diff --git a/flake.lock b/flake.lock
index fd7d351..c430f78 100644
--- a/flake.lock
+++ b/flake.lock
@@ -21,21 +21,6 @@
         "type": "github"
       }
     },
-    "catppuccin": {
-      "locked": {
-        "lastModified": 1726952185,
-        "narHash": "sha256-l/HbsQjJMT6tlf8KCooFYi3J6wjIips3n6/aWAoLY4g=",
-        "owner": "catppuccin",
-        "repo": "nix",
-        "rev": "630b559cc1cb4c0bdd525af506935323e4ccd5d1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "catppuccin",
-        "repo": "nix",
-        "type": "github"
-      }
-    },
     "crane": {
       "inputs": {
         "nixpkgs": [
@@ -448,11 +433,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1726985855,
-        "narHash": "sha256-NJPGK030Y3qETpWBhj9oobDQRbXdXOPxtu+YgGvZ84o=",
+        "lastModified": 1725863684,
+        "narHash": "sha256-HmdTBpuCsw35Ii35JUKO6AE6nae+kJliQb0XGd4hoLE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "04213d1ce4221f5d9b40bcee30706ce9a91d148d",
+        "rev": "be47a2bdf278c57c2d05e747a13ed31cef54a037",
         "type": "github"
       },
       "original": {
@@ -1104,7 +1089,6 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
-        "catppuccin": "catppuccin",
         "disko": "disko",
         "dream2nix": "dream2nix",
         "flakeParts": "flakeParts",
diff --git a/flake.nix b/flake.nix
index 79dd5bc..65cf299 100644
--- a/flake.nix
+++ b/flake.nix
@@ -59,7 +59,6 @@
       url = "github:nix-community/lanzaboote";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    catppuccin.url = "github:catppuccin/nix";
   };
 
   outputs =
diff --git a/hmModules/btop/default.nix b/hmModules/btop/default.nix
index 5d23dec..d3568da 100644
--- a/hmModules/btop/default.nix
+++ b/hmModules/btop/default.nix
@@ -1,9 +1,21 @@
+{ pkgs, ... }:
 {
   programs.btop = {
     enable = true;
     settings = {
       update_ms = 100;
       theme_background = false;
+      # color_theme = "${config.programs.btop.package}/share/btop/themes/dracula.theme";
+      color_theme =
+        let
+          catppuccin-theme = pkgs.fetchFromGitHub {
+            owner = "catppuccin";
+            repo = "btop";
+            rev = "21b8d5956a8b07fa52519e3267fb3a2d2e693d17";
+            hash = "sha256-UXeTypc15MhjgGUiCrDUZ40m32yH2o1N+rcrEgY6sME=";
+          };
+        in
+        "${catppuccin-theme}/themes/catppuccin_mocha.theme";
     };
   };
 }
diff --git a/hmModules/catppuccin/default.nix b/hmModules/catppuccin/default.nix
deleted file mode 100644
index 7b00ca9..0000000
--- a/hmModules/catppuccin/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib, ... }:
-{
-  catppuccin = {
-    enable = true;
-    flavor = "mocha";
-    accent = "sapphire";
-  };
-
-  qt = {
-    platformTheme.name = lib.mkForce "kvantum";
-    style.name = lib.mkForce "kvantum";
-  };
-
-  # TODO move away
-  programs.alacritty = {
-    enable = true;
-    settings = {
-      font = {
-        normal = {
-          family = "Fira Code";
-          style = "Regular";
-        };
-        bold = {
-          family = "Fira Code";
-          style = "Bold";
-        };
-        italic = {
-          family = "Cascadia Code";
-          style = "Italic";
-        };
-        bold_italic = {
-          family = "Fira Code";
-          style = "Bold Italic";
-        };
-        size = 13;
-      };
-    };
-  };
-}
diff --git a/hmModules/foot/default.nix b/hmModules/foot/default.nix
index 620d5f8..620e385 100644
--- a/hmModules/foot/default.nix
+++ b/hmModules/foot/default.nix
@@ -1,50 +1,59 @@
 {
   lib,
+  pkgs,
   config,
   ...
 }:
 lib.mkMerge [
   {
-    programs.foot = {
-      enable = true;
-      server.enable = true;
-      settings = {
-        main = {
-          term = "xterm-256color";
-          login-shell = "yes";
-          dpi-aware = "no";
-          horizontal-letter-offset = "1";
-          font =
-            let
-              size = "13";
-            in
-            lib.mkForce (
+    programs.foot =
+      let
+        catppuccin = pkgs.fetchFromGitHub {
+          owner = "catppuccin";
+          repo = "foot";
+          rev = "307611230661b7b1787feb7f9d122e851bae97e9";
+          hash = "sha256-mkPYHDJtfdfDnqLr1YOjaBpn4lCceok36LrnkUkNIE4=";
+        };
+      in
+      {
+        enable = true;
+        server.enable = true;
+        settings = {
+          main = {
+            term = "xterm-256color";
+            login-shell = "yes";
+            dpi-aware = "no";
+            horizontal-letter-offset = "1";
+            include = "${catppuccin}/themes/catppuccin-mocha.ini";
+            font =
+              let
+                size = "13";
+              in
               lib.concatStringsSep ", " [
                 "Iosevka Comfy:size=${size}"
                 "Symbols Nerd Font:size=${size}"
                 "JoyPixels:size=${size}"
-              ]
-            );
-        };
-        cursor = {
-          blink = true;
-        };
-        tweak = {
-          overflowing-glyphs = true;
-        };
+              ];
+          };
+          cursor = {
+            blink = true;
+          };
+          tweak = {
+            overflowing-glyphs = true;
+          };
 
-        key-bindings = {
-          scrollback-up-page = "Control+Shift+k";
-          scrollback-down-page = "Control+Shift+j";
-          search-start = "Control+Shift+s";
-          pipe-command-output = ''[sh -c 'f=$(mktemp); cat - > $f; footclient hx $f; rm $f'] Control+Shift+g'';
-        };
+          key-bindings = {
+            scrollback-up-page = "Control+Shift+k";
+            scrollback-down-page = "Control+Shift+j";
+            search-start = "Control+Shift+s";
+            pipe-command-output = ''[sh -c 'f=$(mktemp); cat - > $f; footclient hx $f; rm $f'] Control+Shift+g'';
+          };
 
-        mouse = {
-          hide-when-typing = "yes";
+          mouse = {
+            hide-when-typing = "yes";
+          };
         };
       };
-    };
   }
   (lib.mkIf config.programs.fish.enable {
     programs.fish.functions = {
diff --git a/hmModules/helix/default.nix b/hmModules/helix/default.nix
index c6ef610..5816637 100644
--- a/hmModules/helix/default.nix
+++ b/hmModules/helix/default.nix
@@ -12,6 +12,7 @@
     enable = true;
     defaultEditor = true;
     settings = {
+      theme = "catppuccin_mocha";
       editor = {
         indent-guides.render = true;
         cursor-shape = {
diff --git a/hmModules/hyprland/default.nix b/hmModules/hyprland/default.nix
index 92ffe67..646254c 100644
--- a/hmModules/hyprland/default.nix
+++ b/hmModules/hyprland/default.nix
@@ -56,20 +56,21 @@ in
 
   gtk = {
     enable = true;
-    # font.name = lib.mkForce "Sans,Symbols Nerd Font";
+    font.name = "Sans,Symbols Nerd Font";
     iconTheme = {
       name = "Adwaita";
       package = pkgs.adwaita-icon-theme;
     };
-    # cursorTheme = {
-    #   name = "catppuccin-mocha-sapphire";
-    #   package = pkgs.catppuccin-cursors;
-    #   size = 48;
-    # };
+    cursorTheme = {
+      name = "catppuccin-mocha-sapphire";
+      package = pkgs.catppuccin-cursors;
+      size = 48;
+    };
   };
 
   qt = {
     enable = true;
+    platformTheme.name = "gtk3";
   };
 
   # services.kanshi = {
diff --git a/hmModules/shell/default.nix b/hmModules/shell/default.nix
index d1e8fc4..64f955e 100644
--- a/hmModules/shell/default.nix
+++ b/hmModules/shell/default.nix
@@ -116,11 +116,45 @@
   #   '';
   # };
 
+  xdg.configFile = {
+    "dracula-theme" = {
+      target = "fish/themes/dracula.theme";
+      source =
+        let
+          theme = pkgs.fetchFromGitHub {
+            owner = "dracula";
+            repo = "fish";
+            rev = "269cd7d76d5104fdc2721db7b8848f6224bdf554";
+            hash = "sha256-Hyq4EfSmWmxwCYhp3O8agr7VWFAflcUe8BUKh50fNfY=";
+          };
+        in
+        "${theme}/themes/Dracula\ Official.theme";
+    };
+    "catppuccin-theme" = {
+      target = "fish/themes/Catppuccin\ Mocha.theme";
+      source =
+        let
+          theme = pkgs.fetchFromGitHub {
+            owner = "catppuccin";
+            repo = "fish";
+            rev = "a3b9eb5eaf2171ba1359fe98f20d226c016568cf";
+            hash = "sha256-shQxlyoauXJACoZWtRUbRMxmm10R8vOigXwjxBhG8ng=";
+          };
+        in
+        "${theme}/themes/Catppuccin\ Mocha.theme";
+    };
+  };
+
   programs.fish = {
     enable = true;
-    shellInit = lib.optionalString (builtins.hasAttr "cachix-personal-token" age.secrets) ''
-      export CACHIX_AUTH_TOKEN=$(cat ${age.secrets.cachix-personal-token.path})
-    '';
+    shellInit =
+      ''
+        fish_config theme choose "dracula"
+        fish_config theme choose "Catppuccin Mocha"
+      ''
+      + lib.optionalString (builtins.hasAttr "cachix-personal-token" age.secrets) ''
+        export CACHIX_AUTH_TOKEN=$(cat ${age.secrets.cachix-personal-token.path})
+      '';
     shellAliases = {
       "cat" = "bat";
     };
diff --git a/hmModules/sway/default.nix b/hmModules/sway/default.nix
index 95d5bf4..26fee7a 100644
--- a/hmModules/sway/default.nix
+++ b/hmModules/sway/default.nix
@@ -28,7 +28,7 @@
 
     gtk = {
       enable = true;
-      font.name = lib.mkForce "Sans,Symbols Nerd Font";
+      font.name = "Sans,Symbols Nerd Font";
       iconTheme = {
         name = "Adwaita";
         package = pkgs.adwaita-icon-theme;
diff --git a/hosts/default.nix b/hosts/default.nix
index 400f3ce..18e0bc7 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -68,13 +68,11 @@
           inputs.nixThePlanet.nixosModules.macos-ventura
           inputs.lix-module.nixosModules.default
           inputs.lanzaboote.nixosModules.lanzaboote
-          inputs.catppuccin.nixosModules.catppuccin
         ];
         extraHmModules = [
           # inputs.ccrEmacs.hmModules.default
           "${inputs.homeManagerGitWorkspace}/modules/services/git-workspace.nix"
           inputs.vscode-server.nixosModules.home
-          inputs.catppuccin.homeManagerModules.catppuccin
         ];
         secrets = {
           "picard-wireguard-private-key" = { };
diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix
index def7e50..baf46b0 100644
--- a/hosts/picard/default.nix
+++ b/hosts/picard/default.nix
@@ -84,7 +84,6 @@
       "reinstall-magisk-on-lineage"
       "vscode-server"
       "zk"
-      "catppuccin"
     ];
     extraGroups = [ ];
     backupPaths = [ ];
diff --git a/modules/nix/default.nix b/modules/nix/default.nix
index cf855e4..550aadf 100644
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -32,7 +32,7 @@
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
         "mlabs.cachix.org-1:gStKdEqNKcrlSQw5iMW6wFCj3+b+1ASpBVY2SYuNV2M="
       ];
-      deprecated-features = [ "url-literals" ];
+      # deprecated-features = [ "url-literals" ];
     };
 
     nixPath = [ "nixpkgs=${fleetFlake.inputs.nixpkgs}" ];