diff --git a/.changeset/three-moles-attack.md b/.changeset/three-moles-attack.md
new file mode 100644
index 0000000000..75f5014bfd
--- /dev/null
+++ b/.changeset/three-moles-attack.md
@@ -0,0 +1,7 @@
+---
+"@digdir/designsystemet-theme": minor
+"@digdir/designsystemet": minor
+"@digdir/designsystemet-css": minor
+---
+
+Implemented a more flexible system of semantic border-radius tokens.
diff --git a/apps/storefront/app/bloggen/_components/Contributors/Contributors.module.css b/apps/storefront/app/bloggen/_components/Contributors/Contributors.module.css
index dff0e1cb6f..cef6e16010 100644
--- a/apps/storefront/app/bloggen/_components/Contributors/Contributors.module.css
+++ b/apps/storefront/app/bloggen/_components/Contributors/Contributors.module.css
@@ -10,7 +10,7 @@
   margin: 0 auto;
   margin-top: var(--ds-spacing-18);
   padding: var(--ds-spacing-10);
-  border-radius: var(--ds-border-radius-2xl);
+  border-radius: var(--ds-border-radius-lg);
   border: 1px solid var(--ds-color-neutral-border-subtle);
 }
 
diff --git a/apps/storefront/app/bloggen/_components/PostLayout/PostLayout.module.css b/apps/storefront/app/bloggen/_components/PostLayout/PostLayout.module.css
index ed65974fd2..2ebce015ab 100644
--- a/apps/storefront/app/bloggen/_components/PostLayout/PostLayout.module.css
+++ b/apps/storefront/app/bloggen/_components/PostLayout/PostLayout.module.css
@@ -88,7 +88,7 @@
 
 .wantToWrite {
   margin-top: var(--ds-spacing-12);
-  border-radius: var(--ds-border-radius-2xl);
+  border-radius: var(--ds-border-radius-lg);
   background: var(--ds-color-brand1-surface-default);
   color: var(--ds-color-brand1-text-default);
   padding: var(--ds-spacing-8);
diff --git a/apps/storefront/layouts/MenuPageLayout/MenuPageLayout.module.css b/apps/storefront/layouts/MenuPageLayout/MenuPageLayout.module.css
index fa81892c83..b4568a209a 100644
--- a/apps/storefront/layouts/MenuPageLayout/MenuPageLayout.module.css
+++ b/apps/storefront/layouts/MenuPageLayout/MenuPageLayout.module.css
@@ -27,7 +27,7 @@
   margin-bottom: var(--ds-spacing-6);
   padding: var(--ds-spacing-10);
   width: 100%;
-  border-radius: var(--ds-border-radius-xl);
+  border-radius: var(--ds-border-radius-lg);
   background-color: var(--ds-color-neutral-background-subtle);
 }
 
diff --git a/apps/storefront/tokens/altinn/dark.ts b/apps/storefront/tokens/altinn/dark.ts
index f1635059f9..3729d5ee62 100644
--- a/apps/storefront/tokens/altinn/dark.ts
+++ b/apps/storefront/tokens/altinn/dark.ts
@@ -2334,923 +2334,421 @@ export const  color = [
   }
 ] 
 
-export const  typography = [
+export const  dimension = [
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "3.75rem",
-      letterSpacing: "-1%"
-    },
+    $type: "dimension",
+    $value: "min( 0.25rem , 0.25rem *1)",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.11}",
-        letterSpacing: "{letter-spacing.1}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.1}"
     },
-    name: "--ds-heading-2xl",
+    name: "--ds-border-radius-sm",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "2xl"
+      "border-radius",
+      "sm"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "3rem",
-      letterSpacing: "-1%"
-    },
+    $type: "dimension",
+    $value: "min( 0.25rem , 0.25rem *2)",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.10}",
-        letterSpacing: "{letter-spacing.1}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.2}"
     },
-    name: "--ds-heading-xl",
+    name: "--ds-border-radius-md",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "xl"
+      "border-radius",
+      "md"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "2.25rem",
-      letterSpacing: "-0.5%"
-    },
+    $type: "dimension",
+    $value: "min( 0.25rem , 0.25rem *5)",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.9}",
-        letterSpacing: "{letter-spacing.2}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.3}"
     },
-    name: "--ds-heading-lg",
+    name: "--ds-border-radius-lg",
     attributes: {},
     path: [
-      "typography",
-      "heading",
+      "border-radius",
       "lg"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.875rem",
-      letterSpacing: "-0.25%"
-    },
+    $type: "dimension",
+    $value: "0.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.8}",
-        letterSpacing: "{letter-spacing.3}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.4}"
     },
-    name: "--ds-heading-md",
+    name: "--ds-border-radius-default",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "md"
+      "border-radius",
+      "default"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.5rem",
-      letterSpacing: "0%"
-    },
+    $type: "dimension",
+    $value: "624.9375rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.7}",
-        letterSpacing: "{letter-spacing.5}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.5}"
     },
-    name: "--ds-heading-sm",
+    name: "--ds-border-radius-full",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "sm"
+      "border-radius",
+      "full"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "0rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*0"
     },
-    name: "--ds-heading-xs",
+    name: "--ds-spacing-0",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "xs"
+      "spacing",
+      "0"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.125rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "0.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*1"
     },
-    name: "--ds-heading-2xs",
+    name: "--ds-spacing-1",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "2xs"
+      "spacing",
+      "1"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "1.5rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "0.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.7}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*2"
     },
-    name: "--ds-body-xl",
+    name: "--ds-spacing-2",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "xl"
+      "spacing",
+      "2"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "0.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*3"
     },
-    name: "--ds-body-lg",
+    name: "--ds-spacing-3",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "lg"
+      "spacing",
+      "3"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "1rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*4"
     },
-    name: "--ds-body-md",
+    name: "--ds-spacing-4",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "md"
+      "spacing",
+      "4"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
-    },
-    name: "--ds-body-sm",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "sm"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
-    },
-    name: "--ds-body-xs",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "xs"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.5rem",
-      letterSpacing: "0.5%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.7}",
-        letterSpacing: "{letter-spacing.8}"
-      }
-    },
-    name: "--ds-body-short-xl",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "short",
-      "xl"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
-    },
-    name: "--ds-body-short-lg",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "short",
-      "lg"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
-    },
-    name: "--ds-body-short-md",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "short",
-      "md"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
-    },
-    name: "--ds-body-short-sm",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "short",
-      "sm"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "1.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*5"
     },
-    name: "--ds-body-short-xs",
+    name: "--ds-spacing-5",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "short",
-      "xs"
+      "spacing",
+      "5"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "1.5rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "1.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.7}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*6"
     },
-    name: "--ds-body-long-xl",
+    name: "--ds-spacing-6",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "xl"
+      "spacing",
+      "6"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "1.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*7"
     },
-    name: "--ds-body-long-lg",
+    name: "--ds-spacing-7",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "lg"
+      "spacing",
+      "7"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "2rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*8"
     },
-    name: "--ds-body-long-md",
+    name: "--ds-spacing-8",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "md"
+      "spacing",
+      "8"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
+    $type: "dimension",
+    $value: "2.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*9"
     },
-    name: "--ds-body-long-sm",
+    name: "--ds-spacing-9",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "sm"
+      "spacing",
+      "9"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "2.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*10"
     },
-    name: "--ds-body-long-xs",
+    name: "--ds-spacing-10",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "xs"
+      "spacing",
+      "10"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "2.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*11"
     },
-    name: "--ds-label-lg",
+    name: "--ds-spacing-11",
     attributes: {},
     path: [
-      "typography",
-      "label",
-      "lg"
+      "spacing",
+      "11"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "3rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*12"
     },
-    name: "--ds-label-md",
+    name: "--ds-spacing-12",
     attributes: {},
     path: [
-      "typography",
-      "label",
-      "md"
+      "spacing",
+      "12"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
+    $type: "dimension",
+    $value: "3.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*13"
     },
-    name: "--ds-label-sm",
+    name: "--ds-spacing-13",
     attributes: {},
     path: [
-      "typography",
-      "label",
-      "sm"
+      "spacing",
+      "13"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "3.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*14"
     },
-    name: "--ds-label-xs",
+    name: "--ds-spacing-14",
     attributes: {},
     path: [
-      "typography",
-      "label",
-      "xs"
+      "spacing",
+      "14"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "3.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*15"
     },
-    name: "--ds-error_message-lg",
+    name: "--ds-spacing-15",
     attributes: {},
     path: [
-      "typography",
-      "error_message",
-      "lg"
+      "spacing",
+      "15"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "4.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*18"
     },
-    name: "--ds-error_message-md",
+    name: "--ds-spacing-18",
     attributes: {},
     path: [
-      "typography",
-      "error_message",
-      "md"
+      "spacing",
+      "18"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
+    $type: "dimension",
+    $value: "5.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*22"
     },
-    name: "--ds-error_message-sm",
+    name: "--ds-spacing-22",
     attributes: {},
     path: [
-      "typography",
-      "error_message",
-      "sm"
+      "spacing",
+      "22"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "6.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*26"
     },
-    name: "--ds-error_message-xs",
+    name: "--ds-spacing-26",
     attributes: {},
     path: [
-      "typography",
-      "error_message",
-      "xs"
+      "spacing",
+      "26"
     ]
-  }
-] 
-
-export const  opacity = [
+  },
   {
-    $type: "opacity",
-    $value: "30%",
+    $type: "dimension",
+    $value: "7.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "opacity",
-      $value: "{opacity.30}"
+      $type: "dimension",
+      $value: "{spacing.scale}*30"
     },
-    name: "--ds-disabled-opacity",
+    name: "--ds-spacing-30",
     attributes: {},
     path: [
-      "disabled",
-      "opacity"
+      "spacing",
+      "30"
     ]
-  }
-] 
-
-export const  dimension = [
+  },
   {
     $type: "dimension",
-    $value: "0.125rem",
+    $value: "0rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*0.5"
+      $value: "{sizing.scale}*0"
     },
-    name: "--ds-border-radius-sm",
+    name: "--ds-sizing-0",
     attributes: {},
     path: [
-      "border-radius",
-      "sm"
+      "sizing",
+      "0"
     ]
   },
   {
@@ -3260,13 +2758,13 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*1"
+      $value: "{sizing.scale}*1"
     },
-    name: "--ds-border-radius-md",
+    name: "--ds-sizing-1",
     attributes: {},
     path: [
-      "border-radius",
-      "md"
+      "sizing",
+      "1"
     ]
   },
   {
@@ -3276,13 +2774,13 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*2"
+      $value: "{sizing.scale}*2"
     },
-    name: "--ds-border-radius-lg",
+    name: "--ds-sizing-2",
     attributes: {},
     path: [
-      "border-radius",
-      "lg"
+      "sizing",
+      "2"
     ]
   },
   {
@@ -3292,13 +2790,13 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*3"
+      $value: "{sizing.scale}*3"
     },
-    name: "--ds-border-radius-xl",
+    name: "--ds-sizing-3",
     attributes: {},
     path: [
-      "border-radius",
-      "xl"
+      "sizing",
+      "3"
     ]
   },
   {
@@ -3308,13 +2806,29 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*4"
+      $value: "{sizing.scale}*4"
     },
-    name: "--ds-border-radius-2xl",
+    name: "--ds-sizing-4",
     attributes: {},
     path: [
-      "border-radius",
-      "2xl"
+      "sizing",
+      "4"
+    ]
+  },
+  {
+    $type: "dimension",
+    $value: "1.25rem",
+    filePath: "../../design-tokens/semantic/style.json",
+    isSource: false,
+    original: {
+      $type: "dimension",
+      $value: "{sizing.scale}*5"
+    },
+    name: "--ds-sizing-5",
+    attributes: {},
+    path: [
+      "sizing",
+      "5"
     ]
   },
   {
@@ -3324,685 +2838,1123 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*6"
+      $value: "{sizing.scale}*6"
     },
-    name: "--ds-border-radius-3xl",
+    name: "--ds-sizing-6",
     attributes: {},
     path: [
-      "border-radius",
-      "3xl"
+      "sizing",
+      "6"
     ]
   },
   {
     $type: "dimension",
-    $value: "2rem",
+    $value: "1.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*8"
+      $value: "{sizing.scale}*7"
     },
-    name: "--ds-border-radius-4xl",
+    name: "--ds-sizing-7",
     attributes: {},
     path: [
-      "border-radius",
-      "4xl"
+      "sizing",
+      "7"
     ]
   },
   {
     $type: "dimension",
-    $value: "624.9375rem",
+    $value: "2rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "9999"
+      $value: "{sizing.scale}*8"
     },
-    name: "--ds-border-radius-full",
+    name: "--ds-sizing-8",
     attributes: {},
     path: [
-      "border-radius",
-      "full"
+      "sizing",
+      "8"
     ]
   },
   {
     $type: "dimension",
-    $value: "0rem",
+    $value: "2.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*0"
+      $value: "{sizing.scale}*9"
     },
-    name: "--ds-spacing-0",
+    name: "--ds-sizing-9",
     attributes: {},
     path: [
-      "spacing",
-      "0"
+      "sizing",
+      "9"
     ]
   },
   {
     $type: "dimension",
-    $value: "0.25rem",
+    $value: "2.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*1"
+      $value: "{sizing.scale}*10"
     },
-    name: "--ds-spacing-1",
+    name: "--ds-sizing-10",
     attributes: {},
     path: [
-      "spacing",
-      "1"
+      "sizing",
+      "10"
     ]
   },
   {
     $type: "dimension",
-    $value: "0.5rem",
+    $value: "2.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*2"
+      $value: "{sizing.scale}*11"
     },
-    name: "--ds-spacing-2",
+    name: "--ds-sizing-11",
     attributes: {},
     path: [
-      "spacing",
-      "2"
+      "sizing",
+      "11"
     ]
   },
   {
     $type: "dimension",
-    $value: "0.75rem",
+    $value: "3rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*3"
+      $value: "{sizing.scale}*12"
     },
-    name: "--ds-spacing-3",
+    name: "--ds-sizing-12",
     attributes: {},
     path: [
-      "spacing",
-      "3"
+      "sizing",
+      "12"
     ]
   },
   {
     $type: "dimension",
-    $value: "1rem",
+    $value: "3.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*4"
+      $value: "{sizing.scale}*13"
     },
-    name: "--ds-spacing-4",
+    name: "--ds-sizing-13",
     attributes: {},
     path: [
-      "spacing",
-      "4"
+      "sizing",
+      "13"
     ]
   },
   {
     $type: "dimension",
-    $value: "1.25rem",
+    $value: "3.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*5"
+      $value: "{sizing.scale}*14"
     },
-    name: "--ds-spacing-5",
+    name: "--ds-sizing-14",
     attributes: {},
     path: [
-      "spacing",
-      "5"
+      "sizing",
+      "14"
     ]
   },
   {
     $type: "dimension",
-    $value: "1.5rem",
+    $value: "3.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*6"
+      $value: "{sizing.scale}*15"
     },
-    name: "--ds-spacing-6",
+    name: "--ds-sizing-15",
     attributes: {},
     path: [
-      "spacing",
-      "6"
+      "sizing",
+      "15"
     ]
   },
   {
     $type: "dimension",
-    $value: "1.75rem",
+    $value: "4.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*7"
+      $value: "{sizing.scale}*18"
     },
-    name: "--ds-spacing-7",
+    name: "--ds-sizing-18",
     attributes: {},
     path: [
-      "spacing",
-      "7"
+      "sizing",
+      "18"
     ]
   },
   {
     $type: "dimension",
-    $value: "2rem",
+    $value: "5.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*8"
+      $value: "{sizing.scale}*22"
     },
-    name: "--ds-spacing-8",
+    name: "--ds-sizing-22",
     attributes: {},
     path: [
-      "spacing",
-      "8"
+      "sizing",
+      "22"
     ]
   },
   {
     $type: "dimension",
-    $value: "2.25rem",
+    $value: "6.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*9"
+      $value: "{sizing.scale}*26"
     },
-    name: "--ds-spacing-9",
+    name: "--ds-sizing-26",
     attributes: {},
     path: [
-      "spacing",
-      "9"
+      "sizing",
+      "26"
     ]
   },
   {
     $type: "dimension",
-    $value: "2.5rem",
+    $value: "7.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*10"
+      $value: "{sizing.scale}*30"
+    },
+    name: "--ds-sizing-30",
+    attributes: {},
+    path: [
+      "sizing",
+      "30"
+    ]
+  }
+] 
+
+export const  typography = [
+  {
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "3.75rem",
+      letterSpacing: "-1%"
+    },
+    filePath: "../../design-tokens/semantic/style.json",
+    isSource: false,
+    original: {
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.11}",
+        letterSpacing: "{letter-spacing.1}"
+      }
+    },
+    name: "--ds-heading-2xl",
+    attributes: {},
+    path: [
+      "typography",
+      "heading",
+      "2xl"
+    ]
+  },
+  {
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "3rem",
+      letterSpacing: "-1%"
+    },
+    filePath: "../../design-tokens/semantic/style.json",
+    isSource: false,
+    original: {
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.10}",
+        letterSpacing: "{letter-spacing.1}"
+      }
     },
-    name: "--ds-spacing-10",
+    name: "--ds-heading-xl",
     attributes: {},
     path: [
-      "spacing",
-      "10"
+      "typography",
+      "heading",
+      "xl"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "2.25rem",
+      letterSpacing: "-0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*11"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.9}",
+        letterSpacing: "{letter-spacing.2}"
+      }
     },
-    name: "--ds-spacing-11",
+    name: "--ds-heading-lg",
     attributes: {},
     path: [
-      "spacing",
-      "11"
+      "typography",
+      "heading",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.875rem",
+      letterSpacing: "-0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*12"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.8}",
+        letterSpacing: "{letter-spacing.3}"
+      }
     },
-    name: "--ds-spacing-12",
+    name: "--ds-heading-md",
     attributes: {},
     path: [
-      "spacing",
-      "12"
+      "typography",
+      "heading",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.5rem",
+      letterSpacing: "0%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*13"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.7}",
+        letterSpacing: "{letter-spacing.5}"
+      }
     },
-    name: "--ds-spacing-13",
+    name: "--ds-heading-sm",
     attributes: {},
     path: [
-      "spacing",
-      "13"
+      "typography",
+      "heading",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*14"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-spacing-14",
+    name: "--ds-heading-xs",
     attributes: {},
     path: [
-      "spacing",
-      "14"
+      "typography",
+      "heading",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.125rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*15"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-spacing-15",
+    name: "--ds-heading-2xs",
     attributes: {},
     path: [
-      "spacing",
-      "15"
+      "typography",
+      "heading",
+      "2xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "4.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "1.5rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*18"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.7}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-spacing-18",
+    name: "--ds-body-xl",
     attributes: {},
     path: [
-      "spacing",
-      "18"
+      "typography",
+      "body",
+      "xl"
     ]
   },
   {
-    $type: "dimension",
-    $value: "5.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*22"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-spacing-22",
+    name: "--ds-body-lg",
     attributes: {},
     path: [
-      "spacing",
-      "22"
+      "typography",
+      "body",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "6.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*26"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-spacing-26",
+    name: "--ds-body-md",
     attributes: {},
     path: [
-      "spacing",
-      "26"
+      "typography",
+      "body",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "7.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*30"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-spacing-30",
+    name: "--ds-body-sm",
     attributes: {},
     path: [
-      "spacing",
-      "30"
+      "typography",
+      "body",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "0rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*0"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-0",
+    name: "--ds-body-xs",
     attributes: {},
     path: [
-      "sizing",
-      "0"
+      "typography",
+      "body",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "0.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.5rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*1"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.7}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-1",
+    name: "--ds-body-short-xl",
     attributes: {},
     path: [
-      "sizing",
-      "1"
+      "typography",
+      "body",
+      "short",
+      "xl"
     ]
   },
   {
-    $type: "dimension",
-    $value: "0.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*2"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-2",
+    name: "--ds-body-short-lg",
     attributes: {},
     path: [
-      "sizing",
-      "2"
+      "typography",
+      "body",
+      "short",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "0.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*3"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-3",
+    name: "--ds-body-short-md",
     attributes: {},
     path: [
-      "sizing",
-      "3"
+      "typography",
+      "body",
+      "short",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "1rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*4"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-sizing-4",
+    name: "--ds-body-short-sm",
     attributes: {},
     path: [
-      "sizing",
-      "4"
+      "typography",
+      "body",
+      "short",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "1.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*5"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-5",
+    name: "--ds-body-short-xs",
     attributes: {},
     path: [
-      "sizing",
-      "5"
+      "typography",
+      "body",
+      "short",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "1.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "1.5rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*6"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.7}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-6",
+    name: "--ds-body-long-xl",
     attributes: {},
     path: [
-      "sizing",
-      "6"
+      "typography",
+      "body",
+      "long",
+      "xl"
     ]
   },
   {
-    $type: "dimension",
-    $value: "1.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*7"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-7",
+    name: "--ds-body-long-lg",
     attributes: {},
     path: [
-      "sizing",
-      "7"
+      "typography",
+      "body",
+      "long",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*8"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-8",
+    name: "--ds-body-long-md",
     attributes: {},
     path: [
-      "sizing",
-      "8"
+      "typography",
+      "body",
+      "long",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*9"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-sizing-9",
+    name: "--ds-body-long-sm",
     attributes: {},
     path: [
-      "sizing",
-      "9"
+      "typography",
+      "body",
+      "long",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*10"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-10",
+    name: "--ds-body-long-xs",
     attributes: {},
     path: [
-      "sizing",
-      "10"
+      "typography",
+      "body",
+      "long",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*11"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-11",
+    name: "--ds-label-lg",
     attributes: {},
     path: [
-      "sizing",
-      "11"
+      "typography",
+      "label",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*12"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-12",
+    name: "--ds-label-md",
     attributes: {},
     path: [
-      "sizing",
-      "12"
+      "typography",
+      "label",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*13"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-sizing-13",
+    name: "--ds-label-sm",
     attributes: {},
     path: [
-      "sizing",
-      "13"
+      "typography",
+      "label",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*14"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-14",
+    name: "--ds-label-xs",
     attributes: {},
     path: [
-      "sizing",
-      "14"
+      "typography",
+      "label",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*15"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-15",
+    name: "--ds-error_message-lg",
     attributes: {},
     path: [
-      "sizing",
-      "15"
+      "typography",
+      "error_message",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "4.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*18"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-18",
+    name: "--ds-error_message-md",
     attributes: {},
     path: [
-      "sizing",
-      "18"
+      "typography",
+      "error_message",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "5.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*22"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-sizing-22",
+    name: "--ds-error_message-sm",
     attributes: {},
     path: [
-      "sizing",
-      "22"
+      "typography",
+      "error_message",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "6.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*26"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-26",
+    name: "--ds-error_message-xs",
     attributes: {},
     path: [
-      "sizing",
-      "26"
+      "typography",
+      "error_message",
+      "xs"
     ]
-  },
+  }
+] 
+
+export const  opacity = [
   {
-    $type: "dimension",
-    $value: "7.5rem",
+    $type: "opacity",
+    $value: "30%",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*30"
+      $type: "opacity",
+      $value: "{opacity.30}"
     },
-    name: "--ds-sizing-30",
+    name: "--ds-disabled-opacity",
     attributes: {},
     path: [
-      "sizing",
-      "30"
+      "disabled",
+      "opacity"
     ]
   }
 ] 
diff --git a/apps/storefront/tokens/altinn/light.ts b/apps/storefront/tokens/altinn/light.ts
index 5a51a3a00a..c45fefea2e 100644
--- a/apps/storefront/tokens/altinn/light.ts
+++ b/apps/storefront/tokens/altinn/light.ts
@@ -2334,923 +2334,421 @@ export const  color = [
   }
 ] 
 
-export const  typography = [
+export const  dimension = [
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "3.75rem",
-      letterSpacing: "-1%"
-    },
+    $type: "dimension",
+    $value: "min( 0.25rem , 0.25rem *1)",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.11}",
-        letterSpacing: "{letter-spacing.1}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.1}"
     },
-    name: "--ds-heading-2xl",
+    name: "--ds-border-radius-sm",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "2xl"
+      "border-radius",
+      "sm"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "3rem",
-      letterSpacing: "-1%"
-    },
+    $type: "dimension",
+    $value: "min( 0.25rem , 0.25rem *2)",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.10}",
-        letterSpacing: "{letter-spacing.1}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.2}"
     },
-    name: "--ds-heading-xl",
+    name: "--ds-border-radius-md",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "xl"
+      "border-radius",
+      "md"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "2.25rem",
-      letterSpacing: "-0.5%"
-    },
+    $type: "dimension",
+    $value: "min( 0.25rem , 0.25rem *5)",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.9}",
-        letterSpacing: "{letter-spacing.2}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.3}"
     },
-    name: "--ds-heading-lg",
+    name: "--ds-border-radius-lg",
     attributes: {},
     path: [
-      "typography",
-      "heading",
+      "border-radius",
       "lg"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.875rem",
-      letterSpacing: "-0.25%"
-    },
+    $type: "dimension",
+    $value: "0.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.8}",
-        letterSpacing: "{letter-spacing.3}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.4}"
     },
-    name: "--ds-heading-md",
+    name: "--ds-border-radius-default",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "md"
+      "border-radius",
+      "default"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.5rem",
-      letterSpacing: "0%"
-    },
+    $type: "dimension",
+    $value: "624.9375rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.7}",
-        letterSpacing: "{letter-spacing.5}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.5}"
     },
-    name: "--ds-heading-sm",
+    name: "--ds-border-radius-full",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "sm"
+      "border-radius",
+      "full"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "0rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*0"
     },
-    name: "--ds-heading-xs",
+    name: "--ds-spacing-0",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "xs"
+      "spacing",
+      "0"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.125rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "0.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*1"
     },
-    name: "--ds-heading-2xs",
+    name: "--ds-spacing-1",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "2xs"
+      "spacing",
+      "1"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "1.5rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "0.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.7}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*2"
     },
-    name: "--ds-body-xl",
+    name: "--ds-spacing-2",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "xl"
+      "spacing",
+      "2"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "0.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*3"
     },
-    name: "--ds-body-lg",
+    name: "--ds-spacing-3",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "lg"
+      "spacing",
+      "3"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "1rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*4"
     },
-    name: "--ds-body-md",
+    name: "--ds-spacing-4",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "md"
+      "spacing",
+      "4"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
-    },
-    name: "--ds-body-sm",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "sm"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
-    },
-    name: "--ds-body-xs",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "xs"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.5rem",
-      letterSpacing: "0.5%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.7}",
-        letterSpacing: "{letter-spacing.8}"
-      }
-    },
-    name: "--ds-body-short-xl",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "short",
-      "xl"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
-    },
-    name: "--ds-body-short-lg",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "short",
-      "lg"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
-    },
-    name: "--ds-body-short-md",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "short",
-      "md"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
-    },
-    name: "--ds-body-short-sm",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "short",
-      "sm"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "1.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*5"
     },
-    name: "--ds-body-short-xs",
+    name: "--ds-spacing-5",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "short",
-      "xs"
+      "spacing",
+      "5"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "1.5rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "1.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.7}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*6"
     },
-    name: "--ds-body-long-xl",
+    name: "--ds-spacing-6",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "xl"
+      "spacing",
+      "6"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "1.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*7"
     },
-    name: "--ds-body-long-lg",
+    name: "--ds-spacing-7",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "lg"
+      "spacing",
+      "7"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "2rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*8"
     },
-    name: "--ds-body-long-md",
+    name: "--ds-spacing-8",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "md"
+      "spacing",
+      "8"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
+    $type: "dimension",
+    $value: "2.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*9"
     },
-    name: "--ds-body-long-sm",
+    name: "--ds-spacing-9",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "sm"
+      "spacing",
+      "9"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "2.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*10"
     },
-    name: "--ds-body-long-xs",
+    name: "--ds-spacing-10",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "xs"
+      "spacing",
+      "10"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "2.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*11"
     },
-    name: "--ds-label-lg",
+    name: "--ds-spacing-11",
     attributes: {},
     path: [
-      "typography",
-      "label",
-      "lg"
+      "spacing",
+      "11"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "3rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*12"
     },
-    name: "--ds-label-md",
+    name: "--ds-spacing-12",
     attributes: {},
     path: [
-      "typography",
-      "label",
-      "md"
+      "spacing",
+      "12"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
+    $type: "dimension",
+    $value: "3.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*13"
     },
-    name: "--ds-label-sm",
+    name: "--ds-spacing-13",
     attributes: {},
     path: [
-      "typography",
-      "label",
-      "sm"
+      "spacing",
+      "13"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "3.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*14"
     },
-    name: "--ds-label-xs",
+    name: "--ds-spacing-14",
     attributes: {},
     path: [
-      "typography",
-      "label",
-      "xs"
+      "spacing",
+      "14"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "3.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*15"
     },
-    name: "--ds-error_message-lg",
+    name: "--ds-spacing-15",
     attributes: {},
     path: [
-      "typography",
-      "error_message",
-      "lg"
+      "spacing",
+      "15"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "4.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*18"
     },
-    name: "--ds-error_message-md",
+    name: "--ds-spacing-18",
     attributes: {},
     path: [
-      "typography",
-      "error_message",
-      "md"
+      "spacing",
+      "18"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
+    $type: "dimension",
+    $value: "5.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*22"
     },
-    name: "--ds-error_message-sm",
+    name: "--ds-spacing-22",
     attributes: {},
     path: [
-      "typography",
-      "error_message",
-      "sm"
+      "spacing",
+      "22"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Helvetica Neue",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "6.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*26"
     },
-    name: "--ds-error_message-xs",
+    name: "--ds-spacing-26",
     attributes: {},
     path: [
-      "typography",
-      "error_message",
-      "xs"
+      "spacing",
+      "26"
     ]
-  }
-] 
-
-export const  opacity = [
+  },
   {
-    $type: "opacity",
-    $value: "30%",
+    $type: "dimension",
+    $value: "7.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "opacity",
-      $value: "{opacity.30}"
+      $type: "dimension",
+      $value: "{spacing.scale}*30"
     },
-    name: "--ds-disabled-opacity",
+    name: "--ds-spacing-30",
     attributes: {},
     path: [
-      "disabled",
-      "opacity"
+      "spacing",
+      "30"
     ]
-  }
-] 
-
-export const  dimension = [
+  },
   {
     $type: "dimension",
-    $value: "0.125rem",
+    $value: "0rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*0.5"
+      $value: "{sizing.scale}*0"
     },
-    name: "--ds-border-radius-sm",
+    name: "--ds-sizing-0",
     attributes: {},
     path: [
-      "border-radius",
-      "sm"
+      "sizing",
+      "0"
     ]
   },
   {
@@ -3260,13 +2758,13 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*1"
+      $value: "{sizing.scale}*1"
     },
-    name: "--ds-border-radius-md",
+    name: "--ds-sizing-1",
     attributes: {},
     path: [
-      "border-radius",
-      "md"
+      "sizing",
+      "1"
     ]
   },
   {
@@ -3276,13 +2774,13 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*2"
+      $value: "{sizing.scale}*2"
     },
-    name: "--ds-border-radius-lg",
+    name: "--ds-sizing-2",
     attributes: {},
     path: [
-      "border-radius",
-      "lg"
+      "sizing",
+      "2"
     ]
   },
   {
@@ -3292,13 +2790,13 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*3"
+      $value: "{sizing.scale}*3"
     },
-    name: "--ds-border-radius-xl",
+    name: "--ds-sizing-3",
     attributes: {},
     path: [
-      "border-radius",
-      "xl"
+      "sizing",
+      "3"
     ]
   },
   {
@@ -3308,13 +2806,29 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*4"
+      $value: "{sizing.scale}*4"
     },
-    name: "--ds-border-radius-2xl",
+    name: "--ds-sizing-4",
     attributes: {},
     path: [
-      "border-radius",
-      "2xl"
+      "sizing",
+      "4"
+    ]
+  },
+  {
+    $type: "dimension",
+    $value: "1.25rem",
+    filePath: "../../design-tokens/semantic/style.json",
+    isSource: false,
+    original: {
+      $type: "dimension",
+      $value: "{sizing.scale}*5"
+    },
+    name: "--ds-sizing-5",
+    attributes: {},
+    path: [
+      "sizing",
+      "5"
     ]
   },
   {
@@ -3324,685 +2838,1123 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*6"
+      $value: "{sizing.scale}*6"
     },
-    name: "--ds-border-radius-3xl",
+    name: "--ds-sizing-6",
     attributes: {},
     path: [
-      "border-radius",
-      "3xl"
+      "sizing",
+      "6"
     ]
   },
   {
     $type: "dimension",
-    $value: "2rem",
+    $value: "1.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*8"
+      $value: "{sizing.scale}*7"
     },
-    name: "--ds-border-radius-4xl",
+    name: "--ds-sizing-7",
     attributes: {},
     path: [
-      "border-radius",
-      "4xl"
+      "sizing",
+      "7"
     ]
   },
   {
     $type: "dimension",
-    $value: "624.9375rem",
+    $value: "2rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "9999"
+      $value: "{sizing.scale}*8"
     },
-    name: "--ds-border-radius-full",
+    name: "--ds-sizing-8",
     attributes: {},
     path: [
-      "border-radius",
-      "full"
+      "sizing",
+      "8"
     ]
   },
   {
     $type: "dimension",
-    $value: "0rem",
+    $value: "2.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*0"
+      $value: "{sizing.scale}*9"
     },
-    name: "--ds-spacing-0",
+    name: "--ds-sizing-9",
     attributes: {},
     path: [
-      "spacing",
-      "0"
+      "sizing",
+      "9"
     ]
   },
   {
     $type: "dimension",
-    $value: "0.25rem",
+    $value: "2.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*1"
+      $value: "{sizing.scale}*10"
     },
-    name: "--ds-spacing-1",
+    name: "--ds-sizing-10",
     attributes: {},
     path: [
-      "spacing",
-      "1"
+      "sizing",
+      "10"
     ]
   },
   {
     $type: "dimension",
-    $value: "0.5rem",
+    $value: "2.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*2"
+      $value: "{sizing.scale}*11"
     },
-    name: "--ds-spacing-2",
+    name: "--ds-sizing-11",
     attributes: {},
     path: [
-      "spacing",
-      "2"
+      "sizing",
+      "11"
     ]
   },
   {
     $type: "dimension",
-    $value: "0.75rem",
+    $value: "3rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*3"
+      $value: "{sizing.scale}*12"
     },
-    name: "--ds-spacing-3",
+    name: "--ds-sizing-12",
     attributes: {},
     path: [
-      "spacing",
-      "3"
+      "sizing",
+      "12"
     ]
   },
   {
     $type: "dimension",
-    $value: "1rem",
+    $value: "3.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*4"
+      $value: "{sizing.scale}*13"
     },
-    name: "--ds-spacing-4",
+    name: "--ds-sizing-13",
     attributes: {},
     path: [
-      "spacing",
-      "4"
+      "sizing",
+      "13"
     ]
   },
   {
     $type: "dimension",
-    $value: "1.25rem",
+    $value: "3.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*5"
+      $value: "{sizing.scale}*14"
     },
-    name: "--ds-spacing-5",
+    name: "--ds-sizing-14",
     attributes: {},
     path: [
-      "spacing",
-      "5"
+      "sizing",
+      "14"
     ]
   },
   {
     $type: "dimension",
-    $value: "1.5rem",
+    $value: "3.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*6"
+      $value: "{sizing.scale}*15"
     },
-    name: "--ds-spacing-6",
+    name: "--ds-sizing-15",
     attributes: {},
     path: [
-      "spacing",
-      "6"
+      "sizing",
+      "15"
     ]
   },
   {
     $type: "dimension",
-    $value: "1.75rem",
+    $value: "4.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*7"
+      $value: "{sizing.scale}*18"
     },
-    name: "--ds-spacing-7",
+    name: "--ds-sizing-18",
     attributes: {},
     path: [
-      "spacing",
-      "7"
+      "sizing",
+      "18"
     ]
   },
   {
     $type: "dimension",
-    $value: "2rem",
+    $value: "5.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*8"
+      $value: "{sizing.scale}*22"
     },
-    name: "--ds-spacing-8",
+    name: "--ds-sizing-22",
     attributes: {},
     path: [
-      "spacing",
-      "8"
+      "sizing",
+      "22"
     ]
   },
   {
     $type: "dimension",
-    $value: "2.25rem",
+    $value: "6.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*9"
+      $value: "{sizing.scale}*26"
     },
