diff --git a/users/willifan/graphical/default.nix b/users/willifan/graphical/default.nix
index 8877859..3761c7e 100644
--- a/users/willifan/graphical/default.nix
+++ b/users/willifan/graphical/default.nix
@@ -4,12 +4,13 @@
 
   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 75af3bb..680c332 100644
--- a/users/willifan/graphical/dev/vscodium.nix
+++ b/users/willifan/graphical/dev/vscodium.nix
@@ -10,7 +10,6 @@
         "[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/games/default.nix b/users/willifan/graphical/games/default.nix
deleted file mode 100644
index c084ee0..0000000
--- a/users/willifan/graphical/games/default.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ 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
deleted file mode 100644
index 5277176..0000000
--- a/users/willifan/graphical/games/mangohud.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ pkgs, homa-manager, ... }:
-{
-  environment.systemPackages = with pkgs; [
-    mangohud
-  ];
-}
\ No newline at end of file
diff --git a/users/willifan/graphical/games/steam.nix b/users/willifan/graphical/games/steam.nix
deleted file mode 100644
index 85e8abb..0000000
--- a/users/willifan/graphical/games/steam.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ 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
diff --git a/users/willifan/graphical/games/minecraft.nix b/users/willifan/graphical/minecraft.nix
similarity index 100%
rename from users/willifan/graphical/games/minecraft.nix
rename to users/willifan/graphical/minecraft.nix
diff --git a/users/willifan/graphical/games/ROG_Pugio_II_fixes.nix b/users/willifan/graphical/steam.nix
similarity index 59%
rename from users/willifan/graphical/games/ROG_Pugio_II_fixes.nix
rename to users/willifan/graphical/steam.nix
index 8a8c3f0..7f11bc9 100644
--- a/users/willifan/graphical/games/ROG_Pugio_II_fixes.nix
+++ b/users/willifan/graphical/steam.nix
@@ -1,37 +1,27 @@
-{ pkgs, ... }:
+{ pkgs, home-manager, ... }:
 {
+  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