diff --git a/flake.nix b/flake.nix
index e891b79..b139ee8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -47,7 +47,7 @@
             ./modules/themeing
             ./modules/programs
           ];
-          home-manager.users.lucy = ./modules/home/default.nix;
+          home-manager.users.lucy = ./modules/hosts/base/home.nix;
         }
       ];
     in
diff --git a/modules/home/default.nix b/modules/home/default.nix
deleted file mode 100644
index 3a94fca..0000000
--- a/modules/home/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  imports = [
-    ./home.nix
-    ./gtk.nix
-    ./services.nix
-  ];
-}
diff --git a/modules/home/gtk.nix b/modules/home/gtk.nix
deleted file mode 100644
index 4158304..0000000
--- a/modules/home/gtk.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ pkgs, config, inputs, ... }: {
-  gtk = {
-    enable = true;
-    colorScheme = "dark";
-    theme = {
-      name = "adw-gtk3-dark";
-      package = pkgs.adw-gtk3;
-    };
-    iconTheme = {
-      name = "Papirus-Dark";
-      package = pkgs.papirus-icon-theme;
-    };
-    font = {
-      name = config.theming.font;
-      package = config.theming.fontPackage;
-      size = 12;
-    };
-    cursorTheme.name = "macOS";
-    cursorTheme.size = 24;
-    gtk3.extraCss = builtins.readFile (config.scheme inputs.tt-gtk);
-    gtk4.extraCss = builtins.readFile (config.scheme inputs.tt-gtk);
-
-  };
-}
diff --git a/modules/home/home.nix b/modules/home/home.nix
deleted file mode 100644
index 463f64c..0000000
--- a/modules/home/home.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  pkgs,
-  ...
-}:
-{
-  home.packages = with pkgs; [
-    nixd
-    nixfmt
-    clang
-    kdePackages.qtdeclarative
-  ];
-  home.stateVersion = "26.05";
-  home.pointerCursor = {
-    enable = true;
-    name = "macOS";
-    package = pkgs.apple-cursor;
-    size = 24;
-  };
-}
diff --git a/modules/home/services.nix b/modules/home/services.nix
deleted file mode 100644
index 843453a..0000000
--- a/modules/home/services.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ pkgs, config, ... }: {
-  services.syncthing = {
-    enable = true;
-    settings = {
-      devices = {
-        cyberia = {
-          id = "OOJBAJU-AAIKLHO-BKMMHBU-2NXE75Z-HE64A6V-LET4ZXB-Q2FT2Y4-GZON3AD";
-        };
-      };
-    };
-  };
-  services.polkit-gnome.enable = true; 
-  dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
-}
diff --git a/modules/hosts/base/home.nix b/modules/hosts/base/home.nix
new file mode 100644
index 0000000..dcf777e
--- /dev/null
+++ b/modules/hosts/base/home.nix
@@ -0,0 +1,59 @@
+{
+  inputs,
+  pkgs,
+  config,
+  ...
+}:
+let
+  c = config.scheme.withHashtag;
+in
+{
+  home.packages = with pkgs; [
+    nixd
+    nixfmt
+    clang
+    kdePackages.qtdeclarative
+  ];
+
+  home.stateVersion = "26.05";
+  home.pointerCursor = {
+    enable = true;
+    name = "macOS";
+    package = pkgs.apple-cursor;
+    size = 24;
+  };
+  services.syncthing = {
+    enable = true;
+    settings = {
+      devices = {
+        cyberia = {
+          id = "OOJBAJU-AAIKLHO-BKMMHBU-2NXE75Z-HE64A6V-LET4ZXB-Q2FT2Y4-GZON3AD";
+        };
+      };
+    };
+  };
+  gtk = {
+    enable = true;
+    colorScheme = "dark";
+    theme = {
+      name = "adw-gtk3-dark";
+      package = pkgs.adw-gtk3;
+    };
+    iconTheme = {
+      name = "Papirus-Dark";
+      package = pkgs.papirus-icon-theme;
+    };
+    font = {
+      name = config.theming.font;
+      package = config.theming.fontPackage;
+      size = 12;
+    };
+    cursorTheme.name = "macOS";
+    cursorTheme.size = 24;
+    gtk3.extraCss = builtins.readFile (config.scheme inputs.tt-gtk);
+    gtk4.extraCss = builtins.readFile (config.scheme inputs.tt-gtk);
+
+  };
+  services.polkit-gnome.enable = true; # polkit
+  dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
+}
diff --git a/modules/programs/.#niri.nix b/modules/programs/.#niri.nix
deleted file mode 120000
index 5689a4e..0000000
--- a/modules/programs/.#niri.nix
+++ /dev/null
@@ -1 +0,0 @@
-lucy@nerv.4230:1788254438
\ No newline at end of file
diff --git a/modules/programs/nixcord.nix b/modules/programs/nixcord.nix
index 8b163c0..fc1ff36 100644
--- a/modules/programs/nixcord.nix
+++ b/modules/programs/nixcord.nix
@@ -7,7 +7,6 @@
 {
   imports = [ inputs.nixcord.homeModules.nixcord ];
   programs.nixcord = {
-    discord.silenceNoModClientWarning = true;
     enable = true;
     vesktop.enable = true;
     quickCss = builtins.readFile (config.scheme inputs.tt-discord);
diff --git a/modules/theming/default.nix b/modules/themeing/default.nix
similarity index 100%
rename from modules/theming/default.nix
rename to modules/themeing/default.nix