-    name: "--ds-spacing-9",
+    name: "--ds-sizing-26",
     attributes: {},
     path: [
-      "spacing",
-      "9"
+      "sizing",
+      "26"
     ]
   },
   {
     $type: "dimension",
-    $value: "2.5rem",
+    $value: "7.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*10"
+      $value: "{sizing.scale}*30"
+    },
+    name: "--ds-sizing-30",
+    attributes: {},
+    path: [
+      "sizing",
+      "30"
+    ]
+  }
+] 
+
+export const  typography = [
+  {
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "3.75rem",
+      letterSpacing: "-1%"
+    },
+    filePath: "../../design-tokens/semantic/style.json",
+    isSource: false,
+    original: {
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.11}",
+        letterSpacing: "{letter-spacing.1}"
+      }
+    },
+    name: "--ds-heading-2xl",
+    attributes: {},
+    path: [
+      "typography",
+      "heading",
+      "2xl"
+    ]
+  },
+  {
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "3rem",
+      letterSpacing: "-1%"
+    },
+    filePath: "../../design-tokens/semantic/style.json",
+    isSource: false,
+    original: {
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.10}",
+        letterSpacing: "{letter-spacing.1}"
+      }
     },
-    name: "--ds-spacing-10",
+    name: "--ds-heading-xl",
     attributes: {},
     path: [
-      "spacing",
-      "10"
+      "typography",
+      "heading",
+      "xl"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "2.25rem",
+      letterSpacing: "-0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*11"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.9}",
+        letterSpacing: "{letter-spacing.2}"
+      }
     },
-    name: "--ds-spacing-11",
+    name: "--ds-heading-lg",
     attributes: {},
     path: [
-      "spacing",
-      "11"
+      "typography",
+      "heading",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.875rem",
+      letterSpacing: "-0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*12"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.8}",
+        letterSpacing: "{letter-spacing.3}"
+      }
     },
-    name: "--ds-spacing-12",
+    name: "--ds-heading-md",
     attributes: {},
     path: [
-      "spacing",
-      "12"
+      "typography",
+      "heading",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.5rem",
+      letterSpacing: "0%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*13"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.7}",
+        letterSpacing: "{letter-spacing.5}"
+      }
     },
-    name: "--ds-spacing-13",
+    name: "--ds-heading-sm",
     attributes: {},
     path: [
-      "spacing",
-      "13"
+      "typography",
+      "heading",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*14"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-spacing-14",
+    name: "--ds-heading-xs",
     attributes: {},
     path: [
-      "spacing",
-      "14"
+      "typography",
+      "heading",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.125rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*15"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-spacing-15",
+    name: "--ds-heading-2xs",
     attributes: {},
     path: [
-      "spacing",
-      "15"
+      "typography",
+      "heading",
+      "2xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "4.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "1.5rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*18"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.7}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-spacing-18",
+    name: "--ds-body-xl",
     attributes: {},
     path: [
-      "spacing",
-      "18"
+      "typography",
+      "body",
+      "xl"
     ]
   },
   {
-    $type: "dimension",
-    $value: "5.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*22"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-spacing-22",
+    name: "--ds-body-lg",
     attributes: {},
     path: [
-      "spacing",
-      "22"
+      "typography",
+      "body",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "6.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*26"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-spacing-26",
+    name: "--ds-body-md",
     attributes: {},
     path: [
-      "spacing",
-      "26"
+      "typography",
+      "body",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "7.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*30"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-spacing-30",
+    name: "--ds-body-sm",
     attributes: {},
     path: [
-      "spacing",
-      "30"
+      "typography",
+      "body",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "0rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*0"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-0",
+    name: "--ds-body-xs",
     attributes: {},
     path: [
-      "sizing",
-      "0"
+      "typography",
+      "body",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "0.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.5rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*1"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.7}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-1",
+    name: "--ds-body-short-xl",
     attributes: {},
     path: [
-      "sizing",
-      "1"
+      "typography",
+      "body",
+      "short",
+      "xl"
     ]
   },
   {
-    $type: "dimension",
-    $value: "0.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*2"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-2",
+    name: "--ds-body-short-lg",
     attributes: {},
     path: [
-      "sizing",
-      "2"
+      "typography",
+      "body",
+      "short",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "0.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*3"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-3",
+    name: "--ds-body-short-md",
     attributes: {},
     path: [
-      "sizing",
-      "3"
+      "typography",
+      "body",
+      "short",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "1rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*4"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-sizing-4",
+    name: "--ds-body-short-sm",
     attributes: {},
     path: [
-      "sizing",
-      "4"
+      "typography",
+      "body",
+      "short",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "1.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*5"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-5",
+    name: "--ds-body-short-xs",
     attributes: {},
     path: [
-      "sizing",
-      "5"
+      "typography",
+      "body",
+      "short",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "1.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "1.5rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*6"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.7}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-6",
+    name: "--ds-body-long-xl",
     attributes: {},
     path: [
-      "sizing",
-      "6"
+      "typography",
+      "body",
+      "long",
+      "xl"
     ]
   },
   {
-    $type: "dimension",
-    $value: "1.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*7"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-7",
+    name: "--ds-body-long-lg",
     attributes: {},
     path: [
-      "sizing",
-      "7"
+      "typography",
+      "body",
+      "long",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*8"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-8",
+    name: "--ds-body-long-md",
     attributes: {},
     path: [
-      "sizing",
-      "8"
+      "typography",
+      "body",
+      "long",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*9"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-sizing-9",
+    name: "--ds-body-long-sm",
     attributes: {},
     path: [
-      "sizing",
-      "9"
+      "typography",
+      "body",
+      "long",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*10"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-10",
+    name: "--ds-body-long-xs",
     attributes: {},
     path: [
-      "sizing",
-      "10"
+      "typography",
+      "body",
+      "long",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*11"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-11",
+    name: "--ds-label-lg",
     attributes: {},
     path: [
-      "sizing",
-      "11"
+      "typography",
+      "label",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*12"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-12",
+    name: "--ds-label-md",
     attributes: {},
     path: [
-      "sizing",
-      "12"
+      "typography",
+      "label",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*13"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-sizing-13",
+    name: "--ds-label-sm",
     attributes: {},
     path: [
-      "sizing",
-      "13"
+      "typography",
+      "label",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*14"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-14",
+    name: "--ds-label-xs",
     attributes: {},
     path: [
-      "sizing",
-      "14"
+      "typography",
+      "label",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*15"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-15",
+    name: "--ds-error_message-lg",
     attributes: {},
     path: [
-      "sizing",
-      "15"
+      "typography",
+      "error_message",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "4.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*18"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-18",
+    name: "--ds-error_message-md",
     attributes: {},
     path: [
-      "sizing",
-      "18"
+      "typography",
+      "error_message",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "5.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*22"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-sizing-22",
+    name: "--ds-error_message-sm",
     attributes: {},
     path: [
-      "sizing",
-      "22"
+      "typography",
+      "error_message",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "6.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Helvetica Neue",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*26"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-26",
+    name: "--ds-error_message-xs",
     attributes: {},
     path: [
-      "sizing",
-      "26"
+      "typography",
+      "error_message",
+      "xs"
     ]
-  },
+  }
+] 
+
+export const  opacity = [
   {
-    $type: "dimension",
-    $value: "7.5rem",
+    $type: "opacity",
+    $value: "30%",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*30"
+      $type: "opacity",
+      $value: "{opacity.30}"
     },
-    name: "--ds-sizing-30",
+    name: "--ds-disabled-opacity",
     attributes: {},
     path: [
-      "sizing",
-      "30"
+      "disabled",
+      "opacity"
     ]
   }
 ] 
diff --git a/apps/storefront/tokens/digdir/dark.ts b/apps/storefront/tokens/digdir/dark.ts
index c5d7090012..cea1726f3a 100644
--- a/apps/storefront/tokens/digdir/dark.ts
+++ b/apps/storefront/tokens/digdir/dark.ts
@@ -2334,923 +2334,421 @@ export const  color = [
   }
 ] 
 
-export const  typography = [
+export const  dimension = [
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "3.75rem",
-      letterSpacing: "-1%"
-    },
+    $type: "dimension",
+    $value: "min( 0.25rem , 0.25rem *1)",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.11}",
-        letterSpacing: "{letter-spacing.1}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.1}"
     },
-    name: "--ds-heading-2xl",
+    name: "--ds-border-radius-sm",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "2xl"
+      "border-radius",
+      "sm"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "3rem",
-      letterSpacing: "-1%"
-    },
+    $type: "dimension",
+    $value: "min( 0.25rem , 0.25rem *2)",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.10}",
-        letterSpacing: "{letter-spacing.1}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.2}"
     },
-    name: "--ds-heading-xl",
+    name: "--ds-border-radius-md",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "xl"
+      "border-radius",
+      "md"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "2.25rem",
-      letterSpacing: "-0.5%"
-    },
+    $type: "dimension",
+    $value: "min( 0.25rem , 0.25rem *5)",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.9}",
-        letterSpacing: "{letter-spacing.2}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.3}"
     },
-    name: "--ds-heading-lg",
+    name: "--ds-border-radius-lg",
     attributes: {},
     path: [
-      "typography",
-      "heading",
+      "border-radius",
       "lg"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.875rem",
-      letterSpacing: "-0.25%"
-    },
+    $type: "dimension",
+    $value: "0.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.8}",
-        letterSpacing: "{letter-spacing.3}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.4}"
     },
-    name: "--ds-heading-md",
+    name: "--ds-border-radius-default",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "md"
+      "border-radius",
+      "default"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.5rem",
-      letterSpacing: "0%"
-    },
+    $type: "dimension",
+    $value: "624.9375rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.7}",
-        letterSpacing: "{letter-spacing.5}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.5}"
     },
-    name: "--ds-heading-sm",
+    name: "--ds-border-radius-full",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "sm"
+      "border-radius",
+      "full"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "0rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*0"
     },
-    name: "--ds-heading-xs",
+    name: "--ds-spacing-0",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "xs"
+      "spacing",
+      "0"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.125rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "0.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*1"
     },
-    name: "--ds-heading-2xs",
+    name: "--ds-spacing-1",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "2xs"
+      "spacing",
+      "1"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "1.5rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "0.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.7}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*2"
     },
-    name: "--ds-body-xl",
+    name: "--ds-spacing-2",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "xl"
+      "spacing",
+      "2"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "0.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*3"
     },
-    name: "--ds-body-lg",
+    name: "--ds-spacing-3",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "lg"
+      "spacing",
+      "3"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "1rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*4"
     },
-    name: "--ds-body-md",
+    name: "--ds-spacing-4",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "md"
+      "spacing",
+      "4"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
-    },
-    name: "--ds-body-sm",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "sm"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
-    },
-    name: "--ds-body-xs",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "xs"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.5rem",
-      letterSpacing: "0.5%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.7}",
-        letterSpacing: "{letter-spacing.8}"
-      }
-    },
-    name: "--ds-body-short-xl",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "short",
-      "xl"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
-    },
-    name: "--ds-body-short-lg",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "short",
-      "lg"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
-    },
-    name: "--ds-body-short-md",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "short",
-      "md"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
-    },
-    name: "--ds-body-short-sm",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "short",
-      "sm"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "1.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*5"
     },
-    name: "--ds-body-short-xs",
+    name: "--ds-spacing-5",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "short",
-      "xs"
+      "spacing",
+      "5"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "1.5rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "1.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.7}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*6"
     },
-    name: "--ds-body-long-xl",
+    name: "--ds-spacing-6",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "xl"
+      "spacing",
+      "6"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "1.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*7"
     },
-    name: "--ds-body-long-lg",
+    name: "--ds-spacing-7",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "lg"
+      "spacing",
+      "7"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "2rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*8"
     },
-    name: "--ds-body-long-md",
+    name: "--ds-spacing-8",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "md"
+      "spacing",
+      "8"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
+    $type: "dimension",
+    $value: "2.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*9"
     },
-    name: "--ds-body-long-sm",
+    name: "--ds-spacing-9",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "sm"
+      "spacing",
+      "9"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "2.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*10"
     },
-    name: "--ds-body-long-xs",
+    name: "--ds-spacing-10",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "xs"
+      "spacing",
+      "10"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "2.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*11"
     },
-    name: "--ds-label-lg",
+    name: "--ds-spacing-11",
     attributes: {},
     path: [
-      "typography",
-      "label",
-      "lg"
+      "spacing",
+      "11"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "3rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*12"
     },
-    name: "--ds-label-md",
+    name: "--ds-spacing-12",
     attributes: {},
     path: [
-      "typography",
-      "label",
-      "md"
+      "spacing",
+      "12"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
+    $type: "dimension",
+    $value: "3.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*13"
     },
-    name: "--ds-label-sm",
+    name: "--ds-spacing-13",
     attributes: {},
     path: [
-      "typography",
-      "label",
-      "sm"
+      "spacing",
+      "13"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "3.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*14"
     },
-    name: "--ds-label-xs",
+    name: "--ds-spacing-14",
     attributes: {},
     path: [
-      "typography",
-      "label",
-      "xs"
+      "spacing",
+      "14"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "3.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*15"
     },
-    name: "--ds-error_message-lg",
+    name: "--ds-spacing-15",
     attributes: {},
     path: [
-      "typography",
-      "error_message",
-      "lg"
+      "spacing",
+      "15"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "4.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*18"
     },
-    name: "--ds-error_message-md",
+    name: "--ds-spacing-18",
     attributes: {},
     path: [
-      "typography",
-      "error_message",
-      "md"
+      "spacing",
+      "18"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
+    $type: "dimension",
+    $value: "5.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*22"
     },
-    name: "--ds-error_message-sm",
+    name: "--ds-spacing-22",
     attributes: {},
     path: [
-      "typography",
-      "error_message",
-      "sm"
+      "spacing",
+      "22"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "6.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*26"
     },
-    name: "--ds-error_message-xs",
+    name: "--ds-spacing-26",
     attributes: {},
     path: [
-      "typography",
-      "error_message",
-      "xs"
+      "spacing",
+      "26"
     ]
-  }
-] 
-
-export const  opacity = [
+  },
   {
-    $type: "opacity",
-    $value: "30%",
+    $type: "dimension",
+    $value: "7.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "opacity",
-      $value: "{opacity.30}"
+      $type: "dimension",
+      $value: "{spacing.scale}*30"
     },
-    name: "--ds-disabled-opacity",
+    name: "--ds-spacing-30",
     attributes: {},
     path: [
-      "disabled",
-      "opacity"
+      "spacing",
+      "30"
     ]
-  }
-] 
-
-export const  dimension = [
+  },
   {
     $type: "dimension",
-    $value: "0.125rem",
+    $value: "0rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*0.5"
+      $value: "{sizing.scale}*0"
     },
-    name: "--ds-border-radius-sm",
+    name: "--ds-sizing-0",
     attributes: {},
     path: [
-      "border-radius",
-      "sm"
+      "sizing",
+      "0"
     ]
   },
   {
@@ -3260,13 +2758,13 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*1"
+      $value: "{sizing.scale}*1"
     },
-    name: "--ds-border-radius-md",
+    name: "--ds-sizing-1",
     attributes: {},
     path: [
-      "border-radius",
-      "md"
+      "sizing",
+      "1"
     ]
   },
   {
@@ -3276,13 +2774,13 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*2"
+      $value: "{sizing.scale}*2"
     },
-    name: "--ds-border-radius-lg",
+    name: "--ds-sizing-2",
     attributes: {},
     path: [
-      "border-radius",
-      "lg"
+      "sizing",
+      "2"
     ]
   },
   {
@@ -3292,13 +2790,13 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*3"
+      $value: "{sizing.scale}*3"
     },
-    name: "--ds-border-radius-xl",
+    name: "--ds-sizing-3",
     attributes: {},
     path: [
-      "border-radius",
-      "xl"
+      "sizing",
+      "3"
     ]
   },
   {
@@ -3308,13 +2806,29 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*4"
+      $value: "{sizing.scale}*4"
     },
-    name: "--ds-border-radius-2xl",
+    name: "--ds-sizing-4",
     attributes: {},
     path: [
-      "border-radius",
-      "2xl"
+      "sizing",
+      "4"
+    ]
+  },
+  {
+    $type: "dimension",
+    $value: "1.25rem",
+    filePath: "../../design-tokens/semantic/style.json",
+    isSource: false,
+    original: {
+      $type: "dimension",
+      $value: "{sizing.scale}*5"
+    },
+    name: "--ds-sizing-5",
+    attributes: {},
+    path: [
+      "sizing",
+      "5"
     ]
   },
   {
@@ -3324,685 +2838,1123 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*6"
+      $value: "{sizing.scale}*6"
     },
-    name: "--ds-border-radius-3xl",
+    name: "--ds-sizing-6",
     attributes: {},
     path: [
-      "border-radius",
-      "3xl"
+      "sizing",
+      "6"
     ]
   },
   {
     $type: "dimension",
-    $value: "2rem",
+    $value: "1.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*8"
+      $value: "{sizing.scale}*7"
     },
-    name: "--ds-border-radius-4xl",
+    name: "--ds-sizing-7",
     attributes: {},
     path: [
-      "border-radius",
-      "4xl"
+      "sizing",
+      "7"
     ]
   },
   {
     $type: "dimension",
-    $value: "624.9375rem",
+    $value: "2rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "9999"
+      $value: "{sizing.scale}*8"
     },
-    name: "--ds-border-radius-full",
+    name: "--ds-sizing-8",
     attributes: {},
     path: [
-      "border-radius",
-      "full"
+      "sizing",
+      "8"
     ]
   },
   {
     $type: "dimension",
-    $value: "0rem",
+    $value: "2.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*0"
+      $value: "{sizing.scale}*9"
     },
-    name: "--ds-spacing-0",
+    name: "--ds-sizing-9",
     attributes: {},
     path: [
-      "spacing",
-      "0"
+      "sizing",
+      "9"
     ]
   },
   {
     $type: "dimension",
-    $value: "0.25rem",
+    $value: "2.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*1"
+      $value: "{sizing.scale}*10"
     },
-    name: "--ds-spacing-1",
+    name: "--ds-sizing-10",
     attributes: {},
     path: [
-      "spacing",
-      "1"
+      "sizing",
+      "10"
     ]
   },
   {
     $type: "dimension",
-    $value: "0.5rem",
+    $value: "2.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*2"
+      $value: "{sizing.scale}*11"
     },
-    name: "--ds-spacing-2",
+    name: "--ds-sizing-11",
     attributes: {},
     path: [
-      "spacing",
-      "2"
+      "sizing",
+      "11"
     ]
   },
   {
     $type: "dimension",
-    $value: "0.75rem",
+    $value: "3rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*3"
+      $value: "{sizing.scale}*12"
     },
-    name: "--ds-spacing-3",
+    name: "--ds-sizing-12",
     attributes: {},
     path: [
-      "spacing",
-      "3"
+      "sizing",
+      "12"
     ]
   },
   {
     $type: "dimension",
-    $value: "1rem",
+    $value: "3.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*4"
+      $value: "{sizing.scale}*13"
     },
-    name: "--ds-spacing-4",
+    name: "--ds-sizing-13",
     attributes: {},
     path: [
-      "spacing",
-      "4"
+      "sizing",
+      "13"
     ]
   },
   {
     $type: "dimension",
-    $value: "1.25rem",
+    $value: "3.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*5"
+      $value: "{sizing.scale}*14"
     },
-    name: "--ds-spacing-5",
+    name: "--ds-sizing-14",
     attributes: {},
     path: [
-      "spacing",
-      "5"
+      "sizing",
+      "14"
     ]
   },
   {
     $type: "dimension",
-    $value: "1.5rem",
+    $value: "3.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*6"
+      $value: "{sizing.scale}*15"
     },
-    name: "--ds-spacing-6",
+    name: "--ds-sizing-15",
     attributes: {},
     path: [
-      "spacing",
-      "6"
+      "sizing",
+      "15"
     ]
   },
   {
     $type: "dimension",
-    $value: "1.75rem",
+    $value: "4.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*7"
+      $value: "{sizing.scale}*18"
     },
-    name: "--ds-spacing-7",
+    name: "--ds-sizing-18",
     attributes: {},
     path: [
-      "spacing",
-      "7"
+      "sizing",
+      "18"
     ]
   },
   {
     $type: "dimension",
-    $value: "2rem",
+    $value: "5.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*8"
+      $value: "{sizing.scale}*22"
     },
-    name: "--ds-spacing-8",
+    name: "--ds-sizing-22",
     attributes: {},
     path: [
-      "spacing",
-      "8"
+      "sizing",
+      "22"
     ]
   },
   {
     $type: "dimension",
-    $value: "2.25rem",
+    $value: "6.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*9"
+      $value: "{sizing.scale}*26"
     },
-    name: "--ds-spacing-9",
+    name: "--ds-sizing-26",
     attributes: {},
     path: [
-      "spacing",
-      "9"
+      "sizing",
+      "26"
     ]
   },
   {
     $type: "dimension",
-    $value: "2.5rem",
+    $value: "7.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*10"
+      $value: "{sizing.scale}*30"
+    },
+    name: "--ds-sizing-30",
+    attributes: {},
+    path: [
+      "sizing",
+      "30"
+    ]
+  }
+] 
+
+export const  typography = [
+  {
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "3.75rem",
+      letterSpacing: "-1%"
+    },
+    filePath: "../../design-tokens/semantic/style.json",
+    isSource: false,
+    original: {
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.11}",
+        letterSpacing: "{letter-spacing.1}"
+      }
+    },
+    name: "--ds-heading-2xl",
+    attributes: {},
+    path: [
+      "typography",
+      "heading",
+      "2xl"
+    ]
+  },
+  {
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "3rem",
+      letterSpacing: "-1%"
+    },
+    filePath: "../../design-tokens/semantic/style.json",
+    isSource: false,
+    original: {
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.10}",
+        letterSpacing: "{letter-spacing.1}"
+      }
     },
-    name: "--ds-spacing-10",
+    name: "--ds-heading-xl",
     attributes: {},
     path: [
-      "spacing",
-      "10"
+      "typography",
+      "heading",
+      "xl"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "2.25rem",
+      letterSpacing: "-0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*11"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.9}",
+        letterSpacing: "{letter-spacing.2}"
+      }
     },
-    name: "--ds-spacing-11",
+    name: "--ds-heading-lg",
     attributes: {},
     path: [
-      "spacing",
-      "11"
+      "typography",
+      "heading",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.875rem",
+      letterSpacing: "-0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*12"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.8}",
+        letterSpacing: "{letter-spacing.3}"
+      }
     },
-    name: "--ds-spacing-12",
+    name: "--ds-heading-md",
     attributes: {},
     path: [
-      "spacing",
-      "12"
+      "typography",
+      "heading",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.5rem",
+      letterSpacing: "0%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*13"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.7}",
+        letterSpacing: "{letter-spacing.5}"
+      }
     },
-    name: "--ds-spacing-13",
+    name: "--ds-heading-sm",
     attributes: {},
     path: [
-      "spacing",
-      "13"
+      "typography",
+      "heading",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*14"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-spacing-14",
+    name: "--ds-heading-xs",
     attributes: {},
     path: [
-      "spacing",
-      "14"
+      "typography",
+      "heading",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.125rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*15"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-spacing-15",
+    name: "--ds-heading-2xs",
     attributes: {},
     path: [
-      "spacing",
-      "15"
+      "typography",
+      "heading",
+      "2xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "4.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "1.5rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*18"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.7}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-spacing-18",
+    name: "--ds-body-xl",
     attributes: {},
     path: [
-      "spacing",
-      "18"
+      "typography",
+      "body",
+      "xl"
     ]
   },
   {
-    $type: "dimension",
-    $value: "5.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*22"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-spacing-22",
+    name: "--ds-body-lg",
     attributes: {},
     path: [
-      "spacing",
-      "22"
+      "typography",
+      "body",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "6.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*26"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-spacing-26",
+    name: "--ds-body-md",
     attributes: {},
     path: [
-      "spacing",
-      "26"
+      "typography",
+      "body",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "7.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*30"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-spacing-30",
+    name: "--ds-body-sm",
     attributes: {},
     path: [
-      "spacing",
-      "30"
+      "typography",
+      "body",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "0rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*0"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-0",
+    name: "--ds-body-xs",
     attributes: {},
     path: [
-      "sizing",
-      "0"
+      "typography",
+      "body",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "0.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.5rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*1"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.7}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-1",
+    name: "--ds-body-short-xl",
     attributes: {},
     path: [
-      "sizing",
-      "1"
+      "typography",
+      "body",
+      "short",
+      "xl"
     ]
   },
   {
-    $type: "dimension",
-    $value: "0.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*2"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-2",
+    name: "--ds-body-short-lg",
     attributes: {},
     path: [
-      "sizing",
-      "2"
+      "typography",
+      "body",
+      "short",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "0.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*3"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-3",
+    name: "--ds-body-short-md",
     attributes: {},
     path: [
-      "sizing",
-      "3"
+      "typography",
+      "body",
+      "short",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "1rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*4"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-sizing-4",
+    name: "--ds-body-short-sm",
     attributes: {},
     path: [
-      "sizing",
-      "4"
+      "typography",
+      "body",
+      "short",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "1.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*5"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-5",
+    name: "--ds-body-short-xs",
     attributes: {},
     path: [
-      "sizing",
-      "5"
+      "typography",
+      "body",
+      "short",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "1.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "1.5rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*6"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.7}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-6",
+    name: "--ds-body-long-xl",
     attributes: {},
     path: [
-      "sizing",
-      "6"
+      "typography",
+      "body",
+      "long",
+      "xl"
     ]
   },
   {
-    $type: "dimension",
-    $value: "1.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*7"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-7",
+    name: "--ds-body-long-lg",
     attributes: {},
     path: [
-      "sizing",
-      "7"
+      "typography",
+      "body",
+      "long",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*8"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-8",
+    name: "--ds-body-long-md",
     attributes: {},
     path: [
-      "sizing",
-      "8"
+      "typography",
+      "body",
+      "long",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*9"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-sizing-9",
+    name: "--ds-body-long-sm",
     attributes: {},
     path: [
-      "sizing",
-      "9"
+      "typography",
+      "body",
+      "long",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*10"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-10",
+    name: "--ds-body-long-xs",
     attributes: {},
     path: [
-      "sizing",
-      "10"
+      "typography",
+      "body",
+      "long",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*11"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-11",
+    name: "--ds-label-lg",
     attributes: {},
     path: [
-      "sizing",
-      "11"
+      "typography",
+      "label",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*12"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-12",
+    name: "--ds-label-md",
     attributes: {},
     path: [
-      "sizing",
-      "12"
+      "typography",
+      "label",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*13"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-sizing-13",
+    name: "--ds-label-sm",
     attributes: {},
     path: [
-      "sizing",
-      "13"
+      "typography",
+      "label",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*14"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-14",
+    name: "--ds-label-xs",
     attributes: {},
     path: [
-      "sizing",
-      "14"
+      "typography",
+      "label",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*15"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-15",
+    name: "--ds-error_message-lg",
     attributes: {},
     path: [
-      "sizing",
-      "15"
+      "typography",
+      "error_message",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "4.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*18"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-18",
+    name: "--ds-error_message-md",
     attributes: {},
     path: [
-      "sizing",
-      "18"
+      "typography",
+      "error_message",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "5.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*22"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-sizing-22",
+    name: "--ds-error_message-sm",
     attributes: {},
     path: [
-      "sizing",
-      "22"
+      "typography",
+      "error_message",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "6.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*26"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-26",
+    name: "--ds-error_message-xs",
     attributes: {},
     path: [
-      "sizing",
-      "26"
+      "typography",
+      "error_message",
+      "xs"
     ]
-  },
+  }
+] 
+
+export const  opacity = [
   {
-    $type: "dimension",
-    $value: "7.5rem",
+    $type: "opacity",
+    $value: "30%",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*30"
+      $type: "opacity",
+      $value: "{opacity.30}"
     },
-    name: "--ds-sizing-30",
+    name: "--ds-disabled-opacity",
     attributes: {},
     path: [
-      "sizing",
-      "30"
+      "disabled",
+      "opacity"
     ]
   }
 ] 
diff --git a/apps/storefront/tokens/digdir/light.ts b/apps/storefront/tokens/digdir/light.ts
index 3778017482..0ada305567 100644
--- a/apps/storefront/tokens/digdir/light.ts
+++ b/apps/storefront/tokens/digdir/light.ts
@@ -2334,923 +2334,421 @@ export const  color = [
   }
 ] 
 
-export const  typography = [
+export const  dimension = [
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "3.75rem",
-      letterSpacing: "-1%"
-    },
+    $type: "dimension",
+    $value: "min( 0.25rem , 0.25rem *1)",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.11}",
-        letterSpacing: "{letter-spacing.1}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.1}"
     },
-    name: "--ds-heading-2xl",
+    name: "--ds-border-radius-sm",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "2xl"
+      "border-radius",
+      "sm"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "3rem",
-      letterSpacing: "-1%"
-    },
+    $type: "dimension",
+    $value: "min( 0.25rem , 0.25rem *2)",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.10}",
-        letterSpacing: "{letter-spacing.1}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.2}"
     },
-    name: "--ds-heading-xl",
+    name: "--ds-border-radius-md",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "xl"
+      "border-radius",
+      "md"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "2.25rem",
-      letterSpacing: "-0.5%"
-    },
+    $type: "dimension",
+    $value: "min( 0.25rem , 0.25rem *5)",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.9}",
-        letterSpacing: "{letter-spacing.2}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.3}"
     },
-    name: "--ds-heading-lg",
+    name: "--ds-border-radius-lg",
     attributes: {},
     path: [
-      "typography",
-      "heading",
+      "border-radius",
       "lg"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.875rem",
-      letterSpacing: "-0.25%"
-    },
+    $type: "dimension",
+    $value: "0.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.8}",
-        letterSpacing: "{letter-spacing.3}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.4}"
     },
-    name: "--ds-heading-md",
+    name: "--ds-border-radius-default",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "md"
+      "border-radius",
+      "default"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.5rem",
-      letterSpacing: "0%"
-    },
+    $type: "dimension",
+    $value: "624.9375rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.7}",
-        letterSpacing: "{letter-spacing.5}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.5}"
     },
-    name: "--ds-heading-sm",
+    name: "--ds-border-radius-full",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "sm"
+      "border-radius",
+      "full"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "0rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*0"
     },
-    name: "--ds-heading-xs",
+    name: "--ds-spacing-0",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "xs"
+      "spacing",
+      "0"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.125rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "0.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*1"
     },
-    name: "--ds-heading-2xs",
+    name: "--ds-spacing-1",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "2xs"
+      "spacing",
+      "1"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "1.5rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "0.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.7}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*2"
     },
-    name: "--ds-body-xl",
+    name: "--ds-spacing-2",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "xl"
+      "spacing",
+      "2"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "0.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*3"
     },
-    name: "--ds-body-lg",
+    name: "--ds-spacing-3",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "lg"
+      "spacing",
+      "3"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "1rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*4"
     },
-    name: "--ds-body-md",
+    name: "--ds-spacing-4",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "md"
+      "spacing",
+      "4"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
-    },
-    name: "--ds-body-sm",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "sm"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
-    },
-    name: "--ds-body-xs",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "xs"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.5rem",
-      letterSpacing: "0.5%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.7}",
-        letterSpacing: "{letter-spacing.8}"
-      }
-    },
-    name: "--ds-body-short-xl",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "short",
-      "xl"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
-    },
-    name: "--ds-body-short-lg",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "short",
-      "lg"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
-    },
-    name: "--ds-body-short-md",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "short",
-      "md"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
-    },
-    name: "--ds-body-short-sm",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "short",
-      "sm"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "1.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*5"
     },
-    name: "--ds-body-short-xs",
+    name: "--ds-spacing-5",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "short",
-      "xs"
+      "spacing",
+      "5"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "1.5rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "1.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.7}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*6"
     },
-    name: "--ds-body-long-xl",
+    name: "--ds-spacing-6",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "xl"
+      "spacing",
+      "6"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "1.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*7"
     },
-    name: "--ds-body-long-lg",
+    name: "--ds-spacing-7",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "lg"
+      "spacing",
+      "7"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "2rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*8"
     },
-    name: "--ds-body-long-md",
+    name: "--ds-spacing-8",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "md"
+      "spacing",
+      "8"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
+    $type: "dimension",
+    $value: "2.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*9"
     },
-    name: "--ds-body-long-sm",
+    name: "--ds-spacing-9",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "sm"
+      "spacing",
+      "9"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "2.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*10"
     },
-    name: "--ds-body-long-xs",
+    name: "--ds-spacing-10",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "xs"
+      "spacing",
+      "10"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "2.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*11"
     },
-    name: "--ds-label-lg",
+    name: "--ds-spacing-11",
     attributes: {},
     path: [
-      "typography",
-      "label",
-      "lg"
+      "spacing",
+      "11"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "3rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*12"
     },
-    name: "--ds-label-md",
+    name: "--ds-spacing-12",
     attributes: {},
     path: [
-      "typography",
-      "label",
-      "md"
+      "spacing",
+      "12"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
+    $type: "dimension",
+    $value: "3.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*13"
     },
-    name: "--ds-label-sm",
+    name: "--ds-spacing-13",
     attributes: {},
     path: [
-      "typography",
-      "label",
-      "sm"
+      "spacing",
+      "13"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "3.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*14"
     },
-    name: "--ds-label-xs",
+    name: "--ds-spacing-14",
     attributes: {},
     path: [
-      "typography",
-      "label",
-      "xs"
+      "spacing",
+      "14"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "3.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*15"
     },
-    name: "--ds-error_message-lg",
+    name: "--ds-spacing-15",
     attributes: {},
     path: [
-      "typography",
-      "error_message",
-      "lg"
+      "spacing",
+      "15"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "4.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*18"
     },
-    name: "--ds-error_message-md",
+    name: "--ds-spacing-18",
     attributes: {},
     path: [
-      "typography",
-      "error_message",
-      "md"
+      "spacing",
+      "18"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
+    $type: "dimension",
+    $value: "5.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*22"
     },
-    name: "--ds-error_message-sm",
+    name: "--ds-spacing-22",
     attributes: {},
     path: [
-      "typography",
-      "error_message",
-      "sm"
+      "spacing",
+      "22"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "6.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*26"
     },
-    name: "--ds-error_message-xs",
+    name: "--ds-spacing-26",
     attributes: {},
     path: [
-      "typography",
-      "error_message",
-      "xs"
+      "spacing",
+      "26"
     ]
-  }
-] 
-
-export const  opacity = [
+  },
   {
-    $type: "opacity",
-    $value: "30%",
+    $type: "dimension",
+    $value: "7.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "opacity",
-      $value: "{opacity.30}"
+      $type: "dimension",
+      $value: "{spacing.scale}*30"
     },
-    name: "--ds-disabled-opacity",
+    name: "--ds-spacing-30",
     attributes: {},
     path: [
-      "disabled",
-      "opacity"
+      "spacing",
+      "30"
     ]
-  }
-] 
-
-export const  dimension = [
+  },
   {
     $type: "dimension",
-    $value: "0.125rem",
+    $value: "0rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*0.5"
+      $value: "{sizing.scale}*0"
     },
-    name: "--ds-border-radius-sm",
+    name: "--ds-sizing-0",
     attributes: {},
     path: [
-      "border-radius",
-      "sm"
+      "sizing",
+      "0"
     ]
   },
   {
@@ -3260,13 +2758,13 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*1"
+      $value: "{sizing.scale}*1"
     },
-    name: "--ds-border-radius-md",
+    name: "--ds-sizing-1",
     attributes: {},
     path: [
-      "border-radius",
-      "md"
+      "sizing",
+      "1"
     ]
   },
   {
@@ -3276,13 +2774,13 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*2"
+      $value: "{sizing.scale}*2"
     },
-    name: "--ds-border-radius-lg",
+    name: "--ds-sizing-2",
     attributes: {},
     path: [
-      "border-radius",
-      "lg"
+      "sizing",
+      "2"
     ]
   },
   {
@@ -3292,13 +2790,13 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*3"
+      $value: "{sizing.scale}*3"
     },
-    name: "--ds-border-radius-xl",
+    name: "--ds-sizing-3",
     attributes: {},
     path: [
-      "border-radius",
-      "xl"
+      "sizing",
+      "3"
     ]
   },
   {
@@ -3308,13 +2806,29 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*4"
+      $value: "{sizing.scale}*4"
     },
-    name: "--ds-border-radius-2xl",
+    name: "--ds-sizing-4",
     attributes: {},
     path: [
-      "border-radius",
-      "2xl"
+      "sizing",
+      "4"
+    ]
+  },
+  {
+    $type: "dimension",
+    $value: "1.25rem",
+    filePath: "../../design-tokens/semantic/style.json",
+    isSource: false,
+    original: {
+      $type: "dimension",
+      $value: "{sizing.scale}*5"
+    },
+    name: "--ds-sizing-5",
+    attributes: {},
+    path: [
+      "sizing",
+      "5"
     ]
   },
   {
@@ -3324,685 +2838,1123 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*6"
+      $value: "{sizing.scale}*6"
     },
-    name: "--ds-border-radius-3xl",
+    name: "--ds-sizing-6",
     attributes: {},
     path: [
-      "border-radius",
-      "3xl"
+      "sizing",
+      "6"
     ]
   },
   {
     $type: "dimension",
-    $value: "2rem",
+    $value: "1.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*8"
+      $value: "{sizing.scale}*7"
     },
