diff --git a/users/willifan/graphical/default.nix b/users/willifan/graphical/default.nix
index 3761c7e..8877859 100644
--- a/users/willifan/graphical/default.nix
+++ b/users/willifan/graphical/default.nix
@@ -4,13 +4,12 @@
 
   imports = [
     ./dev
+    ./games
     ./hyprland
     ./theme
 
     ./firefox.nix
     ./kitty.nix
-    ./minecraft.nix
-    ./steam.nix
     ./thunar.nix
     ./thunderbird.nix
   ];
diff --git a/users/willifan/graphical/dev/vscodium.nix b/users/willifan/graphical/dev/vscodium.nix
index 680c332..75af3bb 100644
--- a/users/willifan/graphical/dev/vscodium.nix
+++ b/users/willifan/graphical/dev/vscodium.nix
@@ -10,6 +10,7 @@
         "[nix]"."editor.tabSize" = 2;
         "explorer.confirmDragAndDrop" = false;
         "cmake.showOptionsMovedNotification" = false;
+        "extensions.autoUpdate" = false;
       };
       extensions = with pkgs.vscode-extensions; [
         # System
diff --git a/users/willifan/graphical/steam.nix b/users/willifan/graphical/games/ROG_Pugio_II_fixes.nix
similarity index 59%
rename from users/willifan/graphical/steam.nix
rename to users/willifan/graphical/games/ROG_Pugio_II_fixes.nix
index 7f11bc9..8a8c3f0 100644
--- a/users/willifan/graphical/steam.nix
+++ b/users/willifan/graphical/games/ROG_Pugio_II_fixes.nix
@@ -1,27 +1,37 @@
-{ pkgs, home-manager, ... }:
+{ pkgs, ... }:
 {
-  programs.steam = {
-    enable = true;
-    gamescopeSession = {
-      enable = true;
-    };
-  };
-
-  environment.systemPackages = with pkgs; [
-    mangohud
-  ];
-
-  hardware.steam-hardware.enable = true;
 
   services.udev.extraRules = ''
-    SUBSYSTEM=="tty", ATTRS{idVendor}=="28de", ATTRS{idProduct}=="2102", MODE="0660", TAG+="uaccess"
-  
     # Disable mouse as gamepad
     ACTION=="add", SUBSYSTEM=="input", ATTRS{idVendor}=="0b05", ATTRS{idProduct}=="1906", RUN+="/bin/sh -c 'chmod 000 /dev/input/by-id/usb-ASUSTeK_ROG_PUGIO_II-if03-joystick'"
     ACTION=="add", SUBSYSTEM=="input", ATTRS{idVendor}=="0b05", ATTRS{idProduct}=="1908", RUN+="/bin/sh -c 'chmod 000 /dev/input/by-id/usb-ASUSTeK_ROG_PUGIO_II-if03-joystick'"
     ACTION=="add", SUBSYSTEM=="input", ATTRS{idVendor}=="0b05", ATTRS{idProduct}=="1906", RUN+="/bin/sh -c 'chmod 000 /dev/input/by-id/usb-ASUSTeK_ROG_PUGIO_II-if03-event-joystick'"
     ACTION=="add", SUBSYSTEM=="input", ATTRS{idVendor}=="0b05", ATTRS{idProduct}=="1908", RUN+="/bin/sh -c 'chmod 000 /dev/input/by-id/usb-ASUSTeK_ROG_PUGIO_II-if03-event-joystick'"
   '';
-  services.ratbagd.enable = true;
 
+  services.ratbagd = {
+    enable = true;
+    package = pkgs.libratbag.overrideAttrs (previousAttrs: rec {
+      postInstall = ''
+        # Ensure the target directory exists
+        mkdir -p $out/share/libratbag/
+        # cat the custom configuration file
+        cat << EOF > $out/share/libratbag/asus-rog-pugio-II.device
+[Device]
+Name=ASUS ROG Pugio II
+DeviceMatch=usb:0b05:1906;usb:0b05:1908
+Driver=asus
+
+[Driver/asus]
+Profiles=3
+Buttons=10
+Leds=3
+Dpis=4
+Wireless=1
+DpiRange=100:16000@100
+ButtonMapping=f0;f1;f2;e4;e5;e6;0;e8;e9;e1;e2
+EOF
+      '';
+    });
+  };
 }
\ No newline at end of file
diff --git a/users/willifan/graphical/games/default.nix b/users/willifan/graphical/games/default.nix
new file mode 100644
index 0000000..c084ee0
--- /dev/null
+++ b/users/willifan/graphical/games/default.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }:
+{
+
+  imports = [
+
+    ./mangohud.nix
+    ./minecraft.nix
+    ./ROG_Pugio_II_fixes.nix
+    ./steam.nix
+
+  ];
+  
+}
\ No newline at end of file
diff --git a/users/willifan/graphical/games/mangohud.nix b/users/willifan/graphical/games/mangohud.nix
new file mode 100644
index 0000000..5277176
--- /dev/null
+++ b/users/willifan/graphical/games/mangohud.nix
@@ -0,0 +1,6 @@
+{ pkgs, homa-manager, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    mangohud
+  ];
+}
\ No newline at end of file
diff --git a/users/willifan/graphical/minecraft.nix b/users/willifan/graphical/games/minecraft.nix
similarity index 100%
rename from users/willifan/graphical/minecraft.nix
rename to users/willifan/graphical/games/minecraft.nix
diff --git a/users/willifan/graphical/games/steam.nix b/users/willifan/graphical/games/steam.nix
new file mode 100644
index 0000000..85e8abb
--- /dev/null
+++ b/users/willifan/graphical/games/steam.nix
@@ -0,0 +1,16 @@
+{ pkgs, home-manager, ... }:
+{
+  programs.steam = {
+    enable = true;
+    gamescopeSession = {
+      enable = true;
+    };
+  };
+
+  hardware.steam-hardware.enable = true;
+
+  services.udev.extraRules = ''
+    SUBSYSTEM=="tty", ATTRS{idVendor}=="28de", ATTRS{idProduct}=="2102", MODE="0660", TAG+="uaccess"
+  '';
+  
+}
\ No newline at end of file