diff --git a/themes/adventure.json b/themes/adventure.json
index 47bb3937..d280ebc3 100644
--- a/themes/adventure.json
+++ b/themes/adventure.json
@@ -114,119 +114,78 @@
       "warning.border": "#333333",
       "syntax": {
         "attribute": {
-          "color": "#eebb6e",
-          "font_style": null,
-          "font_weight": null
+          "color": "#eebb6e"
         },
         "boolean": {
-          "color": "#5da602",
-          "font_style": null,
-          "font_weight": null
+          "color": "#5da602"
         },
         "comment": {
           "color": "#5d6165",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "comment.doc": {
           "color": "#5d6165",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "constant": {
-          "color": "#d84a33",
-          "font_style": null,
-          "font_weight": null
+          "color": "#d84a33"
         },
         "constructor": {
-          "color": "#eebb6e",
-          "font_style": null,
-          "font_weight": null
+          "color": "#eebb6e"
         },
         "embedded": {
-          "color": "#feffff",
-          "font_style": null,
-          "font_weight": null
+          "color": "#feffff"
         },
         "function": {
-          "color": "#5da602",
-          "font_style": null,
-          "font_weight": null
+          "color": "#5da602"
         },
         "keyword": {
-          "color": "#417ab3",
-          "font_style": null,
-          "font_weight": null
+          "color": "#417ab3"
         },
         "link_text": {
           "color": "#97d7ef",
-          "font_style": "normal",
-          "font_weight": null
+          "font_style": "normal"
         },
         "link_uri": {
           "color": "#4b6479",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "number": {
-          "color": "#d84a33",
-          "font_style": null,
-          "font_weight": null
+          "color": "#d84a33"
         },
         "string": {
-          "color": "#5da602",
-          "font_style": null,
-          "font_weight": null
+          "color": "#5da602"
         },
         "string.escape": {
-          "color": "#5da602",
-          "font_style": null,
-          "font_weight": null
+          "color": "#5da602"
         },
         "string.regex": {
-          "color": "#5da602",
-          "font_style": null,
-          "font_weight": null
+          "color": "#5da602"
         },
         "string.special": {
-          "color": "#eebb6e",
-          "font_style": null,
-          "font_weight": null
+          "color": "#eebb6e"
         },
         "string.special.symbol": {
-          "color": "#eebb6e",
-          "font_style": null,
-          "font_weight": null
+          "color": "#eebb6e"
         },
         "tag": {
-          "color": "#eebb6e",
-          "font_style": null,
-          "font_weight": null
+          "color": "#eebb6e"
         },
         "text.literal": {
-          "color": "#d84a33",
-          "font_style": null,
-          "font_weight": null
+          "color": "#d84a33"
         },
         "title": {
           "color": "#97d7ef",
-          "font_style": null,
           "font_weight": 600
         },
         "type": {
-          "color": "#eebb6e",
-          "font_style": null,
-          "font_weight": null
+          "color": "#eebb6e"
         },
         "property": {
-          "color": "#feffff",
-          "font_style": null,
-          "font_weight": null
+          "color": "#feffff"
         },
         "variable.special": {
-          "color": "#d84a33",
-          "font_style": null,
-          "font_weight": null
+          "color": "#d84a33"
         }
       }
     }
@@ -304,162 +263,95 @@
       "editor.line_number": "#8F8F8F",
       "editor.active_line_number": "#DDDDDD",
       "conflict": "#D2602D",
-      "conflict.background": null,
-      "conflict.border": null,
       "created": "#3f72e2",
       "created.background": "#0C4619",
-      "created.border": null,
-      "deleted": null,
       "deleted.background": "#46190C",
-      "deleted.border": null,
-      "error": null,
       "error.background": "#46190C",
       "error.border": "#802207",
       "hidden": "#9E9E9E",
-      "hidden.background": null,
-      "hidden.border": null,
       "hint": "#b283f8",
       "hint.background": "#250c4b",
       "hint.border": "#3f0891",
-      "ignored": null,
-      "ignored.background": null,
-      "ignored.border": null,
-      "info": null,
       "info.background": "#0C194D",
       "info.border": "#082190",
       "modified": "#B0A878",
       "modified.background": "#3A310E",
-      "modified.border": null,
       "predictive": "#5D5945",
-      "predictive.background": null,
-      "predictive.border": null,
-      "renamed": null,
-      "renamed.background": null,
-      "renamed.border": null,
-      "success": null,
       "success.background": "#0C4619",
-      "success.border": null,
-      "unreachable": null,
-      "unreachable.background": null,
-      "unreachable.border": null,
-      "warning": null,
       "warning.background": "#3A310E",
       "warning.border": "#7B6508",
       "syntax": {
         "attribute": {
-          "color": "#be9a52",
-          "font_style": null,
-          "font_weight": null
+          "color": "#be9a52"
         },
         "boolean": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "comment": {
-          "color": "#9E9E9E",
-          "font_style": null,
-          "font_weight": null
+          "color": "#9E9E9E"
         },
         "comment.doc": {
-          "color": "#9E9E9E",
-          "font_style": null,
-          "font_weight": null
+          "color": "#9E9E9E"
         },
         "constant": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "constructor": {
-          "color": "#b5af9a",
-          "font_style": null,
-          "font_weight": null
+          "color": "#b5af9a"
         },
         "embedded": {
-          "color": "#CACCCA",
-          "font_style": null,
-          "font_weight": null
+          "color": "#CACCCA"
         },
         "function": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "keyword": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         },
         "link_text": {
           "color": "#A86D3B",
-          "font_style": "normal",
-          "font_weight": null
+          "font_style": "normal"
         },
         "link_uri": {
           "color": "#6F6D66",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "number": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         },
         "string": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.escape": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.regex": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.special": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "string.special.symbol": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "tag": {
-          "color": "#b5af9a",
-          "font_style": null,
-          "font_weight": null
+          "color": "#b5af9a"
         },
         "text.literal": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "title": {
           "color": "#A76D3B",
-          "font_style": null,
           "font_weight": 600
         },
         "type": {
-          "color": "#A86D3B",
-          "font_style": null,
-          "font_weight": null
+          "color": "#A86D3B"
         },
         "property": {
-          "color": "#CACCCA",
-          "font_style": null,
-          "font_weight": null
+          "color": "#CACCCA"
         },
         "variable.special": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         }
       }
     }
diff --git a/themes/alduin.json b/themes/alduin.json
index aa636c97..2cea58b4 100644
--- a/themes/alduin.json
+++ b/themes/alduin.json
@@ -65,162 +65,95 @@
       "editor.line_number": "#8F8F8F",
       "editor.active_line_number": "#DDDDDD",
       "conflict": "#D2602D",
-      "conflict.background": null,
-      "conflict.border": null,
       "created": "#3f72e2",
       "created.background": "#0C4619",
-      "created.border": null,
-      "deleted": null,
       "deleted.background": "#46190C",
-      "deleted.border": null,
-      "error": null,
       "error.background": "#46190C",
       "error.border": "#802207",
       "hidden": "#9E9E9E",
-      "hidden.background": null,
-      "hidden.border": null,
       "hint": "#b283f8",
       "hint.background": "#250c4b",
       "hint.border": "#3f0891",
-      "ignored": null,
-      "ignored.background": null,
-      "ignored.border": null,
-      "info": null,
       "info.background": "#0C194D",
       "info.border": "#082190",
       "modified": "#B0A878",
       "modified.background": "#3A310E",
-      "modified.border": null,
       "predictive": "#5D5945",
-      "predictive.background": null,
-      "predictive.border": null,
-      "renamed": null,
-      "renamed.background": null,
-      "renamed.border": null,
-      "success": null,
       "success.background": "#0C4619",
-      "success.border": null,
-      "unreachable": null,
-      "unreachable.background": null,
-      "unreachable.border": null,
-      "warning": null,
       "warning.background": "#3A310E",
       "warning.border": "#7B6508",
       "syntax": {
         "attribute": {
-          "color": "#be9a52",
-          "font_style": null,
-          "font_weight": null
+          "color": "#be9a52"
         },
         "boolean": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "comment": {
-          "color": "#9E9E9E",
-          "font_style": null,
-          "font_weight": null
+          "color": "#9E9E9E"
         },
         "comment.doc": {
-          "color": "#9E9E9E",
-          "font_style": null,
-          "font_weight": null
+          "color": "#9E9E9E"
         },
         "constant": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "constructor": {
-          "color": "#b5af9a",
-          "font_style": null,
-          "font_weight": null
+          "color": "#b5af9a"
         },
         "embedded": {
-          "color": "#CACCCA",
-          "font_style": null,
-          "font_weight": null
+          "color": "#CACCCA"
         },
         "function": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "keyword": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         },
         "link_text": {
           "color": "#A86D3B",
-          "font_style": "normal",
-          "font_weight": null
+          "font_style": "normal"
         },
         "link_uri": {
           "color": "#6F6D66",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "number": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         },
         "string": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.escape": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.regex": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.special": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "string.special.symbol": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "tag": {
-          "color": "#b5af9a",
-          "font_style": null,
-          "font_weight": null
+          "color": "#b5af9a"
         },
         "text.literal": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "title": {
           "color": "#A76D3B",
-          "font_style": null,
           "font_weight": 600
         },
         "type": {
-          "color": "#A86D3B",
-          "font_style": null,
-          "font_weight": null
+          "color": "#A86D3B"
         },
         "property": {
-          "color": "#CACCCA",
-          "font_style": null,
-          "font_weight": null
+          "color": "#CACCCA"
         },
         "variable.special": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         }
       }
     }