-    name: "--ds-border-radius-4xl",
+    name: "--ds-sizing-7",
     attributes: {},
     path: [
-      "border-radius",
-      "4xl"
+      "sizing",
+      "7"
     ]
   },
   {
     $type: "dimension",
-    $value: "624.9375rem",
+    $value: "2rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "9999"
+      $value: "{sizing.scale}*8"
     },
-    name: "--ds-border-radius-full",
+    name: "--ds-sizing-8",
     attributes: {},
     path: [
-      "border-radius",
-      "full"
+      "sizing",
+      "8"
     ]
   },
   {
     $type: "dimension",
-    $value: "0rem",
+    $value: "2.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*0"
+      $value: "{sizing.scale}*9"
     },
-    name: "--ds-spacing-0",
+    name: "--ds-sizing-9",
     attributes: {},
     path: [
-      "spacing",
-      "0"
+      "sizing",
+      "9"
     ]
   },
   {
     $type: "dimension",
-    $value: "0.25rem",
+    $value: "2.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*1"
+      $value: "{sizing.scale}*10"
     },
-    name: "--ds-spacing-1",
+    name: "--ds-sizing-10",
     attributes: {},
     path: [
-      "spacing",
-      "1"
+      "sizing",
+      "10"
     ]
   },
   {
     $type: "dimension",
-    $value: "0.5rem",
+    $value: "2.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*2"
+      $value: "{sizing.scale}*11"
     },
-    name: "--ds-spacing-2",
+    name: "--ds-sizing-11",
     attributes: {},
     path: [
-      "spacing",
-      "2"
+      "sizing",
+      "11"
     ]
   },
   {
     $type: "dimension",
-    $value: "0.75rem",
+    $value: "3rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*3"
+      $value: "{sizing.scale}*12"
     },
-    name: "--ds-spacing-3",
+    name: "--ds-sizing-12",
     attributes: {},
     path: [
-      "spacing",
-      "3"
+      "sizing",
+      "12"
     ]
   },
   {
     $type: "dimension",
-    $value: "1rem",
+    $value: "3.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*4"
+      $value: "{sizing.scale}*13"
     },
-    name: "--ds-spacing-4",
+    name: "--ds-sizing-13",
     attributes: {},
     path: [
-      "spacing",
-      "4"
+      "sizing",
+      "13"
     ]
   },
   {
     $type: "dimension",
-    $value: "1.25rem",
+    $value: "3.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*5"
+      $value: "{sizing.scale}*14"
     },
-    name: "--ds-spacing-5",
+    name: "--ds-sizing-14",
     attributes: {},
     path: [
-      "spacing",
-      "5"
+      "sizing",
+      "14"
     ]
   },
   {
     $type: "dimension",
-    $value: "1.5rem",
+    $value: "3.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*6"
+      $value: "{sizing.scale}*15"
     },
-    name: "--ds-spacing-6",
+    name: "--ds-sizing-15",
     attributes: {},
     path: [
-      "spacing",
-      "6"
+      "sizing",
+      "15"
     ]
   },
   {
     $type: "dimension",
-    $value: "1.75rem",
+    $value: "4.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*7"
+      $value: "{sizing.scale}*18"
     },
-    name: "--ds-spacing-7",
+    name: "--ds-sizing-18",
     attributes: {},
     path: [
-      "spacing",
-      "7"
+      "sizing",
+      "18"
     ]
   },
   {
     $type: "dimension",
-    $value: "2rem",
+    $value: "5.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*8"
+      $value: "{sizing.scale}*22"
     },
-    name: "--ds-spacing-8",
+    name: "--ds-sizing-22",
     attributes: {},
     path: [
-      "spacing",
-      "8"
+      "sizing",
+      "22"
     ]
   },
   {
     $type: "dimension",
-    $value: "2.25rem",
+    $value: "6.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*9"
+      $value: "{sizing.scale}*26"
     },
-    name: "--ds-spacing-9",
+    name: "--ds-sizing-26",
     attributes: {},
     path: [
-      "spacing",
-      "9"
+      "sizing",
+      "26"
     ]
   },
   {
     $type: "dimension",
-    $value: "2.5rem",
+    $value: "7.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*10"
+      $value: "{sizing.scale}*30"
+    },
+    name: "--ds-sizing-30",
+    attributes: {},
+    path: [
+      "sizing",
+      "30"
+    ]
+  }
+] 
+
+export const  typography = [
+  {
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "3.75rem",
+      letterSpacing: "-1%"
+    },
+    filePath: "../../design-tokens/semantic/style.json",
+    isSource: false,
+    original: {
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.11}",
+        letterSpacing: "{letter-spacing.1}"
+      }
+    },
+    name: "--ds-heading-2xl",
+    attributes: {},
+    path: [
+      "typography",
+      "heading",
+      "2xl"
+    ]
+  },
+  {
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "3rem",
+      letterSpacing: "-1%"
+    },
+    filePath: "../../design-tokens/semantic/style.json",
+    isSource: false,
+    original: {
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.10}",
+        letterSpacing: "{letter-spacing.1}"
+      }
     },
-    name: "--ds-spacing-10",
+    name: "--ds-heading-xl",
     attributes: {},
     path: [
-      "spacing",
-      "10"
+      "typography",
+      "heading",
+      "xl"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "2.25rem",
+      letterSpacing: "-0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*11"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.9}",
+        letterSpacing: "{letter-spacing.2}"
+      }
     },
-    name: "--ds-spacing-11",
+    name: "--ds-heading-lg",
     attributes: {},
     path: [
-      "spacing",
-      "11"
+      "typography",
+      "heading",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.875rem",
+      letterSpacing: "-0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*12"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.8}",
+        letterSpacing: "{letter-spacing.3}"
+      }
     },
-    name: "--ds-spacing-12",
+    name: "--ds-heading-md",
     attributes: {},
     path: [
-      "spacing",
-      "12"
+      "typography",
+      "heading",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.5rem",
+      letterSpacing: "0%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*13"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.7}",
+        letterSpacing: "{letter-spacing.5}"
+      }
     },
-    name: "--ds-spacing-13",
+    name: "--ds-heading-sm",
     attributes: {},
     path: [
-      "spacing",
-      "13"
+      "typography",
+      "heading",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*14"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-spacing-14",
+    name: "--ds-heading-xs",
     attributes: {},
     path: [
-      "spacing",
-      "14"
+      "typography",
+      "heading",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.125rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*15"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-spacing-15",
+    name: "--ds-heading-2xs",
     attributes: {},
     path: [
-      "spacing",
-      "15"
+      "typography",
+      "heading",
+      "2xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "4.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "1.5rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*18"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.7}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-spacing-18",
+    name: "--ds-body-xl",
     attributes: {},
     path: [
-      "spacing",
-      "18"
+      "typography",
+      "body",
+      "xl"
     ]
   },
   {
-    $type: "dimension",
-    $value: "5.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*22"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-spacing-22",
+    name: "--ds-body-lg",
     attributes: {},
     path: [
-      "spacing",
-      "22"
+      "typography",
+      "body",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "6.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*26"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-spacing-26",
+    name: "--ds-body-md",
     attributes: {},
     path: [
-      "spacing",
-      "26"
+      "typography",
+      "body",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "7.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*30"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-spacing-30",
+    name: "--ds-body-sm",
     attributes: {},
     path: [
-      "spacing",
-      "30"
+      "typography",
+      "body",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "0rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*0"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-0",
+    name: "--ds-body-xs",
     attributes: {},
     path: [
-      "sizing",
-      "0"
+      "typography",
+      "body",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "0.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.5rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*1"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.7}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-1",
+    name: "--ds-body-short-xl",
     attributes: {},
     path: [
-      "sizing",
-      "1"
+      "typography",
+      "body",
+      "short",
+      "xl"
     ]
   },
   {
-    $type: "dimension",
-    $value: "0.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*2"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-2",
+    name: "--ds-body-short-lg",
     attributes: {},
     path: [
-      "sizing",
-      "2"
+      "typography",
+      "body",
+      "short",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "0.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*3"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-3",
+    name: "--ds-body-short-md",
     attributes: {},
     path: [
-      "sizing",
-      "3"
+      "typography",
+      "body",
+      "short",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "1rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*4"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-sizing-4",
+    name: "--ds-body-short-sm",
     attributes: {},
     path: [
-      "sizing",
-      "4"
+      "typography",
+      "body",
+      "short",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "1.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*5"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-5",
+    name: "--ds-body-short-xs",
     attributes: {},
     path: [
-      "sizing",
-      "5"
+      "typography",
+      "body",
+      "short",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "1.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "1.5rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*6"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.7}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-6",
+    name: "--ds-body-long-xl",
     attributes: {},
     path: [
-      "sizing",
-      "6"
+      "typography",
+      "body",
+      "long",
+      "xl"
     ]
   },
   {
-    $type: "dimension",
-    $value: "1.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*7"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-7",
+    name: "--ds-body-long-lg",
     attributes: {},
     path: [
-      "sizing",
-      "7"
+      "typography",
+      "body",
+      "long",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*8"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-8",
+    name: "--ds-body-long-md",
     attributes: {},
     path: [
-      "sizing",
-      "8"
+      "typography",
+      "body",
+      "long",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*9"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-sizing-9",
+    name: "--ds-body-long-sm",
     attributes: {},
     path: [
-      "sizing",
-      "9"
+      "typography",
+      "body",
+      "long",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*10"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-10",
+    name: "--ds-body-long-xs",
     attributes: {},
     path: [
-      "sizing",
-      "10"
+      "typography",
+      "body",
+      "long",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*11"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-11",
+    name: "--ds-label-lg",
     attributes: {},
     path: [
-      "sizing",
-      "11"
+      "typography",
+      "label",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*12"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-12",
+    name: "--ds-label-md",
     attributes: {},
     path: [
-      "sizing",
-      "12"
+      "typography",
+      "label",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*13"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-sizing-13",
+    name: "--ds-label-sm",
     attributes: {},
     path: [
-      "sizing",
-      "13"
+      "typography",
+      "label",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*14"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-14",
+    name: "--ds-label-xs",
     attributes: {},
     path: [
-      "sizing",
-      "14"
+      "typography",
+      "label",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*15"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-15",
+    name: "--ds-error_message-lg",
     attributes: {},
     path: [
-      "sizing",
-      "15"
+      "typography",
+      "error_message",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "4.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*18"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-18",
+    name: "--ds-error_message-md",
     attributes: {},
     path: [
-      "sizing",
-      "18"
+      "typography",
+      "error_message",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "5.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*22"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-sizing-22",
+    name: "--ds-error_message-sm",
     attributes: {},
     path: [
-      "sizing",
-      "22"
+      "typography",
+      "error_message",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "6.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*26"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-26",
+    name: "--ds-error_message-xs",
     attributes: {},
     path: [
-      "sizing",
-      "26"
+      "typography",
+      "error_message",
+      "xs"
     ]
-  },
+  }
+] 
+
+export const  opacity = [
   {
-    $type: "dimension",
-    $value: "7.5rem",
+    $type: "opacity",
+    $value: "30%",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*30"
+      $type: "opacity",
+      $value: "{opacity.30}"
     },
-    name: "--ds-sizing-30",
+    name: "--ds-disabled-opacity",
     attributes: {},
     path: [
-      "sizing",
-      "30"
+      "disabled",
+      "opacity"
     ]
   }
 ] 
diff --git a/apps/storefront/tokens/portal/dark.ts b/apps/storefront/tokens/portal/dark.ts
index 1dfae13ec2..d7e7cb40f3 100644
--- a/apps/storefront/tokens/portal/dark.ts
+++ b/apps/storefront/tokens/portal/dark.ts
@@ -2334,923 +2334,421 @@ export const  color = [
   }
 ] 
 
-export const  typography = [
+export const  dimension = [
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "3.75rem",
-      letterSpacing: "-1%"
-    },
+    $type: "dimension",
+    $value: "min( 0.25rem , 0.25rem *1)",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.11}",
-        letterSpacing: "{letter-spacing.1}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.1}"
     },
-    name: "--ds-heading-2xl",
+    name: "--ds-border-radius-sm",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "2xl"
+      "border-radius",
+      "sm"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "3rem",
-      letterSpacing: "-1%"
-    },
+    $type: "dimension",
+    $value: "min( 0.25rem , 0.25rem *2)",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.10}",
-        letterSpacing: "{letter-spacing.1}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.2}"
     },
-    name: "--ds-heading-xl",
+    name: "--ds-border-radius-md",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "xl"
+      "border-radius",
+      "md"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "2.25rem",
-      letterSpacing: "-0.5%"
-    },
+    $type: "dimension",
+    $value: "min( 0.25rem , 0.25rem *5)",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.9}",
-        letterSpacing: "{letter-spacing.2}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.3}"
     },
-    name: "--ds-heading-lg",
+    name: "--ds-border-radius-lg",
     attributes: {},
     path: [
-      "typography",
-      "heading",
+      "border-radius",
       "lg"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.875rem",
-      letterSpacing: "-0.25%"
-    },
+    $type: "dimension",
+    $value: "0.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.8}",
-        letterSpacing: "{letter-spacing.3}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.4}"
     },
-    name: "--ds-heading-md",
+    name: "--ds-border-radius-default",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "md"
+      "border-radius",
+      "default"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.5rem",
-      letterSpacing: "0%"
-    },
+    $type: "dimension",
+    $value: "624.9375rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.7}",
-        letterSpacing: "{letter-spacing.5}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.5}"
     },
-    name: "--ds-heading-sm",
+    name: "--ds-border-radius-full",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "sm"
+      "border-radius",
+      "full"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "0rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*0"
     },
-    name: "--ds-heading-xs",
+    name: "--ds-spacing-0",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "xs"
+      "spacing",
+      "0"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.125rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "0.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*1"
     },
-    name: "--ds-heading-2xs",
+    name: "--ds-spacing-1",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "2xs"
+      "spacing",
+      "1"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "1.5rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "0.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.7}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*2"
     },
-    name: "--ds-body-xl",
+    name: "--ds-spacing-2",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "xl"
+      "spacing",
+      "2"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "0.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*3"
     },
-    name: "--ds-body-lg",
+    name: "--ds-spacing-3",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "lg"
+      "spacing",
+      "3"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "1rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*4"
     },
-    name: "--ds-body-md",
+    name: "--ds-spacing-4",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "md"
+      "spacing",
+      "4"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
-    },
-    name: "--ds-body-sm",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "sm"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
-    },
-    name: "--ds-body-xs",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "xs"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.5rem",
-      letterSpacing: "0.5%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.7}",
-        letterSpacing: "{letter-spacing.8}"
-      }
-    },
-    name: "--ds-body-short-xl",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "short",
-      "xl"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
-    },
-    name: "--ds-body-short-lg",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "short",
-      "lg"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
-    },
-    name: "--ds-body-short-md",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "short",
-      "md"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
-    },
-    name: "--ds-body-short-sm",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "short",
-      "sm"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "1.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*5"
     },
-    name: "--ds-body-short-xs",
+    name: "--ds-spacing-5",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "short",
-      "xs"
+      "spacing",
+      "5"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "1.5rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "1.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.7}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*6"
     },
-    name: "--ds-body-long-xl",
+    name: "--ds-spacing-6",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "xl"
+      "spacing",
+      "6"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "1.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*7"
     },
-    name: "--ds-body-long-lg",
+    name: "--ds-spacing-7",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "lg"
+      "spacing",
+      "7"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "2rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*8"
     },
-    name: "--ds-body-long-md",
+    name: "--ds-spacing-8",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "md"
+      "spacing",
+      "8"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
+    $type: "dimension",
+    $value: "2.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*9"
     },
-    name: "--ds-body-long-sm",
+    name: "--ds-spacing-9",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "sm"
+      "spacing",
+      "9"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "2.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*10"
     },
-    name: "--ds-body-long-xs",
+    name: "--ds-spacing-10",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "xs"
+      "spacing",
+      "10"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "2.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*11"
     },
-    name: "--ds-label-lg",
+    name: "--ds-spacing-11",
     attributes: {},
     path: [
-      "typography",
-      "label",
-      "lg"
+      "spacing",
+      "11"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "3rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*12"
     },
-    name: "--ds-label-md",
+    name: "--ds-spacing-12",
     attributes: {},
     path: [
-      "typography",
-      "label",
-      "md"
+      "spacing",
+      "12"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
+    $type: "dimension",
+    $value: "3.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*13"
     },
-    name: "--ds-label-sm",
+    name: "--ds-spacing-13",
     attributes: {},
     path: [
-      "typography",
-      "label",
-      "sm"
+      "spacing",
+      "13"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "3.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*14"
     },
-    name: "--ds-label-xs",
+    name: "--ds-spacing-14",
     attributes: {},
     path: [
-      "typography",
-      "label",
-      "xs"
+      "spacing",
+      "14"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "3.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*15"
     },
-    name: "--ds-error_message-lg",
+    name: "--ds-spacing-15",
     attributes: {},
     path: [
-      "typography",
-      "error_message",
-      "lg"
+      "spacing",
+      "15"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "4.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*18"
     },
-    name: "--ds-error_message-md",
+    name: "--ds-spacing-18",
     attributes: {},
     path: [
-      "typography",
-      "error_message",
-      "md"
+      "spacing",
+      "18"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
+    $type: "dimension",
+    $value: "5.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*22"
     },
-    name: "--ds-error_message-sm",
+    name: "--ds-spacing-22",
     attributes: {},
     path: [
-      "typography",
-      "error_message",
-      "sm"
+      "spacing",
+      "22"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "6.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*26"
     },
-    name: "--ds-error_message-xs",
+    name: "--ds-spacing-26",
     attributes: {},
     path: [
-      "typography",
-      "error_message",
-      "xs"
+      "spacing",
+      "26"
     ]
-  }
-] 
-
-export const  opacity = [
+  },
   {
-    $type: "opacity",
-    $value: "30%",
+    $type: "dimension",
+    $value: "7.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "opacity",
-      $value: "{opacity.30}"
+      $type: "dimension",
+      $value: "{spacing.scale}*30"
     },
-    name: "--ds-disabled-opacity",
+    name: "--ds-spacing-30",
     attributes: {},
     path: [
-      "disabled",
-      "opacity"
+      "spacing",
+      "30"
     ]
-  }
-] 
-
-export const  dimension = [
+  },
   {
     $type: "dimension",
-    $value: "0.125rem",
+    $value: "0rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*0.5"
+      $value: "{sizing.scale}*0"
     },
-    name: "--ds-border-radius-sm",
+    name: "--ds-sizing-0",
     attributes: {},
     path: [
-      "border-radius",
-      "sm"
+      "sizing",
+      "0"
     ]
   },
   {
@@ -3260,13 +2758,13 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*1"
+      $value: "{sizing.scale}*1"
     },
-    name: "--ds-border-radius-md",
+    name: "--ds-sizing-1",
     attributes: {},
     path: [
-      "border-radius",
-      "md"
+      "sizing",
+      "1"
     ]
   },
   {
@@ -3276,13 +2774,13 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*2"
+      $value: "{sizing.scale}*2"
     },
-    name: "--ds-border-radius-lg",
+    name: "--ds-sizing-2",
     attributes: {},
     path: [
-      "border-radius",
-      "lg"
+      "sizing",
+      "2"
     ]
   },
   {
@@ -3292,13 +2790,13 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*3"
+      $value: "{sizing.scale}*3"
     },
-    name: "--ds-border-radius-xl",
+    name: "--ds-sizing-3",
     attributes: {},
     path: [
-      "border-radius",
-      "xl"
+      "sizing",
+      "3"
     ]
   },
   {
@@ -3308,13 +2806,29 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*4"
+      $value: "{sizing.scale}*4"
     },
-    name: "--ds-border-radius-2xl",
+    name: "--ds-sizing-4",
     attributes: {},
     path: [
-      "border-radius",
-      "2xl"
+      "sizing",
+      "4"
+    ]
+  },
+  {
+    $type: "dimension",
+    $value: "1.25rem",
+    filePath: "../../design-tokens/semantic/style.json",
+    isSource: false,
+    original: {
+      $type: "dimension",
+      $value: "{sizing.scale}*5"
+    },
+    name: "--ds-sizing-5",
+    attributes: {},
+    path: [
+      "sizing",
+      "5"
     ]
   },
   {
@@ -3324,685 +2838,1123 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*6"
+      $value: "{sizing.scale}*6"
     },
-    name: "--ds-border-radius-3xl",
+    name: "--ds-sizing-6",
     attributes: {},
     path: [
-      "border-radius",
-      "3xl"
+      "sizing",
+      "6"
     ]
   },
   {
     $type: "dimension",
-    $value: "2rem",
+    $value: "1.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*8"
+      $value: "{sizing.scale}*7"
     },
-    name: "--ds-border-radius-4xl",
+    name: "--ds-sizing-7",
     attributes: {},
     path: [
-      "border-radius",
-      "4xl"
+      "sizing",
+      "7"
     ]
   },
   {
     $type: "dimension",
-    $value: "624.9375rem",
+    $value: "2rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "9999"
+      $value: "{sizing.scale}*8"
     },
-    name: "--ds-border-radius-full",
+    name: "--ds-sizing-8",
     attributes: {},
     path: [
-      "border-radius",
-      "full"
+      "sizing",
+      "8"
     ]
   },
   {
     $type: "dimension",
-    $value: "0rem",
+    $value: "2.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*0"
+      $value: "{sizing.scale}*9"
     },
-    name: "--ds-spacing-0",
+    name: "--ds-sizing-9",
     attributes: {},
     path: [
-      "spacing",
-      "0"
+      "sizing",
+      "9"
     ]
   },
   {
     $type: "dimension",
-    $value: "0.25rem",
+    $value: "2.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*1"
+      $value: "{sizing.scale}*10"
     },
-    name: "--ds-spacing-1",
+    name: "--ds-sizing-10",
     attributes: {},
     path: [
-      "spacing",
-      "1"
+      "sizing",
+      "10"
     ]
   },
   {
     $type: "dimension",
-    $value: "0.5rem",
+    $value: "2.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*2"
+      $value: "{sizing.scale}*11"
     },
-    name: "--ds-spacing-2",
+    name: "--ds-sizing-11",
     attributes: {},
     path: [
-      "spacing",
-      "2"
+      "sizing",
+      "11"
     ]
   },
   {
     $type: "dimension",
-    $value: "0.75rem",
+    $value: "3rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*3"
+      $value: "{sizing.scale}*12"
     },
-    name: "--ds-spacing-3",
+    name: "--ds-sizing-12",
     attributes: {},
     path: [
-      "spacing",
-      "3"
+      "sizing",
+      "12"
     ]
   },
   {
     $type: "dimension",
-    $value: "1rem",
+    $value: "3.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*4"
+      $value: "{sizing.scale}*13"
     },
-    name: "--ds-spacing-4",
+    name: "--ds-sizing-13",
     attributes: {},
     path: [
-      "spacing",
-      "4"
+      "sizing",
+      "13"
     ]
   },
   {
     $type: "dimension",
-    $value: "1.25rem",
+    $value: "3.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*5"
+      $value: "{sizing.scale}*14"
     },
-    name: "--ds-spacing-5",
+    name: "--ds-sizing-14",
     attributes: {},
     path: [
-      "spacing",
-      "5"
+      "sizing",
+      "14"
     ]
   },
   {
     $type: "dimension",
-    $value: "1.5rem",
+    $value: "3.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*6"
+      $value: "{sizing.scale}*15"
     },
-    name: "--ds-spacing-6",
+    name: "--ds-sizing-15",
     attributes: {},
     path: [
-      "spacing",
-      "6"
+      "sizing",
+      "15"
     ]
   },
   {
     $type: "dimension",
-    $value: "1.75rem",
+    $value: "4.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*7"
+      $value: "{sizing.scale}*18"
     },
-    name: "--ds-spacing-7",
+    name: "--ds-sizing-18",
     attributes: {},
     path: [
-      "spacing",
-      "7"
+      "sizing",
+      "18"
     ]
   },
   {
     $type: "dimension",
-    $value: "2rem",
+    $value: "5.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*8"
+      $value: "{sizing.scale}*22"
     },
-    name: "--ds-spacing-8",
+    name: "--ds-sizing-22",
     attributes: {},
     path: [
-      "spacing",
-      "8"
+      "sizing",
+      "22"
     ]
   },
   {
     $type: "dimension",
-    $value: "2.25rem",
+    $value: "6.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*9"
+      $value: "{sizing.scale}*26"
     },
-    name: "--ds-spacing-9",
+    name: "--ds-sizing-26",
     attributes: {},
     path: [
-      "spacing",
-      "9"
+      "sizing",
+      "26"
     ]
   },
   {
     $type: "dimension",
-    $value: "2.5rem",
+    $value: "7.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*10"
+      $value: "{sizing.scale}*30"
+    },
+    name: "--ds-sizing-30",
+    attributes: {},
+    path: [
+      "sizing",
+      "30"
+    ]
+  }
+] 
+
+export const  typography = [
+  {
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "3.75rem",
+      letterSpacing: "-1%"
+    },
+    filePath: "../../design-tokens/semantic/style.json",
+    isSource: false,
+    original: {
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.11}",
+        letterSpacing: "{letter-spacing.1}"
+      }
+    },
+    name: "--ds-heading-2xl",
+    attributes: {},
+    path: [
+      "typography",
+      "heading",
+      "2xl"
+    ]
+  },
+  {
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "3rem",
+      letterSpacing: "-1%"
+    },
+    filePath: "../../design-tokens/semantic/style.json",
+    isSource: false,
+    original: {
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.10}",
+        letterSpacing: "{letter-spacing.1}"
+      }
     },
-    name: "--ds-spacing-10",
+    name: "--ds-heading-xl",
     attributes: {},
     path: [
-      "spacing",
-      "10"
+      "typography",
+      "heading",
+      "xl"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "2.25rem",
+      letterSpacing: "-0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*11"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.9}",
+        letterSpacing: "{letter-spacing.2}"
+      }
     },
-    name: "--ds-spacing-11",
+    name: "--ds-heading-lg",
     attributes: {},
     path: [
-      "spacing",
-      "11"
+      "typography",
+      "heading",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.875rem",
+      letterSpacing: "-0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*12"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.8}",
+        letterSpacing: "{letter-spacing.3}"
+      }
     },
-    name: "--ds-spacing-12",
+    name: "--ds-heading-md",
     attributes: {},
     path: [
-      "spacing",
-      "12"
+      "typography",
+      "heading",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.5rem",
+      letterSpacing: "0%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*13"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.7}",
+        letterSpacing: "{letter-spacing.5}"
+      }
     },
-    name: "--ds-spacing-13",
+    name: "--ds-heading-sm",
     attributes: {},
     path: [
-      "spacing",
-      "13"
+      "typography",
+      "heading",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*14"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-spacing-14",
+    name: "--ds-heading-xs",
     attributes: {},
     path: [
-      "spacing",
-      "14"
+      "typography",
+      "heading",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.125rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*15"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-spacing-15",
+    name: "--ds-heading-2xs",
     attributes: {},
     path: [
-      "spacing",
-      "15"
+      "typography",
+      "heading",
+      "2xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "4.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "1.5rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*18"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.7}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-spacing-18",
+    name: "--ds-body-xl",
     attributes: {},
     path: [
-      "spacing",
-      "18"
+      "typography",
+      "body",
+      "xl"
     ]
   },
   {
-    $type: "dimension",
-    $value: "5.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*22"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-spacing-22",
+    name: "--ds-body-lg",
     attributes: {},
     path: [
-      "spacing",
-      "22"
+      "typography",
+      "body",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "6.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*26"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-spacing-26",
+    name: "--ds-body-md",
     attributes: {},
     path: [
-      "spacing",
-      "26"
+      "typography",
+      "body",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "7.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*30"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-spacing-30",
+    name: "--ds-body-sm",
     attributes: {},
     path: [
-      "spacing",
-      "30"
+      "typography",
+      "body",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "0rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*0"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-0",
+    name: "--ds-body-xs",
     attributes: {},
     path: [
-      "sizing",
-      "0"
+      "typography",
+      "body",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "0.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.5rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*1"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.7}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-1",
+    name: "--ds-body-short-xl",
     attributes: {},
     path: [
-      "sizing",
-      "1"
+      "typography",
+      "body",
+      "short",
+      "xl"
     ]
   },
   {
-    $type: "dimension",
-    $value: "0.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*2"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-2",
+    name: "--ds-body-short-lg",
     attributes: {},
     path: [
-      "sizing",
-      "2"
+      "typography",
+      "body",
+      "short",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "0.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*3"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-3",
+    name: "--ds-body-short-md",
     attributes: {},
     path: [
-      "sizing",
-      "3"
+      "typography",
+      "body",
+      "short",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "1rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*4"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-sizing-4",
+    name: "--ds-body-short-sm",
     attributes: {},
     path: [
-      "sizing",
-      "4"
+      "typography",
+      "body",
+      "short",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "1.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*5"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-5",
+    name: "--ds-body-short-xs",
     attributes: {},
     path: [
-      "sizing",
-      "5"
+      "typography",
+      "body",
+      "short",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "1.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "1.5rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*6"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.7}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-6",
+    name: "--ds-body-long-xl",
     attributes: {},
     path: [
-      "sizing",
-      "6"
+      "typography",
+      "body",
+      "long",
+      "xl"
     ]
   },
   {
-    $type: "dimension",
-    $value: "1.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*7"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-7",
+    name: "--ds-body-long-lg",
     attributes: {},
     path: [
-      "sizing",
-      "7"
+      "typography",
+      "body",
+      "long",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*8"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-8",
+    name: "--ds-body-long-md",
     attributes: {},
     path: [
-      "sizing",
-      "8"
+      "typography",
+      "body",
+      "long",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*9"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-sizing-9",
+    name: "--ds-body-long-sm",
     attributes: {},
     path: [
-      "sizing",
-      "9"
+      "typography",
+      "body",
+      "long",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*10"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-10",
+    name: "--ds-body-long-xs",
     attributes: {},
     path: [
-      "sizing",
-      "10"
+      "typography",
+      "body",
+      "long",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*11"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-11",
+    name: "--ds-label-lg",
     attributes: {},
     path: [
-      "sizing",
-      "11"
+      "typography",
+      "label",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*12"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-12",
+    name: "--ds-label-md",
     attributes: {},
     path: [
-      "sizing",
-      "12"
+      "typography",
+      "label",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*13"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-sizing-13",
+    name: "--ds-label-sm",
     attributes: {},
     path: [
-      "sizing",
-      "13"
+      "typography",
+      "label",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*14"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-14",
+    name: "--ds-label-xs",
     attributes: {},
     path: [
-      "sizing",
-      "14"
+      "typography",
+      "label",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*15"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-15",
+    name: "--ds-error_message-lg",
     attributes: {},
     path: [
-      "sizing",
-      "15"
+      "typography",
+      "error_message",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "4.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*18"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-18",
+    name: "--ds-error_message-md",
     attributes: {},
     path: [
-      "sizing",
-      "18"
+      "typography",
+      "error_message",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "5.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*22"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-sizing-22",
+    name: "--ds-error_message-sm",
     attributes: {},
     path: [
-      "sizing",
-      "22"
+      "typography",
+      "error_message",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "6.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*26"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-26",
+    name: "--ds-error_message-xs",
     attributes: {},
     path: [
-      "sizing",
-      "26"
+      "typography",
+      "error_message",
+      "xs"
     ]
-  },
+  }
+] 
+
+export const  opacity = [
   {
-    $type: "dimension",
-    $value: "7.5rem",
+    $type: "opacity",
+    $value: "30%",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*30"
+      $type: "opacity",
+      $value: "{opacity.30}"
     },
-    name: "--ds-sizing-30",
+    name: "--ds-disabled-opacity",
     attributes: {},
     path: [
-      "sizing",
-      "30"
+      "disabled",
+      "opacity"
     ]
   }
 ] 
diff --git a/apps/storefront/tokens/portal/light.ts b/apps/storefront/tokens/portal/light.ts
index 30f88361a7..e08e908777 100644
--- a/apps/storefront/tokens/portal/light.ts
+++ b/apps/storefront/tokens/portal/light.ts
@@ -2334,923 +2334,421 @@ export const  color = [
   }
 ] 
 
-export const  typography = [
+export const  dimension = [
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "3.75rem",
-      letterSpacing: "-1%"
-    },
+    $type: "dimension",
+    $value: "min( 0.25rem , 0.25rem *1)",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.11}",
-        letterSpacing: "{letter-spacing.1}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.1}"
     },
-    name: "--ds-heading-2xl",
+    name: "--ds-border-radius-sm",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "2xl"
+      "border-radius",
+      "sm"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "3rem",
-      letterSpacing: "-1%"
-    },
+    $type: "dimension",
+    $value: "min( 0.25rem , 0.25rem *2)",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.10}",
-        letterSpacing: "{letter-spacing.1}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.2}"
     },
-    name: "--ds-heading-xl",
+    name: "--ds-border-radius-md",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "xl"
+      "border-radius",
+      "md"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "2.25rem",
-      letterSpacing: "-0.5%"
-    },
+    $type: "dimension",
+    $value: "min( 0.25rem , 0.25rem *5)",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.9}",
-        letterSpacing: "{letter-spacing.2}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.3}"
     },
-    name: "--ds-heading-lg",
+    name: "--ds-border-radius-lg",
     attributes: {},
     path: [
-      "typography",
-      "heading",
+      "border-radius",
       "lg"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.875rem",
-      letterSpacing: "-0.25%"
-    },
+    $type: "dimension",
+    $value: "0.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.8}",
-        letterSpacing: "{letter-spacing.3}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.4}"
     },
-    name: "--ds-heading-md",
+    name: "--ds-border-radius-default",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "md"
+      "border-radius",
+      "default"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.5rem",
-      letterSpacing: "0%"
-    },
+    $type: "dimension",
+    $value: "624.9375rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.7}",
-        letterSpacing: "{letter-spacing.5}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.5}"
     },
-    name: "--ds-heading-sm",
+    name: "--ds-border-radius-full",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "sm"
+      "border-radius",
+      "full"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "0rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*0"
     },
-    name: "--ds-heading-xs",
+    name: "--ds-spacing-0",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "xs"
+      "spacing",
+      "0"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.125rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "0.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*1"
     },
-    name: "--ds-heading-2xs",
+    name: "--ds-spacing-1",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "2xs"
+      "spacing",
+      "1"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "1.5rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "0.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.7}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*2"
     },
-    name: "--ds-body-xl",
+    name: "--ds-spacing-2",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "xl"
+      "spacing",
+      "2"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "0.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*3"
     },
-    name: "--ds-body-lg",
+    name: "--ds-spacing-3",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "lg"
+      "spacing",
+      "3"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "1rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*4"
     },
-    name: "--ds-body-md",
+    name: "--ds-spacing-4",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "md"
+      "spacing",
+      "4"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
-    },
-    name: "--ds-body-sm",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "sm"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
-    },
-    name: "--ds-body-xs",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "xs"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.5rem",
-      letterSpacing: "0.5%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.7}",
-        letterSpacing: "{letter-spacing.8}"
-      }
-    },
-    name: "--ds-body-short-xl",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "short",
-      "xl"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
-    },
-    name: "--ds-body-short-lg",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "short",
-      "lg"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
-    },
-    name: "--ds-body-short-md",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "short",
-      "md"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
-    },
-    name: "--ds-body-short-sm",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "short",
-      "sm"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "1.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*5"
     },
-    name: "--ds-body-short-xs",
+    name: "--ds-spacing-5",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "short",
-      "xs"
+      "spacing",
+      "5"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "1.5rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "1.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.7}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*6"
     },
-    name: "--ds-body-long-xl",
+    name: "--ds-spacing-6",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "xl"
+      "spacing",
+      "6"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "1.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*7"
     },
-    name: "--ds-body-long-lg",
+    name: "--ds-spacing-7",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "lg"
+      "spacing",
+      "7"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "2rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*8"
     },
-    name: "--ds-body-long-md",
+    name: "--ds-spacing-8",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "md"
+      "spacing",
+      "8"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
+    $type: "dimension",
+    $value: "2.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*9"
     },
-    name: "--ds-body-long-sm",
+    name: "--ds-spacing-9",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "sm"
+      "spacing",
+      "9"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "2.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*10"
     },
-    name: "--ds-body-long-xs",
+    name: "--ds-spacing-10",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "xs"
+      "spacing",
+      "10"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "2.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*11"
     },
-    name: "--ds-label-lg",
+    name: "--ds-spacing-11",
     attributes: {},
     path: [
-      "typography",
-      "label",
-      "lg"
+      "spacing",
+      "11"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "3rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*12"
     },
-    name: "--ds-label-md",
+    name: "--ds-spacing-12",
     attributes: {},
     path: [
-      "typography",
-      "label",
-      "md"
+      "spacing",
+      "12"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
+    $type: "dimension",
+    $value: "3.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*13"
     },
