diff --git a/src/theme.js b/src/theme.js
index 3451d70..b6962a4 100644
--- a/src/theme.js
+++ b/src/theme.js
@@ -258,14 +258,21 @@ 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/onEmphasis'],
+      "vim.normal.foreground": tokens['fgColor/onEmphasis'],
       "vim.normal.background": tokens['bgColor/neutral-emphasis'],
+      "vim.helix_normal.foreground": tokens['fgColor/onEmphasis'],
       "vim.helix_normal.background": tokens['bgColor/neutral-emphasis'],
+      "vim.visual.foreground": tokens['fgColor/onEmphasis'],
       "vim.visual.background": tokens['bgColor/accent-emphasis'],
+      "vim.helix_select.foreground": tokens['fgColor/onEmphasis'],
       "vim.helix_select.background": tokens['bgColor/accent-emphasis'],
+      "vim.insert.foreground": tokens['fgColor/onEmphasis'],
       "vim.insert.background": tokens['bgColor/success-emphasis'],
+      "vim.visual_line.foreground": tokens['fgColor/onEmphasis'],
       "vim.visual_line.background": tokens['bgColor/accent-emphasis'],
+      "vim.visual_block.foreground": tokens['fgColor/onEmphasis'],
       "vim.visual_block.background": tokens['bgColor/done-emphasis'],
+      "vim.replace.foreground": tokens['fgColor/onEmphasis'],
       "vim.replace.background": tokens['bgColor/sponsors-emphasis'],
 
       "warning": tokens['fgColor/attention'],
diff --git a/themes/github_theme.json b/themes/github_theme.json
index 7d66677..880ab9b 100644
--- a/themes/github_theme.json
+++ b/themes/github_theme.json
@@ -143,14 +143,21 @@
         "unreachable": "#818b98ff",
         "unreachable.background": "#eff2f5ff",
         "unreachable.border": "#818b981a",
-        "vim.mode.text": "#ffffffff",
+        "vim.normal.foreground": "#ffffffff",
         "vim.normal.background": "#59636eff",
+        "vim.helix_normal.foreground": "#ffffffff",
         "vim.helix_normal.background": "#59636eff",
+        "vim.visual.foreground": "#ffffffff",
         "vim.visual.background": "#0969daff",
+        "vim.helix_select.foreground": "#ffffffff",
         "vim.helix_select.background": "#0969daff",
+        "vim.insert.foreground": "#ffffffff",
         "vim.insert.background": "#1f883dff",
+        "vim.visual_line.foreground": "#ffffffff",
         "vim.visual_line.background": "#0969daff",
+        "vim.visual_block.foreground": "#ffffffff",
         "vim.visual_block.background": "#8250dfff",
+        "vim.replace.foreground": "#ffffffff",
         "vim.replace.background": "#bf3989ff",
         "warning": "#9a6700ff",
         "warning.background": "#f6f8faff",
@@ -564,14 +571,21 @@
         "unreachable": "#818b98ff",
         "unreachable.background": "#eff2f5ff",
         "unreachable.border": "#818b981a",
-        "vim.mode.text": "#ffffffff",
+        "vim.normal.foreground": "#ffffffff",
         "vim.normal.background": "#59636eff",
+        "vim.helix_normal.foreground": "#ffffffff",
         "vim.helix_normal.background": "#59636eff",
+        "vim.visual.foreground": "#ffffffff",
         "vim.visual.background": "#0969daff",
+        "vim.helix_select.foreground": "#ffffffff",
         "vim.helix_select.background": "#0969daff",
+        "vim.insert.foreground": "#ffffffff",
         "vim.insert.background": "#0969daff",
+        "vim.visual_line.foreground": "#ffffffff",
         "vim.visual_line.background": "#0969daff",
+        "vim.visual_block.foreground": "#ffffffff",
         "vim.visual_block.background": "#8250dfff",
+        "vim.replace.foreground": "#ffffffff",
         "vim.replace.background": "#bf3989ff",
         "warning": "#9a6700ff",
         "warning.background": "#f6f8faff",
