diff --git a/homes/x86_64-linux/jo/default.nix b/homes/x86_64-linux/jo/default.nix
index fa5d00e..39536ca 100644
--- a/homes/x86_64-linux/jo/default.nix
+++ b/homes/x86_64-linux/jo/default.nix
@@ -4,28 +4,8 @@
   };
 
   home.packages = with pkgs; [
-    ## GENERAL
-    youtube-music
-    discord
-    ghostty
-    teams-for-linux
-    enpass
-
-    ## WEB
-    firefox
-    ungoogled-chromium
-
-    ## EDITORS
-    nano
     zed-editor
-    apostrophe
-    jetbrains.phpstorm
-    arduino-ide
-    obsidian
-
-    ## RUNTIMES and CLIs for development
-    bun
-    git
+    firefox
   ];
 
   home.stateVersion = "25.05";
diff --git a/modules/home/themes/catppuccin/default.nix b/modules/home/themes/catppuccin/default.nix
index 11b0ccf..7e49943 100644
--- a/modules/home/themes/catppuccin/default.nix
+++ b/modules/home/themes/catppuccin/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   self,
-  pkgs,
   config,
   osConfig,
   namespace,
@@ -10,15 +9,12 @@
   inherit (lib) mkEnableOption types mkIf;
   inherit (self.lib) mkOpt;
 
-  palette = (pkgs.lib.importJSON (config.catppuccin.sources.palette + "/palette.json")).${config.catppuccin.flavor}.colors;
-
   cfg = config.${namespace}.themes.catppuccin;
 in {
   options.${namespace}.themes.catppuccin = {
     enable = mkEnableOption "the Catppuccin theme, globally.";
     accent = mkOpt types.str "blue" "The accent colour to use.";
     flavor = mkOpt types.str "macchiato" "The flavor to use.";
-    palette = mkOpt (lib.types.attrsOf lib.types.raw) palette "a reference to the current active Catppuccin palette.";
   };
 
   config = mkIf cfg.enable {
@@ -32,8 +28,6 @@ in {
       cursors.flavor = cfg.flavor;
     };
 
-    ${namespace}.themes.catppuccin = {
-      gtk.enable = mkIf osConfig.${namespace}.desktop.gnome.enable true;
-    };
+    ${namespace}.themes.catppuccin.gtk.enable = mkIf osConfig.${namespace}.desktop.gnome.enable true;
   };
 }
diff --git a/modules/home/themes/catppuccin/palette/default.nix b/modules/home/themes/catppuccin/palette/default.nix
new file mode 100644
index 0000000..6fdff23
--- /dev/null
+++ b/modules/home/themes/catppuccin/palette/default.nix
@@ -0,0 +1,14 @@
+{
+  lib,
+  pkgs,
+  config,
+  namespace,
+  ...
+}: let
+  inherit (lib) mkOption mkIf;
+  palette = (pkgs.lib.importJSON (config.catppuccin.sources.palette + "/palette.json")).${config.catppuccin.flavor}.colors;
+in {
+  options.${namespace}.themes.catppuccin.palette = mkOption {type = lib.types.attrsOf lib.types.raw;};
+
+  config.${namespace}.themes.catppuccin.palette = mkIf config.${namespace}.themes.catppuccin.enable palette;
+}
diff --git a/modules/nixos/services/home-manager/default.nix b/modules/nixos/services/home-manager/default.nix
deleted file mode 100644
index 017f26a..0000000
--- a/modules/nixos/services/home-manager/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{...}: {
-  # Todo: rewrite as recursive operation, based on ${namespace}.users
-  system.userActivationScripts = {
-    removeConflictingHomeManagerBackups = {
-      text = ''
-        rm -f /home/jo/.gtkrc-2.0.homeManagerBackupFileExtension
-        rm -f /home/jo/.config/gtk-3.0/gtk.css.homeManagerBackupFileExtension
-        rm -f /home/jo/.config/gtk-4.0/gtk.css.homeManagerBackupFileExtension
-      '';
-    };
-  };
-
-  home-manager.backupFileExtension = "homeManagerBackupFileExtension";
-}