diff --git a/hosts/thinkpad/config.nix b/hosts/thinkpad/config.nix
index 4bc99fa..571eb11 100644
--- a/hosts/thinkpad/config.nix
+++ b/hosts/thinkpad/config.nix
@@ -3,7 +3,7 @@
     ../../modules/scans/thinkpad.nix
     ../../modules/hardware/thinkpad.nix
     
-    ../../modules/system
+    ../../modules/system/desktop.nix
     ../../modules/system/user.nix
   ];
 }
diff --git a/modules/hardware/thinkpad.nix b/modules/hardware/thinkpad.nix
index 03df0fa..7acfcfe 100644
--- a/modules/hardware/thinkpad.nix
+++ b/modules/hardware/thinkpad.nix
@@ -57,8 +57,8 @@
     
         [UNDERVOLT]
         CORE: -100
-        GPU: -80
         CACHE: -100
+        GPU: -80
         UNCORE: -80
         ANALOGIO: 0
       '';
@@ -74,4 +74,9 @@
     };
     hardware.bolt.enable = true;
   };
+  environment.systemPackages = with pkgs; [
+    intel-gpu-tools
+    throttled
+    tlp
+  ];
 }
diff --git a/modules/home/core/apps.nix b/modules/home/core/apps.nix
index 03b158c..e1224f9 100644
--- a/modules/home/core/apps.nix
+++ b/modules/home/core/apps.nix
@@ -14,6 +14,7 @@
       discord
       slack
       brave
+      modrinth-app
 
       appimage-run
       #winboat
diff --git a/modules/system/base.nix b/modules/system/base.nix
index 88b2c13..2cdea36 100644
--- a/modules/system/base.nix
+++ b/modules/system/base.nix
@@ -1,14 +1,30 @@
-{ hostname, timezone, ... }: {
+{ hostname, timezone, locale, ... }: {
   system.stateVersion = "24.11";
   imports = [
+    ./core/virtualization.nix
+    ./core/bootloader.nix
+    ./core/filesystem.nix
+    ./core/network.nix
+    ./core/kernel.nix
+    ./core/shell.nix
     ./misc/utilities.nix
     ./misc/nix-conf.nix
   ];
 
   networking.hostName = "${hostname}";
   time.timeZone = timezone;
+  i18n.defaultLocale = locale;
+  environment.localBinInPath = true;
+
+  security = {
+    sudo.configFile = ''
+      Defaults insults
+      Defaults passwd_tries = 5
+    '';
+  };
+
   services = {
     openssh.enable = true;
     tailscale.enable = true;
   };
-}
+}
\ No newline at end of file
diff --git a/modules/system/default.nix b/modules/system/default.nix
deleted file mode 100644
index 75f35a1..0000000
--- a/modules/system/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ pkgs, locale, ... }: {
-  imports = [
-    ./core/virtualization.nix
-    ./core/bootloader.nix
-    ./core/filesystem.nix
-    ./core/network.nix
-    ./core/kernel.nix
-    ./core/shell.nix
-    ./misc/programs.nix
-    ./misc/graphics.nix
-    ./desktop.nix
-    ./base.nix
-  ];
-
-  i18n.defaultLocale = locale;
-  environment.localBinInPath = true;
-
-  security = {
-    sudo.configFile = ''
-      Defaults insults
-      Defaults passwd_tries = 5
-    '';
-  };
-}
diff --git a/modules/system/desktop.nix b/modules/system/desktop.nix
index 16f96e1..baff14a 100644
--- a/modules/system/desktop.nix
+++ b/modules/system/desktop.nix
@@ -1,7 +1,9 @@
-
 { pkgs, enable-dm, ... }: {
   imports = [
+    ./misc/programs.nix
+    ./misc/graphics.nix
     ./misc/theme.nix
+    ./base.nix
   ];
 
   programs.hyprland = {
diff --git a/modules/system/misc/graphics.nix b/modules/system/misc/graphics.nix
index 7bd0bdf..47d6159 100644
--- a/modules/system/misc/graphics.nix
+++ b/modules/system/misc/graphics.nix
@@ -5,13 +5,6 @@
   };
 
   services = {
-    xserver = {
-      enable = true;
-      xkb = {
-        layout = "us";
-        variant = "";
-      };
-    };
     pipewire = {
       enable = true;
       alsa.enable = true;
diff --git a/modules/system/misc/utilities.nix b/modules/system/misc/utilities.nix
index f6eca54..5d7f785 100644
--- a/modules/system/misc/utilities.nix
+++ b/modules/system/misc/utilities.nix
@@ -16,7 +16,6 @@
     pavucontrol
     jq
     powertop
-    smartmontools
     fastfetch
     ethtool
     dig
@@ -46,8 +45,6 @@
     sysstat
     netcat
     p7zip
-    throttled
-    tlp
     stress
     stress-ng
     wakeonlan