diff --git a/themes/ayu.json b/themes/ayu.json
index 0543b76e..7b002394 100644
--- a/themes/ayu.json
+++ b/themes/ayu.json
@@ -110,119 +110,78 @@
       "warning.border": "#FF9940",
       "syntax": {
         "attribute": {
-          "color": "#86B300",
-          "font_style": null,
-          "font_weight": null
+          "color": "#86B300"
         },
         "boolean": {
-          "color": "#FF9940",
-          "font_style": null,
-          "font_weight": null
+          "color": "#FF9940"
         },
         "comment": {
           "color": "#ABB0B6",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "comment.doc": {
           "color": "#ABB0B6",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "constant": {
-          "color": "#F07171",
-          "font_style": null,
-          "font_weight": null
+          "color": "#F07171"
         },
         "constructor": {
-          "color": "#55B4D4",
-          "font_style": null,
-          "font_weight": null
+          "color": "#55B4D4"
         },
         "embedded": {
-          "color": "#5C6773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#5C6773"
         },
         "function": {
-          "color": "#55B4D4",
-          "font_style": null,
-          "font_weight": null
+          "color": "#55B4D4"
         },
         "keyword": {
-          "color": "#FF9940",
-          "font_style": null,
-          "font_weight": null
+          "color": "#FF9940"
         },
         "link_text": {
           "color": "#55B4D4",
-          "font_style": "underline",
-          "font_weight": null
+          "font_style": "underline"
         },
         "link_uri": {
           "color": "#5C6773",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "number": {
-          "color": "#F07171",
-          "font_style": null,
-          "font_weight": null
+          "color": "#F07171"
         },
         "string": {
-          "color": "#86B300",
-          "font_style": null,
-          "font_weight": null
+          "color": "#86B300"
         },
         "string.escape": {
-          "color": "#FF9940",
-          "font_style": null,
-          "font_weight": null
+          "color": "#FF9940"
         },
         "string.regex": {
-          "color": "#86B300",
-          "font_style": null,
-          "font_weight": null
+          "color": "#86B300"
         },
         "string.special": {
-          "color": "#55B4D4",
-          "font_style": null,
-          "font_weight": null
+          "color": "#55B4D4"
         },
         "string.special.symbol": {
-          "color": "#55B4D4",
-          "font_style": null,
-          "font_weight": null
+          "color": "#55B4D4"
         },
         "tag": {
-          "color": "#FF9940",
-          "font_style": null,
-          "font_weight": null
+          "color": "#FF9940"
         },
         "text.literal": {
-          "color": "#5C6773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#5C6773"
         },
         "title": {
           "color": "#55B4D4",
-          "font_style": null,
           "font_weight": 600
         },
         "type": {
-          "color": "#55B4D4",
-          "font_style": null,
-          "font_weight": null
+          "color": "#55B4D4"
         },
         "property": {
-          "color": "#5C6773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#5C6773"
         },
         "variable.special": {
-          "color": "#FF9940",
-          "font_style": null,
-          "font_weight": null
+          "color": "#FF9940"
         }
       }
     }
@@ -291,162 +250,95 @@
       "editor.line_number": "#8F8F8F",
       "editor.active_line_number": "#DDDDDD",
       "conflict": "#D2602D",
-      "conflict.background": null,
-      "conflict.border": null,
       "created": "#3f72e2",
       "created.background": "#0C4619",
-      "created.border": null,
-      "deleted": null,
       "deleted.background": "#46190C",
-      "deleted.border": null,
-      "error": null,
       "error.background": "#46190C",
       "error.border": "#802207",
       "hidden": "#9E9E9E",
-      "hidden.background": null,
-      "hidden.border": null,
       "hint": "#b283f8",
       "hint.background": "#250c4b",
       "hint.border": "#3f0891",
-      "ignored": null,
-      "ignored.background": null,
-      "ignored.border": null,
-      "info": null,
       "info.background": "#0C194D",
       "info.border": "#082190",
       "modified": "#B0A878",
       "modified.background": "#3A310E",
-      "modified.border": null,
       "predictive": "#5D5945",
-      "predictive.background": null,
-      "predictive.border": null,
-      "renamed": null,
-      "renamed.background": null,
-      "renamed.border": null,
-      "success": null,
       "success.background": "#0C4619",
-      "success.border": null,
-      "unreachable": null,
-      "unreachable.background": null,
-      "unreachable.border": null,
-      "warning": null,
       "warning.background": "#3A310E",
       "warning.border": "#7B6508",
       "syntax": {
         "attribute": {
-          "color": "#be9a52",
-          "font_style": null,
-          "font_weight": null
+          "color": "#be9a52"
         },
         "boolean": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "comment": {
-          "color": "#9E9E9E",
-          "font_style": null,
-          "font_weight": null
+          "color": "#9E9E9E"
         },
         "comment.doc": {
-          "color": "#9E9E9E",
-          "font_style": null,
-          "font_weight": null
+          "color": "#9E9E9E"
         },
         "constant": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "constructor": {
-          "color": "#b5af9a",
-          "font_style": null,
-          "font_weight": null
+          "color": "#b5af9a"
         },
         "embedded": {
-          "color": "#CACCCA",
-          "font_style": null,
-          "font_weight": null
+          "color": "#CACCCA"
         },
         "function": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "keyword": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         },
         "link_text": {
           "color": "#A86D3B",
-          "font_style": "normal",
-          "font_weight": null
+          "font_style": "normal"
         },
         "link_uri": {
           "color": "#6F6D66",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "number": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         },
         "string": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.escape": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.regex": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.special": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "string.special.symbol": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "tag": {
-          "color": "#b5af9a",
-          "font_style": null,
-          "font_weight": null
+          "color": "#b5af9a"
         },
         "text.literal": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "title": {
           "color": "#A76D3B",
-          "font_style": null,
           "font_weight": 600
         },
         "type": {
-          "color": "#A86D3B",
-          "font_style": null,
-          "font_weight": null
+          "color": "#A86D3B"
         },
         "property": {
-          "color": "#CACCCA",
-          "font_style": null,
-          "font_weight": null
+          "color": "#CACCCA"
         },
         "variable.special": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         }
       }
     }
