diff --git a/modules/users/nathan/home-manager/default.nix b/modules/users/nathan/home-manager/default.nix
index 5256132..ad70352 100644
--- a/modules/users/nathan/home-manager/default.nix
+++ b/modules/users/nathan/home-manager/default.nix
@@ -1,9 +1,15 @@
-{ inputs, ... }: {
+{ self, inputs, ... }: {
 
     flake.homeModules.nathan = { config, lib, pkgs, ... }: {
 
-        imports = [
+        imports = with self.homeModules; [
             inputs.sops-nix.homeManagerModules.sops
+
+
+            nathan-terminal
+            nathan-mpd
+            nathan-nh
+            nathan-pywal
         ];
 
         config = {
diff --git a/modules/users/nathan/home-manager/features/bash.nix b/modules/users/nathan/home-manager/features/bash.nix
index 5be8a62..749f82f 100644
--- a/modules/users/nathan/home-manager/features/bash.nix
+++ b/modules/users/nathan/home-manager/features/bash.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.homeModules.nathan-bash = { config, lib, pkgs, ... }: {
+    flake.homeModules.nathan-terminal = { config, lib, pkgs, ... }: {
 
         home.packages = with pkgs; [ oh-my-posh ];
 
diff --git a/modules/users/nathan/home-manager/features/bat.nix b/modules/users/nathan/home-manager/features/bat.nix
index 50bc1d4..4963fad 100644
--- a/modules/users/nathan/home-manager/features/bat.nix
+++ b/modules/users/nathan/home-manager/features/bat.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.homeModules.nathan-bat = { config, lib, pkgs, ... }: {
+    flake.homeModules.nathan-terminal = { config, lib, pkgs, ... }: {
 
         programs.bat = {
 
diff --git a/modules/users/nathan/home-manager/features/calcurse.nix b/modules/users/nathan/home-manager/features/calcurse.nix
index 3ed474b..113192a 100644
--- a/modules/users/nathan/home-manager/features/calcurse.nix
+++ b/modules/users/nathan/home-manager/features/calcurse.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.homeModules.nathan-calcurse = { config, lib, pkgs, ... }: {
+    flake.homeModules.nathan-terminal = { config, lib, pkgs, ... }: {
 
         config = {
             home.packages = with pkgs; [
diff --git a/modules/users/nathan/home-manager/features/eza.nix b/modules/users/nathan/home-manager/features/eza.nix
index 49270e0..126f47d 100644
--- a/modules/users/nathan/home-manager/features/eza.nix
+++ b/modules/users/nathan/home-manager/features/eza.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.homeModules.nathan-eza = { config, lib, pkgs, ... }: {
+    flake.homeModules.nathan-terminal = { config, lib, pkgs, ... }: {
 
         programs.eza = {
 
diff --git a/modules/users/nathan/home-manager/features/fzf.nix b/modules/users/nathan/home-manager/features/fzf.nix
index 89404e4..9439614 100644
--- a/modules/users/nathan/home-manager/features/fzf.nix
+++ b/modules/users/nathan/home-manager/features/fzf.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.homeModules.nathan-fzf = { config, lib, pkgs, ... }: {
+    flake.homeModules.nathan-terminal = { config, lib, pkgs, ... }: {
 
         programs.fzf = {
 
diff --git a/modules/users/nathan/home-manager/features/git.nix b/modules/users/nathan/home-manager/features/git.nix
index d45faf5..d3f2ff8 100644
--- a/modules/users/nathan/home-manager/features/git.nix
+++ b/modules/users/nathan/home-manager/features/git.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.homeModules.nathan-git = { config, lib, ... }: {
+    flake.homeModules.nathan-terminal = { config, lib, ... }: {
 
         config = {
 
diff --git a/modules/users/nathan/home-manager/features/ohmyposh.nix b/modules/users/nathan/home-manager/features/ohmyposh.nix
index 39a0245..73ba90e 100644
--- a/modules/users/nathan/home-manager/features/ohmyposh.nix
+++ b/modules/users/nathan/home-manager/features/ohmyposh.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.homeModules.nathan-ohmyposh = { config, lib, pkgs, ... }: {
+    flake.homeModules.nathan-terminal = { config, lib, pkgs, ... }: {
 
         home.packages = with pkgs; [
             oh-my-posh
diff --git a/modules/users/nathan/home-manager/features/opencode.nix b/modules/users/nathan/home-manager/features/opencode.nix
index 62591e8..4b19de7 100644
--- a/modules/users/nathan/home-manager/features/opencode.nix
+++ b/modules/users/nathan/home-manager/features/opencode.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.homeModules.nathan-opencode = { config, lib, ... }: {
+    flake.homeModules.nathan-terminal = { config, lib, ... }: {
 
         config = {
 
diff --git a/modules/users/nathan/home-manager/features/ripgrep.nix b/modules/users/nathan/home-manager/features/ripgrep.nix
index 9c4a6c2..d291fb5 100644
--- a/modules/users/nathan/home-manager/features/ripgrep.nix
+++ b/modules/users/nathan/home-manager/features/ripgrep.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.homeModules.nathan-ripgrep = { ... }: {
+    flake.homeModules.nathan-terminal = { ... }: {
 
         programs.ripgrep = {
             enable = true;
diff --git a/modules/users/nathan/home-manager/features/ssh.nix b/modules/users/nathan/home-manager/features/ssh.nix
index 7aa09e4..e149ded 100644
--- a/modules/users/nathan/home-manager/features/ssh.nix
+++ b/modules/users/nathan/home-manager/features/ssh.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.homeModules.nathan-ssh = { ... }: {
+    flake.homeModules.nathan-terminal = { ... }: {
 
         programs.ssh = {
 
diff --git a/modules/users/nathan/home-manager/features/tmux.nix b/modules/users/nathan/home-manager/features/tmux.nix
index 1f1828b..7ad89eb 100644
--- a/modules/users/nathan/home-manager/features/tmux.nix
+++ b/modules/users/nathan/home-manager/features/tmux.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.homeModules.nathan-tmux = { config, lib, pkgs, ... }: {
+    flake.homeModules.nathan-terminal = { config, lib, pkgs, ... }: {
 
         programs.tmux = {
 
diff --git a/modules/users/nathan/home-manager/features/yazi.nix b/modules/users/nathan/home-manager/features/yazi.nix
index 39e9bc2..b26f054 100644
--- a/modules/users/nathan/home-manager/features/yazi.nix
+++ b/modules/users/nathan/home-manager/features/yazi.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.homeModules.nathan-yazi = { ... }: {
+    flake.homeModules.nathan-terminal = { ... }: {
         config = {
             programs.yazi = {
                 enable = true;
diff --git a/modules/users/nathan/home-manager/features/zoxide.nix b/modules/users/nathan/home-manager/features/zoxide.nix
index 5169443..c2aa8ed 100644
--- a/modules/users/nathan/home-manager/features/zoxide.nix
+++ b/modules/users/nathan/home-manager/features/zoxide.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.homeModules.nathan-zoxide = { ... }: {
+    flake.homeModules.nathan-terminal = { ... }: {
 
         programs.zoxide = {
 
diff --git a/modules/users/nathan/home-manager/features/zsh.nix b/modules/users/nathan/home-manager/features/zsh.nix
index 321d2f2..5efa224 100644
--- a/modules/users/nathan/home-manager/features/zsh.nix
+++ b/modules/users/nathan/home-manager/features/zsh.nix
@@ -1,6 +1,6 @@
 { ... }: {
 
-    flake.homeModules.nathan-zsh = { lib, ... }: {
+    flake.homeModules.nathan-terminal = { lib, ... }: {
 
         programs.zsh = {
 
diff --git a/modules/users/nathan/nathan.nix b/modules/users/nathan/nathan.nix
index 002cb7d..9be6116 100644
--- a/modules/users/nathan/nathan.nix
+++ b/modules/users/nathan/nathan.nix
@@ -21,10 +21,21 @@
 
             };
 
-            home-manager.users.nathan = lib.mkMerge [
+            home-manager.users.nathan = with self.homeModules; let
+                laptop = [ "laptop" ];
+                #homebox = [ "homebox" ];
+                #both = laptop ++ homebox;
+                useWith = x: y: (lib.mkIf (builtins.any (z: z == config.networking.hostName) x) y);
+            in lib.mkMerge [
                 self.homeModules.nathan
+                (useWith laptop nathan-aurora)
+                (useWith laptop nathan-firefox)
+                (useWith laptop nathan-rofi)
+                (useWith laptop nathan-hypridle)
+                (useWith laptop nathan-hyprland)
+                (useWith laptop nathan-kitty)
                 
-                (lib.mkIf (config.networking.hostName == "laptop") {
+                (useWith laptop {
                     wayland.windowManager.hyprland.extraConfig = ''
                         monitor=eDP-1,1920x1080@60,0x0,1
                         bind = CTRL SHIFT, XF86Launch2, exec, bash -c 'if [[ $(hyprctl monitors | grep 0x0 | sed -n -e "s/\t*1920x1080@//" -e "s/.[1234567890]* at 0x0//p") == 300 ]]; then pkexec --user root /nix/var/nix/profiles/system/bin/switch-to-configuration switch; else pkexec --user root /nix/var/nix/profiles/system/specialisation/docked/bin/switch-to-configuration switch; fi'
@@ -35,7 +46,7 @@
         };
     };
 
-    flake.homeModules.nathan = { lib, ... }:
+    flake.homeModules.nathan-standalone = { lib, ... }:
 
     {