diff --git a/hosts/desktops/common/packages.nix b/hosts/desktops/common/packages.nix
index 58a1aa7..06dc9bd 100644
--- a/hosts/desktops/common/packages.nix
+++ b/hosts/desktops/common/packages.nix
@@ -52,7 +52,6 @@
     ventoy-bin
     virt-manager
     wezterm
-    yakuake
     # Package overrides
     (appimage-run.override {
       extraPkgs = pkgs: [  ];
diff --git a/users/common/home.nix b/users/common/home.nix
index 4e86758..d40c1e8 100644
--- a/users/common/home.nix
+++ b/users/common/home.nix
@@ -8,8 +8,9 @@
     sessionVariables = {
       EDITOR = "micro";
     };
-    activation.installMicroPlugins = ''
-      ${pkgs.micro}/bin/micro -plugin install filemanager
-    '';
+    file = {
+      ".config/btop/themes/catppuccin_mocha.theme".source = "${inputs.dotfiles}/.config/btop/themes/catppuccin_mocha.theme";
+      ""
+    };
   };
 }
diff --git a/users/common/programs.nix b/users/common/programs.nix
index 138651b..caa8d8e 100644
--- a/users/common/programs.nix
+++ b/users/common/programs.nix
@@ -19,7 +19,7 @@
         scrollbar = true;
         tabstospaces = true;
         tabsize = 2;
-        colorscheme = "cmc-16";
+        colorscheme = "simple";
       };
     };
     oh-my-posh = {
@@ -51,7 +51,7 @@
             owner = "oh-my-fish";
             repo = "plugin-bang-bang";
             rev = "f969c618301163273d0a03d002614d9a81952c1e";
-            sha256 = "A8ydBX4LORk+nutjHurqNNWFmW6LIiBPQcxS3x4nbeQ=";
+            sha256 = "sha256-A8ydBX4LORk+nutjHurqNNWFmW6LIiBPQcxS3x4nbeQ=";
           };
         }
         {
@@ -60,7 +60,15 @@
             owner = "PatrickF1";
             repo = "fzf.fish";
             rev = "v9.2";
-            sha256 = "XmRGe39O3xXmTvfawwT2mCwLIyXOlQm7f40mH5tzz+s=";
+            sha256 = "sha256-XmRGe39O3xXmTvfawwT2mCwLIyXOlQm7f40mH5tzz+s=";
+          };
+        }
+        {
+          name = "catppuccin";
+          src = {
+            owner = "catppuccin";
+            repo = "fish";
+            sha256 = "";
           };
         }
       ];
diff --git a/users/desktops/common/home.nix b/users/desktops/common/home.nix
index 71719e8..7153e3b 100644
--- a/users/desktops/common/home.nix
+++ b/users/desktops/common/home.nix
@@ -13,13 +13,12 @@
       syncthingtray
     ];
     file = {
-      # Dotfiles that can't be managed via home-manager
-      ".local/share/color-schemes/CatppuccinMocha.colors".source = "${inputs.dotfiles}/CatppuccinMocha.colors";
-      ".local/share/color-schemes/CatppuccinLatte.colors".source = "${inputs.dotfiles}/CatppuccinLatte.colors";
-      ".config/wezterm/wezterm.lua".source = "${inputs.dotfiles}/wezterm.lua";
-      ".config/MangoHud/MangoHud.conf".source = "${inputs.dotfiles}/MangoHud/MangoHud.conf";
+      ".config/wezterm/wezterm.lua".source = "${inputs.dotfiles}/.config/wezterm/wezterm.lua";
+      ".config/MangoHud/MangoHud.conf".source = "${inputs.dotfiles}/.config/MangoHud/MangoHud.conf";
+      ".config/solvespace/settings.json".source = "${inputs.dotfiles}/.config/solvespace/settings.json";
+      ".local/share/color-schemes/CatppuccinLatte.colors".source = "${inputs.dotfiles}/.local/share/color-schemes/CatppuccinLatte.colors";
+      ".local/share/color-schemes/CatppuccinMocha.colors".source = "${inputs.dotfiles}/.local/share/color-schemes/CatppuccinMocha.colors";
       # Autostart programs
-      ".config/autostart/org.kde.yakuake.desktop".source = config.lib.file.mkOutOfStoreSymlink "/var/run/current-system/sw/share/applications/org.kde.yakuake.desktop";
       ".config/autostart/koi.desktop".source = config.lib.file.mkOutOfStoreSymlink "/var/run/current-system/sw/share/applications/koi.desktop";
     };
   };