-    name: "--ds-label-sm",
+    name: "--ds-spacing-13",
     attributes: {},
     path: [
-      "typography",
-      "label",
-      "sm"
+      "spacing",
+      "13"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "3.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*14"
     },
-    name: "--ds-label-xs",
+    name: "--ds-spacing-14",
     attributes: {},
     path: [
-      "typography",
-      "label",
-      "xs"
+      "spacing",
+      "14"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "3.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*15"
     },
-    name: "--ds-error_message-lg",
+    name: "--ds-spacing-15",
     attributes: {},
     path: [
-      "typography",
-      "error_message",
-      "lg"
+      "spacing",
+      "15"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "4.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*18"
     },
-    name: "--ds-error_message-md",
+    name: "--ds-spacing-18",
     attributes: {},
     path: [
-      "typography",
-      "error_message",
-      "md"
+      "spacing",
+      "18"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
+    $type: "dimension",
+    $value: "5.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*22"
     },
-    name: "--ds-error_message-sm",
+    name: "--ds-spacing-22",
     attributes: {},
     path: [
-      "typography",
-      "error_message",
-      "sm"
+      "spacing",
+      "22"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "6.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*26"
     },
-    name: "--ds-error_message-xs",
+    name: "--ds-spacing-26",
     attributes: {},
     path: [
-      "typography",
-      "error_message",
-      "xs"
+      "spacing",
+      "26"
     ]
-  }
-] 
-
-export const  opacity = [
+  },
   {
-    $type: "opacity",
-    $value: "30%",
+    $type: "dimension",
+    $value: "7.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "opacity",
-      $value: "{opacity.30}"
+      $type: "dimension",
+      $value: "{spacing.scale}*30"
     },
-    name: "--ds-disabled-opacity",
+    name: "--ds-spacing-30",
     attributes: {},
     path: [
-      "disabled",
-      "opacity"
+      "spacing",
+      "30"
     ]
-  }
-] 
-
-export const  dimension = [
+  },
   {
     $type: "dimension",
-    $value: "0.125rem",
+    $value: "0rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*0.5"
+      $value: "{sizing.scale}*0"
     },
-    name: "--ds-border-radius-sm",
+    name: "--ds-sizing-0",
     attributes: {},
     path: [
-      "border-radius",
-      "sm"
+      "sizing",
+      "0"
     ]
   },
   {
@@ -3260,13 +2758,13 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*1"
+      $value: "{sizing.scale}*1"
     },
-    name: "--ds-border-radius-md",
+    name: "--ds-sizing-1",
     attributes: {},
     path: [
-      "border-radius",
-      "md"
+      "sizing",
+      "1"
     ]
   },
   {
@@ -3276,13 +2774,13 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*2"
+      $value: "{sizing.scale}*2"
     },
-    name: "--ds-border-radius-lg",
+    name: "--ds-sizing-2",
     attributes: {},
     path: [
-      "border-radius",
-      "lg"
+      "sizing",
+      "2"
     ]
   },
   {
@@ -3292,13 +2790,13 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*3"
+      $value: "{sizing.scale}*3"
     },
-    name: "--ds-border-radius-xl",
+    name: "--ds-sizing-3",
     attributes: {},
     path: [
-      "border-radius",
-      "xl"
+      "sizing",
+      "3"
     ]
   },
   {
@@ -3308,13 +2806,29 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*4"
+      $value: "{sizing.scale}*4"
     },
-    name: "--ds-border-radius-2xl",
+    name: "--ds-sizing-4",
     attributes: {},
     path: [
-      "border-radius",
-      "2xl"
+      "sizing",
+      "4"
+    ]
+  },
+  {
+    $type: "dimension",
+    $value: "1.25rem",
+    filePath: "../../design-tokens/semantic/style.json",
+    isSource: false,
+    original: {
+      $type: "dimension",
+      $value: "{sizing.scale}*5"
+    },
+    name: "--ds-sizing-5",
+    attributes: {},
+    path: [
+      "sizing",
+      "5"
     ]
   },
   {
@@ -3324,685 +2838,1123 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*6"
+      $value: "{sizing.scale}*6"
     },
-    name: "--ds-border-radius-3xl",
+    name: "--ds-sizing-6",
     attributes: {},
     path: [
-      "border-radius",
-      "3xl"
+      "sizing",
+      "6"
     ]
   },
   {
     $type: "dimension",
-    $value: "2rem",
+    $value: "1.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*8"
+      $value: "{sizing.scale}*7"
     },
-    name: "--ds-border-radius-4xl",
+    name: "--ds-sizing-7",
     attributes: {},
     path: [
-      "border-radius",
-      "4xl"
+      "sizing",
+      "7"
     ]
   },
   {
     $type: "dimension",
-    $value: "624.9375rem",
+    $value: "2rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "9999"
+      $value: "{sizing.scale}*8"
     },
-    name: "--ds-border-radius-full",
+    name: "--ds-sizing-8",
     attributes: {},
     path: [
-      "border-radius",
-      "full"
+      "sizing",
+      "8"
     ]
   },
   {
     $type: "dimension",
-    $value: "0rem",
+    $value: "2.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*0"
+      $value: "{sizing.scale}*9"
     },
-    name: "--ds-spacing-0",
+    name: "--ds-sizing-9",
     attributes: {},
     path: [
-      "spacing",
-      "0"
+      "sizing",
+      "9"
     ]
   },
   {
     $type: "dimension",
-    $value: "0.25rem",
+    $value: "2.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*1"
+      $value: "{sizing.scale}*10"
     },
-    name: "--ds-spacing-1",
+    name: "--ds-sizing-10",
     attributes: {},
     path: [
-      "spacing",
-      "1"
+      "sizing",
+      "10"
     ]
   },
   {
     $type: "dimension",
-    $value: "0.5rem",
+    $value: "2.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*2"
+      $value: "{sizing.scale}*11"
     },
-    name: "--ds-spacing-2",
+    name: "--ds-sizing-11",
     attributes: {},
     path: [
-      "spacing",
-      "2"
+      "sizing",
+      "11"
     ]
   },
   {
     $type: "dimension",
-    $value: "0.75rem",
+    $value: "3rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*3"
+      $value: "{sizing.scale}*12"
     },
-    name: "--ds-spacing-3",
+    name: "--ds-sizing-12",
     attributes: {},
     path: [
-      "spacing",
-      "3"
+      "sizing",
+      "12"
     ]
   },
   {
     $type: "dimension",
-    $value: "1rem",
+    $value: "3.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*4"
+      $value: "{sizing.scale}*13"
     },
-    name: "--ds-spacing-4",
+    name: "--ds-sizing-13",
     attributes: {},
     path: [
-      "spacing",
-      "4"
+      "sizing",
+      "13"
     ]
   },
   {
     $type: "dimension",
-    $value: "1.25rem",
+    $value: "3.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*5"
+      $value: "{sizing.scale}*14"
     },
-    name: "--ds-spacing-5",
+    name: "--ds-sizing-14",
     attributes: {},
     path: [
-      "spacing",
-      "5"
+      "sizing",
+      "14"
     ]
   },
   {
     $type: "dimension",
-    $value: "1.5rem",
+    $value: "3.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*6"
+      $value: "{sizing.scale}*15"
     },
-    name: "--ds-spacing-6",
+    name: "--ds-sizing-15",
     attributes: {},
     path: [
-      "spacing",
-      "6"
+      "sizing",
+      "15"
     ]
   },
   {
     $type: "dimension",
-    $value: "1.75rem",
+    $value: "4.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*7"
+      $value: "{sizing.scale}*18"
     },
-    name: "--ds-spacing-7",
+    name: "--ds-sizing-18",
     attributes: {},
     path: [
-      "spacing",
-      "7"
+      "sizing",
+      "18"
     ]
   },
   {
     $type: "dimension",
-    $value: "2rem",
+    $value: "5.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*8"
+      $value: "{sizing.scale}*22"
     },
-    name: "--ds-spacing-8",
+    name: "--ds-sizing-22",
     attributes: {},
     path: [
-      "spacing",
-      "8"
+      "sizing",
+      "22"
     ]
   },
   {
     $type: "dimension",
-    $value: "2.25rem",
+    $value: "6.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*9"
+      $value: "{sizing.scale}*26"
     },
-    name: "--ds-spacing-9",
+    name: "--ds-sizing-26",
     attributes: {},
     path: [
-      "spacing",
-      "9"
+      "sizing",
+      "26"
     ]
   },
   {
     $type: "dimension",
-    $value: "2.5rem",
+    $value: "7.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*10"
+      $value: "{sizing.scale}*30"
+    },
+    name: "--ds-sizing-30",
+    attributes: {},
+    path: [
+      "sizing",
+      "30"
+    ]
+  }
+] 
+
+export const  typography = [
+  {
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "3.75rem",
+      letterSpacing: "-1%"
+    },
+    filePath: "../../design-tokens/semantic/style.json",
+    isSource: false,
+    original: {
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.11}",
+        letterSpacing: "{letter-spacing.1}"
+      }
+    },
+    name: "--ds-heading-2xl",
+    attributes: {},
+    path: [
+      "typography",
+      "heading",
+      "2xl"
+    ]
+  },
+  {
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "3rem",
+      letterSpacing: "-1%"
+    },
+    filePath: "../../design-tokens/semantic/style.json",
+    isSource: false,
+    original: {
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.10}",
+        letterSpacing: "{letter-spacing.1}"
+      }
     },
-    name: "--ds-spacing-10",
+    name: "--ds-heading-xl",
     attributes: {},
     path: [
-      "spacing",
-      "10"
+      "typography",
+      "heading",
+      "xl"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "2.25rem",
+      letterSpacing: "-0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*11"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.9}",
+        letterSpacing: "{letter-spacing.2}"
+      }
     },
-    name: "--ds-spacing-11",
+    name: "--ds-heading-lg",
     attributes: {},
     path: [
-      "spacing",
-      "11"
+      "typography",
+      "heading",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.875rem",
+      letterSpacing: "-0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*12"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.8}",
+        letterSpacing: "{letter-spacing.3}"
+      }
     },
-    name: "--ds-spacing-12",
+    name: "--ds-heading-md",
     attributes: {},
     path: [
-      "spacing",
-      "12"
+      "typography",
+      "heading",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.5rem",
+      letterSpacing: "0%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*13"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.7}",
+        letterSpacing: "{letter-spacing.5}"
+      }
     },
-    name: "--ds-spacing-13",
+    name: "--ds-heading-sm",
     attributes: {},
     path: [
-      "spacing",
-      "13"
+      "typography",
+      "heading",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*14"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-spacing-14",
+    name: "--ds-heading-xs",
     attributes: {},
     path: [
-      "spacing",
-      "14"
+      "typography",
+      "heading",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.125rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*15"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-spacing-15",
+    name: "--ds-heading-2xs",
     attributes: {},
     path: [
-      "spacing",
-      "15"
+      "typography",
+      "heading",
+      "2xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "4.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "1.5rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*18"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.7}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-spacing-18",
+    name: "--ds-body-xl",
     attributes: {},
     path: [
-      "spacing",
-      "18"
+      "typography",
+      "body",
+      "xl"
     ]
   },
   {
-    $type: "dimension",
-    $value: "5.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*22"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-spacing-22",
+    name: "--ds-body-lg",
     attributes: {},
     path: [
-      "spacing",
-      "22"
+      "typography",
+      "body",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "6.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*26"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-spacing-26",
+    name: "--ds-body-md",
     attributes: {},
     path: [
-      "spacing",
-      "26"
+      "typography",
+      "body",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "7.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*30"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-spacing-30",
+    name: "--ds-body-sm",
     attributes: {},
     path: [
-      "spacing",
-      "30"
+      "typography",
+      "body",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "0rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*0"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-0",
+    name: "--ds-body-xs",
     attributes: {},
     path: [
-      "sizing",
-      "0"
+      "typography",
+      "body",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "0.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.5rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*1"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.7}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-1",
+    name: "--ds-body-short-xl",
     attributes: {},
     path: [
-      "sizing",
-      "1"
+      "typography",
+      "body",
+      "short",
+      "xl"
     ]
   },
   {
-    $type: "dimension",
-    $value: "0.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*2"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-2",
+    name: "--ds-body-short-lg",
     attributes: {},
     path: [
-      "sizing",
-      "2"
+      "typography",
+      "body",
+      "short",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "0.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*3"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-3",
+    name: "--ds-body-short-md",
     attributes: {},
     path: [
-      "sizing",
-      "3"
+      "typography",
+      "body",
+      "short",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "1rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*4"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-sizing-4",
+    name: "--ds-body-short-sm",
     attributes: {},
     path: [
-      "sizing",
-      "4"
+      "typography",
+      "body",
+      "short",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "1.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*5"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-5",
+    name: "--ds-body-short-xs",
     attributes: {},
     path: [
-      "sizing",
-      "5"
+      "typography",
+      "body",
+      "short",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "1.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "1.5rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*6"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.7}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-6",
+    name: "--ds-body-long-xl",
     attributes: {},
     path: [
-      "sizing",
-      "6"
+      "typography",
+      "body",
+      "long",
+      "xl"
     ]
   },
   {
-    $type: "dimension",
-    $value: "1.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*7"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-7",
+    name: "--ds-body-long-lg",
     attributes: {},
     path: [
-      "sizing",
-      "7"
+      "typography",
+      "body",
+      "long",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*8"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-8",
+    name: "--ds-body-long-md",
     attributes: {},
     path: [
-      "sizing",
-      "8"
+      "typography",
+      "body",
+      "long",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*9"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-sizing-9",
+    name: "--ds-body-long-sm",
     attributes: {},
     path: [
-      "sizing",
-      "9"
+      "typography",
+      "body",
+      "long",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*10"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-10",
+    name: "--ds-body-long-xs",
     attributes: {},
     path: [
-      "sizing",
-      "10"
+      "typography",
+      "body",
+      "long",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*11"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-11",
+    name: "--ds-label-lg",
     attributes: {},
     path: [
-      "sizing",
-      "11"
+      "typography",
+      "label",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*12"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-12",
+    name: "--ds-label-md",
     attributes: {},
     path: [
-      "sizing",
-      "12"
+      "typography",
+      "label",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*13"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-sizing-13",
+    name: "--ds-label-sm",
     attributes: {},
     path: [
-      "sizing",
-      "13"
+      "typography",
+      "label",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*14"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-14",
+    name: "--ds-label-xs",
     attributes: {},
     path: [
-      "sizing",
-      "14"
+      "typography",
+      "label",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*15"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-15",
+    name: "--ds-error_message-lg",
     attributes: {},
     path: [
-      "sizing",
-      "15"
+      "typography",
+      "error_message",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "4.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*18"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-18",
+    name: "--ds-error_message-md",
     attributes: {},
     path: [
-      "sizing",
-      "18"
+      "typography",
+      "error_message",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "5.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*22"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-sizing-22",
+    name: "--ds-error_message-sm",
     attributes: {},
     path: [
-      "sizing",
-      "22"
+      "typography",
+      "error_message",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "6.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*26"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-26",
+    name: "--ds-error_message-xs",
     attributes: {},
     path: [
-      "sizing",
-      "26"
+      "typography",
+      "error_message",
+      "xs"
     ]
-  },
+  }
+] 
+
+export const  opacity = [
   {
-    $type: "dimension",
-    $value: "7.5rem",
+    $type: "opacity",
+    $value: "30%",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*30"
+      $type: "opacity",
+      $value: "{opacity.30}"
     },
-    name: "--ds-sizing-30",
+    name: "--ds-disabled-opacity",
     attributes: {},
     path: [
-      "sizing",
-      "30"
+      "disabled",
+      "opacity"
     ]
   }
 ] 
diff --git a/apps/storefront/tokens/uutilsynet/dark.ts b/apps/storefront/tokens/uutilsynet/dark.ts
index b229912827..bb35faea2c 100644
--- a/apps/storefront/tokens/uutilsynet/dark.ts
+++ b/apps/storefront/tokens/uutilsynet/dark.ts
@@ -2334,923 +2334,421 @@ export const  color = [
   }
 ] 
 
-export const  typography = [
+export const  dimension = [
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "3.75rem",
-      letterSpacing: "-1%"
-    },
+    $type: "dimension",
+    $value: "min( 0.25rem , 0.25rem *1)",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.11}",
-        letterSpacing: "{letter-spacing.1}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.1}"
     },
-    name: "--ds-heading-2xl",
+    name: "--ds-border-radius-sm",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "2xl"
+      "border-radius",
+      "sm"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "3rem",
-      letterSpacing: "-1%"
-    },
+    $type: "dimension",
+    $value: "min( 0.25rem , 0.25rem *2)",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.10}",
-        letterSpacing: "{letter-spacing.1}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.2}"
     },
-    name: "--ds-heading-xl",
+    name: "--ds-border-radius-md",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "xl"
+      "border-radius",
+      "md"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "2.25rem",
-      letterSpacing: "-0.5%"
-    },
+    $type: "dimension",
+    $value: "min( 0.25rem , 0.25rem *5)",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.9}",
-        letterSpacing: "{letter-spacing.2}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.3}"
     },
-    name: "--ds-heading-lg",
+    name: "--ds-border-radius-lg",
     attributes: {},
     path: [
-      "typography",
-      "heading",
+      "border-radius",
       "lg"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.875rem",
-      letterSpacing: "-0.25%"
-    },
+    $type: "dimension",
+    $value: "0.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.8}",
-        letterSpacing: "{letter-spacing.3}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.4}"
     },
-    name: "--ds-heading-md",
+    name: "--ds-border-radius-default",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "md"
+      "border-radius",
+      "default"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.5rem",
-      letterSpacing: "0%"
-    },
+    $type: "dimension",
+    $value: "624.9375rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.7}",
-        letterSpacing: "{letter-spacing.5}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.5}"
     },
-    name: "--ds-heading-sm",
+    name: "--ds-border-radius-full",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "sm"
+      "border-radius",
+      "full"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "0rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*0"
     },
-    name: "--ds-heading-xs",
+    name: "--ds-spacing-0",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "xs"
+      "spacing",
+      "0"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.125rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "0.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*1"
     },
-    name: "--ds-heading-2xs",
+    name: "--ds-spacing-1",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "2xs"
+      "spacing",
+      "1"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "1.5rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "0.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.7}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*2"
     },
-    name: "--ds-body-xl",
+    name: "--ds-spacing-2",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "xl"
+      "spacing",
+      "2"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "0.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*3"
     },
-    name: "--ds-body-lg",
+    name: "--ds-spacing-3",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "lg"
+      "spacing",
+      "3"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "1rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*4"
     },
-    name: "--ds-body-md",
+    name: "--ds-spacing-4",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "md"
+      "spacing",
+      "4"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
-    },
-    name: "--ds-body-sm",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "sm"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
-    },
-    name: "--ds-body-xs",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "xs"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.5rem",
-      letterSpacing: "0.5%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.7}",
-        letterSpacing: "{letter-spacing.8}"
-      }
-    },
-    name: "--ds-body-short-xl",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "short",
-      "xl"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
-    },
-    name: "--ds-body-short-lg",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "short",
-      "lg"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
-    },
-    name: "--ds-body-short-md",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "short",
-      "md"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
-    },
-    name: "--ds-body-short-sm",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "short",
-      "sm"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "1.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*5"
     },
-    name: "--ds-body-short-xs",
+    name: "--ds-spacing-5",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "short",
-      "xs"
+      "spacing",
+      "5"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "1.5rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "1.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.7}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*6"
     },
-    name: "--ds-body-long-xl",
+    name: "--ds-spacing-6",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "xl"
+      "spacing",
+      "6"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "1.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*7"
     },
-    name: "--ds-body-long-lg",
+    name: "--ds-spacing-7",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "lg"
+      "spacing",
+      "7"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "2rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*8"
     },
-    name: "--ds-body-long-md",
+    name: "--ds-spacing-8",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "md"
+      "spacing",
+      "8"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
+    $type: "dimension",
+    $value: "2.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*9"
     },
-    name: "--ds-body-long-sm",
+    name: "--ds-spacing-9",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "sm"
+      "spacing",
+      "9"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "2.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*10"
     },
-    name: "--ds-body-long-xs",
+    name: "--ds-spacing-10",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "xs"
+      "spacing",
+      "10"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "2.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*11"
     },
-    name: "--ds-label-lg",
+    name: "--ds-spacing-11",
     attributes: {},
     path: [
-      "typography",
-      "label",
-      "lg"
+      "spacing",
+      "11"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "3rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*12"
     },
-    name: "--ds-label-md",
+    name: "--ds-spacing-12",
     attributes: {},
     path: [
-      "typography",
-      "label",
-      "md"
+      "spacing",
+      "12"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
+    $type: "dimension",
+    $value: "3.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*13"
     },
-    name: "--ds-label-sm",
+    name: "--ds-spacing-13",
     attributes: {},
     path: [
-      "typography",
-      "label",
-      "sm"
+      "spacing",
+      "13"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "3.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*14"
     },
-    name: "--ds-label-xs",
+    name: "--ds-spacing-14",
     attributes: {},
     path: [
-      "typography",
-      "label",
-      "xs"
+      "spacing",
+      "14"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "3.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*15"
     },
-    name: "--ds-error_message-lg",
+    name: "--ds-spacing-15",
     attributes: {},
     path: [
-      "typography",
-      "error_message",
-      "lg"
+      "spacing",
+      "15"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "4.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*18"
     },
-    name: "--ds-error_message-md",
+    name: "--ds-spacing-18",
     attributes: {},
     path: [
-      "typography",
-      "error_message",
-      "md"
+      "spacing",
+      "18"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
+    $type: "dimension",
+    $value: "5.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*22"
     },
-    name: "--ds-error_message-sm",
+    name: "--ds-spacing-22",
     attributes: {},
     path: [
-      "typography",
-      "error_message",
-      "sm"
+      "spacing",
+      "22"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "6.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*26"
     },
-    name: "--ds-error_message-xs",
+    name: "--ds-spacing-26",
     attributes: {},
     path: [
-      "typography",
-      "error_message",
-      "xs"
+      "spacing",
+      "26"
     ]
-  }
-] 
-
-export const  opacity = [
+  },
   {
-    $type: "opacity",
-    $value: "30%",
+    $type: "dimension",
+    $value: "7.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "opacity",
-      $value: "{opacity.30}"
+      $type: "dimension",
+      $value: "{spacing.scale}*30"
     },
-    name: "--ds-disabled-opacity",
+    name: "--ds-spacing-30",
     attributes: {},
     path: [
-      "disabled",
-      "opacity"
+      "spacing",
+      "30"
     ]
-  }
-] 
-
-export const  dimension = [
+  },
   {
     $type: "dimension",
-    $value: "0.125rem",
+    $value: "0rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*0.5"
+      $value: "{sizing.scale}*0"
     },
-    name: "--ds-border-radius-sm",
+    name: "--ds-sizing-0",
     attributes: {},
     path: [
-      "border-radius",
-      "sm"
+      "sizing",
+      "0"
     ]
   },
   {
@@ -3260,13 +2758,13 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*1"
+      $value: "{sizing.scale}*1"
     },
-    name: "--ds-border-radius-md",
+    name: "--ds-sizing-1",
     attributes: {},
     path: [
-      "border-radius",
-      "md"
+      "sizing",
+      "1"
     ]
   },
   {
@@ -3276,13 +2774,13 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*2"
+      $value: "{sizing.scale}*2"
     },
-    name: "--ds-border-radius-lg",
+    name: "--ds-sizing-2",
     attributes: {},
     path: [
-      "border-radius",
-      "lg"
+      "sizing",
+      "2"
     ]
   },
   {
@@ -3292,13 +2790,13 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*3"
+      $value: "{sizing.scale}*3"
     },
-    name: "--ds-border-radius-xl",
+    name: "--ds-sizing-3",
     attributes: {},
     path: [
-      "border-radius",
-      "xl"
+      "sizing",
+      "3"
     ]
   },
   {
@@ -3308,13 +2806,29 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*4"
+      $value: "{sizing.scale}*4"
     },
-    name: "--ds-border-radius-2xl",
+    name: "--ds-sizing-4",
     attributes: {},
     path: [
-      "border-radius",
-      "2xl"
+      "sizing",
+      "4"
+    ]
+  },
+  {
+    $type: "dimension",
+    $value: "1.25rem",
+    filePath: "../../design-tokens/semantic/style.json",
+    isSource: false,
+    original: {
+      $type: "dimension",
+      $value: "{sizing.scale}*5"
+    },
+    name: "--ds-sizing-5",
+    attributes: {},
+    path: [
+      "sizing",
+      "5"
     ]
   },
   {
@@ -3324,685 +2838,1123 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*6"
+      $value: "{sizing.scale}*6"
     },
-    name: "--ds-border-radius-3xl",
+    name: "--ds-sizing-6",
     attributes: {},
     path: [
-      "border-radius",
-      "3xl"
+      "sizing",
+      "6"
     ]
   },
   {
     $type: "dimension",
-    $value: "2rem",
+    $value: "1.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*8"
+      $value: "{sizing.scale}*7"
     },
-    name: "--ds-border-radius-4xl",
+    name: "--ds-sizing-7",
     attributes: {},
     path: [
-      "border-radius",
-      "4xl"
+      "sizing",
+      "7"
     ]
   },
   {
     $type: "dimension",
-    $value: "624.9375rem",
+    $value: "2rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "9999"
+      $value: "{sizing.scale}*8"
     },
-    name: "--ds-border-radius-full",
+    name: "--ds-sizing-8",
     attributes: {},
     path: [
-      "border-radius",
-      "full"
+      "sizing",
+      "8"
     ]
   },
   {
     $type: "dimension",
-    $value: "0rem",
+    $value: "2.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*0"
+      $value: "{sizing.scale}*9"
     },
-    name: "--ds-spacing-0",
+    name: "--ds-sizing-9",
     attributes: {},
     path: [
-      "spacing",
-      "0"
+      "sizing",
+      "9"
     ]
   },
   {
     $type: "dimension",
-    $value: "0.25rem",
+    $value: "2.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*1"
+      $value: "{sizing.scale}*10"
     },
-    name: "--ds-spacing-1",
+    name: "--ds-sizing-10",
     attributes: {},
     path: [
-      "spacing",
-      "1"
+      "sizing",
+      "10"
     ]
   },
   {
     $type: "dimension",
-    $value: "0.5rem",
+    $value: "2.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*2"
+      $value: "{sizing.scale}*11"
     },
-    name: "--ds-spacing-2",
+    name: "--ds-sizing-11",
     attributes: {},
     path: [
-      "spacing",
-      "2"
+      "sizing",
+      "11"
     ]
   },
   {
     $type: "dimension",
-    $value: "0.75rem",
+    $value: "3rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*3"
+      $value: "{sizing.scale}*12"
     },
-    name: "--ds-spacing-3",
+    name: "--ds-sizing-12",
     attributes: {},
     path: [
-      "spacing",
-      "3"
+      "sizing",
+      "12"
     ]
   },
   {
     $type: "dimension",
-    $value: "1rem",
+    $value: "3.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*4"
+      $value: "{sizing.scale}*13"
     },
-    name: "--ds-spacing-4",
+    name: "--ds-sizing-13",
     attributes: {},
     path: [
-      "spacing",
-      "4"
+      "sizing",
+      "13"
     ]
   },
   {
     $type: "dimension",
-    $value: "1.25rem",
+    $value: "3.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*5"
+      $value: "{sizing.scale}*14"
     },
-    name: "--ds-spacing-5",
+    name: "--ds-sizing-14",
     attributes: {},
     path: [
-      "spacing",
-      "5"
+      "sizing",
+      "14"
     ]
   },
   {
     $type: "dimension",
-    $value: "1.5rem",
+    $value: "3.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*6"
+      $value: "{sizing.scale}*15"
     },
-    name: "--ds-spacing-6",
+    name: "--ds-sizing-15",
     attributes: {},
     path: [
-      "spacing",
-      "6"
+      "sizing",
+      "15"
     ]
   },
   {
     $type: "dimension",
-    $value: "1.75rem",
+    $value: "4.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*7"
+      $value: "{sizing.scale}*18"
     },
-    name: "--ds-spacing-7",
+    name: "--ds-sizing-18",
     attributes: {},
     path: [
-      "spacing",
-      "7"
+      "sizing",
+      "18"
     ]
   },
   {
     $type: "dimension",
-    $value: "2rem",
+    $value: "5.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*8"
+      $value: "{sizing.scale}*22"
     },
-    name: "--ds-spacing-8",
+    name: "--ds-sizing-22",
     attributes: {},
     path: [
-      "spacing",
-      "8"
+      "sizing",
+      "22"
     ]
   },
   {
     $type: "dimension",
-    $value: "2.25rem",
+    $value: "6.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*9"
+      $value: "{sizing.scale}*26"
     },
-    name: "--ds-spacing-9",
+    name: "--ds-sizing-26",
     attributes: {},
     path: [
-      "spacing",
-      "9"
+      "sizing",
+      "26"
     ]
   },
   {
     $type: "dimension",
-    $value: "2.5rem",
+    $value: "7.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*10"
+      $value: "{sizing.scale}*30"
+    },
+    name: "--ds-sizing-30",
+    attributes: {},
+    path: [
+      "sizing",
+      "30"
+    ]
+  }
+] 
+
+export const  typography = [
+  {
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "3.75rem",
+      letterSpacing: "-1%"
+    },
+    filePath: "../../design-tokens/semantic/style.json",
+    isSource: false,
+    original: {
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.11}",
+        letterSpacing: "{letter-spacing.1}"
+      }
+    },
+    name: "--ds-heading-2xl",
+    attributes: {},
+    path: [
+      "typography",
+      "heading",
+      "2xl"
+    ]
+  },
+  {
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "3rem",
+      letterSpacing: "-1%"
+    },
+    filePath: "../../design-tokens/semantic/style.json",
+    isSource: false,
+    original: {
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.10}",
+        letterSpacing: "{letter-spacing.1}"
+      }
     },
-    name: "--ds-spacing-10",
+    name: "--ds-heading-xl",
     attributes: {},
     path: [
-      "spacing",
-      "10"
+      "typography",
+      "heading",
+      "xl"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "2.25rem",
+      letterSpacing: "-0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*11"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.9}",
+        letterSpacing: "{letter-spacing.2}"
+      }
     },
-    name: "--ds-spacing-11",
+    name: "--ds-heading-lg",
     attributes: {},
     path: [
-      "spacing",
-      "11"
+      "typography",
+      "heading",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.875rem",
+      letterSpacing: "-0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*12"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.8}",
+        letterSpacing: "{letter-spacing.3}"
+      }
     },
-    name: "--ds-spacing-12",
+    name: "--ds-heading-md",
     attributes: {},
     path: [
-      "spacing",
-      "12"
+      "typography",
+      "heading",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.5rem",
+      letterSpacing: "0%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*13"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.7}",
+        letterSpacing: "{letter-spacing.5}"
+      }
     },
-    name: "--ds-spacing-13",
+    name: "--ds-heading-sm",
     attributes: {},
     path: [
-      "spacing",
-      "13"
+      "typography",
+      "heading",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*14"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-spacing-14",
+    name: "--ds-heading-xs",
     attributes: {},
     path: [
-      "spacing",
-      "14"
+      "typography",
+      "heading",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.125rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*15"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-spacing-15",
+    name: "--ds-heading-2xs",
     attributes: {},
     path: [
-      "spacing",
-      "15"
+      "typography",
+      "heading",
+      "2xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "4.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "1.5rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*18"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.7}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-spacing-18",
+    name: "--ds-body-xl",
     attributes: {},
     path: [
-      "spacing",
-      "18"
+      "typography",
+      "body",
+      "xl"
     ]
   },
   {
-    $type: "dimension",
-    $value: "5.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*22"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-spacing-22",
+    name: "--ds-body-lg",
     attributes: {},
     path: [
-      "spacing",
-      "22"
+      "typography",
+      "body",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "6.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*26"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-spacing-26",
+    name: "--ds-body-md",
     attributes: {},
     path: [
-      "spacing",
-      "26"
+      "typography",
+      "body",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "7.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*30"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-spacing-30",
+    name: "--ds-body-sm",
     attributes: {},
     path: [
-      "spacing",
-      "30"
+      "typography",
+      "body",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "0rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*0"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-0",
+    name: "--ds-body-xs",
     attributes: {},
     path: [
-      "sizing",
-      "0"
+      "typography",
+      "body",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "0.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.5rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*1"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.7}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-1",
+    name: "--ds-body-short-xl",
     attributes: {},
     path: [
-      "sizing",
-      "1"
+      "typography",
+      "body",
+      "short",
+      "xl"
     ]
   },
   {
-    $type: "dimension",
-    $value: "0.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*2"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-2",
+    name: "--ds-body-short-lg",
     attributes: {},
     path: [
-      "sizing",
-      "2"
+      "typography",
+      "body",
+      "short",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "0.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*3"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-3",
+    name: "--ds-body-short-md",
     attributes: {},
     path: [
-      "sizing",
-      "3"
+      "typography",
+      "body",
+      "short",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "1rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*4"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-sizing-4",
+    name: "--ds-body-short-sm",
     attributes: {},
     path: [
-      "sizing",
-      "4"
+      "typography",
+      "body",
+      "short",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "1.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*5"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-5",
+    name: "--ds-body-short-xs",
     attributes: {},
     path: [
-      "sizing",
-      "5"
+      "typography",
+      "body",
+      "short",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "1.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "1.5rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*6"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.7}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-6",
+    name: "--ds-body-long-xl",
     attributes: {},
     path: [
-      "sizing",
-      "6"
+      "typography",
+      "body",
+      "long",
+      "xl"
     ]
   },
   {
-    $type: "dimension",
-    $value: "1.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*7"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-7",
+    name: "--ds-body-long-lg",
     attributes: {},
     path: [
-      "sizing",
-      "7"
+      "typography",
+      "body",
+      "long",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*8"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-8",
+    name: "--ds-body-long-md",
     attributes: {},
     path: [
-      "sizing",
-      "8"
+      "typography",
+      "body",
+      "long",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*9"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-sizing-9",
+    name: "--ds-body-long-sm",
     attributes: {},
     path: [
-      "sizing",
-      "9"
+      "typography",
+      "body",
+      "long",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*10"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-10",
+    name: "--ds-body-long-xs",
     attributes: {},
     path: [
-      "sizing",
-      "10"
+      "typography",
+      "body",
+      "long",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*11"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-11",
+    name: "--ds-label-lg",
     attributes: {},
     path: [
-      "sizing",
-      "11"
+      "typography",
+      "label",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*12"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-12",
+    name: "--ds-label-md",
     attributes: {},
     path: [
-      "sizing",
-      "12"
+      "typography",
+      "label",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*13"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-sizing-13",
+    name: "--ds-label-sm",
     attributes: {},
     path: [
-      "sizing",
-      "13"
+      "typography",
+      "label",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*14"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-14",
+    name: "--ds-label-xs",
     attributes: {},
     path: [
-      "sizing",
-      "14"
+      "typography",
+      "label",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*15"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-15",
+    name: "--ds-error_message-lg",
     attributes: {},
     path: [
-      "sizing",
-      "15"
+      "typography",
+      "error_message",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "4.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*18"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-18",
+    name: "--ds-error_message-md",
     attributes: {},
     path: [
-      "sizing",
-      "18"
+      "typography",
+      "error_message",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "5.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*22"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-sizing-22",
+    name: "--ds-error_message-sm",
     attributes: {},
     path: [
-      "sizing",
-      "22"
+      "typography",
+      "error_message",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "6.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*26"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-26",
+    name: "--ds-error_message-xs",
     attributes: {},
     path: [
-      "sizing",
-      "26"
+      "typography",
+      "error_message",
+      "xs"
     ]
-  },
+  }
+] 
+
+export const  opacity = [
   {
-    $type: "dimension",
-    $value: "7.5rem",
+    $type: "opacity",
+    $value: "30%",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*30"
+      $type: "opacity",
+      $value: "{opacity.30}"
     },
-    name: "--ds-sizing-30",
+    name: "--ds-disabled-opacity",
     attributes: {},
     path: [
-      "sizing",
-      "30"
+      "disabled",
+      "opacity"
     ]
   }
 ] 
diff --git a/apps/storefront/tokens/uutilsynet/light.ts b/apps/storefront/tokens/uutilsynet/light.ts
index d23621ae0c..f052d25c58 100644
--- a/apps/storefront/tokens/uutilsynet/light.ts
+++ b/apps/storefront/tokens/uutilsynet/light.ts
@@ -2334,923 +2334,421 @@ export const  color = [
   }
 ] 
 
-export const  typography = [
+export const  dimension = [
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "3.75rem",
-      letterSpacing: "-1%"
-    },
+    $type: "dimension",
+    $value: "min( 0.25rem , 0.25rem *1)",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.11}",
-        letterSpacing: "{letter-spacing.1}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.1}"
     },
-    name: "--ds-heading-2xl",
+    name: "--ds-border-radius-sm",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "2xl"
+      "border-radius",
+      "sm"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "3rem",
-      letterSpacing: "-1%"
-    },
+    $type: "dimension",
+    $value: "min( 0.25rem , 0.25rem *2)",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.10}",
-        letterSpacing: "{letter-spacing.1}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.2}"
     },
-    name: "--ds-heading-xl",
+    name: "--ds-border-radius-md",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "xl"
+      "border-radius",
+      "md"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "2.25rem",
-      letterSpacing: "-0.5%"
-    },
+    $type: "dimension",
+    $value: "min( 0.25rem , 0.25rem *5)",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.9}",
-        letterSpacing: "{letter-spacing.2}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.3}"
     },
-    name: "--ds-heading-lg",
+    name: "--ds-border-radius-lg",
     attributes: {},
     path: [
-      "typography",
-      "heading",
+      "border-radius",
       "lg"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.875rem",
-      letterSpacing: "-0.25%"
-    },
+    $type: "dimension",
+    $value: "0.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.8}",
-        letterSpacing: "{letter-spacing.3}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.4}"
     },
-    name: "--ds-heading-md",
+    name: "--ds-border-radius-default",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "md"
+      "border-radius",
+      "default"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.5rem",
-      letterSpacing: "0%"
-    },
+    $type: "dimension",
+    $value: "624.9375rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.7}",
-        letterSpacing: "{letter-spacing.5}"
-      }
+      $type: "dimension",
+      $value: "{border-radius.5}"
     },
-    name: "--ds-heading-sm",
+    name: "--ds-border-radius-full",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "sm"
+      "border-radius",
+      "full"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "0rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*0"
     },
-    name: "--ds-heading-xs",
+    name: "--ds-spacing-0",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "xs"
+      "spacing",
+      "0"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.125rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "0.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*1"
     },
-    name: "--ds-heading-2xs",
+    name: "--ds-spacing-1",
     attributes: {},
     path: [
-      "typography",
-      "heading",
-      "2xs"
+      "spacing",
+      "1"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "1.5rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "0.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.7}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*2"
     },
-    name: "--ds-body-xl",
+    name: "--ds-spacing-2",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "xl"
+      "spacing",
+      "2"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "0.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*3"
     },
