diff --git a/themes/base16-3024-dark.json b/themes/base16-3024-dark.json
index 37d1029..bbd8175 100644
--- a/themes/base16-3024-dark.json
+++ b/themes/base16-3024-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#a16a94"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#a16a94"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#e8bbd0"
diff --git a/themes/base16-3024-light.json b/themes/base16-3024-light.json
index ed47dcf..a7491e6 100644
--- a/themes/base16-3024-light.json
+++ b/themes/base16-3024-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#a16a94"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#a16a94"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#e8bbd0"
diff --git a/themes/base16-apathy-dark.json b/themes/base16-apathy-dark.json
index bbeabfd..4af0fe6 100644
--- a/themes/base16-apathy-dark.json
+++ b/themes/base16-apathy-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#4C963E"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#4C963E"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#3E7996"
diff --git a/themes/base16-apathy-light.json b/themes/base16-apathy-light.json
index b08bf7a..42ef486 100644
--- a/themes/base16-apathy-light.json
+++ b/themes/base16-apathy-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#4C963E"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#4C963E"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#3E7996"
diff --git a/themes/base16-apprentice-dark.json b/themes/base16-apprentice-dark.json
index 7fbdf12..2762f32 100644
--- a/themes/base16-apprentice-dark.json
+++ b/themes/base16-apprentice-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#87AFD7"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#87AFD7"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#FF8700"
diff --git a/themes/base16-apprentice-light.json b/themes/base16-apprentice-light.json
index 6e99791..187044e 100644
--- a/themes/base16-apprentice-light.json
+++ b/themes/base16-apprentice-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#87AFD7"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#87AFD7"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#FF8700"
diff --git a/themes/base16-ashes-dark.json b/themes/base16-ashes-dark.json
index 7c7114a..f1e7dd5 100644
--- a/themes/base16-ashes-dark.json
+++ b/themes/base16-ashes-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#C795AE"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#C795AE"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#C7C795"
diff --git a/themes/base16-ashes-light.json b/themes/base16-ashes-light.json
index 76b64fa..6ae680a 100644
--- a/themes/base16-ashes-light.json
+++ b/themes/base16-ashes-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#C795AE"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#C795AE"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#C7C795"
diff --git a/themes/base16-atelier-cave-dark.json b/themes/base16-atelier-cave-dark.json
index 6fc07a9..d674247 100644
--- a/themes/base16-atelier-cave-dark.json
+++ b/themes/base16-atelier-cave-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#955ae7"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#955ae7"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#aa573c"
diff --git a/themes/base16-atelier-cave-light.json b/themes/base16-atelier-cave-light.json
index e920819..d21fe36 100644
--- a/themes/base16-atelier-cave-light.json
+++ b/themes/base16-atelier-cave-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#955ae7"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#955ae7"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#aa573c"
diff --git a/themes/base16-atelier-dune-dark.json b/themes/base16-atelier-dune-dark.json
index 024b7d8..692aa0f 100644
--- a/themes/base16-atelier-dune-dark.json
+++ b/themes/base16-atelier-dune-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#b854d4"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#b854d4"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#b65611"
diff --git a/themes/base16-atelier-dune-light.json b/themes/base16-atelier-dune-light.json
index ac55a79..82deaf8 100644
--- a/themes/base16-atelier-dune-light.json
+++ b/themes/base16-atelier-dune-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#b854d4"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#b854d4"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#b65611"
diff --git a/themes/base16-atelier-estuary-dark.json b/themes/base16-atelier-estuary-dark.json
index cbba4a4..2ddf61c 100644
--- a/themes/base16-atelier-estuary-dark.json
+++ b/themes/base16-atelier-estuary-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#5f9182"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#5f9182"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ae7313"
diff --git a/themes/base16-atelier-estuary-light.json b/themes/base16-atelier-estuary-light.json
index d4840f6..43d1a4f 100644
--- a/themes/base16-atelier-estuary-light.json
+++ b/themes/base16-atelier-estuary-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#5f9182"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#5f9182"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ae7313"
diff --git a/themes/base16-atelier-forest-dark.json b/themes/base16-atelier-forest-dark.json
index 3a4a799..5e0a804 100644
--- a/themes/base16-atelier-forest-dark.json
+++ b/themes/base16-atelier-forest-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#6666ea"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#6666ea"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#df5320"
diff --git a/themes/base16-atelier-forest-light.json b/themes/base16-atelier-forest-light.json
index 1adc760..54addb8 100644
--- a/themes/base16-atelier-forest-light.json
+++ b/themes/base16-atelier-forest-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#6666ea"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#6666ea"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#df5320"
diff --git a/themes/base16-atelier-heath-dark.json b/themes/base16-atelier-heath-dark.json
index b823808..3ab2d84 100644
--- a/themes/base16-atelier-heath-dark.json
+++ b/themes/base16-atelier-heath-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#7b59c0"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#7b59c0"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#a65926"
diff --git a/themes/base16-atelier-heath-light.json b/themes/base16-atelier-heath-light.json
index 878a130..30ac5de 100644
--- a/themes/base16-atelier-heath-light.json
+++ b/themes/base16-atelier-heath-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#7b59c0"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#7b59c0"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#a65926"
diff --git a/themes/base16-atelier-lakeside-dark.json b/themes/base16-atelier-lakeside-dark.json
index 666ec85..4c828e2 100644
--- a/themes/base16-atelier-lakeside-dark.json
+++ b/themes/base16-atelier-lakeside-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#6b6bb8"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#6b6bb8"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#935c25"
diff --git a/themes/base16-atelier-lakeside-light.json b/themes/base16-atelier-lakeside-light.json
index 1f569c6..cb16c3e 100644
--- a/themes/base16-atelier-lakeside-light.json
+++ b/themes/base16-atelier-lakeside-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#6b6bb8"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#6b6bb8"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#935c25"
diff --git a/themes/base16-atelier-plateau-dark.json b/themes/base16-atelier-plateau-dark.json
index 9be8316..46f2295 100644
--- a/themes/base16-atelier-plateau-dark.json
+++ b/themes/base16-atelier-plateau-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#8464c4"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#8464c4"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#b45a3c"
diff --git a/themes/base16-atelier-plateau-light.json b/themes/base16-atelier-plateau-light.json
index a13b295..c5df859 100644
--- a/themes/base16-atelier-plateau-light.json
+++ b/themes/base16-atelier-plateau-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#8464c4"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#8464c4"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#b45a3c"
diff --git a/themes/base16-atelier-savanna-dark.json b/themes/base16-atelier-savanna-dark.json
index 345dea5..4bb50c7 100644
--- a/themes/base16-atelier-savanna-dark.json
+++ b/themes/base16-atelier-savanna-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#55859b"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#55859b"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#9f713c"
diff --git a/themes/base16-atelier-savanna-light.json b/themes/base16-atelier-savanna-light.json
index dd9986b..6fc820d 100644
--- a/themes/base16-atelier-savanna-light.json
+++ b/themes/base16-atelier-savanna-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#55859b"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#55859b"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#9f713c"
diff --git a/themes/base16-atelier-seaside-dark.json b/themes/base16-atelier-seaside-dark.json
index cc7c87a..37ba13a 100644
--- a/themes/base16-atelier-seaside-dark.json
+++ b/themes/base16-atelier-seaside-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#ad2bee"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#ad2bee"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#87711d"
diff --git a/themes/base16-atelier-seaside-light.json b/themes/base16-atelier-seaside-light.json
index 94491e6..142afc0 100644
--- a/themes/base16-atelier-seaside-light.json
+++ b/themes/base16-atelier-seaside-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#ad2bee"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#ad2bee"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#87711d"
diff --git a/themes/base16-atelier-sulphurpool-dark.json b/themes/base16-atelier-sulphurpool-dark.json
index 55946ed..7abf839 100644
--- a/themes/base16-atelier-sulphurpool-dark.json
+++ b/themes/base16-atelier-sulphurpool-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#6679cc"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#6679cc"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#c76b29"
diff --git a/themes/base16-atelier-sulphurpool-light.json b/themes/base16-atelier-sulphurpool-light.json
index f49f851..cd60884 100644
--- a/themes/base16-atelier-sulphurpool-light.json
+++ b/themes/base16-atelier-sulphurpool-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#6679cc"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#6679cc"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#c76b29"
diff --git a/themes/base16-atlas-dark.json b/themes/base16-atlas-dark.json
index 105e163..a3d6d6c 100644
--- a/themes/base16-atlas-dark.json
+++ b/themes/base16-atlas-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#9a70a4"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#9a70a4"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#f08e48"
diff --git a/themes/base16-atlas-light.json b/themes/base16-atlas-light.json
index b1aca4f..700f38e 100644
--- a/themes/base16-atlas-light.json
+++ b/themes/base16-atlas-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#9a70a4"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#9a70a4"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#f08e48"
diff --git a/themes/base16-ayu-dark.json b/themes/base16-ayu-dark.json
index 739041b..0a70c8e 100644
--- a/themes/base16-ayu-dark.json
+++ b/themes/base16-ayu-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#D2A6FF"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#D2A6FF"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#FF8F40"
diff --git a/themes/base16-ayu-light.json b/themes/base16-ayu-light.json
index d66acb6..4b92e50 100644
--- a/themes/base16-ayu-light.json
+++ b/themes/base16-ayu-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#A37ACC"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#A37ACC"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#FA8D3E"
diff --git a/themes/base16-ayu-mirage-dark.json b/themes/base16-ayu-mirage-dark.json
index ad4dda2..37fbeb6 100644
--- a/themes/base16-ayu-mirage-dark.json
+++ b/themes/base16-ayu-mirage-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#D4BFFF"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#D4BFFF"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#FFAD66"
diff --git a/themes/base16-ayu-mirage-light.json b/themes/base16-ayu-mirage-light.json
index 4cf533a..c75c63c 100644
--- a/themes/base16-ayu-mirage-light.json
+++ b/themes/base16-ayu-mirage-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#D4BFFF"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#D4BFFF"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#FFAD66"
diff --git a/themes/base16-bespin-dark.json b/themes/base16-bespin-dark.json
index a5893b8..8928916 100644
--- a/themes/base16-bespin-dark.json
+++ b/themes/base16-bespin-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#9b859d"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#9b859d"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#cf7d34"
diff --git a/themes/base16-bespin-light.json b/themes/base16-bespin-light.json
index f825b8d..eef5e8a 100644
--- a/themes/base16-bespin-light.json
+++ b/themes/base16-bespin-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#9b859d"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#9b859d"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#cf7d34"
diff --git a/themes/base16-black-metal-(bathory)-dark.json b/themes/base16-black-metal-(bathory)-dark.json
index fa3a90a..679bb65 100644
--- a/themes/base16-black-metal-(bathory)-dark.json
+++ b/themes/base16-black-metal-(bathory)-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#999999"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#999999"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#aaaaaa"
diff --git a/themes/base16-black-metal-(bathory)-light.json b/themes/base16-black-metal-(bathory)-light.json
index c2ef1c8..abf6d40 100644
--- a/themes/base16-black-metal-(bathory)-light.json
+++ b/themes/base16-black-metal-(bathory)-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#999999"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#999999"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#aaaaaa"
diff --git a/themes/base16-black-metal-(burzum)-dark.json b/themes/base16-black-metal-(burzum)-dark.json
index cce3c3d..4aab93d 100644
--- a/themes/base16-black-metal-(burzum)-dark.json
+++ b/themes/base16-black-metal-(burzum)-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#999999"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#999999"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#aaaaaa"
diff --git a/themes/base16-black-metal-(burzum)-light.json b/themes/base16-black-metal-(burzum)-light.json
index 7d03dd6..7c9a0ae 100644
--- a/themes/base16-black-metal-(burzum)-light.json
+++ b/themes/base16-black-metal-(burzum)-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#999999"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#999999"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#aaaaaa"
diff --git a/themes/base16-black-metal-(dark-funeral)-light.json b/themes/base16-black-metal-(dark-funeral)-light.json
index 57e3462..3b1be6e 100644
--- a/themes/base16-black-metal-(dark-funeral)-light.json
+++ b/themes/base16-black-metal-(dark-funeral)-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#999999"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#999999"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#aaaaaa"
diff --git a/themes/base16-black-metal-(dark-funeral).json b/themes/base16-black-metal-(dark-funeral).json
index f5a38ee..15d470f 100644
--- a/themes/base16-black-metal-(dark-funeral).json
+++ b/themes/base16-black-metal-(dark-funeral).json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#999999"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#999999"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#aaaaaa"
diff --git a/themes/base16-black-metal-(gorgoroth)-dark.json b/themes/base16-black-metal-(gorgoroth)-dark.json
index d9d7733..b8d3a5d 100644
--- a/themes/base16-black-metal-(gorgoroth)-dark.json
+++ b/themes/base16-black-metal-(gorgoroth)-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#999999"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#999999"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#aaaaaa"
diff --git a/themes/base16-black-metal-(gorgoroth)-light.json b/themes/base16-black-metal-(gorgoroth)-light.json
index 9ad3988..5dfd8d9 100644
--- a/themes/base16-black-metal-(gorgoroth)-light.json
+++ b/themes/base16-black-metal-(gorgoroth)-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#999999"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#999999"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#aaaaaa"
diff --git a/themes/base16-black-metal-(immortal)-dark.json b/themes/base16-black-metal-(immortal)-dark.json
index 95ed581..73532b0 100644
--- a/themes/base16-black-metal-(immortal)-dark.json
+++ b/themes/base16-black-metal-(immortal)-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#999999"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#999999"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#aaaaaa"
diff --git a/themes/base16-black-metal-(immortal)-light.json b/themes/base16-black-metal-(immortal)-light.json
index 91ee81f..5767fcd 100644
--- a/themes/base16-black-metal-(immortal)-light.json
+++ b/themes/base16-black-metal-(immortal)-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#999999"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#999999"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#aaaaaa"
diff --git a/themes/base16-black-metal-(khold)-dark.json b/themes/base16-black-metal-(khold)-dark.json
index c707415..a98eb73 100644
--- a/themes/base16-black-metal-(khold)-dark.json
+++ b/themes/base16-black-metal-(khold)-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#999999"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#999999"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#aaaaaa"
diff --git a/themes/base16-black-metal-(khold)-light.json b/themes/base16-black-metal-(khold)-light.json
index fd8ac1b..9f8ca39 100644
--- a/themes/base16-black-metal-(khold)-light.json
+++ b/themes/base16-black-metal-(khold)-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#999999"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#999999"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#aaaaaa"
diff --git a/themes/base16-black-metal-(marduk)-dark.json b/themes/base16-black-metal-(marduk)-dark.json
index f3053b4..d11f147 100644
--- a/themes/base16-black-metal-(marduk)-dark.json
+++ b/themes/base16-black-metal-(marduk)-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#999999"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#999999"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#aaaaaa"
diff --git a/themes/base16-black-metal-(marduk)-light.json b/themes/base16-black-metal-(marduk)-light.json
index 091803c..bc64a69 100644
--- a/themes/base16-black-metal-(marduk)-light.json
+++ b/themes/base16-black-metal-(marduk)-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#999999"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#999999"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#aaaaaa"
diff --git a/themes/base16-black-metal-(mayhem)-dark.json b/themes/base16-black-metal-(mayhem)-dark.json
index 7019e38..2b6cf54 100644
--- a/themes/base16-black-metal-(mayhem)-dark.json
+++ b/themes/base16-black-metal-(mayhem)-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#999999"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#999999"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#aaaaaa"
diff --git a/themes/base16-black-metal-(mayhem)-light.json b/themes/base16-black-metal-(mayhem)-light.json
index 8758036..c2944dd 100644
--- a/themes/base16-black-metal-(mayhem)-light.json
+++ b/themes/base16-black-metal-(mayhem)-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#999999"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#999999"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#aaaaaa"
diff --git a/themes/base16-black-metal-(nile)-dark.json b/themes/base16-black-metal-(nile)-dark.json
index 7b75492..8e69521 100644
--- a/themes/base16-black-metal-(nile)-dark.json
+++ b/themes/base16-black-metal-(nile)-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#999999"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#999999"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#aaaaaa"
diff --git a/themes/base16-black-metal-(nile)-light.json b/themes/base16-black-metal-(nile)-light.json
index eee1689..6e33578 100644
--- a/themes/base16-black-metal-(nile)-light.json
+++ b/themes/base16-black-metal-(nile)-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#999999"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#999999"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#aaaaaa"
diff --git a/themes/base16-black-metal-(venom)-dark.json b/themes/base16-black-metal-(venom)-dark.json
index 6eb9d2f..ff75f20 100644
--- a/themes/base16-black-metal-(venom)-dark.json
+++ b/themes/base16-black-metal-(venom)-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#999999"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#999999"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#aaaaaa"
diff --git a/themes/base16-black-metal-(venom)-light.json b/themes/base16-black-metal-(venom)-light.json
index 5d75d8a..87a2a1d 100644
--- a/themes/base16-black-metal-(venom)-light.json
+++ b/themes/base16-black-metal-(venom)-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#999999"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#999999"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#aaaaaa"
diff --git a/themes/base16-black-metal-dark.json b/themes/base16-black-metal-dark.json
index f5313b2..0fae75d 100644
--- a/themes/base16-black-metal-dark.json
+++ b/themes/base16-black-metal-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#999999"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#999999"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#aaaaaa"
diff --git a/themes/base16-black-metal-light.json b/themes/base16-black-metal-light.json
index f282b37..fa54579 100644
--- a/themes/base16-black-metal-light.json
+++ b/themes/base16-black-metal-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#999999"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#999999"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#aaaaaa"
diff --git a/themes/base16-blue-forest.json b/themes/base16-blue-forest.json
index 6ca95ac..b8485ca 100644
--- a/themes/base16-blue-forest.json
+++ b/themes/base16-blue-forest.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#0099FF"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#0099FF"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#FF8080"
diff --git a/themes/base16-blueish-dark.json b/themes/base16-blueish-dark.json
index 21ebef1..dbe8224 100644
--- a/themes/base16-blueish-dark.json
+++ b/themes/base16-blueish-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#FF84DD"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#FF84DD"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#F6A85C"
diff --git a/themes/base16-blueish-light.json b/themes/base16-blueish-light.json
index e5e3eae..dcee09e 100644
--- a/themes/base16-blueish-light.json
+++ b/themes/base16-blueish-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#FF84DD"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#FF84DD"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#F6A85C"
diff --git a/themes/base16-brewer-dark.json b/themes/base16-brewer-dark.json
index 206d538..4af78d9 100644
--- a/themes/base16-brewer-dark.json
+++ b/themes/base16-brewer-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#756bb1"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#756bb1"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#e6550d"
diff --git a/themes/base16-brewer-light.json b/themes/base16-brewer-light.json
index 0b578df..0228c4b 100644
--- a/themes/base16-brewer-light.json
+++ b/themes/base16-brewer-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#756bb1"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#756bb1"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#e6550d"
diff --git a/themes/base16-bright-dark.json b/themes/base16-bright-dark.json
index 35b4ee3..8dc79ef 100644
--- a/themes/base16-bright-dark.json
+++ b/themes/base16-bright-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#d381c3"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#d381c3"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#fc6d24"
diff --git a/themes/base16-bright-light.json b/themes/base16-bright-light.json
index e48c58a..ee5e3d9 100644
--- a/themes/base16-bright-light.json
+++ b/themes/base16-bright-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#d381c3"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#d381c3"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#fc6d24"
diff --git a/themes/base16-brogrammer-dark.json b/themes/base16-brogrammer-dark.json
index 1a8c37d..8a696f7 100644
--- a/themes/base16-brogrammer-dark.json
+++ b/themes/base16-brogrammer-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#0f7ddb"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#0f7ddb"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#de352e"
diff --git a/themes/base16-brogrammer-light.json b/themes/base16-brogrammer-light.json
index fbac9de..8318bdf 100644
--- a/themes/base16-brogrammer-light.json
+++ b/themes/base16-brogrammer-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#0f7ddb"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#0f7ddb"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#de352e"
diff --git a/themes/base16-brush-trees-dark.json b/themes/base16-brush-trees-dark.json
index 7dd4ee3..22406fb 100644
--- a/themes/base16-brush-trees-dark.json
+++ b/themes/base16-brush-trees-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#b386b2"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#b386b2"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#d8bba2"
diff --git a/themes/base16-brush-trees-light.json b/themes/base16-brush-trees-light.json
index dc881f7..3756ded 100644
--- a/themes/base16-brush-trees-light.json
+++ b/themes/base16-brush-trees-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#b386b2"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#b386b2"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#d8bba2"
diff --git a/themes/base16-catppuccin-dark.json b/themes/base16-catppuccin-dark.json
index afde7d7..1e06616 100644
--- a/themes/base16-catppuccin-dark.json
+++ b/themes/base16-catppuccin-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#DDB6F2"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#DDB6F2"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#F8BD96"
diff --git a/themes/base16-catppuccin-light.json b/themes/base16-catppuccin-light.json
index a6238d9..a27a420 100644
--- a/themes/base16-catppuccin-light.json
+++ b/themes/base16-catppuccin-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#DDB6F2"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#DDB6F2"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#F8BD96"
diff --git a/themes/base16-chalk-dark.json b/themes/base16-chalk-dark.json
index c837797..b62238e 100644
--- a/themes/base16-chalk-dark.json
+++ b/themes/base16-chalk-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#e1a3ee"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#e1a3ee"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#eda987"
diff --git a/themes/base16-chalk-light.json b/themes/base16-chalk-light.json
index ad36526..e86994c 100644
--- a/themes/base16-chalk-light.json
+++ b/themes/base16-chalk-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#e1a3ee"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#e1a3ee"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#eda987"
diff --git a/themes/base16-circus-dark.json b/themes/base16-circus-dark.json
index 6f36a5b..141f116 100644
--- a/themes/base16-circus-dark.json
+++ b/themes/base16-circus-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#b888e2"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#b888e2"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#4bb1a7"
diff --git a/themes/base16-circus-light.json b/themes/base16-circus-light.json
index 32f070d..ce1ae3c 100644
--- a/themes/base16-circus-light.json
+++ b/themes/base16-circus-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#b888e2"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#b888e2"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#4bb1a7"
diff --git a/themes/base16-classic-dark.json b/themes/base16-classic-dark.json
index c3ed983..47349f9 100644
--- a/themes/base16-classic-dark.json
+++ b/themes/base16-classic-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#AA759F"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#AA759F"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#D28445"
diff --git a/themes/base16-classic-light.json b/themes/base16-classic-light.json
index 2716e39..61d2910 100644
--- a/themes/base16-classic-light.json
+++ b/themes/base16-classic-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#AA759F"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#AA759F"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#D28445"
diff --git a/themes/base16-codeschool-dark.json b/themes/base16-codeschool-dark.json
index 6b64320..1c20cae 100644
--- a/themes/base16-codeschool-dark.json
+++ b/themes/base16-codeschool-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#c59820"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#c59820"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#43820d"
diff --git a/themes/base16-codeschool-light.json b/themes/base16-codeschool-light.json
index 44035d2..4d4aa5c 100644
--- a/themes/base16-codeschool-light.json
+++ b/themes/base16-codeschool-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#c59820"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#c59820"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#43820d"
diff --git a/themes/base16-colors-dark.json b/themes/base16-colors-dark.json
index 7564bb5..45b3ab6 100644
--- a/themes/base16-colors-dark.json
+++ b/themes/base16-colors-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#b10dc9"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#b10dc9"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ff851b"
diff --git a/themes/base16-colors-light.json b/themes/base16-colors-light.json
index ca80600..bf1b63c 100644
--- a/themes/base16-colors-light.json
+++ b/themes/base16-colors-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#b10dc9"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#b10dc9"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ff851b"
diff --git a/themes/base16-cupcake-dark.json b/themes/base16-cupcake-dark.json
index 30f6ecd..3e322b4 100644
--- a/themes/base16-cupcake-dark.json
+++ b/themes/base16-cupcake-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#BB99B4"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#BB99B4"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#EBB790"
diff --git a/themes/base16-cupcake-light.json b/themes/base16-cupcake-light.json
index 940645e..6ebfb8f 100644
--- a/themes/base16-cupcake-light.json
+++ b/themes/base16-cupcake-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#BB99B4"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#BB99B4"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#EBB790"
diff --git a/themes/base16-cupertino-dark.json b/themes/base16-cupertino-dark.json
index 5a040db..d5968dd 100644
--- a/themes/base16-cupertino-dark.json
+++ b/themes/base16-cupertino-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#a90d91"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#a90d91"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#eb8500"
diff --git a/themes/base16-cupertino-light.json b/themes/base16-cupertino-light.json
index f2a5b33..4de30df 100644
--- a/themes/base16-cupertino-light.json
+++ b/themes/base16-cupertino-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#a90d91"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#a90d91"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#eb8500"
diff --git a/themes/base16-da-one-black-dark.json b/themes/base16-da-one-black-dark.json
index 6c2dcdd..6b205b7 100644
--- a/themes/base16-da-one-black-dark.json
+++ b/themes/base16-da-one-black-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#e799ff"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#e799ff"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ffc387"
diff --git a/themes/base16-da-one-black-light.json b/themes/base16-da-one-black-light.json
index 16d05ae..d51cd21 100644
--- a/themes/base16-da-one-black-light.json
+++ b/themes/base16-da-one-black-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#e799ff"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#e799ff"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ffc387"
diff --git a/themes/base16-da-one-gray-dark.json b/themes/base16-da-one-gray-dark.json
index 535a24c..a3ad507 100644
--- a/themes/base16-da-one-gray-dark.json
+++ b/themes/base16-da-one-gray-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#e799ff"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#e799ff"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ffc387"
diff --git a/themes/base16-da-one-gray-light.json b/themes/base16-da-one-gray-light.json
index 040236d..647bb38 100644
--- a/themes/base16-da-one-gray-light.json
+++ b/themes/base16-da-one-gray-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#e799ff"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#e799ff"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ffc387"
diff --git a/themes/base16-da-one-ocean-dark.json b/themes/base16-da-one-ocean-dark.json
index 6f5bd44..da0f6d8 100644
--- a/themes/base16-da-one-ocean-dark.json
+++ b/themes/base16-da-one-ocean-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#e799ff"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#e799ff"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ffc387"
diff --git a/themes/base16-da-one-ocean-light.json b/themes/base16-da-one-ocean-light.json
index fbcf599..5e5e250 100644
--- a/themes/base16-da-one-ocean-light.json
+++ b/themes/base16-da-one-ocean-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#e799ff"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#e799ff"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ffc387"
diff --git a/themes/base16-da-one-paper-dark.json b/themes/base16-da-one-paper-dark.json
index c0471ea..6470f74 100644
--- a/themes/base16-da-one-paper-dark.json
+++ b/themes/base16-da-one-paper-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#c173d1"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#c173d1"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ff9470"
diff --git a/themes/base16-da-one-paper-light.json b/themes/base16-da-one-paper-light.json
index a919a9e..975a122 100644
--- a/themes/base16-da-one-paper-light.json
+++ b/themes/base16-da-one-paper-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#c173d1"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#c173d1"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ff9470"
diff --git a/themes/base16-da-one-sea-dark.json b/themes/base16-da-one-sea-dark.json
index 9655ba3..9adee38 100644
--- a/themes/base16-da-one-sea-dark.json
+++ b/themes/base16-da-one-sea-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#e799ff"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#e799ff"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ffc387"
diff --git a/themes/base16-da-one-sea-light.json b/themes/base16-da-one-sea-light.json
index aa8058d..0ca043b 100644
--- a/themes/base16-da-one-sea-light.json
+++ b/themes/base16-da-one-sea-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#e799ff"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#e799ff"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ffc387"
diff --git a/themes/base16-da-one-white-dark.json b/themes/base16-da-one-white-dark.json
index 4203e0d..2de00da 100644
--- a/themes/base16-da-one-white-dark.json
+++ b/themes/base16-da-one-white-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#c173d1"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#c173d1"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ff9470"
diff --git a/themes/base16-da-one-white-light.json b/themes/base16-da-one-white-light.json
index baa84c0..608920c 100644
--- a/themes/base16-da-one-white-light.json
+++ b/themes/base16-da-one-white-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#c173d1"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#c173d1"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ff9470"
diff --git a/themes/base16-danqing-dark.json b/themes/base16-danqing-dark.json
index e8578b7..5149215 100644
--- a/themes/base16-danqing-dark.json
+++ b/themes/base16-danqing-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#CCA4E3"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#CCA4E3"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#B38A61"
diff --git a/themes/base16-danqing-light.json b/themes/base16-danqing-light.json
index 0a03d04..827372a 100644
--- a/themes/base16-danqing-light.json
+++ b/themes/base16-danqing-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#CCA4E3"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#CCA4E3"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#B38A61"
diff --git a/themes/base16-darcula-dark.json b/themes/base16-darcula-dark.json
index c910692..7ce2f76 100644
--- a/themes/base16-darcula-dark.json
+++ b/themes/base16-darcula-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#cc7832"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#cc7832"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#689757"
diff --git a/themes/base16-darcula-light.json b/themes/base16-darcula-light.json
index 919ec62..d491100 100644
--- a/themes/base16-darcula-light.json
+++ b/themes/base16-darcula-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#cc7832"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#cc7832"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#689757"
diff --git a/themes/base16-dark-violet-dark.json b/themes/base16-dark-violet-dark.json
index 06bf276..1edd919 100644
--- a/themes/base16-dark-violet-dark.json
+++ b/themes/base16-dark-violet-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#7e5ce6"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#7e5ce6"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#bb66cc"
diff --git a/themes/base16-dark-violet-light.json b/themes/base16-dark-violet-light.json
index 116ab4d..d0c4fb8 100644
--- a/themes/base16-dark-violet-light.json
+++ b/themes/base16-dark-violet-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#7e5ce6"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#7e5ce6"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#bb66cc"
diff --git a/themes/base16-darkmoss-dark.json b/themes/base16-darkmoss-dark.json
index 7b61ce7..ee7d987 100644
--- a/themes/base16-darkmoss-dark.json
+++ b/themes/base16-darkmoss-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#9bc0c8"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#9bc0c8"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#e6db74"
diff --git a/themes/base16-darkmoss-light.json b/themes/base16-darkmoss-light.json
index 4f2ce66..c974a0b 100644
--- a/themes/base16-darkmoss-light.json
+++ b/themes/base16-darkmoss-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#9bc0c8"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#9bc0c8"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#e6db74"
diff --git a/themes/base16-darktooth-dark.json b/themes/base16-darktooth-dark.json
index b08473a..4980604 100644
--- a/themes/base16-darktooth-dark.json
+++ b/themes/base16-darktooth-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#8F4673"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#8F4673"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#FE8625"
diff --git a/themes/base16-darktooth-light.json b/themes/base16-darktooth-light.json
index dc82694..5defd31 100644
--- a/themes/base16-darktooth-light.json
+++ b/themes/base16-darktooth-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#8F4673"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#8F4673"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#FE8625"
diff --git a/themes/base16-decaf-dark.json b/themes/base16-decaf-dark.json
index e30abcc..f8b6e1b 100644
--- a/themes/base16-decaf-dark.json
+++ b/themes/base16-decaf-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#efb3f7"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#efb3f7"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ffbf70"
diff --git a/themes/base16-decaf-light.json b/themes/base16-decaf-light.json
index a465a77..25a7e82 100644
--- a/themes/base16-decaf-light.json
+++ b/themes/base16-decaf-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#efb3f7"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#efb3f7"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ffbf70"
diff --git a/themes/base16-default-dark.json b/themes/base16-default-dark.json
index ed348dc..39c7fef 100644
--- a/themes/base16-default-dark.json
+++ b/themes/base16-default-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#ba8baf"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#ba8baf"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#dc9656"
diff --git a/themes/base16-default-light.json b/themes/base16-default-light.json
index 0b30ac5..b4eac0b 100644
--- a/themes/base16-default-light.json
+++ b/themes/base16-default-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#ba8baf"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#ba8baf"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#dc9656"
diff --git a/themes/base16-dirtysea.json b/themes/base16-dirtysea.json
index dbf0c5d..08e49ae 100644
--- a/themes/base16-dirtysea.json
+++ b/themes/base16-dirtysea.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#000090"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#000090"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#006565"
diff --git a/themes/base16-dracula-dark.json b/themes/base16-dracula-dark.json
index b91eb6b..2e1cf74 100644
--- a/themes/base16-dracula-dark.json
+++ b/themes/base16-dracula-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#b45bcf"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#b45bcf"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#b45bcf"
diff --git a/themes/base16-dracula-light.json b/themes/base16-dracula-light.json
index 2318d1a..65fc5f4 100644
--- a/themes/base16-dracula-light.json
+++ b/themes/base16-dracula-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#b45bcf"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#b45bcf"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#b45bcf"
diff --git a/themes/base16-edge-dark.json b/themes/base16-edge-dark.json
index b7784e7..125256c 100644
--- a/themes/base16-edge-dark.json
+++ b/themes/base16-edge-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#b870ce"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#b870ce"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#db7070"
diff --git a/themes/base16-edge-light.json b/themes/base16-edge-light.json
index 64f7edf..d13207c 100644
--- a/themes/base16-edge-light.json
+++ b/themes/base16-edge-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#b870ce"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#b870ce"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#db7070"
diff --git a/themes/base16-eighties-dark.json b/themes/base16-eighties-dark.json
index 38c24fa..1dc02de 100644
--- a/themes/base16-eighties-dark.json
+++ b/themes/base16-eighties-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#cc99cc"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#cc99cc"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#f99157"
diff --git a/themes/base16-eighties-light.json b/themes/base16-eighties-light.json
index 0cdbd6f..418a685 100644
--- a/themes/base16-eighties-light.json
+++ b/themes/base16-eighties-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#cc99cc"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#cc99cc"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#f99157"
diff --git a/themes/base16-embers-dark.json b/themes/base16-embers-dark.json
index 86433c6..e46db51 100644
--- a/themes/base16-embers-dark.json
+++ b/themes/base16-embers-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#82576D"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#82576D"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#828257"
diff --git a/themes/base16-embers-light.json b/themes/base16-embers-light.json
index 587734c..54a61cc 100644
--- a/themes/base16-embers-light.json
+++ b/themes/base16-embers-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#82576D"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#82576D"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#828257"
diff --git a/themes/base16-emil-dark.json b/themes/base16-emil-dark.json
index fec02a8..cc184ef 100644
--- a/themes/base16-emil-dark.json
+++ b/themes/base16-emil-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#6916b6"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#6916b6"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#d22a8b"
diff --git a/themes/base16-emil-light.json b/themes/base16-emil-light.json
index 918457d..d39c787 100644
--- a/themes/base16-emil-light.json
+++ b/themes/base16-emil-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#6916b6"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#6916b6"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#d22a8b"
diff --git a/themes/base16-equilibrium-dark.json b/themes/base16-equilibrium-dark.json
index aa134bd..08d64c3 100644
--- a/themes/base16-equilibrium-dark.json
+++ b/themes/base16-equilibrium-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#6a7fd2"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#6a7fd2"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#df5923"
diff --git a/themes/base16-equilibrium-gray-dark.json b/themes/base16-equilibrium-gray-dark.json
index 2224a41..f3ba37e 100644
--- a/themes/base16-equilibrium-gray-dark.json
+++ b/themes/base16-equilibrium-gray-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#6a7fd2"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#6a7fd2"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#df5923"
diff --git a/themes/base16-equilibrium-gray-light.json b/themes/base16-equilibrium-gray-light.json
index 20b3fd9..079a31d 100644
--- a/themes/base16-equilibrium-gray-light.json
+++ b/themes/base16-equilibrium-gray-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#4e66b6"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#4e66b6"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#bf3e05"
diff --git a/themes/base16-equilibrium-light.json b/themes/base16-equilibrium-light.json
index a4fe1d0..0410b93 100644
--- a/themes/base16-equilibrium-light.json
+++ b/themes/base16-equilibrium-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#4e66b6"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#4e66b6"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#bf3e05"
diff --git a/themes/base16-espresso-dark.json b/themes/base16-espresso-dark.json
index 87005af..84863a1 100644
--- a/themes/base16-espresso-dark.json
+++ b/themes/base16-espresso-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#d197d9"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#d197d9"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#f9a959"
diff --git a/themes/base16-espresso-light.json b/themes/base16-espresso-light.json
index 74b4196..0178192 100644
--- a/themes/base16-espresso-light.json
+++ b/themes/base16-espresso-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#d197d9"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#d197d9"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#f9a959"
diff --git a/themes/base16-eva-dark.json b/themes/base16-eva-dark.json
index fb8e161..7cf1e4f 100644
--- a/themes/base16-eva-dark.json
+++ b/themes/base16-eva-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#9c6cd3"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#9c6cd3"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ff9966"
diff --git a/themes/base16-eva-dim-dark.json b/themes/base16-eva-dim-dark.json
index f13c2eb..52ef135 100644
--- a/themes/base16-eva-dim-dark.json
+++ b/themes/base16-eva-dim-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#9c6cd3"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#9c6cd3"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ff9966"
diff --git a/themes/base16-eva-dim-light.json b/themes/base16-eva-dim-light.json
index 2efef65..8c68803 100644
--- a/themes/base16-eva-dim-light.json
+++ b/themes/base16-eva-dim-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#9c6cd3"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#9c6cd3"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ff9966"
diff --git a/themes/base16-eva-light.json b/themes/base16-eva-light.json
index 3fbf8c9..0084c58 100644
--- a/themes/base16-eva-light.json
+++ b/themes/base16-eva-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#9c6cd3"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#9c6cd3"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ff9966"
diff --git a/themes/base16-everforest-dark.json b/themes/base16-everforest-dark.json
index 0cf202f..f17bc63 100644
--- a/themes/base16-everforest-dark.json
+++ b/themes/base16-everforest-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#e67e80"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#e67e80"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#d699b6"
diff --git a/themes/base16-everforest-light.json b/themes/base16-everforest-light.json
index 8a1c074..173b1e2 100644
--- a/themes/base16-everforest-light.json
+++ b/themes/base16-everforest-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#e67e80"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#e67e80"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#d699b6"
diff --git a/themes/base16-flat-dark.json b/themes/base16-flat-dark.json
index 2692f4f..bdd4f4b 100644
--- a/themes/base16-flat-dark.json
+++ b/themes/base16-flat-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#9B59B6"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#9B59B6"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#E67E22"
diff --git a/themes/base16-flat-light.json b/themes/base16-flat-light.json
index 4369884..3f180dd 100644
--- a/themes/base16-flat-light.json
+++ b/themes/base16-flat-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#9B59B6"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#9B59B6"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#E67E22"
diff --git a/themes/base16-framer-dark.json b/themes/base16-framer-dark.json
index 1bf68b6..f833395 100644
--- a/themes/base16-framer-dark.json
+++ b/themes/base16-framer-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#BA8CFC"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#BA8CFC"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#FC4769"
diff --git a/themes/base16-framer-light.json b/themes/base16-framer-light.json
index 66c1f73..4584eb9 100644
--- a/themes/base16-framer-light.json
+++ b/themes/base16-framer-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#BA8CFC"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#BA8CFC"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#FC4769"
diff --git a/themes/base16-fruit-soda-dark.json b/themes/base16-fruit-soda-dark.json
index c761375..8235b04 100644
--- a/themes/base16-fruit-soda-dark.json
+++ b/themes/base16-fruit-soda-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#611fce"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#611fce"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#fe6d08"
diff --git a/themes/base16-fruit-soda-light.json b/themes/base16-fruit-soda-light.json
index a6a2b45..c8e849e 100644
--- a/themes/base16-fruit-soda-light.json
+++ b/themes/base16-fruit-soda-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#611fce"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#611fce"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#fe6d08"
diff --git a/themes/base16-gigavolt-dark.json b/themes/base16-gigavolt-dark.json
index c40ddfe..050fd22 100644
--- a/themes/base16-gigavolt-dark.json
+++ b/themes/base16-gigavolt-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#ae94f9"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#ae94f9"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#19f988"
diff --git a/themes/base16-gigavolt-light.json b/themes/base16-gigavolt-light.json
index 9e4ee0e..ee89fac 100644
--- a/themes/base16-gigavolt-light.json
+++ b/themes/base16-gigavolt-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#ae94f9"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#ae94f9"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#19f988"
diff --git a/themes/base16-github.json b/themes/base16-github.json
index 443423d..dc6c155 100644
--- a/themes/base16-github.json
+++ b/themes/base16-github.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#a71d5d"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#a71d5d"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#0086b3"
diff --git a/themes/base16-google-dark.json b/themes/base16-google-dark.json
index f0fe6ca..e1e3706 100644
--- a/themes/base16-google-dark.json
+++ b/themes/base16-google-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#A36AC7"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#A36AC7"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#F96A38"
diff --git a/themes/base16-google-light.json b/themes/base16-google-light.json
index 39faac6..e1e122f 100644
--- a/themes/base16-google-light.json
+++ b/themes/base16-google-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#A36AC7"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#A36AC7"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#F96A38"
diff --git a/themes/base16-gotham-dark.json b/themes/base16-gotham-dark.json
index 9da2894..1a608db 100644
--- a/themes/base16-gotham-dark.json
+++ b/themes/base16-gotham-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#888ca6"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#888ca6"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#d26937"
diff --git a/themes/base16-gotham-light.json b/themes/base16-gotham-light.json
index 71213a0..bb72dc9 100644
--- a/themes/base16-gotham-light.json
+++ b/themes/base16-gotham-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#888ca6"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#888ca6"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#d26937"
diff --git a/themes/base16-grayscale-dark.json b/themes/base16-grayscale-dark.json
index 28a6f05..b85978d 100644
--- a/themes/base16-grayscale-dark.json
+++ b/themes/base16-grayscale-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#747474"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#747474"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#999999"
diff --git a/themes/base16-grayscale-light.json b/themes/base16-grayscale-light.json
index db87a2c..2889e29 100644
--- a/themes/base16-grayscale-light.json
+++ b/themes/base16-grayscale-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#747474"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#747474"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#999999"
diff --git a/themes/base16-green-screen-dark.json b/themes/base16-green-screen-dark.json
index 79ec016..425ab1e 100644
--- a/themes/base16-green-screen-dark.json
+++ b/themes/base16-green-screen-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#00bb00"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#00bb00"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#009900"
diff --git a/themes/base16-green-screen-light.json b/themes/base16-green-screen-light.json
index b4b77d4..d351719 100644
--- a/themes/base16-green-screen-light.json
+++ b/themes/base16-green-screen-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#00bb00"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#00bb00"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#009900"
diff --git a/themes/base16-gruber-dark.json b/themes/base16-gruber-dark.json
index 2e74e26..e28aba0 100644
--- a/themes/base16-gruber-dark.json
+++ b/themes/base16-gruber-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#9e95c7"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#9e95c7"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#c73c3f"
diff --git a/themes/base16-gruber-light.json b/themes/base16-gruber-light.json
index 49a22e7..15c5566 100644
--- a/themes/base16-gruber-light.json
+++ b/themes/base16-gruber-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#9e95c7"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#9e95c7"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#c73c3f"
diff --git a/themes/base16-gruvbox-dark-hard.json b/themes/base16-gruvbox-dark-hard.json
index 571e4aa..d6cbc45 100644
--- a/themes/base16-gruvbox-dark-hard.json
+++ b/themes/base16-gruvbox-dark-hard.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#d3869b"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#d3869b"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#fe8019"
diff --git a/themes/base16-gruvbox-dark-medium.json b/themes/base16-gruvbox-dark-medium.json
index af3a2aa..7f574a4 100644
--- a/themes/base16-gruvbox-dark-medium.json
+++ b/themes/base16-gruvbox-dark-medium.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#d3869b"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#d3869b"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#fe8019"
diff --git a/themes/base16-gruvbox-dark-pale-light.json b/themes/base16-gruvbox-dark-pale-light.json
index 1339238..836a7a0 100644
--- a/themes/base16-gruvbox-dark-pale-light.json
+++ b/themes/base16-gruvbox-dark-pale-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#d485ad"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#d485ad"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ff8700"
diff --git a/themes/base16-gruvbox-dark-pale.json b/themes/base16-gruvbox-dark-pale.json
index d59505f..143a6a8 100644
--- a/themes/base16-gruvbox-dark-pale.json
+++ b/themes/base16-gruvbox-dark-pale.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#d485ad"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#d485ad"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ff8700"
diff --git a/themes/base16-gruvbox-dark-soft.json b/themes/base16-gruvbox-dark-soft.json
index 0b7b6d5..6dc160b 100644
--- a/themes/base16-gruvbox-dark-soft.json
+++ b/themes/base16-gruvbox-dark-soft.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#d3869b"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#d3869b"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#fe8019"
diff --git a/themes/base16-gruvbox-light-hard.json b/themes/base16-gruvbox-light-hard.json
index 569ca7f..6a16f60 100644
--- a/themes/base16-gruvbox-light-hard.json
+++ b/themes/base16-gruvbox-light-hard.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#8f3f71"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#8f3f71"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#af3a03"
diff --git a/themes/base16-gruvbox-light-medium.json b/themes/base16-gruvbox-light-medium.json
index 24f2d57..fcec553 100644
--- a/themes/base16-gruvbox-light-medium.json
+++ b/themes/base16-gruvbox-light-medium.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#8f3f71"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#8f3f71"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#af3a03"
diff --git a/themes/base16-gruvbox-light-soft.json b/themes/base16-gruvbox-light-soft.json
index b409229..a71d62d 100644
--- a/themes/base16-gruvbox-light-soft.json
+++ b/themes/base16-gruvbox-light-soft.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#8f3f71"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#8f3f71"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#af3a03"
diff --git a/themes/base16-gruvbox-material-dark-hard.json b/themes/base16-gruvbox-material-dark-hard.json
index 8aac47f..ee22ff1 100644
--- a/themes/base16-gruvbox-material-dark-hard.json
+++ b/themes/base16-gruvbox-material-dark-hard.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#d3869b"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#d3869b"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#e78a4e"
diff --git a/themes/base16-gruvbox-material-dark-medium.json b/themes/base16-gruvbox-material-dark-medium.json
index 5b130e7..06d0f63 100644
--- a/themes/base16-gruvbox-material-dark-medium.json
+++ b/themes/base16-gruvbox-material-dark-medium.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#d3869b"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#d3869b"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#e78a4e"
diff --git a/themes/base16-gruvbox-material-dark-soft.json b/themes/base16-gruvbox-material-dark-soft.json
index cb9b3f4..f40b66e 100644
--- a/themes/base16-gruvbox-material-dark-soft.json
+++ b/themes/base16-gruvbox-material-dark-soft.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#d3869b"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#d3869b"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#e78a4e"
diff --git a/themes/base16-gruvbox-material-light-hard.json b/themes/base16-gruvbox-material-light-hard.json
index df15024..fb7c2e0 100644
--- a/themes/base16-gruvbox-material-light-hard.json
+++ b/themes/base16-gruvbox-material-light-hard.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#945e80"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#945e80"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#c35e0a"
diff --git a/themes/base16-gruvbox-material-light-medium.json b/themes/base16-gruvbox-material-light-medium.json
index 80c50bf..2d83818 100644
--- a/themes/base16-gruvbox-material-light-medium.json
+++ b/themes/base16-gruvbox-material-light-medium.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#945e80"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#945e80"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#c35e0a"
diff --git a/themes/base16-gruvbox-material-light-soft.json b/themes/base16-gruvbox-material-light-soft.json
index f7f35f0..b9285f4 100644
--- a/themes/base16-gruvbox-material-light-soft.json
+++ b/themes/base16-gruvbox-material-light-soft.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#945e80"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#945e80"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#c35e0a"
diff --git a/themes/base16-hardcore-dark.json b/themes/base16-hardcore-dark.json
index 62fe53b..7772dc2 100644
--- a/themes/base16-hardcore-dark.json
+++ b/themes/base16-hardcore-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#9e6ffe"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#9e6ffe"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#fd971f"
diff --git a/themes/base16-hardcore-light.json b/themes/base16-hardcore-light.json
index d526c4e..f17d15b 100644
--- a/themes/base16-hardcore-light.json
+++ b/themes/base16-hardcore-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#9e6ffe"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#9e6ffe"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#fd971f"
diff --git a/themes/base16-harmonic16-dark.json b/themes/base16-harmonic16-dark.json
index 764eef8..f3c7595 100644
--- a/themes/base16-harmonic16-dark.json
+++ b/themes/base16-harmonic16-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#bf568b"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#bf568b"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#bfbf56"
diff --git a/themes/base16-harmonic16-light.json b/themes/base16-harmonic16-light.json
index d8f2741..af2ec88 100644
--- a/themes/base16-harmonic16-light.json
+++ b/themes/base16-harmonic16-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#bf568b"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#bf568b"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#bfbf56"
diff --git a/themes/base16-heetch-dark.json b/themes/base16-heetch-dark.json
index e0d7a57..30ea0de 100644
--- a/themes/base16-heetch-dark.json
+++ b/themes/base16-heetch-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#82034C"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#82034C"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#5BA2B6"
diff --git a/themes/base16-heetch-light.json b/themes/base16-heetch-light.json
index 72946ee..427138a 100644
--- a/themes/base16-heetch-light.json
+++ b/themes/base16-heetch-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#bd0152"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#bd0152"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#bdb6c5"
diff --git a/themes/base16-helios-dark.json b/themes/base16-helios-dark.json
index d8a29f7..c403486 100644
--- a/themes/base16-helios-dark.json
+++ b/themes/base16-helios-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#be4264"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#be4264"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#eb8413"
diff --git a/themes/base16-helios-light.json b/themes/base16-helios-light.json
index 8ff3a3a..d67844f 100644
--- a/themes/base16-helios-light.json
+++ b/themes/base16-helios-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#be4264"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#be4264"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#eb8413"
diff --git a/themes/base16-hopscotch-dark.json b/themes/base16-hopscotch-dark.json
index a00cf0b..70895e5 100644
--- a/themes/base16-hopscotch-dark.json
+++ b/themes/base16-hopscotch-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#c85e7c"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#c85e7c"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#fd8b19"
diff --git a/themes/base16-hopscotch-light.json b/themes/base16-hopscotch-light.json
index 0de84f0..e5c7e00 100644
--- a/themes/base16-hopscotch-light.json
+++ b/themes/base16-hopscotch-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#c85e7c"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#c85e7c"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#fd8b19"
diff --git a/themes/base16-horizon-dark.json b/themes/base16-horizon-dark.json
index 7af0c4a..48e3d3f 100644
--- a/themes/base16-horizon-dark.json
+++ b/themes/base16-horizon-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#B072D1"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#B072D1"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#E58D7D"
diff --git a/themes/base16-horizon-light.json b/themes/base16-horizon-light.json
index 08c5106..e9baec0 100644
--- a/themes/base16-horizon-light.json
+++ b/themes/base16-horizon-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#1D8991"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#1D8991"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#F6661E"
diff --git a/themes/base16-horizon-terminal-dark.json b/themes/base16-horizon-terminal-dark.json
index 3ad20d4..faa0def 100644
--- a/themes/base16-horizon-terminal-dark.json
+++ b/themes/base16-horizon-terminal-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#EE64AC"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#EE64AC"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#FAB795"
diff --git a/themes/base16-horizon-terminal-light.json b/themes/base16-horizon-terminal-light.json
index 9d81bd1..b801405 100644
--- a/themes/base16-horizon-terminal-light.json
+++ b/themes/base16-horizon-terminal-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#EE64AC"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#EE64AC"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#F9CEC3"
diff --git a/themes/base16-humanoid-dark.json b/themes/base16-humanoid-dark.json
index 84baa19..bd5268c 100644
--- a/themes/base16-humanoid-dark.json
+++ b/themes/base16-humanoid-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#f15ee3"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#f15ee3"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ff9505"
diff --git a/themes/base16-humanoid-light.json b/themes/base16-humanoid-light.json
index 740cf9c..57dcc4c 100644
--- a/themes/base16-humanoid-light.json
+++ b/themes/base16-humanoid-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#700f98"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#700f98"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ff3d00"
diff --git a/themes/base16-ia-dark.json b/themes/base16-ia-dark.json
index 46e4478..7823837 100644
--- a/themes/base16-ia-dark.json
+++ b/themes/base16-ia-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#b98eb2"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#b98eb2"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#d86868"
diff --git a/themes/base16-ia-light.json b/themes/base16-ia-light.json
index 3278b26..a877a51 100644
--- a/themes/base16-ia-light.json
+++ b/themes/base16-ia-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#a94598"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#a94598"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#c43e18"
diff --git a/themes/base16-icy-dark.json b/themes/base16-icy-dark.json
index 1808907..619cd5a 100644
--- a/themes/base16-icy-dark.json
+++ b/themes/base16-icy-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#00acc1"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#00acc1"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#b3ebf2"
diff --git a/themes/base16-ir-black-dark.json b/themes/base16-ir-black-dark.json
index 49e58bb..933f67f 100644
--- a/themes/base16-ir-black-dark.json
+++ b/themes/base16-ir-black-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#ff73fd"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#ff73fd"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#e9c062"
diff --git a/themes/base16-ir-black-light.json b/themes/base16-ir-black-light.json
index bf35b23..e662dbf 100644
--- a/themes/base16-ir-black-light.json
+++ b/themes/base16-ir-black-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#ff73fd"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#ff73fd"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#e9c062"
diff --git a/themes/base16-isotope-dark.json b/themes/base16-isotope-dark.json
index 4a1db11..7e9ac6d 100644
--- a/themes/base16-isotope-dark.json
+++ b/themes/base16-isotope-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#cc00ff"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#cc00ff"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ff9900"
diff --git a/themes/base16-isotope-light.json b/themes/base16-isotope-light.json
index 21aaccb..17e4882 100644
--- a/themes/base16-isotope-light.json
+++ b/themes/base16-isotope-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#cc00ff"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#cc00ff"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ff9900"
diff --git a/themes/base16-kanagawa.json b/themes/base16-kanagawa.json
index b093185..21a2f3f 100644
--- a/themes/base16-kanagawa.json
+++ b/themes/base16-kanagawa.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#957FB8"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#957FB8"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#FFA066"
diff --git a/themes/base16-katy-dark.json b/themes/base16-katy-dark.json
index 6a155f1..2747b77 100644
--- a/themes/base16-katy-dark.json
+++ b/themes/base16-katy-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#c792ea"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#c792ea"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#f78c6c"
diff --git a/themes/base16-katy-light.json b/themes/base16-katy-light.json
index 99b1147..dcad432 100644
--- a/themes/base16-katy-light.json
+++ b/themes/base16-katy-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#c792ea"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#c792ea"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#f78c6c"
diff --git a/themes/base16-kimber-dark.json b/themes/base16-kimber-dark.json
index da35d3f..f9ccdbc 100644
--- a/themes/base16-kimber-dark.json
+++ b/themes/base16-kimber-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#86CACD"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#86CACD"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#476C88"
diff --git a/themes/base16-kimber-light.json b/themes/base16-kimber-light.json
index aa71b6e..81d88fa 100644
--- a/themes/base16-kimber-light.json
+++ b/themes/base16-kimber-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#86CACD"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#86CACD"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#476C88"
diff --git a/themes/base16-lime-dark.json b/themes/base16-lime-dark.json
index bf6ff4e..b987f76 100644
--- a/themes/base16-lime-dark.json
+++ b/themes/base16-lime-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#1b825f"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#1b825f"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ff773a"
diff --git a/themes/base16-lime-light.json b/themes/base16-lime-light.json
index ceb5272..983c48d 100644
--- a/themes/base16-lime-light.json
+++ b/themes/base16-lime-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#1b825f"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#1b825f"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ff773a"
diff --git a/themes/base16-london-tube-dark.json b/themes/base16-london-tube-dark.json
index 5672780..2edff77 100644
--- a/themes/base16-london-tube-dark.json
+++ b/themes/base16-london-tube-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#98005d"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#98005d"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#f386a1"
diff --git a/themes/base16-london-tube-light.json b/themes/base16-london-tube-light.json
index e8756e4..adeacb2 100644
--- a/themes/base16-london-tube-light.json
+++ b/themes/base16-london-tube-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#98005d"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#98005d"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#f386a1"
diff --git a/themes/base16-macintosh-dark.json b/themes/base16-macintosh-dark.json
index 946f054..49d1596 100644
--- a/themes/base16-macintosh-dark.json
+++ b/themes/base16-macintosh-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#4700a5"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#4700a5"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ff6403"
diff --git a/themes/base16-macintosh-light.json b/themes/base16-macintosh-light.json
index e521dde..f5deac3 100644
--- a/themes/base16-macintosh-light.json
+++ b/themes/base16-macintosh-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#4700a5"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#4700a5"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ff6403"
diff --git a/themes/base16-marrakesh-dark.json b/themes/base16-marrakesh-dark.json
index ac07f2f..5a62ae9 100644
--- a/themes/base16-marrakesh-dark.json
+++ b/themes/base16-marrakesh-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#8868b3"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#8868b3"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#b36144"
diff --git a/themes/base16-marrakesh-light.json b/themes/base16-marrakesh-light.json
index 642d4b1..d07fe03 100644
--- a/themes/base16-marrakesh-light.json
+++ b/themes/base16-marrakesh-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#8868b3"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#8868b3"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#b36144"
diff --git a/themes/base16-materia-dark.json b/themes/base16-materia-dark.json
index 5a1e14e..6698402 100644
--- a/themes/base16-materia-dark.json
+++ b/themes/base16-materia-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#82AAFF"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#82AAFF"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#EA9560"
diff --git a/themes/base16-materia-light.json b/themes/base16-materia-light.json
index 3755fee..caf9f37 100644
--- a/themes/base16-materia-light.json
+++ b/themes/base16-materia-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#82AAFF"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#82AAFF"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#EA9560"
diff --git a/themes/base16-material-dark.json b/themes/base16-material-dark.json
index 709cc6e..19b2971 100644
--- a/themes/base16-material-dark.json
+++ b/themes/base16-material-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#C792EA"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#C792EA"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#F78C6C"
diff --git a/themes/base16-material-darker.json b/themes/base16-material-darker.json
index 4db2f5c..a48a84f 100644
--- a/themes/base16-material-darker.json
+++ b/themes/base16-material-darker.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#C792EA"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#C792EA"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#F78C6C"
diff --git a/themes/base16-material-light.json b/themes/base16-material-light.json
index d22dde9..cc7ea99 100644
--- a/themes/base16-material-light.json
+++ b/themes/base16-material-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#C792EA"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#C792EA"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#F78C6C"
diff --git a/themes/base16-material-lighter.json b/themes/base16-material-lighter.json
index 2d07cf8..207906a 100644
--- a/themes/base16-material-lighter.json
+++ b/themes/base16-material-lighter.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#7C4DFF"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#7C4DFF"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#F76D47"
diff --git a/themes/base16-material-palenight-dark.json b/themes/base16-material-palenight-dark.json
index ec79f8b..e873282 100644
--- a/themes/base16-material-palenight-dark.json
+++ b/themes/base16-material-palenight-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#C792EA"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#C792EA"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#F78C6C"
diff --git a/themes/base16-material-palenight-light.json b/themes/base16-material-palenight-light.json
index 8485a74..cc520d5 100644
--- a/themes/base16-material-palenight-light.json
+++ b/themes/base16-material-palenight-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#C792EA"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#C792EA"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#F78C6C"
diff --git a/themes/base16-material-vivid-dark.json b/themes/base16-material-vivid-dark.json
index a6a206e..12353b8 100644
--- a/themes/base16-material-vivid-dark.json
+++ b/themes/base16-material-vivid-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#673ab7"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#673ab7"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ff9800"
diff --git a/themes/base16-material-vivid-light.json b/themes/base16-material-vivid-light.json
index 3a21ffb..3a04267 100644
--- a/themes/base16-material-vivid-light.json
+++ b/themes/base16-material-vivid-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#673ab7"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#673ab7"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ff9800"
diff --git a/themes/base16-mellow-purple-dark.json b/themes/base16-mellow-purple-dark.json
index 2e54e15..500afcd 100644
--- a/themes/base16-mellow-purple-dark.json
+++ b/themes/base16-mellow-purple-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#8991bb"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#8991bb"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#aa00a3"
diff --git a/themes/base16-mellow-purple-light.json b/themes/base16-mellow-purple-light.json
index d8f8beb..44b9974 100644
--- a/themes/base16-mellow-purple-light.json
+++ b/themes/base16-mellow-purple-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#8991bb"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#8991bb"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#aa00a3"
diff --git a/themes/base16-mexico-dark.json b/themes/base16-mexico-dark.json
index 2ed4ea5..e574c6a 100644
--- a/themes/base16-mexico-dark.json
+++ b/themes/base16-mexico-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#96609e"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#96609e"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#dc9656"
diff --git a/themes/base16-mexico-light.json b/themes/base16-mexico-light.json
index 178825c..38fa68d 100644
--- a/themes/base16-mexico-light.json
+++ b/themes/base16-mexico-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#96609e"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#96609e"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#dc9656"
diff --git a/themes/base16-mocha-dark.json b/themes/base16-mocha-dark.json
index cb82fd8..a4d00f0 100644
--- a/themes/base16-mocha-dark.json
+++ b/themes/base16-mocha-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#a89bb9"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#a89bb9"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#d28b71"
diff --git a/themes/base16-mocha-light.json b/themes/base16-mocha-light.json
index 6f5a698..ba04d02 100644
--- a/themes/base16-mocha-light.json
+++ b/themes/base16-mocha-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#a89bb9"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#a89bb9"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#d28b71"
diff --git a/themes/base16-monokai-dark.json b/themes/base16-monokai-dark.json
index d8c219c..00e53f8 100644
--- a/themes/base16-monokai-dark.json
+++ b/themes/base16-monokai-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#ae81ff"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#ae81ff"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#fd971f"
diff --git a/themes/base16-monokai-light.json b/themes/base16-monokai-light.json
index 64011e5..303dd97 100644
--- a/themes/base16-monokai-light.json
+++ b/themes/base16-monokai-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#ae81ff"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#ae81ff"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#fd971f"
diff --git a/themes/base16-nebula-dark.json b/themes/base16-nebula-dark.json
index ed22115..5f6c6ac 100644
--- a/themes/base16-nebula-dark.json
+++ b/themes/base16-nebula-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#716cae"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#716cae"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#94929e"
diff --git a/themes/base16-nebula-light.json b/themes/base16-nebula-light.json
index b7c599d..3edcfd8 100644
--- a/themes/base16-nebula-light.json
+++ b/themes/base16-nebula-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#716cae"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#716cae"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#94929e"
diff --git a/themes/base16-nord-dark.json b/themes/base16-nord-dark.json
index 78d0896..dbe23cd 100644
--- a/themes/base16-nord-dark.json
+++ b/themes/base16-nord-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#B48EAD"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#B48EAD"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#D08770"
diff --git a/themes/base16-nord-light.json b/themes/base16-nord-light.json
index 530b9c7..e627b09 100644
--- a/themes/base16-nord-light.json
+++ b/themes/base16-nord-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#B48EAD"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#B48EAD"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#D08770"
diff --git a/themes/base16-nova.json b/themes/base16-nova.json
index 02a1ee0..9a99d0b 100644
--- a/themes/base16-nova.json
+++ b/themes/base16-nova.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#9A93E1"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#9A93E1"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#7FC1CA"
diff --git a/themes/base16-ocean-dark.json b/themes/base16-ocean-dark.json
index 1cb8bd9..1f434d2 100644
--- a/themes/base16-ocean-dark.json
+++ b/themes/base16-ocean-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#b48ead"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#b48ead"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#d08770"
diff --git a/themes/base16-ocean-light.json b/themes/base16-ocean-light.json
index 72d8c65..5d9cf82 100644
--- a/themes/base16-ocean-light.json
+++ b/themes/base16-ocean-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#b48ead"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#b48ead"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#d08770"
diff --git a/themes/base16-oceanicnext-dark.json b/themes/base16-oceanicnext-dark.json
index ed4b701..c31fc59 100644
--- a/themes/base16-oceanicnext-dark.json
+++ b/themes/base16-oceanicnext-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#C594C5"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#C594C5"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#F99157"
diff --git a/themes/base16-oceanicnext-light.json b/themes/base16-oceanicnext-light.json
index 9b20385..1c163b2 100644
--- a/themes/base16-oceanicnext-light.json
+++ b/themes/base16-oceanicnext-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#C594C5"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#C594C5"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#F99157"
diff --git a/themes/base16-one-dark.json b/themes/base16-one-dark.json
index 27eeb5e..699d0c1 100644
--- a/themes/base16-one-dark.json
+++ b/themes/base16-one-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#a626a4"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#a626a4"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#d75f00"
diff --git a/themes/base16-one-light.json b/themes/base16-one-light.json
index 3a695be..61a8532 100644
--- a/themes/base16-one-light.json
+++ b/themes/base16-one-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#a626a4"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#a626a4"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#d75f00"
diff --git a/themes/base16-onedark-dark.json b/themes/base16-onedark-dark.json
index b0580b1..f9c3457 100644
--- a/themes/base16-onedark-dark.json
+++ b/themes/base16-onedark-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#c678dd"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#c678dd"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#d19a66"
diff --git a/themes/base16-onedark-light.json b/themes/base16-onedark-light.json
index 8434f9d..df313d9 100644
--- a/themes/base16-onedark-light.json
+++ b/themes/base16-onedark-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#c678dd"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#c678dd"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#d19a66"
diff --git a/themes/base16-outrun-dark.json b/themes/base16-outrun-dark.json
index 86ef237..20e0575 100644
--- a/themes/base16-outrun-dark.json
+++ b/themes/base16-outrun-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#F10596"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#F10596"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#FC8D28"
diff --git a/themes/base16-outrun-light.json b/themes/base16-outrun-light.json
index f3d22c9..427ebaf 100644
--- a/themes/base16-outrun-light.json
+++ b/themes/base16-outrun-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#F10596"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#F10596"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#FC8D28"
diff --git a/themes/base16-pandora.json b/themes/base16-pandora.json
index 8f51c37..b4ad407 100644
--- a/themes/base16-pandora.json
+++ b/themes/base16-pandora.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#a24030"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#a24030"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ff9153"
diff --git a/themes/base16-papercolor-dark.json b/themes/base16-papercolor-dark.json
index ff7e1b5..2bdf39f 100644
--- a/themes/base16-papercolor-dark.json
+++ b/themes/base16-papercolor-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#00afaf"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#00afaf"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#5faf5f"
diff --git a/themes/base16-papercolor-light.json b/themes/base16-papercolor-light.json
index ae8f375..91d6e56 100644
--- a/themes/base16-papercolor-light.json
+++ b/themes/base16-papercolor-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#005faf"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#005faf"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#d70000"
diff --git a/themes/base16-paraiso-dark.json b/themes/base16-paraiso-dark.json
index d63071b..038101a 100644
--- a/themes/base16-paraiso-dark.json
+++ b/themes/base16-paraiso-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#815ba4"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#815ba4"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#f99b15"
diff --git a/themes/base16-paraiso-light.json b/themes/base16-paraiso-light.json
index 9b9dce7..6f89b0a 100644
--- a/themes/base16-paraiso-light.json
+++ b/themes/base16-paraiso-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#815ba4"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#815ba4"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#f99b15"
diff --git a/themes/base16-pasque-dark.json b/themes/base16-pasque-dark.json
index 1ed583a..8ea5464 100644
--- a/themes/base16-pasque-dark.json
+++ b/themes/base16-pasque-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#953B9D"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#953B9D"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#918889"
diff --git a/themes/base16-pasque-light.json b/themes/base16-pasque-light.json
index a9d1bdc..d333b01 100644
--- a/themes/base16-pasque-light.json
+++ b/themes/base16-pasque-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#953B9D"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#953B9D"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#918889"
diff --git a/themes/base16-phd-dark.json b/themes/base16-phd-dark.json
index c5dff65..25160bc 100644
--- a/themes/base16-phd-dark.json
+++ b/themes/base16-phd-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#9989cc"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#9989cc"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#f0a000"
diff --git a/themes/base16-phd-light.json b/themes/base16-phd-light.json
index 669cea4..f05ee0e 100644
--- a/themes/base16-phd-light.json
+++ b/themes/base16-phd-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#9989cc"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#9989cc"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#f0a000"
diff --git a/themes/base16-pico-dark.json b/themes/base16-pico-dark.json
index 07fd8f5..effb487 100644
--- a/themes/base16-pico-dark.json
+++ b/themes/base16-pico-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#ff77a8"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#ff77a8"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ffa300"
diff --git a/themes/base16-pico-light.json b/themes/base16-pico-light.json
index 9409713..dc42ca8 100644
--- a/themes/base16-pico-light.json
+++ b/themes/base16-pico-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#ff77a8"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#ff77a8"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ffa300"
diff --git a/themes/base16-pinky-dark.json b/themes/base16-pinky-dark.json
index 7dc8104..537d286 100644
--- a/themes/base16-pinky-dark.json
+++ b/themes/base16-pinky-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#007fff"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#007fff"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#00ff66"
diff --git a/themes/base16-pinky-light.json b/themes/base16-pinky-light.json
index 717ca91..15053e9 100644
--- a/themes/base16-pinky-light.json
+++ b/themes/base16-pinky-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#007fff"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#007fff"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#00ff66"
diff --git a/themes/base16-pop-dark.json b/themes/base16-pop-dark.json
index 6b4ee48..93a0af9 100644
--- a/themes/base16-pop-dark.json
+++ b/themes/base16-pop-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#b31e8d"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#b31e8d"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#f29333"
diff --git a/themes/base16-pop-light.json b/themes/base16-pop-light.json
index 5f19942..c73d458 100644
--- a/themes/base16-pop-light.json
+++ b/themes/base16-pop-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#b31e8d"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#b31e8d"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#f29333"
diff --git a/themes/base16-porple-dark.json b/themes/base16-porple-dark.json
index db4b16f..d05df05 100644
--- a/themes/base16-porple-dark.json
+++ b/themes/base16-porple-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#b74989"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#b74989"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#d28e5d"
diff --git a/themes/base16-porple-light.json b/themes/base16-porple-light.json
index 3ea6407..db0121f 100644
--- a/themes/base16-porple-light.json
+++ b/themes/base16-porple-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#b74989"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#b74989"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#d28e5d"
diff --git a/themes/base16-primer-dark-dimmed-light.json b/themes/base16-primer-dark-dimmed-light.json
index 3d6608f..0ceebbb 100644
--- a/themes/base16-primer-dark-dimmed-light.json
+++ b/themes/base16-primer-dark-dimmed-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#e275ad"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#e275ad"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#e0823d"
diff --git a/themes/base16-primer-dark-dimmed.json b/themes/base16-primer-dark-dimmed.json
index c589cd1..6dabe46 100644
--- a/themes/base16-primer-dark-dimmed.json
+++ b/themes/base16-primer-dark-dimmed.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#e275ad"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#e275ad"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#e0823d"
diff --git a/themes/base16-primer-dark.json b/themes/base16-primer-dark.json
index 66f77d6..f6717de 100644
--- a/themes/base16-primer-dark.json
+++ b/themes/base16-primer-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#f778ba"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#f778ba"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#f0883e"
diff --git a/themes/base16-primer-light.json b/themes/base16-primer-light.json
index 804786a..7b6a811 100644
--- a/themes/base16-primer-light.json
+++ b/themes/base16-primer-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#ea4aaa"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#ea4aaa"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#f66a0a"
diff --git a/themes/base16-purpledream-dark.json b/themes/base16-purpledream-dark.json
index 402763b..36b5917 100644
--- a/themes/base16-purpledream-dark.json
+++ b/themes/base16-purpledream-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#B000D0"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#B000D0"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#CCAE14"
diff --git a/themes/base16-purpledream-light.json b/themes/base16-purpledream-light.json
index 6ee1e64..835d0b4 100644
--- a/themes/base16-purpledream-light.json
+++ b/themes/base16-purpledream-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#B000D0"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#B000D0"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#CCAE14"
diff --git a/themes/base16-qualia.json b/themes/base16-qualia.json
index a2d8f86..07c45e0 100644
--- a/themes/base16-qualia.json
+++ b/themes/base16-qualia.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#E0AF85"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#E0AF85"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#A3B8EF"
diff --git a/themes/base16-railscasts-dark.json b/themes/base16-railscasts-dark.json
index 28cfd13..55bd775 100644
--- a/themes/base16-railscasts-dark.json
+++ b/themes/base16-railscasts-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#b6b3eb"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#b6b3eb"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#cc7833"
diff --git a/themes/base16-railscasts-light.json b/themes/base16-railscasts-light.json
index a719761..b952b43 100644
--- a/themes/base16-railscasts-light.json
+++ b/themes/base16-railscasts-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#b6b3eb"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#b6b3eb"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#cc7833"
diff --git a/themes/base16-rebecca.json b/themes/base16-rebecca.json
index 45d98cc..e8e89f4 100644
--- a/themes/base16-rebecca.json
+++ b/themes/base16-rebecca.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#7aa5ff"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#7aa5ff"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#efe4a1"
diff --git a/themes/base16-rose-pine-dark.json b/themes/base16-rose-pine-dark.json
index 11f5e57..fca42d4 100644
--- a/themes/base16-rose-pine-dark.json
+++ b/themes/base16-rose-pine-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#c4a7e7"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#c4a7e7"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#eb6f92"
diff --git a/themes/base16-rose-pine-dawn-dark.json b/themes/base16-rose-pine-dawn-dark.json
index 10c45ad..232d335 100644
--- a/themes/base16-rose-pine-dawn-dark.json
+++ b/themes/base16-rose-pine-dawn-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#907aa9"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#907aa9"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#b4637a"
diff --git a/themes/base16-rose-pine-dawn-light.json b/themes/base16-rose-pine-dawn-light.json
index 9222cb4..d83a350 100644
--- a/themes/base16-rose-pine-dawn-light.json
+++ b/themes/base16-rose-pine-dawn-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#907aa9"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#907aa9"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#b4637a"
diff --git a/themes/base16-rose-pine-light.json b/themes/base16-rose-pine-light.json
index a271b59..ecf059c 100644
--- a/themes/base16-rose-pine-light.json
+++ b/themes/base16-rose-pine-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#c4a7e7"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#c4a7e7"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#eb6f92"
diff --git a/themes/base16-rose-pine-moon-dark.json b/themes/base16-rose-pine-moon-dark.json
index a0a9096..0e4a294 100644
--- a/themes/base16-rose-pine-moon-dark.json
+++ b/themes/base16-rose-pine-moon-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#c4a7e7"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#c4a7e7"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#eb6f92"
diff --git a/themes/base16-rose-pine-moon-light.json b/themes/base16-rose-pine-moon-light.json
index c4da0ef..2ff6b7f 100644
--- a/themes/base16-rose-pine-moon-light.json
+++ b/themes/base16-rose-pine-moon-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#c4a7e7"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#c4a7e7"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#eb6f92"
diff --git a/themes/base16-sagelight-dark.json b/themes/base16-sagelight-dark.json
index a3e1234..2cd1b33 100644
--- a/themes/base16-sagelight-dark.json
+++ b/themes/base16-sagelight-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#c8a0d2"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#c8a0d2"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ffaa61"
diff --git a/themes/base16-sagelight-light.json b/themes/base16-sagelight-light.json
index 80b96f3..4450abc 100644
--- a/themes/base16-sagelight-light.json
+++ b/themes/base16-sagelight-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#c8a0d2"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#c8a0d2"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ffaa61"
diff --git a/themes/base16-sakura-dark.json b/themes/base16-sakura-dark.json
index 9742c6e..a20b9c6 100644
--- a/themes/base16-sakura-dark.json
+++ b/themes/base16-sakura-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#5e2180"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#5e2180"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#f6661e"
diff --git a/themes/base16-sakura-light.json b/themes/base16-sakura-light.json
index daa390c..70e28a4 100644
--- a/themes/base16-sakura-light.json
+++ b/themes/base16-sakura-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#5e2180"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#5e2180"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#f6661e"
diff --git a/themes/base16-sandcastle-dark.json b/themes/base16-sandcastle-dark.json
index ea00d19..898eb42 100644
--- a/themes/base16-sandcastle-dark.json
+++ b/themes/base16-sandcastle-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#d75f5f"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#d75f5f"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#a07e3b"
diff --git a/themes/base16-sandcastle-light.json b/themes/base16-sandcastle-light.json
index 43dbc3e..bc7ba80 100644
--- a/themes/base16-sandcastle-light.json
+++ b/themes/base16-sandcastle-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#d75f5f"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#d75f5f"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#a07e3b"
diff --git a/themes/base16-seti-ui-dark.json b/themes/base16-seti-ui-dark.json
index 901eca2..b51b573 100644
--- a/themes/base16-seti-ui-dark.json
+++ b/themes/base16-seti-ui-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#a074c4"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#a074c4"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#db7b55"
diff --git a/themes/base16-seti-ui-light.json b/themes/base16-seti-ui-light.json
index b437fdc..13b4095 100644
--- a/themes/base16-seti-ui-light.json
+++ b/themes/base16-seti-ui-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#a074c4"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#a074c4"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#db7b55"
diff --git a/themes/base16-shades-of-purple-dark.json b/themes/base16-shades-of-purple-dark.json
index f8d2bb9..5a7dbbe 100644
--- a/themes/base16-shades-of-purple-dark.json
+++ b/themes/base16-shades-of-purple-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#ff2c70"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#ff2c70"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#f92a1c"
diff --git a/themes/base16-shades-of-purple-light.json b/themes/base16-shades-of-purple-light.json
index 3aa48a4..357dc3e 100644
--- a/themes/base16-shades-of-purple-light.json
+++ b/themes/base16-shades-of-purple-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#ff2c70"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#ff2c70"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#f92a1c"
diff --git a/themes/base16-shadesmear-dark.json b/themes/base16-shadesmear-dark.json
index d3ab7d3..2937a8c 100644
--- a/themes/base16-shadesmear-dark.json
+++ b/themes/base16-shadesmear-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#D7AB54"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#D7AB54"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#A64270"
diff --git a/themes/base16-shadesmear-light.json b/themes/base16-shadesmear-light.json
index 90b414f..31b0392 100644
--- a/themes/base16-shadesmear-light.json
+++ b/themes/base16-shadesmear-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#D7AB54"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#D7AB54"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#A64270"
diff --git a/themes/base16-shapeshifter-dark.json b/themes/base16-shapeshifter-dark.json
index e6ba1bd..b91e888 100644
--- a/themes/base16-shapeshifter-dark.json
+++ b/themes/base16-shapeshifter-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#f996e2"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#f996e2"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#e09448"
diff --git a/themes/base16-shapeshifter-light.json b/themes/base16-shapeshifter-light.json
index 04b711d..588c8d8 100644
--- a/themes/base16-shapeshifter-light.json
+++ b/themes/base16-shapeshifter-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#f996e2"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#f996e2"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#e09448"
diff --git a/themes/base16-silk-dark.json b/themes/base16-silk-dark.json
index 47a8c09..381c8ac 100644
--- a/themes/base16-silk-dark.json
+++ b/themes/base16-silk-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#756b8a"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#756b8a"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#fcab74"
diff --git a/themes/base16-silk-light.json b/themes/base16-silk-light.json
index 3494485..260c9af 100644
--- a/themes/base16-silk-light.json
+++ b/themes/base16-silk-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#6E6582"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#6E6582"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#D27F46"
diff --git a/themes/base16-snazzy-dark.json b/themes/base16-snazzy-dark.json
index 9b6b2d0..e4c2665 100644
--- a/themes/base16-snazzy-dark.json
+++ b/themes/base16-snazzy-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#ff6ac1"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#ff6ac1"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ff9f43"
diff --git a/themes/base16-snazzy-light.json b/themes/base16-snazzy-light.json
index 7594fab..bff2fe8 100644
--- a/themes/base16-snazzy-light.json
+++ b/themes/base16-snazzy-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#ff6ac1"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#ff6ac1"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ff9f43"
diff --git a/themes/base16-solar-flare-dark.json b/themes/base16-solar-flare-dark.json
index 115e673..cb58865 100644
--- a/themes/base16-solar-flare-dark.json
+++ b/themes/base16-solar-flare-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#A363D5"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#A363D5"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#E66B2B"
diff --git a/themes/base16-solar-flare-light.json b/themes/base16-solar-flare-light.json
index e39bd86..f32afee 100644
--- a/themes/base16-solar-flare-light.json
+++ b/themes/base16-solar-flare-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#A363D5"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#A363D5"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#E66B2B"
diff --git a/themes/base16-solarized-dark.json b/themes/base16-solarized-dark.json
index c432211..e108e13 100644
--- a/themes/base16-solarized-dark.json
+++ b/themes/base16-solarized-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#6c71c4"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#6c71c4"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#cb4b16"
diff --git a/themes/base16-solarized-light.json b/themes/base16-solarized-light.json
index ee09f87..daf7361 100644
--- a/themes/base16-solarized-light.json
+++ b/themes/base16-solarized-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#6c71c4"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#6c71c4"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#cb4b16"
diff --git a/themes/base16-spaceduck-dark.json b/themes/base16-spaceduck-dark.json
index 440036f..af4a9cc 100644
--- a/themes/base16-spaceduck-dark.json
+++ b/themes/base16-spaceduck-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#b3a1e6"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#b3a1e6"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#e39400"
diff --git a/themes/base16-spaceduck-light.json b/themes/base16-spaceduck-light.json
index 6c57faa..f49fff7 100644
--- a/themes/base16-spaceduck-light.json
+++ b/themes/base16-spaceduck-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#b3a1e6"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#b3a1e6"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#e39400"
diff --git a/themes/base16-spacemacs-dark.json b/themes/base16-spacemacs-dark.json
index 9c45578..e159572 100644
--- a/themes/base16-spacemacs-dark.json
+++ b/themes/base16-spacemacs-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#a31db1"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#a31db1"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ffa500"
diff --git a/themes/base16-spacemacs-light.json b/themes/base16-spacemacs-light.json
index 56e7996..4c81364 100644
--- a/themes/base16-spacemacs-light.json
+++ b/themes/base16-spacemacs-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#a31db1"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#a31db1"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ffa500"
diff --git a/themes/base16-stella-dark.json b/themes/base16-stella-dark.json
index 42415f9..6207bbc 100644
--- a/themes/base16-stella-dark.json
+++ b/themes/base16-stella-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#C594FF"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#C594FF"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#8865C6"
diff --git a/themes/base16-stella-light.json b/themes/base16-stella-light.json
index c445e2b..3acd467 100644
--- a/themes/base16-stella-light.json
+++ b/themes/base16-stella-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#C594FF"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#C594FF"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#8865C6"
diff --git a/themes/base16-still-alive.json b/themes/base16-still-alive.json
index 1e921b6..51e7642 100644
--- a/themes/base16-still-alive.json
+++ b/themes/base16-still-alive.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#900000"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#900000"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#183048"
diff --git a/themes/base16-summercamp-dark.json b/themes/base16-summercamp-dark.json
index c16045a..abbe187 100644
--- a/themes/base16-summercamp-dark.json
+++ b/themes/base16-summercamp-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#FF8080"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#FF8080"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#fba11b"
diff --git a/themes/base16-summercamp-light.json b/themes/base16-summercamp-light.json
index a22007b..21b0f6d 100644
--- a/themes/base16-summercamp-light.json
+++ b/themes/base16-summercamp-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#FF8080"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#FF8080"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#fba11b"
diff --git a/themes/base16-summerfruit-dark.json b/themes/base16-summerfruit-dark.json
index 4b1ec39..311f709 100644
--- a/themes/base16-summerfruit-dark.json
+++ b/themes/base16-summerfruit-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#AD00A1"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#AD00A1"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#FD8900"
diff --git a/themes/base16-summerfruit-light.json b/themes/base16-summerfruit-light.json
index b52912a..4822068 100644
--- a/themes/base16-summerfruit-light.json
+++ b/themes/base16-summerfruit-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#AD00A1"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#AD00A1"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#FD8900"
diff --git a/themes/base16-synth-midnight-terminal-dark.json b/themes/base16-synth-midnight-terminal-dark.json
index 8fa7f97..cd35725 100644
--- a/themes/base16-synth-midnight-terminal-dark.json
+++ b/themes/base16-synth-midnight-terminal-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#ea5ce2"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#ea5ce2"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ea770d"
diff --git a/themes/base16-synth-midnight-terminal-light.json b/themes/base16-synth-midnight-terminal-light.json
index 34553e6..2752645 100644
--- a/themes/base16-synth-midnight-terminal-light.json
+++ b/themes/base16-synth-midnight-terminal-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#ea5ce2"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#ea5ce2"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ea770d"
diff --git a/themes/base16-tango-dark.json b/themes/base16-tango-dark.json
index 469512e..52822e2 100644
--- a/themes/base16-tango-dark.json
+++ b/themes/base16-tango-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#75507b"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#75507b"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ef2929"
diff --git a/themes/base16-tango-light.json b/themes/base16-tango-light.json
index 6d26bd9..7e5b3c5 100644
--- a/themes/base16-tango-light.json
+++ b/themes/base16-tango-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#75507b"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#75507b"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ef2929"
diff --git a/themes/base16-tender-dark.json b/themes/base16-tender-dark.json
index 98ef2a6..eb46c4e 100644
--- a/themes/base16-tender-dark.json
+++ b/themes/base16-tender-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#d3b987"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#d3b987"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#dc9656"
diff --git a/themes/base16-tender-light.json b/themes/base16-tender-light.json
index f784c16..6d1bbcd 100644
--- a/themes/base16-tender-light.json
+++ b/themes/base16-tender-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#d3b987"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#d3b987"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#dc9656"
diff --git a/themes/base16-tokyo-city-dark.json b/themes/base16-tokyo-city-dark.json
index 84bcac2..bedd322 100644
--- a/themes/base16-tokyo-city-dark.json
+++ b/themes/base16-tokyo-city-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#BB9AF7"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#BB9AF7"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#FF9E64"
diff --git a/themes/base16-tokyo-city-light.json b/themes/base16-tokyo-city-light.json
index 85ba90a..6164508 100644
--- a/themes/base16-tokyo-city-light.json
+++ b/themes/base16-tokyo-city-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#5A4A78"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#5A4A78"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#965027"
diff --git a/themes/base16-tokyo-city-terminal-dark.json b/themes/base16-tokyo-city-terminal-dark.json
index e322282..880e86c 100644
--- a/themes/base16-tokyo-city-terminal-dark.json
+++ b/themes/base16-tokyo-city-terminal-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#B62D65"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#B62D65"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#FF9E64"
diff --git a/themes/base16-tokyo-city-terminal-light.json b/themes/base16-tokyo-city-terminal-light.json
index 9e17869..f1df4a0 100644
--- a/themes/base16-tokyo-city-terminal-light.json
+++ b/themes/base16-tokyo-city-terminal-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#5A4A78"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#5A4A78"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#965027"
diff --git a/themes/base16-tokyo-night-dark.json b/themes/base16-tokyo-night-dark.json
index 9374d9c..2222f5a 100644
--- a/themes/base16-tokyo-night-dark.json
+++ b/themes/base16-tokyo-night-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#BB9AF7"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#BB9AF7"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#A9B1D6"
diff --git a/themes/base16-tokyo-night-light.json b/themes/base16-tokyo-night-light.json
index f8a9df3..11c5778 100644
--- a/themes/base16-tokyo-night-light.json
+++ b/themes/base16-tokyo-night-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#5A4A78"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#5A4A78"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#965027"
diff --git a/themes/base16-tokyo-night-storm-dark.json b/themes/base16-tokyo-night-storm-dark.json
index ee5412b..3c8a680 100644
--- a/themes/base16-tokyo-night-storm-dark.json
+++ b/themes/base16-tokyo-night-storm-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#BB9AF7"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#BB9AF7"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#A9B1D6"
diff --git a/themes/base16-tokyo-night-storm-light.json b/themes/base16-tokyo-night-storm-light.json
index 5fcf1be..612716a 100644
--- a/themes/base16-tokyo-night-storm-light.json
+++ b/themes/base16-tokyo-night-storm-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#BB9AF7"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#BB9AF7"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#A9B1D6"
diff --git a/themes/base16-tokyo-night-terminal-dark.json b/themes/base16-tokyo-night-terminal-dark.json
index c9d27a3..94051af 100644
--- a/themes/base16-tokyo-night-terminal-dark.json
+++ b/themes/base16-tokyo-night-terminal-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#BB9AF7"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#BB9AF7"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#FF9E64"
diff --git a/themes/base16-tokyo-night-terminal-light.json b/themes/base16-tokyo-night-terminal-light.json
index f26f8e3..639260f 100644
--- a/themes/base16-tokyo-night-terminal-light.json
+++ b/themes/base16-tokyo-night-terminal-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#5A4A78"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#5A4A78"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#965027"
diff --git a/themes/base16-tokyo-night-terminal-storm-dark.json b/themes/base16-tokyo-night-terminal-storm-dark.json
index de84e00..5963be6 100644
--- a/themes/base16-tokyo-night-terminal-storm-dark.json
+++ b/themes/base16-tokyo-night-terminal-storm-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#BB9AF7"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#BB9AF7"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#FF9E64"
diff --git a/themes/base16-tokyo-night-terminal-storm-light.json b/themes/base16-tokyo-night-terminal-storm-light.json
index 0e56b3f..fcbe1a8 100644
--- a/themes/base16-tokyo-night-terminal-storm-light.json
+++ b/themes/base16-tokyo-night-terminal-storm-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#BB9AF7"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#BB9AF7"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#FF9E64"
diff --git a/themes/base16-tokyodark-terminal-dark.json b/themes/base16-tokyodark-terminal-dark.json
index ca61b40..3ec9f69 100644
--- a/themes/base16-tokyodark-terminal-dark.json
+++ b/themes/base16-tokyodark-terminal-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#a485dd"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#a485dd"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#f6955b"
diff --git a/themes/base16-tokyodark-terminal-light.json b/themes/base16-tokyodark-terminal-light.json
index cc15a99..4b09c4b 100644
--- a/themes/base16-tokyodark-terminal-light.json
+++ b/themes/base16-tokyodark-terminal-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#a485dd"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#a485dd"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#f6955b"
diff --git a/themes/base16-tokyodark.json b/themes/base16-tokyodark.json
index 36ad3b2..487641e 100644
--- a/themes/base16-tokyodark.json
+++ b/themes/base16-tokyodark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#ee6d85"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#ee6d85"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#a485dd"
diff --git a/themes/base16-tomorrow-dark.json b/themes/base16-tomorrow-dark.json
index a131235..faad875 100644
--- a/themes/base16-tomorrow-dark.json
+++ b/themes/base16-tomorrow-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#8959a8"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#8959a8"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#f5871f"
diff --git a/themes/base16-tomorrow-light.json b/themes/base16-tomorrow-light.json
index 2c0b3e3..b602beb 100644
--- a/themes/base16-tomorrow-light.json
+++ b/themes/base16-tomorrow-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#8959a8"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#8959a8"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#f5871f"
diff --git a/themes/base16-tomorrow-night-dark.json b/themes/base16-tomorrow-night-dark.json
index 0f10595..0d804c4 100644
--- a/themes/base16-tomorrow-night-dark.json
+++ b/themes/base16-tomorrow-night-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#b294bb"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#b294bb"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#de935f"
diff --git a/themes/base16-tomorrow-night-eighties-dark.json b/themes/base16-tomorrow-night-eighties-dark.json
index e8f36ec..02af849 100644
--- a/themes/base16-tomorrow-night-eighties-dark.json
+++ b/themes/base16-tomorrow-night-eighties-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#cc99cc"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#cc99cc"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#f99157"
diff --git a/themes/base16-tomorrow-night-eighties-light.json b/themes/base16-tomorrow-night-eighties-light.json
index 93bb68a..18d4426 100644
--- a/themes/base16-tomorrow-night-eighties-light.json
+++ b/themes/base16-tomorrow-night-eighties-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#cc99cc"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#cc99cc"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#f99157"
diff --git a/themes/base16-tomorrow-night-light.json b/themes/base16-tomorrow-night-light.json
index 5eed2fb..6f1eeed 100644
--- a/themes/base16-tomorrow-night-light.json
+++ b/themes/base16-tomorrow-night-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#b294bb"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#b294bb"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#de935f"
diff --git a/themes/base16-twilight-dark.json b/themes/base16-twilight-dark.json
index 602ad6c..d8e16c3 100644
--- a/themes/base16-twilight-dark.json
+++ b/themes/base16-twilight-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#9b859d"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#9b859d"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#cda869"
diff --git a/themes/base16-twilight-light.json b/themes/base16-twilight-light.json
index 9021a2e..3836dfd 100644
--- a/themes/base16-twilight-light.json
+++ b/themes/base16-twilight-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#9b859d"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#9b859d"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#cda869"
diff --git a/themes/base16-unikitty-dark.json b/themes/base16-unikitty-dark.json
index b61c12c..360f245 100644
--- a/themes/base16-unikitty-dark.json
+++ b/themes/base16-unikitty-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#bb60ea"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#bb60ea"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#d65407"
diff --git a/themes/base16-unikitty-light.json b/themes/base16-unikitty-light.json
index 0bfcbfe..00923f6 100644
--- a/themes/base16-unikitty-light.json
+++ b/themes/base16-unikitty-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#aa17e6"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#aa17e6"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#d65407"
diff --git a/themes/base16-unikitty-reversible-dark.json b/themes/base16-unikitty-reversible-dark.json
index 76ab440..9346e86 100644
--- a/themes/base16-unikitty-reversible-dark.json
+++ b/themes/base16-unikitty-reversible-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#b33ce8"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#b33ce8"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#d65407"
diff --git a/themes/base16-unikitty-reversible-light.json b/themes/base16-unikitty-reversible-light.json
index 04f6717..5134454 100644
--- a/themes/base16-unikitty-reversible-light.json
+++ b/themes/base16-unikitty-reversible-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#b33ce8"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#b33ce8"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#d65407"
diff --git a/themes/base16-uwunicorn-dark.json b/themes/base16-uwunicorn-dark.json
index dd0586b..5f64afa 100644
--- a/themes/base16-uwunicorn-dark.json
+++ b/themes/base16-uwunicorn-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#78a38f"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#78a38f"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#de5b44"
diff --git a/themes/base16-uwunicorn-light.json b/themes/base16-uwunicorn-light.json
index 03e6373..8c89c6c 100644
--- a/themes/base16-uwunicorn-light.json
+++ b/themes/base16-uwunicorn-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#78a38f"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#78a38f"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#de5b44"
diff --git a/themes/base16-vice-dark.json b/themes/base16-vice-dark.json
index 146d225..ecc7029 100644
--- a/themes/base16-vice-dark.json
+++ b/themes/base16-vice-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#00f6d9"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#00f6d9"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#85ffe0"
diff --git a/themes/base16-vice-light.json b/themes/base16-vice-light.json
index 848c27e..8d65e36 100644
--- a/themes/base16-vice-light.json
+++ b/themes/base16-vice-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#00f6d9"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#00f6d9"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#85ffe0"
diff --git a/themes/base16-vulcan.json b/themes/base16-vulcan.json
index 94bf5e6..bb375e5 100644
--- a/themes/base16-vulcan.json
+++ b/themes/base16-vulcan.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#9198a3"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#9198a3"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#9198a3"
diff --git a/themes/base16-windows-10-dark.json b/themes/base16-windows-10-dark.json
index 7756785..c752f18 100644
--- a/themes/base16-windows-10-dark.json
+++ b/themes/base16-windows-10-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#b4009e"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#b4009e"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#c19c00"
diff --git a/themes/base16-windows-10-light.json b/themes/base16-windows-10-light.json
index a7b7397..d846513 100644
--- a/themes/base16-windows-10-light.json
+++ b/themes/base16-windows-10-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#881798"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#881798"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#f9f1a5"
diff --git a/themes/base16-windows-95-dark.json b/themes/base16-windows-95-dark.json
index 8de26dc..cac541e 100644
--- a/themes/base16-windows-95-dark.json
+++ b/themes/base16-windows-95-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#fc54fc"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#fc54fc"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#a85400"
diff --git a/themes/base16-windows-95-light.json b/themes/base16-windows-95-light.json
index eb91a2f..cf17b93 100644
--- a/themes/base16-windows-95-light.json
+++ b/themes/base16-windows-95-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#a800a8"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#a800a8"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#fcfc54"
diff --git a/themes/base16-windows-high-contrast-dark.json b/themes/base16-windows-high-contrast-dark.json
index ab64565..7213803 100644
--- a/themes/base16-windows-high-contrast-dark.json
+++ b/themes/base16-windows-high-contrast-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#fc54fc"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#fc54fc"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#808000"
diff --git a/themes/base16-windows-high-contrast-light.json b/themes/base16-windows-high-contrast-light.json
index 627cde7..517fe3b 100644
--- a/themes/base16-windows-high-contrast-light.json
+++ b/themes/base16-windows-high-contrast-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#800080"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#800080"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#fcfc54"
diff --git a/themes/base16-windows-nt-dark.json b/themes/base16-windows-nt-dark.json
index 0712614..08e28f2 100644
--- a/themes/base16-windows-nt-dark.json
+++ b/themes/base16-windows-nt-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#ff00ff"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#ff00ff"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#808000"
diff --git a/themes/base16-windows-nt-light.json b/themes/base16-windows-nt-light.json
index 4a1e302..504b7e7 100644
--- a/themes/base16-windows-nt-light.json
+++ b/themes/base16-windows-nt-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#800080"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#800080"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ffff00"
diff --git a/themes/base16-woodland-dark.json b/themes/base16-woodland-dark.json
index 204e605..2e57c18 100644
--- a/themes/base16-woodland-dark.json
+++ b/themes/base16-woodland-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#bb90e2"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#bb90e2"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ca7f32"
diff --git a/themes/base16-woodland-light.json b/themes/base16-woodland-light.json
index bfb0cbc..d03aab7 100644
--- a/themes/base16-woodland-light.json
+++ b/themes/base16-woodland-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#bb90e2"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#bb90e2"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#ca7f32"
diff --git a/themes/base16-xcode-dusk-dark.json b/themes/base16-xcode-dusk-dark.json
index 29980db..814acb4 100644
--- a/themes/base16-xcode-dusk-dark.json
+++ b/themes/base16-xcode-dusk-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#B21889"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#B21889"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#786DC5"
diff --git a/themes/base16-xcode-dusk-light.json b/themes/base16-xcode-dusk-light.json
index f0944a9..a9face7 100644
--- a/themes/base16-xcode-dusk-light.json
+++ b/themes/base16-xcode-dusk-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#B21889"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#B21889"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#786DC5"
diff --git a/themes/base16-zenburn-dark.json b/themes/base16-zenburn-dark.json
index d7dc955..31c975a 100644
--- a/themes/base16-zenburn-dark.json
+++ b/themes/base16-zenburn-dark.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#dc8cc3"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#dc8cc3"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#dfaf8f"
diff --git a/themes/base16-zenburn-light.json b/themes/base16-zenburn-light.json
index 2650c14..c517bde 100644
--- a/themes/base16-zenburn-light.json
+++ b/themes/base16-zenburn-light.json
@@ -519,6 +519,19 @@
             "name": "Keyword, Storage",
             "scope": [
                 "keyword",
+                "keyword.other",
+                "keyword.other.using",
+                "keyword.other.namespace",
+                "keyword.other.class",
+                "keyword.other.new",
+                "keyword.other.event",
+                "keyword.other.this",
+                "keyword.other.await",
+                "keyword.other.var",
+                "keyword.other.package",
+                "keyword.other.import",
+                "variable.language.this",
+                "storage.type.ts",
                 "storage.modifier"
             ],
             "settings": {
@@ -538,26 +551,6 @@
                 "foreground": "#dc8cc3"
             }
         },
-        {
-            "name": "Keyword",
-            "scope": [
-                "keyword.other.using",
-                "keyword.other.namespace",
-                "keyword.other.class",
-                "keyword.other.new",
-                "keyword.other.event",
-                "keyword.other.this",
-                "keyword.other.await",
-                "keyword.other.var",
-                "keyword.other.package",
-                "keyword.other.import",
-                "variable.language.this",
-                "storage.type.ts"
-            ],
-            "settings": {
-                "foreground": "#dc8cc3"
-            }
-        },
         {
             "name": "Types, Primitives",
             "scope": [
@@ -657,8 +650,7 @@
                 "support.constant",
                 "constant.character",
                 "constant.escape",
-                "keyword.other.unit",
-                "keyword.other"
+                "keyword.other.unit"
             ],
             "settings": {
                 "foreground": "#dfaf8f"