diff --git a/crates/theme2/src/themes/andromeda.rs b/crates/theme2/src/themes/andromeda.rs
index 766de3faac..2a0b5dca75 100644
--- a/crates/theme2/src/themes/andromeda.rs
+++ b/crates/theme2/src/themes/andromeda.rs
@@ -56,7 +56,7 @@ pub fn andromeda() -> UserThemeFamily {
                     tab_bar_background: Some(rgba(0x21242bff).into()),
                     tab_inactive_background: Some(rgba(0x21242bff).into()),
                     tab_active_background: Some(rgba(0x1e2025ff).into()),
-                    scrollbar_thumb_background: Some(rgba(0x21242bff).into()),
+                    scrollbar_thumb_background: Some(rgba(0xf7f7f84c).into()),
                     scrollbar_thumb_hover_background: Some(rgba(0x252931ff).into()),
                     scrollbar_thumb_border: Some(rgba(0x252931ff).into()),
                     scrollbar_track_background: Some(rgba(0x1e2025ff).into()),
diff --git a/crates/theme2/src/themes/atelier.rs b/crates/theme2/src/themes/atelier.rs
index ff4c212bc4..690dede609 100644
--- a/crates/theme2/src/themes/atelier.rs
+++ b/crates/theme2/src/themes/atelier.rs
@@ -57,7 +57,7 @@ pub fn atelier() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0xebeae3ff).into()),
                         tab_inactive_background: Some(rgba(0xebeae3ff).into()),
                         tab_active_background: Some(rgba(0xf4f3ecff).into()),
-                        scrollbar_thumb_background: Some(rgba(0xebeae3ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0x22221b4c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0xd1d0c6ff).into()),
                         scrollbar_thumb_border: Some(rgba(0xd1d0c6ff).into()),
                         scrollbar_track_background: Some(rgba(0xf4f3ecff).into()),
@@ -494,7 +494,7 @@ pub fn atelier() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0x27211eff).into()),
                         tab_inactive_background: Some(rgba(0x27211eff).into()),
                         tab_active_background: Some(rgba(0x1b1918ff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x27211eff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xf1efee4c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0x3b3431ff).into()),
                         scrollbar_thumb_border: Some(rgba(0x3b3431ff).into()),
                         scrollbar_track_background: Some(rgba(0x1b1918ff).into()),
@@ -931,7 +931,7 @@ pub fn atelier() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0xe3ebe6ff).into()),
                         tab_inactive_background: Some(rgba(0xe3ebe6ff).into()),
                         tab_active_background: Some(rgba(0xecf4eeff).into()),
-                        scrollbar_thumb_background: Some(rgba(0xe3ebe6ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0x171c194c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0xc8d1cbff).into()),
                         scrollbar_thumb_border: Some(rgba(0xc8d1cbff).into()),
                         scrollbar_track_background: Some(rgba(0xecf4eeff).into()),
@@ -1368,7 +1368,7 @@ pub fn atelier() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0x221f26ff).into()),
                         tab_inactive_background: Some(rgba(0x221f26ff).into()),
                         tab_active_background: Some(rgba(0x19171cff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x221f26ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xefecf44c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0x332f38ff).into()),
                         scrollbar_thumb_border: Some(rgba(0x332f38ff).into()),
                         scrollbar_track_background: Some(rgba(0x19171cff).into()),
@@ -1805,7 +1805,7 @@ pub fn atelier() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0x2c2b23ff).into()),
                         tab_inactive_background: Some(rgba(0x2c2b23ff).into()),
                         tab_active_background: Some(rgba(0x22221bff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x2c2b23ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xf4f3ec4c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0x3c3b31ff).into()),
                         scrollbar_thumb_border: Some(rgba(0x3c3b31ff).into()),
                         scrollbar_track_background: Some(rgba(0x22221bff).into()),
@@ -2242,7 +2242,7 @@ pub fn atelier() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0x262f51ff).into()),
                         tab_inactive_background: Some(rgba(0x262f51ff).into()),
                         tab_active_background: Some(rgba(0x202746ff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x262f51ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xf5f7ff4c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0x363f62ff).into()),
                         scrollbar_thumb_border: Some(rgba(0x363f62ff).into()),
                         scrollbar_track_background: Some(rgba(0x202746ff).into()),
