diff --git a/nixos/home/gui/browser/chromium-wayland.nix b/nixos/home/browser/chromium-wayland.nix
similarity index 100%
rename from nixos/home/gui/browser/chromium-wayland.nix
rename to nixos/home/browser/chromium-wayland.nix
diff --git a/nixos/home/gui/browser/chromium.nix b/nixos/home/browser/chromium.nix
similarity index 100%
rename from nixos/home/gui/browser/chromium.nix
rename to nixos/home/browser/chromium.nix
diff --git a/nixos/home/gui/browser/firefox.nix b/nixos/home/browser/firefox.nix
similarity index 100%
rename from nixos/home/gui/browser/firefox.nix
rename to nixos/home/browser/firefox.nix
diff --git a/nixos/home/browser/librewolf.nix b/nixos/home/browser/librewolf.nix
new file mode 100644
index 00000000..2e05bfff
--- /dev/null
+++ b/nixos/home/browser/librewolf.nix
@@ -0,0 +1,4 @@
+{ ... }:
+{
+  programs.librewolf.enable = true;
+}
diff --git a/nixos/home/collections/personal/default.nix b/nixos/home/collections/personal/default.nix
index bf530d35..88293d1b 100644
--- a/nixos/home/collections/personal/default.nix
+++ b/nixos/home/collections/personal/default.nix
@@ -1,9 +1,8 @@
-{ ... }:
+{ pkgs, ... }:
 {
   imports = [
-    ../../desktop
+    ../../browser/librewolf.nix
     ../../desktop/wayland/hyprland.nix
-
     ../../env/fonts/firacode.nix
     ../../env/shell/bash.nix
     ../../env/shell/fish.nix
@@ -13,20 +12,24 @@
     ../../env/nixpkgs.nix
     ../../env/ssh.nix
     ../../env/starship.nix
-
-    ../../git/personal
-
-    ../../gui/browser/chromium-wayland.nix
-    ../../gui/dev/neovide.nix
-    ../../gui/documents/zotero.nix
-    ../../gui/gaming/steam.nix
-    ../../gui/messaging/discord.nix
-    ../../gui/messaging/element.nix
-    ../../gui/messaging/signal.nix
-    ../../gui/security
-    ../../gui/terminal/foot.nix
-    ../../gui/terminal/wezterm.nix
-
-    ../../tui
+    ../../git/personal.nix
+    ../../terminal/foot.nix
+    ../../terminal/wezterm.nix
+    ../../tui/neovim.nix
+    ../../tui/lazygit.nix
+  ];
+  home.packages = with pkgs; [
+    bitwarden
+    file
+    marktext
+    mesa
+    neovide
+    nomachine-client
+    otpclient
+    silver-searcher
+    signal-desktop
+    steam
+    steam-run
+    zotero
   ];
 }
diff --git a/nixos/home/collections/work/default.nix b/nixos/home/collections/work/default.nix
index 1655862b..1566b1db 100644
--- a/nixos/home/collections/work/default.nix
+++ b/nixos/home/collections/work/default.nix
@@ -1,9 +1,8 @@
-{ ... }:
+{ pkgs, ... }:
 {
   imports = [
-    ../../desktop
+    ../../browser/librewolf.nix
     ../../desktop/wayland/hyprland.nix
-
     ../../env/fonts/firacode.nix
     ../../env/shell/bash.nix
     ../../env/shell/fish.nix
@@ -13,21 +12,24 @@
     ../../env/nixpkgs.nix
     ../../env/ssh.nix
     ../../env/starship.nix
-
-    ../../git/work
-
-    ../../gui/browser/chromium-wayland.nix
-    ../../gui/dev/neovide.nix
-    ../../gui/documents/libreoffice.nix
-    ../../gui/documents/marktext.nix
-    ../../gui/documents/zotero.nix
-    ../../gui/messaging/signal.nix
-    ../../gui/messaging/zoom.nix
-    ../../gui/remote/nomachine.nix
-    ../../gui/security
-    ../../gui/terminal/wezterm.nix
-    ../../gui/terminal/foot.nix
-
-    ../../tui
+    ../../git/work.nix
+    ../../terminal/wezterm.nix
+    ../../terminal/foot.nix
+    ../../tui/neovim.nix
+    ../../tui/lazygit.nix
+  ];
+  home.packages = with pkgs; [
+    bitwarden
+    file
+    libreoffice-fresh
+    marktext
+    neovide
+    nomachine-client
+    otpclient
+    silver-searcher
+    signal-desktop
+    teams
+    zoom-us
+    zotero
   ];
 }