-    name: "--ds-body-lg",
+    name: "--ds-spacing-3",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "lg"
+      "spacing",
+      "3"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "1rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*4"
     },
-    name: "--ds-body-md",
+    name: "--ds-spacing-4",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "md"
+      "spacing",
+      "4"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
-    },
-    name: "--ds-body-sm",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "sm"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.5",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.md}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
-    },
-    name: "--ds-body-xs",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "xs"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.5rem",
-      letterSpacing: "0.5%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.7}",
-        letterSpacing: "{letter-spacing.8}"
-      }
-    },
-    name: "--ds-body-short-xl",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "short",
-      "xl"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
-    },
-    name: "--ds-body-short-lg",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "short",
-      "lg"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
-    },
-    name: "--ds-body-short-md",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "short",
-      "md"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
-    filePath: "../../design-tokens/semantic/style.json",
-    isSource: false,
-    original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
-    },
-    name: "--ds-body-short-sm",
-    attributes: {},
-    path: [
-      "typography",
-      "body",
-      "short",
-      "sm"
-    ]
-  },
-  {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "1.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*5"
     },
-    name: "--ds-body-short-xs",
+    name: "--ds-spacing-5",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "short",
-      "xs"
+      "spacing",
+      "5"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "1.5rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "1.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.7}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*6"
     },
-    name: "--ds-body-long-xl",
+    name: "--ds-spacing-6",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "xl"
+      "spacing",
+      "6"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "1.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*7"
     },
-    name: "--ds-body-long-lg",
+    name: "--ds-spacing-7",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "lg"
+      "spacing",
+      "7"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "2rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*8"
     },
-    name: "--ds-body-long-md",
+    name: "--ds-spacing-8",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "md"
+      "spacing",
+      "8"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
+    $type: "dimension",
+    $value: "2.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*9"
     },
-    name: "--ds-body-long-sm",
+    name: "--ds-spacing-9",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "sm"
+      "spacing",
+      "9"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.7",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "2.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.lg}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*10"
     },
-    name: "--ds-body-long-xs",
+    name: "--ds-spacing-10",
     attributes: {},
     path: [
-      "typography",
-      "body",
-      "long",
-      "xs"
+      "spacing",
+      "10"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "2.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*11"
     },
-    name: "--ds-label-lg",
+    name: "--ds-spacing-11",
     attributes: {},
     path: [
-      "typography",
-      "label",
-      "lg"
+      "spacing",
+      "11"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "3rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*12"
     },
-    name: "--ds-label-md",
+    name: "--ds-spacing-12",
     attributes: {},
     path: [
-      "typography",
-      "label",
-      "md"
+      "spacing",
+      "12"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
+    $type: "dimension",
+    $value: "3.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*13"
     },
-    name: "--ds-label-sm",
+    name: "--ds-spacing-13",
     attributes: {},
     path: [
-      "typography",
-      "label",
-      "sm"
+      "spacing",
+      "13"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 500,
-      lineHeight: "1.3",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "3.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.medium}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*14"
     },
-    name: "--ds-label-xs",
+    name: "--ds-spacing-14",
     attributes: {},
     path: [
-      "typography",
-      "label",
-      "xs"
+      "spacing",
+      "14"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.3125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "3.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.6}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*15"
     },
-    name: "--ds-error_message-lg",
+    name: "--ds-spacing-15",
     attributes: {},
     path: [
-      "typography",
-      "error_message",
-      "lg"
+      "spacing",
+      "15"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1.125rem",
-      letterSpacing: "0.5%"
-    },
+    $type: "dimension",
+    $value: "4.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.5}",
-        letterSpacing: "{letter-spacing.8}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*18"
     },
-    name: "--ds-error_message-md",
+    name: "--ds-spacing-18",
     attributes: {},
     path: [
-      "typography",
-      "error_message",
-      "md"
+      "spacing",
+      "18"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "1rem",
-      letterSpacing: "0.25%"
-    },
+    $type: "dimension",
+    $value: "5.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.4}",
-        letterSpacing: "{letter-spacing.7}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*22"
     },
-    name: "--ds-error_message-sm",
+    name: "--ds-spacing-22",
     attributes: {},
     path: [
-      "typography",
-      "error_message",
-      "sm"
+      "spacing",
+      "22"
     ]
   },
   {
-    $type: "typography",
-    $value: {
-      fontFamily: "Inter",
-      fontWeight: 400,
-      lineHeight: "1.3",
-      fontSize: "0.875rem",
-      letterSpacing: "0.15%"
-    },
+    $type: "dimension",
+    $value: "6.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "typography",
-      $value: {
-        fontFamily: "{font.family}",
-        fontWeight: "{font-weight.regular}",
-        lineHeight: "{line-height.sm}",
-        fontSize: "{font-size.3}",
-        letterSpacing: "{letter-spacing.6}"
-      }
+      $type: "dimension",
+      $value: "{spacing.scale}*26"
     },
-    name: "--ds-error_message-xs",
+    name: "--ds-spacing-26",
     attributes: {},
     path: [
-      "typography",
-      "error_message",
-      "xs"
+      "spacing",
+      "26"
     ]
-  }
-] 
-
-export const  opacity = [
+  },
   {
-    $type: "opacity",
-    $value: "30%",
+    $type: "dimension",
+    $value: "7.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "opacity",
-      $value: "{opacity.30}"
+      $type: "dimension",
+      $value: "{spacing.scale}*30"
     },
-    name: "--ds-disabled-opacity",
+    name: "--ds-spacing-30",
     attributes: {},
     path: [
-      "disabled",
-      "opacity"
+      "spacing",
+      "30"
     ]
-  }
-] 
-
-export const  dimension = [
+  },
   {
     $type: "dimension",
-    $value: "0.125rem",
+    $value: "0rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*0.5"
+      $value: "{sizing.scale}*0"
     },
-    name: "--ds-border-radius-sm",
+    name: "--ds-sizing-0",
     attributes: {},
     path: [
-      "border-radius",
-      "sm"
+      "sizing",
+      "0"
     ]
   },
   {
@@ -3260,13 +2758,13 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*1"
+      $value: "{sizing.scale}*1"
     },
-    name: "--ds-border-radius-md",
+    name: "--ds-sizing-1",
     attributes: {},
     path: [
-      "border-radius",
-      "md"
+      "sizing",
+      "1"
     ]
   },
   {
@@ -3276,13 +2774,13 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*2"
+      $value: "{sizing.scale}*2"
     },
-    name: "--ds-border-radius-lg",
+    name: "--ds-sizing-2",
     attributes: {},
     path: [
-      "border-radius",
-      "lg"
+      "sizing",
+      "2"
     ]
   },
   {
@@ -3292,13 +2790,13 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*3"
+      $value: "{sizing.scale}*3"
     },
-    name: "--ds-border-radius-xl",
+    name: "--ds-sizing-3",
     attributes: {},
     path: [
-      "border-radius",
-      "xl"
+      "sizing",
+      "3"
     ]
   },
   {
@@ -3308,13 +2806,29 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*4"
+      $value: "{sizing.scale}*4"
     },
-    name: "--ds-border-radius-2xl",
+    name: "--ds-sizing-4",
     attributes: {},
     path: [
-      "border-radius",
-      "2xl"
+      "sizing",
+      "4"
+    ]
+  },
+  {
+    $type: "dimension",
+    $value: "1.25rem",
+    filePath: "../../design-tokens/semantic/style.json",
+    isSource: false,
+    original: {
+      $type: "dimension",
+      $value: "{sizing.scale}*5"
+    },
+    name: "--ds-sizing-5",
+    attributes: {},
+    path: [
+      "sizing",
+      "5"
     ]
   },
   {
@@ -3324,685 +2838,1123 @@ export const  dimension = [
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*6"
+      $value: "{sizing.scale}*6"
     },
-    name: "--ds-border-radius-3xl",
+    name: "--ds-sizing-6",
     attributes: {},
     path: [
-      "border-radius",
-      "3xl"
+      "sizing",
+      "6"
     ]
   },
   {
     $type: "dimension",
-    $value: "2rem",
+    $value: "1.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{border-radius.base}*8"
+      $value: "{sizing.scale}*7"
     },
-    name: "--ds-border-radius-4xl",
+    name: "--ds-sizing-7",
     attributes: {},
     path: [
-      "border-radius",
-      "4xl"
+      "sizing",
+      "7"
     ]
   },
   {
     $type: "dimension",
-    $value: "624.9375rem",
+    $value: "2rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "9999"
+      $value: "{sizing.scale}*8"
     },
-    name: "--ds-border-radius-full",
+    name: "--ds-sizing-8",
     attributes: {},
     path: [
-      "border-radius",
-      "full"
+      "sizing",
+      "8"
     ]
   },
   {
     $type: "dimension",
-    $value: "0rem",
+    $value: "2.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*0"
+      $value: "{sizing.scale}*9"
     },
-    name: "--ds-spacing-0",
+    name: "--ds-sizing-9",
     attributes: {},
     path: [
-      "spacing",
-      "0"
+      "sizing",
+      "9"
     ]
   },
   {
     $type: "dimension",
-    $value: "0.25rem",
+    $value: "2.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*1"
+      $value: "{sizing.scale}*10"
     },
-    name: "--ds-spacing-1",
+    name: "--ds-sizing-10",
     attributes: {},
     path: [
-      "spacing",
-      "1"
+      "sizing",
+      "10"
     ]
   },
   {
     $type: "dimension",
-    $value: "0.5rem",
+    $value: "2.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*2"
+      $value: "{sizing.scale}*11"
     },
-    name: "--ds-spacing-2",
+    name: "--ds-sizing-11",
     attributes: {},
     path: [
-      "spacing",
-      "2"
+      "sizing",
+      "11"
     ]
   },
   {
     $type: "dimension",
-    $value: "0.75rem",
+    $value: "3rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*3"
+      $value: "{sizing.scale}*12"
     },
-    name: "--ds-spacing-3",
+    name: "--ds-sizing-12",
     attributes: {},
     path: [
-      "spacing",
-      "3"
+      "sizing",
+      "12"
     ]
   },
   {
     $type: "dimension",
-    $value: "1rem",
+    $value: "3.25rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*4"
+      $value: "{sizing.scale}*13"
     },
-    name: "--ds-spacing-4",
+    name: "--ds-sizing-13",
     attributes: {},
     path: [
-      "spacing",
-      "4"
+      "sizing",
+      "13"
     ]
   },
   {
     $type: "dimension",
-    $value: "1.25rem",
+    $value: "3.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*5"
+      $value: "{sizing.scale}*14"
     },
-    name: "--ds-spacing-5",
+    name: "--ds-sizing-14",
     attributes: {},
     path: [
-      "spacing",
-      "5"
+      "sizing",
+      "14"
     ]
   },
   {
     $type: "dimension",
-    $value: "1.5rem",
+    $value: "3.75rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*6"
+      $value: "{sizing.scale}*15"
     },
-    name: "--ds-spacing-6",
+    name: "--ds-sizing-15",
     attributes: {},
     path: [
-      "spacing",
-      "6"
+      "sizing",
+      "15"
     ]
   },
   {
     $type: "dimension",
-    $value: "1.75rem",
+    $value: "4.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*7"
+      $value: "{sizing.scale}*18"
     },
-    name: "--ds-spacing-7",
+    name: "--ds-sizing-18",
     attributes: {},
     path: [
-      "spacing",
-      "7"
+      "sizing",
+      "18"
     ]
   },
   {
     $type: "dimension",
-    $value: "2rem",
+    $value: "5.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*8"
+      $value: "{sizing.scale}*22"
     },
-    name: "--ds-spacing-8",
+    name: "--ds-sizing-22",
     attributes: {},
     path: [
-      "spacing",
-      "8"
+      "sizing",
+      "22"
     ]
   },
   {
     $type: "dimension",
-    $value: "2.25rem",
+    $value: "6.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*9"
+      $value: "{sizing.scale}*26"
     },
-    name: "--ds-spacing-9",
+    name: "--ds-sizing-26",
     attributes: {},
     path: [
-      "spacing",
-      "9"
+      "sizing",
+      "26"
     ]
   },
   {
     $type: "dimension",
-    $value: "2.5rem",
+    $value: "7.5rem",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
       $type: "dimension",
-      $value: "{spacing.base}*10"
+      $value: "{sizing.scale}*30"
+    },
+    name: "--ds-sizing-30",
+    attributes: {},
+    path: [
+      "sizing",
+      "30"
+    ]
+  }
+] 
+
+export const  typography = [
+  {
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "3.75rem",
+      letterSpacing: "-1%"
+    },
+    filePath: "../../design-tokens/semantic/style.json",
+    isSource: false,
+    original: {
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.11}",
+        letterSpacing: "{letter-spacing.1}"
+      }
+    },
+    name: "--ds-heading-2xl",
+    attributes: {},
+    path: [
+      "typography",
+      "heading",
+      "2xl"
+    ]
+  },
+  {
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "3rem",
+      letterSpacing: "-1%"
+    },
+    filePath: "../../design-tokens/semantic/style.json",
+    isSource: false,
+    original: {
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.10}",
+        letterSpacing: "{letter-spacing.1}"
+      }
     },
-    name: "--ds-spacing-10",
+    name: "--ds-heading-xl",
     attributes: {},
     path: [
-      "spacing",
-      "10"
+      "typography",
+      "heading",
+      "xl"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "2.25rem",
+      letterSpacing: "-0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*11"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.9}",
+        letterSpacing: "{letter-spacing.2}"
+      }
     },
-    name: "--ds-spacing-11",
+    name: "--ds-heading-lg",
     attributes: {},
     path: [
-      "spacing",
-      "11"
+      "typography",
+      "heading",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.875rem",
+      letterSpacing: "-0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*12"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.8}",
+        letterSpacing: "{letter-spacing.3}"
+      }
     },
-    name: "--ds-spacing-12",
+    name: "--ds-heading-md",
     attributes: {},
     path: [
-      "spacing",
-      "12"
+      "typography",
+      "heading",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.5rem",
+      letterSpacing: "0%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*13"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.7}",
+        letterSpacing: "{letter-spacing.5}"
+      }
     },
-    name: "--ds-spacing-13",
+    name: "--ds-heading-sm",
     attributes: {},
     path: [
-      "spacing",
-      "13"
+      "typography",
+      "heading",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*14"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-spacing-14",
+    name: "--ds-heading-xs",
     attributes: {},
     path: [
-      "spacing",
-      "14"
+      "typography",
+      "heading",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.125rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*15"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-spacing-15",
+    name: "--ds-heading-2xs",
     attributes: {},
     path: [
-      "spacing",
-      "15"
+      "typography",
+      "heading",
+      "2xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "4.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "1.5rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*18"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.7}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-spacing-18",
+    name: "--ds-body-xl",
     attributes: {},
     path: [
-      "spacing",
-      "18"
+      "typography",
+      "body",
+      "xl"
     ]
   },
   {
-    $type: "dimension",
-    $value: "5.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*22"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-spacing-22",
+    name: "--ds-body-lg",
     attributes: {},
     path: [
-      "spacing",
-      "22"
+      "typography",
+      "body",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "6.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*26"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-spacing-26",
+    name: "--ds-body-md",
     attributes: {},
     path: [
-      "spacing",
-      "26"
+      "typography",
+      "body",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "7.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{spacing.base}*30"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-spacing-30",
+    name: "--ds-body-sm",
     attributes: {},
     path: [
-      "spacing",
-      "30"
+      "typography",
+      "body",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "0rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.5",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*0"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.md}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-0",
+    name: "--ds-body-xs",
     attributes: {},
     path: [
-      "sizing",
-      "0"
+      "typography",
+      "body",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "0.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.5rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*1"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.7}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-1",
+    name: "--ds-body-short-xl",
     attributes: {},
     path: [
-      "sizing",
-      "1"
+      "typography",
+      "body",
+      "short",
+      "xl"
     ]
   },
   {
-    $type: "dimension",
-    $value: "0.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*2"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-2",
+    name: "--ds-body-short-lg",
     attributes: {},
     path: [
-      "sizing",
-      "2"
+      "typography",
+      "body",
+      "short",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "0.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*3"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-3",
+    name: "--ds-body-short-md",
     attributes: {},
     path: [
-      "sizing",
-      "3"
+      "typography",
+      "body",
+      "short",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "1rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*4"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-sizing-4",
+    name: "--ds-body-short-sm",
     attributes: {},
     path: [
-      "sizing",
-      "4"
+      "typography",
+      "body",
+      "short",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "1.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*5"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-5",
+    name: "--ds-body-short-xs",
     attributes: {},
     path: [
-      "sizing",
-      "5"
+      "typography",
+      "body",
+      "short",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "1.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "1.5rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*6"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.7}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-6",
+    name: "--ds-body-long-xl",
     attributes: {},
     path: [
-      "sizing",
-      "6"
+      "typography",
+      "body",
+      "long",
+      "xl"
     ]
   },
   {
-    $type: "dimension",
-    $value: "1.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*7"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-7",
+    name: "--ds-body-long-lg",
     attributes: {},
     path: [
-      "sizing",
-      "7"
+      "typography",
+      "body",
+      "long",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*8"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-8",
+    name: "--ds-body-long-md",
     attributes: {},
     path: [
-      "sizing",
-      "8"
+      "typography",
+      "body",
+      "long",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*9"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-sizing-9",
+    name: "--ds-body-long-sm",
     attributes: {},
     path: [
-      "sizing",
-      "9"
+      "typography",
+      "body",
+      "long",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.7",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*10"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.lg}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-10",
+    name: "--ds-body-long-xs",
     attributes: {},
     path: [
-      "sizing",
-      "10"
+      "typography",
+      "body",
+      "long",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "2.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*11"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-11",
+    name: "--ds-label-lg",
     attributes: {},
     path: [
-      "sizing",
-      "11"
+      "typography",
+      "label",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*12"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-12",
+    name: "--ds-label-md",
     attributes: {},
     path: [
-      "sizing",
-      "12"
+      "typography",
+      "label",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.25rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*13"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-sizing-13",
+    name: "--ds-label-sm",
     attributes: {},
     path: [
-      "sizing",
-      "13"
+      "typography",
+      "label",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 500,
+      lineHeight: "1.3",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*14"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.medium}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-14",
+    name: "--ds-label-xs",
     attributes: {},
     path: [
-      "sizing",
-      "14"
+      "typography",
+      "label",
+      "xs"
     ]
   },
   {
-    $type: "dimension",
-    $value: "3.75rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.3125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*15"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.6}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-15",
+    name: "--ds-error_message-lg",
     attributes: {},
     path: [
-      "sizing",
-      "15"
+      "typography",
+      "error_message",
+      "lg"
     ]
   },
   {
-    $type: "dimension",
-    $value: "4.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1.125rem",
+      letterSpacing: "0.5%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*18"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.5}",
+        letterSpacing: "{letter-spacing.8}"
+      }
     },
-    name: "--ds-sizing-18",
+    name: "--ds-error_message-md",
     attributes: {},
     path: [
-      "sizing",
-      "18"
+      "typography",
+      "error_message",
+      "md"
     ]
   },
   {
-    $type: "dimension",
-    $value: "5.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "1rem",
+      letterSpacing: "0.25%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*22"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.4}",
+        letterSpacing: "{letter-spacing.7}"
+      }
     },
-    name: "--ds-sizing-22",
+    name: "--ds-error_message-sm",
     attributes: {},
     path: [
-      "sizing",
-      "22"
+      "typography",
+      "error_message",
+      "sm"
     ]
   },
   {
-    $type: "dimension",
-    $value: "6.5rem",
+    $type: "typography",
+    $value: {
+      fontFamily: "Inter",
+      fontWeight: 400,
+      lineHeight: "1.3",
+      fontSize: "0.875rem",
+      letterSpacing: "0.15%"
+    },
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*26"
+      $type: "typography",
+      $value: {
+        fontFamily: "{font.family}",
+        fontWeight: "{font-weight.regular}",
+        lineHeight: "{line-height.sm}",
+        fontSize: "{font-size.3}",
+        letterSpacing: "{letter-spacing.6}"
+      }
     },
-    name: "--ds-sizing-26",
+    name: "--ds-error_message-xs",
     attributes: {},
     path: [
-      "sizing",
-      "26"
+      "typography",
+      "error_message",
+      "xs"
     ]
-  },
+  }
+] 
+
+export const  opacity = [
   {
-    $type: "dimension",
-    $value: "7.5rem",
+    $type: "opacity",
+    $value: "30%",
     filePath: "../../design-tokens/semantic/style.json",
     isSource: false,
     original: {
-      $type: "dimension",
-      $value: "{sizing.base}*30"
+      $type: "opacity",
+      $value: "{opacity.30}"
     },
-    name: "--ds-sizing-30",
+    name: "--ds-disabled-opacity",
     attributes: {},
     path: [
-      "sizing",
-      "30"
+      "disabled",
+      "opacity"
     ]
   }
 ] 
diff --git a/apps/theme/utils/tokenMapping.ts b/apps/theme/utils/tokenMapping.ts
index 269199e1b9..51c63cf651 100644
--- a/apps/theme/utils/tokenMapping.ts
+++ b/apps/theme/utils/tokenMapping.ts
@@ -87,14 +87,14 @@ export const mapTokens = () => {
   setToken('--ds-color-focus-outer', 'var(--neutral-13)');
   setToken('--ds-color-focus-inner', 'var(--neutral-1)');
 
-  setToken('--ds-border-radius-sm', 'calc(var(--ds-border-radius-base)*0.5)');
-  setToken('--ds-border-radius-md', 'calc(var(--ds-border-radius-base)*1)');
-  setToken('--ds-border-radius-lg', 'calc(var(--ds-border-radius-base)*2)');
-  setToken('--ds-border-radius-xl', 'calc(var(--ds-border-radius-base)*3)');
-  setToken('--ds-border-radius-2xl', 'calc(var(--ds-border-radius-base)*4)');
-  setToken('--ds-border-radius-3xl', 'calc(var(--ds-border-radius-base)*6)');
-  setToken('--ds-border-radius-4xl', 'calc(var(--ds-border-radius-base)*8)');
-  setToken('--ds-border-radius-full', '624.9375rem');
+  // setToken('--ds-border-radius-sm', 'calc(var(--ds-border-radius-base)*0.5)');
+  // setToken('--ds-border-radius-md', 'calc(var(--ds-border-radius-base)*1)');
+  // setToken('--ds-border-radius-lg', 'calc(var(--ds-border-radius-base)*2)');
+  // setToken('--ds-border-radius-xl', 'calc(var(--ds-border-radius-base)*3)');
+  // setToken('--ds-border-radius-2xl', 'calc(var(--ds-border-radius-base)*4)');
+  // setToken('--ds-border-radius-3xl', 'calc(var(--ds-border-radius-base)*6)');
+  // setToken('--ds-border-radius-4xl', 'calc(var(--ds-border-radius-base)*8)');
+  // setToken('--ds-border-radius-full', '624.9375rem');
 };
 
 const setToken = (token: string, color: string) => {
diff --git a/design-tokens/$themes.json b/design-tokens/$themes.json
index 53036f6d82..4fe48950b7 100644
--- a/design-tokens/$themes.json
+++ b/design-tokens/$themes.json
@@ -1013,7 +1013,14 @@
       "font.family": "32f399ee0e608727f1c4d02e8ceb892a6c3e79e0",
       "font-weight.medium": "d48aac48a9fecf0dbe2e5c7b68427961007eac36",
       "font-weight.semibold": "d684180ad99ad0b200080b18529a25476554343f",
-      "font-weight.regular": "82250a86efe7517071ff39e79b2579c5b57a6083"
+      "font-weight.regular": "82250a86efe7517071ff39e79b2579c5b57a6083",
+      "border-radius.1": "b43afe7398c480ec8ae8f957b17487dda2d41ed9",
+      "border-radius.2": "5d515a95e8fa8d99b5ac73247f7d3bcbbf1a4ceb",
+      "border-radius.3": "ec2b713c77398e3aea7a9233ad200b1459c09407",
+      "border-radius.4": "68f3dd7cbc18bacd8a7ce0b31fdd006d20606380",
+      "border-radius.5": "797ca330f3d8a6d814f9ce3d4353945e032ac3ea",
+      "border-radius.base": "4e59f07de035b99ea39b8f3be0b656830da074b3",
+      "border-radius.scale": "4f53ee9f64ca05d424205b92856db20508a2070a"
     },
     "group": "Theme"
   },
@@ -1105,7 +1112,14 @@
       "font.family": "32f399ee0e608727f1c4d02e8ceb892a6c3e79e0",
       "font-weight.medium": "d48aac48a9fecf0dbe2e5c7b68427961007eac36",
       "font-weight.semibold": "d684180ad99ad0b200080b18529a25476554343f",
-      "font-weight.regular": "82250a86efe7517071ff39e79b2579c5b57a6083"
+      "font-weight.regular": "82250a86efe7517071ff39e79b2579c5b57a6083",
+      "border-radius.1": "b43afe7398c480ec8ae8f957b17487dda2d41ed9",
+      "border-radius.2": "5d515a95e8fa8d99b5ac73247f7d3bcbbf1a4ceb",
+      "border-radius.3": "ec2b713c77398e3aea7a9233ad200b1459c09407",
+      "border-radius.4": "68f3dd7cbc18bacd8a7ce0b31fdd006d20606380",
+      "border-radius.5": "797ca330f3d8a6d814f9ce3d4353945e032ac3ea",
+      "border-radius.base": "4e59f07de035b99ea39b8f3be0b656830da074b3",
+      "border-radius.scale": "4f53ee9f64ca05d424205b92856db20508a2070a"
     },
     "group": "Theme"
   },
@@ -1197,7 +1211,14 @@
       "font.family": "32f399ee0e608727f1c4d02e8ceb892a6c3e79e0",
       "font-weight.medium": "d48aac48a9fecf0dbe2e5c7b68427961007eac36",
       "font-weight.semibold": "d684180ad99ad0b200080b18529a25476554343f",
-      "font-weight.regular": "82250a86efe7517071ff39e79b2579c5b57a6083"
+      "font-weight.regular": "82250a86efe7517071ff39e79b2579c5b57a6083",
+      "border-radius.1": "b43afe7398c480ec8ae8f957b17487dda2d41ed9",
+      "border-radius.2": "5d515a95e8fa8d99b5ac73247f7d3bcbbf1a4ceb",
+      "border-radius.3": "ec2b713c77398e3aea7a9233ad200b1459c09407",
+      "border-radius.4": "68f3dd7cbc18bacd8a7ce0b31fdd006d20606380",
+      "border-radius.5": "797ca330f3d8a6d814f9ce3d4353945e032ac3ea",
+      "border-radius.base": "4e59f07de035b99ea39b8f3be0b656830da074b3",
+      "border-radius.scale": "4f53ee9f64ca05d424205b92856db20508a2070a"
     },
     "group": "Theme"
   },
@@ -1628,7 +1649,14 @@
       "font.family": "32f399ee0e608727f1c4d02e8ceb892a6c3e79e0",
       "font-weight.medium": "d48aac48a9fecf0dbe2e5c7b68427961007eac36",
       "font-weight.semibold": "d684180ad99ad0b200080b18529a25476554343f",
-      "font-weight.regular": "82250a86efe7517071ff39e79b2579c5b57a6083"
+      "font-weight.regular": "82250a86efe7517071ff39e79b2579c5b57a6083",
+      "border-radius.1": "b43afe7398c480ec8ae8f957b17487dda2d41ed9",
+      "border-radius.2": "5d515a95e8fa8d99b5ac73247f7d3bcbbf1a4ceb",
+      "border-radius.3": "ec2b713c77398e3aea7a9233ad200b1459c09407",
+      "border-radius.4": "68f3dd7cbc18bacd8a7ce0b31fdd006d20606380",
+      "border-radius.5": "797ca330f3d8a6d814f9ce3d4353945e032ac3ea",
+      "border-radius.base": "4e59f07de035b99ea39b8f3be0b656830da074b3",
+      "border-radius.scale": "4f53ee9f64ca05d424205b92856db20508a2070a"
     },
     "group": "Theme"
   },
@@ -1667,9 +1695,9 @@
       "typography.body.long.md": "S:6c1e607695a6580e03cbfafc19d1ccd0cf101975,",
       "typography.body.long.sm": "S:130b4703250b813d4caa3a80cf6c99298e9751fe,",
       "typography.body.long.xs": "S:11866ebed76712786f3d96b29a24f4a582bc85d0,",
-      "typography.body.xl": "S:161a8794f593b060bac9935e6b12aa74d83913aa,",
-      "typography.body.short.xl": "S:885e2c60a1e3a29094de4ded3ce89f6f5bb6badc,",
-      "typography.body.long.xl": "S:b6c948bbe35be5d2ca269515dfcffc08f4deec1a,",
+      "typography.body.xl": "S:1a95070f47e0fba591efbefe237e2ba65410008c,",
+      "typography.body.short.xl": "S:ac182b4d24bf241219aa8846020a9d2941074aa1,",
+      "typography.body.long.xl": "S:a8ea778d52402dfe5ee1cabd6ae616d886e9ee2c,",
       "shadow.xs": "S:15d2411391bc522973094bb8ef03ae9c97284a6d,",
       "shadow.sm": "S:a0f04eea29a42b7a02f2d9cdc74370cee6938577,",
       "shadow.md": "S:264c137ed468ebafe3317250f31a9615eea0ee19,",
@@ -1825,10 +1853,7 @@
       "border-radius.sm": "7b2af5d22e01253d20184bf5c3f872a18d41a315",
       "border-radius.md": "76f37e1c3307e179fa0144249c3b801d1c23e748",
       "border-radius.lg": "ac79c81ad8072fd4377a13a6e856d494c693fcf3",
-      "border-radius.xl": "7b61c03456ebcf335bed7486c7897986b688765b",
-      "border-radius.2xl": "2cbdcf5e08c9a5d1e2755d0999b76825e39331a9",
-      "border-radius.3xl": "49868c68c4a133bd40d0860c0951b0a279dc0785",
-      "border-radius.4xl": "02b3a1d2f7da8148195447afade3707876c8be19",
+      "border-radius.default": "7b61c03456ebcf335bed7486c7897986b688765b",
       "border-radius.full": "402d1c89e9770719d5da3e2379344604f3021569",
       "spacing.0": "fc789f9fa08a555a4338d53405faa463dfa51689",
       "spacing.1": "f81609d4dc6bf19d758713001ca33e4e21acbd7a",
diff --git a/design-tokens/primitives/globals.json b/design-tokens/primitives/globals.json
index 4c0f4347fc..f69e791db2 100644
--- a/design-tokens/primitives/globals.json
+++ b/design-tokens/primitives/globals.json
@@ -134,12 +134,6 @@
       ]
     }
   },
