diff --git a/src/theme.js b/src/theme.js
index d06ae62..5dd4e24 100644
--- a/src/theme.js
+++ b/src/theme.js
@@ -194,10 +194,10 @@ export function getTheme({ themeKey, name, type }) {
       "renamed.border": tokens['borderColor/success-muted'],
 
       "scrollbar.thumb.border": tokens['borderColor/transparent'],
-      "scrollbar.thumb.hover_background": tokens['bgColor/muted'],
+      "scrollbar.thumb.hover_background": alpha('bgColor/neutral-emphasis', type === 'light' ? 0.2 : 0.4),
       "scrollbar.track.background": tokens['bgColor/transparent'],
       "scrollbar.track.border": tokens['borderColor/transparent'],
-      "scrollbar_thumb.background": tokens['bgColor/neutal-muted'],
+      "scrollbar_thumb.background": alpha('bgColor/neutral-emphasis', type === 'light' ? 0.1 : 0.3),
 
       "search.match_background": alpha("base/color/yellow/1", 0.3),
 
diff --git a/themes/github_theme.json b/themes/github_theme.json
index 6375dc7..ac0baa3 100644
--- a/themes/github_theme.json
+++ b/themes/github_theme.json
@@ -92,9 +92,10 @@
         "renamed.background": "#dafbe1ff",
         "renamed.border": "#4ac26b66",
         "scrollbar.thumb.border": "#ffffff00",
-        "scrollbar.thumb.hover_background": "#f6f8faff",
+        "scrollbar.thumb.hover_background": "#59636e33",
         "scrollbar.track.background": "#ffffff00",
         "scrollbar.track.border": "#ffffff00",
+        "scrollbar_thumb.background": "#59636e1a",
         "search.match_background": "#fae17d4d",
         "status_bar.background": "#f6f8faff",
         "success": "#1a7f37ff",
@@ -448,10 +449,10 @@
         "conflict.border": "#fb8f4466",
         "created": "#0969daff",
         "created.background": "#ddf4ffff",
-        "created.border": "#54aeff66",
-        "deleted": "#be4e02ff",
+        "created.border": "#ddf4ffff",
+        "deleted": "#bc4c00ff",
         "deleted.background": "#fff1e5ff",
-        "deleted.border": "#fb8f4466",
+        "deleted.border": "#fff1e5ff",
         "drop_target.background": "#ddf4ffff",
         "editor.active_line.background": "#f6f8faff",
         "editor.active_line_number": "#1f2328ff",
@@ -472,7 +473,7 @@
         "element.hover": "#818b981f",
         "element.selected": "#818b981f",
         "elevated_surface.background": "#ffffffff",
-        "error": "#be4e02ff",
+        "error": "#bc4c00ff",
         "error.background": "#f6f8faff",
         "error.border": "#d1d9e0b3",
         "ghost_element.active": "#818b981f",
@@ -510,16 +511,17 @@
         "predictive.border": "#d1d9e0b3",
         "renamed": "#0969daff",
         "renamed.background": "#ddf4ffff",
-        "renamed.border": "#54aeff66",
+        "renamed.border": "#ddf4ffff",
         "scrollbar.thumb.border": "#ffffff00",
-        "scrollbar.thumb.hover_background": "#f6f8faff",
+        "scrollbar.thumb.hover_background": "#59636e33",
         "scrollbar.track.background": "#ffffff00",
         "scrollbar.track.border": "#ffffff00",
+        "scrollbar_thumb.background": "#59636e1a",
         "search.match_background": "#fae17d4d",
         "status_bar.background": "#f6f8faff",
         "success": "#0969daff",
         "success.background": "#ddf4ffff",
-        "success.border": "#54aeff66",
+        "success.border": "#ddf4ffff",
         "surface.background": "#f6f8faff",
         "tab.active_background": "#ffffffff",
         "tab.inactive_background": "#f6f8faff",
@@ -859,7 +861,7 @@
         "created": "#024c1aff",
         "created.background": "#d2fedbff",
         "created.border": "#26a148ff",
-        "deleted": "#8a071eff",
+        "deleted": "#86061dff",
         "deleted.background": "#fff0eeff",
         "deleted.border": "#ee5a5dff",
         "drop_target.background": "#dff7ffff",
@@ -882,7 +884,7 @@
         "element.hover": "#e0e6ebff",
         "element.selected": "#e0e6ebff",
         "elevated_surface.background": "#ffffffff",
-        "error": "#8a071eff",
+        "error": "#86061dff",
         "error.background": "#e6eaefff",
         "error.border": "#454c54ff",
         "ghost_element.active": "#e0e6ebff",
@@ -922,9 +924,10 @@
         "renamed.background": "#d2fedbff",
         "renamed.border": "#26a148ff",
         "scrollbar.thumb.border": "#ffffff00",
-        "scrollbar.thumb.hover_background": "#e6eaefff",
+        "scrollbar.thumb.hover_background": "#454c5433",
         "scrollbar.track.background": "#ffffff00",
         "scrollbar.track.border": "#ffffff00",
+        "scrollbar_thumb.background": "#454c541a",
         "search.match_background": "#f0ce534d",
         "status_bar.background": "#eff2f5ff",
         "success": "#024c1aff",
@@ -1342,9 +1345,10 @@
         "renamed.background": "#ddf4ffff",
         "renamed.border": "#54aeff66",
         "scrollbar.thumb.border": "#ffffff00",
-        "scrollbar.thumb.hover_background": "#f6f8faff",
+        "scrollbar.thumb.hover_background": "#59636e33",
         "scrollbar.track.background": "#ffffff00",
         "scrollbar.track.border": "#ffffff00",
+        "scrollbar_thumb.background": "#59636e1a",
         "search.match_background": "#fae17d4d",
         "status_bar.background": "#f6f8faff",
         "success": "#0969daff",
@@ -1704,7 +1708,7 @@
         "editor.foreground": "#f0f6fcff",
         "editor.gutter.background": "#0d1117ff",
         "editor.highlighted_line.background": "#656c7633",
-        "editor.invisible": "#656c7699",
+        "editor.invisible": "#656c76ff",
         "editor.line_number": "#9198a1ff",
         "editor.subheader.background": "#151b23ff",
         "editor.wrap_guide": "#3d444db3",
@@ -1713,7 +1717,7 @@
         "element.disabled": "#212830ff",
         "element.hover": "#656c7633",
         "element.selected": "#656c7633",
-        "elevated_surface.background": "#151b23ff",
+        "elevated_surface.background": "#010409ff",
         "error": "#f85149ff",
         "error.background": "#151b23ff",
         "error.border": "#3d444db3",
@@ -1722,7 +1726,7 @@
         "ghost_element.disabled": "#212830ff",
         "ghost_element.hover": "#656c7633",
         "ghost_element.selected": "#656c7633",
-        "hidden": "#656c7699",
+        "hidden": "#656c76ff",
         "hidden.background": "#212830ff",
         "hidden.border": "#656c761a",
         "hint": "#9198a1ff",
@@ -1733,7 +1737,7 @@
         "icon.border": "#3d444dff",
         "icon.accent": "#4493f8ff",
         "icon.muted": "#9198a1ff",
-        "icon.disabled": "#656c7699",
+        "icon.disabled": "#656c76ff",
         "ignored": "#9198a1ff",
         "ignored.background": "#212830ff",
         "ignored.border": "#656c761a",
@@ -1754,9 +1758,10 @@
         "renamed.background": "#2ea04326",
         "renamed.border": "#2ea04366",
         "scrollbar.thumb.border": "#00000000",
-        "scrollbar.thumb.hover_background": "#151b23ff",
+        "scrollbar.thumb.hover_background": "#656c7666",
         "scrollbar.track.background": "#00000000",
         "scrollbar.track.border": "#00000000",
+        "scrollbar_thumb.background": "#656c764d",
         "search.match_background": "#f2cc604d",
         "status_bar.background": "#010409ff",
         "success": "#3fb950ff",
@@ -1796,12 +1801,12 @@
         "terminal.foreground": "#f0f6fcff",
         "text": "#f0f6fcff",
         "text.accent": "#4493f8ff",
-        "text.disabled": "#656c7699",
+        "text.disabled": "#656c76ff",
         "text.muted": "#f0f6fcff",
         "text.placeholder": "#9198a1ff",
         "title_bar.background": "#010409ff",
         "toolbar.background": "#0d1117ff",
-        "unreachable": "#656c7699",
+        "unreachable": "#656c76ff",
         "unreachable.background": "#212830ff",
         "unreachable.border": "#656c761a",
         "vim.mode.text": "#f0f6fcff",
@@ -2109,9 +2114,9 @@
         "conflict.background": "#db6d281a",
         "conflict.border": "#db6d2866",
         "created": "#58a6ffff",
-        "created.background": "#388bfd26",
+        "created.background": "#388bfd33",
         "created.border": "#388bfd66",
-        "deleted": "#db6d28ff",
+        "deleted": "#f0883eff",
         "deleted.background": "#db6d281a",
         "deleted.border": "#db6d2866",
         "drop_target.background": "#388bfd1a",
@@ -2124,7 +2129,7 @@
         "editor.foreground": "#f0f6fcff",
         "editor.gutter.background": "#0d1117ff",
         "editor.highlighted_line.background": "#656c7633",
-        "editor.invisible": "#656c7699",
+        "editor.invisible": "#656c76ff",
         "editor.line_number": "#9198a1ff",
         "editor.subheader.background": "#151b23ff",
         "editor.wrap_guide": "#3d444db3",
@@ -2133,8 +2138,8 @@
         "element.disabled": "#212830ff",
         "element.hover": "#656c7633",
         "element.selected": "#656c7633",
-        "elevated_surface.background": "#151b23ff",
-        "error": "#db6d28ff",
+        "elevated_surface.background": "#010409ff",
+        "error": "#f0883eff",
         "error.background": "#151b23ff",
         "error.border": "#3d444db3",
         "ghost_element.active": "#656c7633",
@@ -2142,7 +2147,7 @@
         "ghost_element.disabled": "#212830ff",
         "ghost_element.hover": "#656c7633",
         "ghost_element.selected": "#656c7633",
-        "hidden": "#656c7699",
+        "hidden": "#656c76ff",
         "hidden.background": "#212830ff",
         "hidden.border": "#656c761a",
         "hint": "#9198a1ff",
@@ -2153,7 +2158,7 @@
         "icon.border": "#3d444dff",
         "icon.accent": "#4493f8ff",
         "icon.muted": "#9198a1ff",
-        "icon.disabled": "#656c7699",
+        "icon.disabled": "#656c76ff",
         "ignored": "#9198a1ff",
         "ignored.background": "#212830ff",
         "ignored.border": "#656c761a",
@@ -2171,16 +2176,17 @@
         "predictive.background": "#656c7633",
         "predictive.border": "#3d444db3",
         "renamed": "#58a6ffff",
-        "renamed.background": "#388bfd26",
+        "renamed.background": "#388bfd33",
         "renamed.border": "#388bfd66",
         "scrollbar.thumb.border": "#00000000",
-        "scrollbar.thumb.hover_background": "#151b23ff",
+        "scrollbar.thumb.hover_background": "#656c7666",
         "scrollbar.track.background": "#00000000",
         "scrollbar.track.border": "#00000000",
+        "scrollbar_thumb.background": "#656c764d",
         "search.match_background": "#f2cc604d",
         "status_bar.background": "#010409ff",
         "success": "#58a6ffff",
-        "success.background": "#388bfd26",
+        "success.background": "#388bfd33",
         "success.border": "#388bfd66",
         "surface.background": "#010409ff",
         "tab.active_background": "#0d1117ff",
@@ -2216,12 +2222,12 @@
         "terminal.foreground": "#f0f6fcff",
         "text": "#f0f6fcff",
         "text.accent": "#4493f8ff",
-        "text.disabled": "#656c7699",
+        "text.disabled": "#656c76ff",
         "text.muted": "#f0f6fcff",
         "text.placeholder": "#9198a1ff",
         "title_bar.background": "#010409ff",
         "toolbar.background": "#0d1117ff",
-        "unreachable": "#656c7699",
+        "unreachable": "#656c76ff",
         "unreachable.background": "#212830ff",
         "unreachable.border": "#656c761a",
         "vim.mode.text": "#f0f6fcff",
@@ -2510,7 +2516,7 @@
         "background.appearance": "opaque",
         "background": "#010409ff",
         "border": "#b7bdc8ff",
-        "border.disabled": "#9198a11f",
+        "border.disabled": "#656c761a",
         "border.focused": "#409effff",
         "border.selected": "#409effff",
         "border.transparent": "#00000000",
@@ -2534,7 +2540,7 @@
         "editor.foreground": "#ffffffff",
         "editor.gutter.background": "#010409ff",
         "editor.highlighted_line.background": "#212830ff",
-        "editor.invisible": "#9198a199",
+        "editor.invisible": "#656c76ff",
         "editor.line_number": "#b7bdc8ff",
         "editor.subheader.background": "#151b23ff",
         "editor.wrap_guide": "#b7bdc8ff",
@@ -2543,7 +2549,7 @@
         "element.disabled": "#262c36ff",
         "element.hover": "#212830ff",
         "element.selected": "#212830ff",
-        "elevated_surface.background": "#151b23ff",
+        "elevated_surface.background": "#010409ff",
         "error": "#ff9492ff",
         "error.background": "#151b23ff",
         "error.border": "#b7bdc8ff",
@@ -2552,9 +2558,9 @@
         "ghost_element.disabled": "#262c36ff",
         "ghost_element.hover": "#212830ff",
         "ghost_element.selected": "#212830ff",
-        "hidden": "#9198a199",
+        "hidden": "#656c76ff",
         "hidden.background": "#262c36ff",
-        "hidden.border": "#9198a11f",
+        "hidden.border": "#656c761a",
         "hint": "#b7bdc8ff",
         "hint.background": "#151b23ff",
         "hint.border": "#b7bdc8ff",
@@ -2563,10 +2569,10 @@
         "icon.border": "#b7bdc8ff",
         "icon.accent": "#74b9ffff",
         "icon.muted": "#b7bdc8ff",
-        "icon.disabled": "#9198a199",
+        "icon.disabled": "#656c76ff",
         "ignored": "#b7bdc8ff",
         "ignored.background": "#262c36ff",
-        "ignored.border": "#9198a11f",
+        "ignored.border": "#656c761a",
         "info": "#f0b72fff",
         "info.background": "#151b23ff",
         "info.border": "#b7bdc8ff",
@@ -2584,9 +2590,10 @@
         "renamed.background": "#0ac74026",
         "renamed.border": "#0ac740ff",
         "scrollbar.thumb.border": "#00000000",
-        "scrollbar.thumb.hover_background": "#151b23ff",
+        "scrollbar.thumb.hover_background": "#3d444d66",
         "scrollbar.track.background": "#00000000",
         "scrollbar.track.border": "#00000000",
+        "scrollbar_thumb.background": "#3d444d4d",
         "search.match_background": "#fbd6694d",
         "status_bar.background": "#010409ff",
         "success": "#2bd853ff",
@@ -2626,14 +2633,14 @@
         "terminal.foreground": "#ffffffff",
         "text": "#ffffffff",
         "text.accent": "#74b9ffff",
-        "text.disabled": "#9198a199",
+        "text.disabled": "#656c76ff",
         "text.muted": "#ffffffff",
         "text.placeholder": "#b7bdc8ff",
         "title_bar.background": "#010409ff",
         "toolbar.background": "#010409ff",
-        "unreachable": "#9198a199",
+        "unreachable": "#656c76ff",
         "unreachable.background": "#262c36ff",
-        "unreachable.border": "#9198a11f",
+        "unreachable.border": "#656c761a",
         "vim.mode.text": "#ffffffff",
         "vim.normal.background": "#3d444dff",
         "vim.helix_normal.background": "#3d444dff",
@@ -2954,7 +2961,7 @@
         "editor.foreground": "#f0f6fcff",
         "editor.gutter.background": "#0d1117ff",
         "editor.highlighted_line.background": "#656c7633",
-        "editor.invisible": "#656c7699",
+        "editor.invisible": "#656c76ff",
         "editor.line_number": "#9198a1ff",
         "editor.subheader.background": "#151b23ff",
         "editor.wrap_guide": "#3d444db3",
@@ -2963,7 +2970,7 @@
         "element.disabled": "#212830ff",
         "element.hover": "#656c7633",
         "element.selected": "#656c7633",
-        "elevated_surface.background": "#151b23ff",
+        "elevated_surface.background": "#010409ff",
         "error": "#f85149ff",
         "error.background": "#151b23ff",
         "error.border": "#3d444db3",
@@ -2972,7 +2979,7 @@
         "ghost_element.disabled": "#212830ff",
         "ghost_element.hover": "#656c7633",
         "ghost_element.selected": "#656c7633",
-        "hidden": "#656c7699",
+        "hidden": "#656c76ff",
         "hidden.background": "#212830ff",
         "hidden.border": "#656c761a",
         "hint": "#9198a1ff",
@@ -2983,7 +2990,7 @@
         "icon.border": "#3d444dff",
         "icon.accent": "#4493f8ff",
         "icon.muted": "#9198a1ff",
-        "icon.disabled": "#656c7699",
+        "icon.disabled": "#656c76ff",
         "ignored": "#9198a1ff",
         "ignored.background": "#212830ff",
         "ignored.border": "#656c761a",
@@ -3004,9 +3011,10 @@
         "renamed.background": "#388bfd26",
         "renamed.border": "#388bfd66",
         "scrollbar.thumb.border": "#00000000",
-        "scrollbar.thumb.hover_background": "#151b23ff",
+        "scrollbar.thumb.hover_background": "#656c7666",
         "scrollbar.track.background": "#00000000",
         "scrollbar.track.border": "#00000000",
+        "scrollbar_thumb.background": "#656c764d",
         "search.match_background": "#f2cc604d",
         "status_bar.background": "#010409ff",
         "success": "#58a6ffff",
@@ -3046,12 +3054,12 @@
         "terminal.foreground": "#f0f6fcff",
         "text": "#f0f6fcff",
         "text.accent": "#4493f8ff",
-        "text.disabled": "#656c7699",
+        "text.disabled": "#656c76ff",
         "text.muted": "#f0f6fcff",
         "text.placeholder": "#9198a1ff",
         "title_bar.background": "#010409ff",
         "toolbar.background": "#0d1117ff",
-        "unreachable": "#656c7699",
+        "unreachable": "#656c76ff",
         "unreachable.background": "#212830ff",
         "unreachable.border": "#656c761a",
         "vim.mode.text": "#f0f6fcff",
@@ -3416,9 +3424,10 @@
         "renamed.background": "#46954a26",
         "renamed.border": "#46954a66",
         "scrollbar.thumb.border": "#00000000",
-        "scrollbar.thumb.hover_background": "#262c36ff",
+        "scrollbar.thumb.hover_background": "#656c7666",
         "scrollbar.track.background": "#00000000",
         "scrollbar.track.border": "#00000000",
+        "scrollbar_thumb.background": "#656c764d",
         "search.match_background": "#eac55f4d",
         "status_bar.background": "#151b23ff",
         "success": "#57ab5aff",