@@ -2679,7 +2679,7 @@ pub fn atelier() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0xe5e8f5ff).into()),
                         tab_inactive_background: Some(rgba(0xe5e8f5ff).into()),
                         tab_active_background: Some(rgba(0xf5f7ffff).into()),
-                        scrollbar_thumb_background: Some(rgba(0xe5e8f5ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0x2027464c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0xccd0e1ff).into()),
                         scrollbar_thumb_border: Some(rgba(0xccd0e1ff).into()),
                         scrollbar_track_background: Some(rgba(0xf5f7ffff).into()),
@@ -3116,7 +3116,7 @@ pub fn atelier() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0x262622ff).into()),
                         tab_inactive_background: Some(rgba(0x262622ff).into()),
                         tab_active_background: Some(rgba(0x20201dff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x262622ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xfefbec4c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0x3b3933ff).into()),
                         scrollbar_thumb_border: Some(rgba(0x3b3933ff).into()),
                         scrollbar_track_background: Some(rgba(0x20201dff).into()),
@@ -3553,7 +3553,7 @@ pub fn atelier() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0x1f231fff).into()),
                         tab_inactive_background: Some(rgba(0x1f231fff).into()),
                         tab_active_background: Some(rgba(0x131513ff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x1f231fff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xf4fbf44c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0x333b33ff).into()),
                         scrollbar_thumb_border: Some(rgba(0x333b33ff).into()),
                         scrollbar_track_background: Some(rgba(0x131513ff).into()),
@@ -3990,7 +3990,7 @@ pub fn atelier() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0xe6e3ebff).into()),
                         tab_inactive_background: Some(rgba(0xe6e3ebff).into()),
                         tab_active_background: Some(rgba(0xefecf4ff).into()),
-                        scrollbar_thumb_background: Some(rgba(0xe6e3ebff).into()),
+                        scrollbar_thumb_background: Some(rgba(0x19171c4c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0xcbc8d1ff).into()),
                         scrollbar_thumb_border: Some(rgba(0xcbc8d1ff).into()),
                         scrollbar_track_background: Some(rgba(0xefecf4ff).into()),
@@ -4427,7 +4427,7 @@ pub fn atelier() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0x252020ff).into()),
                         tab_inactive_background: Some(rgba(0x252020ff).into()),
                         tab_active_background: Some(rgba(0x1b1818ff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x252020ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xf4ecec4c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0x352f2fff).into()),
                         scrollbar_thumb_border: Some(rgba(0x352f2fff).into()),
                         scrollbar_track_background: Some(rgba(0x1b1818ff).into()),
@@ -4864,7 +4864,7 @@ pub fn atelier() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0x252025ff).into()),
                         tab_inactive_background: Some(rgba(0x252025ff).into()),
                         tab_active_background: Some(rgba(0x1b181bff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x252025ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xf7f3f74c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0x393239ff).into()),
                         scrollbar_thumb_border: Some(rgba(0x393239ff).into()),
                         scrollbar_track_background: Some(rgba(0x1b181bff).into()),
@@ -5301,7 +5301,7 @@ pub fn atelier() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0x1c2529ff).into()),
                         tab_inactive_background: Some(rgba(0x1c2529ff).into()),
                         tab_active_background: Some(rgba(0x161b1dff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x1c2529ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xebf8ff4c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0x2c3b42ff).into()),
                         scrollbar_thumb_border: Some(rgba(0x2c3b42ff).into()),
                         scrollbar_track_background: Some(rgba(0x161b1dff).into()),
@@ -5738,7 +5738,7 @@ pub fn atelier() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0xe9e6e4ff).into()),
                         tab_inactive_background: Some(rgba(0xe9e6e4ff).into()),
                         tab_active_background: Some(rgba(0xf1efeeff).into()),
-                        scrollbar_thumb_background: Some(rgba(0xe9e6e4ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0x1b19184c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0xd6d1cfff).into()),
                         scrollbar_thumb_border: Some(rgba(0xd6d1cfff).into()),
                         scrollbar_track_background: Some(rgba(0xf1efeeff).into()),
@@ -6175,7 +6175,7 @@ pub fn atelier() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0xeeebd7ff).into()),
                         tab_inactive_background: Some(rgba(0xeeebd7ff).into()),
                         tab_active_background: Some(rgba(0xfefbecff).into()),