@@ -975,14 +989,21 @@
         "unreachable": "#59636eff",
         "unreachable.background": "#e0e6ebff",
         "unreachable.border": "#59636e1f",
-        "vim.mode.text": "#ffffffff",
+        "vim.normal.foreground": "#ffffffff",
         "vim.normal.background": "#454c54ff",
+        "vim.helix_normal.foreground": "#ffffffff",
         "vim.helix_normal.background": "#454c54ff",
+        "vim.visual.foreground": "#ffffffff",
         "vim.visual.background": "#0349b4ff",
+        "vim.helix_select.foreground": "#ffffffff",
         "vim.helix_select.background": "#0349b4ff",
+        "vim.insert.foreground": "#ffffffff",
         "vim.insert.background": "#055d20ff",
+        "vim.visual_line.foreground": "#ffffffff",
         "vim.visual_line.background": "#0349b4ff",
+        "vim.visual_block.foreground": "#ffffffff",
         "vim.visual_block.background": "#622cbcff",
+        "vim.replace.foreground": "#ffffffff",
         "vim.replace.background": "#971368ff",
         "warning": "#603700ff",
         "warning.background": "#e6eaefff",
@@ -1396,14 +1417,21 @@
         "unreachable": "#818b98ff",
         "unreachable.background": "#eff2f5ff",
         "unreachable.border": "#818b981a",
-        "vim.mode.text": "#ffffffff",
+        "vim.normal.foreground": "#ffffffff",
         "vim.normal.background": "#59636eff",
+        "vim.helix_normal.foreground": "#ffffffff",
         "vim.helix_normal.background": "#59636eff",
+        "vim.visual.foreground": "#ffffffff",
         "vim.visual.background": "#0969daff",
+        "vim.helix_select.foreground": "#ffffffff",
         "vim.helix_select.background": "#0969daff",
+        "vim.insert.foreground": "#ffffffff",
         "vim.insert.background": "#0969daff",
+        "vim.visual_line.foreground": "#ffffffff",
         "vim.visual_line.background": "#0969daff",
+        "vim.visual_block.foreground": "#ffffffff",
         "vim.visual_block.background": "#8250dfff",
+        "vim.replace.foreground": "#ffffffff",
         "vim.replace.background": "#bf3989ff",
         "warning": "#9a6700ff",
         "warning.background": "#f6f8faff",
@@ -1809,14 +1837,21 @@
         "unreachable": "#656c76ff",
         "unreachable.background": "#212830ff",
         "unreachable.border": "#656c761a",
-        "vim.mode.text": "#ffffffff",
+        "vim.normal.foreground": "#ffffffff",
         "vim.normal.background": "#656c76ff",
+        "vim.helix_normal.foreground": "#ffffffff",
         "vim.helix_normal.background": "#656c76ff",
+        "vim.visual.foreground": "#ffffffff",
         "vim.visual.background": "#1f6febff",
+        "vim.helix_select.foreground": "#ffffffff",
         "vim.helix_select.background": "#1f6febff",
+        "vim.insert.foreground": "#ffffffff",
         "vim.insert.background": "#238636ff",
+        "vim.visual_line.foreground": "#ffffffff",
         "vim.visual_line.background": "#1f6febff",
+        "vim.visual_block.foreground": "#ffffffff",
         "vim.visual_block.background": "#8957e5ff",
+        "vim.replace.foreground": "#ffffffff",
         "vim.replace.background": "#bf4b8aff",
         "warning": "#d29922ff",
         "warning.background": "#151b23ff",
@@ -2230,14 +2265,21 @@
         "unreachable": "#656c76ff",
         "unreachable.background": "#212830ff",
         "unreachable.border": "#656c761a",
-        "vim.mode.text": "#ffffffff",
+        "vim.normal.foreground": "#ffffffff",
         "vim.normal.background": "#656c76ff",
+        "vim.helix_normal.foreground": "#ffffffff",
         "vim.helix_normal.background": "#656c76ff",
+        "vim.visual.foreground": "#ffffffff",
         "vim.visual.background": "#1f6febff",
+        "vim.helix_select.foreground": "#ffffffff",
         "vim.helix_select.background": "#1f6febff",
