diff --git a/home/desktop-full.nix b/home/desktop-full.nix
index dfdf6bb..0ee5bda 100644
--- a/home/desktop-full.nix
+++ b/home/desktop-full.nix
@@ -7,7 +7,7 @@
     ./modules/messaging.nix
     ./modules/r.nix
     ./modules/tex.nix
-    ./modules/mail
+    ./modules/mail.nix
     ./modules/office-gui.nix
     ./modules/office-cli.nix
     ./modules/aichat.nix
diff --git a/home/modules/mail/bindings.neomuttrc b/home/dotfiles/neomutt/bindings.neomuttrc
similarity index 100%
rename from home/modules/mail/bindings.neomuttrc
rename to home/dotfiles/neomutt/bindings.neomuttrc
diff --git a/home/modules/mail/config.neomuttrc b/home/dotfiles/neomutt/colors.neomuttrc
similarity index 56%
rename from home/modules/mail/config.neomuttrc
rename to home/dotfiles/neomutt/colors.neomuttrc
index 392c634..363f28f 100644
--- a/home/modules/mail/config.neomuttrc
+++ b/home/dotfiles/neomutt/colors.neomuttrc
@@ -1,48 +1,6 @@
-# Alias
-
-set alias_file = ~/.local/share/neomutt/aliases.neomuttrc
-source $alias_file
-
-# External
-
-set my_download_folder = ~/tmp
-
-# Status bar
-
-set status_chars = "✔↻٪A"
-unset help
-
-# Index
-
-set index_format = "%-25.25F %<[y?%<[7d?%<[d?%[     %H:%M]&%[%a  %H:%M]>&%[%d.%m. %Hh]>&%[%d.%m.%Y]> %Z %?X?▼ &?%s"
-set strict_threads
-set send_charset = "utf-8:iso-8859-1:us-ascii"
-set charset = "utf-8"
-
-# Pager view
-
-set pager_index_lines = 10
-set pager_context = 3
-set pager_stop
-set smart_wrap
-set menu_scroll
-set tilde
-unset markers
-ignore *
-unignore from: to: cc: bcc: date: subject:
-unhdr_order *
-hdr_order from: to: cc: bcc: date: subject:
-alternative_order text/plain text/enriched text/html
-auto_view text/html
-
-# Attachments
-
-set rfc2047_parameters
-set attach_save_dir = $my_download_folder
-
 # Colors
 
-color indicator white brightblack
+color indicator default brightblack
 color index_flags brightmagenta default '.*'
 color index_date cyan default
 color index  brightgreen default '~N'
diff --git a/home/dotfiles/neomutt/config.neomuttrc b/home/dotfiles/neomutt/config.neomuttrc
new file mode 100644
index 0000000..f7408be
--- /dev/null
+++ b/home/dotfiles/neomutt/config.neomuttrc
@@ -0,0 +1,43 @@
+# External
+
+set my_download_folder = ~/tmp
+
+# Status bar
+
+set status_chars = "✔↻٪A"
+unset help
+
+# Index
+
+set index_format = "%-25.25F %<[y?%<[7d?%<[d?%[     %H:%M]&%[%a  %H:%M]>&%[%d.%m. %Hh]>&%[%d.%m.%Y]> %Z %?X?▼ &?%s"
+set strict_threads
+set send_charset = "utf-8:iso-8859-1:us-ascii"
+set charset = "utf-8"
+
+# Pager view
+
+set pager_index_lines = 10
+set pager_context = 3
+set pager_stop
+set smart_wrap
+set menu_scroll
+set tilde
+unset markers
+ignore *
+unignore from: to: cc: bcc: date: subject:
+unhdr_order *
+hdr_order from: to: cc: bcc: date: subject:
+alternative_order text/plain text/enriched text/html
+auto_view text/html
+
+# Attachments
+
+set rfc2047_parameters
+set attach_save_dir = $my_download_folder
+
+# Alias
+
+set alias_file = ~/.local/share/neomutt/aliases.neomuttrc
+source $alias_file
+
+source colors.neomuttrc
diff --git a/home/modules/mail/default.nix b/home/modules/mail.nix
similarity index 96%
rename from home/modules/mail/default.nix
rename to home/modules/mail.nix
index 3f73a72..6a5d423 100644
--- a/home/modules/mail/default.nix
+++ b/home/modules/mail.nix
@@ -259,11 +259,11 @@ in
       { key = "l"; map = [ "index" "pager" ]; action = "<enter-command>unset signature<enter><list-reply>"; }
     ];
 
-    extraConfig = builtins.readFile ./config.neomuttrc;
+    extraConfig = builtins.readFile ../dotfiles/neomutt/config.neomuttrc;
   };
 
-  xdg.configFile."neomutt/bindings.neomuttrc".source = ./bindings.neomuttrc;
-
+  xdg.configFile."neomutt/colors.neomuttrc".source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/home/dotfiles/neomutt/colors.neomuttrc";
+  xdg.configFile."neomutt/bindings.neomuttrc".source = config.lib.file.mkOutOfStoreSymlink "/etc/nixos/home/dotfiles/neomutt/bindings.neomuttrc";
   programs.neovim.plugins = with pkgs.vimPlugins; [
     {
       plugin = vim-pathogen; 
diff --git a/home/modules/nvim/default.nix b/home/modules/nvim/default.nix
index cdb8211..9dbeba5 100644
--- a/home/modules/nvim/default.nix
+++ b/home/modules/nvim/default.nix
@@ -135,6 +135,13 @@
         '';
       }
 
+      {
+        plugin = catppuccin-nvim;
+        config = ''
+          colorscheme catppuccin-nvim
+        '';
+      }
+
       # {
       #   plugin = papercolor-theme;
       #   config = ''