diff --git a/packages/calcite-design-tokens/src/tokens/core/color.json b/packages/calcite-design-tokens/src/tokens/core/color.json
index 22f3b4c7752..bbe8099c005 100644
--- a/packages/calcite-design-tokens/src/tokens/core/color.json
+++ b/packages/calcite-design-tokens/src/tokens/core/color.json
@@ -6,648 +6,189 @@
           "value": "#ffffff",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "neutral",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "blk",
-              "state": "",
-              "scale": "000",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "blk-005": {
           "value": "#f8f8f8",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "neutral",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "blk",
-              "state": "",
-              "scale": "005",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "blk-010": {
           "value": "#f3f3f3",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "neutral",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "blk",
-              "state": "",
-              "scale": "010",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "blk-020": {
           "value": "#eaeaea",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "neutral",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "blk",
-              "state": "",
-              "scale": "020",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "blk-030": {
           "value": "#dfdfdf",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "neutral",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "blk",
-              "state": "",
-              "scale": "030",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "blk-040": {
           "value": "#d4d4d4",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "neutral",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "blk",
-              "state": "",
-              "scale": "040",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "blk-050": {
           "value": "#cacaca",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "neutral",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "blk",
-              "state": "",
-              "scale": "050",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "blk-060": {
           "value": "#bfbfbf",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "neutral",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "blk",
-              "state": "",
-              "scale": "060",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "blk-070": {
           "value": "#b5b5b5",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "neutral",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "blk",
-              "state": "",
-              "scale": "070",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "blk-080": {
           "value": "#aaaaaa",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "neutral",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "blk",
-              "state": "",
-              "scale": "080",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "blk-090": {
           "value": "#9f9f9f",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "neutral",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "blk",
-              "state": "",
-              "scale": "090",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "blk-100": {
           "value": "#949494",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "neutral",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "blk",
-              "state": "",
-              "scale": "100",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "blk-110": {
           "value": "#8a8a8a",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "neutral",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "blk",
-              "state": "",
-              "scale": "110",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "blk-120": {
           "value": "#808080",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "neutral",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "blk",
-              "state": "",
-              "scale": "120",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "blk-130": {
           "value": "#757575",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "neutral",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "blk",
-              "state": "",
-              "scale": "130",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "blk-140": {
           "value": "#6a6a6a",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "neutral",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "blk",
-              "state": "",
-              "scale": "140",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "blk-150": {
           "value": "#606060",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "neutral",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "blk",
-              "state": "",
-              "scale": "150",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "blk-160": {
           "value": "#555555",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "neutral",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "blk",
-              "state": "",
-              "scale": "160",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "blk-170": {
           "value": "#4a4a4a",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "neutral",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "blk",
-              "state": "",
-              "scale": "170",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "blk-180": {
           "value": "#404040",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "neutral",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "blk",
-              "state": "",
-              "scale": "180",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "blk-190": {
           "value": "#353535",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "neutral",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "blk",
-              "state": "",
-              "scale": "190",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "blk-200": {
           "value": "#2b2b2b",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "neutral",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "blk",
-              "state": "",
-              "scale": "200",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "blk-210": {
           "value": "#202020",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "neutral",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "blk",
-              "state": "",
-              "scale": "210",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "blk-220": {
           "value": "#151515",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "neutral",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "blk",
-              "state": "",
-              "scale": "220",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "blk-230": {
           "value": "#0b0b0b",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "neutral",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "blk",
-              "state": "",
-              "scale": "230",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "blk-235": {
           "value": "#060606",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "neutral",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "blk",
-              "state": "",
-              "scale": "235",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "blk-240": {
           "value": "#000000",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "neutral",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "blk",
-              "state": "",
-              "scale": "240",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         }
       },
@@ -657,240 +198,70 @@
             "value": "#c7eaff",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "blue",
-                "state": "",
-                "scale": "010",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-bb-020": {
             "value": "#9fd4f3",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "blue",
-                "state": "",
-                "scale": "020",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-bb-030": {
             "value": "#77bde7",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "blue",
-                "state": "",
-                "scale": "030",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-bb-040": {
             "value": "#50a7da",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "blue",
-                "state": "",
-                "scale": "040",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-bb-050": {
             "value": "#2890ce",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "blue",
-                "state": "",
-                "scale": "050",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-bb-060": {
             "value": "#007ac2",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "blue",
-                "state": "",
-                "scale": "060",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-bb-070": {
             "value": "#00619b",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "blue",
-                "state": "",
-                "scale": "070",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-bb-080": {
             "value": "#004874",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "blue",
-                "state": "",
-                "scale": "080",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-bb-090": {
             "value": "#00304d",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "blue",
-                "state": "",
-                "scale": "090",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-bb-100": {
             "value": "#001726",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "blue",
-                "state": "",
-                "scale": "100",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         },
@@ -899,240 +270,70 @@
             "value": "#cef5f4",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "green-blue",
-                "state": "",
-                "scale": "010",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-gb-020": {
             "value": "#afedec",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "green-blue",
-                "state": "",
-                "scale": "020",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-gb-030": {
             "value": "#8fe6e5",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "green-blue",
-                "state": "",
-                "scale": "030",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-gb-040": {
             "value": "#5ae0de",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "green-blue",
-                "state": "",
-                "scale": "040",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-gb-050": {
             "value": "#28cecb",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "green-blue",
-                "state": "",
-                "scale": "050",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-gb-060": {
             "value": "#00bab5",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "green-blue",
-                "state": "",
-                "scale": "060",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-gb-070": {
             "value": "#009b98",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "green-blue",
-                "state": "",
-                "scale": "070",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-gb-080": {
             "value": "#007472",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "green-blue",
-                "state": "",
-                "scale": "080",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-gb-090": {
             "value": "#004d4c",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "green-blue",
-                "state": "",
-                "scale": "090",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-gb-100": {
             "value": "#002625",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "green-blue",
-                "state": "",
-                "scale": "100",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         },
@@ -1141,240 +342,70 @@
             "value": "#bdf2c4",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "green",
-                "state": "",
-                "scale": "010",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-gg-020": {
             "value": "#a2e4ab",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "green",
-                "state": "",
-                "scale": "020",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-gg-030": {
             "value": "#87d692",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "green",
-                "state": "",
-                "scale": "030",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-gg-040": {
             "value": "#6bc878",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "green",
-                "state": "",
-                "scale": "040",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-gg-050": {
             "value": "#50ba5f",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "green",
-                "state": "",
-                "scale": "050",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-gg-060": {
             "value": "#35ac46",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "green",
-                "state": "",
-                "scale": "060",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-gg-070": {
             "value": "#288835",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "green",
-                "state": "",
-                "scale": "070",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-gg-080": {
             "value": "#1a6324",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "green",
-                "state": "",
-                "scale": "080",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-gg-090": {
             "value": "#0d3f14",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "green",
-                "state": "",
-                "scale": "090",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-gg-100": {
             "value": "#001a03",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "green",
-                "state": "",
-                "scale": "100",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         },
@@ -1383,240 +414,70 @@
             "value": "#e5f7b4",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "yellow-green",
-                "state": "",
-                "scale": "010",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-yg-020": {
             "value": "#d9ef9f",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "yellow-green",
-                "state": "",
-                "scale": "020",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-yg-030": {
             "value": "#cde78a",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "yellow-green",
-                "state": "",
-                "scale": "030",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-yg-040": {
             "value": "#c2e075",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "yellow-green",
-                "state": "",
-                "scale": "040",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-yg-050": {
             "value": "#b6d860",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "yellow-green",
-                "state": "",
-                "scale": "050",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-yg-060": {
             "value": "#aad04b",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "yellow-green",
-                "state": "",
-                "scale": "060",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-yg-070": {
             "value": "#84a338",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "yellow-green",
-                "state": "",
-                "scale": "070",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-yg-080": {
             "value": "#5e7526",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "yellow-green",
-                "state": "",
-                "scale": "080",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-yg-090": {
             "value": "#384813",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "yellow-green",
-                "state": "",
-                "scale": "090",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-yg-100": {
             "value": "#121a00",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "yellow-green",
-                "state": "",
-                "scale": "100",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         },
@@ -1625,240 +486,70 @@
             "value": "#fff7cc",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "yellow",
-                "state": "",
-                "scale": "010",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-yy-020": {
             "value": "#fef3ad",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "yellow",
-                "state": "",
-                "scale": "020",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-yy-030": {
             "value": "#fcee8d",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "yellow",
-                "state": "",
-                "scale": "030",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-yy-040": {
             "value": "#fbea6e",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "yellow",
-                "state": "",
-                "scale": "040",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-yy-050": {
             "value": "#f9e54e",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "yellow",
-                "state": "",
-                "scale": "050",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-yy-060": {
             "value": "#edd317",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "yellow",
-                "state": "",
-                "scale": "060",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-yy-070": {
             "value": "#d9bc00",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "yellow",
-                "state": "",
-                "scale": "070",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-yy-080": {
             "value": "#bfa200",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "yellow",
-                "state": "",
-                "scale": "080",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-yy-090": {
             "value": "#8c7500",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "yellow",
-                "state": "",
-                "scale": "090",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-yy-100": {
             "value": "#5c4e00",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "yellow",
-                "state": "",
-                "scale": "100",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         },
@@ -1867,240 +558,70 @@
             "value": "#ffe2bf",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "orange-yellow",
-                "state": "",
-                "scale": "010",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-oy-020": {
             "value": "#fed3a1",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "orange-yellow",
-                "state": "",
-                "scale": "020",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-oy-030": {
             "value": "#fcc582",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "orange-yellow",
-                "state": "",
-                "scale": "030",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-oy-040": {
             "value": "#fbb664",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "orange-yellow",
-                "state": "",
-                "scale": "040",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-oy-050": {
             "value": "#f9a845",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "orange-yellow",
-                "state": "",
-                "scale": "050",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-oy-060": {
             "value": "#f89927",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "orange-yellow",
-                "state": "",
-                "scale": "060",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-oy-070": {
             "value": "#c67718",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "orange-yellow",
-                "state": "",
-                "scale": "070",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-oy-080": {
             "value": "#9a5b10",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "orange-yellow",
-                "state": "",
-                "scale": "080",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-oy-090": {
             "value": "#6d3f08",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "orange-yellow",
-                "state": "",
-                "scale": "090",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-oy-100": {
             "value": "#402300",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "orange-yellow",
-                "state": "",
-                "scale": "100",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         },
@@ -2109,240 +630,70 @@
             "value": "#ffd8bf",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "orange",
-                "state": "",
-                "scale": "010",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-oo-020": {
             "value": "#fdc39f",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "orange",
-                "state": "",
-                "scale": "020",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-oo-030": {
             "value": "#faae7f",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "orange",
-                "state": "",
-                "scale": "030",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-oo-040": {
             "value": "#f89960",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "orange",
-                "state": "",
-                "scale": "040",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-oo-050": {
             "value": "#f58440",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "orange",
-                "state": "",
-                "scale": "050",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-oo-060": {
             "value": "#f36f20",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "orange",
-                "state": "",
-                "scale": "060",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-oo-070": {
             "value": "#c65a18",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "orange",
-                "state": "",
-                "scale": "070",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-oo-080": {
             "value": "#9a4410",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "orange",
-                "state": "",
-                "scale": "080",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-oo-090": {
             "value": "#6d2f08",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "orange",
-                "state": "",
-                "scale": "090",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-oo-100": {
             "value": "#401900",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "orange",
-                "state": "",
-                "scale": "100",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         },
@@ -2351,240 +702,70 @@
             "value": "#ffc7b3",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "red-orange",
-                "state": "",
-                "scale": "010",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-ro-020": {
             "value": "#f8af95",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "red-orange",
-                "state": "",
-                "scale": "020",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-ro-030": {
             "value": "#f09677",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "red-orange",
-                "state": "",
-                "scale": "030",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-ro-040": {
             "value": "#e97e5a",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "red-orange",
-                "state": "",
-                "scale": "040",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-ro-050": {
             "value": "#e1653c",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "red-orange",
-                "state": "",
-                "scale": "050",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-ro-060": {
             "value": "#da4d1e",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "red-orange",
-                "state": "",
-                "scale": "060",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-ro-070": {
             "value": "#ad3c16",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "red-orange",
-                "state": "",
-                "scale": "070",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-ro-080": {
             "value": "#802c0f",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "red-orange",
-                "state": "",
-                "scale": "080",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-ro-090": {
             "value": "#531b07",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "red-orange",
-                "state": "",
-                "scale": "090",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-ro-100": {
             "value": "#260a00",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "red-orange",
-                "state": "",
-                "scale": "100",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         },
@@ -2593,240 +774,70 @@
             "value": "#ffc6bf",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "red",
-                "state": "",
-                "scale": "010",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-rr-020": {
             "value": "#ffaaa1",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "red",
-                "state": "",
-                "scale": "020",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-rr-030": {
             "value": "#f2877b",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "red",
-                "state": "",
-                "scale": "030",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-rr-040": {
             "value": "#f07062",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "red",
-                "state": "",
-                "scale": "040",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-rr-050": {
             "value": "#e65240",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "red",
-                "state": "",
-                "scale": "050",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-rr-060": {
             "value": "#d83020",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "red",
-                "state": "",
-                "scale": "060",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-rr-070": {
             "value": "#a82b1e",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "red",
-                "state": "",
-                "scale": "070",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-rr-080": {
             "value": "#7c1d13",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "red",
-                "state": "",
-                "scale": "080",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-rr-090": {
             "value": "#4f0e08",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "red",
-                "state": "",
-                "scale": "090",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-rr-100": {
             "value": "#210300",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "red",
-                "state": "",
-                "scale": "100",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         },
@@ -2835,240 +846,70 @@
             "value": "#ffd1ef",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "pink",
-                "state": "",
-                "scale": "010",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-pk-020": {
             "value": "#fabee4",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "pink",
-                "state": "",
-                "scale": "020",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-pk-030": {
             "value": "#f2a5d6",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "pink",
-                "state": "",
-                "scale": "030",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-pk-040": {
             "value": "#eb8dc9",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "pink",
-                "state": "",
-                "scale": "040",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-pk-050": {
             "value": "#e673bb",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "pink",
-                "state": "",
-                "scale": "050",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-pk-060": {
             "value": "#e04ea6",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "pink",
-                "state": "",
-                "scale": "060",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-pk-070": {
             "value": "#ba2f7e",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "pink",
-                "state": "",
-                "scale": "070",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-pk-080": {
             "value": "#851b52",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "pink",
-                "state": "",
-                "scale": "080",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-pk-090": {
             "value": "#590b32",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "pink",
-                "state": "",
-                "scale": "090",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-pk-100": {
             "value": "#260404",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "pink",
-                "state": "",
-                "scale": "100",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         },
@@ -3077,240 +918,70 @@
             "value": "#fadbff",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "violet-red",
-                "state": "",
-                "scale": "010",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-vr-020": {
             "value": "#e4beeb",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "violet-red",
-                "state": "",
-                "scale": "020",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-vr-030": {
             "value": "#cfa1d7",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "violet-red",
-                "state": "",
-                "scale": "030",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-vr-040": {
             "value": "#b983c3",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "violet-red",
-                "state": "",
-                "scale": "040",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-vr-050": {
             "value": "#a466af",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "violet-red",
-                "state": "",
-                "scale": "050",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-vr-060": {
             "value": "#8e499b",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "violet-red",
-                "state": "",
-                "scale": "060",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-vr-070": {
             "value": "#73377e",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "violet-red",
-                "state": "",
-                "scale": "070",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-vr-080": {
             "value": "#572561",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "violet-red",
-                "state": "",
-                "scale": "080",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-vr-090": {
             "value": "#3c1243",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "violet-red",
-                "state": "",
-                "scale": "090",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-vr-100": {
             "value": "#200026",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "violet-red",
-                "state": "",
-                "scale": "100",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         },
@@ -3319,240 +990,70 @@
             "value": "#e8d9ff",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "violet",
-                "state": "",
-                "scale": "010",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-vv-020": {
             "value": "#cdb9eb",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "violet",
-                "state": "",
-                "scale": "020",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-vv-030": {
             "value": "#b39ad7",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "violet",
-                "state": "",
-                "scale": "030",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-vv-040": {
             "value": "#987ac3",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "violet",
-                "state": "",
-                "scale": "040",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-vv-050": {
             "value": "#7e5baf",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "violet",
-                "state": "",
-                "scale": "050",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-vv-060": {
             "value": "#633b9b",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "violet",
-                "state": "",
-                "scale": "060",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-vv-070": {
             "value": "#4e2c7e",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "violet",
-                "state": "",
-                "scale": "070",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-vv-080": {
             "value": "#3a1e61",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "violet",
-                "state": "",
-                "scale": "080",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-vv-090": {
             "value": "#250f43",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "violet",
-                "state": "",
-                "scale": "090",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "h-vv-100": {
             "value": "#100026",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "high-saturation",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "violet",
-                "state": "",
-                "scale": "100",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         }
@@ -3563,96 +1064,28 @@
             "value": "#59d6ff",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "blue",
-                "state": "",
-                "scale": "120",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "v-bb-140": {
             "value": "#3db8ff",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "blue",
-                "state": "",
-                "scale": "140",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "v-bb-160": {
             "value": "#009af2",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "blue",
-                "state": "",
-                "scale": "160",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "v-bb-180": {
             "value": "#009af2",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "blue",
-                "state": "",
-                "scale": "180",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         },
@@ -3661,96 +1094,28 @@
             "value": "#59fffc",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "green-blue",
-                "state": "",
-                "scale": "120",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "v-gb-140": {
             "value": "#00f7f3",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "green-blue",
-                "state": "",
-                "scale": "140",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "v-gb-160": {
             "value": "#00e6e2",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "green-blue",
-                "state": "",
-                "scale": "160",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "v-gb-180": {
             "value": "#00cfca",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "green-blue",
-                "state": "",
-                "scale": "180",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         },
@@ -3759,96 +1124,28 @@
             "value": "#73ff84",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "green",
-                "state": "",
-                "scale": "120",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "v-gg-140": {
             "value": "#3bed52",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "green",
-                "state": "",
-                "scale": "140",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "v-gg-160": {
             "value": "#00b81b",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "green",
-                "state": "",
-                "scale": "160",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "v-gg-180": {
             "value": "#00a118",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "green",
-                "state": "",
-                "scale": "180",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         },
@@ -3857,96 +1154,28 @@
             "value": "#d7ff73",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "yellow-green",
-                "state": "",
-                "scale": "120",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "v-yg-140": {
             "value": "#bbed3b",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "yellow-green",
-                "state": "",
-                "scale": "140",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "v-yg-160": {
             "value": "#96cc00",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "yellow-green",
-                "state": "",
-                "scale": "160",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "v-yg-180": {
             "value": "#7fab00",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "yellow-green",
-                "state": "",
-                "scale": "180",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         },
@@ -3955,96 +1184,28 @@
             "value": "#fff766",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "yellow",
-                "state": "",
-                "scale": "120",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "v-yy-140": {
             "value": "#ffee33",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "yellow",
-                "state": "",
-                "scale": "140",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "v-yy-160": {
             "value": "#f5d000",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "yellow",
-                "state": "",
-                "scale": "160",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "v-yy-180": {
             "value": "#ebba17",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "yellow",
-                "state": "",
-                "scale": "180",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         },
@@ -4053,96 +1214,28 @@
             "value": "#ffb54d",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "orange-yellow",
-                "state": "",
-                "scale": "120",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "v-oy-140": {
             "value": "#ff9500",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "orange-yellow",
-                "state": "",
-                "scale": "140",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "v-oy-160": {
             "value": "#e68600",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "orange-yellow",
-                "state": "",
-                "scale": "160",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "v-oy-180": {
             "value": "#d17300",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "orange-yellow",
-                "state": "",
-                "scale": "180",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         },
@@ -4151,96 +1244,28 @@
             "value": "#ff824d",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "red-orange",
-                "state": "",
-                "scale": "120",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "v-ro-140": {
             "value": "#ff4d00",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "red-orange",
-                "state": "",
-                "scale": "140",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "v-ro-160": {
             "value": "#de4300",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "red-orange",
-                "state": "",
-                "scale": "160",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "v-ro-180": {
             "value": "#c93b00",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "red-orange",
-                "state": "",
-                "scale": "180",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         },
@@ -4249,96 +1274,28 @@
             "value": "#ff624d",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "red",
-                "state": "",
-                "scale": "120",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "v-rr-140": {
             "value": "#ff0015",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "red",
-                "state": "",
-                "scale": "140",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "v-rr-160": {
             "value": "#d90012",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "red",
-                "state": "",
-                "scale": "160",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "v-rr-180": {
             "value": "#b3000f",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "red",
-                "state": "",
-                "scale": "180",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         },
@@ -4347,96 +1304,28 @@
             "value": "#ff66c2",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "pink",
-                "state": "",
-                "scale": "120",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "v-pk-140": {
             "value": "#ff19a4",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "pink",
-                "state": "",
-                "scale": "140",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "v-pk-160": {
             "value": "#d11486",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "pink",
-                "state": "",
-                "scale": "160",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "v-pk-180": {
             "value": "#c00073",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "pink",
-                "state": "",
-                "scale": "180",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         },
@@ -4445,96 +1334,28 @@
             "value": "#ea80ff",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "violet-red",
-                "state": "",
-                "scale": "120",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "v-vr-140": {
             "value": "#dd33ff",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "violet-red",
-                "state": "",
-                "scale": "140",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "v-vr-160": {
             "value": "#ac08cc",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "violet-red",
-                "state": "",
-                "scale": "160",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "v-vr-180": {
             "value": "#83009e",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "violet-red",
-                "state": "",
-                "scale": "180",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         },
@@ -4543,96 +1364,28 @@
             "value": "#b580ff",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "violet",
-                "state": "",
-                "scale": "120",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "v-vv-140": {
             "value": "#974dff",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "violet",
-                "state": "",
-                "scale": "140",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "v-vv-160": {
             "value": "#8129ff",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "violet",
-                "state": "",
-                "scale": "160",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "v-vv-180": {
             "value": "#6a0be6",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "vibrant",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "violet",
-                "state": "",
-                "scale": "180",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         }
@@ -4643,72 +1396,21 @@
             "value": "#44ED51",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "dark",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "green",
-                "state": "",
-                "scale": "410",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "d-gg-420": {
             "value": "#36DA43",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "dark",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "green",
-                "state": "",
-                "scale": "420",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "d-gg-430": {
             "value": "#36DA43",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "dark",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "green",
-                "state": "",
-                "scale": "430",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         },
@@ -4717,72 +1419,21 @@
             "value": "#FFE24D",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "dark",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "yellow",
-                "state": "",
-                "scale": "410",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "d-yy-420": {
             "value": "#FFC900",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "dark",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "yellow",
-                "state": "",
-                "scale": "420",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "d-yy-430": {
             "value": "#F4B000",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "dark",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "yellow",
-                "state": "",
-                "scale": "430",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         },
@@ -4791,72 +1442,21 @@
             "value": "#FF7465",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "dark",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "red",
-                "state": "",
-                "scale": "410",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "d-rr-420": {
             "value": "#FE583E",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "dark",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "red",
-                "state": "",
-                "scale": "420",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "d-rr-430": {
             "value": "#F3381B",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "dark",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "red",
-                "state": "",
-                "scale": "430",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         },
@@ -4865,72 +1465,21 @@
             "value": "#47BBFF",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "dark",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "blue",
-                "state": "",
-                "scale": "410",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "d-bb-420": {
             "value": "#00A0FF",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "dark",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "blue",
-                "state": "",
-                "scale": "420",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "d-bb-430": {
             "value": "#0087D7",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "core",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "dark",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "blue",
-                "state": "",
-                "scale": "430",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         }
diff --git a/packages/calcite-design-tokens/src/tokens/core/container-size.json b/packages/calcite-design-tokens/src/tokens/core/container-size.json
index 2bde7ad6527..39e28c561f7 100644
--- a/packages/calcite-design-tokens/src/tokens/core/container-size.json
+++ b/packages/calcite-design-tokens/src/tokens/core/container-size.json
@@ -5,264 +5,77 @@
         "value": 0,
         "type": "sizing",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "breakpoint",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "0",
-            "context": "",
-            "mode": ""
-          }
+          "category": "breakpoint"
         }
       },
       "154": {
         "value": 154,
         "type": "sizing",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "breakpoint",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "154",
-            "context": "",
-            "mode": ""
-          }
+          "category": "breakpoint"
         }
       },
       "320": {
         "value": 320,
         "type": "sizing",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "breakpoint",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "320",
-            "context": "",
-            "mode": ""
-          }
+          "category": "breakpoint"
         }
       },
       "328": {
         "value": 328,
         "type": "sizing",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "breakpoint",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "328",
-            "context": "",
-            "mode": ""
-          }
+          "category": "breakpoint"
         }
       },
       "476": {
         "value": 476,
         "type": "sizing",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "breakpoint",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "476",
-            "context": "",
-            "mode": ""
-          }
+          "category": "breakpoint"
         }
       },
       "504": {
         "value": 504,
         "type": "sizing",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "breakpoint",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "504",
-            "context": "",
-            "mode": ""
-          }
+          "category": "breakpoint"
         }
       },
       "678": {
         "value": 678,
         "type": "sizing",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "breakpoint",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "678",
-            "context": "",
-            "mode": ""
-          }
+          "category": "breakpoint"
         }
       },
       "768": {
         "value": 768,
         "type": "sizing",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "breakpoint",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "768",
-            "context": "",
-            "mode": ""
-          }
+          "category": "breakpoint"
         }
       },
       "854": {
         "value": 854,
         "type": "sizing",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "breakpoint",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "854",
-            "context": "",
-            "mode": ""
-          }
+          "category": "breakpoint"
         }
       },
       "1152": {
         "value": 1152,
         "type": "sizing",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "breakpoint",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "1152",
-            "context": "",
-            "mode": ""
-          }
+          "category": "breakpoint"
         }
       },
       "1440": {
         "value": 1440,
         "type": "sizing",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "breakpoint",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "1440",
-            "context": "",
-            "mode": ""
-          }
+          "category": "breakpoint"
         }
       }
     }
diff --git a/packages/calcite-design-tokens/src/tokens/core/font.json b/packages/calcite-design-tokens/src/tokens/core/font.json
index ac4cdb50425..7d299df6c55 100644
--- a/packages/calcite-design-tokens/src/tokens/core/font.json
+++ b/packages/calcite-design-tokens/src/tokens/core/font.json
@@ -7,72 +7,21 @@
           "type": "fontFamilies",
           "description": "Fallback for Monaco",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "family",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "andaleMono",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "avenirNextPro": {
           "value": "Avenir Next LT Pro",
           "type": "fontFamilies",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "family",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "avenirNextPro",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "avenirNextWorld": {
           "value": "Avenir Next World",
           "type": "fontFamilies",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "family",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "avenirNextWorld",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "avenirNext": {
@@ -80,24 +29,7 @@
           "type": "fontFamilies",
           "description": "Primary font family",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "family",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "avenirNext",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "avenir": {
@@ -105,24 +37,7 @@
           "type": "fontFamilies",
           "description": "Fallback for Avenir Next",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "family",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "avenir",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "consolas": {
@@ -130,24 +45,7 @@
           "type": "fontFamilies",
           "description": "Fallback for Monaco",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "family",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "consolas",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "helveticaNeue": {
@@ -155,24 +53,7 @@
           "type": "fontFamilies",
           "description": "Fallback for Avenir Next",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "family",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "helveticaNeue",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "lucidaConsole": {
@@ -180,48 +61,14 @@
           "type": "fontFamilies",
           "description": "Fallback for Monaco",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "family",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "lucidaConsole",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "monaco": {
           "value": "Monaco",
           "type": "fontFamilies",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "family",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "monaco",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "monospace": {
@@ -229,24 +76,7 @@
           "type": "fontFamilies",
           "description": "Fallback for Monaco",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "family",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "monospace",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "sansSerif": {
@@ -254,24 +84,7 @@
           "type": "fontFamilies",
           "description": "Fallback for Avenir Next",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "family",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "sansSerif",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         }
       },
@@ -281,24 +94,7 @@
           "type": "fontStyle",
           "description": "used in ratings",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "style",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "italic",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         }
       },
@@ -308,48 +104,14 @@
           "type": "fontWeights",
           "description": "only for Avenir Next World (secondary font family)",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "weight",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "ultra-light",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "thin": {
           "value": "Thin",
           "type": "fontWeights",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "weight",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "thin",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "light": {
@@ -361,120 +123,35 @@
           "value": "Regular",
           "type": "fontWeights",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "weight",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "regular",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "medium": {
           "value": "Medium",
           "type": "fontWeights",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "weight",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "medium",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "medium-italic": {
           "value": "Medium Italic",
           "type": "fontWeights",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "weight",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "medium-italic",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "demi": {
           "value": "Demi",
           "type": "fontWeights",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "weight",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "demi",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "bold": {
           "value": "Bold",
           "type": "fontWeights",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "property": "weight",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "variant": "bold",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "extrabold": {
@@ -482,24 +159,7 @@
           "type": "fontWeights",
           "description": "only for Avenir Next World (secondary font family)",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "weight",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "extra-bold",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "black": {
@@ -507,48 +167,14 @@
           "type": "fontWeights",
           "description": "only for Avenir Next World (secondary font family)",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "weight",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "black",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "heavy": {
           "value": "Heavy",
           "type": "fontWeights",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "weight",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "heavy",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         }
       },
@@ -558,24 +184,7 @@
           "type": "textDecoration",
           "description": "Deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "text-decoration",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "none",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "underline": {
@@ -583,24 +192,7 @@
           "type": "textDecoration",
           "description": "Deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "text-decoration",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "underline",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         }
       },
@@ -610,24 +202,7 @@
           "type": "textCase",
           "description": "Deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "text-case",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "none",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "uppercase": {
@@ -635,24 +210,7 @@
           "type": "textCase",
           "description": "Deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "text-case",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "uppercase",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "lowercase": {
@@ -660,24 +218,7 @@
           "type": "textCase",
           "description": "Deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "text-case",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "lowercase",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "capitalize": {
@@ -685,24 +226,7 @@
           "type": "textCase",
           "description": "Deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "text-case",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "capitalize",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         }
       }
diff --git a/packages/calcite-design-tokens/src/tokens/core/opacity.json b/packages/calcite-design-tokens/src/tokens/core/opacity.json
index c66f5b68c8f..27879901fa3 100644
--- a/packages/calcite-design-tokens/src/tokens/core/opacity.json
+++ b/packages/calcite-design-tokens/src/tokens/core/opacity.json
@@ -5,384 +5,112 @@
         "value": "0%",
         "type": "opacity",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "opacity",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "0",
-            "context": "",
-            "mode": ""
-          }
+          "category": "opacity"
         }
       },
       "4": {
         "value": "4%",
         "type": "opacity",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "opacity",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "4",
-            "context": "",
-            "mode": ""
-          }
+          "category": "opacity"
         }
       },
       "8": {
         "value": "8%",
         "type": "opacity",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "opacity",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "8",
-            "context": "",
-            "mode": ""
-          }
+          "category": "opacity"
         }
       },
       "10": {
         "value": "10%",
         "type": "opacity",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "opacity",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "10",
-            "context": "",
-            "mode": ""
-          }
+          "category": "opacity"
         }
       },
       "20": {
         "value": "20%",
         "type": "opacity",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "opacity",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "20",
-            "context": "",
-            "mode": ""
-          }
+          "category": "opacity"
         }
       },
       "30": {
         "value": "30%",
         "type": "opacity",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "opacity",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "30",
-            "context": "",
-            "mode": ""
-          }
+          "category": "opacity"
         }
       },
       "40": {
         "value": "40%",
         "type": "opacity",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "opacity",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "40",
-            "context": "",
-            "mode": ""
-          }
+          "category": "opacity"
         }
       },
       "50": {
         "value": "50%",
         "type": "opacity",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "opacity",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "50",
-            "context": "",
-            "mode": ""
-          }
+          "category": "opacity"
         }
       },
       "60": {
         "value": "60%",
         "type": "opacity",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "opacity",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "60",
-            "context": "",
-            "mode": ""
-          }
+          "category": "opacity"
         }
       },
       "70": {
         "value": "70%",
         "type": "opacity",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "opacity",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "70",
-            "context": "",
-            "mode": ""
-          }
+          "category": "opacity"
         }
       },
       "80": {
         "value": "80%",
         "type": "opacity",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "opacity",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "80",
-            "context": "",
-            "mode": ""
-          }
+          "category": "opacity"
         }
       },
       "85": {
         "value": "85%",
         "type": "opacity",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "opacity",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "85",
-            "context": "",
-            "mode": ""
-          }
+          "category": "opacity"
         }
       },
       "90": {
         "value": "90%",
         "type": "opacity",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "opacity",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "90",
-            "context": "",
-            "mode": ""
-          }
+          "category": "opacity"
         }
       },
       "92": {
         "value": "92%",
         "type": "opacity",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "opacity",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "92",
-            "context": "",
-            "mode": ""
-          }
+          "category": "opacity"
         }
       },
       "96": {
         "value": "96%",
         "type": "opacity",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "opacity",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "96",
-            "context": "",
-            "mode": ""
-          }
+          "category": "opacity"
         }
       },
       "100": {
         "value": "100%",
         "type": "opacity",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "opacity",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "100",
-            "context": "",
-            "mode": ""
-          }
+          "category": "opacity"
         }
       }
     }
diff --git a/packages/calcite-design-tokens/src/tokens/core/shadow.json b/packages/calcite-design-tokens/src/tokens/core/shadow.json
index a08292561a6..87c6d473a32 100644
--- a/packages/calcite-design-tokens/src/tokens/core/shadow.json
+++ b/packages/calcite-design-tokens/src/tokens/core/shadow.json
@@ -11,24 +11,7 @@
         },
         "type": "boxShadow",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "shadow",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "0",
-            "context": "",
-            "mode": ""
-          }
+          "category": "shadow"
         }
       },
       "1": {
@@ -41,24 +24,7 @@
         },
         "type": "boxShadow",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "shadow",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "1",
-            "context": "",
-            "mode": ""
-          }
+          "category": "shadow"
         }
       },
       "2": {
@@ -71,24 +37,7 @@
         },
         "type": "boxShadow",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "shadow",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "2",
-            "context": "",
-            "mode": ""
-          }
+          "category": "shadow"
         }
       },
       "3": {
@@ -101,24 +50,7 @@
         },
         "type": "boxShadow",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "shadow",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "3",
-            "context": "",
-            "mode": ""
-          }
+          "category": "shadow"
         }
       },
       "4": {
@@ -131,24 +63,7 @@
         },
         "type": "boxShadow",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "shadow",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "4",
-            "context": "",
-            "mode": ""
-          }
+          "category": "shadow"
         }
       }
     }
diff --git a/packages/calcite-design-tokens/src/tokens/core/size.json b/packages/calcite-design-tokens/src/tokens/core/size.json
index 10dc87bf49e..38278101db4 100644
--- a/packages/calcite-design-tokens/src/tokens/core/size.json
+++ b/packages/calcite-design-tokens/src/tokens/core/size.json
@@ -6,744 +6,217 @@
           "value": "1px",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "default",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "1",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "2": {
           "value": "2px",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "default",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "2",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "4": {
           "value": "4px",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "default",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "4",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "6": {
           "value": "6px",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "default",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "6",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "8": {
           "value": "8px",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "default",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "8",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "10": {
           "value": "10px",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "default",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "10",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "12": {
           "value": "12px",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "default",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "12",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "14": {
           "value": "14px",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "default",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "14",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "16": {
           "value": "16px",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "default",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "16",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "20": {
           "value": "20px",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "default",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "20",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "24": {
           "value": "24px",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "default",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "24",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "28": {
           "value": "28px",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "default",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "28",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "32": {
           "value": "32px",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "default",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "32",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "36": {
           "value": "36px",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "default",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "36",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "40": {
           "value": "40px",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "default",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "40",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "44": {
           "value": "44px",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "default",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "44",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "48": {
           "value": "48px",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "default",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "48",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "56": {
           "value": "56px",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "default",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "56",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "64": {
           "value": "64px",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "default",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "64",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "72": {
           "value": "72px",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "default",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "72",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "80": {
           "value": "80px",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "default",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "80",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "96": {
           "value": "96px",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "default",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "96",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "112": {
           "value": "112px",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "default",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "112",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "128": {
           "value": "128px",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "default",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "128",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "144": {
           "value": "144px",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "default",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "144",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "160": {
           "value": "160px",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "default",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "160",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "192": {
           "value": "192px",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "default",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "162",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "224": {
           "value": "224px",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "default",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "224",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "256": {
           "value": "256px",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "default",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "256",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "288": {
           "value": "288px",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "default",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "288",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "none": {
           "value": "0",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "default",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "none",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         }
       },
@@ -752,192 +225,56 @@
           "value": "50%",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "relative",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": ".5",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "100": {
           "value": "100%",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "relative",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "1",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "125": {
           "value": "125%",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "relative",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "1.25",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "137": {
           "value": "137.5%",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "relative",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "1.375",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "150": {
           "value": "150%",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "relative",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "1.5",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "162": {
           "value": "162.5%",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "relative",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "1.625",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "200": {
           "value": "200%",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "relative",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "2",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "auto": {
           "value": "auto",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "core",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "relative",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "auto",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         }
       }
diff --git a/packages/calcite-design-tokens/src/tokens/core/z-index.json b/packages/calcite-design-tokens/src/tokens/core/z-index.json
index 1134922dc67..08e5845e83b 100644
--- a/packages/calcite-design-tokens/src/tokens/core/z-index.json
+++ b/packages/calcite-design-tokens/src/tokens/core/z-index.json
@@ -5,216 +5,63 @@
         "value": "-999999",
         "type": "z-index",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "z-index",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "0",
-            "context": "",
-            "mode": ""
-          }
+          "category": "z-index"
         }
       },
       "1": {
         "value": "1",
         "type": "z-index",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "z-index",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "1",
-            "context": "",
-            "mode": ""
-          }
+          "category": "z-index"
         }
       },
       "3": {
         "value": "300",
         "type": "z-index",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "z-index",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "3",
-            "context": "",
-            "mode": ""
-          }
+          "category": "z-index"
         }
       },
       "4": {
         "value": "400",
         "type": "z-index",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "z-index",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "4",
-            "context": "",
-            "mode": ""
-          }
+          "category": "z-index"
         }
       },
       "5": {
         "value": "500",
         "type": "z-index",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "z-index",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "5",
-            "context": "",
-            "mode": ""
-          }
+          "category": "z-index"
         }
       },
       "6": {
         "value": "600",
         "type": "z-index",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "z-index",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "6",
-            "context": "",
-            "mode": ""
-          }
+          "category": "z-index"
         }
       },
       "7": {
         "value": "700",
         "type": "z-index",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "z-index",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "7",
-            "context": "",
-            "mode": ""
-          }
+          "category": "z-index"
         }
       },
       "8": {
         "value": "800",
         "type": "z-index",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "z-index",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "8",
-            "context": "",
-            "mode": ""
-          }
+          "category": "z-index"
         }
       },
       "9": {
         "value": "900",
         "type": "z-index",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "core",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "z-index",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "9",
-            "context": "",
-            "mode": ""
-          }
+          "category": "z-index"
         }
       }
     }
diff --git a/packages/calcite-design-tokens/src/tokens/semantic/border.json b/packages/calcite-design-tokens/src/tokens/semantic/border.json
index d3e15ff9e56..94ca0aa78e3 100644
--- a/packages/calcite-design-tokens/src/tokens/semantic/border.json
+++ b/packages/calcite-design-tokens/src/tokens/semantic/border.json
@@ -6,96 +6,28 @@
           "value": "{core.size.default.none}",
           "type": "borderWidth",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "border",
-              "group": "width",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "none",
-              "context": "",
-              "mode": ""
-            }
+            "category": "border"
           }
         },
         "sm": {
           "value": "{core.size.default.1}",
           "type": "borderWidth",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "border",
-              "group": "width",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "sm",
-              "context": "",
-              "mode": ""
-            }
+            "category": "border"
           }
         },
         "md": {
           "value": "{core.size.default.2}",
           "type": "borderWidth",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "border",
-              "group": "width",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "md",
-              "context": "",
-              "mode": ""
-            }
+            "category": "border"
           }
         },
         "lg": {
           "value": "{core.size.default.4}",
           "type": "borderWidth",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "border",
-              "group": "width",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "lg",
-              "context": "",
-              "mode": ""
-            }
+            "category": "border"
           }
         }
       }
diff --git a/packages/calcite-design-tokens/src/tokens/semantic/color/dark.json b/packages/calcite-design-tokens/src/tokens/semantic/color/dark.json
index a482efc1869..77b76929aa9 100644
--- a/packages/calcite-design-tokens/src/tokens/semantic/color/dark.json
+++ b/packages/calcite-design-tokens/src/tokens/semantic/color/dark.json
@@ -6,48 +6,14 @@
           "value": "{core.color.neutral.blk-190}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "background",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "default",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "none": {
           "value": "rgba({core.color.neutral.blk-000}, {core.opacity.0})",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "background",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "none",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         }
       },
@@ -56,95 +22,28 @@
           "value": "{core.color.neutral.blk-200}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "element": "",
-              "category": "color",
-              "group": "foreground",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "1",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "2": {
           "value": "{core.color.neutral.blk-210}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "foreground",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "2",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "3": {
           "value": "{core.color.neutral.blk-220}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "foreground",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "3",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "current": {
           "value": "#214155",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "foreground",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "current",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         }
       },
@@ -154,72 +53,21 @@
             "value": "rgba({core.color.neutral.blk-000}, {core.opacity.0})",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "transparent",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "default",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "hover": {
             "value": "rgba({core.color.neutral.blk-000}, {core.opacity.4})",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "transparent",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "hover",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "press": {
             "value": "rgba({core.color.neutral.blk-000}, {core.opacity.8})",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "transparent",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "press",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         },
@@ -227,48 +75,14 @@
           "value": "rgba({core.color.neutral.blk-240}, {core.opacity.85})",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "transparent",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "scrim",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "tint": {
           "value": "rgba({core.color.neutral.blk-200}, {core.opacity.80})",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "transparent",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "tint",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         }
       },
@@ -278,72 +92,21 @@
             "value": "{core.color.vibrant.blue.v-bb-160}",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "brand",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "hover": {
             "value": "{core.color.high-saturation.blue.h-bb-060}",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "brand",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "hover",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "press": {
             "value": "{core.color.high-saturation.blue.h-bb-070}",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "brand",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "press",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         },
@@ -351,24 +114,7 @@
           "type": "color",
           "value": "rgba({core.color.dark.blue.d-bb-420}, {core.opacity.40})",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "brand",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "underline",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         }
       },
@@ -378,72 +124,21 @@
             "value": "{core.color.dark.blue.d-bb-420}",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "status",
-                "kind": "info",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "hover": {
             "value": "{core.color.vibrant.blue.v-bb-140}",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "status",
-                "kind": "info",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "hover",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "press": {
             "value": "{core.color.vibrant.blue.v-bb-160}",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "status",
-                "kind": "info",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "press",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         },
@@ -452,73 +147,20 @@
             "value": "{core.color.dark.green.d-gg-420}",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "status",
-                "kind": "success",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "default",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "hover": {
             "value": "{core.color.vibrant.green.v-gg-140}",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "status",
-                "kind": "success",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "hover",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "press": {
             "value": "{core.color.vibrant.green.v-gg-160}",
             "type": "color",
-            "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "status",
-                "kind": "success",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "press",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
-            }
+            "category": "color"
           }
         },
         "warning": {
@@ -526,73 +168,20 @@
             "value": "{core.color.dark.yellow.d-yy-420}",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "status",
-                "kind": "warning",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "default",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "hover": {
             "value": "{core.color.vibrant.yellow.v-yy-140}",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "status",
-                "kind": "warning",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "hover",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "press": {
             "value": "{core.color.vibrant.yellow.v-yy-160}",
             "type": "color",
-            "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "status",
-                "kind": "warning",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "press",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
-            }
+            "category": "color"
           }
         },
         "danger": {
@@ -600,72 +189,21 @@
             "value": "{core.color.dark.red.d-rr-420}",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "status",
-                "kind": "danger",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "default",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "hover": {
             "value": "{core.color.vibrant.red.v-rr-140}",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "status",
-                "kind": "danger",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "hover",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "press": {
             "value": "{core.color.vibrant.red.v-rr-160}",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "status",
-                "kind": "danger",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "press",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         }
@@ -675,72 +213,21 @@
           "value": "{core.color.neutral.blk-005}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "inverse",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "default",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "hover": {
           "value": "{core.color.neutral.blk-000}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "inverse",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "hover",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "press": {
           "value": "{core.color.neutral.blk-010}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "inverse",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "press",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         }
       },
@@ -749,120 +236,35 @@
           "value": "{core.color.neutral.blk-000}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "text",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "1",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "2": {
           "value": "{core.color.neutral.blk-060}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "text",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "2",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "3": {
           "value": "{core.color.neutral.blk-090}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "text",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "3",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "inverse": {
           "value": "{core.color.neutral.blk-220}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "link": {
           "value": "{core.color.dark.blue.d-bb-420}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         }
       },
@@ -871,144 +273,42 @@
           "value": "{core.color.neutral.blk-160}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "border",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "1",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "2": {
           "value": "{core.color.neutral.blk-170}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "border",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "2",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "3": {
           "value": "{core.color.neutral.blk-180}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "border",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "3",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "input": {
           "value": "{core.color.neutral.blk-130}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "border",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "input",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "ghost": {
           "value": "rgba({core.color.neutral.blk-130}, {core.opacity.30})",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "border",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "ghost",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "white": {
           "value": "{core.color.neutral.blk-005}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "border",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "white",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         }
       }
diff --git a/packages/calcite-design-tokens/src/tokens/semantic/color/light.json b/packages/calcite-design-tokens/src/tokens/semantic/color/light.json
index ed539952891..85e2835aae1 100644
--- a/packages/calcite-design-tokens/src/tokens/semantic/color/light.json
+++ b/packages/calcite-design-tokens/src/tokens/semantic/color/light.json
@@ -6,48 +6,14 @@
           "value": "{core.color.neutral.blk-005}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "background",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "default",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "none": {
           "value": "rgba({core.color.neutral.blk-000}, {core.opacity.0})",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "background",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "none",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         }
       },
@@ -56,95 +22,28 @@
           "value": "{core.color.neutral.blk-000}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "element": "",
-              "category": "color",
-              "group": "foreground",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "1",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "2": {
           "value": "{core.color.neutral.blk-010}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "foreground",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "2",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "3": {
           "value": "{core.color.neutral.blk-020}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "foreground",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "3",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "current": {
           "value": "{core.color.high-saturation.blue.h-bb-010}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "foreground",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "current",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         }
       },
@@ -154,72 +53,21 @@
             "value": "rgba({core.color.neutral.blk-240}, {core.opacity.0})",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "transparent",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "default",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "hover": {
             "value": "rgba({core.color.neutral.blk-240}, {core.opacity.4})",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "transparent",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "hover",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "press": {
             "value": "rgba({core.color.neutral.blk-240}, {core.opacity.8})",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "transparent",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "press",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         },
@@ -227,48 +75,14 @@
           "value": "rgba({core.color.neutral.blk-000}, {core.opacity.85})",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "transparent",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "scrim",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "tint": {
           "value": "rgba({core.color.neutral.blk-000}, {core.opacity.80})",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "transparent",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "tint",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         }
       },
@@ -278,72 +92,21 @@
             "value": "{core.color.high-saturation.blue.h-bb-060}",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "brand",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "hover": {
             "value": "{core.color.high-saturation.blue.h-bb-070}",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "brand",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "hover",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "press": {
             "value": "{core.color.high-saturation.blue.h-bb-080}",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "brand",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "press",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         },
@@ -351,24 +114,7 @@
           "type": "color",
           "value": "rgba({core.color.high-saturation.blue.h-bb-070}, {core.opacity.40})",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "brand",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "underline",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         }
       },
@@ -378,72 +124,21 @@
             "value": "{core.color.high-saturation.blue.h-bb-070}",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "status",
-                "kind": "info",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "hover": {
             "value": "{core.color.high-saturation.blue.h-bb-080}",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "status",
-                "kind": "info",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "hover",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "press": {
             "value": "{core.color.high-saturation.blue.h-bb-090}",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "status",
-                "kind": "info",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "press",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         },
@@ -452,72 +147,21 @@
             "value": "{core.color.high-saturation.green.h-gg-060}",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "status",
-                "kind": "success",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "default",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "hover": {
             "value": "{core.color.high-saturation.green.h-gg-070}",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "status",
-                "kind": "success",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "hover",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "press": {
             "value": "{core.color.high-saturation.green.h-gg-080}",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "status",
-                "kind": "success",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "press",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         },
@@ -526,72 +170,21 @@
             "value": "{core.color.high-saturation.yellow.h-yy-060}",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "status",
-                "kind": "warning",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "default",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "hover": {
             "value": "{core.color.high-saturation.yellow.h-yy-070}",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "status",
-                "kind": "warning",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "hover",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "press": {
             "value": "{core.color.high-saturation.yellow.h-yy-080}",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "status",
-                "kind": "warning",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "press",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         },
@@ -600,72 +193,21 @@
             "value": "{core.color.high-saturation.red.h-rr-060}",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "status",
-                "kind": "danger",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "default",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "hover": {
             "value": "{core.color.high-saturation.red.h-rr-070}",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "status",
-                "kind": "danger",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "hover",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           },
           "press": {
             "value": "{core.color.high-saturation.red.h-rr-080}",
             "type": "color",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "color",
-                "group": "status",
-                "kind": "danger",
-                "appearance": "",
-                "property": "",
-                "variant": "",
-                "state": "press",
-                "scale": "",
-                "context": "",
-                "mode": ""
-              }
+              "category": "color"
             }
           }
         }
@@ -675,72 +217,21 @@
           "value": "{core.color.neutral.blk-190}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "inverse",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "default",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "hover": {
           "value": "{core.color.neutral.blk-200}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "inverse",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "hover",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "press": {
           "value": "{core.color.neutral.blk-210}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "inverse",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "press",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         }
       },
@@ -749,120 +240,35 @@
           "value": "{core.color.neutral.blk-220}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "text",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "1",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "2": {
           "value": "{core.color.neutral.blk-170}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "text",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "2",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "3": {
           "value": "{core.color.neutral.blk-140}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "text",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "3",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "inverse": {
           "value": "{core.color.neutral.blk-000}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "link": {
           "value": "{core.color.high-saturation.blue.h-bb-070}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         }
       },
@@ -871,144 +277,42 @@
           "value": "{core.color.neutral.blk-050}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "border",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "1",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "2": {
           "value": "{core.color.neutral.blk-040}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "border",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "2",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "3": {
           "value": "{core.color.neutral.blk-030}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "border",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "3",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "input": {
           "value": "{core.color.neutral.blk-100}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "border",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "input",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "ghost": {
           "value": "rgba({core.color.neutral.blk-240}, {core.opacity.30})",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "border",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "ghost",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         },
         "white": {
           "value": "{core.color.neutral.blk-000}",
           "type": "color",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "color",
-              "group": "border",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "white",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "color"
           }
         }
       }
diff --git a/packages/calcite-design-tokens/src/tokens/semantic/container-size.json b/packages/calcite-design-tokens/src/tokens/semantic/container-size.json
index 44fd4320b62..5c24ea6bb38 100644
--- a/packages/calcite-design-tokens/src/tokens/semantic/container-size.json
+++ b/packages/calcite-design-tokens/src/tokens/semantic/container-size.json
@@ -10,24 +10,7 @@
           "type": "dimension",
           "description": "Small handheld devices and mini-windows",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "breakpoint",
-              "group": "height",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "xxs",
-              "context": "",
-              "mode": ""
-            }
+            "category": "breakpoint"
           }
         },
         "xs": {
@@ -38,24 +21,7 @@
           "type": "dimension",
           "description": "Handheld devices",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "breakpoint",
-              "group": "height",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "xs",
-              "context": "",
-              "mode": ""
-            }
+            "category": "breakpoint"
           }
         },
         "sm": {
@@ -66,24 +32,7 @@
           "type": "dimension",
           "description": "Small tablets",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "breakpoint",
-              "group": "height",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "sm",
-              "context": "",
-              "mode": ""
-            }
+            "category": "breakpoint"
           }
         },
         "md": {
@@ -94,24 +43,7 @@
           "type": "dimension",
           "description": "Small laptops",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "breakpoint",
-              "group": "height",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "md",
-              "context": "",
-              "mode": ""
-            }
+            "category": "breakpoint"
           }
         },
         "lg": {
@@ -122,24 +54,7 @@
           "type": "dimension",
           "description": "Large laptops and desktop computers",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "breakpoint",
-              "group": "height",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "lg",
-              "context": "",
-              "mode": ""
-            }
+            "category": "breakpoint"
           }
         },
         "xl": {
@@ -149,24 +64,7 @@
           "type": "dimension",
           "description": "Projectors and televisions",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "breakpoint",
-              "group": "height",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "xl",
-              "context": "",
-              "mode": ""
-            }
+            "category": "breakpoint"
           }
         }
       },
@@ -179,24 +77,7 @@
           "type": "dimension",
           "description": "Small handheld devices and mini-windows",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "breakpoint",
-              "group": "width",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "xxs",
-              "context": "",
-              "mode": ""
-            }
+            "category": "breakpoint"
           }
         },
         "xs": {
@@ -207,24 +88,7 @@
           "type": "dimension",
           "description": "Handheld devices",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "breakpoint",
-              "group": "width",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "xs",
-              "context": "",
-              "mode": ""
-            }
+            "category": "breakpoint"
           }
         },
         "sm": {
@@ -235,24 +99,7 @@
           "type": "dimension",
           "description": "Small tablets",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "breakpoint",
-              "group": "width",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "sm",
-              "context": "",
-              "mode": ""
-            }
+            "category": "breakpoint"
           }
         },
         "md": {
@@ -263,24 +110,7 @@
           "type": "dimension",
           "description": "Small laptops",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "breakpoint",
-              "group": "width",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "md",
-              "context": "",
-              "mode": ""
-            }
+            "category": "breakpoint"
           }
         },
         "lg": {
@@ -291,24 +121,7 @@
           "type": "dimension",
           "description": "Large laptops and desktop computers",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "breakpoint",
-              "group": "width",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "lg",
-              "context": "",
-              "mode": ""
-            }
+            "category": "breakpoint"
           }
         },
         "xl": {
@@ -318,24 +131,7 @@
           "type": "dimension",
           "description": "Projectors and televisions",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "breakpoint",
-              "group": "width",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "xl",
-              "context": "",
-              "mode": ""
-            }
+            "category": "breakpoint"
           }
         }
       },
@@ -343,48 +139,14 @@
         "value": "{core.size.default.24}",
         "type": "spacing",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "semantic",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "breakpoint",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "margin",
-            "variant": "",
-            "state": "",
-            "scale": "",
-            "context": "",
-            "mode": ""
-          }
+          "category": "breakpoint"
         }
       },
       "gutter": {
         "value": "{core.size.default.16}",
         "type": "spacing",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "semantic",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "breakpoint",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "gutter",
-            "variant": "",
-            "state": "",
-            "scale": "",
-            "context": "",
-            "mode": ""
-          }
+          "category": "breakpoint"
         }
       },
       "content": {
@@ -393,24 +155,7 @@
           "type": "sizing",
           "description": "for fluid grid widths",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "breakpoint",
-              "group": "content",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "fluid",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "breakpoint"
           }
         },
         "fixed": {
@@ -418,24 +163,7 @@
           "type": "sizing",
           "description": "only for lg breakpoint fixed grid width",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "breakpoint",
-              "group": "content",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "fixed",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "breakpoint"
           }
         }
       }
diff --git a/packages/calcite-design-tokens/src/tokens/semantic/corner.json b/packages/calcite-design-tokens/src/tokens/semantic/corner.json
index 1adbf12ef1e..48c7113c38a 100644
--- a/packages/calcite-design-tokens/src/tokens/semantic/corner.json
+++ b/packages/calcite-design-tokens/src/tokens/semantic/corner.json
@@ -6,96 +6,29 @@
           "value": "{semantic.corner.radius.sharp}",
           "type": "borderRadius",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "corner",
-              "group": "radius",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "default",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "corner"
           }
         },
         "sharp": {
           "value": "{core.size.default.none}",
           "type": "borderRadius",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "corner",
-              "group": "radius",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "sharp",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "corner"
           }
         },
         "round": {
           "value": "{core.size.default.4}",
           "type": "borderRadius",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "corner",
-              "group": "radius",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "round",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "corner"
           }
         },
         "pill": {
           "value": "{core.size.relative.100}",
           "type": "borderRadius",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "corner",
-              "group": "radius",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "pill",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "element": "",
+            "category": "corner"
           }
         }
       }
diff --git a/packages/calcite-design-tokens/src/tokens/semantic/font.json b/packages/calcite-design-tokens/src/tokens/semantic/font.json
index b9344cdda38..23ad616edfc 100644
--- a/packages/calcite-design-tokens/src/tokens/semantic/font.json
+++ b/packages/calcite-design-tokens/src/tokens/semantic/font.json
@@ -12,24 +12,7 @@
           "type": "fontFamilies",
           "description": "Primary font with fallbacks",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "family",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "group": "family"
           }
         },
         "code": {
@@ -43,24 +26,7 @@
           "type": "fontFamilies",
           "description": "Font family for code with fallbacks",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "family",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "code",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         }
       },
@@ -70,24 +36,7 @@
           "type": "fontWeights",
           "description": "For Avenir Next World (secondary font family)",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "weight",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "light",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "normal": {
@@ -98,120 +47,35 @@
             "calcite.deprecated": true
           },
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "weight",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "normal",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "regular": {
           "value": "{core.font.weight.regular}",
           "type": "fontWeights",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "weight",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "regular",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "medium": {
           "value": "{core.font.weight.medium}",
           "type": "fontWeights",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "weight",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "medium",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "semibold": {
           "value": "{core.font.weight.demi}",
           "type": "fontWeights",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "weight",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "semibold",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "bold": {
           "value": "{core.font.weight.demi}",
           "type": "fontWeights",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "weight",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "bold",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         }
       },
@@ -220,168 +84,49 @@
           "value": "{core.size.default.10}",
           "type": "fontSizes",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "size",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "xs",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "sm": {
           "value": "{core.size.default.12}",
           "type": "fontSizes",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "size",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "sm",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "default": {
           "value": "{core.size.default.14}",
           "type": "fontSizes",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "size",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "default",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "md": {
           "value": "{core.size.default.16}",
           "type": "fontSizes",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "size",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "md",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "lg": {
           "value": "{core.size.default.2} * 9",
           "type": "fontSizes",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "size",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "lg",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "xl": {
           "value": "{core.size.default.20}",
           "type": "fontSizes",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "size",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "xl",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "xxl": {
           "value": "{core.size.default.24}",
           "type": "fontSizes",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "size",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "xxl",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         }
       },
@@ -391,24 +136,7 @@
           "type": "fontStyle",
           "description": "used in ratings",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "style",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "emphasis",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         }
       },
@@ -418,96 +146,28 @@
             "value": "{core.size.default.12}",
             "type": "lineHeights",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "font",
-                "group": "line-height",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "fixed",
-                "state": "",
-                "scale": "sm",
-                "context": "",
-                "mode": ""
-              }
+              "category": "font"
             }
           },
           "base": {
             "value": "{core.size.default.16}",
             "type": "lineHeights",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "font",
-                "group": "line-height",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "fixed",
-                "state": "",
-                "scale": "base",
-                "context": "",
-                "mode": ""
-              }
+              "category": "font"
             }
           },
           "lg": {
             "value": "{core.size.default.20}",
             "type": "lineHeights",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "font",
-                "group": "line-height",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "fixed",
-                "state": "",
-                "scale": "lg",
-                "context": "",
-                "mode": ""
-              }
+              "category": "font"
             }
           },
           "xl": {
             "value": "{core.size.default.24}",
             "type": "lineHeights",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "font",
-                "group": "line-height",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "fixed",
-                "state": "",
-                "scale": "xl",
-                "context": "",
-                "mode": ""
-              }
+              "category": "font"
             }
           }
         },
@@ -517,24 +177,7 @@
             "type": "lineHeights",
             "description": "1",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "font",
-                "group": "line-height",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "relative",
-                "state": "",
-                "scale": "default",
-                "context": "",
-                "mode": ""
-              }
+              "category": "font"
             }
           },
           "tight": {
@@ -542,24 +185,7 @@
             "type": "lineHeights",
             "description": "1.25",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "font",
-                "group": "line-height",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "relative",
-                "state": "",
-                "scale": "tight",
-                "context": "",
-                "mode": ""
-              }
+              "category": "font"
             }
           },
           "snug": {
@@ -567,24 +193,7 @@
             "type": "lineHeights",
             "description": "1.375",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "font",
-                "group": "line-height",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "relative",
-                "state": "",
-                "scale": "snug",
-                "context": "",
-                "mode": ""
-              }
+              "category": "font"
             }
           },
           "normal": {
@@ -592,24 +201,7 @@
             "type": "lineHeights",
             "description": "1.5",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "font",
-                "group": "line-height",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "relative",
-                "state": "",
-                "scale": "normal",
-                "context": "",
-                "mode": ""
-              }
+              "category": "font"
             }
           },
           "relaxed": {
@@ -617,24 +209,7 @@
             "type": "lineHeights",
             "description": "1.625",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "font",
-                "group": "line-height",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "relative",
-                "state": "",
-                "scale": "relaxed",
-                "context": "",
-                "mode": ""
-              }
+              "category": "font"
             }
           },
           "loose": {
@@ -642,24 +217,7 @@
             "type": "lineHeights",
             "description": "2",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "",
-                "element": "",
-                "category": "font",
-                "group": "line-height",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "relative",
-                "state": "",
-                "scale": "loose",
-                "context": "",
-                "mode": ""
-              }
+              "category": "font"
             }
           }
         }
@@ -670,24 +228,7 @@
           "type": "letterSpacing",
           "description": "Deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "letter-spacing",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "tight",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "normal": {
@@ -695,24 +236,7 @@
           "type": "letterSpacing",
           "description": "Deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "letter-spacing",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "normal",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "wide": {
@@ -720,24 +244,7 @@
           "type": "letterSpacing",
           "description": "Deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "letter-spacing",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "wide",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         }
       },
@@ -747,24 +254,7 @@
           "type": "paragraphSpacing",
           "description": "Deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "paragraph-spacing",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "normal",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         }
       },
@@ -774,24 +264,7 @@
           "type": "textDecoration",
           "description": "Deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "text-decoration",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "none",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "underline": {
@@ -799,24 +272,7 @@
           "type": "textDecoration",
           "description": "Deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "text-decoration",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "underline",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         }
       },
@@ -826,24 +282,7 @@
           "type": "textCase",
           "description": "Deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "text-case",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "none",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "uppercase": {
@@ -851,24 +290,7 @@
           "type": "textCase",
           "description": "Deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "text-case",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "uppercase",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "lowercase": {
@@ -876,24 +298,7 @@
           "type": "textCase",
           "description": "Deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "text-case",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "lowercase",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         },
         "capitalize": {
@@ -901,24 +306,7 @@
           "type": "textCase",
           "description": "Deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "font",
-              "group": "text-case",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "capitalize",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": "font"
           }
         }
       }
diff --git a/packages/calcite-design-tokens/src/tokens/semantic/opacity.json b/packages/calcite-design-tokens/src/tokens/semantic/opacity.json
index d6c8d478995..11e52c2c94c 100644
--- a/packages/calcite-design-tokens/src/tokens/semantic/opacity.json
+++ b/packages/calcite-design-tokens/src/tokens/semantic/opacity.json
@@ -5,120 +5,35 @@
         "value": "{core.opacity.40}",
         "type": "opacity",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "semantic",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "opacity",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "light",
-            "context": "",
-            "mode": ""
-          }
+          "category": "opacity"
         }
       },
       "half": {
         "value": "{core.opacity.50}",
         "type": "opacity",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "semantic",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "opacity",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "half",
-            "state": "",
-            "scale": "",
-            "context": "",
-            "mode": ""
-          }
+          "category": "opacity"
         }
       },
       "dark": {
         "value": "{core.opacity.85}",
         "type": "opacity",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "semantic",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "opacity",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "dark",
-            "context": "",
-            "mode": ""
-          }
+          "category": "opacity"
         }
       },
       "full": {
         "value": "{core.opacity.100}",
         "type": "opacity",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "semantic",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "opacity",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "full",
-            "state": "",
-            "scale": "",
-            "context": "",
-            "mode": ""
-          }
+          "category": "opacity"
         }
       },
       "disabled": {
         "value": "{core.opacity.50}",
         "type": "opacity",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "semantic",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "opacity",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "disabled",
-            "scale": "",
-            "context": "",
-            "mode": ""
-          }
+          "category": "opacity"
         }
       }
     }
diff --git a/packages/calcite-design-tokens/src/tokens/semantic/shadow.json b/packages/calcite-design-tokens/src/tokens/semantic/shadow.json
index 22b93c30aa1..eed64c12fc1 100644
--- a/packages/calcite-design-tokens/src/tokens/semantic/shadow.json
+++ b/packages/calcite-design-tokens/src/tokens/semantic/shadow.json
@@ -5,24 +5,7 @@
         "value": "{core.shadow.0}",
         "type": "boxShadow",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "semantic",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "shadow",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "none",
-            "context": "",
-            "mode": ""
-          }
+          "category": "shadow"
         }
       },
       "sm": {
@@ -32,24 +15,7 @@
         ],
         "type": "boxShadow",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "semantic",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "shadow",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "sm",
-            "context": "",
-            "mode": ""
-          }
+          "category": "shadow"
         }
       },
       "md": {
@@ -59,24 +25,7 @@
         ],
         "type": "boxShadow",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "semantic",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "shadow",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "",
-            "state": "",
-            "scale": "md",
-            "context": "",
-            "mode": ""
-          }
+          "category": "shadow"
         }
       }
     }
diff --git a/packages/calcite-design-tokens/src/tokens/semantic/size.json b/packages/calcite-design-tokens/src/tokens/semantic/size.json
index d00ef2a0c5f..77b662b1008 100644
--- a/packages/calcite-design-tokens/src/tokens/semantic/size.json
+++ b/packages/calcite-design-tokens/src/tokens/semantic/size.json
@@ -7,24 +7,7 @@
           "type": "spacing",
           "description": "deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "fixed",
-              "element": "",
-              "category": "size",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "xxxs",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "xxs": {
@@ -32,24 +15,7 @@
           "type": "spacing",
           "description": "deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "fixed",
-              "element": "",
-              "category": "size",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "xxs",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "xs": {
@@ -57,24 +23,7 @@
           "type": "spacing",
           "description": "deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "fixed",
-              "element": "",
-              "category": "size",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "xs",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "sm": {
@@ -82,24 +31,7 @@
           "type": "spacing",
           "description": "deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "fixed",
-              "element": "",
-              "category": "size",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "sm",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "sm+": {
@@ -107,24 +39,7 @@
           "type": "spacing",
           "description": "deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "fixed",
-              "element": "",
-              "category": "size",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "sm+",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "md": {
@@ -132,24 +47,7 @@
           "type": "spacing",
           "description": "deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "fixed",
-              "element": "",
-              "category": "size",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "md",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "md+": {
@@ -157,24 +55,7 @@
           "type": "spacing",
           "description": "deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "fixed",
-              "element": "",
-              "category": "size",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "md+",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "lg": {
@@ -182,24 +63,7 @@
           "type": "spacing",
           "description": "deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "fixed",
-              "element": "",
-              "category": "size",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "lg",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "xl": {
@@ -207,24 +71,7 @@
           "type": "spacing",
           "description": "deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "fixed",
-              "element": "",
-              "category": "size",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "xl",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "xxl": {
@@ -232,24 +79,7 @@
           "type": "spacing",
           "description": "deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "fixed",
-              "element": "",
-              "category": "size",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "xxl",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "xxxl": {
@@ -257,24 +87,7 @@
           "type": "spacing",
           "description": "deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "fixed",
-              "element": "",
-              "category": "size",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "xxxl",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         }
       },
@@ -283,236 +96,70 @@
           "value": "{core.size.default.1}",
           "type": "sizing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "px",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "xxxs": {
           "value": "{core.size.default.12}",
           "type": "dimension",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "xxxs",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "xxs": {
           "value": "{core.size.default.14}",
           "type": "dimension",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "xxs",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "xs": {
           "value": "{core.size.default.16}",
           "type": "dimension",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "xs",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "sm": {
           "value": "{core.size.default.24}",
           "type": "dimension",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "sm",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "md": {
           "value": "{core.size.default.32}",
           "type": "dimension",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "md",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "lg": {
           "value": "{core.size.default.44}",
           "type": "dimension",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "lg",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "xl": {
           "value": "{core.size.default.48}",
           "type": "dimension",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "xl",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "xxl": {
           "value": "{core.size.default.64}",
           "type": "dimension",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "state": "",
-              "scale": "xxl",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "xxxl": {
           "value": "{core.size.default.96}",
           "type": "dimension",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "state": "",
-              "scale": "xxxl",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         }
       }
diff --git a/packages/calcite-design-tokens/src/tokens/semantic/space.json b/packages/calcite-design-tokens/src/tokens/semantic/space.json
index 2a17a8f7606..349e883ea1f 100644
--- a/packages/calcite-design-tokens/src/tokens/semantic/space.json
+++ b/packages/calcite-design-tokens/src/tokens/semantic/space.json
@@ -7,24 +7,7 @@
           "type": "spacing",
           "description": "deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "fixed",
-              "element": "",
-              "category": "space",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "xxs",
-              "context": "",
-              "mode": ""
-            }
+            "category": "space"
           }
         },
         "xs": {
@@ -32,24 +15,7 @@
           "type": "spacing",
           "description": "deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "fixed",
-              "element": "",
-              "category": "space",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "xs",
-              "context": "",
-              "mode": ""
-            }
+            "category": "space"
           }
         },
         "sm": {
@@ -57,24 +23,7 @@
           "type": "spacing",
           "description": "deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "fixed",
-              "element": "",
-              "category": "space",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "sm",
-              "context": "",
-              "mode": ""
-            }
+            "category": "space"
           }
         },
         "md": {
@@ -82,24 +31,7 @@
           "type": "spacing",
           "description": "deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "fixed",
-              "element": "",
-              "category": "space",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "md",
-              "context": "",
-              "mode": ""
-            }
+            "category": "space"
           }
         },
         "lg": {
@@ -107,24 +39,7 @@
           "type": "spacing",
           "description": "deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "fixed",
-              "element": "",
-              "category": "space",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "lg",
-              "context": "",
-              "mode": ""
-            }
+            "category": "space"
           }
         },
         "xl": {
@@ -132,24 +47,7 @@
           "type": "spacing",
           "description": "deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "fixed",
-              "element": "",
-              "category": "space",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "xl",
-              "context": "",
-              "mode": ""
-            }
+            "category": "space"
           }
         },
         "xxl": {
@@ -157,24 +55,7 @@
           "type": "spacing",
           "description": "deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "fixed",
-              "element": "",
-              "category": "space",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "xxl",
-              "context": "",
-              "mode": ""
-            }
+            "category": "space"
           }
         },
         "xxxl": {
@@ -182,24 +63,7 @@
           "type": "spacing",
           "description": "deprecated",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "fixed",
-              "element": "",
-              "category": "space",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "xxxl",
-              "context": "",
-              "mode": ""
-            }
+            "category": "space"
           }
         }
       },
@@ -208,312 +72,94 @@
           "value": "{core.size.default.none}",
           "type": "spacing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "space",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "px",
-              "context": "",
-              "mode": ""
-            }
+            "pattern": "",
+            "category": "space"
           }
         },
         "px": {
           "value": "{core.size.default.1}",
           "type": "spacing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "space",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "px",
-              "context": "",
-              "mode": ""
-            }
+            "pattern": "",
+            "category": "space"
           }
         },
         "base": {
           "value": "{core.size.default.2}",
           "type": "spacing",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "space",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "px",
-              "context": "",
-              "mode": ""
-            }
+            "pattern": "",
+            "category": "space"
           }
         },
         "xxs": {
           "value": "{core.size.default.4}",
           "type": "dimension",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "xxs",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "xs": {
           "value": "{core.size.default.6}",
           "type": "dimension",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "xs",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "sm": {
           "value": "{core.size.default.8}",
           "type": "dimension",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "size",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "sm",
-              "context": "",
-              "mode": ""
-            }
+            "category": "size"
           }
         },
         "sm+": {
           "value": "{core.size.default.10}",
           "type": "dimension",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "space",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "sm+",
-              "context": "",
-              "mode": ""
-            }
+            "category": "space"
           }
         },
         "md": {
           "value": "{core.size.default.12}",
           "type": "dimension",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "space",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "md",
-              "context": "",
-              "mode": ""
-            }
+            "category": "space"
           }
         },
         "md+": {
           "value": "{core.size.default.14}",
           "type": "dimension",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "space",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "md+",
-              "context": "",
-              "mode": ""
-            }
+            "category": "space"
           }
         },
         "lg": {
           "value": "{core.size.default.16}",
           "type": "dimension",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "space",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "lg",
-              "context": "",
-              "mode": ""
-            }
+            "category": "space"
           }
         },
         "xl": {
           "value": "{core.size.default.20}",
           "type": "dimension",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "space",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "xl",
-              "context": "",
-              "mode": ""
-            }
+            "category": "space"
           }
         },
         "xxl": {
           "value": "{core.size.default.24}",
           "type": "dimension",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "space",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "xxl",
-              "context": "",
-              "mode": ""
-            }
+            "category": "space"
           }
         },
         "xxxl": {
           "value": "{core.size.default.32}",
           "type": "dimension",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "",
-              "element": "",
-              "category": "space",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "xxxl",
-              "context": "",
-              "mode": ""
-            }
+            "category": "space"
           }
         }
       }
diff --git a/packages/calcite-design-tokens/src/tokens/semantic/typography.json b/packages/calcite-design-tokens/src/tokens/semantic/typography.json
index 9b6782c55c7..edad94dcfa6 100644
--- a/packages/calcite-design-tokens/src/tokens/semantic/typography.json
+++ b/packages/calcite-design-tokens/src/tokens/semantic/typography.json
@@ -15,24 +15,7 @@
             "textDecoration": "{semantic.font.text-decoration.none}"
           },
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "typography",
-              "element": "",
-              "category": "",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "",
-              "state": "",
-              "scale": "",
-              "context": "",
-              "mode": ""
-            }
+            "category": ""
           }
         },
         "light": {
@@ -47,24 +30,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "light",
-                "state": "",
-                "scale": "-3h",
-                "context": "",
-                "mode": ""
-              }
+              "category": ""
             }
           },
           "-2h": {
@@ -77,24 +43,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "default",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "light",
-                "state": "",
-                "scale": "-2h",
-                "context": "",
-                "mode": ""
-              }
+              "category": "default"
             }
           },
           "-1h": {
@@ -106,24 +55,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "default",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "light",
-                "state": "",
-                "scale": "-1h",
-                "context": "",
-                "mode": ""
-              }
+              "category": "default"
             }
           },
           "0h": {
@@ -137,24 +69,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "default",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "light",
-                "state": "",
-                "scale": "0h",
-                "context": "",
-                "mode": ""
-              }
+              "category": "default"
             }
           },
           "1h": {
@@ -168,24 +83,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "default",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "light",
-                "state": "",
-                "scale": "1h",
-                "context": "",
-                "mode": ""
-              }
+              "category": "default"
             }
           }
         },
@@ -200,24 +98,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "default",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "regular",
-                "state": "",
-                "scale": "-3h",
-                "context": "",
-                "mode": ""
-              }
+              "category": "default"
             }
           },
           "-2h": {
@@ -229,48 +110,14 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "default",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "regular",
-                "state": "",
-                "scale": "-2h",
-                "context": "",
-                "mode": ""
-              }
+              "category": "default"
             }
           },
           "-1h": {
             "value": "{semantic.typography.default.default}",
             "type": "typography",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "default",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "regular",
-                "state": "",
-                "scale": "-1h",
-                "context": "",
-                "mode": ""
-              }
+              "category": "default"
             }
           },
           "0h": {
@@ -283,24 +130,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "default",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "regular",
-                "state": "",
-                "scale": "0h",
-                "context": "",
-                "mode": ""
-              }
+              "category": "default"
             }
           },
           "1h": {
@@ -313,24 +143,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "default",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "regular",
-                "state": "",
-                "scale": "1h",
-                "context": "",
-                "mode": ""
-              }
+              "category": "default"
             }
           }
         },
@@ -346,24 +159,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "default",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "medium",
-                "state": "",
-                "scale": "-3h",
-                "context": "",
-                "mode": ""
-              }
+              "category": "default"
             }
           },
           "-2h": {
@@ -376,24 +172,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "default",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "medium",
-                "state": "",
-                "scale": "-2h",
-                "context": "",
-                "mode": ""
-              }
+              "category": "default"
             }
           },
           "-1h": {
@@ -405,24 +184,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "default",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "medium",
-                "state": "",
-                "scale": "-1h",
-                "context": "",
-                "mode": ""
-              }
+              "category": "default"
             }
           },
           "0h": {
@@ -436,24 +198,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "default",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "medium",
-                "state": "",
-                "scale": "0h",
-                "context": "",
-                "mode": ""
-              }
+              "category": "default"
             }
           },
           "1h": {
@@ -467,24 +212,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "default",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "medium",
-                "state": "",
-                "scale": "1h",
-                "context": "",
-                "mode": ""
-              }
+              "category": "default"
             }
           }
         },
@@ -500,24 +228,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "default",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "bold",
-                "state": "",
-                "scale": "-3h",
-                "context": "",
-                "mode": ""
-              }
+              "category": "default"
             }
           },
           "-2h": {
@@ -530,24 +241,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "default",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "bold",
-                "state": "",
-                "scale": "-2h",
-                "context": "",
-                "mode": ""
-              }
+              "category": "default"
             }
           },
           "-1h": {
@@ -559,24 +253,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "default",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "bold",
-                "state": "",
-                "scale": "-1h",
-                "context": "",
-                "mode": ""
-              }
+              "category": "default"
             }
           },
           "0h": {
@@ -590,24 +267,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "default",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "bold",
-                "state": "",
-                "scale": "0h",
-                "context": "",
-                "mode": ""
-              }
+              "category": "default"
             }
           },
           "1h": {
@@ -621,24 +281,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "default",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "bold",
-                "state": "",
-                "scale": "1h",
-                "context": "",
-                "mode": ""
-              }
+              "category": "default"
             }
           }
         }
@@ -656,24 +299,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "wrap",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "light",
-                "state": "",
-                "scale": "0",
-                "context": "",
-                "mode": ""
-              }
+              "category": "wrap"
             }
           },
           "1": {
@@ -687,24 +313,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "wrap",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "light",
-                "state": "",
-                "scale": "1",
-                "context": "",
-                "mode": ""
-              }
+              "category": "wrap"
             }
           },
           "2": {
@@ -718,24 +327,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "wrap",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "light",
-                "state": "",
-                "scale": "2",
-                "context": "",
-                "mode": ""
-              }
+              "category": "wrap"
             }
           },
           "3": {
@@ -749,24 +341,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "wrap",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "light",
-                "state": "",
-                "scale": "3",
-                "context": "",
-                "mode": ""
-              }
+              "category": "wrap"
             }
           },
           "-2": {
@@ -780,24 +355,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "wrap",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "light",
-                "state": "",
-                "scale": "-2",
-                "context": "",
-                "mode": ""
-              }
+              "category": "wrap"
             }
           },
           "-1": {
@@ -810,24 +368,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "wrap",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "light",
-                "state": "",
-                "scale": "-1",
-                "context": "",
-                "mode": ""
-              }
+              "category": "wrap"
             }
           }
         },
@@ -842,24 +383,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "wrap",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "regular",
-                "state": "",
-                "scale": "0",
-                "context": "",
-                "mode": ""
-              }
+              "category": "wrap"
             }
           },
           "1": {
@@ -872,24 +396,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "wrap",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "regular",
-                "state": "",
-                "scale": "1",
-                "context": "",
-                "mode": ""
-              }
+              "category": "wrap"
             }
           },
           "2": {
@@ -902,24 +409,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "wrap",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "regular",
-                "state": "",
-                "scale": "2",
-                "context": "",
-                "mode": ""
-              }
+              "category": "wrap"
             }
           },
           "3": {
@@ -932,24 +422,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "wrap",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "regular",
-                "state": "",
-                "scale": "3",
-                "context": "",
-                "mode": ""
-              }
+              "category": "wrap"
             }
           },
           "-2": {
@@ -962,24 +435,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "wrap",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "regular",
-                "state": "",
-                "scale": "-2",
-                "context": "",
-                "mode": ""
-              }
+              "category": "wrap"
             }
           },
           "-1": {
@@ -991,24 +447,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "wrap",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "regular",
-                "state": "",
-                "scale": "-1",
-                "context": "",
-                "mode": ""
-              }
+              "category": "wrap"
             }
           }
         },
@@ -1024,24 +463,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "wrap",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "medium",
-                "state": "",
-                "scale": "0",
-                "context": "",
-                "mode": ""
-              }
+              "category": "wrap"
             }
           },
           "1": {
@@ -1055,24 +477,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "wrap",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "medium",
-                "state": "",
-                "scale": "1",
-                "context": "",
-                "mode": ""
-              }
+              "category": "wrap"
             }
           },
           "2": {
@@ -1086,24 +491,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "wrap",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "medium",
-                "state": "",
-                "scale": "2",
-                "context": "",
-                "mode": ""
-              }
+              "category": "wrap"
             }
           },
           "3": {
@@ -1117,24 +505,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "wrap",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "medium",
-                "state": "",
-                "scale": "3",
-                "context": "",
-                "mode": ""
-              }
+              "category": "wrap"
             }
           },
           "-2": {
@@ -1148,24 +519,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "wrap",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "medium",
-                "state": "",
-                "scale": "-2",
-                "context": "",
-                "mode": ""
-              }
+              "category": "wrap"
             }
           },
           "-1": {
@@ -1178,24 +532,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "wrap",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "medium",
-                "state": "",
-                "scale": "-1",
-                "context": "",
-                "mode": ""
-              }
+              "category": "wrap"
             }
           }
         },
@@ -1211,24 +548,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "wrap",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "bold",
-                "state": "",
-                "scale": "0",
-                "context": "",
-                "mode": ""
-              }
+              "category": "wrap"
             }
           },
           "1": {
@@ -1242,24 +562,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "wrap",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "bold",
-                "state": "",
-                "scale": "1",
-                "context": "",
-                "mode": ""
-              }
+              "category": "wrap"
             }
           },
           "2": {
@@ -1273,24 +576,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "wrap",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "bold",
-                "state": "",
-                "scale": "2",
-                "context": "",
-                "mode": ""
-              }
+              "category": "wrap"
             }
           },
           "3": {
@@ -1304,24 +590,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "wrap",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "bold",
-                "state": "",
-                "scale": "3",
-                "context": "",
-                "mode": ""
-              }
+              "category": "wrap"
             }
           },
           "-2": {
@@ -1335,24 +604,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "wrap",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "bold",
-                "state": "",
-                "scale": "-2",
-                "context": "",
-                "mode": ""
-              }
+              "category": "wrap"
             }
           },
           "-1": {
@@ -1365,24 +617,7 @@
               "calcite.extends": "{semantic.typography.default.default}"
             },
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "wrap",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "bold",
-                "state": "",
-                "scale": "-1",
-                "context": "",
-                "mode": ""
-              }
+              "category": "wrap"
             }
           }
         }
@@ -1393,48 +628,14 @@
             "value": "{semantic.typography.wrap.bold.3}",
             "type": "typography",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "hierarchy",
-                "group": "",
-                "kind": "",
-                "appearance": "display",
-                "property": "",
-                "variant": "",
-                "state": "",
-                "scale": "1",
-                "context": "",
-                "mode": ""
-              }
+              "category": "hierarchy"
             }
           },
           "2": {
             "value": "{semantic.typography.wrap.bold.2}",
             "type": "typography",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "hierarchy",
-                "group": "",
-                "kind": "",
-                "appearance": "display",
-                "property": "",
-                "variant": "",
-                "state": "",
-                "scale": "2",
-                "context": "",
-                "mode": ""
-              }
+              "category": "hierarchy"
             }
           }
         },
@@ -1443,120 +644,35 @@
             "value": "{semantic.typography.wrap.medium.3}",
             "type": "typography",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "hierarchy",
-                "group": "",
-                "kind": "",
-                "appearance": "heading",
-                "property": "",
-                "variant": "",
-                "state": "",
-                "scale": "1",
-                "context": "",
-                "mode": ""
-              }
+              "category": "hierarchy"
             }
           },
           "2": {
             "value": "{semantic.typography.wrap.medium.2}",
             "type": "typography",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "hierarchy",
-                "group": "",
-                "kind": "",
-                "appearance": "heading",
-                "property": "",
-                "variant": "",
-                "state": "",
-                "scale": "2",
-                "context": "",
-                "mode": ""
-              }
+              "category": "hierarchy"
             }
           },
           "3": {
             "value": "{semantic.typography.wrap.medium.1}",
             "type": "typography",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "hierarchy",
-                "group": "",
-                "kind": "",
-                "appearance": "heading",
-                "property": "",
-                "variant": "",
-                "state": "",
-                "scale": "3",
-                "context": "",
-                "mode": ""
-              }
+              "category": "hierarchy"
             }
           },
           "4": {
             "value": "{semantic.typography.wrap.medium.0}",
             "type": "typography",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "hierarchy",
-                "group": "",
-                "kind": "",
-                "appearance": "heading",
-                "property": "",
-                "variant": "",
-                "state": "",
-                "scale": "4",
-                "context": "",
-                "mode": ""
-              }
+              "category": "hierarchy"
             }
           },
           "5": {
             "value": "{semantic.typography.wrap.medium.-1}",
             "type": "typography",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "hierarchy",
-                "group": "",
-                "kind": "",
-                "appearance": "heading",
-                "property": "",
-                "variant": "",
-                "state": "",
-                "scale": "5",
-                "context": "",
-                "mode": ""
-              }
+              "category": "hierarchy"
             }
           }
         },
@@ -1565,48 +681,14 @@
             "value": "{semantic.typography.wrap.regular.-1}",
             "type": "typography",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "hierarchy",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "body",
-                "state": "",
-                "scale": "snug",
-                "context": "",
-                "mode": ""
-              }
+              "category": "hierarchy"
             }
           },
           "default": {
             "value": "{semantic.typography.default.default}",
             "type": "typography",
             "attributes": {
-              "calcite-schema": {
-                "system": "calcite",
-                "tier": "semantic",
-                "domain": "",
-                "component": "",
-                "pattern": "typography",
-                "element": "",
-                "category": "hierarchy",
-                "group": "",
-                "kind": "",
-                "appearance": "",
-                "property": "",
-                "variant": "body",
-                "state": "",
-                "scale": "default",
-                "context": "",
-                "mode": ""
-              }
+              "category": "hierarchy"
             }
           }
         },
@@ -1618,48 +700,14 @@
           },
           "type": "typography",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "typography",
-              "element": "",
-              "category": "hierarchy",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "overline",
-              "state": "",
-              "scale": "default",
-              "context": "",
-              "mode": ""
-            }
+            "category": "hierarchy"
           }
         },
         "caption": {
           "value": "{semantic.typography.wrap.regular.-2}",
           "type": "typography",
           "attributes": {
-            "calcite-schema": {
-              "system": "calcite",
-              "tier": "semantic",
-              "domain": "",
-              "component": "",
-              "pattern": "typography",
-              "element": "",
-              "category": "hierarchy",
-              "group": "",
-              "kind": "",
-              "appearance": "",
-              "property": "",
-              "variant": "caption",
-              "state": "",
-              "scale": "default",
-              "context": "",
-              "mode": ""
-            }
+            "category": "hierarchy"
           }
         }
       }
diff --git a/packages/calcite-design-tokens/src/tokens/semantic/z-index.json b/packages/calcite-design-tokens/src/tokens/semantic/z-index.json
index 1d087b1b49b..614173b73ba 100644
--- a/packages/calcite-design-tokens/src/tokens/semantic/z-index.json
+++ b/packages/calcite-design-tokens/src/tokens/semantic/z-index.json
@@ -5,240 +5,70 @@
         "value": "{core.z-index.0}",
         "type": "z-index",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "semantic",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "z-index",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "deep",
-            "state": "",
-            "scale": "",
-            "context": "",
-            "mode": ""
-          }
+          "category": "z-index"
         }
       },
       "default": {
         "value": "{core.z-index.1}",
         "type": "z-index",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "semantic",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "z-index",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "default",
-            "state": "",
-            "scale": "",
-            "context": "",
-            "mode": ""
-          }
+          "category": "z-index"
         }
       },
       "sticky": {
         "value": "{core.z-index.3}",
         "type": "z-index",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "semantic",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "z-index",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "sticky",
-            "state": "",
-            "scale": "",
-            "context": "",
-            "mode": ""
-          }
+          "category": "z-index"
         }
       },
       "header": {
         "value": "{core.z-index.4}",
         "type": "z-index",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "semantic",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "z-index",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "header",
-            "state": "",
-            "scale": "",
-            "context": "",
-            "mode": ""
-          }
+          "category": "z-index"
         }
       },
       "toast": {
         "value": "{core.z-index.5}",
         "type": "z-index",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "semantic",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "z-index",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "toast",
-            "state": "",
-            "scale": "",
-            "context": "",
-            "mode": ""
-          }
+          "category": "z-index"
         }
       },
       "dropdown": {
         "value": "{core.z-index.6}",
         "type": "z-index",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "semantic",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "z-index",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "dropdown",
-            "state": "",
-            "scale": "",
-            "context": "",
-            "mode": ""
-          }
+          "category": "z-index"
         }
       },
       "overlay": {
         "value": "{core.z-index.7}",
         "type": "z-index",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "semantic",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "z-index",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "overlay",
-            "state": "",
-            "scale": "",
-            "context": "",
-            "mode": ""
-          }
+          "category": "z-index"
         }
       },
       "modal": {
         "value": "{core.z-index.8}",
         "type": "z-index",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "semantic",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "z-index",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "modal",
-            "state": "",
-            "scale": "",
-            "context": "",
-            "mode": ""
-          }
+          "category": "z-index"
         }
       },
       "popup": {
         "value": "{core.z-index.9}",
         "type": "z-index",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "semantic",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "z-index",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "popup",
-            "state": "",
-            "scale": "",
-            "context": "",
-            "mode": ""
-          }
+          "category": "z-index"
         }
       },
       "tooltip": {
         "value": "{core.z-index.9} + 1",
         "type": "z-index",
         "attributes": {
-          "calcite-schema": {
-            "system": "calcite",
-            "tier": "semantic",
-            "domain": "",
-            "component": "",
-            "pattern": "",
-            "element": "",
-            "category": "z-index",
-            "group": "",
-            "kind": "",
-            "appearance": "",
-            "property": "",
-            "variant": "tooltip",
-            "state": "",
-            "scale": "",
-            "context": "",
-            "mode": ""
-          }
+          "category": "z-index"
         }
       }
     }
diff --git a/packages/calcite-design-tokens/tests/spec/__snapshots__/index.spec.ts.snap b/packages/calcite-design-tokens/tests/spec/__snapshots__/index.spec.ts.snap
index 03ef81f7c20..63ae9d04abd 100644
--- a/packages/calcite-design-tokens/tests/spec/__snapshots__/index.spec.ts.snap
+++ b/packages/calcite-design-tokens/tests/spec/__snapshots__/index.spec.ts.snap
@@ -1236,12 +1236,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#ffffff",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "neutral",
         "subitem": "blk-000",
@@ -1251,6 +1246,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.neutral.blk-000",
           "docs": "core.color.neutral.blk-000",
           "es6": "calciteColorNeutralBlk000"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -1263,12 +1263,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#f8f8f8",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "neutral",
         "subitem": "blk-005",
@@ -1278,6 +1273,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.neutral.blk-005",
           "docs": "core.color.neutral.blk-005",
           "es6": "calciteColorNeutralBlk005"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -1290,12 +1290,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#f3f3f3",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "neutral",
         "subitem": "blk-010",
@@ -1305,6 +1300,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.neutral.blk-010",
           "docs": "core.color.neutral.blk-010",
           "es6": "calciteColorNeutralBlk010"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -1317,12 +1317,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#eaeaea",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "neutral",
         "subitem": "blk-020",
@@ -1332,6 +1327,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.neutral.blk-020",
           "docs": "core.color.neutral.blk-020",
           "es6": "calciteColorNeutralBlk020"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -1344,12 +1344,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#dfdfdf",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "neutral",
         "subitem": "blk-030",
@@ -1359,6 +1354,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.neutral.blk-030",
           "docs": "core.color.neutral.blk-030",
           "es6": "calciteColorNeutralBlk030"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -1371,12 +1371,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#d4d4d4",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "neutral",
         "subitem": "blk-040",
@@ -1386,6 +1381,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.neutral.blk-040",
           "docs": "core.color.neutral.blk-040",
           "es6": "calciteColorNeutralBlk040"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -1398,12 +1398,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#cacaca",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "neutral",
         "subitem": "blk-050",
@@ -1413,6 +1408,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.neutral.blk-050",
           "docs": "core.color.neutral.blk-050",
           "es6": "calciteColorNeutralBlk050"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -1425,12 +1425,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#bfbfbf",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "neutral",
         "subitem": "blk-060",
@@ -1440,6 +1435,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.neutral.blk-060",
           "docs": "core.color.neutral.blk-060",
           "es6": "calciteColorNeutralBlk060"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -1452,12 +1452,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#b5b5b5",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "neutral",
         "subitem": "blk-070",
@@ -1467,6 +1462,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.neutral.blk-070",
           "docs": "core.color.neutral.blk-070",
           "es6": "calciteColorNeutralBlk070"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -1479,12 +1479,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#aaaaaa",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "neutral",
         "subitem": "blk-080",
@@ -1494,6 +1489,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.neutral.blk-080",
           "docs": "core.color.neutral.blk-080",
           "es6": "calciteColorNeutralBlk080"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -1506,12 +1506,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#9f9f9f",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "neutral",
         "subitem": "blk-090",
@@ -1521,6 +1516,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.neutral.blk-090",
           "docs": "core.color.neutral.blk-090",
           "es6": "calciteColorNeutralBlk090"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -1533,12 +1533,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#949494",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "neutral",
         "subitem": "blk-100",
@@ -1548,6 +1543,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.neutral.blk-100",
           "docs": "core.color.neutral.blk-100",
           "es6": "calciteColorNeutralBlk100"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -1560,12 +1560,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#8a8a8a",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "neutral",
         "subitem": "blk-110",
@@ -1575,6 +1570,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.neutral.blk-110",
           "docs": "core.color.neutral.blk-110",
           "es6": "calciteColorNeutralBlk110"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -1587,12 +1587,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#808080",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "neutral",
         "subitem": "blk-120",
@@ -1602,6 +1597,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.neutral.blk-120",
           "docs": "core.color.neutral.blk-120",
           "es6": "calciteColorNeutralBlk120"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -1614,12 +1614,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#757575",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "neutral",
         "subitem": "blk-130",
@@ -1629,6 +1624,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.neutral.blk-130",
           "docs": "core.color.neutral.blk-130",
           "es6": "calciteColorNeutralBlk130"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -1641,12 +1641,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#6a6a6a",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "neutral",
         "subitem": "blk-140",
@@ -1656,6 +1651,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.neutral.blk-140",
           "docs": "core.color.neutral.blk-140",
           "es6": "calciteColorNeutralBlk140"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -1668,12 +1668,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#606060",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "neutral",
         "subitem": "blk-150",
@@ -1683,6 +1678,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.neutral.blk-150",
           "docs": "core.color.neutral.blk-150",
           "es6": "calciteColorNeutralBlk150"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -1695,12 +1695,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#555555",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "neutral",
         "subitem": "blk-160",
@@ -1710,6 +1705,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.neutral.blk-160",
           "docs": "core.color.neutral.blk-160",
           "es6": "calciteColorNeutralBlk160"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -1722,12 +1722,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#4a4a4a",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "neutral",
         "subitem": "blk-170",
@@ -1737,6 +1732,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.neutral.blk-170",
           "docs": "core.color.neutral.blk-170",
           "es6": "calciteColorNeutralBlk170"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -1749,12 +1749,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#404040",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "neutral",
         "subitem": "blk-180",
@@ -1764,6 +1759,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.neutral.blk-180",
           "docs": "core.color.neutral.blk-180",
           "es6": "calciteColorNeutralBlk180"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -1776,12 +1776,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#353535",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "neutral",
         "subitem": "blk-190",
@@ -1791,6 +1786,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.neutral.blk-190",
           "docs": "core.color.neutral.blk-190",
           "es6": "calciteColorNeutralBlk190"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -1803,12 +1803,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#2b2b2b",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "neutral",
         "subitem": "blk-200",
@@ -1818,6 +1813,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.neutral.blk-200",
           "docs": "core.color.neutral.blk-200",
           "es6": "calciteColorNeutralBlk200"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -1830,12 +1830,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#202020",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "neutral",
         "subitem": "blk-210",
@@ -1845,6 +1840,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.neutral.blk-210",
           "docs": "core.color.neutral.blk-210",
           "es6": "calciteColorNeutralBlk210"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -1857,12 +1857,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#151515",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "neutral",
         "subitem": "blk-220",
@@ -1872,6 +1867,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.neutral.blk-220",
           "docs": "core.color.neutral.blk-220",
           "es6": "calciteColorNeutralBlk220"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -1884,12 +1884,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#0b0b0b",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "neutral",
         "subitem": "blk-230",
@@ -1899,6 +1894,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.neutral.blk-230",
           "docs": "core.color.neutral.blk-230",
           "es6": "calciteColorNeutralBlk230"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -1911,12 +1911,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#060606",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "neutral",
         "subitem": "blk-235",
@@ -1926,6 +1921,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.neutral.blk-235",
           "docs": "core.color.neutral.blk-235",
           "es6": "calciteColorNeutralBlk235"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -1938,12 +1938,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#000000",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "neutral",
         "subitem": "blk-240",
@@ -1953,6 +1948,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.neutral.blk-240",
           "docs": "core.color.neutral.blk-240",
           "es6": "calciteColorNeutralBlk240"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -1965,12 +1965,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#c7eaff",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "blue",
@@ -1981,6 +1976,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.blue.h-bb-010",
           "docs": "core.color.high-saturation.blue.h-bb-010",
           "es6": "calciteColorHighSaturationBlueHBb010"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -1993,12 +1993,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#9fd4f3",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "blue",
@@ -2009,6 +2004,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.blue.h-bb-020",
           "docs": "core.color.high-saturation.blue.h-bb-020",
           "es6": "calciteColorHighSaturationBlueHBb020"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2021,12 +2021,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#77bde7",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "blue",
@@ -2037,6 +2032,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.blue.h-bb-030",
           "docs": "core.color.high-saturation.blue.h-bb-030",
           "es6": "calciteColorHighSaturationBlueHBb030"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2049,12 +2049,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#50a7da",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "blue",
@@ -2065,6 +2060,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.blue.h-bb-040",
           "docs": "core.color.high-saturation.blue.h-bb-040",
           "es6": "calciteColorHighSaturationBlueHBb040"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2077,12 +2077,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#2890ce",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "blue",
@@ -2093,6 +2088,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.blue.h-bb-050",
           "docs": "core.color.high-saturation.blue.h-bb-050",
           "es6": "calciteColorHighSaturationBlueHBb050"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2105,12 +2105,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#007ac2",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "blue",
@@ -2121,6 +2116,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.blue.h-bb-060",
           "docs": "core.color.high-saturation.blue.h-bb-060",
           "es6": "calciteColorHighSaturationBlueHBb060"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2133,12 +2133,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#00619b",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "blue",
@@ -2149,6 +2144,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.blue.h-bb-070",
           "docs": "core.color.high-saturation.blue.h-bb-070",
           "es6": "calciteColorHighSaturationBlueHBb070"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2161,12 +2161,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#004874",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "blue",
@@ -2177,6 +2172,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.blue.h-bb-080",
           "docs": "core.color.high-saturation.blue.h-bb-080",
           "es6": "calciteColorHighSaturationBlueHBb080"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2189,12 +2189,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#00304d",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "blue",
@@ -2205,6 +2200,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.blue.h-bb-090",
           "docs": "core.color.high-saturation.blue.h-bb-090",
           "es6": "calciteColorHighSaturationBlueHBb090"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2217,12 +2217,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#001726",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "blue",
@@ -2233,6 +2228,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.blue.h-bb-100",
           "docs": "core.color.high-saturation.blue.h-bb-100",
           "es6": "calciteColorHighSaturationBlueHBb100"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2245,12 +2245,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#cef5f4",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "green-blue",
@@ -2261,6 +2256,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.green-blue.h-gb-010",
           "docs": "core.color.high-saturation.green-blue.h-gb-010",
           "es6": "calciteColorHighSaturationGreenBlueHGb010"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2273,12 +2273,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#afedec",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "green-blue",
@@ -2289,6 +2284,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.green-blue.h-gb-020",
           "docs": "core.color.high-saturation.green-blue.h-gb-020",
           "es6": "calciteColorHighSaturationGreenBlueHGb020"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2301,12 +2301,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#8fe6e5",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "green-blue",
@@ -2317,6 +2312,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.green-blue.h-gb-030",
           "docs": "core.color.high-saturation.green-blue.h-gb-030",
           "es6": "calciteColorHighSaturationGreenBlueHGb030"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2329,12 +2329,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#5ae0de",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "green-blue",
@@ -2345,6 +2340,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.green-blue.h-gb-040",
           "docs": "core.color.high-saturation.green-blue.h-gb-040",
           "es6": "calciteColorHighSaturationGreenBlueHGb040"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2357,12 +2357,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#28cecb",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "green-blue",
@@ -2373,6 +2368,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.green-blue.h-gb-050",
           "docs": "core.color.high-saturation.green-blue.h-gb-050",
           "es6": "calciteColorHighSaturationGreenBlueHGb050"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2385,12 +2385,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#00bab5",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "green-blue",
@@ -2401,6 +2396,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.green-blue.h-gb-060",
           "docs": "core.color.high-saturation.green-blue.h-gb-060",
           "es6": "calciteColorHighSaturationGreenBlueHGb060"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2413,12 +2413,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#009b98",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "green-blue",
@@ -2429,6 +2424,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.green-blue.h-gb-070",
           "docs": "core.color.high-saturation.green-blue.h-gb-070",
           "es6": "calciteColorHighSaturationGreenBlueHGb070"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2441,12 +2441,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#007472",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "green-blue",
@@ -2457,6 +2452,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.green-blue.h-gb-080",
           "docs": "core.color.high-saturation.green-blue.h-gb-080",
           "es6": "calciteColorHighSaturationGreenBlueHGb080"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2469,12 +2469,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#004d4c",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "green-blue",
@@ -2485,6 +2480,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.green-blue.h-gb-090",
           "docs": "core.color.high-saturation.green-blue.h-gb-090",
           "es6": "calciteColorHighSaturationGreenBlueHGb090"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2497,12 +2497,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#002625",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "green-blue",
@@ -2513,6 +2508,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.green-blue.h-gb-100",
           "docs": "core.color.high-saturation.green-blue.h-gb-100",
           "es6": "calciteColorHighSaturationGreenBlueHGb100"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2525,12 +2525,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#bdf2c4",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "green",
@@ -2541,6 +2536,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.green.h-gg-010",
           "docs": "core.color.high-saturation.green.h-gg-010",
           "es6": "calciteColorHighSaturationGreenHGg010"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2553,12 +2553,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#a2e4ab",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "green",
@@ -2569,6 +2564,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.green.h-gg-020",
           "docs": "core.color.high-saturation.green.h-gg-020",
           "es6": "calciteColorHighSaturationGreenHGg020"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2581,12 +2581,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#87d692",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "green",
@@ -2597,6 +2592,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.green.h-gg-030",
           "docs": "core.color.high-saturation.green.h-gg-030",
           "es6": "calciteColorHighSaturationGreenHGg030"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2609,12 +2609,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#6bc878",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "green",
@@ -2625,6 +2620,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.green.h-gg-040",
           "docs": "core.color.high-saturation.green.h-gg-040",
           "es6": "calciteColorHighSaturationGreenHGg040"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2637,12 +2637,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#50ba5f",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "green",
@@ -2653,6 +2648,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.green.h-gg-050",
           "docs": "core.color.high-saturation.green.h-gg-050",
           "es6": "calciteColorHighSaturationGreenHGg050"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2665,12 +2665,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#35ac46",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "green",
@@ -2681,6 +2676,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.green.h-gg-060",
           "docs": "core.color.high-saturation.green.h-gg-060",
           "es6": "calciteColorHighSaturationGreenHGg060"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2693,12 +2693,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#288835",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "green",
@@ -2709,6 +2704,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.green.h-gg-070",
           "docs": "core.color.high-saturation.green.h-gg-070",
           "es6": "calciteColorHighSaturationGreenHGg070"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2721,12 +2721,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#1a6324",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "green",
@@ -2737,6 +2732,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.green.h-gg-080",
           "docs": "core.color.high-saturation.green.h-gg-080",
           "es6": "calciteColorHighSaturationGreenHGg080"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2749,12 +2749,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#0d3f14",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "green",
@@ -2765,6 +2760,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.green.h-gg-090",
           "docs": "core.color.high-saturation.green.h-gg-090",
           "es6": "calciteColorHighSaturationGreenHGg090"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2777,12 +2777,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#001a03",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "green",
@@ -2793,6 +2788,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.green.h-gg-100",
           "docs": "core.color.high-saturation.green.h-gg-100",
           "es6": "calciteColorHighSaturationGreenHGg100"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2805,12 +2805,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#e5f7b4",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "yellow-green",
@@ -2821,6 +2816,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.yellow-green.h-yg-010",
           "docs": "core.color.high-saturation.yellow-green.h-yg-010",
           "es6": "calciteColorHighSaturationYellowGreenHYg010"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2833,12 +2833,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#d9ef9f",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "yellow-green",
@@ -2849,6 +2844,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.yellow-green.h-yg-020",
           "docs": "core.color.high-saturation.yellow-green.h-yg-020",
           "es6": "calciteColorHighSaturationYellowGreenHYg020"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2861,12 +2861,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#cde78a",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "yellow-green",
@@ -2877,6 +2872,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.yellow-green.h-yg-030",
           "docs": "core.color.high-saturation.yellow-green.h-yg-030",
           "es6": "calciteColorHighSaturationYellowGreenHYg030"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2889,12 +2889,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#c2e075",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "yellow-green",
@@ -2905,6 +2900,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.yellow-green.h-yg-040",
           "docs": "core.color.high-saturation.yellow-green.h-yg-040",
           "es6": "calciteColorHighSaturationYellowGreenHYg040"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2917,12 +2917,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#b6d860",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "yellow-green",
@@ -2933,6 +2928,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.yellow-green.h-yg-050",
           "docs": "core.color.high-saturation.yellow-green.h-yg-050",
           "es6": "calciteColorHighSaturationYellowGreenHYg050"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2945,12 +2945,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#aad04b",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "yellow-green",
@@ -2961,6 +2956,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.yellow-green.h-yg-060",
           "docs": "core.color.high-saturation.yellow-green.h-yg-060",
           "es6": "calciteColorHighSaturationYellowGreenHYg060"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -2973,12 +2973,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#84a338",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "yellow-green",
@@ -2989,6 +2984,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.yellow-green.h-yg-070",
           "docs": "core.color.high-saturation.yellow-green.h-yg-070",
           "es6": "calciteColorHighSaturationYellowGreenHYg070"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3001,12 +3001,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#5e7526",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "yellow-green",
@@ -3017,6 +3012,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.yellow-green.h-yg-080",
           "docs": "core.color.high-saturation.yellow-green.h-yg-080",
           "es6": "calciteColorHighSaturationYellowGreenHYg080"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3029,12 +3029,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#384813",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "yellow-green",
@@ -3045,6 +3040,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.yellow-green.h-yg-090",
           "docs": "core.color.high-saturation.yellow-green.h-yg-090",
           "es6": "calciteColorHighSaturationYellowGreenHYg090"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3057,12 +3057,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#121a00",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "yellow-green",
@@ -3073,6 +3068,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.yellow-green.h-yg-100",
           "docs": "core.color.high-saturation.yellow-green.h-yg-100",
           "es6": "calciteColorHighSaturationYellowGreenHYg100"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3085,12 +3085,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#fff7cc",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "yellow",
@@ -3101,6 +3096,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.yellow.h-yy-010",
           "docs": "core.color.high-saturation.yellow.h-yy-010",
           "es6": "calciteColorHighSaturationYellowHYy010"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3113,12 +3113,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#fef3ad",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "yellow",
@@ -3129,6 +3124,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.yellow.h-yy-020",
           "docs": "core.color.high-saturation.yellow.h-yy-020",
           "es6": "calciteColorHighSaturationYellowHYy020"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3141,12 +3141,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#fcee8d",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "yellow",
@@ -3157,6 +3152,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.yellow.h-yy-030",
           "docs": "core.color.high-saturation.yellow.h-yy-030",
           "es6": "calciteColorHighSaturationYellowHYy030"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3169,12 +3169,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#fbea6e",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "yellow",
@@ -3185,6 +3180,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.yellow.h-yy-040",
           "docs": "core.color.high-saturation.yellow.h-yy-040",
           "es6": "calciteColorHighSaturationYellowHYy040"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3197,12 +3197,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#f9e54e",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "yellow",
@@ -3213,6 +3208,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.yellow.h-yy-050",
           "docs": "core.color.high-saturation.yellow.h-yy-050",
           "es6": "calciteColorHighSaturationYellowHYy050"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3225,12 +3225,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#edd317",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "yellow",
@@ -3241,6 +3236,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.yellow.h-yy-060",
           "docs": "core.color.high-saturation.yellow.h-yy-060",
           "es6": "calciteColorHighSaturationYellowHYy060"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3253,12 +3253,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#d9bc00",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "yellow",
@@ -3269,6 +3264,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.yellow.h-yy-070",
           "docs": "core.color.high-saturation.yellow.h-yy-070",
           "es6": "calciteColorHighSaturationYellowHYy070"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3281,12 +3281,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#bfa200",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "yellow",
@@ -3297,6 +3292,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.yellow.h-yy-080",
           "docs": "core.color.high-saturation.yellow.h-yy-080",
           "es6": "calciteColorHighSaturationYellowHYy080"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3309,12 +3309,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#8c7500",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "yellow",
@@ -3325,6 +3320,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.yellow.h-yy-090",
           "docs": "core.color.high-saturation.yellow.h-yy-090",
           "es6": "calciteColorHighSaturationYellowHYy090"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3337,12 +3337,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#5c4e00",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "yellow",
@@ -3353,6 +3348,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.yellow.h-yy-100",
           "docs": "core.color.high-saturation.yellow.h-yy-100",
           "es6": "calciteColorHighSaturationYellowHYy100"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3365,12 +3365,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#ffe2bf",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "orange-yellow",
@@ -3381,6 +3376,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.orange-yellow.h-oy-010",
           "docs": "core.color.high-saturation.orange-yellow.h-oy-010",
           "es6": "calciteColorHighSaturationOrangeYellowHOy010"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3393,12 +3393,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#fed3a1",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "orange-yellow",
@@ -3409,6 +3404,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.orange-yellow.h-oy-020",
           "docs": "core.color.high-saturation.orange-yellow.h-oy-020",
           "es6": "calciteColorHighSaturationOrangeYellowHOy020"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3421,12 +3421,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#fcc582",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "orange-yellow",
@@ -3437,6 +3432,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.orange-yellow.h-oy-030",
           "docs": "core.color.high-saturation.orange-yellow.h-oy-030",
           "es6": "calciteColorHighSaturationOrangeYellowHOy030"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3449,12 +3449,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#fbb664",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "orange-yellow",
@@ -3465,6 +3460,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.orange-yellow.h-oy-040",
           "docs": "core.color.high-saturation.orange-yellow.h-oy-040",
           "es6": "calciteColorHighSaturationOrangeYellowHOy040"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3477,12 +3477,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#f9a845",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "orange-yellow",
@@ -3493,6 +3488,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.orange-yellow.h-oy-050",
           "docs": "core.color.high-saturation.orange-yellow.h-oy-050",
           "es6": "calciteColorHighSaturationOrangeYellowHOy050"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3505,12 +3505,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#f89927",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "orange-yellow",
@@ -3521,6 +3516,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.orange-yellow.h-oy-060",
           "docs": "core.color.high-saturation.orange-yellow.h-oy-060",
           "es6": "calciteColorHighSaturationOrangeYellowHOy060"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3533,12 +3533,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#c67718",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "orange-yellow",
@@ -3549,6 +3544,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.orange-yellow.h-oy-070",
           "docs": "core.color.high-saturation.orange-yellow.h-oy-070",
           "es6": "calciteColorHighSaturationOrangeYellowHOy070"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3561,12 +3561,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#9a5b10",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "orange-yellow",
@@ -3577,6 +3572,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.orange-yellow.h-oy-080",
           "docs": "core.color.high-saturation.orange-yellow.h-oy-080",
           "es6": "calciteColorHighSaturationOrangeYellowHOy080"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3589,12 +3589,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#6d3f08",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "orange-yellow",
@@ -3605,6 +3600,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.orange-yellow.h-oy-090",
           "docs": "core.color.high-saturation.orange-yellow.h-oy-090",
           "es6": "calciteColorHighSaturationOrangeYellowHOy090"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3617,12 +3617,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#402300",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "orange-yellow",
@@ -3633,6 +3628,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.orange-yellow.h-oy-100",
           "docs": "core.color.high-saturation.orange-yellow.h-oy-100",
           "es6": "calciteColorHighSaturationOrangeYellowHOy100"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3645,12 +3645,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#ffd8bf",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "orange",
@@ -3661,6 +3656,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.orange.h-oo-010",
           "docs": "core.color.high-saturation.orange.h-oo-010",
           "es6": "calciteColorHighSaturationOrangeHOo010"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3673,12 +3673,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#fdc39f",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "orange",
@@ -3689,6 +3684,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.orange.h-oo-020",
           "docs": "core.color.high-saturation.orange.h-oo-020",
           "es6": "calciteColorHighSaturationOrangeHOo020"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3701,12 +3701,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#faae7f",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "orange",
@@ -3717,6 +3712,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.orange.h-oo-030",
           "docs": "core.color.high-saturation.orange.h-oo-030",
           "es6": "calciteColorHighSaturationOrangeHOo030"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3729,12 +3729,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#f89960",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "orange",
@@ -3745,6 +3740,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.orange.h-oo-040",
           "docs": "core.color.high-saturation.orange.h-oo-040",
           "es6": "calciteColorHighSaturationOrangeHOo040"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3757,12 +3757,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#f58440",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "orange",
@@ -3773,6 +3768,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.orange.h-oo-050",
           "docs": "core.color.high-saturation.orange.h-oo-050",
           "es6": "calciteColorHighSaturationOrangeHOo050"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3785,12 +3785,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#f36f20",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "orange",
@@ -3801,6 +3796,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.orange.h-oo-060",
           "docs": "core.color.high-saturation.orange.h-oo-060",
           "es6": "calciteColorHighSaturationOrangeHOo060"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3813,12 +3813,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#c65a18",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "orange",
@@ -3829,6 +3824,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.orange.h-oo-070",
           "docs": "core.color.high-saturation.orange.h-oo-070",
           "es6": "calciteColorHighSaturationOrangeHOo070"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3841,12 +3841,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#9a4410",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "orange",
@@ -3857,6 +3852,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.orange.h-oo-080",
           "docs": "core.color.high-saturation.orange.h-oo-080",
           "es6": "calciteColorHighSaturationOrangeHOo080"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3869,12 +3869,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#6d2f08",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "orange",
@@ -3885,6 +3880,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.orange.h-oo-090",
           "docs": "core.color.high-saturation.orange.h-oo-090",
           "es6": "calciteColorHighSaturationOrangeHOo090"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3897,12 +3897,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#401900",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "orange",
@@ -3913,6 +3908,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.orange.h-oo-100",
           "docs": "core.color.high-saturation.orange.h-oo-100",
           "es6": "calciteColorHighSaturationOrangeHOo100"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3925,12 +3925,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#ffc7b3",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "red-orange",
@@ -3941,6 +3936,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.red-orange.h-ro-010",
           "docs": "core.color.high-saturation.red-orange.h-ro-010",
           "es6": "calciteColorHighSaturationRedOrangeHRo010"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3953,12 +3953,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#f8af95",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "red-orange",
@@ -3969,6 +3964,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.red-orange.h-ro-020",
           "docs": "core.color.high-saturation.red-orange.h-ro-020",
           "es6": "calciteColorHighSaturationRedOrangeHRo020"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -3981,12 +3981,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#f09677",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "red-orange",
@@ -3997,6 +3992,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.red-orange.h-ro-030",
           "docs": "core.color.high-saturation.red-orange.h-ro-030",
           "es6": "calciteColorHighSaturationRedOrangeHRo030"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4009,12 +4009,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#e97e5a",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "red-orange",
@@ -4025,6 +4020,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.red-orange.h-ro-040",
           "docs": "core.color.high-saturation.red-orange.h-ro-040",
           "es6": "calciteColorHighSaturationRedOrangeHRo040"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4037,12 +4037,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#e1653c",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "red-orange",
@@ -4053,6 +4048,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.red-orange.h-ro-050",
           "docs": "core.color.high-saturation.red-orange.h-ro-050",
           "es6": "calciteColorHighSaturationRedOrangeHRo050"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4065,12 +4065,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#da4d1e",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "red-orange",
@@ -4081,6 +4076,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.red-orange.h-ro-060",
           "docs": "core.color.high-saturation.red-orange.h-ro-060",
           "es6": "calciteColorHighSaturationRedOrangeHRo060"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4093,12 +4093,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#ad3c16",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "red-orange",
@@ -4109,6 +4104,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.red-orange.h-ro-070",
           "docs": "core.color.high-saturation.red-orange.h-ro-070",
           "es6": "calciteColorHighSaturationRedOrangeHRo070"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4121,12 +4121,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#802c0f",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "red-orange",
@@ -4137,6 +4132,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.red-orange.h-ro-080",
           "docs": "core.color.high-saturation.red-orange.h-ro-080",
           "es6": "calciteColorHighSaturationRedOrangeHRo080"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4149,12 +4149,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#531b07",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "red-orange",
@@ -4165,6 +4160,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.red-orange.h-ro-090",
           "docs": "core.color.high-saturation.red-orange.h-ro-090",
           "es6": "calciteColorHighSaturationRedOrangeHRo090"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4177,12 +4177,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#260a00",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "red-orange",
@@ -4193,6 +4188,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.red-orange.h-ro-100",
           "docs": "core.color.high-saturation.red-orange.h-ro-100",
           "es6": "calciteColorHighSaturationRedOrangeHRo100"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4205,12 +4205,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#ffc6bf",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "red",
@@ -4221,6 +4216,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.red.h-rr-010",
           "docs": "core.color.high-saturation.red.h-rr-010",
           "es6": "calciteColorHighSaturationRedHRr010"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4233,12 +4233,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#ffaaa1",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "red",
@@ -4249,6 +4244,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.red.h-rr-020",
           "docs": "core.color.high-saturation.red.h-rr-020",
           "es6": "calciteColorHighSaturationRedHRr020"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4261,12 +4261,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#f2877b",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "red",
@@ -4277,6 +4272,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.red.h-rr-030",
           "docs": "core.color.high-saturation.red.h-rr-030",
           "es6": "calciteColorHighSaturationRedHRr030"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4289,12 +4289,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#f07062",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "red",
@@ -4305,6 +4300,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.red.h-rr-040",
           "docs": "core.color.high-saturation.red.h-rr-040",
           "es6": "calciteColorHighSaturationRedHRr040"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4317,12 +4317,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#e65240",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "red",
@@ -4333,6 +4328,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.red.h-rr-050",
           "docs": "core.color.high-saturation.red.h-rr-050",
           "es6": "calciteColorHighSaturationRedHRr050"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4345,12 +4345,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#d83020",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "red",
@@ -4361,6 +4356,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.red.h-rr-060",
           "docs": "core.color.high-saturation.red.h-rr-060",
           "es6": "calciteColorHighSaturationRedHRr060"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4373,12 +4373,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#a82b1e",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "red",
@@ -4389,6 +4384,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.red.h-rr-070",
           "docs": "core.color.high-saturation.red.h-rr-070",
           "es6": "calciteColorHighSaturationRedHRr070"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4401,12 +4401,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#7c1d13",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "red",
@@ -4417,6 +4412,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.red.h-rr-080",
           "docs": "core.color.high-saturation.red.h-rr-080",
           "es6": "calciteColorHighSaturationRedHRr080"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4429,12 +4429,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#4f0e08",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "red",
@@ -4445,6 +4440,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.red.h-rr-090",
           "docs": "core.color.high-saturation.red.h-rr-090",
           "es6": "calciteColorHighSaturationRedHRr090"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4457,12 +4457,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#210300",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "red",
@@ -4473,6 +4468,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.red.h-rr-100",
           "docs": "core.color.high-saturation.red.h-rr-100",
           "es6": "calciteColorHighSaturationRedHRr100"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4485,12 +4485,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#ffd1ef",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "pink",
@@ -4501,6 +4496,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.pink.h-pk-010",
           "docs": "core.color.high-saturation.pink.h-pk-010",
           "es6": "calciteColorHighSaturationPinkHPk010"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4513,12 +4513,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#fabee4",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "pink",
@@ -4529,6 +4524,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.pink.h-pk-020",
           "docs": "core.color.high-saturation.pink.h-pk-020",
           "es6": "calciteColorHighSaturationPinkHPk020"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4541,12 +4541,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#f2a5d6",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "pink",
@@ -4557,6 +4552,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.pink.h-pk-030",
           "docs": "core.color.high-saturation.pink.h-pk-030",
           "es6": "calciteColorHighSaturationPinkHPk030"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4569,12 +4569,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#eb8dc9",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "pink",
@@ -4585,6 +4580,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.pink.h-pk-040",
           "docs": "core.color.high-saturation.pink.h-pk-040",
           "es6": "calciteColorHighSaturationPinkHPk040"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4597,12 +4597,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#e673bb",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "pink",
@@ -4613,6 +4608,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.pink.h-pk-050",
           "docs": "core.color.high-saturation.pink.h-pk-050",
           "es6": "calciteColorHighSaturationPinkHPk050"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4625,12 +4625,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#e04ea6",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "pink",
@@ -4641,6 +4636,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.pink.h-pk-060",
           "docs": "core.color.high-saturation.pink.h-pk-060",
           "es6": "calciteColorHighSaturationPinkHPk060"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4653,12 +4653,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#ba2f7e",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "pink",
@@ -4669,6 +4664,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.pink.h-pk-070",
           "docs": "core.color.high-saturation.pink.h-pk-070",
           "es6": "calciteColorHighSaturationPinkHPk070"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4681,12 +4681,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#851b52",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "pink",
@@ -4697,6 +4692,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.pink.h-pk-080",
           "docs": "core.color.high-saturation.pink.h-pk-080",
           "es6": "calciteColorHighSaturationPinkHPk080"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4709,12 +4709,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#590b32",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "pink",
@@ -4725,6 +4720,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.pink.h-pk-090",
           "docs": "core.color.high-saturation.pink.h-pk-090",
           "es6": "calciteColorHighSaturationPinkHPk090"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4737,12 +4737,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#260404",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "pink",
@@ -4753,6 +4748,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.pink.h-pk-100",
           "docs": "core.color.high-saturation.pink.h-pk-100",
           "es6": "calciteColorHighSaturationPinkHPk100"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4765,12 +4765,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#fadbff",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "violet-red",
@@ -4781,6 +4776,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.violet-red.h-vr-010",
           "docs": "core.color.high-saturation.violet-red.h-vr-010",
           "es6": "calciteColorHighSaturationVioletRedHVr010"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4793,12 +4793,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#e4beeb",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "violet-red",
@@ -4809,6 +4804,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.violet-red.h-vr-020",
           "docs": "core.color.high-saturation.violet-red.h-vr-020",
           "es6": "calciteColorHighSaturationVioletRedHVr020"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4821,12 +4821,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#cfa1d7",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "violet-red",
@@ -4837,6 +4832,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.violet-red.h-vr-030",
           "docs": "core.color.high-saturation.violet-red.h-vr-030",
           "es6": "calciteColorHighSaturationVioletRedHVr030"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4849,12 +4849,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#b983c3",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "violet-red",
@@ -4865,6 +4860,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.violet-red.h-vr-040",
           "docs": "core.color.high-saturation.violet-red.h-vr-040",
           "es6": "calciteColorHighSaturationVioletRedHVr040"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4877,12 +4877,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#a466af",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "violet-red",
@@ -4893,6 +4888,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.violet-red.h-vr-050",
           "docs": "core.color.high-saturation.violet-red.h-vr-050",
           "es6": "calciteColorHighSaturationVioletRedHVr050"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4905,12 +4905,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#8e499b",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "violet-red",
@@ -4921,6 +4916,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.violet-red.h-vr-060",
           "docs": "core.color.high-saturation.violet-red.h-vr-060",
           "es6": "calciteColorHighSaturationVioletRedHVr060"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4933,12 +4933,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#73377e",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "violet-red",
@@ -4949,6 +4944,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.violet-red.h-vr-070",
           "docs": "core.color.high-saturation.violet-red.h-vr-070",
           "es6": "calciteColorHighSaturationVioletRedHVr070"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4961,12 +4961,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#572561",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "violet-red",
@@ -4977,6 +4972,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.violet-red.h-vr-080",
           "docs": "core.color.high-saturation.violet-red.h-vr-080",
           "es6": "calciteColorHighSaturationVioletRedHVr080"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -4989,12 +4989,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#3c1243",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "violet-red",
@@ -5005,6 +5000,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.violet-red.h-vr-090",
           "docs": "core.color.high-saturation.violet-red.h-vr-090",
           "es6": "calciteColorHighSaturationVioletRedHVr090"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5017,12 +5017,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#200026",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "violet-red",
@@ -5033,6 +5028,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.violet-red.h-vr-100",
           "docs": "core.color.high-saturation.violet-red.h-vr-100",
           "es6": "calciteColorHighSaturationVioletRedHVr100"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5045,12 +5045,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#e8d9ff",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "violet",
@@ -5061,6 +5056,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.violet.h-vv-010",
           "docs": "core.color.high-saturation.violet.h-vv-010",
           "es6": "calciteColorHighSaturationVioletHVv010"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5073,12 +5073,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#cdb9eb",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "violet",
@@ -5089,6 +5084,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.violet.h-vv-020",
           "docs": "core.color.high-saturation.violet.h-vv-020",
           "es6": "calciteColorHighSaturationVioletHVv020"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5101,12 +5101,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#b39ad7",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "violet",
@@ -5117,7 +5112,12 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.violet.h-vv-030",
           "docs": "core.color.high-saturation.violet.h-vv-030",
           "es6": "calciteColorHighSaturationVioletHVv030"
-        }
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
+        }
       },
       "filePath": "src/tokens/core/color.json",
       "isSource": false,
@@ -5129,12 +5129,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#987ac3",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "violet",
@@ -5145,6 +5140,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.violet.h-vv-040",
           "docs": "core.color.high-saturation.violet.h-vv-040",
           "es6": "calciteColorHighSaturationVioletHVv040"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5157,12 +5157,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#7e5baf",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "violet",
@@ -5173,6 +5168,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.violet.h-vv-050",
           "docs": "core.color.high-saturation.violet.h-vv-050",
           "es6": "calciteColorHighSaturationVioletHVv050"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5185,12 +5185,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#633b9b",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "violet",
@@ -5201,6 +5196,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.violet.h-vv-060",
           "docs": "core.color.high-saturation.violet.h-vv-060",
           "es6": "calciteColorHighSaturationVioletHVv060"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5213,12 +5213,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#4e2c7e",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "violet",
@@ -5229,6 +5224,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.violet.h-vv-070",
           "docs": "core.color.high-saturation.violet.h-vv-070",
           "es6": "calciteColorHighSaturationVioletHVv070"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5241,12 +5241,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#3a1e61",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "violet",
@@ -5257,6 +5252,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.violet.h-vv-080",
           "docs": "core.color.high-saturation.violet.h-vv-080",
           "es6": "calciteColorHighSaturationVioletHVv080"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5269,12 +5269,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#250f43",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "violet",
@@ -5285,6 +5280,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.violet.h-vv-090",
           "docs": "core.color.high-saturation.violet.h-vv-090",
           "es6": "calciteColorHighSaturationVioletHVv090"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5297,12 +5297,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#100026",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "high-saturation",
         "subitem": "violet",
@@ -5313,6 +5308,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.high-saturation.violet.h-vv-100",
           "docs": "core.color.high-saturation.violet.h-vv-100",
           "es6": "calciteColorHighSaturationVioletHVv100"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5325,12 +5325,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#59d6ff",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "blue",
@@ -5341,6 +5336,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.blue.v-bb-120",
           "docs": "core.color.vibrant.blue.v-bb-120",
           "es6": "calciteColorVibrantBlueVBb120"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5353,12 +5353,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#3db8ff",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "blue",
@@ -5369,6 +5364,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.blue.v-bb-140",
           "docs": "core.color.vibrant.blue.v-bb-140",
           "es6": "calciteColorVibrantBlueVBb140"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5381,12 +5381,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#009af2",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "blue",
@@ -5397,6 +5392,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.blue.v-bb-160",
           "docs": "core.color.vibrant.blue.v-bb-160",
           "es6": "calciteColorVibrantBlueVBb160"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5409,12 +5409,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#009af2",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "blue",
@@ -5425,6 +5420,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.blue.v-bb-180",
           "docs": "core.color.vibrant.blue.v-bb-180",
           "es6": "calciteColorVibrantBlueVBb180"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5437,12 +5437,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#59fffc",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "green-blue",
@@ -5453,6 +5448,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.green-blue.v-gb-120",
           "docs": "core.color.vibrant.green-blue.v-gb-120",
           "es6": "calciteColorVibrantGreenBlueVGb120"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5465,12 +5465,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#00f7f3",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "green-blue",
@@ -5481,6 +5476,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.green-blue.v-gb-140",
           "docs": "core.color.vibrant.green-blue.v-gb-140",
           "es6": "calciteColorVibrantGreenBlueVGb140"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5493,12 +5493,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#00e6e2",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "green-blue",
@@ -5509,6 +5504,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.green-blue.v-gb-160",
           "docs": "core.color.vibrant.green-blue.v-gb-160",
           "es6": "calciteColorVibrantGreenBlueVGb160"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5521,12 +5521,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#00cfca",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "green-blue",
@@ -5537,6 +5532,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.green-blue.v-gb-180",
           "docs": "core.color.vibrant.green-blue.v-gb-180",
           "es6": "calciteColorVibrantGreenBlueVGb180"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5549,12 +5549,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#73ff84",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "green",
@@ -5565,6 +5560,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.green.v-gg-120",
           "docs": "core.color.vibrant.green.v-gg-120",
           "es6": "calciteColorVibrantGreenVGg120"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5577,12 +5577,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#3bed52",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "green",
@@ -5593,6 +5588,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.green.v-gg-140",
           "docs": "core.color.vibrant.green.v-gg-140",
           "es6": "calciteColorVibrantGreenVGg140"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5605,12 +5605,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#00b81b",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "green",
@@ -5621,6 +5616,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.green.v-gg-160",
           "docs": "core.color.vibrant.green.v-gg-160",
           "es6": "calciteColorVibrantGreenVGg160"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5633,12 +5633,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#00a118",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "green",
@@ -5649,6 +5644,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.green.v-gg-180",
           "docs": "core.color.vibrant.green.v-gg-180",
           "es6": "calciteColorVibrantGreenVGg180"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5661,12 +5661,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#d7ff73",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "yellow-green",
@@ -5677,6 +5672,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.yellow-green.v-yg-120",
           "docs": "core.color.vibrant.yellow-green.v-yg-120",
           "es6": "calciteColorVibrantYellowGreenVYg120"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5689,12 +5689,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#bbed3b",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "yellow-green",
@@ -5705,6 +5700,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.yellow-green.v-yg-140",
           "docs": "core.color.vibrant.yellow-green.v-yg-140",
           "es6": "calciteColorVibrantYellowGreenVYg140"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5717,12 +5717,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#96cc00",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "yellow-green",
@@ -5733,6 +5728,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.yellow-green.v-yg-160",
           "docs": "core.color.vibrant.yellow-green.v-yg-160",
           "es6": "calciteColorVibrantYellowGreenVYg160"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5745,12 +5745,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#7fab00",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "yellow-green",
@@ -5761,6 +5756,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.yellow-green.v-yg-180",
           "docs": "core.color.vibrant.yellow-green.v-yg-180",
           "es6": "calciteColorVibrantYellowGreenVYg180"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5773,12 +5773,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#fff766",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "yellow",
@@ -5789,6 +5784,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.yellow.v-yy-120",
           "docs": "core.color.vibrant.yellow.v-yy-120",
           "es6": "calciteColorVibrantYellowVYy120"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5801,12 +5801,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#ffee33",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "yellow",
@@ -5817,6 +5812,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.yellow.v-yy-140",
           "docs": "core.color.vibrant.yellow.v-yy-140",
           "es6": "calciteColorVibrantYellowVYy140"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5829,12 +5829,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#f5d000",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "yellow",
@@ -5845,6 +5840,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.yellow.v-yy-160",
           "docs": "core.color.vibrant.yellow.v-yy-160",
           "es6": "calciteColorVibrantYellowVYy160"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5857,12 +5857,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#ebba17",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "yellow",
@@ -5873,6 +5868,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.yellow.v-yy-180",
           "docs": "core.color.vibrant.yellow.v-yy-180",
           "es6": "calciteColorVibrantYellowVYy180"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5885,12 +5885,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#ffb54d",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "orange-yellow",
@@ -5901,6 +5896,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.orange-yellow.v-oy-120",
           "docs": "core.color.vibrant.orange-yellow.v-oy-120",
           "es6": "calciteColorVibrantOrangeYellowVOy120"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5913,12 +5913,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#ff9500",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "orange-yellow",
@@ -5929,6 +5924,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.orange-yellow.v-oy-140",
           "docs": "core.color.vibrant.orange-yellow.v-oy-140",
           "es6": "calciteColorVibrantOrangeYellowVOy140"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5941,12 +5941,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#e68600",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "orange-yellow",
@@ -5957,6 +5952,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.orange-yellow.v-oy-160",
           "docs": "core.color.vibrant.orange-yellow.v-oy-160",
           "es6": "calciteColorVibrantOrangeYellowVOy160"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5969,12 +5969,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#d17300",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "orange-yellow",
@@ -5985,6 +5980,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.orange-yellow.v-oy-180",
           "docs": "core.color.vibrant.orange-yellow.v-oy-180",
           "es6": "calciteColorVibrantOrangeYellowVOy180"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -5997,12 +5997,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#ff824d",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "red-orange",
@@ -6013,6 +6008,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.red-orange.v-ro-120",
           "docs": "core.color.vibrant.red-orange.v-ro-120",
           "es6": "calciteColorVibrantRedOrangeVRo120"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -6025,12 +6025,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#ff4d00",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "red-orange",
@@ -6041,6 +6036,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.red-orange.v-ro-140",
           "docs": "core.color.vibrant.red-orange.v-ro-140",
           "es6": "calciteColorVibrantRedOrangeVRo140"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -6053,12 +6053,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#de4300",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "red-orange",
@@ -6069,6 +6064,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.red-orange.v-ro-160",
           "docs": "core.color.vibrant.red-orange.v-ro-160",
           "es6": "calciteColorVibrantRedOrangeVRo160"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -6081,12 +6081,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#c93b00",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "red-orange",
@@ -6097,6 +6092,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.red-orange.v-ro-180",
           "docs": "core.color.vibrant.red-orange.v-ro-180",
           "es6": "calciteColorVibrantRedOrangeVRo180"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -6109,12 +6109,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#ff624d",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "red",
@@ -6125,6 +6120,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.red.v-rr-120",
           "docs": "core.color.vibrant.red.v-rr-120",
           "es6": "calciteColorVibrantRedVRr120"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -6137,12 +6137,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#ff0015",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "red",
@@ -6153,6 +6148,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.red.v-rr-140",
           "docs": "core.color.vibrant.red.v-rr-140",
           "es6": "calciteColorVibrantRedVRr140"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -6165,12 +6165,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#d90012",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "red",
@@ -6181,6 +6176,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.red.v-rr-160",
           "docs": "core.color.vibrant.red.v-rr-160",
           "es6": "calciteColorVibrantRedVRr160"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -6193,12 +6193,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#b3000f",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "red",
@@ -6209,6 +6204,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.red.v-rr-180",
           "docs": "core.color.vibrant.red.v-rr-180",
           "es6": "calciteColorVibrantRedVRr180"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -6221,12 +6221,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#ff66c2",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "pink",
@@ -6237,6 +6232,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.pink.v-pk-120",
           "docs": "core.color.vibrant.pink.v-pk-120",
           "es6": "calciteColorVibrantPinkVPk120"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -6249,12 +6249,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#ff19a4",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "pink",
@@ -6265,6 +6260,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.pink.v-pk-140",
           "docs": "core.color.vibrant.pink.v-pk-140",
           "es6": "calciteColorVibrantPinkVPk140"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -6277,12 +6277,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#d11486",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "pink",
@@ -6293,6 +6288,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.pink.v-pk-160",
           "docs": "core.color.vibrant.pink.v-pk-160",
           "es6": "calciteColorVibrantPinkVPk160"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -6305,12 +6305,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#c00073",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "pink",
@@ -6321,6 +6316,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.pink.v-pk-180",
           "docs": "core.color.vibrant.pink.v-pk-180",
           "es6": "calciteColorVibrantPinkVPk180"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -6333,12 +6333,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#ea80ff",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "violet-red",
@@ -6349,6 +6344,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.violet-red.v-vr-120",
           "docs": "core.color.vibrant.violet-red.v-vr-120",
           "es6": "calciteColorVibrantVioletRedVVr120"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -6361,12 +6361,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#dd33ff",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "violet-red",
@@ -6377,6 +6372,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.violet-red.v-vr-140",
           "docs": "core.color.vibrant.violet-red.v-vr-140",
           "es6": "calciteColorVibrantVioletRedVVr140"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -6389,12 +6389,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#ac08cc",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "violet-red",
@@ -6405,6 +6400,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.violet-red.v-vr-160",
           "docs": "core.color.vibrant.violet-red.v-vr-160",
           "es6": "calciteColorVibrantVioletRedVVr160"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -6417,12 +6417,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#83009e",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "violet-red",
@@ -6433,6 +6428,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.violet-red.v-vr-180",
           "docs": "core.color.vibrant.violet-red.v-vr-180",
           "es6": "calciteColorVibrantVioletRedVVr180"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -6445,12 +6445,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#b580ff",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "violet",
@@ -6461,6 +6456,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.violet.v-vv-120",
           "docs": "core.color.vibrant.violet.v-vv-120",
           "es6": "calciteColorVibrantVioletVVv120"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -6473,12 +6473,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#974dff",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "violet",
@@ -6489,6 +6484,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.violet.v-vv-140",
           "docs": "core.color.vibrant.violet.v-vv-140",
           "es6": "calciteColorVibrantVioletVVv140"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -6501,12 +6501,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#8129ff",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "violet",
@@ -6517,6 +6512,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.violet.v-vv-160",
           "docs": "core.color.vibrant.violet.v-vv-160",
           "es6": "calciteColorVibrantVioletVVv160"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -6529,12 +6529,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#6a0be6",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "vibrant",
         "subitem": "violet",
@@ -6545,6 +6540,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.vibrant.violet.v-vv-180",
           "docs": "core.color.vibrant.violet.v-vv-180",
           "es6": "calciteColorVibrantVioletVVv180"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -6557,12 +6557,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#44ed51",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "dark",
         "subitem": "green",
@@ -6573,6 +6568,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.dark.green.d-gg-410",
           "docs": "core.color.dark.green.d-gg-410",
           "es6": "calciteColorDarkGreenDGg410"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -6585,12 +6585,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#36da43",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "dark",
         "subitem": "green",
@@ -6601,6 +6596,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.dark.green.d-gg-420",
           "docs": "core.color.dark.green.d-gg-420",
           "es6": "calciteColorDarkGreenDGg420"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -6613,12 +6613,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#36da43",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "dark",
         "subitem": "green",
@@ -6629,6 +6624,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.dark.green.d-gg-430",
           "docs": "core.color.dark.green.d-gg-430",
           "es6": "calciteColorDarkGreenDGg430"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -6641,12 +6641,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#ffe24d",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "dark",
         "subitem": "yellow",
@@ -6657,6 +6652,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.dark.yellow.d-yy-410",
           "docs": "core.color.dark.yellow.d-yy-410",
           "es6": "calciteColorDarkYellowDYy410"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -6669,12 +6669,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#ffc900",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "dark",
         "subitem": "yellow",
@@ -6685,6 +6680,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.dark.yellow.d-yy-420",
           "docs": "core.color.dark.yellow.d-yy-420",
           "es6": "calciteColorDarkYellowDYy420"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -6697,12 +6697,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#f4b000",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "dark",
         "subitem": "yellow",
@@ -6713,6 +6708,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.dark.yellow.d-yy-430",
           "docs": "core.color.dark.yellow.d-yy-430",
           "es6": "calciteColorDarkYellowDYy430"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -6725,12 +6725,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#ff7465",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "dark",
         "subitem": "red",
@@ -6741,6 +6736,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.dark.red.d-rr-410",
           "docs": "core.color.dark.red.d-rr-410",
           "es6": "calciteColorDarkRedDRr410"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -6753,12 +6753,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#fe583e",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "dark",
         "subitem": "red",
@@ -6769,6 +6764,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.dark.red.d-rr-420",
           "docs": "core.color.dark.red.d-rr-420",
           "es6": "calciteColorDarkRedDRr420"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -6781,12 +6781,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#f3381b",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "dark",
         "subitem": "red",
@@ -6797,6 +6792,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.dark.red.d-rr-430",
           "docs": "core.color.dark.red.d-rr-430",
           "es6": "calciteColorDarkRedDRr430"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -6809,12 +6809,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#47bbff",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "dark",
         "subitem": "blue",
@@ -6825,6 +6820,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.dark.blue.d-bb-410",
           "docs": "core.color.dark.blue.d-bb-410",
           "es6": "calciteColorDarkBlueDBb410"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -6837,12 +6837,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#00a0ff",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "dark",
         "subitem": "blue",
@@ -6853,6 +6848,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.dark.blue.d-bb-420",
           "docs": "core.color.dark.blue.d-bb-420",
           "es6": "calciteColorDarkBlueDBb420"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -6865,12 +6865,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "#0087d7",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "color"
-        },
-        "category": "core",
+        "category": "color",
         "type": "color",
         "item": "dark",
         "subitem": "blue",
@@ -6881,6 +6876,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.color.dark.blue.d-bb-430",
           "docs": "core.color.dark.blue.d-bb-430",
           "es6": "calciteColorDarkBlueDBb430"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/core/color.json",
@@ -6893,12 +6893,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "0",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "breakpoint",
         "type": "container-size",
         "item": "0",
         "names": {
@@ -6907,6 +6902,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.container-size.0",
           "docs": "core.container-size.0",
           "es6": "calciteContainerSize0"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/container-size.json",
@@ -6919,12 +6919,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "154px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "breakpoint",
         "type": "container-size",
         "item": "154",
         "names": {
@@ -6933,6 +6928,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.container-size.154",
           "docs": "core.container-size.154",
           "es6": "calciteContainerSize154"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/container-size.json",
@@ -6945,12 +6945,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "320px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "breakpoint",
         "type": "container-size",
         "item": "320",
         "names": {
@@ -6959,6 +6954,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.container-size.320",
           "docs": "core.container-size.320",
           "es6": "calciteContainerSize320"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/container-size.json",
@@ -6971,12 +6971,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "328px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "breakpoint",
         "type": "container-size",
         "item": "328",
         "names": {
@@ -6985,6 +6980,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.container-size.328",
           "docs": "core.container-size.328",
           "es6": "calciteContainerSize328"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/container-size.json",
@@ -6997,12 +6997,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "476px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "breakpoint",
         "type": "container-size",
         "item": "476",
         "names": {
@@ -7011,6 +7006,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.container-size.476",
           "docs": "core.container-size.476",
           "es6": "calciteContainerSize476"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/container-size.json",
@@ -7023,12 +7023,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "504px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "breakpoint",
         "type": "container-size",
         "item": "504",
         "names": {
@@ -7037,6 +7032,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.container-size.504",
           "docs": "core.container-size.504",
           "es6": "calciteContainerSize504"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/container-size.json",
@@ -7049,12 +7049,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "678px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "breakpoint",
         "type": "container-size",
         "item": "678",
         "names": {
@@ -7063,6 +7058,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.container-size.678",
           "docs": "core.container-size.678",
           "es6": "calciteContainerSize678"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/container-size.json",
@@ -7075,12 +7075,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "768px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "breakpoint",
         "type": "container-size",
         "item": "768",
         "names": {
@@ -7089,6 +7084,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.container-size.768",
           "docs": "core.container-size.768",
           "es6": "calciteContainerSize768"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/container-size.json",
@@ -7101,12 +7101,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "854px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "breakpoint",
         "type": "container-size",
         "item": "854",
         "names": {
@@ -7115,6 +7110,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.container-size.854",
           "docs": "core.container-size.854",
           "es6": "calciteContainerSize854"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/container-size.json",
@@ -7127,12 +7127,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "1152px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "breakpoint",
         "type": "container-size",
         "item": "1152",
         "names": {
@@ -7141,6 +7136,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.container-size.1152",
           "docs": "core.container-size.1152",
           "es6": "calciteContainerSize1152"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/container-size.json",
@@ -7153,12 +7153,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "1440px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "breakpoint",
         "type": "container-size",
         "item": "1440",
         "names": {
@@ -7167,6 +7162,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.container-size.1440",
           "docs": "core.container-size.1440",
           "es6": "calciteContainerSize1440"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/container-size.json",
@@ -7180,12 +7180,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "type": "fontFamily",
       "description": "Fallback for Monaco",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "fontFamily"
-        },
-        "category": "core",
+        "category": "font",
         "type": "fontFamily",
         "item": "family",
         "subitem": "andaleMono",
@@ -7202,6 +7197,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.font.family.andaleMono",
           "docs": "core.font.family.andaleMono",
           "es6": "calciteFontFamilyAndaleMono"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "fontFamily"
         }
       },
       "filePath": "src/tokens/core/font.json",
@@ -7215,12 +7215,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "Avenir Next LT Pro",
       "type": "fontFamily",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "fontFamily"
-        },
-        "category": "core",
+        "category": "font",
         "type": "font",
         "item": "family",
         "subitem": "avenirNextPro",
@@ -7230,6 +7225,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.font.family.avenirNextPro",
           "docs": "core.font.family.avenirNextPro",
           "es6": "calciteFontFamilyAvenirNextPro"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "fontFamily"
         }
       },
       "filePath": "src/tokens/core/font.json",
@@ -7242,12 +7242,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "Avenir Next World",
       "type": "fontFamily",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "fontFamily"
-        },
-        "category": "core",
+        "category": "font",
         "type": "font",
         "item": "family",
         "subitem": "avenirNextWorld",
@@ -7257,6 +7252,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.font.family.avenirNextWorld",
           "docs": "core.font.family.avenirNextWorld",
           "es6": "calciteFontFamilyAvenirNextWorld"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "fontFamily"
         }
       },
       "filePath": "src/tokens/core/font.json",
@@ -7270,12 +7270,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "type": "fontFamily",
       "description": "Primary font family",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "fontFamily"
-        },
-        "category": "core",
+        "category": "font",
         "type": "fontFamily",
         "item": "family",
         "subitem": "avenirNext",
@@ -7292,6 +7287,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.font.family.avenirNext",
           "docs": "core.font.family.avenirNext",
           "es6": "calciteFontFamilyAvenirNext"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "fontFamily"
         }
       },
       "filePath": "src/tokens/core/font.json",
@@ -7306,12 +7306,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "type": "fontFamily",
       "description": "Fallback for Avenir Next",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "fontFamily"
-        },
-        "category": "core",
+        "category": "font",
         "type": "fontFamily",
         "item": "family",
         "subitem": "avenir",
@@ -7328,6 +7323,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.font.family.avenir",
           "docs": "core.font.family.avenir",
           "es6": "calciteFontFamilyAvenir"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "fontFamily"
         }
       },
       "filePath": "src/tokens/core/font.json",
@@ -7342,12 +7342,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "type": "fontFamily",
       "description": "Fallback for Monaco",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "fontFamily"
-        },
-        "category": "core",
+        "category": "font",
         "type": "fontFamily",
         "item": "family",
         "subitem": "consolas",
@@ -7364,6 +7359,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.font.family.consolas",
           "docs": "core.font.family.consolas",
           "es6": "calciteFontFamilyConsolas"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "fontFamily"
         }
       },
       "filePath": "src/tokens/core/font.json",
@@ -7378,12 +7378,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "type": "fontFamily",
       "description": "Fallback for Avenir Next",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "fontFamily"
-        },
-        "category": "core",
+        "category": "font",
         "type": "fontFamily",
         "item": "family",
         "subitem": "helveticaNeue",
@@ -7400,6 +7395,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.font.family.helveticaNeue",
           "docs": "core.font.family.helveticaNeue",
           "es6": "calciteFontFamilyHelveticaNeue"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "fontFamily"
         }
       },
       "filePath": "src/tokens/core/font.json",
@@ -7414,12 +7414,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "type": "fontFamily",
       "description": "Fallback for Monaco",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "fontFamily"
-        },
-        "category": "core",
+        "category": "font",
         "type": "fontFamily",
         "item": "family",
         "subitem": "lucidaConsole",
@@ -7436,6 +7431,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.font.family.lucidaConsole",
           "docs": "core.font.family.lucidaConsole",
           "es6": "calciteFontFamilyLucidaConsole"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "fontFamily"
         }
       },
       "filePath": "src/tokens/core/font.json",
@@ -7449,12 +7449,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "Monaco",
       "type": "fontFamily",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "fontFamily"
-        },
-        "category": "core",
+        "category": "font",
         "type": "font",
         "item": "family",
         "subitem": "monaco",
@@ -7464,6 +7459,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.font.family.monaco",
           "docs": "core.font.family.monaco",
           "es6": "calciteFontFamilyMonaco"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "fontFamily"
         }
       },
       "filePath": "src/tokens/core/font.json",
@@ -7477,12 +7477,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "type": "fontFamily",
       "description": "Fallback for Monaco",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "fontFamily"
-        },
-        "category": "core",
+        "category": "font",
         "type": "fontFamily",
         "item": "family",
         "subitem": "monospace",
@@ -7499,6 +7494,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.font.family.monospace",
           "docs": "core.font.family.monospace",
           "es6": "calciteFontFamilyMonospace"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "fontFamily"
         }
       },
       "filePath": "src/tokens/core/font.json",
@@ -7513,12 +7513,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "type": "fontFamily",
       "description": "Fallback for Avenir Next",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "fontFamily"
-        },
-        "category": "core",
+        "category": "font",
         "type": "fontFamily",
         "item": "family",
         "subitem": "sansSerif",
@@ -7535,6 +7530,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.font.family.sansSerif",
           "docs": "core.font.family.sansSerif",
           "es6": "calciteFontFamilySansSerif"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "fontFamily"
         }
       },
       "filePath": "src/tokens/core/font.json",
@@ -7549,12 +7549,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "type": "fontStyle",
       "description": "used in ratings",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "fontStyle"
-        },
-        "category": "core",
+        "category": "font",
         "type": "fontStyle",
         "item": "style",
         "subitem": "italic",
@@ -7571,6 +7566,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.font.style.italic",
           "docs": "core.font.style.italic",
           "es6": "calciteFontStyleItalic"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "fontStyle"
         }
       },
       "filePath": "src/tokens/core/font.json",
@@ -7585,12 +7585,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "type": "fontWeight",
       "description": "only for Avenir Next World (secondary font family)",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "fontWeight"
-        },
-        "category": "core",
+        "category": "font",
         "type": "fontWeight",
         "item": "weight",
         "subitem": "ultralight",
@@ -7607,6 +7602,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.font.weight.ultralight",
           "docs": "core.font.weight.ultralight",
           "es6": "calciteFontWeightUltralight"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "fontWeight"
         }
       },
       "filePath": "src/tokens/core/font.json",
@@ -7620,12 +7620,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "100",
       "type": "fontWeight",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "fontWeight"
-        },
-        "category": "core",
+        "category": "font",
         "type": "font",
         "item": "weight",
         "subitem": "thin",
@@ -7635,6 +7630,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.font.weight.thin",
           "docs": "core.font.weight.thin",
           "es6": "calciteFontWeightThin"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "fontWeight"
         }
       },
       "filePath": "src/tokens/core/font.json",
@@ -7683,12 +7683,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "400",
       "type": "fontWeight",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "fontWeight"
-        },
-        "category": "core",
+        "category": "font",
         "type": "font",
         "item": "weight",
         "subitem": "regular",
@@ -7698,6 +7693,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.font.weight.regular",
           "docs": "core.font.weight.regular",
           "es6": "calciteFontWeightRegular"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "fontWeight"
         }
       },
       "filePath": "src/tokens/core/font.json",
@@ -7710,12 +7710,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "500",
       "type": "fontWeight",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "fontWeight"
-        },
-        "category": "core",
+        "category": "font",
         "type": "font",
         "item": "weight",
         "subitem": "medium",
@@ -7725,6 +7720,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.font.weight.medium",
           "docs": "core.font.weight.medium",
           "es6": "calciteFontWeightMedium"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "fontWeight"
         }
       },
       "filePath": "src/tokens/core/font.json",
@@ -7737,12 +7737,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "Medium Italic",
       "type": "fontWeight",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "fontWeight"
-        },
-        "category": "core",
+        "category": "font",
         "type": "font",
         "item": "weight",
         "subitem": "medium-italic",
@@ -7752,6 +7747,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.font.weight.medium-italic",
           "docs": "core.font.weight.medium-italic",
           "es6": "calciteFontWeightMediumItalic"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "fontWeight"
         }
       },
       "filePath": "src/tokens/core/font.json",
@@ -7764,12 +7764,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "600",
       "type": "fontWeight",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "fontWeight"
-        },
-        "category": "core",
+        "category": "font",
         "type": "font",
         "item": "weight",
         "subitem": "demi",
@@ -7779,6 +7774,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.font.weight.demi",
           "docs": "core.font.weight.demi",
           "es6": "calciteFontWeightDemi"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "fontWeight"
         }
       },
       "filePath": "src/tokens/core/font.json",
@@ -7791,12 +7791,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "700",
       "type": "fontWeight",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "fontWeight"
-        },
-        "category": "core",
+        "category": "font",
         "type": "font",
         "item": "weight",
         "subitem": "bold",
@@ -7806,6 +7801,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.font.weight.bold",
           "docs": "core.font.weight.bold",
           "es6": "calciteFontWeightBold"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "fontWeight"
         }
       },
       "filePath": "src/tokens/core/font.json",
@@ -7819,12 +7819,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "type": "fontWeight",
       "description": "only for Avenir Next World (secondary font family)",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "fontWeight"
-        },
-        "category": "core",
+        "category": "font",
         "type": "fontWeight",
         "item": "weight",
         "subitem": "extrabold",
@@ -7841,6 +7836,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.font.weight.extrabold",
           "docs": "core.font.weight.extrabold",
           "es6": "calciteFontWeightExtrabold"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "fontWeight"
         }
       },
       "filePath": "src/tokens/core/font.json",
@@ -7855,12 +7855,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "type": "fontWeight",
       "description": "only for Avenir Next World (secondary font family)",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "fontWeight"
-        },
-        "category": "core",
+        "category": "font",
         "type": "fontWeight",
         "item": "weight",
         "subitem": "black",
@@ -7877,6 +7872,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.font.weight.black",
           "docs": "core.font.weight.black",
           "es6": "calciteFontWeightBlack"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "fontWeight"
         }
       },
       "filePath": "src/tokens/core/font.json",
@@ -7890,12 +7890,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "900",
       "type": "fontWeight",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "fontWeight"
-        },
-        "category": "core",
+        "category": "font",
         "type": "font",
         "item": "weight",
         "subitem": "heavy",
@@ -7905,6 +7900,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.font.weight.heavy",
           "docs": "core.font.weight.heavy",
           "es6": "calciteFontWeightHeavy"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "fontWeight"
         }
       },
       "filePath": "src/tokens/core/font.json",
@@ -7918,12 +7918,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "type": "textDecoration",
       "description": "Deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "textDecoration"
-        },
-        "category": "core",
+        "category": "font",
         "type": "textDecoration",
         "item": "text-decoration",
         "subitem": "none",
@@ -7940,6 +7935,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.font.text-decoration.none",
           "docs": "core.font.text-decoration.none",
           "es6": "calciteFontTextDecorationNone"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "textDecoration"
         }
       },
       "filePath": "src/tokens/core/font.json",
@@ -7954,12 +7954,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "type": "textDecoration",
       "description": "Deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "textDecoration"
-        },
-        "category": "core",
+        "category": "font",
         "type": "textDecoration",
         "item": "text-decoration",
         "subitem": "underline",
@@ -7976,6 +7971,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.font.text-decoration.underline",
           "docs": "core.font.text-decoration.underline",
           "es6": "calciteFontTextDecorationUnderline"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "textDecoration"
         }
       },
       "filePath": "src/tokens/core/font.json",
@@ -7990,12 +7990,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "type": "textCase",
       "description": "Deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "textCase"
-        },
-        "category": "core",
+        "category": "font",
         "type": "textCase",
         "item": "text-case",
         "subitem": "none",
@@ -8012,6 +8007,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.font.text-case.none",
           "docs": "core.font.text-case.none",
           "es6": "calciteFontTextCaseNone"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "textCase"
         }
       },
       "filePath": "src/tokens/core/font.json",
@@ -8026,12 +8026,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "type": "textCase",
       "description": "Deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "textCase"
-        },
-        "category": "core",
+        "category": "font",
         "type": "textCase",
         "item": "text-case",
         "subitem": "uppercase",
@@ -8048,6 +8043,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.font.text-case.uppercase",
           "docs": "core.font.text-case.uppercase",
           "es6": "calciteFontTextCaseUppercase"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "textCase"
         }
       },
       "filePath": "src/tokens/core/font.json",
@@ -8062,12 +8062,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "type": "textCase",
       "description": "Deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "textCase"
-        },
-        "category": "core",
+        "category": "font",
         "type": "textCase",
         "item": "text-case",
         "subitem": "lowercase",
@@ -8084,6 +8079,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.font.text-case.lowercase",
           "docs": "core.font.text-case.lowercase",
           "es6": "calciteFontTextCaseLowercase"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "textCase"
         }
       },
       "filePath": "src/tokens/core/font.json",
@@ -8098,12 +8098,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "type": "textCase",
       "description": "Deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "textCase"
-        },
-        "category": "core",
+        "category": "font",
         "type": "textCase",
         "item": "text-case",
         "subitem": "capitalize",
@@ -8120,6 +8115,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.font.text-case.capitalize",
           "docs": "core.font.text-case.capitalize",
           "es6": "calciteFontTextCaseCapitalize"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "textCase"
         }
       },
       "filePath": "src/tokens/core/font.json",
@@ -8133,12 +8133,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "0",
       "type": "opacity",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "opacity"
-        },
-        "category": "core",
+        "category": "opacity",
         "type": "opacity",
         "item": "0",
         "names": {
@@ -8147,6 +8142,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.opacity.0",
           "docs": "core.opacity.0",
           "es6": "calciteOpacity0"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "opacity"
         }
       },
       "filePath": "src/tokens/core/opacity.json",
@@ -8159,12 +8159,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "0.04",
       "type": "opacity",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "opacity"
-        },
-        "category": "core",
+        "category": "opacity",
         "type": "opacity",
         "item": "4",
         "names": {
@@ -8173,6 +8168,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.opacity.4",
           "docs": "core.opacity.4",
           "es6": "calciteOpacity4"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "opacity"
         }
       },
       "filePath": "src/tokens/core/opacity.json",
@@ -8185,12 +8185,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "0.08",
       "type": "opacity",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "opacity"
-        },
-        "category": "core",
+        "category": "opacity",
         "type": "opacity",
         "item": "8",
         "names": {
@@ -8199,6 +8194,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.opacity.8",
           "docs": "core.opacity.8",
           "es6": "calciteOpacity8"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "opacity"
         }
       },
       "filePath": "src/tokens/core/opacity.json",
@@ -8211,12 +8211,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "0.1",
       "type": "opacity",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "opacity"
-        },
-        "category": "core",
+        "category": "opacity",
         "type": "opacity",
         "item": "10",
         "names": {
@@ -8225,6 +8220,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.opacity.10",
           "docs": "core.opacity.10",
           "es6": "calciteOpacity10"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "opacity"
         }
       },
       "filePath": "src/tokens/core/opacity.json",
@@ -8237,12 +8237,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "0.2",
       "type": "opacity",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "opacity"
-        },
-        "category": "core",
+        "category": "opacity",
         "type": "opacity",
         "item": "20",
         "names": {
@@ -8251,6 +8246,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.opacity.20",
           "docs": "core.opacity.20",
           "es6": "calciteOpacity20"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "opacity"
         }
       },
       "filePath": "src/tokens/core/opacity.json",
@@ -8263,12 +8263,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "0.3",
       "type": "opacity",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "opacity"
-        },
-        "category": "core",
+        "category": "opacity",
         "type": "opacity",
         "item": "30",
         "names": {
@@ -8277,6 +8272,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.opacity.30",
           "docs": "core.opacity.30",
           "es6": "calciteOpacity30"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "opacity"
         }
       },
       "filePath": "src/tokens/core/opacity.json",
@@ -8289,12 +8289,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "0.4",
       "type": "opacity",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "opacity"
-        },
-        "category": "core",
+        "category": "opacity",
         "type": "opacity",
         "item": "40",
         "names": {
@@ -8303,6 +8298,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.opacity.40",
           "docs": "core.opacity.40",
           "es6": "calciteOpacity40"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "opacity"
         }
       },
       "filePath": "src/tokens/core/opacity.json",
@@ -8315,12 +8315,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "0.5",
       "type": "opacity",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "opacity"
-        },
-        "category": "core",
+        "category": "opacity",
         "type": "opacity",
         "item": "50",
         "names": {
@@ -8329,6 +8324,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.opacity.50",
           "docs": "core.opacity.50",
           "es6": "calciteOpacity50"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "opacity"
         }
       },
       "filePath": "src/tokens/core/opacity.json",
@@ -8341,12 +8341,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "0.6",
       "type": "opacity",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "opacity"
-        },
-        "category": "core",
+        "category": "opacity",
         "type": "opacity",
         "item": "60",
         "names": {
@@ -8355,6 +8350,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.opacity.60",
           "docs": "core.opacity.60",
           "es6": "calciteOpacity60"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "opacity"
         }
       },
       "filePath": "src/tokens/core/opacity.json",
@@ -8367,12 +8367,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "0.7",
       "type": "opacity",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "opacity"
-        },
-        "category": "core",
+        "category": "opacity",
         "type": "opacity",
         "item": "70",
         "names": {
@@ -8381,6 +8376,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.opacity.70",
           "docs": "core.opacity.70",
           "es6": "calciteOpacity70"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "opacity"
         }
       },
       "filePath": "src/tokens/core/opacity.json",
@@ -8393,12 +8393,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "0.8",
       "type": "opacity",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "opacity"
-        },
-        "category": "core",
+        "category": "opacity",
         "type": "opacity",
         "item": "80",
         "names": {
@@ -8407,6 +8402,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.opacity.80",
           "docs": "core.opacity.80",
           "es6": "calciteOpacity80"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "opacity"
         }
       },
       "filePath": "src/tokens/core/opacity.json",
@@ -8419,12 +8419,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "0.85",
       "type": "opacity",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "opacity"
-        },
-        "category": "core",
+        "category": "opacity",
         "type": "opacity",
         "item": "85",
         "names": {
@@ -8433,6 +8428,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.opacity.85",
           "docs": "core.opacity.85",
           "es6": "calciteOpacity85"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "opacity"
         }
       },
       "filePath": "src/tokens/core/opacity.json",
@@ -8445,12 +8445,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "0.9",
       "type": "opacity",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "opacity"
-        },
-        "category": "core",
+        "category": "opacity",
         "type": "opacity",
         "item": "90",
         "names": {
@@ -8459,6 +8454,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.opacity.90",
           "docs": "core.opacity.90",
           "es6": "calciteOpacity90"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "opacity"
         }
       },
       "filePath": "src/tokens/core/opacity.json",
@@ -8471,12 +8471,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "0.92",
       "type": "opacity",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "opacity"
-        },
-        "category": "core",
+        "category": "opacity",
         "type": "opacity",
         "item": "92",
         "names": {
@@ -8485,6 +8480,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.opacity.92",
           "docs": "core.opacity.92",
           "es6": "calciteOpacity92"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "opacity"
         }
       },
       "filePath": "src/tokens/core/opacity.json",
@@ -8497,12 +8497,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "0.96",
       "type": "opacity",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "opacity"
-        },
-        "category": "core",
+        "category": "opacity",
         "type": "opacity",
         "item": "96",
         "names": {
@@ -8511,6 +8506,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.opacity.96",
           "docs": "core.opacity.96",
           "es6": "calciteOpacity96"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "opacity"
         }
       },
       "filePath": "src/tokens/core/opacity.json",
@@ -8523,12 +8523,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "1",
       "type": "opacity",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "opacity"
-        },
-        "category": "core",
+        "category": "opacity",
         "type": "opacity",
         "item": "100",
         "names": {
@@ -8537,6 +8532,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.opacity.100",
           "docs": "core.opacity.100",
           "es6": "calciteOpacity100"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "opacity"
         }
       },
       "filePath": "src/tokens/core/opacity.json",
@@ -8549,12 +8549,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "{\\"blur\\":\\"0\\",\\"spread\\":\\"0\\",\\"color\\":\\"rgba(0, 0, 0, 0)\\",\\"x\\":\\"0\\",\\"y\\":\\"0\\"}",
       "type": "shadow",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "shadow"
-        },
-        "category": "core",
+        "category": "shadow",
         "type": "shadow",
         "item": "0",
         "names": {
@@ -8563,6 +8558,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.shadow.0",
           "docs": "core.shadow.0",
           "es6": "calciteShadow0"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "shadow"
         }
       },
       "filePath": "src/tokens/core/shadow.json",
@@ -8575,12 +8575,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "{\\"blur\\":\\"8px\\",\\"spread\\":\\"0\\",\\"color\\":\\"rgba(0, 0, 0, 0.04)\\",\\"x\\":\\"0\\",\\"y\\":\\"2px\\"}",
       "type": "shadow",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "shadow"
-        },
-        "category": "core",
+        "category": "shadow",
         "type": "shadow",
         "item": "1",
         "names": {
@@ -8589,6 +8584,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.shadow.1",
           "docs": "core.shadow.1",
           "es6": "calciteShadow1"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "shadow"
         }
       },
       "filePath": "src/tokens/core/shadow.json",
@@ -8601,12 +8601,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "{\\"blur\\":\\"16px\\",\\"spread\\":\\"0\\",\\"color\\":\\"rgba(0, 0, 0, 0.08)\\",\\"x\\":\\"0\\",\\"y\\":\\"4px\\"}",
       "type": "shadow",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "shadow"
-        },
-        "category": "core",
+        "category": "shadow",
         "type": "shadow",
         "item": "2",
         "names": {
@@ -8615,6 +8610,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.shadow.2",
           "docs": "core.shadow.2",
           "es6": "calciteShadow2"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "shadow"
         }
       },
       "filePath": "src/tokens/core/shadow.json",
@@ -8627,12 +8627,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "{\\"blur\\":\\"20px\\",\\"spread\\":\\"0\\",\\"color\\":\\"rgba(0, 0, 0, 0.08)\\",\\"x\\":\\"0\\",\\"y\\":\\"4px\\"}",
       "type": "shadow",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "shadow"
-        },
-        "category": "core",
+        "category": "shadow",
         "type": "shadow",
         "item": "3",
         "names": {
@@ -8641,6 +8636,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.shadow.3",
           "docs": "core.shadow.3",
           "es6": "calciteShadow3"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "shadow"
         }
       },
       "filePath": "src/tokens/core/shadow.json",
@@ -8653,12 +8653,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "{\\"blur\\":\\"32px\\",\\"spread\\":\\"-2px\\",\\"color\\":\\"rgba(0, 0, 0, 0.1)\\",\\"x\\":\\"0\\",\\"y\\":\\"12px\\"}",
       "type": "shadow",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "shadow"
-        },
-        "category": "core",
+        "category": "shadow",
         "type": "shadow",
         "item": "4",
         "names": {
@@ -8667,6 +8662,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.shadow.4",
           "docs": "core.shadow.4",
           "es6": "calciteShadow4"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "shadow"
         }
       },
       "filePath": "src/tokens/core/shadow.json",
@@ -8679,12 +8679,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "1px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "1",
@@ -8694,6 +8689,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.default.1",
           "docs": "core.size.default.1",
           "es6": "calciteSize1"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -8706,12 +8706,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "2px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "2",
@@ -8721,6 +8716,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.default.2",
           "docs": "core.size.default.2",
           "es6": "calciteSize2"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -8733,12 +8733,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "4px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "4",
@@ -8748,6 +8743,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.default.4",
           "docs": "core.size.default.4",
           "es6": "calciteSize4"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -8760,12 +8760,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "6px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "6",
@@ -8775,6 +8770,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.default.6",
           "docs": "core.size.default.6",
           "es6": "calciteSize6"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -8787,12 +8787,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "8px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "8",
@@ -8802,6 +8797,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.default.8",
           "docs": "core.size.default.8",
           "es6": "calciteSize8"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -8814,12 +8814,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "10px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "10",
@@ -8829,6 +8824,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.default.10",
           "docs": "core.size.default.10",
           "es6": "calciteSize10"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -8841,12 +8841,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "12px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "12",
@@ -8856,6 +8851,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.default.12",
           "docs": "core.size.default.12",
           "es6": "calciteSize12"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -8868,12 +8868,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "14px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "14",
@@ -8883,6 +8878,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.default.14",
           "docs": "core.size.default.14",
           "es6": "calciteSize14"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -8895,12 +8895,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "16px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "16",
@@ -8910,6 +8905,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.default.16",
           "docs": "core.size.default.16",
           "es6": "calciteSize16"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -8922,12 +8922,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "20px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "20",
@@ -8937,6 +8932,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.default.20",
           "docs": "core.size.default.20",
           "es6": "calciteSize20"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -8949,12 +8949,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "24px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "24",
@@ -8964,6 +8959,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.default.24",
           "docs": "core.size.default.24",
           "es6": "calciteSize24"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -8976,12 +8976,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "28px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "28",
@@ -8991,6 +8986,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.default.28",
           "docs": "core.size.default.28",
           "es6": "calciteSize28"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -9003,12 +9003,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "32px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "32",
@@ -9018,6 +9013,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.default.32",
           "docs": "core.size.default.32",
           "es6": "calciteSize32"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -9030,12 +9030,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "36px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "36",
@@ -9045,6 +9040,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.default.36",
           "docs": "core.size.default.36",
           "es6": "calciteSize36"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -9057,12 +9057,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "40px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "40",
@@ -9072,6 +9067,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.default.40",
           "docs": "core.size.default.40",
           "es6": "calciteSize40"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -9084,12 +9084,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "44px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "44",
@@ -9099,6 +9094,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.default.44",
           "docs": "core.size.default.44",
           "es6": "calciteSize44"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -9111,12 +9111,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "48px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "48",
@@ -9126,6 +9121,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.default.48",
           "docs": "core.size.default.48",
           "es6": "calciteSize48"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -9138,12 +9138,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "56px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "56",
@@ -9153,6 +9148,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.default.56",
           "docs": "core.size.default.56",
           "es6": "calciteSize56"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -9165,12 +9165,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "64px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "64",
@@ -9180,6 +9175,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.default.64",
           "docs": "core.size.default.64",
           "es6": "calciteSize64"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -9192,12 +9192,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "72px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "72",
@@ -9207,6 +9202,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.default.72",
           "docs": "core.size.default.72",
           "es6": "calciteSize72"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -9219,12 +9219,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "80px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "80",
@@ -9234,6 +9229,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.default.80",
           "docs": "core.size.default.80",
           "es6": "calciteSize80"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -9246,12 +9246,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "96px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "96",
@@ -9261,6 +9256,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.default.96",
           "docs": "core.size.default.96",
           "es6": "calciteSize96"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -9273,12 +9273,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "112px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "112",
@@ -9288,6 +9283,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.default.112",
           "docs": "core.size.default.112",
           "es6": "calciteSize112"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -9300,12 +9300,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "128px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "128",
@@ -9315,6 +9310,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.default.128",
           "docs": "core.size.default.128",
           "es6": "calciteSize128"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -9327,12 +9327,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "144px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "144",
@@ -9342,6 +9337,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.default.144",
           "docs": "core.size.default.144",
           "es6": "calciteSize144"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -9354,12 +9354,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "160px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "160",
@@ -9369,6 +9364,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.default.160",
           "docs": "core.size.default.160",
           "es6": "calciteSize160"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -9381,12 +9381,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "192px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "192",
@@ -9396,6 +9391,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.default.192",
           "docs": "core.size.default.192",
           "es6": "calciteSize192"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -9408,12 +9408,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "224px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "224",
@@ -9423,6 +9418,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.default.224",
           "docs": "core.size.default.224",
           "es6": "calciteSize224"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -9435,12 +9435,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "256px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "256",
@@ -9450,6 +9445,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.default.256",
           "docs": "core.size.default.256",
           "es6": "calciteSize256"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -9462,12 +9462,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "288px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "288",
@@ -9477,6 +9472,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.default.288",
           "docs": "core.size.default.288",
           "es6": "calciteSize288"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -9489,12 +9489,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "0",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "none",
@@ -9504,6 +9499,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.default.none",
           "docs": "core.size.default.none",
           "es6": "calciteSizeNone"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -9516,12 +9516,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "50%",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "relative",
         "subitem": "50",
@@ -9531,6 +9526,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.relative.50",
           "docs": "core.size.relative.50",
           "es6": "calciteSizeRelative50"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -9543,12 +9543,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "100%",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "relative",
         "subitem": "100",
@@ -9558,6 +9553,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.relative.100",
           "docs": "core.size.relative.100",
           "es6": "calciteSizeRelative100"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -9570,12 +9570,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "125%",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "relative",
         "subitem": "125",
@@ -9585,6 +9580,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.relative.125",
           "docs": "core.size.relative.125",
           "es6": "calciteSizeRelative125"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -9597,12 +9597,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "137.5%",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "relative",
         "subitem": "137",
@@ -9612,6 +9607,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.relative.137",
           "docs": "core.size.relative.137",
           "es6": "calciteSizeRelative137"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -9624,12 +9624,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "150%",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "relative",
         "subitem": "150",
@@ -9639,6 +9634,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.relative.150",
           "docs": "core.size.relative.150",
           "es6": "calciteSizeRelative150"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -9651,12 +9651,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "162.5%",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "relative",
         "subitem": "162",
@@ -9666,6 +9661,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.relative.162",
           "docs": "core.size.relative.162",
           "es6": "calciteSizeRelative162"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -9678,12 +9678,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "200%",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "relative",
         "subitem": "200",
@@ -9693,6 +9688,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.relative.200",
           "docs": "core.size.relative.200",
           "es6": "calciteSizeRelative200"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -9705,12 +9705,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "auto",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "dimension"
-        },
-        "category": "core",
+        "category": "size",
         "type": "size",
         "item": "relative",
         "subitem": "auto",
@@ -9720,6 +9715,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.size.relative.auto",
           "docs": "core.size.relative.auto",
           "es6": "calciteSizeRelativeAuto"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/core/size.json",
@@ -9732,12 +9732,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "-999999",
       "type": "z-index",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "z-index"
-        },
-        "category": "core",
+        "category": "z-index",
         "type": "z-index",
         "item": "0",
         "names": {
@@ -9746,6 +9741,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.z-index.0",
           "docs": "core.z-index.0",
           "es6": "calciteZIndex0"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "z-index"
         }
       },
       "filePath": "src/tokens/core/z-index.json",
@@ -9758,12 +9758,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "1",
       "type": "z-index",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "z-index"
-        },
-        "category": "core",
+        "category": "z-index",
         "type": "z-index",
         "item": "1",
         "names": {
@@ -9772,6 +9767,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.z-index.1",
           "docs": "core.z-index.1",
           "es6": "calciteZIndex1"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "z-index"
         }
       },
       "filePath": "src/tokens/core/z-index.json",
@@ -9784,12 +9784,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "300",
       "type": "z-index",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "z-index"
-        },
-        "category": "core",
+        "category": "z-index",
         "type": "z-index",
         "item": "3",
         "names": {
@@ -9798,6 +9793,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.z-index.3",
           "docs": "core.z-index.3",
           "es6": "calciteZIndex3"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "z-index"
         }
       },
       "filePath": "src/tokens/core/z-index.json",
@@ -9810,12 +9810,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "400",
       "type": "z-index",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "z-index"
-        },
-        "category": "core",
+        "category": "z-index",
         "type": "z-index",
         "item": "4",
         "names": {
@@ -9824,6 +9819,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.z-index.4",
           "docs": "core.z-index.4",
           "es6": "calciteZIndex4"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "z-index"
         }
       },
       "filePath": "src/tokens/core/z-index.json",
@@ -9836,12 +9836,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "500",
       "type": "z-index",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "z-index"
-        },
-        "category": "core",
+        "category": "z-index",
         "type": "z-index",
         "item": "5",
         "names": {
@@ -9850,6 +9845,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.z-index.5",
           "docs": "core.z-index.5",
           "es6": "calciteZIndex5"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "z-index"
         }
       },
       "filePath": "src/tokens/core/z-index.json",
@@ -9862,12 +9862,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "600",
       "type": "z-index",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "z-index"
-        },
-        "category": "core",
+        "category": "z-index",
         "type": "z-index",
         "item": "6",
         "names": {
@@ -9876,6 +9871,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.z-index.6",
           "docs": "core.z-index.6",
           "es6": "calciteZIndex6"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "z-index"
         }
       },
       "filePath": "src/tokens/core/z-index.json",
@@ -9888,12 +9888,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "700",
       "type": "z-index",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "z-index"
-        },
-        "category": "core",
+        "category": "z-index",
         "type": "z-index",
         "item": "7",
         "names": {
@@ -9902,6 +9897,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.z-index.7",
           "docs": "core.z-index.7",
           "es6": "calciteZIndex7"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "z-index"
         }
       },
       "filePath": "src/tokens/core/z-index.json",
@@ -9914,12 +9914,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "800",
       "type": "z-index",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "z-index"
-        },
-        "category": "core",
+        "category": "z-index",
         "type": "z-index",
         "item": "8",
         "names": {
@@ -9928,6 +9923,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.z-index.8",
           "docs": "core.z-index.8",
           "es6": "calciteZIndex8"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "z-index"
         }
       },
       "filePath": "src/tokens/core/z-index.json",
@@ -9940,12 +9940,7 @@ exports[`generated tokens > DOCS > core should match 1`] = `
       "value": "900",
       "type": "z-index",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "core",
-          "type": "z-index"
-        },
-        "category": "core",
+        "category": "z-index",
         "type": "z-index",
         "item": "9",
         "names": {
@@ -9954,6 +9949,11 @@ exports[`generated tokens > DOCS > core should match 1`] = `
           "js": "core.z-index.9",
           "docs": "core.z-index.9",
           "es6": "calciteZIndex9"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "core",
+          "type": "z-index"
         }
       },
       "filePath": "src/tokens/core/z-index.json",
@@ -9975,12 +9975,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"#f8f8f8\\",\\"dark\\":\\"#353535\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "background",
         "subitem": "default",
@@ -9990,6 +9985,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.background.default",
           "docs": "semantic.color.background.default",
           "es6": "calciteColorBackground"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10002,12 +10002,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "rgba(255, 255, 255, 0)",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "background",
         "subitem": "none",
@@ -10017,6 +10012,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.background.none",
           "docs": "semantic.color.background.none",
           "es6": "calciteColorBackgroundNone"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10029,12 +10029,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"#ffffff\\",\\"dark\\":\\"#2b2b2b\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "foreground",
         "subitem": "1",
@@ -10044,6 +10039,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.foreground.1",
           "docs": "semantic.color.foreground.1",
           "es6": "calciteColorForeground1"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10056,12 +10056,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"#f3f3f3\\",\\"dark\\":\\"#202020\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "foreground",
         "subitem": "2",
@@ -10071,6 +10066,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.foreground.2",
           "docs": "semantic.color.foreground.2",
           "es6": "calciteColorForeground2"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10083,12 +10083,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"#eaeaea\\",\\"dark\\":\\"#151515\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "foreground",
         "subitem": "3",
@@ -10098,6 +10093,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.foreground.3",
           "docs": "semantic.color.foreground.3",
           "es6": "calciteColorForeground3"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10110,12 +10110,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"#c7eaff\\",\\"dark\\":\\"#214155\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "foreground",
         "subitem": "current",
@@ -10125,6 +10120,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.foreground.current",
           "docs": "semantic.color.foreground.current",
           "es6": "calciteColorForegroundCurrent"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10137,12 +10137,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"rgba(0, 0, 0, 0)\\",\\"dark\\":\\"rgba(255, 255, 255, 0)\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "transparent",
         "subitem": "default",
@@ -10153,6 +10148,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.transparent.default.default",
           "docs": "semantic.color.transparent.default.default",
           "es6": "calciteColorTransparent"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10165,12 +10165,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"rgba(0, 0, 0, 0.04)\\",\\"dark\\":\\"rgba(255, 255, 255, 0.04)\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "transparent",
         "subitem": "default",
@@ -10181,6 +10176,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.transparent.default.hover",
           "docs": "semantic.color.transparent.default.hover",
           "es6": "calciteColorTransparentHover"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10193,12 +10193,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"rgba(0, 0, 0, 0.08)\\",\\"dark\\":\\"rgba(255, 255, 255, 0.08)\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "transparent",
         "subitem": "default",
@@ -10209,6 +10204,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.transparent.default.press",
           "docs": "semantic.color.transparent.default.press",
           "es6": "calciteColorTransparentPress"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10221,12 +10221,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"rgba(255, 255, 255, 0.85)\\",\\"dark\\":\\"rgba(0, 0, 0, 0.85)\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "transparent",
         "subitem": "scrim",
@@ -10236,6 +10231,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.transparent.scrim",
           "docs": "semantic.color.transparent.scrim",
           "es6": "calciteColorTransparentScrim"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10248,12 +10248,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"rgba(255, 255, 255, 0.8)\\",\\"dark\\":\\"rgba(43, 43, 43, 0.8)\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "transparent",
         "subitem": "tint",
@@ -10263,6 +10258,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.transparent.tint",
           "docs": "semantic.color.transparent.tint",
           "es6": "calciteColorTransparentTint"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10275,12 +10275,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"#007ac2\\",\\"dark\\":\\"#009af2\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "brand",
         "subitem": "default",
@@ -10291,6 +10286,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.brand.default.default",
           "docs": "semantic.color.brand.default.default",
           "es6": "calciteColorBrand"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10303,12 +10303,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"#00619b\\",\\"dark\\":\\"#007ac2\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "brand",
         "subitem": "default",
@@ -10319,6 +10314,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.brand.default.hover",
           "docs": "semantic.color.brand.default.hover",
           "es6": "calciteColorBrandHover"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10331,12 +10331,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"#004874\\",\\"dark\\":\\"#00619b\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "brand",
         "subitem": "default",
@@ -10347,6 +10342,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.brand.default.press",
           "docs": "semantic.color.brand.default.press",
           "es6": "calciteColorBrandPress"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10359,12 +10359,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "color",
       "value": "{\\"light\\":\\"rgba(0, 97, 155, 0.4)\\",\\"dark\\":\\"rgba(0, 160, 255, 0.4)\\"}",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "brand",
         "subitem": "underline",
@@ -10374,6 +10369,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.brand.underline",
           "docs": "semantic.color.brand.underline",
           "es6": "calciteColorBrandUnderline"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10386,12 +10386,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"#00619b\\",\\"dark\\":\\"#00a0ff\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "status",
         "subitem": "info",
@@ -10402,6 +10397,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.status.info.default",
           "docs": "semantic.color.status.info.default",
           "es6": "calciteColorStatusInfo"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10414,12 +10414,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"#004874\\",\\"dark\\":\\"#3db8ff\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "status",
         "subitem": "info",
@@ -10430,6 +10425,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.status.info.hover",
           "docs": "semantic.color.status.info.hover",
           "es6": "calciteColorStatusInfoHover"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10442,12 +10442,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"#00304d\\",\\"dark\\":\\"#009af2\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "status",
         "subitem": "info",
@@ -10458,6 +10453,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.status.info.press",
           "docs": "semantic.color.status.info.press",
           "es6": "calciteColorStatusInfoPress"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10470,12 +10470,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"#35ac46\\",\\"dark\\":\\"#36da43\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "status",
         "subitem": "success",
@@ -10486,6 +10481,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.status.success.default",
           "docs": "semantic.color.status.success.default",
           "es6": "calciteColorStatusSuccess"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10498,12 +10498,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"#288835\\",\\"dark\\":\\"#3bed52\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "status",
         "subitem": "success",
@@ -10514,6 +10509,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.status.success.hover",
           "docs": "semantic.color.status.success.hover",
           "es6": "calciteColorStatusSuccessHover"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10526,12 +10526,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"#1a6324\\",\\"dark\\":\\"#00b81b\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "status",
         "subitem": "success",
@@ -10542,6 +10537,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.status.success.press",
           "docs": "semantic.color.status.success.press",
           "es6": "calciteColorStatusSuccessPress"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10554,12 +10554,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"#edd317\\",\\"dark\\":\\"#ffc900\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "status",
         "subitem": "warning",
@@ -10570,6 +10565,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.status.warning.default",
           "docs": "semantic.color.status.warning.default",
           "es6": "calciteColorStatusWarning"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10582,12 +10582,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"#d9bc00\\",\\"dark\\":\\"#ffee33\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "status",
         "subitem": "warning",
@@ -10598,6 +10593,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.status.warning.hover",
           "docs": "semantic.color.status.warning.hover",
           "es6": "calciteColorStatusWarningHover"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10610,12 +10610,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"#bfa200\\",\\"dark\\":\\"#f5d000\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "status",
         "subitem": "warning",
@@ -10626,6 +10621,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.status.warning.press",
           "docs": "semantic.color.status.warning.press",
           "es6": "calciteColorStatusWarningPress"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10638,12 +10638,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"#d83020\\",\\"dark\\":\\"#fe583e\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "status",
         "subitem": "danger",
@@ -10654,6 +10649,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.status.danger.default",
           "docs": "semantic.color.status.danger.default",
           "es6": "calciteColorStatusDanger"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10666,12 +10666,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"#a82b1e\\",\\"dark\\":\\"#ff0015\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "status",
         "subitem": "danger",
@@ -10682,6 +10677,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.status.danger.hover",
           "docs": "semantic.color.status.danger.hover",
           "es6": "calciteColorStatusDangerHover"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10694,12 +10694,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"#7c1d13\\",\\"dark\\":\\"#d90012\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "status",
         "subitem": "danger",
@@ -10710,6 +10705,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.status.danger.press",
           "docs": "semantic.color.status.danger.press",
           "es6": "calciteColorStatusDangerPress"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10722,12 +10722,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"#353535\\",\\"dark\\":\\"#f8f8f8\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "inverse",
         "subitem": "default",
@@ -10737,6 +10732,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.inverse.default",
           "docs": "semantic.color.inverse.default",
           "es6": "calciteColorInverse"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10749,12 +10749,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"#2b2b2b\\",\\"dark\\":\\"#ffffff\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "inverse",
         "subitem": "hover",
@@ -10764,6 +10759,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.inverse.hover",
           "docs": "semantic.color.inverse.hover",
           "es6": "calciteColorInverseHover"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10776,12 +10776,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"#202020\\",\\"dark\\":\\"#f3f3f3\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "inverse",
         "subitem": "press",
@@ -10791,6 +10786,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.inverse.press",
           "docs": "semantic.color.inverse.press",
           "es6": "calciteColorInversePress"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10803,12 +10803,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"#151515\\",\\"dark\\":\\"#ffffff\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "text",
         "subitem": "1",
@@ -10818,6 +10813,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.text.1",
           "docs": "semantic.color.text.1",
           "es6": "calciteColorText1"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10830,12 +10830,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"#4a4a4a\\",\\"dark\\":\\"#bfbfbf\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "text",
         "subitem": "2",
@@ -10845,6 +10840,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.text.2",
           "docs": "semantic.color.text.2",
           "es6": "calciteColorText2"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10857,12 +10857,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"#6a6a6a\\",\\"dark\\":\\"#9f9f9f\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "text",
         "subitem": "3",
@@ -10872,6 +10867,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.text.3",
           "docs": "semantic.color.text.3",
           "es6": "calciteColorText3"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10884,12 +10884,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"#ffffff\\",\\"dark\\":\\"#151515\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "text",
         "subitem": "inverse",
@@ -10899,6 +10894,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.text.inverse",
           "docs": "semantic.color.text.inverse",
           "es6": "calciteColorTextInverse"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10911,12 +10911,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"#00619b\\",\\"dark\\":\\"#00a0ff\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "text",
         "subitem": "link",
@@ -10926,6 +10921,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.text.link",
           "docs": "semantic.color.text.link",
           "es6": "calciteColorTextLink"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10938,12 +10938,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"#cacaca\\",\\"dark\\":\\"#555555\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "border",
         "subitem": "1",
@@ -10953,6 +10948,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.border.1",
           "docs": "semantic.color.border.1",
           "es6": "calciteColorBorder1"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10965,12 +10965,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"#d4d4d4\\",\\"dark\\":\\"#4a4a4a\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "border",
         "subitem": "2",
@@ -10980,6 +10975,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.border.2",
           "docs": "semantic.color.border.2",
           "es6": "calciteColorBorder2"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -10992,12 +10992,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"#dfdfdf\\",\\"dark\\":\\"#404040\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "border",
         "subitem": "3",
@@ -11007,6 +11002,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.border.3",
           "docs": "semantic.color.border.3",
           "es6": "calciteColorBorder3"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -11019,12 +11019,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"#949494\\",\\"dark\\":\\"#757575\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "border",
         "subitem": "input",
@@ -11034,6 +11029,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.border.input",
           "docs": "semantic.color.border.input",
           "es6": "calciteColorBorderInput"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -11046,12 +11046,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"rgba(0, 0, 0, 0.3)\\",\\"dark\\":\\"rgba(117, 117, 117, 0.3)\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "border",
         "subitem": "ghost",
@@ -11061,6 +11056,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.border.ghost",
           "docs": "semantic.color.border.ghost",
           "es6": "calciteColorBorderGhost"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -11073,12 +11073,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"light\\":\\"#ffffff\\",\\"dark\\":\\"#f8f8f8\\"}",
       "type": "color",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "color",
-          "type": "color"
-        },
-        "category": "semantic",
+        "category": "color",
         "type": "color",
         "item": "border",
         "subitem": "white",
@@ -11088,6 +11083,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.color.border.white",
           "docs": "semantic.color.border.white",
           "es6": "calciteColorBorderWhite"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "color",
+          "type": "color"
         }
       },
       "filePath": "src/tokens/semantic/color/light.json",
@@ -11100,12 +11100,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "0",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "border",
         "type": "border",
         "item": "width",
         "subitem": "none",
@@ -11115,6 +11110,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.border.width.none",
           "docs": "semantic.border.width.none",
           "es6": "calciteBorderWidthNone"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/border.json",
@@ -11127,12 +11127,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "1px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "border",
         "type": "border",
         "item": "width",
         "subitem": "sm",
@@ -11142,6 +11137,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.border.width.sm",
           "docs": "semantic.border.width.sm",
           "es6": "calciteBorderWidthSm"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/border.json",
@@ -11154,12 +11154,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "2px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "border",
         "type": "border",
         "item": "width",
         "subitem": "md",
@@ -11169,6 +11164,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.border.width.md",
           "docs": "semantic.border.width.md",
           "es6": "calciteBorderWidthMd"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/border.json",
@@ -11181,12 +11181,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "4px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "border",
         "type": "border",
         "item": "width",
         "subitem": "lg",
@@ -11196,6 +11191,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.border.width.lg",
           "docs": "semantic.border.width.lg",
           "es6": "calciteBorderWidthLg"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/border.json",
@@ -11209,12 +11209,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "Small handheld devices and mini-windows",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "breakpoint",
         "type": "dimension",
         "item": "height",
         "subitem": "xxs",
@@ -11234,6 +11229,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.container-size.height.xxs",
           "docs": "semantic.container-size.height.xxs",
           "es6": "calciteContainerSizeHeightXxs"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/container-size.json",
@@ -11248,12 +11248,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "Handheld devices",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "breakpoint",
         "type": "dimension",
         "item": "height",
         "subitem": "xs",
@@ -11273,6 +11268,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.container-size.height.xs",
           "docs": "semantic.container-size.height.xs",
           "es6": "calciteContainerSizeHeightXs"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/container-size.json",
@@ -11287,12 +11287,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "Small tablets",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "breakpoint",
         "type": "dimension",
         "item": "height",
         "subitem": "sm",
@@ -11312,6 +11307,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.container-size.height.sm",
           "docs": "semantic.container-size.height.sm",
           "es6": "calciteContainerSizeHeightSm"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/container-size.json",
@@ -11326,12 +11326,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "Small laptops",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "breakpoint",
         "type": "dimension",
         "item": "height",
         "subitem": "md",
@@ -11351,6 +11346,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.container-size.height.md",
           "docs": "semantic.container-size.height.md",
           "es6": "calciteContainerSizeHeightMd"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/container-size.json",
@@ -11365,12 +11365,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "Large laptops and desktop computers",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "breakpoint",
         "type": "dimension",
         "item": "height",
         "subitem": "lg",
@@ -11390,6 +11385,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.container-size.height.lg",
           "docs": "semantic.container-size.height.lg",
           "es6": "calciteContainerSizeHeightLg"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/container-size.json",
@@ -11404,12 +11404,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "Projectors and televisions",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "breakpoint",
         "type": "dimension",
         "item": "height",
         "subitem": "xl",
@@ -11428,6 +11423,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.container-size.height.xl",
           "docs": "semantic.container-size.height.xl",
           "es6": "calciteContainerSizeHeightXl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/container-size.json",
@@ -11442,12 +11442,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "Small handheld devices and mini-windows",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "breakpoint",
         "type": "dimension",
         "item": "width",
         "subitem": "xxs",
@@ -11467,6 +11462,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.container-size.width.xxs",
           "docs": "semantic.container-size.width.xxs",
           "es6": "calciteContainerSizeWidthXxs"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/container-size.json",
@@ -11481,12 +11481,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "Handheld devices",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "breakpoint",
         "type": "dimension",
         "item": "width",
         "subitem": "xs",
@@ -11506,6 +11501,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.container-size.width.xs",
           "docs": "semantic.container-size.width.xs",
           "es6": "calciteContainerSizeWidthXs"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/container-size.json",
@@ -11520,12 +11520,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "Small tablets",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "breakpoint",
         "type": "dimension",
         "item": "width",
         "subitem": "sm",
@@ -11545,6 +11540,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.container-size.width.sm",
           "docs": "semantic.container-size.width.sm",
           "es6": "calciteContainerSizeWidthSm"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/container-size.json",
@@ -11559,12 +11559,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "Small laptops",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "breakpoint",
         "type": "dimension",
         "item": "width",
         "subitem": "md",
@@ -11584,6 +11579,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.container-size.width.md",
           "docs": "semantic.container-size.width.md",
           "es6": "calciteContainerSizeWidthMd"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/container-size.json",
@@ -11598,12 +11598,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "Large laptops and desktop computers",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "breakpoint",
         "type": "dimension",
         "item": "width",
         "subitem": "lg",
@@ -11623,6 +11618,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.container-size.width.lg",
           "docs": "semantic.container-size.width.lg",
           "es6": "calciteContainerSizeWidthLg"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/container-size.json",
@@ -11637,12 +11637,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "Projectors and televisions",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "breakpoint",
         "type": "dimension",
         "item": "width",
         "subitem": "xl",
@@ -11661,6 +11656,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.container-size.width.xl",
           "docs": "semantic.container-size.width.xl",
           "es6": "calciteContainerSizeWidthXl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/container-size.json",
@@ -11674,12 +11674,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "24px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "breakpoint",
         "type": "container-size",
         "item": "margin",
         "names": {
@@ -11688,6 +11683,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.container-size.margin",
           "docs": "semantic.container-size.margin",
           "es6": "calciteContainerSizeMargin"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/container-size.json",
@@ -11700,12 +11700,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "16px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "breakpoint",
         "type": "container-size",
         "item": "gutter",
         "names": {
@@ -11714,6 +11709,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.container-size.gutter",
           "docs": "semantic.container-size.gutter",
           "es6": "calciteContainerSizeGutter"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/container-size.json",
@@ -11727,12 +11727,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "for fluid grid widths",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "breakpoint",
         "type": "dimension",
         "item": "content",
         "subitem": "fluid",
@@ -11749,6 +11744,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.container-size.content.fluid",
           "docs": "semantic.container-size.content.fluid",
           "es6": "calciteContainerSizeContentFluid"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/container-size.json",
@@ -11763,12 +11763,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "only for lg breakpoint fixed grid width",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "breakpoint",
         "type": "dimension",
         "item": "content",
         "subitem": "fixed",
@@ -11785,6 +11780,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.container-size.content.fixed",
           "docs": "semantic.container-size.content.fixed",
           "es6": "calciteContainerSizeContentFixed"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/container-size.json",
@@ -11798,12 +11798,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "0",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "corner",
         "type": "corner",
         "item": "radius",
         "subitem": "default",
@@ -11813,6 +11808,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.corner.radius.default",
           "docs": "semantic.corner.radius.default",
           "es6": "calciteCornerRadius"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/corner.json",
@@ -11825,12 +11825,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "0",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "corner",
         "type": "corner",
         "item": "radius",
         "subitem": "sharp",
@@ -11840,6 +11835,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.corner.radius.sharp",
           "docs": "semantic.corner.radius.sharp",
           "es6": "calciteCornerRadiusSharp"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/corner.json",
@@ -11852,12 +11852,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "4px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "corner",
         "type": "corner",
         "item": "radius",
         "subitem": "round",
@@ -11867,6 +11862,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.corner.radius.round",
           "docs": "semantic.corner.radius.round",
           "es6": "calciteCornerRadiusRound"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/corner.json",
@@ -11879,12 +11879,8 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "100%",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "element": "",
+        "category": "corner",
         "type": "corner",
         "item": "radius",
         "subitem": "pill",
@@ -11894,6 +11890,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.corner.radius.pill",
           "docs": "semantic.corner.radius.pill",
           "es6": "calciteCornerRadiusPill"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/corner.json",
@@ -11907,11 +11908,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "fontFamily",
       "description": "Primary font with fallbacks",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "fontFamily"
-        },
+        "group": "family",
         "category": "semantic",
         "type": "fontFamily",
         "item": "family",
@@ -11929,6 +11926,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.family.default",
           "docs": "semantic.font.family.default",
           "es6": "calciteFontFamily"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "fontFamily"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -11943,12 +11945,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "fontFamily",
       "description": "Font family for code with fallbacks",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "fontFamily"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "fontFamily",
         "item": "family",
         "subitem": "code",
@@ -11971,6 +11968,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.family.code",
           "docs": "semantic.font.family.code",
           "es6": "calciteFontFamilyCode"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "fontFamily"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -11985,12 +11987,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "fontWeight",
       "description": "For Avenir Next World (secondary font family)",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "fontWeight"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "fontWeight",
         "item": "weight",
         "subitem": "light",
@@ -12007,6 +12004,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.weight.light",
           "docs": "semantic.font.weight.light",
           "es6": "calciteFontWeightLight"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "fontWeight"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -12024,12 +12026,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         "calcite.deprecated": true
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "fontWeight"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "fontWeight",
         "item": "weight",
         "subitem": "normal",
@@ -12049,6 +12046,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.weight.normal",
           "docs": "semantic.font.weight.normal",
           "es6": "calciteFontWeightNormal"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "fontWeight"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -12062,12 +12064,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "400",
       "type": "fontWeight",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "fontWeight"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "font",
         "item": "weight",
         "subitem": "regular",
@@ -12077,6 +12074,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.weight.regular",
           "docs": "semantic.font.weight.regular",
           "es6": "calciteFontWeightRegular"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "fontWeight"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -12089,12 +12091,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "500",
       "type": "fontWeight",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "fontWeight"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "font",
         "item": "weight",
         "subitem": "medium",
@@ -12104,6 +12101,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.weight.medium",
           "docs": "semantic.font.weight.medium",
           "es6": "calciteFontWeightMedium"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "fontWeight"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -12116,12 +12118,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "600",
       "type": "fontWeight",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "fontWeight"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "font",
         "item": "weight",
         "subitem": "semibold",
@@ -12131,6 +12128,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.weight.semibold",
           "docs": "semantic.font.weight.semibold",
           "es6": "calciteFontWeightSemibold"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "fontWeight"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -12143,12 +12145,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "600",
       "type": "fontWeight",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "fontWeight"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "font",
         "item": "weight",
         "subitem": "bold",
@@ -12158,6 +12155,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.weight.bold",
           "docs": "semantic.font.weight.bold",
           "es6": "calciteFontWeightBold"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "fontWeight"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -12170,12 +12172,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "10px",
       "type": "fontSize",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "fontSize"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "font",
         "item": "size",
         "subitem": "xs",
@@ -12185,6 +12182,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.size.xs",
           "docs": "semantic.font.size.xs",
           "es6": "calciteFontSizeXs"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "fontSize"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -12197,12 +12199,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "12px",
       "type": "fontSize",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "fontSize"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "font",
         "item": "size",
         "subitem": "sm",
@@ -12212,6 +12209,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.size.sm",
           "docs": "semantic.font.size.sm",
           "es6": "calciteFontSizeSm"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "fontSize"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -12224,12 +12226,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "14px",
       "type": "fontSize",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "fontSize"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "font",
         "item": "size",
         "subitem": "default",
@@ -12239,6 +12236,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.size.default",
           "docs": "semantic.font.size.default",
           "es6": "calciteFontSize"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "fontSize"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -12251,12 +12253,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "16px",
       "type": "fontSize",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "fontSize"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "font",
         "item": "size",
         "subitem": "md",
@@ -12266,6 +12263,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.size.md",
           "docs": "semantic.font.size.md",
           "es6": "calciteFontSizeMd"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "fontSize"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -12278,12 +12280,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "18px",
       "type": "fontSize",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "fontSize"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "font",
         "item": "size",
         "subitem": "lg",
@@ -12293,6 +12290,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.size.lg",
           "docs": "semantic.font.size.lg",
           "es6": "calciteFontSizeLg"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "fontSize"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -12305,12 +12307,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "20px",
       "type": "fontSize",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "fontSize"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "font",
         "item": "size",
         "subitem": "xl",
@@ -12320,6 +12317,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.size.xl",
           "docs": "semantic.font.size.xl",
           "es6": "calciteFontSizeXl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "fontSize"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -12332,12 +12334,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "24px",
       "type": "fontSize",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "fontSize"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "font",
         "item": "size",
         "subitem": "xxl",
@@ -12347,6 +12344,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.size.xxl",
           "docs": "semantic.font.size.xxl",
           "es6": "calciteFontSizeXxl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "fontSize"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -12360,12 +12362,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "fontStyle",
       "description": "used in ratings",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "fontStyle"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "fontStyle",
         "item": "style",
         "subitem": "emphasis",
@@ -12382,6 +12379,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.style.emphasis",
           "docs": "semantic.font.style.emphasis",
           "es6": "calciteFontStyleEmphasis"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "fontStyle"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -12395,12 +12397,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "12px",
       "type": "lineHeight",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "lineHeight"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "font",
         "item": "line-height",
         "subitem": "fixed",
@@ -12411,6 +12408,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.line-height.fixed.sm",
           "docs": "semantic.font.line-height.fixed.sm",
           "es6": "calciteFontLineHeightFixedSm"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "lineHeight"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -12423,12 +12425,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "16px",
       "type": "lineHeight",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "lineHeight"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "font",
         "item": "line-height",
         "subitem": "fixed",
@@ -12439,6 +12436,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.line-height.fixed.base",
           "docs": "semantic.font.line-height.fixed.base",
           "es6": "calciteFontLineHeightFixedBase"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "lineHeight"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -12451,12 +12453,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "20px",
       "type": "lineHeight",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "lineHeight"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "font",
         "item": "line-height",
         "subitem": "fixed",
@@ -12467,6 +12464,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.line-height.fixed.lg",
           "docs": "semantic.font.line-height.fixed.lg",
           "es6": "calciteFontLineHeightFixedLg"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "lineHeight"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -12479,12 +12481,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "24px",
       "type": "lineHeight",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "lineHeight"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "font",
         "item": "line-height",
         "subitem": "fixed",
@@ -12495,6 +12492,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.line-height.fixed.xl",
           "docs": "semantic.font.line-height.fixed.xl",
           "es6": "calciteFontLineHeightFixedXl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "lineHeight"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -12508,12 +12510,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "lineHeight",
       "description": "1",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "lineHeight"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "lineHeight",
         "item": "line-height",
         "subitem": "relative",
@@ -12531,6 +12528,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.line-height.relative.default",
           "docs": "semantic.font.line-height.relative.default",
           "es6": "calciteFontLineHeightRelative"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "lineHeight"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -12545,12 +12547,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "lineHeight",
       "description": "1.25",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "lineHeight"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "lineHeight",
         "item": "line-height",
         "subitem": "relative",
@@ -12568,6 +12565,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.line-height.relative.tight",
           "docs": "semantic.font.line-height.relative.tight",
           "es6": "calciteFontLineHeightRelativeTight"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "lineHeight"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -12582,12 +12584,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "lineHeight",
       "description": "1.375",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "lineHeight"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "lineHeight",
         "item": "line-height",
         "subitem": "relative",
@@ -12605,6 +12602,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.line-height.relative.snug",
           "docs": "semantic.font.line-height.relative.snug",
           "es6": "calciteFontLineHeightRelativeSnug"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "lineHeight"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -12619,12 +12621,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "lineHeight",
       "description": "1.5",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "lineHeight"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "lineHeight",
         "item": "line-height",
         "subitem": "relative",
@@ -12642,6 +12639,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.line-height.relative.normal",
           "docs": "semantic.font.line-height.relative.normal",
           "es6": "calciteFontLineHeightRelativeNormal"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "lineHeight"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -12656,12 +12658,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "lineHeight",
       "description": "1.625",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "lineHeight"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "lineHeight",
         "item": "line-height",
         "subitem": "relative",
@@ -12679,6 +12676,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.line-height.relative.relaxed",
           "docs": "semantic.font.line-height.relative.relaxed",
           "es6": "calciteFontLineHeightRelativeRelaxed"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "lineHeight"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -12693,12 +12695,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "lineHeight",
       "description": "2",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "lineHeight"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "lineHeight",
         "item": "line-height",
         "subitem": "relative",
@@ -12716,6 +12713,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.line-height.relative.loose",
           "docs": "semantic.font.line-height.relative.loose",
           "es6": "calciteFontLineHeightRelativeLoose"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "lineHeight"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -12730,12 +12732,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "Deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "dimension",
         "item": "letter-spacing",
         "subitem": "tight",
@@ -12752,6 +12749,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.letter-spacing.tight",
           "docs": "semantic.font.letter-spacing.tight",
           "es6": "calciteFontLetterSpacingTight"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -12766,12 +12768,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "Deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "dimension",
         "item": "letter-spacing",
         "subitem": "normal",
@@ -12788,6 +12785,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.letter-spacing.normal",
           "docs": "semantic.font.letter-spacing.normal",
           "es6": "calciteFontLetterSpacingNormal"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -12802,12 +12804,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "Deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "dimension",
         "item": "letter-spacing",
         "subitem": "wide",
@@ -12824,6 +12821,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.letter-spacing.wide",
           "docs": "semantic.font.letter-spacing.wide",
           "es6": "calciteFontLetterSpacingWide"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -12838,12 +12840,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "Deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "dimension",
         "item": "paragraph-spacing",
         "subitem": "normal",
@@ -12860,6 +12857,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.paragraph-spacing.normal",
           "docs": "semantic.font.paragraph-spacing.normal",
           "es6": "calciteFontParagraphSpacingNormal"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -12874,12 +12876,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "textDecoration",
       "description": "Deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "textDecoration"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "textDecoration",
         "item": "text-decoration",
         "subitem": "none",
@@ -12896,6 +12893,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.text-decoration.none",
           "docs": "semantic.font.text-decoration.none",
           "es6": "calciteFontTextDecorationNone"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "textDecoration"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -12910,12 +12912,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "textDecoration",
       "description": "Deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "textDecoration"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "textDecoration",
         "item": "text-decoration",
         "subitem": "underline",
@@ -12932,6 +12929,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.text-decoration.underline",
           "docs": "semantic.font.text-decoration.underline",
           "es6": "calciteFontTextDecorationUnderline"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "textDecoration"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -12946,12 +12948,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "textCase",
       "description": "Deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "textCase"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "textCase",
         "item": "text-case",
         "subitem": "none",
@@ -12968,6 +12965,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.text-case.none",
           "docs": "semantic.font.text-case.none",
           "es6": "calciteFontTextCaseNone"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "textCase"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -12982,12 +12984,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "textCase",
       "description": "Deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "textCase"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "textCase",
         "item": "text-case",
         "subitem": "uppercase",
@@ -13004,6 +13001,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.text-case.uppercase",
           "docs": "semantic.font.text-case.uppercase",
           "es6": "calciteFontTextCaseUppercase"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "textCase"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -13018,12 +13020,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "textCase",
       "description": "Deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "textCase"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "textCase",
         "item": "text-case",
         "subitem": "lowercase",
@@ -13040,6 +13037,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.text-case.lowercase",
           "docs": "semantic.font.text-case.lowercase",
           "es6": "calciteFontTextCaseLowercase"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "textCase"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -13054,12 +13056,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "textCase",
       "description": "Deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "textCase"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "textCase",
         "item": "text-case",
         "subitem": "capitalize",
@@ -13076,6 +13073,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.font.text-case.capitalize",
           "docs": "semantic.font.text-case.capitalize",
           "es6": "calciteFontTextCaseCapitalize"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "textCase"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -13089,12 +13091,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "0.4",
       "type": "opacity",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "opacity"
-        },
-        "category": "semantic",
+        "category": "opacity",
         "type": "opacity",
         "item": "light",
         "names": {
@@ -13103,6 +13100,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.opacity.light",
           "docs": "semantic.opacity.light",
           "es6": "calciteOpacityLight"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "opacity"
         }
       },
       "filePath": "src/tokens/semantic/opacity.json",
@@ -13115,12 +13117,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "0.5",
       "type": "opacity",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "opacity"
-        },
-        "category": "semantic",
+        "category": "opacity",
         "type": "opacity",
         "item": "half",
         "names": {
@@ -13129,6 +13126,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.opacity.half",
           "docs": "semantic.opacity.half",
           "es6": "calciteOpacityHalf"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "opacity"
         }
       },
       "filePath": "src/tokens/semantic/opacity.json",
@@ -13141,12 +13143,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "0.85",
       "type": "opacity",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "opacity"
-        },
-        "category": "semantic",
+        "category": "opacity",
         "type": "opacity",
         "item": "dark",
         "names": {
@@ -13155,6 +13152,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.opacity.dark",
           "docs": "semantic.opacity.dark",
           "es6": "calciteOpacityDark"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "opacity"
         }
       },
       "filePath": "src/tokens/semantic/opacity.json",
@@ -13167,12 +13169,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "1",
       "type": "opacity",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "opacity"
-        },
-        "category": "semantic",
+        "category": "opacity",
         "type": "opacity",
         "item": "full",
         "names": {
@@ -13181,6 +13178,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.opacity.full",
           "docs": "semantic.opacity.full",
           "es6": "calciteOpacityFull"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "opacity"
         }
       },
       "filePath": "src/tokens/semantic/opacity.json",
@@ -13193,12 +13195,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "0.5",
       "type": "opacity",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "opacity"
-        },
-        "category": "semantic",
+        "category": "opacity",
         "type": "opacity",
         "item": "disabled",
         "names": {
@@ -13207,6 +13204,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.opacity.disabled",
           "docs": "semantic.opacity.disabled",
           "es6": "calciteOpacityDisabled"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "opacity"
         }
       },
       "filePath": "src/tokens/semantic/opacity.json",
@@ -13219,12 +13221,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"blur\\":\\"0\\",\\"spread\\":\\"0\\",\\"color\\":\\"rgba(0, 0, 0, 0)\\",\\"x\\":\\"0\\",\\"y\\":\\"0\\"}",
       "type": "shadow",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "shadow"
-        },
-        "category": "semantic",
+        "category": "shadow",
         "type": "shadow",
         "item": "none",
         "names": {
@@ -13233,6 +13230,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.shadow.none",
           "docs": "semantic.shadow.none",
           "es6": "calciteShadowNone"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "shadow"
         }
       },
       "filePath": "src/tokens/semantic/shadow.json",
@@ -13245,12 +13247,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "[{\\"blur\\":\\"8px\\",\\"spread\\":\\"0\\",\\"color\\":\\"rgba(0, 0, 0, 0.04)\\",\\"x\\":\\"0\\",\\"y\\":\\"2px\\"},{\\"blur\\":\\"16px\\",\\"spread\\":\\"0\\",\\"color\\":\\"rgba(0, 0, 0, 0.08)\\",\\"x\\":\\"0\\",\\"y\\":\\"4px\\"}]",
       "type": "shadow",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "shadow"
-        },
-        "category": "semantic",
+        "category": "shadow",
         "type": "shadow",
         "item": "sm",
         "names": {
@@ -13259,6 +13256,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.shadow.sm",
           "docs": "semantic.shadow.sm",
           "es6": "calciteShadowSm"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "shadow"
         }
       },
       "filePath": "src/tokens/semantic/shadow.json",
@@ -13271,12 +13273,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "[{\\"blur\\":\\"20px\\",\\"spread\\":\\"0\\",\\"color\\":\\"rgba(0, 0, 0, 0.08)\\",\\"x\\":\\"0\\",\\"y\\":\\"4px\\"},{\\"blur\\":\\"32px\\",\\"spread\\":\\"-2px\\",\\"color\\":\\"rgba(0, 0, 0, 0.1)\\",\\"x\\":\\"0\\",\\"y\\":\\"12px\\"}]",
       "type": "shadow",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "shadow"
-        },
-        "category": "semantic",
+        "category": "shadow",
         "type": "shadow",
         "item": "md",
         "names": {
@@ -13285,6 +13282,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.shadow.md",
           "docs": "semantic.shadow.md",
           "es6": "calciteShadowMd"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "shadow"
         }
       },
       "filePath": "src/tokens/semantic/shadow.json",
@@ -13298,12 +13300,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "dimension",
         "item": "fixed",
         "subitem": "xxxs",
@@ -13320,6 +13317,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.size.fixed.xxxs",
           "docs": "semantic.size.fixed.xxxs",
           "es6": "calciteSizeFixedXxxs"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -13334,12 +13336,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "dimension",
         "item": "fixed",
         "subitem": "xxs",
@@ -13356,6 +13353,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.size.fixed.xxs",
           "docs": "semantic.size.fixed.xxs",
           "es6": "calciteSizeFixedXxs"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -13370,12 +13372,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "dimension",
         "item": "fixed",
         "subitem": "xs",
@@ -13392,6 +13389,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.size.fixed.xs",
           "docs": "semantic.size.fixed.xs",
           "es6": "calciteSizeFixedXs"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -13406,12 +13408,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "dimension",
         "item": "fixed",
         "subitem": "sm",
@@ -13428,6 +13425,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.size.fixed.sm",
           "docs": "semantic.size.fixed.sm",
           "es6": "calciteSizeFixedSm"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -13442,12 +13444,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "dimension",
         "item": "fixed",
         "subitem": "sm+",
@@ -13464,6 +13461,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.size.fixed.sm+",
           "docs": "semantic.size.fixed.sm+",
           "es6": "calciteSizeFixedSmPlus"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -13478,12 +13480,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "dimension",
         "item": "fixed",
         "subitem": "md",
@@ -13500,6 +13497,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.size.fixed.md",
           "docs": "semantic.size.fixed.md",
           "es6": "calciteSizeFixedMd"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -13514,12 +13516,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "dimension",
         "item": "fixed",
         "subitem": "md+",
@@ -13536,6 +13533,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.size.fixed.md+",
           "docs": "semantic.size.fixed.md+",
           "es6": "calciteSizeFixedMdPlus"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -13550,12 +13552,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "dimension",
         "item": "fixed",
         "subitem": "lg",
@@ -13572,6 +13569,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.size.fixed.lg",
           "docs": "semantic.size.fixed.lg",
           "es6": "calciteSizeFixedLg"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -13586,12 +13588,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "dimension",
         "item": "fixed",
         "subitem": "xl",
@@ -13608,6 +13605,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.size.fixed.xl",
           "docs": "semantic.size.fixed.xl",
           "es6": "calciteSizeFixedXl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -13622,12 +13624,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "dimension",
         "item": "fixed",
         "subitem": "xxl",
@@ -13644,6 +13641,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.size.fixed.xxl",
           "docs": "semantic.size.fixed.xxl",
           "es6": "calciteSizeFixedXxl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -13658,12 +13660,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "dimension",
         "item": "fixed",
         "subitem": "xxxl",
@@ -13680,6 +13677,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.size.fixed.xxxl",
           "docs": "semantic.size.fixed.xxxl",
           "es6": "calciteSizeFixedXxxl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -13693,12 +13695,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "1px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "px",
@@ -13708,6 +13705,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.size.default.px",
           "docs": "semantic.size.default.px",
           "es6": "calciteSizePx"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -13720,12 +13722,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "0.75rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "xxxs",
@@ -13735,6 +13732,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.size.default.xxxs",
           "docs": "semantic.size.default.xxxs",
           "es6": "calciteSizeXxxs"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -13747,12 +13749,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "0.875rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "xxs",
@@ -13762,6 +13759,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.size.default.xxs",
           "docs": "semantic.size.default.xxs",
           "es6": "calciteSizeXxs"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -13774,12 +13776,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "1rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "xs",
@@ -13789,6 +13786,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.size.default.xs",
           "docs": "semantic.size.default.xs",
           "es6": "calciteSizeXs"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -13801,12 +13803,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "1.5rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "sm",
@@ -13816,6 +13813,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.size.default.sm",
           "docs": "semantic.size.default.sm",
           "es6": "calciteSizeSm"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -13828,12 +13830,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "2rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "md",
@@ -13843,6 +13840,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.size.default.md",
           "docs": "semantic.size.default.md",
           "es6": "calciteSizeMd"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -13855,12 +13857,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "2.75rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "lg",
@@ -13870,6 +13867,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.size.default.lg",
           "docs": "semantic.size.default.lg",
           "es6": "calciteSizeLg"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -13882,12 +13884,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "3rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "xl",
@@ -13897,6 +13894,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.size.default.xl",
           "docs": "semantic.size.default.xl",
           "es6": "calciteSizeXl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -13909,12 +13911,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "4rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "xxl",
@@ -13924,6 +13921,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.size.default.xxl",
           "docs": "semantic.size.default.xxl",
           "es6": "calciteSizeXxl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -13936,12 +13938,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "6rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "xxxl",
@@ -13951,6 +13948,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.size.default.xxxl",
           "docs": "semantic.size.default.xxxl",
           "es6": "calciteSizeXxxl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -13964,12 +13966,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "space",
         "type": "dimension",
         "item": "fixed",
         "subitem": "xxs",
@@ -13986,6 +13983,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.spacing.fixed.xxs",
           "docs": "semantic.spacing.fixed.xxs",
           "es6": "calciteSpacingFixedXxs"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -14000,12 +14002,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "space",
         "type": "dimension",
         "item": "fixed",
         "subitem": "xs",
@@ -14022,6 +14019,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.spacing.fixed.xs",
           "docs": "semantic.spacing.fixed.xs",
           "es6": "calciteSpacingFixedXs"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -14036,12 +14038,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "space",
         "type": "dimension",
         "item": "fixed",
         "subitem": "sm",
@@ -14058,6 +14055,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.spacing.fixed.sm",
           "docs": "semantic.spacing.fixed.sm",
           "es6": "calciteSpacingFixedSm"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -14072,12 +14074,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "space",
         "type": "dimension",
         "item": "fixed",
         "subitem": "md",
@@ -14094,6 +14091,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.spacing.fixed.md",
           "docs": "semantic.spacing.fixed.md",
           "es6": "calciteSpacingFixedMd"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -14108,12 +14110,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "space",
         "type": "dimension",
         "item": "fixed",
         "subitem": "lg",
@@ -14130,6 +14127,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.spacing.fixed.lg",
           "docs": "semantic.spacing.fixed.lg",
           "es6": "calciteSpacingFixedLg"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -14144,12 +14146,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "space",
         "type": "dimension",
         "item": "fixed",
         "subitem": "xl",
@@ -14166,6 +14163,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.spacing.fixed.xl",
           "docs": "semantic.spacing.fixed.xl",
           "es6": "calciteSpacingFixedXl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -14180,12 +14182,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "space",
         "type": "dimension",
         "item": "fixed",
         "subitem": "xxl",
@@ -14202,6 +14199,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.spacing.fixed.xxl",
           "docs": "semantic.spacing.fixed.xxl",
           "es6": "calciteSpacingFixedXxl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -14216,12 +14218,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "space",
         "type": "dimension",
         "item": "fixed",
         "subitem": "xxxl",
@@ -14238,6 +14235,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.spacing.fixed.xxxl",
           "docs": "semantic.spacing.fixed.xxxl",
           "es6": "calciteSpacingFixedXxxl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -14251,12 +14253,8 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "0",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "pattern": "",
+        "category": "space",
         "type": "spacing",
         "item": "default",
         "subitem": "none",
@@ -14266,6 +14264,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.spacing.default.none",
           "docs": "semantic.spacing.default.none",
           "es6": "calciteSpacingNone"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -14278,12 +14281,8 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "1px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "pattern": "",
+        "category": "space",
         "type": "spacing",
         "item": "default",
         "subitem": "px",
@@ -14293,8 +14292,13 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.spacing.default.px",
           "docs": "semantic.spacing.default.px",
           "es6": "calciteSpacingPx"
-        }
-      },
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
+        }
+      },
       "filePath": "src/tokens/semantic/space.json",
       "isSource": true,
       "name": "Spacing Px",
@@ -14305,12 +14309,8 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "2px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "pattern": "",
+        "category": "space",
         "type": "spacing",
         "item": "default",
         "subitem": "base",
@@ -14320,6 +14320,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.spacing.default.base",
           "docs": "semantic.spacing.default.base",
           "es6": "calciteSpacingBase"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -14332,12 +14337,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "0.25rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "spacing",
         "item": "default",
         "subitem": "xxs",
@@ -14347,6 +14347,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.spacing.default.xxs",
           "docs": "semantic.spacing.default.xxs",
           "es6": "calciteSpacingXxs"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -14359,12 +14364,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "0.375rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "spacing",
         "item": "default",
         "subitem": "xs",
@@ -14374,6 +14374,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.spacing.default.xs",
           "docs": "semantic.spacing.default.xs",
           "es6": "calciteSpacingXs"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -14386,12 +14391,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "0.5rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "spacing",
         "item": "default",
         "subitem": "sm",
@@ -14401,6 +14401,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.spacing.default.sm",
           "docs": "semantic.spacing.default.sm",
           "es6": "calciteSpacingSm"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -14413,12 +14418,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "0.625rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "space",
         "type": "spacing",
         "item": "default",
         "subitem": "sm+",
@@ -14428,6 +14428,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.spacing.default.sm+",
           "docs": "semantic.spacing.default.sm+",
           "es6": "calciteSpacingSmPlus"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -14440,12 +14445,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "0.75rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "space",
         "type": "spacing",
         "item": "default",
         "subitem": "md",
@@ -14455,6 +14455,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.spacing.default.md",
           "docs": "semantic.spacing.default.md",
           "es6": "calciteSpacingMd"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -14467,12 +14472,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "0.875rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "space",
         "type": "spacing",
         "item": "default",
         "subitem": "md+",
@@ -14482,6 +14482,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.spacing.default.md+",
           "docs": "semantic.spacing.default.md+",
           "es6": "calciteSpacingMdPlus"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -14494,12 +14499,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "1rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "space",
         "type": "spacing",
         "item": "default",
         "subitem": "lg",
@@ -14509,6 +14509,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.spacing.default.lg",
           "docs": "semantic.spacing.default.lg",
           "es6": "calciteSpacingLg"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -14521,12 +14526,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "1.25rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "space",
         "type": "spacing",
         "item": "default",
         "subitem": "xl",
@@ -14536,6 +14536,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.spacing.default.xl",
           "docs": "semantic.spacing.default.xl",
           "es6": "calciteSpacingXl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -14548,12 +14553,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "1.5rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "space",
         "type": "spacing",
         "item": "default",
         "subitem": "xxl",
@@ -14563,6 +14563,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.spacing.default.xxl",
           "docs": "semantic.spacing.default.xxl",
           "es6": "calciteSpacingXxl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -14575,12 +14580,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "2rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "space",
         "type": "spacing",
         "item": "default",
         "subitem": "xxxl",
@@ -14590,6 +14590,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.spacing.default.xxxl",
           "docs": "semantic.spacing.default.xxxl",
           "es6": "calciteSpacingXxxl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -14602,12 +14607,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "type": "typography",
       "value": "{\\"fontFamily\\":[\\"Avenir Next\\",\\"Avenir\\",\\"Helvetica Neue\\",\\"sans-serif\\"],\\"fontSize\\":\\"14px\\",\\"fontWeight\\":\\"400\\",\\"letterSpacing\\":\\"0\\",\\"lineHeight\\":\\"16px\\",\\"paragraphSpacing\\":\\"4px\\",\\"textCase\\":\\"none\\",\\"textDecoration\\":\\"none\\"}",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "",
         "type": "typography",
         "item": "default",
         "subitem": "default",
@@ -14617,6 +14617,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.default.default",
           "docs": "semantic.typography.default.default",
           "es6": "calciteTypography"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -14646,12 +14651,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "",
         "type": "typography",
         "item": "default",
         "subitem": "light",
@@ -14662,6 +14662,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.default.light.-3h",
           "docs": "semantic.typography.default.light.-3h",
           "es6": "calciteTypographyLightMinus3H"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -14691,12 +14696,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "default",
         "type": "typography",
         "item": "default",
         "subitem": "light",
@@ -14707,6 +14707,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.default.light.-2h",
           "docs": "semantic.typography.default.light.-2h",
           "es6": "calciteTypographyLightMinus2H"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -14736,12 +14741,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "default",
         "type": "typography",
         "item": "default",
         "subitem": "light",
@@ -14752,6 +14752,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.default.light.-1h",
           "docs": "semantic.typography.default.light.-1h",
           "es6": "calciteTypographyLightMinus1H"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -14781,12 +14786,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "default",
         "type": "typography",
         "item": "default",
         "subitem": "light",
@@ -14797,6 +14797,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.default.light.0h",
           "docs": "semantic.typography.default.light.0h",
           "es6": "calciteTypographyLight0H"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -14826,12 +14831,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "default",
         "type": "typography",
         "item": "default",
         "subitem": "light",
@@ -14842,6 +14842,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.default.light.1h",
           "docs": "semantic.typography.default.light.1h",
           "es6": "calciteTypographyLight1H"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -14871,12 +14876,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "default",
         "type": "typography",
         "item": "default",
         "subitem": "regular",
@@ -14887,6 +14887,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.default.regular.-3h",
           "docs": "semantic.typography.default.regular.-3h",
           "es6": "calciteTypographyRegularMinus3H"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -14916,12 +14921,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "default",
         "type": "typography",
         "item": "default",
         "subitem": "regular",
@@ -14932,6 +14932,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.default.regular.-2h",
           "docs": "semantic.typography.default.regular.-2h",
           "es6": "calciteTypographyRegularMinus2H"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -14944,12 +14949,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"fontFamily\\":[\\"Avenir Next\\",\\"Avenir\\",\\"Helvetica Neue\\",\\"sans-serif\\"],\\"fontSize\\":\\"14px\\",\\"fontWeight\\":\\"400\\",\\"letterSpacing\\":\\"0\\",\\"lineHeight\\":\\"16px\\",\\"paragraphSpacing\\":\\"4px\\",\\"textCase\\":\\"none\\",\\"textDecoration\\":\\"none\\"}",
       "type": "typography",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "default",
         "type": "typography",
         "item": "default",
         "subitem": "regular",
@@ -14960,6 +14960,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.default.regular.-1h",
           "docs": "semantic.typography.default.regular.-1h",
           "es6": "calciteTypographyRegularMinus1H"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -14989,12 +14994,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "default",
         "type": "typography",
         "item": "default",
         "subitem": "regular",
@@ -15005,6 +15005,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.default.regular.0h",
           "docs": "semantic.typography.default.regular.0h",
           "es6": "calciteTypographyRegular0H"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -15034,12 +15039,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "default",
         "type": "typography",
         "item": "default",
         "subitem": "regular",
@@ -15050,6 +15050,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.default.regular.1h",
           "docs": "semantic.typography.default.regular.1h",
           "es6": "calciteTypographyRegular1H"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -15079,12 +15084,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "default",
         "type": "typography",
         "item": "default",
         "subitem": "medium",
@@ -15095,6 +15095,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.default.medium.-3h",
           "docs": "semantic.typography.default.medium.-3h",
           "es6": "calciteTypographyMediumMinus3H"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -15124,12 +15129,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "default",
         "type": "typography",
         "item": "default",
         "subitem": "medium",
@@ -15140,6 +15140,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.default.medium.-2h",
           "docs": "semantic.typography.default.medium.-2h",
           "es6": "calciteTypographyMediumMinus2H"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -15169,12 +15174,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "default",
         "type": "typography",
         "item": "default",
         "subitem": "medium",
@@ -15185,6 +15185,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.default.medium.-1h",
           "docs": "semantic.typography.default.medium.-1h",
           "es6": "calciteTypographyMediumMinus1H"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -15214,12 +15219,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "default",
         "type": "typography",
         "item": "default",
         "subitem": "medium",
@@ -15230,6 +15230,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.default.medium.0h",
           "docs": "semantic.typography.default.medium.0h",
           "es6": "calciteTypographyMedium0H"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -15259,12 +15264,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "default",
         "type": "typography",
         "item": "default",
         "subitem": "medium",
@@ -15275,6 +15275,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.default.medium.1h",
           "docs": "semantic.typography.default.medium.1h",
           "es6": "calciteTypographyMedium1H"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -15304,12 +15309,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "default",
         "type": "typography",
         "item": "default",
         "subitem": "bold",
@@ -15320,6 +15320,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.default.bold.-3h",
           "docs": "semantic.typography.default.bold.-3h",
           "es6": "calciteTypographyBoldMinus3H"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -15349,12 +15354,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "default",
         "type": "typography",
         "item": "default",
         "subitem": "bold",
@@ -15365,6 +15365,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.default.bold.-2h",
           "docs": "semantic.typography.default.bold.-2h",
           "es6": "calciteTypographyBoldMinus2H"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -15394,12 +15399,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "default",
         "type": "typography",
         "item": "default",
         "subitem": "bold",
@@ -15410,6 +15410,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.default.bold.-1h",
           "docs": "semantic.typography.default.bold.-1h",
           "es6": "calciteTypographyBoldMinus1H"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -15439,12 +15444,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "default",
         "type": "typography",
         "item": "default",
         "subitem": "bold",
@@ -15455,6 +15455,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.default.bold.0h",
           "docs": "semantic.typography.default.bold.0h",
           "es6": "calciteTypographyBold0H"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -15484,12 +15489,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "default",
         "type": "typography",
         "item": "default",
         "subitem": "bold",
@@ -15500,6 +15500,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.default.bold.1h",
           "docs": "semantic.typography.default.bold.1h",
           "es6": "calciteTypographyBold1H"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -15529,12 +15534,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "wrap",
         "type": "typography",
         "item": "wrap",
         "subitem": "light",
@@ -15545,6 +15545,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.wrap.light.0",
           "docs": "semantic.typography.wrap.light.0",
           "es6": "calciteTypographyWrapLight0"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -15574,12 +15579,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "wrap",
         "type": "typography",
         "item": "wrap",
         "subitem": "light",
@@ -15590,6 +15590,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.wrap.light.1",
           "docs": "semantic.typography.wrap.light.1",
           "es6": "calciteTypographyWrapLight1"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -15619,12 +15624,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "wrap",
         "type": "typography",
         "item": "wrap",
         "subitem": "light",
@@ -15635,6 +15635,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.wrap.light.2",
           "docs": "semantic.typography.wrap.light.2",
           "es6": "calciteTypographyWrapLight2"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -15664,12 +15669,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "wrap",
         "type": "typography",
         "item": "wrap",
         "subitem": "light",
@@ -15680,6 +15680,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.wrap.light.3",
           "docs": "semantic.typography.wrap.light.3",
           "es6": "calciteTypographyWrapLight3"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -15709,12 +15714,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "wrap",
         "type": "typography",
         "item": "wrap",
         "subitem": "light",
@@ -15725,6 +15725,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.wrap.light.-2",
           "docs": "semantic.typography.wrap.light.-2",
           "es6": "calciteTypographyWrapLightMinus2"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -15754,12 +15759,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "wrap",
         "type": "typography",
         "item": "wrap",
         "subitem": "light",
@@ -15770,6 +15770,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.wrap.light.-1",
           "docs": "semantic.typography.wrap.light.-1",
           "es6": "calciteTypographyWrapLightMinus1"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -15799,12 +15804,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "wrap",
         "type": "typography",
         "item": "wrap",
         "subitem": "regular",
@@ -15815,6 +15815,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.wrap.regular.0",
           "docs": "semantic.typography.wrap.regular.0",
           "es6": "calciteTypographyWrapRegular0"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -15844,12 +15849,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "wrap",
         "type": "typography",
         "item": "wrap",
         "subitem": "regular",
@@ -15860,6 +15860,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.wrap.regular.1",
           "docs": "semantic.typography.wrap.regular.1",
           "es6": "calciteTypographyWrapRegular1"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -15889,12 +15894,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "wrap",
         "type": "typography",
         "item": "wrap",
         "subitem": "regular",
@@ -15905,6 +15905,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.wrap.regular.2",
           "docs": "semantic.typography.wrap.regular.2",
           "es6": "calciteTypographyWrapRegular2"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -15934,12 +15939,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "wrap",
         "type": "typography",
         "item": "wrap",
         "subitem": "regular",
@@ -15950,6 +15950,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.wrap.regular.3",
           "docs": "semantic.typography.wrap.regular.3",
           "es6": "calciteTypographyWrapRegular3"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -15979,12 +15984,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "wrap",
         "type": "typography",
         "item": "wrap",
         "subitem": "regular",
@@ -15995,6 +15995,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.wrap.regular.-2",
           "docs": "semantic.typography.wrap.regular.-2",
           "es6": "calciteTypographyWrapRegularMinus2"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -16024,12 +16029,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "wrap",
         "type": "typography",
         "item": "wrap",
         "subitem": "regular",
@@ -16040,6 +16040,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.wrap.regular.-1",
           "docs": "semantic.typography.wrap.regular.-1",
           "es6": "calciteTypographyWrapRegularMinus1"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -16069,12 +16074,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "wrap",
         "type": "typography",
         "item": "wrap",
         "subitem": "medium",
@@ -16085,6 +16085,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.wrap.medium.0",
           "docs": "semantic.typography.wrap.medium.0",
           "es6": "calciteTypographyWrapMedium0"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -16114,12 +16119,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "wrap",
         "type": "typography",
         "item": "wrap",
         "subitem": "medium",
@@ -16130,6 +16130,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.wrap.medium.1",
           "docs": "semantic.typography.wrap.medium.1",
           "es6": "calciteTypographyWrapMedium1"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -16159,12 +16164,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "wrap",
         "type": "typography",
         "item": "wrap",
         "subitem": "medium",
@@ -16175,6 +16175,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.wrap.medium.2",
           "docs": "semantic.typography.wrap.medium.2",
           "es6": "calciteTypographyWrapMedium2"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -16204,12 +16209,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "wrap",
         "type": "typography",
         "item": "wrap",
         "subitem": "medium",
@@ -16220,6 +16220,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.wrap.medium.3",
           "docs": "semantic.typography.wrap.medium.3",
           "es6": "calciteTypographyWrapMedium3"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -16249,12 +16254,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "wrap",
         "type": "typography",
         "item": "wrap",
         "subitem": "medium",
@@ -16265,6 +16265,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.wrap.medium.-2",
           "docs": "semantic.typography.wrap.medium.-2",
           "es6": "calciteTypographyWrapMediumMinus2"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -16294,12 +16299,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "wrap",
         "type": "typography",
         "item": "wrap",
         "subitem": "medium",
@@ -16310,6 +16310,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.wrap.medium.-1",
           "docs": "semantic.typography.wrap.medium.-1",
           "es6": "calciteTypographyWrapMediumMinus1"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -16339,12 +16344,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "wrap",
         "type": "typography",
         "item": "wrap",
         "subitem": "bold",
@@ -16355,6 +16355,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.wrap.bold.0",
           "docs": "semantic.typography.wrap.bold.0",
           "es6": "calciteTypographyWrapBold0"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -16384,12 +16389,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "wrap",
         "type": "typography",
         "item": "wrap",
         "subitem": "bold",
@@ -16400,6 +16400,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.wrap.bold.1",
           "docs": "semantic.typography.wrap.bold.1",
           "es6": "calciteTypographyWrapBold1"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -16429,12 +16434,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "wrap",
         "type": "typography",
         "item": "wrap",
         "subitem": "bold",
@@ -16445,6 +16445,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.wrap.bold.2",
           "docs": "semantic.typography.wrap.bold.2",
           "es6": "calciteTypographyWrapBold2"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -16474,12 +16479,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "wrap",
         "type": "typography",
         "item": "wrap",
         "subitem": "bold",
@@ -16490,6 +16490,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.wrap.bold.3",
           "docs": "semantic.typography.wrap.bold.3",
           "es6": "calciteTypographyWrapBold3"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -16519,12 +16524,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "wrap",
         "type": "typography",
         "item": "wrap",
         "subitem": "bold",
@@ -16535,6 +16535,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.wrap.bold.-2",
           "docs": "semantic.typography.wrap.bold.-2",
           "es6": "calciteTypographyWrapBoldMinus2"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -16564,12 +16569,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
         }
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "wrap",
         "type": "typography",
         "item": "wrap",
         "subitem": "bold",
@@ -16580,6 +16580,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.wrap.bold.-1",
           "docs": "semantic.typography.wrap.bold.-1",
           "es6": "calciteTypographyWrapBoldMinus1"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -16592,12 +16597,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"fontWeight\\":\\"600\\",\\"lineHeight\\":\\"1.375\\",\\"fontSize\\":\\"24px\\"}",
       "type": "typography",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "hierarchy",
         "type": "typography",
         "item": "hierarchy",
         "subitem": "display",
@@ -16608,6 +16608,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.hierarchy.display.1",
           "docs": "semantic.typography.hierarchy.display.1",
           "es6": "calciteTypographyHierarchyDisplay1"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -16620,12 +16625,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"fontWeight\\":\\"600\\",\\"lineHeight\\":\\"1.375\\",\\"fontSize\\":\\"20px\\"}",
       "type": "typography",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "hierarchy",
         "type": "typography",
         "item": "hierarchy",
         "subitem": "display",
@@ -16636,6 +16636,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.hierarchy.display.2",
           "docs": "semantic.typography.hierarchy.display.2",
           "es6": "calciteTypographyHierarchyDisplay2"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -16648,12 +16653,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"fontWeight\\":\\"500\\",\\"lineHeight\\":\\"1.375\\",\\"fontSize\\":\\"24px\\"}",
       "type": "typography",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "hierarchy",
         "type": "typography",
         "item": "hierarchy",
         "subitem": "heading",
@@ -16664,6 +16664,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.hierarchy.heading.1",
           "docs": "semantic.typography.hierarchy.heading.1",
           "es6": "calciteTypographyHierarchyHeading1"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -16676,12 +16681,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"fontWeight\\":\\"500\\",\\"lineHeight\\":\\"1.375\\",\\"fontSize\\":\\"20px\\"}",
       "type": "typography",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "hierarchy",
         "type": "typography",
         "item": "hierarchy",
         "subitem": "heading",
@@ -16692,6 +16692,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.hierarchy.heading.2",
           "docs": "semantic.typography.hierarchy.heading.2",
           "es6": "calciteTypographyHierarchyHeading2"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -16704,12 +16709,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"fontWeight\\":\\"500\\",\\"lineHeight\\":\\"1.375\\",\\"fontSize\\":\\"18px\\"}",
       "type": "typography",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "hierarchy",
         "type": "typography",
         "item": "hierarchy",
         "subitem": "heading",
@@ -16720,6 +16720,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.hierarchy.heading.3",
           "docs": "semantic.typography.hierarchy.heading.3",
           "es6": "calciteTypographyHierarchyHeading3"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -16732,12 +16737,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"fontWeight\\":\\"500\\",\\"lineHeight\\":\\"1.375\\",\\"fontSize\\":\\"16px\\"}",
       "type": "typography",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "hierarchy",
         "type": "typography",
         "item": "hierarchy",
         "subitem": "heading",
@@ -16748,6 +16748,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.hierarchy.heading.4",
           "docs": "semantic.typography.hierarchy.heading.4",
           "es6": "calciteTypographyHierarchyHeading4"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -16760,12 +16765,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"fontWeight\\":\\"500\\",\\"lineHeight\\":\\"1.375\\"}",
       "type": "typography",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "hierarchy",
         "type": "typography",
         "item": "hierarchy",
         "subitem": "heading",
@@ -16776,6 +16776,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.hierarchy.heading.5",
           "docs": "semantic.typography.hierarchy.heading.5",
           "es6": "calciteTypographyHierarchyHeading5"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -16788,12 +16793,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"lineHeight\\":\\"1.375\\"}",
       "type": "typography",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "hierarchy",
         "type": "typography",
         "item": "hierarchy",
         "subitem": "body",
@@ -16804,6 +16804,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.hierarchy.body.snug",
           "docs": "semantic.typography.hierarchy.body.snug",
           "es6": "calciteTypographyHierarchyBodySnug"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -16816,12 +16821,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"fontFamily\\":[\\"Avenir Next\\",\\"Avenir\\",\\"Helvetica Neue\\",\\"sans-serif\\"],\\"fontSize\\":\\"14px\\",\\"fontWeight\\":\\"400\\",\\"letterSpacing\\":\\"0\\",\\"lineHeight\\":\\"16px\\",\\"paragraphSpacing\\":\\"4px\\",\\"textCase\\":\\"none\\",\\"textDecoration\\":\\"none\\"}",
       "type": "typography",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "hierarchy",
         "type": "typography",
         "item": "hierarchy",
         "subitem": "body",
@@ -16832,6 +16832,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.hierarchy.body.default",
           "docs": "semantic.typography.hierarchy.body.default",
           "es6": "calciteTypographyHierarchyBody"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -16844,12 +16849,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"lineHeight\\":\\"12px\\",\\"textCase\\":\\"uppercase\\",\\"fontWeight\\":\\"600\\"}",
       "type": "typography",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "hierarchy",
         "type": "typography",
         "item": "hierarchy",
         "subitem": "overline",
@@ -16859,6 +16859,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.hierarchy.overline",
           "docs": "semantic.typography.hierarchy.overline",
           "es6": "calciteTypographyHierarchyOverline"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -16871,12 +16876,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "{\\"lineHeight\\":\\"1.375\\",\\"fontSize\\":\\"12px\\"}",
       "type": "typography",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "typography"
-        },
-        "category": "semantic",
+        "category": "hierarchy",
         "type": "typography",
         "item": "hierarchy",
         "subitem": "caption",
@@ -16886,6 +16886,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.typography.hierarchy.caption",
           "docs": "semantic.typography.hierarchy.caption",
           "es6": "calciteTypographyHierarchyCaption"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "typography"
         }
       },
       "filePath": "src/tokens/semantic/typography.json",
@@ -16898,12 +16903,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "-999999",
       "type": "z-index",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "z-index"
-        },
-        "category": "semantic",
+        "category": "z-index",
         "type": "z-index",
         "item": "deep",
         "names": {
@@ -16912,6 +16912,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.z-index.deep",
           "docs": "semantic.z-index.deep",
           "es6": "calciteZIndexDeep"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "z-index"
         }
       },
       "filePath": "src/tokens/semantic/z-index.json",
@@ -16924,12 +16929,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "1",
       "type": "z-index",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "z-index"
-        },
-        "category": "semantic",
+        "category": "z-index",
         "type": "z-index",
         "item": "default",
         "names": {
@@ -16938,6 +16938,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.z-index.default",
           "docs": "semantic.z-index.default",
           "es6": "calciteZIndex"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "z-index"
         }
       },
       "filePath": "src/tokens/semantic/z-index.json",
@@ -16950,12 +16955,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "300",
       "type": "z-index",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "z-index"
-        },
-        "category": "semantic",
+        "category": "z-index",
         "type": "z-index",
         "item": "sticky",
         "names": {
@@ -16964,6 +16964,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.z-index.sticky",
           "docs": "semantic.z-index.sticky",
           "es6": "calciteZIndexSticky"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "z-index"
         }
       },
       "filePath": "src/tokens/semantic/z-index.json",
@@ -16976,12 +16981,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "400",
       "type": "z-index",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "z-index"
-        },
-        "category": "semantic",
+        "category": "z-index",
         "type": "z-index",
         "item": "header",
         "names": {
@@ -16990,6 +16990,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.z-index.header",
           "docs": "semantic.z-index.header",
           "es6": "calciteZIndexHeader"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "z-index"
         }
       },
       "filePath": "src/tokens/semantic/z-index.json",
@@ -17002,12 +17007,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "500",
       "type": "z-index",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "z-index"
-        },
-        "category": "semantic",
+        "category": "z-index",
         "type": "z-index",
         "item": "toast",
         "names": {
@@ -17016,6 +17016,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.z-index.toast",
           "docs": "semantic.z-index.toast",
           "es6": "calciteZIndexToast"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "z-index"
         }
       },
       "filePath": "src/tokens/semantic/z-index.json",
@@ -17028,12 +17033,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "600",
       "type": "z-index",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "z-index"
-        },
-        "category": "semantic",
+        "category": "z-index",
         "type": "z-index",
         "item": "dropdown",
         "names": {
@@ -17042,6 +17042,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.z-index.dropdown",
           "docs": "semantic.z-index.dropdown",
           "es6": "calciteZIndexDropdown"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "z-index"
         }
       },
       "filePath": "src/tokens/semantic/z-index.json",
@@ -17054,12 +17059,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "700",
       "type": "z-index",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "z-index"
-        },
-        "category": "semantic",
+        "category": "z-index",
         "type": "z-index",
         "item": "overlay",
         "names": {
@@ -17068,6 +17068,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.z-index.overlay",
           "docs": "semantic.z-index.overlay",
           "es6": "calciteZIndexOverlay"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "z-index"
         }
       },
       "filePath": "src/tokens/semantic/z-index.json",
@@ -17080,12 +17085,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "800",
       "type": "z-index",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "z-index"
-        },
-        "category": "semantic",
+        "category": "z-index",
         "type": "z-index",
         "item": "modal",
         "names": {
@@ -17094,6 +17094,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.z-index.modal",
           "docs": "semantic.z-index.modal",
           "es6": "calciteZIndexModal"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "z-index"
         }
       },
       "filePath": "src/tokens/semantic/z-index.json",
@@ -17106,12 +17111,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "900",
       "type": "z-index",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "z-index"
-        },
-        "category": "semantic",
+        "category": "z-index",
         "type": "z-index",
         "item": "popup",
         "names": {
@@ -17120,6 +17120,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.z-index.popup",
           "docs": "semantic.z-index.popup",
           "es6": "calciteZIndexPopup"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "z-index"
         }
       },
       "filePath": "src/tokens/semantic/z-index.json",
@@ -17132,12 +17137,7 @@ exports[`generated tokens > DOCS > global should match 1`] = `
       "value": "901",
       "type": "z-index",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "z-index"
-        },
-        "category": "semantic",
+        "category": "z-index",
         "type": "z-index",
         "item": "tooltip",
         "names": {
@@ -17146,6 +17146,11 @@ exports[`generated tokens > DOCS > global should match 1`] = `
           "js": "semantic.z-index.tooltip",
           "docs": "semantic.z-index.tooltip",
           "es6": "calciteZIndexTooltip"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "z-index"
         }
       },
       "filePath": "src/tokens/semantic/z-index.json",
@@ -17167,12 +17172,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "0",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "border",
         "type": "border",
         "item": "width",
         "subitem": "none",
@@ -17182,6 +17182,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.border.width.none",
           "docs": "semantic.border.width.none",
           "es6": "calciteBorderWidthNone"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/border.json",
@@ -17194,12 +17199,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "1px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "border",
         "type": "border",
         "item": "width",
         "subitem": "sm",
@@ -17209,6 +17209,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.border.width.sm",
           "docs": "semantic.border.width.sm",
           "es6": "calciteBorderWidthSm"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/border.json",
@@ -17221,12 +17226,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "2px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "border",
         "type": "border",
         "item": "width",
         "subitem": "md",
@@ -17236,6 +17236,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.border.width.md",
           "docs": "semantic.border.width.md",
           "es6": "calciteBorderWidthMd"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/border.json",
@@ -17248,12 +17253,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "4px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "border",
         "type": "border",
         "item": "width",
         "subitem": "lg",
@@ -17263,6 +17263,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.border.width.lg",
           "docs": "semantic.border.width.lg",
           "es6": "calciteBorderWidthLg"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/border.json",
@@ -17276,12 +17281,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "Small handheld devices and mini-windows",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "breakpoint",
         "type": "dimension",
         "item": "height",
         "subitem": "xxs",
@@ -17301,6 +17301,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.container-size.height.xxs",
           "docs": "semantic.container-size.height.xxs",
           "es6": "calciteContainerSizeHeightXxs"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/container-size.json",
@@ -17315,12 +17320,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "Handheld devices",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "breakpoint",
         "type": "dimension",
         "item": "height",
         "subitem": "xs",
@@ -17340,6 +17340,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.container-size.height.xs",
           "docs": "semantic.container-size.height.xs",
           "es6": "calciteContainerSizeHeightXs"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/container-size.json",
@@ -17354,12 +17359,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "Small tablets",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "breakpoint",
         "type": "dimension",
         "item": "height",
         "subitem": "sm",
@@ -17379,6 +17379,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.container-size.height.sm",
           "docs": "semantic.container-size.height.sm",
           "es6": "calciteContainerSizeHeightSm"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/container-size.json",
@@ -17393,12 +17398,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "Small laptops",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "breakpoint",
         "type": "dimension",
         "item": "height",
         "subitem": "md",
@@ -17418,6 +17418,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.container-size.height.md",
           "docs": "semantic.container-size.height.md",
           "es6": "calciteContainerSizeHeightMd"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/container-size.json",
@@ -17432,12 +17437,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "Large laptops and desktop computers",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "breakpoint",
         "type": "dimension",
         "item": "height",
         "subitem": "lg",
@@ -17457,6 +17457,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.container-size.height.lg",
           "docs": "semantic.container-size.height.lg",
           "es6": "calciteContainerSizeHeightLg"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/container-size.json",
@@ -17471,12 +17476,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "Projectors and televisions",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "breakpoint",
         "type": "dimension",
         "item": "height",
         "subitem": "xl",
@@ -17495,6 +17495,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.container-size.height.xl",
           "docs": "semantic.container-size.height.xl",
           "es6": "calciteContainerSizeHeightXl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/container-size.json",
@@ -17509,12 +17514,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "Small handheld devices and mini-windows",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "breakpoint",
         "type": "dimension",
         "item": "width",
         "subitem": "xxs",
@@ -17534,6 +17534,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.container-size.width.xxs",
           "docs": "semantic.container-size.width.xxs",
           "es6": "calciteContainerSizeWidthXxs"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/container-size.json",
@@ -17548,12 +17553,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "Handheld devices",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "breakpoint",
         "type": "dimension",
         "item": "width",
         "subitem": "xs",
@@ -17573,6 +17573,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.container-size.width.xs",
           "docs": "semantic.container-size.width.xs",
           "es6": "calciteContainerSizeWidthXs"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/container-size.json",
@@ -17587,12 +17592,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "Small tablets",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "breakpoint",
         "type": "dimension",
         "item": "width",
         "subitem": "sm",
@@ -17612,6 +17612,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.container-size.width.sm",
           "docs": "semantic.container-size.width.sm",
           "es6": "calciteContainerSizeWidthSm"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/container-size.json",
@@ -17626,12 +17631,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "Small laptops",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "breakpoint",
         "type": "dimension",
         "item": "width",
         "subitem": "md",
@@ -17651,6 +17651,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.container-size.width.md",
           "docs": "semantic.container-size.width.md",
           "es6": "calciteContainerSizeWidthMd"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/container-size.json",
@@ -17665,12 +17670,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "Large laptops and desktop computers",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "breakpoint",
         "type": "dimension",
         "item": "width",
         "subitem": "lg",
@@ -17690,6 +17690,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.container-size.width.lg",
           "docs": "semantic.container-size.width.lg",
           "es6": "calciteContainerSizeWidthLg"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/container-size.json",
@@ -17704,12 +17709,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "Projectors and televisions",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "breakpoint",
         "type": "dimension",
         "item": "width",
         "subitem": "xl",
@@ -17728,6 +17728,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.container-size.width.xl",
           "docs": "semantic.container-size.width.xl",
           "es6": "calciteContainerSizeWidthXl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/container-size.json",
@@ -17741,12 +17746,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "24px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "breakpoint",
         "type": "container-size",
         "item": "margin",
         "names": {
@@ -17755,6 +17755,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.container-size.margin",
           "docs": "semantic.container-size.margin",
           "es6": "calciteContainerSizeMargin"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/container-size.json",
@@ -17767,12 +17772,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "16px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "breakpoint",
         "type": "container-size",
         "item": "gutter",
         "names": {
@@ -17781,6 +17781,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.container-size.gutter",
           "docs": "semantic.container-size.gutter",
           "es6": "calciteContainerSizeGutter"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/container-size.json",
@@ -17794,12 +17799,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "for fluid grid widths",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "breakpoint",
         "type": "dimension",
         "item": "content",
         "subitem": "fluid",
@@ -17816,6 +17816,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.container-size.content.fluid",
           "docs": "semantic.container-size.content.fluid",
           "es6": "calciteContainerSizeContentFluid"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/container-size.json",
@@ -17830,12 +17835,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "only for lg breakpoint fixed grid width",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "breakpoint",
         "type": "dimension",
         "item": "content",
         "subitem": "fixed",
@@ -17852,6 +17852,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.container-size.content.fixed",
           "docs": "semantic.container-size.content.fixed",
           "es6": "calciteContainerSizeContentFixed"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/container-size.json",
@@ -17865,12 +17870,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "0",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "corner",
         "type": "corner",
         "item": "radius",
         "subitem": "default",
@@ -17880,6 +17880,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.corner.radius.default",
           "docs": "semantic.corner.radius.default",
           "es6": "calciteCornerRadius"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/corner.json",
@@ -17892,12 +17897,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "0",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "corner",
         "type": "corner",
         "item": "radius",
         "subitem": "sharp",
@@ -17907,6 +17907,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.corner.radius.sharp",
           "docs": "semantic.corner.radius.sharp",
           "es6": "calciteCornerRadiusSharp"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/corner.json",
@@ -17919,12 +17924,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "4px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "corner",
         "type": "corner",
         "item": "radius",
         "subitem": "round",
@@ -17934,6 +17934,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.corner.radius.round",
           "docs": "semantic.corner.radius.round",
           "es6": "calciteCornerRadiusRound"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/corner.json",
@@ -17946,12 +17951,8 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "100%",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "element": "",
+        "category": "corner",
         "type": "corner",
         "item": "radius",
         "subitem": "pill",
@@ -17961,6 +17962,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.corner.radius.pill",
           "docs": "semantic.corner.radius.pill",
           "es6": "calciteCornerRadiusPill"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/corner.json",
@@ -17974,11 +17980,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "fontFamily",
       "description": "Primary font with fallbacks",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "fontFamily"
-        },
+        "group": "family",
         "category": "semantic",
         "type": "fontFamily",
         "item": "family",
@@ -17996,6 +17998,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.family.default",
           "docs": "semantic.font.family.default",
           "es6": "calciteFontFamily"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "fontFamily"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -18010,12 +18017,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "fontFamily",
       "description": "Font family for code with fallbacks",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "fontFamily"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "fontFamily",
         "item": "family",
         "subitem": "code",
@@ -18038,6 +18040,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.family.code",
           "docs": "semantic.font.family.code",
           "es6": "calciteFontFamilyCode"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "fontFamily"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -18052,12 +18059,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "fontWeight",
       "description": "For Avenir Next World (secondary font family)",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "fontWeight"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "fontWeight",
         "item": "weight",
         "subitem": "light",
@@ -18074,6 +18076,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.weight.light",
           "docs": "semantic.font.weight.light",
           "es6": "calciteFontWeightLight"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "fontWeight"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -18091,12 +18098,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
         "calcite.deprecated": true
       },
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "fontWeight"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "fontWeight",
         "item": "weight",
         "subitem": "normal",
@@ -18116,6 +18118,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.weight.normal",
           "docs": "semantic.font.weight.normal",
           "es6": "calciteFontWeightNormal"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "fontWeight"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -18129,12 +18136,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "400",
       "type": "fontWeight",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "fontWeight"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "font",
         "item": "weight",
         "subitem": "regular",
@@ -18144,6 +18146,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.weight.regular",
           "docs": "semantic.font.weight.regular",
           "es6": "calciteFontWeightRegular"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "fontWeight"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -18156,12 +18163,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "500",
       "type": "fontWeight",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "fontWeight"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "font",
         "item": "weight",
         "subitem": "medium",
@@ -18171,6 +18173,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.weight.medium",
           "docs": "semantic.font.weight.medium",
           "es6": "calciteFontWeightMedium"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "fontWeight"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -18183,12 +18190,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "600",
       "type": "fontWeight",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "fontWeight"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "font",
         "item": "weight",
         "subitem": "semibold",
@@ -18198,6 +18200,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.weight.semibold",
           "docs": "semantic.font.weight.semibold",
           "es6": "calciteFontWeightSemibold"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "fontWeight"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -18210,12 +18217,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "600",
       "type": "fontWeight",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "fontWeight"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "font",
         "item": "weight",
         "subitem": "bold",
@@ -18225,6 +18227,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.weight.bold",
           "docs": "semantic.font.weight.bold",
           "es6": "calciteFontWeightBold"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "fontWeight"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -18237,12 +18244,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "10px",
       "type": "fontSize",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "fontSize"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "font",
         "item": "size",
         "subitem": "xs",
@@ -18252,6 +18254,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.size.xs",
           "docs": "semantic.font.size.xs",
           "es6": "calciteFontSizeXs"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "fontSize"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -18264,12 +18271,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "12px",
       "type": "fontSize",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "fontSize"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "font",
         "item": "size",
         "subitem": "sm",
@@ -18279,6 +18281,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.size.sm",
           "docs": "semantic.font.size.sm",
           "es6": "calciteFontSizeSm"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "fontSize"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -18291,12 +18298,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "14px",
       "type": "fontSize",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "fontSize"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "font",
         "item": "size",
         "subitem": "default",
@@ -18306,6 +18308,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.size.default",
           "docs": "semantic.font.size.default",
           "es6": "calciteFontSize"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "fontSize"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -18318,12 +18325,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "16px",
       "type": "fontSize",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "fontSize"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "font",
         "item": "size",
         "subitem": "md",
@@ -18333,6 +18335,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.size.md",
           "docs": "semantic.font.size.md",
           "es6": "calciteFontSizeMd"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "fontSize"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -18345,12 +18352,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "18px",
       "type": "fontSize",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "fontSize"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "font",
         "item": "size",
         "subitem": "lg",
@@ -18360,6 +18362,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.size.lg",
           "docs": "semantic.font.size.lg",
           "es6": "calciteFontSizeLg"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "fontSize"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -18372,12 +18379,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "20px",
       "type": "fontSize",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "fontSize"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "font",
         "item": "size",
         "subitem": "xl",
@@ -18387,6 +18389,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.size.xl",
           "docs": "semantic.font.size.xl",
           "es6": "calciteFontSizeXl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "fontSize"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -18399,12 +18406,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "24px",
       "type": "fontSize",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "fontSize"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "font",
         "item": "size",
         "subitem": "xxl",
@@ -18414,6 +18416,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.size.xxl",
           "docs": "semantic.font.size.xxl",
           "es6": "calciteFontSizeXxl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "fontSize"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -18427,12 +18434,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "fontStyle",
       "description": "used in ratings",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "fontStyle"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "fontStyle",
         "item": "style",
         "subitem": "emphasis",
@@ -18449,6 +18451,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.style.emphasis",
           "docs": "semantic.font.style.emphasis",
           "es6": "calciteFontStyleEmphasis"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "fontStyle"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -18462,12 +18469,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "12px",
       "type": "lineHeight",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "lineHeight"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "font",
         "item": "line-height",
         "subitem": "fixed",
@@ -18478,6 +18480,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.line-height.fixed.sm",
           "docs": "semantic.font.line-height.fixed.sm",
           "es6": "calciteFontLineHeightFixedSm"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "lineHeight"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -18490,12 +18497,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "16px",
       "type": "lineHeight",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "lineHeight"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "font",
         "item": "line-height",
         "subitem": "fixed",
@@ -18506,6 +18508,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.line-height.fixed.base",
           "docs": "semantic.font.line-height.fixed.base",
           "es6": "calciteFontLineHeightFixedBase"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "lineHeight"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -18518,12 +18525,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "20px",
       "type": "lineHeight",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "lineHeight"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "font",
         "item": "line-height",
         "subitem": "fixed",
@@ -18534,6 +18536,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.line-height.fixed.lg",
           "docs": "semantic.font.line-height.fixed.lg",
           "es6": "calciteFontLineHeightFixedLg"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "lineHeight"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -18546,12 +18553,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "24px",
       "type": "lineHeight",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "lineHeight"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "font",
         "item": "line-height",
         "subitem": "fixed",
@@ -18562,6 +18564,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.line-height.fixed.xl",
           "docs": "semantic.font.line-height.fixed.xl",
           "es6": "calciteFontLineHeightFixedXl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "lineHeight"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -18575,12 +18582,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "lineHeight",
       "description": "1",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "lineHeight"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "lineHeight",
         "item": "line-height",
         "subitem": "relative",
@@ -18598,6 +18600,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.line-height.relative.default",
           "docs": "semantic.font.line-height.relative.default",
           "es6": "calciteFontLineHeightRelative"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "lineHeight"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -18612,12 +18619,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "lineHeight",
       "description": "1.25",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "lineHeight"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "lineHeight",
         "item": "line-height",
         "subitem": "relative",
@@ -18635,6 +18637,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.line-height.relative.tight",
           "docs": "semantic.font.line-height.relative.tight",
           "es6": "calciteFontLineHeightRelativeTight"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "lineHeight"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -18649,12 +18656,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "lineHeight",
       "description": "1.375",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "lineHeight"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "lineHeight",
         "item": "line-height",
         "subitem": "relative",
@@ -18672,6 +18674,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.line-height.relative.snug",
           "docs": "semantic.font.line-height.relative.snug",
           "es6": "calciteFontLineHeightRelativeSnug"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "lineHeight"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -18686,12 +18693,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "lineHeight",
       "description": "1.5",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "lineHeight"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "lineHeight",
         "item": "line-height",
         "subitem": "relative",
@@ -18709,6 +18711,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.line-height.relative.normal",
           "docs": "semantic.font.line-height.relative.normal",
           "es6": "calciteFontLineHeightRelativeNormal"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "lineHeight"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -18723,12 +18730,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "lineHeight",
       "description": "1.625",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "lineHeight"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "lineHeight",
         "item": "line-height",
         "subitem": "relative",
@@ -18746,6 +18748,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.line-height.relative.relaxed",
           "docs": "semantic.font.line-height.relative.relaxed",
           "es6": "calciteFontLineHeightRelativeRelaxed"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "lineHeight"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -18760,12 +18767,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "lineHeight",
       "description": "2",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "lineHeight"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "lineHeight",
         "item": "line-height",
         "subitem": "relative",
@@ -18783,6 +18785,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.line-height.relative.loose",
           "docs": "semantic.font.line-height.relative.loose",
           "es6": "calciteFontLineHeightRelativeLoose"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "lineHeight"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -18797,12 +18804,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "Deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "dimension",
         "item": "letter-spacing",
         "subitem": "tight",
@@ -18819,6 +18821,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.letter-spacing.tight",
           "docs": "semantic.font.letter-spacing.tight",
           "es6": "calciteFontLetterSpacingTight"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -18833,12 +18840,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "Deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "dimension",
         "item": "letter-spacing",
         "subitem": "normal",
@@ -18855,6 +18857,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.letter-spacing.normal",
           "docs": "semantic.font.letter-spacing.normal",
           "es6": "calciteFontLetterSpacingNormal"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -18869,12 +18876,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "Deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "dimension",
         "item": "letter-spacing",
         "subitem": "wide",
@@ -18891,6 +18893,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.letter-spacing.wide",
           "docs": "semantic.font.letter-spacing.wide",
           "es6": "calciteFontLetterSpacingWide"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -18905,12 +18912,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "Deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "dimension",
         "item": "paragraph-spacing",
         "subitem": "normal",
@@ -18927,6 +18929,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.paragraph-spacing.normal",
           "docs": "semantic.font.paragraph-spacing.normal",
           "es6": "calciteFontParagraphSpacingNormal"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -18941,12 +18948,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "textDecoration",
       "description": "Deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "textDecoration"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "textDecoration",
         "item": "text-decoration",
         "subitem": "none",
@@ -18963,6 +18965,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.text-decoration.none",
           "docs": "semantic.font.text-decoration.none",
           "es6": "calciteFontTextDecorationNone"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "textDecoration"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -18977,12 +18984,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "textDecoration",
       "description": "Deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "textDecoration"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "textDecoration",
         "item": "text-decoration",
         "subitem": "underline",
@@ -18999,6 +19001,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.text-decoration.underline",
           "docs": "semantic.font.text-decoration.underline",
           "es6": "calciteFontTextDecorationUnderline"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "textDecoration"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -19013,12 +19020,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "textCase",
       "description": "Deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "textCase"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "textCase",
         "item": "text-case",
         "subitem": "none",
@@ -19035,6 +19037,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.text-case.none",
           "docs": "semantic.font.text-case.none",
           "es6": "calciteFontTextCaseNone"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "textCase"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -19049,12 +19056,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "textCase",
       "description": "Deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "textCase"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "textCase",
         "item": "text-case",
         "subitem": "uppercase",
@@ -19071,6 +19073,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.text-case.uppercase",
           "docs": "semantic.font.text-case.uppercase",
           "es6": "calciteFontTextCaseUppercase"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "textCase"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -19085,12 +19092,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "textCase",
       "description": "Deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "textCase"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "textCase",
         "item": "text-case",
         "subitem": "lowercase",
@@ -19107,6 +19109,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.text-case.lowercase",
           "docs": "semantic.font.text-case.lowercase",
           "es6": "calciteFontTextCaseLowercase"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "textCase"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -19121,12 +19128,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "textCase",
       "description": "Deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "textCase"
-        },
-        "category": "semantic",
+        "category": "font",
         "type": "textCase",
         "item": "text-case",
         "subitem": "capitalize",
@@ -19143,6 +19145,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.font.text-case.capitalize",
           "docs": "semantic.font.text-case.capitalize",
           "es6": "calciteFontTextCaseCapitalize"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "textCase"
         }
       },
       "filePath": "src/tokens/semantic/font.json",
@@ -19156,12 +19163,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "0.4",
       "type": "opacity",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "opacity"
-        },
-        "category": "semantic",
+        "category": "opacity",
         "type": "opacity",
         "item": "light",
         "names": {
@@ -19170,6 +19172,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.opacity.light",
           "docs": "semantic.opacity.light",
           "es6": "calciteOpacityLight"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "opacity"
         }
       },
       "filePath": "src/tokens/semantic/opacity.json",
@@ -19182,12 +19189,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "0.5",
       "type": "opacity",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "opacity"
-        },
-        "category": "semantic",
+        "category": "opacity",
         "type": "opacity",
         "item": "half",
         "names": {
@@ -19196,6 +19198,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.opacity.half",
           "docs": "semantic.opacity.half",
           "es6": "calciteOpacityHalf"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "opacity"
         }
       },
       "filePath": "src/tokens/semantic/opacity.json",
@@ -19208,12 +19215,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "0.85",
       "type": "opacity",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "opacity"
-        },
-        "category": "semantic",
+        "category": "opacity",
         "type": "opacity",
         "item": "dark",
         "names": {
@@ -19222,6 +19224,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.opacity.dark",
           "docs": "semantic.opacity.dark",
           "es6": "calciteOpacityDark"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "opacity"
         }
       },
       "filePath": "src/tokens/semantic/opacity.json",
@@ -19234,12 +19241,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "1",
       "type": "opacity",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "opacity"
-        },
-        "category": "semantic",
+        "category": "opacity",
         "type": "opacity",
         "item": "full",
         "names": {
@@ -19248,6 +19250,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.opacity.full",
           "docs": "semantic.opacity.full",
           "es6": "calciteOpacityFull"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "opacity"
         }
       },
       "filePath": "src/tokens/semantic/opacity.json",
@@ -19260,12 +19267,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "0.5",
       "type": "opacity",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "opacity"
-        },
-        "category": "semantic",
+        "category": "opacity",
         "type": "opacity",
         "item": "disabled",
         "names": {
@@ -19274,6 +19276,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.opacity.disabled",
           "docs": "semantic.opacity.disabled",
           "es6": "calciteOpacityDisabled"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "opacity"
         }
       },
       "filePath": "src/tokens/semantic/opacity.json",
@@ -19286,12 +19293,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "{\\"blur\\":\\"0\\",\\"spread\\":\\"0\\",\\"color\\":\\"rgba(0, 0, 0, 0)\\",\\"x\\":\\"0\\",\\"y\\":\\"0\\"}",
       "type": "shadow",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "shadow"
-        },
-        "category": "semantic",
+        "category": "shadow",
         "type": "shadow",
         "item": "none",
         "names": {
@@ -19300,6 +19302,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.shadow.none",
           "docs": "semantic.shadow.none",
           "es6": "calciteShadowNone"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "shadow"
         }
       },
       "filePath": "src/tokens/semantic/shadow.json",
@@ -19312,12 +19319,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "[{\\"blur\\":\\"8px\\",\\"spread\\":\\"0\\",\\"color\\":\\"rgba(0, 0, 0, 0.04)\\",\\"x\\":\\"0\\",\\"y\\":\\"2px\\"},{\\"blur\\":\\"16px\\",\\"spread\\":\\"0\\",\\"color\\":\\"rgba(0, 0, 0, 0.08)\\",\\"x\\":\\"0\\",\\"y\\":\\"4px\\"}]",
       "type": "shadow",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "shadow"
-        },
-        "category": "semantic",
+        "category": "shadow",
         "type": "shadow",
         "item": "sm",
         "names": {
@@ -19326,6 +19328,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.shadow.sm",
           "docs": "semantic.shadow.sm",
           "es6": "calciteShadowSm"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "shadow"
         }
       },
       "filePath": "src/tokens/semantic/shadow.json",
@@ -19338,12 +19345,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "[{\\"blur\\":\\"20px\\",\\"spread\\":\\"0\\",\\"color\\":\\"rgba(0, 0, 0, 0.08)\\",\\"x\\":\\"0\\",\\"y\\":\\"4px\\"},{\\"blur\\":\\"32px\\",\\"spread\\":\\"-2px\\",\\"color\\":\\"rgba(0, 0, 0, 0.1)\\",\\"x\\":\\"0\\",\\"y\\":\\"12px\\"}]",
       "type": "shadow",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "shadow"
-        },
-        "category": "semantic",
+        "category": "shadow",
         "type": "shadow",
         "item": "md",
         "names": {
@@ -19352,6 +19354,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.shadow.md",
           "docs": "semantic.shadow.md",
           "es6": "calciteShadowMd"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "shadow"
         }
       },
       "filePath": "src/tokens/semantic/shadow.json",
@@ -19365,12 +19372,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "dimension",
         "item": "fixed",
         "subitem": "xxxs",
@@ -19387,6 +19389,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.size.fixed.xxxs",
           "docs": "semantic.size.fixed.xxxs",
           "es6": "calciteSizeFixedXxxs"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -19401,12 +19408,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "dimension",
         "item": "fixed",
         "subitem": "xxs",
@@ -19423,6 +19425,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.size.fixed.xxs",
           "docs": "semantic.size.fixed.xxs",
           "es6": "calciteSizeFixedXxs"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -19437,12 +19444,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "dimension",
         "item": "fixed",
         "subitem": "xs",
@@ -19459,6 +19461,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.size.fixed.xs",
           "docs": "semantic.size.fixed.xs",
           "es6": "calciteSizeFixedXs"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -19473,12 +19480,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "dimension",
         "item": "fixed",
         "subitem": "sm",
@@ -19495,6 +19497,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.size.fixed.sm",
           "docs": "semantic.size.fixed.sm",
           "es6": "calciteSizeFixedSm"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -19509,12 +19516,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "dimension",
         "item": "fixed",
         "subitem": "sm+",
@@ -19531,6 +19533,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.size.fixed.sm+",
           "docs": "semantic.size.fixed.sm+",
           "es6": "calciteSizeFixedSmPlus"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -19545,12 +19552,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "dimension",
         "item": "fixed",
         "subitem": "md",
@@ -19567,6 +19569,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.size.fixed.md",
           "docs": "semantic.size.fixed.md",
           "es6": "calciteSizeFixedMd"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -19581,12 +19588,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "dimension",
         "item": "fixed",
         "subitem": "md+",
@@ -19603,6 +19605,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.size.fixed.md+",
           "docs": "semantic.size.fixed.md+",
           "es6": "calciteSizeFixedMdPlus"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -19617,12 +19624,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "dimension",
         "item": "fixed",
         "subitem": "lg",
@@ -19639,6 +19641,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.size.fixed.lg",
           "docs": "semantic.size.fixed.lg",
           "es6": "calciteSizeFixedLg"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -19653,12 +19660,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "dimension",
         "item": "fixed",
         "subitem": "xl",
@@ -19675,6 +19677,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.size.fixed.xl",
           "docs": "semantic.size.fixed.xl",
           "es6": "calciteSizeFixedXl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -19689,12 +19696,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "dimension",
         "item": "fixed",
         "subitem": "xxl",
@@ -19711,6 +19713,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.size.fixed.xxl",
           "docs": "semantic.size.fixed.xxl",
           "es6": "calciteSizeFixedXxl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -19725,12 +19732,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "dimension",
         "item": "fixed",
         "subitem": "xxxl",
@@ -19747,6 +19749,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.size.fixed.xxxl",
           "docs": "semantic.size.fixed.xxxl",
           "es6": "calciteSizeFixedXxxl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -19760,12 +19767,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "1px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "px",
@@ -19775,6 +19777,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.size.default.px",
           "docs": "semantic.size.default.px",
           "es6": "calciteSizePx"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -19787,12 +19794,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "0.75rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "xxxs",
@@ -19802,6 +19804,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.size.default.xxxs",
           "docs": "semantic.size.default.xxxs",
           "es6": "calciteSizeXxxs"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -19814,12 +19821,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "0.875rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "xxs",
@@ -19829,6 +19831,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.size.default.xxs",
           "docs": "semantic.size.default.xxs",
           "es6": "calciteSizeXxs"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -19841,12 +19848,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "1rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "xs",
@@ -19856,6 +19858,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.size.default.xs",
           "docs": "semantic.size.default.xs",
           "es6": "calciteSizeXs"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -19868,12 +19875,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "1.5rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "sm",
@@ -19883,6 +19885,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.size.default.sm",
           "docs": "semantic.size.default.sm",
           "es6": "calciteSizeSm"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -19895,12 +19902,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "2rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "md",
@@ -19910,6 +19912,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.size.default.md",
           "docs": "semantic.size.default.md",
           "es6": "calciteSizeMd"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -19922,12 +19929,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "2.75rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "lg",
@@ -19937,6 +19939,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.size.default.lg",
           "docs": "semantic.size.default.lg",
           "es6": "calciteSizeLg"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -19949,12 +19956,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "3rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "xl",
@@ -19964,6 +19966,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.size.default.xl",
           "docs": "semantic.size.default.xl",
           "es6": "calciteSizeXl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -19976,12 +19983,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "4rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "xxl",
@@ -19991,6 +19993,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.size.default.xxl",
           "docs": "semantic.size.default.xxl",
           "es6": "calciteSizeXxl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -20003,12 +20010,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "6rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "size",
         "item": "default",
         "subitem": "xxxl",
@@ -20018,6 +20020,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.size.default.xxxl",
           "docs": "semantic.size.default.xxxl",
           "es6": "calciteSizeXxxl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/size.json",
@@ -20031,12 +20038,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "space",
         "type": "dimension",
         "item": "fixed",
         "subitem": "xxs",
@@ -20053,6 +20055,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.spacing.fixed.xxs",
           "docs": "semantic.spacing.fixed.xxs",
           "es6": "calciteSpacingFixedXxs"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -20067,12 +20074,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "space",
         "type": "dimension",
         "item": "fixed",
         "subitem": "xs",
@@ -20089,6 +20091,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.spacing.fixed.xs",
           "docs": "semantic.spacing.fixed.xs",
           "es6": "calciteSpacingFixedXs"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -20103,12 +20110,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "space",
         "type": "dimension",
         "item": "fixed",
         "subitem": "sm",
@@ -20125,6 +20127,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.spacing.fixed.sm",
           "docs": "semantic.spacing.fixed.sm",
           "es6": "calciteSpacingFixedSm"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -20139,12 +20146,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "space",
         "type": "dimension",
         "item": "fixed",
         "subitem": "md",
@@ -20161,6 +20163,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.spacing.fixed.md",
           "docs": "semantic.spacing.fixed.md",
           "es6": "calciteSpacingFixedMd"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -20175,12 +20182,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "space",
         "type": "dimension",
         "item": "fixed",
         "subitem": "lg",
@@ -20197,6 +20199,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.spacing.fixed.lg",
           "docs": "semantic.spacing.fixed.lg",
           "es6": "calciteSpacingFixedLg"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -20211,12 +20218,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "space",
         "type": "dimension",
         "item": "fixed",
         "subitem": "xl",
@@ -20233,6 +20235,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.spacing.fixed.xl",
           "docs": "semantic.spacing.fixed.xl",
           "es6": "calciteSpacingFixedXl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -20247,12 +20254,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "space",
         "type": "dimension",
         "item": "fixed",
         "subitem": "xxl",
@@ -20269,6 +20271,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.spacing.fixed.xxl",
           "docs": "semantic.spacing.fixed.xxl",
           "es6": "calciteSpacingFixedXxl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -20283,12 +20290,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "type": "dimension",
       "description": "deprecated",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "space",
         "type": "dimension",
         "item": "fixed",
         "subitem": "xxxl",
@@ -20305,6 +20307,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.spacing.fixed.xxxl",
           "docs": "semantic.spacing.fixed.xxxl",
           "es6": "calciteSpacingFixedXxxl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -20318,12 +20325,8 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "0",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "pattern": "",
+        "category": "space",
         "type": "spacing",
         "item": "default",
         "subitem": "none",
@@ -20333,6 +20336,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.spacing.default.none",
           "docs": "semantic.spacing.default.none",
           "es6": "calciteSpacingNone"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -20345,12 +20353,8 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "1px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "pattern": "",
+        "category": "space",
         "type": "spacing",
         "item": "default",
         "subitem": "px",
@@ -20360,6 +20364,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.spacing.default.px",
           "docs": "semantic.spacing.default.px",
           "es6": "calciteSpacingPx"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -20372,12 +20381,8 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "2px",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "pattern": "",
+        "category": "space",
         "type": "spacing",
         "item": "default",
         "subitem": "base",
@@ -20387,6 +20392,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.spacing.default.base",
           "docs": "semantic.spacing.default.base",
           "es6": "calciteSpacingBase"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -20399,12 +20409,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "0.25rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "spacing",
         "item": "default",
         "subitem": "xxs",
@@ -20414,6 +20419,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.spacing.default.xxs",
           "docs": "semantic.spacing.default.xxs",
           "es6": "calciteSpacingXxs"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -20426,12 +20436,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "0.375rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "spacing",
         "item": "default",
         "subitem": "xs",
@@ -20441,6 +20446,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.spacing.default.xs",
           "docs": "semantic.spacing.default.xs",
           "es6": "calciteSpacingXs"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -20453,12 +20463,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "0.5rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "size",
         "type": "spacing",
         "item": "default",
         "subitem": "sm",
@@ -20468,6 +20473,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.spacing.default.sm",
           "docs": "semantic.spacing.default.sm",
           "es6": "calciteSpacingSm"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -20480,12 +20490,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "0.625rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "space",
         "type": "spacing",
         "item": "default",
         "subitem": "sm+",
@@ -20495,6 +20500,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.spacing.default.sm+",
           "docs": "semantic.spacing.default.sm+",
           "es6": "calciteSpacingSmPlus"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -20507,12 +20517,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "0.75rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "space",
         "type": "spacing",
         "item": "default",
         "subitem": "md",
@@ -20522,6 +20527,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.spacing.default.md",
           "docs": "semantic.spacing.default.md",
           "es6": "calciteSpacingMd"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -20534,12 +20544,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "0.875rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "space",
         "type": "spacing",
         "item": "default",
         "subitem": "md+",
@@ -20549,6 +20554,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.spacing.default.md+",
           "docs": "semantic.spacing.default.md+",
           "es6": "calciteSpacingMdPlus"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -20561,12 +20571,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "1rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "space",
         "type": "spacing",
         "item": "default",
         "subitem": "lg",
@@ -20576,6 +20581,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.spacing.default.lg",
           "docs": "semantic.spacing.default.lg",
           "es6": "calciteSpacingLg"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -20588,12 +20598,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "1.25rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "space",
         "type": "spacing",
         "item": "default",
         "subitem": "xl",
@@ -20603,6 +20608,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.spacing.default.xl",
           "docs": "semantic.spacing.default.xl",
           "es6": "calciteSpacingXl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -20615,12 +20625,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "1.5rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "space",
         "type": "spacing",
         "item": "default",
         "subitem": "xxl",
@@ -20630,6 +20635,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.spacing.default.xxl",
           "docs": "semantic.spacing.default.xxl",
           "es6": "calciteSpacingXxl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -20642,12 +20652,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "2rem",
       "type": "dimension",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "dimension"
-        },
-        "category": "semantic",
+        "category": "space",
         "type": "spacing",
         "item": "default",
         "subitem": "xxxl",
@@ -20657,6 +20662,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.spacing.default.xxxl",
           "docs": "semantic.spacing.default.xxxl",
           "es6": "calciteSpacingXxxl"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "dimension"
         }
       },
       "filePath": "src/tokens/semantic/space.json",
@@ -20669,12 +20679,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "-999999",
       "type": "z-index",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "z-index"
-        },
-        "category": "semantic",
+        "category": "z-index",
         "type": "z-index",
         "item": "deep",
         "names": {
@@ -20683,6 +20688,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.z-index.deep",
           "docs": "semantic.z-index.deep",
           "es6": "calciteZIndexDeep"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "z-index"
         }
       },
       "filePath": "src/tokens/semantic/z-index.json",
@@ -20695,12 +20705,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "1",
       "type": "z-index",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "z-index"
-        },
-        "category": "semantic",
+        "category": "z-index",
         "type": "z-index",
         "item": "default",
         "names": {
@@ -20709,6 +20714,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.z-index.default",
           "docs": "semantic.z-index.default",
           "es6": "calciteZIndex"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "z-index"
         }
       },
       "filePath": "src/tokens/semantic/z-index.json",
@@ -20721,12 +20731,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "300",
       "type": "z-index",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "z-index"
-        },
-        "category": "semantic",
+        "category": "z-index",
         "type": "z-index",
         "item": "sticky",
         "names": {
@@ -20735,6 +20740,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.z-index.sticky",
           "docs": "semantic.z-index.sticky",
           "es6": "calciteZIndexSticky"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "z-index"
         }
       },
       "filePath": "src/tokens/semantic/z-index.json",
@@ -20747,12 +20757,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "400",
       "type": "z-index",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "z-index"
-        },
-        "category": "semantic",
+        "category": "z-index",
         "type": "z-index",
         "item": "header",
         "names": {
@@ -20761,6 +20766,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.z-index.header",
           "docs": "semantic.z-index.header",
           "es6": "calciteZIndexHeader"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "z-index"
         }
       },
       "filePath": "src/tokens/semantic/z-index.json",
@@ -20773,12 +20783,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "500",
       "type": "z-index",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "z-index"
-        },
-        "category": "semantic",
+        "category": "z-index",
         "type": "z-index",
         "item": "toast",
         "names": {
@@ -20787,6 +20792,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.z-index.toast",
           "docs": "semantic.z-index.toast",
           "es6": "calciteZIndexToast"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "z-index"
         }
       },
       "filePath": "src/tokens/semantic/z-index.json",
@@ -20799,12 +20809,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "600",
       "type": "z-index",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "z-index"
-        },
-        "category": "semantic",
+        "category": "z-index",
         "type": "z-index",
         "item": "dropdown",
         "names": {
@@ -20813,6 +20818,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.z-index.dropdown",
           "docs": "semantic.z-index.dropdown",
           "es6": "calciteZIndexDropdown"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "z-index"
         }
       },
       "filePath": "src/tokens/semantic/z-index.json",
@@ -20825,12 +20835,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "700",
       "type": "z-index",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "z-index"
-        },
-        "category": "semantic",
+        "category": "z-index",
         "type": "z-index",
         "item": "overlay",
         "names": {
@@ -20839,6 +20844,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.z-index.overlay",
           "docs": "semantic.z-index.overlay",
           "es6": "calciteZIndexOverlay"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "z-index"
         }
       },
       "filePath": "src/tokens/semantic/z-index.json",
@@ -20851,12 +20861,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "800",
       "type": "z-index",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "z-index"
-        },
-        "category": "semantic",
+        "category": "z-index",
         "type": "z-index",
         "item": "modal",
         "names": {
@@ -20865,6 +20870,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.z-index.modal",
           "docs": "semantic.z-index.modal",
           "es6": "calciteZIndexModal"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "z-index"
         }
       },
       "filePath": "src/tokens/semantic/z-index.json",
@@ -20877,12 +20887,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "900",
       "type": "z-index",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "z-index"
-        },
-        "category": "semantic",
+        "category": "z-index",
         "type": "z-index",
         "item": "popup",
         "names": {
@@ -20891,7 +20896,12 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.z-index.popup",
           "docs": "semantic.z-index.popup",
           "es6": "calciteZIndexPopup"
-        }
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "z-index"
+        }
       },
       "filePath": "src/tokens/semantic/z-index.json",
       "isSource": true,
@@ -20903,12 +20913,7 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
       "value": "901",
       "type": "z-index",
       "attributes": {
-        "calcite-schema": {
-          "system": "calcite",
-          "tier": "semantic",
-          "type": "z-index"
-        },
-        "category": "semantic",
+        "category": "z-index",
         "type": "z-index",
         "item": "tooltip",
         "names": {
@@ -20917,6 +20922,11 @@ exports[`generated tokens > DOCS > semantic should match 1`] = `
           "js": "semantic.z-index.tooltip",
           "docs": "semantic.z-index.tooltip",
           "es6": "calciteZIndexTooltip"
+        },
+        "calcite-schema": {
+          "system": "calcite",
+          "tier": "semantic",
+          "type": "z-index"
         }
       },
       "filePath": "src/tokens/semantic/z-index.json",
@@ -23037,12 +23047,7 @@ export default {
           value: "#ffffff",
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "color",
-            },
-            category: "core",
+            category: "color",
             type: "color",
             item: "neutral",
             subitem: "blk-000",
@@ -23053,6 +23058,11 @@ export default {
               docs: "core.color.neutral.blk-000",
               es6: "calciteColorNeutralBlk000",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "color",
+            },
           },
           filePath: "src/tokens/core/color.json",
           isSource: false,
@@ -23060,24 +23070,7 @@ export default {
             value: "#ffffff",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "neutral",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "blk",
-                state: "",
-                scale: "000",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Neutral Blk 000",
@@ -23088,12 +23081,7 @@ export default {
           value: "#f8f8f8",
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "color",
-            },
-            category: "core",
+            category: "color",
             type: "color",
             item: "neutral",
             subitem: "blk-005",
@@ -23104,6 +23092,11 @@ export default {
               docs: "core.color.neutral.blk-005",
               es6: "calciteColorNeutralBlk005",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "color",
+            },
           },
           filePath: "src/tokens/core/color.json",
           isSource: false,
@@ -23111,24 +23104,7 @@ export default {
             value: "#f8f8f8",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "neutral",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "blk",
-                state: "",
-                scale: "005",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Neutral Blk 005",
@@ -23139,12 +23115,7 @@ export default {
           value: "#f3f3f3",
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "color",
-            },
-            category: "core",
+            category: "color",
             type: "color",
             item: "neutral",
             subitem: "blk-010",
@@ -23155,6 +23126,11 @@ export default {
               docs: "core.color.neutral.blk-010",
               es6: "calciteColorNeutralBlk010",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "color",
+            },
           },
           filePath: "src/tokens/core/color.json",
           isSource: false,
@@ -23162,24 +23138,7 @@ export default {
             value: "#f3f3f3",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "neutral",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "blk",
-                state: "",
-                scale: "010",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Neutral Blk 010",
@@ -23190,12 +23149,7 @@ export default {
           value: "#eaeaea",
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "color",
-            },
-            category: "core",
+            category: "color",
             type: "color",
             item: "neutral",
             subitem: "blk-020",
@@ -23206,6 +23160,11 @@ export default {
               docs: "core.color.neutral.blk-020",
               es6: "calciteColorNeutralBlk020",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "color",
+            },
           },
           filePath: "src/tokens/core/color.json",
           isSource: false,
@@ -23213,24 +23172,7 @@ export default {
             value: "#eaeaea",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "neutral",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "blk",
-                state: "",
-                scale: "020",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Neutral Blk 020",
@@ -23241,12 +23183,7 @@ export default {
           value: "#dfdfdf",
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "color",
-            },
-            category: "core",
+            category: "color",
             type: "color",
             item: "neutral",
             subitem: "blk-030",
@@ -23257,6 +23194,11 @@ export default {
               docs: "core.color.neutral.blk-030",
               es6: "calciteColorNeutralBlk030",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "color",
+            },
           },
           filePath: "src/tokens/core/color.json",
           isSource: false,
@@ -23264,24 +23206,7 @@ export default {
             value: "#dfdfdf",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "neutral",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "blk",
-                state: "",
-                scale: "030",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Neutral Blk 030",
@@ -23292,12 +23217,7 @@ export default {
           value: "#d4d4d4",
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "color",
-            },
-            category: "core",
+            category: "color",
             type: "color",
             item: "neutral",
             subitem: "blk-040",
@@ -23308,6 +23228,11 @@ export default {
               docs: "core.color.neutral.blk-040",
               es6: "calciteColorNeutralBlk040",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "color",
+            },
           },
           filePath: "src/tokens/core/color.json",
           isSource: false,
@@ -23315,24 +23240,7 @@ export default {
             value: "#d4d4d4",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "neutral",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "blk",
-                state: "",
-                scale: "040",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Neutral Blk 040",
@@ -23343,12 +23251,7 @@ export default {
           value: "#cacaca",
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "color",
-            },
-            category: "core",
+            category: "color",
             type: "color",
             item: "neutral",
             subitem: "blk-050",
@@ -23359,6 +23262,11 @@ export default {
               docs: "core.color.neutral.blk-050",
               es6: "calciteColorNeutralBlk050",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "color",
+            },
           },
           filePath: "src/tokens/core/color.json",
           isSource: false,
@@ -23366,24 +23274,7 @@ export default {
             value: "#cacaca",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "neutral",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "blk",
-                state: "",
-                scale: "050",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Neutral Blk 050",
@@ -23394,12 +23285,7 @@ export default {
           value: "#bfbfbf",
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "color",
-            },
-            category: "core",
+            category: "color",
             type: "color",
             item: "neutral",
             subitem: "blk-060",
@@ -23410,6 +23296,11 @@ export default {
               docs: "core.color.neutral.blk-060",
               es6: "calciteColorNeutralBlk060",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "color",
+            },
           },
           filePath: "src/tokens/core/color.json",
           isSource: false,
@@ -23417,24 +23308,7 @@ export default {
             value: "#bfbfbf",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "neutral",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "blk",
-                state: "",
-                scale: "060",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Neutral Blk 060",
@@ -23445,12 +23319,7 @@ export default {
           value: "#b5b5b5",
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "color",
-            },
-            category: "core",
+            category: "color",
             type: "color",
             item: "neutral",
             subitem: "blk-070",
@@ -23461,6 +23330,11 @@ export default {
               docs: "core.color.neutral.blk-070",
               es6: "calciteColorNeutralBlk070",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "color",
+            },
           },
           filePath: "src/tokens/core/color.json",
           isSource: false,
@@ -23468,24 +23342,7 @@ export default {
             value: "#b5b5b5",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "neutral",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "blk",
-                state: "",
-                scale: "070",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Neutral Blk 070",
@@ -23496,12 +23353,7 @@ export default {
           value: "#aaaaaa",
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "color",
-            },
-            category: "core",
+            category: "color",
             type: "color",
             item: "neutral",
             subitem: "blk-080",
@@ -23512,6 +23364,11 @@ export default {
               docs: "core.color.neutral.blk-080",
               es6: "calciteColorNeutralBlk080",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "color",
+            },
           },
           filePath: "src/tokens/core/color.json",
           isSource: false,
@@ -23519,24 +23376,7 @@ export default {
             value: "#aaaaaa",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "neutral",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "blk",
-                state: "",
-                scale: "080",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Neutral Blk 080",
@@ -23547,12 +23387,7 @@ export default {
           value: "#9f9f9f",
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "color",
-            },
-            category: "core",
+            category: "color",
             type: "color",
             item: "neutral",
             subitem: "blk-090",
@@ -23563,6 +23398,11 @@ export default {
               docs: "core.color.neutral.blk-090",
               es6: "calciteColorNeutralBlk090",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "color",
+            },
           },
           filePath: "src/tokens/core/color.json",
           isSource: false,
@@ -23570,24 +23410,7 @@ export default {
             value: "#9f9f9f",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "neutral",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "blk",
-                state: "",
-                scale: "090",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Neutral Blk 090",
@@ -23598,12 +23421,7 @@ export default {
           value: "#949494",
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "color",
-            },
-            category: "core",
+            category: "color",
             type: "color",
             item: "neutral",
             subitem: "blk-100",
@@ -23614,6 +23432,11 @@ export default {
               docs: "core.color.neutral.blk-100",
               es6: "calciteColorNeutralBlk100",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "color",
+            },
           },
           filePath: "src/tokens/core/color.json",
           isSource: false,
@@ -23621,24 +23444,7 @@ export default {
             value: "#949494",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "neutral",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "blk",
-                state: "",
-                scale: "100",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Neutral Blk 100",
@@ -23649,12 +23455,7 @@ export default {
           value: "#8a8a8a",
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "color",
-            },
-            category: "core",
+            category: "color",
             type: "color",
             item: "neutral",
             subitem: "blk-110",
@@ -23665,6 +23466,11 @@ export default {
               docs: "core.color.neutral.blk-110",
               es6: "calciteColorNeutralBlk110",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "color",
+            },
           },
           filePath: "src/tokens/core/color.json",
           isSource: false,
@@ -23672,24 +23478,7 @@ export default {
             value: "#8a8a8a",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "neutral",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "blk",
-                state: "",
-                scale: "110",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Neutral Blk 110",
@@ -23700,12 +23489,7 @@ export default {
           value: "#808080",
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "color",
-            },
-            category: "core",
+            category: "color",
             type: "color",
             item: "neutral",
             subitem: "blk-120",
@@ -23716,6 +23500,11 @@ export default {
               docs: "core.color.neutral.blk-120",
               es6: "calciteColorNeutralBlk120",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "color",
+            },
           },
           filePath: "src/tokens/core/color.json",
           isSource: false,
@@ -23723,24 +23512,7 @@ export default {
             value: "#808080",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "neutral",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "blk",
-                state: "",
-                scale: "120",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Neutral Blk 120",
@@ -23751,12 +23523,7 @@ export default {
           value: "#757575",
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "color",
-            },
-            category: "core",
+            category: "color",
             type: "color",
             item: "neutral",
             subitem: "blk-130",
@@ -23767,6 +23534,11 @@ export default {
               docs: "core.color.neutral.blk-130",
               es6: "calciteColorNeutralBlk130",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "color",
+            },
           },
           filePath: "src/tokens/core/color.json",
           isSource: false,
@@ -23774,24 +23546,7 @@ export default {
             value: "#757575",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "neutral",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "blk",
-                state: "",
-                scale: "130",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Neutral Blk 130",
@@ -23802,12 +23557,7 @@ export default {
           value: "#6a6a6a",
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "color",
-            },
-            category: "core",
+            category: "color",
             type: "color",
             item: "neutral",
             subitem: "blk-140",
@@ -23818,6 +23568,11 @@ export default {
               docs: "core.color.neutral.blk-140",
               es6: "calciteColorNeutralBlk140",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "color",
+            },
           },
           filePath: "src/tokens/core/color.json",
           isSource: false,
@@ -23825,24 +23580,7 @@ export default {
             value: "#6a6a6a",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "neutral",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "blk",
-                state: "",
-                scale: "140",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Neutral Blk 140",
@@ -23853,12 +23591,7 @@ export default {
           value: "#606060",
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "color",
-            },
-            category: "core",
+            category: "color",
             type: "color",
             item: "neutral",
             subitem: "blk-150",
@@ -23869,6 +23602,11 @@ export default {
               docs: "core.color.neutral.blk-150",
               es6: "calciteColorNeutralBlk150",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "color",
+            },
           },
           filePath: "src/tokens/core/color.json",
           isSource: false,
@@ -23876,24 +23614,7 @@ export default {
             value: "#606060",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "neutral",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "blk",
-                state: "",
-                scale: "150",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Neutral Blk 150",
@@ -23904,12 +23625,7 @@ export default {
           value: "#555555",
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "color",
-            },
-            category: "core",
+            category: "color",
             type: "color",
             item: "neutral",
             subitem: "blk-160",
@@ -23920,6 +23636,11 @@ export default {
               docs: "core.color.neutral.blk-160",
               es6: "calciteColorNeutralBlk160",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "color",
+            },
           },
           filePath: "src/tokens/core/color.json",
           isSource: false,
@@ -23927,24 +23648,7 @@ export default {
             value: "#555555",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "neutral",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "blk",
-                state: "",
-                scale: "160",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Neutral Blk 160",
@@ -23955,12 +23659,7 @@ export default {
           value: "#4a4a4a",
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "color",
-            },
-            category: "core",
+            category: "color",
             type: "color",
             item: "neutral",
             subitem: "blk-170",
@@ -23971,6 +23670,11 @@ export default {
               docs: "core.color.neutral.blk-170",
               es6: "calciteColorNeutralBlk170",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "color",
+            },
           },
           filePath: "src/tokens/core/color.json",
           isSource: false,
@@ -23978,24 +23682,7 @@ export default {
             value: "#4a4a4a",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "neutral",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "blk",
-                state: "",
-                scale: "170",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Neutral Blk 170",
@@ -24006,12 +23693,7 @@ export default {
           value: "#404040",
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "color",
-            },
-            category: "core",
+            category: "color",
             type: "color",
             item: "neutral",
             subitem: "blk-180",
@@ -24022,6 +23704,11 @@ export default {
               docs: "core.color.neutral.blk-180",
               es6: "calciteColorNeutralBlk180",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "color",
+            },
           },
           filePath: "src/tokens/core/color.json",
           isSource: false,
@@ -24029,24 +23716,7 @@ export default {
             value: "#404040",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "neutral",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "blk",
-                state: "",
-                scale: "180",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Neutral Blk 180",
@@ -24057,12 +23727,7 @@ export default {
           value: "#353535",
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "color",
-            },
-            category: "core",
+            category: "color",
             type: "color",
             item: "neutral",
             subitem: "blk-190",
@@ -24073,6 +23738,11 @@ export default {
               docs: "core.color.neutral.blk-190",
               es6: "calciteColorNeutralBlk190",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "color",
+            },
           },
           filePath: "src/tokens/core/color.json",
           isSource: false,
@@ -24080,24 +23750,7 @@ export default {
             value: "#353535",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "neutral",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "blk",
-                state: "",
-                scale: "190",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Neutral Blk 190",
@@ -24108,12 +23761,7 @@ export default {
           value: "#2b2b2b",
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "color",
-            },
-            category: "core",
+            category: "color",
             type: "color",
             item: "neutral",
             subitem: "blk-200",
@@ -24124,6 +23772,11 @@ export default {
               docs: "core.color.neutral.blk-200",
               es6: "calciteColorNeutralBlk200",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "color",
+            },
           },
           filePath: "src/tokens/core/color.json",
           isSource: false,
@@ -24131,24 +23784,7 @@ export default {
             value: "#2b2b2b",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "neutral",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "blk",
-                state: "",
-                scale: "200",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Neutral Blk 200",
@@ -24159,12 +23795,7 @@ export default {
           value: "#202020",
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "color",
-            },
-            category: "core",
+            category: "color",
             type: "color",
             item: "neutral",
             subitem: "blk-210",
@@ -24175,6 +23806,11 @@ export default {
               docs: "core.color.neutral.blk-210",
               es6: "calciteColorNeutralBlk210",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "color",
+            },
           },
           filePath: "src/tokens/core/color.json",
           isSource: false,
@@ -24182,24 +23818,7 @@ export default {
             value: "#202020",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "neutral",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "blk",
-                state: "",
-                scale: "210",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Neutral Blk 210",
@@ -24210,12 +23829,7 @@ export default {
           value: "#151515",
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "color",
-            },
-            category: "core",
+            category: "color",
             type: "color",
             item: "neutral",
             subitem: "blk-220",
@@ -24226,6 +23840,11 @@ export default {
               docs: "core.color.neutral.blk-220",
               es6: "calciteColorNeutralBlk220",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "color",
+            },
           },
           filePath: "src/tokens/core/color.json",
           isSource: false,
@@ -24233,24 +23852,7 @@ export default {
             value: "#151515",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "neutral",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "blk",
-                state: "",
-                scale: "220",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Neutral Blk 220",
@@ -24261,12 +23863,7 @@ export default {
           value: "#0b0b0b",
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "color",
-            },
-            category: "core",
+            category: "color",
             type: "color",
             item: "neutral",
             subitem: "blk-230",
@@ -24277,6 +23874,11 @@ export default {
               docs: "core.color.neutral.blk-230",
               es6: "calciteColorNeutralBlk230",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "color",
+            },
           },
           filePath: "src/tokens/core/color.json",
           isSource: false,
@@ -24284,24 +23886,7 @@ export default {
             value: "#0b0b0b",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "neutral",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "blk",
-                state: "",
-                scale: "230",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Neutral Blk 230",
@@ -24312,12 +23897,7 @@ export default {
           value: "#060606",
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "color",
-            },
-            category: "core",
+            category: "color",
             type: "color",
             item: "neutral",
             subitem: "blk-235",
@@ -24328,6 +23908,11 @@ export default {
               docs: "core.color.neutral.blk-235",
               es6: "calciteColorNeutralBlk235",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "color",
+            },
           },
           filePath: "src/tokens/core/color.json",
           isSource: false,
@@ -24335,24 +23920,7 @@ export default {
             value: "#060606",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "neutral",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "blk",
-                state: "",
-                scale: "235",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Neutral Blk 235",
@@ -24363,12 +23931,7 @@ export default {
           value: "#000000",
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "color",
-            },
-            category: "core",
+            category: "color",
             type: "color",
             item: "neutral",
             subitem: "blk-240",
@@ -24379,6 +23942,11 @@ export default {
               docs: "core.color.neutral.blk-240",
               es6: "calciteColorNeutralBlk240",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "color",
+            },
           },
           filePath: "src/tokens/core/color.json",
           isSource: false,
@@ -24386,24 +23954,7 @@ export default {
             value: "#000000",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "neutral",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "blk",
-                state: "",
-                scale: "240",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Neutral Blk 240",
@@ -24417,12 +23968,7 @@ export default {
             value: "#c7eaff",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "blue",
@@ -24434,6 +23980,11 @@ export default {
                 docs: "core.color.high-saturation.blue.h-bb-010",
                 es6: "calciteColorHighSaturationBlueHBb010",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -24441,24 +23992,7 @@ export default {
               value: "#c7eaff",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "blue",
-                  state: "",
-                  scale: "010",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Blue H Bb 010",
@@ -24469,12 +24003,7 @@ export default {
             value: "#9fd4f3",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "blue",
@@ -24486,6 +24015,11 @@ export default {
                 docs: "core.color.high-saturation.blue.h-bb-020",
                 es6: "calciteColorHighSaturationBlueHBb020",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -24493,24 +24027,7 @@ export default {
               value: "#9fd4f3",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "blue",
-                  state: "",
-                  scale: "020",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Blue H Bb 020",
@@ -24521,12 +24038,7 @@ export default {
             value: "#77bde7",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "blue",
@@ -24538,6 +24050,11 @@ export default {
                 docs: "core.color.high-saturation.blue.h-bb-030",
                 es6: "calciteColorHighSaturationBlueHBb030",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -24545,24 +24062,7 @@ export default {
               value: "#77bde7",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "blue",
-                  state: "",
-                  scale: "030",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Blue H Bb 030",
@@ -24573,12 +24073,7 @@ export default {
             value: "#50a7da",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "blue",
@@ -24590,6 +24085,11 @@ export default {
                 docs: "core.color.high-saturation.blue.h-bb-040",
                 es6: "calciteColorHighSaturationBlueHBb040",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -24597,24 +24097,7 @@ export default {
               value: "#50a7da",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "blue",
-                  state: "",
-                  scale: "040",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Blue H Bb 040",
@@ -24625,12 +24108,7 @@ export default {
             value: "#2890ce",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "blue",
@@ -24642,6 +24120,11 @@ export default {
                 docs: "core.color.high-saturation.blue.h-bb-050",
                 es6: "calciteColorHighSaturationBlueHBb050",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -24649,24 +24132,7 @@ export default {
               value: "#2890ce",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "blue",
-                  state: "",
-                  scale: "050",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Blue H Bb 050",
@@ -24677,12 +24143,7 @@ export default {
             value: "#007ac2",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "blue",
@@ -24694,31 +24155,19 @@ export default {
                 docs: "core.color.high-saturation.blue.h-bb-060",
                 es6: "calciteColorHighSaturationBlueHBb060",
               },
-            },
-            filePath: "src/tokens/core/color.json",
-            isSource: false,
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
+            },
+            filePath: "src/tokens/core/color.json",
+            isSource: false,
             original: {
               value: "#007ac2",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "blue",
-                  state: "",
-                  scale: "060",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Blue H Bb 060",
@@ -24729,12 +24178,7 @@ export default {
             value: "#00619b",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "blue",
@@ -24746,6 +24190,11 @@ export default {
                 docs: "core.color.high-saturation.blue.h-bb-070",
                 es6: "calciteColorHighSaturationBlueHBb070",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -24753,24 +24202,7 @@ export default {
               value: "#00619b",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "blue",
-                  state: "",
-                  scale: "070",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Blue H Bb 070",
@@ -24781,12 +24213,7 @@ export default {
             value: "#004874",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "blue",
@@ -24798,6 +24225,11 @@ export default {
                 docs: "core.color.high-saturation.blue.h-bb-080",
                 es6: "calciteColorHighSaturationBlueHBb080",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -24805,24 +24237,7 @@ export default {
               value: "#004874",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "blue",
-                  state: "",
-                  scale: "080",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Blue H Bb 080",
@@ -24833,12 +24248,7 @@ export default {
             value: "#00304d",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "blue",
@@ -24850,6 +24260,11 @@ export default {
                 docs: "core.color.high-saturation.blue.h-bb-090",
                 es6: "calciteColorHighSaturationBlueHBb090",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -24857,24 +24272,7 @@ export default {
               value: "#00304d",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "blue",
-                  state: "",
-                  scale: "090",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Blue H Bb 090",
@@ -24885,12 +24283,7 @@ export default {
             value: "#001726",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "blue",
@@ -24902,6 +24295,11 @@ export default {
                 docs: "core.color.high-saturation.blue.h-bb-100",
                 es6: "calciteColorHighSaturationBlueHBb100",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -24909,24 +24307,7 @@ export default {
               value: "#001726",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "blue",
-                  state: "",
-                  scale: "100",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Blue H Bb 100",
@@ -24939,12 +24320,7 @@ export default {
             value: "#cef5f4",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "green-blue",
@@ -24956,6 +24332,11 @@ export default {
                 docs: "core.color.high-saturation.green-blue.h-gb-010",
                 es6: "calciteColorHighSaturationGreenBlueHGb010",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -24963,24 +24344,7 @@ export default {
               value: "#cef5f4",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "green-blue",
-                  state: "",
-                  scale: "010",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Green Blue H Gb 010",
@@ -24997,12 +24361,7 @@ export default {
             value: "#afedec",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "green-blue",
@@ -25014,6 +24373,11 @@ export default {
                 docs: "core.color.high-saturation.green-blue.h-gb-020",
                 es6: "calciteColorHighSaturationGreenBlueHGb020",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -25021,24 +24385,7 @@ export default {
               value: "#afedec",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "green-blue",
-                  state: "",
-                  scale: "020",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Green Blue H Gb 020",
@@ -25055,12 +24402,7 @@ export default {
             value: "#8fe6e5",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "green-blue",
@@ -25072,6 +24414,11 @@ export default {
                 docs: "core.color.high-saturation.green-blue.h-gb-030",
                 es6: "calciteColorHighSaturationGreenBlueHGb030",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -25079,24 +24426,7 @@ export default {
               value: "#8fe6e5",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "green-blue",
-                  state: "",
-                  scale: "030",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Green Blue H Gb 030",
@@ -25113,12 +24443,7 @@ export default {
             value: "#5ae0de",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "green-blue",
@@ -25130,6 +24455,11 @@ export default {
                 docs: "core.color.high-saturation.green-blue.h-gb-040",
                 es6: "calciteColorHighSaturationGreenBlueHGb040",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -25137,24 +24467,7 @@ export default {
               value: "#5ae0de",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "green-blue",
-                  state: "",
-                  scale: "040",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Green Blue H Gb 040",
@@ -25171,12 +24484,7 @@ export default {
             value: "#28cecb",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "green-blue",
@@ -25188,6 +24496,11 @@ export default {
                 docs: "core.color.high-saturation.green-blue.h-gb-050",
                 es6: "calciteColorHighSaturationGreenBlueHGb050",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -25195,24 +24508,7 @@ export default {
               value: "#28cecb",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "green-blue",
-                  state: "",
-                  scale: "050",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Green Blue H Gb 050",
@@ -25229,12 +24525,7 @@ export default {
             value: "#00bab5",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "green-blue",
@@ -25246,6 +24537,11 @@ export default {
                 docs: "core.color.high-saturation.green-blue.h-gb-060",
                 es6: "calciteColorHighSaturationGreenBlueHGb060",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -25253,24 +24549,7 @@ export default {
               value: "#00bab5",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "green-blue",
-                  state: "",
-                  scale: "060",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Green Blue H Gb 060",
@@ -25287,12 +24566,7 @@ export default {
             value: "#009b98",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "green-blue",
@@ -25304,6 +24578,11 @@ export default {
                 docs: "core.color.high-saturation.green-blue.h-gb-070",
                 es6: "calciteColorHighSaturationGreenBlueHGb070",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -25311,24 +24590,7 @@ export default {
               value: "#009b98",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "green-blue",
-                  state: "",
-                  scale: "070",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Green Blue H Gb 070",
@@ -25345,12 +24607,7 @@ export default {
             value: "#007472",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "green-blue",
@@ -25362,6 +24619,11 @@ export default {
                 docs: "core.color.high-saturation.green-blue.h-gb-080",
                 es6: "calciteColorHighSaturationGreenBlueHGb080",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -25369,24 +24631,7 @@ export default {
               value: "#007472",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "green-blue",
-                  state: "",
-                  scale: "080",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Green Blue H Gb 080",
@@ -25403,12 +24648,7 @@ export default {
             value: "#004d4c",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "green-blue",
@@ -25420,6 +24660,11 @@ export default {
                 docs: "core.color.high-saturation.green-blue.h-gb-090",
                 es6: "calciteColorHighSaturationGreenBlueHGb090",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -25427,24 +24672,7 @@ export default {
               value: "#004d4c",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "green-blue",
-                  state: "",
-                  scale: "090",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Green Blue H Gb 090",
@@ -25461,12 +24689,7 @@ export default {
             value: "#002625",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "green-blue",
@@ -25478,6 +24701,11 @@ export default {
                 docs: "core.color.high-saturation.green-blue.h-gb-100",
                 es6: "calciteColorHighSaturationGreenBlueHGb100",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -25485,24 +24713,7 @@ export default {
               value: "#002625",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "green-blue",
-                  state: "",
-                  scale: "100",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Green Blue H Gb 100",
@@ -25521,12 +24732,7 @@ export default {
             value: "#bdf2c4",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "green",
@@ -25538,6 +24744,11 @@ export default {
                 docs: "core.color.high-saturation.green.h-gg-010",
                 es6: "calciteColorHighSaturationGreenHGg010",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -25545,24 +24756,7 @@ export default {
               value: "#bdf2c4",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "green",
-                  state: "",
-                  scale: "010",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Green H Gg 010",
@@ -25573,12 +24767,7 @@ export default {
             value: "#a2e4ab",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "green",
@@ -25590,6 +24779,11 @@ export default {
                 docs: "core.color.high-saturation.green.h-gg-020",
                 es6: "calciteColorHighSaturationGreenHGg020",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -25597,24 +24791,7 @@ export default {
               value: "#a2e4ab",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "green",
-                  state: "",
-                  scale: "020",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Green H Gg 020",
@@ -25625,12 +24802,7 @@ export default {
             value: "#87d692",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "green",
@@ -25642,6 +24814,11 @@ export default {
                 docs: "core.color.high-saturation.green.h-gg-030",
                 es6: "calciteColorHighSaturationGreenHGg030",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -25649,24 +24826,7 @@ export default {
               value: "#87d692",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "green",
-                  state: "",
-                  scale: "030",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Green H Gg 030",
@@ -25677,12 +24837,7 @@ export default {
             value: "#6bc878",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "green",
@@ -25694,6 +24849,11 @@ export default {
                 docs: "core.color.high-saturation.green.h-gg-040",
                 es6: "calciteColorHighSaturationGreenHGg040",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -25701,24 +24861,7 @@ export default {
               value: "#6bc878",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "green",
-                  state: "",
-                  scale: "040",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Green H Gg 040",
@@ -25729,12 +24872,7 @@ export default {
             value: "#50ba5f",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "green",
@@ -25746,6 +24884,11 @@ export default {
                 docs: "core.color.high-saturation.green.h-gg-050",
                 es6: "calciteColorHighSaturationGreenHGg050",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -25753,24 +24896,7 @@ export default {
               value: "#50ba5f",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "green",
-                  state: "",
-                  scale: "050",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Green H Gg 050",
@@ -25781,12 +24907,7 @@ export default {
             value: "#35ac46",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "green",
@@ -25798,6 +24919,11 @@ export default {
                 docs: "core.color.high-saturation.green.h-gg-060",
                 es6: "calciteColorHighSaturationGreenHGg060",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -25805,24 +24931,7 @@ export default {
               value: "#35ac46",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "green",
-                  state: "",
-                  scale: "060",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Green H Gg 060",
@@ -25833,12 +24942,7 @@ export default {
             value: "#288835",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "green",
@@ -25850,6 +24954,11 @@ export default {
                 docs: "core.color.high-saturation.green.h-gg-070",
                 es6: "calciteColorHighSaturationGreenHGg070",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -25857,24 +24966,7 @@ export default {
               value: "#288835",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "green",
-                  state: "",
-                  scale: "070",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Green H Gg 070",
@@ -25885,12 +24977,7 @@ export default {
             value: "#1a6324",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "green",
@@ -25902,6 +24989,11 @@ export default {
                 docs: "core.color.high-saturation.green.h-gg-080",
                 es6: "calciteColorHighSaturationGreenHGg080",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -25909,24 +25001,7 @@ export default {
               value: "#1a6324",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "green",
-                  state: "",
-                  scale: "080",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Green H Gg 080",
@@ -25937,12 +25012,7 @@ export default {
             value: "#0d3f14",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "green",
@@ -25954,6 +25024,11 @@ export default {
                 docs: "core.color.high-saturation.green.h-gg-090",
                 es6: "calciteColorHighSaturationGreenHGg090",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -25961,24 +25036,7 @@ export default {
               value: "#0d3f14",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "green",
-                  state: "",
-                  scale: "090",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Green H Gg 090",
@@ -25989,12 +25047,7 @@ export default {
             value: "#001a03",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "green",
@@ -26006,6 +25059,11 @@ export default {
                 docs: "core.color.high-saturation.green.h-gg-100",
                 es6: "calciteColorHighSaturationGreenHGg100",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -26013,24 +25071,7 @@ export default {
               value: "#001a03",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "green",
-                  state: "",
-                  scale: "100",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Green H Gg 100",
@@ -26043,12 +25084,7 @@ export default {
             value: "#e5f7b4",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "yellow-green",
@@ -26060,6 +25096,11 @@ export default {
                 docs: "core.color.high-saturation.yellow-green.h-yg-010",
                 es6: "calciteColorHighSaturationYellowGreenHYg010",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -26067,24 +25108,7 @@ export default {
               value: "#e5f7b4",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "yellow-green",
-                  state: "",
-                  scale: "010",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Yellow Green H Yg 010",
@@ -26101,12 +25125,7 @@ export default {
             value: "#d9ef9f",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "yellow-green",
@@ -26118,6 +25137,11 @@ export default {
                 docs: "core.color.high-saturation.yellow-green.h-yg-020",
                 es6: "calciteColorHighSaturationYellowGreenHYg020",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -26125,24 +25149,7 @@ export default {
               value: "#d9ef9f",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "yellow-green",
-                  state: "",
-                  scale: "020",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Yellow Green H Yg 020",
@@ -26159,12 +25166,7 @@ export default {
             value: "#cde78a",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "yellow-green",
@@ -26176,6 +25178,11 @@ export default {
                 docs: "core.color.high-saturation.yellow-green.h-yg-030",
                 es6: "calciteColorHighSaturationYellowGreenHYg030",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -26183,24 +25190,7 @@ export default {
               value: "#cde78a",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "yellow-green",
-                  state: "",
-                  scale: "030",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Yellow Green H Yg 030",
@@ -26217,12 +25207,7 @@ export default {
             value: "#c2e075",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "yellow-green",
@@ -26234,6 +25219,11 @@ export default {
                 docs: "core.color.high-saturation.yellow-green.h-yg-040",
                 es6: "calciteColorHighSaturationYellowGreenHYg040",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -26241,24 +25231,7 @@ export default {
               value: "#c2e075",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "yellow-green",
-                  state: "",
-                  scale: "040",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Yellow Green H Yg 040",
@@ -26275,12 +25248,7 @@ export default {
             value: "#b6d860",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "yellow-green",
@@ -26292,6 +25260,11 @@ export default {
                 docs: "core.color.high-saturation.yellow-green.h-yg-050",
                 es6: "calciteColorHighSaturationYellowGreenHYg050",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -26299,24 +25272,7 @@ export default {
               value: "#b6d860",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "yellow-green",
-                  state: "",
-                  scale: "050",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Yellow Green H Yg 050",
@@ -26333,12 +25289,7 @@ export default {
             value: "#aad04b",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "yellow-green",
@@ -26350,6 +25301,11 @@ export default {
                 docs: "core.color.high-saturation.yellow-green.h-yg-060",
                 es6: "calciteColorHighSaturationYellowGreenHYg060",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -26357,24 +25313,7 @@ export default {
               value: "#aad04b",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "yellow-green",
-                  state: "",
-                  scale: "060",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Yellow Green H Yg 060",
@@ -26391,12 +25330,7 @@ export default {
             value: "#84a338",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "yellow-green",
@@ -26408,6 +25342,11 @@ export default {
                 docs: "core.color.high-saturation.yellow-green.h-yg-070",
                 es6: "calciteColorHighSaturationYellowGreenHYg070",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -26415,24 +25354,7 @@ export default {
               value: "#84a338",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "yellow-green",
-                  state: "",
-                  scale: "070",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Yellow Green H Yg 070",
@@ -26449,12 +25371,7 @@ export default {
             value: "#5e7526",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "yellow-green",
@@ -26466,6 +25383,11 @@ export default {
                 docs: "core.color.high-saturation.yellow-green.h-yg-080",
                 es6: "calciteColorHighSaturationYellowGreenHYg080",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -26473,24 +25395,7 @@ export default {
               value: "#5e7526",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "yellow-green",
-                  state: "",
-                  scale: "080",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Yellow Green H Yg 080",
@@ -26507,12 +25412,7 @@ export default {
             value: "#384813",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "yellow-green",
@@ -26524,6 +25424,11 @@ export default {
                 docs: "core.color.high-saturation.yellow-green.h-yg-090",
                 es6: "calciteColorHighSaturationYellowGreenHYg090",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -26531,24 +25436,7 @@ export default {
               value: "#384813",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "yellow-green",
-                  state: "",
-                  scale: "090",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Yellow Green H Yg 090",
@@ -26565,12 +25453,7 @@ export default {
             value: "#121a00",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "yellow-green",
@@ -26582,6 +25465,11 @@ export default {
                 docs: "core.color.high-saturation.yellow-green.h-yg-100",
                 es6: "calciteColorHighSaturationYellowGreenHYg100",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -26589,24 +25477,7 @@ export default {
               value: "#121a00",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "yellow-green",
-                  state: "",
-                  scale: "100",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Yellow Green H Yg 100",
@@ -26625,12 +25496,7 @@ export default {
             value: "#fff7cc",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "yellow",
@@ -26642,6 +25508,11 @@ export default {
                 docs: "core.color.high-saturation.yellow.h-yy-010",
                 es6: "calciteColorHighSaturationYellowHYy010",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -26649,24 +25520,7 @@ export default {
               value: "#fff7cc",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "yellow",
-                  state: "",
-                  scale: "010",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Yellow H Yy 010",
@@ -26677,12 +25531,7 @@ export default {
             value: "#fef3ad",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "yellow",
@@ -26694,6 +25543,11 @@ export default {
                 docs: "core.color.high-saturation.yellow.h-yy-020",
                 es6: "calciteColorHighSaturationYellowHYy020",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -26701,24 +25555,7 @@ export default {
               value: "#fef3ad",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "yellow",
-                  state: "",
-                  scale: "020",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Yellow H Yy 020",
@@ -26729,12 +25566,7 @@ export default {
             value: "#fcee8d",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "yellow",
@@ -26746,6 +25578,11 @@ export default {
                 docs: "core.color.high-saturation.yellow.h-yy-030",
                 es6: "calciteColorHighSaturationYellowHYy030",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -26753,24 +25590,7 @@ export default {
               value: "#fcee8d",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "yellow",
-                  state: "",
-                  scale: "030",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Yellow H Yy 030",
@@ -26781,12 +25601,7 @@ export default {
             value: "#fbea6e",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "yellow",
@@ -26798,6 +25613,11 @@ export default {
                 docs: "core.color.high-saturation.yellow.h-yy-040",
                 es6: "calciteColorHighSaturationYellowHYy040",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -26805,24 +25625,7 @@ export default {
               value: "#fbea6e",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "yellow",
-                  state: "",
-                  scale: "040",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Yellow H Yy 040",
@@ -26833,12 +25636,7 @@ export default {
             value: "#f9e54e",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "yellow",
@@ -26850,6 +25648,11 @@ export default {
                 docs: "core.color.high-saturation.yellow.h-yy-050",
                 es6: "calciteColorHighSaturationYellowHYy050",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -26857,24 +25660,7 @@ export default {
               value: "#f9e54e",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "yellow",
-                  state: "",
-                  scale: "050",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Yellow H Yy 050",
@@ -26885,12 +25671,7 @@ export default {
             value: "#edd317",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "yellow",
@@ -26902,6 +25683,11 @@ export default {
                 docs: "core.color.high-saturation.yellow.h-yy-060",
                 es6: "calciteColorHighSaturationYellowHYy060",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -26909,24 +25695,7 @@ export default {
               value: "#edd317",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "yellow",
-                  state: "",
-                  scale: "060",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Yellow H Yy 060",
@@ -26937,12 +25706,7 @@ export default {
             value: "#d9bc00",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "yellow",
@@ -26954,6 +25718,11 @@ export default {
                 docs: "core.color.high-saturation.yellow.h-yy-070",
                 es6: "calciteColorHighSaturationYellowHYy070",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -26961,24 +25730,7 @@ export default {
               value: "#d9bc00",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "yellow",
-                  state: "",
-                  scale: "070",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Yellow H Yy 070",
@@ -26989,12 +25741,7 @@ export default {
             value: "#bfa200",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "yellow",
@@ -27006,6 +25753,11 @@ export default {
                 docs: "core.color.high-saturation.yellow.h-yy-080",
                 es6: "calciteColorHighSaturationYellowHYy080",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -27013,24 +25765,7 @@ export default {
               value: "#bfa200",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "yellow",
-                  state: "",
-                  scale: "080",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Yellow H Yy 080",
@@ -27041,12 +25776,7 @@ export default {
             value: "#8c7500",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "yellow",
@@ -27058,6 +25788,11 @@ export default {
                 docs: "core.color.high-saturation.yellow.h-yy-090",
                 es6: "calciteColorHighSaturationYellowHYy090",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -27065,24 +25800,7 @@ export default {
               value: "#8c7500",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "yellow",
-                  state: "",
-                  scale: "090",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Yellow H Yy 090",
@@ -27093,12 +25811,7 @@ export default {
             value: "#5c4e00",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "yellow",
@@ -27110,6 +25823,11 @@ export default {
                 docs: "core.color.high-saturation.yellow.h-yy-100",
                 es6: "calciteColorHighSaturationYellowHYy100",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -27117,24 +25835,7 @@ export default {
               value: "#5c4e00",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "yellow",
-                  state: "",
-                  scale: "100",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Yellow H Yy 100",
@@ -27147,12 +25848,7 @@ export default {
             value: "#ffe2bf",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "orange-yellow",
@@ -27164,6 +25860,11 @@ export default {
                 docs: "core.color.high-saturation.orange-yellow.h-oy-010",
                 es6: "calciteColorHighSaturationOrangeYellowHOy010",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -27171,24 +25872,7 @@ export default {
               value: "#ffe2bf",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "orange-yellow",
-                  state: "",
-                  scale: "010",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Orange Yellow H Oy 010",
@@ -27205,12 +25889,7 @@ export default {
             value: "#fed3a1",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "orange-yellow",
@@ -27222,31 +25901,19 @@ export default {
                 docs: "core.color.high-saturation.orange-yellow.h-oy-020",
                 es6: "calciteColorHighSaturationOrangeYellowHOy020",
               },
-            },
-            filePath: "src/tokens/core/color.json",
-            isSource: false,
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
+            },
+            filePath: "src/tokens/core/color.json",
+            isSource: false,
             original: {
               value: "#fed3a1",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "orange-yellow",
-                  state: "",
-                  scale: "020",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Orange Yellow H Oy 020",
@@ -27263,12 +25930,7 @@ export default {
             value: "#fcc582",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "orange-yellow",
@@ -27280,6 +25942,11 @@ export default {
                 docs: "core.color.high-saturation.orange-yellow.h-oy-030",
                 es6: "calciteColorHighSaturationOrangeYellowHOy030",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -27287,24 +25954,7 @@ export default {
               value: "#fcc582",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "orange-yellow",
-                  state: "",
-                  scale: "030",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Orange Yellow H Oy 030",
@@ -27321,12 +25971,7 @@ export default {
             value: "#fbb664",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "orange-yellow",
@@ -27338,6 +25983,11 @@ export default {
                 docs: "core.color.high-saturation.orange-yellow.h-oy-040",
                 es6: "calciteColorHighSaturationOrangeYellowHOy040",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -27345,24 +25995,7 @@ export default {
               value: "#fbb664",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "orange-yellow",
-                  state: "",
-                  scale: "040",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Orange Yellow H Oy 040",
@@ -27379,12 +26012,7 @@ export default {
             value: "#f9a845",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "orange-yellow",
@@ -27396,6 +26024,11 @@ export default {
                 docs: "core.color.high-saturation.orange-yellow.h-oy-050",
                 es6: "calciteColorHighSaturationOrangeYellowHOy050",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -27403,24 +26036,7 @@ export default {
               value: "#f9a845",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "orange-yellow",
-                  state: "",
-                  scale: "050",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Orange Yellow H Oy 050",
@@ -27437,12 +26053,7 @@ export default {
             value: "#f89927",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "orange-yellow",
@@ -27454,6 +26065,11 @@ export default {
                 docs: "core.color.high-saturation.orange-yellow.h-oy-060",
                 es6: "calciteColorHighSaturationOrangeYellowHOy060",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -27461,24 +26077,7 @@ export default {
               value: "#f89927",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "orange-yellow",
-                  state: "",
-                  scale: "060",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Orange Yellow H Oy 060",
@@ -27495,12 +26094,7 @@ export default {
             value: "#c67718",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "orange-yellow",
@@ -27512,6 +26106,11 @@ export default {
                 docs: "core.color.high-saturation.orange-yellow.h-oy-070",
                 es6: "calciteColorHighSaturationOrangeYellowHOy070",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -27519,24 +26118,7 @@ export default {
               value: "#c67718",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "orange-yellow",
-                  state: "",
-                  scale: "070",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Orange Yellow H Oy 070",
@@ -27553,12 +26135,7 @@ export default {
             value: "#9a5b10",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "orange-yellow",
@@ -27570,6 +26147,11 @@ export default {
                 docs: "core.color.high-saturation.orange-yellow.h-oy-080",
                 es6: "calciteColorHighSaturationOrangeYellowHOy080",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -27577,24 +26159,7 @@ export default {
               value: "#9a5b10",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "orange-yellow",
-                  state: "",
-                  scale: "080",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Orange Yellow H Oy 080",
@@ -27611,12 +26176,7 @@ export default {
             value: "#6d3f08",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "orange-yellow",
@@ -27628,6 +26188,11 @@ export default {
                 docs: "core.color.high-saturation.orange-yellow.h-oy-090",
                 es6: "calciteColorHighSaturationOrangeYellowHOy090",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -27635,24 +26200,7 @@ export default {
               value: "#6d3f08",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "orange-yellow",
-                  state: "",
-                  scale: "090",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Orange Yellow H Oy 090",
@@ -27669,12 +26217,7 @@ export default {
             value: "#402300",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "orange-yellow",
@@ -27686,6 +26229,11 @@ export default {
                 docs: "core.color.high-saturation.orange-yellow.h-oy-100",
                 es6: "calciteColorHighSaturationOrangeYellowHOy100",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -27693,24 +26241,7 @@ export default {
               value: "#402300",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "orange-yellow",
-                  state: "",
-                  scale: "100",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Orange Yellow H Oy 100",
@@ -27729,12 +26260,7 @@ export default {
             value: "#ffd8bf",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "orange",
@@ -27746,6 +26272,11 @@ export default {
                 docs: "core.color.high-saturation.orange.h-oo-010",
                 es6: "calciteColorHighSaturationOrangeHOo010",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -27753,24 +26284,7 @@ export default {
               value: "#ffd8bf",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "orange",
-                  state: "",
-                  scale: "010",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Orange H Oo 010",
@@ -27781,12 +26295,7 @@ export default {
             value: "#fdc39f",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "orange",
@@ -27798,6 +26307,11 @@ export default {
                 docs: "core.color.high-saturation.orange.h-oo-020",
                 es6: "calciteColorHighSaturationOrangeHOo020",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -27805,24 +26319,7 @@ export default {
               value: "#fdc39f",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "orange",
-                  state: "",
-                  scale: "020",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Orange H Oo 020",
@@ -27833,12 +26330,7 @@ export default {
             value: "#faae7f",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "orange",
@@ -27850,6 +26342,11 @@ export default {
                 docs: "core.color.high-saturation.orange.h-oo-030",
                 es6: "calciteColorHighSaturationOrangeHOo030",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -27857,24 +26354,7 @@ export default {
               value: "#faae7f",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "orange",
-                  state: "",
-                  scale: "030",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Orange H Oo 030",
@@ -27885,12 +26365,7 @@ export default {
             value: "#f89960",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "orange",
@@ -27902,6 +26377,11 @@ export default {
                 docs: "core.color.high-saturation.orange.h-oo-040",
                 es6: "calciteColorHighSaturationOrangeHOo040",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -27909,24 +26389,7 @@ export default {
               value: "#f89960",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "orange",
-                  state: "",
-                  scale: "040",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Orange H Oo 040",
@@ -27937,12 +26400,7 @@ export default {
             value: "#f58440",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "orange",
@@ -27954,6 +26412,11 @@ export default {
                 docs: "core.color.high-saturation.orange.h-oo-050",
                 es6: "calciteColorHighSaturationOrangeHOo050",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -27961,24 +26424,7 @@ export default {
               value: "#f58440",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "orange",
-                  state: "",
-                  scale: "050",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Orange H Oo 050",
@@ -27989,12 +26435,7 @@ export default {
             value: "#f36f20",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "orange",
@@ -28006,6 +26447,11 @@ export default {
                 docs: "core.color.high-saturation.orange.h-oo-060",
                 es6: "calciteColorHighSaturationOrangeHOo060",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -28013,24 +26459,7 @@ export default {
               value: "#f36f20",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "orange",
-                  state: "",
-                  scale: "060",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Orange H Oo 060",
@@ -28041,12 +26470,7 @@ export default {
             value: "#c65a18",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "orange",
@@ -28058,6 +26482,11 @@ export default {
                 docs: "core.color.high-saturation.orange.h-oo-070",
                 es6: "calciteColorHighSaturationOrangeHOo070",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -28065,24 +26494,7 @@ export default {
               value: "#c65a18",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "orange",
-                  state: "",
-                  scale: "070",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Orange H Oo 070",
@@ -28093,12 +26505,7 @@ export default {
             value: "#9a4410",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "orange",
@@ -28110,6 +26517,11 @@ export default {
                 docs: "core.color.high-saturation.orange.h-oo-080",
                 es6: "calciteColorHighSaturationOrangeHOo080",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -28117,24 +26529,7 @@ export default {
               value: "#9a4410",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "orange",
-                  state: "",
-                  scale: "080",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Orange H Oo 080",
@@ -28145,12 +26540,7 @@ export default {
             value: "#6d2f08",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "orange",
@@ -28162,6 +26552,11 @@ export default {
                 docs: "core.color.high-saturation.orange.h-oo-090",
                 es6: "calciteColorHighSaturationOrangeHOo090",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -28169,24 +26564,7 @@ export default {
               value: "#6d2f08",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "orange",
-                  state: "",
-                  scale: "090",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Orange H Oo 090",
@@ -28197,12 +26575,7 @@ export default {
             value: "#401900",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "orange",
@@ -28214,6 +26587,11 @@ export default {
                 docs: "core.color.high-saturation.orange.h-oo-100",
                 es6: "calciteColorHighSaturationOrangeHOo100",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -28221,24 +26599,7 @@ export default {
               value: "#401900",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "orange",
-                  state: "",
-                  scale: "100",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Orange H Oo 100",
@@ -28251,12 +26612,7 @@ export default {
             value: "#ffc7b3",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "red-orange",
@@ -28268,6 +26624,11 @@ export default {
                 docs: "core.color.high-saturation.red-orange.h-ro-010",
                 es6: "calciteColorHighSaturationRedOrangeHRo010",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -28275,24 +26636,7 @@ export default {
               value: "#ffc7b3",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "red-orange",
-                  state: "",
-                  scale: "010",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Red Orange H Ro 010",
@@ -28309,12 +26653,7 @@ export default {
             value: "#f8af95",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "red-orange",
@@ -28326,6 +26665,11 @@ export default {
                 docs: "core.color.high-saturation.red-orange.h-ro-020",
                 es6: "calciteColorHighSaturationRedOrangeHRo020",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -28333,24 +26677,7 @@ export default {
               value: "#f8af95",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "red-orange",
-                  state: "",
-                  scale: "020",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Red Orange H Ro 020",
@@ -28367,12 +26694,7 @@ export default {
             value: "#f09677",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "red-orange",
@@ -28384,6 +26706,11 @@ export default {
                 docs: "core.color.high-saturation.red-orange.h-ro-030",
                 es6: "calciteColorHighSaturationRedOrangeHRo030",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -28391,24 +26718,7 @@ export default {
               value: "#f09677",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "red-orange",
-                  state: "",
-                  scale: "030",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Red Orange H Ro 030",
@@ -28425,12 +26735,7 @@ export default {
             value: "#e97e5a",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "red-orange",
@@ -28442,6 +26747,11 @@ export default {
                 docs: "core.color.high-saturation.red-orange.h-ro-040",
                 es6: "calciteColorHighSaturationRedOrangeHRo040",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -28449,24 +26759,7 @@ export default {
               value: "#e97e5a",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "red-orange",
-                  state: "",
-                  scale: "040",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Red Orange H Ro 040",
@@ -28483,12 +26776,7 @@ export default {
             value: "#e1653c",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "red-orange",
@@ -28500,6 +26788,11 @@ export default {
                 docs: "core.color.high-saturation.red-orange.h-ro-050",
                 es6: "calciteColorHighSaturationRedOrangeHRo050",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -28507,24 +26800,7 @@ export default {
               value: "#e1653c",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "red-orange",
-                  state: "",
-                  scale: "050",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Red Orange H Ro 050",
@@ -28541,12 +26817,7 @@ export default {
             value: "#da4d1e",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "red-orange",
@@ -28558,6 +26829,11 @@ export default {
                 docs: "core.color.high-saturation.red-orange.h-ro-060",
                 es6: "calciteColorHighSaturationRedOrangeHRo060",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -28565,24 +26841,7 @@ export default {
               value: "#da4d1e",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "red-orange",
-                  state: "",
-                  scale: "060",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Red Orange H Ro 060",
@@ -28599,12 +26858,7 @@ export default {
             value: "#ad3c16",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "red-orange",
@@ -28616,6 +26870,11 @@ export default {
                 docs: "core.color.high-saturation.red-orange.h-ro-070",
                 es6: "calciteColorHighSaturationRedOrangeHRo070",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -28623,24 +26882,7 @@ export default {
               value: "#ad3c16",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "red-orange",
-                  state: "",
-                  scale: "070",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Red Orange H Ro 070",
@@ -28657,12 +26899,7 @@ export default {
             value: "#802c0f",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "red-orange",
@@ -28674,6 +26911,11 @@ export default {
                 docs: "core.color.high-saturation.red-orange.h-ro-080",
                 es6: "calciteColorHighSaturationRedOrangeHRo080",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -28681,24 +26923,7 @@ export default {
               value: "#802c0f",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "red-orange",
-                  state: "",
-                  scale: "080",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Red Orange H Ro 080",
@@ -28715,12 +26940,7 @@ export default {
             value: "#531b07",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "red-orange",
@@ -28732,6 +26952,11 @@ export default {
                 docs: "core.color.high-saturation.red-orange.h-ro-090",
                 es6: "calciteColorHighSaturationRedOrangeHRo090",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -28739,24 +26964,7 @@ export default {
               value: "#531b07",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "red-orange",
-                  state: "",
-                  scale: "090",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Red Orange H Ro 090",
@@ -28773,12 +26981,7 @@ export default {
             value: "#260a00",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "red-orange",
@@ -28790,6 +26993,11 @@ export default {
                 docs: "core.color.high-saturation.red-orange.h-ro-100",
                 es6: "calciteColorHighSaturationRedOrangeHRo100",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -28797,24 +27005,7 @@ export default {
               value: "#260a00",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "red-orange",
-                  state: "",
-                  scale: "100",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Red Orange H Ro 100",
@@ -28833,12 +27024,7 @@ export default {
             value: "#ffc6bf",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "red",
@@ -28850,6 +27036,11 @@ export default {
                 docs: "core.color.high-saturation.red.h-rr-010",
                 es6: "calciteColorHighSaturationRedHRr010",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -28857,24 +27048,7 @@ export default {
               value: "#ffc6bf",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "red",
-                  state: "",
-                  scale: "010",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Red H Rr 010",
@@ -28885,12 +27059,7 @@ export default {
             value: "#ffaaa1",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "red",
@@ -28902,6 +27071,11 @@ export default {
                 docs: "core.color.high-saturation.red.h-rr-020",
                 es6: "calciteColorHighSaturationRedHRr020",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -28909,24 +27083,7 @@ export default {
               value: "#ffaaa1",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "red",
-                  state: "",
-                  scale: "020",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Red H Rr 020",
@@ -28937,12 +27094,7 @@ export default {
             value: "#f2877b",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "red",
@@ -28954,6 +27106,11 @@ export default {
                 docs: "core.color.high-saturation.red.h-rr-030",
                 es6: "calciteColorHighSaturationRedHRr030",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -28961,24 +27118,7 @@ export default {
               value: "#f2877b",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "red",
-                  state: "",
-                  scale: "030",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Red H Rr 030",
@@ -28989,12 +27129,7 @@ export default {
             value: "#f07062",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "red",
@@ -29006,6 +27141,11 @@ export default {
                 docs: "core.color.high-saturation.red.h-rr-040",
                 es6: "calciteColorHighSaturationRedHRr040",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -29013,24 +27153,7 @@ export default {
               value: "#f07062",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "red",
-                  state: "",
-                  scale: "040",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Red H Rr 040",
@@ -29041,12 +27164,7 @@ export default {
             value: "#e65240",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "red",
@@ -29058,6 +27176,11 @@ export default {
                 docs: "core.color.high-saturation.red.h-rr-050",
                 es6: "calciteColorHighSaturationRedHRr050",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -29065,24 +27188,7 @@ export default {
               value: "#e65240",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "red",
-                  state: "",
-                  scale: "050",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Red H Rr 050",
@@ -29093,12 +27199,7 @@ export default {
             value: "#d83020",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "red",
@@ -29110,6 +27211,11 @@ export default {
                 docs: "core.color.high-saturation.red.h-rr-060",
                 es6: "calciteColorHighSaturationRedHRr060",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -29117,24 +27223,7 @@ export default {
               value: "#d83020",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "red",
-                  state: "",
-                  scale: "060",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Red H Rr 060",
@@ -29145,12 +27234,7 @@ export default {
             value: "#a82b1e",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "red",
@@ -29162,6 +27246,11 @@ export default {
                 docs: "core.color.high-saturation.red.h-rr-070",
                 es6: "calciteColorHighSaturationRedHRr070",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -29169,24 +27258,7 @@ export default {
               value: "#a82b1e",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "red",
-                  state: "",
-                  scale: "070",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Red H Rr 070",
@@ -29197,12 +27269,7 @@ export default {
             value: "#7c1d13",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "red",
@@ -29214,6 +27281,11 @@ export default {
                 docs: "core.color.high-saturation.red.h-rr-080",
                 es6: "calciteColorHighSaturationRedHRr080",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -29221,24 +27293,7 @@ export default {
               value: "#7c1d13",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "red",
-                  state: "",
-                  scale: "080",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Red H Rr 080",
@@ -29249,12 +27304,7 @@ export default {
             value: "#4f0e08",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "red",
@@ -29266,6 +27316,11 @@ export default {
                 docs: "core.color.high-saturation.red.h-rr-090",
                 es6: "calciteColorHighSaturationRedHRr090",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -29273,24 +27328,7 @@ export default {
               value: "#4f0e08",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "red",
-                  state: "",
-                  scale: "090",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Red H Rr 090",
@@ -29301,12 +27339,7 @@ export default {
             value: "#210300",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "red",
@@ -29318,6 +27351,11 @@ export default {
                 docs: "core.color.high-saturation.red.h-rr-100",
                 es6: "calciteColorHighSaturationRedHRr100",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -29325,24 +27363,7 @@ export default {
               value: "#210300",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "red",
-                  state: "",
-                  scale: "100",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Red H Rr 100",
@@ -29355,12 +27376,7 @@ export default {
             value: "#ffd1ef",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "pink",
@@ -29372,6 +27388,11 @@ export default {
                 docs: "core.color.high-saturation.pink.h-pk-010",
                 es6: "calciteColorHighSaturationPinkHPk010",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -29379,24 +27400,7 @@ export default {
               value: "#ffd1ef",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "pink",
-                  state: "",
-                  scale: "010",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Pink H Pk 010",
@@ -29407,12 +27411,7 @@ export default {
             value: "#fabee4",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "pink",
@@ -29424,6 +27423,11 @@ export default {
                 docs: "core.color.high-saturation.pink.h-pk-020",
                 es6: "calciteColorHighSaturationPinkHPk020",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -29431,24 +27435,7 @@ export default {
               value: "#fabee4",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "pink",
-                  state: "",
-                  scale: "020",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Pink H Pk 020",
@@ -29459,12 +27446,7 @@ export default {
             value: "#f2a5d6",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "pink",
@@ -29476,6 +27458,11 @@ export default {
                 docs: "core.color.high-saturation.pink.h-pk-030",
                 es6: "calciteColorHighSaturationPinkHPk030",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -29483,24 +27470,7 @@ export default {
               value: "#f2a5d6",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "pink",
-                  state: "",
-                  scale: "030",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Pink H Pk 030",
@@ -29511,12 +27481,7 @@ export default {
             value: "#eb8dc9",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "pink",
@@ -29528,6 +27493,11 @@ export default {
                 docs: "core.color.high-saturation.pink.h-pk-040",
                 es6: "calciteColorHighSaturationPinkHPk040",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -29535,24 +27505,7 @@ export default {
               value: "#eb8dc9",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "pink",
-                  state: "",
-                  scale: "040",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Pink H Pk 040",
@@ -29563,12 +27516,7 @@ export default {
             value: "#e673bb",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "pink",
@@ -29580,6 +27528,11 @@ export default {
                 docs: "core.color.high-saturation.pink.h-pk-050",
                 es6: "calciteColorHighSaturationPinkHPk050",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -29587,24 +27540,7 @@ export default {
               value: "#e673bb",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "pink",
-                  state: "",
-                  scale: "050",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Pink H Pk 050",
@@ -29615,12 +27551,7 @@ export default {
             value: "#e04ea6",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "pink",
@@ -29632,6 +27563,11 @@ export default {
                 docs: "core.color.high-saturation.pink.h-pk-060",
                 es6: "calciteColorHighSaturationPinkHPk060",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -29639,24 +27575,7 @@ export default {
               value: "#e04ea6",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "pink",
-                  state: "",
-                  scale: "060",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Pink H Pk 060",
@@ -29667,12 +27586,7 @@ export default {
             value: "#ba2f7e",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "pink",
@@ -29684,6 +27598,11 @@ export default {
                 docs: "core.color.high-saturation.pink.h-pk-070",
                 es6: "calciteColorHighSaturationPinkHPk070",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -29691,24 +27610,7 @@ export default {
               value: "#ba2f7e",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "pink",
-                  state: "",
-                  scale: "070",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Pink H Pk 070",
@@ -29719,12 +27621,7 @@ export default {
             value: "#851b52",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "pink",
@@ -29736,31 +27633,19 @@ export default {
                 docs: "core.color.high-saturation.pink.h-pk-080",
                 es6: "calciteColorHighSaturationPinkHPk080",
               },
-            },
-            filePath: "src/tokens/core/color.json",
-            isSource: false,
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
+            },
+            filePath: "src/tokens/core/color.json",
+            isSource: false,
             original: {
               value: "#851b52",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "pink",
-                  state: "",
-                  scale: "080",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Pink H Pk 080",
@@ -29771,12 +27656,7 @@ export default {
             value: "#590b32",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "pink",
@@ -29788,6 +27668,11 @@ export default {
                 docs: "core.color.high-saturation.pink.h-pk-090",
                 es6: "calciteColorHighSaturationPinkHPk090",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -29795,24 +27680,7 @@ export default {
               value: "#590b32",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "pink",
-                  state: "",
-                  scale: "090",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Pink H Pk 090",
@@ -29823,12 +27691,7 @@ export default {
             value: "#260404",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "pink",
@@ -29840,6 +27703,11 @@ export default {
                 docs: "core.color.high-saturation.pink.h-pk-100",
                 es6: "calciteColorHighSaturationPinkHPk100",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -29847,24 +27715,7 @@ export default {
               value: "#260404",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "pink",
-                  state: "",
-                  scale: "100",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Pink H Pk 100",
@@ -29877,12 +27728,7 @@ export default {
             value: "#fadbff",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "violet-red",
@@ -29894,6 +27740,11 @@ export default {
                 docs: "core.color.high-saturation.violet-red.h-vr-010",
                 es6: "calciteColorHighSaturationVioletRedHVr010",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -29901,24 +27752,7 @@ export default {
               value: "#fadbff",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "violet-red",
-                  state: "",
-                  scale: "010",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Violet Red H Vr 010",
@@ -29935,12 +27769,7 @@ export default {
             value: "#e4beeb",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "violet-red",
@@ -29952,6 +27781,11 @@ export default {
                 docs: "core.color.high-saturation.violet-red.h-vr-020",
                 es6: "calciteColorHighSaturationVioletRedHVr020",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -29959,24 +27793,7 @@ export default {
               value: "#e4beeb",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "violet-red",
-                  state: "",
-                  scale: "020",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Violet Red H Vr 020",
@@ -29993,12 +27810,7 @@ export default {
             value: "#cfa1d7",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "violet-red",
@@ -30010,6 +27822,11 @@ export default {
                 docs: "core.color.high-saturation.violet-red.h-vr-030",
                 es6: "calciteColorHighSaturationVioletRedHVr030",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -30017,24 +27834,7 @@ export default {
               value: "#cfa1d7",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "violet-red",
-                  state: "",
-                  scale: "030",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Violet Red H Vr 030",
@@ -30051,12 +27851,7 @@ export default {
             value: "#b983c3",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "violet-red",
@@ -30068,6 +27863,11 @@ export default {
                 docs: "core.color.high-saturation.violet-red.h-vr-040",
                 es6: "calciteColorHighSaturationVioletRedHVr040",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -30075,24 +27875,7 @@ export default {
               value: "#b983c3",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "violet-red",
-                  state: "",
-                  scale: "040",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Violet Red H Vr 040",
@@ -30109,12 +27892,7 @@ export default {
             value: "#a466af",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "violet-red",
@@ -30126,6 +27904,11 @@ export default {
                 docs: "core.color.high-saturation.violet-red.h-vr-050",
                 es6: "calciteColorHighSaturationVioletRedHVr050",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -30133,24 +27916,7 @@ export default {
               value: "#a466af",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "violet-red",
-                  state: "",
-                  scale: "050",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Violet Red H Vr 050",
@@ -30167,12 +27933,7 @@ export default {
             value: "#8e499b",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "violet-red",
@@ -30184,6 +27945,11 @@ export default {
                 docs: "core.color.high-saturation.violet-red.h-vr-060",
                 es6: "calciteColorHighSaturationVioletRedHVr060",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -30191,24 +27957,7 @@ export default {
               value: "#8e499b",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "violet-red",
-                  state: "",
-                  scale: "060",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Violet Red H Vr 060",
@@ -30225,12 +27974,7 @@ export default {
             value: "#73377e",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "violet-red",
@@ -30242,6 +27986,11 @@ export default {
                 docs: "core.color.high-saturation.violet-red.h-vr-070",
                 es6: "calciteColorHighSaturationVioletRedHVr070",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -30249,24 +27998,7 @@ export default {
               value: "#73377e",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "violet-red",
-                  state: "",
-                  scale: "070",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Violet Red H Vr 070",
@@ -30283,12 +28015,7 @@ export default {
             value: "#572561",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "violet-red",
@@ -30300,6 +28027,11 @@ export default {
                 docs: "core.color.high-saturation.violet-red.h-vr-080",
                 es6: "calciteColorHighSaturationVioletRedHVr080",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -30307,24 +28039,7 @@ export default {
               value: "#572561",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "violet-red",
-                  state: "",
-                  scale: "080",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Violet Red H Vr 080",
@@ -30341,12 +28056,7 @@ export default {
             value: "#3c1243",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "violet-red",
@@ -30358,6 +28068,11 @@ export default {
                 docs: "core.color.high-saturation.violet-red.h-vr-090",
                 es6: "calciteColorHighSaturationVioletRedHVr090",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -30365,24 +28080,7 @@ export default {
               value: "#3c1243",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "violet-red",
-                  state: "",
-                  scale: "090",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Violet Red H Vr 090",
@@ -30399,12 +28097,7 @@ export default {
             value: "#200026",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "violet-red",
@@ -30416,6 +28109,11 @@ export default {
                 docs: "core.color.high-saturation.violet-red.h-vr-100",
                 es6: "calciteColorHighSaturationVioletRedHVr100",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -30423,24 +28121,7 @@ export default {
               value: "#200026",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "violet-red",
-                  state: "",
-                  scale: "100",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Violet Red H Vr 100",
@@ -30459,12 +28140,7 @@ export default {
             value: "#e8d9ff",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "violet",
@@ -30476,6 +28152,11 @@ export default {
                 docs: "core.color.high-saturation.violet.h-vv-010",
                 es6: "calciteColorHighSaturationVioletHVv010",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -30483,24 +28164,7 @@ export default {
               value: "#e8d9ff",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "violet",
-                  state: "",
-                  scale: "010",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Violet H Vv 010",
@@ -30511,12 +28175,7 @@ export default {
             value: "#cdb9eb",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "violet",
@@ -30528,6 +28187,11 @@ export default {
                 docs: "core.color.high-saturation.violet.h-vv-020",
                 es6: "calciteColorHighSaturationVioletHVv020",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -30535,24 +28199,7 @@ export default {
               value: "#cdb9eb",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "violet",
-                  state: "",
-                  scale: "020",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Violet H Vv 020",
@@ -30563,12 +28210,7 @@ export default {
             value: "#b39ad7",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "violet",
@@ -30580,6 +28222,11 @@ export default {
                 docs: "core.color.high-saturation.violet.h-vv-030",
                 es6: "calciteColorHighSaturationVioletHVv030",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -30587,24 +28234,7 @@ export default {
               value: "#b39ad7",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "violet",
-                  state: "",
-                  scale: "030",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Violet H Vv 030",
@@ -30615,12 +28245,7 @@ export default {
             value: "#987ac3",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "violet",
@@ -30632,6 +28257,11 @@ export default {
                 docs: "core.color.high-saturation.violet.h-vv-040",
                 es6: "calciteColorHighSaturationVioletHVv040",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -30639,24 +28269,7 @@ export default {
               value: "#987ac3",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "violet",
-                  state: "",
-                  scale: "040",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Violet H Vv 040",
@@ -30667,12 +28280,7 @@ export default {
             value: "#7e5baf",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "violet",
@@ -30684,6 +28292,11 @@ export default {
                 docs: "core.color.high-saturation.violet.h-vv-050",
                 es6: "calciteColorHighSaturationVioletHVv050",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -30691,24 +28304,7 @@ export default {
               value: "#7e5baf",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "violet",
-                  state: "",
-                  scale: "050",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Violet H Vv 050",
@@ -30719,12 +28315,7 @@ export default {
             value: "#633b9b",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "violet",
@@ -30736,6 +28327,11 @@ export default {
                 docs: "core.color.high-saturation.violet.h-vv-060",
                 es6: "calciteColorHighSaturationVioletHVv060",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -30743,24 +28339,7 @@ export default {
               value: "#633b9b",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "violet",
-                  state: "",
-                  scale: "060",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Violet H Vv 060",
@@ -30771,12 +28350,7 @@ export default {
             value: "#4e2c7e",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "violet",
@@ -30788,6 +28362,11 @@ export default {
                 docs: "core.color.high-saturation.violet.h-vv-070",
                 es6: "calciteColorHighSaturationVioletHVv070",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -30795,24 +28374,7 @@ export default {
               value: "#4e2c7e",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "violet",
-                  state: "",
-                  scale: "070",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Violet H Vv 070",
@@ -30823,12 +28385,7 @@ export default {
             value: "#3a1e61",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "violet",
@@ -30840,6 +28397,11 @@ export default {
                 docs: "core.color.high-saturation.violet.h-vv-080",
                 es6: "calciteColorHighSaturationVioletHVv080",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -30847,24 +28409,7 @@ export default {
               value: "#3a1e61",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "violet",
-                  state: "",
-                  scale: "080",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Violet H Vv 080",
@@ -30875,12 +28420,7 @@ export default {
             value: "#250f43",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "violet",
@@ -30892,6 +28432,11 @@ export default {
                 docs: "core.color.high-saturation.violet.h-vv-090",
                 es6: "calciteColorHighSaturationVioletHVv090",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -30899,24 +28444,7 @@ export default {
               value: "#250f43",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "violet",
-                  state: "",
-                  scale: "090",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Violet H Vv 090",
@@ -30927,12 +28455,7 @@ export default {
             value: "#100026",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "high-saturation",
               subitem: "violet",
@@ -30944,6 +28467,11 @@ export default {
                 docs: "core.color.high-saturation.violet.h-vv-100",
                 es6: "calciteColorHighSaturationVioletHVv100",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -30951,24 +28479,7 @@ export default {
               value: "#100026",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "high-saturation",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "violet",
-                  state: "",
-                  scale: "100",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color High Saturation Violet H Vv 100",
@@ -30983,12 +28494,7 @@ export default {
             value: "#59d6ff",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "blue",
@@ -31000,6 +28506,11 @@ export default {
                 docs: "core.color.vibrant.blue.v-bb-120",
                 es6: "calciteColorVibrantBlueVBb120",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -31007,24 +28518,7 @@ export default {
               value: "#59d6ff",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "blue",
-                  state: "",
-                  scale: "120",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Blue V Bb 120",
@@ -31035,12 +28529,7 @@ export default {
             value: "#3db8ff",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "blue",
@@ -31052,6 +28541,11 @@ export default {
                 docs: "core.color.vibrant.blue.v-bb-140",
                 es6: "calciteColorVibrantBlueVBb140",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -31059,24 +28553,7 @@ export default {
               value: "#3db8ff",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "blue",
-                  state: "",
-                  scale: "140",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Blue V Bb 140",
@@ -31087,12 +28564,7 @@ export default {
             value: "#009af2",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "blue",
@@ -31104,6 +28576,11 @@ export default {
                 docs: "core.color.vibrant.blue.v-bb-160",
                 es6: "calciteColorVibrantBlueVBb160",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -31111,24 +28588,7 @@ export default {
               value: "#009af2",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "blue",
-                  state: "",
-                  scale: "160",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Blue V Bb 160",
@@ -31139,12 +28599,7 @@ export default {
             value: "#009af2",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "blue",
@@ -31156,6 +28611,11 @@ export default {
                 docs: "core.color.vibrant.blue.v-bb-180",
                 es6: "calciteColorVibrantBlueVBb180",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -31163,24 +28623,7 @@ export default {
               value: "#009af2",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "blue",
-                  state: "",
-                  scale: "180",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Blue V Bb 180",
@@ -31193,12 +28636,7 @@ export default {
             value: "#59fffc",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "green-blue",
@@ -31210,6 +28648,11 @@ export default {
                 docs: "core.color.vibrant.green-blue.v-gb-120",
                 es6: "calciteColorVibrantGreenBlueVGb120",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -31217,24 +28660,7 @@ export default {
               value: "#59fffc",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "green-blue",
-                  state: "",
-                  scale: "120",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Green Blue V Gb 120",
@@ -31245,12 +28671,7 @@ export default {
             value: "#00f7f3",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "green-blue",
@@ -31262,6 +28683,11 @@ export default {
                 docs: "core.color.vibrant.green-blue.v-gb-140",
                 es6: "calciteColorVibrantGreenBlueVGb140",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -31269,24 +28695,7 @@ export default {
               value: "#00f7f3",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "green-blue",
-                  state: "",
-                  scale: "140",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Green Blue V Gb 140",
@@ -31297,12 +28706,7 @@ export default {
             value: "#00e6e2",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "green-blue",
@@ -31314,6 +28718,11 @@ export default {
                 docs: "core.color.vibrant.green-blue.v-gb-160",
                 es6: "calciteColorVibrantGreenBlueVGb160",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -31321,24 +28730,7 @@ export default {
               value: "#00e6e2",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "green-blue",
-                  state: "",
-                  scale: "160",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Green Blue V Gb 160",
@@ -31349,12 +28741,7 @@ export default {
             value: "#00cfca",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "green-blue",
@@ -31366,6 +28753,11 @@ export default {
                 docs: "core.color.vibrant.green-blue.v-gb-180",
                 es6: "calciteColorVibrantGreenBlueVGb180",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -31373,24 +28765,7 @@ export default {
               value: "#00cfca",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "green-blue",
-                  state: "",
-                  scale: "180",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Green Blue V Gb 180",
@@ -31403,12 +28778,7 @@ export default {
             value: "#73ff84",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "green",
@@ -31420,6 +28790,11 @@ export default {
                 docs: "core.color.vibrant.green.v-gg-120",
                 es6: "calciteColorVibrantGreenVGg120",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -31427,24 +28802,7 @@ export default {
               value: "#73ff84",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "green",
-                  state: "",
-                  scale: "120",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Green V Gg 120",
@@ -31455,12 +28813,7 @@ export default {
             value: "#3bed52",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "green",
@@ -31472,6 +28825,11 @@ export default {
                 docs: "core.color.vibrant.green.v-gg-140",
                 es6: "calciteColorVibrantGreenVGg140",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -31479,24 +28837,7 @@ export default {
               value: "#3bed52",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "green",
-                  state: "",
-                  scale: "140",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Green V Gg 140",
@@ -31507,12 +28848,7 @@ export default {
             value: "#00b81b",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "green",
@@ -31524,6 +28860,11 @@ export default {
                 docs: "core.color.vibrant.green.v-gg-160",
                 es6: "calciteColorVibrantGreenVGg160",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -31531,24 +28872,7 @@ export default {
               value: "#00b81b",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "green",
-                  state: "",
-                  scale: "160",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Green V Gg 160",
@@ -31559,12 +28883,7 @@ export default {
             value: "#00a118",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "green",
@@ -31576,6 +28895,11 @@ export default {
                 docs: "core.color.vibrant.green.v-gg-180",
                 es6: "calciteColorVibrantGreenVGg180",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -31583,24 +28907,7 @@ export default {
               value: "#00a118",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "green",
-                  state: "",
-                  scale: "180",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Green V Gg 180",
@@ -31613,12 +28920,7 @@ export default {
             value: "#d7ff73",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "yellow-green",
@@ -31630,6 +28932,11 @@ export default {
                 docs: "core.color.vibrant.yellow-green.v-yg-120",
                 es6: "calciteColorVibrantYellowGreenVYg120",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -31637,24 +28944,7 @@ export default {
               value: "#d7ff73",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "yellow-green",
-                  state: "",
-                  scale: "120",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Yellow Green V Yg 120",
@@ -31665,12 +28955,7 @@ export default {
             value: "#bbed3b",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "yellow-green",
@@ -31682,6 +28967,11 @@ export default {
                 docs: "core.color.vibrant.yellow-green.v-yg-140",
                 es6: "calciteColorVibrantYellowGreenVYg140",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -31689,24 +28979,7 @@ export default {
               value: "#bbed3b",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "yellow-green",
-                  state: "",
-                  scale: "140",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Yellow Green V Yg 140",
@@ -31717,12 +28990,7 @@ export default {
             value: "#96cc00",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "yellow-green",
@@ -31734,6 +29002,11 @@ export default {
                 docs: "core.color.vibrant.yellow-green.v-yg-160",
                 es6: "calciteColorVibrantYellowGreenVYg160",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -31741,24 +29014,7 @@ export default {
               value: "#96cc00",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "yellow-green",
-                  state: "",
-                  scale: "160",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Yellow Green V Yg 160",
@@ -31769,12 +29025,7 @@ export default {
             value: "#7fab00",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "yellow-green",
@@ -31786,6 +29037,11 @@ export default {
                 docs: "core.color.vibrant.yellow-green.v-yg-180",
                 es6: "calciteColorVibrantYellowGreenVYg180",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -31793,24 +29049,7 @@ export default {
               value: "#7fab00",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "yellow-green",
-                  state: "",
-                  scale: "180",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Yellow Green V Yg 180",
@@ -31823,12 +29062,7 @@ export default {
             value: "#fff766",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "yellow",
@@ -31840,6 +29074,11 @@ export default {
                 docs: "core.color.vibrant.yellow.v-yy-120",
                 es6: "calciteColorVibrantYellowVYy120",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -31847,24 +29086,7 @@ export default {
               value: "#fff766",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "yellow",
-                  state: "",
-                  scale: "120",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Yellow V Yy 120",
@@ -31875,12 +29097,7 @@ export default {
             value: "#ffee33",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "yellow",
@@ -31892,6 +29109,11 @@ export default {
                 docs: "core.color.vibrant.yellow.v-yy-140",
                 es6: "calciteColorVibrantYellowVYy140",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -31899,24 +29121,7 @@ export default {
               value: "#ffee33",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "yellow",
-                  state: "",
-                  scale: "140",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Yellow V Yy 140",
@@ -31927,12 +29132,7 @@ export default {
             value: "#f5d000",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "yellow",
@@ -31944,6 +29144,11 @@ export default {
                 docs: "core.color.vibrant.yellow.v-yy-160",
                 es6: "calciteColorVibrantYellowVYy160",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -31951,24 +29156,7 @@ export default {
               value: "#f5d000",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "yellow",
-                  state: "",
-                  scale: "160",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Yellow V Yy 160",
@@ -31979,12 +29167,7 @@ export default {
             value: "#ebba17",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "yellow",
@@ -31996,6 +29179,11 @@ export default {
                 docs: "core.color.vibrant.yellow.v-yy-180",
                 es6: "calciteColorVibrantYellowVYy180",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -32003,24 +29191,7 @@ export default {
               value: "#ebba17",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "yellow",
-                  state: "",
-                  scale: "180",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Yellow V Yy 180",
@@ -32033,12 +29204,7 @@ export default {
             value: "#ffb54d",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "orange-yellow",
@@ -32050,6 +29216,11 @@ export default {
                 docs: "core.color.vibrant.orange-yellow.v-oy-120",
                 es6: "calciteColorVibrantOrangeYellowVOy120",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -32057,24 +29228,7 @@ export default {
               value: "#ffb54d",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "orange-yellow",
-                  state: "",
-                  scale: "120",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Orange Yellow V Oy 120",
@@ -32085,12 +29239,7 @@ export default {
             value: "#ff9500",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "orange-yellow",
@@ -32102,6 +29251,11 @@ export default {
                 docs: "core.color.vibrant.orange-yellow.v-oy-140",
                 es6: "calciteColorVibrantOrangeYellowVOy140",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -32109,24 +29263,7 @@ export default {
               value: "#ff9500",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "orange-yellow",
-                  state: "",
-                  scale: "140",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Orange Yellow V Oy 140",
@@ -32137,12 +29274,7 @@ export default {
             value: "#e68600",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "orange-yellow",
@@ -32154,6 +29286,11 @@ export default {
                 docs: "core.color.vibrant.orange-yellow.v-oy-160",
                 es6: "calciteColorVibrantOrangeYellowVOy160",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -32161,24 +29298,7 @@ export default {
               value: "#e68600",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "orange-yellow",
-                  state: "",
-                  scale: "160",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Orange Yellow V Oy 160",
@@ -32189,12 +29309,7 @@ export default {
             value: "#d17300",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "orange-yellow",
@@ -32206,31 +29321,19 @@ export default {
                 docs: "core.color.vibrant.orange-yellow.v-oy-180",
                 es6: "calciteColorVibrantOrangeYellowVOy180",
               },
-            },
-            filePath: "src/tokens/core/color.json",
-            isSource: false,
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
+            },
+            filePath: "src/tokens/core/color.json",
+            isSource: false,
             original: {
               value: "#d17300",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "orange-yellow",
-                  state: "",
-                  scale: "180",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Orange Yellow V Oy 180",
@@ -32243,12 +29346,7 @@ export default {
             value: "#ff824d",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "red-orange",
@@ -32260,6 +29358,11 @@ export default {
                 docs: "core.color.vibrant.red-orange.v-ro-120",
                 es6: "calciteColorVibrantRedOrangeVRo120",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -32267,24 +29370,7 @@ export default {
               value: "#ff824d",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "red-orange",
-                  state: "",
-                  scale: "120",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Red Orange V Ro 120",
@@ -32295,12 +29381,7 @@ export default {
             value: "#ff4d00",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "red-orange",
@@ -32312,6 +29393,11 @@ export default {
                 docs: "core.color.vibrant.red-orange.v-ro-140",
                 es6: "calciteColorVibrantRedOrangeVRo140",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -32319,24 +29405,7 @@ export default {
               value: "#ff4d00",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "red-orange",
-                  state: "",
-                  scale: "140",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Red Orange V Ro 140",
@@ -32347,12 +29416,7 @@ export default {
             value: "#de4300",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "red-orange",
@@ -32364,6 +29428,11 @@ export default {
                 docs: "core.color.vibrant.red-orange.v-ro-160",
                 es6: "calciteColorVibrantRedOrangeVRo160",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -32371,24 +29440,7 @@ export default {
               value: "#de4300",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "red-orange",
-                  state: "",
-                  scale: "160",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Red Orange V Ro 160",
@@ -32399,12 +29451,7 @@ export default {
             value: "#c93b00",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "red-orange",
@@ -32416,6 +29463,11 @@ export default {
                 docs: "core.color.vibrant.red-orange.v-ro-180",
                 es6: "calciteColorVibrantRedOrangeVRo180",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -32423,24 +29475,7 @@ export default {
               value: "#c93b00",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "red-orange",
-                  state: "",
-                  scale: "180",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Red Orange V Ro 180",
@@ -32453,12 +29488,7 @@ export default {
             value: "#ff624d",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "red",
@@ -32470,6 +29500,11 @@ export default {
                 docs: "core.color.vibrant.red.v-rr-120",
                 es6: "calciteColorVibrantRedVRr120",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -32477,24 +29512,7 @@ export default {
               value: "#ff624d",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "red",
-                  state: "",
-                  scale: "120",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Red V Rr 120",
@@ -32505,12 +29523,7 @@ export default {
             value: "#ff0015",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "red",
@@ -32522,6 +29535,11 @@ export default {
                 docs: "core.color.vibrant.red.v-rr-140",
                 es6: "calciteColorVibrantRedVRr140",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -32529,24 +29547,7 @@ export default {
               value: "#ff0015",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "red",
-                  state: "",
-                  scale: "140",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Red V Rr 140",
@@ -32557,12 +29558,7 @@ export default {
             value: "#d90012",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "red",
@@ -32574,6 +29570,11 @@ export default {
                 docs: "core.color.vibrant.red.v-rr-160",
                 es6: "calciteColorVibrantRedVRr160",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -32581,24 +29582,7 @@ export default {
               value: "#d90012",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "red",
-                  state: "",
-                  scale: "160",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Red V Rr 160",
@@ -32609,12 +29593,7 @@ export default {
             value: "#b3000f",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "red",
@@ -32626,6 +29605,11 @@ export default {
                 docs: "core.color.vibrant.red.v-rr-180",
                 es6: "calciteColorVibrantRedVRr180",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -32633,24 +29617,7 @@ export default {
               value: "#b3000f",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "red",
-                  state: "",
-                  scale: "180",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Red V Rr 180",
@@ -32663,12 +29630,7 @@ export default {
             value: "#ff66c2",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "pink",
@@ -32680,6 +29642,11 @@ export default {
                 docs: "core.color.vibrant.pink.v-pk-120",
                 es6: "calciteColorVibrantPinkVPk120",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -32687,24 +29654,7 @@ export default {
               value: "#ff66c2",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "pink",
-                  state: "",
-                  scale: "120",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Pink V Pk 120",
@@ -32715,12 +29665,7 @@ export default {
             value: "#ff19a4",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "pink",
@@ -32732,6 +29677,11 @@ export default {
                 docs: "core.color.vibrant.pink.v-pk-140",
                 es6: "calciteColorVibrantPinkVPk140",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -32739,24 +29689,7 @@ export default {
               value: "#ff19a4",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "pink",
-                  state: "",
-                  scale: "140",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Pink V Pk 140",
@@ -32767,12 +29700,7 @@ export default {
             value: "#d11486",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "pink",
@@ -32784,6 +29712,11 @@ export default {
                 docs: "core.color.vibrant.pink.v-pk-160",
                 es6: "calciteColorVibrantPinkVPk160",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -32791,24 +29724,7 @@ export default {
               value: "#d11486",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "pink",
-                  state: "",
-                  scale: "160",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Pink V Pk 160",
@@ -32819,12 +29735,7 @@ export default {
             value: "#c00073",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "pink",
@@ -32836,6 +29747,11 @@ export default {
                 docs: "core.color.vibrant.pink.v-pk-180",
                 es6: "calciteColorVibrantPinkVPk180",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -32843,24 +29759,7 @@ export default {
               value: "#c00073",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "pink",
-                  state: "",
-                  scale: "180",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Pink V Pk 180",
@@ -32873,12 +29772,7 @@ export default {
             value: "#ea80ff",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "violet-red",
@@ -32890,6 +29784,11 @@ export default {
                 docs: "core.color.vibrant.violet-red.v-vr-120",
                 es6: "calciteColorVibrantVioletRedVVr120",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -32897,24 +29796,7 @@ export default {
               value: "#ea80ff",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "violet-red",
-                  state: "",
-                  scale: "120",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Violet Red V Vr 120",
@@ -32925,12 +29807,7 @@ export default {
             value: "#dd33ff",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "violet-red",
@@ -32942,6 +29819,11 @@ export default {
                 docs: "core.color.vibrant.violet-red.v-vr-140",
                 es6: "calciteColorVibrantVioletRedVVr140",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -32949,24 +29831,7 @@ export default {
               value: "#dd33ff",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "violet-red",
-                  state: "",
-                  scale: "140",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Violet Red V Vr 140",
@@ -32977,12 +29842,7 @@ export default {
             value: "#ac08cc",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "violet-red",
@@ -32994,6 +29854,11 @@ export default {
                 docs: "core.color.vibrant.violet-red.v-vr-160",
                 es6: "calciteColorVibrantVioletRedVVr160",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -33001,24 +29866,7 @@ export default {
               value: "#ac08cc",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "violet-red",
-                  state: "",
-                  scale: "160",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Violet Red V Vr 160",
@@ -33029,12 +29877,7 @@ export default {
             value: "#83009e",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "violet-red",
@@ -33046,6 +29889,11 @@ export default {
                 docs: "core.color.vibrant.violet-red.v-vr-180",
                 es6: "calciteColorVibrantVioletRedVVr180",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -33053,24 +29901,7 @@ export default {
               value: "#83009e",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "violet-red",
-                  state: "",
-                  scale: "180",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Violet Red V Vr 180",
@@ -33083,12 +29914,7 @@ export default {
             value: "#b580ff",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "violet",
@@ -33100,6 +29926,11 @@ export default {
                 docs: "core.color.vibrant.violet.v-vv-120",
                 es6: "calciteColorVibrantVioletVVv120",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -33107,24 +29938,7 @@ export default {
               value: "#b580ff",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "violet",
-                  state: "",
-                  scale: "120",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Violet V Vv 120",
@@ -33135,12 +29949,7 @@ export default {
             value: "#974dff",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "violet",
@@ -33152,6 +29961,11 @@ export default {
                 docs: "core.color.vibrant.violet.v-vv-140",
                 es6: "calciteColorVibrantVioletVVv140",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -33159,24 +29973,7 @@ export default {
               value: "#974dff",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "violet",
-                  state: "",
-                  scale: "140",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Violet V Vv 140",
@@ -33187,12 +29984,7 @@ export default {
             value: "#8129ff",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "violet",
@@ -33204,6 +29996,11 @@ export default {
                 docs: "core.color.vibrant.violet.v-vv-160",
                 es6: "calciteColorVibrantVioletVVv160",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -33211,24 +30008,7 @@ export default {
               value: "#8129ff",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "violet",
-                  state: "",
-                  scale: "160",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Violet V Vv 160",
@@ -33239,12 +30019,7 @@ export default {
             value: "#6a0be6",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "vibrant",
               subitem: "violet",
@@ -33256,6 +30031,11 @@ export default {
                 docs: "core.color.vibrant.violet.v-vv-180",
                 es6: "calciteColorVibrantVioletVVv180",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -33263,24 +30043,7 @@ export default {
               value: "#6a0be6",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "vibrant",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "violet",
-                  state: "",
-                  scale: "180",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Vibrant Violet V Vv 180",
@@ -33295,12 +30058,7 @@ export default {
             value: "#44ed51",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "dark",
               subitem: "green",
@@ -33312,6 +30070,11 @@ export default {
                 docs: "core.color.dark.green.d-gg-410",
                 es6: "calciteColorDarkGreenDGg410",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -33319,24 +30082,7 @@ export default {
               value: "#44ED51",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "dark",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "green",
-                  state: "",
-                  scale: "410",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Dark Green D Gg 410",
@@ -33347,12 +30093,7 @@ export default {
             value: "#36da43",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "dark",
               subitem: "green",
@@ -33364,6 +30105,11 @@ export default {
                 docs: "core.color.dark.green.d-gg-420",
                 es6: "calciteColorDarkGreenDGg420",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -33371,24 +30117,7 @@ export default {
               value: "#36DA43",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "dark",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "green",
-                  state: "",
-                  scale: "420",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Dark Green D Gg 420",
@@ -33399,12 +30128,7 @@ export default {
             value: "#36da43",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "dark",
               subitem: "green",
@@ -33416,6 +30140,11 @@ export default {
                 docs: "core.color.dark.green.d-gg-430",
                 es6: "calciteColorDarkGreenDGg430",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -33423,24 +30152,7 @@ export default {
               value: "#36DA43",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "dark",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "green",
-                  state: "",
-                  scale: "430",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Dark Green D Gg 430",
@@ -33453,12 +30165,7 @@ export default {
             value: "#ffe24d",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "dark",
               subitem: "yellow",
@@ -33470,6 +30177,11 @@ export default {
                 docs: "core.color.dark.yellow.d-yy-410",
                 es6: "calciteColorDarkYellowDYy410",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -33477,24 +30189,7 @@ export default {
               value: "#FFE24D",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "dark",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "yellow",
-                  state: "",
-                  scale: "410",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Dark Yellow D Yy 410",
@@ -33505,12 +30200,7 @@ export default {
             value: "#ffc900",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "dark",
               subitem: "yellow",
@@ -33522,6 +30212,11 @@ export default {
                 docs: "core.color.dark.yellow.d-yy-420",
                 es6: "calciteColorDarkYellowDYy420",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -33529,24 +30224,7 @@ export default {
               value: "#FFC900",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "dark",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "yellow",
-                  state: "",
-                  scale: "420",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Dark Yellow D Yy 420",
@@ -33557,12 +30235,7 @@ export default {
             value: "#f4b000",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "dark",
               subitem: "yellow",
@@ -33574,6 +30247,11 @@ export default {
                 docs: "core.color.dark.yellow.d-yy-430",
                 es6: "calciteColorDarkYellowDYy430",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -33581,24 +30259,7 @@ export default {
               value: "#F4B000",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "dark",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "yellow",
-                  state: "",
-                  scale: "430",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Dark Yellow D Yy 430",
@@ -33611,12 +30272,7 @@ export default {
             value: "#ff7465",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "dark",
               subitem: "red",
@@ -33628,6 +30284,11 @@ export default {
                 docs: "core.color.dark.red.d-rr-410",
                 es6: "calciteColorDarkRedDRr410",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -33635,24 +30296,7 @@ export default {
               value: "#FF7465",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "dark",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "red",
-                  state: "",
-                  scale: "410",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Dark Red D Rr 410",
@@ -33663,12 +30307,7 @@ export default {
             value: "#fe583e",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "dark",
               subitem: "red",
@@ -33680,6 +30319,11 @@ export default {
                 docs: "core.color.dark.red.d-rr-420",
                 es6: "calciteColorDarkRedDRr420",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -33687,24 +30331,7 @@ export default {
               value: "#FE583E",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "dark",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "red",
-                  state: "",
-                  scale: "420",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Dark Red D Rr 420",
@@ -33715,12 +30342,7 @@ export default {
             value: "#f3381b",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "dark",
               subitem: "red",
@@ -33732,6 +30354,11 @@ export default {
                 docs: "core.color.dark.red.d-rr-430",
                 es6: "calciteColorDarkRedDRr430",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -33739,24 +30366,7 @@ export default {
               value: "#F3381B",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "dark",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "red",
-                  state: "",
-                  scale: "430",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Dark Red D Rr 430",
@@ -33769,12 +30379,7 @@ export default {
             value: "#47bbff",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "dark",
               subitem: "blue",
@@ -33786,6 +30391,11 @@ export default {
                 docs: "core.color.dark.blue.d-bb-410",
                 es6: "calciteColorDarkBlueDBb410",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -33793,24 +30403,7 @@ export default {
               value: "#47BBFF",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "dark",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "blue",
-                  state: "",
-                  scale: "410",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Dark Blue D Bb 410",
@@ -33821,12 +30414,7 @@ export default {
             value: "#00a0ff",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "dark",
               subitem: "blue",
@@ -33838,6 +30426,11 @@ export default {
                 docs: "core.color.dark.blue.d-bb-420",
                 es6: "calciteColorDarkBlueDBb420",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -33845,24 +30438,7 @@ export default {
               value: "#00A0FF",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "dark",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "blue",
-                  state: "",
-                  scale: "420",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Dark Blue D Bb 420",
@@ -33873,12 +30449,7 @@ export default {
             value: "#0087d7",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                type: "color",
-              },
-              category: "core",
+              category: "color",
               type: "color",
               item: "dark",
               subitem: "blue",
@@ -33890,6 +30461,11 @@ export default {
                 docs: "core.color.dark.blue.d-bb-430",
                 es6: "calciteColorDarkBlueDBb430",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "core",
+                type: "color",
+              },
             },
             filePath: "src/tokens/core/color.json",
             isSource: false,
@@ -33897,24 +30473,7 @@ export default {
               value: "#0087D7",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "core",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "dark",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "blue",
-                  state: "",
-                  scale: "430",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Dark Blue D Bb 430",
@@ -33929,12 +30488,7 @@ export default {
         value: "0",
         type: "dimension",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "dimension",
-          },
-          category: "core",
+          category: "breakpoint",
           type: "container-size",
           item: "0",
           names: {
@@ -33944,6 +30498,11 @@ export default {
             docs: "core.container-size.0",
             es6: "calciteContainerSize0",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "dimension",
+          },
         },
         filePath: "src/tokens/core/container-size.json",
         isSource: false,
@@ -33951,24 +30510,7 @@ export default {
           value: 0,
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "breakpoint",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "0",
-              context: "",
-              mode: "",
-            },
+            category: "breakpoint",
           },
         },
         name: "Container Size 0",
@@ -33979,12 +30521,7 @@ export default {
         value: "154px",
         type: "dimension",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "dimension",
-          },
-          category: "core",
+          category: "breakpoint",
           type: "container-size",
           item: "154",
           names: {
@@ -33994,6 +30531,11 @@ export default {
             docs: "core.container-size.154",
             es6: "calciteContainerSize154",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "dimension",
+          },
         },
         filePath: "src/tokens/core/container-size.json",
         isSource: false,
@@ -34001,24 +30543,7 @@ export default {
           value: 154,
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "breakpoint",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "154",
-              context: "",
-              mode: "",
-            },
+            category: "breakpoint",
           },
         },
         name: "Container Size 154",
@@ -34029,12 +30554,7 @@ export default {
         value: "320px",
         type: "dimension",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "dimension",
-          },
-          category: "core",
+          category: "breakpoint",
           type: "container-size",
           item: "320",
           names: {
@@ -34044,6 +30564,11 @@ export default {
             docs: "core.container-size.320",
             es6: "calciteContainerSize320",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "dimension",
+          },
         },
         filePath: "src/tokens/core/container-size.json",
         isSource: false,
@@ -34051,24 +30576,7 @@ export default {
           value: 320,
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "breakpoint",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "320",
-              context: "",
-              mode: "",
-            },
+            category: "breakpoint",
           },
         },
         name: "Container Size 320",
@@ -34079,12 +30587,7 @@ export default {
         value: "328px",
         type: "dimension",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "dimension",
-          },
-          category: "core",
+          category: "breakpoint",
           type: "container-size",
           item: "328",
           names: {
@@ -34094,6 +30597,11 @@ export default {
             docs: "core.container-size.328",
             es6: "calciteContainerSize328",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "dimension",
+          },
         },
         filePath: "src/tokens/core/container-size.json",
         isSource: false,
@@ -34101,24 +30609,7 @@ export default {
           value: 328,
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "breakpoint",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "328",
-              context: "",
-              mode: "",
-            },
+            category: "breakpoint",
           },
         },
         name: "Container Size 328",
@@ -34129,12 +30620,7 @@ export default {
         value: "476px",
         type: "dimension",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "dimension",
-          },
-          category: "core",
+          category: "breakpoint",
           type: "container-size",
           item: "476",
           names: {
@@ -34144,6 +30630,11 @@ export default {
             docs: "core.container-size.476",
             es6: "calciteContainerSize476",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "dimension",
+          },
         },
         filePath: "src/tokens/core/container-size.json",
         isSource: false,
@@ -34151,24 +30642,7 @@ export default {
           value: 476,
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "breakpoint",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "476",
-              context: "",
-              mode: "",
-            },
+            category: "breakpoint",
           },
         },
         name: "Container Size 476",
@@ -34179,12 +30653,7 @@ export default {
         value: "504px",
         type: "dimension",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "dimension",
-          },
-          category: "core",
+          category: "breakpoint",
           type: "container-size",
           item: "504",
           names: {
@@ -34194,6 +30663,11 @@ export default {
             docs: "core.container-size.504",
             es6: "calciteContainerSize504",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "dimension",
+          },
         },
         filePath: "src/tokens/core/container-size.json",
         isSource: false,
@@ -34201,24 +30675,7 @@ export default {
           value: 504,
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "breakpoint",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "504",
-              context: "",
-              mode: "",
-            },
+            category: "breakpoint",
           },
         },
         name: "Container Size 504",
@@ -34229,12 +30686,7 @@ export default {
         value: "678px",
         type: "dimension",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "dimension",
-          },
-          category: "core",
+          category: "breakpoint",
           type: "container-size",
           item: "678",
           names: {
@@ -34244,6 +30696,11 @@ export default {
             docs: "core.container-size.678",
             es6: "calciteContainerSize678",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "dimension",
+          },
         },
         filePath: "src/tokens/core/container-size.json",
         isSource: false,
@@ -34251,24 +30708,7 @@ export default {
           value: 678,
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "breakpoint",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "678",
-              context: "",
-              mode: "",
-            },
+            category: "breakpoint",
           },
         },
         name: "Container Size 678",
@@ -34279,12 +30719,7 @@ export default {
         value: "768px",
         type: "dimension",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "dimension",
-          },
-          category: "core",
+          category: "breakpoint",
           type: "container-size",
           item: "768",
           names: {
@@ -34294,6 +30729,11 @@ export default {
             docs: "core.container-size.768",
             es6: "calciteContainerSize768",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "dimension",
+          },
         },
         filePath: "src/tokens/core/container-size.json",
         isSource: false,
@@ -34301,24 +30741,7 @@ export default {
           value: 768,
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "breakpoint",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "768",
-              context: "",
-              mode: "",
-            },
+            category: "breakpoint",
           },
         },
         name: "Container Size 768",
@@ -34329,12 +30752,7 @@ export default {
         value: "854px",
         type: "dimension",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "dimension",
-          },
-          category: "core",
+          category: "breakpoint",
           type: "container-size",
           item: "854",
           names: {
@@ -34344,6 +30762,11 @@ export default {
             docs: "core.container-size.854",
             es6: "calciteContainerSize854",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "dimension",
+          },
         },
         filePath: "src/tokens/core/container-size.json",
         isSource: false,
@@ -34351,24 +30774,7 @@ export default {
           value: 854,
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "breakpoint",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "854",
-              context: "",
-              mode: "",
-            },
+            category: "breakpoint",
           },
         },
         name: "Container Size 854",
@@ -34379,12 +30785,7 @@ export default {
         value: "1152px",
         type: "dimension",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "dimension",
-          },
-          category: "core",
+          category: "breakpoint",
           type: "container-size",
           item: "1152",
           names: {
@@ -34394,6 +30795,11 @@ export default {
             docs: "core.container-size.1152",
             es6: "calciteContainerSize1152",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "dimension",
+          },
         },
         filePath: "src/tokens/core/container-size.json",
         isSource: false,
@@ -34401,24 +30807,7 @@ export default {
           value: 1152,
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "breakpoint",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "1152",
-              context: "",
-              mode: "",
-            },
+            category: "breakpoint",
           },
         },
         name: "Container Size 1152",
@@ -34429,12 +30818,7 @@ export default {
         value: "1440px",
         type: "dimension",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "dimension",
-          },
-          category: "core",
+          category: "breakpoint",
           type: "container-size",
           item: "1440",
           names: {
@@ -34444,6 +30828,11 @@ export default {
             docs: "core.container-size.1440",
             es6: "calciteContainerSize1440",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "dimension",
+          },
         },
         filePath: "src/tokens/core/container-size.json",
         isSource: false,
@@ -34451,24 +30840,7 @@ export default {
           value: 1440,
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "breakpoint",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "1440",
-              context: "",
-              mode: "",
-            },
+            category: "breakpoint",
           },
         },
         name: "Container Size 1440",
@@ -34483,12 +30855,7 @@ export default {
           type: "fontFamily",
           description: "Fallback for Monaco",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "fontFamily",
-            },
-            category: "core",
+            category: "font",
             type: "fontFamily",
             item: "family",
             subitem: "andaleMono",
@@ -34506,6 +30873,11 @@ export default {
               docs: "core.font.family.andaleMono",
               es6: "calciteFontFamilyAndaleMono",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "fontFamily",
+            },
           },
           filePath: "src/tokens/core/font.json",
           isSource: false,
@@ -34514,24 +30886,7 @@ export default {
             type: "fontFamily",
             description: "Fallback for Monaco",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "family",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "andaleMono",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Family Andale Mono",
@@ -34543,12 +30898,7 @@ export default {
           value: "Avenir Next LT Pro",
           type: "fontFamily",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "fontFamily",
-            },
-            category: "core",
+            category: "font",
             type: "font",
             item: "family",
             subitem: "avenirNextPro",
@@ -34559,6 +30909,11 @@ export default {
               docs: "core.font.family.avenirNextPro",
               es6: "calciteFontFamilyAvenirNextPro",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "fontFamily",
+            },
           },
           filePath: "src/tokens/core/font.json",
           isSource: false,
@@ -34566,24 +30921,7 @@ export default {
             value: "Avenir Next LT Pro",
             type: "fontFamily",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "family",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "avenirNextPro",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Family Avenir Next Pro",
@@ -34594,12 +30932,7 @@ export default {
           value: "Avenir Next World",
           type: "fontFamily",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "fontFamily",
-            },
-            category: "core",
+            category: "font",
             type: "font",
             item: "family",
             subitem: "avenirNextWorld",
@@ -34610,6 +30943,11 @@ export default {
               docs: "core.font.family.avenirNextWorld",
               es6: "calciteFontFamilyAvenirNextWorld",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "fontFamily",
+            },
           },
           filePath: "src/tokens/core/font.json",
           isSource: false,
@@ -34617,24 +30955,7 @@ export default {
             value: "Avenir Next World",
             type: "fontFamily",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "family",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "avenirNextWorld",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Family Avenir Next World",
@@ -34646,12 +30967,7 @@ export default {
           type: "fontFamily",
           description: "Primary font family",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "fontFamily",
-            },
-            category: "core",
+            category: "font",
             type: "fontFamily",
             item: "family",
             subitem: "avenirNext",
@@ -34669,6 +30985,11 @@ export default {
               docs: "core.font.family.avenirNext",
               es6: "calciteFontFamilyAvenirNext",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "fontFamily",
+            },
           },
           filePath: "src/tokens/core/font.json",
           isSource: false,
@@ -34677,24 +30998,7 @@ export default {
             type: "fontFamily",
             description: "Primary font family",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "family",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "avenirNext",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Family Avenir Next",
@@ -34707,12 +31011,7 @@ export default {
           type: "fontFamily",
           description: "Fallback for Avenir Next",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "fontFamily",
-            },
-            category: "core",
+            category: "font",
             type: "fontFamily",
             item: "family",
             subitem: "avenir",
@@ -34730,6 +31029,11 @@ export default {
               docs: "core.font.family.avenir",
               es6: "calciteFontFamilyAvenir",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "fontFamily",
+            },
           },
           filePath: "src/tokens/core/font.json",
           isSource: false,
@@ -34738,24 +31042,7 @@ export default {
             type: "fontFamily",
             description: "Fallback for Avenir Next",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "family",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "avenir",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Family Avenir",
@@ -34768,12 +31055,7 @@ export default {
           type: "fontFamily",
           description: "Fallback for Monaco",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "fontFamily",
-            },
-            category: "core",
+            category: "font",
             type: "fontFamily",
             item: "family",
             subitem: "consolas",
@@ -34791,6 +31073,11 @@ export default {
               docs: "core.font.family.consolas",
               es6: "calciteFontFamilyConsolas",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "fontFamily",
+            },
           },
           filePath: "src/tokens/core/font.json",
           isSource: false,
@@ -34799,24 +31086,7 @@ export default {
             type: "fontFamily",
             description: "Fallback for Monaco",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "family",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "consolas",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Family Consolas",
@@ -34829,12 +31099,7 @@ export default {
           type: "fontFamily",
           description: "Fallback for Avenir Next",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "fontFamily",
-            },
-            category: "core",
+            category: "font",
             type: "fontFamily",
             item: "family",
             subitem: "helveticaNeue",
@@ -34852,6 +31117,11 @@ export default {
               docs: "core.font.family.helveticaNeue",
               es6: "calciteFontFamilyHelveticaNeue",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "fontFamily",
+            },
           },
           filePath: "src/tokens/core/font.json",
           isSource: false,
@@ -34860,24 +31130,7 @@ export default {
             type: "fontFamily",
             description: "Fallback for Avenir Next",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "family",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "helveticaNeue",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Family Helvetica Neue",
@@ -34890,12 +31143,7 @@ export default {
           type: "fontFamily",
           description: "Fallback for Monaco",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "fontFamily",
-            },
-            category: "core",
+            category: "font",
             type: "fontFamily",
             item: "family",
             subitem: "lucidaConsole",
@@ -34913,6 +31161,11 @@ export default {
               docs: "core.font.family.lucidaConsole",
               es6: "calciteFontFamilyLucidaConsole",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "fontFamily",
+            },
           },
           filePath: "src/tokens/core/font.json",
           isSource: false,
@@ -34921,24 +31174,7 @@ export default {
             type: "fontFamily",
             description: "Fallback for Monaco",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "family",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "lucidaConsole",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Family Lucida Console",
@@ -34950,12 +31186,7 @@ export default {
           value: "Monaco",
           type: "fontFamily",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "fontFamily",
-            },
-            category: "core",
+            category: "font",
             type: "font",
             item: "family",
             subitem: "monaco",
@@ -34966,6 +31197,11 @@ export default {
               docs: "core.font.family.monaco",
               es6: "calciteFontFamilyMonaco",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "fontFamily",
+            },
           },
           filePath: "src/tokens/core/font.json",
           isSource: false,
@@ -34973,24 +31209,7 @@ export default {
             value: "Monaco",
             type: "fontFamily",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "family",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "monaco",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Family Monaco",
@@ -35002,12 +31221,7 @@ export default {
           type: "fontFamily",
           description: "Fallback for Monaco",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "fontFamily",
-            },
-            category: "core",
+            category: "font",
             type: "fontFamily",
             item: "family",
             subitem: "monospace",
@@ -35025,6 +31239,11 @@ export default {
               docs: "core.font.family.monospace",
               es6: "calciteFontFamilyMonospace",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "fontFamily",
+            },
           },
           filePath: "src/tokens/core/font.json",
           isSource: false,
@@ -35033,24 +31252,7 @@ export default {
             type: "fontFamily",
             description: "Fallback for Monaco",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "family",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "monospace",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Family Monospace",
@@ -35063,12 +31265,7 @@ export default {
           type: "fontFamily",
           description: "Fallback for Avenir Next",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "fontFamily",
-            },
-            category: "core",
+            category: "font",
             type: "fontFamily",
             item: "family",
             subitem: "sansSerif",
@@ -35086,6 +31283,11 @@ export default {
               docs: "core.font.family.sansSerif",
               es6: "calciteFontFamilySansSerif",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "fontFamily",
+            },
           },
           filePath: "src/tokens/core/font.json",
           isSource: false,
@@ -35094,24 +31296,7 @@ export default {
             type: "fontFamily",
             description: "Fallback for Avenir Next",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "family",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "sansSerif",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Family Sans Serif",
@@ -35126,12 +31311,7 @@ export default {
           type: "fontStyle",
           description: "used in ratings",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "fontStyle",
-            },
-            category: "core",
+            category: "font",
             type: "fontStyle",
             item: "style",
             subitem: "italic",
@@ -35149,6 +31329,11 @@ export default {
               docs: "core.font.style.italic",
               es6: "calciteFontStyleItalic",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "fontStyle",
+            },
           },
           filePath: "src/tokens/core/font.json",
           isSource: false,
@@ -35157,24 +31342,7 @@ export default {
             type: "fontStyle",
             description: "used in ratings",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "style",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "italic",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Style Italic",
@@ -35189,12 +31357,7 @@ export default {
           type: "fontWeight",
           description: "only for Avenir Next World (secondary font family)",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "fontWeight",
-            },
-            category: "core",
+            category: "font",
             type: "fontWeight",
             item: "weight",
             subitem: "ultralight",
@@ -35212,6 +31375,11 @@ export default {
               docs: "core.font.weight.ultralight",
               es6: "calciteFontWeightUltralight",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "fontWeight",
+            },
           },
           filePath: "src/tokens/core/font.json",
           isSource: false,
@@ -35220,24 +31388,7 @@ export default {
             type: "fontWeight",
             description: "only for Avenir Next World (secondary font family)",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "weight",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "ultra-light",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Weight Ultralight",
@@ -35249,12 +31400,7 @@ export default {
           value: "100",
           type: "fontWeight",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "fontWeight",
-            },
-            category: "core",
+            category: "font",
             type: "font",
             item: "weight",
             subitem: "thin",
@@ -35265,6 +31411,11 @@ export default {
               docs: "core.font.weight.thin",
               es6: "calciteFontWeightThin",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "fontWeight",
+            },
           },
           filePath: "src/tokens/core/font.json",
           isSource: false,
@@ -35272,24 +31423,7 @@ export default {
             value: "Thin",
             type: "fontWeight",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "weight",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "thin",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Weight Thin",
@@ -35341,12 +31475,7 @@ export default {
           value: "400",
           type: "fontWeight",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "fontWeight",
-            },
-            category: "core",
+            category: "font",
             type: "font",
             item: "weight",
             subitem: "regular",
@@ -35357,6 +31486,11 @@ export default {
               docs: "core.font.weight.regular",
               es6: "calciteFontWeightRegular",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "fontWeight",
+            },
           },
           filePath: "src/tokens/core/font.json",
           isSource: false,
@@ -35364,24 +31498,7 @@ export default {
             value: "Regular",
             type: "fontWeight",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "weight",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "regular",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Weight Regular",
@@ -35392,12 +31509,7 @@ export default {
           value: "500",
           type: "fontWeight",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "fontWeight",
-            },
-            category: "core",
+            category: "font",
             type: "font",
             item: "weight",
             subitem: "medium",
@@ -35408,6 +31520,11 @@ export default {
               docs: "core.font.weight.medium",
               es6: "calciteFontWeightMedium",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "fontWeight",
+            },
           },
           filePath: "src/tokens/core/font.json",
           isSource: false,
@@ -35415,24 +31532,7 @@ export default {
             value: "Medium",
             type: "fontWeight",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "weight",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "medium",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Weight Medium",
@@ -35443,12 +31543,7 @@ export default {
           value: "Medium Italic",
           type: "fontWeight",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "fontWeight",
-            },
-            category: "core",
+            category: "font",
             type: "font",
             item: "weight",
             subitem: "medium-italic",
@@ -35459,6 +31554,11 @@ export default {
               docs: "core.font.weight.medium-italic",
               es6: "calciteFontWeightMediumItalic",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "fontWeight",
+            },
           },
           filePath: "src/tokens/core/font.json",
           isSource: false,
@@ -35466,24 +31566,7 @@ export default {
             value: "Medium Italic",
             type: "fontWeight",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "weight",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "medium-italic",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Weight Medium Italic",
@@ -35494,12 +31577,7 @@ export default {
           value: "600",
           type: "fontWeight",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "fontWeight",
-            },
-            category: "core",
+            category: "font",
             type: "font",
             item: "weight",
             subitem: "demi",
@@ -35510,6 +31588,11 @@ export default {
               docs: "core.font.weight.demi",
               es6: "calciteFontWeightDemi",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "fontWeight",
+            },
           },
           filePath: "src/tokens/core/font.json",
           isSource: false,
@@ -35517,24 +31600,7 @@ export default {
             value: "Demi",
             type: "fontWeight",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "weight",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "demi",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Weight Demi",
@@ -35545,12 +31611,7 @@ export default {
           value: "700",
           type: "fontWeight",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "fontWeight",
-            },
-            category: "core",
+            category: "font",
             type: "font",
             item: "weight",
             subitem: "bold",
@@ -35561,6 +31622,11 @@ export default {
               docs: "core.font.weight.bold",
               es6: "calciteFontWeightBold",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "fontWeight",
+            },
           },
           filePath: "src/tokens/core/font.json",
           isSource: false,
@@ -35568,24 +31634,7 @@ export default {
             value: "Bold",
             type: "fontWeight",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                property: "weight",
-                group: "",
-                kind: "",
-                appearance: "",
-                variant: "bold",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Weight Bold",
@@ -35597,12 +31646,7 @@ export default {
           type: "fontWeight",
           description: "only for Avenir Next World (secondary font family)",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "fontWeight",
-            },
-            category: "core",
+            category: "font",
             type: "fontWeight",
             item: "weight",
             subitem: "extrabold",
@@ -35620,6 +31664,11 @@ export default {
               docs: "core.font.weight.extrabold",
               es6: "calciteFontWeightExtrabold",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "fontWeight",
+            },
           },
           filePath: "src/tokens/core/font.json",
           isSource: false,
@@ -35628,24 +31677,7 @@ export default {
             type: "fontWeight",
             description: "only for Avenir Next World (secondary font family)",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "weight",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "extra-bold",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Weight Extrabold",
@@ -35658,12 +31690,7 @@ export default {
           type: "fontWeight",
           description: "only for Avenir Next World (secondary font family)",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "fontWeight",
-            },
-            category: "core",
+            category: "font",
             type: "fontWeight",
             item: "weight",
             subitem: "black",
@@ -35681,6 +31708,11 @@ export default {
               docs: "core.font.weight.black",
               es6: "calciteFontWeightBlack",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "fontWeight",
+            },
           },
           filePath: "src/tokens/core/font.json",
           isSource: false,
@@ -35689,24 +31721,7 @@ export default {
             type: "fontWeight",
             description: "only for Avenir Next World (secondary font family)",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "weight",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "black",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Weight Black",
@@ -35718,12 +31733,7 @@ export default {
           value: "900",
           type: "fontWeight",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "fontWeight",
-            },
-            category: "core",
+            category: "font",
             type: "font",
             item: "weight",
             subitem: "heavy",
@@ -35734,6 +31744,11 @@ export default {
               docs: "core.font.weight.heavy",
               es6: "calciteFontWeightHeavy",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "fontWeight",
+            },
           },
           filePath: "src/tokens/core/font.json",
           isSource: false,
@@ -35741,24 +31756,7 @@ export default {
             value: "Heavy",
             type: "fontWeight",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "weight",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "heavy",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Weight Heavy",
@@ -35772,12 +31770,7 @@ export default {
           type: "textDecoration",
           description: "Deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "textDecoration",
-            },
-            category: "core",
+            category: "font",
             type: "textDecoration",
             item: "text-decoration",
             subitem: "none",
@@ -35795,6 +31788,11 @@ export default {
               docs: "core.font.text-decoration.none",
               es6: "calciteFontTextDecorationNone",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "textDecoration",
+            },
           },
           filePath: "src/tokens/core/font.json",
           isSource: false,
@@ -35803,24 +31801,7 @@ export default {
             type: "textDecoration",
             description: "Deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "text-decoration",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "none",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Text Decoration None",
@@ -35833,12 +31814,7 @@ export default {
           type: "textDecoration",
           description: "Deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "textDecoration",
-            },
-            category: "core",
+            category: "font",
             type: "textDecoration",
             item: "text-decoration",
             subitem: "underline",
@@ -35856,6 +31832,11 @@ export default {
               docs: "core.font.text-decoration.underline",
               es6: "calciteFontTextDecorationUnderline",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "textDecoration",
+            },
           },
           filePath: "src/tokens/core/font.json",
           isSource: false,
@@ -35864,24 +31845,7 @@ export default {
             type: "textDecoration",
             description: "Deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "text-decoration",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "underline",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Text Decoration Underline",
@@ -35896,12 +31860,7 @@ export default {
           type: "textCase",
           description: "Deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "textCase",
-            },
-            category: "core",
+            category: "font",
             type: "textCase",
             item: "text-case",
             subitem: "none",
@@ -35919,6 +31878,11 @@ export default {
               docs: "core.font.text-case.none",
               es6: "calciteFontTextCaseNone",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "textCase",
+            },
           },
           filePath: "src/tokens/core/font.json",
           isSource: false,
@@ -35927,24 +31891,7 @@ export default {
             type: "textCase",
             description: "Deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "text-case",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "none",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Text Case None",
@@ -35957,12 +31904,7 @@ export default {
           type: "textCase",
           description: "Deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "textCase",
-            },
-            category: "core",
+            category: "font",
             type: "textCase",
             item: "text-case",
             subitem: "uppercase",
@@ -35980,6 +31922,11 @@ export default {
               docs: "core.font.text-case.uppercase",
               es6: "calciteFontTextCaseUppercase",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "textCase",
+            },
           },
           filePath: "src/tokens/core/font.json",
           isSource: false,
@@ -35988,24 +31935,7 @@ export default {
             type: "textCase",
             description: "Deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "text-case",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "uppercase",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Text Case Uppercase",
@@ -36018,12 +31948,7 @@ export default {
           type: "textCase",
           description: "Deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "textCase",
-            },
-            category: "core",
+            category: "font",
             type: "textCase",
             item: "text-case",
             subitem: "lowercase",
@@ -36041,6 +31966,11 @@ export default {
               docs: "core.font.text-case.lowercase",
               es6: "calciteFontTextCaseLowercase",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "textCase",
+            },
           },
           filePath: "src/tokens/core/font.json",
           isSource: false,
@@ -36049,24 +31979,7 @@ export default {
             type: "textCase",
             description: "Deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "text-case",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "lowercase",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Text Case Lowercase",
@@ -36079,12 +31992,7 @@ export default {
           type: "textCase",
           description: "Deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "textCase",
-            },
-            category: "core",
+            category: "font",
             type: "textCase",
             item: "text-case",
             subitem: "capitalize",
@@ -36102,6 +32010,11 @@ export default {
               docs: "core.font.text-case.capitalize",
               es6: "calciteFontTextCaseCapitalize",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "textCase",
+            },
           },
           filePath: "src/tokens/core/font.json",
           isSource: false,
@@ -36110,24 +32023,7 @@ export default {
             type: "textCase",
             description: "Deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "text-case",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "capitalize",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Text Case Capitalize",
@@ -36142,12 +32038,7 @@ export default {
         value: "0",
         type: "opacity",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "opacity",
-          },
-          category: "core",
+          category: "opacity",
           type: "opacity",
           item: "0",
           names: {
@@ -36157,6 +32048,11 @@ export default {
             docs: "core.opacity.0",
             es6: "calciteOpacity0",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "opacity",
+          },
         },
         filePath: "src/tokens/core/opacity.json",
         isSource: false,
@@ -36164,24 +32060,7 @@ export default {
           value: "0%",
           type: "opacity",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "opacity",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "0",
-              context: "",
-              mode: "",
-            },
+            category: "opacity",
           },
         },
         name: "Opacity 0",
@@ -36192,12 +32071,7 @@ export default {
         value: "0.04",
         type: "opacity",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "opacity",
-          },
-          category: "core",
+          category: "opacity",
           type: "opacity",
           item: "4",
           names: {
@@ -36207,6 +32081,11 @@ export default {
             docs: "core.opacity.4",
             es6: "calciteOpacity4",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "opacity",
+          },
         },
         filePath: "src/tokens/core/opacity.json",
         isSource: false,
@@ -36214,24 +32093,7 @@ export default {
           value: "4%",
           type: "opacity",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "opacity",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "4",
-              context: "",
-              mode: "",
-            },
+            category: "opacity",
           },
         },
         name: "Opacity 4",
@@ -36242,12 +32104,7 @@ export default {
         value: "0.08",
         type: "opacity",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "opacity",
-          },
-          category: "core",
+          category: "opacity",
           type: "opacity",
           item: "8",
           names: {
@@ -36257,6 +32114,11 @@ export default {
             docs: "core.opacity.8",
             es6: "calciteOpacity8",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "opacity",
+          },
         },
         filePath: "src/tokens/core/opacity.json",
         isSource: false,
@@ -36264,24 +32126,7 @@ export default {
           value: "8%",
           type: "opacity",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "opacity",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "8",
-              context: "",
-              mode: "",
-            },
+            category: "opacity",
           },
         },
         name: "Opacity 8",
@@ -36292,12 +32137,7 @@ export default {
         value: "0.1",
         type: "opacity",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "opacity",
-          },
-          category: "core",
+          category: "opacity",
           type: "opacity",
           item: "10",
           names: {
@@ -36307,6 +32147,11 @@ export default {
             docs: "core.opacity.10",
             es6: "calciteOpacity10",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "opacity",
+          },
         },
         filePath: "src/tokens/core/opacity.json",
         isSource: false,
@@ -36314,24 +32159,7 @@ export default {
           value: "10%",
           type: "opacity",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "opacity",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "10",
-              context: "",
-              mode: "",
-            },
+            category: "opacity",
           },
         },
         name: "Opacity 10",
@@ -36342,12 +32170,7 @@ export default {
         value: "0.2",
         type: "opacity",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "opacity",
-          },
-          category: "core",
+          category: "opacity",
           type: "opacity",
           item: "20",
           names: {
@@ -36357,6 +32180,11 @@ export default {
             docs: "core.opacity.20",
             es6: "calciteOpacity20",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "opacity",
+          },
         },
         filePath: "src/tokens/core/opacity.json",
         isSource: false,
@@ -36364,24 +32192,7 @@ export default {
           value: "20%",
           type: "opacity",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "opacity",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "20",
-              context: "",
-              mode: "",
-            },
+            category: "opacity",
           },
         },
         name: "Opacity 20",
@@ -36392,12 +32203,7 @@ export default {
         value: "0.3",
         type: "opacity",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "opacity",
-          },
-          category: "core",
+          category: "opacity",
           type: "opacity",
           item: "30",
           names: {
@@ -36407,6 +32213,11 @@ export default {
             docs: "core.opacity.30",
             es6: "calciteOpacity30",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "opacity",
+          },
         },
         filePath: "src/tokens/core/opacity.json",
         isSource: false,
@@ -36414,24 +32225,7 @@ export default {
           value: "30%",
           type: "opacity",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "opacity",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "30",
-              context: "",
-              mode: "",
-            },
+            category: "opacity",
           },
         },
         name: "Opacity 30",
@@ -36442,12 +32236,7 @@ export default {
         value: "0.4",
         type: "opacity",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "opacity",
-          },
-          category: "core",
+          category: "opacity",
           type: "opacity",
           item: "40",
           names: {
@@ -36457,6 +32246,11 @@ export default {
             docs: "core.opacity.40",
             es6: "calciteOpacity40",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "opacity",
+          },
         },
         filePath: "src/tokens/core/opacity.json",
         isSource: false,
@@ -36464,24 +32258,7 @@ export default {
           value: "40%",
           type: "opacity",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "opacity",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "40",
-              context: "",
-              mode: "",
-            },
+            category: "opacity",
           },
         },
         name: "Opacity 40",
@@ -36492,12 +32269,7 @@ export default {
         value: "0.5",
         type: "opacity",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "opacity",
-          },
-          category: "core",
+          category: "opacity",
           type: "opacity",
           item: "50",
           names: {
@@ -36507,6 +32279,11 @@ export default {
             docs: "core.opacity.50",
             es6: "calciteOpacity50",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "opacity",
+          },
         },
         filePath: "src/tokens/core/opacity.json",
         isSource: false,
@@ -36514,24 +32291,7 @@ export default {
           value: "50%",
           type: "opacity",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "opacity",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "50",
-              context: "",
-              mode: "",
-            },
+            category: "opacity",
           },
         },
         name: "Opacity 50",
@@ -36542,12 +32302,7 @@ export default {
         value: "0.6",
         type: "opacity",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "opacity",
-          },
-          category: "core",
+          category: "opacity",
           type: "opacity",
           item: "60",
           names: {
@@ -36557,6 +32312,11 @@ export default {
             docs: "core.opacity.60",
             es6: "calciteOpacity60",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "opacity",
+          },
         },
         filePath: "src/tokens/core/opacity.json",
         isSource: false,
@@ -36564,24 +32324,7 @@ export default {
           value: "60%",
           type: "opacity",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "opacity",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "60",
-              context: "",
-              mode: "",
-            },
+            category: "opacity",
           },
         },
         name: "Opacity 60",
@@ -36592,12 +32335,7 @@ export default {
         value: "0.7",
         type: "opacity",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "opacity",
-          },
-          category: "core",
+          category: "opacity",
           type: "opacity",
           item: "70",
           names: {
@@ -36607,6 +32345,11 @@ export default {
             docs: "core.opacity.70",
             es6: "calciteOpacity70",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "opacity",
+          },
         },
         filePath: "src/tokens/core/opacity.json",
         isSource: false,
@@ -36614,24 +32357,7 @@ export default {
           value: "70%",
           type: "opacity",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "opacity",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "70",
-              context: "",
-              mode: "",
-            },
+            category: "opacity",
           },
         },
         name: "Opacity 70",
@@ -36642,12 +32368,7 @@ export default {
         value: "0.8",
         type: "opacity",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "opacity",
-          },
-          category: "core",
+          category: "opacity",
           type: "opacity",
           item: "80",
           names: {
@@ -36657,6 +32378,11 @@ export default {
             docs: "core.opacity.80",
             es6: "calciteOpacity80",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "opacity",
+          },
         },
         filePath: "src/tokens/core/opacity.json",
         isSource: false,
@@ -36664,24 +32390,7 @@ export default {
           value: "80%",
           type: "opacity",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "opacity",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "80",
-              context: "",
-              mode: "",
-            },
+            category: "opacity",
           },
         },
         name: "Opacity 80",
@@ -36692,12 +32401,7 @@ export default {
         value: "0.85",
         type: "opacity",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "opacity",
-          },
-          category: "core",
+          category: "opacity",
           type: "opacity",
           item: "85",
           names: {
@@ -36707,6 +32411,11 @@ export default {
             docs: "core.opacity.85",
             es6: "calciteOpacity85",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "opacity",
+          },
         },
         filePath: "src/tokens/core/opacity.json",
         isSource: false,
@@ -36714,24 +32423,7 @@ export default {
           value: "85%",
           type: "opacity",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "opacity",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "85",
-              context: "",
-              mode: "",
-            },
+            category: "opacity",
           },
         },
         name: "Opacity 85",
@@ -36742,12 +32434,7 @@ export default {
         value: "0.9",
         type: "opacity",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "opacity",
-          },
-          category: "core",
+          category: "opacity",
           type: "opacity",
           item: "90",
           names: {
@@ -36757,6 +32444,11 @@ export default {
             docs: "core.opacity.90",
             es6: "calciteOpacity90",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "opacity",
+          },
         },
         filePath: "src/tokens/core/opacity.json",
         isSource: false,
@@ -36764,24 +32456,7 @@ export default {
           value: "90%",
           type: "opacity",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "opacity",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "90",
-              context: "",
-              mode: "",
-            },
+            category: "opacity",
           },
         },
         name: "Opacity 90",
@@ -36792,12 +32467,7 @@ export default {
         value: "0.92",
         type: "opacity",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "opacity",
-          },
-          category: "core",
+          category: "opacity",
           type: "opacity",
           item: "92",
           names: {
@@ -36807,6 +32477,11 @@ export default {
             docs: "core.opacity.92",
             es6: "calciteOpacity92",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "opacity",
+          },
         },
         filePath: "src/tokens/core/opacity.json",
         isSource: false,
@@ -36814,24 +32489,7 @@ export default {
           value: "92%",
           type: "opacity",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "opacity",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "92",
-              context: "",
-              mode: "",
-            },
+            category: "opacity",
           },
         },
         name: "Opacity 92",
@@ -36842,12 +32500,7 @@ export default {
         value: "0.96",
         type: "opacity",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "opacity",
-          },
-          category: "core",
+          category: "opacity",
           type: "opacity",
           item: "96",
           names: {
@@ -36857,6 +32510,11 @@ export default {
             docs: "core.opacity.96",
             es6: "calciteOpacity96",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "opacity",
+          },
         },
         filePath: "src/tokens/core/opacity.json",
         isSource: false,
@@ -36864,24 +32522,7 @@ export default {
           value: "96%",
           type: "opacity",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "opacity",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "96",
-              context: "",
-              mode: "",
-            },
+            category: "opacity",
           },
         },
         name: "Opacity 96",
@@ -36892,12 +32533,7 @@ export default {
         value: "1",
         type: "opacity",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "opacity",
-          },
-          category: "core",
+          category: "opacity",
           type: "opacity",
           item: "100",
           names: {
@@ -36907,6 +32543,11 @@ export default {
             docs: "core.opacity.100",
             es6: "calciteOpacity100",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "opacity",
+          },
         },
         filePath: "src/tokens/core/opacity.json",
         isSource: false,
@@ -36914,24 +32555,7 @@ export default {
           value: "100%",
           type: "opacity",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "opacity",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "100",
-              context: "",
-              mode: "",
-            },
+            category: "opacity",
           },
         },
         name: "Opacity 100",
@@ -36950,12 +32574,7 @@ export default {
         },
         type: "shadow",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "shadow",
-          },
-          category: "core",
+          category: "shadow",
           type: "shadow",
           item: "0",
           names: {
@@ -36965,6 +32584,11 @@ export default {
             docs: "core.shadow.0",
             es6: "calciteShadow0",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "shadow",
+          },
         },
         filePath: "src/tokens/core/shadow.json",
         isSource: false,
@@ -36978,24 +32602,7 @@ export default {
           },
           type: "shadow",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "shadow",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "0",
-              context: "",
-              mode: "",
-            },
+            category: "shadow",
           },
         },
         name: "Shadow 0",
@@ -37012,12 +32619,7 @@ export default {
         },
         type: "shadow",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "shadow",
-          },
-          category: "core",
+          category: "shadow",
           type: "shadow",
           item: "1",
           names: {
@@ -37027,6 +32629,11 @@ export default {
             docs: "core.shadow.1",
             es6: "calciteShadow1",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "shadow",
+          },
         },
         filePath: "src/tokens/core/shadow.json",
         isSource: false,
@@ -37040,24 +32647,7 @@ export default {
           },
           type: "shadow",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "shadow",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "1",
-              context: "",
-              mode: "",
-            },
+            category: "shadow",
           },
         },
         name: "Shadow 1",
@@ -37074,12 +32664,7 @@ export default {
         },
         type: "shadow",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "shadow",
-          },
-          category: "core",
+          category: "shadow",
           type: "shadow",
           item: "2",
           names: {
@@ -37089,6 +32674,11 @@ export default {
             docs: "core.shadow.2",
             es6: "calciteShadow2",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "shadow",
+          },
         },
         filePath: "src/tokens/core/shadow.json",
         isSource: false,
@@ -37102,24 +32692,7 @@ export default {
           },
           type: "shadow",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "shadow",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "2",
-              context: "",
-              mode: "",
-            },
+            category: "shadow",
           },
         },
         name: "Shadow 2",
@@ -37136,12 +32709,7 @@ export default {
         },
         type: "shadow",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "shadow",
-          },
-          category: "core",
+          category: "shadow",
           type: "shadow",
           item: "3",
           names: {
@@ -37151,6 +32719,11 @@ export default {
             docs: "core.shadow.3",
             es6: "calciteShadow3",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "shadow",
+          },
         },
         filePath: "src/tokens/core/shadow.json",
         isSource: false,
@@ -37164,24 +32737,7 @@ export default {
           },
           type: "shadow",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "shadow",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "3",
-              context: "",
-              mode: "",
-            },
+            category: "shadow",
           },
         },
         name: "Shadow 3",
@@ -37198,12 +32754,7 @@ export default {
         },
         type: "shadow",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "shadow",
-          },
-          category: "core",
+          category: "shadow",
           type: "shadow",
           item: "4",
           names: {
@@ -37213,6 +32764,11 @@ export default {
             docs: "core.shadow.4",
             es6: "calciteShadow4",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "shadow",
+          },
         },
         filePath: "src/tokens/core/shadow.json",
         isSource: false,
@@ -37226,24 +32782,7 @@ export default {
           },
           type: "shadow",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "shadow",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "4",
-              context: "",
-              mode: "",
-            },
+            category: "shadow",
           },
         },
         name: "Shadow 4",
@@ -37257,12 +32796,7 @@ export default {
           value: "1px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "1",
@@ -37273,6 +32807,11 @@ export default {
               docs: "core.size.default.1",
               es6: "calciteSize1",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -37280,24 +32819,7 @@ export default {
             value: "1px",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "default",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "1",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size 1",
@@ -37308,12 +32830,7 @@ export default {
           value: "2px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "2",
@@ -37324,6 +32841,11 @@ export default {
               docs: "core.size.default.2",
               es6: "calciteSize2",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -37331,24 +32853,7 @@ export default {
             value: "2px",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "default",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "2",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size 2",
@@ -37359,12 +32864,7 @@ export default {
           value: "4px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "4",
@@ -37375,6 +32875,11 @@ export default {
               docs: "core.size.default.4",
               es6: "calciteSize4",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -37382,24 +32887,7 @@ export default {
             value: "4px",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "default",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "4",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size 4",
@@ -37410,12 +32898,7 @@ export default {
           value: "6px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "6",
@@ -37426,6 +32909,11 @@ export default {
               docs: "core.size.default.6",
               es6: "calciteSize6",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -37433,24 +32921,7 @@ export default {
             value: "6px",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "default",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "6",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size 6",
@@ -37461,12 +32932,7 @@ export default {
           value: "8px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "8",
@@ -37477,6 +32943,11 @@ export default {
               docs: "core.size.default.8",
               es6: "calciteSize8",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -37484,24 +32955,7 @@ export default {
             value: "8px",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "default",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "8",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size 8",
@@ -37512,12 +32966,7 @@ export default {
           value: "10px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "10",
@@ -37528,6 +32977,11 @@ export default {
               docs: "core.size.default.10",
               es6: "calciteSize10",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -37535,24 +32989,7 @@ export default {
             value: "10px",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "default",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "10",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size 10",
@@ -37563,12 +33000,7 @@ export default {
           value: "12px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "12",
@@ -37579,6 +33011,11 @@ export default {
               docs: "core.size.default.12",
               es6: "calciteSize12",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -37586,24 +33023,7 @@ export default {
             value: "12px",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "default",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "12",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size 12",
@@ -37614,12 +33034,7 @@ export default {
           value: "14px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "14",
@@ -37630,6 +33045,11 @@ export default {
               docs: "core.size.default.14",
               es6: "calciteSize14",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -37637,24 +33057,7 @@ export default {
             value: "14px",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "default",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "14",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size 14",
@@ -37665,12 +33068,7 @@ export default {
           value: "16px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "16",
@@ -37681,6 +33079,11 @@ export default {
               docs: "core.size.default.16",
               es6: "calciteSize16",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -37688,24 +33091,7 @@ export default {
             value: "16px",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "default",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "16",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size 16",
@@ -37716,12 +33102,7 @@ export default {
           value: "20px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "20",
@@ -37732,6 +33113,11 @@ export default {
               docs: "core.size.default.20",
               es6: "calciteSize20",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -37739,24 +33125,7 @@ export default {
             value: "20px",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "default",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "20",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size 20",
@@ -37767,12 +33136,7 @@ export default {
           value: "24px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "24",
@@ -37783,6 +33147,11 @@ export default {
               docs: "core.size.default.24",
               es6: "calciteSize24",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -37790,24 +33159,7 @@ export default {
             value: "24px",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "default",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "24",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size 24",
@@ -37818,12 +33170,7 @@ export default {
           value: "28px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "28",
@@ -37834,6 +33181,11 @@ export default {
               docs: "core.size.default.28",
               es6: "calciteSize28",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -37841,24 +33193,7 @@ export default {
             value: "28px",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "default",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "28",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size 28",
@@ -37869,12 +33204,7 @@ export default {
           value: "32px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "32",
@@ -37885,6 +33215,11 @@ export default {
               docs: "core.size.default.32",
               es6: "calciteSize32",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -37892,24 +33227,7 @@ export default {
             value: "32px",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "default",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "32",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size 32",
@@ -37920,12 +33238,7 @@ export default {
           value: "36px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "36",
@@ -37936,6 +33249,11 @@ export default {
               docs: "core.size.default.36",
               es6: "calciteSize36",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -37943,24 +33261,7 @@ export default {
             value: "36px",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "default",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "36",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size 36",
@@ -37971,12 +33272,7 @@ export default {
           value: "40px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "40",
@@ -37987,6 +33283,11 @@ export default {
               docs: "core.size.default.40",
               es6: "calciteSize40",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -37994,24 +33295,7 @@ export default {
             value: "40px",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "default",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "40",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size 40",
@@ -38022,12 +33306,7 @@ export default {
           value: "44px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "44",
@@ -38038,6 +33317,11 @@ export default {
               docs: "core.size.default.44",
               es6: "calciteSize44",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -38045,24 +33329,7 @@ export default {
             value: "44px",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "default",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "44",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size 44",
@@ -38073,12 +33340,7 @@ export default {
           value: "48px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "48",
@@ -38089,6 +33351,11 @@ export default {
               docs: "core.size.default.48",
               es6: "calciteSize48",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -38096,24 +33363,7 @@ export default {
             value: "48px",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "default",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "48",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size 48",
@@ -38124,12 +33374,7 @@ export default {
           value: "56px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "56",
@@ -38140,6 +33385,11 @@ export default {
               docs: "core.size.default.56",
               es6: "calciteSize56",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -38147,24 +33397,7 @@ export default {
             value: "56px",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "default",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "56",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size 56",
@@ -38174,13 +33407,8 @@ export default {
         64: {
           value: "64px",
           type: "dimension",
-          attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+          attributes: {
+            category: "size",
             type: "size",
             item: "default",
             subitem: "64",
@@ -38191,6 +33419,11 @@ export default {
               docs: "core.size.default.64",
               es6: "calciteSize64",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -38198,24 +33431,7 @@ export default {
             value: "64px",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "default",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "64",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size 64",
@@ -38226,12 +33442,7 @@ export default {
           value: "72px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "72",
@@ -38242,6 +33453,11 @@ export default {
               docs: "core.size.default.72",
               es6: "calciteSize72",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -38249,24 +33465,7 @@ export default {
             value: "72px",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "default",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "72",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size 72",
@@ -38277,12 +33476,7 @@ export default {
           value: "80px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "80",
@@ -38293,6 +33487,11 @@ export default {
               docs: "core.size.default.80",
               es6: "calciteSize80",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -38300,24 +33499,7 @@ export default {
             value: "80px",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "default",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "80",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size 80",
@@ -38328,12 +33510,7 @@ export default {
           value: "96px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "96",
@@ -38344,6 +33521,11 @@ export default {
               docs: "core.size.default.96",
               es6: "calciteSize96",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -38351,24 +33533,7 @@ export default {
             value: "96px",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "default",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "96",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size 96",
@@ -38379,12 +33544,7 @@ export default {
           value: "112px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "112",
@@ -38395,6 +33555,11 @@ export default {
               docs: "core.size.default.112",
               es6: "calciteSize112",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -38402,24 +33567,7 @@ export default {
             value: "112px",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "default",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "112",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size 112",
@@ -38430,12 +33578,7 @@ export default {
           value: "128px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "128",
@@ -38446,6 +33589,11 @@ export default {
               docs: "core.size.default.128",
               es6: "calciteSize128",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -38453,24 +33601,7 @@ export default {
             value: "128px",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "default",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "128",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size 128",
@@ -38481,12 +33612,7 @@ export default {
           value: "144px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "144",
@@ -38497,6 +33623,11 @@ export default {
               docs: "core.size.default.144",
               es6: "calciteSize144",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -38504,24 +33635,7 @@ export default {
             value: "144px",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "default",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "144",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size 144",
@@ -38532,12 +33646,7 @@ export default {
           value: "160px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "160",
@@ -38548,6 +33657,11 @@ export default {
               docs: "core.size.default.160",
               es6: "calciteSize160",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -38555,24 +33669,7 @@ export default {
             value: "160px",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "default",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "160",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size 160",
@@ -38583,12 +33680,7 @@ export default {
           value: "192px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "192",
@@ -38599,6 +33691,11 @@ export default {
               docs: "core.size.default.192",
               es6: "calciteSize192",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -38606,24 +33703,7 @@ export default {
             value: "192px",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "default",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "162",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size 192",
@@ -38634,12 +33714,7 @@ export default {
           value: "224px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "224",
@@ -38650,6 +33725,11 @@ export default {
               docs: "core.size.default.224",
               es6: "calciteSize224",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -38657,24 +33737,7 @@ export default {
             value: "224px",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "default",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "224",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size 224",
@@ -38685,12 +33748,7 @@ export default {
           value: "256px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "256",
@@ -38701,6 +33759,11 @@ export default {
               docs: "core.size.default.256",
               es6: "calciteSize256",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -38708,24 +33771,7 @@ export default {
             value: "256px",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "default",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "256",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size 256",
@@ -38736,12 +33782,7 @@ export default {
           value: "288px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "288",
@@ -38752,6 +33793,11 @@ export default {
               docs: "core.size.default.288",
               es6: "calciteSize288",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -38759,24 +33805,7 @@ export default {
             value: "288px",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "default",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "288",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size 288",
@@ -38787,12 +33816,7 @@ export default {
           value: "0",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "none",
@@ -38803,6 +33827,11 @@ export default {
               docs: "core.size.default.none",
               es6: "calciteSizeNone",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -38810,24 +33839,7 @@ export default {
             value: "0",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "default",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "none",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size None",
@@ -38840,12 +33852,7 @@ export default {
           value: "50%",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "relative",
             subitem: "50",
@@ -38856,6 +33863,11 @@ export default {
               docs: "core.size.relative.50",
               es6: "calciteSizeRelative50",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -38863,24 +33875,7 @@ export default {
             value: "50%",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "relative",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: ".5",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Relative 50",
@@ -38891,12 +33886,7 @@ export default {
           value: "100%",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "relative",
             subitem: "100",
@@ -38907,6 +33897,11 @@ export default {
               docs: "core.size.relative.100",
               es6: "calciteSizeRelative100",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -38914,24 +33909,7 @@ export default {
             value: "100%",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "relative",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "1",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Relative 100",
@@ -38942,12 +33920,7 @@ export default {
           value: "125%",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "relative",
             subitem: "125",
@@ -38958,6 +33931,11 @@ export default {
               docs: "core.size.relative.125",
               es6: "calciteSizeRelative125",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -38965,24 +33943,7 @@ export default {
             value: "125%",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "relative",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "1.25",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Relative 125",
@@ -38993,12 +33954,7 @@ export default {
           value: "137.5%",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "relative",
             subitem: "137",
@@ -39009,6 +33965,11 @@ export default {
               docs: "core.size.relative.137",
               es6: "calciteSizeRelative137",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -39016,24 +33977,7 @@ export default {
             value: "137.5%",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "relative",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "1.375",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Relative 137",
@@ -39044,12 +33988,7 @@ export default {
           value: "150%",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "relative",
             subitem: "150",
@@ -39060,6 +33999,11 @@ export default {
               docs: "core.size.relative.150",
               es6: "calciteSizeRelative150",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -39067,24 +34011,7 @@ export default {
             value: "150%",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "relative",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "1.5",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Relative 150",
@@ -39095,12 +34022,7 @@ export default {
           value: "162.5%",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "relative",
             subitem: "162",
@@ -39111,6 +34033,11 @@ export default {
               docs: "core.size.relative.162",
               es6: "calciteSizeRelative162",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -39118,24 +34045,7 @@ export default {
             value: "162.5%",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "relative",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "1.625",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Relative 162",
@@ -39146,12 +34056,7 @@ export default {
           value: "200%",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "relative",
             subitem: "200",
@@ -39162,6 +34067,11 @@ export default {
               docs: "core.size.relative.200",
               es6: "calciteSizeRelative200",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -39169,24 +34079,7 @@ export default {
             value: "200%",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "relative",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "2",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Relative 200",
@@ -39197,12 +34090,7 @@ export default {
           value: "auto",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              type: "dimension",
-            },
-            category: "core",
+            category: "size",
             type: "size",
             item: "relative",
             subitem: "auto",
@@ -39213,6 +34101,11 @@ export default {
               docs: "core.size.relative.auto",
               es6: "calciteSizeRelativeAuto",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "core",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/core/size.json",
           isSource: false,
@@ -39220,24 +34113,7 @@ export default {
             value: "auto",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "core",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "relative",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "auto",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Relative Auto",
@@ -39251,12 +34127,7 @@ export default {
         value: "-999999",
         type: "z-index",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "z-index",
-          },
-          category: "core",
+          category: "z-index",
           type: "z-index",
           item: "0",
           names: {
@@ -39266,6 +34137,11 @@ export default {
             docs: "core.z-index.0",
             es6: "calciteZIndex0",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "z-index",
+          },
         },
         filePath: "src/tokens/core/z-index.json",
         isSource: false,
@@ -39273,24 +34149,7 @@ export default {
           value: "-999999",
           type: "z-index",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "z-index",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "0",
-              context: "",
-              mode: "",
-            },
+            category: "z-index",
           },
         },
         name: "Z Index 0",
@@ -39301,12 +34160,7 @@ export default {
         value: "1",
         type: "z-index",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "z-index",
-          },
-          category: "core",
+          category: "z-index",
           type: "z-index",
           item: "1",
           names: {
@@ -39316,6 +34170,11 @@ export default {
             docs: "core.z-index.1",
             es6: "calciteZIndex1",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "z-index",
+          },
         },
         filePath: "src/tokens/core/z-index.json",
         isSource: false,
@@ -39323,24 +34182,7 @@ export default {
           value: "1",
           type: "z-index",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "z-index",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "1",
-              context: "",
-              mode: "",
-            },
+            category: "z-index",
           },
         },
         name: "Z Index 1",
@@ -39351,12 +34193,7 @@ export default {
         value: "300",
         type: "z-index",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "z-index",
-          },
-          category: "core",
+          category: "z-index",
           type: "z-index",
           item: "3",
           names: {
@@ -39366,6 +34203,11 @@ export default {
             docs: "core.z-index.3",
             es6: "calciteZIndex3",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "z-index",
+          },
         },
         filePath: "src/tokens/core/z-index.json",
         isSource: false,
@@ -39373,24 +34215,7 @@ export default {
           value: "300",
           type: "z-index",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "z-index",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "3",
-              context: "",
-              mode: "",
-            },
+            category: "z-index",
           },
         },
         name: "Z Index 3",
@@ -39401,12 +34226,7 @@ export default {
         value: "400",
         type: "z-index",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "z-index",
-          },
-          category: "core",
+          category: "z-index",
           type: "z-index",
           item: "4",
           names: {
@@ -39416,6 +34236,11 @@ export default {
             docs: "core.z-index.4",
             es6: "calciteZIndex4",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "z-index",
+          },
         },
         filePath: "src/tokens/core/z-index.json",
         isSource: false,
@@ -39423,24 +34248,7 @@ export default {
           value: "400",
           type: "z-index",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "z-index",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "4",
-              context: "",
-              mode: "",
-            },
+            category: "z-index",
           },
         },
         name: "Z Index 4",
@@ -39451,12 +34259,7 @@ export default {
         value: "500",
         type: "z-index",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "z-index",
-          },
-          category: "core",
+          category: "z-index",
           type: "z-index",
           item: "5",
           names: {
@@ -39466,6 +34269,11 @@ export default {
             docs: "core.z-index.5",
             es6: "calciteZIndex5",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "z-index",
+          },
         },
         filePath: "src/tokens/core/z-index.json",
         isSource: false,
@@ -39473,24 +34281,7 @@ export default {
           value: "500",
           type: "z-index",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "z-index",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "5",
-              context: "",
-              mode: "",
-            },
+            category: "z-index",
           },
         },
         name: "Z Index 5",
@@ -39501,12 +34292,7 @@ export default {
         value: "600",
         type: "z-index",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "z-index",
-          },
-          category: "core",
+          category: "z-index",
           type: "z-index",
           item: "6",
           names: {
@@ -39516,6 +34302,11 @@ export default {
             docs: "core.z-index.6",
             es6: "calciteZIndex6",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "z-index",
+          },
         },
         filePath: "src/tokens/core/z-index.json",
         isSource: false,
@@ -39523,24 +34314,7 @@ export default {
           value: "600",
           type: "z-index",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "z-index",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "6",
-              context: "",
-              mode: "",
-            },
+            category: "z-index",
           },
         },
         name: "Z Index 6",
@@ -39551,12 +34325,7 @@ export default {
         value: "700",
         type: "z-index",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "z-index",
-          },
-          category: "core",
+          category: "z-index",
           type: "z-index",
           item: "7",
           names: {
@@ -39566,6 +34335,11 @@ export default {
             docs: "core.z-index.7",
             es6: "calciteZIndex7",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "z-index",
+          },
         },
         filePath: "src/tokens/core/z-index.json",
         isSource: false,
@@ -39573,24 +34347,7 @@ export default {
           value: "700",
           type: "z-index",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "z-index",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "7",
-              context: "",
-              mode: "",
-            },
+            category: "z-index",
           },
         },
         name: "Z Index 7",
@@ -39601,12 +34358,7 @@ export default {
         value: "800",
         type: "z-index",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "z-index",
-          },
-          category: "core",
+          category: "z-index",
           type: "z-index",
           item: "8",
           names: {
@@ -39616,6 +34368,11 @@ export default {
             docs: "core.z-index.8",
             es6: "calciteZIndex8",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "z-index",
+          },
         },
         filePath: "src/tokens/core/z-index.json",
         isSource: false,
@@ -39623,24 +34380,7 @@ export default {
           value: "800",
           type: "z-index",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "z-index",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "8",
-              context: "",
-              mode: "",
-            },
+            category: "z-index",
           },
         },
         name: "Z Index 8",
@@ -39651,12 +34391,7 @@ export default {
         value: "900",
         type: "z-index",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "core",
-            type: "z-index",
-          },
-          category: "core",
+          category: "z-index",
           type: "z-index",
           item: "9",
           names: {
@@ -39666,6 +34401,11 @@ export default {
             docs: "core.z-index.9",
             es6: "calciteZIndex9",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "core",
+            type: "z-index",
+          },
         },
         filePath: "src/tokens/core/z-index.json",
         isSource: false,
@@ -39673,24 +34413,7 @@ export default {
           value: "900",
           type: "z-index",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "core",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "z-index",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "9",
-              context: "",
-              mode: "",
-            },
+            category: "z-index",
           },
         },
         name: "Z Index 9",
@@ -40148,12 +34871,7 @@ export default {
           },
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "color",
-              type: "color",
-            },
-            category: "semantic",
+            category: "color",
             type: "color",
             item: "background",
             subitem: "default",
@@ -40164,6 +34882,11 @@ export default {
               docs: "semantic.color.background.default",
               es6: "calciteColorBackground",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "color",
+              type: "color",
+            },
           },
           filePath: "src/tokens/semantic/color/light.json",
           isSource: false,
@@ -40171,24 +34894,7 @@ export default {
             value: "{core.color.neutral.blk-005}",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "background",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "default",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Background",
@@ -40199,12 +34905,7 @@ export default {
           value: "rgba(255, 255, 255, 0)",
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "color",
-              type: "color",
-            },
-            category: "semantic",
+            category: "color",
             type: "color",
             item: "background",
             subitem: "none",
@@ -40215,6 +34916,11 @@ export default {
               docs: "semantic.color.background.none",
               es6: "calciteColorBackgroundNone",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "color",
+              type: "color",
+            },
           },
           filePath: "src/tokens/semantic/color/light.json",
           isSource: false,
@@ -40222,24 +34928,7 @@ export default {
             value: "rgba({core.color.neutral.blk-000}, {core.opacity.0})",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "background",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "none",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Background None",
@@ -40255,12 +34944,7 @@ export default {
           },
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "color",
-              type: "color",
-            },
-            category: "semantic",
+            category: "color",
             type: "color",
             item: "foreground",
             subitem: "1",
@@ -40271,6 +34955,11 @@ export default {
               docs: "semantic.color.foreground.1",
               es6: "calciteColorForeground1",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "color",
+              type: "color",
+            },
           },
           filePath: "src/tokens/semantic/color/light.json",
           isSource: false,
@@ -40278,23 +34967,7 @@ export default {
             value: "{core.color.neutral.blk-000}",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                element: "",
-                category: "color",
-                group: "foreground",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "1",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Foreground 1",
@@ -40308,12 +34981,7 @@ export default {
           },
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "color",
-              type: "color",
-            },
-            category: "semantic",
+            category: "color",
             type: "color",
             item: "foreground",
             subitem: "2",
@@ -40324,6 +34992,11 @@ export default {
               docs: "semantic.color.foreground.2",
               es6: "calciteColorForeground2",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "color",
+              type: "color",
+            },
           },
           filePath: "src/tokens/semantic/color/light.json",
           isSource: false,
@@ -40331,24 +35004,7 @@ export default {
             value: "{core.color.neutral.blk-010}",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "foreground",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "2",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Foreground 2",
@@ -40362,12 +35018,7 @@ export default {
           },
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "color",
-              type: "color",
-            },
-            category: "semantic",
+            category: "color",
             type: "color",
             item: "foreground",
             subitem: "3",
@@ -40378,6 +35029,11 @@ export default {
               docs: "semantic.color.foreground.3",
               es6: "calciteColorForeground3",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "color",
+              type: "color",
+            },
           },
           filePath: "src/tokens/semantic/color/light.json",
           isSource: false,
@@ -40385,24 +35041,7 @@ export default {
             value: "{core.color.neutral.blk-020}",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "foreground",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "3",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Foreground 3",
@@ -40416,12 +35055,7 @@ export default {
           },
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "color",
-              type: "color",
-            },
-            category: "semantic",
+            category: "color",
             type: "color",
             item: "foreground",
             subitem: "current",
@@ -40432,6 +35066,11 @@ export default {
               docs: "semantic.color.foreground.current",
               es6: "calciteColorForegroundCurrent",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "color",
+              type: "color",
+            },
           },
           filePath: "src/tokens/semantic/color/light.json",
           isSource: false,
@@ -40439,24 +35078,7 @@ export default {
             value: "{core.color.high-saturation.blue.h-bb-010}",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "foreground",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "current",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Foreground Current",
@@ -40473,12 +35095,7 @@ export default {
             },
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "color",
-                type: "color",
-              },
-              category: "semantic",
+              category: "color",
               type: "color",
               item: "transparent",
               subitem: "default",
@@ -40490,6 +35107,11 @@ export default {
                 docs: "semantic.color.transparent.default.default",
                 es6: "calciteColorTransparent",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "color",
+                type: "color",
+              },
             },
             filePath: "src/tokens/semantic/color/light.json",
             isSource: false,
@@ -40497,24 +35119,7 @@ export default {
               value: "rgba({core.color.neutral.blk-240}, {core.opacity.0})",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "transparent",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "",
-                  state: "default",
-                  scale: "",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Transparent",
@@ -40528,12 +35133,7 @@ export default {
             },
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "color",
-                type: "color",
-              },
-              category: "semantic",
+              category: "color",
               type: "color",
               item: "transparent",
               subitem: "default",
@@ -40545,6 +35145,11 @@ export default {
                 docs: "semantic.color.transparent.default.hover",
                 es6: "calciteColorTransparentHover",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "color",
+                type: "color",
+              },
             },
             filePath: "src/tokens/semantic/color/light.json",
             isSource: false,
@@ -40552,24 +35157,7 @@ export default {
               value: "rgba({core.color.neutral.blk-240}, {core.opacity.4})",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "transparent",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "",
-                  state: "hover",
-                  scale: "",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Transparent Hover",
@@ -40583,12 +35171,7 @@ export default {
             },
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "color",
-                type: "color",
-              },
-              category: "semantic",
+              category: "color",
               type: "color",
               item: "transparent",
               subitem: "default",
@@ -40600,6 +35183,11 @@ export default {
                 docs: "semantic.color.transparent.default.press",
                 es6: "calciteColorTransparentPress",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "color",
+                type: "color",
+              },
             },
             filePath: "src/tokens/semantic/color/light.json",
             isSource: false,
@@ -40607,24 +35195,7 @@ export default {
               value: "rgba({core.color.neutral.blk-240}, {core.opacity.8})",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "transparent",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "",
-                  state: "press",
-                  scale: "",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Transparent Press",
@@ -40639,12 +35210,7 @@ export default {
           },
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "color",
-              type: "color",
-            },
-            category: "semantic",
+            category: "color",
             type: "color",
             item: "transparent",
             subitem: "scrim",
@@ -40655,6 +35221,11 @@ export default {
               docs: "semantic.color.transparent.scrim",
               es6: "calciteColorTransparentScrim",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "color",
+              type: "color",
+            },
           },
           filePath: "src/tokens/semantic/color/light.json",
           isSource: false,
@@ -40662,24 +35233,7 @@ export default {
             value: "rgba({core.color.neutral.blk-000}, {core.opacity.85})",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "transparent",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "scrim",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Transparent Scrim",
@@ -40693,12 +35247,7 @@ export default {
           },
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "color",
-              type: "color",
-            },
-            category: "semantic",
+            category: "color",
             type: "color",
             item: "transparent",
             subitem: "tint",
@@ -40709,6 +35258,11 @@ export default {
               docs: "semantic.color.transparent.tint",
               es6: "calciteColorTransparentTint",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "color",
+              type: "color",
+            },
           },
           filePath: "src/tokens/semantic/color/light.json",
           isSource: false,
@@ -40716,24 +35270,7 @@ export default {
             value: "rgba({core.color.neutral.blk-000}, {core.opacity.80})",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "transparent",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "tint",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Transparent Tint",
@@ -40750,12 +35287,7 @@ export default {
             },
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "color",
-                type: "color",
-              },
-              category: "semantic",
+              category: "color",
               type: "color",
               item: "brand",
               subitem: "default",
@@ -40767,6 +35299,11 @@ export default {
                 docs: "semantic.color.brand.default.default",
                 es6: "calciteColorBrand",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "color",
+                type: "color",
+              },
             },
             filePath: "src/tokens/semantic/color/light.json",
             isSource: false,
@@ -40774,24 +35311,7 @@ export default {
               value: "{core.color.high-saturation.blue.h-bb-060}",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "brand",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "",
-                  state: "",
-                  scale: "",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Brand",
@@ -40805,12 +35325,7 @@ export default {
             },
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "color",
-                type: "color",
-              },
-              category: "semantic",
+              category: "color",
               type: "color",
               item: "brand",
               subitem: "default",
@@ -40822,6 +35337,11 @@ export default {
                 docs: "semantic.color.brand.default.hover",
                 es6: "calciteColorBrandHover",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "color",
+                type: "color",
+              },
             },
             filePath: "src/tokens/semantic/color/light.json",
             isSource: false,
@@ -40829,24 +35349,7 @@ export default {
               value: "{core.color.high-saturation.blue.h-bb-070}",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "brand",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "",
-                  state: "hover",
-                  scale: "",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Brand Hover",
@@ -40860,12 +35363,7 @@ export default {
             },
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "color",
-                type: "color",
-              },
-              category: "semantic",
+              category: "color",
               type: "color",
               item: "brand",
               subitem: "default",
@@ -40877,6 +35375,11 @@ export default {
                 docs: "semantic.color.brand.default.press",
                 es6: "calciteColorBrandPress",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "color",
+                type: "color",
+              },
             },
             filePath: "src/tokens/semantic/color/light.json",
             isSource: false,
@@ -40884,24 +35387,7 @@ export default {
               value: "{core.color.high-saturation.blue.h-bb-080}",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "brand",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "",
-                  state: "press",
-                  scale: "",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Brand Press",
@@ -40916,12 +35402,7 @@ export default {
             dark: "rgba(0, 160, 255, 0.4)",
           },
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "color",
-              type: "color",
-            },
-            category: "semantic",
+            category: "color",
             type: "color",
             item: "brand",
             subitem: "underline",
@@ -40932,6 +35413,11 @@ export default {
               docs: "semantic.color.brand.underline",
               es6: "calciteColorBrandUnderline",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "color",
+              type: "color",
+            },
           },
           filePath: "src/tokens/semantic/color/light.json",
           isSource: false,
@@ -40940,24 +35426,7 @@ export default {
             value:
               "rgba({core.color.high-saturation.blue.h-bb-070}, {core.opacity.40})",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "brand",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "underline",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Brand Underline",
@@ -40974,12 +35443,7 @@ export default {
             },
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "color",
-                type: "color",
-              },
-              category: "semantic",
+              category: "color",
               type: "color",
               item: "status",
               subitem: "info",
@@ -40991,6 +35455,11 @@ export default {
                 docs: "semantic.color.status.info.default",
                 es6: "calciteColorStatusInfo",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "color",
+                type: "color",
+              },
             },
             filePath: "src/tokens/semantic/color/light.json",
             isSource: false,
@@ -40998,24 +35467,7 @@ export default {
               value: "{core.color.high-saturation.blue.h-bb-070}",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "status",
-                  kind: "info",
-                  appearance: "",
-                  property: "",
-                  variant: "",
-                  state: "",
-                  scale: "",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Status Info",
@@ -41029,12 +35481,7 @@ export default {
             },
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "color",
-                type: "color",
-              },
-              category: "semantic",
+              category: "color",
               type: "color",
               item: "status",
               subitem: "info",
@@ -41046,6 +35493,11 @@ export default {
                 docs: "semantic.color.status.info.hover",
                 es6: "calciteColorStatusInfoHover",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "color",
+                type: "color",
+              },
             },
             filePath: "src/tokens/semantic/color/light.json",
             isSource: false,
@@ -41053,24 +35505,7 @@ export default {
               value: "{core.color.high-saturation.blue.h-bb-080}",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "status",
-                  kind: "info",
-                  appearance: "",
-                  property: "",
-                  variant: "",
-                  state: "hover",
-                  scale: "",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Status Info Hover",
@@ -41084,12 +35519,7 @@ export default {
             },
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "color",
-                type: "color",
-              },
-              category: "semantic",
+              category: "color",
               type: "color",
               item: "status",
               subitem: "info",
@@ -41101,6 +35531,11 @@ export default {
                 docs: "semantic.color.status.info.press",
                 es6: "calciteColorStatusInfoPress",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "color",
+                type: "color",
+              },
             },
             filePath: "src/tokens/semantic/color/light.json",
             isSource: false,
@@ -41108,24 +35543,7 @@ export default {
               value: "{core.color.high-saturation.blue.h-bb-090}",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "status",
-                  kind: "info",
-                  appearance: "",
-                  property: "",
-                  variant: "",
-                  state: "press",
-                  scale: "",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Status Info Press",
@@ -41141,12 +35559,7 @@ export default {
             },
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "color",
-                type: "color",
-              },
-              category: "semantic",
+              category: "color",
               type: "color",
               item: "status",
               subitem: "success",
@@ -41158,6 +35571,11 @@ export default {
                 docs: "semantic.color.status.success.default",
                 es6: "calciteColorStatusSuccess",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "color",
+                type: "color",
+              },
             },
             filePath: "src/tokens/semantic/color/light.json",
             isSource: false,
@@ -41165,24 +35583,7 @@ export default {
               value: "{core.color.high-saturation.green.h-gg-060}",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "status",
-                  kind: "success",
-                  appearance: "",
-                  property: "",
-                  variant: "",
-                  state: "default",
-                  scale: "",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Status Success",
@@ -41196,12 +35597,7 @@ export default {
             },
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "color",
-                type: "color",
-              },
-              category: "semantic",
+              category: "color",
               type: "color",
               item: "status",
               subitem: "success",
@@ -41213,6 +35609,11 @@ export default {
                 docs: "semantic.color.status.success.hover",
                 es6: "calciteColorStatusSuccessHover",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "color",
+                type: "color",
+              },
             },
             filePath: "src/tokens/semantic/color/light.json",
             isSource: false,
@@ -41220,24 +35621,7 @@ export default {
               value: "{core.color.high-saturation.green.h-gg-070}",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "status",
-                  kind: "success",
-                  appearance: "",
-                  property: "",
-                  variant: "",
-                  state: "hover",
-                  scale: "",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Status Success Hover",
@@ -41251,12 +35635,7 @@ export default {
             },
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "color",
-                type: "color",
-              },
-              category: "semantic",
+              category: "color",
               type: "color",
               item: "status",
               subitem: "success",
@@ -41268,6 +35647,11 @@ export default {
                 docs: "semantic.color.status.success.press",
                 es6: "calciteColorStatusSuccessPress",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "color",
+                type: "color",
+              },
             },
             filePath: "src/tokens/semantic/color/light.json",
             isSource: false,
@@ -41275,24 +35659,7 @@ export default {
               value: "{core.color.high-saturation.green.h-gg-080}",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "status",
-                  kind: "success",
-                  appearance: "",
-                  property: "",
-                  variant: "",
-                  state: "press",
-                  scale: "",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Status Success Press",
@@ -41308,12 +35675,7 @@ export default {
             },
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "color",
-                type: "color",
-              },
-              category: "semantic",
+              category: "color",
               type: "color",
               item: "status",
               subitem: "warning",
@@ -41325,6 +35687,11 @@ export default {
                 docs: "semantic.color.status.warning.default",
                 es6: "calciteColorStatusWarning",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "color",
+                type: "color",
+              },
             },
             filePath: "src/tokens/semantic/color/light.json",
             isSource: false,
@@ -41332,24 +35699,7 @@ export default {
               value: "{core.color.high-saturation.yellow.h-yy-060}",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "status",
-                  kind: "warning",
-                  appearance: "",
-                  property: "",
-                  variant: "",
-                  state: "default",
-                  scale: "",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Status Warning",
@@ -41363,12 +35713,7 @@ export default {
             },
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "color",
-                type: "color",
-              },
-              category: "semantic",
+              category: "color",
               type: "color",
               item: "status",
               subitem: "warning",
@@ -41380,6 +35725,11 @@ export default {
                 docs: "semantic.color.status.warning.hover",
                 es6: "calciteColorStatusWarningHover",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "color",
+                type: "color",
+              },
             },
             filePath: "src/tokens/semantic/color/light.json",
             isSource: false,
@@ -41387,24 +35737,7 @@ export default {
               value: "{core.color.high-saturation.yellow.h-yy-070}",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "status",
-                  kind: "warning",
-                  appearance: "",
-                  property: "",
-                  variant: "",
-                  state: "hover",
-                  scale: "",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Status Warning Hover",
@@ -41418,12 +35751,7 @@ export default {
             },
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "color",
-                type: "color",
-              },
-              category: "semantic",
+              category: "color",
               type: "color",
               item: "status",
               subitem: "warning",
@@ -41435,6 +35763,11 @@ export default {
                 docs: "semantic.color.status.warning.press",
                 es6: "calciteColorStatusWarningPress",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "color",
+                type: "color",
+              },
             },
             filePath: "src/tokens/semantic/color/light.json",
             isSource: false,
@@ -41442,24 +35775,7 @@ export default {
               value: "{core.color.high-saturation.yellow.h-yy-080}",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "status",
-                  kind: "warning",
-                  appearance: "",
-                  property: "",
-                  variant: "",
-                  state: "press",
-                  scale: "",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Status Warning Press",
@@ -41475,12 +35791,7 @@ export default {
             },
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "color",
-                type: "color",
-              },
-              category: "semantic",
+              category: "color",
               type: "color",
               item: "status",
               subitem: "danger",
@@ -41492,6 +35803,11 @@ export default {
                 docs: "semantic.color.status.danger.default",
                 es6: "calciteColorStatusDanger",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "color",
+                type: "color",
+              },
             },
             filePath: "src/tokens/semantic/color/light.json",
             isSource: false,
@@ -41499,24 +35815,7 @@ export default {
               value: "{core.color.high-saturation.red.h-rr-060}",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "status",
-                  kind: "danger",
-                  appearance: "",
-                  property: "",
-                  variant: "",
-                  state: "default",
-                  scale: "",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Status Danger",
@@ -41530,12 +35829,7 @@ export default {
             },
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "color",
-                type: "color",
-              },
-              category: "semantic",
+              category: "color",
               type: "color",
               item: "status",
               subitem: "danger",
@@ -41547,6 +35841,11 @@ export default {
                 docs: "semantic.color.status.danger.hover",
                 es6: "calciteColorStatusDangerHover",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "color",
+                type: "color",
+              },
             },
             filePath: "src/tokens/semantic/color/light.json",
             isSource: false,
@@ -41554,24 +35853,7 @@ export default {
               value: "{core.color.high-saturation.red.h-rr-070}",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "status",
-                  kind: "danger",
-                  appearance: "",
-                  property: "",
-                  variant: "",
-                  state: "hover",
-                  scale: "",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Status Danger Hover",
@@ -41585,12 +35867,7 @@ export default {
             },
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "color",
-                type: "color",
-              },
-              category: "semantic",
+              category: "color",
               type: "color",
               item: "status",
               subitem: "danger",
@@ -41602,6 +35879,11 @@ export default {
                 docs: "semantic.color.status.danger.press",
                 es6: "calciteColorStatusDangerPress",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "color",
+                type: "color",
+              },
             },
             filePath: "src/tokens/semantic/color/light.json",
             isSource: false,
@@ -41609,24 +35891,7 @@ export default {
               value: "{core.color.high-saturation.red.h-rr-080}",
               type: "color",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "color",
-                  group: "status",
-                  kind: "danger",
-                  appearance: "",
-                  property: "",
-                  variant: "",
-                  state: "press",
-                  scale: "",
-                  context: "",
-                  mode: "",
-                },
+                category: "color",
               },
             },
             name: "Color Status Danger Press",
@@ -41643,12 +35908,7 @@ export default {
           },
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "color",
-              type: "color",
-            },
-            category: "semantic",
+            category: "color",
             type: "color",
             item: "inverse",
             subitem: "default",
@@ -41659,6 +35919,11 @@ export default {
               docs: "semantic.color.inverse.default",
               es6: "calciteColorInverse",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "color",
+              type: "color",
+            },
           },
           filePath: "src/tokens/semantic/color/light.json",
           isSource: false,
@@ -41666,24 +35931,7 @@ export default {
             value: "{core.color.neutral.blk-190}",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "inverse",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "default",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Inverse",
@@ -41697,12 +35945,7 @@ export default {
           },
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "color",
-              type: "color",
-            },
-            category: "semantic",
+            category: "color",
             type: "color",
             item: "inverse",
             subitem: "hover",
@@ -41713,6 +35956,11 @@ export default {
               docs: "semantic.color.inverse.hover",
               es6: "calciteColorInverseHover",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "color",
+              type: "color",
+            },
           },
           filePath: "src/tokens/semantic/color/light.json",
           isSource: false,
@@ -41720,24 +35968,7 @@ export default {
             value: "{core.color.neutral.blk-200}",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "inverse",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "hover",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Inverse Hover",
@@ -41751,12 +35982,7 @@ export default {
           },
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "color",
-              type: "color",
-            },
-            category: "semantic",
+            category: "color",
             type: "color",
             item: "inverse",
             subitem: "press",
@@ -41767,6 +35993,11 @@ export default {
               docs: "semantic.color.inverse.press",
               es6: "calciteColorInversePress",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "color",
+              type: "color",
+            },
           },
           filePath: "src/tokens/semantic/color/light.json",
           isSource: false,
@@ -41774,24 +36005,7 @@ export default {
             value: "{core.color.neutral.blk-210}",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "inverse",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "press",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Inverse Press",
@@ -41807,12 +36021,7 @@ export default {
           },
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "color",
-              type: "color",
-            },
-            category: "semantic",
+            category: "color",
             type: "color",
             item: "text",
             subitem: "1",
@@ -41823,6 +36032,11 @@ export default {
               docs: "semantic.color.text.1",
               es6: "calciteColorText1",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "color",
+              type: "color",
+            },
           },
           filePath: "src/tokens/semantic/color/light.json",
           isSource: false,
@@ -41830,24 +36044,7 @@ export default {
             value: "{core.color.neutral.blk-220}",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "text",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "1",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Text 1",
@@ -41861,12 +36058,7 @@ export default {
           },
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "color",
-              type: "color",
-            },
-            category: "semantic",
+            category: "color",
             type: "color",
             item: "text",
             subitem: "2",
@@ -41877,6 +36069,11 @@ export default {
               docs: "semantic.color.text.2",
               es6: "calciteColorText2",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "color",
+              type: "color",
+            },
           },
           filePath: "src/tokens/semantic/color/light.json",
           isSource: false,
@@ -41884,24 +36081,7 @@ export default {
             value: "{core.color.neutral.blk-170}",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "text",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "2",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Text 2",
@@ -41915,12 +36095,7 @@ export default {
           },
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "color",
-              type: "color",
-            },
-            category: "semantic",
+            category: "color",
             type: "color",
             item: "text",
             subitem: "3",
@@ -41931,6 +36106,11 @@ export default {
               docs: "semantic.color.text.3",
               es6: "calciteColorText3",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "color",
+              type: "color",
+            },
           },
           filePath: "src/tokens/semantic/color/light.json",
           isSource: false,
@@ -41938,24 +36118,7 @@ export default {
             value: "{core.color.neutral.blk-140}",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "text",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "3",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Text 3",
@@ -41969,12 +36132,7 @@ export default {
           },
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "color",
-              type: "color",
-            },
-            category: "semantic",
+            category: "color",
             type: "color",
             item: "text",
             subitem: "inverse",
@@ -41985,6 +36143,11 @@ export default {
               docs: "semantic.color.text.inverse",
               es6: "calciteColorTextInverse",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "color",
+              type: "color",
+            },
           },
           filePath: "src/tokens/semantic/color/light.json",
           isSource: false,
@@ -41992,24 +36155,7 @@ export default {
             value: "{core.color.neutral.blk-000}",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Text Inverse",
@@ -42023,12 +36169,7 @@ export default {
           },
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "color",
-              type: "color",
-            },
-            category: "semantic",
+            category: "color",
             type: "color",
             item: "text",
             subitem: "link",
@@ -42039,6 +36180,11 @@ export default {
               docs: "semantic.color.text.link",
               es6: "calciteColorTextLink",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "color",
+              type: "color",
+            },
           },
           filePath: "src/tokens/semantic/color/light.json",
           isSource: false,
@@ -42046,24 +36192,7 @@ export default {
             value: "{core.color.high-saturation.blue.h-bb-070}",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Text Link",
@@ -42079,12 +36208,7 @@ export default {
           },
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "color",
-              type: "color",
-            },
-            category: "semantic",
+            category: "color",
             type: "color",
             item: "border",
             subitem: "1",
@@ -42095,6 +36219,11 @@ export default {
               docs: "semantic.color.border.1",
               es6: "calciteColorBorder1",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "color",
+              type: "color",
+            },
           },
           filePath: "src/tokens/semantic/color/light.json",
           isSource: false,
@@ -42102,24 +36231,7 @@ export default {
             value: "{core.color.neutral.blk-050}",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "border",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "1",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Border 1",
@@ -42133,12 +36245,7 @@ export default {
           },
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "color",
-              type: "color",
-            },
-            category: "semantic",
+            category: "color",
             type: "color",
             item: "border",
             subitem: "2",
@@ -42149,6 +36256,11 @@ export default {
               docs: "semantic.color.border.2",
               es6: "calciteColorBorder2",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "color",
+              type: "color",
+            },
           },
           filePath: "src/tokens/semantic/color/light.json",
           isSource: false,
@@ -42156,24 +36268,7 @@ export default {
             value: "{core.color.neutral.blk-040}",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "border",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "2",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Border 2",
@@ -42187,12 +36282,7 @@ export default {
           },
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "color",
-              type: "color",
-            },
-            category: "semantic",
+            category: "color",
             type: "color",
             item: "border",
             subitem: "3",
@@ -42203,6 +36293,11 @@ export default {
               docs: "semantic.color.border.3",
               es6: "calciteColorBorder3",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "color",
+              type: "color",
+            },
           },
           filePath: "src/tokens/semantic/color/light.json",
           isSource: false,
@@ -42210,24 +36305,7 @@ export default {
             value: "{core.color.neutral.blk-030}",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "border",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "3",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Border 3",
@@ -42241,12 +36319,7 @@ export default {
           },
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "color",
-              type: "color",
-            },
-            category: "semantic",
+            category: "color",
             type: "color",
             item: "border",
             subitem: "input",
@@ -42257,6 +36330,11 @@ export default {
               docs: "semantic.color.border.input",
               es6: "calciteColorBorderInput",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "color",
+              type: "color",
+            },
           },
           filePath: "src/tokens/semantic/color/light.json",
           isSource: false,
@@ -42264,24 +36342,7 @@ export default {
             value: "{core.color.neutral.blk-100}",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "border",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "input",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Border Input",
@@ -42295,12 +36356,7 @@ export default {
           },
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "color",
-              type: "color",
-            },
-            category: "semantic",
+            category: "color",
             type: "color",
             item: "border",
             subitem: "ghost",
@@ -42311,6 +36367,11 @@ export default {
               docs: "semantic.color.border.ghost",
               es6: "calciteColorBorderGhost",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "color",
+              type: "color",
+            },
           },
           filePath: "src/tokens/semantic/color/light.json",
           isSource: false,
@@ -42318,24 +36379,7 @@ export default {
             value: "rgba({core.color.neutral.blk-240}, {core.opacity.30})",
             type: "color",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "border",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "ghost",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "color",
             },
           },
           name: "Color Border Ghost",
@@ -42349,12 +36393,7 @@ export default {
           },
           type: "color",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "color",
-              type: "color",
-            },
-            category: "semantic",
+            category: "color",
             type: "color",
             item: "border",
             subitem: "white",
@@ -42365,31 +36404,19 @@ export default {
               docs: "semantic.color.border.white",
               es6: "calciteColorBorderWhite",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "color",
+              type: "color",
+            },
           },
           filePath: "src/tokens/semantic/color/light.json",
           isSource: false,
-          original: {
-            value: "{core.color.neutral.blk-000}",
-            type: "color",
-            attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "color",
-                group: "border",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "white",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+          original: {
+            value: "{core.color.neutral.blk-000}",
+            type: "color",
+            attributes: {
+              category: "color",
             },
           },
           name: "Color Border White",
@@ -42404,12 +36431,7 @@ export default {
           value: "0",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "border",
             type: "border",
             item: "width",
             subitem: "none",
@@ -42420,6 +36442,11 @@ export default {
               docs: "semantic.border.width.none",
               es6: "calciteBorderWidthNone",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/border.json",
           isSource: true,
@@ -42427,24 +36454,7 @@ export default {
             value: "{core.size.default.none}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "border",
-                group: "width",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "none",
-                context: "",
-                mode: "",
-              },
+              category: "border",
             },
           },
           name: "Border Width None",
@@ -42455,12 +36465,7 @@ export default {
           value: "1px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "border",
             type: "border",
             item: "width",
             subitem: "sm",
@@ -42471,6 +36476,11 @@ export default {
               docs: "semantic.border.width.sm",
               es6: "calciteBorderWidthSm",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/border.json",
           isSource: true,
@@ -42478,24 +36488,7 @@ export default {
             value: "{core.size.default.1}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "border",
-                group: "width",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "sm",
-                context: "",
-                mode: "",
-              },
+              category: "border",
             },
           },
           name: "Border Width Sm",
@@ -42506,12 +36499,7 @@ export default {
           value: "2px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "border",
             type: "border",
             item: "width",
             subitem: "md",
@@ -42522,6 +36510,11 @@ export default {
               docs: "semantic.border.width.md",
               es6: "calciteBorderWidthMd",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/border.json",
           isSource: true,
@@ -42529,24 +36522,7 @@ export default {
             value: "{core.size.default.2}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "border",
-                group: "width",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "md",
-                context: "",
-                mode: "",
-              },
+              category: "border",
             },
           },
           name: "Border Width Md",
@@ -42557,12 +36533,7 @@ export default {
           value: "4px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "border",
             type: "border",
             item: "width",
             subitem: "lg",
@@ -42573,6 +36544,11 @@ export default {
               docs: "semantic.border.width.lg",
               es6: "calciteBorderWidthLg",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/border.json",
           isSource: true,
@@ -42580,24 +36556,7 @@ export default {
             value: "{core.size.default.4}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "border",
-                group: "width",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "lg",
-                context: "",
-                mode: "",
-              },
+              category: "border",
             },
           },
           name: "Border Width Lg",
@@ -42616,12 +36575,7 @@ export default {
           type: "dimension",
           description: "Small handheld devices and mini-windows",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "breakpoint",
             type: "dimension",
             item: "height",
             subitem: "xxs",
@@ -42642,6 +36596,11 @@ export default {
               docs: "semantic.container-size.height.xxs",
               es6: "calciteContainerSizeHeightXxs",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/container-size.json",
           isSource: true,
@@ -42653,24 +36612,7 @@ export default {
             type: "dimension",
             description: "Small handheld devices and mini-windows",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "breakpoint",
-                group: "height",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xxs",
-                context: "",
-                mode: "",
-              },
+              category: "breakpoint",
             },
           },
           name: "Container Size Height Xxs",
@@ -42686,12 +36628,7 @@ export default {
           type: "dimension",
           description: "Handheld devices",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "breakpoint",
             type: "dimension",
             item: "height",
             subitem: "xs",
@@ -42712,6 +36649,11 @@ export default {
               docs: "semantic.container-size.height.xs",
               es6: "calciteContainerSizeHeightXs",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/container-size.json",
           isSource: true,
@@ -42723,24 +36665,7 @@ export default {
             type: "dimension",
             description: "Handheld devices",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "breakpoint",
-                group: "height",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xs",
-                context: "",
-                mode: "",
-              },
+              category: "breakpoint",
             },
           },
           name: "Container Size Height Xs",
@@ -42756,12 +36681,7 @@ export default {
           type: "dimension",
           description: "Small tablets",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "breakpoint",
             type: "dimension",
             item: "height",
             subitem: "sm",
@@ -42782,6 +36702,11 @@ export default {
               docs: "semantic.container-size.height.sm",
               es6: "calciteContainerSizeHeightSm",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/container-size.json",
           isSource: true,
@@ -42793,24 +36718,7 @@ export default {
             type: "dimension",
             description: "Small tablets",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "breakpoint",
-                group: "height",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "sm",
-                context: "",
-                mode: "",
-              },
+              category: "breakpoint",
             },
           },
           name: "Container Size Height Sm",
@@ -42826,12 +36734,7 @@ export default {
           type: "dimension",
           description: "Small laptops",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "breakpoint",
             type: "dimension",
             item: "height",
             subitem: "md",
@@ -42852,6 +36755,11 @@ export default {
               docs: "semantic.container-size.height.md",
               es6: "calciteContainerSizeHeightMd",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/container-size.json",
           isSource: true,
@@ -42863,24 +36771,7 @@ export default {
             type: "dimension",
             description: "Small laptops",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "breakpoint",
-                group: "height",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "md",
-                context: "",
-                mode: "",
-              },
+              category: "breakpoint",
             },
           },
           name: "Container Size Height Md",
@@ -42896,12 +36787,7 @@ export default {
           type: "dimension",
           description: "Large laptops and desktop computers",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "breakpoint",
             type: "dimension",
             item: "height",
             subitem: "lg",
@@ -42922,6 +36808,11 @@ export default {
               docs: "semantic.container-size.height.lg",
               es6: "calciteContainerSizeHeightLg",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/container-size.json",
           isSource: true,
@@ -42933,24 +36824,7 @@ export default {
             type: "dimension",
             description: "Large laptops and desktop computers",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "breakpoint",
-                group: "height",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "lg",
-                context: "",
-                mode: "",
-              },
+              category: "breakpoint",
             },
           },
           name: "Container Size Height Lg",
@@ -42965,12 +36839,7 @@ export default {
           type: "dimension",
           description: "Projectors and televisions",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "breakpoint",
             type: "dimension",
             item: "height",
             subitem: "xl",
@@ -42990,6 +36859,11 @@ export default {
               docs: "semantic.container-size.height.xl",
               es6: "calciteContainerSizeHeightXl",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/container-size.json",
           isSource: true,
@@ -43000,24 +36874,7 @@ export default {
             type: "dimension",
             description: "Projectors and televisions",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "breakpoint",
-                group: "height",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xl",
-                context: "",
-                mode: "",
-              },
+              category: "breakpoint",
             },
           },
           name: "Container Size Height Xl",
@@ -43035,12 +36892,7 @@ export default {
           type: "dimension",
           description: "Small handheld devices and mini-windows",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "breakpoint",
             type: "dimension",
             item: "width",
             subitem: "xxs",
@@ -43061,6 +36913,11 @@ export default {
               docs: "semantic.container-size.width.xxs",
               es6: "calciteContainerSizeWidthXxs",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/container-size.json",
           isSource: true,
@@ -43072,24 +36929,7 @@ export default {
             type: "dimension",
             description: "Small handheld devices and mini-windows",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "breakpoint",
-                group: "width",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xxs",
-                context: "",
-                mode: "",
-              },
+              category: "breakpoint",
             },
           },
           name: "Container Size Width Xxs",
@@ -43105,12 +36945,7 @@ export default {
           type: "dimension",
           description: "Handheld devices",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "breakpoint",
             type: "dimension",
             item: "width",
             subitem: "xs",
@@ -43131,6 +36966,11 @@ export default {
               docs: "semantic.container-size.width.xs",
               es6: "calciteContainerSizeWidthXs",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/container-size.json",
           isSource: true,
@@ -43142,24 +36982,7 @@ export default {
             type: "dimension",
             description: "Handheld devices",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "breakpoint",
-                group: "width",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xs",
-                context: "",
-                mode: "",
-              },
+              category: "breakpoint",
             },
           },
           name: "Container Size Width Xs",
@@ -43175,12 +36998,7 @@ export default {
           type: "dimension",
           description: "Small tablets",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "breakpoint",
             type: "dimension",
             item: "width",
             subitem: "sm",
@@ -43201,6 +37019,11 @@ export default {
               docs: "semantic.container-size.width.sm",
               es6: "calciteContainerSizeWidthSm",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/container-size.json",
           isSource: true,
@@ -43212,24 +37035,7 @@ export default {
             type: "dimension",
             description: "Small tablets",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "breakpoint",
-                group: "width",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "sm",
-                context: "",
-                mode: "",
-              },
+              category: "breakpoint",
             },
           },
           name: "Container Size Width Sm",
@@ -43245,12 +37051,7 @@ export default {
           type: "dimension",
           description: "Small laptops",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "breakpoint",
             type: "dimension",
             item: "width",
             subitem: "md",
@@ -43271,6 +37072,11 @@ export default {
               docs: "semantic.container-size.width.md",
               es6: "calciteContainerSizeWidthMd",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/container-size.json",
           isSource: true,
@@ -43282,24 +37088,7 @@ export default {
             type: "dimension",
             description: "Small laptops",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "breakpoint",
-                group: "width",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "md",
-                context: "",
-                mode: "",
-              },
+              category: "breakpoint",
             },
           },
           name: "Container Size Width Md",
@@ -43315,12 +37104,7 @@ export default {
           type: "dimension",
           description: "Large laptops and desktop computers",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "breakpoint",
             type: "dimension",
             item: "width",
             subitem: "lg",
@@ -43341,6 +37125,11 @@ export default {
               docs: "semantic.container-size.width.lg",
               es6: "calciteContainerSizeWidthLg",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/container-size.json",
           isSource: true,
@@ -43352,24 +37141,7 @@ export default {
             type: "dimension",
             description: "Large laptops and desktop computers",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "breakpoint",
-                group: "width",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "lg",
-                context: "",
-                mode: "",
-              },
+              category: "breakpoint",
             },
           },
           name: "Container Size Width Lg",
@@ -43384,12 +37156,7 @@ export default {
           type: "dimension",
           description: "Projectors and televisions",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "breakpoint",
             type: "dimension",
             item: "width",
             subitem: "xl",
@@ -43409,6 +37176,11 @@ export default {
               docs: "semantic.container-size.width.xl",
               es6: "calciteContainerSizeWidthXl",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/container-size.json",
           isSource: true,
@@ -43419,24 +37191,7 @@ export default {
             type: "dimension",
             description: "Projectors and televisions",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "breakpoint",
-                group: "width",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xl",
-                context: "",
-                mode: "",
-              },
+              category: "breakpoint",
             },
           },
           name: "Container Size Width Xl",
@@ -43449,12 +37204,7 @@ export default {
         value: "24px",
         type: "dimension",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "dimension",
-          },
-          category: "semantic",
+          category: "breakpoint",
           type: "container-size",
           item: "margin",
           names: {
@@ -43464,6 +37214,11 @@ export default {
             docs: "semantic.container-size.margin",
             es6: "calciteContainerSizeMargin",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "dimension",
+          },
         },
         filePath: "src/tokens/semantic/container-size.json",
         isSource: true,
@@ -43471,24 +37226,7 @@ export default {
           value: "{core.size.default.24}",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "breakpoint",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "margin",
-              variant: "",
-              state: "",
-              scale: "",
-              context: "",
-              mode: "",
-            },
+            category: "breakpoint",
           },
         },
         name: "Container Size Margin",
@@ -43499,12 +37237,7 @@ export default {
         value: "16px",
         type: "dimension",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "dimension",
-          },
-          category: "semantic",
+          category: "breakpoint",
           type: "container-size",
           item: "gutter",
           names: {
@@ -43514,6 +37247,11 @@ export default {
             docs: "semantic.container-size.gutter",
             es6: "calciteContainerSizeGutter",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "dimension",
+          },
         },
         filePath: "src/tokens/semantic/container-size.json",
         isSource: true,
@@ -43521,24 +37259,7 @@ export default {
           value: "{core.size.default.16}",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "breakpoint",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "gutter",
-              variant: "",
-              state: "",
-              scale: "",
-              context: "",
-              mode: "",
-            },
+            category: "breakpoint",
           },
         },
         name: "Container Size Gutter",
@@ -43551,12 +37272,7 @@ export default {
           type: "dimension",
           description: "for fluid grid widths",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "breakpoint",
             type: "dimension",
             item: "content",
             subitem: "fluid",
@@ -43574,6 +37290,11 @@ export default {
               docs: "semantic.container-size.content.fluid",
               es6: "calciteContainerSizeContentFluid",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/container-size.json",
           isSource: true,
@@ -43582,24 +37303,7 @@ export default {
             type: "dimension",
             description: "for fluid grid widths",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "breakpoint",
-                group: "content",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "fluid",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "breakpoint",
             },
           },
           name: "Container Size Content Fluid",
@@ -43612,12 +37316,7 @@ export default {
           type: "dimension",
           description: "only for lg breakpoint fixed grid width",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "breakpoint",
             type: "dimension",
             item: "content",
             subitem: "fixed",
@@ -43635,6 +37334,11 @@ export default {
               docs: "semantic.container-size.content.fixed",
               es6: "calciteContainerSizeContentFixed",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/container-size.json",
           isSource: true,
@@ -43643,24 +37347,7 @@ export default {
             type: "dimension",
             description: "only for lg breakpoint fixed grid width",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "breakpoint",
-                group: "content",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "fixed",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "breakpoint",
             },
           },
           name: "Container Size Content Fixed",
@@ -43676,12 +37363,7 @@ export default {
           value: "0",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "corner",
             type: "corner",
             item: "radius",
             subitem: "default",
@@ -43692,6 +37374,11 @@ export default {
               docs: "semantic.corner.radius.default",
               es6: "calciteCornerRadius",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/corner.json",
           isSource: true,
@@ -43699,24 +37386,7 @@ export default {
             value: "{semantic.corner.radius.sharp}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "corner",
-                group: "radius",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "default",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "corner",
             },
           },
           name: "Corner Radius",
@@ -43727,12 +37397,7 @@ export default {
           value: "0",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "corner",
             type: "corner",
             item: "radius",
             subitem: "sharp",
@@ -43743,6 +37408,11 @@ export default {
               docs: "semantic.corner.radius.sharp",
               es6: "calciteCornerRadiusSharp",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/corner.json",
           isSource: true,
@@ -43750,24 +37420,7 @@ export default {
             value: "{core.size.default.none}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "corner",
-                group: "radius",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "sharp",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "corner",
             },
           },
           name: "Corner Radius Sharp",
@@ -43778,12 +37431,7 @@ export default {
           value: "4px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "corner",
             type: "corner",
             item: "radius",
             subitem: "round",
@@ -43794,6 +37442,11 @@ export default {
               docs: "semantic.corner.radius.round",
               es6: "calciteCornerRadiusRound",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/corner.json",
           isSource: true,
@@ -43801,24 +37454,7 @@ export default {
             value: "{core.size.default.4}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "corner",
-                group: "radius",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "round",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "corner",
             },
           },
           name: "Corner Radius Round",
@@ -43829,12 +37465,8 @@ export default {
           value: "100%",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            element: "",
+            category: "corner",
             type: "corner",
             item: "radius",
             subitem: "pill",
@@ -43845,6 +37477,11 @@ export default {
               docs: "semantic.corner.radius.pill",
               es6: "calciteCornerRadiusPill",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/corner.json",
           isSource: true,
@@ -43852,24 +37489,8 @@ export default {
             value: "{core.size.relative.100}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "corner",
-                group: "radius",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "pill",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              element: "",
+              category: "corner",
             },
           },
           name: "Corner Radius Pill",
@@ -43885,11 +37506,7 @@ export default {
           type: "fontFamily",
           description: "Primary font with fallbacks",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "fontFamily",
-            },
+            group: "family",
             category: "semantic",
             type: "fontFamily",
             item: "family",
@@ -43908,6 +37525,11 @@ export default {
               docs: "semantic.font.family.default",
               es6: "calciteFontFamily",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "fontFamily",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -43921,24 +37543,7 @@ export default {
             type: "fontFamily",
             description: "Primary font with fallbacks",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "family",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              group: "family",
             },
           },
           name: "Font Family",
@@ -43957,12 +37562,7 @@ export default {
           type: "fontFamily",
           description: "Font family for code with fallbacks",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "fontFamily",
-            },
-            category: "semantic",
+            category: "font",
             type: "fontFamily",
             item: "family",
             subitem: "code",
@@ -43986,6 +37586,11 @@ export default {
               docs: "semantic.font.family.code",
               es6: "calciteFontFamilyCode",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "fontFamily",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -44000,24 +37605,7 @@ export default {
             type: "fontFamily",
             description: "Font family for code with fallbacks",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "family",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "code",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Family Code",
@@ -44032,12 +37620,7 @@ export default {
           type: "fontWeight",
           description: "For Avenir Next World (secondary font family)",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "fontWeight",
-            },
-            category: "semantic",
+            category: "font",
             type: "fontWeight",
             item: "weight",
             subitem: "light",
@@ -44055,6 +37638,11 @@ export default {
               docs: "semantic.font.weight.light",
               es6: "calciteFontWeightLight",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "fontWeight",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -44063,24 +37651,7 @@ export default {
             type: "fontWeight",
             description: "For Avenir Next World (secondary font family)",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "weight",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "light",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Weight Light",
@@ -44097,12 +37668,7 @@ export default {
             "calcite.deprecated": true,
           },
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "fontWeight",
-            },
-            category: "semantic",
+            category: "font",
             type: "fontWeight",
             item: "weight",
             subitem: "normal",
@@ -44125,6 +37691,11 @@ export default {
               docs: "semantic.font.weight.normal",
               es6: "calciteFontWeightNormal",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "fontWeight",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -44137,24 +37708,7 @@ export default {
               "calcite.deprecated": true,
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "weight",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "normal",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Weight Normal",
@@ -44167,12 +37721,7 @@ export default {
           value: "400",
           type: "fontWeight",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "fontWeight",
-            },
-            category: "semantic",
+            category: "font",
             type: "font",
             item: "weight",
             subitem: "regular",
@@ -44183,6 +37732,11 @@ export default {
               docs: "semantic.font.weight.regular",
               es6: "calciteFontWeightRegular",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "fontWeight",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -44190,24 +37744,7 @@ export default {
             value: "{core.font.weight.regular}",
             type: "fontWeight",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "weight",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "regular",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Weight Regular",
@@ -44218,12 +37755,7 @@ export default {
           value: "500",
           type: "fontWeight",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "fontWeight",
-            },
-            category: "semantic",
+            category: "font",
             type: "font",
             item: "weight",
             subitem: "medium",
@@ -44234,6 +37766,11 @@ export default {
               docs: "semantic.font.weight.medium",
               es6: "calciteFontWeightMedium",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "fontWeight",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -44241,24 +37778,7 @@ export default {
             value: "{core.font.weight.medium}",
             type: "fontWeight",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "weight",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "medium",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Weight Medium",
@@ -44269,12 +37789,7 @@ export default {
           value: "600",
           type: "fontWeight",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "fontWeight",
-            },
-            category: "semantic",
+            category: "font",
             type: "font",
             item: "weight",
             subitem: "semibold",
@@ -44285,6 +37800,11 @@ export default {
               docs: "semantic.font.weight.semibold",
               es6: "calciteFontWeightSemibold",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "fontWeight",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -44292,24 +37812,7 @@ export default {
             value: "{core.font.weight.demi}",
             type: "fontWeight",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "weight",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "semibold",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Weight Semibold",
@@ -44320,12 +37823,7 @@ export default {
           value: "600",
           type: "fontWeight",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "fontWeight",
-            },
-            category: "semantic",
+            category: "font",
             type: "font",
             item: "weight",
             subitem: "bold",
@@ -44336,31 +37834,19 @@ export default {
               docs: "semantic.font.weight.bold",
               es6: "calciteFontWeightBold",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "fontWeight",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
           original: {
             value: "{core.font.weight.demi}",
-            type: "fontWeight",
-            attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "weight",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "bold",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+            type: "fontWeight",
+            attributes: {
+              category: "font",
             },
           },
           name: "Font Weight Bold",
@@ -44373,12 +37859,7 @@ export default {
           value: "10px",
           type: "fontSize",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "fontSize",
-            },
-            category: "semantic",
+            category: "font",
             type: "font",
             item: "size",
             subitem: "xs",
@@ -44389,6 +37870,11 @@ export default {
               docs: "semantic.font.size.xs",
               es6: "calciteFontSizeXs",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "fontSize",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -44396,24 +37882,7 @@ export default {
             value: "{core.size.default.10}",
             type: "fontSize",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "size",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xs",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Size Xs",
@@ -44424,12 +37893,7 @@ export default {
           value: "12px",
           type: "fontSize",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "fontSize",
-            },
-            category: "semantic",
+            category: "font",
             type: "font",
             item: "size",
             subitem: "sm",
@@ -44440,6 +37904,11 @@ export default {
               docs: "semantic.font.size.sm",
               es6: "calciteFontSizeSm",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "fontSize",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -44447,24 +37916,7 @@ export default {
             value: "{core.size.default.12}",
             type: "fontSize",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "size",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "sm",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Size Sm",
@@ -44475,12 +37927,7 @@ export default {
           value: "14px",
           type: "fontSize",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "fontSize",
-            },
-            category: "semantic",
+            category: "font",
             type: "font",
             item: "size",
             subitem: "default",
@@ -44491,6 +37938,11 @@ export default {
               docs: "semantic.font.size.default",
               es6: "calciteFontSize",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "fontSize",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -44498,24 +37950,7 @@ export default {
             value: "{core.size.default.14}",
             type: "fontSize",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "size",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "default",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Size",
@@ -44526,12 +37961,7 @@ export default {
           value: "16px",
           type: "fontSize",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "fontSize",
-            },
-            category: "semantic",
+            category: "font",
             type: "font",
             item: "size",
             subitem: "md",
@@ -44542,6 +37972,11 @@ export default {
               docs: "semantic.font.size.md",
               es6: "calciteFontSizeMd",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "fontSize",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -44549,24 +37984,7 @@ export default {
             value: "{core.size.default.16}",
             type: "fontSize",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "size",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "md",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Size Md",
@@ -44577,12 +37995,7 @@ export default {
           value: "18px",
           type: "fontSize",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "fontSize",
-            },
-            category: "semantic",
+            category: "font",
             type: "font",
             item: "size",
             subitem: "lg",
@@ -44593,6 +38006,11 @@ export default {
               docs: "semantic.font.size.lg",
               es6: "calciteFontSizeLg",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "fontSize",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -44600,24 +38018,7 @@ export default {
             value: "{core.size.default.2} * 9",
             type: "fontSize",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "size",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "lg",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Size Lg",
@@ -44628,12 +38029,7 @@ export default {
           value: "20px",
           type: "fontSize",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "fontSize",
-            },
-            category: "semantic",
+            category: "font",
             type: "font",
             item: "size",
             subitem: "xl",
@@ -44644,6 +38040,11 @@ export default {
               docs: "semantic.font.size.xl",
               es6: "calciteFontSizeXl",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "fontSize",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -44651,24 +38052,7 @@ export default {
             value: "{core.size.default.20}",
             type: "fontSize",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "size",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xl",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Size Xl",
@@ -44679,12 +38063,7 @@ export default {
           value: "24px",
           type: "fontSize",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "fontSize",
-            },
-            category: "semantic",
+            category: "font",
             type: "font",
             item: "size",
             subitem: "xxl",
@@ -44695,6 +38074,11 @@ export default {
               docs: "semantic.font.size.xxl",
               es6: "calciteFontSizeXxl",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "fontSize",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -44702,24 +38086,7 @@ export default {
             value: "{core.size.default.24}",
             type: "fontSize",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "size",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xxl",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Size Xxl",
@@ -44733,12 +38100,7 @@ export default {
           type: "fontStyle",
           description: "used in ratings",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "fontStyle",
-            },
-            category: "semantic",
+            category: "font",
             type: "fontStyle",
             item: "style",
             subitem: "emphasis",
@@ -44756,6 +38118,11 @@ export default {
               docs: "semantic.font.style.emphasis",
               es6: "calciteFontStyleEmphasis",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "fontStyle",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -44764,24 +38131,7 @@ export default {
             type: "fontStyle",
             description: "used in ratings",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "style",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "emphasis",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Style Emphasis",
@@ -44796,12 +38146,7 @@ export default {
             value: "12px",
             type: "lineHeight",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "lineHeight",
-              },
-              category: "semantic",
+              category: "font",
               type: "font",
               item: "line-height",
               subitem: "fixed",
@@ -44813,6 +38158,11 @@ export default {
                 docs: "semantic.font.line-height.fixed.sm",
                 es6: "calciteFontLineHeightFixedSm",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "lineHeight",
+              },
             },
             filePath: "src/tokens/semantic/font.json",
             isSource: true,
@@ -44820,24 +38170,7 @@ export default {
               value: "{core.size.default.12}",
               type: "lineHeight",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "font",
-                  group: "line-height",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "fixed",
-                  state: "",
-                  scale: "sm",
-                  context: "",
-                  mode: "",
-                },
+                category: "font",
               },
             },
             name: "Font Line Height Fixed Sm",
@@ -44848,12 +38181,7 @@ export default {
             value: "16px",
             type: "lineHeight",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "lineHeight",
-              },
-              category: "semantic",
+              category: "font",
               type: "font",
               item: "line-height",
               subitem: "fixed",
@@ -44865,6 +38193,11 @@ export default {
                 docs: "semantic.font.line-height.fixed.base",
                 es6: "calciteFontLineHeightFixedBase",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "lineHeight",
+              },
             },
             filePath: "src/tokens/semantic/font.json",
             isSource: true,
@@ -44872,24 +38205,7 @@ export default {
               value: "{core.size.default.16}",
               type: "lineHeight",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "font",
-                  group: "line-height",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "fixed",
-                  state: "",
-                  scale: "base",
-                  context: "",
-                  mode: "",
-                },
+                category: "font",
               },
             },
             name: "Font Line Height Fixed Base",
@@ -44900,12 +38216,7 @@ export default {
             value: "20px",
             type: "lineHeight",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "lineHeight",
-              },
-              category: "semantic",
+              category: "font",
               type: "font",
               item: "line-height",
               subitem: "fixed",
@@ -44917,6 +38228,11 @@ export default {
                 docs: "semantic.font.line-height.fixed.lg",
                 es6: "calciteFontLineHeightFixedLg",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "lineHeight",
+              },
             },
             filePath: "src/tokens/semantic/font.json",
             isSource: true,
@@ -44924,24 +38240,7 @@ export default {
               value: "{core.size.default.20}",
               type: "lineHeight",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "font",
-                  group: "line-height",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "fixed",
-                  state: "",
-                  scale: "lg",
-                  context: "",
-                  mode: "",
-                },
+                category: "font",
               },
             },
             name: "Font Line Height Fixed Lg",
@@ -44952,12 +38251,7 @@ export default {
             value: "24px",
             type: "lineHeight",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "lineHeight",
-              },
-              category: "semantic",
+              category: "font",
               type: "font",
               item: "line-height",
               subitem: "fixed",
@@ -44969,6 +38263,11 @@ export default {
                 docs: "semantic.font.line-height.fixed.xl",
                 es6: "calciteFontLineHeightFixedXl",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "lineHeight",
+              },
             },
             filePath: "src/tokens/semantic/font.json",
             isSource: true,
@@ -44976,24 +38275,7 @@ export default {
               value: "{core.size.default.24}",
               type: "lineHeight",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "font",
-                  group: "line-height",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "fixed",
-                  state: "",
-                  scale: "xl",
-                  context: "",
-                  mode: "",
-                },
+                category: "font",
               },
             },
             name: "Font Line Height Fixed Xl",
@@ -45007,12 +38289,7 @@ export default {
             type: "lineHeight",
             description: "1",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "lineHeight",
-              },
-              category: "semantic",
+              category: "font",
               type: "lineHeight",
               item: "line-height",
               subitem: "relative",
@@ -45031,6 +38308,11 @@ export default {
                 docs: "semantic.font.line-height.relative.default",
                 es6: "calciteFontLineHeightRelative",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "lineHeight",
+              },
             },
             filePath: "src/tokens/semantic/font.json",
             isSource: true,
@@ -45039,24 +38321,7 @@ export default {
               type: "lineHeight",
               description: "1",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "font",
-                  group: "line-height",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "relative",
-                  state: "",
-                  scale: "default",
-                  context: "",
-                  mode: "",
-                },
+                category: "font",
               },
             },
             name: "Font Line Height Relative",
@@ -45069,12 +38334,7 @@ export default {
             type: "lineHeight",
             description: "1.25",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "lineHeight",
-              },
-              category: "semantic",
+              category: "font",
               type: "lineHeight",
               item: "line-height",
               subitem: "relative",
@@ -45093,6 +38353,11 @@ export default {
                 docs: "semantic.font.line-height.relative.tight",
                 es6: "calciteFontLineHeightRelativeTight",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "lineHeight",
+              },
             },
             filePath: "src/tokens/semantic/font.json",
             isSource: true,
@@ -45101,24 +38366,7 @@ export default {
               type: "lineHeight",
               description: "1.25",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "font",
-                  group: "line-height",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "relative",
-                  state: "",
-                  scale: "tight",
-                  context: "",
-                  mode: "",
-                },
+                category: "font",
               },
             },
             name: "Font Line Height Relative Tight",
@@ -45131,12 +38379,7 @@ export default {
             type: "lineHeight",
             description: "1.375",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "lineHeight",
-              },
-              category: "semantic",
+              category: "font",
               type: "lineHeight",
               item: "line-height",
               subitem: "relative",
@@ -45155,6 +38398,11 @@ export default {
                 docs: "semantic.font.line-height.relative.snug",
                 es6: "calciteFontLineHeightRelativeSnug",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "lineHeight",
+              },
             },
             filePath: "src/tokens/semantic/font.json",
             isSource: true,
@@ -45163,24 +38411,7 @@ export default {
               type: "lineHeight",
               description: "1.375",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "font",
-                  group: "line-height",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "relative",
-                  state: "",
-                  scale: "snug",
-                  context: "",
-                  mode: "",
-                },
+                category: "font",
               },
             },
             name: "Font Line Height Relative Snug",
@@ -45193,12 +38424,7 @@ export default {
             type: "lineHeight",
             description: "1.5",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "lineHeight",
-              },
-              category: "semantic",
+              category: "font",
               type: "lineHeight",
               item: "line-height",
               subitem: "relative",
@@ -45217,6 +38443,11 @@ export default {
                 docs: "semantic.font.line-height.relative.normal",
                 es6: "calciteFontLineHeightRelativeNormal",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "lineHeight",
+              },
             },
             filePath: "src/tokens/semantic/font.json",
             isSource: true,
@@ -45225,24 +38456,7 @@ export default {
               type: "lineHeight",
               description: "1.5",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "font",
-                  group: "line-height",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "relative",
-                  state: "",
-                  scale: "normal",
-                  context: "",
-                  mode: "",
-                },
+                category: "font",
               },
             },
             name: "Font Line Height Relative Normal",
@@ -45255,12 +38469,7 @@ export default {
             type: "lineHeight",
             description: "1.625",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "lineHeight",
-              },
-              category: "semantic",
+              category: "font",
               type: "lineHeight",
               item: "line-height",
               subitem: "relative",
@@ -45279,6 +38488,11 @@ export default {
                 docs: "semantic.font.line-height.relative.relaxed",
                 es6: "calciteFontLineHeightRelativeRelaxed",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "lineHeight",
+              },
             },
             filePath: "src/tokens/semantic/font.json",
             isSource: true,
@@ -45287,24 +38501,7 @@ export default {
               type: "lineHeight",
               description: "1.625",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "font",
-                  group: "line-height",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "relative",
-                  state: "",
-                  scale: "relaxed",
-                  context: "",
-                  mode: "",
-                },
+                category: "font",
               },
             },
             name: "Font Line Height Relative Relaxed",
@@ -45317,12 +38514,7 @@ export default {
             type: "lineHeight",
             description: "2",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "lineHeight",
-              },
-              category: "semantic",
+              category: "font",
               type: "lineHeight",
               item: "line-height",
               subitem: "relative",
@@ -45341,6 +38533,11 @@ export default {
                 docs: "semantic.font.line-height.relative.loose",
                 es6: "calciteFontLineHeightRelativeLoose",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "lineHeight",
+              },
             },
             filePath: "src/tokens/semantic/font.json",
             isSource: true,
@@ -45349,24 +38546,7 @@ export default {
               type: "lineHeight",
               description: "2",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "font",
-                  group: "line-height",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "relative",
-                  state: "",
-                  scale: "loose",
-                  context: "",
-                  mode: "",
-                },
+                category: "font",
               },
             },
             name: "Font Line Height Relative Loose",
@@ -45382,12 +38562,7 @@ export default {
           type: "dimension",
           description: "Deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "font",
             type: "dimension",
             item: "letter-spacing",
             subitem: "tight",
@@ -45405,6 +38580,11 @@ export default {
               docs: "semantic.font.letter-spacing.tight",
               es6: "calciteFontLetterSpacingTight",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -45413,24 +38593,7 @@ export default {
             type: "dimension",
             description: "Deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "letter-spacing",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "tight",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Letter Spacing Tight",
@@ -45443,12 +38606,7 @@ export default {
           type: "dimension",
           description: "Deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "font",
             type: "dimension",
             item: "letter-spacing",
             subitem: "normal",
@@ -45466,6 +38624,11 @@ export default {
               docs: "semantic.font.letter-spacing.normal",
               es6: "calciteFontLetterSpacingNormal",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -45474,24 +38637,7 @@ export default {
             type: "dimension",
             description: "Deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "letter-spacing",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "normal",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Letter Spacing Normal",
@@ -45504,12 +38650,7 @@ export default {
           type: "dimension",
           description: "Deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "font",
             type: "dimension",
             item: "letter-spacing",
             subitem: "wide",
@@ -45527,6 +38668,11 @@ export default {
               docs: "semantic.font.letter-spacing.wide",
               es6: "calciteFontLetterSpacingWide",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -45535,24 +38681,7 @@ export default {
             type: "dimension",
             description: "Deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "letter-spacing",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "wide",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Letter Spacing Wide",
@@ -45567,12 +38696,7 @@ export default {
           type: "dimension",
           description: "Deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "font",
             type: "dimension",
             item: "paragraph-spacing",
             subitem: "normal",
@@ -45590,6 +38714,11 @@ export default {
               docs: "semantic.font.paragraph-spacing.normal",
               es6: "calciteFontParagraphSpacingNormal",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -45598,24 +38727,7 @@ export default {
             type: "dimension",
             description: "Deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "paragraph-spacing",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "normal",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Paragraph Spacing Normal",
@@ -45630,12 +38742,7 @@ export default {
           type: "textDecoration",
           description: "Deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "textDecoration",
-            },
-            category: "semantic",
+            category: "font",
             type: "textDecoration",
             item: "text-decoration",
             subitem: "none",
@@ -45653,6 +38760,11 @@ export default {
               docs: "semantic.font.text-decoration.none",
               es6: "calciteFontTextDecorationNone",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "textDecoration",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -45661,24 +38773,7 @@ export default {
             type: "textDecoration",
             description: "Deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "text-decoration",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "none",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Text Decoration None",
@@ -45691,12 +38786,7 @@ export default {
           type: "textDecoration",
           description: "Deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "textDecoration",
-            },
-            category: "semantic",
+            category: "font",
             type: "textDecoration",
             item: "text-decoration",
             subitem: "underline",
@@ -45714,6 +38804,11 @@ export default {
               docs: "semantic.font.text-decoration.underline",
               es6: "calciteFontTextDecorationUnderline",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "textDecoration",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -45722,24 +38817,7 @@ export default {
             type: "textDecoration",
             description: "Deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "text-decoration",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "underline",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Text Decoration Underline",
@@ -45754,12 +38832,7 @@ export default {
           type: "textCase",
           description: "Deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "textCase",
-            },
-            category: "semantic",
+            category: "font",
             type: "textCase",
             item: "text-case",
             subitem: "none",
@@ -45777,6 +38850,11 @@ export default {
               docs: "semantic.font.text-case.none",
               es6: "calciteFontTextCaseNone",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "textCase",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -45785,24 +38863,7 @@ export default {
             type: "textCase",
             description: "Deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "text-case",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "none",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Text Case None",
@@ -45815,12 +38876,7 @@ export default {
           type: "textCase",
           description: "Deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "textCase",
-            },
-            category: "semantic",
+            category: "font",
             type: "textCase",
             item: "text-case",
             subitem: "uppercase",
@@ -45838,6 +38894,11 @@ export default {
               docs: "semantic.font.text-case.uppercase",
               es6: "calciteFontTextCaseUppercase",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "textCase",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -45846,24 +38907,7 @@ export default {
             type: "textCase",
             description: "Deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "text-case",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "uppercase",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Text Case Uppercase",
@@ -45876,12 +38920,7 @@ export default {
           type: "textCase",
           description: "Deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "textCase",
-            },
-            category: "semantic",
+            category: "font",
             type: "textCase",
             item: "text-case",
             subitem: "lowercase",
@@ -45899,6 +38938,11 @@ export default {
               docs: "semantic.font.text-case.lowercase",
               es6: "calciteFontTextCaseLowercase",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "textCase",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -45907,24 +38951,7 @@ export default {
             type: "textCase",
             description: "Deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "text-case",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "lowercase",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Text Case Lowercase",
@@ -45937,12 +38964,7 @@ export default {
           type: "textCase",
           description: "Deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "textCase",
-            },
-            category: "semantic",
+            category: "font",
             type: "textCase",
             item: "text-case",
             subitem: "capitalize",
@@ -45960,6 +38982,11 @@ export default {
               docs: "semantic.font.text-case.capitalize",
               es6: "calciteFontTextCaseCapitalize",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "textCase",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -45968,24 +38995,7 @@ export default {
             type: "textCase",
             description: "Deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "text-case",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "capitalize",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Text Case Capitalize",
@@ -46000,12 +39010,7 @@ export default {
         value: "0.4",
         type: "opacity",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "opacity",
-          },
-          category: "semantic",
+          category: "opacity",
           type: "opacity",
           item: "light",
           names: {
@@ -46015,6 +39020,11 @@ export default {
             docs: "semantic.opacity.light",
             es6: "calciteOpacityLight",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "opacity",
+          },
         },
         filePath: "src/tokens/semantic/opacity.json",
         isSource: true,
@@ -46022,24 +39032,7 @@ export default {
           value: "{core.opacity.40}",
           type: "opacity",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "opacity",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "light",
-              context: "",
-              mode: "",
-            },
+            category: "opacity",
           },
         },
         name: "Opacity Light",
@@ -46050,12 +39043,7 @@ export default {
         value: "0.5",
         type: "opacity",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "opacity",
-          },
-          category: "semantic",
+          category: "opacity",
           type: "opacity",
           item: "half",
           names: {
@@ -46065,6 +39053,11 @@ export default {
             docs: "semantic.opacity.half",
             es6: "calciteOpacityHalf",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "opacity",
+          },
         },
         filePath: "src/tokens/semantic/opacity.json",
         isSource: true,
@@ -46072,24 +39065,7 @@ export default {
           value: "{core.opacity.50}",
           type: "opacity",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "opacity",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "half",
-              state: "",
-              scale: "",
-              context: "",
-              mode: "",
-            },
+            category: "opacity",
           },
         },
         name: "Opacity Half",
@@ -46100,12 +39076,7 @@ export default {
         value: "0.85",
         type: "opacity",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "opacity",
-          },
-          category: "semantic",
+          category: "opacity",
           type: "opacity",
           item: "dark",
           names: {
@@ -46115,6 +39086,11 @@ export default {
             docs: "semantic.opacity.dark",
             es6: "calciteOpacityDark",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "opacity",
+          },
         },
         filePath: "src/tokens/semantic/opacity.json",
         isSource: true,
@@ -46122,24 +39098,7 @@ export default {
           value: "{core.opacity.85}",
           type: "opacity",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "opacity",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "dark",
-              context: "",
-              mode: "",
-            },
+            category: "opacity",
           },
         },
         name: "Opacity Dark",
@@ -46150,12 +39109,7 @@ export default {
         value: "1",
         type: "opacity",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "opacity",
-          },
-          category: "semantic",
+          category: "opacity",
           type: "opacity",
           item: "full",
           names: {
@@ -46165,6 +39119,11 @@ export default {
             docs: "semantic.opacity.full",
             es6: "calciteOpacityFull",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "opacity",
+          },
         },
         filePath: "src/tokens/semantic/opacity.json",
         isSource: true,
@@ -46172,24 +39131,7 @@ export default {
           value: "{core.opacity.100}",
           type: "opacity",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "opacity",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "full",
-              state: "",
-              scale: "",
-              context: "",
-              mode: "",
-            },
+            category: "opacity",
           },
         },
         name: "Opacity Full",
@@ -46200,12 +39142,7 @@ export default {
         value: "0.5",
         type: "opacity",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "opacity",
-          },
-          category: "semantic",
+          category: "opacity",
           type: "opacity",
           item: "disabled",
           names: {
@@ -46215,6 +39152,11 @@ export default {
             docs: "semantic.opacity.disabled",
             es6: "calciteOpacityDisabled",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "opacity",
+          },
         },
         filePath: "src/tokens/semantic/opacity.json",
         isSource: true,
@@ -46222,24 +39164,7 @@ export default {
           value: "{core.opacity.50}",
           type: "opacity",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "opacity",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "disabled",
-              scale: "",
-              context: "",
-              mode: "",
-            },
+            category: "opacity",
           },
         },
         name: "Opacity Disabled",
@@ -46258,12 +39183,7 @@ export default {
         },
         type: "shadow",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "shadow",
-          },
-          category: "semantic",
+          category: "shadow",
           type: "shadow",
           item: "none",
           names: {
@@ -46273,6 +39193,11 @@ export default {
             docs: "semantic.shadow.none",
             es6: "calciteShadowNone",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "shadow",
+          },
         },
         filePath: "src/tokens/semantic/shadow.json",
         isSource: true,
@@ -46286,24 +39211,7 @@ export default {
           },
           type: "shadow",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "shadow",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "none",
-              context: "",
-              mode: "",
-            },
+            category: "shadow",
           },
         },
         name: "Shadow None",
@@ -46329,12 +39237,7 @@ export default {
         ],
         type: "shadow",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "shadow",
-          },
-          category: "semantic",
+          category: "shadow",
           type: "shadow",
           item: "sm",
           names: {
@@ -46344,6 +39247,11 @@ export default {
             docs: "semantic.shadow.sm",
             es6: "calciteShadowSm",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "shadow",
+          },
         },
         filePath: "src/tokens/semantic/shadow.json",
         isSource: true,
@@ -46351,24 +39259,7 @@ export default {
           value: ["{core.shadow.1}", "{core.shadow.2}"],
           type: "shadow",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "shadow",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "sm",
-              context: "",
-              mode: "",
-            },
+            category: "shadow",
           },
         },
         name: "Shadow Sm",
@@ -46394,12 +39285,7 @@ export default {
         ],
         type: "shadow",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "shadow",
-          },
-          category: "semantic",
+          category: "shadow",
           type: "shadow",
           item: "md",
           names: {
@@ -46409,6 +39295,11 @@ export default {
             docs: "semantic.shadow.md",
             es6: "calciteShadowMd",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "shadow",
+          },
         },
         filePath: "src/tokens/semantic/shadow.json",
         isSource: true,
@@ -46416,24 +39307,7 @@ export default {
           value: ["{core.shadow.3}", "{core.shadow.4}"],
           type: "shadow",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "shadow",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "md",
-              context: "",
-              mode: "",
-            },
+            category: "shadow",
           },
         },
         name: "Shadow Md",
@@ -46448,12 +39322,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "dimension",
             item: "fixed",
             subitem: "xxxs",
@@ -46471,6 +39340,11 @@ export default {
               docs: "semantic.size.fixed.xxxs",
               es6: "calciteSizeFixedXxxs",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -46479,24 +39353,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xxxs",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Fixed Xxxs",
@@ -46509,12 +39366,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "dimension",
             item: "fixed",
             subitem: "xxs",
@@ -46532,6 +39384,11 @@ export default {
               docs: "semantic.size.fixed.xxs",
               es6: "calciteSizeFixedXxs",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -46540,24 +39397,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xxs",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Fixed Xxs",
@@ -46570,12 +39410,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "dimension",
             item: "fixed",
             subitem: "xs",
@@ -46593,6 +39428,11 @@ export default {
               docs: "semantic.size.fixed.xs",
               es6: "calciteSizeFixedXs",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -46601,24 +39441,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xs",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Fixed Xs",
@@ -46631,12 +39454,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "dimension",
             item: "fixed",
             subitem: "sm",
@@ -46654,6 +39472,11 @@ export default {
               docs: "semantic.size.fixed.sm",
               es6: "calciteSizeFixedSm",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -46662,24 +39485,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "sm",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Fixed Sm",
@@ -46692,12 +39498,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "dimension",
             item: "fixed",
             subitem: "sm+",
@@ -46715,6 +39516,11 @@ export default {
               docs: "semantic.size.fixed.sm+",
               es6: "calciteSizeFixedSmPlus",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -46723,24 +39529,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "sm+",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Fixed Sm Plus",
@@ -46753,12 +39542,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "dimension",
             item: "fixed",
             subitem: "md",
@@ -46776,6 +39560,11 @@ export default {
               docs: "semantic.size.fixed.md",
               es6: "calciteSizeFixedMd",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -46784,24 +39573,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "md",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Fixed Md",
@@ -46814,12 +39586,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "dimension",
             item: "fixed",
             subitem: "md+",
@@ -46837,6 +39604,11 @@ export default {
               docs: "semantic.size.fixed.md+",
               es6: "calciteSizeFixedMdPlus",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -46845,24 +39617,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "md+",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Fixed Md Plus",
@@ -46875,12 +39630,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "dimension",
             item: "fixed",
             subitem: "lg",
@@ -46898,6 +39648,11 @@ export default {
               docs: "semantic.size.fixed.lg",
               es6: "calciteSizeFixedLg",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -46906,24 +39661,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "lg",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Fixed Lg",
@@ -46936,12 +39674,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "dimension",
             item: "fixed",
             subitem: "xl",
@@ -46959,6 +39692,11 @@ export default {
               docs: "semantic.size.fixed.xl",
               es6: "calciteSizeFixedXl",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -46967,24 +39705,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xl",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Fixed Xl",
@@ -46997,12 +39718,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "dimension",
             item: "fixed",
             subitem: "xxl",
@@ -47020,6 +39736,11 @@ export default {
               docs: "semantic.size.fixed.xxl",
               es6: "calciteSizeFixedXxl",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -47028,24 +39749,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xxl",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Fixed Xxl",
@@ -47058,12 +39762,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "dimension",
             item: "fixed",
             subitem: "xxxl",
@@ -47081,6 +39780,11 @@ export default {
               docs: "semantic.size.fixed.xxxl",
               es6: "calciteSizeFixedXxxl",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -47089,24 +39793,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xxxl",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Fixed Xxxl",
@@ -47120,12 +39807,7 @@ export default {
           value: "1px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "px",
@@ -47136,6 +39818,11 @@ export default {
               docs: "semantic.size.default.px",
               es6: "calciteSizePx",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -47143,24 +39830,7 @@ export default {
             value: "{core.size.default.1}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "px",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Px",
@@ -47171,12 +39841,7 @@ export default {
           value: "0.75rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "xxxs",
@@ -47187,6 +39852,11 @@ export default {
               docs: "semantic.size.default.xxxs",
               es6: "calciteSizeXxxs",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -47194,24 +39864,7 @@ export default {
             value: "{core.size.default.12}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xxxs",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Xxxs",
@@ -47222,12 +39875,7 @@ export default {
           value: "0.875rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "xxs",
@@ -47238,6 +39886,11 @@ export default {
               docs: "semantic.size.default.xxs",
               es6: "calciteSizeXxs",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -47245,24 +39898,7 @@ export default {
             value: "{core.size.default.14}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xxs",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Xxs",
@@ -47273,12 +39909,7 @@ export default {
           value: "1rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "xs",
@@ -47289,6 +39920,11 @@ export default {
               docs: "semantic.size.default.xs",
               es6: "calciteSizeXs",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -47296,24 +39932,7 @@ export default {
             value: "{core.size.default.16}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xs",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Xs",
@@ -47324,12 +39943,7 @@ export default {
           value: "1.5rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "sm",
@@ -47340,6 +39954,11 @@ export default {
               docs: "semantic.size.default.sm",
               es6: "calciteSizeSm",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -47347,24 +39966,7 @@ export default {
             value: "{core.size.default.24}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "sm",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Sm",
@@ -47375,12 +39977,7 @@ export default {
           value: "2rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "md",
@@ -47391,6 +39988,11 @@ export default {
               docs: "semantic.size.default.md",
               es6: "calciteSizeMd",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -47398,24 +40000,7 @@ export default {
             value: "{core.size.default.32}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "md",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Md",
@@ -47426,12 +40011,7 @@ export default {
           value: "2.75rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "lg",
@@ -47442,6 +40022,11 @@ export default {
               docs: "semantic.size.default.lg",
               es6: "calciteSizeLg",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -47449,24 +40034,7 @@ export default {
             value: "{core.size.default.44}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "lg",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Lg",
@@ -47477,12 +40045,7 @@ export default {
           value: "3rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "xl",
@@ -47493,6 +40056,11 @@ export default {
               docs: "semantic.size.default.xl",
               es6: "calciteSizeXl",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -47500,24 +40068,7 @@ export default {
             value: "{core.size.default.48}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xl",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Xl",
@@ -47528,12 +40079,7 @@ export default {
           value: "4rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "xxl",
@@ -47544,6 +40090,11 @@ export default {
               docs: "semantic.size.default.xxl",
               es6: "calciteSizeXxl",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -47551,22 +40102,7 @@ export default {
             value: "{core.size.default.64}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                state: "",
-                scale: "xxl",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Xxl",
@@ -47577,12 +40113,7 @@ export default {
           value: "6rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "xxxl",
@@ -47593,6 +40124,11 @@ export default {
               docs: "semantic.size.default.xxxl",
               es6: "calciteSizeXxxl",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -47600,22 +40136,7 @@ export default {
             value: "{core.size.default.96}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                state: "",
-                scale: "xxxl",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Xxxl",
@@ -47628,15 +40149,10 @@ export default {
       fixed: {
         xxs: {
           value: "4px",
-          type: "dimension",
-          description: "deprecated",
-          attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+          type: "dimension",
+          description: "deprecated",
+          attributes: {
+            category: "space",
             type: "dimension",
             item: "fixed",
             subitem: "xxs",
@@ -47654,6 +40170,11 @@ export default {
               docs: "semantic.spacing.fixed.xxs",
               es6: "calciteSpacingFixedXxs",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -47662,24 +40183,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xxs",
-                context: "",
-                mode: "",
-              },
+              category: "space",
             },
           },
           name: "Spacing Fixed Xxs",
@@ -47692,12 +40196,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "space",
             type: "dimension",
             item: "fixed",
             subitem: "xs",
@@ -47715,6 +40214,11 @@ export default {
               docs: "semantic.spacing.fixed.xs",
               es6: "calciteSpacingFixedXs",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -47723,24 +40227,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xs",
-                context: "",
-                mode: "",
-              },
+              category: "space",
             },
           },
           name: "Spacing Fixed Xs",
@@ -47753,12 +40240,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "space",
             type: "dimension",
             item: "fixed",
             subitem: "sm",
@@ -47776,6 +40258,11 @@ export default {
               docs: "semantic.spacing.fixed.sm",
               es6: "calciteSpacingFixedSm",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -47784,24 +40271,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "sm",
-                context: "",
-                mode: "",
-              },
+              category: "space",
             },
           },
           name: "Spacing Fixed Sm",
@@ -47814,12 +40284,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "space",
             type: "dimension",
             item: "fixed",
             subitem: "md",
@@ -47837,6 +40302,11 @@ export default {
               docs: "semantic.spacing.fixed.md",
               es6: "calciteSpacingFixedMd",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -47845,24 +40315,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "md",
-                context: "",
-                mode: "",
-              },
+              category: "space",
             },
           },
           name: "Spacing Fixed Md",
@@ -47875,12 +40328,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "space",
             type: "dimension",
             item: "fixed",
             subitem: "lg",
@@ -47898,6 +40346,11 @@ export default {
               docs: "semantic.spacing.fixed.lg",
               es6: "calciteSpacingFixedLg",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -47906,24 +40359,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "lg",
-                context: "",
-                mode: "",
-              },
+              category: "space",
             },
           },
           name: "Spacing Fixed Lg",
@@ -47936,12 +40372,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "space",
             type: "dimension",
             item: "fixed",
             subitem: "xl",
@@ -47959,6 +40390,11 @@ export default {
               docs: "semantic.spacing.fixed.xl",
               es6: "calciteSpacingFixedXl",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -47967,24 +40403,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xl",
-                context: "",
-                mode: "",
-              },
+              category: "space",
             },
           },
           name: "Spacing Fixed Xl",
@@ -47997,12 +40416,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "space",
             type: "dimension",
             item: "fixed",
             subitem: "xxl",
@@ -48020,6 +40434,11 @@ export default {
               docs: "semantic.spacing.fixed.xxl",
               es6: "calciteSpacingFixedXxl",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -48028,24 +40447,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xxl",
-                context: "",
-                mode: "",
-              },
+              category: "space",
             },
           },
           name: "Spacing Fixed Xxl",
@@ -48058,12 +40460,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "space",
             type: "dimension",
             item: "fixed",
             subitem: "xxxl",
@@ -48081,6 +40478,11 @@ export default {
               docs: "semantic.spacing.fixed.xxxl",
               es6: "calciteSpacingFixedXxxl",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -48089,24 +40491,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xxxl",
-                context: "",
-                mode: "",
-              },
+              category: "space",
             },
           },
           name: "Spacing Fixed Xxxl",
@@ -48120,12 +40505,8 @@ export default {
           value: "0",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            pattern: "",
+            category: "space",
             type: "spacing",
             item: "default",
             subitem: "none",
@@ -48136,6 +40517,11 @@ export default {
               docs: "semantic.spacing.default.none",
               es6: "calciteSpacingNone",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -48143,24 +40529,8 @@ export default {
             value: "{core.size.default.none}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "px",
-                context: "",
-                mode: "",
-              },
+              pattern: "",
+              category: "space",
             },
           },
           name: "Spacing None",
@@ -48171,12 +40541,8 @@ export default {
           value: "1px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            pattern: "",
+            category: "space",
             type: "spacing",
             item: "default",
             subitem: "px",
@@ -48187,6 +40553,11 @@ export default {
               docs: "semantic.spacing.default.px",
               es6: "calciteSpacingPx",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -48194,24 +40565,8 @@ export default {
             value: "{core.size.default.1}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "px",
-                context: "",
-                mode: "",
-              },
+              pattern: "",
+              category: "space",
             },
           },
           name: "Spacing Px",
@@ -48222,12 +40577,8 @@ export default {
           value: "2px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            pattern: "",
+            category: "space",
             type: "spacing",
             item: "default",
             subitem: "base",
@@ -48238,6 +40589,11 @@ export default {
               docs: "semantic.spacing.default.base",
               es6: "calciteSpacingBase",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -48245,24 +40601,8 @@ export default {
             value: "{core.size.default.2}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "px",
-                context: "",
-                mode: "",
-              },
+              pattern: "",
+              category: "space",
             },
           },
           name: "Spacing Base",
@@ -48273,12 +40613,7 @@ export default {
           value: "0.25rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "spacing",
             item: "default",
             subitem: "xxs",
@@ -48289,6 +40624,11 @@ export default {
               docs: "semantic.spacing.default.xxs",
               es6: "calciteSpacingXxs",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -48296,24 +40636,7 @@ export default {
             value: "{core.size.default.4}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xxs",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Spacing Xxs",
@@ -48324,12 +40647,7 @@ export default {
           value: "0.375rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "spacing",
             item: "default",
             subitem: "xs",
@@ -48340,6 +40658,11 @@ export default {
               docs: "semantic.spacing.default.xs",
               es6: "calciteSpacingXs",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -48347,24 +40670,7 @@ export default {
             value: "{core.size.default.6}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xs",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Spacing Xs",
@@ -48375,12 +40681,7 @@ export default {
           value: "0.5rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "spacing",
             item: "default",
             subitem: "sm",
@@ -48391,6 +40692,11 @@ export default {
               docs: "semantic.spacing.default.sm",
               es6: "calciteSpacingSm",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -48398,24 +40704,7 @@ export default {
             value: "{core.size.default.8}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "sm",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Spacing Sm",
@@ -48426,12 +40715,7 @@ export default {
           value: "0.625rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "space",
             type: "spacing",
             item: "default",
             subitem: "sm+",
@@ -48442,6 +40726,11 @@ export default {
               docs: "semantic.spacing.default.sm+",
               es6: "calciteSpacingSmPlus",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -48449,24 +40738,7 @@ export default {
             value: "{core.size.default.10}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "sm+",
-                context: "",
-                mode: "",
-              },
+              category: "space",
             },
           },
           name: "Spacing Sm Plus",
@@ -48477,12 +40749,7 @@ export default {
           value: "0.75rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "space",
             type: "spacing",
             item: "default",
             subitem: "md",
@@ -48493,6 +40760,11 @@ export default {
               docs: "semantic.spacing.default.md",
               es6: "calciteSpacingMd",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -48500,24 +40772,7 @@ export default {
             value: "{core.size.default.12}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "md",
-                context: "",
-                mode: "",
-              },
+              category: "space",
             },
           },
           name: "Spacing Md",
@@ -48528,12 +40783,7 @@ export default {
           value: "0.875rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "space",
             type: "spacing",
             item: "default",
             subitem: "md+",
@@ -48544,6 +40794,11 @@ export default {
               docs: "semantic.spacing.default.md+",
               es6: "calciteSpacingMdPlus",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -48551,24 +40806,7 @@ export default {
             value: "{core.size.default.14}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "md+",
-                context: "",
-                mode: "",
-              },
+              category: "space",
             },
           },
           name: "Spacing Md Plus",
@@ -48579,12 +40817,7 @@ export default {
           value: "1rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "space",
             type: "spacing",
             item: "default",
             subitem: "lg",
@@ -48595,6 +40828,11 @@ export default {
               docs: "semantic.spacing.default.lg",
               es6: "calciteSpacingLg",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -48602,24 +40840,7 @@ export default {
             value: "{core.size.default.16}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "lg",
-                context: "",
-                mode: "",
-              },
+              category: "space",
             },
           },
           name: "Spacing Lg",
@@ -48630,12 +40851,7 @@ export default {
           value: "1.25rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "space",
             type: "spacing",
             item: "default",
             subitem: "xl",
@@ -48646,6 +40862,11 @@ export default {
               docs: "semantic.spacing.default.xl",
               es6: "calciteSpacingXl",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -48653,24 +40874,7 @@ export default {
             value: "{core.size.default.20}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xl",
-                context: "",
-                mode: "",
-              },
+              category: "space",
             },
           },
           name: "Spacing Xl",
@@ -48681,12 +40885,7 @@ export default {
           value: "1.5rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "space",
             type: "spacing",
             item: "default",
             subitem: "xxl",
@@ -48697,6 +40896,11 @@ export default {
               docs: "semantic.spacing.default.xxl",
               es6: "calciteSpacingXxl",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -48704,24 +40908,7 @@ export default {
             value: "{core.size.default.24}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xxl",
-                context: "",
-                mode: "",
-              },
+              category: "space",
             },
           },
           name: "Spacing Xxl",
@@ -48732,12 +40919,7 @@ export default {
           value: "2rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "space",
             type: "spacing",
             item: "default",
             subitem: "xxxl",
@@ -48748,6 +40930,11 @@ export default {
               docs: "semantic.spacing.default.xxxl",
               es6: "calciteSpacingXxxl",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -48755,24 +40942,7 @@ export default {
             value: "{core.size.default.32}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xxxl",
-                context: "",
-                mode: "",
-              },
+              category: "space",
             },
           },
           name: "Spacing Xxxl",
@@ -48801,12 +40971,7 @@ export default {
             textDecoration: "none",
           },
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "typography",
-            },
-            category: "semantic",
+            category: "",
             type: "typography",
             item: "default",
             subitem: "default",
@@ -48817,6 +40982,11 @@ export default {
               docs: "semantic.typography.default.default",
               es6: "calciteTypography",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "typography",
+            },
           },
           filePath: "src/tokens/semantic/typography.json",
           isSource: true,
@@ -48833,24 +41003,7 @@ export default {
               textDecoration: "{semantic.font.text-decoration.none}",
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "typography",
-                element: "",
-                category: "",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "",
             },
           },
           name: "Typography",
@@ -48883,12 +41036,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "",
               type: "typography",
               item: "default",
               subitem: "light",
@@ -48900,6 +41048,11 @@ export default {
                 docs: "semantic.typography.default.light.-3h",
                 es6: "calciteTypographyLightMinus3H",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -48914,24 +41067,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "light",
-                  state: "",
-                  scale: "-3h",
-                  context: "",
-                  mode: "",
-                },
+                category: "",
               },
             },
             name: "Typography Light Minus 3h",
@@ -48962,12 +41098,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "default",
               type: "typography",
               item: "default",
               subitem: "light",
@@ -48979,6 +41110,11 @@ export default {
                 docs: "semantic.typography.default.light.-2h",
                 es6: "calciteTypographyLightMinus2H",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -48992,24 +41128,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "default",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "light",
-                  state: "",
-                  scale: "-2h",
-                  context: "",
-                  mode: "",
-                },
+                category: "default",
               },
             },
             name: "Typography Light Minus 2h",
@@ -49039,12 +41158,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "default",
               type: "typography",
               item: "default",
               subitem: "light",
@@ -49056,6 +41170,11 @@ export default {
                 docs: "semantic.typography.default.light.-1h",
                 es6: "calciteTypographyLightMinus1H",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -49068,24 +41187,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "default",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "light",
-                  state: "",
-                  scale: "-1h",
-                  context: "",
-                  mode: "",
-                },
+                category: "default",
               },
             },
             name: "Typography Light Minus 1h",
@@ -49117,12 +41219,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "default",
               type: "typography",
               item: "default",
               subitem: "light",
@@ -49134,6 +41231,11 @@ export default {
                 docs: "semantic.typography.default.light.0h",
                 es6: "calciteTypographyLight0H",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -49148,24 +41250,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "default",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "light",
-                  state: "",
-                  scale: "0h",
-                  context: "",
-                  mode: "",
-                },
+                category: "default",
               },
             },
             name: "Typography Light 0h",
@@ -49197,12 +41282,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "default",
               type: "typography",
               item: "default",
               subitem: "light",
@@ -49214,6 +41294,11 @@ export default {
                 docs: "semantic.typography.default.light.1h",
                 es6: "calciteTypographyLight1H",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -49228,24 +41313,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "default",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "light",
-                  state: "",
-                  scale: "1h",
-                  context: "",
-                  mode: "",
-                },
+                category: "default",
               },
             },
             name: "Typography Light 1h",
@@ -49278,12 +41346,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "default",
               type: "typography",
               item: "default",
               subitem: "regular",
@@ -49295,6 +41358,11 @@ export default {
                 docs: "semantic.typography.default.regular.-3h",
                 es6: "calciteTypographyRegularMinus3H",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -49308,24 +41376,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "default",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "regular",
-                  state: "",
-                  scale: "-3h",
-                  context: "",
-                  mode: "",
-                },
+                category: "default",
               },
             },
             name: "Typography Regular Minus 3h",
@@ -49355,12 +41406,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "default",
               type: "typography",
               item: "default",
               subitem: "regular",
@@ -49372,6 +41418,11 @@ export default {
                 docs: "semantic.typography.default.regular.-2h",
                 es6: "calciteTypographyRegularMinus2H",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -49384,24 +41435,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "default",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "regular",
-                  state: "",
-                  scale: "-2h",
-                  context: "",
-                  mode: "",
-                },
+                category: "default",
               },
             },
             name: "Typography Regular Minus 2h",
@@ -49426,12 +41460,7 @@ export default {
             },
             type: "typography",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "default",
               type: "typography",
               item: "default",
               subitem: "regular",
@@ -49443,6 +41472,11 @@ export default {
                 docs: "semantic.typography.default.regular.-1h",
                 es6: "calciteTypographyRegularMinus1H",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -49459,24 +41493,7 @@ export default {
               },
               type: "typography",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "default",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "regular",
-                  state: "",
-                  scale: "-1h",
-                  context: "",
-                  mode: "",
-                },
+                category: "default",
               },
             },
             name: "Typography Regular Minus 1h",
@@ -49507,12 +41524,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "default",
               type: "typography",
               item: "default",
               subitem: "regular",
@@ -49524,6 +41536,11 @@ export default {
                 docs: "semantic.typography.default.regular.0h",
                 es6: "calciteTypographyRegular0H",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -49537,24 +41554,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "default",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "regular",
-                  state: "",
-                  scale: "0h",
-                  context: "",
-                  mode: "",
-                },
+                category: "default",
               },
             },
             name: "Typography Regular 0h",
@@ -49585,12 +41585,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "default",
               type: "typography",
               item: "default",
               subitem: "regular",
@@ -49602,6 +41597,11 @@ export default {
                 docs: "semantic.typography.default.regular.1h",
                 es6: "calciteTypographyRegular1H",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -49615,24 +41615,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "default",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "regular",
-                  state: "",
-                  scale: "1h",
-                  context: "",
-                  mode: "",
-                },
+                category: "default",
               },
             },
             name: "Typography Regular 1h",
@@ -49666,12 +41649,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "default",
               type: "typography",
               item: "default",
               subitem: "medium",
@@ -49683,6 +41661,11 @@ export default {
                 docs: "semantic.typography.default.medium.-3h",
                 es6: "calciteTypographyMediumMinus3H",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -49697,24 +41680,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "default",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "medium",
-                  state: "",
-                  scale: "-3h",
-                  context: "",
-                  mode: "",
-                },
+                category: "default",
               },
             },
             name: "Typography Medium Minus 3h",
@@ -49745,12 +41711,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "default",
               type: "typography",
               item: "default",
               subitem: "medium",
@@ -49762,6 +41723,11 @@ export default {
                 docs: "semantic.typography.default.medium.-2h",
                 es6: "calciteTypographyMediumMinus2H",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -49775,24 +41741,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "default",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "medium",
-                  state: "",
-                  scale: "-2h",
-                  context: "",
-                  mode: "",
-                },
+                category: "default",
               },
             },
             name: "Typography Medium Minus 2h",
@@ -49822,12 +41771,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "default",
               type: "typography",
               item: "default",
               subitem: "medium",
@@ -49839,6 +41783,11 @@ export default {
                 docs: "semantic.typography.default.medium.-1h",
                 es6: "calciteTypographyMediumMinus1H",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -49851,24 +41800,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "default",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "medium",
-                  state: "",
-                  scale: "-1h",
-                  context: "",
-                  mode: "",
-                },
+                category: "default",
               },
             },
             name: "Typography Medium Minus 1h",
@@ -49900,12 +41832,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "default",
               type: "typography",
               item: "default",
               subitem: "medium",
@@ -49917,6 +41844,11 @@ export default {
                 docs: "semantic.typography.default.medium.0h",
                 es6: "calciteTypographyMedium0H",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -49931,24 +41863,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "default",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "medium",
-                  state: "",
-                  scale: "0h",
-                  context: "",
-                  mode: "",
-                },
+                category: "default",
               },
             },
             name: "Typography Medium 0h",
@@ -49980,12 +41895,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "default",
               type: "typography",
               item: "default",
               subitem: "medium",
@@ -49997,6 +41907,11 @@ export default {
                 docs: "semantic.typography.default.medium.1h",
                 es6: "calciteTypographyMedium1H",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -50011,24 +41926,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "default",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "medium",
-                  state: "",
-                  scale: "1h",
-                  context: "",
-                  mode: "",
-                },
+                category: "default",
               },
             },
             name: "Typography Medium 1h",
@@ -50062,12 +41960,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "default",
               type: "typography",
               item: "default",
               subitem: "bold",
@@ -50079,6 +41972,11 @@ export default {
                 docs: "semantic.typography.default.bold.-3h",
                 es6: "calciteTypographyBoldMinus3H",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -50093,24 +41991,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "default",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "bold",
-                  state: "",
-                  scale: "-3h",
-                  context: "",
-                  mode: "",
-                },
+                category: "default",
               },
             },
             name: "Typography Bold Minus 3h",
@@ -50141,12 +42022,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "default",
               type: "typography",
               item: "default",
               subitem: "bold",
@@ -50158,6 +42034,11 @@ export default {
                 docs: "semantic.typography.default.bold.-2h",
                 es6: "calciteTypographyBoldMinus2H",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -50171,24 +42052,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "default",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "bold",
-                  state: "",
-                  scale: "-2h",
-                  context: "",
-                  mode: "",
-                },
+                category: "default",
               },
             },
             name: "Typography Bold Minus 2h",
@@ -50218,12 +42082,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "default",
               type: "typography",
               item: "default",
               subitem: "bold",
@@ -50235,6 +42094,11 @@ export default {
                 docs: "semantic.typography.default.bold.-1h",
                 es6: "calciteTypographyBoldMinus1H",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -50247,24 +42111,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "default",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "bold",
-                  state: "",
-                  scale: "-1h",
-                  context: "",
-                  mode: "",
-                },
+                category: "default",
               },
             },
             name: "Typography Bold Minus 1h",
@@ -50296,12 +42143,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "default",
               type: "typography",
               item: "default",
               subitem: "bold",
@@ -50313,6 +42155,11 @@ export default {
                 docs: "semantic.typography.default.bold.0h",
                 es6: "calciteTypographyBold0H",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -50327,24 +42174,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "default",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "bold",
-                  state: "",
-                  scale: "0h",
-                  context: "",
-                  mode: "",
-                },
+                category: "default",
               },
             },
             name: "Typography Bold 0h",
@@ -50376,12 +42206,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "default",
               type: "typography",
               item: "default",
               subitem: "bold",
@@ -50393,6 +42218,11 @@ export default {
                 docs: "semantic.typography.default.bold.1h",
                 es6: "calciteTypographyBold1H",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -50407,24 +42237,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "default",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "bold",
-                  state: "",
-                  scale: "1h",
-                  context: "",
-                  mode: "",
-                },
+                category: "default",
               },
             },
             name: "Typography Bold 1h",
@@ -50460,12 +42273,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "wrap",
               type: "typography",
               item: "wrap",
               subitem: "light",
@@ -50477,6 +42285,11 @@ export default {
                 docs: "semantic.typography.wrap.light.0",
                 es6: "calciteTypographyWrapLight0",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -50491,24 +42304,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "wrap",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "light",
-                  state: "",
-                  scale: "0",
-                  context: "",
-                  mode: "",
-                },
+                category: "wrap",
               },
             },
             name: "Typography Wrap Light 0",
@@ -50540,12 +42336,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "wrap",
               type: "typography",
               item: "wrap",
               subitem: "light",
@@ -50557,6 +42348,11 @@ export default {
                 docs: "semantic.typography.wrap.light.1",
                 es6: "calciteTypographyWrapLight1",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -50571,24 +42367,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "wrap",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "light",
-                  state: "",
-                  scale: "1",
-                  context: "",
-                  mode: "",
-                },
+                category: "wrap",
               },
             },
             name: "Typography Wrap Light 1",
@@ -50620,12 +42399,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "wrap",
               type: "typography",
               item: "wrap",
               subitem: "light",
@@ -50637,6 +42411,11 @@ export default {
                 docs: "semantic.typography.wrap.light.2",
                 es6: "calciteTypographyWrapLight2",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -50651,24 +42430,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "wrap",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "light",
-                  state: "",
-                  scale: "2",
-                  context: "",
-                  mode: "",
-                },
+                category: "wrap",
               },
             },
             name: "Typography Wrap Light 2",
@@ -50700,12 +42462,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "wrap",
               type: "typography",
               item: "wrap",
               subitem: "light",
@@ -50717,6 +42474,11 @@ export default {
                 docs: "semantic.typography.wrap.light.3",
                 es6: "calciteTypographyWrapLight3",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -50731,24 +42493,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "wrap",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "light",
-                  state: "",
-                  scale: "3",
-                  context: "",
-                  mode: "",
-                },
+                category: "wrap",
               },
             },
             name: "Typography Wrap Light 3",
@@ -50780,12 +42525,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "wrap",
               type: "typography",
               item: "wrap",
               subitem: "light",
@@ -50797,6 +42537,11 @@ export default {
                 docs: "semantic.typography.wrap.light.-2",
                 es6: "calciteTypographyWrapLightMinus2",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -50811,24 +42556,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "wrap",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "light",
-                  state: "",
-                  scale: "-2",
-                  context: "",
-                  mode: "",
-                },
+                category: "wrap",
               },
             },
             name: "Typography Wrap Light Minus 2",
@@ -50859,12 +42587,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "wrap",
               type: "typography",
               item: "wrap",
               subitem: "light",
@@ -50876,6 +42599,11 @@ export default {
                 docs: "semantic.typography.wrap.light.-1",
                 es6: "calciteTypographyWrapLightMinus1",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -50889,24 +42617,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "wrap",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "light",
-                  state: "",
-                  scale: "-1",
-                  context: "",
-                  mode: "",
-                },
+                category: "wrap",
               },
             },
             name: "Typography Wrap Light Minus 1",
@@ -50939,12 +42650,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "wrap",
               type: "typography",
               item: "wrap",
               subitem: "regular",
@@ -50956,6 +42662,11 @@ export default {
                 docs: "semantic.typography.wrap.regular.0",
                 es6: "calciteTypographyWrapRegular0",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -50969,24 +42680,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "wrap",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "regular",
-                  state: "",
-                  scale: "0",
-                  context: "",
-                  mode: "",
-                },
+                category: "wrap",
               },
             },
             name: "Typography Wrap Regular 0",
@@ -51017,12 +42711,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "wrap",
               type: "typography",
               item: "wrap",
               subitem: "regular",
@@ -51034,6 +42723,11 @@ export default {
                 docs: "semantic.typography.wrap.regular.1",
                 es6: "calciteTypographyWrapRegular1",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -51047,24 +42741,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "wrap",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "regular",
-                  state: "",
-                  scale: "1",
-                  context: "",
-                  mode: "",
-                },
+                category: "wrap",
               },
             },
             name: "Typography Wrap Regular 1",
@@ -51095,12 +42772,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "wrap",
               type: "typography",
               item: "wrap",
               subitem: "regular",
@@ -51112,6 +42784,11 @@ export default {
                 docs: "semantic.typography.wrap.regular.2",
                 es6: "calciteTypographyWrapRegular2",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -51125,24 +42802,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "wrap",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "regular",
-                  state: "",
-                  scale: "2",
-                  context: "",
-                  mode: "",
-                },
+                category: "wrap",
               },
             },
             name: "Typography Wrap Regular 2",
@@ -51173,12 +42833,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "wrap",
               type: "typography",
               item: "wrap",
               subitem: "regular",
@@ -51190,6 +42845,11 @@ export default {
                 docs: "semantic.typography.wrap.regular.3",
                 es6: "calciteTypographyWrapRegular3",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -51203,24 +42863,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "wrap",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "regular",
-                  state: "",
-                  scale: "3",
-                  context: "",
-                  mode: "",
-                },
+                category: "wrap",
               },
             },
             name: "Typography Wrap Regular 3",
@@ -51251,12 +42894,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "wrap",
               type: "typography",
               item: "wrap",
               subitem: "regular",
@@ -51268,6 +42906,11 @@ export default {
                 docs: "semantic.typography.wrap.regular.-2",
                 es6: "calciteTypographyWrapRegularMinus2",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -51281,24 +42924,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "wrap",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "regular",
-                  state: "",
-                  scale: "-2",
-                  context: "",
-                  mode: "",
-                },
+                category: "wrap",
               },
             },
             name: "Typography Wrap Regular Minus 2",
@@ -51328,12 +42954,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "wrap",
               type: "typography",
               item: "wrap",
               subitem: "regular",
@@ -51345,6 +42966,11 @@ export default {
                 docs: "semantic.typography.wrap.regular.-1",
                 es6: "calciteTypographyWrapRegularMinus1",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -51357,24 +42983,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "wrap",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "regular",
-                  state: "",
-                  scale: "-1",
-                  context: "",
-                  mode: "",
-                },
+                category: "wrap",
               },
             },
             name: "Typography Wrap Regular Minus 1",
@@ -51408,12 +43017,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "wrap",
               type: "typography",
               item: "wrap",
               subitem: "medium",
@@ -51425,6 +43029,11 @@ export default {
                 docs: "semantic.typography.wrap.medium.0",
                 es6: "calciteTypographyWrapMedium0",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -51439,24 +43048,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "wrap",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "medium",
-                  state: "",
-                  scale: "0",
-                  context: "",
-                  mode: "",
-                },
+                category: "wrap",
               },
             },
             name: "Typography Wrap Medium 0",
@@ -51488,12 +43080,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "wrap",
               type: "typography",
               item: "wrap",
               subitem: "medium",
@@ -51505,6 +43092,11 @@ export default {
                 docs: "semantic.typography.wrap.medium.1",
                 es6: "calciteTypographyWrapMedium1",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -51519,24 +43111,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "wrap",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "medium",
-                  state: "",
-                  scale: "1",
-                  context: "",
-                  mode: "",
-                },
+                category: "wrap",
               },
             },
             name: "Typography Wrap Medium 1",
@@ -51568,12 +43143,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "wrap",
               type: "typography",
               item: "wrap",
               subitem: "medium",
@@ -51585,6 +43155,11 @@ export default {
                 docs: "semantic.typography.wrap.medium.2",
                 es6: "calciteTypographyWrapMedium2",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -51599,24 +43174,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "wrap",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "medium",
-                  state: "",
-                  scale: "2",
-                  context: "",
-                  mode: "",
-                },
+                category: "wrap",
               },
             },
             name: "Typography Wrap Medium 2",
@@ -51648,12 +43206,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "wrap",
               type: "typography",
               item: "wrap",
               subitem: "medium",
@@ -51665,6 +43218,11 @@ export default {
                 docs: "semantic.typography.wrap.medium.3",
                 es6: "calciteTypographyWrapMedium3",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -51679,24 +43237,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "wrap",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "medium",
-                  state: "",
-                  scale: "3",
-                  context: "",
-                  mode: "",
-                },
+                category: "wrap",
               },
             },
             name: "Typography Wrap Medium 3",
@@ -51728,12 +43269,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "wrap",
               type: "typography",
               item: "wrap",
               subitem: "medium",
@@ -51745,6 +43281,11 @@ export default {
                 docs: "semantic.typography.wrap.medium.-2",
                 es6: "calciteTypographyWrapMediumMinus2",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -51759,24 +43300,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "wrap",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "medium",
-                  state: "",
-                  scale: "-2",
-                  context: "",
-                  mode: "",
-                },
+                category: "wrap",
               },
             },
             name: "Typography Wrap Medium Minus 2",
@@ -51807,12 +43331,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "wrap",
               type: "typography",
               item: "wrap",
               subitem: "medium",
@@ -51824,6 +43343,11 @@ export default {
                 docs: "semantic.typography.wrap.medium.-1",
                 es6: "calciteTypographyWrapMediumMinus1",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -51837,24 +43361,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "wrap",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "medium",
-                  state: "",
-                  scale: "-1",
-                  context: "",
-                  mode: "",
-                },
+                category: "wrap",
               },
             },
             name: "Typography Wrap Medium Minus 1",
@@ -51888,12 +43395,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "wrap",
               type: "typography",
               item: "wrap",
               subitem: "bold",
@@ -51905,6 +43407,11 @@ export default {
                 docs: "semantic.typography.wrap.bold.0",
                 es6: "calciteTypographyWrapBold0",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -51919,24 +43426,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "wrap",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "bold",
-                  state: "",
-                  scale: "0",
-                  context: "",
-                  mode: "",
-                },
+                category: "wrap",
               },
             },
             name: "Typography Wrap Bold 0",
@@ -51968,12 +43458,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "wrap",
               type: "typography",
               item: "wrap",
               subitem: "bold",
@@ -51985,6 +43470,11 @@ export default {
                 docs: "semantic.typography.wrap.bold.1",
                 es6: "calciteTypographyWrapBold1",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -51999,24 +43489,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "wrap",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "bold",
-                  state: "",
-                  scale: "1",
-                  context: "",
-                  mode: "",
-                },
+                category: "wrap",
               },
             },
             name: "Typography Wrap Bold 1",
@@ -52048,12 +43521,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "wrap",
               type: "typography",
               item: "wrap",
               subitem: "bold",
@@ -52065,6 +43533,11 @@ export default {
                 docs: "semantic.typography.wrap.bold.2",
                 es6: "calciteTypographyWrapBold2",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -52079,24 +43552,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "wrap",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "bold",
-                  state: "",
-                  scale: "2",
-                  context: "",
-                  mode: "",
-                },
+                category: "wrap",
               },
             },
             name: "Typography Wrap Bold 2",
@@ -52128,12 +43584,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "wrap",
               type: "typography",
               item: "wrap",
               subitem: "bold",
@@ -52145,6 +43596,11 @@ export default {
                 docs: "semantic.typography.wrap.bold.3",
                 es6: "calciteTypographyWrapBold3",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -52159,24 +43615,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "wrap",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "bold",
-                  state: "",
-                  scale: "3",
-                  context: "",
-                  mode: "",
-                },
+                category: "wrap",
               },
             },
             name: "Typography Wrap Bold 3",
@@ -52208,12 +43647,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "wrap",
               type: "typography",
               item: "wrap",
               subitem: "bold",
@@ -52225,6 +43659,11 @@ export default {
                 docs: "semantic.typography.wrap.bold.-2",
                 es6: "calciteTypographyWrapBoldMinus2",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -52239,24 +43678,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "wrap",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "bold",
-                  state: "",
-                  scale: "-2",
-                  context: "",
-                  mode: "",
-                },
+                category: "wrap",
               },
             },
             name: "Typography Wrap Bold Minus 2",
@@ -52287,12 +43709,7 @@ export default {
               },
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "wrap",
               type: "typography",
               item: "wrap",
               subitem: "bold",
@@ -52304,6 +43721,11 @@ export default {
                 docs: "semantic.typography.wrap.bold.-1",
                 es6: "calciteTypographyWrapBoldMinus1",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -52317,24 +43739,7 @@ export default {
                 "calcite.extends": "{semantic.typography.default.default}",
               },
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "wrap",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "bold",
-                  state: "",
-                  scale: "-1",
-                  context: "",
-                  mode: "",
-                },
+                category: "wrap",
               },
             },
             name: "Typography Wrap Bold Minus 1",
@@ -52353,12 +43758,7 @@ export default {
             },
             type: "typography",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "hierarchy",
               type: "typography",
               item: "hierarchy",
               subitem: "display",
@@ -52370,6 +43770,11 @@ export default {
                 docs: "semantic.typography.hierarchy.display.1",
                 es6: "calciteTypographyHierarchyDisplay1",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -52381,24 +43786,7 @@ export default {
               },
               type: "typography",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "hierarchy",
-                  group: "",
-                  kind: "",
-                  appearance: "display",
-                  property: "",
-                  variant: "",
-                  state: "",
-                  scale: "1",
-                  context: "",
-                  mode: "",
-                },
+                category: "hierarchy",
               },
             },
             name: "Typography Hierarchy Display 1",
@@ -52413,12 +43801,7 @@ export default {
             },
             type: "typography",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "hierarchy",
               type: "typography",
               item: "hierarchy",
               subitem: "display",
@@ -52430,6 +43813,11 @@ export default {
                 docs: "semantic.typography.hierarchy.display.2",
                 es6: "calciteTypographyHierarchyDisplay2",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -52441,24 +43829,7 @@ export default {
               },
               type: "typography",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "hierarchy",
-                  group: "",
-                  kind: "",
-                  appearance: "display",
-                  property: "",
-                  variant: "",
-                  state: "",
-                  scale: "2",
-                  context: "",
-                  mode: "",
-                },
+                category: "hierarchy",
               },
             },
             name: "Typography Hierarchy Display 2",
@@ -52475,12 +43846,7 @@ export default {
             },
             type: "typography",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "hierarchy",
               type: "typography",
               item: "hierarchy",
               subitem: "heading",
@@ -52492,6 +43858,11 @@ export default {
                 docs: "semantic.typography.hierarchy.heading.1",
                 es6: "calciteTypographyHierarchyHeading1",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -52503,24 +43874,7 @@ export default {
               },
               type: "typography",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "hierarchy",
-                  group: "",
-                  kind: "",
-                  appearance: "heading",
-                  property: "",
-                  variant: "",
-                  state: "",
-                  scale: "1",
-                  context: "",
-                  mode: "",
-                },
+                category: "hierarchy",
               },
             },
             name: "Typography Hierarchy Heading 1",
@@ -52535,12 +43889,7 @@ export default {
             },
             type: "typography",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "hierarchy",
               type: "typography",
               item: "hierarchy",
               subitem: "heading",
@@ -52552,6 +43901,11 @@ export default {
                 docs: "semantic.typography.hierarchy.heading.2",
                 es6: "calciteTypographyHierarchyHeading2",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -52563,24 +43917,7 @@ export default {
               },
               type: "typography",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "hierarchy",
-                  group: "",
-                  kind: "",
-                  appearance: "heading",
-                  property: "",
-                  variant: "",
-                  state: "",
-                  scale: "2",
-                  context: "",
-                  mode: "",
-                },
+                category: "hierarchy",
               },
             },
             name: "Typography Hierarchy Heading 2",
@@ -52595,12 +43932,7 @@ export default {
             },
             type: "typography",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "hierarchy",
               type: "typography",
               item: "hierarchy",
               subitem: "heading",
@@ -52612,6 +43944,11 @@ export default {
                 docs: "semantic.typography.hierarchy.heading.3",
                 es6: "calciteTypographyHierarchyHeading3",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -52623,24 +43960,7 @@ export default {
               },
               type: "typography",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "hierarchy",
-                  group: "",
-                  kind: "",
-                  appearance: "heading",
-                  property: "",
-                  variant: "",
-                  state: "",
-                  scale: "3",
-                  context: "",
-                  mode: "",
-                },
+                category: "hierarchy",
               },
             },
             name: "Typography Hierarchy Heading 3",
@@ -52655,12 +43975,7 @@ export default {
             },
             type: "typography",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "hierarchy",
               type: "typography",
               item: "hierarchy",
               subitem: "heading",
@@ -52672,6 +43987,11 @@ export default {
                 docs: "semantic.typography.hierarchy.heading.4",
                 es6: "calciteTypographyHierarchyHeading4",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -52683,24 +44003,7 @@ export default {
               },
               type: "typography",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "hierarchy",
-                  group: "",
-                  kind: "",
-                  appearance: "heading",
-                  property: "",
-                  variant: "",
-                  state: "",
-                  scale: "4",
-                  context: "",
-                  mode: "",
-                },
+                category: "hierarchy",
               },
             },
             name: "Typography Hierarchy Heading 4",
@@ -52714,12 +44017,7 @@ export default {
             },
             type: "typography",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "hierarchy",
               type: "typography",
               item: "hierarchy",
               subitem: "heading",
@@ -52731,6 +44029,11 @@ export default {
                 docs: "semantic.typography.hierarchy.heading.5",
                 es6: "calciteTypographyHierarchyHeading5",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -52741,24 +44044,7 @@ export default {
               },
               type: "typography",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "hierarchy",
-                  group: "",
-                  kind: "",
-                  appearance: "heading",
-                  property: "",
-                  variant: "",
-                  state: "",
-                  scale: "5",
-                  context: "",
-                  mode: "",
-                },
+                category: "hierarchy",
               },
             },
             name: "Typography Hierarchy Heading 5",
@@ -52773,12 +44059,7 @@ export default {
             },
             type: "typography",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "hierarchy",
               type: "typography",
               item: "hierarchy",
               subitem: "body",
@@ -52790,6 +44071,11 @@ export default {
                 docs: "semantic.typography.hierarchy.body.snug",
                 es6: "calciteTypographyHierarchyBodySnug",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -52799,24 +44085,7 @@ export default {
               },
               type: "typography",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "hierarchy",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "body",
-                  state: "",
-                  scale: "snug",
-                  context: "",
-                  mode: "",
-                },
+                category: "hierarchy",
               },
             },
             name: "Typography Hierarchy Body Snug",
@@ -52841,12 +44110,7 @@ export default {
             },
             type: "typography",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "typography",
-              },
-              category: "semantic",
+              category: "hierarchy",
               type: "typography",
               item: "hierarchy",
               subitem: "body",
@@ -52858,6 +44122,11 @@ export default {
                 docs: "semantic.typography.hierarchy.body.default",
                 es6: "calciteTypographyHierarchyBody",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "typography",
+              },
             },
             filePath: "src/tokens/semantic/typography.json",
             isSource: true,
@@ -52874,24 +44143,7 @@ export default {
               },
               type: "typography",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "typography",
-                  element: "",
-                  category: "hierarchy",
-                  group: "",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "body",
-                  state: "",
-                  scale: "default",
-                  context: "",
-                  mode: "",
-                },
+                category: "hierarchy",
               },
             },
             name: "Typography Hierarchy Body",
@@ -52907,12 +44159,7 @@ export default {
           },
           type: "typography",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "typography",
-            },
-            category: "semantic",
+            category: "hierarchy",
             type: "typography",
             item: "hierarchy",
             subitem: "overline",
@@ -52923,6 +44170,11 @@ export default {
               docs: "semantic.typography.hierarchy.overline",
               es6: "calciteTypographyHierarchyOverline",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "typography",
+            },
           },
           filePath: "src/tokens/semantic/typography.json",
           isSource: true,
@@ -52934,24 +44186,7 @@ export default {
             },
             type: "typography",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "typography",
-                element: "",
-                category: "hierarchy",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "overline",
-                state: "",
-                scale: "default",
-                context: "",
-                mode: "",
-              },
+              category: "hierarchy",
             },
           },
           name: "Typography Hierarchy Overline",
@@ -52965,12 +44200,7 @@ export default {
           },
           type: "typography",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "typography",
-            },
-            category: "semantic",
+            category: "hierarchy",
             type: "typography",
             item: "hierarchy",
             subitem: "caption",
@@ -52981,6 +44211,11 @@ export default {
               docs: "semantic.typography.hierarchy.caption",
               es6: "calciteTypographyHierarchyCaption",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "typography",
+            },
           },
           filePath: "src/tokens/semantic/typography.json",
           isSource: true,
@@ -52991,24 +44226,7 @@ export default {
             },
             type: "typography",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "typography",
-                element: "",
-                category: "hierarchy",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "caption",
-                state: "",
-                scale: "default",
-                context: "",
-                mode: "",
-              },
+              category: "hierarchy",
             },
           },
           name: "Typography Hierarchy Caption",
@@ -53022,12 +44240,7 @@ export default {
         value: "-999999",
         type: "z-index",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "z-index",
-          },
-          category: "semantic",
+          category: "z-index",
           type: "z-index",
           item: "deep",
           names: {
@@ -53037,6 +44250,11 @@ export default {
             docs: "semantic.z-index.deep",
             es6: "calciteZIndexDeep",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "z-index",
+          },
         },
         filePath: "src/tokens/semantic/z-index.json",
         isSource: true,
@@ -53044,24 +44262,7 @@ export default {
           value: "{core.z-index.0}",
           type: "z-index",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "z-index",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "deep",
-              state: "",
-              scale: "",
-              context: "",
-              mode: "",
-            },
+            category: "z-index",
           },
         },
         name: "Z Index Deep",
@@ -53072,12 +44273,7 @@ export default {
         value: "1",
         type: "z-index",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "z-index",
-          },
-          category: "semantic",
+          category: "z-index",
           type: "z-index",
           item: "default",
           names: {
@@ -53087,6 +44283,11 @@ export default {
             docs: "semantic.z-index.default",
             es6: "calciteZIndex",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "z-index",
+          },
         },
         filePath: "src/tokens/semantic/z-index.json",
         isSource: true,
@@ -53094,24 +44295,7 @@ export default {
           value: "{core.z-index.1}",
           type: "z-index",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "z-index",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "default",
-              state: "",
-              scale: "",
-              context: "",
-              mode: "",
-            },
+            category: "z-index",
           },
         },
         name: "Z Index",
@@ -53122,12 +44306,7 @@ export default {
         value: "300",
         type: "z-index",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "z-index",
-          },
-          category: "semantic",
+          category: "z-index",
           type: "z-index",
           item: "sticky",
           names: {
@@ -53137,6 +44316,11 @@ export default {
             docs: "semantic.z-index.sticky",
             es6: "calciteZIndexSticky",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "z-index",
+          },
         },
         filePath: "src/tokens/semantic/z-index.json",
         isSource: true,
@@ -53144,24 +44328,7 @@ export default {
           value: "{core.z-index.3}",
           type: "z-index",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "z-index",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "sticky",
-              state: "",
-              scale: "",
-              context: "",
-              mode: "",
-            },
+            category: "z-index",
           },
         },
         name: "Z Index Sticky",
@@ -53172,12 +44339,7 @@ export default {
         value: "400",
         type: "z-index",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "z-index",
-          },
-          category: "semantic",
+          category: "z-index",
           type: "z-index",
           item: "header",
           names: {
@@ -53187,6 +44349,11 @@ export default {
             docs: "semantic.z-index.header",
             es6: "calciteZIndexHeader",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "z-index",
+          },
         },
         filePath: "src/tokens/semantic/z-index.json",
         isSource: true,
@@ -53194,24 +44361,7 @@ export default {
           value: "{core.z-index.4}",
           type: "z-index",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "z-index",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "header",
-              state: "",
-              scale: "",
-              context: "",
-              mode: "",
-            },
+            category: "z-index",
           },
         },
         name: "Z Index Header",
@@ -53222,12 +44372,7 @@ export default {
         value: "500",
         type: "z-index",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "z-index",
-          },
-          category: "semantic",
+          category: "z-index",
           type: "z-index",
           item: "toast",
           names: {
@@ -53237,6 +44382,11 @@ export default {
             docs: "semantic.z-index.toast",
             es6: "calciteZIndexToast",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "z-index",
+          },
         },
         filePath: "src/tokens/semantic/z-index.json",
         isSource: true,
@@ -53244,24 +44394,7 @@ export default {
           value: "{core.z-index.5}",
           type: "z-index",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "z-index",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "toast",
-              state: "",
-              scale: "",
-              context: "",
-              mode: "",
-            },
+            category: "z-index",
           },
         },
         name: "Z Index Toast",
@@ -53272,12 +44405,7 @@ export default {
         value: "600",
         type: "z-index",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "z-index",
-          },
-          category: "semantic",
+          category: "z-index",
           type: "z-index",
           item: "dropdown",
           names: {
@@ -53287,6 +44415,11 @@ export default {
             docs: "semantic.z-index.dropdown",
             es6: "calciteZIndexDropdown",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "z-index",
+          },
         },
         filePath: "src/tokens/semantic/z-index.json",
         isSource: true,
@@ -53294,24 +44427,7 @@ export default {
           value: "{core.z-index.6}",
           type: "z-index",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "z-index",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "dropdown",
-              state: "",
-              scale: "",
-              context: "",
-              mode: "",
-            },
+            category: "z-index",
           },
         },
         name: "Z Index Dropdown",
@@ -53322,12 +44438,7 @@ export default {
         value: "700",
         type: "z-index",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "z-index",
-          },
-          category: "semantic",
+          category: "z-index",
           type: "z-index",
           item: "overlay",
           names: {
@@ -53337,6 +44448,11 @@ export default {
             docs: "semantic.z-index.overlay",
             es6: "calciteZIndexOverlay",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "z-index",
+          },
         },
         filePath: "src/tokens/semantic/z-index.json",
         isSource: true,
@@ -53344,24 +44460,7 @@ export default {
           value: "{core.z-index.7}",
           type: "z-index",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "z-index",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "overlay",
-              state: "",
-              scale: "",
-              context: "",
-              mode: "",
-            },
+            category: "z-index",
           },
         },
         name: "Z Index Overlay",
@@ -53372,12 +44471,7 @@ export default {
         value: "800",
         type: "z-index",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "z-index",
-          },
-          category: "semantic",
+          category: "z-index",
           type: "z-index",
           item: "modal",
           names: {
@@ -53387,6 +44481,11 @@ export default {
             docs: "semantic.z-index.modal",
             es6: "calciteZIndexModal",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "z-index",
+          },
         },
         filePath: "src/tokens/semantic/z-index.json",
         isSource: true,
@@ -53394,24 +44493,7 @@ export default {
           value: "{core.z-index.8}",
           type: "z-index",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "z-index",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "modal",
-              state: "",
-              scale: "",
-              context: "",
-              mode: "",
-            },
+            category: "z-index",
           },
         },
         name: "Z Index Modal",
@@ -53422,12 +44504,7 @@ export default {
         value: "900",
         type: "z-index",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "z-index",
-          },
-          category: "semantic",
+          category: "z-index",
           type: "z-index",
           item: "popup",
           names: {
@@ -53437,6 +44514,11 @@ export default {
             docs: "semantic.z-index.popup",
             es6: "calciteZIndexPopup",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "z-index",
+          },
         },
         filePath: "src/tokens/semantic/z-index.json",
         isSource: true,
@@ -53444,24 +44526,7 @@ export default {
           value: "{core.z-index.9}",
           type: "z-index",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "z-index",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "popup",
-              state: "",
-              scale: "",
-              context: "",
-              mode: "",
-            },
+            category: "z-index",
           },
         },
         name: "Z Index Popup",
@@ -53472,12 +44537,7 @@ export default {
         value: "901",
         type: "z-index",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "z-index",
-          },
-          category: "semantic",
+          category: "z-index",
           type: "z-index",
           item: "tooltip",
           names: {
@@ -53487,6 +44547,11 @@ export default {
             docs: "semantic.z-index.tooltip",
             es6: "calciteZIndexTooltip",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "z-index",
+          },
         },
         filePath: "src/tokens/semantic/z-index.json",
         isSource: true,
@@ -53494,24 +44559,7 @@ export default {
           value: "{core.z-index.9} + 1",
           type: "z-index",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "z-index",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "tooltip",
-              state: "",
-              scale: "",
-              context: "",
-              mode: "",
-            },
+            category: "z-index",
           },
         },
         name: "Z Index Tooltip",
@@ -53899,12 +44947,7 @@ export default {
           value: "0",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "border",
             type: "border",
             item: "width",
             subitem: "none",
@@ -53915,6 +44958,11 @@ export default {
               docs: "semantic.border.width.none",
               es6: "calciteBorderWidthNone",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/border.json",
           isSource: true,
@@ -53922,24 +44970,7 @@ export default {
             value: "{core.size.default.none}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "border",
-                group: "width",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "none",
-                context: "",
-                mode: "",
-              },
+              category: "border",
             },
           },
           name: "Border Width None",
@@ -53950,12 +44981,7 @@ export default {
           value: "1px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "border",
             type: "border",
             item: "width",
             subitem: "sm",
@@ -53966,6 +44992,11 @@ export default {
               docs: "semantic.border.width.sm",
               es6: "calciteBorderWidthSm",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/border.json",
           isSource: true,
@@ -53973,24 +45004,7 @@ export default {
             value: "{core.size.default.1}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "border",
-                group: "width",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "sm",
-                context: "",
-                mode: "",
-              },
+              category: "border",
             },
           },
           name: "Border Width Sm",
@@ -54001,12 +45015,7 @@ export default {
           value: "2px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "border",
             type: "border",
             item: "width",
             subitem: "md",
@@ -54017,6 +45026,11 @@ export default {
               docs: "semantic.border.width.md",
               es6: "calciteBorderWidthMd",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/border.json",
           isSource: true,
@@ -54024,24 +45038,7 @@ export default {
             value: "{core.size.default.2}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "border",
-                group: "width",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "md",
-                context: "",
-                mode: "",
-              },
+              category: "border",
             },
           },
           name: "Border Width Md",
@@ -54052,12 +45049,7 @@ export default {
           value: "4px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "border",
             type: "border",
             item: "width",
             subitem: "lg",
@@ -54068,6 +45060,11 @@ export default {
               docs: "semantic.border.width.lg",
               es6: "calciteBorderWidthLg",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/border.json",
           isSource: true,
@@ -54075,24 +45072,7 @@ export default {
             value: "{core.size.default.4}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "border",
-                group: "width",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "lg",
-                context: "",
-                mode: "",
-              },
+              category: "border",
             },
           },
           name: "Border Width Lg",
@@ -54111,12 +45091,7 @@ export default {
           type: "dimension",
           description: "Small handheld devices and mini-windows",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "breakpoint",
             type: "dimension",
             item: "height",
             subitem: "xxs",
@@ -54137,6 +45112,11 @@ export default {
               docs: "semantic.container-size.height.xxs",
               es6: "calciteContainerSizeHeightXxs",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/container-size.json",
           isSource: true,
@@ -54148,24 +45128,7 @@ export default {
             type: "dimension",
             description: "Small handheld devices and mini-windows",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "breakpoint",
-                group: "height",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xxs",
-                context: "",
-                mode: "",
-              },
+              category: "breakpoint",
             },
           },
           name: "Container Size Height Xxs",
@@ -54181,12 +45144,7 @@ export default {
           type: "dimension",
           description: "Handheld devices",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "breakpoint",
             type: "dimension",
             item: "height",
             subitem: "xs",
@@ -54207,6 +45165,11 @@ export default {
               docs: "semantic.container-size.height.xs",
               es6: "calciteContainerSizeHeightXs",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/container-size.json",
           isSource: true,
@@ -54218,24 +45181,7 @@ export default {
             type: "dimension",
             description: "Handheld devices",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "breakpoint",
-                group: "height",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xs",
-                context: "",
-                mode: "",
-              },
+              category: "breakpoint",
             },
           },
           name: "Container Size Height Xs",
@@ -54251,12 +45197,7 @@ export default {
           type: "dimension",
           description: "Small tablets",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "breakpoint",
             type: "dimension",
             item: "height",
             subitem: "sm",
@@ -54277,6 +45218,11 @@ export default {
               docs: "semantic.container-size.height.sm",
               es6: "calciteContainerSizeHeightSm",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/container-size.json",
           isSource: true,
@@ -54288,24 +45234,7 @@ export default {
             type: "dimension",
             description: "Small tablets",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "breakpoint",
-                group: "height",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "sm",
-                context: "",
-                mode: "",
-              },
+              category: "breakpoint",
             },
           },
           name: "Container Size Height Sm",
@@ -54321,12 +45250,7 @@ export default {
           type: "dimension",
           description: "Small laptops",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "breakpoint",
             type: "dimension",
             item: "height",
             subitem: "md",
@@ -54347,6 +45271,11 @@ export default {
               docs: "semantic.container-size.height.md",
               es6: "calciteContainerSizeHeightMd",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/container-size.json",
           isSource: true,
@@ -54358,24 +45287,7 @@ export default {
             type: "dimension",
             description: "Small laptops",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "breakpoint",
-                group: "height",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "md",
-                context: "",
-                mode: "",
-              },
+              category: "breakpoint",
             },
           },
           name: "Container Size Height Md",
@@ -54391,12 +45303,7 @@ export default {
           type: "dimension",
           description: "Large laptops and desktop computers",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "breakpoint",
             type: "dimension",
             item: "height",
             subitem: "lg",
@@ -54417,6 +45324,11 @@ export default {
               docs: "semantic.container-size.height.lg",
               es6: "calciteContainerSizeHeightLg",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/container-size.json",
           isSource: true,
@@ -54428,24 +45340,7 @@ export default {
             type: "dimension",
             description: "Large laptops and desktop computers",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "breakpoint",
-                group: "height",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "lg",
-                context: "",
-                mode: "",
-              },
+              category: "breakpoint",
             },
           },
           name: "Container Size Height Lg",
@@ -54460,12 +45355,7 @@ export default {
           type: "dimension",
           description: "Projectors and televisions",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "breakpoint",
             type: "dimension",
             item: "height",
             subitem: "xl",
@@ -54485,6 +45375,11 @@ export default {
               docs: "semantic.container-size.height.xl",
               es6: "calciteContainerSizeHeightXl",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/container-size.json",
           isSource: true,
@@ -54495,24 +45390,7 @@ export default {
             type: "dimension",
             description: "Projectors and televisions",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "breakpoint",
-                group: "height",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xl",
-                context: "",
-                mode: "",
-              },
+              category: "breakpoint",
             },
           },
           name: "Container Size Height Xl",
@@ -54530,12 +45408,7 @@ export default {
           type: "dimension",
           description: "Small handheld devices and mini-windows",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "breakpoint",
             type: "dimension",
             item: "width",
             subitem: "xxs",
@@ -54556,6 +45429,11 @@ export default {
               docs: "semantic.container-size.width.xxs",
               es6: "calciteContainerSizeWidthXxs",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/container-size.json",
           isSource: true,
@@ -54567,24 +45445,7 @@ export default {
             type: "dimension",
             description: "Small handheld devices and mini-windows",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "breakpoint",
-                group: "width",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xxs",
-                context: "",
-                mode: "",
-              },
+              category: "breakpoint",
             },
           },
           name: "Container Size Width Xxs",
@@ -54600,12 +45461,7 @@ export default {
           type: "dimension",
           description: "Handheld devices",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "breakpoint",
             type: "dimension",
             item: "width",
             subitem: "xs",
@@ -54626,6 +45482,11 @@ export default {
               docs: "semantic.container-size.width.xs",
               es6: "calciteContainerSizeWidthXs",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/container-size.json",
           isSource: true,
@@ -54637,24 +45498,7 @@ export default {
             type: "dimension",
             description: "Handheld devices",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "breakpoint",
-                group: "width",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xs",
-                context: "",
-                mode: "",
-              },
+              category: "breakpoint",
             },
           },
           name: "Container Size Width Xs",
@@ -54670,12 +45514,7 @@ export default {
           type: "dimension",
           description: "Small tablets",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "breakpoint",
             type: "dimension",
             item: "width",
             subitem: "sm",
@@ -54696,6 +45535,11 @@ export default {
               docs: "semantic.container-size.width.sm",
               es6: "calciteContainerSizeWidthSm",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/container-size.json",
           isSource: true,
@@ -54707,24 +45551,7 @@ export default {
             type: "dimension",
             description: "Small tablets",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "breakpoint",
-                group: "width",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "sm",
-                context: "",
-                mode: "",
-              },
+              category: "breakpoint",
             },
           },
           name: "Container Size Width Sm",
@@ -54740,12 +45567,7 @@ export default {
           type: "dimension",
           description: "Small laptops",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "breakpoint",
             type: "dimension",
             item: "width",
             subitem: "md",
@@ -54766,6 +45588,11 @@ export default {
               docs: "semantic.container-size.width.md",
               es6: "calciteContainerSizeWidthMd",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/container-size.json",
           isSource: true,
@@ -54777,24 +45604,7 @@ export default {
             type: "dimension",
             description: "Small laptops",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "breakpoint",
-                group: "width",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "md",
-                context: "",
-                mode: "",
-              },
+              category: "breakpoint",
             },
           },
           name: "Container Size Width Md",
@@ -54810,12 +45620,7 @@ export default {
           type: "dimension",
           description: "Large laptops and desktop computers",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "breakpoint",
             type: "dimension",
             item: "width",
             subitem: "lg",
@@ -54836,6 +45641,11 @@ export default {
               docs: "semantic.container-size.width.lg",
               es6: "calciteContainerSizeWidthLg",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/container-size.json",
           isSource: true,
@@ -54847,24 +45657,7 @@ export default {
             type: "dimension",
             description: "Large laptops and desktop computers",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "breakpoint",
-                group: "width",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "lg",
-                context: "",
-                mode: "",
-              },
+              category: "breakpoint",
             },
           },
           name: "Container Size Width Lg",
@@ -54879,12 +45672,7 @@ export default {
           type: "dimension",
           description: "Projectors and televisions",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "breakpoint",
             type: "dimension",
             item: "width",
             subitem: "xl",
@@ -54904,6 +45692,11 @@ export default {
               docs: "semantic.container-size.width.xl",
               es6: "calciteContainerSizeWidthXl",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/container-size.json",
           isSource: true,
@@ -54914,24 +45707,7 @@ export default {
             type: "dimension",
             description: "Projectors and televisions",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "breakpoint",
-                group: "width",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xl",
-                context: "",
-                mode: "",
-              },
+              category: "breakpoint",
             },
           },
           name: "Container Size Width Xl",
@@ -54944,12 +45720,7 @@ export default {
         value: "24px",
         type: "dimension",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "dimension",
-          },
-          category: "semantic",
+          category: "breakpoint",
           type: "container-size",
           item: "margin",
           names: {
@@ -54959,6 +45730,11 @@ export default {
             docs: "semantic.container-size.margin",
             es6: "calciteContainerSizeMargin",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "dimension",
+          },
         },
         filePath: "src/tokens/semantic/container-size.json",
         isSource: true,
@@ -54966,24 +45742,7 @@ export default {
           value: "{core.size.default.24}",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "breakpoint",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "margin",
-              variant: "",
-              state: "",
-              scale: "",
-              context: "",
-              mode: "",
-            },
+            category: "breakpoint",
           },
         },
         name: "Container Size Margin",
@@ -54994,12 +45753,7 @@ export default {
         value: "16px",
         type: "dimension",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "dimension",
-          },
-          category: "semantic",
+          category: "breakpoint",
           type: "container-size",
           item: "gutter",
           names: {
@@ -55009,6 +45763,11 @@ export default {
             docs: "semantic.container-size.gutter",
             es6: "calciteContainerSizeGutter",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "dimension",
+          },
         },
         filePath: "src/tokens/semantic/container-size.json",
         isSource: true,
@@ -55016,24 +45775,7 @@ export default {
           value: "{core.size.default.16}",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "breakpoint",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "gutter",
-              variant: "",
-              state: "",
-              scale: "",
-              context: "",
-              mode: "",
-            },
+            category: "breakpoint",
           },
         },
         name: "Container Size Gutter",
@@ -55046,12 +45788,7 @@ export default {
           type: "dimension",
           description: "for fluid grid widths",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "breakpoint",
             type: "dimension",
             item: "content",
             subitem: "fluid",
@@ -55069,6 +45806,11 @@ export default {
               docs: "semantic.container-size.content.fluid",
               es6: "calciteContainerSizeContentFluid",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/container-size.json",
           isSource: true,
@@ -55077,24 +45819,7 @@ export default {
             type: "dimension",
             description: "for fluid grid widths",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "breakpoint",
-                group: "content",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "fluid",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "breakpoint",
             },
           },
           name: "Container Size Content Fluid",
@@ -55107,12 +45832,7 @@ export default {
           type: "dimension",
           description: "only for lg breakpoint fixed grid width",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "breakpoint",
             type: "dimension",
             item: "content",
             subitem: "fixed",
@@ -55130,6 +45850,11 @@ export default {
               docs: "semantic.container-size.content.fixed",
               es6: "calciteContainerSizeContentFixed",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/container-size.json",
           isSource: true,
@@ -55138,24 +45863,7 @@ export default {
             type: "dimension",
             description: "only for lg breakpoint fixed grid width",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "breakpoint",
-                group: "content",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "fixed",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "breakpoint",
             },
           },
           name: "Container Size Content Fixed",
@@ -55171,12 +45879,7 @@ export default {
           value: "0",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "corner",
             type: "corner",
             item: "radius",
             subitem: "default",
@@ -55187,6 +45890,11 @@ export default {
               docs: "semantic.corner.radius.default",
               es6: "calciteCornerRadius",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/corner.json",
           isSource: true,
@@ -55194,24 +45902,7 @@ export default {
             value: "{semantic.corner.radius.sharp}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "corner",
-                group: "radius",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "default",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "corner",
             },
           },
           name: "Corner Radius",
@@ -55222,12 +45913,7 @@ export default {
           value: "0",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "corner",
             type: "corner",
             item: "radius",
             subitem: "sharp",
@@ -55238,6 +45924,11 @@ export default {
               docs: "semantic.corner.radius.sharp",
               es6: "calciteCornerRadiusSharp",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/corner.json",
           isSource: true,
@@ -55245,24 +45936,7 @@ export default {
             value: "{core.size.default.none}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "corner",
-                group: "radius",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "sharp",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "corner",
             },
           },
           name: "Corner Radius Sharp",
@@ -55273,12 +45947,7 @@ export default {
           value: "4px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "corner",
             type: "corner",
             item: "radius",
             subitem: "round",
@@ -55289,6 +45958,11 @@ export default {
               docs: "semantic.corner.radius.round",
               es6: "calciteCornerRadiusRound",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/corner.json",
           isSource: true,
@@ -55296,24 +45970,7 @@ export default {
             value: "{core.size.default.4}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "corner",
-                group: "radius",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "round",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "corner",
             },
           },
           name: "Corner Radius Round",
@@ -55324,12 +45981,8 @@ export default {
           value: "100%",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            element: "",
+            category: "corner",
             type: "corner",
             item: "radius",
             subitem: "pill",
@@ -55340,6 +45993,11 @@ export default {
               docs: "semantic.corner.radius.pill",
               es6: "calciteCornerRadiusPill",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/corner.json",
           isSource: true,
@@ -55347,24 +46005,8 @@ export default {
             value: "{core.size.relative.100}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "corner",
-                group: "radius",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "pill",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              element: "",
+              category: "corner",
             },
           },
           name: "Corner Radius Pill",
@@ -55380,11 +46022,7 @@ export default {
           type: "fontFamily",
           description: "Primary font with fallbacks",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "fontFamily",
-            },
+            group: "family",
             category: "semantic",
             type: "fontFamily",
             item: "family",
@@ -55403,6 +46041,11 @@ export default {
               docs: "semantic.font.family.default",
               es6: "calciteFontFamily",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "fontFamily",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -55416,24 +46059,7 @@ export default {
             type: "fontFamily",
             description: "Primary font with fallbacks",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "family",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              group: "family",
             },
           },
           name: "Font Family",
@@ -55452,12 +46078,7 @@ export default {
           type: "fontFamily",
           description: "Font family for code with fallbacks",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "fontFamily",
-            },
-            category: "semantic",
+            category: "font",
             type: "fontFamily",
             item: "family",
             subitem: "code",
@@ -55481,6 +46102,11 @@ export default {
               docs: "semantic.font.family.code",
               es6: "calciteFontFamilyCode",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "fontFamily",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -55495,24 +46121,7 @@ export default {
             type: "fontFamily",
             description: "Font family for code with fallbacks",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "family",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "code",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Family Code",
@@ -55527,12 +46136,7 @@ export default {
           type: "fontWeight",
           description: "For Avenir Next World (secondary font family)",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "fontWeight",
-            },
-            category: "semantic",
+            category: "font",
             type: "fontWeight",
             item: "weight",
             subitem: "light",
@@ -55550,6 +46154,11 @@ export default {
               docs: "semantic.font.weight.light",
               es6: "calciteFontWeightLight",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "fontWeight",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -55558,24 +46167,7 @@ export default {
             type: "fontWeight",
             description: "For Avenir Next World (secondary font family)",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "weight",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "light",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Weight Light",
@@ -55592,12 +46184,7 @@ export default {
             "calcite.deprecated": true,
           },
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "fontWeight",
-            },
-            category: "semantic",
+            category: "font",
             type: "fontWeight",
             item: "weight",
             subitem: "normal",
@@ -55620,6 +46207,11 @@ export default {
               docs: "semantic.font.weight.normal",
               es6: "calciteFontWeightNormal",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "fontWeight",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -55632,24 +46224,7 @@ export default {
               "calcite.deprecated": true,
             },
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "weight",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "normal",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Weight Normal",
@@ -55662,12 +46237,7 @@ export default {
           value: "400",
           type: "fontWeight",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "fontWeight",
-            },
-            category: "semantic",
+            category: "font",
             type: "font",
             item: "weight",
             subitem: "regular",
@@ -55678,6 +46248,11 @@ export default {
               docs: "semantic.font.weight.regular",
               es6: "calciteFontWeightRegular",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "fontWeight",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -55685,24 +46260,7 @@ export default {
             value: "{core.font.weight.regular}",
             type: "fontWeight",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "weight",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "regular",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Weight Regular",
@@ -55713,12 +46271,7 @@ export default {
           value: "500",
           type: "fontWeight",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "fontWeight",
-            },
-            category: "semantic",
+            category: "font",
             type: "font",
             item: "weight",
             subitem: "medium",
@@ -55729,6 +46282,11 @@ export default {
               docs: "semantic.font.weight.medium",
               es6: "calciteFontWeightMedium",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "fontWeight",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -55736,24 +46294,7 @@ export default {
             value: "{core.font.weight.medium}",
             type: "fontWeight",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "weight",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "medium",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Weight Medium",
@@ -55764,12 +46305,7 @@ export default {
           value: "600",
           type: "fontWeight",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "fontWeight",
-            },
-            category: "semantic",
+            category: "font",
             type: "font",
             item: "weight",
             subitem: "semibold",
@@ -55780,6 +46316,11 @@ export default {
               docs: "semantic.font.weight.semibold",
               es6: "calciteFontWeightSemibold",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "fontWeight",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -55787,24 +46328,7 @@ export default {
             value: "{core.font.weight.demi}",
             type: "fontWeight",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "weight",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "semibold",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Weight Semibold",
@@ -55815,12 +46339,7 @@ export default {
           value: "600",
           type: "fontWeight",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "fontWeight",
-            },
-            category: "semantic",
+            category: "font",
             type: "font",
             item: "weight",
             subitem: "bold",
@@ -55831,31 +46350,19 @@ export default {
               docs: "semantic.font.weight.bold",
               es6: "calciteFontWeightBold",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "fontWeight",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
           original: {
             value: "{core.font.weight.demi}",
-            type: "fontWeight",
-            attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "weight",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "bold",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+            type: "fontWeight",
+            attributes: {
+              category: "font",
             },
           },
           name: "Font Weight Bold",
@@ -55868,12 +46375,7 @@ export default {
           value: "10px",
           type: "fontSize",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "fontSize",
-            },
-            category: "semantic",
+            category: "font",
             type: "font",
             item: "size",
             subitem: "xs",
@@ -55884,6 +46386,11 @@ export default {
               docs: "semantic.font.size.xs",
               es6: "calciteFontSizeXs",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "fontSize",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -55891,24 +46398,7 @@ export default {
             value: "{core.size.default.10}",
             type: "fontSize",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "size",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xs",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Size Xs",
@@ -55919,12 +46409,7 @@ export default {
           value: "12px",
           type: "fontSize",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "fontSize",
-            },
-            category: "semantic",
+            category: "font",
             type: "font",
             item: "size",
             subitem: "sm",
@@ -55935,6 +46420,11 @@ export default {
               docs: "semantic.font.size.sm",
               es6: "calciteFontSizeSm",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "fontSize",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -55942,24 +46432,7 @@ export default {
             value: "{core.size.default.12}",
             type: "fontSize",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "size",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "sm",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Size Sm",
@@ -55970,12 +46443,7 @@ export default {
           value: "14px",
           type: "fontSize",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "fontSize",
-            },
-            category: "semantic",
+            category: "font",
             type: "font",
             item: "size",
             subitem: "default",
@@ -55986,6 +46454,11 @@ export default {
               docs: "semantic.font.size.default",
               es6: "calciteFontSize",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "fontSize",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -55993,24 +46466,7 @@ export default {
             value: "{core.size.default.14}",
             type: "fontSize",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "size",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "default",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Size",
@@ -56021,12 +46477,7 @@ export default {
           value: "16px",
           type: "fontSize",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "fontSize",
-            },
-            category: "semantic",
+            category: "font",
             type: "font",
             item: "size",
             subitem: "md",
@@ -56037,6 +46488,11 @@ export default {
               docs: "semantic.font.size.md",
               es6: "calciteFontSizeMd",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "fontSize",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -56044,24 +46500,7 @@ export default {
             value: "{core.size.default.16}",
             type: "fontSize",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "size",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "md",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Size Md",
@@ -56072,12 +46511,7 @@ export default {
           value: "18px",
           type: "fontSize",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "fontSize",
-            },
-            category: "semantic",
+            category: "font",
             type: "font",
             item: "size",
             subitem: "lg",
@@ -56088,6 +46522,11 @@ export default {
               docs: "semantic.font.size.lg",
               es6: "calciteFontSizeLg",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "fontSize",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -56095,24 +46534,7 @@ export default {
             value: "{core.size.default.2} * 9",
             type: "fontSize",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "size",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "lg",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Size Lg",
@@ -56123,12 +46545,7 @@ export default {
           value: "20px",
           type: "fontSize",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "fontSize",
-            },
-            category: "semantic",
+            category: "font",
             type: "font",
             item: "size",
             subitem: "xl",
@@ -56139,6 +46556,11 @@ export default {
               docs: "semantic.font.size.xl",
               es6: "calciteFontSizeXl",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "fontSize",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -56146,24 +46568,7 @@ export default {
             value: "{core.size.default.20}",
             type: "fontSize",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "size",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xl",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Size Xl",
@@ -56174,12 +46579,7 @@ export default {
           value: "24px",
           type: "fontSize",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "fontSize",
-            },
-            category: "semantic",
+            category: "font",
             type: "font",
             item: "size",
             subitem: "xxl",
@@ -56190,6 +46590,11 @@ export default {
               docs: "semantic.font.size.xxl",
               es6: "calciteFontSizeXxl",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "fontSize",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -56197,24 +46602,7 @@ export default {
             value: "{core.size.default.24}",
             type: "fontSize",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "size",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xxl",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Size Xxl",
@@ -56228,12 +46616,7 @@ export default {
           type: "fontStyle",
           description: "used in ratings",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "fontStyle",
-            },
-            category: "semantic",
+            category: "font",
             type: "fontStyle",
             item: "style",
             subitem: "emphasis",
@@ -56251,6 +46634,11 @@ export default {
               docs: "semantic.font.style.emphasis",
               es6: "calciteFontStyleEmphasis",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "fontStyle",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -56259,24 +46647,7 @@ export default {
             type: "fontStyle",
             description: "used in ratings",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "style",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "emphasis",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Style Emphasis",
@@ -56291,12 +46662,7 @@ export default {
             value: "12px",
             type: "lineHeight",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "lineHeight",
-              },
-              category: "semantic",
+              category: "font",
               type: "font",
               item: "line-height",
               subitem: "fixed",
@@ -56308,6 +46674,11 @@ export default {
                 docs: "semantic.font.line-height.fixed.sm",
                 es6: "calciteFontLineHeightFixedSm",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "lineHeight",
+              },
             },
             filePath: "src/tokens/semantic/font.json",
             isSource: true,
@@ -56315,24 +46686,7 @@ export default {
               value: "{core.size.default.12}",
               type: "lineHeight",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "font",
-                  group: "line-height",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "fixed",
-                  state: "",
-                  scale: "sm",
-                  context: "",
-                  mode: "",
-                },
+                category: "font",
               },
             },
             name: "Font Line Height Fixed Sm",
@@ -56343,12 +46697,7 @@ export default {
             value: "16px",
             type: "lineHeight",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "lineHeight",
-              },
-              category: "semantic",
+              category: "font",
               type: "font",
               item: "line-height",
               subitem: "fixed",
@@ -56360,6 +46709,11 @@ export default {
                 docs: "semantic.font.line-height.fixed.base",
                 es6: "calciteFontLineHeightFixedBase",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "lineHeight",
+              },
             },
             filePath: "src/tokens/semantic/font.json",
             isSource: true,
@@ -56367,24 +46721,7 @@ export default {
               value: "{core.size.default.16}",
               type: "lineHeight",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "font",
-                  group: "line-height",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "fixed",
-                  state: "",
-                  scale: "base",
-                  context: "",
-                  mode: "",
-                },
+                category: "font",
               },
             },
             name: "Font Line Height Fixed Base",
@@ -56395,12 +46732,7 @@ export default {
             value: "20px",
             type: "lineHeight",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "lineHeight",
-              },
-              category: "semantic",
+              category: "font",
               type: "font",
               item: "line-height",
               subitem: "fixed",
@@ -56412,6 +46744,11 @@ export default {
                 docs: "semantic.font.line-height.fixed.lg",
                 es6: "calciteFontLineHeightFixedLg",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "lineHeight",
+              },
             },
             filePath: "src/tokens/semantic/font.json",
             isSource: true,
@@ -56419,24 +46756,7 @@ export default {
               value: "{core.size.default.20}",
               type: "lineHeight",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "font",
-                  group: "line-height",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "fixed",
-                  state: "",
-                  scale: "lg",
-                  context: "",
-                  mode: "",
-                },
+                category: "font",
               },
             },
             name: "Font Line Height Fixed Lg",
@@ -56447,12 +46767,7 @@ export default {
             value: "24px",
             type: "lineHeight",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "lineHeight",
-              },
-              category: "semantic",
+              category: "font",
               type: "font",
               item: "line-height",
               subitem: "fixed",
@@ -56464,6 +46779,11 @@ export default {
                 docs: "semantic.font.line-height.fixed.xl",
                 es6: "calciteFontLineHeightFixedXl",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "lineHeight",
+              },
             },
             filePath: "src/tokens/semantic/font.json",
             isSource: true,
@@ -56471,24 +46791,7 @@ export default {
               value: "{core.size.default.24}",
               type: "lineHeight",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "font",
-                  group: "line-height",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "fixed",
-                  state: "",
-                  scale: "xl",
-                  context: "",
-                  mode: "",
-                },
+                category: "font",
               },
             },
             name: "Font Line Height Fixed Xl",
@@ -56502,12 +46805,7 @@ export default {
             type: "lineHeight",
             description: "1",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "lineHeight",
-              },
-              category: "semantic",
+              category: "font",
               type: "lineHeight",
               item: "line-height",
               subitem: "relative",
@@ -56526,6 +46824,11 @@ export default {
                 docs: "semantic.font.line-height.relative.default",
                 es6: "calciteFontLineHeightRelative",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "lineHeight",
+              },
             },
             filePath: "src/tokens/semantic/font.json",
             isSource: true,
@@ -56534,24 +46837,7 @@ export default {
               type: "lineHeight",
               description: "1",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "font",
-                  group: "line-height",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "relative",
-                  state: "",
-                  scale: "default",
-                  context: "",
-                  mode: "",
-                },
+                category: "font",
               },
             },
             name: "Font Line Height Relative",
@@ -56564,12 +46850,7 @@ export default {
             type: "lineHeight",
             description: "1.25",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "lineHeight",
-              },
-              category: "semantic",
+              category: "font",
               type: "lineHeight",
               item: "line-height",
               subitem: "relative",
@@ -56588,6 +46869,11 @@ export default {
                 docs: "semantic.font.line-height.relative.tight",
                 es6: "calciteFontLineHeightRelativeTight",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "lineHeight",
+              },
             },
             filePath: "src/tokens/semantic/font.json",
             isSource: true,
@@ -56596,24 +46882,7 @@ export default {
               type: "lineHeight",
               description: "1.25",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "font",
-                  group: "line-height",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "relative",
-                  state: "",
-                  scale: "tight",
-                  context: "",
-                  mode: "",
-                },
+                category: "font",
               },
             },
             name: "Font Line Height Relative Tight",
@@ -56626,12 +46895,7 @@ export default {
             type: "lineHeight",
             description: "1.375",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "lineHeight",
-              },
-              category: "semantic",
+              category: "font",
               type: "lineHeight",
               item: "line-height",
               subitem: "relative",
@@ -56650,6 +46914,11 @@ export default {
                 docs: "semantic.font.line-height.relative.snug",
                 es6: "calciteFontLineHeightRelativeSnug",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "lineHeight",
+              },
             },
             filePath: "src/tokens/semantic/font.json",
             isSource: true,
@@ -56658,24 +46927,7 @@ export default {
               type: "lineHeight",
               description: "1.375",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "font",
-                  group: "line-height",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "relative",
-                  state: "",
-                  scale: "snug",
-                  context: "",
-                  mode: "",
-                },
+                category: "font",
               },
             },
             name: "Font Line Height Relative Snug",
@@ -56688,12 +46940,7 @@ export default {
             type: "lineHeight",
             description: "1.5",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "lineHeight",
-              },
-              category: "semantic",
+              category: "font",
               type: "lineHeight",
               item: "line-height",
               subitem: "relative",
@@ -56712,6 +46959,11 @@ export default {
                 docs: "semantic.font.line-height.relative.normal",
                 es6: "calciteFontLineHeightRelativeNormal",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "lineHeight",
+              },
             },
             filePath: "src/tokens/semantic/font.json",
             isSource: true,
@@ -56720,24 +46972,7 @@ export default {
               type: "lineHeight",
               description: "1.5",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "font",
-                  group: "line-height",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "relative",
-                  state: "",
-                  scale: "normal",
-                  context: "",
-                  mode: "",
-                },
+                category: "font",
               },
             },
             name: "Font Line Height Relative Normal",
@@ -56750,12 +46985,7 @@ export default {
             type: "lineHeight",
             description: "1.625",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "lineHeight",
-              },
-              category: "semantic",
+              category: "font",
               type: "lineHeight",
               item: "line-height",
               subitem: "relative",
@@ -56774,6 +47004,11 @@ export default {
                 docs: "semantic.font.line-height.relative.relaxed",
                 es6: "calciteFontLineHeightRelativeRelaxed",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "lineHeight",
+              },
             },
             filePath: "src/tokens/semantic/font.json",
             isSource: true,
@@ -56782,24 +47017,7 @@ export default {
               type: "lineHeight",
               description: "1.625",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "font",
-                  group: "line-height",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "relative",
-                  state: "",
-                  scale: "relaxed",
-                  context: "",
-                  mode: "",
-                },
+                category: "font",
               },
             },
             name: "Font Line Height Relative Relaxed",
@@ -56812,12 +47030,7 @@ export default {
             type: "lineHeight",
             description: "2",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                type: "lineHeight",
-              },
-              category: "semantic",
+              category: "font",
               type: "lineHeight",
               item: "line-height",
               subitem: "relative",
@@ -56836,6 +47049,11 @@ export default {
                 docs: "semantic.font.line-height.relative.loose",
                 es6: "calciteFontLineHeightRelativeLoose",
               },
+              "calcite-schema": {
+                system: "calcite",
+                tier: "semantic",
+                type: "lineHeight",
+              },
             },
             filePath: "src/tokens/semantic/font.json",
             isSource: true,
@@ -56844,24 +47062,7 @@ export default {
               type: "lineHeight",
               description: "2",
               attributes: {
-                "calcite-schema": {
-                  system: "calcite",
-                  tier: "semantic",
-                  domain: "",
-                  component: "",
-                  pattern: "",
-                  element: "",
-                  category: "font",
-                  group: "line-height",
-                  kind: "",
-                  appearance: "",
-                  property: "",
-                  variant: "relative",
-                  state: "",
-                  scale: "loose",
-                  context: "",
-                  mode: "",
-                },
+                category: "font",
               },
             },
             name: "Font Line Height Relative Loose",
@@ -56877,12 +47078,7 @@ export default {
           type: "dimension",
           description: "Deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "font",
             type: "dimension",
             item: "letter-spacing",
             subitem: "tight",
@@ -56900,6 +47096,11 @@ export default {
               docs: "semantic.font.letter-spacing.tight",
               es6: "calciteFontLetterSpacingTight",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -56908,24 +47109,7 @@ export default {
             type: "dimension",
             description: "Deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "letter-spacing",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "tight",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Letter Spacing Tight",
@@ -56938,12 +47122,7 @@ export default {
           type: "dimension",
           description: "Deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "font",
             type: "dimension",
             item: "letter-spacing",
             subitem: "normal",
@@ -56961,6 +47140,11 @@ export default {
               docs: "semantic.font.letter-spacing.normal",
               es6: "calciteFontLetterSpacingNormal",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -56969,24 +47153,7 @@ export default {
             type: "dimension",
             description: "Deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "letter-spacing",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "normal",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Letter Spacing Normal",
@@ -56999,12 +47166,7 @@ export default {
           type: "dimension",
           description: "Deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "font",
             type: "dimension",
             item: "letter-spacing",
             subitem: "wide",
@@ -57022,6 +47184,11 @@ export default {
               docs: "semantic.font.letter-spacing.wide",
               es6: "calciteFontLetterSpacingWide",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -57030,24 +47197,7 @@ export default {
             type: "dimension",
             description: "Deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "letter-spacing",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "wide",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Letter Spacing Wide",
@@ -57062,12 +47212,7 @@ export default {
           type: "dimension",
           description: "Deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "font",
             type: "dimension",
             item: "paragraph-spacing",
             subitem: "normal",
@@ -57085,6 +47230,11 @@ export default {
               docs: "semantic.font.paragraph-spacing.normal",
               es6: "calciteFontParagraphSpacingNormal",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -57093,24 +47243,7 @@ export default {
             type: "dimension",
             description: "Deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "paragraph-spacing",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "normal",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Paragraph Spacing Normal",
@@ -57125,12 +47258,7 @@ export default {
           type: "textDecoration",
           description: "Deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "textDecoration",
-            },
-            category: "semantic",
+            category: "font",
             type: "textDecoration",
             item: "text-decoration",
             subitem: "none",
@@ -57148,6 +47276,11 @@ export default {
               docs: "semantic.font.text-decoration.none",
               es6: "calciteFontTextDecorationNone",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "textDecoration",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -57156,24 +47289,7 @@ export default {
             type: "textDecoration",
             description: "Deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "text-decoration",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "none",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Text Decoration None",
@@ -57186,12 +47302,7 @@ export default {
           type: "textDecoration",
           description: "Deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "textDecoration",
-            },
-            category: "semantic",
+            category: "font",
             type: "textDecoration",
             item: "text-decoration",
             subitem: "underline",
@@ -57209,6 +47320,11 @@ export default {
               docs: "semantic.font.text-decoration.underline",
               es6: "calciteFontTextDecorationUnderline",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "textDecoration",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -57217,24 +47333,7 @@ export default {
             type: "textDecoration",
             description: "Deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "text-decoration",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "underline",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Text Decoration Underline",
@@ -57249,12 +47348,7 @@ export default {
           type: "textCase",
           description: "Deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "textCase",
-            },
-            category: "semantic",
+            category: "font",
             type: "textCase",
             item: "text-case",
             subitem: "none",
@@ -57272,6 +47366,11 @@ export default {
               docs: "semantic.font.text-case.none",
               es6: "calciteFontTextCaseNone",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "textCase",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -57280,24 +47379,7 @@ export default {
             type: "textCase",
             description: "Deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "text-case",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "none",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Text Case None",
@@ -57310,12 +47392,7 @@ export default {
           type: "textCase",
           description: "Deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "textCase",
-            },
-            category: "semantic",
+            category: "font",
             type: "textCase",
             item: "text-case",
             subitem: "uppercase",
@@ -57333,6 +47410,11 @@ export default {
               docs: "semantic.font.text-case.uppercase",
               es6: "calciteFontTextCaseUppercase",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "textCase",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -57341,24 +47423,7 @@ export default {
             type: "textCase",
             description: "Deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "text-case",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "uppercase",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Text Case Uppercase",
@@ -57371,12 +47436,7 @@ export default {
           type: "textCase",
           description: "Deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "textCase",
-            },
-            category: "semantic",
+            category: "font",
             type: "textCase",
             item: "text-case",
             subitem: "lowercase",
@@ -57394,6 +47454,11 @@ export default {
               docs: "semantic.font.text-case.lowercase",
               es6: "calciteFontTextCaseLowercase",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "textCase",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -57402,24 +47467,7 @@ export default {
             type: "textCase",
             description: "Deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "text-case",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "lowercase",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Text Case Lowercase",
@@ -57432,12 +47480,7 @@ export default {
           type: "textCase",
           description: "Deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "textCase",
-            },
-            category: "semantic",
+            category: "font",
             type: "textCase",
             item: "text-case",
             subitem: "capitalize",
@@ -57455,6 +47498,11 @@ export default {
               docs: "semantic.font.text-case.capitalize",
               es6: "calciteFontTextCaseCapitalize",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "textCase",
+            },
           },
           filePath: "src/tokens/semantic/font.json",
           isSource: true,
@@ -57463,24 +47511,7 @@ export default {
             type: "textCase",
             description: "Deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "font",
-                group: "text-case",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "capitalize",
-                state: "",
-                scale: "",
-                context: "",
-                mode: "",
-              },
+              category: "font",
             },
           },
           name: "Font Text Case Capitalize",
@@ -57495,12 +47526,7 @@ export default {
         value: "0.4",
         type: "opacity",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "opacity",
-          },
-          category: "semantic",
+          category: "opacity",
           type: "opacity",
           item: "light",
           names: {
@@ -57510,6 +47536,11 @@ export default {
             docs: "semantic.opacity.light",
             es6: "calciteOpacityLight",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "opacity",
+          },
         },
         filePath: "src/tokens/semantic/opacity.json",
         isSource: true,
@@ -57517,24 +47548,7 @@ export default {
           value: "{core.opacity.40}",
           type: "opacity",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "opacity",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "light",
-              context: "",
-              mode: "",
-            },
+            category: "opacity",
           },
         },
         name: "Opacity Light",
@@ -57545,12 +47559,7 @@ export default {
         value: "0.5",
         type: "opacity",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "opacity",
-          },
-          category: "semantic",
+          category: "opacity",
           type: "opacity",
           item: "half",
           names: {
@@ -57560,6 +47569,11 @@ export default {
             docs: "semantic.opacity.half",
             es6: "calciteOpacityHalf",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "opacity",
+          },
         },
         filePath: "src/tokens/semantic/opacity.json",
         isSource: true,
@@ -57567,24 +47581,7 @@ export default {
           value: "{core.opacity.50}",
           type: "opacity",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "opacity",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "half",
-              state: "",
-              scale: "",
-              context: "",
-              mode: "",
-            },
+            category: "opacity",
           },
         },
         name: "Opacity Half",
@@ -57595,12 +47592,7 @@ export default {
         value: "0.85",
         type: "opacity",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "opacity",
-          },
-          category: "semantic",
+          category: "opacity",
           type: "opacity",
           item: "dark",
           names: {
@@ -57610,6 +47602,11 @@ export default {
             docs: "semantic.opacity.dark",
             es6: "calciteOpacityDark",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "opacity",
+          },
         },
         filePath: "src/tokens/semantic/opacity.json",
         isSource: true,
@@ -57617,24 +47614,7 @@ export default {
           value: "{core.opacity.85}",
           type: "opacity",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "opacity",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "dark",
-              context: "",
-              mode: "",
-            },
+            category: "opacity",
           },
         },
         name: "Opacity Dark",
@@ -57645,12 +47625,7 @@ export default {
         value: "1",
         type: "opacity",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "opacity",
-          },
-          category: "semantic",
+          category: "opacity",
           type: "opacity",
           item: "full",
           names: {
@@ -57660,6 +47635,11 @@ export default {
             docs: "semantic.opacity.full",
             es6: "calciteOpacityFull",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "opacity",
+          },
         },
         filePath: "src/tokens/semantic/opacity.json",
         isSource: true,
@@ -57667,24 +47647,7 @@ export default {
           value: "{core.opacity.100}",
           type: "opacity",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "opacity",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "full",
-              state: "",
-              scale: "",
-              context: "",
-              mode: "",
-            },
+            category: "opacity",
           },
         },
         name: "Opacity Full",
@@ -57695,12 +47658,7 @@ export default {
         value: "0.5",
         type: "opacity",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "opacity",
-          },
-          category: "semantic",
+          category: "opacity",
           type: "opacity",
           item: "disabled",
           names: {
@@ -57710,6 +47668,11 @@ export default {
             docs: "semantic.opacity.disabled",
             es6: "calciteOpacityDisabled",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "opacity",
+          },
         },
         filePath: "src/tokens/semantic/opacity.json",
         isSource: true,
@@ -57717,24 +47680,7 @@ export default {
           value: "{core.opacity.50}",
           type: "opacity",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "opacity",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "disabled",
-              scale: "",
-              context: "",
-              mode: "",
-            },
+            category: "opacity",
           },
         },
         name: "Opacity Disabled",
@@ -57753,12 +47699,7 @@ export default {
         },
         type: "shadow",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "shadow",
-          },
-          category: "semantic",
+          category: "shadow",
           type: "shadow",
           item: "none",
           names: {
@@ -57768,6 +47709,11 @@ export default {
             docs: "semantic.shadow.none",
             es6: "calciteShadowNone",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "shadow",
+          },
         },
         filePath: "src/tokens/semantic/shadow.json",
         isSource: true,
@@ -57781,24 +47727,7 @@ export default {
           },
           type: "shadow",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "shadow",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "none",
-              context: "",
-              mode: "",
-            },
+            category: "shadow",
           },
         },
         name: "Shadow None",
@@ -57824,12 +47753,7 @@ export default {
         ],
         type: "shadow",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "shadow",
-          },
-          category: "semantic",
+          category: "shadow",
           type: "shadow",
           item: "sm",
           names: {
@@ -57839,6 +47763,11 @@ export default {
             docs: "semantic.shadow.sm",
             es6: "calciteShadowSm",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "shadow",
+          },
         },
         filePath: "src/tokens/semantic/shadow.json",
         isSource: true,
@@ -57846,24 +47775,7 @@ export default {
           value: ["{core.shadow.1}", "{core.shadow.2}"],
           type: "shadow",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "shadow",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "sm",
-              context: "",
-              mode: "",
-            },
+            category: "shadow",
           },
         },
         name: "Shadow Sm",
@@ -57889,12 +47801,7 @@ export default {
         ],
         type: "shadow",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "shadow",
-          },
-          category: "semantic",
+          category: "shadow",
           type: "shadow",
           item: "md",
           names: {
@@ -57904,6 +47811,11 @@ export default {
             docs: "semantic.shadow.md",
             es6: "calciteShadowMd",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "shadow",
+          },
         },
         filePath: "src/tokens/semantic/shadow.json",
         isSource: true,
@@ -57911,24 +47823,7 @@ export default {
           value: ["{core.shadow.3}", "{core.shadow.4}"],
           type: "shadow",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "shadow",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "",
-              state: "",
-              scale: "md",
-              context: "",
-              mode: "",
-            },
+            category: "shadow",
           },
         },
         name: "Shadow Md",
@@ -57943,12 +47838,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "dimension",
             item: "fixed",
             subitem: "xxxs",
@@ -57966,6 +47856,11 @@ export default {
               docs: "semantic.size.fixed.xxxs",
               es6: "calciteSizeFixedXxxs",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -57974,24 +47869,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xxxs",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Fixed Xxxs",
@@ -58004,12 +47882,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "dimension",
             item: "fixed",
             subitem: "xxs",
@@ -58027,6 +47900,11 @@ export default {
               docs: "semantic.size.fixed.xxs",
               es6: "calciteSizeFixedXxs",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -58035,24 +47913,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xxs",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Fixed Xxs",
@@ -58065,12 +47926,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "dimension",
             item: "fixed",
             subitem: "xs",
@@ -58088,6 +47944,11 @@ export default {
               docs: "semantic.size.fixed.xs",
               es6: "calciteSizeFixedXs",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -58096,24 +47957,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xs",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Fixed Xs",
@@ -58126,12 +47970,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "dimension",
             item: "fixed",
             subitem: "sm",
@@ -58149,6 +47988,11 @@ export default {
               docs: "semantic.size.fixed.sm",
               es6: "calciteSizeFixedSm",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -58157,24 +48001,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "sm",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Fixed Sm",
@@ -58187,12 +48014,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "dimension",
             item: "fixed",
             subitem: "sm+",
@@ -58210,6 +48032,11 @@ export default {
               docs: "semantic.size.fixed.sm+",
               es6: "calciteSizeFixedSmPlus",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -58218,24 +48045,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "sm+",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Fixed Sm Plus",
@@ -58248,12 +48058,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "dimension",
             item: "fixed",
             subitem: "md",
@@ -58271,6 +48076,11 @@ export default {
               docs: "semantic.size.fixed.md",
               es6: "calciteSizeFixedMd",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -58279,24 +48089,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "md",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Fixed Md",
@@ -58309,12 +48102,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "dimension",
             item: "fixed",
             subitem: "md+",
@@ -58332,6 +48120,11 @@ export default {
               docs: "semantic.size.fixed.md+",
               es6: "calciteSizeFixedMdPlus",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -58340,24 +48133,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "md+",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Fixed Md Plus",
@@ -58370,12 +48146,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "dimension",
             item: "fixed",
             subitem: "lg",
@@ -58393,6 +48164,11 @@ export default {
               docs: "semantic.size.fixed.lg",
               es6: "calciteSizeFixedLg",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -58401,24 +48177,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "lg",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Fixed Lg",
@@ -58431,12 +48190,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "dimension",
             item: "fixed",
             subitem: "xl",
@@ -58454,6 +48208,11 @@ export default {
               docs: "semantic.size.fixed.xl",
               es6: "calciteSizeFixedXl",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -58462,24 +48221,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xl",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Fixed Xl",
@@ -58492,12 +48234,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "dimension",
             item: "fixed",
             subitem: "xxl",
@@ -58515,6 +48252,11 @@ export default {
               docs: "semantic.size.fixed.xxl",
               es6: "calciteSizeFixedXxl",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -58523,24 +48265,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xxl",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Fixed Xxl",
@@ -58553,12 +48278,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "dimension",
             item: "fixed",
             subitem: "xxxl",
@@ -58576,6 +48296,11 @@ export default {
               docs: "semantic.size.fixed.xxxl",
               es6: "calciteSizeFixedXxxl",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -58584,24 +48309,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xxxl",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Fixed Xxxl",
@@ -58615,12 +48323,7 @@ export default {
           value: "1px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "px",
@@ -58631,6 +48334,11 @@ export default {
               docs: "semantic.size.default.px",
               es6: "calciteSizePx",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -58638,24 +48346,7 @@ export default {
             value: "{core.size.default.1}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "px",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Px",
@@ -58666,12 +48357,7 @@ export default {
           value: "0.75rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "xxxs",
@@ -58682,6 +48368,11 @@ export default {
               docs: "semantic.size.default.xxxs",
               es6: "calciteSizeXxxs",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -58689,24 +48380,7 @@ export default {
             value: "{core.size.default.12}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xxxs",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Xxxs",
@@ -58717,12 +48391,7 @@ export default {
           value: "0.875rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "xxs",
@@ -58733,6 +48402,11 @@ export default {
               docs: "semantic.size.default.xxs",
               es6: "calciteSizeXxs",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -58740,24 +48414,7 @@ export default {
             value: "{core.size.default.14}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xxs",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Xxs",
@@ -58768,12 +48425,7 @@ export default {
           value: "1rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "xs",
@@ -58784,6 +48436,11 @@ export default {
               docs: "semantic.size.default.xs",
               es6: "calciteSizeXs",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -58791,24 +48448,7 @@ export default {
             value: "{core.size.default.16}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xs",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Xs",
@@ -58819,12 +48459,7 @@ export default {
           value: "1.5rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "sm",
@@ -58835,6 +48470,11 @@ export default {
               docs: "semantic.size.default.sm",
               es6: "calciteSizeSm",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -58842,24 +48482,7 @@ export default {
             value: "{core.size.default.24}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "sm",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Sm",
@@ -58870,12 +48493,7 @@ export default {
           value: "2rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "md",
@@ -58886,6 +48504,11 @@ export default {
               docs: "semantic.size.default.md",
               es6: "calciteSizeMd",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -58893,24 +48516,7 @@ export default {
             value: "{core.size.default.32}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "md",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Md",
@@ -58921,12 +48527,7 @@ export default {
           value: "2.75rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "lg",
@@ -58937,6 +48538,11 @@ export default {
               docs: "semantic.size.default.lg",
               es6: "calciteSizeLg",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -58944,24 +48550,7 @@ export default {
             value: "{core.size.default.44}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "lg",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Lg",
@@ -58972,12 +48561,7 @@ export default {
           value: "3rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "xl",
@@ -58988,6 +48572,11 @@ export default {
               docs: "semantic.size.default.xl",
               es6: "calciteSizeXl",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -58995,24 +48584,7 @@ export default {
             value: "{core.size.default.48}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xl",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Xl",
@@ -59023,12 +48595,7 @@ export default {
           value: "4rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "xxl",
@@ -59039,6 +48606,11 @@ export default {
               docs: "semantic.size.default.xxl",
               es6: "calciteSizeXxl",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -59046,22 +48618,7 @@ export default {
             value: "{core.size.default.64}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                state: "",
-                scale: "xxl",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Xxl",
@@ -59072,12 +48629,7 @@ export default {
           value: "6rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "size",
             item: "default",
             subitem: "xxxl",
@@ -59088,6 +48640,11 @@ export default {
               docs: "semantic.size.default.xxxl",
               es6: "calciteSizeXxxl",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/size.json",
           isSource: true,
@@ -59095,22 +48652,7 @@ export default {
             value: "{core.size.default.96}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                state: "",
-                scale: "xxxl",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Size Xxxl",
@@ -59126,12 +48668,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "space",
             type: "dimension",
             item: "fixed",
             subitem: "xxs",
@@ -59149,6 +48686,11 @@ export default {
               docs: "semantic.spacing.fixed.xxs",
               es6: "calciteSpacingFixedXxs",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -59157,24 +48699,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xxs",
-                context: "",
-                mode: "",
-              },
+              category: "space",
             },
           },
           name: "Spacing Fixed Xxs",
@@ -59187,12 +48712,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "space",
             type: "dimension",
             item: "fixed",
             subitem: "xs",
@@ -59210,6 +48730,11 @@ export default {
               docs: "semantic.spacing.fixed.xs",
               es6: "calciteSpacingFixedXs",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -59218,24 +48743,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xs",
-                context: "",
-                mode: "",
-              },
+              category: "space",
             },
           },
           name: "Spacing Fixed Xs",
@@ -59248,12 +48756,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "space",
             type: "dimension",
             item: "fixed",
             subitem: "sm",
@@ -59271,6 +48774,11 @@ export default {
               docs: "semantic.spacing.fixed.sm",
               es6: "calciteSpacingFixedSm",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -59279,24 +48787,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "sm",
-                context: "",
-                mode: "",
-              },
+              category: "space",
             },
           },
           name: "Spacing Fixed Sm",
@@ -59309,12 +48800,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "space",
             type: "dimension",
             item: "fixed",
             subitem: "md",
@@ -59332,6 +48818,11 @@ export default {
               docs: "semantic.spacing.fixed.md",
               es6: "calciteSpacingFixedMd",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -59340,24 +48831,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "md",
-                context: "",
-                mode: "",
-              },
+              category: "space",
             },
           },
           name: "Spacing Fixed Md",
@@ -59370,12 +48844,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "space",
             type: "dimension",
             item: "fixed",
             subitem: "lg",
@@ -59393,6 +48862,11 @@ export default {
               docs: "semantic.spacing.fixed.lg",
               es6: "calciteSpacingFixedLg",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -59401,24 +48875,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "lg",
-                context: "",
-                mode: "",
-              },
+              category: "space",
             },
           },
           name: "Spacing Fixed Lg",
@@ -59431,12 +48888,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "space",
             type: "dimension",
             item: "fixed",
             subitem: "xl",
@@ -59454,6 +48906,11 @@ export default {
               docs: "semantic.spacing.fixed.xl",
               es6: "calciteSpacingFixedXl",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -59462,24 +48919,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xl",
-                context: "",
-                mode: "",
-              },
+              category: "space",
             },
           },
           name: "Spacing Fixed Xl",
@@ -59492,12 +48932,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "space",
             type: "dimension",
             item: "fixed",
             subitem: "xxl",
@@ -59515,6 +48950,11 @@ export default {
               docs: "semantic.spacing.fixed.xxl",
               es6: "calciteSpacingFixedXxl",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -59523,24 +48963,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xxl",
-                context: "",
-                mode: "",
-              },
+              category: "space",
             },
           },
           name: "Spacing Fixed Xxl",
@@ -59553,12 +48976,7 @@ export default {
           type: "dimension",
           description: "deprecated",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "space",
             type: "dimension",
             item: "fixed",
             subitem: "xxxl",
@@ -59576,6 +48994,11 @@ export default {
               docs: "semantic.spacing.fixed.xxxl",
               es6: "calciteSpacingFixedXxxl",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -59584,24 +49007,7 @@ export default {
             type: "dimension",
             description: "deprecated",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "fixed",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xxxl",
-                context: "",
-                mode: "",
-              },
+              category: "space",
             },
           },
           name: "Spacing Fixed Xxxl",
@@ -59615,12 +49021,8 @@ export default {
           value: "0",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            pattern: "",
+            category: "space",
             type: "spacing",
             item: "default",
             subitem: "none",
@@ -59631,6 +49033,11 @@ export default {
               docs: "semantic.spacing.default.none",
               es6: "calciteSpacingNone",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -59638,24 +49045,8 @@ export default {
             value: "{core.size.default.none}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "px",
-                context: "",
-                mode: "",
-              },
+              pattern: "",
+              category: "space",
             },
           },
           name: "Spacing None",
@@ -59666,12 +49057,8 @@ export default {
           value: "1px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            pattern: "",
+            category: "space",
             type: "spacing",
             item: "default",
             subitem: "px",
@@ -59682,6 +49069,11 @@ export default {
               docs: "semantic.spacing.default.px",
               es6: "calciteSpacingPx",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -59689,24 +49081,8 @@ export default {
             value: "{core.size.default.1}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "px",
-                context: "",
-                mode: "",
-              },
+              pattern: "",
+              category: "space",
             },
           },
           name: "Spacing Px",
@@ -59717,12 +49093,8 @@ export default {
           value: "2px",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            pattern: "",
+            category: "space",
             type: "spacing",
             item: "default",
             subitem: "base",
@@ -59733,6 +49105,11 @@ export default {
               docs: "semantic.spacing.default.base",
               es6: "calciteSpacingBase",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -59740,24 +49117,8 @@ export default {
             value: "{core.size.default.2}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "px",
-                context: "",
-                mode: "",
-              },
+              pattern: "",
+              category: "space",
             },
           },
           name: "Spacing Base",
@@ -59768,12 +49129,7 @@ export default {
           value: "0.25rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "spacing",
             item: "default",
             subitem: "xxs",
@@ -59784,6 +49140,11 @@ export default {
               docs: "semantic.spacing.default.xxs",
               es6: "calciteSpacingXxs",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -59791,24 +49152,7 @@ export default {
             value: "{core.size.default.4}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xxs",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Spacing Xxs",
@@ -59819,12 +49163,7 @@ export default {
           value: "0.375rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "spacing",
             item: "default",
             subitem: "xs",
@@ -59835,6 +49174,11 @@ export default {
               docs: "semantic.spacing.default.xs",
               es6: "calciteSpacingXs",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -59842,24 +49186,7 @@ export default {
             value: "{core.size.default.6}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xs",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Spacing Xs",
@@ -59870,12 +49197,7 @@ export default {
           value: "0.5rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "size",
             type: "spacing",
             item: "default",
             subitem: "sm",
@@ -59886,6 +49208,11 @@ export default {
               docs: "semantic.spacing.default.sm",
               es6: "calciteSpacingSm",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -59893,24 +49220,7 @@ export default {
             value: "{core.size.default.8}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "size",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "sm",
-                context: "",
-                mode: "",
-              },
+              category: "size",
             },
           },
           name: "Spacing Sm",
@@ -59921,12 +49231,7 @@ export default {
           value: "0.625rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "space",
             type: "spacing",
             item: "default",
             subitem: "sm+",
@@ -59937,6 +49242,11 @@ export default {
               docs: "semantic.spacing.default.sm+",
               es6: "calciteSpacingSmPlus",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -59944,24 +49254,7 @@ export default {
             value: "{core.size.default.10}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "sm+",
-                context: "",
-                mode: "",
-              },
+              category: "space",
             },
           },
           name: "Spacing Sm Plus",
@@ -59972,12 +49265,7 @@ export default {
           value: "0.75rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "space",
             type: "spacing",
             item: "default",
             subitem: "md",
@@ -59988,6 +49276,11 @@ export default {
               docs: "semantic.spacing.default.md",
               es6: "calciteSpacingMd",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -59995,24 +49288,7 @@ export default {
             value: "{core.size.default.12}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "md",
-                context: "",
-                mode: "",
-              },
+              category: "space",
             },
           },
           name: "Spacing Md",
@@ -60023,12 +49299,7 @@ export default {
           value: "0.875rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "space",
             type: "spacing",
             item: "default",
             subitem: "md+",
@@ -60039,6 +49310,11 @@ export default {
               docs: "semantic.spacing.default.md+",
               es6: "calciteSpacingMdPlus",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -60046,24 +49322,7 @@ export default {
             value: "{core.size.default.14}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "md+",
-                context: "",
-                mode: "",
-              },
+              category: "space",
             },
           },
           name: "Spacing Md Plus",
@@ -60074,12 +49333,7 @@ export default {
           value: "1rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "space",
             type: "spacing",
             item: "default",
             subitem: "lg",
@@ -60090,6 +49344,11 @@ export default {
               docs: "semantic.spacing.default.lg",
               es6: "calciteSpacingLg",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -60097,24 +49356,7 @@ export default {
             value: "{core.size.default.16}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "lg",
-                context: "",
-                mode: "",
-              },
+              category: "space",
             },
           },
           name: "Spacing Lg",
@@ -60125,12 +49367,7 @@ export default {
           value: "1.25rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "space",
             type: "spacing",
             item: "default",
             subitem: "xl",
@@ -60141,6 +49378,11 @@ export default {
               docs: "semantic.spacing.default.xl",
               es6: "calciteSpacingXl",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -60148,24 +49390,7 @@ export default {
             value: "{core.size.default.20}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xl",
-                context: "",
-                mode: "",
-              },
+              category: "space",
             },
           },
           name: "Spacing Xl",
@@ -60176,12 +49401,7 @@ export default {
           value: "1.5rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "space",
             type: "spacing",
             item: "default",
             subitem: "xxl",
@@ -60192,6 +49412,11 @@ export default {
               docs: "semantic.spacing.default.xxl",
               es6: "calciteSpacingXxl",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -60199,24 +49424,7 @@ export default {
             value: "{core.size.default.24}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xxl",
-                context: "",
-                mode: "",
-              },
+              category: "space",
             },
           },
           name: "Spacing Xxl",
@@ -60227,12 +49435,7 @@ export default {
           value: "2rem",
           type: "dimension",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              type: "dimension",
-            },
-            category: "semantic",
+            category: "space",
             type: "spacing",
             item: "default",
             subitem: "xxxl",
@@ -60243,6 +49446,11 @@ export default {
               docs: "semantic.spacing.default.xxxl",
               es6: "calciteSpacingXxxl",
             },
+            "calcite-schema": {
+              system: "calcite",
+              tier: "semantic",
+              type: "dimension",
+            },
           },
           filePath: "src/tokens/semantic/space.json",
           isSource: true,
@@ -60250,24 +49458,7 @@ export default {
             value: "{core.size.default.32}",
             type: "dimension",
             attributes: {
-              "calcite-schema": {
-                system: "calcite",
-                tier: "semantic",
-                domain: "",
-                component: "",
-                pattern: "",
-                element: "",
-                category: "space",
-                group: "",
-                kind: "",
-                appearance: "",
-                property: "",
-                variant: "",
-                state: "",
-                scale: "xxxl",
-                context: "",
-                mode: "",
-              },
+              category: "space",
             },
           },
           name: "Spacing Xxxl",
@@ -60281,12 +49472,7 @@ export default {
         value: "-999999",
         type: "z-index",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "z-index",
-          },
-          category: "semantic",
+          category: "z-index",
           type: "z-index",
           item: "deep",
           names: {
@@ -60296,6 +49482,11 @@ export default {
             docs: "semantic.z-index.deep",
             es6: "calciteZIndexDeep",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "z-index",
+          },
         },
         filePath: "src/tokens/semantic/z-index.json",
         isSource: true,
@@ -60303,24 +49494,7 @@ export default {
           value: "{core.z-index.0}",
           type: "z-index",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "z-index",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "deep",
-              state: "",
-              scale: "",
-              context: "",
-              mode: "",
-            },
+            category: "z-index",
           },
         },
         name: "Z Index Deep",
@@ -60331,12 +49505,7 @@ export default {
         value: "1",
         type: "z-index",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "z-index",
-          },
-          category: "semantic",
+          category: "z-index",
           type: "z-index",
           item: "default",
           names: {
@@ -60346,6 +49515,11 @@ export default {
             docs: "semantic.z-index.default",
             es6: "calciteZIndex",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "z-index",
+          },
         },
         filePath: "src/tokens/semantic/z-index.json",
         isSource: true,
@@ -60353,24 +49527,7 @@ export default {
           value: "{core.z-index.1}",
           type: "z-index",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "z-index",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "default",
-              state: "",
-              scale: "",
-              context: "",
-              mode: "",
-            },
+            category: "z-index",
           },
         },
         name: "Z Index",
@@ -60381,12 +49538,7 @@ export default {
         value: "300",
         type: "z-index",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "z-index",
-          },
-          category: "semantic",
+          category: "z-index",
           type: "z-index",
           item: "sticky",
           names: {
@@ -60396,6 +49548,11 @@ export default {
             docs: "semantic.z-index.sticky",
             es6: "calciteZIndexSticky",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "z-index",
+          },
         },
         filePath: "src/tokens/semantic/z-index.json",
         isSource: true,
@@ -60403,24 +49560,7 @@ export default {
           value: "{core.z-index.3}",
           type: "z-index",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "z-index",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "sticky",
-              state: "",
-              scale: "",
-              context: "",
-              mode: "",
-            },
+            category: "z-index",
           },
         },
         name: "Z Index Sticky",
@@ -60431,12 +49571,7 @@ export default {
         value: "400",
         type: "z-index",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "z-index",
-          },
-          category: "semantic",
+          category: "z-index",
           type: "z-index",
           item: "header",
           names: {
@@ -60446,6 +49581,11 @@ export default {
             docs: "semantic.z-index.header",
             es6: "calciteZIndexHeader",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "z-index",
+          },
         },
         filePath: "src/tokens/semantic/z-index.json",
         isSource: true,
@@ -60453,24 +49593,7 @@ export default {
           value: "{core.z-index.4}",
           type: "z-index",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "z-index",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "header",
-              state: "",
-              scale: "",
-              context: "",
-              mode: "",
-            },
+            category: "z-index",
           },
         },
         name: "Z Index Header",
@@ -60481,12 +49604,7 @@ export default {
         value: "500",
         type: "z-index",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "z-index",
-          },
-          category: "semantic",
+          category: "z-index",
           type: "z-index",
           item: "toast",
           names: {
@@ -60496,6 +49614,11 @@ export default {
             docs: "semantic.z-index.toast",
             es6: "calciteZIndexToast",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "z-index",
+          },
         },
         filePath: "src/tokens/semantic/z-index.json",
         isSource: true,
@@ -60503,24 +49626,7 @@ export default {
           value: "{core.z-index.5}",
           type: "z-index",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "z-index",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "toast",
-              state: "",
-              scale: "",
-              context: "",
-              mode: "",
-            },
+            category: "z-index",
           },
         },
         name: "Z Index Toast",
@@ -60531,12 +49637,7 @@ export default {
         value: "600",
         type: "z-index",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "z-index",
-          },
-          category: "semantic",
+          category: "z-index",
           type: "z-index",
           item: "dropdown",
           names: {
@@ -60546,6 +49647,11 @@ export default {
             docs: "semantic.z-index.dropdown",
             es6: "calciteZIndexDropdown",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "z-index",
+          },
         },
         filePath: "src/tokens/semantic/z-index.json",
         isSource: true,
@@ -60553,24 +49659,7 @@ export default {
           value: "{core.z-index.6}",
           type: "z-index",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "z-index",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "dropdown",
-              state: "",
-              scale: "",
-              context: "",
-              mode: "",
-            },
+            category: "z-index",
           },
         },
         name: "Z Index Dropdown",
@@ -60581,12 +49670,7 @@ export default {
         value: "700",
         type: "z-index",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "z-index",
-          },
-          category: "semantic",
+          category: "z-index",
           type: "z-index",
           item: "overlay",
           names: {
@@ -60596,6 +49680,11 @@ export default {
             docs: "semantic.z-index.overlay",
             es6: "calciteZIndexOverlay",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "z-index",
+          },
         },
         filePath: "src/tokens/semantic/z-index.json",
         isSource: true,
@@ -60603,24 +49692,7 @@ export default {
           value: "{core.z-index.7}",
           type: "z-index",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "z-index",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "overlay",
-              state: "",
-              scale: "",
-              context: "",
-              mode: "",
-            },
+            category: "z-index",
           },
         },
         name: "Z Index Overlay",
@@ -60631,12 +49703,7 @@ export default {
         value: "800",
         type: "z-index",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "z-index",
-          },
-          category: "semantic",
+          category: "z-index",
           type: "z-index",
           item: "modal",
           names: {
@@ -60646,6 +49713,11 @@ export default {
             docs: "semantic.z-index.modal",
             es6: "calciteZIndexModal",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "z-index",
+          },
         },
         filePath: "src/tokens/semantic/z-index.json",
         isSource: true,
@@ -60653,24 +49725,7 @@ export default {
           value: "{core.z-index.8}",
           type: "z-index",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "z-index",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "modal",
-              state: "",
-              scale: "",
-              context: "",
-              mode: "",
-            },
+            category: "z-index",
           },
         },
         name: "Z Index Modal",
@@ -60681,12 +49736,7 @@ export default {
         value: "900",
         type: "z-index",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "z-index",
-          },
-          category: "semantic",
+          category: "z-index",
           type: "z-index",
           item: "popup",
           names: {
@@ -60696,6 +49746,11 @@ export default {
             docs: "semantic.z-index.popup",
             es6: "calciteZIndexPopup",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "z-index",
+          },
         },
         filePath: "src/tokens/semantic/z-index.json",
         isSource: true,
@@ -60703,24 +49758,7 @@ export default {
           value: "{core.z-index.9}",
           type: "z-index",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "z-index",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "popup",
-              state: "",
-              scale: "",
-              context: "",
-              mode: "",
-            },
+            category: "z-index",
           },
         },
         name: "Z Index Popup",
@@ -60731,12 +49769,7 @@ export default {
         value: "901",
         type: "z-index",
         attributes: {
-          "calcite-schema": {
-            system: "calcite",
-            tier: "semantic",
-            type: "z-index",
-          },
-          category: "semantic",
+          category: "z-index",
           type: "z-index",
           item: "tooltip",
           names: {
@@ -60746,6 +49779,11 @@ export default {
             docs: "semantic.z-index.tooltip",
             es6: "calciteZIndexTooltip",
           },
+          "calcite-schema": {
+            system: "calcite",
+            tier: "semantic",
+            type: "z-index",
+          },
         },
         filePath: "src/tokens/semantic/z-index.json",
         isSource: true,
@@ -60753,24 +49791,7 @@ export default {
           value: "{core.z-index.9} + 1",
           type: "z-index",
           attributes: {
-            "calcite-schema": {
-              system: "calcite",
-              tier: "semantic",
-              domain: "",
-              component: "",
-              pattern: "",
-              element: "",
-              category: "z-index",
-              group: "",
-              kind: "",
-              appearance: "",
-              property: "",
-              variant: "tooltip",
-              state: "",
-              scale: "",
-              context: "",
-              mode: "",
-            },
+            category: "z-index",
           },
         },
         name: "Z Index Tooltip",