diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 235f26b..20d85d4 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -22,7 +22,6 @@
   imports = [
     inputs.zen-browser.homeModules.beta
     ./hypr
-    ./theme
   ];
 
   programs.zen-browser = {
@@ -44,4 +43,9 @@
       # find more options here: https://mozilla.github.io/policy-templates/
     };
   };
+
+  services.darkman = {
+    enable = true;
+    settings.portal = true;
+  };
 }
diff --git a/modules/desktop/hypr/default.nix b/modules/desktop/hypr/default.nix
index 6258713..3fcf366 100644
--- a/modules/desktop/hypr/default.nix
+++ b/modules/desktop/hypr/default.nix
@@ -1,3 +1,6 @@
+let
+  theme = import ../theme;
+in
 {
   imports = [
     ./bindings
@@ -55,4 +58,17 @@
       ];
     };
   };
+
+  services.darkman = {
+    lightModeScripts.hyprland-light = ''
+      hyprctl keyword misc:background_color 0x${theme.bg.light}
+      hyprctl keyword general:col.active_border 0xFF${theme.primary.light}
+      hyprctl keyword general:col.inactive_border 0xFF${theme.secondary.light}
+    '';
+    darkModeScripts.hyprland-dark = ''
+      hyprctl keyword misc:background_color 0x${theme.bg.dark}
+      hyprctl keyword general:col.active_border 0xFF${theme.primary.dark}
+      hyprctl keyword general:col.inactive_border 0xFF${theme.secondary.dark}
+    '';
+  };
 }
diff --git a/modules/desktop/theme/default.nix b/modules/desktop/theme/default.nix
index ee00d2a..cdd3735 100644
--- a/modules/desktop/theme/default.nix
+++ b/modules/desktop/theme/default.nix
@@ -1,4 +1,4 @@
-let
+{
   bg = {
     light = "FAFAFA";
     dark = "2E3440";
@@ -15,20 +15,4 @@ let
     light = "90A4AE";
     dark = "677691";
   };
-in
-{
-  services.darkman = {
-    enable = true;
-    settings.portal = true;
-    lightModeScripts.hyprland-light = ''
-      hyprctl keyword misc:background_color 0x${bg.light}
-      hyprctl keyword general:col.active_border 0xFF${primary.light}
-      hyprctl keyword general:col.inactive_border 0xFF${secondary.light}
-    '';
-    darkModeScripts.hyprland-dark = ''
-      hyprctl keyword misc:background_color 0x${bg.dark}
-      hyprctl keyword general:col.active_border 0xFF${primary.dark}
-      hyprctl keyword general:col.inactive_border 0xFF${secondary.dark}
-    '';
-  };
 }