diff --git a/apps/docs/content/2-foundations/1-design-tokens/3-typography.mdx b/apps/docs/content/2-foundations/1-design-tokens/3-typography.mdx
index b7d531553..72f2992cd 100644
--- a/apps/docs/content/2-foundations/1-design-tokens/3-typography.mdx
+++ b/apps/docs/content/2-foundations/1-design-tokens/3-typography.mdx
@@ -7,8 +7,8 @@ status: in-development
 
 ## Font Sizes
 
-<FontSizes />
+<FontSizesTable />
 
 ## Font Weights
 
-<FontWeights />
+<FontWeightsTable />
diff --git a/apps/docs/src/components/document/mdx.tsx b/apps/docs/src/components/document/mdx.tsx
index 4561e2f56..a37ffdf5d 100644
--- a/apps/docs/src/components/document/mdx.tsx
+++ b/apps/docs/src/components/document/mdx.tsx
@@ -1,8 +1,8 @@
 import { useMDXComponent } from 'next-contentlayer/hooks';
 import { Heading } from '../typography/heading';
 import { ColorPrimitives } from '@/components/document/color/color-primitives';
-import { FontSizes } from './typography/font-sizes';
-import { FontWeights } from './typography/font-weights';
+import { FontSizesTable } from './typography/font-sizes-table';
+import { FontWeightsTable } from './typography/font-weights-table';
 
 export type MdxProps = {
   code: string;
@@ -16,8 +16,8 @@ export function Mdx({ code }: MdxProps) {
       components={{
         h2: ({ children }) => <Heading as="h2">{children}</Heading>,
         ColorPrimitives: () => <ColorPrimitives />,
-        FontSizes: () => <FontSizes />,
-        FontWeights: () => <FontWeights />,
+        FontSizesTable: () => <FontSizesTable />,
+        FontWeightsTable: () => <FontWeightsTable />,
       }}
     />
   );
diff --git a/apps/docs/src/components/document/typography/font-sizes.tsx b/apps/docs/src/components/document/typography/font-sizes-table.tsx
similarity index 95%
rename from apps/docs/src/components/document/typography/font-sizes.tsx
rename to apps/docs/src/components/document/typography/font-sizes-table.tsx
index 6396d91b9..bef82c622 100644
--- a/apps/docs/src/components/document/typography/font-sizes.tsx
+++ b/apps/docs/src/components/document/typography/font-sizes-table.tsx
@@ -3,7 +3,7 @@ import { objectKeys } from 'ts-extras';
 import { TokenName } from '../color/token-name';
 import { Table, Td } from './table';
 
-export function FontSizes() {
+export function FontSizesTable() {
   return (
     <Table
       headers={['Token', 'Value', 'Example']}
diff --git a/apps/docs/src/components/document/typography/font-weights.tsx b/apps/docs/src/components/document/typography/font-weights-table.tsx
similarity index 95%
rename from apps/docs/src/components/document/typography/font-weights.tsx
rename to apps/docs/src/components/document/typography/font-weights-table.tsx
index 653a726f1..2c07d6478 100644
--- a/apps/docs/src/components/document/typography/font-weights.tsx
+++ b/apps/docs/src/components/document/typography/font-weights-table.tsx
@@ -3,7 +3,7 @@ import { objectKeys } from 'ts-extras';
 import { TokenName } from '../color/token-name';
 import { Table, Td } from './table';
 
-export function FontWeights() {
+export function FontWeightsTable() {
   return (
     <Table
       headers={['Token', 'Value', 'Example']}
diff --git a/packages/design/theme-builder/validation/schema/font-schema.ts b/packages/design/theme-builder/validation/schema/font-schema.ts
index ef5bcb331..a6ba66363 100644
--- a/packages/design/theme-builder/validation/schema/font-schema.ts
+++ b/packages/design/theme-builder/validation/schema/font-schema.ts
@@ -1,119 +1,121 @@
-import { z } from "zod";
+import { z } from 'zod';
 import {
   createStringArraySchema,
   createTokenSchema,
   createIntegerSchema,
   createNumberSchema,
   createRemSchema,
-} from "./shared.js";
+} from './shared.js';
 
 function createFontFamilySchema(name: string) {
   return createTokenSchema({
-    type: "fontFamily",
-    valueSchema: createStringArraySchema("Font family"),
-    name
-  })
+    type: 'fontFamily',
+    valueSchema: createStringArraySchema('Font family'),
+    name,
+  });
 }
 
-const fontFamilySchema = z.object({
-  "primary": createFontFamilySchema("primary"),
-  "secondary": createFontFamilySchema("secondary"),
-  "tertiary": createFontFamilySchema("tertiary")
-}).strict()
+const fontFamilySchema = z
+  .object({
+    primary: createFontFamilySchema('primary'),
+    secondary: createFontFamilySchema('secondary'),
+    tertiary: createFontFamilySchema('tertiary'),
+  })
+  .strict();
 
 function createFontSizeSchema(name: string) {
   return createTokenSchema({
-    type: "dimension",
-    valueSchema: createRemSchema("Font size"),
+    type: 'dimension',
+    valueSchema: createRemSchema('Font size'),
     name,
   });
 }
 
 const fontSizeSchema = z
   .object({
-    "100": createFontSizeSchema("100"),
-    "200": createFontSizeSchema("200"),
-    "300": createFontSizeSchema("300"),
-    "400": createFontSizeSchema("400"),
-    "500": createFontSizeSchema("500"),
-    "600": createFontSizeSchema("600"),
-    "700": createFontSizeSchema("700"),
-    "800": createFontSizeSchema("800"),
-    "900": createFontSizeSchema("900"),
-    "1000": createFontSizeSchema("1000"),
-    "1100": createFontSizeSchema("1100"),
-    "1200": createFontSizeSchema("1200"),
-    "1300": createFontSizeSchema("1300"),
+    '100': createFontSizeSchema('100'),
+    '200': createFontSizeSchema('200'),
+    '300': createFontSizeSchema('300'),
+    '400': createFontSizeSchema('400'),
+    '500': createFontSizeSchema('500'),
+    '600': createFontSizeSchema('600'),
+    '700': createFontSizeSchema('700'),
+    '800': createFontSizeSchema('800'),
+    '900': createFontSizeSchema('900'),
+    '1000': createFontSizeSchema('1000'),
+    '1100': createFontSizeSchema('1100'),
+    '1200': createFontSizeSchema('1200'),
+    '1300': createFontSizeSchema('1300'),
   })
   .strict();
 
 function createFontWeightSchema(name: string) {
   return createTokenSchema({
-    type: "fontWeight",
-    valueSchema: createIntegerSchema("Font weight"),
+    type: 'fontWeight',
+    valueSchema: createIntegerSchema('Font weight'),
     name,
   });
 }
 
 const fontWeightSchema = z
   .object({
-    "100": createFontWeightSchema("100"),
-    "200": createFontWeightSchema("200"),
-    "300": createFontWeightSchema("300"),
-    "400": createFontWeightSchema("400"),
-    "500": createFontWeightSchema("500"),
-    "600": createFontWeightSchema("600"),
-    "700": createFontWeightSchema("700"),
-    "800": createFontWeightSchema("800"),
-    "900": createFontWeightSchema("900"),
+    '100': createFontWeightSchema('100'),
+    '200': createFontWeightSchema('200'),
+    '300': createFontWeightSchema('300'),
+    '400': createFontWeightSchema('400'),
+    '500': createFontWeightSchema('500'),
+    '600': createFontWeightSchema('600'),
+    '700': createFontWeightSchema('700'),
+    '800': createFontWeightSchema('800'),
+    '900': createFontWeightSchema('900'),
   })
   .strict();
 
 function createFontLineHeightSchema(name: string) {
   return createTokenSchema({
-    type: "number",
-    valueSchema: createNumberSchema("Line height"),
+    type: 'number',
+    valueSchema: createNumberSchema('Line height'),
     name,
   });
 }
 
 const fontLineHeightSchema = z
   .object({
-    "50": createFontLineHeightSchema("50"),
-    "100": createFontLineHeightSchema("100"),
-    "200": createFontLineHeightSchema("200"),
-    "300": createFontLineHeightSchema("300"),
-    "400": createFontLineHeightSchema("400"),
-    "500": createFontLineHeightSchema("500"),
-    "600": createFontLineHeightSchema("600"),
-    "700": createFontLineHeightSchema("700"),
-    "800": createFontLineHeightSchema("800"),
-    "900": createFontLineHeightSchema("900"),
-    "1000": createFontLineHeightSchema("1000"),
-    "1100": createFontLineHeightSchema("1100"),
-    "1200": createFontLineHeightSchema("1200"),
-    "1300": createFontLineHeightSchema("1300"),
+    '50': createFontLineHeightSchema('50'),
+    '100': createFontLineHeightSchema('100'),
+    '200': createFontLineHeightSchema('200'),
+    '300': createFontLineHeightSchema('300'),
+    '400': createFontLineHeightSchema('400'),
+    '500': createFontLineHeightSchema('500'),
+    '600': createFontLineHeightSchema('600'),
+    '700': createFontLineHeightSchema('700'),
+    '800': createFontLineHeightSchema('800'),
+    '900': createFontLineHeightSchema('900'),
+    '1000': createFontLineHeightSchema('1000'),
+    '1100': createFontLineHeightSchema('1100'),
+    '1200': createFontLineHeightSchema('1200'),
+    '1300': createFontLineHeightSchema('1300'),
   })
   .strict();
 
 function createLetterSpacingSchema(name: string) {
   return createTokenSchema({
-    type: "dimension",
-    valueSchema: createRemSchema("Letter spacing"),
+    type: 'dimension',
+    valueSchema: createRemSchema('Letter spacing'),
     name,
   });
 }
 
 const letterSpacingSchema = z.object({
-  "100": createLetterSpacingSchema("100"),
-  "200": createLetterSpacingSchema("200"),
-  "300": createLetterSpacingSchema("300"),
-  "400": createLetterSpacingSchema("400"),
-  "500": createLetterSpacingSchema("500"),
-  "600": createLetterSpacingSchema("600"),
-  "700": createLetterSpacingSchema("700"),
-  "800": createLetterSpacingSchema("800"),
-  "900": createLetterSpacingSchema("900"),
+  '100': createLetterSpacingSchema('100'),
+  '200': createLetterSpacingSchema('200'),
+  '300': createLetterSpacingSchema('300'),
+  '400': createLetterSpacingSchema('400'),
+  '500': createLetterSpacingSchema('500'),
+  '600': createLetterSpacingSchema('600'),
+  '700': createLetterSpacingSchema('700'),
+  '800': createLetterSpacingSchema('800'),
+  '900': createLetterSpacingSchema('900'),
 });
 
 export const fontSchema = z
@@ -126,7 +128,7 @@ export const fontSchema = z
       letterSpacing: letterSpacingSchema,
     },
     {
-      required_error: "Color is required.",
-    }
+      required_error: 'Font is required.',
+    },
   )
   .strict();
diff --git a/packages/design/theme-builder/validation/schema/heading-schema.ts b/packages/design/theme-builder/validation/schema/heading-schema.ts
new file mode 100644
index 000000000..a7d14af96
--- /dev/null
+++ b/packages/design/theme-builder/validation/schema/heading-schema.ts
@@ -0,0 +1,23 @@
+import { z } from 'zod';
+import { createTypographySetSchema } from './shared.js';
+
+export const headingSchema = z
+  .object(
+    {
+      '2xs': createTypographySetSchema('2xs'),
+      xs: createTypographySetSchema('xs'),
+      sm: createTypographySetSchema('sm'),
+      md: createTypographySetSchema('md'),
+      lg: createTypographySetSchema('lg'),
+      xl: createTypographySetSchema('xl'),
+      '2xl': createTypographySetSchema('2xl'),
+      '3xl': createTypographySetSchema('3xl'),
+      '4xl': createTypographySetSchema('4xl'),
+      '5xl': createTypographySetSchema('5xl'),
+      '6xl': createTypographySetSchema('6xl'),
+    },
+    {
+      required_error: 'Heading is required.',
+    },
+  )
+  .strict();
diff --git a/packages/design/theme-builder/validation/schema/shared.ts b/packages/design/theme-builder/validation/schema/shared.ts
index 42453f5c7..1d5d9c61e 100644
--- a/packages/design/theme-builder/validation/schema/shared.ts
+++ b/packages/design/theme-builder/validation/schema/shared.ts
@@ -1,4 +1,4 @@
-import { z } from "zod";
+import { z } from 'zod';
 
 export function createTokenSchema({
   type,
@@ -21,16 +21,15 @@ export function createTokenSchema({
       },
       {
         required_error: `${name} is required.`,
-      }
+      },
     )
     .strict();
 }
 
 export function createStringSchema(name: string) {
-  return z
-    .string({
-      required_error: `${name} is required.`,
-    })
+  return z.string({
+    required_error: `${name} is required.`,
+  });
 }
 
 export function createStringArraySchema(name: string) {
@@ -38,7 +37,7 @@ export function createStringArraySchema(name: string) {
     .array(
       z.string({
         required_error: `${name} is required.`,
-      })
+      }),
     )
     .nonempty();
 }
