diff --git a/crates/ui/src/theme/schema.rs b/crates/ui/src/theme/schema.rs
index e7e50c5a..a0185037 100644
--- a/crates/ui/src/theme/schema.rs
+++ b/crates/ui/src/theme/schema.rs
@@ -613,9 +613,9 @@ impl ThemeColor {
         // TODO: Apply default fallback colors to highlight.
 
         // Ensure opacity for list_active, table_active
-        self.list_active = self.list_active.alpha(0.2);
-        self.table_active = self.table_active.alpha(0.2);
-        self.selection = self.selection.alpha(0.3);
+        self.list_active = self.list_active.alpha(self.list_active.a.min(0.2));
+        self.table_active = self.table_active.alpha(self.table_active.a.min(0.2));
+        self.selection = self.selection.alpha(self.selection.a.min(0.3));
     }
 }
 
diff --git a/themes/alduin.json b/themes/alduin.json
index 29c1a844..e48ee851 100644
--- a/themes/alduin.json
+++ b/themes/alduin.json
@@ -20,7 +20,7 @@
         "link.active.foreground": "#83a598",
         "link.foreground": "#83a598",
         "link.hover.foreground": "#83a598",
-        "list.active.background": "#26262622",
+        "list.active.background": "#262626",
         "list.active.border": "#9E9E9E",
         "list.even.background": "#262626",
         "list.head.background": "#1C1C1C",
diff --git a/themes/catppuccin.json b/themes/catppuccin.json
index 59cab2ae..a126a478 100644
--- a/themes/catppuccin.json
+++ b/themes/catppuccin.json
@@ -406,7 +406,7 @@
         "ring": "#f2d5cf",
         "foreground": "#c6d0f5",
         "input.border": "#51576d",
-        "list.active.background": "#8caaee11",
+        "list.active.background": "#8caaee15",
         "list.even.background": "#303446",
         "list.head.background": "#2A2C3C",
         "muted.background": "#414559",
@@ -546,7 +546,7 @@
         "link.active.foreground": "#8aadf4",
         "link.foreground": "#8aadf4",
         "link.hover.foreground": "#8aadf4",
-        "list.active.background": "#8aadf411",
+        "list.active.background": "#8aadf420",
         "list.active.border": "#8aadf4",
         "list.even.background": "#24273a",
         "list.head.background": "#363a4f33",
@@ -693,8 +693,8 @@
         "link.active.foreground": "#89b4fa",
         "link.foreground": "#89b4fa",
         "link.hover.foreground": "#89b4fa",
-        "list.active.background": "#272C4022",
-        "list.active.border": "#89b4fa",
+        "list.active.background": "#89b4fa15",
+        "list.active.border": "#89b4fa77",
         "list.hover.background": "#202031",
         "list.even.background": "#161622",
         "list.head.background": "#1E1E2E",
diff --git a/themes/everforest.json b/themes/everforest.json
index 899ed729..c1d52449 100644
--- a/themes/everforest.json
+++ b/themes/everforest.json
@@ -19,7 +19,7 @@
         "link.active.foreground": "#7fbbb3",
         "link.foreground": "#7fbbb3",
         "link.hover.foreground": "#7fbbb3",
-        "list.active.background": "#a7c08022",
+        "list.active.background": "#a7c08025",
         "list.active.border": "#a7c080",
         "list.even.background": "#F4F1E2",
         "list.head.background": "#F4F1E2",
@@ -163,7 +163,7 @@
         "link.foreground": "#7fbbb3",
         "link.hover.foreground": "#7fbbb3",
         "list.active.background": "#a7c08022",
-        "list.active.border": "#a7c080",
+        "list.active.border": "#a7c08088",
         "list.even.background": "#2E383B",
         "list.head.background": "#2E383B",
         "muted.background": "#2E383B",
diff --git a/themes/fahrenheit.json b/themes/fahrenheit.json
index 79a5fb2e..656b01e0 100644
--- a/themes/fahrenheit.json
+++ b/themes/fahrenheit.json
@@ -15,7 +15,7 @@
         "danger.background": "#593002",
         "foreground": "#FFFFCE",
         "input.border": "#252525",
-        "list.active.background": "#21010122",
+        "list.active.background": "#72020222",
         "list.active.border": "#720202",
         "list.even.background": "#090909",
         "list.hover.background": "#111111",
diff --git a/themes/flexoki.json b/themes/flexoki.json
index ff1bf934..52b472c2 100644
--- a/themes/flexoki.json
+++ b/themes/flexoki.json
@@ -16,7 +16,7 @@
         "ring": "#D0A215",
         "selection.background": "#D0A21577",
         "input.border": "#E6E4D9",
-        "list.active.background": "#D0A21577",
+        "list.active.background": "#D0A21520",
         "list.active.border": "#D0A215",
         "list.background": "#FFFCF0",
         "list.even.background": "#F2F0E5",
diff --git a/themes/harper.json b/themes/harper.json
index 6ca5cc86..74407f2f 100644
--- a/themes/harper.json
+++ b/themes/harper.json
@@ -14,8 +14,8 @@
         "border": "#333333",
         "foreground": "#a8a49d",
         "input.border": "#333333",
