diff --git a/flake.lock b/flake.lock
index 7131cff..c569e2b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -189,11 +189,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1701728041,
-        "narHash": "sha256-x0pyrI1vC8evVDxCxyO6olOyr4wlFg9+VS3C3p4xFYQ=",
+        "lastModified": 1702203126,
+        "narHash": "sha256-4BhN2Vji19MzRC7SUfPZGmtZ2WZydQeUk/ogfRBIZMs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ac7216918cd65f3824ba7817dea8f22e61221eaf",
+        "rev": "defbb9c5857e157703e8fc7cf3c2ceb01cb95883",
         "type": "github"
       },
       "original": {
@@ -225,27 +225,26 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1701656485,
-        "narHash": "sha256-xDFormrGCKKGqngHa2Bz1GTeKlFMMjLnHhTDRdMJ1hs=",
+        "lastModified": 1702336390,
+        "narHash": "sha256-BRO8J8QbmyuS0XMh4UfY11akgTGZj1YhkqNvR83JrsI=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "fa194fc484fd7270ab324bb985593f71102e84d1",
+        "rev": "fef05bf9c8e818f4ca1425ef4c18e6680becd072",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "master",
         "repo": "nixos-hardware",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1701718080,
-        "narHash": "sha256-6ovz0pG76dE0P170pmmZex1wWcQoeiomUZGggfH9XPs=",
+        "lastModified": 1702151865,
+        "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "2c7f3c0fb7c08a0814627611d9d7d45ab6d75335",
+        "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd",
         "type": "github"
       },
       "original": {
@@ -295,11 +294,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1701532764,
-        "narHash": "sha256-Jrizp/nITbul2HBIraQRDw5lyJnzTsj0K9wZUFYX2gg=",
+        "lastModified": 1702242258,
+        "narHash": "sha256-DSiwYD1DZY+YJALahnCVKacWk2AGy+s1pd3Z07tEF/U=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "17a452c5d58bb90057d49c7e3e613b5e6dc1c0f4",
+        "rev": "b5ad31b710294038f9ed70efdf787db6a82d7327",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 5a3ec88..47cc071 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,7 +4,7 @@
   inputs = {
     # System
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    nixos-hardware.url = "github:NixOS/nixos-hardware/master";
+    nixos-hardware.url = "github:NixOS/nixos-hardware";
     disko.url = "github:nix-community/disko";
     disko.inputs.nixpkgs.follows = "nixpkgs";
 
@@ -15,7 +15,7 @@
     # Theming
     stylix.url = "github:danth/stylix";
   };
-  outputs = inputs@{ self, nixpkgs, home-manager, ... }:
+  outputs = inputs@{ self, nixpkgs, stylix, home-manager, ... }:
     let
       system = "x86_64-linux";
       pkgs = nixpkgs.legacyPackages.${system};
@@ -26,6 +26,11 @@
           system = "x86_64-linux";
           specialArgs = { inherit inputs; };
           modules = [
+            # Theme
+            stylix.nixosModules.stylix
+            ./themes/targets/all.nix
+            ./themes/sandstone-forest
+
             ./hosts/Equinox
             home-manager.nixosModules.home-manager
             {
@@ -34,12 +39,9 @@
               home-manager.extraSpecialArgs = inputs;
 
               home-manager.users.panotaka = {
-                imports = [ ./home ./home/shell ./home/desktop ./themes/targets/all.nix ./themes/sandstone-forest ];
+                imports = [ ./home ./home/shell ./home/desktop ];
               };
             }
-            inputs.stylix.nixosModules.stylix
-            ./themes/targets/all.nix
-            ./themes/sandstone-forest
           ];
         };
 
@@ -58,7 +60,7 @@
                 imports = [ ./home ./home/shell ./home/desktop ];
               };
             }
-            inputs.stylix.nixosModules.stylix
+            stylix.nixosModules.stylix
             ./themes/targets/all.nix
             ./themes/spaceduck
           ];
diff --git a/themes/targets/all.nix b/themes/targets/all.nix
index 85e786e..321ff9a 100644
--- a/themes/targets/all.nix
+++ b/themes/targets/all.nix
@@ -1,3 +1,9 @@
 {
   stylix.autoEnable = true;
+
+  home-manager.sharedModules = [
+    {
+      stylix.autoEnable = true;
+    }
+  ];
 }