diff --git a/src/theme.js b/src/theme.js
index d06ae62..f8c8270 100644
--- a/src/theme.js
+++ b/src/theme.js
@@ -258,7 +258,7 @@ export function getTheme({ themeKey, name, type }) {
 
       // Using functional tokens as they have sufficient contrast for colorblindness
       // themes, even though they don't really match the functional intent here.
-      "vim.mode.text": tokens['fgColor/default'],
+      "vim.mode.text": tokens['fgColor/onEmphasis'],
       "vim.normal.background": tokens['bgColor/neutral-emphasis'],
       "vim.helix_normal.background": tokens['bgColor/neutral-emphasis'],
       "vim.visual.background": tokens['bgColor/accent-emphasis'],
diff --git a/themes/github_theme.json b/themes/github_theme.json
index 6375dc7..2e30979 100644
--- a/themes/github_theme.json
+++ b/themes/github_theme.json
@@ -142,7 +142,7 @@
         "unreachable": "#818b98ff",
         "unreachable.background": "#eff2f5ff",
         "unreachable.border": "#818b981a",
-        "vim.mode.text": "#1f2328ff",
+        "vim.mode.text": "#ffffffff",
         "vim.normal.background": "#59636eff",
         "vim.helix_normal.background": "#59636eff",
         "vim.visual.background": "#0969daff",
@@ -448,10 +448,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 +472,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,7 +510,7 @@
         "predictive.border": "#d1d9e0b3",
         "renamed": "#0969daff",
         "renamed.background": "#ddf4ffff",
-        "renamed.border": "#54aeff66",
+        "renamed.border": "#ddf4ffff",
         "scrollbar.thumb.border": "#ffffff00",
         "scrollbar.thumb.hover_background": "#f6f8faff",
         "scrollbar.track.background": "#ffffff00",
@@ -519,7 +519,7 @@
         "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",
@@ -562,7 +562,7 @@
         "unreachable": "#818b98ff",
         "unreachable.background": "#eff2f5ff",
         "unreachable.border": "#818b981a",
-        "vim.mode.text": "#1f2328ff",
+        "vim.mode.text": "#ffffffff",
         "vim.normal.background": "#59636eff",
         "vim.helix_normal.background": "#59636eff",
         "vim.visual.background": "#0969daff",
@@ -859,7 +859,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 +882,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",
@@ -972,7 +972,7 @@
         "unreachable": "#59636eff",
         "unreachable.background": "#e0e6ebff",
         "unreachable.border": "#59636e1f",
-        "vim.mode.text": "#010409ff",
+        "vim.mode.text": "#ffffffff",
         "vim.normal.background": "#454c54ff",
         "vim.helix_normal.background": "#454c54ff",
         "vim.visual.background": "#0349b4ff",
@@ -1392,7 +1392,7 @@
         "unreachable": "#818b98ff",
         "unreachable.background": "#eff2f5ff",
         "unreachable.border": "#818b981a",
-        "vim.mode.text": "#1f2328ff",
+        "vim.mode.text": "#ffffffff",
         "vim.normal.background": "#59636eff",
         "vim.helix_normal.background": "#59636eff",
         "vim.visual.background": "#0969daff",
@@ -1704,7 +1704,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 +1713,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 +1722,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 +1733,7 @@
         "icon.border": "#3d444dff",
         "icon.accent": "#4493f8ff",
         "icon.muted": "#9198a1ff",
-        "icon.disabled": "#656c7699",
+        "icon.disabled": "#656c76ff",
         "ignored": "#9198a1ff",
         "ignored.background": "#212830ff",
         "ignored.border": "#656c761a",
@@ -1796,15 +1796,15 @@
         "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",
+        "vim.mode.text": "#ffffffff",
         "vim.normal.background": "#656c76ff",
         "vim.helix_normal.background": "#656c76ff",
         "vim.visual.background": "#1f6febff",
@@ -2109,9 +2109,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 +2124,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 +2133,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 +2142,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 +2153,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,7 +2171,7 @@
         "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",
@@ -2180,7 +2180,7 @@
         "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,15 +2216,15 @@
         "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",
+        "vim.mode.text": "#ffffffff",
         "vim.normal.background": "#656c76ff",
         "vim.helix_normal.background": "#656c76ff",
         "vim.visual.background": "#1f6febff",
@@ -2510,7 +2510,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 +2534,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 +2543,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 +2552,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 +2563,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",
@@ -2626,14 +2626,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 +2954,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 +2963,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 +2972,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 +2983,7 @@
         "icon.border": "#3d444dff",
         "icon.accent": "#4493f8ff",
         "icon.muted": "#9198a1ff",
-        "icon.disabled": "#656c7699",
+        "icon.disabled": "#656c76ff",
         "ignored": "#9198a1ff",
         "ignored.background": "#212830ff",
         "ignored.border": "#656c761a",
@@ -3046,15 +3046,15 @@
         "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",
+        "vim.mode.text": "#ffffffff",
         "vim.normal.background": "#656c76ff",
         "vim.helix_normal.background": "#656c76ff",
         "vim.visual.background": "#1f6febff",
@@ -3466,7 +3466,7 @@
         "unreachable": "#656c76ff",
         "unreachable.background": "#2a313cff",
         "unreachable.border": "#656c761a",
-        "vim.mode.text": "#d1d7e0ff",
+        "vim.mode.text": "#f0f6fcff",
         "vim.normal.background": "#656c76ff",
         "vim.helix_normal.background": "#656c76ff",
         "vim.visual.background": "#316dcaff",