diff --git a/tokens/semantic/typography.json b/tokens/semantic/typography.json
index 18408f3..79d5614 100644
--- a/tokens/semantic/typography.json
+++ b/tokens/semantic/typography.json
@@ -1,137 +1,107 @@
 {
   "typography": {
     "heading": {
-      "1": {
-        "$value": {
-          "fontWeight": "{typography.base.weight.bold}",
-          "fontSize": "{typography.base.size.t32}",
-          "lineHeight": "{typography.base.lineHeight.t48}",
-          "letterSpacing": "{typography.base.letterSpacing.default}"
-        },
-        "$type": "typography"
+      "typography.heading.1": {
+        "weight": "typography.base.weight.bold",
+        "size": "typography.base.size.t32",
+        "lineHeight": "typography.base.lineHeight.t48",
+        "letterSpacing": "typography.base.letterSpacing.default"
       },
-      "2": {
-        "$value": {
-          "fontWeight": "{typography.base.weight.bold}",
-          "fontSize": "{typography.base.size.t24}",
-          "lineHeight": "{typography.base.lineHeight.t36}",
-          "letterSpacing": "{typography.base.letterSpacing.default}"
-        },
-        "$type": "typography"
+      "typography.heading.2": {
+        "weight": "typography.base.weight.bold",
+        "size": "typography.base.size.t24",
+        "lineHeight": "typography.base.lineHeight.t36",
+        "letterSpacing": "typography.base.letterSpacing.default"
       },
-      "3": {
-        "$value": {
-          "fontWeight": "{typography.base.weight.bold}",
-          "fontSize": "{typography.base.size.t20}",
-          "lineHeight": "{typography.base.lineHeight.t30}",
-          "letterSpacing": "{typography.base.letterSpacing.default}"
-        },
-        "$type": "typography"
+      "typography.heading.3": {
+        "weight": "typography.base.weight.bold",
+        "size": "typography.base.size.t20",
+        "lineHeight": "typography.base.lineHeight.t30",
+        "letterSpacing": "typography.base.letterSpacing.default"
       },
-      "4": {
-        "$value": {
-          "fontWeight": "{typography.base.weight.bold}",
-          "fontSize": "{typography.base.size.t16}",
-          "lineHeight": "{typography.base.lineHeight.t24}",
-          "letterSpacing": "{typography.base.letterSpacing.wide}"
-        },
-        "$type": "typography"
+      "typography.heading.4": {
+        "weight": "typography.base.weight.bold",
+        "size": "typography.base.size.t16",
+        "lineHeight": "typography.base.lineHeight.t24",
+        "letterSpacing": "typography.base.letterSpacing.wide"
       }
     },
     "title": {
-      "1": {
-        "$value": {
-          "fontWeight": "{typography.base.weight.semibold}",
-          "fontSize": "{typography.base.size.t28}",
-          "lineHeight": "{typography.base.lineHeight.t42}",
-          "letterSpacing": "{typography.base.letterSpacing.default}"
-        },
-        "$type": "typography"
+      "typography.title.1": {
+        "weight": "typography.base.weight.semibold",
+        "size": "typography.base.size.t28",
+        "lineHeight": "typography.base.lineHeight.t42",
+        "letterSpacing": "typography.base.letterSpacing.default"
       },
-      "2": {
-        "$value": {
-          "fontWeight": "{typography.base.weight.semibold}",
-          "fontSize": "{typography.base.size.t24}",
-          "lineHeight": "{typography.base.lineHeight.t36}",
-          "letterSpacing": "{typography.base.letterSpacing.default}"
-        },
-        "$type": "typography"
+      "typography.title.2": {
+        "weight": "typography.base.weight.semibold",
+        "size": "typography.base.size.t24",
+        "lineHeight": "typography.base.lineHeight.t36",
+        "letterSpacing": "typography.base.letterSpacing.default"
       },
-      "3": {
-        "$value": {
-          "fontWeight": "{typography.base.weight.semibold}",
-          "fontSize": "{typography.base.size.t20}",
-          "lineHeight": "{typography.base.lineHeight.t30}",
-          "letterSpacing": "{typography.base.letterSpacing.default}"
-        },
-        "$type": "typography"
+      "typography.title.3": {
+        "weight": "typography.base.weight.semibold",
+        "size": "typography.base.size.t20",
+        "lineHeight": "typography.base.lineHeight.t30",
+        "letterSpacing": "typography.base.letterSpacing.default"
       },
-      "4": {
-        "$value": {
-          "fontWeight": "{typography.base.weight.semibold}",
-          "fontSize": "{typography.base.size.t16}",
-          "lineHeight": "{typography.base.lineHeight.t24}",
-          "letterSpacing": "{typography.base.letterSpacing.wide}"
-        },
-        "$type": "typography"
+      "typography.title.4": {
+        "weight": "typography.base.weight.semibold",
+        "size": "typography.base.size.t18",
+        "lineHeight": "typography.base.lineHeight.t26",
+        "letterSpacing": "typography.base.letterSpacing.default"
+      },
+      "typography.title.5": {
+        "weight": "typography.base.weight.semibold",
+        "size": "typography.base.size.t16",
+        "lineHeight": "typography.base.lineHeight.t24",
+        "letterSpacing": "typography.base.letterSpacing.wide"
       }
     },
     "body": {
-      "1": {
-        "$value": {
-          "fontWeight": "{typography.base.weight.regular}",
-          "fontSize": "{typography.base.size.t16}",
-          "lineHeight": "{typography.base.lineHeight.t26}",
-          "letterSpacing": "{typography.base.letterSpacing.wide}"
-        },
-        "$type": "typography"
+      "typography.body.1": {
+        "weight": "typography.base.weight.regular",
+        "size": "typography.base.size.t16",
+        "lineHeight": "typography.base.lineHeight.t26",
+        "letterSpacing": "typography.base.letterSpacing.wide"
+      },
+      "typography.body.2": {
+        "weight": "typography.base.weight.regular",
+        "size": "typography.base.size.t14",
+        "lineHeight": "typography.base.lineHeight.t22",
+        "letterSpacing": "typography.base.letterSpacing.wide"
       },
-      "2": {
-        "$value": {
-          "fontWeight": "{typography.base.weight.regular}",
-          "fontSize": "{typography.base.size.t14}",
-          "lineHeight": "{typography.base.lineHeight.t22}",
-          "letterSpacing": "{typography.base.letterSpacing.wide}"
-        },
-        "$type": "typography"
+      "typography.body.3": {
+        "weight": "typography.base.weight.regular",
+        "size": "typography.base.size.t12",
+        "lineHeight": "typography.base.lineHeight.t18",
+        "letterSpacing": "typography.base.letterSpacing.wide"
       }
     },
     "label": {
-      "1": {
-        "$value": {
-          "fontWeight": "{typography.base.weight.semibold}",
-          "fontSize": "{typography.base.size.t18}",
-          "lineHeight": "{typography.base.lineHeight.t24}",
-          "letterSpacing": "{typography.base.letterSpacing.default}"
-        },
-        "$type": "typography"
+      "typography.label.1": {
+        "weight": "typography.base.weight.semibold",
+        "size": "typography.base.size.t18",
+        "lineHeight": "typography.base.lineHeight.t24",
+        "letterSpacing": "typography.base.letterSpacing.default"
       },
-      "2": {
-        "$value": {
-          "fontWeight": "{typography.base.weight.semibold}",
-          "fontSize": "{typography.base.size.t16}",
-          "lineHeight": "{typography.base.lineHeight.t22}",
-          "letterSpacing": "{typography.base.letterSpacing.default}"
-        },
-        "$type": "typography"
+      "typography.label.2": {
+        "weight": "typography.base.weight.semibold",
+        "size": "typography.base.size.t16",
+        "lineHeight": "typography.base.lineHeight.t22",
+        "letterSpacing": "typography.base.letterSpacing.default"
       },
-      "3": {
-        "$value": {
-          "fontWeight": "{typography.base.weight.semibold}",
-          "fontSize": "{typography.base.size.t14}",
-          "lineHeight": "{typography.base.lineHeight.t18}",
-          "letterSpacing": "{typography.base.letterSpacing.default}"
-        },
-        "$type": "typography"
+      "typography.label.3": {
+        "weight": "typography.base.weight.semibold",
+        "size": "typography.base.size.t14",
+        "lineHeight": "typography.base.lineHeight.t18",
+        "letterSpacing": "typography.base.letterSpacing.default"
       },
-      "4": {
-        "$value": {
-          "fontWeight": "{typography.base.weight.semibold}",
-          "fontSize": "{typography.base.size.t12}",
-          "lineHeight": "{typography.base.lineHeight.t16}",
-          "letterSpacing": "{typography.base.letterSpacing.default}"
-        },
-        "$type": "typography"
+      "typography.label.4": {
+        "weight": "typography.base.weight.semibold",
+        "size": "typography.base.size.t12",
+        "lineHeight": "typography.base.lineHeight.t16",
+        "letterSpacing": "typography.base.letterSpacing.default"
       }
     }
   }