diff --git a/home/config/yazi/module/Theme.nix b/home/config/yazi/module/Theme.nix
index 93c0855c..af96139f 100644
--- a/home/config/yazi/module/Theme.nix
+++ b/home/config/yazi/module/Theme.nix
@@ -6,27 +6,27 @@ let
   borderLight = {
     fg = "#${config.style.color.accent}";
   };
+  hover = {
+    bg = "#${config.style.color.bg.regular}";
+    fg = "#${config.style.color.fg.light}";
+  };
+  select = {
+    bg = "#${config.style.color.selection}";
+    fg = "#${config.style.color.fg.dark}";
+  };
+  text = {
+    fg = "#${config.style.color.fg.light}";
+  };
 in
 {
   file = (pkgs.formats.toml { }).generate "YaziThemeConfig" {
     manager = {
       border_style = border;
       border_symbol = " ";
-      cwd = {
-        fg = "#${config.style.color.fg.light}";
-        # bg = "#${style.color.bg.regular}";
-      };
-      hovered = {
-        fg = "#${config.style.color.fg.light}";
-        bg = "#${config.style.color.bg.regular}";
-      };
-      preview_hovered = {
-        fg = "#${config.style.color.fg.light}";
-        bg = "#${config.style.color.bg.regular}";
-      };
-      tab_active = {
-        bg = "#${config.style.color.accent}";
-      };
+      cwd = text;
+      hovered = hover;
+      preview_hovered = hover;
+      tab_active = hover;
     };
     select = {
       border = borderLight;
@@ -36,58 +36,47 @@ in
     };
     completion = {
       border = borderLight;
+      active = hover;
+      inactive = text;
     };
     tasks = {
       border = borderLight;
     };
+    which = {
+      cand = text;
+      cols = 3;
+      desc = text;
+      mask = hover;
+      rest = text;
+      separator = "=>";
+      separator_style = text;
+    };
 
     status = {
-      separator_open = "";
+      mode_normal = hover;
+      mode_select = select;
+      permissions_r = text;
+      permissions_s = text;
+      permissions_t = text;
+      permissions_w = text;
+      permissions_x = text;
+      progress_label = hover;
+      progress_normal = hover;
       separator_close = "";
+      separator_open = "";
       # NOTE: Inversed because yazi dev is fckin weird. Also add manpages ffs.
       separator_style = {
         bg = "#${config.style.color.fg.light}";
         fg = "#${config.style.color.bg.regular}";
       };
-      mode_normal = {
-        fg = "#${config.style.color.fg.light}";
-        bg = "#${config.style.color.bg.regular}";
-      };
-      mode_select = {
-        fg = "#${config.style.color.fg.light}";
-        bg = "#${config.style.color.selection}";
-      };
       mode_unset = {
         fg = "#${config.style.color.fg.light}";
         bg = "#${config.style.color.neutral}";
       };
-      progress_label = {
-        fg = "#${config.style.color.fg.light}";
-        bg = "#${config.style.color.bg.regular}";
-      };
-      progress_normal = {
-        fg = "#${config.style.color.fg.light}";
-        bg = "#${config.style.color.bg.regular}";
-      };
       progress_error = {
         fg = "#${config.style.color.fg.light}";
         bg = "#${config.style.color.negative}";
       };
-      permissions_t = {
-        fg = "#${config.style.color.fg.light}";
-      };
-      permissions_r = {
-        fg = "#${config.style.color.fg.light}";
-      };
-      permissions_w = {
-        fg = "#${config.style.color.fg.light}";
-      };
-      permissions_x = {
-        fg = "#${config.style.color.fg.light}";
-      };
-      permissions_s = {
-        fg = "#${config.style.color.fg.light}";
-      };
     };
   };
 }
diff --git a/home/program/firefox/default.nix b/home/program/firefox/default.nix
index 44aecfc8..628b12f3 100644
--- a/home/program/firefox/default.nix
+++ b/home/program/firefox/default.nix
@@ -274,8 +274,8 @@ in
         enabled = true;
         enabledByDefault = true;
         changeBrowserTheme = false;
-        detectDarkTheme = true;
-        enableContextMenus = true;
+        detectDarkTheme = false;
+        enableContextMenus = false;
         enableForPDF = true;
         enableForProtectedPages = false;
         fetchNews = false;