diff --git a/base.nix b/base.nix
index 0f86e79..3aaf36f 100644
--- a/base.nix
+++ b/base.nix
@@ -10,30 +10,9 @@
     inputs.home-manager.nixosModules.home-manager
     ./jawz.nix
     ./modules/modules.nix
+    ./stylix.nix
   ];
   system.stateVersion = "24.11";
-  stylix = {
-    enable = true;
-    image = ./wallpaper.jpeg;
-    cursor = {
-      package = pkgs.bibata-cursors;
-      name = "Bibata-Modern-Ice";
-    };
-    fonts = {
-      monospace = {
-        package = pkgs.nerd-fonts.comic-shanns-mono;
-        name = "ComicShansMono Nerd Font Mono";
-      };
-      sansSerif = {
-        package = pkgs.dejavu_fonts;
-        name = "DejaVu Sans";
-      };
-      serif = {
-        package = pkgs.dejavu_fonts;
-        name = "DejaVu Serif";
-      };
-    };
-  };
   sops = {
     defaultSopsFormat = "yaml";
     defaultSopsFile = ./secrets/secrets.yaml;
diff --git a/home-manager.nix b/home-manager.nix
index 77cd8e2..4bb8af8 100644
--- a/home-manager.nix
+++ b/home-manager.nix
@@ -1,10 +1,6 @@
 { config, ... }:
 {
   home.stateVersion = "24.11";
-  stylix.targets = {
-    emacs.enable = true;
-    vesktop.enable = true;
-  };
   programs.bash = {
     enable = true;
     historyFile = "\${XDG_STATE_HOME}/bash/history";
diff --git a/stylix.nix b/stylix.nix
new file mode 100644
index 0000000..150f995
--- /dev/null
+++ b/stylix.nix
@@ -0,0 +1,36 @@
+{ pkgs, ... }:
+{
+  stylix = {
+    enable = true;
+    image = ./wallpapers/classical.jpeg;
+    cursor = {
+      package = pkgs.bibata-cursors;
+      name = "Bibata-Modern-Ice";
+    };
+    fonts = {
+      monospace = {
+        package = pkgs.nerd-fonts.comic-shanns-mono;
+        name = "ComicShansMono Nerd Font Mono";
+      };
+      sansSerif = {
+        package = pkgs.dejavu_fonts;
+        name = "DejaVu Sans";
+      };
+      serif = {
+        package = pkgs.dejavu_fonts;
+        name = "DejaVu Serif";
+      };
+    };
+  };
+  home-manager.users.jawz.stylix = {
+    targets = {
+      vesktop.enable = true;
+    };
+    iconTheme = {
+      enable = true;
+      package = pkgs.papirus-icon-theme;
+      light = "Papirus-Light";
+      dark = "Papirus-Dark";
+    };
+  };
+}