diff --git a/home/hosts/cloud/default.nix b/home/hosts/cloud/default.nix
deleted file mode 100644
index 0225681..0000000
--- a/home/hosts/cloud/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  # No Special Home
-}
diff --git a/home/hosts/komodo/default.nix b/home/hosts/komodo/default.nix
deleted file mode 100644
index 1f96f06..0000000
--- a/home/hosts/komodo/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  config,
-  ...
-}:
-{
-
-  home.file = {
-    Pool.source = config.lib.file.mkOutOfStoreSymlink "/pool";
-    DockerStorage.source = config.lib.file.mkOutOfStoreSymlink "/mnt/DockerStorage";
-  };
-}
diff --git a/home/hosts/lxc/default.nix b/home/hosts/lxc/default.nix
deleted file mode 100644
index 0225681..0000000
--- a/home/hosts/lxc/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  # No Special Home
-}
diff --git a/home/hosts/proxy/default.nix b/home/hosts/proxy/default.nix
deleted file mode 100644
index 0225681..0000000
--- a/home/hosts/proxy/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  # No Special Home
-}
diff --git a/home/users/toph/config/theme/default.nix b/home/users/toph/config/theme/default.nix
index bb7a267..04ca253 100644
--- a/home/users/toph/config/theme/default.nix
+++ b/home/users/toph/config/theme/default.nix
@@ -5,6 +5,8 @@
   ...
 }:
 let
+  isServer = hostSpec.isServer or false;
+
   qogir = pkgs.qogir-icon-theme.override {
     colorVariants = [
       "dark"
@@ -14,9 +16,8 @@ let
       "ubuntu"
     ];
   };
-
 in
-{
+lib.mkIf (!isServer) {
   imports = [
     inputs.stylix.homeManagerModules.stylix
   ];
diff --git a/hosts/global/core/user.nix b/hosts/global/core/user.nix
index bd1d9b0..00999fb 100644
--- a/hosts/global/core/user.nix
+++ b/hosts/global/core/user.nix
@@ -71,32 +71,37 @@ in
   };
 }
 // lib.optionalAttrs (inputs ? "home-manager") {
-  # Setup root home?
-  home-manager.users.root = lib.optionalAttrs (!isMinimal) {
-    home.stateVersion = "24.05"; # Avoid error
-  };
-
   # Set up home-manager for the configured user
   home-manager = {
     extraSpecialArgs = {
       inherit pkgs inputs;
       inherit (config) secretsSpec hostSpec;
     };
-    users.${username} = lib.optionalAttrs (!isMinimal) {
-      imports = [
-        (
-          { config, ... }:
-          import (lib.custom.relativeToRoot "home/users/${username}") {
-            inherit
-              config
-              hostSpec
-              inputs
-              lib
-              pkgs
-              ;
-          }
-        )
-      ];
+    users = {
+      root.home.stateVersion = "24.05"; # Avoid error
+      ${username} = {
+        imports = [
+          (
+            { config, ... }:
+            import
+              (
+                if isMinimal then
+                  lib.custom.relativeToRoot "home/global/core"
+                else
+                  lib.custom.relativeToRoot "home/users/${username}"
+              )
+              {
+                inherit
+                  config
+                  hostSpec
+                  inputs
+                  lib
+                  pkgs
+                  ;
+              }
+          )
+        ];
+      };
     };
   };
 }
diff --git a/hosts/nixos/cloud/default.nix b/hosts/nixos/cloud/default.nix
index 0b59420..867e5c8 100644
--- a/hosts/nixos/cloud/default.nix
+++ b/hosts/nixos/cloud/default.nix
@@ -45,6 +45,7 @@ in
     handle = user.handle;
     userFullName = user.fullName;
     isServer = true;
+    isMinimal = true;
   };
 
   networking = {
diff --git a/hosts/nixos/komodo/default.nix b/hosts/nixos/komodo/default.nix
index 9a6bfc3..04a4340 100644
--- a/hosts/nixos/komodo/default.nix
+++ b/hosts/nixos/komodo/default.nix
@@ -45,6 +45,7 @@ in
     handle = user.handle;
     userFullName = user.fullName;
     isServer = true;
+    isMinimal = true;
   };
 
   networking = {
diff --git a/hosts/nixos/komodo/hardware.nix b/hosts/nixos/komodo/hardware.nix
index 2390f31..376eed7 100644
--- a/hosts/nixos/komodo/hardware.nix
+++ b/hosts/nixos/komodo/hardware.nix
@@ -9,4 +9,10 @@
       "hosts/global/common/system/pool.nix"
     ])
   ];
+
+  ## Easy links, I use this dirs more often in this host
+  systemd.user.tmpfiles.rules = [
+    "L+ %h/Pool - - - - /pool"
+    "L+ %h/DockerStorage - - - - /mnt/DockerStorage"
+  ];
 }
diff --git a/hosts/nixos/lxc/default.nix b/hosts/nixos/lxc/default.nix
index 0fc951c..212e901 100644
--- a/hosts/nixos/lxc/default.nix
+++ b/hosts/nixos/lxc/default.nix
@@ -38,6 +38,7 @@ in
     handle = user.handle;
     userFullName = user.fullName;
     isServer = true;
+    isMinimal = true;
   };
 
   networking = {
diff --git a/hosts/nixos/proxy/default.nix b/hosts/nixos/proxy/default.nix
index d0bfc73..0008e6d 100644
--- a/hosts/nixos/proxy/default.nix
+++ b/hosts/nixos/proxy/default.nix
@@ -46,6 +46,7 @@ in
     handle = user.handle;
     userFullName = user.fullName;
     isServer = true;
+    isMinimal = true;
   };
 
   networking = {