-                        scrollbar_thumb_background: Some(rgba(0xeeebd7ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0x20201d4c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0xd7d3beff).into()),
                         scrollbar_thumb_border: Some(rgba(0xd7d3beff).into()),
                         scrollbar_track_background: Some(rgba(0xfefbecff).into()),
@@ -6612,7 +6612,7 @@ pub fn atelier() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0xebe3e3ff).into()),
                         tab_inactive_background: Some(rgba(0xebe3e3ff).into()),
                         tab_active_background: Some(rgba(0xf4ececff).into()),
-                        scrollbar_thumb_background: Some(rgba(0xebe3e3ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0x1b18184c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0xcfc7c7ff).into()),
                         scrollbar_thumb_border: Some(rgba(0xcfc7c7ff).into()),
                         scrollbar_track_background: Some(rgba(0xf4ececff).into()),
@@ -7049,7 +7049,7 @@ pub fn atelier() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0xdaeedaff).into()),
                         tab_inactive_background: Some(rgba(0xdaeedaff).into()),
                         tab_active_background: Some(rgba(0xf4fbf4ff).into()),
-                        scrollbar_thumb_background: Some(rgba(0xdaeedaff).into()),
+                        scrollbar_thumb_background: Some(rgba(0x1315134c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0xbed7beff).into()),
                         scrollbar_thumb_border: Some(rgba(0xbed7beff).into()),
                         scrollbar_track_background: Some(rgba(0xf4fbf4ff).into()),
@@ -7486,7 +7486,7 @@ pub fn atelier() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0x1f2621ff).into()),
                         tab_inactive_background: Some(rgba(0x1f2621ff).into()),
                         tab_active_background: Some(rgba(0x171c19ff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x1f2621ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xecf4ee4c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0x2f3832ff).into()),
                         scrollbar_thumb_border: Some(rgba(0x2f3832ff).into()),
                         scrollbar_track_background: Some(rgba(0x171c19ff).into()),
@@ -7923,7 +7923,7 @@ pub fn atelier() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0xe1d6e1ff).into()),
                         tab_inactive_background: Some(rgba(0xe1d6e1ff).into()),
                         tab_active_background: Some(rgba(0xf7f3f7ff).into()),
-                        scrollbar_thumb_background: Some(rgba(0xe1d6e1ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0x1b181b4c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0xcdbecdff).into()),
                         scrollbar_thumb_border: Some(rgba(0xcdbecdff).into()),
                         scrollbar_track_background: Some(rgba(0xf7f3f7ff).into()),
@@ -8360,7 +8360,7 @@ pub fn atelier() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0xcdeaf9ff).into()),
                         tab_inactive_background: Some(rgba(0xcdeaf9ff).into()),
                         tab_active_background: Some(rgba(0xebf8ffff).into()),
-                        scrollbar_thumb_background: Some(rgba(0xcdeaf9ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0x161b1d4c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0xb0d3e5ff).into()),
                         scrollbar_thumb_border: Some(rgba(0xb0d3e5ff).into()),
                         scrollbar_track_background: Some(rgba(0xebf8ffff).into()),
diff --git a/crates/theme2/src/themes/ayu.rs b/crates/theme2/src/themes/ayu.rs
index 0a47c22fbd..71e0257ba8 100644
--- a/crates/theme2/src/themes/ayu.rs
+++ b/crates/theme2/src/themes/ayu.rs
@@ -57,7 +57,7 @@ pub fn ayu() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0x1f2127ff).into()),
                         tab_inactive_background: Some(rgba(0x1f2127ff).into()),
                         tab_active_background: Some(rgba(0x0d1017ff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x1f2127ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xbfbdb64c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0x2d2f34ff).into()),
                         scrollbar_thumb_border: Some(rgba(0x2d2f34ff).into()),
                         scrollbar_track_background: Some(rgba(0x0d1017ff).into()),
@@ -473,7 +473,7 @@ pub fn ayu() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0xececedff).into()),
                         tab_inactive_background: Some(rgba(0xececedff).into()),
                         tab_active_background: Some(rgba(0xfcfcfcff).into()),