-        "list.active.background": "#B196C611",
-        "list.active.border": "#B196C644",
+        "list.active.background": "#B196C622",
+        "list.active.border": "#B196C699",
         "list.even.background": "#18151B77",
         "muted.background": "#333333",
         "muted.foreground": "#726E69",
diff --git a/themes/hybrid.json b/themes/hybrid.json
index 423e89d8..4d26e830 100644
--- a/themes/hybrid.json
+++ b/themes/hybrid.json
@@ -19,7 +19,7 @@
         "link.active.foreground": "#005f87",
         "link.foreground": "#005f87",
         "link.hover.foreground": "#005f87",
-        "list.active.background": "#8A8A4A33",
+        "list.active.background": "#79792C20",
         "list.active.border": "#79792C",
         "list.hover.background": "#D5D5D5",
         "list.even.background": "#DFDFDF",
diff --git a/themes/jellybeans.json b/themes/jellybeans.json
index a07b1426..0c728b6a 100644
--- a/themes/jellybeans.json
+++ b/themes/jellybeans.json
@@ -18,8 +18,8 @@
         "link.active.foreground": "#97bedc",
         "link.foreground": "#97bedc",
         "link.hover.foreground": "#97bedc",
-        "list.active.background": "#97bedc11",
-        "list.active.border": "#97bedc44",
+        "list.active.background": "#97bedc15",
+        "list.active.border": "#97bedc",
         "list.even.background": "#1C1C1C",
         "muted.background": "#3a3a3a",
         "muted.foreground": "#767676",
diff --git a/themes/macos-classic.json b/themes/macos-classic.json
index 3a731380..e9760d31 100644
--- a/themes/macos-classic.json
+++ b/themes/macos-classic.json
@@ -16,7 +16,7 @@
         "ring": "#0064E1",
         "danger.foreground": "#FFFFFF",
         "input.border": "#E0E0E0",
-        "list.active.background": "#C7DEFF",
+        "list.active.background": "#0064E110",
         "list.active.border": "#0064E1",
         "list.background": "#FFFFFF",
         "list.even.background": "#F7F7F7",
@@ -157,7 +157,7 @@
         "ring": "#0059D1",
         "foreground": "#DEDEDE",
         "input.border": "#494949",
-        "list.active.background": "#353436",
+        "list.active.background": "#0059D115",
         "list.active.border": "#0059D1",
         "muted.background": "#1E1D1E",
         "muted.foreground": "#9D9D9D",
diff --git a/themes/matrix.json b/themes/matrix.json
index c0f866be..66ee784c 100644
--- a/themes/matrix.json
+++ b/themes/matrix.json
@@ -25,7 +25,7 @@
         "link.active.foreground": "#00FF00",
         "link.foreground": "#00FF00",
         "link.hover.foreground": "#00FF00",
-        "list.active.background": "#00190066",
+        "list.active.background": "#00FF0011",
         "list.active.border": "#00FF00",
         "list.even.background": "#00190066",
         "muted.background": "#001900",
diff --git a/themes/mellifluous.json b/themes/mellifluous.json
index 84305a0a..3d276a62 100644
--- a/themes/mellifluous.json
+++ b/themes/mellifluous.json
@@ -20,7 +20,7 @@
         "link.foreground": "#5A6599",
         "link.hover.foreground": "#5A6599",
         "list.hover.background": "#d5d5d5",
-        "list.active.background": "#60606022",
+        "list.active.background": "#5A659922",
         "list.active.border": "#5A6599",
         "list.even.background": "#F0F0F0",
         "muted.background": "#e5e5e5",
diff --git a/themes/solarized.json b/themes/solarized.json
index 6b30b2f7..15b94eba 100644
--- a/themes/solarized.json
+++ b/themes/solarized.json
@@ -15,7 +15,7 @@
         "foreground": "#586E75",
         "input.border": "#DCD4BC",
         "link.foreground": "#587573",
-        "list.active.background": "#859ca322",
+        "list.active.background": "#586E75",
         "list.active.border": "#586E75",
         "list.even.background": "#EEE8D599",
         "muted.background": "#eee8d5",
@@ -156,7 +156,7 @@
         "border": "#083e4c",
         "foreground": "#fdf6e3",
         "input.border": "#083e4c",
-        "list.active.background": "#0d667d22",
+        "list.active.background": "#0d667d25",
         "list.active.border": "#0d667d",
         "list.even.background": "#15333A99",
         "muted.background": "#073642",
diff --git a/themes/tokyonight.json b/themes/tokyonight.json
index a1059aa0..c8a8e2b1 100644
--- a/themes/tokyonight.json
+++ b/themes/tokyonight.json
@@ -16,7 +16,7 @@
         "ring": "#7aa2f7",
         "foreground": "#c0caf5",
         "input.border": "#414868",
-        "link.active.foreground": "#7aa2f7",
+        "link.active.foreground": "#7aa2f722",
         "link.foreground": "#7aa2f7",
         "link.hover.foreground": "#7aa2f7",
         "list.active.background": "#7aa2f722",