@@ -46,9 +45,9 @@ export function createStringArraySchema(name: string) {
 export function createColorHexSchema() {
   return z
     .string({
-      required_error: "Color is required.",
+      required_error: 'Color is required.',
     })
-    .regex(/^#[0-9a-f]{6,8}$/, "Color must be a full lowercase hex value.");
+    .regex(/^#[0-9a-f]{6,8}$/, 'Color must be a full lowercase hex value.');
 }
 
 export function createPixelSchema(name: string) {
@@ -87,15 +86,53 @@ export function createShadowValueSchema(name: string) {
   return z
     .object(
       {
-        offsetX: createPixelSchema("Offset X"),
-        offsetY: createPixelSchema("Offset Y"),
-        blur: createPixelSchema("Blur"),
-        spread: createPixelSchema("Spread"),
+        offsetX: createPixelSchema('Offset X'),
+        offsetY: createPixelSchema('Offset Y'),
+        blur: createPixelSchema('Blur'),
+        spread: createPixelSchema('Spread'),
         color: createColorHexSchema(),
       },
       {
         required_error: `${name} is required.`,
-      }
+      },
+    )
+    .strict();
+}
+
+function createTypographyValueSchema(name: string) {
+  return z
+    .object(
+      {
+        fontFamily: createStringArraySchema('Font family'),
+        fontSize: createRemSchema('Font size'),
+        fontWeight: createNumberSchema('Font weight'),
+        lineHeight: createNumberSchema('Line height'),
+      },
+      {
+        required_error: `${name} is required.`,
+      },
+    )
+    .strict();
+}
+
+function createTypographySchema(name: string) {
+  return createTokenSchema({
+    type: 'typography',
+    valueSchema: createTypographyValueSchema(name),
+    name,
+  });
+}
+
+export function createTypographySetSchema(name: string) {
+  return z
+    .object(
+      {
+        regular: createTypographySchema('regular'),
+        bold: createTypographySchema('bold'),
+      },
+      {
+        required_error: `${name} is required.`,
+      },
     )
     .strict();
 }
diff --git a/packages/design/theme-builder/validation/schema/text-schema.ts b/packages/design/theme-builder/validation/schema/text-schema.ts
new file mode 100644
index 000000000..51383e8b4
--- /dev/null
+++ b/packages/design/theme-builder/validation/schema/text-schema.ts
@@ -0,0 +1,17 @@
+import { z } from 'zod';
+import { createTypographySetSchema } from './shared.js';
+
+export const textSchema = z
+  .object(
+    {
+      sm: createTypographySetSchema('sm'),
+      md: createTypographySetSchema('md'),
+      lg: createTypographySetSchema('lg'),
+      xl: createTypographySetSchema('xl'),
+      '2xl': createTypographySetSchema('2xl'),
+    },
+    {
+      required_error: 'Text is required.',
+    },
+  )
+  .strict();
diff --git a/packages/design/theme-builder/validation/schema/tokens-schema.ts b/packages/design/theme-builder/validation/schema/tokens-schema.ts
index 8bf9d3ecf..a1d6975d8 100644
--- a/packages/design/theme-builder/validation/schema/tokens-schema.ts
+++ b/packages/design/theme-builder/validation/schema/tokens-schema.ts
@@ -1,16 +1,18 @@
-import { z } from "zod";
+import { z } from 'zod';
 import {
   TokenError,
   TokensValidationError,
-} from "./tokens-validation-error.js";
-import { colorSchema } from "./color-schema.js";
-import { spaceSchema } from "./space-schema.js";
-import { fontSchema } from "./font-schema.js";
-import { screenSchema } from "./screen-schema.js";
-import { zIndexSchema } from "./z-index-schema.js";
-import { borderSchema } from "./border-schema.js";
-import { opacitySchema } from "./opacity-schema.js";
-import { shadowSchema } from "./shadow-schema.js";
+} from './tokens-validation-error.js';
+import { colorSchema } from './color-schema.js';
+import { spaceSchema } from './space-schema.js';
+import { fontSchema } from './font-schema.js';
+import { screenSchema } from './screen-schema.js';
+import { zIndexSchema } from './z-index-schema.js';
+import { borderSchema } from './border-schema.js';
+import { opacitySchema } from './opacity-schema.js';
+import { shadowSchema } from './shadow-schema.js';
+import { headingSchema } from './heading-schema.js';
+import { textSchema } from './text-schema.js';
 
 const primitiveSchema = z
   .object(
@@ -23,8 +25,10 @@ const primitiveSchema = z
       border: borderSchema,
       opacity: opacitySchema,
       shadow: shadowSchema,
+      heading: headingSchema,
+      text: textSchema,
     },
-    { required_error: "Primitive is required." }
+    { required_error: 'Primitive is required.' },
   )
   .strict();
 
@@ -43,7 +47,7 @@ export function validateDesignTokens({ tokens }: { tokens: unknown }) {
     const zodError = error as z.ZodError;
 
     const errors: TokenError[] = zodError.errors.map((error) => ({
-      path: error.path.join("."),
+      path: error.path.join('.'),
       message: error.message,
     }));
 
diff --git a/packages/design/tokens-builder/package.json b/packages/design/tokens-builder/package.json
index 6fbc303d9..8e8551d16 100644
--- a/packages/design/tokens-builder/package.json
+++ b/packages/design/tokens-builder/package.json
@@ -17,7 +17,8 @@
   "dependencies": {
     "camelcase": "^8.0.0",
     "lodash.clonedeepwith": "^4.5.0",
-    "style-dictionary": "4.0.0-prerelease.31"
+    "style-dictionary": "4.0.0-prerelease.31",
+    "ts-extras": "^0.11.0"
   },
   "devDependencies": {
     "@govie-ds/prettier-config": "workspace:^",
diff --git a/packages/design/tokens-builder/src/formatters/figma.ts b/packages/design/tokens-builder/src/formatters/figma.ts
index fd3311978..5bb1fe3ac 100644
--- a/packages/design/tokens-builder/src/formatters/figma.ts
+++ b/packages/design/tokens-builder/src/formatters/figma.ts
@@ -1,10 +1,11 @@
 import cloneDeepWith from 'lodash.clonedeepwith';
 import { minifyDictionary } from './minify-dictionary.js';
 import { FormatFnArguments } from 'style-dictionary/types';
+import { Tokens } from 'style-dictionary';
+import { objectKeys } from 'ts-extras';
 
 // TODO: implement as style dictionary transforms
-// TODO: type
-function stripReferenceTiers({ tokens }: any) {
+function stripReferenceTiers({ tokens }: Tokens) {
   return cloneDeepWith(tokens, (value) => {
     if (typeof value === 'string' && value.startsWith('{')) {
       return value.replace(/{(primitive|semantic|component)\./g, '{');
@@ -15,8 +16,7 @@ function stripReferenceTiers({ tokens }: any) {
 }
 
 // TODO: implement as style dictionary transforms
-// TODO: type
-function toDimension({ tokens }: any) {
+function toDimension({ tokens }: Tokens) {
   return cloneDeepWith(tokens, (value) => {
     if (value === 'fontWeight') {
       return 'dimension';
@@ -26,15 +26,49 @@ function toDimension({ tokens }: any) {
   });
 }
 
+type FigmaType = 'color' | 'number' | 'string' | 'boolean';
+
+function toValue(key: string, value: any) {
+  if (key === 'fontSize') {
+    return value.$value[key].replace('rem', '');
+  }
+
+  if (key === 'fontFamily') {
+    return value.$value[key].join(', ');
+  }
+
+  return value.$value[key];
+}
+
+// Convert composite JSON tokens to nested Figma groups
+function toGroups({ tokens }: Tokens) {
+  const types: Record<string, FigmaType> = {
+    fontFamily: 'string',
+    fontSize: 'number',
+    fontWeight: 'number',
+    lineHeight: 'number',
+  };
+
+  return cloneDeepWith(tokens, (value) => {
+    if (value.$type === 'typography') {
+      return objectKeys(value.$value).reduce((acc, key) => {
+        acc[key] = {
+          $type: types[key],
+          $value: toValue(key, value),
+        };
+
+        return acc;
+      }, {} as Tokens);
+    }
+
+    return undefined;
+  });
+}
+
 // TODO: implement as style dictionary transforms
-// TODO: type
-function toString({ tokens }: any) {
+function toString({ tokens }: Tokens) {
   return cloneDeepWith(tokens, (value) => {
-    if (
-      value === 'shadow' ||
-      value === 'typography' ||
-      value === 'fontFamily'
-    ) {
+    if (value === 'shadow' || value === 'fontFamily') {
       return 'string';
     }
 
@@ -53,9 +87,11 @@ export async function figmaFormatter({
     outputReferences: options.outputReferences,
   });
 
-  const cleanedTokens = toString({
-    tokens: toDimension({
-      tokens: stripReferenceTiers({ tokens }),
+  const cleanedTokens = toGroups({
+    tokens: toString({
+      tokens: toDimension({
+        tokens: stripReferenceTiers({ tokens }),
+      }),
     }),
   });
 
diff --git a/packages/design/tokens-builder/src/tokens-builder.ts b/packages/design/tokens-builder/src/tokens-builder.ts
index e41475982..80cd9f7e9 100644
--- a/packages/design/tokens-builder/src/tokens-builder.ts
+++ b/packages/design/tokens-builder/src/tokens-builder.ts
@@ -338,7 +338,7 @@ async function build({ source, tokens, platforms }: TokenBuilderOptions) {
       'shadow/css/shorthand',
       'letterSpacing/percentage',
       'fontSize/px',
-      'typography/css/shorthand',
+      // 'typography/css/shorthand',
     ],
   });
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b11301c71..990f8d832 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -375,6 +375,9 @@ importers:
       style-dictionary:
         specifier: 4.0.0-prerelease.31
         version: 4.0.0-prerelease.31
+      ts-extras:
+        specifier: ^0.11.0
+        version: 0.11.0
     devDependencies:
       '@govie-ds/prettier-config':
         specifier: workspace:^
diff --git a/tokens/tokens/light/primitive/heading.json b/tokens/tokens/light/primitive/heading.json
new file mode 100644
index 000000000..8e5fe0aff
--- /dev/null
+++ b/tokens/tokens/light/primitive/heading.json
@@ -0,0 +1,226 @@
+{
+  "primitive": {
+    "heading": {
+      "2xs": {
+        "regular": {
+          "$type": "typography",
+          "$value": {
+            "fontFamily": "{primitive.font.family.primary}",
+            "fontSize": "{primitive.font.size.300}",
+            "fontWeight": "{primitive.font.weight.400}",
+            "lineHeight": "{primitive.font.lineHeight.300}"
+          }
+        },
+        "bold": {
+          "$type": "typography",
+          "$value": {
+            "fontFamily": "{primitive.font.family.primary}",
+            "fontSize": "{primitive.font.size.300}",
+            "fontWeight": "{primitive.font.weight.700}",
+            "lineHeight": "{primitive.font.lineHeight.300}"
+          }
+        }
+      },
+      "xs": {
+        "regular": {
+          "$type": "typography",
+          "$value": {
+            "fontFamily": "{primitive.font.family.primary}",
+            "fontSize": "{primitive.font.size.400}",
+            "fontWeight": "{primitive.font.weight.400}",
+            "lineHeight": "{primitive.font.lineHeight.400}"
+          }
+        },
+        "bold": {
+          "$type": "typography",
+          "$value": {
+            "fontFamily": "{primitive.font.family.primary}",
+            "fontSize": "{primitive.font.size.400}",
+            "fontWeight": "{primitive.font.weight.700}",
+            "lineHeight": "{primitive.font.lineHeight.400}"
+          }
+        }
+      },
+      "sm": {
+        "regular": {
+          "$type": "typography",
+          "$value": {
+            "fontFamily": "{primitive.font.family.primary}",
+            "fontSize": "{primitive.font.size.500}",
+            "fontWeight": "{primitive.font.weight.400}",
+            "lineHeight": "{primitive.font.lineHeight.400}"
+          }
+        },
+        "bold": {
+          "$type": "typography",
+          "$value": {
+            "fontFamily": "{primitive.font.family.primary}",
+            "fontSize": "{primitive.font.size.500}",
+            "fontWeight": "{primitive.font.weight.700}",
+            "lineHeight": "{primitive.font.lineHeight.400}"
+          }
+        }
+      },
+      "md": {
+        "regular": {
+          "$type": "typography",
+          "$value": {
+            "fontFamily": "{primitive.font.family.primary}",
+            "fontSize": "{primitive.font.size.600}",
+            "fontWeight": "{primitive.font.weight.400}",
+            "lineHeight": "{primitive.font.lineHeight.500}"
+          }
+        },
+        "bold": {
+          "$type": "typography",
+          "$value": {
+            "fontFamily": "{primitive.font.family.primary}",
+            "fontSize": "{primitive.font.size.600}",
+            "fontWeight": "{primitive.font.weight.700}",
+            "lineHeight": "{primitive.font.lineHeight.500}"
+          }
+        }
+      },
+      "lg": {
+        "regular": {
+          "$type": "typography",
+          "$value": {
+            "fontFamily": "{primitive.font.family.primary}",
+            "fontSize": "{primitive.font.size.700}",
+            "fontWeight": "{primitive.font.weight.400}",
+            "lineHeight": "{primitive.font.lineHeight.600}"
+          }
+        },
+        "bold": {
+          "$type": "typography",
+          "$value": {
+            "fontFamily": "{primitive.font.family.primary}",
+            "fontSize": "{primitive.font.size.700}",
+            "fontWeight": "{primitive.font.weight.700}",
+            "lineHeight": "{primitive.font.lineHeight.600}"
+          }
+        }
+      },
+      "xl": {
+        "regular": {
+          "$type": "typography",
+          "$value": {
+            "fontFamily": "{primitive.font.family.primary}",
+            "fontSize": "{primitive.font.size.800}",
+            "fontWeight": "{primitive.font.weight.400}",
+            "lineHeight": "{primitive.font.lineHeight.700}"
+          }
+        },
+        "bold": {
+          "$type": "typography",
+          "$value": {
+            "fontFamily": "{primitive.font.family.primary}",
+            "fontSize": "{primitive.font.size.800}",
+            "fontWeight": "{primitive.font.weight.700}",
+            "lineHeight": "{primitive.font.lineHeight.700}"
+          }
+        }
+      },
+      "2xl": {
+        "regular": {
+          "$type": "typography",
+          "$value": {
+            "fontFamily": "{primitive.font.family.primary}",
+            "fontSize": "{primitive.font.size.900}",
+            "fontWeight": "{primitive.font.weight.400}",
+            "lineHeight": "{primitive.font.lineHeight.800}"
+          }
+        },
+        "bold": {
+          "$type": "typography",
+          "$value": {
+            "fontFamily": "{primitive.font.family.primary}",
+            "fontSize": "{primitive.font.size.900}",
+            "fontWeight": "{primitive.font.weight.700}",
+            "lineHeight": "{primitive.font.lineHeight.800}"
+          }
+        }
+      },
+      "3xl": {
+        "regular": {
+          "$type": "typography",
+          "$value": {
+            "fontFamily": "{primitive.font.family.primary}",
+            "fontSize": "{primitive.font.size.1000}",
+            "fontWeight": "{primitive.font.weight.400}",
+            "lineHeight": "{primitive.font.lineHeight.900}"
+          }
+        },
+        "bold": {
+          "$type": "typography",
+          "$value": {
+            "fontFamily": "{primitive.font.family.primary}",
+            "fontSize": "{primitive.font.size.1000}",
+            "fontWeight": "{primitive.font.weight.700}",
+            "lineHeight": "{primitive.font.lineHeight.900}"
+          }
+        }
+      },
+      "4xl": {
+        "regular": {
+          "$type": "typography",
+          "$value": {
+            "fontFamily": "{primitive.font.family.primary}",
+            "fontSize": "{primitive.font.size.1100}",
+            "fontWeight": "{primitive.font.weight.400}",
+            "lineHeight": "{primitive.font.lineHeight.1000}"
+          }
+        },
+        "bold": {
+          "$type": "typography",
+          "$value": {
+            "fontFamily": "{primitive.font.family.primary}",
+            "fontSize": "{primitive.font.size.1100}",
+            "fontWeight": "{primitive.font.weight.700}",
+            "lineHeight": "{primitive.font.lineHeight.1000}"
+          }
+        }
+      },
+      "5xl": {
+        "regular": {
+          "$type": "typography",
+          "$value": {
+            "fontFamily": "{primitive.font.family.primary}",
+            "fontSize": "{primitive.font.size.1200}",
+            "fontWeight": "{primitive.font.weight.400}",
+            "lineHeight": "{primitive.font.lineHeight.1100}"
+          }
+        },
+        "bold": {
+          "$type": "typography",
+          "$value": {
+            "fontFamily": "{primitive.font.family.primary}",
+            "fontSize": "{primitive.font.size.1200}",
+            "fontWeight": "{primitive.font.weight.700}",
+            "lineHeight": "{primitive.font.lineHeight.1100}"
+          }
+        }
+      },
+      "6xl": {
+        "regular": {
+          "$type": "typography",
+          "$value": {
+            "fontFamily": "{primitive.font.family.primary}",
+            "fontSize": "{primitive.font.size.1300}",
+            "fontWeight": "{primitive.font.weight.400}",
+            "lineHeight": "{primitive.font.lineHeight.1200}"
+          }
+        },
+        "bold": {
+          "$type": "typography",
+          "$value": {
+            "fontFamily": "{primitive.font.family.primary}",
+            "fontSize": "{primitive.font.size.1300}",
+            "fontWeight": "{primitive.font.weight.700}",
+            "lineHeight": "{primitive.font.lineHeight.1200}"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/tokens/tokens/light/primitive/text.json b/tokens/tokens/light/primitive/text.json
new file mode 100644
index 000000000..4ec7324d2
--- /dev/null
+++ b/tokens/tokens/light/primitive/text.json
@@ -0,0 +1,106 @@
+{
+  "primitive": {
+    "text": {
+      "sm": {
+        "regular": {
+          "$type": "typography",
+          "$value": {
+            "fontFamily": "{primitive.font.family.primary}",
+            "fontSize": "{primitive.font.size.200}",
+            "fontWeight": "{primitive.font.weight.400}",
+            "lineHeight": "{primitive.font.lineHeight.200}"
+          }
+        },
+        "bold": {
+          "$type": "typography",
+          "$value": {
+            "fontFamily": "{primitive.font.family.primary}",
+            "fontSize": "{primitive.font.size.200}",
+            "fontWeight": "{primitive.font.weight.700}",
+            "lineHeight": "{primitive.font.lineHeight.200}"
+          }
+        }
+      },
+      "md": {
+        "regular": {
+          "$type": "typography",
+          "$value": {
+            "fontFamily": "{primitive.font.family.primary}",
+            "fontSize": "{primitive.font.size.300}",
+            "fontWeight": "{primitive.font.weight.400}",
+            "lineHeight": "{primitive.font.lineHeight.300}"
+          }
+        },
+        "bold": {
+          "$type": "typography",
+          "$value": {
+            "fontFamily": "{primitive.font.family.primary}",
+            "fontSize": "{primitive.font.size.300}",
+            "fontWeight": "{primitive.font.weight.700}",
+            "lineHeight": "{primitive.font.lineHeight.300}"
+          }
+        }
+      },
+      "lg": {
+        "regular": {
+          "$type": "typography",
+          "$value": {
+            "fontFamily": "{primitive.font.family.primary}",
+            "fontSize": "{primitive.font.size.400}",
+            "fontWeight": "{primitive.font.weight.400}",
+            "lineHeight": "{primitive.font.lineHeight.400}"
+          }
+        },
+        "bold": {
+          "$type": "typography",
+          "$value": {
+            "fontFamily": "{primitive.font.family.primary}",
+            "fontSize": "{primitive.font.size.400}",
+            "fontWeight": "{primitive.font.weight.700}",
+            "lineHeight": "{primitive.font.lineHeight.400}"
+          }
+        }
+      },
+      "xl": {
+        "regular": {
+          "$type": "typography",
+          "$value": {
+            "fontFamily": "{primitive.font.family.primary}",
+            "fontSize": "{primitive.font.size.500}",
+            "fontWeight": "{primitive.font.weight.400}",
+            "lineHeight": "{primitive.font.lineHeight.500}"
+          }
+        },
+        "bold": {
+          "$type": "typography",
+          "$value": {
+            "fontFamily": "{primitive.font.family.primary}",
+            "fontSize": "{primitive.font.size.500}",
+            "fontWeight": "{primitive.font.weight.700}",
+            "lineHeight": "{primitive.font.lineHeight.500}"
+          }
+        }
+      },
+      "2xl": {
+        "regular": {
+          "$type": "typography",
+          "$value": {
+            "fontFamily": "{primitive.font.family.primary}",
+            "fontSize": "{primitive.font.size.600}",
+            "fontWeight": "{primitive.font.weight.400}",
+            "lineHeight": "{primitive.font.lineHeight.600}"
+          }
+        },
+        "bold": {
+          "$type": "typography",
+          "$value": {
+            "fontFamily": "{primitive.font.family.primary}",
+            "fontSize": "{primitive.font.size.600}",
+            "fontWeight": "{primitive.font.weight.700}",
+            "lineHeight": "{primitive.font.lineHeight.600}"
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/tokens/tokens/light/semantic/text.json b/tokens/tokens/light/semantic/text.json
deleted file mode 100644
index c8932c457..000000000
--- a/tokens/tokens/light/semantic/text.json
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-  "semantic": {
-    "text": {
-      "3xs": {
-        "$type": "typography",
-        "$value": {
-          "fontFamily": "{primitive.font.family.primary}",
-          "fontSize": "{primitive.font.size.300}",
-          "fontWeight": "{primitive.font.weight.400}",
-          "lineHeight": "{primitive.font.lineHeight.300}"
-        }
-      },
-      "2xs": {
-        "$type": "typography",
-        "$value": {
-          "fontFamily": "{primitive.font.family.primary}",
-          "fontSize": "{primitive.font.size.400}",
-          "fontWeight": "{primitive.font.weight.400}",
-          "lineHeight": "{primitive.font.lineHeight.400}"
-        }
-      },
-      "xs": {
-        "$type": "typography",
-        "$value": {
-          "fontFamily": "{primitive.font.family.primary}",
-          "fontSize": "{primitive.font.size.500}",
-          "fontWeight": "{primitive.font.weight.400}",
-          "lineHeight": "{primitive.font.lineHeight.400}"
-        }
-      },
-      "md": {
-        "$type": "typography",
-        "$value": {
-          "fontFamily": "{primitive.font.family.primary}",
-          "fontSize": "{primitive.font.size.600}",
-          "fontWeight": "{primitive.font.weight.400}",
-          "lineHeight": "{primitive.font.lineHeight.500}"
-        }
-      },
-      "lg": {
-        "$type": "typography",
-        "$value": {
-          "fontFamily": "{primitive.font.family.primary}",
-          "fontSize": "{primitive.font.size.700}",
-          "fontWeight": "{primitive.font.weight.400}",
-          "lineHeight": "{primitive.font.lineHeight.600}"
-        }
-      },
-      "xl": {
-        "$type": "typography",
-        "$value": {
-          "fontFamily": "{primitive.font.family.primary}",
-          "fontSize": "{primitive.font.size.800}",
-          "fontWeight": "{primitive.font.weight.400}",
-          "lineHeight": "{primitive.font.lineHeight.700}"
-        }
-      },
-      "2xl": {
-        "$type": "typography",
-        "$value": {
-          "fontFamily": "{primitive.font.family.primary}",
-          "fontSize": "{primitive.font.size.900}",
-          "fontWeight": "{primitive.font.weight.400}",
-          "lineHeight": "{primitive.font.lineHeight.800}"
-        }
-      },
-      "3xl": {
-        "$type": "typography",
-        "$value": {
-          "fontFamily": "{primitive.font.family.primary}",
-          "fontSize": "{primitive.font.size.1000}",
-          "fontWeight": "{primitive.font.weight.400}",
-          "lineHeight": "{primitive.font.lineHeight.900}"
-        }
-      },
-      "4xl": {
-        "$type": "typography",
-        "$value": {
-          "fontFamily": "{primitive.font.family.primary}",
-          "fontSize": "{primitive.font.size.1100}",
-          "fontWeight": "{primitive.font.weight.400}",
-          "lineHeight": "{primitive.font.lineHeight.1000}"
-        }
-      },
-      "5xl": {
-        "$type": "typography",
-        "$value": {
-          "fontFamily": "{primitive.font.family.primary}",
-          "fontSize": "{primitive.font.size.1200}",
-          "fontWeight": "{primitive.font.weight.400}",
-          "lineHeight": "{primitive.font.lineHeight.1100}"
-        }
-      },
-      "6xl": {
-        "$type": "typography",
-        "$value": {
-          "fontFamily": "{primitive.font.family.primary}",
-          "fontSize": "{primitive.font.size.1300}",
-          "fontWeight": "{primitive.font.weight.400}",
-          "lineHeight": "{primitive.font.lineHeight.1200}"
-        }
-      }
-    }
-  }
-}