diff --git a/nixos/home/desktop/default.nix b/nixos/home/desktop/default.nix
deleted file mode 100644
index 95a58fe9..00000000
--- a/nixos/home/desktop/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./common
-    ./wayland
-    ./xorg
-  ];
-}
diff --git a/nixos/home/desktop/wayland/common.nix b/nixos/home/desktop/wayland/common.nix
index b91f0142..89dcc27e 100644
--- a/nixos/home/desktop/wayland/common.nix
+++ b/nixos/home/desktop/wayland/common.nix
@@ -1,44 +1,8 @@
 { pkgs, ... }:
 {
-  imports = [
-    ../common/gtk.nix
-    ../common/dunst.nix
-    ../common/rofi.nix
-    ./waybar.nix
-  ];
   home.packages = with pkgs; [
     pipewire
     wireplumber
     wl-clipboard
-    swayimg
-    hyprpaper
-    dolphin
-    jq
-    socat
   ];
-  programs.swaylock = {
-    enable = true;
-    package = pkgs.swaylock-effects;
-    settings = {
-      screenshots = true;
-      clock = true;
-      indicator = true;
-      indicator-radius = 100;
-      indicator-thickness = 7;
-      effect-blur = "7x5";
-      effect-vignette = "0.5:0.5";
-      ring-color = "bb00cc";
-      key-hl-color = "00000000";
-      line-color = "00000088";
-      separator-color = "00000000";
-      grace = 2;
-      fade-in = 0.2;
-    };
-  };
-  programs.eww = {
-    enable = true;
-    package = pkgs.eww-wayland;
-    configDir = ./config/eww;
-  };
-  programs.rofi.package = pkgs.rofi-wayland;
 }
diff --git a/nixos/home/desktop/wayland/config/waybar/config-hyprland b/nixos/home/desktop/wayland/config/waybar/config-hyprland
index c11412a7..d91bfef9 100644
--- a/nixos/home/desktop/wayland/config/waybar/config-hyprland
+++ b/nixos/home/desktop/wayland/config/waybar/config-hyprland
@@ -8,8 +8,9 @@
         "all-outputs": true,
         "format": "{icon}",
         "format-icons": {
-            "1": "",
-            "2": "󰊯",
+            "1:Web": "",
+            "2:Term": "",
+            "3:Code": ""
             "3": "",
             "4": "",
             "5": "",
@@ -19,6 +20,15 @@
             "9": "",
             "urgent": "",
             "focused": "",
+            "default": "",
+            "1:web": "",
+            "2:code": "",
+            "3:term": "",
+            "4:work": "",
+            "5:music": "",
+            "6:docs": "",
+            "urgent": "",
+            "focused": "",
             "default": ""
         }
     },
diff --git a/nixos/home/desktop/wayland/default.nix b/nixos/home/desktop/wayland/default.nix
deleted file mode 100644
index fc8fff9c..00000000
--- a/nixos/home/desktop/wayland/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [ wl-clipboard ];
-}
diff --git a/nixos/home/desktop/wayland/eww.nix b/nixos/home/desktop/wayland/eww.nix
new file mode 100644
index 00000000..4febadb4
--- /dev/null
+++ b/nixos/home/desktop/wayland/eww.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    jq
+    socat
+  ];
+  programs.eww = {
+    enable = true;
+    package = pkgs.eww-wayland;
+    configDir = ./config/eww;
+  };
+}
diff --git a/nixos/home/desktop/wayland/hyprland.nix b/nixos/home/desktop/wayland/hyprland.nix
index 79fbb98b..f45aa06d 100644
--- a/nixos/home/desktop/wayland/hyprland.nix
+++ b/nixos/home/desktop/wayland/hyprland.nix
@@ -1,4 +1,4 @@
-{ ... }:
+{ pkgs, ... }:
 let
   flake-compat = builtins.fetchTarball "https://github.com/edolstra/flake-compat/archive/master.tar.gz";
 
