diff --git a/systems/modules/stylix.nix b/systems/modules/stylix.nix
index c595896..1dade38 100644
--- a/systems/modules/stylix.nix
+++ b/systems/modules/stylix.nix
@@ -1,21 +1,36 @@
 { inputs, ... }:
 let
+  opacity = 0.8;
   toImport = [
-    ../../themes/cursors/banana-cursor.nix
-    ../../themes/darkviolet.nix
-    ../../themes/fonts/sauce-code-pro.nix
+    ./themes/cursors/banana-cursor.nix
+    ./themes/colourschemes/darkviolet.nix
+    ./themes/fonts/sauce-code-pro.nix
+    {
+      # Put options that exist in both NixOS and home-manager modules here.
+      stylix = {
+        enable = true;
+        image = ../../media/wallpaper.jpg;
+        opacity = {
+          applications = opacity;
+          desktop = opacity;
+          popups = opacity;
+          terminal = opacity;
+        };
+      };
+    }
   ];
 in
 {
-  imports = [ inputs.stylix.nixosModules.stylix ] ++ toImport;
-
   # Enable basic fonts for reasonable Unicode coverage
   fonts.enableDefaultPackages = true;
 
-  stylix = {
-    enable = true;
-    image = ../../media/wallpaper.jpg;
-    homeManagerIntegration.autoImport = false;
-    homeManagerIntegration.followSystem = false;
-  };
+  imports = [ inputs.stylix.nixosModules.stylix ] ++ toImport;
+  home-manager.users.rafiq.imports = [ inputs.stylix.homeManagerModules.stylix ] ++ toImport;
+
+  # Put options that only exist in the NixOS module here.
+  stylix.homeManagerIntegration.autoImport = false;
+  stylix.homeManagerIntegration.followSystem = false;
+
+  # Put options that only exist in the home-manager module here.
+  # home-manager.users.rafiq.stylix = {};
 }
diff --git a/themes/3024.nix b/systems/modules/themes/colourschemes/3024.nix
similarity index 100%
rename from themes/3024.nix
rename to systems/modules/themes/colourschemes/3024.nix
diff --git a/themes/black-metal.nix b/systems/modules/themes/colourschemes/black-metal.nix
similarity index 100%
rename from themes/black-metal.nix
rename to systems/modules/themes/colourschemes/black-metal.nix
diff --git a/themes/bright.nix b/systems/modules/themes/colourschemes/bright.nix
similarity index 100%
rename from themes/bright.nix
rename to systems/modules/themes/colourschemes/bright.nix
diff --git a/themes/catppuccin-mocha.nix b/systems/modules/themes/colourschemes/catppuccin-mocha.nix
similarity index 100%
rename from themes/catppuccin-mocha.nix
rename to systems/modules/themes/colourschemes/catppuccin-mocha.nix
diff --git a/themes/darkviolet.nix b/systems/modules/themes/colourschemes/darkviolet.nix
similarity index 100%
rename from themes/darkviolet.nix
rename to systems/modules/themes/colourschemes/darkviolet.nix
diff --git a/themes/cursors/banana-cursor.nix b/systems/modules/themes/cursors/banana-cursor.nix
similarity index 100%
rename from themes/cursors/banana-cursor.nix
rename to systems/modules/themes/cursors/banana-cursor.nix
diff --git a/themes/cursors/wii-cursor.nix b/systems/modules/themes/cursors/wii-cursor.nix
similarity index 100%
rename from themes/cursors/wii-cursor.nix
rename to systems/modules/themes/cursors/wii-cursor.nix
diff --git a/themes/fonts/0xProto.nix b/systems/modules/themes/fonts/0xProto.nix
similarity index 100%
rename from themes/fonts/0xProto.nix
rename to systems/modules/themes/fonts/0xProto.nix
diff --git a/themes/fonts/3270.nix b/systems/modules/themes/fonts/3270.nix
similarity index 100%
rename from themes/fonts/3270.nix
rename to systems/modules/themes/fonts/3270.nix
diff --git a/themes/fonts/sauce-code-pro.nix b/systems/modules/themes/fonts/sauce-code-pro.nix
similarity index 100%
rename from themes/fonts/sauce-code-pro.nix
rename to systems/modules/themes/fonts/sauce-code-pro.nix
diff --git a/themes/fonts/terminess.nix b/systems/modules/themes/fonts/terminess.nix
similarity index 100%
rename from themes/fonts/terminess.nix
rename to systems/modules/themes/fonts/terminess.nix
diff --git a/users/modules/stylix.nix b/users/modules/stylix.nix
deleted file mode 100644
index 70d67b9..0000000
--- a/users/modules/stylix.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ inputs, pkgs, ... }:
-{
-  imports = [
-    inputs.stylix.homeManagerModules.stylix
-    ../../themes/darkviolet.nix
-    ../../themes/fonts/sauce-code-pro.nix
-    ../../themes/cursors/banana-cursor.nix
-  ];
-  stylix = {
-    enable = true;
-    image = ../../media/wallpaper.jpg;
-    iconTheme = {
-      enable = true;
-      package = pkgs.numix-icon-theme;
-      dark = "Numix";
-      light = "Numix-Light";
-    };
-    opacity = {
-      applications = 0.8;
-      desktop = 0.8;
-      popups = 0.8;
-      terminal = 0.8;
-    };
-    targets.gtk.extraCss = # css
-      ''
-        window {
-            background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0) 50%, rgba(0, 0, 0, 0.1) 50%);
-            background-size: 100% 2px;  /* Adjust height for scanline thickness */
-              background-color: rgba(0, 0, 0, 0.05); /*Very slight transparency*/
-        }
-        entry {
-          box-shadow: inset 1px 1px 2px rgba(0, 0, 0, 0.2);
-        }
-        button:hover {
-          box-shadow: 0 0 5px rgba(0, 255, 0, 0.5);  /* Replace color */
-        }
-      '';
-  };
-}
diff --git a/users/rafiq.nix b/users/rafiq.nix
index a18f8a0..acccfe3 100644
--- a/users/rafiq.nix
+++ b/users/rafiq.nix
@@ -9,7 +9,6 @@
     ./modules/sh.nix
     ./modules/de.nix
     ./modules/utils.nix
-    ./modules/stylix.nix
   ];
 
   # This enables using home-manager from the command line.