diff --git a/themes/catppuccin-frappe.json b/themes/catppuccin-frappe.json
index 7ff1996..46c8bbd 100644
--- a/themes/catppuccin-frappe.json
+++ b/themes/catppuccin-frappe.json
@@ -143,8 +143,8 @@
           "error-marker": "#E782847F",
           "unknown-identifier": "#E782847F",
           "error-text": "#E782847F",
-          "debug-text": "#E782847F",
-          "warning-text": "#E782847F",
+          "debug-text": "#737994FF",
+          "warning-text": "#A5ADCEFF",
           "pattern-variable": "#949CBBFF",
           "function-parameter": "#949CBBFF",
           "function-variable": "#949CBBFF",
@@ -160,13 +160,13 @@
           "typedef": "#949CBBFF",
           "user-defined-type": "#949CBBFF",
           "keyword": "#CA9EE6FF",
-          "builtin-type": "#E78284FF",
+          "known-identifier": "#E78284FF",
           "line-number": "#838BA7FF",
-          "block-comment": "#737994FF",
+          "multi-line--comment": "#737994FF",
           "number": "#EF9F76FF",
-          "preprocessor-identifier": "#BABBF1FF",
-          "directive": "#A5ADCEFF",
-          "operator": "#C6D0F5FF",
+          "preproc-identifier": "#BABBF1FF",
+          "preprocessor": "#A5ADCEFF",
+          "punctuation": "#C6D0F5FF",
           "separator": "#C6D0F5FF",
           "selection": "#6268807F",
           "string": "#A6D189FF"
diff --git a/themes/catppuccin-latte.json b/themes/catppuccin-latte.json
index 29e6692..af4f42f 100644
--- a/themes/catppuccin-latte.json
+++ b/themes/catppuccin-latte.json
@@ -143,8 +143,8 @@
           "error-marker": "#D20F397F",
           "unknown-identifier": "#D20F397F",
           "error-text": "#D20F397F",
-          "debug-text": "#D20F397F",
-          "warning-text": "#D20F397F",
+          "debug-text": "#9CA0B0FF",
+          "warning-text": "#6C6F85FF",
           "pattern-variable": "#7C7F93FF",
           "function-parameter": "#7C7F93FF",
           "function-variable": "#7C7F93FF",
@@ -160,13 +160,13 @@
           "typedef": "#7C7F93FF",
           "user-defined-type": "#7C7F93FF",
           "keyword": "#8839EFFF",
-          "builtin-type": "#D20F39FF",
+          "known=identifier": "#D20F39FF",
           "line-number": "#8C8FA1FF",
-          "block-comment": "#9CA0B0FF",
+          "multi-line-comment": "#9CA0B0FF",
           "number": "#FE640BFF",
-          "preprocessor-identifier": "#7287FDFF",
-          "directive": "#6C6F85FF",
-          "operator": "#4C4F69FF",
+          "preproc-identifier": "#7287FDFF",
+          "preprocessor": "#6C6F85FF",
+          "punctuation": "#4C4F69FF",
           "separator": "#4C4F69FF",
           "selection": "#ACB0BE7F",
           "string": "#40A02BFF"
diff --git a/themes/catppuccin-macchiato.json b/themes/catppuccin-macchiato.json
index e056cc2..f2886b0 100644
--- a/themes/catppuccin-macchiato.json
+++ b/themes/catppuccin-macchiato.json
@@ -143,8 +143,8 @@
           "error-marker": "#ED87967F",
           "unknown-identifier": "#ED87967F",
           "error-text": "#ED87967F",
-          "debug-text": "#ED87967F",
-          "warning-text": "#ED87967F",
+          "debug-text": "#6E738DFF",
+          "warning-text": "#A5ADCBFF",
           "pattern-variable": "#939AB7FF",
           "function-parameter": "#939AB7FF",
           "function-variable": "#939AB7FF",
@@ -160,13 +160,13 @@
           "typedef": "#939AB7FF",
           "user-defined-type": "#939AB7FF",
           "keyword": "#C6A0F6FF",
-          "builtin-type": "#ED8796FF",
+          "known-identifier": "#ED8796FF",
           "line-number": "#8087A2FF",
-          "block-comment": "#6E738DFF",
+          "multi-line-comment": "#6E738DFF",
           "number": "#F5A97FFF",
-          "preprocessor-identifier": "#B7BDF8FF",
-          "directive": "#A5ADCBFF",
-          "operator": "#CAD3F5FF",
+          "preproc-identifier": "#B7BDF8FF",
+          "preprocessor": "#A5ADCBFF",
+          "punctuation": "#CAD3F5FF",
           "separator": "#CAD3F5FF",
           "selection": "#5B60787F",
           "string": "#A6DA95FF"
