diff --git a/home-manager/common/desktops/hyprland/default.nix b/home-manager/common/desktops/hyprland/default.nix
index 69520ca4..cff2adf7 100644
--- a/home-manager/common/desktops/hyprland/default.nix
+++ b/home-manager/common/desktops/hyprland/default.nix
@@ -1,7 +1,7 @@
 { pkgs, inputs, theme, ... }: {
     imports = [
         inputs.stylix.homeManagerModules.stylix
-        ./themes/${theme}.nix
+        ../../../../../stylix/${theme}
         ./components
         ./assets/waybar/scripts.nix
     ];
@@ -15,6 +15,7 @@
     gtk.enable = true;
     
     stylix  = {
+      image = /etc/nixos/git/wallpapers/${theme}/wallpaper1.png;
       opacity = {
         desktop = 0.7;
         popups = 0.7;
diff --git a/home-manager/common/desktops/hyprland/themes/green.nix b/home-manager/common/desktops/hyprland/themes/green.nix
deleted file mode 100644
index 6ea8c8f9..00000000
--- a/home-manager/common/desktops/hyprland/themes/green.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{lib, inputs, pkgs, gpu, platform, theme, ...}: {
-    # Themes https://github.com/tinted-theming/base16-schemes
-  stylix  = {
-    image = /etc/nixos/git/wallpapers/${theme}/wallpaper1.png;
-    polarity = "dark";
-    # base16Scheme = "${pkgs.base16-schemes}/share/themes/everforest-dark-hard.yaml";
-    base16Scheme = ../../../../../lib/themes/everforest-dark-hard.yaml;
-  };
-}
\ No newline at end of file
diff --git a/home-manager/common/desktops/hyprland/themes/tokyo-day.nix b/home-manager/common/desktops/hyprland/themes/tokyo-day.nix
deleted file mode 100644
index 1ca7ec2a..00000000
--- a/home-manager/common/desktops/hyprland/themes/tokyo-day.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{lib, inputs, pkgs, gpu, platform, theme, ...}: {
-    # Themes https://github.com/tinted-theming/base16-schemes
-  stylix  = {
-    image = /etc/nixos/git/wallpapers/${theme}/wallpaper1.png;
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-terminal-light.yaml";
-  };
-}
\ No newline at end of file
diff --git a/home-manager/common/desktops/hyprland/themes/stylix.nix b/lib/stylix/green/default.nix
similarity index 52%
rename from home-manager/common/desktops/hyprland/themes/stylix.nix
rename to lib/stylix/green/default.nix
index b94973cf..d29fe269 100644
--- a/home-manager/common/desktops/hyprland/themes/stylix.nix
+++ b/lib/stylix/green/default.nix
@@ -1,8 +1,7 @@
 {lib, inputs, pkgs, gpu, platform, theme, ...}: {
     # Themes https://github.com/tinted-theming/base16-schemes
   stylix  = {
-    image = /etc/nixos/git/wallpapers/${theme}/wallpaper1.png;
     polarity = "dark";
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/atelier-cave.yaml";
+    base16Scheme = ./everforest-dark-hard.yaml;
   };
 }
\ No newline at end of file
diff --git a/lib/themes/everforest-dark-hard.yaml b/lib/stylix/green/everforest-dark-hard.yaml
similarity index 100%
rename from lib/themes/everforest-dark-hard.yaml
rename to lib/stylix/green/everforest-dark-hard.yaml
diff --git a/home-manager/common/desktops/hyprland/themes/gruvbox.nix b/lib/stylix/gruvbox/gruvbox.nix
similarity index 78%
rename from home-manager/common/desktops/hyprland/themes/gruvbox.nix
rename to lib/stylix/gruvbox/gruvbox.nix
index a52e5426..ca7d39bd 100644
--- a/home-manager/common/desktops/hyprland/themes/gruvbox.nix
+++ b/lib/stylix/gruvbox/gruvbox.nix
@@ -1,7 +1,6 @@
 {lib, inputs, pkgs, gpu, platform, theme, ...}: {
     # Themes https://github.com/tinted-theming/base16-schemes
   stylix  = {
-    image = /etc/nixos/git/wallpapers/${theme}/wallpaper1.png;
     polarity = "dark";
     base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml";
   };
diff --git a/nixos/common/desktops/hyprland/themes/stylix.nix b/lib/stylix/stylix/default.nix
similarity index 78%
rename from nixos/common/desktops/hyprland/themes/stylix.nix
rename to lib/stylix/stylix/default.nix
index b94973cf..64c39b92 100644
--- a/nixos/common/desktops/hyprland/themes/stylix.nix
+++ b/lib/stylix/stylix/default.nix
@@ -1,7 +1,6 @@
 {lib, inputs, pkgs, gpu, platform, theme, ...}: {
     # Themes https://github.com/tinted-theming/base16-schemes
   stylix  = {
-    image = /etc/nixos/git/wallpapers/${theme}/wallpaper1.png;
     polarity = "dark";
     base16Scheme = "${pkgs.base16-schemes}/share/themes/atelier-cave.yaml";
   };
diff --git a/nixos/common/desktops/hyprland/themes/tokyo-day.nix b/lib/stylix/tokyo-day/default.nix
similarity index 77%
rename from nixos/common/desktops/hyprland/themes/tokyo-day.nix
rename to lib/stylix/tokyo-day/default.nix
index 1ca7ec2a..2b95675b 100644
--- a/nixos/common/desktops/hyprland/themes/tokyo-day.nix
+++ b/lib/stylix/tokyo-day/default.nix
@@ -1,7 +1,6 @@
 {lib, inputs, pkgs, gpu, platform, theme, ...}: {
     # Themes https://github.com/tinted-theming/base16-schemes
   stylix  = {
-    image = /etc/nixos/git/wallpapers/${theme}/wallpaper1.png;
     base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-terminal-light.yaml";
   };
 }
\ No newline at end of file
diff --git a/home-manager/common/desktops/hyprland/themes/tokyo-night.nix b/lib/stylix/tokyo-night/default.nix
similarity index 79%
rename from home-manager/common/desktops/hyprland/themes/tokyo-night.nix
rename to lib/stylix/tokyo-night/default.nix
index ce987a96..ab564747 100644
--- a/home-manager/common/desktops/hyprland/themes/tokyo-night.nix
+++ b/lib/stylix/tokyo-night/default.nix
@@ -1,7 +1,6 @@
 {lib, inputs, pkgs, gpu, platform, theme, ...}: {
     # Themes https://github.com/tinted-theming/base16-schemes
   stylix  = {
-    image = /etc/nixos/git/wallpapers/${theme}/wallpaper1.png;
     polarity = "dark";
     base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-terminal-dark.yaml";
   };
diff --git a/nixos/common/desktops/hyprland/default.nix b/nixos/common/desktops/hyprland/default.nix
index 6d248dd3..b28300b7 100644
--- a/nixos/common/desktops/hyprland/default.nix
+++ b/nixos/common/desktops/hyprland/default.nix
@@ -9,10 +9,11 @@
 
   imports = [ 
     inputs.stylix.nixosModules.stylix
-    ./themes/${theme}.nix
+    ../../../../../stylix/${theme}
   ];
 
   stylix  = {
+    image = /etc/nixos/git/wallpapers/${theme}/wallpaper1.png;
     opacity = {
       desktop = 0.7;
       popups = 0.7;
diff --git a/nixos/common/desktops/hyprland/themes/green.nix b/nixos/common/desktops/hyprland/themes/green.nix
deleted file mode 100644
index 0551075c..00000000
--- a/nixos/common/desktops/hyprland/themes/green.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{lib, inputs, pkgs, gpu, platform, theme, ...}: {
-    # Themes https://github.com/tinted-theming/base16-schemes
-  stylix  = {
-    image = /etc/nixos/git/wallpapers/${theme}/wallpaper1.png;
-    polarity = "dark";
-    # base16Scheme = "${pkgs.base16-schemes}/share/themes/everforest.yaml";
-    base16Scheme = ../../../../../lib/themes/everforest-dark-hard.yaml;
-  };
-}
\ No newline at end of file
diff --git a/nixos/common/desktops/hyprland/themes/gruvbox.nix b/nixos/common/desktops/hyprland/themes/gruvbox.nix
deleted file mode 100644
index a52e5426..00000000
--- a/nixos/common/desktops/hyprland/themes/gruvbox.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{lib, inputs, pkgs, gpu, platform, theme, ...}: {
-    # Themes https://github.com/tinted-theming/base16-schemes
-  stylix  = {
-    image = /etc/nixos/git/wallpapers/${theme}/wallpaper1.png;
-    polarity = "dark";
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml";
-  };
-}
\ No newline at end of file
diff --git a/nixos/common/desktops/hyprland/themes/tokyo-night.nix b/nixos/common/desktops/hyprland/themes/tokyo-night.nix
deleted file mode 100644
index ce987a96..00000000
--- a/nixos/common/desktops/hyprland/themes/tokyo-night.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{lib, inputs, pkgs, gpu, platform, theme, ...}: {
-    # Themes https://github.com/tinted-theming/base16-schemes
-  stylix  = {
-    image = /etc/nixos/git/wallpapers/${theme}/wallpaper1.png;
-    polarity = "dark";
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-terminal-dark.yaml";
-  };
-}
\ No newline at end of file