-                        scrollbar_thumb_background: Some(rgba(0xececedff).into()),
+                        scrollbar_thumb_background: Some(rgba(0x5c61664c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0xdfe0e1ff).into()),
                         scrollbar_thumb_border: Some(rgba(0xdfe0e1ff).into()),
                         scrollbar_track_background: Some(rgba(0xfcfcfcff).into()),
@@ -889,7 +889,7 @@ pub fn ayu() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0x353944ff).into()),
                         tab_inactive_background: Some(rgba(0x353944ff).into()),
                         tab_active_background: Some(rgba(0x242936ff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x353944ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xcccac24c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0x43464fff).into()),
                         scrollbar_thumb_border: Some(rgba(0x43464fff).into()),
                         scrollbar_track_background: Some(rgba(0x242936ff).into()),
diff --git a/crates/theme2/src/themes/gruvbox.rs b/crates/theme2/src/themes/gruvbox.rs
index 5ac9438ad8..113535cbdf 100644
--- a/crates/theme2/src/themes/gruvbox.rs
+++ b/crates/theme2/src/themes/gruvbox.rs
@@ -57,7 +57,7 @@ pub fn gruvbox() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0xecddb5ff).into()),
                         tab_inactive_background: Some(rgba(0xecddb5ff).into()),
                         tab_active_background: Some(rgba(0xf9f5d7ff).into()),
-                        scrollbar_thumb_background: Some(rgba(0xecddb5ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0x2828284c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0xddcca7ff).into()),
                         scrollbar_thumb_border: Some(rgba(0xddcca7ff).into()),
                         scrollbar_track_background: Some(rgba(0xf9f5d7ff).into()),
@@ -480,7 +480,7 @@ pub fn gruvbox() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0x3b3735ff).into()),
                         tab_inactive_background: Some(rgba(0x3b3735ff).into()),
                         tab_active_background: Some(rgba(0x32302fff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x3b3735ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xfbf1c74c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0x494340ff).into()),
                         scrollbar_thumb_border: Some(rgba(0x494340ff).into()),
                         scrollbar_track_background: Some(rgba(0x32302fff).into()),
@@ -903,7 +903,7 @@ pub fn gruvbox() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0xecddb4ff).into()),
                         tab_inactive_background: Some(rgba(0xecddb4ff).into()),
                         tab_active_background: Some(rgba(0xfbf1c7ff).into()),
-                        scrollbar_thumb_background: Some(rgba(0xecddb4ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0x2828284c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0xddcca7ff).into()),
                         scrollbar_thumb_border: Some(rgba(0xddcca7ff).into()),
                         scrollbar_track_background: Some(rgba(0xfbf1c7ff).into()),
@@ -1326,7 +1326,7 @@ pub fn gruvbox() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0x3a3735ff).into()),
                         tab_inactive_background: Some(rgba(0x3a3735ff).into()),
                         tab_active_background: Some(rgba(0x282828ff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x3a3735ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xfbf1c74c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0x494340ff).into()),
                         scrollbar_thumb_border: Some(rgba(0x494340ff).into()),
                         scrollbar_track_background: Some(rgba(0x282828ff).into()),
@@ -1749,7 +1749,7 @@ pub fn gruvbox() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0xecdcb3ff).into()),
                         tab_inactive_background: Some(rgba(0xecdcb3ff).into()),
                         tab_active_background: Some(rgba(0xf2e5bcff).into()),
-                        scrollbar_thumb_background: Some(rgba(0xecdcb3ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0x2828284c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0xddcca7ff).into()),
                         scrollbar_thumb_border: Some(rgba(0xddcca7ff).into()),
                         scrollbar_track_background: Some(rgba(0xf2e5bcff).into()),
@@ -2172,7 +2172,7 @@ pub fn gruvbox() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0x393634ff).into()),
                         tab_inactive_background: Some(rgba(0x393634ff).into()),
                         tab_active_background: Some(rgba(0x1d2021ff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x393634ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xfbf1c74c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0x494340ff).into()),
                         scrollbar_thumb_border: Some(rgba(0x494340ff).into()),
                         scrollbar_track_background: Some(rgba(0x1d2021ff).into()),