+        "vim.insert.foreground": "#ffffffff",
         "vim.insert.background": "#1f6febff",
+        "vim.visual_line.foreground": "#ffffffff",
         "vim.visual_line.background": "#1f6febff",
+        "vim.visual_block.foreground": "#ffffffff",
         "vim.visual_block.background": "#8957e5ff",
+        "vim.replace.foreground": "#ffffffff",
         "vim.replace.background": "#bf4b8aff",
         "warning": "#d29922ff",
         "warning.background": "#151b23ff",
@@ -2641,14 +2683,21 @@
         "unreachable": "#656c76ff",
         "unreachable.background": "#262c36ff",
         "unreachable.border": "#656c761a",
-        "vim.mode.text": "#ffffffff",
+        "vim.normal.foreground": "#ffffffff",
         "vim.normal.background": "#3d444dff",
+        "vim.helix_normal.foreground": "#ffffffff",
         "vim.helix_normal.background": "#3d444dff",
+        "vim.visual.foreground": "#ffffffff",
         "vim.visual.background": "#194fb1ff",
+        "vim.helix_select.foreground": "#ffffffff",
         "vim.helix_select.background": "#194fb1ff",
+        "vim.insert.foreground": "#ffffffff",
         "vim.insert.background": "#006222ff",
+        "vim.visual_line.foreground": "#ffffffff",
         "vim.visual_line.background": "#194fb1ff",
+        "vim.visual_block.foreground": "#ffffffff",
         "vim.visual_block.background": "#6921d7ff",
+        "vim.replace.foreground": "#ffffffff",
         "vim.replace.background": "#9c1d6aff",
         "warning": "#f0b72fff",
         "warning.background": "#151b23ff",
@@ -3062,14 +3111,21 @@
         "unreachable": "#656c76ff",
         "unreachable.background": "#212830ff",
         "unreachable.border": "#656c761a",
-        "vim.mode.text": "#ffffffff",
+        "vim.normal.foreground": "#ffffffff",
         "vim.normal.background": "#656c76ff",
+        "vim.helix_normal.foreground": "#ffffffff",
         "vim.helix_normal.background": "#656c76ff",
+        "vim.visual.foreground": "#ffffffff",
         "vim.visual.background": "#1f6febff",
+        "vim.helix_select.foreground": "#ffffffff",
         "vim.helix_select.background": "#1f6febff",
+        "vim.insert.foreground": "#ffffffff",
         "vim.insert.background": "#1f6febff",
+        "vim.visual_line.foreground": "#ffffffff",
         "vim.visual_line.background": "#1f6febff",
+        "vim.visual_block.foreground": "#ffffffff",
         "vim.visual_block.background": "#8957e5ff",
+        "vim.replace.foreground": "#ffffffff",
         "vim.replace.background": "#bf4b8aff",
         "warning": "#d29922ff",
         "warning.background": "#151b23ff",
@@ -3475,14 +3531,21 @@
         "unreachable": "#656c76ff",
         "unreachable.background": "#2a313cff",
         "unreachable.border": "#656c761a",
-        "vim.mode.text": "#f0f6fcff",
+        "vim.normal.foreground": "#f0f6fcff",
         "vim.normal.background": "#656c76ff",
+        "vim.helix_normal.foreground": "#f0f6fcff",
         "vim.helix_normal.background": "#656c76ff",
+        "vim.visual.foreground": "#f0f6fcff",
         "vim.visual.background": "#316dcaff",
+        "vim.helix_select.foreground": "#f0f6fcff",
         "vim.helix_select.background": "#316dcaff",
+        "vim.insert.foreground": "#f0f6fcff",
         "vim.insert.background": "#347d39ff",
+        "vim.visual_line.foreground": "#f0f6fcff",
         "vim.visual_line.background": "#316dcaff",
+        "vim.visual_block.foreground": "#f0f6fcff",
         "vim.visual_block.background": "#8256d0ff",
+        "vim.replace.foreground": "#f0f6fcff",
         "vim.replace.background": "#ae4c82ff",
         "warning": "#c69026ff",
         "warning.background": "#262c36ff",