diff --git a/flake.nix b/flake.nix
index 6e8a7fc..d783588 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,6 +19,7 @@
       nixos-hardware,
       home-manager,
       wayland-pipewire-idle-inhibit,
+      stylix,
       ...
   }:
     let
@@ -46,116 +47,62 @@
       nixosConfigurations = {
         # clients
         ace = lib.nixosSystem {
-          modules = [
-            inputs.stylix.nixosModules.stylix
-            ./hosts/ace
-          ];
+          modules = [ ./hosts/ace ];
           specialArgs = { inherit inputs outputs; };
         };
         dragon = lib.nixosSystem {
-          modules = [
-            inputs.stylix.nixosModules.stylix
-            ./hosts/dragon
-          ];
+          modules = [ ./hosts/dragon ];
           specialArgs = { inherit inputs outputs; };
         };
         eve = lib.nixosSystem {
-          modules = [
-            nixos-hardware.nixosModules.google-pixelbook
-            inputs.stylix.nixosModules.stylix
-            ./hosts/eve
-          ];
+          modules = [ ./hosts/eve ];
           specialArgs = { inherit inputs outputs; };
         };
         loki = lib.nixosSystem {
-          modules = [
-            nixos-hardware.nixosModules.dell-xps-13-9310
-            inputs.stylix.nixosModules.stylix
-            ./hosts/loki
-            ];
+          modules = [ ./hosts/loki ];
           specialArgs = { inherit inputs outputs; };
         };
 
         pocket2 = lib.nixosSystem {
-          modules = [
-            inputs.stylix.nixosModules.stylix
-            ./hosts/pocket2
-          ];
+          modules = [ ./hosts/pocket2 ];
           specialArgs = { inherit inputs outputs; };
         };
         smaug = lib.nixosSystem {
-          modules = [
-            nixos-hardware.nixosModules.lenovo-thinkpad-x260
-            inputs.stylix.nixosModules.stylix
-            ./hosts/smaug
-            ];
+          modules = [ ./hosts/smaug ];
+          specialArgs = { inherit inputs outputs; };
+        };
+        t2 = lib.nixosSystem {
+          modules = [ ./hosts/t2 ];
           specialArgs = { inherit inputs outputs; };
         };
-        # t2 = lib.nixosSystem {
-        #   modules = [
-        #     inputs.stylix.nixosModules.stylix
-        #     ./hosts/t2
-        #   ];
-        #   specialArgs = { inherit inputs outputs; };
-        # };
 
         # servers
         display = lib.nixosSystem {
-          modules = [
-            inputs.stylix.nixosModules.stylix
-            ./hosts/display
-          ];
+          modules = [ ./hosts/display ];
           specialArgs = { inherit inputs outputs; };
         };
         fred = lib.nixosSystem {
-          modules = [
-            inputs.stylix.nixosModules.stylix
-            ./hosts/fred
-          ];
+          modules = [ ./hosts/fred ];
           specialArgs = { inherit inputs outputs; };
         };
         harper2 = lib.nixosSystem {
-          modules = [
-            inputs.stylix.nixosModules.stylix
-            ./hosts/harper2
-          ];
+          modules = [ ./hosts/harper2 ];
           specialArgs = { inherit inputs outputs; };
         };
         harper = lib.nixosSystem {
-          modules = [
-            inputs.stylix.nixosModules.stylix
-            ./hosts/harper
-          ];
+          modules = [ ./hosts/harper ];
           specialArgs = { inherit inputs outputs; };
         };
         nuwww = lib.nixosSystem {
-          modules = [
-            inputs.stylix.nixosModules.stylix
-            ./hosts/nuwww
-          ];
+          modules = [ ./hosts/nuwww ];
           specialArgs = { inherit inputs outputs; };
         };
         pihole = lib.nixosSystem {
-          modules = [
-            inputs.stylix.nixosModules.stylix
-            ./hosts/pihole
-          ];
+          modules = [ ./hosts/pihole ];
           specialArgs = { inherit inputs outputs; };
         };
         www2 = lib.nixosSystem {
-          modules = [
-            inputs.stylix.nixosModules.stylix
-            ./hosts/www2
-          ];
-          specialArgs = { inherit inputs outputs; };
-        };
-
-        # test system
-        nixos = lib.nixosSystem {
-          modules = [
-            inputs.stylix.nixosModules.stylix
-            ./hosts/nixos
-          ];
+          modules = [ ./hosts/www2 ];
           specialArgs = { inherit inputs outputs; };
         };
       };