diff --git a/crates/theme2/src/themes/one.rs b/crates/theme2/src/themes/one.rs
index 6bf05bda0f..f29686f402 100644
--- a/crates/theme2/src/themes/one.rs
+++ b/crates/theme2/src/themes/one.rs
@@ -57,7 +57,7 @@ pub fn one() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0xebebecff).into()),
                         tab_inactive_background: Some(rgba(0xebebecff).into()),
                         tab_active_background: Some(rgba(0xfafafaff).into()),
-                        scrollbar_thumb_background: Some(rgba(0xebebecff).into()),
+                        scrollbar_thumb_background: Some(rgba(0x383a414c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0xdfdfe0ff).into()),
                         scrollbar_thumb_border: Some(rgba(0xdfdfe0ff).into()),
                         scrollbar_track_background: Some(rgba(0xfafafaff).into()),
@@ -480,7 +480,7 @@ pub fn one() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0x2f343eff).into()),
                         tab_inactive_background: Some(rgba(0x2f343eff).into()),
                         tab_active_background: Some(rgba(0x282c34ff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x2f343eff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xc8ccd44c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0x363c46ff).into()),
                         scrollbar_thumb_border: Some(rgba(0x363c46ff).into()),
                         scrollbar_track_background: Some(rgba(0x282c34ff).into()),
diff --git a/crates/theme2/src/themes/rose_pine.rs b/crates/theme2/src/themes/rose_pine.rs
index 0a8fbdec0f..4dfa9433e4 100644
--- a/crates/theme2/src/themes/rose_pine.rs
+++ b/crates/theme2/src/themes/rose_pine.rs
@@ -57,7 +57,7 @@ pub fn rose_pine() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0xfef9f2ff).into()),
                         tab_inactive_background: Some(rgba(0xfef9f2ff).into()),
                         tab_active_background: Some(rgba(0xfaf4edff).into()),
-                        scrollbar_thumb_background: Some(rgba(0xfef9f2ff).into()),
+                        scrollbar_thumb_background: Some(rgba(0x5752794c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0xe5e0dfff).into()),
                         scrollbar_thumb_border: Some(rgba(0xe5e0dfff).into()),
                         scrollbar_track_background: Some(rgba(0xfaf4edff).into()),
@@ -487,7 +487,7 @@ pub fn rose_pine() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0x28253cff).into()),
                         tab_inactive_background: Some(rgba(0x28253cff).into()),
                         tab_active_background: Some(rgba(0x232136ff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x28253cff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xe0def44c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0x322f48ff).into()),
                         scrollbar_thumb_border: Some(rgba(0x322f48ff).into()),
                         scrollbar_track_background: Some(rgba(0x232136ff).into()),
@@ -917,7 +917,7 @@ pub fn rose_pine() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0x1d1b2aff).into()),
                         tab_inactive_background: Some(rgba(0x1d1b2aff).into()),
                         tab_active_background: Some(rgba(0x191724ff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x1d1b2aff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xe0def44c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0x232132ff).into()),
                         scrollbar_thumb_border: Some(rgba(0x232132ff).into()),
                         scrollbar_track_background: Some(rgba(0x191724ff).into()),
diff --git a/crates/theme2/src/themes/sandcastle.rs b/crates/theme2/src/themes/sandcastle.rs
index df1f7496ce..fcd18e0d94 100644
--- a/crates/theme2/src/themes/sandcastle.rs
+++ b/crates/theme2/src/themes/sandcastle.rs
@@ -56,7 +56,7 @@ pub fn sandcastle() -> UserThemeFamily {
                     tab_bar_background: Some(rgba(0x2b3039ff).into()),
                     tab_inactive_background: Some(rgba(0x2b3039ff).into()),
                     tab_active_background: Some(rgba(0x282c34ff).into()),
-                    scrollbar_thumb_background: Some(rgba(0x2b3039ff).into()),
+                    scrollbar_thumb_background: Some(rgba(0xfdf4c14c).into()),
                     scrollbar_thumb_hover_background: Some(rgba(0x313741ff).into()),
                     scrollbar_thumb_border: Some(rgba(0x313741ff).into()),
                     scrollbar_track_background: Some(rgba(0x282c34ff).into()),
diff --git a/crates/theme2/src/themes/solarized.rs b/crates/theme2/src/themes/solarized.rs
index b52fe34467..a855eed1f3 100644
--- a/crates/theme2/src/themes/solarized.rs
+++ b/crates/theme2/src/themes/solarized.rs
@@ -57,7 +57,7 @@ pub fn solarized() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0xf3eddaff).into()),
                         tab_inactive_background: Some(rgba(0xf3eddaff).into()),
                         tab_active_background: Some(rgba(0xfdf6e3ff).into()),
