diff --git a/common.nix b/common.nix
index 92e22b7..3e860f1 100644
--- a/common.nix
+++ b/common.nix
@@ -50,13 +50,6 @@
     };
   };
 
-  #themeing
-  qt = {
-    enable = true;
-    style = "gtk2";
-    platformTheme = "gtk2";
-  };
-
   #time settings
   time.timeZone = "America/New_York";
   services = {
diff --git a/home-manager/default.nix b/home-manager/default.nix
index d37099b..9efdeba 100644
--- a/home-manager/default.nix
+++ b/home-manager/default.nix
@@ -3,9 +3,7 @@
   lib,
   inputs,
   ...
-}: let
-  helperfunc = args: (lib.lists.forEach args (m: ./. + ("/" + m + ".nix")));
-in {
+}: {
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = false;
@@ -13,10 +11,8 @@ in {
     users = {
       ${settings.username} = {
         imports =
-          helperfunc
           [
-            "theme"
-            "spicetify"
+            ./spicetify.nix
           ];
         xsession.numlock.enable = true;
         home = {
@@ -24,18 +20,6 @@ in {
           stateVersion = settings.version;
         };
       };
-      root = {
-        imports =
-          helperfunc
-          [
-            "theme"
-          ];
-        home = {
-          username = "root";
-          homeDirectory = "/root";
-          stateVersion = settings.version;
-        };
-      };
     };
   };
 }
diff --git a/home-manager/theme.nix b/home-manager/theme.nix
deleted file mode 100644
index 7a8ebeb..0000000
--- a/home-manager/theme.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{pkgs, ...}: {
-  gtk = {
-    enable = true;
-    theme = {
-      package = pkgs.flat-remix-gtk;
-      name = "Flat-Remix-GTK-Blue-Darkest";
-    };
-    iconTheme = {
-      package = pkgs.flat-remix-icon-theme;
-      name = "Flat-Remix-Blue-Dark";
-    };
-    font = {
-      name = "Overpass";
-      size = 10;
-    };
-  };
-  home.pointerCursor = {
-    gtk.enable = true;
-    x11.enable = true;
-    package = pkgs.quintom-cursor-theme;
-    name = "Quintom_Ink";
-    size = 16;
-  };
-}
diff --git a/modules/theme.nix b/modules/theme.nix
new file mode 100644
index 0000000..6371fc2
--- /dev/null
+++ b/modules/theme.nix
@@ -0,0 +1,48 @@
+{pkgs,...}:
+{
+  environment = {
+  systemPackages = with pkgs;
+  [
+    flat-remix-gtk 
+    flat-remix-icon-theme
+    quintom-cursor-theme
+  ];
+  etc = {
+  "xdg/gtk-4.0/settings.ini".text = ''
+[Settings]
+gtk-cursor-theme-name=Quintom_Ink
+gtk-cursor-theme-size=16
+gtk-font-name=Overpass 10
+gtk-icon-theme-name=Flat-Remix-Blue-Dark
+gtk-theme-name=Flat-Remix-GTK-Blue-Darkest
+  '';
+  "xdg/gtk-3.0/settings.ini".text = ''
+[Settings]
+gtk-cursor-theme-name=Quintom_Ink
+gtk-cursor-theme-size=16
+gtk-font-name=Overpass 10
+gtk-icon-theme-name=Flat-Remix-Blue-Dark
+gtk-theme-name=Flat-Remix-GTK-Blue-Darkest
+  '';
+  "xdg/gtk-2.0/gtkrc".text = ''
+gtk-cursor-theme-name = "Quintom_Ink"
+gtk-cursor-theme-size = 16
+gtk-font-name = "Overpass 10"
+gtk-icon-theme-name = "Flat-Remix-Blue-Dark"
+gtk-theme-name = "Flat-Remix-GTK-Blue-Darkest"
+  '';
+  "xdg/Xresources".text = ''
+Xcursor.size: 16
+Xcursor.theme: Quintom_Ink
+  '';
+  };
+  }; 
+  qt = {
+    enable = true;
+    style = "gtk2";
+    platformTheme = "gtk2";
+  };
+  services.xserver.displayManager.sessionCommands = ''
+  xrdb -load /etc/xdg/Xresources
+  '';
+}
diff --git a/systems/desktop.nix b/systems/desktop.nix
index 7745db1..81d7607 100644
--- a/systems/desktop.nix
+++ b/systems/desktop.nix
@@ -7,17 +7,18 @@
   imports = let
     modules = [
       "boot"
+      "dwm"
       "fonts"
       "git"
-      #"mining"
       "packages"
       "parrot"
       "picom"
       "refreshrate"
-      "sxhkd"
-      "vfio"
-      "dwm"
       "shells"
+      "sxhkd"
+      "theme"
+      "vfio"
+      #"mining"
     ];
   in
     lib.lists.forEach modules (
diff --git a/systems/laptop.nix b/systems/laptop.nix
index c2d4a36..e5de1da 100644
--- a/systems/laptop.nix
+++ b/systems/laptop.nix
@@ -14,6 +14,7 @@
       "gnome"
       "shells"
       "gaming"
+      "theme"
     ];
   in
     lib.lists.forEach modules (