diff --git a/common/home.nix b/common/home.nix
index 53a294d5..215c147a 100644
--- a/common/home.nix
+++ b/common/home.nix
@@ -6,6 +6,7 @@
     ./nvim.nix
     ./goread.nix
     ./ncmpcpp.nix
+    # ./neomutt.nix
   ] ++ lib.optionals device.isLinux [ ../linux ];
 
   home.packages = with pkgs;
@@ -53,6 +54,8 @@
     ] ++ lib.optionals device.isLinux [
       mpv
       psst
+      catppuccinThemes.gtk
+      catppuccinThemes.papirus-folders
       gnome.seahorse
       gnome.nautilus
       nextcloud-client
@@ -63,16 +66,6 @@
       dig
       mullvad
       steam-run
-      (pkgs.catppuccin-gtk.override {
-        variant = "mocha";
-        size = "standard";
-        accents = [ "mauve" ];
-        tweaks = [ "normal" ];
-      })
-      (pkgs.catppuccin-papirus-folders.override {
-        accent = "mauve";
-        flavor = "mocha";
-      })
       usbutils
       handlr-regex
       handlr-xdg
@@ -173,22 +166,23 @@
       enable = true;
       enableFishIntegration = true;
       enableNushellIntegration = true;
-      settings = let flavour = "mocha"; # Replace with your preferred palette
-      in {
-        # Check https://starship.rs/config/#prompt
-        format = "$all$character";
-        palette = "catppuccin_${flavour}";
-        character = {
-          success_symbol = "[[OK](bold green) ❯](maroon)";
-          error_symbol = "[❯](red)";
-          vimcmd_symbol = "[❮](green)";
-        };
-        directory = {
-          truncation_length = 4;
-          style = "bold lavender";
-        };
-      } // builtins.fromTOML (builtins.readFile
-        (pkgs.catppuccinThemes.starship + /palettes/${flavour}.toml));
+      settings =
+        let flavour = "mocha"; # Replace with your preferred palette
+        in {
+          # Check https://starship.rs/config/#prompt
+          format = "$all$character";
+          palette = "catppuccin_${flavour}";
+          character = {
+            success_symbol = "[[OK](bold green) ❯](maroon)";
+            error_symbol = "[❯](red)";
+            vimcmd_symbol = "[❮](green)";
+          };
+          directory = {
+            truncation_length = 4;
+            style = "bold lavender";
+          };
+        } // builtins.fromTOML (builtins.readFile
+          (pkgs.catppuccinThemes.starship + /palettes/${flavour}.toml));
     };
     eza = {
       enable = true;
@@ -251,10 +245,11 @@
 
   home = {
     username = device.user;
-    homeDirectory = if device.isMac then
-      lib.mkForce "/Users/${device.user}"
-    else
-      lib.mkForce "/home/${device.user}";
+    homeDirectory =
+      if device.isMac then
+        lib.mkForce "/Users/${device.user}"
+      else
+        lib.mkForce "/home/${device.user}";
 
     stateVersion = "23.11";
 
diff --git a/common/neomutt.nix b/common/neomutt.nix
new file mode 100644
index 00000000..5cbe196a
--- /dev/null
+++ b/common/neomutt.nix
@@ -0,0 +1,9 @@
+{ pkgs, ... }: {
+  programs.neomutt = {
+    enable = true;
+    vimKeys = true;
+    editor = "nvim";
+    # sidebar = {
+    # };
+  };
+}
diff --git a/overlays.nix b/overlays.nix
index 3d23b209..3361c362 100644
--- a/overlays.nix
+++ b/overlays.nix
@@ -74,6 +74,12 @@ let
         src = picat-src;
         cargoLock = { lockFile = "${picat-src}/Cargo.lock"; };
       };
+
+    psst = (prev.psst.overrideAttrs (final: prev: {
+      postInstall = (prev.postInstall or "") + ''
+        patch $out/share/applications/Psst.desktop < ${./patches/psst.patch}
+      '';
+    }));
   };
 
   anyrun-overlay = final: prev: {
diff --git a/patches/psst.patch b/patches/psst.patch
new file mode 100644
index 00000000..a95c4cf2
--- /dev/null
+++ b/patches/psst.patch
@@ -0,0 +1,13 @@
+diff --git a/Psst.desktop b/Psst.desktop
+index 267da3c..258dba2 100644
+--- a/Psst.desktop
++++ b/Psst.desktop
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Categories=Audio;AudioVideo
+ Comment=Fast and multi-platform Spotify client with native GUI
+-Exec=psst-gui
++Exec=env WAYLAND_DISPLAY= psst-gui
+ Icon=psst
+ Name=Psst
+ StartupWMClass=psst-gui
diff --git a/themes/catppuccin.nix b/themes/catppuccin.nix
index f80feff2..356699b8 100644
--- a/themes/catppuccin.nix
+++ b/themes/catppuccin.nix
@@ -59,4 +59,16 @@ in
     rev = "main";
     sha256 = "sha256-czvR3bVZ0NfBmuu0JixalS7B1vf1uEGSTSUVVTclKxI";
   };
+
+  gtk = (pkgs.catppuccin-gtk.override {
+    variant = "mocha";
+    size = "standard";
+    accents = [ "mauve" ];
+    tweaks = [ "normal" ];
+  });
+
+  papirus-folders = (pkgs.catppuccin-papirus-folders.override {
+    accent = "mauve";
+    flavor = "mocha";
+  });
 }