diff --git a/themes/catppuccin.json b/themes/catppuccin.json
index 251492b5..9aaac52e 100644
--- a/themes/catppuccin.json
+++ b/themes/catppuccin.json
@@ -108,499 +108,325 @@
       "warning.border": "#df8e1d",
       "syntax": {
         "variable": {
-          "color": "#4c4f69",
-          "font_style": null,
-          "font_weight": null
+          "color": "#4c4f69"
         },
         "variable.builtin": {
-          "color": "#d20f39",
-          "font_style": null,
-          "font_weight": null
+          "color": "#d20f39"
         },
         "variable.parameter": {
-          "color": "#e64553",
-          "font_style": null,
-          "font_weight": null
+          "color": "#e64553"
         },
         "variable.member": {
-          "color": "#1e66f5",
-          "font_style": null,
-          "font_weight": null
+          "color": "#1e66f5"
         },
         "variable.special": {
           "color": "#d20f39",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "constant": {
-          "color": "#fe640b",
-          "font_style": null,
-          "font_weight": null
+          "color": "#fe640b"
         },
         "constant.builtin": {
-          "color": "#fe640b",
-          "font_style": null,
-          "font_weight": null
+          "color": "#fe640b"
         },
         "constant.macro": {
-          "color": "#8839ef",
-          "font_style": null,
-          "font_weight": null
+          "color": "#8839ef"
         },
         "module": {
           "color": "#df8e1d",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "label": {
-          "color": "#209fb5",
-          "font_style": null,
-          "font_weight": null
+          "color": "#209fb5"
         },
         "string": {
-          "color": "#40a02b",
-          "font_style": null,
-          "font_weight": null
+          "color": "#40a02b"
         },
         "string.documentation": {
-          "color": "#179299",
-          "font_style": null,
-          "font_weight": null
+          "color": "#179299"
         },
         "string.regexp": {
-          "color": "#fe640b",
-          "font_style": null,
-          "font_weight": null
+          "color": "#fe640b"
         },
         "string.escape": {
-          "color": "#ea76cb",
-          "font_style": null,
-          "font_weight": null
+          "color": "#ea76cb"
         },
         "string.special": {
-          "color": "#ea76cb",
-          "font_style": null,
-          "font_weight": null
+          "color": "#ea76cb"
         },
         "string.special.path": {
-          "color": "#ea76cb",
-          "font_style": null,
-          "font_weight": null
+          "color": "#ea76cb"
         },
         "string.special.symbol": {
-          "color": "#dd7878",
-          "font_style": null,
-          "font_weight": null
+          "color": "#dd7878"
         },
         "string.special.url": {
           "color": "#dc8a78",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "character": {
-          "color": "#179299",
-          "font_style": null,
-          "font_weight": null
+          "color": "#179299"
         },
         "character.special": {
-          "color": "#ea76cb",
-          "font_style": null,
-          "font_weight": null
+          "color": "#ea76cb"
         },
         "boolean": {
-          "color": "#fe640b",
-          "font_style": null,
-          "font_weight": null
+          "color": "#fe640b"
         },
         "number": {
-          "color": "#fe640b",
-          "font_style": null,
-          "font_weight": null
+          "color": "#fe640b"
         },
         "number.float": {
-          "color": "#fe640b",
-          "font_style": null,
-          "font_weight": null
+          "color": "#fe640b"
         },
         "type": {
-          "color": "#df8e1d",
-          "font_style": null,
-          "font_weight": null
+          "color": "#df8e1d"
         },
         "type.builtin": {
           "color": "#8839ef",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "type.definition": {
-          "color": "#df8e1d",
-          "font_style": null,
-          "font_weight": null
+          "color": "#df8e1d"
         },
         "type.interface": {
           "color": "#df8e1d",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "type.super": {
           "color": "#df8e1d",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "attribute": {
-          "color": "#fe640b",
-          "font_style": null,
-          "font_weight": null
+          "color": "#fe640b"
         },
         "property": {
-          "color": "#1e66f5",
-          "font_style": null,
-          "font_weight": null
+          "color": "#1e66f5"
         },
         "function": {
-          "color": "#1e66f5",
-          "font_style": null,
-          "font_weight": null
+          "color": "#1e66f5"
         },
         "function.builtin": {
-          "color": "#fe640b",
-          "font_style": null,
-          "font_weight": null
+          "color": "#fe640b"
         },
         "function.call": {
-          "color": "#1e66f5",
-          "font_style": null,
-          "font_weight": null
+          "color": "#1e66f5"
         },
         "function.macro": {
-          "color": "#179299",
-          "font_style": null,
-          "font_weight": null
+          "color": "#179299"
         },
         "function.method": {
-          "color": "#1e66f5",
-          "font_style": null,
-          "font_weight": null
+          "color": "#1e66f5"
         },
         "function.method.call": {
-          "color": "#1e66f5",
-          "font_style": null,
-          "font_weight": null
+          "color": "#1e66f5"
         },
         "constructor": {
-          "color": "#dd7878",
-          "font_style": null,
-          "font_weight": null
+          "color": "#dd7878"
         },
         "operator": {
-          "color": "#04a5e5",
-          "font_style": null,
-          "font_weight": null
+          "color": "#04a5e5"
         },
         "keyword": {
-          "color": "#8839ef",
-          "font_style": null,
-          "font_weight": null
+          "color": "#8839ef"
         },
         "keyword.modifier": {
-          "color": "#8839ef",
-          "font_style": null,
-          "font_weight": null
+          "color": "#8839ef"
         },
         "keyword.type": {
-          "color": "#8839ef",
-          "font_style": null,
-          "font_weight": null
+          "color": "#8839ef"
         },
         "keyword.coroutine": {
-          "color": "#8839ef",
-          "font_style": null,
-          "font_weight": null
+          "color": "#8839ef"
         },
         "keyword.function": {
-          "color": "#8839ef",
-          "font_style": null,
-          "font_weight": null
+          "color": "#8839ef"
         },
         "keyword.operator": {
-          "color": "#8839ef",
-          "font_style": null,
-          "font_weight": null
+          "color": "#8839ef"
         },
         "keyword.import": {
-          "color": "#8839ef",
-          "font_style": null,
-          "font_weight": null
+          "color": "#8839ef"
         },
         "keyword.repeat": {
-          "color": "#8839ef",
-          "font_style": null,
-          "font_weight": null
+          "color": "#8839ef"
         },
         "keyword.return": {
-          "color": "#8839ef",
-          "font_style": null,
-          "font_weight": null
+          "color": "#8839ef"
         },
         "keyword.debug": {
-          "color": "#8839ef",
-          "font_style": null,
-          "font_weight": null
+          "color": "#8839ef"
         },
         "keyword.exception": {
-          "color": "#8839ef",
-          "font_style": null,
-          "font_weight": null
+          "color": "#8839ef"
         },
         "keyword.conditional": {
-          "color": "#8839ef",
-          "font_style": null,
-          "font_weight": null
+          "color": "#8839ef"
         },
         "keyword.conditional.ternary": {
-          "color": "#8839ef",
-          "font_style": null,
-          "font_weight": null
+          "color": "#8839ef"
         },
         "keyword.directive": {
-          "color": "#ea76cb",
-          "font_style": null,
-          "font_weight": null
+          "color": "#ea76cb"
         },
         "keyword.directive.define": {
-          "color": "#ea76cb",
-          "font_style": null,
-          "font_weight": null
+          "color": "#ea76cb"
         },
         "keyword.export": {
-          "color": "#04a5e5",
-          "font_style": null,
-          "font_weight": null
+          "color": "#04a5e5"
         },
         "punctuation": {
-          "color": "#7c7f93",
-          "font_style": null,
-          "font_weight": null
+          "color": "#7c7f93"
         },
         "punctuation.delimiter": {
-          "color": "#7c7f93",
-          "font_style": null,
-          "font_weight": null
+          "color": "#7c7f93"
         },
         "punctuation.bracket": {
-          "color": "#7c7f93",
-          "font_style": null,
-          "font_weight": null
+          "color": "#7c7f93"
         },
         "punctuation.special": {
-          "color": "#ea76cb",
-          "font_style": null,
-          "font_weight": null
+          "color": "#ea76cb"
         },
         "punctuation.special.symbol": {
-          "color": "#dd7878",
-          "font_style": null,
-          "font_weight": null
+          "color": "#dd7878"
         },
         "punctuation.list_marker": {
-          "color": "#179299",
-          "font_style": null,
-          "font_weight": null
+          "color": "#179299"
         },
         "comment": {
           "color": "#7c7f93",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "comment.doc": {
           "color": "#7c7f93",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "comment.documentation": {
           "color": "#7c7f93",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "comment.error": {
           "color": "#d20f39",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "comment.warning": {
           "color": "#df8e1d",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "comment.hint": {
           "color": "#1e66f5",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "comment.todo": {
           "color": "#dd7878",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "comment.note": {
           "color": "#dc8a78",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "diff.plus": {
-          "color": "#40a02b",
-          "font_style": null,
-          "font_weight": null
+          "color": "#40a02b"
         },
         "diff.minus": {
-          "color": "#d20f39",
-          "font_style": null,
-          "font_weight": null
+          "color": "#d20f39"
         },
         "tag": {
-          "color": "#1e66f5",
-          "font_style": null,
-          "font_weight": null
+          "color": "#1e66f5"
         },
         "tag.attribute": {
           "color": "#df8e1d",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "tag.delimiter": {
-          "color": "#179299",
-          "font_style": null,
-          "font_weight": null
+          "color": "#179299"
         },
         "parameter": {
-          "color": "#e64553",
-          "font_style": null,
-          "font_weight": null
+          "color": "#e64553"
         },
         "field": {
-          "color": "#7287fd",
-          "font_style": null,
-          "font_weight": null
+          "color": "#7287fd"
         },
         "namespace": {
           "color": "#df8e1d",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "float": {
-          "color": "#fe640b",
-          "font_style": null,
-          "font_weight": null
+          "color": "#fe640b"
         },
         "symbol": {
-          "color": "#ea76cb",
-          "font_style": null,
-          "font_weight": null
+          "color": "#ea76cb"
         },
         "string.regex": {
-          "color": "#fe640b",
-          "font_style": null,
-          "font_weight": null
+          "color": "#fe640b"
         },
         "text": {
-          "color": "#4c4f69",
-          "font_style": null,
-          "font_weight": null
+          "color": "#4c4f69"
         },
         "emphasis.strong": {
           "color": "#e64553",
-          "font_style": null,
           "font_weight": 700
         },
         "emphasis": {
           "color": "#e64553",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "embedded": {
-          "color": "#e64553",
-          "font_style": null,
-          "font_weight": null
+          "color": "#e64553"
         },
         "text.literal": {
-          "color": "#40a02b",
-          "font_style": null,
-          "font_weight": null
+          "color": "#40a02b"
         },
         "concept": {
-          "color": "#209fb5",
-          "font_style": null,
-          "font_weight": null
+          "color": "#209fb5"
         },
         "enum": {
           "color": "#179299",
-          "font_style": null,
           "font_weight": 700
         },
         "function.decorator": {
-          "color": "#fe640b",
-          "font_style": null,
-          "font_weight": null
+          "color": "#fe640b"
         },
         "type.class.definition": {
           "color": "#df8e1d",
-          "font_style": null,
           "font_weight": 700
         },
         "hint": {
           "color": "#acb0be",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "link_text": {
-          "color": "#7287fd",
-          "font_style": null,
-          "font_weight": null
+          "color": "#7287fd"
         },
         "link_uri": {
           "color": "#1e66f5",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "parent": {
-          "color": "#fe640b",
-          "font_style": null,
-          "font_weight": null
+          "color": "#fe640b"
         },
         "predictive": {
-          "color": "#9ca0b0",
-          "font_style": null,
-          "font_weight": null
+          "color": "#9ca0b0"
         },
         "predoc": {
-          "color": "#d20f39",
-          "font_style": null,
-          "font_weight": null
+          "color": "#d20f39"
         },
         "primary": {
-          "color": "#e64553",
-          "font_style": null,
-          "font_weight": null
+          "color": "#e64553"
         },
         "tag.doctype": {
-          "color": "#8839ef",
-          "font_style": null,
-          "font_weight": null
+          "color": "#8839ef"
         },
         "string.doc": {
           "color": "#179299",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "title": {
           "color": "#4c4f69",
-          "font_style": null,
           "font_weight": 800
         },
         "variant": {
-          "color": "#d20f39",
-          "font_style": null,
-          "font_weight": null
+          "color": "#d20f39"
         }
       }
     }
@@ -667,162 +493,95 @@
       "editor.line_number": "#979db5",
       "editor.active_line_number": "#c6d0f5",
       "conflict": "#e78284",
-      "conflict.background": null,
-      "conflict.border": null,
       "created": "#a6d189",
       "created.background": "#2e3b2e",
-      "created.border": null,
-      "deleted": null,
       "deleted.background": "#3b2e2e",
-      "deleted.border": null,
-      "error": null,
       "error.background": "#3b2e2e",
       "error.border": "#7b2e2e",
       "hidden": "#51576d",
-      "hidden.background": null,
-      "hidden.border": null,
       "hint": "#8caaee",
       "hint.background": "#1e2030",
       "hint.border": "#3b4b91",
-      "ignored": null,
-      "ignored.background": null,
-      "ignored.border": null,
-      "info": null,
       "info.background": "#1e2b4d",
       "info.border": "#2e3b91",
       "modified": "#e7d682",
       "modified.background": "#3a2f1e",
-      "modified.border": null,
       "predictive": "#51576d",
-      "predictive.background": null,
-      "predictive.border": null,
-      "renamed": null,
-      "renamed.background": null,
-      "renamed.border": null,
-      "success": null,
       "success.background": "#2e3b2e",
-      "success.border": null,
-      "unreachable": null,
-      "unreachable.background": null,
-      "unreachable.border": null,
-      "warning": null,
       "warning.background": "#3a2f1e",
       "warning.border": "#7b6b2e",
       "syntax": {
         "attribute": {
-          "color": "#e7d682",
-          "font_style": null,
-          "font_weight": null
+          "color": "#e7d682"
         },
         "boolean": {
-          "color": "#e78284",
-          "font_style": null,
-          "font_weight": null
+          "color": "#e78284"
         },
         "comment": {
-          "color": "#51576d",
-          "font_style": null,
-          "font_weight": null
+          "color": "#51576d"
         },
         "comment.doc": {
-          "color": "#51576d",
-          "font_style": null,
-          "font_weight": null
+          "color": "#51576d"
         },
         "constant": {
-          "color": "#e7d682",
-          "font_style": null,
-          "font_weight": null
+          "color": "#e7d682"
         },
         "constructor": {
-          "color": "#a6d189",
-          "font_style": null,
-          "font_weight": null
+          "color": "#a6d189"
         },
         "embedded": {
-          "color": "#c6d0f5",
-          "font_style": null,
-          "font_weight": null
+          "color": "#c6d0f5"
         },
         "function": {
-          "color": "#8caaee",
-          "font_style": null,
-          "font_weight": null
+          "color": "#8caaee"
         },
         "keyword": {
-          "color": "#e78284",
-          "font_style": null,
-          "font_weight": null
+          "color": "#e78284"
         },
         "link_text": {
           "color": "#8caaee",
-          "font_style": "normal",
-          "font_weight": null
+          "font_style": "normal"
         },
         "link_uri": {
           "color": "#51576d",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "number": {
-          "color": "#e78284",
-          "font_style": null,
-          "font_weight": null
+          "color": "#e78284"
         },
         "string": {
-          "color": "#a6d189",
-          "font_style": null,
-          "font_weight": null
+          "color": "#a6d189"
         },
         "string.escape": {
-          "color": "#a6d189",
-          "font_style": null,
-          "font_weight": null
+          "color": "#a6d189"
         },
         "string.regex": {
-          "color": "#a6d189",
-          "font_style": null,
-          "font_weight": null
+          "color": "#a6d189"
         },
         "string.special": {
-          "color": "#e7d682",
-          "font_style": null,
-          "font_weight": null
+          "color": "#e7d682"
         },
         "string.special.symbol": {
-          "color": "#e7d682",
-          "font_style": null,
-          "font_weight": null
+          "color": "#e7d682"
         },
         "tag": {
-          "color": "#8caaee",
-          "font_style": null,
-          "font_weight": null
+          "color": "#8caaee"
         },
         "text.literal": {
-          "color": "#c6d0f5",
-          "font_style": null,
-          "font_weight": null
+          "color": "#c6d0f5"
         },
         "title": {
           "color": "#e78284",
-          "font_style": null,
           "font_weight": 600
         },
         "type": {
-          "color": "#8caaee",
-          "font_style": null,
-          "font_weight": null
+          "color": "#8caaee"
         },
         "property": {
-          "color": "#c6d0f5",
-          "font_style": null,
-          "font_weight": null
+          "color": "#c6d0f5"
         },
         "variable.special": {
-          "color": "#e78284",
-          "font_style": null,
-          "font_weight": null
+          "color": "#e78284"
         }
       }
     }
@@ -935,119 +694,78 @@
       "warning.border": "#eed49f",
       "syntax": {
         "attribute": {
-          "color": "#eed49f",
-          "font_style": null,
-          "font_weight": null
+          "color": "#eed49f"
         },
         "boolean": {
-          "color": "#f5bde6",
-          "font_style": null,
-          "font_weight": null
+          "color": "#f5bde6"
         },
         "comment": {
           "color": "#b8c0e0",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "comment.doc": {
           "color": "#b8c0e0",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "constant": {
-          "color": "#eed49f",
-          "font_style": null,
-          "font_weight": null
+          "color": "#eed49f"
         },
         "constructor": {
-          "color": "#8aadf4",
-          "font_style": null,
-          "font_weight": null
+          "color": "#8aadf4"
         },
         "embedded": {
-          "color": "#cad3f5",
-          "font_style": null,
-          "font_weight": null
+          "color": "#cad3f5"
         },
         "function": {
-          "color": "#8aadf4",
-          "font_style": null,
-          "font_weight": null
+          "color": "#8aadf4"
         },
         "keyword": {
-          "color": "#f5bde6",
-          "font_style": null,
-          "font_weight": null
+          "color": "#f5bde6"
         },
         "link_text": {
           "color": "#8aadf4",
-          "font_style": "normal",
-          "font_weight": null
+          "font_style": "normal"
         },
         "link_uri": {
           "color": "#b8c0e0",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "number": {
-          "color": "#eed49f",
-          "font_style": null,
-          "font_weight": null
+          "color": "#eed49f"
         },
         "string": {
-          "color": "#a6da95",
-          "font_style": null,
-          "font_weight": null
+          "color": "#a6da95"
         },
         "string.escape": {
-          "color": "#a6da95",
-          "font_style": null,
-          "font_weight": null
+          "color": "#a6da95"
         },
         "string.regex": {
-          "color": "#a6da95",
-          "font_style": null,
-          "font_weight": null
+          "color": "#a6da95"
         },
         "string.special": {
-          "color": "#eed49f",
-          "font_style": null,
-          "font_weight": null
+          "color": "#eed49f"
         },
         "string.special.symbol": {
-          "color": "#eed49f",
-          "font_style": null,
-          "font_weight": null
+          "color": "#eed49f"
         },
         "tag": {
-          "color": "#8aadf4",
-          "font_style": null,
-          "font_weight": null
+          "color": "#8aadf4"
         },
         "text.literal": {
-          "color": "#cad3f5",
-          "font_style": null,
-          "font_weight": null
+          "color": "#cad3f5"
         },
         "title": {
           "color": "#f5bde6",
-          "font_style": null,
           "font_weight": 600
         },
         "type": {
-          "color": "#8aadf4",
-          "font_style": null,
-          "font_weight": null
+          "color": "#8aadf4"
         },
         "property": {
-          "color": "#cad3f5",
-          "font_style": null,
-          "font_weight": null
+          "color": "#cad3f5"
         },
         "variable.special": {
-          "color": "#f5bde6",
-          "font_style": null,
-          "font_weight": null
+          "color": "#f5bde6"
         }
       }
     }
@@ -1157,119 +875,78 @@
       "warning.border": "#f9e2af",
       "syntax": {
         "attribute": {
-          "color": "#f9e2af",
-          "font_style": null,
-          "font_weight": null
+          "color": "#f9e2af"
         },
         "boolean": {
-          "color": "#f5c2e7",
-          "font_style": null,
-          "font_weight": null
+          "color": "#f5c2e7"
         },
         "comment": {
           "color": "#6c7086",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "comment.doc": {
           "color": "#6c7086",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "constant": {
-          "color": "#f9e2af",
-          "font_style": null,
-          "font_weight": null
+          "color": "#f9e2af"
         },
         "constructor": {
-          "color": "#89b4fa",
-          "font_style": null,
-          "font_weight": null
+          "color": "#89b4fa"
         },
         "embedded": {
-          "color": "#cdd6f4",
-          "font_style": null,
-          "font_weight": null
+          "color": "#cdd6f4"
         },
         "function": {
-          "color": "#89b4fa",
-          "font_style": null,
-          "font_weight": null
+          "color": "#89b4fa"
         },
         "keyword": {
-          "color": "#f5c2e7",
-          "font_style": null,
-          "font_weight": null
+          "color": "#f5c2e7"
         },
         "link_text": {
           "color": "#89b4fa",
-          "font_style": "normal",
-          "font_weight": null
+          "font_style": "normal"
         },
         "link_uri": {
           "color": "#6c7086",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "number": {
-          "color": "#f9e2af",
-          "font_style": null,
-          "font_weight": null
+          "color": "#f9e2af"
         },
         "string": {
-          "color": "#a6e3a1",
-          "font_style": null,
-          "font_weight": null
+          "color": "#a6e3a1"
         },
         "string.escape": {
-          "color": "#a6e3a1",
-          "font_style": null,
-          "font_weight": null
+          "color": "#a6e3a1"
         },
         "string.regex": {
-          "color": "#a6e3a1",
-          "font_style": null,
-          "font_weight": null
+          "color": "#a6e3a1"
         },
         "string.special": {
-          "color": "#f9e2af",
-          "font_style": null,
-          "font_weight": null
+          "color": "#f9e2af"
         },
         "string.special.symbol": {
-          "color": "#f9e2af",
-          "font_style": null,
-          "font_weight": null
+          "color": "#f9e2af"
         },
         "tag": {
-          "color": "#89b4fa",
-          "font_style": null,
-          "font_weight": null
+          "color": "#89b4fa"
         },
         "text.literal": {
-          "color": "#cdd6f4",
-          "font_style": null,
-          "font_weight": null
+          "color": "#cdd6f4"
         },
         "title": {
           "color": "#f5c2e7",
-          "font_style": null,
           "font_weight": 600
         },
         "type": {
-          "color": "#89b4fa",
-          "font_style": null,
-          "font_weight": null
+          "color": "#89b4fa"
         },
         "property": {
-          "color": "#cdd6f4",
-          "font_style": null,
-          "font_weight": null
+          "color": "#cdd6f4"
         },
         "variable.special": {
-          "color": "#f5c2e7",
-          "font_style": null,
-          "font_weight": null
+          "color": "#f5c2e7"
         }
       }
     }
diff --git a/themes/everforest.json b/themes/everforest.json
index a2abd5a7..d13f8955 100644
--- a/themes/everforest.json
+++ b/themes/everforest.json
@@ -76,14 +76,10 @@
       "error.background": "#f4e4e4",
       "error.border": "#e67e80",
       "hidden": "#959a9d",
-      "hidden.background": null,
-      "hidden.border": null,
       "hint": "#7fbbb3",
       "hint.background": "#e0f4f4",
       "hint.border": "#7fbbb3",
       "ignored": "#959a9d",
-      "ignored.background": null,
-      "ignored.border": null,
       "info": "#7fbbb3",
       "info.background": "#e0f4f4",
       "info.border": "#7fbbb3",
@@ -91,8 +87,6 @@
       "modified.background": "#f9f4e4",
       "modified.border": "#dbbc7f",
       "predictive": "#5F6D75",
-      "predictive.background": null,
-      "predictive.border": null,
       "renamed": "#a7c080",
       "renamed.background": "#eaf4e4",
       "renamed.border": "#a7c080",
@@ -100,126 +94,83 @@
       "success.background": "#eaf4e4",
       "success.border": "#a7c080",
       "unreachable": "#959a9d",
-      "unreachable.background": null,
-      "unreachable.border": null,
       "warning": "#dbbc7f",
       "warning.background": "#f9f4e4",
       "warning.border": "#dbbc7f",
       "syntax": {
         "attribute": {
-          "color": "#dbbc7f",
-          "font_style": null,
-          "font_weight": null
+          "color": "#dbbc7f"
         },
         "boolean": {
-          "color": "#e69875",
-          "font_style": null,
-          "font_weight": null
+          "color": "#e69875"
         },
         "comment": {
           "color": "#959a9d",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "comment.doc": {
           "color": "#959a9d",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "constant": {
-          "color": "#e69875",
-          "font_style": null,
-          "font_weight": null
+          "color": "#e69875"
         },
         "constructor": {
-          "color": "#a7c080",
-          "font_style": null,
-          "font_weight": null
+          "color": "#a7c080"
         },
         "embedded": {
-          "color": "#5F6D75",
-          "font_style": null,
-          "font_weight": null
+          "color": "#5F6D75"
         },
         "function": {
-          "color": "#a7c080",
-          "font_style": null,
-          "font_weight": null
+          "color": "#a7c080"
         },
         "keyword": {
-          "color": "#e67e80",
-          "font_style": null,
-          "font_weight": null
+          "color": "#e67e80"
         },
         "link_text": {
           "color": "#7fbbb3",
-          "font_style": "normal",
-          "font_weight": null
+          "font_style": "normal"
         },
         "link_uri": {
           "color": "#5F6D75",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "number": {
-          "color": "#e69875",
-          "font_style": null,
-          "font_weight": null
+          "color": "#e69875"
         },
         "string": {
-          "color": "#a7c080",
-          "font_style": null,
-          "font_weight": null
+          "color": "#a7c080"
         },
         "string.escape": {
-          "color": "#a7c080",
-          "font_style": null,
-          "font_weight": null
+          "color": "#a7c080"
         },
         "string.regex": {
-          "color": "#a7c080",
-          "font_style": null,
-          "font_weight": null
+          "color": "#a7c080"
         },
         "string.special": {
-          "color": "#dbbc7f",
-          "font_style": null,
-          "font_weight": null
+          "color": "#dbbc7f"
         },
         "string.special.symbol": {
-          "color": "#dbbc7f",
-          "font_style": null,
-          "font_weight": null
+          "color": "#dbbc7f"
         },
         "tag": {
-          "color": "#a7c080",
-          "font_style": null,
-          "font_weight": null
+          "color": "#a7c080"
         },
         "text.literal": {
-          "color": "#dbbc7f",
-          "font_style": null,
-          "font_weight": null
+          "color": "#dbbc7f"
         },
         "title": {
           "color": "#e69875",
-          "font_style": null,
           "font_weight": 600
         },
         "type": {
-          "color": "#7fbbb3",
-          "font_style": null,
-          "font_weight": null
+          "color": "#7fbbb3"
         },
         "property": {
-          "color": "#5F6D75",
-          "font_style": null,
-          "font_weight": null
+          "color": "#5F6D75"
         },
         "variable.special": {
-          "color": "#e67e80",
-          "font_style": null,
-          "font_weight": null
+          "color": "#e67e80"
         }
       }
     }
@@ -287,162 +238,95 @@
       "editor.line_number": "#8F8F8F",
       "editor.active_line_number": "#DDDDDD",
       "conflict": "#D2602D",
-      "conflict.background": null,
-      "conflict.border": null,
       "created": "#3f72e2",
       "created.background": "#0C4619",
-      "created.border": null,
-      "deleted": null,
       "deleted.background": "#46190C",
-      "deleted.border": null,
-      "error": null,
       "error.background": "#46190C",
       "error.border": "#802207",
       "hidden": "#9E9E9E",
-      "hidden.background": null,
-      "hidden.border": null,
       "hint": "#b283f8",
       "hint.background": "#250c4b",
       "hint.border": "#3f0891",
-      "ignored": null,
-      "ignored.background": null,
-      "ignored.border": null,
-      "info": null,
       "info.background": "#0C194D",
       "info.border": "#082190",
       "modified": "#B0A878",
       "modified.background": "#3A310E",
-      "modified.border": null,
       "predictive": "#5D5945",
-      "predictive.background": null,
-      "predictive.border": null,
-      "renamed": null,
-      "renamed.background": null,
-      "renamed.border": null,
-      "success": null,
       "success.background": "#0C4619",
-      "success.border": null,
-      "unreachable": null,
-      "unreachable.background": null,
-      "unreachable.border": null,
-      "warning": null,
       "warning.background": "#3A310E",
       "warning.border": "#7B6508",
       "syntax": {
         "attribute": {
-          "color": "#be9a52",
-          "font_style": null,
-          "font_weight": null
+          "color": "#be9a52"
         },
         "boolean": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "comment": {
-          "color": "#9E9E9E",
-          "font_style": null,
-          "font_weight": null
+          "color": "#9E9E9E"
         },
         "comment.doc": {
-          "color": "#9E9E9E",
-          "font_style": null,
-          "font_weight": null
+          "color": "#9E9E9E"
         },
         "constant": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "constructor": {
-          "color": "#b5af9a",
-          "font_style": null,
-          "font_weight": null
+          "color": "#b5af9a"
         },
         "embedded": {
-          "color": "#CACCCA",
-          "font_style": null,
-          "font_weight": null
+          "color": "#CACCCA"
         },
         "function": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "keyword": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         },
         "link_text": {
           "color": "#A86D3B",
-          "font_style": "normal",
-          "font_weight": null
+          "font_style": "normal"
         },
         "link_uri": {
           "color": "#6F6D66",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "number": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         },
         "string": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.escape": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.regex": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.special": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "string.special.symbol": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "tag": {
-          "color": "#b5af9a",
-          "font_style": null,
-          "font_weight": null
+          "color": "#b5af9a"
         },
         "text.literal": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "title": {
           "color": "#A76D3B",
-          "font_style": null,
           "font_weight": 600
         },
         "type": {
-          "color": "#A86D3B",
-          "font_style": null,
-          "font_weight": null
+          "color": "#A86D3B"
         },
         "property": {
-          "color": "#CACCCA",
-          "font_style": null,
-          "font_weight": null
+          "color": "#CACCCA"
         },
         "variable.special": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         }
       }
     }
diff --git a/themes/gruvbox.json b/themes/gruvbox.json
index 514f405b..4f803545 100644
--- a/themes/gruvbox.json
+++ b/themes/gruvbox.json
@@ -105,119 +105,78 @@
       "warning.border": "#b57614",
       "syntax": {
         "attribute": {
-          "color": "#b57614",
-          "font_style": null,
-          "font_weight": null
+          "color": "#b57614"
         },
         "boolean": {
-          "color": "#d79921",
-          "font_style": null,
-          "font_weight": null
+          "color": "#d79921"
         },
         "comment": {
           "color": "#928374",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "comment.doc": {
           "color": "#928374",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "constant": {
-          "color": "#d79921",
-          "font_style": null,
-          "font_weight": null
+          "color": "#d79921"
         },
         "constructor": {
-          "color": "#b57614",
-          "font_style": null,
-          "font_weight": null
+          "color": "#b57614"
         },
         "embedded": {
-          "color": "#3c3836",
-          "font_style": null,
-          "font_weight": null
+          "color": "#3c3836"
         },
         "function": {
-          "color": "#d79921",
-          "font_style": null,
-          "font_weight": null
+          "color": "#d79921"
         },
         "keyword": {
-          "color": "#cc241d",
-          "font_style": null,
-          "font_weight": null
+          "color": "#cc241d"
         },
         "link_text": {
           "color": "#458588",
-          "font_style": "normal",
-          "font_weight": null
+          "font_style": "normal"
         },
         "link_uri": {
           "color": "#076678",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "number": {
-          "color": "#cc241d",
-          "font_style": null,
-          "font_weight": null
+          "color": "#cc241d"
         },
         "string": {
-          "color": "#79740e",
-          "font_style": null,
-          "font_weight": null
+          "color": "#79740e"
         },
         "string.escape": {
-          "color": "#79740e",
-          "font_style": null,
-          "font_weight": null
+          "color": "#79740e"
         },
         "string.regex": {
-          "color": "#79740e",
-          "font_style": null,
-          "font_weight": null
+          "color": "#79740e"
         },
         "string.special": {
-          "color": "#d79921",
-          "font_style": null,
-          "font_weight": null
+          "color": "#d79921"
         },
         "string.special.symbol": {
-          "color": "#d79921",
-          "font_style": null,
-          "font_weight": null
+          "color": "#d79921"
         },
         "tag": {
-          "color": "#b57614",
-          "font_style": null,
-          "font_weight": null
+          "color": "#b57614"
         },
         "text.literal": {
-          "color": "#d79921",
-          "font_style": null,
-          "font_weight": null
+          "color": "#d79921"
         },
         "title": {
           "color": "#b57614",
-          "font_style": null,
           "font_weight": 600
         },
         "type": {
-          "color": "#b57614",
-          "font_style": null,
-          "font_weight": null
+          "color": "#b57614"
         },
         "property": {
-          "color": "#3c3836",
-          "font_style": null,
-          "font_weight": null
+          "color": "#3c3836"
         },
         "variable.special": {
-          "color": "#cc241d",
-          "font_style": null,
-          "font_weight": null
+          "color": "#cc241d"
         }
       }
     }
@@ -285,162 +244,95 @@
       "editor.line_number": "#8F8F8F",
       "editor.active_line_number": "#DDDDDD",
       "conflict": "#D2602D",
-      "conflict.background": null,
-      "conflict.border": null,
       "created": "#3f72e2",
       "created.background": "#0C4619",
-      "created.border": null,
-      "deleted": null,
       "deleted.background": "#46190C",
-      "deleted.border": null,
-      "error": null,
       "error.background": "#46190C",
       "error.border": "#802207",
       "hidden": "#9E9E9E",
-      "hidden.background": null,
-      "hidden.border": null,
       "hint": "#b283f8",
       "hint.background": "#250c4b",
       "hint.border": "#3f0891",
-      "ignored": null,
-      "ignored.background": null,
-      "ignored.border": null,
-      "info": null,
       "info.background": "#0C194D",
       "info.border": "#082190",
       "modified": "#B0A878",
       "modified.background": "#3A310E",
-      "modified.border": null,
       "predictive": "#5D5945",
-      "predictive.background": null,
-      "predictive.border": null,
-      "renamed": null,
-      "renamed.background": null,
-      "renamed.border": null,
-      "success": null,
       "success.background": "#0C4619",
-      "success.border": null,
-      "unreachable": null,
-      "unreachable.background": null,
-      "unreachable.border": null,
-      "warning": null,
       "warning.background": "#3A310E",
       "warning.border": "#7B6508",
       "syntax": {
         "attribute": {
-          "color": "#be9a52",
-          "font_style": null,
-          "font_weight": null
+          "color": "#be9a52"
         },
         "boolean": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "comment": {
-          "color": "#9E9E9E",
-          "font_style": null,
-          "font_weight": null
+          "color": "#9E9E9E"
         },
         "comment.doc": {
-          "color": "#9E9E9E",
-          "font_style": null,
-          "font_weight": null
+          "color": "#9E9E9E"
         },
         "constant": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "constructor": {
-          "color": "#b5af9a",
-          "font_style": null,
-          "font_weight": null
+          "color": "#b5af9a"
         },
         "embedded": {
-          "color": "#CACCCA",
-          "font_style": null,
-          "font_weight": null
+          "color": "#CACCCA"
         },
         "function": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "keyword": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         },
         "link_text": {
           "color": "#A86D3B",
-          "font_style": "normal",
-          "font_weight": null
+          "font_style": "normal"
         },
         "link_uri": {
           "color": "#6F6D66",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "number": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         },
         "string": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.escape": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.regex": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.special": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "string.special.symbol": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "tag": {
-          "color": "#b5af9a",
-          "font_style": null,
-          "font_weight": null
+          "color": "#b5af9a"
         },
         "text.literal": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "title": {
           "color": "#A76D3B",
-          "font_style": null,
           "font_weight": 600
         },
         "type": {
-          "color": "#A86D3B",
-          "font_style": null,
-          "font_weight": null
+          "color": "#A86D3B"
         },
         "property": {
-          "color": "#CACCCA",
-          "font_style": null,
-          "font_weight": null
+          "color": "#CACCCA"
         },
         "variable.special": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         }
       }
     }
diff --git a/themes/hybrid.json b/themes/hybrid.json
index 4d715acf..996c4d47 100644
--- a/themes/hybrid.json
+++ b/themes/hybrid.json
@@ -106,119 +106,78 @@
       "warning.border": "#D7C490",
       "syntax": {
         "attribute": {
-          "color": "#948000",
-          "font_style": null,
-          "font_weight": null
+          "color": "#948000"
         },
         "boolean": {
-          "color": "#005F00",
-          "font_style": null,
-          "font_weight": null
+          "color": "#005F00"
         },
         "comment": {
           "color": "#5F5F5F",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "comment.doc": {
           "color": "#5F5F5F",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "constant": {
-          "color": "#005F87",
-          "font_style": null,
-          "font_weight": null
+          "color": "#005F87"
         },
         "constructor": {
-          "color": "#79792C",
-          "font_style": null,
-          "font_weight": null
+          "color": "#79792C"
         },
         "embedded": {
-          "color": "#1C1C1C",
-          "font_style": null,
-          "font_weight": null
+          "color": "#1C1C1C"
         },
         "function": {
-          "color": "#005F87",
-          "font_style": null,
-          "font_weight": null
+          "color": "#005F87"
         },
         "keyword": {
-          "color": "#5F1C51",
-          "font_style": null,
-          "font_weight": null
+          "color": "#5F1C51"
         },
         "link_text": {
           "color": "#005F87",
-          "font_style": "underline",
-          "font_weight": null
+          "font_style": "underline"
         },
         "link_uri": {
           "color": "#005F87",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "number": {
-          "color": "#005F00",
-          "font_style": null,
-          "font_weight": null
+          "color": "#005F00"
         },
         "string": {
-          "color": "#005F00",
-          "font_style": null,
-          "font_weight": null
+          "color": "#005F00"
         },
         "string.escape": {
-          "color": "#005F00",
-          "font_style": null,
-          "font_weight": null
+          "color": "#005F00"
         },
         "string.regex": {
-          "color": "#005F00",
-          "font_style": null,
-          "font_weight": null
+          "color": "#005F00"
         },
         "string.special": {
-          "color": "#005F87",
-          "font_style": null,
-          "font_weight": null
+          "color": "#005F87"
         },
         "string.special.symbol": {
-          "color": "#005F87",
-          "font_style": null,
-          "font_weight": null
+          "color": "#005F87"
         },
         "tag": {
-          "color": "#79792C",
-          "font_style": null,
-          "font_weight": null
+          "color": "#79792C"
         },
         "text.literal": {
-          "color": "#005F87",
-          "font_style": null,
-          "font_weight": null
+          "color": "#005F87"
         },
         "title": {
           "color": "#005F87",
-          "font_style": null,
           "font_weight": 600
         },
         "type": {
-          "color": "#5F1C51",
-          "font_style": null,
-          "font_weight": null
+          "color": "#5F1C51"
         },
         "property": {
-          "color": "#1C1C1C",
-          "font_style": null,
-          "font_weight": null
+          "color": "#1C1C1C"
         },
         "variable.special": {
-          "color": "#5F1C51",
-          "font_style": null,
-          "font_weight": null
+          "color": "#5F1C51"
         }
       }
     }
@@ -287,162 +246,95 @@
       "editor.line_number": "#8F8F8F",
       "editor.active_line_number": "#DDDDDD",
       "conflict": "#D2602D",
-      "conflict.background": null,
-      "conflict.border": null,
       "created": "#3f72e2",
       "created.background": "#0C4619",
-      "created.border": null,
-      "deleted": null,
       "deleted.background": "#46190C",
-      "deleted.border": null,
-      "error": null,
       "error.background": "#46190C",
       "error.border": "#802207",
       "hidden": "#9E9E9E",
-      "hidden.background": null,
-      "hidden.border": null,
       "hint": "#b283f8",
       "hint.background": "#250c4b",
       "hint.border": "#3f0891",
-      "ignored": null,
-      "ignored.background": null,
-      "ignored.border": null,
-      "info": null,
       "info.background": "#0C194D",
       "info.border": "#082190",
       "modified": "#B0A878",
       "modified.background": "#3A310E",
-      "modified.border": null,
       "predictive": "#5D5945",
-      "predictive.background": null,
-      "predictive.border": null,
-      "renamed": null,
-      "renamed.background": null,
-      "renamed.border": null,
-      "success": null,
       "success.background": "#0C4619",
-      "success.border": null,
-      "unreachable": null,
-      "unreachable.background": null,
-      "unreachable.border": null,
-      "warning": null,
       "warning.background": "#3A310E",
       "warning.border": "#7B6508",
       "syntax": {
         "attribute": {
-          "color": "#be9a52",
-          "font_style": null,
-          "font_weight": null
+          "color": "#be9a52"
         },
         "boolean": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "comment": {
-          "color": "#9E9E9E",
-          "font_style": null,
-          "font_weight": null
+          "color": "#9E9E9E"
         },
         "comment.doc": {
-          "color": "#9E9E9E",
-          "font_style": null,
-          "font_weight": null
+          "color": "#9E9E9E"
         },
         "constant": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "constructor": {
-          "color": "#b5af9a",
-          "font_style": null,
-          "font_weight": null
+          "color": "#b5af9a"
         },
         "embedded": {
-          "color": "#CACCCA",
-          "font_style": null,
-          "font_weight": null
+          "color": "#CACCCA"
         },
         "function": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "keyword": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         },
         "link_text": {
           "color": "#A86D3B",
-          "font_style": "normal",
-          "font_weight": null
+          "font_style": "normal"
         },
         "link_uri": {
           "color": "#6F6D66",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "number": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         },
         "string": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.escape": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.regex": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.special": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "string.special.symbol": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "tag": {
-          "color": "#b5af9a",
-          "font_style": null,
-          "font_weight": null
+          "color": "#b5af9a"
         },
         "text.literal": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "title": {
           "color": "#A76D3B",
-          "font_style": null,
           "font_weight": 600
         },
         "type": {
-          "color": "#A86D3B",
-          "font_style": null,
-          "font_weight": null
+          "color": "#A86D3B"
         },
         "property": {
-          "color": "#CACCCA",
-          "font_style": null,
-          "font_weight": null
+          "color": "#CACCCA"
         },
         "variable.special": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         }
       }
     }
diff --git a/themes/jellybeans.json b/themes/jellybeans.json
index 8e412ca5..f3efa5cc 100644
--- a/themes/jellybeans.json
+++ b/themes/jellybeans.json
@@ -68,162 +68,95 @@
       "editor.line_number": "#8F8F8F",
       "editor.active_line_number": "#DDDDDD",
       "conflict": "#D2602D",
-      "conflict.background": null,
-      "conflict.border": null,
       "created": "#3f72e2",
       "created.background": "#0C4619",
-      "created.border": null,
-      "deleted": null,
       "deleted.background": "#46190C",
-      "deleted.border": null,
-      "error": null,
       "error.background": "#46190C",
       "error.border": "#802207",
       "hidden": "#9E9E9E",
-      "hidden.background": null,
-      "hidden.border": null,
       "hint": "#b283f8",
       "hint.background": "#250c4b",
       "hint.border": "#3f0891",
-      "ignored": null,
-      "ignored.background": null,
-      "ignored.border": null,
-      "info": null,
       "info.background": "#0C194D",
       "info.border": "#082190",
       "modified": "#B0A878",
       "modified.background": "#3A310E",
-      "modified.border": null,
       "predictive": "#5D5945",
-      "predictive.background": null,
-      "predictive.border": null,
-      "renamed": null,
-      "renamed.background": null,
-      "renamed.border": null,
-      "success": null,
       "success.background": "#0C4619",
-      "success.border": null,
-      "unreachable": null,
-      "unreachable.background": null,
-      "unreachable.border": null,
-      "warning": null,
       "warning.background": "#3A310E",
       "warning.border": "#7B6508",
       "syntax": {
         "attribute": {
-          "color": "#be9a52",
-          "font_style": null,
-          "font_weight": null
+          "color": "#be9a52"
         },
         "boolean": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "comment": {
-          "color": "#9E9E9E",
-          "font_style": null,
-          "font_weight": null
+          "color": "#9E9E9E"
         },
         "comment.doc": {
-          "color": "#9E9E9E",
-          "font_style": null,
-          "font_weight": null
+          "color": "#9E9E9E"
         },
         "constant": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "constructor": {
-          "color": "#b5af9a",
-          "font_style": null,
-          "font_weight": null
+          "color": "#b5af9a"
         },
         "embedded": {
-          "color": "#CACCCA",
-          "font_style": null,
-          "font_weight": null
+          "color": "#CACCCA"
         },
         "function": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "keyword": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         },
         "link_text": {
           "color": "#A86D3B",
-          "font_style": "normal",
-          "font_weight": null
+          "font_style": "normal"
         },
         "link_uri": {
           "color": "#6F6D66",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "number": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         },
         "string": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.escape": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.regex": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.special": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "string.special.symbol": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "tag": {
-          "color": "#b5af9a",
-          "font_style": null,
-          "font_weight": null
+          "color": "#b5af9a"
         },
         "text.literal": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "title": {
           "color": "#A76D3B",
-          "font_style": null,
           "font_weight": 600
         },
         "type": {
-          "color": "#A86D3B",
-          "font_style": null,
-          "font_weight": null
+          "color": "#A86D3B"
         },
         "property": {
-          "color": "#CACCCA",
-          "font_style": null,
-          "font_weight": null
+          "color": "#CACCCA"
         },
         "variable.special": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         }
       }
     }
diff --git a/themes/macos-classic.json b/themes/macos-classic.json
index 20a069ac..d2a27abf 100644
--- a/themes/macos-classic.json
+++ b/themes/macos-classic.json
@@ -67,167 +67,98 @@
       "editor.line_number": "#929292",
       "editor.active_line_number": "#000000",
       "conflict": "#C5060B",
-      "conflict.background": null,
-      "conflict.border": null,
       "created": "#1642FF",
       "created.background": "#e5ffe9",
-      "created.border": null,
-      "deleted": null,
       "deleted.background": "#FBEAE5",
-      "deleted.border": null,
-      "error": null,
       "error.background": "#FBEAE5",
       "error.border": "#EC9F89",
       "hidden": "#6D6D6D",
-      "hidden.background": null,
-      "hidden.border": null,
       "hint": "#9e5dff",
       "hint.background": "#ece6ff",
       "hint.border": "#bc8fff",
-      "ignored": null,
-      "ignored.background": null,
-      "ignored.border": null,
-      "info": null,
       "info.background": "#E5EAFF",
       "info.border": "#8DA1FF",
       "modified": "#9e7008",
       "modified.background": "#fff2e5",
-      "modified.border": null,
       "predictive": "#A4ABB6",
-      "predictive.background": null,
-      "predictive.border": null,
-      "renamed": null,
-      "renamed.background": null,
-      "renamed.border": null,
-      "success": null,
       "success.background": "#E5FFE5",
-      "success.border": null,
-      "unreachable": null,
-      "unreachable.background": null,
-      "unreachable.border": null,
       "warning": "#C99401",
       "warning.background": "#FFFBE5",
       "warning.border": "#D9CC89",
       "syntax": {
         "attribute": {
-          "color": "#957931",
-          "font_style": null,
-          "font_weight": null
+          "color": "#957931"
         },
         "boolean": {
-          "color": "#C5060B",
-          "font_style": null,
-          "font_weight": null
+          "color": "#C5060B"
         },
         "comment": {
-          "color": "#007fff",
-          "font_style": null,
-          "font_weight": null
+          "color": "#007fff"
         },
         "comment.doc": {
-          "color": "#007fff",
-          "font_style": null,
-          "font_weight": null
+          "color": "#007fff"
         },
         "constant": {
-          "color": "#C5060B",
-          "font_style": null,
-          "font_weight": null
+          "color": "#C5060B"
         },
         "constructor": {
-          "color": "#0433ff",
-          "font_style": null,
-          "font_weight": null
+          "color": "#0433ff"
         },
         "embedded": {
-          "color": "#333333",
-          "font_style": null,
-          "font_weight": null
+          "color": "#333333"
         },
         "function": {
-          "color": "#0000A2",
-          "font_style": null,
-          "font_weight": null
+          "color": "#0000A2"
         },
         "keyword": {
-          "color": "#0433ff",
-          "font_style": null,
-          "font_weight": null
+          "color": "#0433ff"
         },
         "link_text": {
           "color": "#0000A2",
-          "font_style": "normal",
-          "font_weight": null
+          "font_style": "normal"
         },
         "link_uri": {
           "color": "#6A7293",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "number": {
-          "color": "#0433ff",
-          "font_style": null,
-          "font_weight": null
+          "color": "#0433ff"
         },
         "string": {
-          "color": "#036A07",
-          "font_style": null,
-          "font_weight": null
+          "color": "#036A07"
         },
         "string.escape": {
-          "color": "#036A07",
-          "font_style": null,
-          "font_weight": null
+          "color": "#036A07"
         },
         "string.regex": {
-          "color": "#036A07",
-          "font_style": null,
-          "font_weight": null
+          "color": "#036A07"
         },
         "string.special": {
-          "color": "#d21f07",
-          "font_style": null,
-          "font_weight": null
+          "color": "#d21f07"
         },
         "string.special.symbol": {
-          "color": "#d21f07",
-          "font_style": null,
-          "font_weight": null
+          "color": "#d21f07"
         },
         "tag": {
-          "color": "#0433ff",
-          "font_style": null,
-          "font_weight": null
+          "color": "#0433ff"
         },
         "text.literal": {
-          "color": "#6F42C1",
-          "font_style": null,
-          "font_weight": null
+          "color": "#6F42C1"
         },
         "title": {
-          "color": "#0433FF",
-          "font_style": null,
-          "font_weight": null
+          "color": "#0433FF"
         },
         "type": {
-          "color": "#6f42c1",
-          "font_style": null,
-          "font_weight": null
+          "color": "#6f42c1"
         },
         "property": {
-          "color": "#333333",
-          "font_style": null,
-          "font_weight": null
+          "color": "#333333"
         },
         "variable": {
-          "color": "#333333",
-          "font_style": null,
-          "font_weight": null
+          "color": "#333333"
         },
         "variable.special": {
-          "color": "#C5060B",
-          "font_style": null,
-          "font_weight": null
+          "color": "#C5060B"
         }
       }
     }
@@ -296,162 +227,95 @@
       "editor.line_number": "#8F8F8F",
       "editor.active_line_number": "#DDDDDD",
       "conflict": "#D2602D",
-      "conflict.background": null,
-      "conflict.border": null,
       "created": "#3f72e2",
       "created.background": "#0C4619",
-      "created.border": null,
-      "deleted": null,
       "deleted.background": "#46190C",
-      "deleted.border": null,
-      "error": null,
       "error.background": "#46190C",
       "error.border": "#802207",
       "hidden": "#9E9E9E",
-      "hidden.background": null,
-      "hidden.border": null,
       "hint": "#b283f8",
       "hint.background": "#250c4b",
       "hint.border": "#3f0891",
-      "ignored": null,
-      "ignored.background": null,
-      "ignored.border": null,
-      "info": null,
       "info.background": "#0C194D",
       "info.border": "#082190",
       "modified": "#B0A878",
       "modified.background": "#3A310E",
-      "modified.border": null,
       "predictive": "#5D5945",
-      "predictive.background": null,
-      "predictive.border": null,
-      "renamed": null,
-      "renamed.background": null,
-      "renamed.border": null,
-      "success": null,
       "success.background": "#0C4619",
-      "success.border": null,
-      "unreachable": null,
-      "unreachable.background": null,
-      "unreachable.border": null,
-      "warning": null,
       "warning.background": "#3A310E",
       "warning.border": "#7B6508",
       "syntax": {
         "attribute": {
-          "color": "#be9a52",
-          "font_style": null,
-          "font_weight": null
+          "color": "#be9a52"
         },
         "boolean": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "comment": {
-          "color": "#9E9E9E",
-          "font_style": null,
-          "font_weight": null
+          "color": "#9E9E9E"
         },
         "comment.doc": {
-          "color": "#9E9E9E",
-          "font_style": null,
-          "font_weight": null
+          "color": "#9E9E9E"
         },
         "constant": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "constructor": {
-          "color": "#b5af9a",
-          "font_style": null,
-          "font_weight": null
+          "color": "#b5af9a"
         },
         "embedded": {
-          "color": "#CACCCA",
-          "font_style": null,
-          "font_weight": null
+          "color": "#CACCCA"
         },
         "function": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "keyword": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         },
         "link_text": {
           "color": "#A86D3B",
-          "font_style": "normal",
-          "font_weight": null
+          "font_style": "normal"
         },
         "link_uri": {
           "color": "#6F6D66",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "number": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         },
         "string": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.escape": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.regex": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.special": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "string.special.symbol": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "tag": {
-          "color": "#b5af9a",
-          "font_style": null,
-          "font_weight": null
+          "color": "#b5af9a"
         },
         "text.literal": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "title": {
           "color": "#A76D3B",
-          "font_style": null,
           "font_weight": 600
         },
         "type": {
-          "color": "#A86D3B",
-          "font_style": null,
-          "font_weight": null
+          "color": "#A86D3B"
         },
         "property": {
-          "color": "#CACCCA",
-          "font_style": null,
-          "font_weight": null
+          "color": "#CACCCA"
         },
         "variable.special": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         }
       }
     }
diff --git a/themes/molokai.json b/themes/molokai.json
index 86e44563..4a8078c5 100644
--- a/themes/molokai.json
+++ b/themes/molokai.json
@@ -100,119 +100,79 @@
       "warning.border": "#ADADB0",
       "syntax": {
         "attribute": {
-          "color": "#e14775",
-          "font_style": null,
-          "font_weight": null
+          "color": "#e14775"
         },
         "boolean": {
-          "color": "#cc7a0a",
-          "font_style": null,
-          "font_weight": null
+          "color": "#cc7a0a"
         },
         "comment": {
           "color": "#767676",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "comment.doc": {
           "color": "#767676",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "constant": {
-          "color": "#7058be",
-          "font_style": null,
-          "font_weight": null
+          "color": "#7058be"
         },
         "constructor": {
-          "color": "#269D69",
-          "font_style": null,
-          "font_weight": null
+          "color": "#269D69"
         },
         "embedded": {
-          "color": "#1c8ca8",
-          "font_style": null,
-          "font_weight": null
+          "color": "#1c8ca8"
         },
         "function": {
-          "color": "#e14775",
-          "font_style": null,
-          "font_weight": null
+          "color": "#e14775"
         },
         "keyword": {
           "color": "#e14775",
-          "font_style": "normal",
-          "font_weight": null
+          "font_style": "normal"
         },
         "link_text": {
           "color": "#cc7a0a",
-          "font_style": "underline",
-          "font_weight": null
+          "font_style": "underline"
         },
         "link_uri": {
           "color": "#7058be",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "number": {
-          "color": "#cc7a0a",
-          "font_style": null,
-          "font_weight": null
+          "color": "#cc7a0a"
         },
         "string": {
-          "color": "#269D69",
-          "font_style": null,
-          "font_weight": null
+          "color": "#269D69"
         },
         "string.escape": {
-          "color": "#7058be",
-          "font_style": null,
-          "font_weight": null
+          "color": "#7058be"
         },
         "string.regex": {
-          "color": "#269D69",
-          "font_style": null,
-          "font_weight": null
+          "color": "#269D69"
         },
         "string.special": {
-          "color": "#e14775",
-          "font_style": null,
-          "font_weight": null
+          "color": "#e14775"
         },
         "string.special.symbol": {
-          "color": "#e14775",
-          "font_style": null,
-          "font_weight": null
+          "color": "#e14775"
         },
         "tag": {
-          "color": "#e14775",
-          "font_style": null,
-          "font_weight": null
+          "color": "#e14775"
         },
         "text.literal": {
-          "color": "#7058be",
-          "font_style": null,
-          "font_weight": null
+          "color": "#7058be"
         },
         "title": {
           "color": "#cc7a0a",
-          "font_style": null,
           "font_weight": 600
         },
         "type": {
-          "color": "#1c8ca8",
-          "font_style": null,
-          "font_weight": null
+          "color": "#1c8ca8"
         },
         "property": {
-          "color": "#7058be",
-          "font_style": null,
-          "font_weight": null
+          "color": "#7058be"
         },
         "variable.special": {
-          "color": "#e14775",
-          "font_style": null,
-          "font_weight": null
+          "color": "#e14775"
         }
       }
     }
@@ -272,162 +232,95 @@
       "editor.line_number": "#8F8F8F",
       "editor.active_line_number": "#DDDDDD",
       "conflict": "#D2602D",
-      "conflict.background": null,
-      "conflict.border": null,
       "created": "#3f72e2",
       "created.background": "#0C4619",
-      "created.border": null,
-      "deleted": null,
       "deleted.background": "#46190C",
-      "deleted.border": null,
-      "error": null,
       "error.background": "#46190C",
       "error.border": "#802207",
       "hidden": "#9E9E9E",
-      "hidden.background": null,
-      "hidden.border": null,
       "hint": "#b283f8",
       "hint.background": "#250c4b",
       "hint.border": "#3f0891",
-      "ignored": null,
-      "ignored.background": null,
-      "ignored.border": null,
-      "info": null,
       "info.background": "#0C194D",
       "info.border": "#082190",
       "modified": "#B0A878",
       "modified.background": "#3A310E",
-      "modified.border": null,
       "predictive": "#5D5945",
-      "predictive.background": null,
-      "predictive.border": null,
-      "renamed": null,
-      "renamed.background": null,
-      "renamed.border": null,
-      "success": null,
       "success.background": "#0C4619",
-      "success.border": null,
-      "unreachable": null,
-      "unreachable.background": null,
-      "unreachable.border": null,
-      "warning": null,
       "warning.background": "#3A310E",
       "warning.border": "#7B6508",
       "syntax": {
         "attribute": {
-          "color": "#be9a52",
-          "font_style": null,
-          "font_weight": null
+          "color": "#be9a52"
         },
         "boolean": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "comment": {
-          "color": "#9E9E9E",
-          "font_style": null,
-          "font_weight": null
+          "color": "#9E9E9E"
         },
         "comment.doc": {
-          "color": "#9E9E9E",
-          "font_style": null,
-          "font_weight": null
+          "color": "#9E9E9E"
         },
         "constant": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "constructor": {
-          "color": "#b5af9a",
-          "font_style": null,
-          "font_weight": null
+          "color": "#b5af9a"
         },
         "embedded": {
-          "color": "#CACCCA",
-          "font_style": null,
-          "font_weight": null
+          "color": "#CACCCA"
         },
         "function": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "keyword": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         },
         "link_text": {
           "color": "#A86D3B",
-          "font_style": "normal",
-          "font_weight": null
+          "font_style": "normal"
         },
         "link_uri": {
           "color": "#6F6D66",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "number": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         },
         "string": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.escape": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.regex": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.special": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "string.special.symbol": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "tag": {
-          "color": "#b5af9a",
-          "font_style": null,
-          "font_weight": null
+          "color": "#b5af9a"
         },
         "text.literal": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "title": {
           "color": "#A76D3B",
-          "font_style": null,
           "font_weight": 600
         },
         "type": {
-          "color": "#A86D3B",
-          "font_style": null,
-          "font_weight": null
+          "color": "#A86D3B"
         },
         "property": {
-          "color": "#CACCCA",
-          "font_style": null,
-          "font_weight": null
+          "color": "#CACCCA"
         },
         "variable.special": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         }
       }
     }
diff --git a/themes/solarized.json b/themes/solarized.json
index 32d2c7be..cd85a3ec 100644
--- a/themes/solarized.json
+++ b/themes/solarized.json
@@ -113,119 +113,78 @@
       "warning.border": "#657B83",
       "syntax": {
         "attribute": {
-          "color": "#B58900",
-          "font_style": null,
-          "font_weight": null
+          "color": "#B58900"
         },
         "boolean": {
-          "color": "#CB4B16",
-          "font_style": null,
-          "font_weight": null
+          "color": "#CB4B16"
         },
         "comment": {
           "color": "#93A1A1",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "comment.doc": {
           "color": "#93A1A1",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "constant": {
-          "color": "#268BD2",
-          "font_style": null,
-          "font_weight": null
+          "color": "#268BD2"
         },
         "constructor": {
-          "color": "#859900",
-          "font_style": null,
-          "font_weight": null
+          "color": "#859900"
         },
         "embedded": {
-          "color": "#2AA198",
-          "font_style": null,
-          "font_weight": null
+          "color": "#2AA198"
         },
         "function": {
-          "color": "#268BD2",
-          "font_style": null,
-          "font_weight": null
+          "color": "#268BD2"
         },
         "keyword": {
-          "color": "#DC322F",
-          "font_style": null,
-          "font_weight": null
+          "color": "#DC322F"
         },
         "link_text": {
           "color": "#268BD2",
-          "font_style": "underline",
-          "font_weight": null
+          "font_style": "underline"
         },
         "link_uri": {
           "color": "#2AA198",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "number": {
-          "color": "#D33682",
-          "font_style": null,
-          "font_weight": null
+          "color": "#D33682"
         },
         "string": {
-          "color": "#859900",
-          "font_style": null,
-          "font_weight": null
+          "color": "#859900"
         },
         "string.escape": {
-          "color": "#2AA198",
-          "font_style": null,
-          "font_weight": null
+          "color": "#2AA198"
         },
         "string.regex": {
-          "color": "#D33682",
-          "font_style": null,
-          "font_weight": null
+          "color": "#D33682"
         },
         "string.special": {
-          "color": "#B58900",
-          "font_style": null,
-          "font_weight": null
+          "color": "#B58900"
         },
         "string.special.symbol": {
-          "color": "#B58900",
-          "font_style": null,
-          "font_weight": null
+          "color": "#B58900"
         },
         "tag": {
-          "color": "#268BD2",
-          "font_style": null,
-          "font_weight": null
+          "color": "#268BD2"
         },
         "text.literal": {
-          "color": "#586E75",
-          "font_style": null,
-          "font_weight": null
+          "color": "#586E75"
         },
         "title": {
           "color": "#073642",
-          "font_style": null,
           "font_weight": 600
         },
         "type": {
-          "color": "#2AA198",
-          "font_style": null,
-          "font_weight": null
+          "color": "#2AA198"
         },
         "property": {
-          "color": "#586E75",
-          "font_style": null,
-          "font_weight": null
+          "color": "#586E75"
         },
         "variable.special": {
-          "color": "#DC322F",
-          "font_style": null,
-          "font_weight": null
+          "color": "#DC322F"
         }
       }
     }
@@ -295,162 +254,95 @@
       "editor.line_number": "#8F8F8F",
       "editor.active_line_number": "#DDDDDD",
       "conflict": "#D2602D",
-      "conflict.background": null,
-      "conflict.border": null,
       "created": "#3f72e2",
       "created.background": "#0C4619",
-      "created.border": null,
-      "deleted": null,
       "deleted.background": "#46190C",
-      "deleted.border": null,
-      "error": null,
       "error.background": "#46190C",
       "error.border": "#802207",
       "hidden": "#9E9E9E",
-      "hidden.background": null,
-      "hidden.border": null,
       "hint": "#b283f8",
       "hint.background": "#250c4b",
       "hint.border": "#3f0891",
-      "ignored": null,
-      "ignored.background": null,
-      "ignored.border": null,
-      "info": null,
       "info.background": "#0C194D",
       "info.border": "#082190",
       "modified": "#B0A878",
       "modified.background": "#3A310E",
-      "modified.border": null,
       "predictive": "#5D5945",
-      "predictive.background": null,
-      "predictive.border": null,
-      "renamed": null,
-      "renamed.background": null,
-      "renamed.border": null,
-      "success": null,
       "success.background": "#0C4619",
-      "success.border": null,
-      "unreachable": null,
-      "unreachable.background": null,
-      "unreachable.border": null,
-      "warning": null,
       "warning.background": "#3A310E",
       "warning.border": "#7B6508",
       "syntax": {
         "attribute": {
-          "color": "#be9a52",
-          "font_style": null,
-          "font_weight": null
+          "color": "#be9a52"
         },
         "boolean": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "comment": {
-          "color": "#9E9E9E",
-          "font_style": null,
-          "font_weight": null
+          "color": "#9E9E9E"
         },
         "comment.doc": {
-          "color": "#9E9E9E",
-          "font_style": null,
-          "font_weight": null
+          "color": "#9E9E9E"
         },
         "constant": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "constructor": {
-          "color": "#b5af9a",
-          "font_style": null,
-          "font_weight": null
+          "color": "#b5af9a"
         },
         "embedded": {
-          "color": "#CACCCA",
-          "font_style": null,
-          "font_weight": null
+          "color": "#CACCCA"
         },
         "function": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "keyword": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         },
         "link_text": {
           "color": "#A86D3B",
-          "font_style": "normal",
-          "font_weight": null
+          "font_style": "normal"
         },
         "link_uri": {
           "color": "#6F6D66",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "number": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         },
         "string": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.escape": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.regex": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.special": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "string.special.symbol": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "tag": {
-          "color": "#b5af9a",
-          "font_style": null,
-          "font_weight": null
+          "color": "#b5af9a"
         },
         "text.literal": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "title": {
           "color": "#A76D3B",
-          "font_style": null,
           "font_weight": 600
         },
         "type": {
-          "color": "#A86D3B",
-          "font_style": null,
-          "font_weight": null
+          "color": "#A86D3B"
         },
         "property": {
-          "color": "#CACCCA",
-          "font_style": null,
-          "font_weight": null
+          "color": "#CACCCA"
         },
         "variable.special": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         }
       }
     }
diff --git a/themes/spaceduck.json b/themes/spaceduck.json
index dde92b5c..16b34235 100644
--- a/themes/spaceduck.json
+++ b/themes/spaceduck.json
@@ -103,119 +103,78 @@
       "warning.border": "#f2ce00",
       "syntax": {
         "attribute": {
-          "color": "#f2ce00",
-          "font_style": null,
-          "font_weight": null
+          "color": "#f2ce00"
         },
         "boolean": {
-          "color": "#f2ce00",
-          "font_style": null,
-          "font_weight": null
+          "color": "#f2ce00"
         },
         "comment": {
           "color": "#4b6479",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "comment.doc": {
           "color": "#4b6479",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "constant": {
-          "color": "#e33400",
-          "font_style": null,
-          "font_weight": null
+          "color": "#e33400"
         },
         "constructor": {
-          "color": "#5ccc96",
-          "font_style": null,
-          "font_weight": null
+          "color": "#5ccc96"
         },
         "embedded": {
-          "color": "#ecf0c1",
-          "font_style": null,
-          "font_weight": null
+          "color": "#ecf0c1"
         },
         "function": {
-          "color": "#089CC5",
-          "font_style": null,
-          "font_weight": null
+          "color": "#089CC5"
         },
         "keyword": {
-          "color": "#C86D8C",
-          "font_style": null,
-          "font_weight": null
+          "color": "#C86D8C"
         },
         "link_text": {
           "color": "#089CC5",
-          "font_style": "underline",
-          "font_weight": null
+          "font_style": "underline"
         },
         "link_uri": {
           "color": "#089CC5",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "number": {
-          "color": "#f2ce00",
-          "font_style": null,
-          "font_weight": null
+          "color": "#f2ce00"
         },
         "string": {
-          "color": "#5ccc96",
-          "font_style": null,
-          "font_weight": null
+          "color": "#5ccc96"
         },
         "string.escape": {
-          "color": "#5ccc96",
-          "font_style": null,
-          "font_weight": null
+          "color": "#5ccc96"
         },
         "string.regex": {
-          "color": "#5ccc96",
-          "font_style": null,
-          "font_weight": null
+          "color": "#5ccc96"
         },
         "string.special": {
-          "color": "#f2ce00",
-          "font_style": null,
-          "font_weight": null
+          "color": "#f2ce00"
         },
         "string.special.symbol": {
-          "color": "#f2ce00",
-          "font_style": null,
-          "font_weight": null
+          "color": "#f2ce00"
         },
         "tag": {
-          "color": "#C86D8C",
-          "font_style": null,
-          "font_weight": null
+          "color": "#C86D8C"
         },
         "text.literal": {
-          "color": "#ecf0c1",
-          "font_style": null,
-          "font_weight": null
+          "color": "#ecf0c1"
         },
         "title": {
           "color": "#f2ce00",
-          "font_style": null,
           "font_weight": 600
         },
         "type": {
-          "color": "#089CC5",
-          "font_style": null,
-          "font_weight": null
+          "color": "#089CC5"
         },
         "property": {
-          "color": "#ecf0c1",
-          "font_style": null,
-          "font_weight": null
+          "color": "#ecf0c1"
         },
         "variable.special": {
-          "color": "#C86D8C",
-          "font_style": null,
-          "font_weight": null
+          "color": "#C86D8C"
         }
       }
     }
diff --git a/themes/tokyonight.json b/themes/tokyonight.json
index 4df1548a..fdbbcba3 100644
--- a/themes/tokyonight.json
+++ b/themes/tokyonight.json
@@ -104,119 +104,78 @@
       "warning.border": "#7aa2f7",
       "syntax": {
         "attribute": {
-          "color": "#e0af68",
-          "font_style": null,
-          "font_weight": null
+          "color": "#e0af68"
         },
         "boolean": {
-          "color": "#9ece6a",
-          "font_style": null,
-          "font_weight": null
+          "color": "#9ece6a"
         },
         "comment": {
           "color": "#565f89",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "comment.doc": {
           "color": "#565f89",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "constant": {
-          "color": "#7aa2f7",
-          "font_style": null,
-          "font_weight": null
+          "color": "#7aa2f7"
         },
         "constructor": {
-          "color": "#e0af68",
-          "font_style": null,
-          "font_weight": null
+          "color": "#e0af68"
         },
         "embedded": {
-          "color": "#c0caf5",
-          "font_style": null,
-          "font_weight": null
+          "color": "#c0caf5"
         },
         "function": {
-          "color": "#7aa2f7",
-          "font_style": null,
-          "font_weight": null
+          "color": "#7aa2f7"
         },
         "keyword": {
-          "color": "#f7768e",
-          "font_style": null,
-          "font_weight": null
+          "color": "#f7768e"
         },
         "link_text": {
           "color": "#7dcfff",
-          "font_style": "underline",
-          "font_weight": null
+          "font_style": "underline"
         },
         "link_uri": {
           "color": "#7aa2f7",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "number": {
-          "color": "#e0af68",
-          "font_style": null,
-          "font_weight": null
+          "color": "#e0af68"
         },
         "string": {
-          "color": "#9ece6a",
-          "font_style": null,
-          "font_weight": null
+          "color": "#9ece6a"
         },
         "string.escape": {
-          "color": "#7dcfff",
-          "font_style": null,
-          "font_weight": null
+          "color": "#7dcfff"
         },
         "string.regex": {
-          "color": "#9ece6a",
-          "font_style": null,
-          "font_weight": null
+          "color": "#9ece6a"
         },
         "string.special": {
-          "color": "#e0af68",
-          "font_style": null,
-          "font_weight": null
+          "color": "#e0af68"
         },
         "string.special.symbol": {
-          "color": "#e0af68",
-          "font_style": null,
-          "font_weight": null
+          "color": "#e0af68"
         },
         "tag": {
-          "color": "#f7768e",
-          "font_style": null,
-          "font_weight": null
+          "color": "#f7768e"
         },
         "text.literal": {
-          "color": "#c0caf5",
-          "font_style": null,
-          "font_weight": null
+          "color": "#c0caf5"
         },
         "title": {
           "color": "#7aa2f7",
-          "font_style": null,
           "font_weight": 600
         },
         "type": {
-          "color": "#7dcfff",
-          "font_style": null,
-          "font_weight": null
+          "color": "#7dcfff"
         },
         "property": {
-          "color": "#c0caf5",
-          "font_style": null,
-          "font_weight": null
+          "color": "#c0caf5"
         },
         "variable.special": {
-          "color": "#f7768e",
-          "font_style": null,
-          "font_weight": null
+          "color": "#f7768e"
         }
       }
     }
@@ -282,162 +241,95 @@
       "editor.line_number": "#363C58",
       "editor.active_line_number": "#B0B9E2",
       "conflict": "#D2602D",
-      "conflict.background": null,
-      "conflict.border": null,
       "created": "#3f72e2",
       "created.background": "#0C4619",
-      "created.border": null,
-      "deleted": null,
       "deleted.background": "#46190C",
-      "deleted.border": null,
-      "error": null,
       "error.background": "#46190C",
       "error.border": "#802207",
       "hidden": "#9E9E9E",
-      "hidden.background": null,
-      "hidden.border": null,
       "hint": "#b283f8",
       "hint.background": "#250c4b",
       "hint.border": "#3f0891",
-      "ignored": null,
-      "ignored.background": null,
-      "ignored.border": null,
-      "info": null,
       "info.background": "#0C194D",
       "info.border": "#082190",
       "modified": "#B0A878",
       "modified.background": "#3A310E",
-      "modified.border": null,
       "predictive": "#5D5945",
-      "predictive.background": null,
-      "predictive.border": null,
-      "renamed": null,
-      "renamed.background": null,
-      "renamed.border": null,
-      "success": null,
       "success.background": "#0C4619",
-      "success.border": null,
-      "unreachable": null,
-      "unreachable.background": null,
-      "unreachable.border": null,
-      "warning": null,
       "warning.background": "#3A310E",
       "warning.border": "#7B6508",
       "syntax": {
         "attribute": {
-          "color": "#be9a52",
-          "font_style": null,
-          "font_weight": null
+          "color": "#be9a52"
         },
         "boolean": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "comment": {
-          "color": "#9E9E9E",
-          "font_style": null,
-          "font_weight": null
+          "color": "#9E9E9E"
         },
         "comment.doc": {
-          "color": "#9E9E9E",
-          "font_style": null,
-          "font_weight": null
+          "color": "#9E9E9E"
         },
         "constant": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "constructor": {
-          "color": "#b5af9a",
-          "font_style": null,
-          "font_weight": null
+          "color": "#b5af9a"
         },
         "embedded": {
-          "color": "#CACCCA",
-          "font_style": null,
-          "font_weight": null
+          "color": "#CACCCA"
         },
         "function": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "keyword": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         },
         "link_text": {
           "color": "#A86D3B",
-          "font_style": "normal",
-          "font_weight": null
+          "font_style": "normal"
         },
         "link_uri": {
           "color": "#6F6D66",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "number": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         },
         "string": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.escape": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.regex": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.special": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "string.special.symbol": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "tag": {
-          "color": "#b5af9a",
-          "font_style": null,
-          "font_weight": null
+          "color": "#b5af9a"
         },
         "text.literal": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "title": {
           "color": "#A76D3B",
-          "font_style": null,
           "font_weight": 600
         },
         "type": {
-          "color": "#A86D3B",
-          "font_style": null,
-          "font_weight": null
+          "color": "#A86D3B"
         },
         "property": {
-          "color": "#CACCCA",
-          "font_style": null,
-          "font_weight": null
+          "color": "#CACCCA"
         },
         "variable.special": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         }
       }
     }
@@ -548,119 +440,78 @@
       "warning.border": "#82aaff",
       "syntax": {
         "attribute": {
-          "color": "#ffc777",
-          "font_style": null,
-          "font_weight": null
+          "color": "#ffc777"
         },
         "boolean": {
-          "color": "#c3e88d",
-          "font_style": null,
-          "font_weight": null
+          "color": "#c3e88d"
         },
         "comment": {
           "color": "#6e738d",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "comment.doc": {
           "color": "#6e738d",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "constant": {
-          "color": "#82aaff",
-          "font_style": null,
-          "font_weight": null
+          "color": "#82aaff"
         },
         "constructor": {
-          "color": "#ffc777",
-          "font_style": null,
-          "font_weight": null
+          "color": "#ffc777"
         },
         "embedded": {
-          "color": "#c0caf5",
-          "font_style": null,
-          "font_weight": null
+          "color": "#c0caf5"
         },
         "function": {
-          "color": "#82aaff",
-          "font_style": null,
-          "font_weight": null
+          "color": "#82aaff"
         },
         "keyword": {
-          "color": "#ed8796",
-          "font_style": null,
-          "font_weight": null
+          "color": "#ed8796"
         },
         "link_text": {
           "color": "#86e1fc",
-          "font_style": "underline",
-          "font_weight": null
+          "font_style": "underline"
         },
         "link_uri": {
           "color": "#82aaff",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "number": {
-          "color": "#ffc777",
-          "font_style": null,
-          "font_weight": null
+          "color": "#ffc777"
         },
         "string": {
-          "color": "#c3e88d",
-          "font_style": null,
-          "font_weight": null
+          "color": "#c3e88d"
         },
         "string.escape": {
-          "color": "#86e1fc",
-          "font_style": null,
-          "font_weight": null
+          "color": "#86e1fc"
         },
         "string.regex": {
-          "color": "#c3e88d",
-          "font_style": null,
-          "font_weight": null
+          "color": "#c3e88d"
         },
         "string.special": {
-          "color": "#ffc777",
-          "font_style": null,
-          "font_weight": null
+          "color": "#ffc777"
         },
         "string.special.symbol": {
-          "color": "#ffc777",
-          "font_style": null,
-          "font_weight": null
+          "color": "#ffc777"
         },
         "tag": {
-          "color": "#ed8796",
-          "font_style": null,
-          "font_weight": null
+          "color": "#ed8796"
         },
         "text.literal": {
-          "color": "#c0caf5",
-          "font_style": null,
-          "font_weight": null
+          "color": "#c0caf5"
         },
         "title": {
           "color": "#82aaff",
-          "font_style": null,
           "font_weight": 600
         },
         "type": {
-          "color": "#86e1fc",
-          "font_style": null,
-          "font_weight": null
+          "color": "#86e1fc"
         },
         "property": {
-          "color": "#c0caf5",
-          "font_style": null,
-          "font_weight": null
+          "color": "#c0caf5"
         },
         "variable.special": {
-          "color": "#ed8796",
-          "font_style": null,
-          "font_weight": null
+          "color": "#ed8796"
         }
       }
     }
diff --git a/themes/twilight.json b/themes/twilight.json
index 9474ffeb..34ef36ff 100644
--- a/themes/twilight.json
+++ b/themes/twilight.json
@@ -65,162 +65,95 @@
       "editor.line_number": "#8F8F8F",
       "editor.active_line_number": "#DDDDDD",
       "conflict": "#D2602D",
-      "conflict.background": null,
-      "conflict.border": null,
       "created": "#3f72e2",
       "created.background": "#0C4619",
-      "created.border": null,
-      "deleted": null,
       "deleted.background": "#46190C",
-      "deleted.border": null,
-      "error": null,
       "error.background": "#46190C",
       "error.border": "#802207",
       "hidden": "#9E9E9E",
-      "hidden.background": null,
-      "hidden.border": null,
       "hint": "#b283f8",
       "hint.background": "#250c4b",
       "hint.border": "#3f0891",
-      "ignored": null,
-      "ignored.background": null,
-      "ignored.border": null,
-      "info": null,
       "info.background": "#0C194D",
       "info.border": "#082190",
       "modified": "#B0A878",
       "modified.background": "#3A310E",
-      "modified.border": null,
       "predictive": "#5D5945",
-      "predictive.background": null,
-      "predictive.border": null,
-      "renamed": null,
-      "renamed.background": null,
-      "renamed.border": null,
-      "success": null,
       "success.background": "#0C4619",
-      "success.border": null,
-      "unreachable": null,
-      "unreachable.background": null,
-      "unreachable.border": null,
-      "warning": null,
       "warning.background": "#3A310E",
       "warning.border": "#7B6508",
       "syntax": {
         "attribute": {
-          "color": "#be9a52",
-          "font_style": null,
-          "font_weight": null
+          "color": "#be9a52"
         },
         "boolean": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "comment": {
-          "color": "#9E9E9E",
-          "font_style": null,
-          "font_weight": null
+          "color": "#9E9E9E"
         },
         "comment.doc": {
-          "color": "#9E9E9E",
-          "font_style": null,
-          "font_weight": null
+          "color": "#9E9E9E"
         },
         "constant": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "constructor": {
-          "color": "#b5af9a",
-          "font_style": null,
-          "font_weight": null
+          "color": "#b5af9a"
         },
         "embedded": {
-          "color": "#CACCCA",
-          "font_style": null,
-          "font_weight": null
+          "color": "#CACCCA"
         },
         "function": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "keyword": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         },
         "link_text": {
           "color": "#A86D3B",
-          "font_style": "normal",
-          "font_weight": null
+          "font_style": "normal"
         },
         "link_uri": {
           "color": "#6F6D66",
-          "font_style": "italic",
-          "font_weight": null
+          "font_style": "italic"
         },
         "number": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         },
         "string": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.escape": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.regex": {
-          "color": "#76BA53",
-          "font_style": null,
-          "font_weight": null
+          "color": "#76BA53"
         },
         "string.special": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "string.special.symbol": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "tag": {
-          "color": "#b5af9a",
-          "font_style": null,
-          "font_weight": null
+          "color": "#b5af9a"
         },
         "text.literal": {
-          "color": "#E1D797",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E1D797"
         },
         "title": {
           "color": "#A76D3B",
-          "font_style": null,
           "font_weight": 600
         },
         "type": {
-          "color": "#A86D3B",
-          "font_style": null,
-          "font_weight": null
+          "color": "#A86D3B"
         },
         "property": {
-          "color": "#CACCCA",
-          "font_style": null,
-          "font_weight": null
+          "color": "#CACCCA"
         },
         "variable.special": {
-          "color": "#E19773",
-          "font_style": null,
-          "font_weight": null
+          "color": "#E19773"
         }
       }
     }