@@ -10,13 +10,26 @@ in
   imports = [
     hyprland.homeManagerModules.default
     ./common.nix
+    ./swaylock.nix
+    ./eww.nix
+    ./waybar.nix
+    ../common/gtk.nix
+    ../common/dunst.nix
+    ../common/rofi.nix
+    ../xorg/xresources.nix
   ];
-
+  home.packages = with pkgs; [
+    swayimg
+    hyprpaper
+    dolphin
+  ];
+  programs.rofi.package = pkgs.rofi-wayland;
   xdg.configFile."hypr" = {
     source = ./config/hypr;
     # recursive = true;
     # text = "# test";
   };
+  xsession.enable = true;
   wayland.windowManager.hyprland = {
     enable = true;
     xwayland = {
diff --git a/nixos/home/desktop/wayland/swaylock.nix b/nixos/home/desktop/wayland/swaylock.nix
new file mode 100644
index 00000000..59b4c733
--- /dev/null
+++ b/nixos/home/desktop/wayland/swaylock.nix
@@ -0,0 +1,22 @@
+{ pkgs, ... }:
+{
+  programs.swaylock = {
+    enable = true;
+    package = pkgs.swaylock-effects;
+    settings = {
+      screenshots = true;
+      clock = true;
+      indicator = true;
+      indicator-radius = 100;
+      indicator-thickness = 7;
+      effect-blur = "7x5";
+      effect-vignette = "0.5:0.5";
+      ring-color = "bb00cc";
+      key-hl-color = "00000000";
+      line-color = "00000088";
+      separator-color = "00000000";
+      grace = 2;
+      fade-in = 0.2;
+    };
+  };
+}
diff --git a/nixos/home/desktop/xorg/common.nix b/nixos/home/desktop/xorg/common.nix
new file mode 100644
index 00000000..0b0f1ff5
--- /dev/null
+++ b/nixos/home/desktop/xorg/common.nix
@@ -0,0 +1,2 @@
+{ ... }:
+{ xsession.enable = true; }
diff --git a/nixos/home/desktop/xorg/default.nix b/nixos/home/desktop/xorg/default.nix
deleted file mode 100644
index 1364701c..00000000
--- a/nixos/home/desktop/xorg/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ ... }:
-{
-  imports = [ ./xresources.nix ];
-  xsession.enable = true;
-}
diff --git a/nixos/home/env/fonts/default.nix b/nixos/home/env/fonts/default.nix
deleted file mode 100644
index 7fbd4ea7..00000000
--- a/nixos/home/env/fonts/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./firacode.nix
-    ./iosevka.nix
-  ];
-}
diff --git a/nixos/home/env/qemu.nix b/nixos/home/env/qemu.nix
deleted file mode 100644
index 036d1077..00000000
--- a/nixos/home/env/qemu.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pkgs, ... }:
-
-{
-  home.packages = with pkgs; [ qemu ];
-}
diff --git a/nixos/home/git/default.nix b/nixos/home/git/common.nix
similarity index 79%
rename from nixos/home/git/default.nix
rename to nixos/home/git/common.nix
index 7e47f2a7..4cecf758 100644
--- a/nixos/home/git/default.nix
+++ b/nixos/home/git/common.nix
@@ -1,10 +1,5 @@
 { ... }:
 {
-  imports = [
-    ../env/bat.nix
-    ../env/ssh.nix
-    ../env/shell
-  ];
   programs.git = {
     enable = true;
     userName = "Evie Litherland-Smith";
diff --git a/nixos/home/git/personal/default.nix b/nixos/home/git/personal.nix
similarity index 65%
rename from nixos/home/git/personal/default.nix
rename to nixos/home/git/personal.nix
index 6fca45f6..d856ccaf 100644
--- a/nixos/home/git/personal/default.nix
+++ b/nixos/home/git/personal.nix
@@ -1,5 +1,5 @@
 { ... }:
 {
-  imports = [ ../default.nix ];
+  imports = [ ./common.nix ];
   programs.git.userEmail = "evie@xenia.me.uk";
 }
diff --git a/nixos/home/git/work/default.nix b/nixos/home/git/work.nix
similarity index 69%
rename from nixos/home/git/work/default.nix
rename to nixos/home/git/work.nix
index 7c6fbcb6..1f000e6e 100644
--- a/nixos/home/git/work/default.nix
+++ b/nixos/home/git/work.nix
@@ -1,5 +1,5 @@
 { ... }:
 {
-  imports = [ ../default.nix ];
+  imports = [ ./common.nix ];
   programs.git.userEmail = "evie.litherland-smith@ukaea.uk";
 }
diff --git a/nixos/home/gui/dev/neovide.nix b/nixos/home/gui/dev/neovide.nix
deleted file mode 100644
index ace5de72..00000000
--- a/nixos/home/gui/dev/neovide.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [ neovide ];
-}
diff --git a/nixos/home/gui/documents/libreoffice.nix b/nixos/home/gui/documents/libreoffice.nix
deleted file mode 100644
index 266ceaea..00000000
--- a/nixos/home/gui/documents/libreoffice.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [ libreoffice-fresh ];
-}
diff --git a/nixos/home/gui/documents/marktext.nix b/nixos/home/gui/documents/marktext.nix
deleted file mode 100644
index aaa0057e..00000000
--- a/nixos/home/gui/documents/marktext.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [ marktext ];
-}
diff --git a/nixos/home/gui/documents/zotero.nix b/nixos/home/gui/documents/zotero.nix
deleted file mode 100644
index 2abc3a08..00000000
--- a/nixos/home/gui/documents/zotero.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ pkgs, ... }:
-
-{
-  #services.nextcloud-client = {
-  #  enable = true;
-  #  startInBackground = true;
-  #};
-  home.packages = with pkgs; [ zotero ];
-}
diff --git a/nixos/home/gui/gaming/steam.nix b/nixos/home/gui/gaming/steam.nix
deleted file mode 100644
index ac2288e6..00000000
--- a/nixos/home/gui/gaming/steam.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ pkgs, ... }:
-
-{
-  home.packages = with pkgs; [
-    mesa
-    steam
-    steam-run
-  ];
-}
diff --git a/nixos/home/gui/messaging/discord.nix b/nixos/home/gui/messaging/discord.nix
deleted file mode 100644
index c429cb26..00000000
--- a/nixos/home/gui/messaging/discord.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [ discord ];
-}
diff --git a/nixos/home/gui/messaging/element.nix b/nixos/home/gui/messaging/element.nix
deleted file mode 100644
index ec9f4891..00000000
--- a/nixos/home/gui/messaging/element.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [ element-desktop ];
-}
diff --git a/nixos/home/gui/messaging/signal.nix b/nixos/home/gui/messaging/signal.nix
deleted file mode 100644
index e08df9a2..00000000
--- a/nixos/home/gui/messaging/signal.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [ signal-desktop ];
-}
diff --git a/nixos/home/gui/messaging/zoom.nix b/nixos/home/gui/messaging/zoom.nix
deleted file mode 100644
index 6fc2ee9e..00000000
--- a/nixos/home/gui/messaging/zoom.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [ zoom-us ];
-}
diff --git a/nixos/home/gui/remote/nomachine.nix b/nixos/home/gui/remote/nomachine.nix
deleted file mode 100644
index a9330055..00000000
--- a/nixos/home/gui/remote/nomachine.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [
-    nomachine-client
-  ];
-}
diff --git a/nixos/home/gui/remote/x2go.nix b/nixos/home/gui/remote/x2go.nix
deleted file mode 100644
index 6b39f597..00000000
--- a/nixos/home/gui/remote/x2go.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [ x2goclient ];
-}
diff --git a/nixos/home/gui/security/default.nix b/nixos/home/gui/security/default.nix
deleted file mode 100644
index 6de2879b..00000000
--- a/nixos/home/gui/security/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ pkgs, ... }:
-{
-  home.packages = with pkgs; [ bitwarden otpclient ];
-}
diff --git a/nixos/home/gui/terminal/config/wezterm/key_tables.lua b/nixos/home/terminal/config/wezterm/key_tables.lua
similarity index 100%
rename from nixos/home/gui/terminal/config/wezterm/key_tables.lua
rename to nixos/home/terminal/config/wezterm/key_tables.lua
diff --git a/nixos/home/gui/terminal/config/wezterm/keys.lua b/nixos/home/terminal/config/wezterm/keys.lua
similarity index 100%
rename from nixos/home/gui/terminal/config/wezterm/keys.lua
rename to nixos/home/terminal/config/wezterm/keys.lua
diff --git a/nixos/home/gui/terminal/config/wezterm/navigator.lua b/nixos/home/terminal/config/wezterm/navigator.lua
similarity index 100%
rename from nixos/home/gui/terminal/config/wezterm/navigator.lua
rename to nixos/home/terminal/config/wezterm/navigator.lua
diff --git a/nixos/home/gui/terminal/config/wezterm/status.lua b/nixos/home/terminal/config/wezterm/status.lua
similarity index 100%
rename from nixos/home/gui/terminal/config/wezterm/status.lua
rename to nixos/home/terminal/config/wezterm/status.lua
diff --git a/nixos/home/gui/terminal/config/wezterm/tab_bar_style.lua b/nixos/home/terminal/config/wezterm/tab_bar_style.lua
similarity index 100%
rename from nixos/home/gui/terminal/config/wezterm/tab_bar_style.lua
rename to nixos/home/terminal/config/wezterm/tab_bar_style.lua
diff --git a/nixos/home/gui/terminal/config/wezterm/wezterm.lua b/nixos/home/terminal/config/wezterm/wezterm.lua
similarity index 100%
rename from nixos/home/gui/terminal/config/wezterm/wezterm.lua
rename to nixos/home/terminal/config/wezterm/wezterm.lua
diff --git a/nixos/home/gui/terminal/foot.nix b/nixos/home/terminal/foot.nix
similarity index 100%
rename from nixos/home/gui/terminal/foot.nix
rename to nixos/home/terminal/foot.nix
diff --git a/nixos/home/gui/terminal/kitty.nix b/nixos/home/terminal/kitty.nix
similarity index 100%
rename from nixos/home/gui/terminal/kitty.nix
rename to nixos/home/terminal/kitty.nix
diff --git a/nixos/home/gui/terminal/urxvt.nix b/nixos/home/terminal/urxvt.nix
similarity index 100%
rename from nixos/home/gui/terminal/urxvt.nix
rename to nixos/home/terminal/urxvt.nix
diff --git a/nixos/home/gui/terminal/wezterm.nix b/nixos/home/terminal/wezterm.nix
similarity index 100%
rename from nixos/home/gui/terminal/wezterm.nix
rename to nixos/home/terminal/wezterm.nix
diff --git a/nixos/home/tui/common.nix b/nixos/home/tui/common.nix
deleted file mode 100644
index e70c1427..00000000
--- a/nixos/home/tui/common.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ pkgs, ... }:
-
-{
-  home.packages = with pkgs; [
-    file
-    silver-searcher
-    lynx
-  ];
-}
diff --git a/nixos/home/tui/default.nix b/nixos/home/tui/default.nix
deleted file mode 100644
index 945ea583..00000000
--- a/nixos/home/tui/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./common.nix
-    ./lazygit.nix
-    ./neovim.nix
-  ];
-}