diff --git a/themes/catppuccin-mocha.json b/themes/catppuccin-mocha.json
index 6765250..4bddd26 100644
--- a/themes/catppuccin-mocha.json
+++ b/themes/catppuccin-mocha.json
@@ -143,8 +143,8 @@
           "error-marker": "#F38BA87F",
           "unknown-identifier": "#F38BA87F",
           "error-text": "#F38BA87F",
-          "debug-text": "#F38BA87F",
-          "warning-text": "#F38BA87F",
+          "debug-text": "#6C7086FF",
+          "warning-text": "#A6ADC8FF",
           "pattern-variable": "#9399B2FF",
           "function-parameter": "#9399B2FF",
           "function-variable": "#9399B2FF",
@@ -160,13 +160,13 @@
           "typedef": "#9399B2FF",
           "user-defined-type": "#9399B2FF",
           "keyword": "#CBA6F7FF",
-          "builtin-type": "#F38BA8FF",
+          "known-identifier": "#F38BA8FF",
           "line-number": "#7F849CFF",
-          "block-comment": "#6C7086FF",
+          "multi-line-comment": "#6C7086FF",
           "number": "#FAB387FF",
-          "preprocessor-identifier": "#B4BEFEFF",
-          "directive": "#A6ADC8FF",
-          "operator": "#CDD6F4FF",
+          "preproc-identifier": "#B4BEFEFF",
+          "preprocessor": "#A6ADC8FF",
+          "punctuation": "#CDD6F4FF",
           "separator": "#CDD6F4FF",
           "selection": "#585B707F",
           "string": "#A6E3A1FF"
diff --git a/themes/solarized_dark.json b/themes/solarized_dark.json
index 9b07564..9c5ae3a 100644
--- a/themes/solarized_dark.json
+++ b/themes/solarized_dark.json
@@ -143,8 +143,8 @@
             "error-marker": "#FF200080",
             "unknown-identifier": "#FF200080",
             "error-text": "#FF200080",
-            "debug-text": "#FF200080",
-            "warning-text": "#FF200080",
+            "debug-text": "#206020FF",
+            "warning-text": "#808040FF",
             "identifier": "#AAAAAAFF",
             "pattern-variable": "#AAAAAAFF",
             "function-parameter": "#AAAAAAFF",
@@ -161,14 +161,14 @@
             "typedef": "#AAAAAAFF",
             "user-defined-type": "#AAAAAAFF",
             "keyword": "#569CD6FF",
-            "builtin-type": "#4DC69BFF",
+            "known-identifier": "#4DC69BFF",
             "line-number": "#007070FF",
-            "block-comment": "#206040FF",
+            "multi-line-comment": "#206040FF",
             "number": "#00FF00FF",
-            "preprocessor-identifier": "#A040C0FF",
-            "directive": "#808040FF",
-            "operator": "#FFFFFFFF",
-            "separator": "#FFFFFFFF",
+            "preproc-identifier": "#A040C0FF",
+            "preprocessor": "#808040FF",
+            "punctuation": "#7F7F7FFF",
+            "separator": "#7F7F7FFF",
             "selection": "#2060A080",
             "string": "#E07070FF"
         }
diff --git a/themes/vs_dark.json b/themes/vs_dark.json
index 92b41bf..bf02866 100644
--- a/themes/vs_dark.json
+++ b/themes/vs_dark.json
@@ -145,8 +145,8 @@
             "error-marker": "#FF200080",
             "unknown-identifier": "#FF200080",
             "error-text": "#FF200080",
-            "debug-text": "#FF200080",
-            "warning-text": "#FF200080",
+            "debug-text": "#206020FF",
+            "warning-text": "#808040FF",
             "pattern-variable": "#AAAAAAFF",
             "function-parameter": "#AAAAAAFF",
             "function-variable": "#AAAAAAFF",
@@ -162,14 +162,14 @@
             "typedef": "#AAAAAAFF",
             "user-defined-type": "#AAAAAAFF",
             "keyword": "#569CD6FF",
-            "builtin-type": "#4DC69BFF",
+            "known-identifier": "#4DC69BFF",
             "line-number": "#007070FF",
-            "block-comment": "#206040FF",
+            "multi-line-comment": "#206040FF",
             "number": "#00FF00FF",
-            "preprocessor-identifier": "#A040C0FF",
-            "directive": "#808040FF",
-            "operator": "#FFFFFFFF",
-            "separator": "#FFFFFFFF",
+            "preproc-identifier": "#A040C0FF",
+            "preprocessor": "#808040FF",
+            "punctuation": "#7F7F7FFF",
+            "separator": "#7F7F7FFF",
             "selection": "#2060A080",
             "string": "#E07070FF"
         }