diff --git a/tokens/dtcg/token_Borders_Defaultmode.json b/tokens/dtcg/token_Borders_Defaultmode.json
index 2950e46..2929985 100644
--- a/tokens/dtcg/token_Borders_Defaultmode.json
+++ b/tokens/dtcg/token_Borders_Defaultmode.json
@@ -2,55 +2,51 @@
   "Border radius": {
     "lg": {
       "$type": "number",
-      "$value": "{utilities.rem.0,5}"
+      "$value": "{scale.300}"
     },
     "md (default)": {
       "$type": "number",
-      "$value": "{utilities.rem.0,375}"
+      "$value": "{scale.200}"
     },
     "none": {
       "$type": "number",
-      "$value": "{utilities.rem.0}"
+      "$value": "{scale.0}"
     },
     "pill": {
       "$type": "number",
-      "$value": "{utilities.rem.50}"
+      "$value": "{scale.1800}"
     },
     "sm": {
       "$type": "number",
-      "$value": "{utilities.rem.0,25}"
+      "$value": "{scale.100}"
     },
     "xl": {
       "$type": "number",
-      "$value": "{utilities.rem.1}"
+      "$value": "{scale.600}"
     },
     "xxl": {
       "$type": "number",
-      "$value": "{utilities.rem.2}"
+      "$value": "{scale.1000}"
     }
   },