-  "border-radius": {
-    "base": {
-      "$type": "borderRadius",
-      "$value": "4"
-    }
-  },
   "opacity": {
     "30": {
       "$type": "opacity",
@@ -147,13 +141,13 @@
     }
   },
   "sizing": {
-    "base": {
+    "scale": {
       "$type": "sizing",
       "$value": "4"
     }
   },
   "spacing": {
-    "base": {
+    "scale": {
       "$type": "spacing",
       "$value": "4"
     }
diff --git a/design-tokens/semantic/style.json b/design-tokens/semantic/style.json
index c613eab546..9e423c41da 100644
--- a/design-tokens/semantic/style.json
+++ b/design-tokens/semantic/style.json
@@ -322,199 +322,187 @@
   "border-radius": {
     "sm": {
       "$type": "borderRadius",
-      "$value": "{border-radius.base}*0.5"
+      "$value": "{border-radius.1}"
     },
     "md": {
       "$type": "borderRadius",
-      "$value": "{border-radius.base}*1"
+      "$value": "{border-radius.2}"
     },
     "lg": {
       "$type": "borderRadius",
-      "$value": "{border-radius.base}*2"
+      "$value": "{border-radius.3}"
     },
-    "xl": {
-      "$type": "borderRadius",
-      "$value": "{border-radius.base}*3"
-    },
-    "2xl": {
-      "$type": "borderRadius",
-      "$value": "{border-radius.base}*4"
-    },
-    "3xl": {
-      "$type": "borderRadius",
-      "$value": "{border-radius.base}*6"
-    },
-    "4xl": {
+    "default": {
       "$type": "borderRadius",
-      "$value": "{border-radius.base}*8"
+      "$value": "{border-radius.4}"
     },
     "full": {
       "$type": "borderRadius",
-      "$value": "9999"
+      "$value": "{border-radius.5}"
     }
   },
   "spacing": {
     "0": {
       "$type": "spacing",
-      "$value": "{spacing.base}*0"
+      "$value": "{spacing.scale}*0"
     },
     "1": {
       "$type": "spacing",
-      "$value": "{spacing.base}*1"
+      "$value": "{spacing.scale}*1"
     },
     "2": {
       "$type": "spacing",
-      "$value": "{spacing.base}*2"
+      "$value": "{spacing.scale}*2"
     },
     "3": {
       "$type": "spacing",
-      "$value": "{spacing.base}*3"
+      "$value": "{spacing.scale}*3"
     },
     "4": {
       "$type": "spacing",
-      "$value": "{spacing.base}*4"
+      "$value": "{spacing.scale}*4"
     },
     "5": {
       "$type": "spacing",
-      "$value": "{spacing.base}*5"
+      "$value": "{spacing.scale}*5"
     },
     "6": {
       "$type": "spacing",
-      "$value": "{spacing.base}*6"
+      "$value": "{spacing.scale}*6"
     },
     "7": {
       "$type": "spacing",
-      "$value": "{spacing.base}*7"
+      "$value": "{spacing.scale}*7"
     },
     "8": {
       "$type": "spacing",
-      "$value": "{spacing.base}*8"
+      "$value": "{spacing.scale}*8"
     },
     "9": {
       "$type": "spacing",
-      "$value": "{spacing.base}*9"
+      "$value": "{spacing.scale}*9"
     },
     "10": {
       "$type": "spacing",
-      "$value": "{spacing.base}*10"
+      "$value": "{spacing.scale}*10"
     },
     "11": {
       "$type": "spacing",
-      "$value": "{spacing.base}*11"
+      "$value": "{spacing.scale}*11"
     },
     "12": {
       "$type": "spacing",
-      "$value": "{spacing.base}*12"
+      "$value": "{spacing.scale}*12"
     },
     "13": {
       "$type": "spacing",
-      "$value": "{spacing.base}*13"
+      "$value": "{spacing.scale}*13"
     },
     "14": {
       "$type": "spacing",
-      "$value": "{spacing.base}*14"
+      "$value": "{spacing.scale}*14"
     },
     "15": {
       "$type": "spacing",
-      "$value": "{spacing.base}*15"
+      "$value": "{spacing.scale}*15"
     },
     "18": {
       "$type": "spacing",
-      "$value": "{spacing.base}*18"
+      "$value": "{spacing.scale}*18"
     },
     "22": {
       "$type": "spacing",
-      "$value": "{spacing.base}*22"
+      "$value": "{spacing.scale}*22"
     },
     "26": {
       "$type": "spacing",
-      "$value": "{spacing.base}*26"
+      "$value": "{spacing.scale}*26"
     },
     "30": {
       "$type": "spacing",
-      "$value": "{spacing.base}*30"
+      "$value": "{spacing.scale}*30"
     }
   },
   "sizing": {
     "0": {
       "$type": "sizing",
-      "$value": "{sizing.base}*0"
+      "$value": "{sizing.scale}*0"
     },
     "1": {
       "$type": "sizing",
-      "$value": "{sizing.base}*1"
+      "$value": "{sizing.scale}*1"
     },
     "2": {
       "$type": "sizing",
-      "$value": "{sizing.base}*2"
+      "$value": "{sizing.scale}*2"
     },
     "3": {
       "$type": "sizing",
-      "$value": "{sizing.base}*3"
+      "$value": "{sizing.scale}*3"
     },
     "4": {
       "$type": "sizing",
-      "$value": "{sizing.base}*4"
+      "$value": "{sizing.scale}*4"
     },
     "5": {
       "$type": "sizing",
-      "$value": "{sizing.base}*5"
+      "$value": "{sizing.scale}*5"
     },
     "6": {
       "$type": "sizing",
-      "$value": "{sizing.base}*6"
+      "$value": "{sizing.scale}*6"
     },
     "7": {
       "$type": "sizing",
-      "$value": "{sizing.base}*7"
+      "$value": "{sizing.scale}*7"
     },
     "8": {
       "$type": "sizing",
-      "$value": "{sizing.base}*8"
+      "$value": "{sizing.scale}*8"
     },
     "9": {
       "$type": "sizing",
-      "$value": "{sizing.base}*9"
+      "$value": "{sizing.scale}*9"
     },
     "10": {
       "$type": "sizing",
-      "$value": "{sizing.base}*10"
+      "$value": "{sizing.scale}*10"
     },
     "11": {
       "$type": "sizing",
-      "$value": "{sizing.base}*11"
+      "$value": "{sizing.scale}*11"
     },
     "12": {
       "$type": "sizing",
-      "$value": "{sizing.base}*12"
+      "$value": "{sizing.scale}*12"
     },
     "13": {
       "$type": "sizing",
-      "$value": "{sizing.base}*13"
+      "$value": "{sizing.scale}*13"
     },
     "14": {
       "$type": "sizing",
-      "$value": "{sizing.base}*14"
+      "$value": "{sizing.scale}*14"
     },
     "15": {
       "$type": "sizing",
-      "$value": "{sizing.base}*15"
+      "$value": "{sizing.scale}*15"
     },
     "18": {
       "$type": "sizing",
-      "$value": "{sizing.base}*18"
+      "$value": "{sizing.scale}*18"
     },
     "22": {
       "$type": "sizing",
-      "$value": "{sizing.base}*22"
+      "$value": "{sizing.scale}*22"
     },
     "26": {
       "$type": "sizing",
-      "$value": "{sizing.base}*26"
+      "$value": "{sizing.scale}*26"
     },
     "30": {
       "$type": "sizing",
-      "$value": "{sizing.base}*30"
+      "$value": "{sizing.scale}*30"
     }
   },
   "border-width": {
diff --git a/design-tokens/themes/theme.json b/design-tokens/themes/theme.json
index 0bb526a0f7..6da6cad3a8 100644
--- a/design-tokens/themes/theme.json
+++ b/design-tokens/themes/theme.json
@@ -330,5 +330,35 @@
       "$type": "fontWeights",
       "$value": "{theme.regular}"
     }
+  },
+  "border-radius": {
+    "1": {
+      "$type": "borderRadius",
+      "$value": "min( {border-radius.base} , {border-radius.scale} *1)"
+    },
+    "2": {
+      "$type": "borderRadius",
+      "$value": "min( {border-radius.base} , {border-radius.scale} *2)"
+    },
+    "3": {
+      "$type": "borderRadius",
+      "$value": "min( {border-radius.base} , {border-radius.scale} *5)"
+    },
+    "4": {
+      "$type": "borderRadius",
+      "$value": "{border-radius.base}"
+    },
+    "5": {
+      "$type": "borderRadius",
+      "$value": "9999"
+    },
+    "base": {
+      "$type": "borderRadius",
+      "$value": "4"
+    },
+    "scale": {
+      "$type": "borderRadius",
+      "$value": "4"
+    }
   }
 }
\ No newline at end of file
diff --git a/design-tokens/themes/theme2.json b/design-tokens/themes/theme2.json
index 2bf977be95..3bea0b107e 100644
--- a/design-tokens/themes/theme2.json
+++ b/design-tokens/themes/theme2.json
@@ -330,5 +330,35 @@
       "$type": "fontWeights",
       "$value": "{theme2.regular}"
     }
+  },
+  "border-radius": {
+    "1": {
+      "$type": "borderRadius",
+      "$value": "min( {border-radius.base} , {border-radius.scale} *1)"
+    },
+    "2": {
+      "$type": "borderRadius",
+      "$value": "min( {border-radius.base} , {border-radius.scale} *2)"
+    },
+    "3": {
+      "$type": "borderRadius",
+      "$value": "min( {border-radius.base} , {border-radius.scale} *5)"
+    },
+    "4": {
+      "$type": "borderRadius",
+      "$value": "{border-radius.base}"
+    },
+    "5": {
+      "$type": "borderRadius",
+      "$value": "9999"
+    },
+    "base": {
+      "$type": "borderRadius",
+      "$value": "4"
+    },
+    "scale": {
+      "$type": "borderRadius",
+      "$value": "4"
+    }
   }
 }
\ No newline at end of file
diff --git a/design-tokens/themes/theme3.json b/design-tokens/themes/theme3.json
index 547bd196f8..9e5ec2c2aa 100644
--- a/design-tokens/themes/theme3.json
+++ b/design-tokens/themes/theme3.json
@@ -330,5 +330,35 @@
       "$type": "fontWeights",
       "$value": "{theme3.regular}"
     }
+  },
+  "border-radius": {
+    "1": {
+      "$type": "borderRadius",
+      "$value": "min( {border-radius.base} , {border-radius.scale} *1)"
+    },
+    "2": {
+      "$type": "borderRadius",
+      "$value": "min( {border-radius.base} , {border-radius.scale} *2)"
+    },
+    "3": {
+      "$type": "borderRadius",
+      "$value": "min( {border-radius.base} , {border-radius.scale} *5)"
+    },
+    "4": {
+      "$type": "borderRadius",
+      "$value": "{border-radius.base}"
+    },
+    "5": {
+      "$type": "borderRadius",
+      "$value": "9999"
+    },
+    "base": {
+      "$type": "borderRadius",
+      "$value": "4"
+    },
+    "scale": {
+      "$type": "borderRadius",
+      "$value": "4"
+    }
   }
 }
\ No newline at end of file
diff --git a/design-tokens/themes/theme4.json b/design-tokens/themes/theme4.json
index a5042e7f69..c82b0ceefc 100644
--- a/design-tokens/themes/theme4.json
+++ b/design-tokens/themes/theme4.json
@@ -330,5 +330,35 @@
       "$type": "fontWeights",
       "$value": "{theme4.regular}"
     }
+  },
+  "border-radius": {
+    "1": {
+      "$type": "borderRadius",
+      "$value": "min( {border-radius.base} , {border-radius.scale} *1)"
+    },
+    "2": {
+      "$type": "borderRadius",
+      "$value": "min( {border-radius.base} , {border-radius.scale} *2)"
+    },
+    "3": {
+      "$type": "borderRadius",
+      "$value": "min( {border-radius.base} , {border-radius.scale} *5)"
+    },
+    "4": {
+      "$type": "borderRadius",
+      "$value": "{border-radius.base}"
+    },
+    "5": {
+      "$type": "borderRadius",
+      "$value": "9999"
+    },
+    "base": {
+      "$type": "borderRadius",
+      "$value": "4"
+    },
+    "scale": {
+      "$type": "borderRadius",
+      "$value": "4"
+    }
   }
 }
\ No newline at end of file
diff --git a/packages/cli/src/migrations/beta-to-v1.ts b/packages/cli/src/migrations/beta-to-v1.ts
index e8c240c2a1..e027754c4a 100644
--- a/packages/cli/src/migrations/beta-to-v1.ts
+++ b/packages/cli/src/migrations/beta-to-v1.ts
@@ -223,10 +223,10 @@ export default (glob?: string) =>
         '--fds-border_radius-small': '--ds-border-radius-sm',
         '--fds-border_radius-medium': '--ds-border-radius-md',
         '--fds-border_radius-large': '--ds-border-radius-lg',
-        '--fds-border_radius-xlarge': '--ds-border-radius-xl',
-        '--fds-border_radius-xxlarge': '--ds-border-radius-2xl',
-        '--fds-border_radius-xxxlarge': '--ds-border-radius-3xl',
-        '--fds-border_radius-xxxxlarge': '--ds-border-radius-4xl',
+        '--fds-border_radius-xlarge': '--ds-border-radius-lg',
+        '--fds-border_radius-xxlarge': '--ds-border-radius-lg',
+        '--fds-border_radius-xxxlarge': '--ds-border-radius-lg',
+        '--fds-border_radius-xxxxlarge': '--ds-border-radius-lg',
         '--fds-border_radius-full': '--ds-border-radius-full',
         '--fds-base_spacing': '[delete]',
         '--fds-base_sizing': '[delete]',
diff --git a/packages/cli/src/tokens/build/configs.ts b/packages/cli/src/tokens/build/configs.ts
index 2b10177672..9ab6c28382 100644
--- a/packages/cli/src/tokens/build/configs.ts
+++ b/packages/cli/src/tokens/build/configs.ts
@@ -7,7 +7,7 @@ import { outputReferencesFilter } from 'style-dictionary/utils';
 
 import * as formats from './formats/css.js';
 import { jsTokens } from './formats/js-tokens.js';
-import { nameKebab, sizeRem, typographyName } from './transformers.js';
+import { nameKebab, resolveMath, sizeRem, typographyName } from './transformers.js';
 import { permutateThemes as permutateThemes_ } from './utils/permutateThemes.js';
 import type { PermutatedThemes } from './utils/permutateThemes.js';
 import { pathStartsWithOneOf, typeEquals } from './utils/utils.js';
