diff --git a/themes/catppuccin-mauve.json b/themes/catppuccin-mauve.json
index f5b22d3..11712cf 100644
--- a/themes/catppuccin-mauve.json
+++ b/themes/catppuccin-mauve.json
@@ -122,7 +122,7 @@
                 "modified": "#df8e1d",
                 "modified.border": "#df8e1d",
                 "modified.background": "#e6e9ef",
-                "predictive": "#4d7ee3",
+                "predictive": "#9ca0b0",
                 "predictive.border": "#7287fd",
                 "predictive.background": "#e6e9ef",
                 "renamed": "#209fb5",
@@ -180,23 +180,28 @@
                     }
                 ],
                 "syntax": {
-                    "attribute": {
-                        "color": "#df8e1d",
+                    "variable": {
+                        "color": "#4c4f69",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "boolean": {
-                        "color": "#fe640b",
+                    "variable.builtin": {
+                        "color": "#d20f39",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "comment": {
-                        "color": "#8c8fa1",
-                        "font_style": "italic",
+                    "variable.parameter": {
+                        "color": "#e64553",
+                        "font_style": null,
                         "font_weight": null
                     },
-                    "comment.doc": {
-                        "color": "#8c8fa1",
+                    "variable.member": {
+                        "color": "#d20f39",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "variable.special": {
+                        "color": "#ea76cb",
                         "font_style": "italic",
                         "font_weight": null
                     },
@@ -205,204 +210,439 @@
                         "font_style": null,
                         "font_weight": null
                     },
-                    "constructor": {
-                        "color": "#1e66f5",
+                    "constant.builtin": {
+                        "color": "#fe640b",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "embedded": {
-                        "color": "#e64553",
+                    "constant.macro": {
+                        "color": "#8839ef",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "emphasis": {
-                        "color": "#d20f39",
+                    "module": {
+                        "color": "#df8e1d",
                         "font_style": "italic",
                         "font_weight": null
                     },
-                    "emphasis.strong": {
-                        "color": "#d20f39",
+                    "label": {
+                        "color": "#209fb5",
                         "font_style": null,
-                        "font_weight": 700
+                        "font_weight": null
                     },
-                    "enum": {
+                    "string": {
+                        "color": "#40a02b",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.documentation": {
                         "color": "#179299",
                         "font_style": null,
-                        "font_weight": 700
+                        "font_weight": null
                     },
-                    "function": {
-                        "color": "#1e66f5",
-                        "font_style": "italic",
+                    "string.regexp": {
+                        "color": "#fe640b",
+                        "font_style": null,
                         "font_weight": null
                     },
-                    "hint": {
-                        "color": "#acb0be",
+                    "string.escape": {
+                        "color": "#ea76cb",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.special": {
+                        "color": "#ea76cb",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.special.path": {
+                        "color": "#ea76cb",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.special.symbol": {
+                        "color": "#dd7878",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.special.url": {
+                        "color": "#dc8a78",
                         "font_style": "italic",
                         "font_weight": null
                     },
-                    "keyword": {
+                    "character": {
+                        "color": "#179299",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "character.special": {
+                        "color": "#ea76cb",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "boolean": {
+                        "color": "#fe640b",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "number": {
+                        "color": "#fe640b",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "number.float": {
+                        "color": "#fe640b",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "type": {
+                        "color": "#df8e1d",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "type.builtin": {
                         "color": "#8839ef",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "type.definition": {
+                        "color": "#df8e1d",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "link_text": {
+                    "type.interface": {
+                        "color": "#df8e1d",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "type.super": {
+                        "color": "#df8e1d",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "attribute": {
+                        "color": "#fe640b",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "property": {
                         "color": "#1e66f5",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "link_uri": {
+                    "function": {
                         "color": "#1e66f5",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "number": {
+                    "function.builtin": {
                         "color": "#fe640b",
                         "font_style": null,
                         "font_weight": null
                     },
+                    "function.call": {
+                        "color": "#1e66f5",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "function.macro": {
+                        "color": "#179299",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "function.method": {
+                        "color": "#1e66f5",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "function.method.call": {
+                        "color": "#1e66f5",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "constructor": {
+                        "color": "#dd7878",
+                        "font_style": null,
+                        "font_weight": null
+                    },
                     "operator": {
                         "color": "#04a5e5",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "predictive": {
-                        "color": "#4d7ee3",
+                    "keyword": {
+                        "color": "#8839ef",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "predoc": {
-                        "color": "#d20f39",
+                    "keyword.modifier": {
+                        "color": "#8839ef",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "primary": {
-                        "color": "#e64553",
+                    "keyword.type": {
+                        "color": "#8839ef",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "property": {
-                        "color": "#1e66f5",
+                    "keyword.coroutine": {
+                        "color": "#8839ef",
+                        "font_style": null,
+                        "font_weight": null,
+                    },
+                    "keyword.function": {
+                        "color": "#8839ef",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation": {
-                        "color": "#179299",
+                    "keyword.operator": {
+                        "color": "#8839ef",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.bracket": {
-                        "color": "#179299",
+                    "keyword.import": {
+                        "color": "#8839ef",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.delimiter": {
-                        "color": "#7c7f93",
+                    "keyword.repeat": {
+                        "color": "#8839ef",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.list_marker": {
-                        "color": "#179299",
+                    "keyword.return": {
+                        "color": "#8839ef",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.special": {
-                        "color": "#179299",
+                    "keyword.debug": {
+                        "color": "#8839ef",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.special.symbol": {
-                        "color": "#d20f39",
+                    "keyword.exception": {
+                        "color": "#8839ef",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string": {
-                        "color": "#40a02b",
+                    "keyword.conditional": {
+                        "color": "#8839ef",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string.escape": {
-                        "color": "#ea76cb",
+                    "keyword.conditional.ternary": {
+                        "color": "#8839ef",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string.regex": {
+                    "keyword.directive": {
                         "color": "#ea76cb",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string.special": {
+                    "keyword.directive.define": {
                         "color": "#ea76cb",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string.special.symbol": {
-                        "color": "#dd7878",
+                    "keyword.export": {
+                        "color": "#04a5e5",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "tag": {
-                        "color": "#1e66f5",
+                    "punctuation": {
+                        "color": "#7c7f93",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "text.literal": {
-                        "color": "#40a02b",
+                    "punctuation.delimiter": {
+                        "color": "#7c7f93",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "title": {
-                        "color": "#4c4f69",
+                    "punctuation.bracket": {
+                        "color": "#7c7f93",
                         "font_style": null,
-                        "font_weight": 800
+                        "font_weight": null
                     },
-                    "type": {
-                        "color": "#df8e1d",
+                    "punctuation.special": {
+                        "color": "#ea76cb",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "type.builtin": {
-                        "color": "#8839ef",
+                    "punctuation.special.symbol": {
+                        "color": "#dd7878",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "type.interface": {
-                        "color": "#df8e1d",
+                    "punctuation.list_marker": {
+                        "color": "#179299",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "comment": {
+                        "color": "#7c7f93",
                         "font_style": "italic",
                         "font_weight": null
                     },
-                    "type.super": {
+                    "comment.doc": {
+                        "color": "#7c7f93",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "comment.documentation": {
+                        "color": "#7c7f93",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "comment.error": {
+                        "color": "#d20f39",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "comment.warning": {
                         "color": "#df8e1d",
                         "font_style": "italic",
                         "font_weight": null
                     },
-                    "variable": {
-                        "color": "#4c4f69",
-                        "font_style": null,
+                    "comment.hint": {
+                        "color": "#1e66f5",
+                        "font_style": "italic",
                         "font_weight": null
                     },
-                    "variable.member": {
-                        "color": "#4c4f69",
-                        "font_style": null,
+                    "comment.todo": {
+                        "color": "#dd7878",
+                        "font_style": "italic",
                         "font_weight": null
                     },
-                    "variable.parameter": {
-                        "color": "#fe640b",
+                    "comment.note": {
+                        "color": "#dc8a78",
                         "font_style": "italic",
                         "font_weight": null
                     },
-                    "variable.special": {
-                        "color": "#823556",
+                    "tag": {
+                        "color": "#1e66f5",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "tag.attribute": {
+                        "color": "#df8e1d",
                         "font_style": "italic",
                         "font_weight": null
                     },
-                    "variant": {
-                        "color": "#d20f39",
+                    "tag.delimiter": {
+                        "color": "#179299",
                         "font_style": null,
                         "font_weight": null
-                    }
-                }
-            }
-        },
+                    },
+                    "parameter": {
+                        "color": "#e64553",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "field": {
+                        "color": "#7287fd",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "namespace": {
+                        "color": "#7287fd",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "float": {
+                        "color": "#fe640b",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "symbol": {
+                        "color": "#ea76cb",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.regex": {
+                        "color": "#fe640b",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "text": {
+                        "color": "#4c4f69",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "emphasis.strong": {
+                        "color": "#e64553",
+                        "font_style": null,
+                        "font_weight": 700
+                    },
+                    "emphasis": {
+                        "color": "#e64553",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "embedded": {
+                        "color": "#e64553",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "text.literal": {
+                        "color": "#40a02b",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "enum": {
+                        "color": "#179299",
+                        "font_style": null,
+                        "font_weight": 700
+                    },
+                    "hint": {
+                        "color": "#acb0be",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "link_text": {
+                        "color": "#1e66f5",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "link_uri": {
+                        "color": "#dc8a78",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "predictive": {
+                        "color": "#9ca0b0",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "predoc": {
+                        "color": "#d20f39",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "primary": {
+                        "color": "#e64553",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "tag.doctype": {
+                        "color": "#8839ef",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "title": {
+                        "color": "#4c4f69",
+                        "font_style": null,
+                        "font_weight": 800
+                    },
+                    "variant": {
+                        "color": "#d20f39",
+                        "font_style": null,
+                        "font_weight": null
+                    }
+                }
+            }
+        },
         {
             "name": "Catppuccin Frappé",
             "appearance": "dark",
@@ -522,7 +762,7 @@
                 "modified": "#e5c890",
                 "modified.border": "#e5c890",
                 "modified.background": "#292c3c",
-                "predictive": "#7e94ca",
+                "predictive": "#737994",
                 "predictive.border": "#babbf1",
                 "predictive.background": "#292c3c",
                 "renamed": "#85c1dc",
@@ -580,23 +820,28 @@
                     }
                 ],
                 "syntax": {
-                    "attribute": {
-                        "color": "#e5c890",
+                    "variable": {
+                        "color": "#c6d0f5",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "boolean": {
-                        "color": "#ef9f76",
+                    "variable.builtin": {
+                        "color": "#e78284",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "comment": {
-                        "color": "#838ba7",
-                        "font_style": "italic",
+                    "variable.parameter": {
+                        "color": "#ea999c",
+                        "font_style": null,
                         "font_weight": null
                     },
-                    "comment.doc": {
-                        "color": "#838ba7",
+                    "variable.member": {
+                        "color": "#e78284",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "variable.special": {
+                        "color": "#f4b8e4",
                         "font_style": "italic",
                         "font_weight": null
                     },
@@ -605,53 +850,78 @@
                         "font_style": null,
                         "font_weight": null
                     },
-                    "constructor": {
-                        "color": "#8caaee",
+                    "constant.builtin": {
+                        "color": "#ef9f76",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "embedded": {
-                        "color": "#ea999c",
+                    "constant.macro": {
+                        "color": "#ca9ee6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "emphasis": {
-                        "color": "#e78284",
+                    "module": {
+                        "color": "#e5c890",
                         "font_style": "italic",
                         "font_weight": null
                     },
-                    "emphasis.strong": {
-                        "color": "#e78284",
+                    "label": {
+                        "color": "#85c1dc",
                         "font_style": null,
-                        "font_weight": 700
+                        "font_weight": null
                     },
-                    "enum": {
+                    "string": {
+                        "color": "#a6d189",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.documentation": {
                         "color": "#81c8be",
                         "font_style": null,
-                        "font_weight": 700
+                        "font_weight": null
                     },
-                    "function": {
-                        "color": "#8caaee",
-                        "font_style": "italic",
+                    "string.regexp": {
+                        "color": "#ef9f76",
+                        "font_style": null,
                         "font_weight": null
                     },
-                    "hint": {
-                        "color": "#626880",
+                    "string.escape": {
+                        "color": "#f4b8e4",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.special": {
+                        "color": "#f4b8e4",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.special.path": {
+                        "color": "#f4b8e4",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.special.symbol": {
+                        "color": "#eebebe",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.special.url": {
+                        "color": "#f2d5cf",
                         "font_style": "italic",
                         "font_weight": null
                     },
-                    "keyword": {
-                        "color": "#ca9ee6",
+                    "character": {
+                        "color": "#81c8be",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "link_text": {
-                        "color": "#8caaee",
+                    "character.special": {
+                        "color": "#f4b8e4",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "link_uri": {
-                        "color": "#8caaee",
+                    "boolean": {
+                        "color": "#ef9f76",
                         "font_style": null,
                         "font_weight": null
                     },
@@ -660,23 +930,38 @@
                         "font_style": null,
                         "font_weight": null
                     },
-                    "operator": {
-                        "color": "#99d1db",
+                    "number.float": {
+                        "color": "#ef9f76",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "predictive": {
-                        "color": "#7e94ca",
+                    "type": {
+                        "color": "#e5c890",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "predoc": {
-                        "color": "#e78284",
+                    "type.builtin": {
+                        "color": "#ca9ee6",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "type.definition": {
+                        "color": "#e5c890",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "primary": {
-                        "color": "#ea999c",
+                    "type.interface": {
+                        "color": "#e5c890",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "type.super": {
+                        "color": "#e5c890",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "attribute": {
+                        "color": "#ef9f76",
                         "font_style": null,
                         "font_weight": null
                     },
@@ -685,116 +970,311 @@
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation": {
-                        "color": "#81c8be",
+                    "function": {
+                        "color": "#8caaee",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.bracket": {
-                        "color": "#81c8be",
+                    "function.builtin": {
+                        "color": "#ef9f76",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.delimiter": {
-                        "color": "#949cbb",
+                    "function.call": {
+                        "color": "#8caaee",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.list_marker": {
+                    "function.macro": {
                         "color": "#81c8be",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.special": {
-                        "color": "#81c8be",
+                    "function.method": {
+                        "color": "#8caaee",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.special.symbol": {
-                        "color": "#e78284",
+                    "function.method.call": {
+                        "color": "#8caaee",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string": {
-                        "color": "#a6d189",
+                    "constructor": {
+                        "color": "#eebebe",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string.escape": {
-                        "color": "#f4b8e4",
+                    "operator": {
+                        "color": "#99d1db",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string.regex": {
-                        "color": "#f4b8e4",
+                    "keyword": {
+                        "color": "#ca9ee6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string.special": {
-                        "color": "#f4b8e4",
+                    "keyword.modifier": {
+                        "color": "#ca9ee6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string.special.symbol": {
-                        "color": "#eebebe",
+                    "keyword.type": {
+                        "color": "#ca9ee6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "tag": {
-                        "color": "#8caaee",
+                    "keyword.coroutine": {
+                        "color": "#ca9ee6",
+                        "font_style": null,
+                        "font_weight": null,
+                    },
+                    "keyword.function": {
+                        "color": "#ca9ee6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "text.literal": {
-                        "color": "#a6d189",
+                    "keyword.operator": {
+                        "color": "#ca9ee6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "title": {
-                        "color": "#c6d0f5",
+                    "keyword.import": {
+                        "color": "#ca9ee6",
                         "font_style": null,
-                        "font_weight": 800
+                        "font_weight": null
                     },
-                    "type": {
-                        "color": "#e5c890",
+                    "keyword.repeat": {
+                        "color": "#ca9ee6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "type.builtin": {
+                    "keyword.return": {
                         "color": "#ca9ee6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "type.interface": {
+                    "keyword.debug": {
+                        "color": "#ca9ee6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.exception": {
+                        "color": "#ca9ee6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.conditional": {
+                        "color": "#ca9ee6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.conditional.ternary": {
+                        "color": "#ca9ee6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.directive": {
+                        "color": "#f4b8e4",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.directive.define": {
+                        "color": "#f4b8e4",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.export": {
+                        "color": "#99d1db",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "punctuation": {
+                        "color": "#949cbb",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "punctuation.delimiter": {
+                        "color": "#949cbb",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "punctuation.bracket": {
+                        "color": "#949cbb",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "punctuation.special": {
+                        "color": "#f4b8e4",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "punctuation.special.symbol": {
+                        "color": "#eebebe",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "punctuation.list_marker": {
+                        "color": "#81c8be",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "comment": {
+                        "color": "#949cbb",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "comment.doc": {
+                        "color": "#949cbb",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "comment.documentation": {
+                        "color": "#949cbb",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "comment.error": {
+                        "color": "#e78284",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "comment.warning": {
                         "color": "#e5c890",
                         "font_style": "italic",
                         "font_weight": null
                     },
-                    "type.super": {
+                    "comment.hint": {
+                        "color": "#8caaee",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "comment.todo": {
+                        "color": "#eebebe",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "comment.note": {
+                        "color": "#f2d5cf",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "tag": {
+                        "color": "#8caaee",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "tag.attribute": {
                         "color": "#e5c890",
                         "font_style": "italic",
                         "font_weight": null
                     },
-                    "variable": {
-                        "color": "#c6d0f5",
+                    "tag.delimiter": {
+                        "color": "#81c8be",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "variable.member": {
-                        "color": "#c6d0f5",
+                    "parameter": {
+                        "color": "#ea999c",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "variable.parameter": {
+                    "field": {
+                        "color": "#babbf1",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "namespace": {
+                        "color": "#babbf1",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "float": {
+                        "color": "#ef9f76",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "symbol": {
+                        "color": "#f4b8e4",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.regex": {
                         "color": "#ef9f76",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "text": {
+                        "color": "#c6d0f5",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "emphasis.strong": {
+                        "color": "#ea999c",
+                        "font_style": null,
+                        "font_weight": 700
+                    },
+                    "emphasis": {
+                        "color": "#ea999c",
                         "font_style": "italic",
                         "font_weight": null
                     },
-                    "variable.special": {
-                        "color": "#d3b1c8",
+                    "embedded": {
+                        "color": "#ea999c",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "text.literal": {
+                        "color": "#a6d189",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "enum": {
+                        "color": "#81c8be",
+                        "font_style": null,
+                        "font_weight": 700
+                    },
+                    "hint": {
+                        "color": "#626880",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "link_text": {
+                        "color": "#8caaee",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "link_uri": {
+                        "color": "#f2d5cf",
                         "font_style": "italic",
                         "font_weight": null
                     },
+                    "predictive": {
+                        "color": "#737994",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "predoc": {
+                        "color": "#e78284",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "primary": {
+                        "color": "#ea999c",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "tag.doctype": {
+                        "color": "#ca9ee6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "title": {
+                        "color": "#c6d0f5",
+                        "font_style": null,
+                        "font_weight": 800
+                    },
                     "variant": {
                         "color": "#e78284",
                         "font_style": null,
@@ -922,7 +1402,7 @@
                 "modified": "#eed49f",
                 "modified.border": "#eed49f",
                 "modified.background": "#1e2030",
-                "predictive": "#7b94cc",
+                "predictive": "#6e738d",
                 "predictive.border": "#b7bdf8",
                 "predictive.background": "#1e2030",
                 "renamed": "#7dc4e4",
@@ -980,23 +1460,28 @@
                     }
                 ],
                 "syntax": {
-                    "attribute": {
-                        "color": "#eed49f",
+                    "variable": {
+                        "color": "#cad3f5",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "boolean": {
-                        "color": "#f5a97f",
+                    "variable.builtin": {
+                        "color": "#ed8796",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "comment": {
-                        "color": "#8087a2",
-                        "font_style": "italic",
+                    "variable.parameter": {
+                        "color": "#ee99a0",
+                        "font_style": null,
                         "font_weight": null
                     },
-                    "comment.doc": {
-                        "color": "#8087a2",
+                    "variable.member": {
+                        "color": "#ed8796",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "variable.special": {
+                        "color": "#f5bde6",
                         "font_style": "italic",
                         "font_weight": null
                     },
@@ -1005,196 +1490,431 @@
                         "font_style": null,
                         "font_weight": null
                     },
-                    "constructor": {
-                        "color": "#8aadf4",
+                    "constant.builtin": {
+                        "color": "#f5a97f",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "embedded": {
-                        "color": "#ee99a0",
+                    "constant.macro": {
+                        "color": "#c6a0f6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "emphasis": {
-                        "color": "#ed8796",
+                    "module": {
+                        "color": "#eed49f",
                         "font_style": "italic",
                         "font_weight": null
                     },
-                    "emphasis.strong": {
-                        "color": "#ed8796",
+                    "label": {
+                        "color": "#7dc4e4",
                         "font_style": null,
-                        "font_weight": 700
+                        "font_weight": null
                     },
-                    "enum": {
-                        "color": "#8bd5ca",
+                    "string": {
+                        "color": "#a6da95",
                         "font_style": null,
-                        "font_weight": 700
-                    },
-                    "function": {
-                        "color": "#8aadf4",
-                        "font_style": "italic",
                         "font_weight": null
                     },
-                    "hint": {
-                        "color": "#5b6078",
-                        "font_style": "italic",
+                    "string.documentation": {
+                        "color": "#8bd5ca",
+                        "font_style": null,
                         "font_weight": null
                     },
-                    "keyword": {
-                        "color": "#c6a0f6",
+                    "string.regexp": {
+                        "color": "#f5a97f",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "link_text": {
-                        "color": "#8aadf4",
+                    "string.escape": {
+                        "color": "#f5bde6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "link_uri": {
-                        "color": "#8aadf4",
+                    "string.special": {
+                        "color": "#f5bde6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "number": {
-                        "color": "#f5a97f",
+                    "string.special.path": {
+                        "color": "#f5bde6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "operator": {
-                        "color": "#91d7e3",
+                    "string.special.symbol": {
+                        "color": "#f0c6c6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "predictive": {
-                        "color": "#7b94cc",
-                        "font_style": null,
+                    "string.special.url": {
+                        "color": "#f4dbd6",
+                        "font_style": "italic",
                         "font_weight": null
                     },
-                    "predoc": {
-                        "color": "#ed8796",
+                    "character": {
+                        "color": "#8bd5ca",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "primary": {
-                        "color": "#ee99a0",
+                    "character.special": {
+                        "color": "#f5bde6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "property": {
-                        "color": "#8aadf4",
+                    "boolean": {
+                        "color": "#f5a97f",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation": {
-                        "color": "#8bd5ca",
+                    "number": {
+                        "color": "#f5a97f",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.bracket": {
-                        "color": "#8bd5ca",
+                    "number.float": {
+                        "color": "#f5a97f",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.delimiter": {
-                        "color": "#939ab7",
+                    "type": {
+                        "color": "#eed49f",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.list_marker": {
-                        "color": "#8bd5ca",
+                    "type.builtin": {
+                        "color": "#c6a0f6",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "type.definition": {
+                        "color": "#eed49f",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.special": {
+                    "type.interface": {
+                        "color": "#eed49f",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "type.super": {
+                        "color": "#eed49f",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "attribute": {
+                        "color": "#f5a97f",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "property": {
+                        "color": "#8aadf4",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "function": {
+                        "color": "#8aadf4",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "function.builtin": {
+                        "color": "#f5a97f",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "function.call": {
+                        "color": "#8aadf4",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "function.macro": {
                         "color": "#8bd5ca",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.special.symbol": {
-                        "color": "#ed8796",
+                    "function.method": {
+                        "color": "#8aadf4",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string": {
-                        "color": "#a6da95",
+                    "function.method.call": {
+                        "color": "#8aadf4",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string.escape": {
-                        "color": "#f5bde6",
+                    "constructor": {
+                        "color": "#f0c6c6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string.regex": {
+                    "operator": {
+                        "color": "#91d7e3",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword": {
+                        "color": "#c6a0f6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.modifier": {
+                        "color": "#c6a0f6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.type": {
+                        "color": "#c6a0f6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.coroutine": {
+                        "color": "#c6a0f6",
+                        "font_style": null,
+                        "font_weight": null,
+                    },
+                    "keyword.function": {
+                        "color": "#c6a0f6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.operator": {
+                        "color": "#c6a0f6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.import": {
+                        "color": "#c6a0f6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.repeat": {
+                        "color": "#c6a0f6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.return": {
+                        "color": "#c6a0f6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.debug": {
+                        "color": "#c6a0f6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.exception": {
+                        "color": "#c6a0f6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.conditional": {
+                        "color": "#c6a0f6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.conditional.ternary": {
+                        "color": "#c6a0f6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.directive": {
                         "color": "#f5bde6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string.special": {
+                    "keyword.directive.define": {
                         "color": "#f5bde6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string.special.symbol": {
-                        "color": "#f0c6c6",
+                    "keyword.export": {
+                        "color": "#91d7e3",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "tag": {
-                        "color": "#8aadf4",
+                    "punctuation": {
+                        "color": "#939ab7",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "text.literal": {
-                        "color": "#a6da95",
+                    "punctuation.delimiter": {
+                        "color": "#939ab7",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "title": {
-                        "color": "#cad3f5",
+                    "punctuation.bracket": {
+                        "color": "#939ab7",
                         "font_style": null,
-                        "font_weight": 800
+                        "font_weight": null
                     },
-                    "type": {
-                        "color": "#eed49f",
+                    "punctuation.special": {
+                        "color": "#f5bde6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "type.builtin": {
-                        "color": "#c6a0f6",
+                    "punctuation.special.symbol": {
+                        "color": "#f0c6c6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "type.interface": {
+                    "punctuation.list_marker": {
+                        "color": "#8bd5ca",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "comment": {
+                        "color": "#939ab7",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "comment.doc": {
+                        "color": "#939ab7",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "comment.documentation": {
+                        "color": "#939ab7",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "comment.error": {
+                        "color": "#ed8796",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "comment.warning": {
                         "color": "#eed49f",
                         "font_style": "italic",
                         "font_weight": null
                     },
-                    "type.super": {
+                    "comment.hint": {
+                        "color": "#8aadf4",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "comment.todo": {
+                        "color": "#f0c6c6",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "comment.note": {
+                        "color": "#f4dbd6",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "tag": {
+                        "color": "#8aadf4",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "tag.attribute": {
                         "color": "#eed49f",
                         "font_style": "italic",
                         "font_weight": null
                     },
-                    "variable": {
-                        "color": "#cad3f5",
+                    "tag.delimiter": {
+                        "color": "#8bd5ca",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "variable.member": {
-                        "color": "#cad3f5",
+                    "parameter": {
+                        "color": "#ee99a0",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "variable.parameter": {
+                    "field": {
+                        "color": "#b7bdf8",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "namespace": {
+                        "color": "#b7bdf8",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "float": {
+                        "color": "#f5a97f",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "symbol": {
+                        "color": "#f5bde6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.regex": {
                         "color": "#f5a97f",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "text": {
+                        "color": "#cad3f5",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "emphasis.strong": {
+                        "color": "#ee99a0",
+                        "font_style": null,
+                        "font_weight": 700
+                    },
+                    "emphasis": {
+                        "color": "#ee99a0",
                         "font_style": "italic",
                         "font_weight": null
                     },
-                    "variable.special": {
-                        "color": "#d8b5cf",
+                    "embedded": {
+                        "color": "#ee99a0",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "text.literal": {
+                        "color": "#a6da95",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "enum": {
+                        "color": "#8bd5ca",
+                        "font_style": null,
+                        "font_weight": 700
+                    },
+                    "hint": {
+                        "color": "#5b6078",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "link_text": {
+                        "color": "#8aadf4",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "link_uri": {
+                        "color": "#f4dbd6",
                         "font_style": "italic",
                         "font_weight": null
                     },
+                    "predictive": {
+                        "color": "#6e738d",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "predoc": {
+                        "color": "#ed8796",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "primary": {
+                        "color": "#ee99a0",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "tag.doctype": {
+                        "color": "#c6a0f6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "title": {
+                        "color": "#cad3f5",
+                        "font_style": null,
+                        "font_weight": 800
+                    },
                     "variant": {
                         "color": "#ed8796",
                         "font_style": null,
@@ -1322,7 +2042,7 @@
                 "modified": "#f9e2af",
                 "modified.border": "#f9e2af",
                 "modified.background": "#181825",
-                "predictive": "#7997cd",
+                "predictive": "#6c7086",
                 "predictive.border": "#b4befe",
                 "predictive.background": "#181825",
                 "renamed": "#74c7ec",
@@ -1368,76 +2088,206 @@
                         "selection": "#dfdad833",
                         "background": "#dfdad8"
                     },
-                    {
-                        "cursor": "#b2c8f6",
-                        "selection": "#b2c8f633",
-                        "background": "#b2c8f6"
+                    {
+                        "cursor": "#b2c8f6",
+                        "selection": "#b2c8f633",
+                        "background": "#b2c8f6"
+                    },
+                    {
+                        "cursor": "#bddbd2",
+                        "selection": "#bddbd233",
+                        "background": "#bddbd2"
+                    }
+                ],
+                "syntax": {
+                    "variable": {
+                        "color": "#cdd6f4",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "variable.builtin": {
+                        "color": "#f38ba8",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "variable.parameter": {
+                        "color": "#eba0ac",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "variable.member": {
+                        "color": "#f38ba8",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "variable.special": {
+                        "color": "#f5c2e7",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "constant": {
+                        "color": "#fab387",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "constant.builtin": {
+                        "color": "#fab387",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "constant.macro": {
+                        "color": "#cba6f7",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "module": {
+                        "color": "#f9e2af",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "label": {
+                        "color": "#74c7ec",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string": {
+                        "color": "#a6e3a1",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.documentation": {
+                        "color": "#94e2d5",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.regexp": {
+                        "color": "#fab387",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.escape": {
+                        "color": "#f5c2e7",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.special": {
+                        "color": "#f5c2e7",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.special.path": {
+                        "color": "#f5c2e7",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.special.symbol": {
+                        "color": "#f2cdcd",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.special.url": {
+                        "color": "#f5e0dc",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "character": {
+                        "color": "#94e2d5",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "character.special": {
+                        "color": "#f5c2e7",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "boolean": {
+                        "color": "#fab387",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "number": {
+                        "color": "#fab387",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "number.float": {
+                        "color": "#fab387",
+                        "font_style": null,
+                        "font_weight": null
                     },
-                    {
-                        "cursor": "#bddbd2",
-                        "selection": "#bddbd233",
-                        "background": "#bddbd2"
-                    }
-                ],
-                "syntax": {
-                    "attribute": {
+                    "type": {
                         "color": "#f9e2af",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "boolean": {
-                        "color": "#fab387",
+                    "type.builtin": {
+                        "color": "#cba6f7",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "type.definition": {
+                        "color": "#f9e2af",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "comment": {
-                        "color": "#7f849c",
+                    "type.interface": {
+                        "color": "#f9e2af",
                         "font_style": "italic",
                         "font_weight": null
                     },
-                    "comment.doc": {
-                        "color": "#7f849c",
+                    "type.super": {
+                        "color": "#f9e2af",
                         "font_style": "italic",
                         "font_weight": null
                     },
-                    "constant": {
+                    "attribute": {
                         "color": "#fab387",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "constructor": {
+                    "property": {
                         "color": "#89b4fa",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "embedded": {
-                        "color": "#eba0ac",
+                    "function": {
+                        "color": "#89b4fa",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "emphasis": {
-                        "color": "#f38ba8",
-                        "font_style": "italic",
+                    "function.builtin": {
+                        "color": "#fab387",
+                        "font_style": null,
                         "font_weight": null
                     },
-                    "emphasis.strong": {
-                        "color": "#f38ba8",
+                    "function.call": {
+                        "color": "#89b4fa",
                         "font_style": null,
-                        "font_weight": 700
+                        "font_weight": null
                     },
-                    "enum": {
+                    "function.macro": {
                         "color": "#94e2d5",
                         "font_style": null,
-                        "font_weight": 700
+                        "font_weight": null
                     },
-                    "function": {
+                    "function.method": {
                         "color": "#89b4fa",
-                        "font_style": "italic",
+                        "font_style": null,
                         "font_weight": null
                     },
-                    "hint": {
-                        "color": "#585b70",
-                        "font_style": "italic",
+                    "function.method.call": {
+                        "color": "#89b4fa",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "constructor": {
+                        "color": "#f2cdcd",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "operator": {
+                        "color": "#89dceb",
+                        "font_style": null,
                         "font_weight": null
                     },
                     "keyword": {
@@ -1445,53 +2295,83 @@
                         "font_style": null,
                         "font_weight": null
                     },
-                    "link_text": {
-                        "color": "#89b4fa",
+                    "keyword.modifier": {
+                        "color": "#cba6f7",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "link_uri": {
-                        "color": "#89b4fa",
+                    "keyword.type": {
+                        "color": "#cba6f7",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "number": {
-                        "color": "#fab387",
+                    "keyword.coroutine": {
+                        "color": "#cba6f7",
+                        "font_style": null,
+                        "font_weight": null,
+                    },
+                    "keyword.function": {
+                        "color": "#cba6f7",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "operator": {
-                        "color": "#89dceb",
+                    "keyword.operator": {
+                        "color": "#cba6f7",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "predictive": {
-                        "color": "#7997cd",
+                    "keyword.import": {
+                        "color": "#cba6f7",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "predoc": {
-                        "color": "#f38ba8",
+                    "keyword.repeat": {
+                        "color": "#cba6f7",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "primary": {
-                        "color": "#eba0ac",
+                    "keyword.return": {
+                        "color": "#cba6f7",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "property": {
-                        "color": "#89b4fa",
+                    "keyword.debug": {
+                        "color": "#cba6f7",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation": {
-                        "color": "#94e2d5",
+                    "keyword.exception": {
+                        "color": "#cba6f7",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.bracket": {
-                        "color": "#94e2d5",
+                    "keyword.conditional": {
+                        "color": "#cba6f7",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.conditional.ternary": {
+                        "color": "#cba6f7",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.directive": {
+                        "color": "#f5c2e7",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.directive.define": {
+                        "color": "#f5c2e7",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.export": {
+                        "color": "#89dceb",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "punctuation": {
+                        "color": "#9399b2",
                         "font_style": null,
                         "font_weight": null
                     },
@@ -1500,48 +2380,128 @@
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.list_marker": {
-                        "color": "#94e2d5",
+                    "punctuation.bracket": {
+                        "color": "#9399b2",
                         "font_style": null,
                         "font_weight": null
                     },
                     "punctuation.special": {
-                        "color": "#94e2d5",
+                        "color": "#f5c2e7",
                         "font_style": null,
                         "font_weight": null
                     },
                     "punctuation.special.symbol": {
+                        "color": "#f2cdcd",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "punctuation.list_marker": {
+                        "color": "#94e2d5",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "comment": {
+                        "color": "#9399b2",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "comment.doc": {
+                        "color": "#9399b2",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "comment.documentation": {
+                        "color": "#9399b2",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "comment.error": {
                         "color": "#f38ba8",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "comment.warning": {
+                        "color": "#f9e2af",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "comment.hint": {
+                        "color": "#89b4fa",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "comment.todo": {
+                        "color": "#f2cdcd",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "comment.note": {
+                        "color": "#f5e0dc",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "tag": {
+                        "color": "#89b4fa",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string": {
-                        "color": "#a6e3a1",
+                    "tag.attribute": {
+                        "color": "#f9e2af",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "tag.delimiter": {
+                        "color": "#94e2d5",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string.escape": {
+                    "parameter": {
+                        "color": "#eba0ac",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "field": {
+                        "color": "#b4befe",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "namespace": {
+                        "color": "#b4befe",
+                        "font_style": "italic",
+                        "font_weight": null
+                    },
+                    "float": {
+                        "color": "#fab387",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "symbol": {
                         "color": "#f5c2e7",
                         "font_style": null,
                         "font_weight": null
                     },
                     "string.regex": {
-                        "color": "#f5c2e7",
+                        "color": "#fab387",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string.special": {
-                        "color": "#f5c2e7",
+                    "text": {
+                        "color": "#cdd6f4",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string.special.symbol": {
-                        "color": "#f2cdcd",
+                    "emphasis.strong": {
+                        "color": "#eba0ac",
                         "font_style": null,
+                        "font_weight": 700
+                    },
+                    "emphasis": {
+                        "color": "#eba0ac",
+                        "font_style": "italic",
                         "font_weight": null
                     },
-                    "tag": {
-                        "color": "#89b4fa",
+                    "embedded": {
+                        "color": "#eba0ac",
                         "font_style": null,
                         "font_weight": null
                     },
@@ -1550,50 +2510,50 @@
                         "font_style": null,
                         "font_weight": null
                     },
-                    "title": {
-                        "color": "#cdd6f4",
+                    "enum": {
+                        "color": "#94e2d5",
                         "font_style": null,
-                        "font_weight": 800
+                        "font_weight": 700
                     },
-                    "type": {
-                        "color": "#f9e2af",
-                        "font_style": null,
+                    "hint": {
+                        "color": "#585b70",
+                        "font_style": "italic",
                         "font_weight": null
                     },
-                    "type.builtin": {
-                        "color": "#cba6f7",
+                    "link_text": {
+                        "color": "#89b4fa",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "type.interface": {
-                        "color": "#f9e2af",
+                    "link_uri": {
+                        "color": "#f5e0dc",
                         "font_style": "italic",
                         "font_weight": null
                     },
-                    "type.super": {
-                        "color": "#f9e2af",
-                        "font_style": "italic",
+                    "predictive": {
+                        "color": "#6c7086",
+                        "font_style": null,
                         "font_weight": null
                     },
-                    "variable": {
-                        "color": "#cdd6f4",
+                    "predoc": {
+                        "color": "#f38ba8",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "variable.member": {
-                        "color": "#cdd6f4",
+                    "primary": {
+                        "color": "#eba0ac",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "variable.parameter": {
-                        "color": "#fab387",
-                        "font_style": "italic",
+                    "tag.doctype": {
+                        "color": "#cba6f7",
+                        "font_style": null,
                         "font_weight": null
                     },
-                    "variable.special": {
-                        "color": "#dcb8d5",
-                        "font_style": "italic",
-                        "font_weight": null
+                    "title": {
+                        "color": "#cdd6f4",
+                        "font_style": null,
+                        "font_weight": 800
                     },
                     "variant": {
                         "color": "#f38ba8",
diff --git a/themes/catppuccin-no-italics-mauve.json b/themes/catppuccin-no-italics-mauve.json
index 81a24e5..893f3f9 100644
--- a/themes/catppuccin-no-italics-mauve.json
+++ b/themes/catppuccin-no-italics-mauve.json
@@ -122,7 +122,7 @@
                 "modified": "#df8e1d",
                 "modified.border": "#df8e1d",
                 "modified.background": "#e6e9ef",
-                "predictive": "#4d7ee3",
+                "predictive": "#9ca0b0",
                 "predictive.border": "#7287fd",
                 "predictive.background": "#e6e9ef",
                 "renamed": "#209fb5",
@@ -180,23 +180,28 @@
                     }
                 ],
                 "syntax": {
-                    "attribute": {
-                        "color": "#df8e1d",
+                    "variable": {
+                        "color": "#4c4f69",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "boolean": {
-                        "color": "#fe640b",
+                    "variable.builtin": {
+                        "color": "#d20f39",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "comment": {
-                        "color": "#8c8fa1",
+                    "variable.parameter": {
+                        "color": "#e64553",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "comment.doc": {
-                        "color": "#8c8fa1",
+                    "variable.member": {
+                        "color": "#d20f39",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "variable.special": {
+                        "color": "#ea76cb",
                         "font_style": null,
                         "font_weight": null
                     },
@@ -205,204 +210,439 @@
                         "font_style": null,
                         "font_weight": null
                     },
-                    "constructor": {
-                        "color": "#1e66f5",
+                    "constant.builtin": {
+                        "color": "#fe640b",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "embedded": {
-                        "color": "#e64553",
+                    "constant.macro": {
+                        "color": "#8839ef",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "emphasis": {
-                        "color": "#d20f39",
+                    "module": {
+                        "color": "#df8e1d",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "emphasis.strong": {
-                        "color": "#d20f39",
+                    "label": {
+                        "color": "#209fb5",
                         "font_style": null,
-                        "font_weight": 700
+                        "font_weight": null
                     },
-                    "enum": {
+                    "string": {
+                        "color": "#40a02b",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.documentation": {
                         "color": "#179299",
                         "font_style": null,
-                        "font_weight": 700
+                        "font_weight": null
                     },
-                    "function": {
-                        "color": "#1e66f5",
+                    "string.regexp": {
+                        "color": "#fe640b",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "hint": {
-                        "color": "#acb0be",
+                    "string.escape": {
+                        "color": "#ea76cb",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "keyword": {
+                    "string.special": {
+                        "color": "#ea76cb",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.special.path": {
+                        "color": "#ea76cb",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.special.symbol": {
+                        "color": "#dd7878",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.special.url": {
+                        "color": "#dc8a78",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "character": {
+                        "color": "#179299",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "character.special": {
+                        "color": "#ea76cb",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "boolean": {
+                        "color": "#fe640b",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "number": {
+                        "color": "#fe640b",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "number.float": {
+                        "color": "#fe640b",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "type": {
+                        "color": "#df8e1d",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "type.builtin": {
                         "color": "#8839ef",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "link_text": {
+                    "type.definition": {
+                        "color": "#df8e1d",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "type.interface": {
+                        "color": "#df8e1d",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "type.super": {
+                        "color": "#df8e1d",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "attribute": {
+                        "color": "#fe640b",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "property": {
                         "color": "#1e66f5",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "link_uri": {
+                    "function": {
                         "color": "#1e66f5",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "number": {
+                    "function.builtin": {
                         "color": "#fe640b",
                         "font_style": null,
                         "font_weight": null
                     },
+                    "function.call": {
+                        "color": "#1e66f5",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "function.macro": {
+                        "color": "#179299",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "function.method": {
+                        "color": "#1e66f5",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "function.method.call": {
+                        "color": "#1e66f5",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "constructor": {
+                        "color": "#dd7878",
+                        "font_style": null,
+                        "font_weight": null
+                    },
                     "operator": {
                         "color": "#04a5e5",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "predictive": {
-                        "color": "#4d7ee3",
+                    "keyword": {
+                        "color": "#8839ef",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "predoc": {
-                        "color": "#d20f39",
+                    "keyword.modifier": {
+                        "color": "#8839ef",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "primary": {
-                        "color": "#e64553",
+                    "keyword.type": {
+                        "color": "#8839ef",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "property": {
-                        "color": "#1e66f5",
+                    "keyword.coroutine": {
+                        "color": "#8839ef",
+                        "font_style": null,
+                        "font_weight": null,
+                    },
+                    "keyword.function": {
+                        "color": "#8839ef",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation": {
-                        "color": "#179299",
+                    "keyword.operator": {
+                        "color": "#8839ef",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.bracket": {
-                        "color": "#179299",
+                    "keyword.import": {
+                        "color": "#8839ef",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.delimiter": {
-                        "color": "#7c7f93",
+                    "keyword.repeat": {
+                        "color": "#8839ef",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.list_marker": {
-                        "color": "#179299",
+                    "keyword.return": {
+                        "color": "#8839ef",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.special": {
-                        "color": "#179299",
+                    "keyword.debug": {
+                        "color": "#8839ef",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.special.symbol": {
-                        "color": "#d20f39",
+                    "keyword.exception": {
+                        "color": "#8839ef",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string": {
-                        "color": "#40a02b",
+                    "keyword.conditional": {
+                        "color": "#8839ef",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string.escape": {
+                    "keyword.conditional.ternary": {
+                        "color": "#8839ef",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.directive": {
                         "color": "#ea76cb",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string.regex": {
+                    "keyword.directive.define": {
                         "color": "#ea76cb",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string.special": {
+                    "keyword.export": {
+                        "color": "#04a5e5",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "punctuation": {
+                        "color": "#7c7f93",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "punctuation.delimiter": {
+                        "color": "#7c7f93",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "punctuation.bracket": {
+                        "color": "#7c7f93",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "punctuation.special": {
                         "color": "#ea76cb",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string.special.symbol": {
+                    "punctuation.special.symbol": {
                         "color": "#dd7878",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "tag": {
-                        "color": "#1e66f5",
+                    "punctuation.list_marker": {
+                        "color": "#179299",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "text.literal": {
-                        "color": "#40a02b",
+                    "comment": {
+                        "color": "#7c7f93",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "title": {
-                        "color": "#4c4f69",
+                    "comment.doc": {
+                        "color": "#7c7f93",
                         "font_style": null,
-                        "font_weight": 800
+                        "font_weight": null
                     },
-                    "type": {
-                        "color": "#df8e1d",
+                    "comment.documentation": {
+                        "color": "#7c7f93",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "type.builtin": {
-                        "color": "#8839ef",
+                    "comment.error": {
+                        "color": "#d20f39",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "type.interface": {
+                    "comment.warning": {
                         "color": "#df8e1d",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "type.super": {
+                    "comment.hint": {
+                        "color": "#1e66f5",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "comment.todo": {
+                        "color": "#dd7878",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "comment.note": {
+                        "color": "#dc8a78",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "tag": {
+                        "color": "#1e66f5",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "tag.attribute": {
                         "color": "#df8e1d",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "variable": {
-                        "color": "#4c4f69",
+                    "tag.delimiter": {
+                        "color": "#179299",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "variable.member": {
-                        "color": "#4c4f69",
+                    "parameter": {
+                        "color": "#e64553",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "variable.parameter": {
-                        "color": "#fe640b",
+                    "field": {
+                        "color": "#7287fd",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "variable.special": {
-                        "color": "#823556",
+                    "namespace": {
+                        "color": "#7287fd",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "variant": {
-                        "color": "#d20f39",
+                    "float": {
+                        "color": "#fe640b",
                         "font_style": null,
                         "font_weight": null
-                    }
-                }
-            }
-        },
+                    },
+                    "symbol": {
+                        "color": "#ea76cb",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.regex": {
+                        "color": "#fe640b",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "text": {
+                        "color": "#4c4f69",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "emphasis.strong": {
+                        "color": "#e64553",
+                        "font_style": null,
+                        "font_weight": 700
+                    },
+                    "emphasis": {
+                        "color": "#e64553",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "embedded": {
+                        "color": "#e64553",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "text.literal": {
+                        "color": "#40a02b",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "enum": {
+                        "color": "#179299",
+                        "font_style": null,
+                        "font_weight": 700
+                    },
+                    "hint": {
+                        "color": "#acb0be",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "link_text": {
+                        "color": "#1e66f5",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "link_uri": {
+                        "color": "#dc8a78",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "predictive": {
+                        "color": "#9ca0b0",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "predoc": {
+                        "color": "#d20f39",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "primary": {
+                        "color": "#e64553",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "tag.doctype": {
+                        "color": "#8839ef",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "title": {
+                        "color": "#4c4f69",
+                        "font_style": null,
+                        "font_weight": 800
+                    },
+                    "variant": {
+                        "color": "#d20f39",
+                        "font_style": null,
+                        "font_weight": null
+                    }
+                }
+            }
+        },
         {
             "name": "Catppuccin Frappé - No Italics",
             "appearance": "dark",
@@ -522,7 +762,7 @@
                 "modified": "#e5c890",
                 "modified.border": "#e5c890",
                 "modified.background": "#292c3c",
-                "predictive": "#7e94ca",
+                "predictive": "#737994",
                 "predictive.border": "#babbf1",
                 "predictive.background": "#292c3c",
                 "renamed": "#85c1dc",
@@ -580,23 +820,28 @@
                     }
                 ],
                 "syntax": {
-                    "attribute": {
-                        "color": "#e5c890",
+                    "variable": {
+                        "color": "#c6d0f5",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "boolean": {
-                        "color": "#ef9f76",
+                    "variable.builtin": {
+                        "color": "#e78284",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "comment": {
-                        "color": "#838ba7",
+                    "variable.parameter": {
+                        "color": "#ea999c",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "comment.doc": {
-                        "color": "#838ba7",
+                    "variable.member": {
+                        "color": "#e78284",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "variable.special": {
+                        "color": "#f4b8e4",
                         "font_style": null,
                         "font_weight": null
                     },
@@ -605,143 +850,378 @@
                         "font_style": null,
                         "font_weight": null
                     },
-                    "constructor": {
-                        "color": "#8caaee",
+                    "constant.builtin": {
+                        "color": "#ef9f76",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "embedded": {
-                        "color": "#ea999c",
+                    "constant.macro": {
+                        "color": "#ca9ee6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "emphasis": {
-                        "color": "#e78284",
+                    "module": {
+                        "color": "#e5c890",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "emphasis.strong": {
-                        "color": "#e78284",
+                    "label": {
+                        "color": "#85c1dc",
                         "font_style": null,
-                        "font_weight": 700
+                        "font_weight": null
                     },
-                    "enum": {
+                    "string": {
+                        "color": "#a6d189",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.documentation": {
                         "color": "#81c8be",
                         "font_style": null,
-                        "font_weight": 700
+                        "font_weight": null
                     },
-                    "function": {
-                        "color": "#8caaee",
+                    "string.regexp": {
+                        "color": "#ef9f76",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "hint": {
-                        "color": "#626880",
+                    "string.escape": {
+                        "color": "#f4b8e4",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "keyword": {
+                    "string.special": {
+                        "color": "#f4b8e4",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.special.path": {
+                        "color": "#f4b8e4",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.special.symbol": {
+                        "color": "#eebebe",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.special.url": {
+                        "color": "#f2d5cf",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "character": {
+                        "color": "#81c8be",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "character.special": {
+                        "color": "#f4b8e4",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "boolean": {
+                        "color": "#ef9f76",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "number": {
+                        "color": "#ef9f76",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "number.float": {
+                        "color": "#ef9f76",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "type": {
+                        "color": "#e5c890",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "type.builtin": {
                         "color": "#ca9ee6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "link_text": {
+                    "type.definition": {
+                        "color": "#e5c890",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "type.interface": {
+                        "color": "#e5c890",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "type.super": {
+                        "color": "#e5c890",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "attribute": {
+                        "color": "#ef9f76",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "property": {
                         "color": "#8caaee",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "link_uri": {
+                    "function": {
                         "color": "#8caaee",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "number": {
+                    "function.builtin": {
                         "color": "#ef9f76",
                         "font_style": null,
                         "font_weight": null
                     },
+                    "function.call": {
+                        "color": "#8caaee",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "function.macro": {
+                        "color": "#81c8be",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "function.method": {
+                        "color": "#8caaee",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "function.method.call": {
+                        "color": "#8caaee",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "constructor": {
+                        "color": "#eebebe",
+                        "font_style": null,
+                        "font_weight": null
+                    },
                     "operator": {
                         "color": "#99d1db",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "predictive": {
-                        "color": "#7e94ca",
+                    "keyword": {
+                        "color": "#ca9ee6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "predoc": {
-                        "color": "#e78284",
+                    "keyword.modifier": {
+                        "color": "#ca9ee6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "primary": {
-                        "color": "#ea999c",
+                    "keyword.type": {
+                        "color": "#ca9ee6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "property": {
-                        "color": "#8caaee",
+                    "keyword.coroutine": {
+                        "color": "#ca9ee6",
+                        "font_style": null,
+                        "font_weight": null,
+                    },
+                    "keyword.function": {
+                        "color": "#ca9ee6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.operator": {
+                        "color": "#ca9ee6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.import": {
+                        "color": "#ca9ee6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.repeat": {
+                        "color": "#ca9ee6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.return": {
+                        "color": "#ca9ee6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.debug": {
+                        "color": "#ca9ee6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.exception": {
+                        "color": "#ca9ee6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.conditional": {
+                        "color": "#ca9ee6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.conditional.ternary": {
+                        "color": "#ca9ee6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.directive": {
+                        "color": "#f4b8e4",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.directive.define": {
+                        "color": "#f4b8e4",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.export": {
+                        "color": "#99d1db",
                         "font_style": null,
                         "font_weight": null
                     },
                     "punctuation": {
-                        "color": "#81c8be",
+                        "color": "#949cbb",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "punctuation.delimiter": {
+                        "color": "#949cbb",
                         "font_style": null,
                         "font_weight": null
                     },
                     "punctuation.bracket": {
+                        "color": "#949cbb",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "punctuation.special": {
+                        "color": "#f4b8e4",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "punctuation.special.symbol": {
+                        "color": "#eebebe",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "punctuation.list_marker": {
                         "color": "#81c8be",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.delimiter": {
+                    "comment": {
+                        "color": "#949cbb",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "comment.doc": {
+                        "color": "#949cbb",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "comment.documentation": {
                         "color": "#949cbb",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.list_marker": {
-                        "color": "#81c8be",
+                    "comment.error": {
+                        "color": "#e78284",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "comment.warning": {
+                        "color": "#e5c890",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "comment.hint": {
+                        "color": "#8caaee",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "comment.todo": {
+                        "color": "#eebebe",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "comment.note": {
+                        "color": "#f2d5cf",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "tag": {
+                        "color": "#8caaee",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "tag.attribute": {
+                        "color": "#e5c890",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "tag.delimiter": {
+                        "color": "#81c8be",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "parameter": {
+                        "color": "#ea999c",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.special": {
-                        "color": "#81c8be",
+                    "field": {
+                        "color": "#babbf1",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.special.symbol": {
-                        "color": "#e78284",
+                    "namespace": {
+                        "color": "#babbf1",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string": {
-                        "color": "#a6d189",
+                    "float": {
+                        "color": "#ef9f76",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string.escape": {
+                    "symbol": {
                         "color": "#f4b8e4",
                         "font_style": null,
                         "font_weight": null
                     },
                     "string.regex": {
-                        "color": "#f4b8e4",
+                        "color": "#ef9f76",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string.special": {
-                        "color": "#f4b8e4",
+                    "text": {
+                        "color": "#c6d0f5",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string.special.symbol": {
-                        "color": "#eebebe",
+                    "emphasis.strong": {
+                        "color": "#ea999c",
+                        "font_style": null,
+                        "font_weight": 700
+                    },
+                    "emphasis": {
+                        "color": "#ea999c",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "tag": {
-                        "color": "#8caaee",
+                    "embedded": {
+                        "color": "#ea999c",
                         "font_style": null,
                         "font_weight": null
                     },
@@ -750,50 +1230,50 @@
                         "font_style": null,
                         "font_weight": null
                     },
-                    "title": {
-                        "color": "#c6d0f5",
+                    "enum": {
+                        "color": "#81c8be",
                         "font_style": null,
-                        "font_weight": 800
+                        "font_weight": 700
                     },
-                    "type": {
-                        "color": "#e5c890",
+                    "hint": {
+                        "color": "#626880",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "type.builtin": {
-                        "color": "#ca9ee6",
+                    "link_text": {
+                        "color": "#8caaee",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "type.interface": {
-                        "color": "#e5c890",
+                    "link_uri": {
+                        "color": "#f2d5cf",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "type.super": {
-                        "color": "#e5c890",
+                    "predictive": {
+                        "color": "#737994",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "variable": {
-                        "color": "#c6d0f5",
+                    "predoc": {
+                        "color": "#e78284",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "variable.member": {
-                        "color": "#c6d0f5",
+                    "primary": {
+                        "color": "#ea999c",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "variable.parameter": {
-                        "color": "#ef9f76",
+                    "tag.doctype": {
+                        "color": "#ca9ee6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "variable.special": {
-                        "color": "#d3b1c8",
+                    "title": {
+                        "color": "#c6d0f5",
                         "font_style": null,
-                        "font_weight": null
+                        "font_weight": 800
                     },
                     "variant": {
                         "color": "#e78284",
@@ -922,7 +1402,7 @@
                 "modified": "#eed49f",
                 "modified.border": "#eed49f",
                 "modified.background": "#1e2030",
-                "predictive": "#7b94cc",
+                "predictive": "#6e738d",
                 "predictive.border": "#b7bdf8",
                 "predictive.background": "#1e2030",
                 "renamed": "#7dc4e4",
@@ -980,168 +1460,408 @@
                     }
                 ],
                 "syntax": {
-                    "attribute": {
+                    "variable": {
+                        "color": "#cad3f5",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "variable.builtin": {
+                        "color": "#ed8796",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "variable.parameter": {
+                        "color": "#ee99a0",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "variable.member": {
+                        "color": "#ed8796",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "variable.special": {
+                        "color": "#f5bde6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "constant": {
+                        "color": "#f5a97f",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "constant.builtin": {
+                        "color": "#f5a97f",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "constant.macro": {
+                        "color": "#c6a0f6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "module": {
+                        "color": "#eed49f",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "label": {
+                        "color": "#7dc4e4",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string": {
+                        "color": "#a6da95",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.documentation": {
+                        "color": "#8bd5ca",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.regexp": {
+                        "color": "#f5a97f",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.escape": {
+                        "color": "#f5bde6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.special": {
+                        "color": "#f5bde6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.special.path": {
+                        "color": "#f5bde6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.special.symbol": {
+                        "color": "#f0c6c6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.special.url": {
+                        "color": "#f4dbd6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "character": {
+                        "color": "#8bd5ca",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "character.special": {
+                        "color": "#f5bde6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "boolean": {
+                        "color": "#f5a97f",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "number": {
+                        "color": "#f5a97f",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "number.float": {
+                        "color": "#f5a97f",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "type": {
+                        "color": "#eed49f",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "type.builtin": {
+                        "color": "#c6a0f6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "type.definition": {
+                        "color": "#eed49f",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "type.interface": {
+                        "color": "#eed49f",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "type.super": {
                         "color": "#eed49f",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "boolean": {
-                        "color": "#f5a97f",
+                    "attribute": {
+                        "color": "#f5a97f",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "property": {
+                        "color": "#8aadf4",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "function": {
+                        "color": "#8aadf4",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "function.builtin": {
+                        "color": "#f5a97f",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "function.call": {
+                        "color": "#8aadf4",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "function.macro": {
+                        "color": "#8bd5ca",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "function.method": {
+                        "color": "#8aadf4",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "function.method.call": {
+                        "color": "#8aadf4",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "constructor": {
+                        "color": "#f0c6c6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "operator": {
+                        "color": "#91d7e3",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword": {
+                        "color": "#c6a0f6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.modifier": {
+                        "color": "#c6a0f6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.type": {
+                        "color": "#c6a0f6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.coroutine": {
+                        "color": "#c6a0f6",
+                        "font_style": null,
+                        "font_weight": null,
+                    },
+                    "keyword.function": {
+                        "color": "#c6a0f6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.operator": {
+                        "color": "#c6a0f6",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.import": {
+                        "color": "#c6a0f6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "comment": {
-                        "color": "#8087a2",
+                    "keyword.repeat": {
+                        "color": "#c6a0f6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "comment.doc": {
-                        "color": "#8087a2",
+                    "keyword.return": {
+                        "color": "#c6a0f6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "constant": {
-                        "color": "#f5a97f",
+                    "keyword.debug": {
+                        "color": "#c6a0f6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "constructor": {
-                        "color": "#8aadf4",
+                    "keyword.exception": {
+                        "color": "#c6a0f6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "embedded": {
-                        "color": "#ee99a0",
+                    "keyword.conditional": {
+                        "color": "#c6a0f6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "emphasis": {
-                        "color": "#ed8796",
+                    "keyword.conditional.ternary": {
+                        "color": "#c6a0f6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "emphasis.strong": {
-                        "color": "#ed8796",
+                    "keyword.directive": {
+                        "color": "#f5bde6",
                         "font_style": null,
-                        "font_weight": 700
+                        "font_weight": null
                     },
-                    "enum": {
-                        "color": "#8bd5ca",
+                    "keyword.directive.define": {
+                        "color": "#f5bde6",
                         "font_style": null,
-                        "font_weight": 700
+                        "font_weight": null
                     },
-                    "function": {
-                        "color": "#8aadf4",
+                    "keyword.export": {
+                        "color": "#91d7e3",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "hint": {
-                        "color": "#5b6078",
+                    "punctuation": {
+                        "color": "#939ab7",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "keyword": {
-                        "color": "#c6a0f6",
+                    "punctuation.delimiter": {
+                        "color": "#939ab7",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "link_text": {
-                        "color": "#8aadf4",
+                    "punctuation.bracket": {
+                        "color": "#939ab7",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "link_uri": {
-                        "color": "#8aadf4",
+                    "punctuation.special": {
+                        "color": "#f5bde6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "number": {
-                        "color": "#f5a97f",
+                    "punctuation.special.symbol": {
+                        "color": "#f0c6c6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "operator": {
-                        "color": "#91d7e3",
+                    "punctuation.list_marker": {
+                        "color": "#8bd5ca",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "predictive": {
-                        "color": "#7b94cc",
+                    "comment": {
+                        "color": "#939ab7",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "predoc": {
+                    "comment.doc": {
+                        "color": "#939ab7",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "comment.documentation": {
+                        "color": "#939ab7",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "comment.error": {
                         "color": "#ed8796",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "primary": {
-                        "color": "#ee99a0",
+                    "comment.warning": {
+                        "color": "#eed49f",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "property": {
+                    "comment.hint": {
                         "color": "#8aadf4",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation": {
-                        "color": "#8bd5ca",
+                    "comment.todo": {
+                        "color": "#f0c6c6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.bracket": {
-                        "color": "#8bd5ca",
+                    "comment.note": {
+                        "color": "#f4dbd6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.delimiter": {
-                        "color": "#939ab7",
+                    "tag": {
+                        "color": "#8aadf4",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.list_marker": {
-                        "color": "#8bd5ca",
+                    "tag.attribute": {
+                        "color": "#eed49f",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.special": {
+                    "tag.delimiter": {
                         "color": "#8bd5ca",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.special.symbol": {
-                        "color": "#ed8796",
+                    "parameter": {
+                        "color": "#ee99a0",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string": {
-                        "color": "#a6da95",
+                    "field": {
+                        "color": "#b7bdf8",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string.escape": {
+                    "namespace": {
+                        "color": "#b7bdf8",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "float": {
+                        "color": "#f5a97f",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "symbol": {
                         "color": "#f5bde6",
                         "font_style": null,
                         "font_weight": null
                     },
                     "string.regex": {
-                        "color": "#f5bde6",
+                        "color": "#f5a97f",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string.special": {
-                        "color": "#f5bde6",
+                    "text": {
+                        "color": "#cad3f5",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string.special.symbol": {
-                        "color": "#f0c6c6",
+                    "emphasis.strong": {
+                        "color": "#ee99a0",
+                        "font_style": null,
+                        "font_weight": 700
+                    },
+                    "emphasis": {
+                        "color": "#ee99a0",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "tag": {
-                        "color": "#8aadf4",
+                    "embedded": {
+                        "color": "#ee99a0",
                         "font_style": null,
                         "font_weight": null
                     },
@@ -1150,50 +1870,50 @@
                         "font_style": null,
                         "font_weight": null
                     },
-                    "title": {
-                        "color": "#cad3f5",
+                    "enum": {
+                        "color": "#8bd5ca",
                         "font_style": null,
-                        "font_weight": 800
+                        "font_weight": 700
                     },
-                    "type": {
-                        "color": "#eed49f",
+                    "hint": {
+                        "color": "#5b6078",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "type.builtin": {
-                        "color": "#c6a0f6",
+                    "link_text": {
+                        "color": "#8aadf4",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "type.interface": {
-                        "color": "#eed49f",
+                    "link_uri": {
+                        "color": "#f4dbd6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "type.super": {
-                        "color": "#eed49f",
+                    "predictive": {
+                        "color": "#6e738d",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "variable": {
-                        "color": "#cad3f5",
+                    "predoc": {
+                        "color": "#ed8796",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "variable.member": {
-                        "color": "#cad3f5",
+                    "primary": {
+                        "color": "#ee99a0",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "variable.parameter": {
-                        "color": "#f5a97f",
+                    "tag.doctype": {
+                        "color": "#c6a0f6",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "variable.special": {
-                        "color": "#d8b5cf",
+                    "title": {
+                        "color": "#cad3f5",
                         "font_style": null,
-                        "font_weight": null
+                        "font_weight": 800
                     },
                     "variant": {
                         "color": "#ed8796",
@@ -1322,7 +2042,7 @@
                 "modified": "#f9e2af",
                 "modified.border": "#f9e2af",
                 "modified.background": "#181825",
-                "predictive": "#7997cd",
+                "predictive": "#6c7086",
                 "predictive.border": "#b4befe",
                 "predictive.background": "#181825",
                 "renamed": "#74c7ec",
@@ -1363,80 +2083,210 @@
                         "selection": "#dfc8c833",
                         "background": "#dfc8c8"
                     },
-                    {
-                        "cursor": "#dfdad8",
-                        "selection": "#dfdad833",
-                        "background": "#dfdad8"
+                    {
+                        "cursor": "#dfdad8",
+                        "selection": "#dfdad833",
+                        "background": "#dfdad8"
+                    },
+                    {
+                        "cursor": "#b2c8f6",
+                        "selection": "#b2c8f633",
+                        "background": "#b2c8f6"
+                    },
+                    {
+                        "cursor": "#bddbd2",
+                        "selection": "#bddbd233",
+                        "background": "#bddbd2"
+                    }
+                ],
+                "syntax": {
+                    "variable": {
+                        "color": "#cdd6f4",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "variable.builtin": {
+                        "color": "#f38ba8",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "variable.parameter": {
+                        "color": "#eba0ac",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "variable.member": {
+                        "color": "#f38ba8",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "variable.special": {
+                        "color": "#f5c2e7",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "constant": {
+                        "color": "#fab387",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "constant.builtin": {
+                        "color": "#fab387",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "constant.macro": {
+                        "color": "#cba6f7",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "module": {
+                        "color": "#f9e2af",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "label": {
+                        "color": "#74c7ec",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string": {
+                        "color": "#a6e3a1",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.documentation": {
+                        "color": "#94e2d5",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.regexp": {
+                        "color": "#fab387",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.escape": {
+                        "color": "#f5c2e7",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.special": {
+                        "color": "#f5c2e7",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.special.path": {
+                        "color": "#f5c2e7",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.special.symbol": {
+                        "color": "#f2cdcd",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.special.url": {
+                        "color": "#f5e0dc",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "character": {
+                        "color": "#94e2d5",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "character.special": {
+                        "color": "#f5c2e7",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "boolean": {
+                        "color": "#fab387",
+                        "font_style": null,
+                        "font_weight": null
                     },
-                    {
-                        "cursor": "#b2c8f6",
-                        "selection": "#b2c8f633",
-                        "background": "#b2c8f6"
+                    "number": {
+                        "color": "#fab387",
+                        "font_style": null,
+                        "font_weight": null
                     },
-                    {
-                        "cursor": "#bddbd2",
-                        "selection": "#bddbd233",
-                        "background": "#bddbd2"
-                    }
-                ],
-                "syntax": {
-                    "attribute": {
+                    "number.float": {
+                        "color": "#fab387",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "type": {
                         "color": "#f9e2af",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "boolean": {
-                        "color": "#fab387",
+                    "type.builtin": {
+                        "color": "#cba6f7",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "comment": {
-                        "color": "#7f849c",
+                    "type.definition": {
+                        "color": "#f9e2af",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "comment.doc": {
-                        "color": "#7f849c",
+                    "type.interface": {
+                        "color": "#f9e2af",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "constant": {
+                    "type.super": {
+                        "color": "#f9e2af",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "attribute": {
                         "color": "#fab387",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "constructor": {
+                    "property": {
                         "color": "#89b4fa",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "embedded": {
-                        "color": "#eba0ac",
+                    "function": {
+                        "color": "#89b4fa",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "emphasis": {
-                        "color": "#f38ba8",
+                    "function.builtin": {
+                        "color": "#fab387",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "emphasis.strong": {
-                        "color": "#f38ba8",
+                    "function.call": {
+                        "color": "#89b4fa",
                         "font_style": null,
-                        "font_weight": 700
+                        "font_weight": null
                     },
-                    "enum": {
+                    "function.macro": {
                         "color": "#94e2d5",
                         "font_style": null,
-                        "font_weight": 700
+                        "font_weight": null
                     },
-                    "function": {
+                    "function.method": {
                         "color": "#89b4fa",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "hint": {
-                        "color": "#585b70",
+                    "function.method.call": {
+                        "color": "#89b4fa",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "constructor": {
+                        "color": "#f2cdcd",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "operator": {
+                        "color": "#89dceb",
                         "font_style": null,
                         "font_weight": null
                     },
@@ -1445,53 +2295,83 @@
                         "font_style": null,
                         "font_weight": null
                     },
-                    "link_text": {
-                        "color": "#89b4fa",
+                    "keyword.modifier": {
+                        "color": "#cba6f7",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "link_uri": {
-                        "color": "#89b4fa",
+                    "keyword.type": {
+                        "color": "#cba6f7",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "number": {
-                        "color": "#fab387",
+                    "keyword.coroutine": {
+                        "color": "#cba6f7",
+                        "font_style": null,
+                        "font_weight": null,
+                    },
+                    "keyword.function": {
+                        "color": "#cba6f7",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "operator": {
-                        "color": "#89dceb",
+                    "keyword.operator": {
+                        "color": "#cba6f7",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "predictive": {
-                        "color": "#7997cd",
+                    "keyword.import": {
+                        "color": "#cba6f7",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "predoc": {
-                        "color": "#f38ba8",
+                    "keyword.repeat": {
+                        "color": "#cba6f7",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "primary": {
-                        "color": "#eba0ac",
+                    "keyword.return": {
+                        "color": "#cba6f7",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "property": {
-                        "color": "#89b4fa",
+                    "keyword.debug": {
+                        "color": "#cba6f7",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation": {
-                        "color": "#94e2d5",
+                    "keyword.exception": {
+                        "color": "#cba6f7",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.bracket": {
-                        "color": "#94e2d5",
+                    "keyword.conditional": {
+                        "color": "#cba6f7",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.conditional.ternary": {
+                        "color": "#cba6f7",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.directive": {
+                        "color": "#f5c2e7",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.directive.define": {
+                        "color": "#f5c2e7",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "keyword.export": {
+                        "color": "#89dceb",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "punctuation": {
+                        "color": "#9399b2",
                         "font_style": null,
                         "font_weight": null
                     },
@@ -1500,101 +2380,181 @@
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.list_marker": {
-                        "color": "#94e2d5",
+                    "punctuation.bracket": {
+                        "color": "#9399b2",
                         "font_style": null,
                         "font_weight": null
                     },
                     "punctuation.special": {
-                        "color": "#94e2d5",
+                        "color": "#f5c2e7",
                         "font_style": null,
                         "font_weight": null
                     },
                     "punctuation.special.symbol": {
-                        "color": "#f38ba8",
+                        "color": "#f2cdcd",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string": {
-                        "color": "#a6e3a1",
+                    "punctuation.list_marker": {
+                        "color": "#94e2d5",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string.escape": {
-                        "color": "#f5c2e7",
+                    "comment": {
+                        "color": "#9399b2",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string.regex": {
-                        "color": "#f5c2e7",
+                    "comment.doc": {
+                        "color": "#9399b2",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string.special": {
-                        "color": "#f5c2e7",
+                    "comment.documentation": {
+                        "color": "#9399b2",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string.special.symbol": {
+                    "comment.error": {
+                        "color": "#f38ba8",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "comment.warning": {
+                        "color": "#f9e2af",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "comment.hint": {
+                        "color": "#89b4fa",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "comment.todo": {
                         "color": "#f2cdcd",
                         "font_style": null,
                         "font_weight": null
                     },
+                    "comment.note": {
+                        "color": "#f5e0dc",
+                        "font_style": null,
+                        "font_weight": null
+                    },
                     "tag": {
                         "color": "#89b4fa",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "text.literal": {
-                        "color": "#a6e3a1",
+                    "tag.attribute": {
+                        "color": "#f9e2af",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "title": {
-                        "color": "#cdd6f4",
+                    "tag.delimiter": {
+                        "color": "#94e2d5",
                         "font_style": null,
-                        "font_weight": 800
+                        "font_weight": null
                     },
-                    "type": {
-                        "color": "#f9e2af",
+                    "parameter": {
+                        "color": "#eba0ac",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "type.builtin": {
-                        "color": "#cba6f7",
+                    "field": {
+                        "color": "#b4befe",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "type.interface": {
-                        "color": "#f9e2af",
+                    "namespace": {
+                        "color": "#b4befe",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "type.super": {
-                        "color": "#f9e2af",
+                    "float": {
+                        "color": "#fab387",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "variable": {
-                        "color": "#cdd6f4",
+                    "symbol": {
+                        "color": "#f5c2e7",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "variable.member": {
+                    "string.regex": {
+                        "color": "#fab387",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "text": {
                         "color": "#cdd6f4",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "variable.parameter": {
-                        "color": "#fab387",
+                    "emphasis.strong": {
+                        "color": "#eba0ac",
+                        "font_style": null,
+                        "font_weight": 700
+                    },
+                    "emphasis": {
+                        "color": "#eba0ac",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "variable.special": {
-                        "color": "#dcb8d5",
+                    "embedded": {
+                        "color": "#eba0ac",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "text.literal": {
+                        "color": "#a6e3a1",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "enum": {
+                        "color": "#94e2d5",
+                        "font_style": null,
+                        "font_weight": 700
+                    },
+                    "hint": {
+                        "color": "#585b70",
                         "font_style": null,
                         "font_weight": null
                     },
+                    "link_text": {
+                        "color": "#89b4fa",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "link_uri": {
+                        "color": "#f5e0dc",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "predictive": {
+                        "color": "#6c7086",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "predoc": {
+                        "color": "#f38ba8",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "primary": {
+                        "color": "#eba0ac",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "tag.doctype": {
+                        "color": "#cba6f7",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "title": {
+                        "color": "#cdd6f4",
+                        "font_style": null,
+                        "font_weight": 800
+                    },
                     "variant": {
                         "color": "#f38ba8",
                         "font_style": null,
diff --git a/zed.tera b/zed.tera
index 4e58af0..4132039 100644
--- a/zed.tera
+++ b/zed.tera
@@ -23,8 +23,7 @@ whiskers:
             c.text  | mix(color=c.blue, amount=0.6),
             c.text  | mix(color=c.green, amount=0.6),
         ] -%}
-        {%- set italics = if(cond=variant == "-no-italics", t="null", f='"italic"') -%}
-        {% set predictColor = c.surface2 | mix(color=c.blue, amount=0.33) %}
+        {%- set italics = if(cond=variant == "-no-italics", t="null", f='"italic"') %}
         {
             "name": "Catppuccin {{ flavor.name }} {%- if accent != 'mauve' %} ({{ accent }}) {%- endif -%} {%- if variant == "-no-italics" %} - No Italics {%- endif -%}",
             "appearance": {% if flavor.dark %}"dark"{% else %}"light"{% endif %},
@@ -150,7 +149,7 @@ whiskers:
                 "modified": "#{{ c.yellow.hex }}",
                 "modified.border": "#{{ c.yellow.hex }}",
                 "modified.background": "#{{ c.mantle.hex }}",
-                "predictive": "#{{ predictColor | get(key="hex") }}",
+                "predictive": "#{{ c.overlay0.hex }}",
                 "predictive.border": "#{{ c.lavender.hex }}",
                 "predictive.background": "#{{ c.mantle.hex }}",
                 "renamed": "#{{ c.sapphire.hex }}",
@@ -179,24 +178,31 @@ whiskers:
                     }{% if not loop.last %},{% endif -%}
                     {% endfor %}
                 ],
+                {#- ref: https://github.com/catppuccin/nvim/blob/637d99e638bc6f1efedac582f6ccab08badac0c6/lua/catppuccin/groups/integrations/treesitter.lua #}
                 "syntax": {
-                    "attribute": {
-                        "color": "#{{ c.yellow.hex }}",
+                    {#- Identifiers #}
+                    "variable": {
+                        "color": "#{{ c.text.hex }}",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "boolean": {
-                        "color": "#{{ c.peach.hex }}",
+                    "variable.builtin": {
+                        "color": "#{{ c.red.hex }}",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "comment": {
-                        "color": "#{{ c.overlay1.hex }}",
-                        "font_style": {{ italics }},
+                    "variable.parameter": {
+                        "color": "#{{ c.maroon.hex }}",
+                        "font_style": null,
                         "font_weight": null
                     },
-                    "comment.doc": {
-                        "color": "#{{ c.overlay1.hex }}",
+                    "variable.member": {
+                        "color": "#{{ c.red.hex }}",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "variable.special": {
+                        "color": "#{{ c.pink.hex }}",
                         "font_style": {{ italics }},
                         "font_weight": null
                     },
@@ -205,196 +211,448 @@ whiskers:
                         "font_style": null,
                         "font_weight": null
                     },
-                    "constructor": {
-                        "color": "#{{ c.blue.hex }}",
+                    "constant.builtin": {
+                        "color": "#{{ c.peach.hex }}",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "embedded": {
-                        "color": "#{{ c.maroon.hex }}",
+                    "constant.macro": {
+                        "color": "#{{ c.mauve.hex }}",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "emphasis": {
-                        "color": "#{{ c.red.hex }}",
+                    "module": {
+                        "color": "#{{ c.yellow.hex }}",
                         "font_style": {{ italics }},
                         "font_weight": null
                     },
-                    "emphasis.strong": {
-                        "color": "#{{ c.red.hex }}",
+                    "label": {
+                        "color": "#{{ c.sapphire.hex }}",
                         "font_style": null,
-                        "font_weight": 700
+                        "font_weight": null
                     },
-                    "enum": {
+                    {#- Literals #}
+                    "string": {
+                        "color": "#{{ c.green.hex }}",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.documentation": {
                         "color": "#{{ c.teal.hex }}",
                         "font_style": null,
-                        "font_weight": 700
+                        "font_weight": null
                     },
-                    "function": {
-                        "color": "#{{ c.blue.hex }}",
-                        "font_style": {{ italics }},
+                    "string.regexp": {
+                        "color": "#{{ c.peach.hex }}",
+                        "font_style": null,
                         "font_weight": null
                     },
-                    "hint": {
-                        "color": "#{{ c.surface2.hex }}",
+                    "string.escape": {
+                        "color": "#{{ c.pink.hex }}",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.special": {
+                        "color": "#{{ c.pink.hex }}",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.special.path": {
+                        "color": "#{{ c.pink.hex }}",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.special.symbol": {
+                        "color": "#{{ c.flamingo.hex }}",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.special.url": {
+                        "color": "#{{ c.rosewater.hex }}",
                         "font_style": {{ italics }},
                         "font_weight": null
                     },
-                    "keyword": {
+                    "character": {
+                        "color": "#{{ c.teal.hex }}",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "character.special": {
+                        "color": "#{{ c.pink.hex }}",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "boolean": {
+                        "color": "#{{ c.peach.hex }}",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "number": {
+                        "color": "#{{ c.peach.hex }}",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "number.float": {
+                        "color": "#{{ c.peach.hex }}",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    {#- Types #}
+                    "type": {
+                        "color": "#{{ c.yellow.hex }}",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "type.builtin": {
                         "color": "#{{ c.mauve.hex }}",
+                        "font_style": {{ italics }},
+                        "font_weight": null
+                    },
+                    "type.definition": {
+                        "color": "#{{ c.yellow.hex }}",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "link_text": {
+                    "type.interface": {
+                        "color": "#{{ c.yellow.hex }}",
+                        "font_style": {{ italics }},
+                        "font_weight": null
+                    },
+                    "type.super": {
+                        "color": "#{{ c.yellow.hex }}",
+                        "font_style": {{ italics }},
+                        "font_weight": null
+                    },
+                    "attribute": {
+                        "color": "#{{ c.peach.hex }}",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "property": {
                         "color": "#{{ c.blue.hex }}",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "link_uri": {
+                    {#- Functions #}
+                    "function": {
                         "color": "#{{ c.blue.hex }}",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "number": {
+                    "function.builtin": {
                         "color": "#{{ c.peach.hex }}",
                         "font_style": null,
                         "font_weight": null
                     },
+                    "function.call": {
+                        "color": "#{{ c.blue.hex }}",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "function.macro": {
+                        "color": "#{{ c.teal.hex }}",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "function.method": {
+                        "color": "#{{ c.blue.hex }}",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "function.method.call": {
+                        "color": "#{{ c.blue.hex }}",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "constructor": {
+                        "color": "#{{ c.flamingo.hex }}",
+                        "font_style": null,
+                        "font_weight": null
+                    },
                     "operator": {
                         "color": "#{{ c.sky.hex }}",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "predictive": {
-                        "color": "#{{ predictColor | get(key="hex") }}",
+                    {#- Keywords #}
+                    "keyword": {
+                        "color": "#{{ c.mauve.hex }}",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "predoc": {
-                        "color": "#{{ c.red.hex }}",
+                    "keyword.modifier": {
+                        "color": "#{{ c.mauve.hex }}",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "primary": {
-                        "color": "#{{ c.maroon.hex }}",
+                    "keyword.type": {
+                        "color": "#{{ c.mauve.hex }}",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "property": {
-                        "color": "#{{ c.blue.hex }}",
+                    "keyword.coroutine": {
+                        "color": "#{{ c.mauve.hex }}",
+                        "font_style": null,
+                        "font_weight": null,
+                    },
+                    "keyword.function": {
+                        "color": "#{{ c.mauve.hex }}",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation": {
-                        "color": "#{{ c.teal.hex }}",
+                    "keyword.operator": {
+                        "color": "#{{ c.mauve.hex }}",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.bracket": {
-                        "color": "#{{ c.teal.hex }}",
+                    "keyword.import": {
+                        "color": "#{{ c.mauve.hex }}",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.delimiter": {
-                        "color": "#{{ c.overlay2.hex }}",
+                    "keyword.repeat": {
+                        "color": "#{{ c.mauve.hex }}",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.list_marker": {
-                        "color": "#{{ c.teal.hex }}",
+                    "keyword.return": {
+                        "color": "#{{ c.mauve.hex }}",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.special": {
-                        "color": "#{{ c.teal.hex }}",
+                    "keyword.debug": {
+                        "color": "#{{ c.mauve.hex }}",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "punctuation.special.symbol": {
-                        "color": "#{{ c.red.hex }}",
+                    "keyword.exception": {
+                        "color": "#{{ c.mauve.hex }}",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string": {
-                        "color": "#{{ c.green.hex }}",
+                    "keyword.conditional": {
+                        "color": "#{{ c.mauve.hex }}",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string.escape": {
-                        "color": "#{{ c.pink.hex }}",
+                    "keyword.conditional.ternary": {
+                        "color": "#{{ c.mauve.hex }}",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string.regex": {
+                    "keyword.directive": {
                         "color": "#{{ c.pink.hex }}",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string.special": {
+                    "keyword.directive.define": {
                         "color": "#{{ c.pink.hex }}",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "string.special.symbol": {
-                        "color": "#{{ c.flamingo.hex }}",
+                    {#- JS & derivative #}
+                    "keyword.export": {
+                        "color": "#{{ c.sky.hex }}",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "tag": {
-                        "color": "#{{ c.blue.hex }}",
+                    {#- Punctuation #}
+                    "punctuation": {
+                        "color": "#{{ c.overlay2.hex }}",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "text.literal": {
-                        "color": "#{{ c.green.hex }}",
+                    "punctuation.delimiter": {
+                        "color": "#{{ c.overlay2.hex }}",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "title": {
-                        "color": "#{{ c.text.hex }}",
+                    "punctuation.bracket": {
+                        "color": "#{{ c.overlay2.hex }}",
                         "font_style": null,
-                        "font_weight": 800
+                        "font_weight": null
                     },
-                    "type": {
-                        "color": "#{{ c.yellow.hex }}",
+                    "punctuation.special": {
+                        "color": "#{{ c.pink.hex }}",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "type.builtin": {
-                        "color": "#{{ c.mauve.hex }}",
+                    "punctuation.special.symbol": {
+                        "color": "#{{ c.flamingo.hex }}",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "type.interface": {
+                    "punctuation.list_marker": {
+                        "color": "#{{ c.teal.hex }}",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    {#- Comment #}
+                    "comment": {
+                        "color": "#{{ c.overlay2.hex }}",
+                        "font_style": {{ italics }},
+                        "font_weight": null
+                    },
+                    "comment.doc": {
+                        "color": "#{{ c.overlay2.hex }}",
+                        "font_style": {{ italics }},
+                        "font_weight": null
+                    },
+                    "comment.documentation": {
+                        "color": "#{{ c.overlay2.hex }}",
+                        "font_style": {{ italics }},
+                        "font_weight": null
+                    },
+                    {#- ! untested, rollback if Zed supports these #}
+                    "comment.error": {
+                        "color": "#{{ c.red.hex }}",
+                        "font_style": {{ italics }},
+                        "font_weight": null
+                    },
+                    "comment.warning": {
                         "color": "#{{ c.yellow.hex }}",
                         "font_style": {{ italics }},
                         "font_weight": null
                     },
-                    "type.super": {
+                    "comment.hint": {
+                        "color": "#{{ c.blue.hex }}",
+                        "font_style": {{ italics }},
+                        "font_weight": null
+                    },
+                    "comment.todo": {
+                        "color": "#{{ c.flamingo.hex }}",
+                        "font_style": {{ italics }},
+                        "font_weight": null
+                    },
+                    "comment.note": {
+                        "color": "#{{ c.rosewater.hex }}",
+                        "font_style": {{ italics }},
+                        "font_weight": null
+                    },
+                    {#- ! end untested #}
+                    {#- Diff (not supported) #}
+                    {#- Tags #}
+                    "tag": {
+                        "color": "#{{ c.blue.hex }}",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "tag.attribute": {
                         "color": "#{{ c.yellow.hex }}",
                         "font_style": {{ italics }},
                         "font_weight": null
                     },
-                    "variable": {
-                        "color": "#{{ c.text.hex }}",
+                    "tag.delimiter": {
+                        "color": "#{{ c.teal.hex }}",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "variable.member": {
-                        "color": "#{{ c.text.hex }}",
+                    {#- Misc #}
+                    {#- Language specific (not supported) #}
+                    {#- Legacy highlights #}
+                    "parameter": {
+                        "color": "#{{ c.maroon.hex }}",
                         "font_style": null,
                         "font_weight": null
                     },
-                    "variable.parameter": {
+                    "field": {
+                        "color": "#{{ c.lavender.hex }}",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "namespace": {
+                        "color": "#{{ c.lavender.hex }}",
+                        "font_style": {{ italics }},
+                        "font_weight": null
+                    },
+                    "float": {
                         "color": "#{{ c.peach.hex }}",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "symbol": {
+                        "color": "#{{ c.pink.hex }}",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "string.regex": {
+                        "color": "#{{ c.peach.hex }}",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "text": {
+                        "color": "#{{ c.text.hex }}",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    {#- 'text.strong' #}
+                    "emphasis.strong": {
+                        "color": "#{{ c.maroon.hex }}",
+                        "font_style": null,
+                        "font_weight": 700
+                    },
+                    {#- 'text.emphasis' #}
+                    "emphasis": {
+                        "color": "#{{ c.maroon.hex }}",
                         "font_style": {{ italics }},
                         "font_weight": null
                     },
-                    "variable.special": {
-                        "color": "#{{ c.text | mix(color=c.red, amount=0.6) | get(key='hex') }}",
+                    "embedded": {
+                        "color": "#{{ c.maroon.hex }}",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "text.literal": {
+                        "color": "#{{ c.green.hex }}",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    {#- Zed specific #}
+                    "enum": {
+                        "color": "#{{ c.teal.hex }}",
+                        "font_style": null,
+                        "font_weight": 700
+                    },
+                    "hint": {
+                        "color": "#{{ c.surface2.hex }}",
                         "font_style": {{ italics }},
                         "font_weight": null
                     },
+                    "link_text": {
+                        "color": "#{{ c.blue.hex }}",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "link_uri": {
+                        "color": "#{{ c.rosewater.hex }}",
+                        "font_style": {{ italics }},
+                        "font_weight": null
+                    },
+                    "predictive": {
+                        "color": "#{{ c.overlay0.hex }}",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "predoc": {
+                        "color": "#{{ c.red.hex }}",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "primary": {
+                        "color": "#{{ c.maroon.hex }}",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "tag.doctype": {
+                        "color": "#{{ c.mauve.hex }}",
+                        "font_style": null,
+                        "font_weight": null
+                    },
+                    "title": {
+                        "color": "#{{ c.text.hex }}",
+                        "font_style": null,
+                        "font_weight": 800
+                    },
                     "variant": {
                         "color": "#{{ c.red.hex }}",
                         "font_style": null,