-  "Border width": {
-    "0": {
-      "$type": "number",
-      "$value": 0
-    },
-    "1 (default)": {
+  "Stroke weight": {
+    "lg": {
       "$type": "number",
-      "$value": 1
+      "$value": 3
     },
-    "2": {
+    "md": {
       "$type": "number",
       "$value": 2
     },
-    "3": {
+    "sm (default)": {
       "$type": "number",
-      "$value": 3
+      "$value": 1
     },
-    "4": {
+    "xl": {
       "$type": "number",
       "$value": 4
     },
-    "5": {
+    "xxl": {
       "$type": "number",
       "$value": 5
     }
diff --git a/tokens/dtcg/token_Colors_Light.json b/tokens/dtcg/token_Colors_Light.json
index feb03f3..f093fc2 100644
--- a/tokens/dtcg/token_Colors_Light.json
+++ b/tokens/dtcg/token_Colors_Light.json
@@ -1,36 +1,16 @@
 {
-  "Body": {
-    "Background": {
-      "default": {
-        "$type": "color",
-        "$value": "{color.gray.white}"
-      },
-      "secondary": {
-        "$type": "color",
-        "$value": "{color.gray.200}"
-      },
-      "tertiary": {
-        "$type": "color",
-        "$value": "{color.gray.100}"
-      }
+  "Background": {
+    "default": {
+      "$type": "color",
+      "$value": "{color.gray.white}"
     },
-    "Text": {
-      "default": {
-        "$type": "color",
-        "$value": "{color.gray.900}"
-      },
-      "emphasis": {
-        "$type": "color",
-        "$value": "{color.gray.black}"
-      },
-      "secondary": {
-        "$type": "color",
-        "$value": "#1d2125bf"
-      },
-      "tertiary": {
-        "$type": "color",
-        "$value": "#1d212580"
-      }
+    "secondary": {
+      "$type": "color",
+      "$value": "{color.gray.200}"
+    },
+    "tertiary": {
+      "$type": "color",
+      "$value": "{color.gray.100}"
     }
   },
   "Border": {
@@ -47,84 +27,54 @@
     "Primary": {
       "moodle black": {
         "$type": "color",
-        "$value": "{brand.grey.300}"
+        "$value": "{color.brand.gray.300}"
       },
       "moodle blue": {
         "$type": "color",
-        "$value": "{brand.blue.300}"
+        "$value": "{color.brand.blue.300}"
       },
       "moodle orange": {
         "$type": "color",
-        "$value": "{brand.orange.400}"
+        "$value": "{color.brand.orange.400}"
       }
     },
     "Secondary": {
       "bright blue": {
         "$type": "color",
-        "$value": "{brand.blue.100}"
+        "$value": "{color.brand.blue.100}"
       },
       "dark grey": {
         "$type": "color",
-        "$value": "{brand.grey.200}"
+        "$value": "{color.brand.gray.200}"
       },
       "light blue": {
         "$type": "color",
-        "$value": "{brand.blue.200}"
+        "$value": "{color.brand.blue.200}"
       },
       "light grey": {
         "$type": "color",
-        "$value": "{brand.grey.100}"
+        "$value": "{color.brand.gray.100}"
       },
       "light peach": {
         "$type": "color",
-        "$value": "{brand.orange.100}"
+        "$value": "{color.brand.orange.100}"
       },
       "medium peach": {
         "$type": "color",
-        "$value": "{brand.orange.200}"
+        "$value": "{color.brand.orange.200}"
       },
       "peach": {
         "$type": "color",
-        "$value": "{brand.orange.300}"
+        "$value": "{color.brand.orange.300}"
       }
     }
   },
-  "Contrast": {
-    "contrast dark": {
-      "$type": "color",
-      "$value": "{color.gray.black}"
-    },
-    "contrast light": {
-      "$type": "color",
-      "$value": "{color.gray.white}"
-    }
-  },
   "Focus ring": {
     "default": {
       "$type": "color",
       "$value": "{Theme.primary}"
     }
   },
-  "Icon": {
-    "fa border color": {
-      "$type": "color",
-      "$value": "#eeeeee"
-    },
-    "fa inverse": {
-      "$type": "color",
-      "$value": "{color.gray.white}"
-    }
-  },
-  "Link": {
-    "default": {
-      "$type": "color",
-      "$value": "{Theme.primary}"
-    },
-    "hover": {
-      "$type": "color",
-      "$value": "{color.blue.600}"
-    }
-  },
   "State": {
     "Outline": {
       "danger": {
@@ -225,6 +175,40 @@
       "$value": "{color.gray.300}"
     }
   },
+  "Text": {
+    "Body": {
+      "Light": {
+        "$type": "color",
+        "$value": "{Theme.light}"
+      },
+      "default": {
+        "$type": "color",
+        "$value": "{color.gray.900}"
+      },
+      "emphasis": {
+        "$type": "color",
+        "$value": "{color.gray.black}"
+      },
+      "secondary": {
+        "$type": "color",
+        "$value": "{color.gray.700}"
+      },
+      "tertiary": {
+        "$type": "color",
+        "$value": "{color.gray.600}"
+      }
+    },
+    "Link": {
+      "default": {
+        "$type": "color",
+        "$value": "{Theme.primary}"
+      },
+      "hover": {
+        "$type": "color",
+        "$value": "{color.blue.600}"
+      }
+    }
+  },
   "Theme": {
     "Background subtle": {
       "danger": {
diff --git a/tokens/dtcg/token_Primitives_Defaultmode.json b/tokens/dtcg/token_Primitives_Defaultmode.json
new file mode 100644
index 0000000..7d0bf84
--- /dev/null
+++ b/tokens/dtcg/token_Primitives_Defaultmode.json
@@ -0,0 +1,761 @@
+{
+  "color": {
+    "blue": {
+      "100": {
+        "$type": "color",
+        "$value": "#cfe2f2"
+      },
+      "200": {
+        "$type": "color",
+        "$value": "#9fc4e5"
+      },
+      "300": {
+        "$type": "color",
+        "$value": "#6fa7d9"
+      },
+      "400": {
+        "$type": "color",
+        "$value": "#3f89cc"
+      },
+      "500": {
+        "$type": "color",
+        "$value": "#0f6cbf"
+      },
+      "600": {
+        "$type": "color",
+        "$value": "#0c5699"
+      },
+      "700": {
+        "$type": "color",
+        "$value": "#094173"
+      },
+      "800": {
+        "$type": "color",
+        "$value": "#062b4c"
+      },
+      "900": {
+        "$type": "color",
+        "$value": "#031626"
+      }
+    },
+    "brand": {
+      "blue": {
+        "100": {
+          "$type": "color",
+          "$value": "#69e0ff"
+        },
+        "200": {
+          "$type": "color",
+          "$value": "#65a1b3"
+        },
+        "300": {
+          "$type": "color",
+          "$value": "#194866"
+        }
+      },
+      "gray": {
+        "100": {
+          "$type": "color",
+          "$value": "#8a8a8e"
+        },
+        "200": {
+          "$type": "color",
+          "$value": "#545454"
+        },
+        "300": {
+          "$type": "color",
+          "$value": "#282828"
+        }
+      },
+      "orange": {
+        "100": {
+          "$type": "color",
+          "$value": "#fff8f1"
+        },
+        "200": {
+          "$type": "color",
+          "$value": "#ffecdb"
+        },
+        "300": {
+          "$type": "color",
+          "$value": "#fedec3"
+        },
+        "400": {
+          "$type": "color",
+          "$value": "#f98012"
+        }
+      }
+    },
+    "cyan": {
+      "100": {
+        "$type": "color",
+        "$value": "#cce6ea"
+      },
+      "200": {
+        "$type": "color",
+        "$value": "#99cdd5"
+      },
+      "300": {
+        "$type": "color",
+        "$value": "#66b3c0"
+      },
+      "400": {
+        "$type": "color",
+        "$value": "#339aab"
+      },
+      "500": {
+        "$type": "color",
+        "$value": "#008196"
+      },
+      "600": {
+        "$type": "color",
+        "$value": "#006778"
+      },
+      "700": {
+        "$type": "color",
+        "$value": "#004d5a"
+      },
+      "800": {
+        "$type": "color",
+        "$value": "#00343c"
+      },
+      "900": {
+        "$type": "color",
+        "$value": "#001a1e"
+      }
+    },
+    "gray": {
+      "100": {
+        "$type": "color",
+        "$value": "#f8f9fa"
+      },
+      "200": {
+        "$type": "color",
+        "$value": "#e9ecef"
+      },
+      "300": {
+        "$type": "color",
+        "$value": "#dee2e6"
+      },
+      "400": {
+        "$type": "color",
+        "$value": "#ced4da"
+      },
+      "500": {
+        "$type": "color",
+        "$value": "#8f959e"
+      },
+      "600": {
+        "$type": "color",
+        "$value": "#6a737b"
+      },
+      "700": {
+        "$type": "color",
+        "$value": "#495057"
+      },
+      "800": {
+        "$type": "color",
+        "$value": "#343a40"
+      },
+      "900": {
+        "$type": "color",
+        "$value": "#1d2125"
+      },
+      "black": {
+        "$type": "color",
+        "$value": "#000000"
+      },
+      "white": {
+        "$type": "color",
+        "$value": "#ffffff"
+      }
+    },
+    "green": {
+      "100": {
+        "$type": "color",
+        "$value": "#d7e4d6"
+      },
+      "200": {
+        "$type": "color",
+        "$value": "#aecaad"
+      },
+      "300": {
+        "$type": "color",
+        "$value": "#86af84"
+      },
+      "400": {
+        "$type": "color",
+        "$value": "#5d955b"
+      },
+      "500": {
+        "$type": "color",
+        "$value": "#357a32"
+      },
+      "600": {
+        "$type": "color",
+        "$value": "#2a6228"
+      },
+      "700": {
+        "$type": "color",
+        "$value": "#20491e"
+      },
+      "800": {
+        "$type": "color",
+        "$value": "#153114"
+      },
+      "900": {
+        "$type": "color",
+        "$value": "#0b180a"
+      }
+    },
+    "indigo": {
+      "100": {
+        "$type": "color",
+        "$value": "#e0cffc"
+      },
+      "200": {
+        "$type": "color",
+        "$value": "#c29ffa"
+      },
+      "300": {
+        "$type": "color",
+        "$value": "#a370f7"
+      },
+      "400": {
+        "$type": "color",
+        "$value": "#8540f5"
+      },
+      "500": {
+        "$type": "color",
+        "$value": "#6610f2"
+      },
+      "600": {
+        "$type": "color",
+        "$value": "#520dc2"
+      },
+      "700": {
+        "$type": "color",
+        "$value": "#3d0a91"
+      },
+      "800": {
+        "$type": "color",
+        "$value": "#290661"
+      },
+      "900": {
+        "$type": "color",
+        "$value": "#140330"
+      }
+    },
+    "orange": {
+      "100": {
+        "$type": "color",
+        "$value": "#ffe3d1"
+      },
+      "200": {
+        "$type": "color",
+        "$value": "#ffc8a3"
+      },
+      "300": {
+        "$type": "color",
+        "$value": "#ffac74"
+      },
+      "400": {
+        "$type": "color",
+        "$value": "#ff9146"
+      },
+      "500": {
+        "$type": "color",
+        "$value": "#ff7518"
+      },
+      "600": {
+        "$type": "color",
+        "$value": "#cc5e13"
+      },
+      "700": {
+        "$type": "color",
+        "$value": "#99460e"
+      },
+      "800": {
+        "$type": "color",
+        "$value": "#662f0a"
+      },
+      "900": {
+        "$type": "color",
+        "$value": "#331705"
+      }
+    },
+    "pink": {
+      "100": {
+        "$type": "color",
+        "$value": "#f8d1e3"
+      },
+      "200": {
+        "$type": "color",
+        "$value": "#f1a3c7"
+      },
+      "300": {
+        "$type": "color",
+        "$value": "#e976ac"
+      },
+      "400": {
+        "$type": "color",
+        "$value": "#e24890"
+      },
+      "500": {
+        "$type": "color",
+        "$value": "#db1a74"
+      },
+      "600": {
+        "$type": "color",
+        "$value": "#af155d"
+      },
+      "700": {
+        "$type": "color",
+        "$value": "#831046"
+      },
+      "800": {
+        "$type": "color",
+        "$value": "#580a2e"
+      },
+      "900": {
+        "$type": "color",
+        "$value": "#2c0517"
+      }
+    },
+    "purple": {
+      "100": {
+        "$type": "color",
+        "$value": "#dfd8e5"
+      },
+      "200": {
+        "$type": "color",
+        "$value": "#c0b1cb"
+      },
+      "300": {
+        "$type": "color",
+        "$value": "#a08bb0"
+      },
+      "400": {
+        "$type": "color",
+        "$value": "#816496"
+      },
+      "500": {
+        "$type": "color",
+        "$value": "#613d7c"
+      },
+      "600": {
+        "$type": "color",
+        "$value": "#4e3163"
+      },
+      "700": {
+        "$type": "color",
+        "$value": "#3a254a"
+      },
+      "800": {
+        "$type": "color",
+        "$value": "#271832"
+      },
+      "900": {
+        "$type": "color",
+        "$value": "#130c19"
+      }
+    },
+    "red": {
+      "100": {
+        "$type": "color",
+        "$value": "#f4d6d2"
+      },
+      "200": {
+        "$type": "color",
+        "$value": "#eaada6"
+      },
+      "300": {
+        "$type": "color",
+        "$value": "#df8379"
+      },
+      "400": {
+        "$type": "color",
+        "$value": "#d55a4d"
+      },
+      "500": {
+        "$type": "color",
+        "$value": "#ca3120"
+      },
+      "600": {
+        "$type": "color",
+        "$value": "#a2271a"
+      },
+      "700": {
+        "$type": "color",
+        "$value": "#791d13"
+      },
+      "800": {
+        "$type": "color",
+        "$value": "#51140d"
+      },
+      "900": {
+        "$type": "color",
+        "$value": "#280a06"
+      }
+    },
+    "teal": {
+      "100": {
+        "$type": "color",
+        "$value": "#d2f4ea"
+      },
+      "200": {
+        "$type": "color",
+        "$value": "#a6e9d5"
+      },
+      "300": {
+        "$type": "color",
+        "$value": "#79dfc1"
+      },
+      "400": {
+        "$type": "color",
+        "$value": "#4dd4ac"
+      },
+      "500": {
+        "$type": "color",
+        "$value": "#20c997"
+      },
+      "600": {
+        "$type": "color",
+        "$value": "#1aa179"
+      },
+      "700": {
+        "$type": "color",
+        "$value": "#13795b"
+      },
+      "800": {
+        "$type": "color",
+        "$value": "#0d503c"
+      },
+      "900": {
+        "$type": "color",
+        "$value": "#06281e"
+      }
+    },
+    "yellow": {
+      "100": {
+        "$type": "color",
+        "$value": "#fcefdc"
+      },
+      "200": {
+        "$type": "color",
+        "$value": "#f9deb8"
+      },
+      "300": {
+        "$type": "color",
+        "$value": "#f6ce95"
+      },
+      "400": {
+        "$type": "color",
+        "$value": "#f3bd71"
+      },
+      "500": {
+        "$type": "color",
+        "$value": "#f0ad4e"
+      },
+      "600": {
+        "$type": "color",
+        "$value": "#c08a3e"
+      },
+      "700": {
+        "$type": "color",
+        "$value": "#90682f"
+      },
+      "800": {
+        "$type": "color",
+        "$value": "#60451f"
+      },
+      "900": {
+        "$type": "color",
+        "$value": "#302310"
+      }
+    }
+  },
+  "scale": {
+    "0": {
+      "$type": "number",
+      "$value": 0
+    },
+    "100": {
+      "$type": "number",
+      "$value": 4
+    },
+    "1000": {
+      "$type": "number",
+      "$value": 32
+    },
+    "1100": {
+      "$type": "number",
+      "$value": 40
+    },
+    "1200": {
+      "$type": "number",
+      "$value": 48
+    },
+    "1300": {
+      "$type": "number",
+      "$value": 56
+    },
+    "1400": {
+      "$type": "number",
+      "$value": 64
+    },
+    "1500": {
+      "$type": "number",
+      "$value": 72
+    },
+    "1600": {
+      "$type": "number",
+      "$value": 80
+    },
+    "1700": {
+      "$type": "number",
+      "$value": 96
+    },
+    "1800": {
+      "$type": "number",
+      "$value": 800
+    },
+    "200": {
+      "$type": "number",
+      "$value": 6
+    },
+    "300": {
+      "$type": "number",
+      "$value": 8
+    },
+    "400": {
+      "$type": "number",
+      "$value": 12
+    },
+    "50": {
+      "$type": "number",
+      "$value": 2
+    },
+    "500": {
+      "$type": "number",
+      "$value": 14
+    },
+    "600": {
+      "$type": "number",
+      "$value": 16
+    },
+    "700": {
+      "$type": "number",
+      "$value": 20
+    },
+    "800": {
+      "$type": "number",
+      "$value": 24
+    },
+    "900": {
+      "$type": "number",
+      "$value": 28
+    }
+  },
+  "typography": {
+    "font-family": {
+      "monospace": {
+        "$type": "string",
+        "$value": "Menlo"
+      },
+      "sans-serif": {
+        "$type": "string",
+        "$value": "Roboto"
+      }
+    },
+    "font-size": {
+      "base": {
+        "0": {
+          "$type": "number",
+          "$value": 0
+        },
+        "0,875": {
+          "$type": "number",
+          "$value": 14
+        },
+        "1": {
+          "$type": "number",
+          "$value": 16
+        },
+        "1,25": {
+          "$type": "number",
+          "$value": 20
+        },
+        "1,5": {
+          "$type": "number",
+          "$value": 24
+        },
+        "1,75": {
+          "$type": "number",
+          "$value": 28
+        },
+        "2": {
+          "$type": "number",
+          "$value": 32
+        },
+        "2,5": {
+          "$type": "number",
+          "$value": 40
+        }
+      }
+    },
+    "font-weight": {
+      "italic": {
+        "black-900": {
+          "$type": "string",
+          "$value": "Black Italic"
+        },
+        "bold-700": {
+          "$type": "string",
+          "$value": "Bold Italic"
+        },
+        "extrabold-800": {
+          "$type": "string",
+          "$value": "Extra bold Italic"
+        },
+        "extralight-200": {
+          "$type": "string",
+          "$value": "Extra light Italic"
+        },
+        "light-300": {
+          "$type": "string",
+          "$value": "Light Italic"
+        },
+        "medium-500": {
+          "$type": "string",
+          "$value": "Medium Italic"
+        },
+        "regular-400": {
+          "$type": "string",
+          "$value": "Italic"
+        },
+        "semibold-600": {
+          "$type": "string",
+          "$value": "Semi Bold Italic"
+        },
+        "thin-100": {
+          "$type": "string",
+          "$value": "Thin Italic"
+        }
+      },
+      "normal": {
+        "black-900": {
+          "$type": "string",
+          "$value": "Black"
+        },
+        "bold-700": {
+          "$type": "string",
+          "$value": "Bold"
+        },
+        "extrabold-800": {
+          "$type": "string",
+          "$value": "Extrabold"
+        },
+        "extralight-200": {
+          "$type": "string",
+          "$value": "Extra light"
+        },
+        "light-300": {
+          "$type": "string",
+          "$value": "Light"
+        },
+        "medium-500": {
+          "$type": "string",
+          "$value": "Medium"
+        },
+        "regular-400": {
+          "$type": "string",
+          "$value": "Regular"
+        },
+        "semibold-600": {
+          "$type": "string",
+          "$value": "Semibold"
+        },
+        "thin-100": {
+          "$type": "string",
+          "$value": "Thin"
+        }
+      }
+    },
+    "letter-spacing": {
+      "none": {
+        "$type": "number",
+        "$value": 0,
+        "$description": "Default, no tracking"
+      }
+    },
+    "line-height": {
+      "displays": {
+        "d1": {
+          "$type": "number",
+          "$value": 96
+        },
+        "d2": {
+          "$type": "number",
+          "$value": 86.4
+        },
+        "d3": {
+          "$type": "number",
+          "$value": 76.8
+        },
+        "d4": {
+          "$type": "number",
+          "$value": 67.2
+        },
+        "d5": {
+          "$type": "number",
+          "$value": 57.6
+        },
+        "d6": {
+          "$type": "number",
+          "$value": 48
+        }
+      },
+      "headings": {
+        "h1": {
+          "$type": "number",
+          "$value": 48
+        },
+        "h2": {
+          "$type": "number",
+          "$value": 38.4
+        },
+        "h3": {
+          "$type": "number",
+          "$value": 33.6
+        },
+        "h4": {
+          "$type": "number",
+          "$value": 28.8
+        },
+        "h5": {
+          "$type": "number",
+          "$value": 24
+        },
+        "h6": {
+          "$type": "number",
+          "$value": 19.2
+        }
+      },
+      "paragraph": {
+        "base": {
+          "$type": "number",
+          "$value": 24
+        },
+        "lg": {
+          "$type": "number",
+          "$value": 40
+        },
+        "sm": {
+          "$type": "number",
+          "$value": 17.4
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/tokens/dtcg/token_Shadows_Defaultmode.json b/tokens/dtcg/token_Shadows_Defaultmode.json
index 2d4a655..93ec7b5 100644
--- a/tokens/dtcg/token_Shadows_Defaultmode.json
+++ b/tokens/dtcg/token_Shadows_Defaultmode.json
@@ -2,43 +2,43 @@
   "Blur": {
     "lg": {
       "$type": "number",
-      "$value": "{utilities.rem.3}"
+      "$value": "{scale.1200}"
     },
     "md (base)": {
       "$type": "number",
-      "$value": "{utilities.rem.1}"
+      "$value": "{scale.600}"
     },
     "sm": {
       "$type": "number",
-      "$value": "{utilities.rem.0,25}"
+      "$value": "{scale.100}"
     }
   },
   "Color": {
     "lg": {
       "$type": "color",
-      "$value": "{shadows.lg}"
+      "$value": "#0000002d"
     },
     "md (base)": {
       "$type": "color",
-      "$value": "{shadows.md}"
+      "$value": "#00000026"
     },
     "sm": {
       "$type": "color",
-      "$value": "{shadows.sm}"
+      "$value": "#00000013"
     }
   },
   "Offset": {
     "lg": {
       "$type": "number",
-      "$value": "{utilities.rem.1}"
+      "$value": "{scale.600}"
     },
     "md (base)": {
       "$type": "number",
-      "$value": "{utilities.rem.0,5}"
+      "$value": "{scale.300}"
     },
     "sm": {
       "$type": "number",
-      "$value": "{utilities.rem.0,125}"
+      "$value": "{scale.50}"
     }
   }
 }
\ No newline at end of file
diff --git a/tokens/dtcg/token_Spacing_Defaultmode.json b/tokens/dtcg/token_Spacing_Defaultmode.json
new file mode 100644
index 0000000..9d4c82f
--- /dev/null
+++ b/tokens/dtcg/token_Spacing_Defaultmode.json
@@ -0,0 +1,34 @@
+{
+  "lg": {
+    "$type": "number",
+    "$value": "{scale.700}"
+  },
+  "md (base)": {
+    "$type": "number",
+    "$value": "{scale.600}"
+  },
+  "none": {
+    "$type": "number",
+    "$value": "{scale.0}"
+  },
+  "sm": {
+    "$type": "number",
+    "$value": "{scale.400}"
+  },
+  "xl": {
+    "$type": "number",
+    "$value": "{scale.1000}"
+  },
+  "xs": {
+    "$type": "number",
+    "$value": "{scale.300}"
+  },
+  "xxl": {
+    "$type": "number",
+    "$value": "{scale.1200}"
+  },
+  "xxs": {
+    "$type": "number",
+    "$value": "{scale.100}"
+  }
+}
\ No newline at end of file
diff --git a/tokens/dtcg/token_Typography_Defaultmode.json b/tokens/dtcg/token_Typography_Defaultmode.json
index c414cbd..5fc8f3d 100644
--- a/tokens/dtcg/token_Typography_Defaultmode.json
+++ b/tokens/dtcg/token_Typography_Defaultmode.json
@@ -15,32 +15,32 @@
     "Displays": {
       "1": {
         "$type": "number",
-        "$value": "{utilities.rem.5}",
+        "$value": "{scale.1600}",
         "$description": "Display style, largest."
       },
       "2": {
         "$type": "number",
-        "$value": "{utilities.rem.4,5}",
+        "$value": "{scale.1500}",
         "$description": "Display style, extra-large."
       },
       "3": {
         "$type": "number",
-        "$value": "{utilities.rem.4}",
+        "$value": "{scale.1400}",
         "$description": "Display style, large."
       },
       "4": {
         "$type": "number",
-        "$value": "{utilities.rem.3,5}",
+        "$value": "{scale.1300}",
         "$description": "Display style, medium-large."
       },
       "5": {
         "$type": "number",
-        "$value": "{utilities.rem.3}",
+        "$value": "{scale.1200}",
         "$description": "Display style, medium."
       },
       "6": {
         "$type": "number",
-        "$value": "{utilities.rem.2,5}",
+        "$value": "{scale.1100}",
         "$description": "Display style, smaller display."
       }
     },
@@ -119,29 +119,24 @@
     },
     "Normal": {
       "bold": {
-        "$type": "number",
-        "$value": "{typography.font-weight.normal.bold-700}",
-        "$description": "High emphasis, primary headings or highlights."
+        "$type": "string",
+        "$value": "{typography.font-weight.normal.bold-700}"
       },
       "light": {
-        "$type": "number",
-        "$value": "{typography.font-weight.normal.light-300}",
-        "$description": "Light weight for headings or emphasis."
+        "$type": "string",
+        "$value": "{typography.font-weight.normal.light-300}"
       },
       "medium": {
-        "$type": "number",
-        "$value": "{typography.font-weight.normal.medium-500}",
-        "$description": "Slightly heavier than normal, often for subheadings."
+        "$type": "string",
+        "$value": "{typography.font-weight.normal.medium-500}"
       },
       "normal (base)": {
-        "$type": "number",
-        "$value": "{typography.font-weight.normal.regular-400}",
-        "$description": "Standard weight for body text."
+        "$type": "string",
+        "$value": "{typography.font-weight.normal.regular-400}"
       },
       "semibold": {
-        "$type": "number",
-        "$value": "{typography.font-weight.normal.semibold-600}",
-        "$description": "Stronger emphasis, used for UI labels."
+        "$type": "string",
+        "$value": "{typography.font-weight.normal.semibold-600}"
       }
     }
   },
@@ -232,17 +227,17 @@
   "Margin bottom": {
     "display": {
       "$type": "number",
-      "$value": "{Spacers.0}",
+      "$value": "{none}",
       "$description": "Default margin below a Displays."
     },
     "heading": {
       "$type": "number",
-      "$value": "{Spacers.2}",
+      "$value": "{xs}",
       "$description": "Default margin below a Headings."
     },
     "paragraph": {
       "$type": "number",
-      "$value": "{Spacers.4 (base)}",
+      "$value": "{md (base)}",
       "$description": "Default margin below a paragraph."
     }
   }