diff --git a/editors/code/package.json b/editors/code/package.json
index d10cea8237..85fbbdea8f 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -1116,29 +1116,124 @@
             }
         ],
         "semanticTokenTypes": [
+            {
+                "id": "angle",
+                "description": "Style for < or >",
+                "superType": "punctuation"
+            },
+            {
+                "id": "arithmetic",
+                "description": "Style for arithmetic operators",
+                "superType": "operator"
+            },
             {
                 "id": "attribute",
                 "description": "Style for attributes"
             },
+            {
+                "id": "bitwise",
+                "description": "Style for bitwise operators",
+                "superType": "operator"
+            },
             {
                 "id": "boolean",
                 "description": "Style for boolean literals",
                 "superType": "keyword"
             },
+            {
+                "id": "brace",
+                "description": "Style for { or }",
+                "superType": "punctuation"
+            },
+            {
+                "id": "bracket",
+                "description": "Style for [ or ]",
+                "superType": "punctuation"
+            },
+            {
+                "id": "builtinAttribute",
+                "description": "Style for builtin attributes",
+                "superType": "attribute"
+            },
             {
                 "id": "builtinType",
                 "description": "Style for builtin types",
                 "superType": "type"
             },
+            {
+                "id": "char",
+                "description": "Style for character literals",
+                "superType": "type"
+            },
+            {
+                "id": "colon",
+                "description": "Style for :",
+                "superType": "punctuation"
+            },
+            {
+                "id": "comma",
+                "description": "Style for ,",
+                "superType": "punctuation"
+            },
+            {
+                "id": "comparison",
+                "description": "Style for comparison operators",
+                "superType": "operator"
+            },
+            {
+                "id": "constParameter",
+                "description": "Style for const generics"
+            },
+            {
+                "id": "dot",
+                "description": "Style for .",
+                "superType": "punctuation"
+            },
+            {
+                "id": "escapeSequence",
+                "description": "Style for char escapes in strings"
+            },
+            {
+                "id": "formatSpecifier",
+                "description": "Style for {} placeholders in format strings"
+            },
+            {
+                "id": "label",
+                "description": "Style for labels"
+            },
             {
                 "id": "lifetime",
                 "description": "Style for lifetimes"
             },
+            {
+                "id": "logical",
+                "description": "Style for logic operators",
+                "superType": "operator"
+            },
+            {
+                "id": "operator",
+                "description": "Style for operators",
+                "superType": "punctuation"
+            },
+            {
+                "id": "parenthesis",
+                "description": "Style for ( or )",
+                "superType": "punctuation"
+            },
+            {
+                "id": "punctuation",
+                "description": "Style for generic punctuation"
+            },
             {
                 "id": "selfKeyword",
                 "description": "Style for the self keyword",
                 "superType": "keyword"
             },
+            {
+                "id": "semicolon",
+                "description": "Style for ;",
+                "superType": "punctuation"
+            },
             {
                 "id": "typeAlias",
                 "description": "Style for type aliases",
@@ -1152,54 +1247,6 @@
             {
                 "id": "unresolvedReference",
                 "description": "Style for names which can not be resolved due to compilation errors"
-            },
-            {
-                "id": "formatSpecifier",
-                "description": "Style for {} placeholders in format strings"
-            },
-            {
-                "id": "punctuation",
-                "description": "generic punctuation"
-            },
-            {
-                "id": "parenthesis",
-                "description": "( or )",
-                "superType": "punctuation"
-            },
-            {
-                "id": "bracket",
-                "description": "[ or ]",
-                "superType": "punctuation"
-            },
-            {
-                "id": "brace",
-                "description": "{ or }",
-                "superType": "punctuation"
-            },
-            {
-                "id": "angle",
-                "description": "< or >",
-                "superType": "punctuation"
-            },
-            {
-                "id": "comma",
-                "description": ",",
-                "superType": "punctuation"
-            },
-            {
-                "id": "colon",
-                "description": ":",
-                "superType": "punctuation"
-            },
-            {
-                "id": "semicolon",
-                "description": ";",
-                "superType": "punctuation"
-            },
-            {
-                "id": "dot",
-                "description": ".",
-                "superType": "punctuation"
             }
         ],
         "semanticTokenModifiers": [
@@ -1211,14 +1258,14 @@
                 "id": "attribute",
                 "description": "Style for elements within attributes"
             },
-            {
-                "id": "constant",
-                "description": "Style for compile-time constants"
-            },
             {
                 "id": "callable",
                 "description": "Style for locals whose types implements one of the `Fn*` traits"
             },
+            {
+                "id": "constant",
+                "description": "Style for compile-time constants"
+            },
             {
                 "id": "consuming",
                 "description": "Style for locals that are being consumed when use in a function call"
@@ -1228,8 +1275,8 @@
                 "description": "Style for control-flow related tokens, this includes the `?` operator"
             },
             {
-                "id": "definition",
-                "description": "Style for mutable bindings"
+                "id": "crateRoot",
+                "description": "Style for names resolving to a crate root"
             },
             {
                 "id": "injected",