diff --git a/homes/aarch64-darwin/marley@mairley/default.nix b/homes/aarch64-darwin/marley@mairley/default.nix
index 9e2d7a8..a4b3fa7 100644
--- a/homes/aarch64-darwin/marley@mairley/default.nix
+++ b/homes/aarch64-darwin/marley@mairley/default.nix
@@ -1,46 +1,8 @@
-{
-  lib,
-  ...
-}:
-let
+{lib, ...}: let
   inherit (lib.marleyos) enabled;
-in
-{
+in {
   marleyos = {
-    isDesktop = true;
-
-    programs = {
-      amfora = enabled;
-      bat = enabled;
-      btop = enabled;
-      cheat = enabled;
-      curl = enabled;
-      eza = enabled;
-      figlet = enabled;
-      fish = enabled;
-      fzf = enabled;
-      gh = enabled;
-      git = enabled;
-      glow = enabled;
-      gpg = enabled;
-      hyfetch = enabled;
-      just = enabled;
-      lazygit = enabled;
-      less = enabled;
-      man = enabled;
-      neo = enabled;
-      neovim = enabled;
-      nh = enabled;
-      rbw = enabled;
-      ripgrep = enabled;
-      ssh = enabled;
-      starship = enabled;
-      tea = enabled;
-      tmux = enabled;
-      wezterm = enabled;
-      wget = enabled;
-      zoxide = enabled;
-    };
+    bundles.mac = enabled;
   };
 
   home.stateVersion = "24.05";
diff --git a/homes/x86_64-linux/marley@nyx/default.nix b/homes/x86_64-linux/marley@nyx/default.nix
index 95ec8b7..e52f59a 100644
--- a/homes/x86_64-linux/marley@nyx/default.nix
+++ b/homes/x86_64-linux/marley@nyx/default.nix
@@ -2,58 +2,8 @@
   inherit (lib.marleyos) enabled;
 in {
   marleyos = {
-    isDesktop = true;
+    bundles.desktop = enabled;
 
-    appearance = {
-      base = enabled;
-      gtk = enabled;
-      qt = enabled;
-    };
-    # TODO: Seperate out into graphical/shell/tui?
-    programs = {
-      amfora = enabled;
-      bat = enabled;
-      btop = enabled;
-      calibre = enabled;
-      cava = enabled;
-      cheat = enabled;
-      curl = enabled;
-      eza = enabled;
-      figlet = enabled;
-      fish = enabled;
-      floorp = enabled;
-      fzf = enabled;
-      gh = enabled;
-      git = enabled;
-      glow = enabled;
-      gpg = enabled;
-      hyfetch = enabled;
-      journalctl = enabled;
-      just = enabled;
-      lazygit = enabled;
-      less = enabled;
-      man = enabled;
-      ncmpcpp = enabled;
-      neo = enabled;
-      neovim = enabled;
-      nh = enabled;
-      pidgin = enabled;
-      rbw = enabled;
-      ripgrep = enabled;
-      ssh = enabled;
-      starship = enabled;
-      systemctl = enabled;
-      tmux = enabled;
-      vesktop = enabled;
-      wezterm = enabled;
-      wget = enabled;
-      zathura = enabled;
-      zoxide = enabled;
-    };
-    services = {
-      # clipboard = enabled;
-      # syncthing = enabled;
-    };
     wayland.hyprland = {
       enable = true;
       monitors = {
diff --git a/modules/home/bundles/desktop/default.nix b/modules/home/bundles/desktop/default.nix
new file mode 100644
index 0000000..2171bb2
--- /dev/null
+++ b/modules/home/bundles/desktop/default.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  cfg = config.marleyos.bundles.desktop;
+
+  inherit (lib.marleyos) enabled;
+in {
+  options.marleyos.bundles.desktop.enable = lib.mkEnableOption "desktop";
+
+  config = lib.mkIf cfg.enable {
+    marleyos = {
+      isDesktop = true;
+
+      appearance = {
+        base = enabled;
+        gtk = enabled;
+        qt = enabled;
+      };
+
+      programs = {
+        cli = enabled;
+        tui = enabled;
+        gui = enabled;
+      };
+
+      services = {
+        # syncthing = enabled;
+      };
+    };
+  };
+}
diff --git a/modules/home/bundles/mac/default.nix b/modules/home/bundles/mac/default.nix
new file mode 100644
index 0000000..bbdfed4
--- /dev/null
+++ b/modules/home/bundles/mac/default.nix
@@ -0,0 +1,29 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  cfg = config.marleyos.bundles.mac;
+
+  inherit (lib.marleyos) enabled disabled;
+in {
+  options.marleyos.bundles.mac.enable = lib.mkEnableOption "mac";
+
+  config = lib.mkIf cfg.enable {
+    marleyos = {
+      isDesktop = true;
+
+      programs = {
+        cli = enabled;
+        journalctl = disabled;
+        systemctl = disabled;
+
+        tui = enabled;
+        cava = disabled;
+        ncmpcpp = disabled;
+
+        wezterm = enabled;
+      };
+    };
+  };
+}
diff --git a/modules/home/programs/bat/default.nix b/modules/home/programs/cli/bat/default.nix
similarity index 100%
rename from modules/home/programs/bat/default.nix
rename to modules/home/programs/cli/bat/default.nix
diff --git a/modules/home/programs/cheat/default.nix b/modules/home/programs/cli/cheat/default.nix
similarity index 100%
rename from modules/home/programs/cheat/default.nix
rename to modules/home/programs/cli/cheat/default.nix
diff --git a/modules/home/programs/curl/default.nix b/modules/home/programs/cli/curl/default.nix
similarity index 100%
rename from modules/home/programs/curl/default.nix
rename to modules/home/programs/cli/curl/default.nix
diff --git a/modules/home/programs/cli/default.nix b/modules/home/programs/cli/default.nix
new file mode 100644
index 0000000..62f80c2
--- /dev/null
+++ b/modules/home/programs/cli/default.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  cfg = config.marleyos.programs.cli;
+
+  inherit (lib.marleyos) enabled;
+in {
+  options.marleyos.programs.cli.enable = lib.mkEnableOption "cli";
+
+  config = lib.mkIf cfg.enable {
+    marleyos.programs = {
+      bat = enabled;
+      cheat = enabled;
+      curl = enabled;
+      eza = enabled;
+      figlet = enabled;
+      fish = enabled;
+      fzf = enabled;
+      gh = enabled;
+      git = enabled;
+      glow = enabled;
+      gpg = enabled;
+      hyfetch = enabled;
+      journalctl = enabled;
+      just = enabled;
+      less = enabled;
+      man = enabled;
+      neo = enabled;
+      nh = enabled;
+      rbw = enabled;
+      ripgrep = enabled;
+      ssh = enabled;
+      starship = enabled;
+      systemctl = enabled;
+      tea = enabled;
+      tmux = enabled;
+      wget = enabled;
+      zoxide = enabled;
+    };
+  };
+}
diff --git a/modules/home/programs/eza/default.nix b/modules/home/programs/cli/eza/default.nix
similarity index 100%
rename from modules/home/programs/eza/default.nix
rename to modules/home/programs/cli/eza/default.nix
diff --git a/modules/home/programs/figlet/default.nix b/modules/home/programs/cli/figlet/default.nix
similarity index 100%
rename from modules/home/programs/figlet/default.nix
rename to modules/home/programs/cli/figlet/default.nix
diff --git a/modules/home/programs/fish/default.nix b/modules/home/programs/cli/fish/default.nix
similarity index 100%
rename from modules/home/programs/fish/default.nix
rename to modules/home/programs/cli/fish/default.nix
diff --git a/modules/home/programs/fzf/default.nix b/modules/home/programs/cli/fzf/default.nix
similarity index 100%
rename from modules/home/programs/fzf/default.nix
rename to modules/home/programs/cli/fzf/default.nix
diff --git a/modules/home/programs/gh/default.nix b/modules/home/programs/cli/gh/default.nix
similarity index 100%
rename from modules/home/programs/gh/default.nix
rename to modules/home/programs/cli/gh/default.nix
diff --git a/modules/home/programs/git/aliases.nix b/modules/home/programs/cli/git/aliases.nix
similarity index 100%
rename from modules/home/programs/git/aliases.nix
rename to modules/home/programs/cli/git/aliases.nix
diff --git a/modules/home/programs/git/default.nix b/modules/home/programs/cli/git/default.nix
similarity index 100%
rename from modules/home/programs/git/default.nix
rename to modules/home/programs/cli/git/default.nix
diff --git a/modules/home/programs/glow/default.nix b/modules/home/programs/cli/glow/default.nix
similarity index 100%
rename from modules/home/programs/glow/default.nix
rename to modules/home/programs/cli/glow/default.nix
diff --git a/modules/home/programs/gpg/default.nix b/modules/home/programs/cli/gpg/default.nix
similarity index 100%
rename from modules/home/programs/gpg/default.nix
rename to modules/home/programs/cli/gpg/default.nix
diff --git a/modules/home/programs/hyfetch/default.nix b/modules/home/programs/cli/hyfetch/default.nix
similarity index 100%
rename from modules/home/programs/hyfetch/default.nix
rename to modules/home/programs/cli/hyfetch/default.nix
diff --git a/modules/home/programs/hyfetch/neofetch.nix b/modules/home/programs/cli/hyfetch/neofetch.nix
similarity index 100%
rename from modules/home/programs/hyfetch/neofetch.nix
rename to modules/home/programs/cli/hyfetch/neofetch.nix
diff --git a/modules/home/programs/journalctl/default.nix b/modules/home/programs/cli/journalctl/default.nix
similarity index 100%
rename from modules/home/programs/journalctl/default.nix
rename to modules/home/programs/cli/journalctl/default.nix
diff --git a/modules/home/programs/just/default.nix b/modules/home/programs/cli/just/default.nix
similarity index 100%
rename from modules/home/programs/just/default.nix
rename to modules/home/programs/cli/just/default.nix
diff --git a/modules/home/programs/less/default.nix b/modules/home/programs/cli/less/default.nix
similarity index 100%
rename from modules/home/programs/less/default.nix
rename to modules/home/programs/cli/less/default.nix
diff --git a/modules/home/programs/man/default.nix b/modules/home/programs/cli/man/default.nix
similarity index 100%
rename from modules/home/programs/man/default.nix
rename to modules/home/programs/cli/man/default.nix
diff --git a/modules/home/programs/neo/default.nix b/modules/home/programs/cli/neo/default.nix
similarity index 100%
rename from modules/home/programs/neo/default.nix
rename to modules/home/programs/cli/neo/default.nix
diff --git a/modules/home/programs/nh/default.nix b/modules/home/programs/cli/nh/default.nix
similarity index 100%
rename from modules/home/programs/nh/default.nix
rename to modules/home/programs/cli/nh/default.nix
diff --git a/modules/home/programs/rbw/default.nix b/modules/home/programs/cli/rbw/default.nix
similarity index 100%
rename from modules/home/programs/rbw/default.nix
rename to modules/home/programs/cli/rbw/default.nix
diff --git a/modules/home/programs/ripgrep/default.nix b/modules/home/programs/cli/ripgrep/default.nix
similarity index 100%
rename from modules/home/programs/ripgrep/default.nix
rename to modules/home/programs/cli/ripgrep/default.nix
diff --git a/modules/home/programs/ssh/default.nix b/modules/home/programs/cli/ssh/default.nix
similarity index 100%
rename from modules/home/programs/ssh/default.nix
rename to modules/home/programs/cli/ssh/default.nix
diff --git a/modules/home/programs/starship/default.nix b/modules/home/programs/cli/starship/default.nix
similarity index 100%
rename from modules/home/programs/starship/default.nix
rename to modules/home/programs/cli/starship/default.nix
diff --git a/modules/home/programs/starship/nerd-font-symbols.nix b/modules/home/programs/cli/starship/nerd-font-symbols.nix
similarity index 100%
rename from modules/home/programs/starship/nerd-font-symbols.nix
rename to modules/home/programs/cli/starship/nerd-font-symbols.nix
diff --git a/modules/home/programs/starship/rose-pine.nix b/modules/home/programs/cli/starship/rose-pine.nix
similarity index 100%
rename from modules/home/programs/starship/rose-pine.nix
rename to modules/home/programs/cli/starship/rose-pine.nix
diff --git a/modules/home/programs/systemctl/default.nix b/modules/home/programs/cli/systemctl/default.nix
similarity index 100%
rename from modules/home/programs/systemctl/default.nix
rename to modules/home/programs/cli/systemctl/default.nix
diff --git a/modules/home/programs/tea/default.nix b/modules/home/programs/cli/tea/default.nix
similarity index 100%
rename from modules/home/programs/tea/default.nix
rename to modules/home/programs/cli/tea/default.nix
diff --git a/modules/home/programs/tmux/default.nix b/modules/home/programs/cli/tmux/default.nix
similarity index 100%
rename from modules/home/programs/tmux/default.nix
rename to modules/home/programs/cli/tmux/default.nix
diff --git a/modules/home/programs/wget/default.nix b/modules/home/programs/cli/wget/default.nix
similarity index 100%
rename from modules/home/programs/wget/default.nix
rename to modules/home/programs/cli/wget/default.nix
diff --git a/modules/home/programs/zoxide/default.nix b/modules/home/programs/cli/zoxide/default.nix
similarity index 100%
rename from modules/home/programs/zoxide/default.nix
rename to modules/home/programs/cli/zoxide/default.nix
diff --git a/modules/home/programs/calibre/default.nix b/modules/home/programs/gui/calibre/default.nix
similarity index 100%
rename from modules/home/programs/calibre/default.nix
rename to modules/home/programs/gui/calibre/default.nix
diff --git a/modules/home/programs/gui/default.nix b/modules/home/programs/gui/default.nix
new file mode 100644
index 0000000..7d3d681
--- /dev/null
+++ b/modules/home/programs/gui/default.nix
@@ -0,0 +1,23 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  cfg = config.marleyos.programs.gui;
+
+  inherit (lib.marleyos) enabled;
+in {
+  options.marleyos.programs.gui.enable = lib.mkEnableOption "gui";
+
+  config = lib.mkIf cfg.enable {
+    marleyos.programs = {
+      calibre = enabled;
+      floorp = enabled;
+      pidgin = enabled;
+      rofi = enabled;
+      vesktop = enabled;
+      wezterm = enabled;
+      zathura = enabled;
+    };
+  };
+}
diff --git a/modules/home/programs/floorp/default.nix b/modules/home/programs/gui/floorp/default.nix
similarity index 100%
rename from modules/home/programs/floorp/default.nix
rename to modules/home/programs/gui/floorp/default.nix
diff --git a/modules/home/programs/pidgin/default.nix b/modules/home/programs/gui/pidgin/default.nix
similarity index 100%
rename from modules/home/programs/pidgin/default.nix
rename to modules/home/programs/gui/pidgin/default.nix
diff --git a/modules/home/programs/pidgin/hearty/purple/status-icon/16/available.png b/modules/home/programs/gui/pidgin/hearty/purple/status-icon/16/available.png
similarity index 100%
rename from modules/home/programs/pidgin/hearty/purple/status-icon/16/available.png
rename to modules/home/programs/gui/pidgin/hearty/purple/status-icon/16/available.png
diff --git a/modules/home/programs/pidgin/hearty/purple/status-icon/16/away.png b/modules/home/programs/gui/pidgin/hearty/purple/status-icon/16/away.png
similarity index 100%
rename from modules/home/programs/pidgin/hearty/purple/status-icon/16/away.png
rename to modules/home/programs/gui/pidgin/hearty/purple/status-icon/16/away.png
diff --git a/modules/home/programs/pidgin/hearty/purple/status-icon/16/busy.png b/modules/home/programs/gui/pidgin/hearty/purple/status-icon/16/busy.png
similarity index 100%
rename from modules/home/programs/pidgin/hearty/purple/status-icon/16/busy.png
rename to modules/home/programs/gui/pidgin/hearty/purple/status-icon/16/busy.png
diff --git a/modules/home/programs/pidgin/hearty/purple/status-icon/16/chat.png b/modules/home/programs/gui/pidgin/hearty/purple/status-icon/16/chat.png
similarity index 100%
rename from modules/home/programs/pidgin/hearty/purple/status-icon/16/chat.png
rename to modules/home/programs/gui/pidgin/hearty/purple/status-icon/16/chat.png
diff --git a/modules/home/programs/pidgin/hearty/purple/status-icon/16/extended-away.png b/modules/home/programs/gui/pidgin/hearty/purple/status-icon/16/extended-away.png
similarity index 100%
rename from modules/home/programs/pidgin/hearty/purple/status-icon/16/extended-away.png
rename to modules/home/programs/gui/pidgin/hearty/purple/status-icon/16/extended-away.png
diff --git a/modules/home/programs/pidgin/hearty/purple/status-icon/16/invisible.png b/modules/home/programs/gui/pidgin/hearty/purple/status-icon/16/invisible.png
similarity index 100%
rename from modules/home/programs/pidgin/hearty/purple/status-icon/16/invisible.png
rename to modules/home/programs/gui/pidgin/hearty/purple/status-icon/16/invisible.png
diff --git a/modules/home/programs/pidgin/hearty/purple/status-icon/16/log-in.png b/modules/home/programs/gui/pidgin/hearty/purple/status-icon/16/log-in.png
similarity index 100%
rename from modules/home/programs/pidgin/hearty/purple/status-icon/16/log-in.png
rename to modules/home/programs/gui/pidgin/hearty/purple/status-icon/16/log-in.png
diff --git a/modules/home/programs/pidgin/hearty/purple/status-icon/16/log-out.png b/modules/home/programs/gui/pidgin/hearty/purple/status-icon/16/log-out.png
similarity index 100%
rename from modules/home/programs/pidgin/hearty/purple/status-icon/16/log-out.png
rename to modules/home/programs/gui/pidgin/hearty/purple/status-icon/16/log-out.png
diff --git a/modules/home/programs/pidgin/hearty/purple/status-icon/16/offline.png b/modules/home/programs/gui/pidgin/hearty/purple/status-icon/16/offline.png
similarity index 100%
rename from modules/home/programs/pidgin/hearty/purple/status-icon/16/offline.png
rename to modules/home/programs/gui/pidgin/hearty/purple/status-icon/16/offline.png
diff --git a/modules/home/programs/pidgin/hearty/purple/status-icon/16/person.png b/modules/home/programs/gui/pidgin/hearty/purple/status-icon/16/person.png
similarity index 100%
rename from modules/home/programs/pidgin/hearty/purple/status-icon/16/person.png
rename to modules/home/programs/gui/pidgin/hearty/purple/status-icon/16/person.png
diff --git a/modules/home/programs/pidgin/hearty/purple/status-icon/theme.xml b/modules/home/programs/gui/pidgin/hearty/purple/status-icon/theme.xml
similarity index 100%
rename from modules/home/programs/pidgin/hearty/purple/status-icon/theme.xml
rename to modules/home/programs/gui/pidgin/hearty/purple/status-icon/theme.xml
diff --git a/modules/home/programs/pidgin/pandamotes/panda=(.gif b/modules/home/programs/gui/pidgin/pandamotes/panda=(.gif
similarity index 100%
rename from modules/home/programs/pidgin/pandamotes/panda=(.gif
rename to modules/home/programs/gui/pidgin/pandamotes/panda=(.gif
diff --git a/modules/home/programs/pidgin/pandamotes/panda=).gif b/modules/home/programs/gui/pidgin/pandamotes/panda=).gif
similarity index 100%
rename from modules/home/programs/pidgin/pandamotes/panda=).gif
rename to modules/home/programs/gui/pidgin/pandamotes/panda=).gif
diff --git a/modules/home/programs/pidgin/pandamotes/panda=>.gif b/modules/home/programs/gui/pidgin/pandamotes/panda=>.gif
similarity index 100%
rename from modules/home/programs/pidgin/pandamotes/panda=>.gif
rename to modules/home/programs/gui/pidgin/pandamotes/panda=>.gif
diff --git a/modules/home/programs/pidgin/pandamotes/panda=D.gif b/modules/home/programs/gui/pidgin/pandamotes/panda=D.gif
similarity index 100%
rename from modules/home/programs/pidgin/pandamotes/panda=D.gif
rename to modules/home/programs/gui/pidgin/pandamotes/panda=D.gif
diff --git a/modules/home/programs/pidgin/pandamotes/panda=Oh.gif b/modules/home/programs/gui/pidgin/pandamotes/panda=Oh.gif
similarity index 100%
rename from modules/home/programs/pidgin/pandamotes/panda=Oh.gif
rename to modules/home/programs/gui/pidgin/pandamotes/panda=Oh.gif
diff --git a/modules/home/programs/pidgin/pandamotes/panda=P.gif b/modules/home/programs/gui/pidgin/pandamotes/panda=P.gif
similarity index 100%
rename from modules/home/programs/pidgin/pandamotes/panda=P.gif
rename to modules/home/programs/gui/pidgin/pandamotes/panda=P.gif
diff --git a/modules/home/programs/pidgin/pandamotes/panda=l.gif b/modules/home/programs/gui/pidgin/pandamotes/panda=l.gif
similarity index 100%
rename from modules/home/programs/pidgin/pandamotes/panda=l.gif
rename to modules/home/programs/gui/pidgin/pandamotes/panda=l.gif
diff --git a/modules/home/programs/pidgin/pandamotes/panda=o.gif b/modules/home/programs/gui/pidgin/pandamotes/panda=o.gif
similarity index 100%
rename from modules/home/programs/pidgin/pandamotes/panda=o.gif
rename to modules/home/programs/gui/pidgin/pandamotes/panda=o.gif
diff --git a/modules/home/programs/pidgin/pandamotes/pandaDX.gif b/modules/home/programs/gui/pidgin/pandamotes/pandaDX.gif
similarity index 100%
rename from modules/home/programs/pidgin/pandamotes/pandaDX.gif
rename to modules/home/programs/gui/pidgin/pandamotes/pandaDX.gif
diff --git a/modules/home/programs/pidgin/pandamotes/pandaT_T.gif b/modules/home/programs/gui/pidgin/pandamotes/pandaT_T.gif
similarity index 100%
rename from modules/home/programs/pidgin/pandamotes/pandaT_T.gif
rename to modules/home/programs/gui/pidgin/pandamotes/pandaT_T.gif
diff --git a/modules/home/programs/pidgin/pandamotes/pandablue.gif b/modules/home/programs/gui/pidgin/pandamotes/pandablue.gif
similarity index 100%
rename from modules/home/programs/pidgin/pandamotes/pandablue.gif
rename to modules/home/programs/gui/pidgin/pandamotes/pandablue.gif
diff --git a/modules/home/programs/pidgin/pandamotes/pandadomo.gif b/modules/home/programs/gui/pidgin/pandamotes/pandadomo.gif
similarity index 100%
rename from modules/home/programs/pidgin/pandamotes/pandadomo.gif
rename to modules/home/programs/gui/pidgin/pandamotes/pandadomo.gif
diff --git a/modules/home/programs/pidgin/pandamotes/pandagonk.gif b/modules/home/programs/gui/pidgin/pandamotes/pandagonk.gif
similarity index 100%
rename from modules/home/programs/pidgin/pandamotes/pandagonk.gif
rename to modules/home/programs/gui/pidgin/pandamotes/pandagonk.gif
diff --git a/modules/home/programs/pidgin/pandamotes/pandagreen.gif b/modules/home/programs/gui/pidgin/pandamotes/pandagreen.gif
similarity index 100%
rename from modules/home/programs/pidgin/pandamotes/pandagreen.gif
rename to modules/home/programs/gui/pidgin/pandamotes/pandagreen.gif
diff --git a/modules/home/programs/pidgin/pandamotes/pandaorange.gif b/modules/home/programs/gui/pidgin/pandamotes/pandaorange.gif
similarity index 100%
rename from modules/home/programs/pidgin/pandamotes/pandaorange.gif
rename to modules/home/programs/gui/pidgin/pandamotes/pandaorange.gif
diff --git a/modules/home/programs/pidgin/pandamotes/pandared.gif b/modules/home/programs/gui/pidgin/pandamotes/pandared.gif
similarity index 100%
rename from modules/home/programs/pidgin/pandamotes/pandared.gif
rename to modules/home/programs/gui/pidgin/pandamotes/pandared.gif
diff --git a/modules/home/programs/pidgin/pandamotes/pandaviolet.gif b/modules/home/programs/gui/pidgin/pandamotes/pandaviolet.gif
similarity index 100%
rename from modules/home/programs/pidgin/pandamotes/pandaviolet.gif
rename to modules/home/programs/gui/pidgin/pandamotes/pandaviolet.gif
diff --git a/modules/home/programs/pidgin/pandamotes/pandax3.gif b/modules/home/programs/gui/pidgin/pandamotes/pandax3.gif
similarity index 100%
rename from modules/home/programs/pidgin/pandamotes/pandax3.gif
rename to modules/home/programs/gui/pidgin/pandamotes/pandax3.gif
diff --git a/modules/home/programs/pidgin/pandamotes/pandayellow.gif b/modules/home/programs/gui/pidgin/pandamotes/pandayellow.gif
similarity index 100%
rename from modules/home/programs/pidgin/pandamotes/pandayellow.gif
rename to modules/home/programs/gui/pidgin/pandamotes/pandayellow.gif
diff --git a/modules/home/programs/pidgin/pandamotes/theme b/modules/home/programs/gui/pidgin/pandamotes/theme
similarity index 100%
rename from modules/home/programs/pidgin/pandamotes/theme
rename to modules/home/programs/gui/pidgin/pandamotes/theme
diff --git a/modules/home/programs/pidgin/pixelhead/ah.png b/modules/home/programs/gui/pidgin/pixelhead/ah.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/ah.png
rename to modules/home/programs/gui/pidgin/pixelhead/ah.png
diff --git a/modules/home/programs/pidgin/pixelhead/angel.png b/modules/home/programs/gui/pidgin/pixelhead/angel.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/angel.png
rename to modules/home/programs/gui/pidgin/pixelhead/angel.png
diff --git a/modules/home/programs/pidgin/pixelhead/angry.png b/modules/home/programs/gui/pidgin/pixelhead/angry.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/angry.png
rename to modules/home/programs/gui/pidgin/pixelhead/angry.png
diff --git a/modules/home/programs/pidgin/pixelhead/beh.png b/modules/home/programs/gui/pidgin/pixelhead/beh.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/beh.png
rename to modules/home/programs/gui/pidgin/pixelhead/beh.png
diff --git a/modules/home/programs/pidgin/pixelhead/blank.png b/modules/home/programs/gui/pidgin/pixelhead/blank.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/blank.png
rename to modules/home/programs/gui/pidgin/pixelhead/blank.png
diff --git a/modules/home/programs/pidgin/pixelhead/blush.png b/modules/home/programs/gui/pidgin/pixelhead/blush.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/blush.png
rename to modules/home/programs/gui/pidgin/pixelhead/blush.png
diff --git a/modules/home/programs/pidgin/pixelhead/confused.png b/modules/home/programs/gui/pidgin/pixelhead/confused.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/confused.png
rename to modules/home/programs/gui/pidgin/pixelhead/confused.png
diff --git a/modules/home/programs/pidgin/pixelhead/cry.png b/modules/home/programs/gui/pidgin/pixelhead/cry.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/cry.png
rename to modules/home/programs/gui/pidgin/pixelhead/cry.png
diff --git a/modules/home/programs/pidgin/pixelhead/devil.png b/modules/home/programs/gui/pidgin/pixelhead/devil.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/devil.png
rename to modules/home/programs/gui/pidgin/pixelhead/devil.png
diff --git a/modules/home/programs/pidgin/pixelhead/drop.png b/modules/home/programs/gui/pidgin/pixelhead/drop.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/drop.png
rename to modules/home/programs/gui/pidgin/pixelhead/drop.png
diff --git a/modules/home/programs/pidgin/pixelhead/geek.png b/modules/home/programs/gui/pidgin/pixelhead/geek.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/geek.png
rename to modules/home/programs/gui/pidgin/pixelhead/geek.png
diff --git a/modules/home/programs/pidgin/pixelhead/glasses.png b/modules/home/programs/gui/pidgin/pixelhead/glasses.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/glasses.png
rename to modules/home/programs/gui/pidgin/pixelhead/glasses.png
diff --git a/modules/home/programs/pidgin/pixelhead/grin.png b/modules/home/programs/gui/pidgin/pixelhead/grin.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/grin.png
rename to modules/home/programs/gui/pidgin/pixelhead/grin.png
diff --git a/modules/home/programs/pidgin/pixelhead/hehe.png b/modules/home/programs/gui/pidgin/pixelhead/hehe.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/hehe.png
rename to modules/home/programs/gui/pidgin/pixelhead/hehe.png
diff --git a/modules/home/programs/pidgin/pixelhead/hm.png b/modules/home/programs/gui/pidgin/pixelhead/hm.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/hm.png
rename to modules/home/programs/gui/pidgin/pixelhead/hm.png
diff --git a/modules/home/programs/pidgin/pixelhead/lovekiss.png b/modules/home/programs/gui/pidgin/pixelhead/lovekiss.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/lovekiss.png
rename to modules/home/programs/gui/pidgin/pixelhead/lovekiss.png
diff --git a/modules/home/programs/pidgin/pixelhead/oh.png b/modules/home/programs/gui/pidgin/pixelhead/oh.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/oh.png
rename to modules/home/programs/gui/pidgin/pixelhead/oh.png
diff --git a/modules/home/programs/pidgin/pixelhead/oink.png b/modules/home/programs/gui/pidgin/pixelhead/oink.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/oink.png
rename to modules/home/programs/gui/pidgin/pixelhead/oink.png
diff --git a/modules/home/programs/pidgin/pixelhead/pfff.png b/modules/home/programs/gui/pidgin/pixelhead/pfff.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/pfff.png
rename to modules/home/programs/gui/pidgin/pixelhead/pfff.png
diff --git a/modules/home/programs/pidgin/pixelhead/pout.png b/modules/home/programs/gui/pidgin/pixelhead/pout.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/pout.png
rename to modules/home/programs/gui/pidgin/pixelhead/pout.png
diff --git a/modules/home/programs/pidgin/pixelhead/puppy.png b/modules/home/programs/gui/pidgin/pixelhead/puppy.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/puppy.png
rename to modules/home/programs/gui/pidgin/pixelhead/puppy.png
diff --git a/modules/home/programs/pidgin/pixelhead/sad.png b/modules/home/programs/gui/pidgin/pixelhead/sad.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/sad.png
rename to modules/home/programs/gui/pidgin/pixelhead/sad.png
diff --git a/modules/home/programs/pidgin/pixelhead/shut.png b/modules/home/programs/gui/pidgin/pixelhead/shut.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/shut.png
rename to modules/home/programs/gui/pidgin/pixelhead/shut.png
diff --git a/modules/home/programs/pidgin/pixelhead/sleep.png b/modules/home/programs/gui/pidgin/pixelhead/sleep.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/sleep.png
rename to modules/home/programs/gui/pidgin/pixelhead/sleep.png
diff --git a/modules/home/programs/pidgin/pixelhead/sleepy.png b/modules/home/programs/gui/pidgin/pixelhead/sleepy.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/sleepy.png
rename to modules/home/programs/gui/pidgin/pixelhead/sleepy.png
diff --git a/modules/home/programs/pidgin/pixelhead/smile.png b/modules/home/programs/gui/pidgin/pixelhead/smile.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/smile.png
rename to modules/home/programs/gui/pidgin/pixelhead/smile.png
diff --git a/modules/home/programs/pidgin/pixelhead/smileclosed.png b/modules/home/programs/gui/pidgin/pixelhead/smileclosed.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/smileclosed.png
rename to modules/home/programs/gui/pidgin/pixelhead/smileclosed.png
diff --git a/modules/home/programs/pidgin/pixelhead/theme b/modules/home/programs/gui/pidgin/pixelhead/theme
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/theme
rename to modules/home/programs/gui/pidgin/pixelhead/theme
diff --git a/modules/home/programs/pidgin/pixelhead/tiltil.png b/modules/home/programs/gui/pidgin/pixelhead/tiltil.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/tiltil.png
rename to modules/home/programs/gui/pidgin/pixelhead/tiltil.png
diff --git a/modules/home/programs/pidgin/pixelhead/tongue.png b/modules/home/programs/gui/pidgin/pixelhead/tongue.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/tongue.png
rename to modules/home/programs/gui/pidgin/pixelhead/tongue.png
diff --git a/modules/home/programs/pidgin/pixelhead/uah.png b/modules/home/programs/gui/pidgin/pixelhead/uah.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/uah.png
rename to modules/home/programs/gui/pidgin/pixelhead/uah.png
diff --git a/modules/home/programs/pidgin/pixelhead/unpleased.png b/modules/home/programs/gui/pidgin/pixelhead/unpleased.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/unpleased.png
rename to modules/home/programs/gui/pidgin/pixelhead/unpleased.png
diff --git a/modules/home/programs/pidgin/pixelhead/upset.png b/modules/home/programs/gui/pidgin/pixelhead/upset.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/upset.png
rename to modules/home/programs/gui/pidgin/pixelhead/upset.png
diff --git a/modules/home/programs/pidgin/pixelhead/wink.png b/modules/home/programs/gui/pidgin/pixelhead/wink.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/wink.png
rename to modules/home/programs/gui/pidgin/pixelhead/wink.png
diff --git a/modules/home/programs/pidgin/pixelhead/xd.png b/modules/home/programs/gui/pidgin/pixelhead/xd.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/xd.png
rename to modules/home/programs/gui/pidgin/pixelhead/xd.png
diff --git a/modules/home/programs/pidgin/pixelhead/xx.png b/modules/home/programs/gui/pidgin/pixelhead/xx.png
similarity index 100%
rename from modules/home/programs/pidgin/pixelhead/xx.png
rename to modules/home/programs/gui/pidgin/pixelhead/xx.png
diff --git a/modules/home/programs/vesktop/default.nix b/modules/home/programs/gui/vesktop/default.nix
similarity index 100%
rename from modules/home/programs/vesktop/default.nix
rename to modules/home/programs/gui/vesktop/default.nix
diff --git a/modules/home/programs/wezterm/default.nix b/modules/home/programs/gui/wezterm/default.nix
similarity index 100%
rename from modules/home/programs/wezterm/default.nix
rename to modules/home/programs/gui/wezterm/default.nix
diff --git a/modules/home/programs/zathura/default.nix b/modules/home/programs/gui/zathura/default.nix
similarity index 100%
rename from modules/home/programs/zathura/default.nix
rename to modules/home/programs/gui/zathura/default.nix
diff --git a/modules/home/programs/hyprlock/default.nix b/modules/home/programs/hyprland/hyprlock/default.nix
similarity index 94%
rename from modules/home/programs/hyprlock/default.nix
rename to modules/home/programs/hyprland/hyprlock/default.nix
index 2da8ff2..84f6fd2 100644
--- a/modules/home/programs/hyprlock/default.nix
+++ b/modules/home/programs/hyprland/hyprlock/default.nix
@@ -21,7 +21,7 @@ in {
 
         background = [
           {
-            path = "${../../wayland/hyprland/wallpaper.png}";
+            path = "${../../../wayland/hyprland/wallpaper.png}";
             blur_passes = 3;
             blur_size = 8;
           }
diff --git a/modules/home/programs/waybar/default.nix b/modules/home/programs/hyprland/waybar/default.nix
similarity index 100%
rename from modules/home/programs/waybar/default.nix
rename to modules/home/programs/hyprland/waybar/default.nix
diff --git a/modules/home/programs/wlogout/default.nix b/modules/home/programs/hyprland/wlogout/default.nix
similarity index 100%
rename from modules/home/programs/wlogout/default.nix
rename to modules/home/programs/hyprland/wlogout/default.nix
diff --git a/modules/home/programs/wlogout/hibernate.png b/modules/home/programs/hyprland/wlogout/hibernate.png
similarity index 100%
rename from modules/home/programs/wlogout/hibernate.png
rename to modules/home/programs/hyprland/wlogout/hibernate.png
diff --git a/modules/home/programs/wlogout/lock.png b/modules/home/programs/hyprland/wlogout/lock.png
similarity index 100%
rename from modules/home/programs/wlogout/lock.png
rename to modules/home/programs/hyprland/wlogout/lock.png
diff --git a/modules/home/programs/wlogout/logout.png b/modules/home/programs/hyprland/wlogout/logout.png
similarity index 100%
rename from modules/home/programs/wlogout/logout.png
rename to modules/home/programs/hyprland/wlogout/logout.png
diff --git a/modules/home/programs/wlogout/reboot.png b/modules/home/programs/hyprland/wlogout/reboot.png
similarity index 100%
rename from modules/home/programs/wlogout/reboot.png
rename to modules/home/programs/hyprland/wlogout/reboot.png
diff --git a/modules/home/programs/wlogout/shutdown.png b/modules/home/programs/hyprland/wlogout/shutdown.png
similarity index 100%
rename from modules/home/programs/wlogout/shutdown.png
rename to modules/home/programs/hyprland/wlogout/shutdown.png
diff --git a/modules/home/programs/wlogout/suspend.png b/modules/home/programs/hyprland/wlogout/suspend.png
similarity index 100%
rename from modules/home/programs/wlogout/suspend.png
rename to modules/home/programs/hyprland/wlogout/suspend.png
diff --git a/modules/home/programs/wofi/default.nix b/modules/home/programs/hyprland/wofi/default.nix
similarity index 100%
rename from modules/home/programs/wofi/default.nix
rename to modules/home/programs/hyprland/wofi/default.nix
diff --git a/modules/home/programs/amfora/default.nix b/modules/home/programs/tui/amfora/default.nix
similarity index 100%
rename from modules/home/programs/amfora/default.nix
rename to modules/home/programs/tui/amfora/default.nix
diff --git a/modules/home/programs/btop/default.nix b/modules/home/programs/tui/btop/default.nix
similarity index 100%
rename from modules/home/programs/btop/default.nix
rename to modules/home/programs/tui/btop/default.nix
diff --git a/modules/home/programs/cava/default.nix b/modules/home/programs/tui/cava/default.nix
similarity index 100%
rename from modules/home/programs/cava/default.nix
rename to modules/home/programs/tui/cava/default.nix
diff --git a/modules/home/programs/tui/default.nix b/modules/home/programs/tui/default.nix
new file mode 100644
index 0000000..367204a
--- /dev/null
+++ b/modules/home/programs/tui/default.nix
@@ -0,0 +1,22 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  cfg = config.marleyos.programs.tui;
+
+  inherit (lib.marleyos) enabled;
+in {
+  options.marleyos.programs.tui.enable = lib.mkEnableOption "tui";
+
+  config = lib.mkIf cfg.enable {
+    marleyos.programs = {
+      amfora = enabled;
+      btop = enabled;
+      cava = enabled;
+      lazygit = enabled;
+      ncmpcpp = enabled;
+      neovim = enabled;
+    };
+  };
+}
diff --git a/modules/home/programs/lazygit/default.nix b/modules/home/programs/tui/lazygit/default.nix
similarity index 100%
rename from modules/home/programs/lazygit/default.nix
rename to modules/home/programs/tui/lazygit/default.nix
diff --git a/modules/home/programs/ncmpcpp/default.nix b/modules/home/programs/tui/ncmpcpp/default.nix
similarity index 100%
rename from modules/home/programs/ncmpcpp/default.nix
rename to modules/home/programs/tui/ncmpcpp/default.nix
diff --git a/modules/home/programs/neovim/default.nix b/modules/home/programs/tui/neovim/default.nix
similarity index 100%
rename from modules/home/programs/neovim/default.nix
rename to modules/home/programs/tui/neovim/default.nix
diff --git a/modules/home/programs/rofi/default.nix b/modules/home/programs/xorg/rofi/default.nix
similarity index 100%
rename from modules/home/programs/rofi/default.nix
rename to modules/home/programs/xorg/rofi/default.nix
diff --git a/modules/nixos/programs/cli/default.nix b/modules/nixos/programs/cli/default.nix
new file mode 100644
index 0000000..5559667
--- /dev/null
+++ b/modules/nixos/programs/cli/default.nix
@@ -0,0 +1,16 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  cfg = config.marleyos.programs.cli;
+
+  inherit (lib.marleyos) enabled;
+in {
+  options.marleyos.programs.cli.enable = lib.mkEnableOption "cli";
+
+  config = lib.mkIf cfg.enable {
+    marleyos.programs = {
+    };
+  };
+}
diff --git a/modules/nixos/programs/fish/default.nix b/modules/nixos/programs/cli/fish/default.nix
similarity index 100%
rename from modules/nixos/programs/fish/default.nix
rename to modules/nixos/programs/cli/fish/default.nix
diff --git a/modules/nixos/programs/gui/default.nix b/modules/nixos/programs/gui/default.nix
new file mode 100644
index 0000000..e69de29
diff --git a/modules/nixos/programs/tui/default.nix b/modules/nixos/programs/tui/default.nix
new file mode 100644
index 0000000..e69de29