diff --git a/hosts/ace/default.nix b/hosts/ace/default.nix
index 4c279f9..b0b0b30 100644
--- a/hosts/ace/default.nix
+++ b/hosts/ace/default.nix
@@ -3,6 +3,7 @@
 {
   imports =
     [
+      inputs.stylix.nixosModules.stylix
       ./hardware-configuration.nix
       # ../disko/mmcblk.nix
       ../workstation
diff --git a/hosts/display/default.nix b/hosts/display/default.nix
index 9b291a0..4502c2c 100644
--- a/hosts/display/default.nix
+++ b/hosts/display/default.nix
@@ -3,6 +3,8 @@
 {
   imports =
     [
+      inputs.stylix.nixosModules.stylix
+      inputs.nixos-hardware.nixosModules.raspberry-pi-4
       ./hardware-configuration.nix
       ../themes.nix
       ../../server
diff --git a/hosts/dragon/default.nix b/hosts/dragon/default.nix
index f2bb91e..d9889f4 100644
--- a/hosts/dragon/default.nix
+++ b/hosts/dragon/default.nix
@@ -3,6 +3,7 @@
 {
   imports =
     [
+      inputs.stylix.nixosModules.stylix
       ./hardware-configuration.nix
       inputs.nixos-hardware.nixosModules.common-cpu-intel
       inputs.nixos-hardware.nixosModules.common-gpu-intel
diff --git a/hosts/eve/default.nix b/hosts/eve/default.nix
index 93aa9a9..ce043a8 100644
--- a/hosts/eve/default.nix
+++ b/hosts/eve/default.nix
@@ -3,6 +3,8 @@
 {
   imports =
     [
+      inputs.nixos-hardware.nixosModules.google-pixelbook
+      inputs.stylix.nixosModules.stylix
       ./hardware-configuration.nix
       # ../disko/mmcblk.nix
       ../workstation
diff --git a/hosts/fred/default.nix b/hosts/fred/default.nix
index 807109a..0146edb 100644
--- a/hosts/fred/default.nix
+++ b/hosts/fred/default.nix
@@ -3,6 +3,7 @@
 {
   imports =
     [
+      inputs.stylix.nixosModules.stylix
       ./hardware-configuration.nix
       ../server
       ../themes.nix
diff --git a/hosts/harper/default.nix b/hosts/harper/default.nix
index 9d81565..55db3ed 100644
--- a/hosts/harper/default.nix
+++ b/hosts/harper/default.nix
@@ -3,6 +3,7 @@
 {
   imports =
     [
+      inputs.stylix.nixosModules.stylix
       ./hardware-configuration.nix
       ../../server
       ../themes.nix
diff --git a/hosts/harper2/default.nix b/hosts/harper2/default.nix
index 595d4e8..6b8f4a9 100644
--- a/hosts/harper2/default.nix
+++ b/hosts/harper2/default.nix
@@ -3,6 +3,7 @@
 {
   imports =
     [
+      inputs.stylix.nixosModules.stylix
       ./hardware-configuration.nix
       ../../server
       ../themes.nix
diff --git a/hosts/loki/default.nix b/hosts/loki/default.nix
index bb7e612..b760376 100644
--- a/hosts/loki/default.nix
+++ b/hosts/loki/default.nix
@@ -3,6 +3,8 @@
 {
   imports =
     [
+      inputs.nixos-hardware.nixosModules.dell-xps-13-9310
+      inputs.stylix.nixosModules.stylix
       ./hardware-configuration.nix
       # ../disko/nvme.nix
       ../workstation
diff --git a/hosts/nuwww/default.nix b/hosts/nuwww/default.nix
index 01a065a..4797569 100644
--- a/hosts/nuwww/default.nix
+++ b/hosts/nuwww/default.nix
@@ -3,6 +3,7 @@
 {
   imports =
     [
+      inputs.stylix.nixosModules.stylix
       ./hardware-configuration.nix
       ../../server
       ../themes.nix
diff --git a/hosts/pihole/default.nix b/hosts/pihole/default.nix
index 1b53457..1e45640 100644
--- a/hosts/pihole/default.nix
+++ b/hosts/pihole/default.nix
@@ -3,6 +3,7 @@
 {
   imports =
     [
+      inputs.stylix.nixosModules.stylix
       ./hardware-configuration.nix
       ../../server
       ../themes.nix
diff --git a/hosts/pocket2/default.nix b/hosts/pocket2/default.nix
index b66a77d..b96f88f 100644
--- a/hosts/pocket2/default.nix
+++ b/hosts/pocket2/default.nix
@@ -3,6 +3,7 @@
 {
   imports =
     [
+      inputs.stylix.nixosModules.stylix
       ./hardware-configuration.nix
       inputs.nixos-hardware.nixosModules.common-cpu-intel
       inputs.nixos-hardware.nixosModules.common-gpu-intel
diff --git a/hosts/smaug/default.nix b/hosts/smaug/default.nix
index 7ba2b08..4cfa241 100644
--- a/hosts/smaug/default.nix
+++ b/hosts/smaug/default.nix
@@ -3,6 +3,8 @@
 {
   imports =
     [
+      nixos-hardware.nixosModules.lenovo-thinkpad-x260
+      inputs.stylix.nixosModules.stylix
       ./hardware-configuration.nix
       # ../disko/sda.nix
       ../workstation
diff --git a/hosts/t2/default.nix b/hosts/t2/default.nix
index 1ab5b23..c59cf9b 100644
--- a/hosts/t2/default.nix
+++ b/hosts/t2/default.nix
@@ -3,6 +3,7 @@
 {
   imports =
     [
+      inputs.stylix.nixosModules.stylix
       ./hardware-configuration.nix
       ../workstation
       ../themes.nix
diff --git a/hosts/www2/default.nix b/hosts/www2/default.nix
index 4908e11..f5d178e 100644
--- a/hosts/www2/default.nix
+++ b/hosts/www2/default.nix
@@ -3,6 +3,7 @@
 {
   imports =
     [
+      inputs.stylix.nixosModules.stylix
       ./hardware-configuration.nix
       ../../server
       ../themes.nix