diff --git a/themes/catppuccin/frappe.nix b/themes/catppuccin/frappe.nix
index 3cf5130..121a758 100644
--- a/themes/catppuccin/frappe.nix
+++ b/themes/catppuccin/frappe.nix
@@ -85,6 +85,8 @@ in
       extended = {
         color16 = peach;
         color17 = rosewater;
+        color18 = crust;
+        color19 = mantle;
       };
     };
     notification = {
diff --git a/themes/default.nix b/themes/default.nix
index 8305e3d..d475d9f 100644
--- a/themes/default.nix
+++ b/themes/default.nix
@@ -54,6 +54,8 @@ in
       extended = {
         color16 = mkColorOption null;
         color17 = mkColorOption null;
+        color18 = mkColorOption null;
+        color19 = mkColorOption null;
       };
     };
     notification = {
diff --git a/users/modules/file_manager/vifm_catppuccin.vifm b/users/modules/file_manager/vifm_catppuccin.vifm
index 7111e86..32d7e22 100644
--- a/users/modules/file_manager/vifm_catppuccin.vifm
+++ b/users/modules/file_manager/vifm_catppuccin.vifm
@@ -49,17 +49,17 @@
 highlight clear
 
 highlight Win         cterm=none ctermfg=7 ctermbg=none
-highlight TopLine     cterm=none ctermfg=7 ctermbg=0
-highlight TopLineSel  cterm=bold ctermfg=4 ctermbg=0
-highlight StatusLine  cterm=bold ctermfg=15 ctermbg=8
+highlight TopLine     cterm=none ctermfg=7 ctermbg=18
+highlight TopLineSel  cterm=bold ctermfg=4 ctermbg=18
+highlight StatusLine  cterm=bold ctermfg=7 ctermbg=18
 highlight CmdLine     cterm=none ctermfg=7 ctermbg=none
-highlight Border      cterm=none ctermfg=0 ctermbg=0
+highlight Border      cterm=none ctermfg=0 ctermbg=18
 highlight OtherLine   cterm=none ctermfg=none ctermbg=none
 highlight JobLine     cterm=bold,reverse ctermfg=black ctermbg=white
 highlight TabLine     cterm=none ctermfg=0 ctermbg=none
 highlight TabLineSel  cterm=bold ctermfg=0 ctermbg=2
 highlight SuggestBox  cterm=bold ctermfg=0 ctermbg=17
-highlight WildMenu    cterm=underline,reverse ctermfg=7 ctermbg=0
+highlight WildMenu    cterm=reverse ctermfg=default ctermbg=default
 
 highlight Directory   cterm=bold ctermfg=4 ctermbg=none
 
diff --git a/users/modules/mail/default.nix b/users/modules/mail/default.nix
index 95466b1..19d9ccd 100644
--- a/users/modules/mail/default.nix
+++ b/users/modules/mail/default.nix
@@ -135,17 +135,19 @@ in
       "error.fg" = 1;
       "warning.fg" = 3;
       "success.fg" = 2;
-      "statusline_default.bg" = 0;
+      "msglist_unread.bold" = true;
+      "msglist_deleted.fg" = 10;
+      "tab.fg" = 0;
+      "tab.selected.reverse" = false;
+      "tab.selected.bold" = true;
+      "tab.selected.bg" = 2;
+      "dirlist_default.bg" = 18;
+      "border.fg" = 0;
+      "statusline_default.bg" = 18;
       "statusline_error.fg" = 1;
       "statusline_error.reverse" = true;
       "statusline_success.fg" = 2;
       "statusline_success.reverse" = true;
-      "msglist_unread.bold" = true;
-      "msglist_deleted.fg" = 10;
-      "tab.bg" = 11;
-      "tab.selected.reverse" = false;
-      "tab.selected.bg" = 12;
-      "tab.fg" = 0;
       "completion_default.bg" = 0;
     };
   };
diff --git a/users/modules/terminal.nix b/users/modules/terminal.nix
index ddfa379..d70d82e 100644
--- a/users/modules/terminal.nix
+++ b/users/modules/terminal.nix
@@ -134,6 +134,14 @@ in
               index = 17;
               color = themeCfg.window.extended.color17;
             }
+            {
+              index = 18;
+              color = themeCfg.window.extended.color18;
+            }
+            {
+              index = 19;
+              color = themeCfg.window.extended.color19;
+            }
           ];
         };
       };