-                        scrollbar_thumb_background: Some(rgba(0xf3eddaff).into()),
+                        scrollbar_thumb_background: Some(rgba(0x002b364c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0xdcdacbff).into()),
                         scrollbar_thumb_border: Some(rgba(0xdcdacbff).into()),
                         scrollbar_track_background: Some(rgba(0xfdf6e3ff).into()),
@@ -473,7 +473,7 @@ pub fn solarized() -> UserThemeFamily {
                         tab_bar_background: Some(rgba(0x04313cff).into()),
                         tab_inactive_background: Some(rgba(0x04313cff).into()),
                         tab_active_background: Some(rgba(0x002b36ff).into()),
-                        scrollbar_thumb_background: Some(rgba(0x04313cff).into()),
+                        scrollbar_thumb_background: Some(rgba(0xfdf6e34c).into()),
                         scrollbar_thumb_hover_background: Some(rgba(0x063541ff).into()),
                         scrollbar_thumb_border: Some(rgba(0x063541ff).into()),
                         scrollbar_track_background: Some(rgba(0x002b36ff).into()),
diff --git a/crates/theme2/src/themes/summercamp.rs b/crates/theme2/src/themes/summercamp.rs
index cd27fc1db8..7a0692c292 100644
--- a/crates/theme2/src/themes/summercamp.rs
+++ b/crates/theme2/src/themes/summercamp.rs
@@ -56,7 +56,7 @@ pub fn summercamp() -> UserThemeFamily {
                     tab_bar_background: Some(rgba(0x231f16ff).into()),
                     tab_inactive_background: Some(rgba(0x231f16ff).into()),
                     tab_active_background: Some(rgba(0x1c1810ff).into()),
-                    scrollbar_thumb_background: Some(rgba(0x231f16ff).into()),
+                    scrollbar_thumb_background: Some(rgba(0xf8f5de4c).into()),
                     scrollbar_thumb_hover_background: Some(rgba(0x29251bff).into()),
                     scrollbar_thumb_border: Some(rgba(0x29251bff).into()),
                     scrollbar_track_background: Some(rgba(0x1c1810ff).into()),
diff --git a/crates/theme_importer/src/zed1/converter.rs b/crates/theme_importer/src/zed1/converter.rs
index c89b88493a..ef201b361e 100644
--- a/crates/theme_importer/src/zed1/converter.rs
+++ b/crates/theme_importer/src/zed1/converter.rs
@@ -3,9 +3,9 @@ use gpui::{serde_json, Hsla, Rgba};
 use gpui1::color::Color as Zed1Color;
 use gpui1::fonts::HighlightStyle as Zed1HighlightStyle;
 use theme::{
-    Appearance, PlayerColor, PlayerColors, StatusColorsRefinement, ThemeColorsRefinement,
-    UserFontStyle, UserFontWeight, UserHighlightStyle, UserSyntaxTheme, UserTheme,
-    UserThemeStylesRefinement,
+    color_alpha, Appearance, PlayerColor, PlayerColors, StatusColorsRefinement,
+    ThemeColorsRefinement, UserFontStyle, UserFontWeight, UserHighlightStyle, UserSyntaxTheme,
+    UserTheme, UserThemeStylesRefinement,
 };
 use theme1::{ColorScheme, Theme as Zed1Theme};
 
@@ -175,7 +175,8 @@ impl Zed1ThemeConverter {
             panel_background: convert(middle.base.default.background),
             panel_focused_border: convert(lowest.accent.hovered.border),
             pane_focused_border: convert(lowest.accent.hovered.border),
-            scrollbar_thumb_background: convert(middle.base.default.background),
+            scrollbar_thumb_background: convert(middle.base.inverted.background)
+                .map(|color| color_alpha(color, 0.3)),
             scrollbar_thumb_hover_background: convert(middle.base.hovered.background),
             scrollbar_thumb_border: convert(middle.base.default.border),
             scrollbar_track_background: convert(highest.base.default.background),