diff --git a/crates/ui/src/theme/schema.rs b/crates/ui/src/theme/schema.rs
index 333fdc7d..d9e3ca96 100644
--- a/crates/ui/src/theme/schema.rs
+++ b/crates/ui/src/theme/schema.rs
@@ -495,8 +495,8 @@ impl Theme {
         apply_color!(progress_bar, fallback = self.primary);
         apply_color!(ring, fallback = self.primary);
         apply_color!(scrollbar, fallback = self.background);
-        apply_color!(scrollbar_thumb, fallback = self.secondary);
-        apply_color!(scrollbar_thumb_hover, fallback = self.secondary_hover);
+        apply_color!(scrollbar_thumb, fallback = self.accent);
+        apply_color!(scrollbar_thumb_hover, fallback = self.scrollbar_thumb);
         apply_color!(selection, fallback = self.primary.opacity(0.5));
         apply_color!(sidebar, fallback = self.background);
         apply_color!(sidebar_accent, fallback = self.accent);
diff --git a/themes/catppuccin.json b/themes/catppuccin.json
index f73ae107..c3362520 100644
--- a/themes/catppuccin.json
+++ b/themes/catppuccin.json
@@ -713,7 +713,8 @@
         "link.hover.foreground": "#89b4fa",
         "list.active.background": "#272C4022",
         "list.active.border": "#89b4fa",
-        "list.even.background": "#1e1e2e",
+        "list.hover.background": "#202031",
+        "list.even.background": "#161622",
         "list.head.background": "#1E1E2E",
         "muted.background": "#302d41",
         "muted.foreground": "#6c7086",
diff --git a/themes/fahrenheit.json b/themes/fahrenheit.json
index e26b91b8..72c4a20a 100644
--- a/themes/fahrenheit.json
+++ b/themes/fahrenheit.json
@@ -23,6 +23,7 @@
         "input.border": "#252525",
         "list.active.background": "#21010122",
         "list.active.border": "#720202",
+        "list.even.background": "#090909",
         "list.hover.background": "#111111",
         "muted.background": "#2e2e2e",
         "muted.foreground": "#828282",
diff --git a/themes/gruvbox.json b/themes/gruvbox.json
index 94d4dc47..3db72bad 100644
--- a/themes/gruvbox.json
+++ b/themes/gruvbox.json
@@ -26,8 +26,9 @@
         "link.foreground": "#458588",
         "link.hover.foreground": "#458588",
         "list.active.background": "#d7992122",
+        "list.hover.background": "#ebdbb2",
         "list.active.border": "#d79921",
-        "list.even.background": "#ebdbb2",
+        "list.even.background": "#f9ecba",
         "muted.background": "#d5c4a1",
         "muted.foreground": "#928374",
         "panel.background": "#ebdbb2",
diff --git a/themes/hybrid.json b/themes/hybrid.json
index 99b6bd60..2213e153 100644
--- a/themes/hybrid.json
+++ b/themes/hybrid.json
@@ -27,7 +27,8 @@
         "link.hover.foreground": "#005f87",
         "list.active.background": "#8A8A4A33",
         "list.active.border": "#79792C",
-        "list.even.background": "#E4E4E4",
+        "list.hover.background": "#D5D5D5",
+        "list.even.background": "#DFDFDF",
         "muted.background": "#e8e8e8",
         "muted.foreground": "#5f5f5f",
         "panel.background": "#f7f7f7",
diff --git a/themes/kibble.json b/themes/kibble.json
index 6cc97e05..735664a3 100644
--- a/themes/kibble.json
+++ b/themes/kibble.json
@@ -23,6 +23,7 @@
         "input.border": "#333333",
         "list.active.background": "#3448D122",
         "list.active.border": "#3448D1",
+        "list.hover.background": "#2c292b54",
         "list.even.background": "#24222355",
         "muted.background": "#333333",
         "muted.foreground": "#726E69",
diff --git a/themes/macos-classic.json b/themes/macos-classic.json
index 6c9a405f..29639737 100644
--- a/themes/macos-classic.json
+++ b/themes/macos-classic.json
@@ -26,8 +26,9 @@
         "input.border": "#E0E0E0",
         "list.active.background": "#C7DEFF",
         "list.active.border": "#0064E1",
-        "list.background": "#F9F9F9",
+        "list.background": "#FFFFFF",
         "list.even.background": "#F7F7F7",
+        "list.hover.background": "#E7E7E7",
         "list.head.background": "#F7F7F7",
         "muted.background": "#F7F7F7",
         "muted.foreground": "#505050",
diff --git a/themes/spaceduck.json b/themes/spaceduck.json
index b40e7703..a4ff4b50 100644
--- a/themes/spaceduck.json
+++ b/themes/spaceduck.json
@@ -24,7 +24,7 @@
         "link.hover.foreground": "#089CC5",
         "list.active.background": "#089CC511",
         "list.active.border": "#089CC5",
-        "list.even.background": "#089CC533",
+        "list.even.background": "#161928",
         "muted.background": "#272C42",
         "muted.foreground": "#4b6479",
         "panel.background": "#003a5b",
diff --git a/themes/tokyonight.json b/themes/tokyonight.json
index 890cedc8..ed8bc477 100644
--- a/themes/tokyonight.json
+++ b/themes/tokyonight.json
@@ -323,7 +323,7 @@
         "list.active.background": "#82aaff22",
         "list.active.border": "#82aaff",
         "list.background": "#222436",
-        "list.even.background": "#222436",
+        "list.even.background": "#282a40",
         "muted.background": "#2d3149",
         "muted.foreground": "#6e738d",
         "panel.background": "#2d3149",