diff --git a/.config/zathura/zathurarc b/.config/zathura/zathurarc
index c6f3b80..ed434e2 100644
--- a/.config/zathura/zathurarc
+++ b/.config/zathura/zathurarc
@@ -1,4 +1,5 @@
-include "dracula-zathura/zathurarc"
+# include "dracula-zathura/zathurarc"
+include "catppuccin/mocha"
 
 set sandbox normal
 
diff --git a/.vim/vimrc b/.vim/vimrc
index cf8d25c..1692f4f 100644
--- a/.vim/vimrc
+++ b/.vim/vimrc
@@ -45,6 +45,7 @@ Plug 'cocopon/iceberg.vim'
 Plug 'sainnhe/edge'
 Plug 'chriskempson/base16-vim'
 Plug 'axvr/photon.vim'
+Plug 'catppuccin/vim', { 'as': 'catppuccin' }
 Plug 'Lokaltog/vim-monotone'
 Plug 'https://git.sr.ht/~romainl/vim-bruin'
 Plug 'fxn/vim-monochrome'
@@ -149,7 +150,8 @@ let g:airline_highlighting_cache = 1
 " violet, wombat, deus
 " let g:airline_theme = 'violet'
 " let g:airline_theme = 'base16_spacemacs'
-let g:airline_theme = 'minimalist'
+" let g:airline_theme = 'minimalist'
+let g:airline_theme = 'catppuccin_mocha'
 " let g:airline_theme = 'iceberg'
 let g:airline#extensions#tabline#enabled = 1
 let g:airline#extensions#tabline#formatter = 'unique_tail_improved'
@@ -1359,7 +1361,8 @@ else
   " colo spacemacs-theme
   " colo monotone
   " colo space_vim_theme
-  colo photon
+  " colo photon
+  colo catppuccin_mocha
 
   " proper dark only when terminal bg is dark
   " colo bruin
diff --git a/nix/modules/xdg.nix b/nix/modules/xdg.nix
index 8dd1926..fb5dc79 100644
--- a/nix/modules/xdg.nix
+++ b/nix/modules/xdg.nix
@@ -3,13 +3,90 @@
   pkgs,
   hostName,
   ...
-}: {
+}: let
+  catppuccin = {
+    kitty = pkgs.fetchFromGitea {
+      domain = "gitea.catppuccin.com";
+      owner = "catppuccin";
+      repo = "kitty";
+      rev = "4820b3ef3f4968cf3084b2239ce7d1e99ea04dda";
+      sha256 = "sha256-uZSx+fuzcW//5/FtW98q7G4xRRjJjD5aQMbvJ4cs94U=";
+    };
+    btop = pkgs.fetchFromGitea {
+      domain = "gitea.catppuccin.com";
+      owner = "catppuccin";
+      repo = "btop";
+      rev = "89ff712eb62747491a76a7902c475007244ff202";
+      sha256 = "sha256-J3UezOQMDdxpflGax0rGBF/XMiKqdqZXuX4KMVGTxFk=";
+    };
+    zathura = pkgs.fetchFromGitea {
+      domain = "gitea.catppuccin.com";
+      owner = "catppuccin";
+      repo = "zathura";
+      rev = "d85d8750acd0b0247aa10e0653998180391110a4";
+      sha256 = "sha256-5Vh2bVabuBluVCJm9vfdnjnk32CtsK7wGIWM5+XnacM=";
+    };
+  };
+in {
   configFile."kitty/config.d" = {
     source = ./../../.config/kitty/config.d;
   };
-  configFile."kitty/current-theme.conf" = {
+
+  # set current kitty theme using:
+  #   kitty +kitten themes --reload-in all <theme>
+  #
+  # this makes linking the custom dracula to current-theme.conf obsolete
+
+  # configFile."kitty/current-theme.conf" = {
+  configFile."kitty/themes/customDracula.conf" = {
     source = ./../../.config/kitty/current-theme.conf;
   };
+  configFile."kitty/themes/diff-frappe.conf" = {
+    source =
+      catppuccin.kitty
+      + "/themes/diff-frappe.conf";
+  };
+  configFile."kitty/themes/diff-latte.conf" = {
+    source =
+      catppuccin.kitty
+      + "/themes/diff-latte.conf";
+  };
+  configFile."kitty/themes/diff-macchiato.conf" = {
+    source =
+      catppuccin.kitty
+      + "/themes/diff-macchiato.conf";
+  };
+  configFile."kitty/themes/diff-mocha.conf" = {
+    source =
+      catppuccin.kitty
+      + "/themes/diff-mocha.conf";
+  };
+  configFile."kitty/themes/frappe.conf" = {
+    source =
+      catppuccin.kitty
+      + "/themes/frappe.conf";
+  };
+  configFile."kitty/themes/latte.conf" = {
+    source =
+      catppuccin.kitty
+      + "/themes/latte.conf";
+  };
+  configFile."kitty/themes/macchiato.conf" = {
+    source =
+      catppuccin.kitty
+      + "/themes/macchiato.conf";
+  };
+  configFile."kitty/themes/mocha.conf" = {
+    source =
+      catppuccin.kitty
+      + "/themes/mocha.conf";
+  };
+
+  configFile."btop/themes/catppuccin_mocha.theme" = {
+    source =
+      catppuccin.btop
+      + "/themes/catppuccin_mocha.theme";
+  };
 
   configFile."aerc/aerc.conf" = {
     # source = ./../../.config/aerc/aerc.conf;
@@ -47,6 +124,26 @@
       sha256 = "sha256-g6vxwPw0Q9QFJBc3d4R3ZsHnnEvU5o1f4DSuyLeN5XQ=";
     };
   };
+  configFile."zathura/catppuccin/latte" = {
+    source =
+      catppuccin.zathura
+      + "/src/catppuccin-latte";
+  };
+  configFile."zathura/catppuccin/frappe" = {
+    source =
+      catppuccin.zathura
+      + "/src/catppuccin-frappe";
+  };
+  configFile."zathura/catppuccin/macchiato" = {
+    source =
+      catppuccin.zathura
+      + "/src/catppuccin-macchiato";
+  };
+  configFile."zathura/catppuccin/mocha" = {
+    source =
+      catppuccin.zathura
+      + "/src/catppuccin-mocha";
+  };
 
   configFile."qutebrowser/dracula" = {
     source = pkgs.fetchFromGitHub {