@@ -26,6 +26,7 @@ const fileHeader = () => [`These files are generated from design tokens defind u
 StyleDictionary.registerTransform(sizeRem);
 StyleDictionary.registerTransform(nameKebab);
 StyleDictionary.registerTransform(typographyName);
+StyleDictionary.registerTransform(resolveMath);
 
 StyleDictionary.registerFormat(jsTokens);
 StyleDictionary.registerFormat(formats.colormode);
@@ -34,7 +35,7 @@ StyleDictionary.registerFormat(formats.typography);
 
 const dsTransformers = [
   nameKebab.name,
-  `ts/resolveMath`,
+  resolveMath.name,
   'ts/size/px',
   sizeRem.name,
   'ts/typography/fontWeight',
@@ -123,7 +124,7 @@ export const semanticVariables: GetConfig = ({ outPath, theme }) => {
    * @example  --ds-spacing-1: var(--ds-spacing-base)*1; ->  --ds-spacing-0: calc(var(--ds-spacing-base)*1);
    */
   const isCalculatedToken: IsCalculatedToken = (token: TransformedToken) =>
-    pathStartsWithOneOf(['spacing', 'sizing', 'border-radius'], token);
+    pathStartsWithOneOf(['spacing', 'sizing'], token);
 
   return {
     usesDtcg,
@@ -152,7 +153,10 @@ export const semanticVariables: GetConfig = ({ outPath, theme }) => {
         ],
         options: {
           fileHeader,
-          outputReferences: (token, options) => isCalculatedToken(token) && outputReferencesFilter(token, options),
+          outputReferences: (token, options) => {
+            const include = pathStartsWithOneOf(['border-radius'], token);
+            return (include || isCalculatedToken(token)) && outputReferencesFilter(token, options);
+          },
         },
       },
     },
diff --git a/packages/cli/src/tokens/build/formats/css.ts b/packages/cli/src/tokens/build/formats/css.ts
index 9a269a7184..df1d531487 100644
--- a/packages/cli/src/tokens/build/formats/css.ts
+++ b/packages/cli/src/tokens/build/formats/css.ts
@@ -72,6 +72,7 @@ export const semantic: Format = {
         if ((isCalculatedToken as IsCalculatedToken)?.(token, options)) {
           return calculatedVariable(format(token));
         }
+        return format(token);
       }
 
       return format(token);
diff --git a/packages/cli/src/tokens/build/transformers.ts b/packages/cli/src/tokens/build/transformers.ts
index ab5f8844c7..60a77a3960 100644
--- a/packages/cli/src/tokens/build/transformers.ts
+++ b/packages/cli/src/tokens/build/transformers.ts
@@ -1,3 +1,4 @@
+import { checkAndEvaluateMath } from '@tokens-studio/sd-transforms';
 import * as R from 'ramda';
 import type { Transform } from 'style-dictionary/types';
 
@@ -54,3 +55,16 @@ export const typographyName: Transform = {
     return token.name.replace('-typography', '');
   },
 };
+
+export const resolveMath: Transform = {
+  name: 'ds/resolveMath',
+  type: 'value',
+  transitive: true,
+  filter: (token) => {
+    const isValidValue = ['string', 'object'].includes(typeof (token.$value ?? token.value));
+    const isTokenOfInterest = !pathStartsWithOneOf(['border-radius'], token);
+
+    return isValidValue && isTokenOfInterest;
+  },
+  transform: (token, platformCfg) => checkAndEvaluateMath(token, platformCfg.mathFractionDigits),
+};
diff --git a/packages/cli/src/tokens/design-tokens/default/primitives/globals.json b/packages/cli/src/tokens/design-tokens/default/primitives/globals.json
index 4c0f4347fc..f69e791db2 100644
--- a/packages/cli/src/tokens/design-tokens/default/primitives/globals.json
+++ b/packages/cli/src/tokens/design-tokens/default/primitives/globals.json
@@ -134,12 +134,6 @@
       ]
     }
   },
-  "border-radius": {
-    "base": {
-      "$type": "borderRadius",
-      "$value": "4"
-    }
-  },
   "opacity": {
     "30": {
       "$type": "opacity",
@@ -147,13 +141,13 @@
     }
   },
   "sizing": {
-    "base": {
+    "scale": {
       "$type": "sizing",
       "$value": "4"
     }
   },
   "spacing": {
-    "base": {
+    "scale": {
       "$type": "spacing",
       "$value": "4"
     }
diff --git a/packages/cli/src/tokens/design-tokens/default/semantic/style.json b/packages/cli/src/tokens/design-tokens/default/semantic/style.json
index c613eab546..9e423c41da 100644
--- a/packages/cli/src/tokens/design-tokens/default/semantic/style.json
+++ b/packages/cli/src/tokens/design-tokens/default/semantic/style.json
@@ -322,199 +322,187 @@
   "border-radius": {
     "sm": {
       "$type": "borderRadius",
-      "$value": "{border-radius.base}*0.5"
+      "$value": "{border-radius.1}"
     },
     "md": {
       "$type": "borderRadius",
-      "$value": "{border-radius.base}*1"
+      "$value": "{border-radius.2}"
     },
     "lg": {
       "$type": "borderRadius",
-      "$value": "{border-radius.base}*2"
+      "$value": "{border-radius.3}"
     },
-    "xl": {
-      "$type": "borderRadius",
-      "$value": "{border-radius.base}*3"
-    },
-    "2xl": {
-      "$type": "borderRadius",
-      "$value": "{border-radius.base}*4"
-    },
-    "3xl": {
-      "$type": "borderRadius",
-      "$value": "{border-radius.base}*6"
-    },
-    "4xl": {
+    "default": {
       "$type": "borderRadius",
-      "$value": "{border-radius.base}*8"
+      "$value": "{border-radius.4}"
     },
     "full": {
       "$type": "borderRadius",
-      "$value": "9999"
+      "$value": "{border-radius.5}"
     }
   },
   "spacing": {
     "0": {
       "$type": "spacing",
-      "$value": "{spacing.base}*0"
+      "$value": "{spacing.scale}*0"
     },
     "1": {
       "$type": "spacing",
-      "$value": "{spacing.base}*1"
+      "$value": "{spacing.scale}*1"
     },
     "2": {
       "$type": "spacing",
-      "$value": "{spacing.base}*2"
+      "$value": "{spacing.scale}*2"
     },
     "3": {
       "$type": "spacing",
-      "$value": "{spacing.base}*3"
+      "$value": "{spacing.scale}*3"
     },
     "4": {
       "$type": "spacing",
-      "$value": "{spacing.base}*4"
+      "$value": "{spacing.scale}*4"
     },
     "5": {
       "$type": "spacing",
-      "$value": "{spacing.base}*5"
+      "$value": "{spacing.scale}*5"
     },
     "6": {
       "$type": "spacing",
-      "$value": "{spacing.base}*6"
+      "$value": "{spacing.scale}*6"
     },
     "7": {
       "$type": "spacing",
-      "$value": "{spacing.base}*7"
+      "$value": "{spacing.scale}*7"
     },
     "8": {
       "$type": "spacing",
-      "$value": "{spacing.base}*8"
+      "$value": "{spacing.scale}*8"
     },
     "9": {
       "$type": "spacing",
-      "$value": "{spacing.base}*9"
+      "$value": "{spacing.scale}*9"
     },
     "10": {
       "$type": "spacing",
-      "$value": "{spacing.base}*10"
+      "$value": "{spacing.scale}*10"
     },
     "11": {
       "$type": "spacing",
-      "$value": "{spacing.base}*11"
+      "$value": "{spacing.scale}*11"
     },
     "12": {
       "$type": "spacing",
-      "$value": "{spacing.base}*12"
+      "$value": "{spacing.scale}*12"
     },
     "13": {
       "$type": "spacing",
-      "$value": "{spacing.base}*13"
+      "$value": "{spacing.scale}*13"
     },
     "14": {
       "$type": "spacing",
-      "$value": "{spacing.base}*14"
+      "$value": "{spacing.scale}*14"
     },
     "15": {
       "$type": "spacing",
-      "$value": "{spacing.base}*15"
+      "$value": "{spacing.scale}*15"
     },
     "18": {
       "$type": "spacing",
-      "$value": "{spacing.base}*18"
+      "$value": "{spacing.scale}*18"
     },
     "22": {
       "$type": "spacing",
-      "$value": "{spacing.base}*22"
+      "$value": "{spacing.scale}*22"
     },
     "26": {
       "$type": "spacing",
-      "$value": "{spacing.base}*26"
+      "$value": "{spacing.scale}*26"
     },
     "30": {
       "$type": "spacing",
-      "$value": "{spacing.base}*30"
+      "$value": "{spacing.scale}*30"
     }
   },
   "sizing": {
     "0": {
       "$type": "sizing",
-      "$value": "{sizing.base}*0"
+      "$value": "{sizing.scale}*0"
     },
     "1": {
       "$type": "sizing",
-      "$value": "{sizing.base}*1"
+      "$value": "{sizing.scale}*1"
     },
     "2": {
       "$type": "sizing",
-      "$value": "{sizing.base}*2"
+      "$value": "{sizing.scale}*2"
     },
     "3": {
       "$type": "sizing",
-      "$value": "{sizing.base}*3"
+      "$value": "{sizing.scale}*3"
     },
     "4": {
       "$type": "sizing",
-      "$value": "{sizing.base}*4"
+      "$value": "{sizing.scale}*4"
     },
     "5": {
       "$type": "sizing",
-      "$value": "{sizing.base}*5"
+      "$value": "{sizing.scale}*5"
     },
     "6": {
       "$type": "sizing",
-      "$value": "{sizing.base}*6"
+      "$value": "{sizing.scale}*6"
     },
     "7": {
       "$type": "sizing",
-      "$value": "{sizing.base}*7"
+      "$value": "{sizing.scale}*7"
     },
     "8": {
       "$type": "sizing",
-      "$value": "{sizing.base}*8"
+      "$value": "{sizing.scale}*8"
     },
     "9": {
       "$type": "sizing",
-      "$value": "{sizing.base}*9"
+      "$value": "{sizing.scale}*9"
     },
     "10": {
       "$type": "sizing",
-      "$value": "{sizing.base}*10"
+      "$value": "{sizing.scale}*10"
     },
     "11": {
       "$type": "sizing",
-      "$value": "{sizing.base}*11"
+      "$value": "{sizing.scale}*11"
     },
     "12": {
       "$type": "sizing",
-      "$value": "{sizing.base}*12"
+      "$value": "{sizing.scale}*12"
     },
     "13": {
       "$type": "sizing",
-      "$value": "{sizing.base}*13"
+      "$value": "{sizing.scale}*13"
     },
     "14": {
       "$type": "sizing",
-      "$value": "{sizing.base}*14"
+      "$value": "{sizing.scale}*14"
     },
     "15": {
       "$type": "sizing",
-      "$value": "{sizing.base}*15"
+      "$value": "{sizing.scale}*15"
     },
     "18": {
       "$type": "sizing",
-      "$value": "{sizing.base}*18"
+      "$value": "{sizing.scale}*18"
     },
     "22": {
       "$type": "sizing",
-      "$value": "{sizing.base}*22"
+      "$value": "{sizing.scale}*22"
     },
     "26": {
       "$type": "sizing",
-      "$value": "{sizing.base}*26"
+      "$value": "{sizing.scale}*26"
     },
     "30": {
       "$type": "sizing",
-      "$value": "{sizing.base}*30"
+      "$value": "{sizing.scale}*30"
     }
   },
   "border-width": {
diff --git a/packages/cli/src/tokens/design-tokens/template/$themes.json b/packages/cli/src/tokens/design-tokens/template/$themes.json
index 8becb7c374..386427d929 100644
--- a/packages/cli/src/tokens/design-tokens/template/$themes.json
+++ b/packages/cli/src/tokens/design-tokens/template/$themes.json
@@ -989,7 +989,14 @@
       "font.family": "32f399ee0e608727f1c4d02e8ceb892a6c3e79e0",
       "font-weight.medium": "d48aac48a9fecf0dbe2e5c7b68427961007eac36",
       "font-weight.semibold": "d684180ad99ad0b200080b18529a25476554343f",
-      "font-weight.regular": "82250a86efe7517071ff39e79b2579c5b57a6083"
+      "font-weight.regular": "82250a86efe7517071ff39e79b2579c5b57a6083",
+      "border-radius.1": "b43afe7398c480ec8ae8f957b17487dda2d41ed9",
+      "border-radius.2": "5d515a95e8fa8d99b5ac73247f7d3bcbbf1a4ceb",
+      "border-radius.3": "ec2b713c77398e3aea7a9233ad200b1459c09407",
+      "border-radius.4": "68f3dd7cbc18bacd8a7ce0b31fdd006d20606380",
+      "border-radius.5": "797ca330f3d8a6d814f9ce3d4353945e032ac3ea",
+      "border-radius.base": "4e59f07de035b99ea39b8f3be0b656830da074b3",
+      "border-radius.scale": "4f53ee9f64ca05d424205b92856db20508a2070a"
     },
     "group": "Theme"
   },
@@ -1028,9 +1035,9 @@
       "typography.body.long.md": "S:6c1e607695a6580e03cbfafc19d1ccd0cf101975,",
       "typography.body.long.sm": "S:130b4703250b813d4caa3a80cf6c99298e9751fe,",
       "typography.body.long.xs": "S:11866ebed76712786f3d96b29a24f4a582bc85d0,",
-      "typography.body.xl": "S:161a8794f593b060bac9935e6b12aa74d83913aa,",
-      "typography.body.short.xl": "S:885e2c60a1e3a29094de4ded3ce89f6f5bb6badc,",
-      "typography.body.long.xl": "S:b6c948bbe35be5d2ca269515dfcffc08f4deec1a,",
+      "typography.body.xl": "S:1a95070f47e0fba591efbefe237e2ba65410008c,",
+      "typography.body.short.xl": "S:ac182b4d24bf241219aa8846020a9d2941074aa1,",
+      "typography.body.long.xl": "S:a8ea778d52402dfe5ee1cabd6ae616d886e9ee2c,",
       "shadow.xs": "S:15d2411391bc522973094bb8ef03ae9c97284a6d,",
       "shadow.sm": "S:a0f04eea29a42b7a02f2d9cdc74370cee6938577,",
       "shadow.md": "S:264c137ed468ebafe3317250f31a9615eea0ee19,",
@@ -1186,10 +1193,7 @@
       "border-radius.sm": "7b2af5d22e01253d20184bf5c3f872a18d41a315",
       "border-radius.md": "76f37e1c3307e179fa0144249c3b801d1c23e748",
       "border-radius.lg": "ac79c81ad8072fd4377a13a6e856d494c693fcf3",
-      "border-radius.xl": "7b61c03456ebcf335bed7486c7897986b688765b",
-      "border-radius.2xl": "2cbdcf5e08c9a5d1e2755d0999b76825e39331a9",
-      "border-radius.3xl": "49868c68c4a133bd40d0860c0951b0a279dc0785",
-      "border-radius.4xl": "02b3a1d2f7da8148195447afade3707876c8be19",
+      "border-radius.default": "7b61c03456ebcf335bed7486c7897986b688765b",
       "border-radius.full": "402d1c89e9770719d5da3e2379344604f3021569",
       "spacing.0": "fc789f9fa08a555a4338d53405faa463dfa51689",
       "spacing.1": "f81609d4dc6bf19d758713001ca33e4e21acbd7a",
diff --git a/packages/cli/src/tokens/design-tokens/template/themes/theme.json b/packages/cli/src/tokens/design-tokens/template/themes/theme.json
index 365a71c363..5c09f7ef1d 100644
--- a/packages/cli/src/tokens/design-tokens/template/themes/theme.json
+++ b/packages/cli/src/tokens/design-tokens/template/themes/theme.json
@@ -330,5 +330,35 @@
       "$type": "fontWeights",
       "$value": "{<theme>.regular}"
     }
+  },
+  "border-radius": {
+    "1": {
+      "$type": "borderRadius",
+      "$value": "min( {border-radius.base} , {border-radius.scale} *1)"
+    },
+    "2": {
+      "$type": "borderRadius",
+      "$value": "min( {border-radius.base} , {border-radius.scale} *2)"
+    },
+    "3": {
+      "$type": "borderRadius",
+      "$value": "min( {border-radius.base} , {border-radius.scale} *5)"
+    },
+    "4": {
+      "$type": "borderRadius",
+      "$value": "{border-radius.base}"
+    },
+    "5": {
+      "$type": "borderRadius",
+      "$value": "9999"
+    },
+    "base": {
+      "$type": "borderRadius",
+      "$value": "8"
+    },
+    "scale": {
+      "$type": "borderRadius",
+      "$value": "4"
+    }
   }
 }
\ No newline at end of file
diff --git a/packages/css/accordion.css b/packages/css/accordion.css
index 6c42790b51..ea7e8e5fe1 100644
--- a/packages/css/accordion.css
+++ b/packages/css/accordion.css
@@ -1,6 +1,6 @@
 .ds-accordion-group {
   --dsc-accordion-background: var(--ds-color-neutral-background-default);
-  --dsc-accordion-border-radius: min(1rem, var(--ds-border-radius-md));
+  --dsc-accordion-border-radius: var(--ds-border-radius-md);
   --dsc-accordion-border: 1px solid var(--ds-color-neutral-border-subtle);
   --dsc-accordion-chevron-gap: var(--ds-spacing-2);
   --dsc-accordion-chevron-size: var(--ds-spacing-6);
diff --git a/packages/css/alert.css b/packages/css/alert.css
index b46fac01fa..81ac33729d 100644
--- a/packages/css/alert.css
+++ b/packages/css/alert.css
@@ -1,7 +1,7 @@
 .ds-alert {
   --dsc-alert-background: var(--ds-color-info-surface-default);
   --dsc-alert-border-color: var(--ds-color-info-border-strong);
-  --dsc-alert-border-radius: min(1rem, var(--ds-border-radius-md));
+  --dsc-alert-border-radius: var(--ds-border-radius-md);
   --dsc-alert-color: var(--ds-color-neutral-text-default);
   --dsc-alert-gap: var(--ds-spacing-2);
   --dsc-alert-icon-color: var(--ds-color-info-text-subtle);
diff --git a/packages/css/avatar.css b/packages/css/avatar.css
index 960f218904..0f17adc12a 100644
--- a/packages/css/avatar.css
+++ b/packages/css/avatar.css
@@ -3,7 +3,7 @@
   --dsc-avatar-color: var(--ds-color-accent-contrast-default);
   --dsc-avatar-size: var(--ds-sizing-12);
   --dsc-avatar-padding: var(--ds-spacing-2);
-  --dsc-avatar-border-radius: 50%;
+  --dsc-avatar-border-radius: var(--ds-border-radius-full);
 
   align-items: center;
   aspect-ratio: 1 / 1;
diff --git a/packages/css/button.css b/packages/css/button.css
index 8f4633e92f..86815edcd5 100644
--- a/packages/css/button.css
+++ b/packages/css/button.css
@@ -14,7 +14,7 @@
 
   align-items: center;
   background: var(--dsc-button-background);
-  border-radius: var(--ds-border-radius-md);
+  border-radius: var(--ds-border-radius-default);
   border: var(--ds-border-width-default) solid var(--dsc-button-border-color, transparent);
   box-sizing: border-box;
   color: var(--dsc-button-color);
diff --git a/packages/css/card.css b/packages/css/card.css
index d6a3f56c93..1815e7f047 100644
--- a/packages/css/card.css
+++ b/packages/css/card.css
@@ -11,7 +11,7 @@
   all: unset; /* Reset if <button> */
   display: block;
   background: var(--dsc-card-background);
-  border-radius: min(1rem, var(--ds-border-radius-md));
+  border-radius: var(--ds-border-radius-lg);
   border: var(--dsc-card-border);
   box-sizing: border-box;
   color: var(--dsc-card-color);
diff --git a/packages/css/checkbox.css b/packages/css/checkbox.css
index a41b9b45f2..4303a4a2fc 100644
--- a/packages/css/checkbox.css
+++ b/packages/css/checkbox.css
@@ -28,7 +28,7 @@
   cursor: pointer;
   box-shadow: inset 0 0 0 2px var(--dsc-checkbox-border-color);
   background: var(--dsc-checkbox-background);
-  border-radius: min(0.25rem, var(--ds-border-radius-md));
+  border-radius: var(--ds-border-radius-sm);
 }
 
 .ds-checkbox__input::before {
@@ -41,7 +41,7 @@
   top: 50%;
   left: 50%;
   cursor: pointer;
-  border-radius: var(--ds-border-radius-md);
+  border-radius: var(--ds-border-radius-sm);
 }
 
 .ds-checkbox__label {
@@ -131,7 +131,7 @@
   outline: var(--dsc-focus-border-width) solid var(--ds-color-focus-outer);
   outline-offset: var(--dsc-focus-border-width);
   box-shadow: 0 0 0 var(--dsc-focus-border-width) var(--ds-color-focus-inner);
-  border-radius: var(--ds-border-radius-md);
+  border-radius: var(--ds-border-radius-sm);
 }
 
 .ds-checkbox--readonly > .ds-checkbox__input:checked {
diff --git a/packages/css/chip.css b/packages/css/chip.css
index 691d73c1d2..7f481211f3 100644
--- a/packages/css/chip.css
+++ b/packages/css/chip.css
@@ -38,7 +38,7 @@
   }
 
   &:has(input[type='checkbox']) {
-    --dsc-chip-border-radius: var(--ds-border-radius-lg);
+    --dsc-chip-border-radius: var(--ds-border-radius-md);
     --dsc-chip-padding: 0 var(--ds-spacing-2) 0 var(--ds-spacing-3);
   }
 
@@ -75,7 +75,6 @@
 
     appearance: none;
     background: none;
-    border-radius: calc(var(--dsc-chip-border-radius) - (var(--gap) / 2)); /* Use same radius as  */
     border: 2px solid;
     box-sizing: border-box;
     color: var(--dsc-chip-input-color);
@@ -84,10 +83,18 @@
     outline: none;
     width: var(--dsc-chip-input-size);
 
+    &[type='radio'] {
+      border-radius: var(--ds-border-radius-full);
+    }
+
     &[type='radio']:checked {
       border-width: calc(var(--dsc-chip-input-size) / 3.5); /* Matches Figma */
     }
 
+    &[type='checkbox'] {
+      border-radius: var(--ds-border-radius-sm);
+    }
+
     &[type='checkbox']:checked {
       background: currentcolor;
       mask: center / cover no-repeat
diff --git a/packages/css/combobox.css b/packages/css/combobox.css
index 3e183a33f9..5cd4c922ec 100644
--- a/packages/css/combobox.css
+++ b/packages/css/combobox.css
@@ -15,7 +15,7 @@
   color: var(--ds-color-neutral-text-default);
   overflow-y: auto;
   z-index: 1600;
-  border-radius: min(1rem, var(--ds-border-radius-md));
+  border-radius: var(--ds-border-radius-md);
   box-shadow: var(--ds-shadow-md);
   border: 1px solid var(--ds-color-neutral-border-default);
 }
@@ -31,7 +31,7 @@
   gap: var(--ds-spacing-1);
   cursor: text;
   padding: var(--ds-spacing-2);
-  border-radius: min(1rem, var(--ds-border-radius-md));
+  border-radius: var(--ds-border-radius-md);
   width: 100%;
   height: auto;
   justify-content: space-between;
@@ -200,7 +200,7 @@
   padding-left: var(--ds-spacing-1);
   border: none;
   border-left: 5px solid transparent;
-  border-radius: min(1rem, var(--ds-border-radius-md));
+  border-radius: var(--ds-border-radius-sm);
   justify-content: start;
   background: none;
   text-align: left;
@@ -242,7 +242,7 @@
   width: var(--ds-spacing-6);
   aspect-ratio: 1 / 1;
   border: 2px solid var(--ds-color-neutral-border-default);
-  border-radius: min(0.25rem, var(--ds-border-radius-md));
+  border-radius: var(--ds-border-radius-sm);
   background-color: var(--ds-color-neutral-background-default);
   display: grid;
   place-items: center;
diff --git a/packages/css/dropdown.css b/packages/css/dropdown.css
index 07d28a6234..1ef9ab4c22 100644
--- a/packages/css/dropdown.css
+++ b/packages/css/dropdown.css
@@ -5,7 +5,7 @@
   --dsc-dropdown-header-padding: var(--ds-spacing-2) var(--ds-spacing-4);
 
   background-color: var(--ds-color-neutral-background-default);
-  border-radius: min(1rem, var(--ds-border-radius-md));
+  border-radius: var(--ds-border-radius-md);
   border: 1px solid var(--ds-color-neutral-border-subtle);
   box-shadow: var(--ds-shadow-md);
   box-sizing: border-box;
diff --git a/packages/css/error-summary.css b/packages/css/error-summary.css
index 9c27a5d830..d45a85f676 100644
--- a/packages/css/error-summary.css
+++ b/packages/css/error-summary.css
@@ -1,6 +1,6 @@
 .ds-error-summary {
   --dsc-errorsummary-background: var(--ds-color-danger-surface-default);
-  --dsc-errorsummary-border-radius: min(1rem, var(--ds-border-radius-lg));
+  --dsc-errorsummary-border-radius: var(--ds-border-radius-lg);
   --dsc-errorsummary-padding: var(--ds-spacing-6) var(--ds-spacing-8);
   --dsc-errorsummary-link-color: var(--ds-color-neutral-text-default);
   --dsc-errorsummary-heading-color: var(--ds-color-danger-text-default);
diff --git a/packages/css/modal.css b/packages/css/modal.css
index 6a04849622..36d17ecdee 100644
--- a/packages/css/modal.css
+++ b/packages/css/modal.css
@@ -10,7 +10,7 @@
   --close-top-right: calc(var(--dsc-modal-padding) * -1 + var(--dsc-modal-close-margin));
 
   background: var(--dsc-modal-background);
-  border-radius: min(1rem, var(--ds-border-radius-lg));
+  border-radius: var(--ds-border-radius-lg);
   border: 0;
   box-shadow: var(--ds-shadow-xl);
   box-sizing: border-box;
diff --git a/packages/css/popover.css b/packages/css/popover.css
index f342e1114b..b933eb4d07 100644
--- a/packages/css/popover.css
+++ b/packages/css/popover.css
@@ -1,7 +1,7 @@
 .ds-popover {
   --dsc-popover-arrow-size: var(--ds-spacing-2);
   --dsc-popover-background: var(--ds-color-neutral-background-default);
-  --dsc-popover-border-radius: min(1rem, var(--ds-border-radius-md));
+  --dsc-popover-border-radius: var(--ds-border-radius-md);
   --dsc-popover-border: 1px solid var(--ds-color-neutral-border-default);
   --dsc-popover-color: var(--ds-color-neutral-text-default);
   --dsc-popover-max-width: 300px;
diff --git a/packages/css/radio.css b/packages/css/radio.css
index 0756e1888a..f9018554e0 100644
--- a/packages/css/radio.css
+++ b/packages/css/radio.css
@@ -28,7 +28,7 @@
   align-self: center;
   box-shadow: inset 0 0 0 2px var(--dsc-radio-border-color);
   background: var(--dsc-radio-background);
-  border-radius: 50%;
+  border-radius: var(--ds-border-radius-full);
 }
 
 .ds-radio__input::before {
diff --git a/packages/css/search.css b/packages/css/search.css
index 5532c25afb..9de0667e77 100644
--- a/packages/css/search.css
+++ b/packages/css/search.css
@@ -34,7 +34,7 @@
   display: flex;
   width: 100%;
   align-items: stretch;
-  border-radius: var(--ds-border-radius-md);
+  border-radius: var(--ds-border-radius-default);
   position: relative;
 }
 
@@ -56,7 +56,7 @@
   background: var(--dsc-search-input-background);
   color: var(--dsc-search-input-color);
   border: var(--dsc-search-input-border);
-  border-radius: var(--ds-border-radius-md);
+  border-radius: var(--ds-border-radius-default);
   font-family: inherit;
   position: relative;
   box-sizing: border-box;
@@ -111,7 +111,7 @@
   cursor: pointer;
   height: var(--dsc-search-clear-button-size);
   width: var(--dsc-search-clear-button-size);
-  border-radius: var(--ds-border-radius-md);
+  border-radius: var(--ds-border-radius-default);
   font-size: 1.25rem;
   padding: 0;
   z-index: 2;
diff --git a/packages/css/skeleton.css b/packages/css/skeleton.css
index 6b66f85672..05c9539d77 100644
--- a/packages/css/skeleton.css
+++ b/packages/css/skeleton.css
@@ -4,7 +4,7 @@
   --dsc-skeleton-background: var(--ds-color-neutral-surface-default);
 
   animation: var(--dsc-skeleton-animation);
-  border-radius: min(1rem, var(--ds-border-radius-lg));
+  border-radius: var(--ds-border-radius-lg);
   box-sizing: border-box;
   display: block;
   height: 1.3em;
diff --git a/packages/css/table.css b/packages/css/table.css
index 2d433b180e..22a43c0a32 100644
--- a/packages/css/table.css
+++ b/packages/css/table.css
@@ -129,7 +129,7 @@
    * Configurations
    */
   &[data-border] {
-    --dsc-table-border-radius: min(1rem, var(--ds-border-radius-md));
+    --dsc-table-border-radius: var(--ds-border-radius-md);
 
     border: var(--dsc-table-border);
 
diff --git a/packages/css/tabs.css b/packages/css/tabs.css
index af4b665671..a36e22fc8f 100644
--- a/packages/css/tabs.css
+++ b/packages/css/tabs.css
@@ -66,7 +66,6 @@
     display: block;
     height: 3px;
     width: 100%;
-    border-radius: var(--dsc-border-radius-full);
     background-color: var(--dsc-tabs__tab-bottom-border-color);
     position: absolute;
     bottom: 0;
diff --git a/packages/css/tag.css b/packages/css/tag.css
index 51abf4219c..191292892e 100644
--- a/packages/css/tag.css
+++ b/packages/css/tag.css
@@ -6,7 +6,7 @@
 
   align-items: center;
   background: var(--dsc-tag-background);
-  border-radius: min(1rem, var(--ds-border-radius-sm));
+  border-radius: var(--ds-border-radius-sm);
   box-sizing: border-box;
   color: var(--dsc-tag-color);
   display: flex;
diff --git a/packages/css/togglegroup.css b/packages/css/togglegroup.css
index 90f25aa679..c66552527d 100644
--- a/packages/css/togglegroup.css
+++ b/packages/css/togglegroup.css
@@ -2,9 +2,10 @@
   --dsc-togglegroup-background: var(--ds-color-neutral-background-default);
   --dsc-togglegroup-border: var(--ds-border-width-default) solid var(--ds-color-neutral-border-default);
   --dsc-togglegroup-padding: var(--ds-spacing-1);
+  --dsc-togglegroup-border-radius: var(--ds-border-radius-default);
 
   background: var(--dsc-togglegroup-background);
-  border-radius: calc(var(--ds-border-radius-md) + var(--dsc-togglegroup-padding));
+  border-radius: calc(var(--dsc-togglegroup-border-radius) + var(--dsc-togglegroup-padding));
   border: var(--dsc-togglegroup-border);
   display: grid;
   gap: var(--dsc-togglegroup-padding);
@@ -13,4 +14,8 @@
   height: fit-content;
   padding: var(--dsc-togglegroup-padding);
   width: fit-content;
+
+  button {
+    border-radius: var(--dsc-togglegroup-border-radius);
+  }
 }
diff --git a/packages/css/tooltip.css b/packages/css/tooltip.css
index cc56d42579..f7d9376856 100644
--- a/packages/css/tooltip.css
+++ b/packages/css/tooltip.css
@@ -1,7 +1,7 @@
 .ds-tooltip {
   --dsc-tooltip-background: var(--ds-color-neutral-text-default);
   --dsc-tooltip-color: var(--ds-color-neutral-background-default);
-  --dsc-tooltip-border-radius: var(--ds-border-radius-md);
+  --dsc-tooltip-border-radius: var(--ds-border-radius-default);
   --dsc-tooltip-padding: var(--ds-spacing-1) var(--ds-spacing-2);
 
   background: var(--dsc-tooltip-background);
diff --git a/packages/theme/brand/altinn.css b/packages/theme/brand/altinn.css
index fed9cc9029..9314382f4e 100644
--- a/packages/theme/brand/altinn.css
+++ b/packages/theme/brand/altinn.css
@@ -787,58 +787,61 @@
 
 @layer ds.theme.semantic {
 :root {
-  --ds-disabled-opacity: 30%;
-  --ds-border-radius-sm: calc(var(--ds-border-radius-base)*0.5);
-  --ds-border-radius-md: calc(var(--ds-border-radius-base)*1);
-  --ds-border-radius-lg: calc(var(--ds-border-radius-base)*2);
-  --ds-border-radius-xl: calc(var(--ds-border-radius-base)*3);
-  --ds-border-radius-2xl: calc(var(--ds-border-radius-base)*4);
-  --ds-border-radius-3xl: calc(var(--ds-border-radius-base)*6);
-  --ds-border-radius-4xl: calc(var(--ds-border-radius-base)*8);
-  --ds-border-radius-full: 624.9375rem;
+  --ds-border-radius-1: min( var(--ds-border-radius-base) , var(--ds-border-radius-scale) *1);
+  --ds-border-radius-2: min( var(--ds-border-radius-base) , var(--ds-border-radius-scale) *2);
+  --ds-border-radius-3: min( var(--ds-border-radius-base) , var(--ds-border-radius-scale) *5);
+  --ds-border-radius-4: var(--ds-border-radius-base);
+  --ds-border-radius-5: 624.9375rem;
   --ds-border-radius-base: 0.25rem;
-  --ds-spacing-0: calc(var(--ds-spacing-base)*0);
-  --ds-spacing-1: calc(var(--ds-spacing-base)*1);
-  --ds-spacing-2: calc(var(--ds-spacing-base)*2);
-  --ds-spacing-3: calc(var(--ds-spacing-base)*3);
-  --ds-spacing-4: calc(var(--ds-spacing-base)*4);
-  --ds-spacing-5: calc(var(--ds-spacing-base)*5);
-  --ds-spacing-6: calc(var(--ds-spacing-base)*6);
-  --ds-spacing-7: calc(var(--ds-spacing-base)*7);
-  --ds-spacing-8: calc(var(--ds-spacing-base)*8);
-  --ds-spacing-9: calc(var(--ds-spacing-base)*9);
-  --ds-spacing-10: calc(var(--ds-spacing-base)*10);
-  --ds-spacing-11: calc(var(--ds-spacing-base)*11);
-  --ds-spacing-12: calc(var(--ds-spacing-base)*12);
-  --ds-spacing-13: calc(var(--ds-spacing-base)*13);
-  --ds-spacing-14: calc(var(--ds-spacing-base)*14);
-  --ds-spacing-15: calc(var(--ds-spacing-base)*15);
-  --ds-spacing-18: calc(var(--ds-spacing-base)*18);
-  --ds-spacing-22: calc(var(--ds-spacing-base)*22);
-  --ds-spacing-26: calc(var(--ds-spacing-base)*26);
-  --ds-spacing-30: calc(var(--ds-spacing-base)*30);
-  --ds-spacing-base: 0.25rem;
-  --ds-sizing-0: calc(var(--ds-sizing-base)*0);
-  --ds-sizing-1: calc(var(--ds-sizing-base)*1);
-  --ds-sizing-2: calc(var(--ds-sizing-base)*2);
-  --ds-sizing-3: calc(var(--ds-sizing-base)*3);
-  --ds-sizing-4: calc(var(--ds-sizing-base)*4);
-  --ds-sizing-5: calc(var(--ds-sizing-base)*5);
-  --ds-sizing-6: calc(var(--ds-sizing-base)*6);
-  --ds-sizing-7: calc(var(--ds-sizing-base)*7);
-  --ds-sizing-8: calc(var(--ds-sizing-base)*8);
-  --ds-sizing-9: calc(var(--ds-sizing-base)*9);
-  --ds-sizing-10: calc(var(--ds-sizing-base)*10);
-  --ds-sizing-11: calc(var(--ds-sizing-base)*11);
-  --ds-sizing-12: calc(var(--ds-sizing-base)*12);
-  --ds-sizing-13: calc(var(--ds-sizing-base)*13);
-  --ds-sizing-14: calc(var(--ds-sizing-base)*14);
-  --ds-sizing-15: calc(var(--ds-sizing-base)*15);
-  --ds-sizing-18: calc(var(--ds-sizing-base)*18);
-  --ds-sizing-22: calc(var(--ds-sizing-base)*22);
-  --ds-sizing-26: calc(var(--ds-sizing-base)*26);
-  --ds-sizing-30: calc(var(--ds-sizing-base)*30);
-  --ds-sizing-base: 0.25rem;
+  --ds-border-radius-scale: 0.25rem;
+  --ds-border-radius-sm: var(--ds-border-radius-1);
+  --ds-border-radius-md: var(--ds-border-radius-2);
+  --ds-border-radius-lg: var(--ds-border-radius-3);
+  --ds-border-radius-default: var(--ds-border-radius-4);
+  --ds-border-radius-full: var(--ds-border-radius-5);
+  --ds-disabled-opacity: 30%;
+  --ds-spacing-0: calc(var(--ds-spacing-scale)*0);
+  --ds-spacing-1: calc(var(--ds-spacing-scale)*1);
+  --ds-spacing-2: calc(var(--ds-spacing-scale)*2);
+  --ds-spacing-3: calc(var(--ds-spacing-scale)*3);
+  --ds-spacing-4: calc(var(--ds-spacing-scale)*4);
+  --ds-spacing-5: calc(var(--ds-spacing-scale)*5);
+  --ds-spacing-6: calc(var(--ds-spacing-scale)*6);
+  --ds-spacing-7: calc(var(--ds-spacing-scale)*7);
+  --ds-spacing-8: calc(var(--ds-spacing-scale)*8);
+  --ds-spacing-9: calc(var(--ds-spacing-scale)*9);
+  --ds-spacing-10: calc(var(--ds-spacing-scale)*10);
+  --ds-spacing-11: calc(var(--ds-spacing-scale)*11);
+  --ds-spacing-12: calc(var(--ds-spacing-scale)*12);
+  --ds-spacing-13: calc(var(--ds-spacing-scale)*13);
+  --ds-spacing-14: calc(var(--ds-spacing-scale)*14);
+  --ds-spacing-15: calc(var(--ds-spacing-scale)*15);
+  --ds-spacing-18: calc(var(--ds-spacing-scale)*18);
+  --ds-spacing-22: calc(var(--ds-spacing-scale)*22);
+  --ds-spacing-26: calc(var(--ds-spacing-scale)*26);
+  --ds-spacing-30: calc(var(--ds-spacing-scale)*30);
+  --ds-spacing-scale: 0.25rem;
+  --ds-sizing-0: calc(var(--ds-sizing-scale)*0);
+  --ds-sizing-1: calc(var(--ds-sizing-scale)*1);
+  --ds-sizing-2: calc(var(--ds-sizing-scale)*2);
+  --ds-sizing-3: calc(var(--ds-sizing-scale)*3);
+  --ds-sizing-4: calc(var(--ds-sizing-scale)*4);
+  --ds-sizing-5: calc(var(--ds-sizing-scale)*5);
+  --ds-sizing-6: calc(var(--ds-sizing-scale)*6);
+  --ds-sizing-7: calc(var(--ds-sizing-scale)*7);
+  --ds-sizing-8: calc(var(--ds-sizing-scale)*8);
+  --ds-sizing-9: calc(var(--ds-sizing-scale)*9);
+  --ds-sizing-10: calc(var(--ds-sizing-scale)*10);
+  --ds-sizing-11: calc(var(--ds-sizing-scale)*11);
+  --ds-sizing-12: calc(var(--ds-sizing-scale)*12);
+  --ds-sizing-13: calc(var(--ds-sizing-scale)*13);
+  --ds-sizing-14: calc(var(--ds-sizing-scale)*14);
+  --ds-sizing-15: calc(var(--ds-sizing-scale)*15);
+  --ds-sizing-18: calc(var(--ds-sizing-scale)*18);
+  --ds-sizing-22: calc(var(--ds-sizing-scale)*22);
+  --ds-sizing-26: calc(var(--ds-sizing-scale)*26);
+  --ds-sizing-30: calc(var(--ds-sizing-scale)*30);
+  --ds-sizing-scale: 0.25rem;
   --ds-border-width-default: 1px;
   --ds-border-width-highlight: 2px;
   --ds-shadow-xs: 0 0 1px 0 rgba(0,0,0,0.16), 0 1px 2px 0 rgba(0,0,0,0.12);
diff --git a/packages/theme/brand/altinn/semantic.css b/packages/theme/brand/altinn/semantic.css
index 5a7b277320..44f8f9a669 100644
--- a/packages/theme/brand/altinn/semantic.css
+++ b/packages/theme/brand/altinn/semantic.css
@@ -4,58 +4,61 @@
 
 @layer ds.theme.semantic {
 :root {
-  --ds-disabled-opacity: 30%;
-  --ds-border-radius-sm: calc(var(--ds-border-radius-base)*0.5);
-  --ds-border-radius-md: calc(var(--ds-border-radius-base)*1);
-  --ds-border-radius-lg: calc(var(--ds-border-radius-base)*2);
-  --ds-border-radius-xl: calc(var(--ds-border-radius-base)*3);
-  --ds-border-radius-2xl: calc(var(--ds-border-radius-base)*4);
-  --ds-border-radius-3xl: calc(var(--ds-border-radius-base)*6);
-  --ds-border-radius-4xl: calc(var(--ds-border-radius-base)*8);
-  --ds-border-radius-full: 624.9375rem;
+  --ds-border-radius-1: min( var(--ds-border-radius-base) , var(--ds-border-radius-scale) *1);
+  --ds-border-radius-2: min( var(--ds-border-radius-base) , var(--ds-border-radius-scale) *2);
+  --ds-border-radius-3: min( var(--ds-border-radius-base) , var(--ds-border-radius-scale) *5);
+  --ds-border-radius-4: var(--ds-border-radius-base);
+  --ds-border-radius-5: 624.9375rem;
   --ds-border-radius-base: 0.25rem;
-  --ds-spacing-0: calc(var(--ds-spacing-base)*0);
-  --ds-spacing-1: calc(var(--ds-spacing-base)*1);
-  --ds-spacing-2: calc(var(--ds-spacing-base)*2);
-  --ds-spacing-3: calc(var(--ds-spacing-base)*3);
-  --ds-spacing-4: calc(var(--ds-spacing-base)*4);
-  --ds-spacing-5: calc(var(--ds-spacing-base)*5);
-  --ds-spacing-6: calc(var(--ds-spacing-base)*6);
-  --ds-spacing-7: calc(var(--ds-spacing-base)*7);
-  --ds-spacing-8: calc(var(--ds-spacing-base)*8);
-  --ds-spacing-9: calc(var(--ds-spacing-base)*9);
-  --ds-spacing-10: calc(var(--ds-spacing-base)*10);
-  --ds-spacing-11: calc(var(--ds-spacing-base)*11);
-  --ds-spacing-12: calc(var(--ds-spacing-base)*12);
-  --ds-spacing-13: calc(var(--ds-spacing-base)*13);
-  --ds-spacing-14: calc(var(--ds-spacing-base)*14);
-  --ds-spacing-15: calc(var(--ds-spacing-base)*15);
-  --ds-spacing-18: calc(var(--ds-spacing-base)*18);
-  --ds-spacing-22: calc(var(--ds-spacing-base)*22);
-  --ds-spacing-26: calc(var(--ds-spacing-base)*26);
-  --ds-spacing-30: calc(var(--ds-spacing-base)*30);
-  --ds-spacing-base: 0.25rem;
-  --ds-sizing-0: calc(var(--ds-sizing-base)*0);
-  --ds-sizing-1: calc(var(--ds-sizing-base)*1);
-  --ds-sizing-2: calc(var(--ds-sizing-base)*2);
-  --ds-sizing-3: calc(var(--ds-sizing-base)*3);
-  --ds-sizing-4: calc(var(--ds-sizing-base)*4);
-  --ds-sizing-5: calc(var(--ds-sizing-base)*5);
-  --ds-sizing-6: calc(var(--ds-sizing-base)*6);
-  --ds-sizing-7: calc(var(--ds-sizing-base)*7);
-  --ds-sizing-8: calc(var(--ds-sizing-base)*8);
-  --ds-sizing-9: calc(var(--ds-sizing-base)*9);
-  --ds-sizing-10: calc(var(--ds-sizing-base)*10);
-  --ds-sizing-11: calc(var(--ds-sizing-base)*11);
-  --ds-sizing-12: calc(var(--ds-sizing-base)*12);
-  --ds-sizing-13: calc(var(--ds-sizing-base)*13);
-  --ds-sizing-14: calc(var(--ds-sizing-base)*14);
-  --ds-sizing-15: calc(var(--ds-sizing-base)*15);
-  --ds-sizing-18: calc(var(--ds-sizing-base)*18);
-  --ds-sizing-22: calc(var(--ds-sizing-base)*22);
-  --ds-sizing-26: calc(var(--ds-sizing-base)*26);
-  --ds-sizing-30: calc(var(--ds-sizing-base)*30);
-  --ds-sizing-base: 0.25rem;
+  --ds-border-radius-scale: 0.25rem;
+  --ds-border-radius-sm: var(--ds-border-radius-1);
+  --ds-border-radius-md: var(--ds-border-radius-2);
+  --ds-border-radius-lg: var(--ds-border-radius-3);
+  --ds-border-radius-default: var(--ds-border-radius-4);
+  --ds-border-radius-full: var(--ds-border-radius-5);
+  --ds-disabled-opacity: 30%;
+  --ds-spacing-0: calc(var(--ds-spacing-scale)*0);
+  --ds-spacing-1: calc(var(--ds-spacing-scale)*1);
+  --ds-spacing-2: calc(var(--ds-spacing-scale)*2);
+  --ds-spacing-3: calc(var(--ds-spacing-scale)*3);
+  --ds-spacing-4: calc(var(--ds-spacing-scale)*4);
+  --ds-spacing-5: calc(var(--ds-spacing-scale)*5);
+  --ds-spacing-6: calc(var(--ds-spacing-scale)*6);
+  --ds-spacing-7: calc(var(--ds-spacing-scale)*7);
+  --ds-spacing-8: calc(var(--ds-spacing-scale)*8);
+  --ds-spacing-9: calc(var(--ds-spacing-scale)*9);
+  --ds-spacing-10: calc(var(--ds-spacing-scale)*10);
+  --ds-spacing-11: calc(var(--ds-spacing-scale)*11);
+  --ds-spacing-12: calc(var(--ds-spacing-scale)*12);
+  --ds-spacing-13: calc(var(--ds-spacing-scale)*13);
+  --ds-spacing-14: calc(var(--ds-spacing-scale)*14);
+  --ds-spacing-15: calc(var(--ds-spacing-scale)*15);
+  --ds-spacing-18: calc(var(--ds-spacing-scale)*18);
+  --ds-spacing-22: calc(var(--ds-spacing-scale)*22);
+  --ds-spacing-26: calc(var(--ds-spacing-scale)*26);
+  --ds-spacing-30: calc(var(--ds-spacing-scale)*30);
+  --ds-spacing-scale: 0.25rem;
+  --ds-sizing-0: calc(var(--ds-sizing-scale)*0);
+  --ds-sizing-1: calc(var(--ds-sizing-scale)*1);
+  --ds-sizing-2: calc(var(--ds-sizing-scale)*2);
+  --ds-sizing-3: calc(var(--ds-sizing-scale)*3);
+  --ds-sizing-4: calc(var(--ds-sizing-scale)*4);
+  --ds-sizing-5: calc(var(--ds-sizing-scale)*5);
+  --ds-sizing-6: calc(var(--ds-sizing-scale)*6);
+  --ds-sizing-7: calc(var(--ds-sizing-scale)*7);
+  --ds-sizing-8: calc(var(--ds-sizing-scale)*8);
+  --ds-sizing-9: calc(var(--ds-sizing-scale)*9);
+  --ds-sizing-10: calc(var(--ds-sizing-scale)*10);
+  --ds-sizing-11: calc(var(--ds-sizing-scale)*11);
+  --ds-sizing-12: calc(var(--ds-sizing-scale)*12);
+  --ds-sizing-13: calc(var(--ds-sizing-scale)*13);
+  --ds-sizing-14: calc(var(--ds-sizing-scale)*14);
+  --ds-sizing-15: calc(var(--ds-sizing-scale)*15);
+  --ds-sizing-18: calc(var(--ds-sizing-scale)*18);
+  --ds-sizing-22: calc(var(--ds-sizing-scale)*22);
+  --ds-sizing-26: calc(var(--ds-sizing-scale)*26);
+  --ds-sizing-30: calc(var(--ds-sizing-scale)*30);
+  --ds-sizing-scale: 0.25rem;
   --ds-border-width-default: 1px;
   --ds-border-width-highlight: 2px;
   --ds-shadow-xs: 0 0 1px 0 rgba(0,0,0,0.16), 0 1px 2px 0 rgba(0,0,0,0.12);
diff --git a/packages/theme/brand/digdir.css b/packages/theme/brand/digdir.css
index 1e126a242f..e2435e1bc3 100644
--- a/packages/theme/brand/digdir.css
+++ b/packages/theme/brand/digdir.css
@@ -787,58 +787,61 @@
 
 @layer ds.theme.semantic {
 :root {
-  --ds-disabled-opacity: 30%;
-  --ds-border-radius-sm: calc(var(--ds-border-radius-base)*0.5);
-  --ds-border-radius-md: calc(var(--ds-border-radius-base)*1);
-  --ds-border-radius-lg: calc(var(--ds-border-radius-base)*2);
-  --ds-border-radius-xl: calc(var(--ds-border-radius-base)*3);
-  --ds-border-radius-2xl: calc(var(--ds-border-radius-base)*4);
-  --ds-border-radius-3xl: calc(var(--ds-border-radius-base)*6);
-  --ds-border-radius-4xl: calc(var(--ds-border-radius-base)*8);
-  --ds-border-radius-full: 624.9375rem;
+  --ds-border-radius-1: min( var(--ds-border-radius-base) , var(--ds-border-radius-scale) *1);
+  --ds-border-radius-2: min( var(--ds-border-radius-base) , var(--ds-border-radius-scale) *2);
+  --ds-border-radius-3: min( var(--ds-border-radius-base) , var(--ds-border-radius-scale) *5);
+  --ds-border-radius-4: var(--ds-border-radius-base);
+  --ds-border-radius-5: 624.9375rem;
   --ds-border-radius-base: 0.25rem;
-  --ds-spacing-0: calc(var(--ds-spacing-base)*0);
-  --ds-spacing-1: calc(var(--ds-spacing-base)*1);
-  --ds-spacing-2: calc(var(--ds-spacing-base)*2);
-  --ds-spacing-3: calc(var(--ds-spacing-base)*3);
-  --ds-spacing-4: calc(var(--ds-spacing-base)*4);
-  --ds-spacing-5: calc(var(--ds-spacing-base)*5);
-  --ds-spacing-6: calc(var(--ds-spacing-base)*6);
-  --ds-spacing-7: calc(var(--ds-spacing-base)*7);
-  --ds-spacing-8: calc(var(--ds-spacing-base)*8);
-  --ds-spacing-9: calc(var(--ds-spacing-base)*9);
-  --ds-spacing-10: calc(var(--ds-spacing-base)*10);
-  --ds-spacing-11: calc(var(--ds-spacing-base)*11);
-  --ds-spacing-12: calc(var(--ds-spacing-base)*12);
-  --ds-spacing-13: calc(var(--ds-spacing-base)*13);
-  --ds-spacing-14: calc(var(--ds-spacing-base)*14);
-  --ds-spacing-15: calc(var(--ds-spacing-base)*15);
-  --ds-spacing-18: calc(var(--ds-spacing-base)*18);
-  --ds-spacing-22: calc(var(--ds-spacing-base)*22);
-  --ds-spacing-26: calc(var(--ds-spacing-base)*26);
-  --ds-spacing-30: calc(var(--ds-spacing-base)*30);
-  --ds-spacing-base: 0.25rem;
-  --ds-sizing-0: calc(var(--ds-sizing-base)*0);
-  --ds-sizing-1: calc(var(--ds-sizing-base)*1);
-  --ds-sizing-2: calc(var(--ds-sizing-base)*2);
-  --ds-sizing-3: calc(var(--ds-sizing-base)*3);
-  --ds-sizing-4: calc(var(--ds-sizing-base)*4);
-  --ds-sizing-5: calc(var(--ds-sizing-base)*5);
-  --ds-sizing-6: calc(var(--ds-sizing-base)*6);
-  --ds-sizing-7: calc(var(--ds-sizing-base)*7);
-  --ds-sizing-8: calc(var(--ds-sizing-base)*8);
-  --ds-sizing-9: calc(var(--ds-sizing-base)*9);
-  --ds-sizing-10: calc(var(--ds-sizing-base)*10);
-  --ds-sizing-11: calc(var(--ds-sizing-base)*11);
-  --ds-sizing-12: calc(var(--ds-sizing-base)*12);
-  --ds-sizing-13: calc(var(--ds-sizing-base)*13);
-  --ds-sizing-14: calc(var(--ds-sizing-base)*14);
-  --ds-sizing-15: calc(var(--ds-sizing-base)*15);
-  --ds-sizing-18: calc(var(--ds-sizing-base)*18);
-  --ds-sizing-22: calc(var(--ds-sizing-base)*22);
-  --ds-sizing-26: calc(var(--ds-sizing-base)*26);
-  --ds-sizing-30: calc(var(--ds-sizing-base)*30);
-  --ds-sizing-base: 0.25rem;
+  --ds-border-radius-scale: 0.25rem;
+  --ds-border-radius-sm: var(--ds-border-radius-1);
+  --ds-border-radius-md: var(--ds-border-radius-2);
+  --ds-border-radius-lg: var(--ds-border-radius-3);
+  --ds-border-radius-default: var(--ds-border-radius-4);
+  --ds-border-radius-full: var(--ds-border-radius-5);
+  --ds-disabled-opacity: 30%;
+  --ds-spacing-0: calc(var(--ds-spacing-scale)*0);
+  --ds-spacing-1: calc(var(--ds-spacing-scale)*1);
+  --ds-spacing-2: calc(var(--ds-spacing-scale)*2);
+  --ds-spacing-3: calc(var(--ds-spacing-scale)*3);
+  --ds-spacing-4: calc(var(--ds-spacing-scale)*4);
+  --ds-spacing-5: calc(var(--ds-spacing-scale)*5);
+  --ds-spacing-6: calc(var(--ds-spacing-scale)*6);
+  --ds-spacing-7: calc(var(--ds-spacing-scale)*7);
+  --ds-spacing-8: calc(var(--ds-spacing-scale)*8);
+  --ds-spacing-9: calc(var(--ds-spacing-scale)*9);
+  --ds-spacing-10: calc(var(--ds-spacing-scale)*10);
+  --ds-spacing-11: calc(var(--ds-spacing-scale)*11);
+  --ds-spacing-12: calc(var(--ds-spacing-scale)*12);
+  --ds-spacing-13: calc(var(--ds-spacing-scale)*13);
+  --ds-spacing-14: calc(var(--ds-spacing-scale)*14);
+  --ds-spacing-15: calc(var(--ds-spacing-scale)*15);
+  --ds-spacing-18: calc(var(--ds-spacing-scale)*18);
+  --ds-spacing-22: calc(var(--ds-spacing-scale)*22);
+  --ds-spacing-26: calc(var(--ds-spacing-scale)*26);
+  --ds-spacing-30: calc(var(--ds-spacing-scale)*30);
+  --ds-spacing-scale: 0.25rem;
+  --ds-sizing-0: calc(var(--ds-sizing-scale)*0);
+  --ds-sizing-1: calc(var(--ds-sizing-scale)*1);
+  --ds-sizing-2: calc(var(--ds-sizing-scale)*2);
+  --ds-sizing-3: calc(var(--ds-sizing-scale)*3);
+  --ds-sizing-4: calc(var(--ds-sizing-scale)*4);
+  --ds-sizing-5: calc(var(--ds-sizing-scale)*5);
+  --ds-sizing-6: calc(var(--ds-sizing-scale)*6);
+  --ds-sizing-7: calc(var(--ds-sizing-scale)*7);
+  --ds-sizing-8: calc(var(--ds-sizing-scale)*8);
+  --ds-sizing-9: calc(var(--ds-sizing-scale)*9);
+  --ds-sizing-10: calc(var(--ds-sizing-scale)*10);
+  --ds-sizing-11: calc(var(--ds-sizing-scale)*11);
+  --ds-sizing-12: calc(var(--ds-sizing-scale)*12);
+  --ds-sizing-13: calc(var(--ds-sizing-scale)*13);
+  --ds-sizing-14: calc(var(--ds-sizing-scale)*14);
+  --ds-sizing-15: calc(var(--ds-sizing-scale)*15);
+  --ds-sizing-18: calc(var(--ds-sizing-scale)*18);
+  --ds-sizing-22: calc(var(--ds-sizing-scale)*22);
+  --ds-sizing-26: calc(var(--ds-sizing-scale)*26);
+  --ds-sizing-30: calc(var(--ds-sizing-scale)*30);
+  --ds-sizing-scale: 0.25rem;
   --ds-border-width-default: 1px;
   --ds-border-width-highlight: 2px;
   --ds-shadow-xs: 0 0 1px 0 rgba(0,0,0,0.16), 0 1px 2px 0 rgba(0,0,0,0.12);
diff --git a/packages/theme/brand/digdir/semantic.css b/packages/theme/brand/digdir/semantic.css
index 5a7b277320..44f8f9a669 100644
--- a/packages/theme/brand/digdir/semantic.css
+++ b/packages/theme/brand/digdir/semantic.css
@@ -4,58 +4,61 @@
 
 @layer ds.theme.semantic {
 :root {
-  --ds-disabled-opacity: 30%;
-  --ds-border-radius-sm: calc(var(--ds-border-radius-base)*0.5);
-  --ds-border-radius-md: calc(var(--ds-border-radius-base)*1);
-  --ds-border-radius-lg: calc(var(--ds-border-radius-base)*2);
-  --ds-border-radius-xl: calc(var(--ds-border-radius-base)*3);
-  --ds-border-radius-2xl: calc(var(--ds-border-radius-base)*4);
-  --ds-border-radius-3xl: calc(var(--ds-border-radius-base)*6);
-  --ds-border-radius-4xl: calc(var(--ds-border-radius-base)*8);
-  --ds-border-radius-full: 624.9375rem;
+  --ds-border-radius-1: min( var(--ds-border-radius-base) , var(--ds-border-radius-scale) *1);
+  --ds-border-radius-2: min( var(--ds-border-radius-base) , var(--ds-border-radius-scale) *2);
+  --ds-border-radius-3: min( var(--ds-border-radius-base) , var(--ds-border-radius-scale) *5);
+  --ds-border-radius-4: var(--ds-border-radius-base);
+  --ds-border-radius-5: 624.9375rem;
   --ds-border-radius-base: 0.25rem;
-  --ds-spacing-0: calc(var(--ds-spacing-base)*0);
-  --ds-spacing-1: calc(var(--ds-spacing-base)*1);
-  --ds-spacing-2: calc(var(--ds-spacing-base)*2);
-  --ds-spacing-3: calc(var(--ds-spacing-base)*3);
-  --ds-spacing-4: calc(var(--ds-spacing-base)*4);
-  --ds-spacing-5: calc(var(--ds-spacing-base)*5);
-  --ds-spacing-6: calc(var(--ds-spacing-base)*6);
-  --ds-spacing-7: calc(var(--ds-spacing-base)*7);
-  --ds-spacing-8: calc(var(--ds-spacing-base)*8);
-  --ds-spacing-9: calc(var(--ds-spacing-base)*9);
-  --ds-spacing-10: calc(var(--ds-spacing-base)*10);
-  --ds-spacing-11: calc(var(--ds-spacing-base)*11);
-  --ds-spacing-12: calc(var(--ds-spacing-base)*12);
-  --ds-spacing-13: calc(var(--ds-spacing-base)*13);
-  --ds-spacing-14: calc(var(--ds-spacing-base)*14);
-  --ds-spacing-15: calc(var(--ds-spacing-base)*15);
-  --ds-spacing-18: calc(var(--ds-spacing-base)*18);
-  --ds-spacing-22: calc(var(--ds-spacing-base)*22);
-  --ds-spacing-26: calc(var(--ds-spacing-base)*26);
-  --ds-spacing-30: calc(var(--ds-spacing-base)*30);
-  --ds-spacing-base: 0.25rem;
-  --ds-sizing-0: calc(var(--ds-sizing-base)*0);
-  --ds-sizing-1: calc(var(--ds-sizing-base)*1);
-  --ds-sizing-2: calc(var(--ds-sizing-base)*2);
-  --ds-sizing-3: calc(var(--ds-sizing-base)*3);
-  --ds-sizing-4: calc(var(--ds-sizing-base)*4);
-  --ds-sizing-5: calc(var(--ds-sizing-base)*5);
-  --ds-sizing-6: calc(var(--ds-sizing-base)*6);
-  --ds-sizing-7: calc(var(--ds-sizing-base)*7);
-  --ds-sizing-8: calc(var(--ds-sizing-base)*8);
-  --ds-sizing-9: calc(var(--ds-sizing-base)*9);
-  --ds-sizing-10: calc(var(--ds-sizing-base)*10);
-  --ds-sizing-11: calc(var(--ds-sizing-base)*11);
-  --ds-sizing-12: calc(var(--ds-sizing-base)*12);
-  --ds-sizing-13: calc(var(--ds-sizing-base)*13);
-  --ds-sizing-14: calc(var(--ds-sizing-base)*14);
-  --ds-sizing-15: calc(var(--ds-sizing-base)*15);
-  --ds-sizing-18: calc(var(--ds-sizing-base)*18);
-  --ds-sizing-22: calc(var(--ds-sizing-base)*22);
-  --ds-sizing-26: calc(var(--ds-sizing-base)*26);
-  --ds-sizing-30: calc(var(--ds-sizing-base)*30);
-  --ds-sizing-base: 0.25rem;
+  --ds-border-radius-scale: 0.25rem;
+  --ds-border-radius-sm: var(--ds-border-radius-1);
+  --ds-border-radius-md: var(--ds-border-radius-2);
+  --ds-border-radius-lg: var(--ds-border-radius-3);
+  --ds-border-radius-default: var(--ds-border-radius-4);
+  --ds-border-radius-full: var(--ds-border-radius-5);
+  --ds-disabled-opacity: 30%;
+  --ds-spacing-0: calc(var(--ds-spacing-scale)*0);
+  --ds-spacing-1: calc(var(--ds-spacing-scale)*1);
+  --ds-spacing-2: calc(var(--ds-spacing-scale)*2);
+  --ds-spacing-3: calc(var(--ds-spacing-scale)*3);
+  --ds-spacing-4: calc(var(--ds-spacing-scale)*4);
+  --ds-spacing-5: calc(var(--ds-spacing-scale)*5);
+  --ds-spacing-6: calc(var(--ds-spacing-scale)*6);
+  --ds-spacing-7: calc(var(--ds-spacing-scale)*7);
+  --ds-spacing-8: calc(var(--ds-spacing-scale)*8);
+  --ds-spacing-9: calc(var(--ds-spacing-scale)*9);
+  --ds-spacing-10: calc(var(--ds-spacing-scale)*10);
+  --ds-spacing-11: calc(var(--ds-spacing-scale)*11);
+  --ds-spacing-12: calc(var(--ds-spacing-scale)*12);
+  --ds-spacing-13: calc(var(--ds-spacing-scale)*13);
+  --ds-spacing-14: calc(var(--ds-spacing-scale)*14);
+  --ds-spacing-15: calc(var(--ds-spacing-scale)*15);
+  --ds-spacing-18: calc(var(--ds-spacing-scale)*18);
+  --ds-spacing-22: calc(var(--ds-spacing-scale)*22);
+  --ds-spacing-26: calc(var(--ds-spacing-scale)*26);
+  --ds-spacing-30: calc(var(--ds-spacing-scale)*30);
+  --ds-spacing-scale: 0.25rem;
+  --ds-sizing-0: calc(var(--ds-sizing-scale)*0);
+  --ds-sizing-1: calc(var(--ds-sizing-scale)*1);
+  --ds-sizing-2: calc(var(--ds-sizing-scale)*2);
+  --ds-sizing-3: calc(var(--ds-sizing-scale)*3);
+  --ds-sizing-4: calc(var(--ds-sizing-scale)*4);
+  --ds-sizing-5: calc(var(--ds-sizing-scale)*5);
+  --ds-sizing-6: calc(var(--ds-sizing-scale)*6);
+  --ds-sizing-7: calc(var(--ds-sizing-scale)*7);
+  --ds-sizing-8: calc(var(--ds-sizing-scale)*8);
+  --ds-sizing-9: calc(var(--ds-sizing-scale)*9);
+  --ds-sizing-10: calc(var(--ds-sizing-scale)*10);
+  --ds-sizing-11: calc(var(--ds-sizing-scale)*11);
+  --ds-sizing-12: calc(var(--ds-sizing-scale)*12);
+  --ds-sizing-13: calc(var(--ds-sizing-scale)*13);
+  --ds-sizing-14: calc(var(--ds-sizing-scale)*14);
+  --ds-sizing-15: calc(var(--ds-sizing-scale)*15);
+  --ds-sizing-18: calc(var(--ds-sizing-scale)*18);
+  --ds-sizing-22: calc(var(--ds-sizing-scale)*22);
+  --ds-sizing-26: calc(var(--ds-sizing-scale)*26);
+  --ds-sizing-30: calc(var(--ds-sizing-scale)*30);
+  --ds-sizing-scale: 0.25rem;
   --ds-border-width-default: 1px;
   --ds-border-width-highlight: 2px;
   --ds-shadow-xs: 0 0 1px 0 rgba(0,0,0,0.16), 0 1px 2px 0 rgba(0,0,0,0.12);
diff --git a/packages/theme/brand/portal.css b/packages/theme/brand/portal.css
index 77cf0cbd40..baf6c90950 100644
--- a/packages/theme/brand/portal.css
+++ b/packages/theme/brand/portal.css
@@ -787,58 +787,61 @@
 
 @layer ds.theme.semantic {
 :root {
-  --ds-disabled-opacity: 30%;
-  --ds-border-radius-sm: calc(var(--ds-border-radius-base)*0.5);
-  --ds-border-radius-md: calc(var(--ds-border-radius-base)*1);
-  --ds-border-radius-lg: calc(var(--ds-border-radius-base)*2);
-  --ds-border-radius-xl: calc(var(--ds-border-radius-base)*3);
-  --ds-border-radius-2xl: calc(var(--ds-border-radius-base)*4);
-  --ds-border-radius-3xl: calc(var(--ds-border-radius-base)*6);
-  --ds-border-radius-4xl: calc(var(--ds-border-radius-base)*8);
-  --ds-border-radius-full: 624.9375rem;
+  --ds-border-radius-1: min( var(--ds-border-radius-base) , var(--ds-border-radius-scale) *1);
+  --ds-border-radius-2: min( var(--ds-border-radius-base) , var(--ds-border-radius-scale) *2);
+  --ds-border-radius-3: min( var(--ds-border-radius-base) , var(--ds-border-radius-scale) *5);
+  --ds-border-radius-4: var(--ds-border-radius-base);
+  --ds-border-radius-5: 624.9375rem;
   --ds-border-radius-base: 0.25rem;
-  --ds-spacing-0: calc(var(--ds-spacing-base)*0);
-  --ds-spacing-1: calc(var(--ds-spacing-base)*1);
-  --ds-spacing-2: calc(var(--ds-spacing-base)*2);
-  --ds-spacing-3: calc(var(--ds-spacing-base)*3);
-  --ds-spacing-4: calc(var(--ds-spacing-base)*4);
-  --ds-spacing-5: calc(var(--ds-spacing-base)*5);
-  --ds-spacing-6: calc(var(--ds-spacing-base)*6);
-  --ds-spacing-7: calc(var(--ds-spacing-base)*7);
-  --ds-spacing-8: calc(var(--ds-spacing-base)*8);
-  --ds-spacing-9: calc(var(--ds-spacing-base)*9);
-  --ds-spacing-10: calc(var(--ds-spacing-base)*10);
-  --ds-spacing-11: calc(var(--ds-spacing-base)*11);
-  --ds-spacing-12: calc(var(--ds-spacing-base)*12);
-  --ds-spacing-13: calc(var(--ds-spacing-base)*13);
-  --ds-spacing-14: calc(var(--ds-spacing-base)*14);
-  --ds-spacing-15: calc(var(--ds-spacing-base)*15);
-  --ds-spacing-18: calc(var(--ds-spacing-base)*18);
-  --ds-spacing-22: calc(var(--ds-spacing-base)*22);
-  --ds-spacing-26: calc(var(--ds-spacing-base)*26);
-  --ds-spacing-30: calc(var(--ds-spacing-base)*30);
-  --ds-spacing-base: 0.25rem;
-  --ds-sizing-0: calc(var(--ds-sizing-base)*0);
-  --ds-sizing-1: calc(var(--ds-sizing-base)*1);
-  --ds-sizing-2: calc(var(--ds-sizing-base)*2);
-  --ds-sizing-3: calc(var(--ds-sizing-base)*3);
-  --ds-sizing-4: calc(var(--ds-sizing-base)*4);
-  --ds-sizing-5: calc(var(--ds-sizing-base)*5);
-  --ds-sizing-6: calc(var(--ds-sizing-base)*6);
-  --ds-sizing-7: calc(var(--ds-sizing-base)*7);
-  --ds-sizing-8: calc(var(--ds-sizing-base)*8);
-  --ds-sizing-9: calc(var(--ds-sizing-base)*9);
-  --ds-sizing-10: calc(var(--ds-sizing-base)*10);
-  --ds-sizing-11: calc(var(--ds-sizing-base)*11);
-  --ds-sizing-12: calc(var(--ds-sizing-base)*12);
-  --ds-sizing-13: calc(var(--ds-sizing-base)*13);
-  --ds-sizing-14: calc(var(--ds-sizing-base)*14);
-  --ds-sizing-15: calc(var(--ds-sizing-base)*15);
-  --ds-sizing-18: calc(var(--ds-sizing-base)*18);
-  --ds-sizing-22: calc(var(--ds-sizing-base)*22);
-  --ds-sizing-26: calc(var(--ds-sizing-base)*26);
-  --ds-sizing-30: calc(var(--ds-sizing-base)*30);
-  --ds-sizing-base: 0.25rem;
+  --ds-border-radius-scale: 0.25rem;
+  --ds-border-radius-sm: var(--ds-border-radius-1);
+  --ds-border-radius-md: var(--ds-border-radius-2);
+  --ds-border-radius-lg: var(--ds-border-radius-3);
+  --ds-border-radius-default: var(--ds-border-radius-4);
+  --ds-border-radius-full: var(--ds-border-radius-5);
+  --ds-disabled-opacity: 30%;
+  --ds-spacing-0: calc(var(--ds-spacing-scale)*0);
+  --ds-spacing-1: calc(var(--ds-spacing-scale)*1);
+  --ds-spacing-2: calc(var(--ds-spacing-scale)*2);
+  --ds-spacing-3: calc(var(--ds-spacing-scale)*3);
+  --ds-spacing-4: calc(var(--ds-spacing-scale)*4);
+  --ds-spacing-5: calc(var(--ds-spacing-scale)*5);
+  --ds-spacing-6: calc(var(--ds-spacing-scale)*6);
+  --ds-spacing-7: calc(var(--ds-spacing-scale)*7);
+  --ds-spacing-8: calc(var(--ds-spacing-scale)*8);
+  --ds-spacing-9: calc(var(--ds-spacing-scale)*9);
+  --ds-spacing-10: calc(var(--ds-spacing-scale)*10);
+  --ds-spacing-11: calc(var(--ds-spacing-scale)*11);
+  --ds-spacing-12: calc(var(--ds-spacing-scale)*12);
+  --ds-spacing-13: calc(var(--ds-spacing-scale)*13);
+  --ds-spacing-14: calc(var(--ds-spacing-scale)*14);
+  --ds-spacing-15: calc(var(--ds-spacing-scale)*15);
+  --ds-spacing-18: calc(var(--ds-spacing-scale)*18);
+  --ds-spacing-22: calc(var(--ds-spacing-scale)*22);
+  --ds-spacing-26: calc(var(--ds-spacing-scale)*26);
+  --ds-spacing-30: calc(var(--ds-spacing-scale)*30);
+  --ds-spacing-scale: 0.25rem;
+  --ds-sizing-0: calc(var(--ds-sizing-scale)*0);
+  --ds-sizing-1: calc(var(--ds-sizing-scale)*1);
+  --ds-sizing-2: calc(var(--ds-sizing-scale)*2);
+  --ds-sizing-3: calc(var(--ds-sizing-scale)*3);
+  --ds-sizing-4: calc(var(--ds-sizing-scale)*4);
+  --ds-sizing-5: calc(var(--ds-sizing-scale)*5);
+  --ds-sizing-6: calc(var(--ds-sizing-scale)*6);
+  --ds-sizing-7: calc(var(--ds-sizing-scale)*7);
+  --ds-sizing-8: calc(var(--ds-sizing-scale)*8);
+  --ds-sizing-9: calc(var(--ds-sizing-scale)*9);
+  --ds-sizing-10: calc(var(--ds-sizing-scale)*10);
+  --ds-sizing-11: calc(var(--ds-sizing-scale)*11);
+  --ds-sizing-12: calc(var(--ds-sizing-scale)*12);
+  --ds-sizing-13: calc(var(--ds-sizing-scale)*13);
+  --ds-sizing-14: calc(var(--ds-sizing-scale)*14);
+  --ds-sizing-15: calc(var(--ds-sizing-scale)*15);
+  --ds-sizing-18: calc(var(--ds-sizing-scale)*18);
+  --ds-sizing-22: calc(var(--ds-sizing-scale)*22);
+  --ds-sizing-26: calc(var(--ds-sizing-scale)*26);
+  --ds-sizing-30: calc(var(--ds-sizing-scale)*30);
+  --ds-sizing-scale: 0.25rem;
   --ds-border-width-default: 1px;
   --ds-border-width-highlight: 2px;
   --ds-shadow-xs: 0 0 1px 0 rgba(0,0,0,0.16), 0 1px 2px 0 rgba(0,0,0,0.12);
diff --git a/packages/theme/brand/portal/semantic.css b/packages/theme/brand/portal/semantic.css
index 5a7b277320..44f8f9a669 100644
--- a/packages/theme/brand/portal/semantic.css
+++ b/packages/theme/brand/portal/semantic.css
@@ -4,58 +4,61 @@
 
 @layer ds.theme.semantic {
 :root {
-  --ds-disabled-opacity: 30%;
-  --ds-border-radius-sm: calc(var(--ds-border-radius-base)*0.5);
-  --ds-border-radius-md: calc(var(--ds-border-radius-base)*1);
-  --ds-border-radius-lg: calc(var(--ds-border-radius-base)*2);
-  --ds-border-radius-xl: calc(var(--ds-border-radius-base)*3);
-  --ds-border-radius-2xl: calc(var(--ds-border-radius-base)*4);
-  --ds-border-radius-3xl: calc(var(--ds-border-radius-base)*6);
-  --ds-border-radius-4xl: calc(var(--ds-border-radius-base)*8);
-  --ds-border-radius-full: 624.9375rem;
+  --ds-border-radius-1: min( var(--ds-border-radius-base) , var(--ds-border-radius-scale) *1);
+  --ds-border-radius-2: min( var(--ds-border-radius-base) , var(--ds-border-radius-scale) *2);
+  --ds-border-radius-3: min( var(--ds-border-radius-base) , var(--ds-border-radius-scale) *5);
+  --ds-border-radius-4: var(--ds-border-radius-base);
+  --ds-border-radius-5: 624.9375rem;
   --ds-border-radius-base: 0.25rem;
-  --ds-spacing-0: calc(var(--ds-spacing-base)*0);
-  --ds-spacing-1: calc(var(--ds-spacing-base)*1);
-  --ds-spacing-2: calc(var(--ds-spacing-base)*2);
-  --ds-spacing-3: calc(var(--ds-spacing-base)*3);
-  --ds-spacing-4: calc(var(--ds-spacing-base)*4);
-  --ds-spacing-5: calc(var(--ds-spacing-base)*5);
-  --ds-spacing-6: calc(var(--ds-spacing-base)*6);
-  --ds-spacing-7: calc(var(--ds-spacing-base)*7);
-  --ds-spacing-8: calc(var(--ds-spacing-base)*8);
-  --ds-spacing-9: calc(var(--ds-spacing-base)*9);
-  --ds-spacing-10: calc(var(--ds-spacing-base)*10);
-  --ds-spacing-11: calc(var(--ds-spacing-base)*11);
-  --ds-spacing-12: calc(var(--ds-spacing-base)*12);
-  --ds-spacing-13: calc(var(--ds-spacing-base)*13);
-  --ds-spacing-14: calc(var(--ds-spacing-base)*14);
-  --ds-spacing-15: calc(var(--ds-spacing-base)*15);
-  --ds-spacing-18: calc(var(--ds-spacing-base)*18);
-  --ds-spacing-22: calc(var(--ds-spacing-base)*22);
-  --ds-spacing-26: calc(var(--ds-spacing-base)*26);
-  --ds-spacing-30: calc(var(--ds-spacing-base)*30);
-  --ds-spacing-base: 0.25rem;
-  --ds-sizing-0: calc(var(--ds-sizing-base)*0);
-  --ds-sizing-1: calc(var(--ds-sizing-base)*1);
-  --ds-sizing-2: calc(var(--ds-sizing-base)*2);
-  --ds-sizing-3: calc(var(--ds-sizing-base)*3);
-  --ds-sizing-4: calc(var(--ds-sizing-base)*4);
-  --ds-sizing-5: calc(var(--ds-sizing-base)*5);
-  --ds-sizing-6: calc(var(--ds-sizing-base)*6);
-  --ds-sizing-7: calc(var(--ds-sizing-base)*7);
-  --ds-sizing-8: calc(var(--ds-sizing-base)*8);
-  --ds-sizing-9: calc(var(--ds-sizing-base)*9);
-  --ds-sizing-10: calc(var(--ds-sizing-base)*10);
-  --ds-sizing-11: calc(var(--ds-sizing-base)*11);
-  --ds-sizing-12: calc(var(--ds-sizing-base)*12);
-  --ds-sizing-13: calc(var(--ds-sizing-base)*13);
-  --ds-sizing-14: calc(var(--ds-sizing-base)*14);
-  --ds-sizing-15: calc(var(--ds-sizing-base)*15);
-  --ds-sizing-18: calc(var(--ds-sizing-base)*18);
-  --ds-sizing-22: calc(var(--ds-sizing-base)*22);
-  --ds-sizing-26: calc(var(--ds-sizing-base)*26);
-  --ds-sizing-30: calc(var(--ds-sizing-base)*30);
-  --ds-sizing-base: 0.25rem;
+  --ds-border-radius-scale: 0.25rem;
+  --ds-border-radius-sm: var(--ds-border-radius-1);
+  --ds-border-radius-md: var(--ds-border-radius-2);
+  --ds-border-radius-lg: var(--ds-border-radius-3);
+  --ds-border-radius-default: var(--ds-border-radius-4);
+  --ds-border-radius-full: var(--ds-border-radius-5);
+  --ds-disabled-opacity: 30%;
+  --ds-spacing-0: calc(var(--ds-spacing-scale)*0);
+  --ds-spacing-1: calc(var(--ds-spacing-scale)*1);
+  --ds-spacing-2: calc(var(--ds-spacing-scale)*2);
+  --ds-spacing-3: calc(var(--ds-spacing-scale)*3);
+  --ds-spacing-4: calc(var(--ds-spacing-scale)*4);
+  --ds-spacing-5: calc(var(--ds-spacing-scale)*5);
+  --ds-spacing-6: calc(var(--ds-spacing-scale)*6);
+  --ds-spacing-7: calc(var(--ds-spacing-scale)*7);
+  --ds-spacing-8: calc(var(--ds-spacing-scale)*8);
+  --ds-spacing-9: calc(var(--ds-spacing-scale)*9);
+  --ds-spacing-10: calc(var(--ds-spacing-scale)*10);
+  --ds-spacing-11: calc(var(--ds-spacing-scale)*11);
+  --ds-spacing-12: calc(var(--ds-spacing-scale)*12);
+  --ds-spacing-13: calc(var(--ds-spacing-scale)*13);
+  --ds-spacing-14: calc(var(--ds-spacing-scale)*14);
+  --ds-spacing-15: calc(var(--ds-spacing-scale)*15);
+  --ds-spacing-18: calc(var(--ds-spacing-scale)*18);
+  --ds-spacing-22: calc(var(--ds-spacing-scale)*22);
+  --ds-spacing-26: calc(var(--ds-spacing-scale)*26);
+  --ds-spacing-30: calc(var(--ds-spacing-scale)*30);
+  --ds-spacing-scale: 0.25rem;
+  --ds-sizing-0: calc(var(--ds-sizing-scale)*0);
+  --ds-sizing-1: calc(var(--ds-sizing-scale)*1);
+  --ds-sizing-2: calc(var(--ds-sizing-scale)*2);
+  --ds-sizing-3: calc(var(--ds-sizing-scale)*3);
+  --ds-sizing-4: calc(var(--ds-sizing-scale)*4);
+  --ds-sizing-5: calc(var(--ds-sizing-scale)*5);
+  --ds-sizing-6: calc(var(--ds-sizing-scale)*6);
+  --ds-sizing-7: calc(var(--ds-sizing-scale)*7);
+  --ds-sizing-8: calc(var(--ds-sizing-scale)*8);
+  --ds-sizing-9: calc(var(--ds-sizing-scale)*9);
+  --ds-sizing-10: calc(var(--ds-sizing-scale)*10);
+  --ds-sizing-11: calc(var(--ds-sizing-scale)*11);
+  --ds-sizing-12: calc(var(--ds-sizing-scale)*12);
+  --ds-sizing-13: calc(var(--ds-sizing-scale)*13);
+  --ds-sizing-14: calc(var(--ds-sizing-scale)*14);
+  --ds-sizing-15: calc(var(--ds-sizing-scale)*15);
+  --ds-sizing-18: calc(var(--ds-sizing-scale)*18);
+  --ds-sizing-22: calc(var(--ds-sizing-scale)*22);
+  --ds-sizing-26: calc(var(--ds-sizing-scale)*26);
+  --ds-sizing-30: calc(var(--ds-sizing-scale)*30);
+  --ds-sizing-scale: 0.25rem;
   --ds-border-width-default: 1px;
   --ds-border-width-highlight: 2px;
   --ds-shadow-xs: 0 0 1px 0 rgba(0,0,0,0.16), 0 1px 2px 0 rgba(0,0,0,0.12);
diff --git a/packages/theme/brand/uutilsynet.css b/packages/theme/brand/uutilsynet.css
index 736ea63b2d..381e03d1a8 100644
--- a/packages/theme/brand/uutilsynet.css
+++ b/packages/theme/brand/uutilsynet.css
@@ -787,58 +787,61 @@
 
 @layer ds.theme.semantic {
 :root {
-  --ds-disabled-opacity: 30%;
-  --ds-border-radius-sm: calc(var(--ds-border-radius-base)*0.5);
-  --ds-border-radius-md: calc(var(--ds-border-radius-base)*1);
-  --ds-border-radius-lg: calc(var(--ds-border-radius-base)*2);
-  --ds-border-radius-xl: calc(var(--ds-border-radius-base)*3);
-  --ds-border-radius-2xl: calc(var(--ds-border-radius-base)*4);
-  --ds-border-radius-3xl: calc(var(--ds-border-radius-base)*6);
-  --ds-border-radius-4xl: calc(var(--ds-border-radius-base)*8);
-  --ds-border-radius-full: 624.9375rem;
+  --ds-border-radius-1: min( var(--ds-border-radius-base) , var(--ds-border-radius-scale) *1);
+  --ds-border-radius-2: min( var(--ds-border-radius-base) , var(--ds-border-radius-scale) *2);
+  --ds-border-radius-3: min( var(--ds-border-radius-base) , var(--ds-border-radius-scale) *5);
+  --ds-border-radius-4: var(--ds-border-radius-base);
+  --ds-border-radius-5: 624.9375rem;
   --ds-border-radius-base: 0.25rem;
-  --ds-spacing-0: calc(var(--ds-spacing-base)*0);
-  --ds-spacing-1: calc(var(--ds-spacing-base)*1);
-  --ds-spacing-2: calc(var(--ds-spacing-base)*2);
-  --ds-spacing-3: calc(var(--ds-spacing-base)*3);
-  --ds-spacing-4: calc(var(--ds-spacing-base)*4);
-  --ds-spacing-5: calc(var(--ds-spacing-base)*5);
-  --ds-spacing-6: calc(var(--ds-spacing-base)*6);
-  --ds-spacing-7: calc(var(--ds-spacing-base)*7);
-  --ds-spacing-8: calc(var(--ds-spacing-base)*8);
-  --ds-spacing-9: calc(var(--ds-spacing-base)*9);
-  --ds-spacing-10: calc(var(--ds-spacing-base)*10);
-  --ds-spacing-11: calc(var(--ds-spacing-base)*11);
-  --ds-spacing-12: calc(var(--ds-spacing-base)*12);
-  --ds-spacing-13: calc(var(--ds-spacing-base)*13);
-  --ds-spacing-14: calc(var(--ds-spacing-base)*14);
-  --ds-spacing-15: calc(var(--ds-spacing-base)*15);
-  --ds-spacing-18: calc(var(--ds-spacing-base)*18);
-  --ds-spacing-22: calc(var(--ds-spacing-base)*22);
-  --ds-spacing-26: calc(var(--ds-spacing-base)*26);
-  --ds-spacing-30: calc(var(--ds-spacing-base)*30);
-  --ds-spacing-base: 0.25rem;
-  --ds-sizing-0: calc(var(--ds-sizing-base)*0);
-  --ds-sizing-1: calc(var(--ds-sizing-base)*1);
-  --ds-sizing-2: calc(var(--ds-sizing-base)*2);
-  --ds-sizing-3: calc(var(--ds-sizing-base)*3);
-  --ds-sizing-4: calc(var(--ds-sizing-base)*4);
-  --ds-sizing-5: calc(var(--ds-sizing-base)*5);
-  --ds-sizing-6: calc(var(--ds-sizing-base)*6);
-  --ds-sizing-7: calc(var(--ds-sizing-base)*7);
-  --ds-sizing-8: calc(var(--ds-sizing-base)*8);
-  --ds-sizing-9: calc(var(--ds-sizing-base)*9);
-  --ds-sizing-10: calc(var(--ds-sizing-base)*10);
-  --ds-sizing-11: calc(var(--ds-sizing-base)*11);
-  --ds-sizing-12: calc(var(--ds-sizing-base)*12);
-  --ds-sizing-13: calc(var(--ds-sizing-base)*13);
-  --ds-sizing-14: calc(var(--ds-sizing-base)*14);
-  --ds-sizing-15: calc(var(--ds-sizing-base)*15);
-  --ds-sizing-18: calc(var(--ds-sizing-base)*18);
-  --ds-sizing-22: calc(var(--ds-sizing-base)*22);
-  --ds-sizing-26: calc(var(--ds-sizing-base)*26);
-  --ds-sizing-30: calc(var(--ds-sizing-base)*30);
-  --ds-sizing-base: 0.25rem;
+  --ds-border-radius-scale: 0.25rem;
+  --ds-border-radius-sm: var(--ds-border-radius-1);
+  --ds-border-radius-md: var(--ds-border-radius-2);
+  --ds-border-radius-lg: var(--ds-border-radius-3);
+  --ds-border-radius-default: var(--ds-border-radius-4);
+  --ds-border-radius-full: var(--ds-border-radius-5);
+  --ds-disabled-opacity: 30%;
+  --ds-spacing-0: calc(var(--ds-spacing-scale)*0);
+  --ds-spacing-1: calc(var(--ds-spacing-scale)*1);
+  --ds-spacing-2: calc(var(--ds-spacing-scale)*2);
+  --ds-spacing-3: calc(var(--ds-spacing-scale)*3);
+  --ds-spacing-4: calc(var(--ds-spacing-scale)*4);
+  --ds-spacing-5: calc(var(--ds-spacing-scale)*5);
+  --ds-spacing-6: calc(var(--ds-spacing-scale)*6);
+  --ds-spacing-7: calc(var(--ds-spacing-scale)*7);
+  --ds-spacing-8: calc(var(--ds-spacing-scale)*8);
+  --ds-spacing-9: calc(var(--ds-spacing-scale)*9);
+  --ds-spacing-10: calc(var(--ds-spacing-scale)*10);
+  --ds-spacing-11: calc(var(--ds-spacing-scale)*11);
+  --ds-spacing-12: calc(var(--ds-spacing-scale)*12);
+  --ds-spacing-13: calc(var(--ds-spacing-scale)*13);
+  --ds-spacing-14: calc(var(--ds-spacing-scale)*14);
+  --ds-spacing-15: calc(var(--ds-spacing-scale)*15);
+  --ds-spacing-18: calc(var(--ds-spacing-scale)*18);
+  --ds-spacing-22: calc(var(--ds-spacing-scale)*22);
+  --ds-spacing-26: calc(var(--ds-spacing-scale)*26);
+  --ds-spacing-30: calc(var(--ds-spacing-scale)*30);
+  --ds-spacing-scale: 0.25rem;
+  --ds-sizing-0: calc(var(--ds-sizing-scale)*0);
+  --ds-sizing-1: calc(var(--ds-sizing-scale)*1);
+  --ds-sizing-2: calc(var(--ds-sizing-scale)*2);
+  --ds-sizing-3: calc(var(--ds-sizing-scale)*3);
+  --ds-sizing-4: calc(var(--ds-sizing-scale)*4);
+  --ds-sizing-5: calc(var(--ds-sizing-scale)*5);
+  --ds-sizing-6: calc(var(--ds-sizing-scale)*6);
+  --ds-sizing-7: calc(var(--ds-sizing-scale)*7);
+  --ds-sizing-8: calc(var(--ds-sizing-scale)*8);
+  --ds-sizing-9: calc(var(--ds-sizing-scale)*9);
+  --ds-sizing-10: calc(var(--ds-sizing-scale)*10);
+  --ds-sizing-11: calc(var(--ds-sizing-scale)*11);
+  --ds-sizing-12: calc(var(--ds-sizing-scale)*12);
+  --ds-sizing-13: calc(var(--ds-sizing-scale)*13);
+  --ds-sizing-14: calc(var(--ds-sizing-scale)*14);
+  --ds-sizing-15: calc(var(--ds-sizing-scale)*15);
+  --ds-sizing-18: calc(var(--ds-sizing-scale)*18);
+  --ds-sizing-22: calc(var(--ds-sizing-scale)*22);
+  --ds-sizing-26: calc(var(--ds-sizing-scale)*26);
+  --ds-sizing-30: calc(var(--ds-sizing-scale)*30);
+  --ds-sizing-scale: 0.25rem;
   --ds-border-width-default: 1px;
   --ds-border-width-highlight: 2px;
   --ds-shadow-xs: 0 0 1px 0 rgba(0,0,0,0.16), 0 1px 2px 0 rgba(0,0,0,0.12);
diff --git a/packages/theme/brand/uutilsynet/semantic.css b/packages/theme/brand/uutilsynet/semantic.css
index 5a7b277320..44f8f9a669 100644
--- a/packages/theme/brand/uutilsynet/semantic.css
+++ b/packages/theme/brand/uutilsynet/semantic.css
@@ -4,58 +4,61 @@
 
 @layer ds.theme.semantic {
 :root {
-  --ds-disabled-opacity: 30%;
-  --ds-border-radius-sm: calc(var(--ds-border-radius-base)*0.5);
-  --ds-border-radius-md: calc(var(--ds-border-radius-base)*1);
-  --ds-border-radius-lg: calc(var(--ds-border-radius-base)*2);
-  --ds-border-radius-xl: calc(var(--ds-border-radius-base)*3);
-  --ds-border-radius-2xl: calc(var(--ds-border-radius-base)*4);
-  --ds-border-radius-3xl: calc(var(--ds-border-radius-base)*6);
-  --ds-border-radius-4xl: calc(var(--ds-border-radius-base)*8);
-  --ds-border-radius-full: 624.9375rem;
+  --ds-border-radius-1: min( var(--ds-border-radius-base) , var(--ds-border-radius-scale) *1);
+  --ds-border-radius-2: min( var(--ds-border-radius-base) , var(--ds-border-radius-scale) *2);
+  --ds-border-radius-3: min( var(--ds-border-radius-base) , var(--ds-border-radius-scale) *5);
+  --ds-border-radius-4: var(--ds-border-radius-base);
+  --ds-border-radius-5: 624.9375rem;
   --ds-border-radius-base: 0.25rem;
-  --ds-spacing-0: calc(var(--ds-spacing-base)*0);
-  --ds-spacing-1: calc(var(--ds-spacing-base)*1);
-  --ds-spacing-2: calc(var(--ds-spacing-base)*2);
-  --ds-spacing-3: calc(var(--ds-spacing-base)*3);
-  --ds-spacing-4: calc(var(--ds-spacing-base)*4);
-  --ds-spacing-5: calc(var(--ds-spacing-base)*5);
-  --ds-spacing-6: calc(var(--ds-spacing-base)*6);
-  --ds-spacing-7: calc(var(--ds-spacing-base)*7);
-  --ds-spacing-8: calc(var(--ds-spacing-base)*8);
-  --ds-spacing-9: calc(var(--ds-spacing-base)*9);
-  --ds-spacing-10: calc(var(--ds-spacing-base)*10);
-  --ds-spacing-11: calc(var(--ds-spacing-base)*11);
-  --ds-spacing-12: calc(var(--ds-spacing-base)*12);
-  --ds-spacing-13: calc(var(--ds-spacing-base)*13);
-  --ds-spacing-14: calc(var(--ds-spacing-base)*14);
-  --ds-spacing-15: calc(var(--ds-spacing-base)*15);
-  --ds-spacing-18: calc(var(--ds-spacing-base)*18);
-  --ds-spacing-22: calc(var(--ds-spacing-base)*22);
-  --ds-spacing-26: calc(var(--ds-spacing-base)*26);
-  --ds-spacing-30: calc(var(--ds-spacing-base)*30);
-  --ds-spacing-base: 0.25rem;
-  --ds-sizing-0: calc(var(--ds-sizing-base)*0);
-  --ds-sizing-1: calc(var(--ds-sizing-base)*1);
-  --ds-sizing-2: calc(var(--ds-sizing-base)*2);
-  --ds-sizing-3: calc(var(--ds-sizing-base)*3);
-  --ds-sizing-4: calc(var(--ds-sizing-base)*4);
-  --ds-sizing-5: calc(var(--ds-sizing-base)*5);
-  --ds-sizing-6: calc(var(--ds-sizing-base)*6);
-  --ds-sizing-7: calc(var(--ds-sizing-base)*7);
-  --ds-sizing-8: calc(var(--ds-sizing-base)*8);
-  --ds-sizing-9: calc(var(--ds-sizing-base)*9);
-  --ds-sizing-10: calc(var(--ds-sizing-base)*10);
-  --ds-sizing-11: calc(var(--ds-sizing-base)*11);
-  --ds-sizing-12: calc(var(--ds-sizing-base)*12);
-  --ds-sizing-13: calc(var(--ds-sizing-base)*13);
-  --ds-sizing-14: calc(var(--ds-sizing-base)*14);
-  --ds-sizing-15: calc(var(--ds-sizing-base)*15);
-  --ds-sizing-18: calc(var(--ds-sizing-base)*18);
-  --ds-sizing-22: calc(var(--ds-sizing-base)*22);
-  --ds-sizing-26: calc(var(--ds-sizing-base)*26);
-  --ds-sizing-30: calc(var(--ds-sizing-base)*30);
-  --ds-sizing-base: 0.25rem;
+  --ds-border-radius-scale: 0.25rem;
+  --ds-border-radius-sm: var(--ds-border-radius-1);
+  --ds-border-radius-md: var(--ds-border-radius-2);
+  --ds-border-radius-lg: var(--ds-border-radius-3);
+  --ds-border-radius-default: var(--ds-border-radius-4);
+  --ds-border-radius-full: var(--ds-border-radius-5);
+  --ds-disabled-opacity: 30%;
+  --ds-spacing-0: calc(var(--ds-spacing-scale)*0);
+  --ds-spacing-1: calc(var(--ds-spacing-scale)*1);
+  --ds-spacing-2: calc(var(--ds-spacing-scale)*2);
+  --ds-spacing-3: calc(var(--ds-spacing-scale)*3);
+  --ds-spacing-4: calc(var(--ds-spacing-scale)*4);
+  --ds-spacing-5: calc(var(--ds-spacing-scale)*5);
+  --ds-spacing-6: calc(var(--ds-spacing-scale)*6);
+  --ds-spacing-7: calc(var(--ds-spacing-scale)*7);
+  --ds-spacing-8: calc(var(--ds-spacing-scale)*8);
+  --ds-spacing-9: calc(var(--ds-spacing-scale)*9);
+  --ds-spacing-10: calc(var(--ds-spacing-scale)*10);
+  --ds-spacing-11: calc(var(--ds-spacing-scale)*11);
+  --ds-spacing-12: calc(var(--ds-spacing-scale)*12);
+  --ds-spacing-13: calc(var(--ds-spacing-scale)*13);
+  --ds-spacing-14: calc(var(--ds-spacing-scale)*14);
+  --ds-spacing-15: calc(var(--ds-spacing-scale)*15);
+  --ds-spacing-18: calc(var(--ds-spacing-scale)*18);
+  --ds-spacing-22: calc(var(--ds-spacing-scale)*22);
+  --ds-spacing-26: calc(var(--ds-spacing-scale)*26);
+  --ds-spacing-30: calc(var(--ds-spacing-scale)*30);
+  --ds-spacing-scale: 0.25rem;
+  --ds-sizing-0: calc(var(--ds-sizing-scale)*0);
+  --ds-sizing-1: calc(var(--ds-sizing-scale)*1);
+  --ds-sizing-2: calc(var(--ds-sizing-scale)*2);
+  --ds-sizing-3: calc(var(--ds-sizing-scale)*3);
+  --ds-sizing-4: calc(var(--ds-sizing-scale)*4);
+  --ds-sizing-5: calc(var(--ds-sizing-scale)*5);
+  --ds-sizing-6: calc(var(--ds-sizing-scale)*6);
+  --ds-sizing-7: calc(var(--ds-sizing-scale)*7);
+  --ds-sizing-8: calc(var(--ds-sizing-scale)*8);
+  --ds-sizing-9: calc(var(--ds-sizing-scale)*9);
+  --ds-sizing-10: calc(var(--ds-sizing-scale)*10);
+  --ds-sizing-11: calc(var(--ds-sizing-scale)*11);
+  --ds-sizing-12: calc(var(--ds-sizing-scale)*12);
+  --ds-sizing-13: calc(var(--ds-sizing-scale)*13);
+  --ds-sizing-14: calc(var(--ds-sizing-scale)*14);
+  --ds-sizing-15: calc(var(--ds-sizing-scale)*15);
+  --ds-sizing-18: calc(var(--ds-sizing-scale)*18);
+  --ds-sizing-22: calc(var(--ds-sizing-scale)*22);
+  --ds-sizing-26: calc(var(--ds-sizing-scale)*26);
+  --ds-sizing-30: calc(var(--ds-sizing-scale)*30);
+  --ds-sizing-scale: 0.25rem;
   --ds-border-width-default: 1px;
   --ds-border-width-highlight: 2px;
   --ds-shadow-xs: 0 0 1px 0 rgba(0,0,0,0.16), 0 1px 2px 0 rgba(0,0,0,0.12);