diff --git a/nixos/home-manager/northstar-xenia.nix b/nixos/home-manager/northstar-xenia.nix
index d4f1087b..adf62dd7 100644
--- a/nixos/home-manager/northstar-xenia.nix
+++ b/nixos/home-manager/northstar-xenia.nix
@@ -1,8 +1,12 @@
 { ... }: {
   imports = [
-    ./common.nix
-    ./packages
-    ./packages/gui
+    ./env/sway.nix
+    ./packages/env
+    ./packages/tui
+    ./packages/gui/browser.nix
+    ./packages/gui/dunst.nix
+    ./packages/gui/foot.nix
+    ./packages/gui/kitty.nix
   ];
   # Home Manager needs a bit of information about you and the
   # paths it should manage.
diff --git a/nixos/home-manager/packages/common.nix b/nixos/home-manager/packages/common.nix
new file mode 100644
index 00000000..e8587d0d
--- /dev/null
+++ b/nixos/home-manager/packages/common.nix
@@ -0,0 +1,52 @@
+{ ... }:
+
+{
+  imports = [ ../common.nix ];
+  programs.ssh = {
+    enable = true;
+    includes = [ "config.d/*" ];
+    forwardAgent = true;
+    serverAliveInterval = 15;
+    serverAliveCountMax = 3;
+    controlMaster = "auto";
+    controlPersist = "5s";
+  };
+  programs.keychain = {
+    enable = true;
+    enableBashIntegration = true;
+    enableZshIntegration = true;
+    enableFishIntegration = true;
+    enableXsessionIntegration = true;
+    extraFlags = [
+      "--quiet"
+      "--ignore-missing"
+    ];
+    keys = [
+      "id_rsa"
+      "id_ed25519"
+    ];
+  };
+  programs.git = {
+    enable = true;
+    userName = "Evie Litherland-Smith";
+    delta.enable = true;
+    extraConfig = {
+      pull = {
+        rebase = false;
+      };
+    };
+  };
+  programs.starship = {
+    enable = true;
+    enableBashIntegration = true;
+    enableZshIntegration = true;
+    enableFishIntegration = true;
+    settings = builtins.fromTOML (builtins.readFile ./config/starship.toml);
+  };
+  programs.direnv = {
+    enable = true;
+    #enableBashIntegration = true;
+    #enableZshIntegration = true;
+    #enableFishIntegration = true;
+  };
+}
diff --git a/nixos/home-manager/packages/default.nix b/nixos/home-manager/packages/default.nix
index 37378aae..755a0712 100644
--- a/nixos/home-manager/packages/default.nix
+++ b/nixos/home-manager/packages/default.nix
@@ -1,55 +1,8 @@
 { ... }:
-
 {
   imports = [
     ./env
+    ./gui
     ./tui
   ];
-  programs.ssh = {
-    enable = true;
-    includes = [ "config.d/*" ];
-    forwardAgent = true;
-    serverAliveInterval = 15;
-    serverAliveCountMax = 3;
-    controlMaster = "auto";
-    controlPersist = "5s";
-  };
-  programs.keychain = {
-    enable = true;
-    enableBashIntegration = true;
-    enableZshIntegration = true;
-    enableFishIntegration = true;
-    enableXsessionIntegration = true;
-    extraFlags = [
-      "--quiet"
-      "--ignore-missing"
-    ];
-    keys = [
-      "id_rsa"
-      "id_ed25519"
-    ];
-  };
-  programs.git = {
-    enable = true;
-    userName = "Evie Litherland-Smith";
-    delta.enable = true;
-    extraConfig = {
-      pull = {
-        rebase = false;
-      };
-    };
-  };
-  programs.starship = {
-    enable = true;
-    enableBashIntegration = true;
-    enableZshIntegration = true;
-    enableFishIntegration = true;
-    settings = builtins.fromTOML (builtins.readFile ./config/starship.toml);
-  };
-  programs.direnv = {
-    enable = true;
-    #enableBashIntegration = true;
-    #enableZshIntegration = true;
-    #enableFishIntegration = true;
-  };
 }
diff --git a/nixos/home-manager/packages/env/bash.nix b/nixos/home-manager/packages/env/bash.nix
index 8e7df86c..cecba2cf 100644
--- a/nixos/home-manager/packages/env/bash.nix
+++ b/nixos/home-manager/packages/env/bash.nix
@@ -1,5 +1,6 @@
 { ... }:
 
 {
+  imports = [ ./common.nix ];
   programs.bash.enable = true;
 }
diff --git a/nixos/home-manager/packages/env/common.nix b/nixos/home-manager/packages/env/common.nix
new file mode 100644
index 00000000..afae92e4
--- /dev/null
+++ b/nixos/home-manager/packages/env/common.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+  imports = [ ../common.nix ];
+}
diff --git a/nixos/home-manager/packages/env/fish.nix b/nixos/home-manager/packages/env/fish.nix
index eadfe16d..39597f61 100644
--- a/nixos/home-manager/packages/env/fish.nix
+++ b/nixos/home-manager/packages/env/fish.nix
@@ -1,6 +1,7 @@
 { ... }:
 
 {
+  imports = [ ./common.nix ];
   programs.fish = {
     enable = true;
     shellAbbrs = {
diff --git a/nixos/home-manager/packages/env/qemu.nix b/nixos/home-manager/packages/env/qemu.nix
index 568212a5..5c36382a 100644
--- a/nixos/home-manager/packages/env/qemu.nix
+++ b/nixos/home-manager/packages/env/qemu.nix
@@ -1,7 +1,6 @@
 { pkgs, ... }:
 
 {
-  home.packages = with pkgs; [
-    qemu
-  ];
+  imports = [ ./common.nix ];
+  home.packages = with pkgs; [ qemu ];
 }
diff --git a/nixos/home-manager/packages/env/zsh.nix b/nixos/home-manager/packages/env/zsh.nix
index 9c5dd48c..da514e18 100644
--- a/nixos/home-manager/packages/env/zsh.nix
+++ b/nixos/home-manager/packages/env/zsh.nix
@@ -1,6 +1,7 @@
 { config, ... }:
 
 {
+  imports = [ ./common.nix ];
   programs.zsh = {
     enable = true;
     shellAliases = {
diff --git a/nixos/home-manager/packages/gui/browser.nix b/nixos/home-manager/packages/gui/browser.nix
new file mode 100644
index 00000000..13d43a03
--- /dev/null
+++ b/nixos/home-manager/packages/gui/browser.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }:
+{
+  imports = [ ./common.nix ];
+  home.packages = with pkgs; [ firefox ];
+}
diff --git a/nixos/home-manager/packages/gui/cloud.nix b/nixos/home-manager/packages/gui/cloud.nix
index 684bb07e..2de1cc37 100644
--- a/nixos/home-manager/packages/gui/cloud.nix
+++ b/nixos/home-manager/packages/gui/cloud.nix
@@ -1,11 +1,13 @@
 { pkgs, ... }:
 
 {
+  imports = [ ./common.nix ];
   #services.nextcloud-client = {
   #  enable = true;
   #  startInBackground = true;
   #};
   home.packages = with pkgs; [
+    bitwarden
     zotero
   ];
 }
diff --git a/nixos/home-manager/packages/gui/common.nix b/nixos/home-manager/packages/gui/common.nix
new file mode 100644
index 00000000..afae92e4
--- /dev/null
+++ b/nixos/home-manager/packages/gui/common.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+  imports = [ ../common.nix ];
+}
diff --git a/nixos/home-manager/packages/gui/default.nix b/nixos/home-manager/packages/gui/default.nix
index 4ee7b559..bbb2a7f1 100644
--- a/nixos/home-manager/packages/gui/default.nix
+++ b/nixos/home-manager/packages/gui/default.nix
@@ -2,12 +2,15 @@
 
 {
   imports = [
+    ./browser.nix
+    ./cloud.nix
     ./dunst.nix
+    ./foot.nix
+    ./gaming.nix
     ./kitty.nix
     ./foot.nix
-  ];
-  home.packages = with pkgs; [
-    firefox
-    # bitwarden
+    ./messaging.nix
+    ./nomachine.nix
+    ./ukaea.nix
   ];
 }
diff --git a/nixos/home-manager/packages/gui/dunst.nix b/nixos/home-manager/packages/gui/dunst.nix
index a12b4f81..0d1085ba 100644
--- a/nixos/home-manager/packages/gui/dunst.nix
+++ b/nixos/home-manager/packages/gui/dunst.nix
@@ -1,5 +1,6 @@
 { ... }:
 {
+  imports = [ ./common.nix ];
   services.dunst = {
     enable = true;
     settings = {
diff --git a/nixos/home-manager/packages/gui/foot.nix b/nixos/home-manager/packages/gui/foot.nix
index 99a24577..6101e73d 100644
--- a/nixos/home-manager/packages/gui/foot.nix
+++ b/nixos/home-manager/packages/gui/foot.nix
@@ -1,5 +1,6 @@
 { ... }:
 {
+  imports = [ ./common.nix ];
   fonts.fontconfig.enable = true;
   programs.foot = {
     enable = true;
diff --git a/nixos/home-manager/packages/gui/gaming.nix b/nixos/home-manager/packages/gui/gaming.nix
index bd9e35b6..1f9e23bb 100644
--- a/nixos/home-manager/packages/gui/gaming.nix
+++ b/nixos/home-manager/packages/gui/gaming.nix
@@ -1,6 +1,7 @@
 { pkgs, ... }:
 
 {
+  imports = [ ./common.nix ];
   home.packages = with pkgs; [
     mesa
     steam
diff --git a/nixos/home-manager/packages/gui/kitty.nix b/nixos/home-manager/packages/gui/kitty.nix
index 9e297f7d..e50c6f59 100644
--- a/nixos/home-manager/packages/gui/kitty.nix
+++ b/nixos/home-manager/packages/gui/kitty.nix
@@ -1,6 +1,7 @@
 { pkgs, ... }:
 
 {
+  imports = [ ./common.nix ];
   programs.kitty = {
     enable = true;
     font = {
diff --git a/nixos/home-manager/packages/gui/messaging.nix b/nixos/home-manager/packages/gui/messaging.nix
index 816dd210..edc2335a 100644
--- a/nixos/home-manager/packages/gui/messaging.nix
+++ b/nixos/home-manager/packages/gui/messaging.nix
@@ -1,6 +1,7 @@
 { pkgs, ... }:
 
 {
+  imports = [ ./common.nix ];
   home.packages = with pkgs; [
     signal-desktop
     element-desktop
diff --git a/nixos/home-manager/packages/gui/nomachine.nix b/nixos/home-manager/packages/gui/nomachine.nix
index 07d37059..9867faf1 100644
--- a/nixos/home-manager/packages/gui/nomachine.nix
+++ b/nixos/home-manager/packages/gui/nomachine.nix
@@ -1,6 +1,7 @@
 { config, pkgs, ... }:
 
 {
+  imports = [ ./common.nix ];
   home.packages = with pkgs; [
     nomachine-client
   ];
diff --git a/nixos/home-manager/packages/gui/ukaea.nix b/nixos/home-manager/packages/gui/ukaea.nix
index 2733164d..68cef783 100644
--- a/nixos/home-manager/packages/gui/ukaea.nix
+++ b/nixos/home-manager/packages/gui/ukaea.nix
@@ -1,6 +1,7 @@
 { pkgs, ... }:
 
 {
+  imports = [ ./common.nix ];
   home.packages = with pkgs; [
     teams
     zoom-us
diff --git a/nixos/home-manager/packages/gui/zotero.nix b/nixos/home-manager/packages/gui/zotero.nix
deleted file mode 100644
index f49b26fb..00000000
--- a/nixos/home-manager/packages/gui/zotero.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ pkgs, ... }:
-
-{
-  home.packages = with pkgs; [
-    zotero
-  ];
-}
diff --git a/nixos/home-manager/packages/tui/common.nix b/nixos/home-manager/packages/tui/common.nix
new file mode 100644
index 00000000..d2035d40
--- /dev/null
+++ b/nixos/home-manager/packages/tui/common.nix
@@ -0,0 +1,33 @@
+{ pkgs, ... }:
+
+{
+  imports = [ ../common.nix ];
+  programs.neovim.defaultEditor = true;
+  programs.bat = {
+    enable = true;
+    config = {
+      theme = "Catppuccin-macchiato";
+    };
+    themes = {
+      Catppuccin-macchiato = builtins.readFile (pkgs.fetchFromGitHub
+        {
+          owner = "catppuccin";
+          repo = "bat";
+          rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
+          sha256 = "6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
+        } + "/Catppuccin-macchiato.tmTheme");
+    };
+  };
+  home.packages = with pkgs; [
+    fira-code
+    iosevka
+    (nerdfonts.override {
+      fonts = [
+        "FiraCode"
+        "Iosevka"
+      ];
+    })
+    file
+    silver-searcher
+  ];
+}
diff --git a/nixos/home-manager/packages/tui/default.nix b/nixos/home-manager/packages/tui/default.nix
index eb0f9b1f..1bf1de6c 100644
--- a/nixos/home-manager/packages/tui/default.nix
+++ b/nixos/home-manager/packages/tui/default.nix
@@ -1,37 +1,8 @@
-{ pkgs, ... }:
-
+{ ... }:
 {
   imports = [
-    ./tmux.nix
-    ./neovim.nix
     ./lazygit.nix
-  ];
-  programs.neovim.defaultEditor = true;
-  programs.bat = {
-    enable = true;
-    config = {
-      theme = "Catppuccin-macchiato";
-    };
-    themes = {
-      Catppuccin-macchiato = builtins.readFile (pkgs.fetchFromGitHub
-        {
-          owner = "catppuccin";
-          repo = "bat";
-          rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
-          sha256 = "6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
-        } + "/Catppuccin-macchiato.tmTheme");
-    };
-  };
-  home.packages = with pkgs; [
-    fira-code
-    iosevka
-    (nerdfonts.override {
-      fonts = [
-        "FiraCode"
-        "Iosevka"
-      ];
-    })
-    file
-    silver-searcher
+    ./neovim.nix
+    ./tmux.nix
   ];
 }
diff --git a/nixos/home-manager/packages/tui/lazygit.nix b/nixos/home-manager/packages/tui/lazygit.nix
index 3747bb17..c38e3ce1 100644
--- a/nixos/home-manager/packages/tui/lazygit.nix
+++ b/nixos/home-manager/packages/tui/lazygit.nix
@@ -1,6 +1,7 @@
 { ... }:
 
 {
+  imports = [ ./common.nix ];
   programs.lazygit = {
     enable = true;
     settings = import ./config/lazygit.nix;
diff --git a/nixos/home-manager/packages/tui/neovim.nix b/nixos/home-manager/packages/tui/neovim.nix
index 275379c2..4d1d48b9 100644
--- a/nixos/home-manager/packages/tui/neovim.nix
+++ b/nixos/home-manager/packages/tui/neovim.nix
@@ -1,6 +1,7 @@
 { pkgs, ... }:
 
 {
+  imports = [ ./common.nix ];
   programs.neovim = {
     enable = true;
     defaultEditor = true;
diff --git a/nixos/home-manager/packages/tui/tmux.nix b/nixos/home-manager/packages/tui/tmux.nix
index d63d63ce..2e68cc55 100644
--- a/nixos/home-manager/packages/tui/tmux.nix
+++ b/nixos/home-manager/packages/tui/tmux.nix
@@ -1,15 +1,17 @@
 { pkgs, ... }:
 {
+  imports = [ ./common.nix ];
   programs.tmux = {
     enable = true;
     clock24 = true;
     extraConfig = builtins.readFile (./config/tmux.conf) + "\n" + builtins.readFile (
-      pkgs.fetchFromGitHub {
-        owner = "catppuccin";
-        repo = "tmux";
-        rev = "4e48b09a76829edc7b55fbb15467cf0411f07931";
-        sha256 = "bXEsxt4ozl3cAzV3ZyvbPsnmy0RAdpLxHwN82gvjLdU=";
-      } + "/catppuccin-macchiato.tmuxtheme"
+      pkgs.fetchFromGitHub
+        {
+          owner = "catppuccin";
+          repo = "tmux";
+          rev = "4e48b09a76829edc7b55fbb15467cf0411f07931";
+          sha256 = "bXEsxt4ozl3cAzV3ZyvbPsnmy0RAdpLxHwN82gvjLdU=";
+        } + "/catppuccin-macchiato.tmuxtheme"
     );
   };
 }
diff --git a/nixos/home-manager/ukaea-elitherl.nix b/nixos/home-manager/ukaea-elitherl.nix
index ffed84ea..3815097c 100644
--- a/nixos/home-manager/ukaea-elitherl.nix
+++ b/nixos/home-manager/ukaea-elitherl.nix
@@ -1,12 +1,17 @@
 { ... }: {
   imports = [
-    ./common.nix
-    ./env
     ./env/hyprland.nix
-    ./packages
-    ./packages/gui
-    ./packages/gui/ukaea.nix
+    ./env/sway.nix
+    ./packages/env
+    ./packages/tui
+    ./packages/gui/browser.nix
+    ./packages/gui/cloud.nix
+    ./packages/gui/dunst.nix
+    ./packages/gui/foot.nix
+    ./packages/gui/kitty.nix
+    ./packages/gui/messaging.nix
     ./packages/gui/nomachine.nix
+    ./packages/gui/ukaea.nix
   ];
   # Home Manager needs a bit of information about you and the
   # paths it should manage.
diff --git a/nixos/home-manager/vanguard-xenia.nix b/nixos/home-manager/vanguard-xenia.nix
index ca5ecec1..1c18389f 100644
--- a/nixos/home-manager/vanguard-xenia.nix
+++ b/nixos/home-manager/vanguard-xenia.nix
@@ -1,10 +1,15 @@
 { pkgs, ... }: {
   imports = [
-    ./common.nix
-    ./env
-    ./packages
-    ./packages/gui
+    ./env/hyprland.nix
+    ./packages/env
+    ./packages/tui
+    ./packages/gui/browser.nix
+    ./packages/gui/cloud.nix
+    ./packages/gui/dunst.nix
+    ./packages/gui/foot.nix
     ./packages/gui/gaming.nix
+    ./packages/gui/kitty.nix
+    ./packages/gui/messaging.nix
     ./packages/gui/nomachine.nix
   ];
   # Home Manager needs a bit of information about you and the