diff --git a/design-tokens/$metadata.json b/design-tokens/$metadata.json
index 4bab0d99e1..84bd8156b8 100644
--- a/design-tokens/$metadata.json
+++ b/design-tokens/$metadata.json
@@ -5,11 +5,10 @@
     "primitives/modes/size/medium",
     "primitives/modes/size/large",
     "primitives/modes/size/global",
-    "primitives/modes/typography/size/small",
-    "primitives/modes/typography/size/medium",
-    "primitives/modes/typography/size/large",
-    "primitives/modes/typography/primary/designsystemet",
-    "primitives/modes/typography/secondary/designsystemet",
+    "primitives/modes/typography/designsystemet",
+    "primitives/modes/typography/size/small/designsystemet",
+    "primitives/modes/typography/size/medium/designsystemet",
+    "primitives/modes/typography/size/large/designsystemet",
     "primitives/modes/color-scheme/dark/global",
     "primitives/modes/color-scheme/dark/designsystemet",
     "primitives/modes/color-scheme/light/global",
diff --git a/design-tokens/$themes.json b/design-tokens/$themes.json
index 299e32e964..ab08296d09 100644
--- a/design-tokens/$themes.json
+++ b/design-tokens/$themes.json
@@ -6,7 +6,7 @@
     "selectedTokenSets": {
       "primitives/modes/size/medium": "source",
       "primitives/modes/size/global": "enabled",
-      "primitives/modes/typography/size/medium": "enabled"
+      "primitives/modes/typography/size/medium/designsystemet": "enabled"
     },
     "$figmaCollectionId": "VariableCollectionId:36248:20757",
     "$figmaModeId": "41630:1",
@@ -19,7 +19,7 @@
     "selectedTokenSets": {
       "primitives/modes/size/large": "source",
       "primitives/modes/size/global": "enabled",
-      "primitives/modes/typography/size/large": "enabled"
+      "primitives/modes/typography/size/large/designsystemet": "enabled"
     },
     "$figmaCollectionId": "VariableCollectionId:36248:20757",
     "$figmaModeId": "41630:2",
@@ -32,7 +32,7 @@
     "selectedTokenSets": {
       "primitives/modes/size/small": "source",
       "primitives/modes/size/global": "enabled",
-      "primitives/modes/typography/size/small": "enabled"
+      "primitives/modes/typography/size/small/designsystemet": "enabled"
     },
     "$figmaCollectionId": "VariableCollectionId:36248:20757",
     "$figmaModeId": "41630:3",
@@ -44,30 +44,11 @@
     "$figmaModeId": "40960:6",
     "name": "designsystemet",
     "selectedTokenSets": {
+      "primitives/modes/typography/designsystemet": "enabled",
       "themes/designsystemet": "enabled"
     },
     "group": "Theme"
   },
-  {
-    "id": "368d753fcac4455f289500eaa42e70dc0a03522f",
-    "$figmaCollectionId": "VariableCollectionId:36248:20769",
-    "$figmaModeId": "36248:2",
-    "name": "Primary",
-    "selectedTokenSets": {
-      "primitives/modes/typography/primary/designsystemet": "enabled"
-    },
-    "group": "Typography"
-  },
-  {
-    "id": "264b8bd1d40b364e1ea3acf09e49795ddd4c513c",
-    "$figmaCollectionId": "VariableCollectionId:36248:20769",
-    "$figmaModeId": "36248:3",
-    "name": "Secondary",
-    "selectedTokenSets": {
-      "primitives/modes/typography/secondary/designsystemet": "enabled"
-    },
-    "group": "Typography"
-  },
   {
     "name": "Dark",
     "selectedTokenSets": {
diff --git a/design-tokens/primitives/modes/typography/designsystemet.json b/design-tokens/primitives/modes/typography/designsystemet.json
new file mode 100644
index 0000000000..3af47955f2
--- /dev/null
+++ b/design-tokens/primitives/modes/typography/designsystemet.json
@@ -0,0 +1,150 @@
+{
+  "typography": {
+    "designsystemet": {
+      "primary": {
+        "font-family": {
+          "$type": "fontFamilies",
+          "$value": "Inter"
+        },
+        "font-weight": {
+          "medium": {
+            "$type": "fontWeights",
+            "$value": "Medium"
+          },
+          "semibold": {
+            "$type": "fontWeights",
+            "$value": "Semi bold"
+          },
+          "regular": {
+            "$type": "fontWeights",
+            "$value": "Regular"
+          }
+        },
+        "line-height": {
+          "sm": {
+            "$type": "lineHeights",
+            "$value": "130%"
+          },
+          "md": {
+            "$type": "lineHeights",
+            "$value": "150%"
+          },
+          "lg": {
+            "$type": "lineHeights",
+            "$value": "170%"
+          }
+        },
+        "letter-spacing": {
+          "1": {
+            "$type": "letterSpacing",
+            "$value": "-1%"
+          },
+          "2": {
+            "$type": "letterSpacing",
+            "$value": "-0.5%"
+          },
+          "3": {
+            "$type": "letterSpacing",
+            "$value": "-0.25%"
+          },
+          "4": {
+            "$type": "letterSpacing",
+            "$value": "-0.15%"
+          },
+          "5": {
+            "$type": "letterSpacing",
+            "$value": "0%"
+          },
+          "6": {
+            "$type": "letterSpacing",
+            "$value": "0.15%"
+          },
+          "7": {
+            "$type": "letterSpacing",
+            "$value": "0.25%"
+          },
+          "8": {
+            "$type": "letterSpacing",
+            "$value": "0.5%"
+          },
+          "9": {
+            "$type": "letterSpacing",
+            "$value": "1.5%"
+          }
+        }
+      },
+      "secondary": {
+        "font-family": {
+          "$type": "fontFamilies",
+          "$value": "Montserrat"
+        },
+        "font-weight": {
+          "medium": {
+            "$type": "fontWeights",
+            "$value": "Medium"
+          },
+          "semibold": {
+            "$type": "fontWeights",
+            "$value": "SemiBold"
+          },
+          "regular": {
+            "$type": "fontWeights",
+            "$value": "Regular"
+          }
+        },
+        "line-height": {
+          "sm": {
+            "$type": "lineHeights",
+            "$value": "130%"
+          },
+          "md": {
+            "$type": "lineHeights",
+            "$value": "150%"
+          },
+          "lg": {
+            "$type": "lineHeights",
+            "$value": "170%"
+          }
+        },
+        "letter-spacing": {
+          "1": {
+            "$type": "letterSpacing",
+            "$value": "-1%"
+          },
+          "2": {
+            "$type": "letterSpacing",
+            "$value": "-0.5%"
+          },
+          "3": {
+            "$type": "letterSpacing",
+            "$value": "-0.25%"
+          },
+          "4": {
+            "$type": "letterSpacing",
+            "$value": "-0.15%"
+          },
+          "5": {
+            "$type": "letterSpacing",
+            "$value": "0%"
+          },
+          "6": {
+            "$type": "letterSpacing",
+            "$value": "0.15%"
+          },
+          "7": {
+            "$type": "letterSpacing",
+            "$value": "0.25%"
+          },
+          "8": {
+            "$type": "letterSpacing",
+            "$value": "0.5%"
+          },
+          "9": {
+            "$type": "letterSpacing",
+            "$value": "1.5%"
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/design-tokens/primitives/modes/typography/primary/designsystemet.json b/design-tokens/primitives/modes/typography/primary/designsystemet.json
deleted file mode 100644
index eaf824170a..0000000000
--- a/design-tokens/primitives/modes/typography/primary/designsystemet.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "designsystemet": {
-    "font-family": {
-      "$type": "fontFamilies",
-      "$value": "Inter"
-    },
-    "font-weight": {
-      "medium": {
-        "$type": "fontWeights",
-        "$value": "Medium"
-      },
-      "semibold": {
-        "$type": "fontWeights",
-        "$value": "Semi bold"
-      },
-      "regular": {
-        "$type": "fontWeights",
-        "$value": "Regular"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/design-tokens/primitives/modes/typography/secondary/designsystemet.json b/design-tokens/primitives/modes/typography/secondary/designsystemet.json
deleted file mode 100644
index eaf824170a..0000000000
--- a/design-tokens/primitives/modes/typography/secondary/designsystemet.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "designsystemet": {
-    "font-family": {
-      "$type": "fontFamilies",
-      "$value": "Inter"
-    },
-    "font-weight": {
-      "medium": {
-        "$type": "fontWeights",
-        "$value": "Medium"
-      },
-      "semibold": {
-        "$type": "fontWeights",
-        "$value": "Semi bold"
-      },
-      "regular": {
-        "$type": "fontWeights",
-        "$value": "Regular"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/design-tokens/primitives/modes/typography/size/large.json b/design-tokens/primitives/modes/typography/size/large.json
deleted file mode 100644
index 9d7ed9b3e6..0000000000
--- a/design-tokens/primitives/modes/typography/size/large.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-  "line-height": {
-    "sm": {
-      "$type": "lineHeights",
-      "$value": "130%"
-    },
-    "md": {
-      "$type": "lineHeights",
-      "$value": "150%"
-    },
-    "lg": {
-      "$type": "lineHeights",
-      "$value": "170%"
-    }
-  },
-  "font-size": {
-    "1": {
-      "$type": "fontSizes",
-      "$value": "13"
-    },
-    "2": {
-      "$type": "fontSizes",
-      "$value": "16"
-    },
-    "3": {
-      "$type": "fontSizes",
-      "$value": "18"
-    },
-    "4": {
-      "$type": "fontSizes",
-      "$value": "21"
-    },
-    "5": {
-      "$type": "fontSizes",
-      "$value": "24"
-    },
-    "6": {
-      "$type": "fontSizes",
-      "$value": "30"
-    },
-    "7": {
-      "$type": "fontSizes",
-      "$value": "36"
-    },
-    "8": {
-      "$type": "fontSizes",
-      "$value": "48"
-    },
-    "9": {
-      "$type": "fontSizes",
-      "$value": "60"
-    },
-    "10": {
-      "$type": "fontSizes",
-      "$value": "72"
-    }
-  },
-  "letter-spacing": {
-    "1": {
-      "$type": "letterSpacing",
-      "$value": "-1%"
-    },
-    "2": {
-      "$type": "letterSpacing",
-      "$value": "-0.5%"
-    },
-    "3": {
-      "$type": "letterSpacing",
-      "$value": "-0.25%"
-    },
-    "4": {
-      "$type": "letterSpacing",
-      "$value": "-0.15%"
-    },
-    "5": {
-      "$type": "letterSpacing",
-      "$value": "0%"
-    },
-    "6": {
-      "$type": "letterSpacing",
-      "$value": "0.15%"
-    },
-    "7": {
-      "$type": "letterSpacing",
-      "$value": "0.25%"
-    },
-    "8": {
-      "$type": "letterSpacing",
-      "$value": "0.5%"
-    },
-    "9": {
-      "$type": "letterSpacing",
-      "$value": "1.5%"
-    }
-  }
-}
\ No newline at end of file
diff --git a/design-tokens/primitives/modes/typography/size/large/designsystemet.json b/design-tokens/primitives/modes/typography/size/large/designsystemet.json
new file mode 100644
index 0000000000..02328a1f6a
--- /dev/null
+++ b/design-tokens/primitives/modes/typography/size/large/designsystemet.json
@@ -0,0 +1,94 @@
+{
+  "typography": {
+    "designsystemet": {
+      "primary" : {
+        "font-size": {
+          "1": {
+            "$type": "fontSizes",
+            "$value": "13"
+          },
+          "2": {
+            "$type": "fontSizes",
+            "$value": "16"
+          },
+          "3": {
+            "$type": "fontSizes",
+            "$value": "18"
+          },
+          "4": {
+            "$type": "fontSizes",
+            "$value": "21"
+          },
+          "5": {
+            "$type": "fontSizes",
+            "$value": "24"
+          },
+          "6": {
+            "$type": "fontSizes",
+            "$value": "30"
+          },
+          "7": {
+            "$type": "fontSizes",
+            "$value": "36"
+          },
+          "8": {
+            "$type": "fontSizes",
+            "$value": "48"
+          },
+          "9": {
+            "$type": "fontSizes",
+            "$value": "60"
+          },
+          "10": {
+            "$type": "fontSizes",
+            "$value": "72"
+          }
+        }
+      },
+      "secondary" : {
+        "font-size": {
+          "1": {
+            "$type": "fontSizes",
+            "$value": "14"
+          },
+          "2": {
+            "$type": "fontSizes",
+            "$value": "17"
+          },
+          "3": {
+            "$type": "fontSizes",
+            "$value": "19"
+          },
+          "4": {
+            "$type": "fontSizes",
+            "$value": "22"
+          },
+          "5": {
+            "$type": "fontSizes",
+            "$value": "25"
+          },
+          "6": {
+            "$type": "fontSizes",
+            "$value": "32"
+          },
+          "7": {
+            "$type": "fontSizes",
+            "$value": "38"
+          },
+          "8": {
+            "$type": "fontSizes",
+            "$value": "50"
+          },
+          "9": {
+            "$type": "fontSizes",
+            "$value": "64"
+          },
+          "10": {
+            "$type": "fontSizes",
+            "$value": "76"
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/design-tokens/primitives/modes/typography/size/medium.json b/design-tokens/primitives/modes/typography/size/medium.json
deleted file mode 100644
index f861fb854c..0000000000
--- a/design-tokens/primitives/modes/typography/size/medium.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-  "line-height": {
-    "sm": {
-      "$type": "lineHeights",
-      "$value": "130%"
-    },
-    "md": {
-      "$type": "lineHeights",
-      "$value": "150%"
-    },
-    "lg": {
-      "$type": "lineHeights",
-      "$value": "170%"
-    }
-  },
-  "font-size": {
-    "1": {
-      "$type": "fontSizes",
-      "$value": "12"
-    },
-    "2": {
-      "$type": "fontSizes",
-      "$value": "14"
-    },
-    "3": {
-      "$type": "fontSizes",
-      "$value": "16"
-    },
-    "4": {
-      "$type": "fontSizes",
-      "$value": "18"
-    },
-    "5": {
-      "$type": "fontSizes",
-      "$value": "21"
-    },
-    "6": {
-      "$type": "fontSizes",
-      "$value": "24"
-    },
-    "7": {
-      "$type": "fontSizes",
-      "$value": "30"
-    },
-    "8": {
-      "$type": "fontSizes",
-      "$value": "36"
-    },
-    "9": {
-      "$type": "fontSizes",
-      "$value": "48"
-    },
-    "10": {
-      "$type": "fontSizes",
-      "$value": "60"
-    }
-  },
-  "letter-spacing": {
-    "1": {
-      "$type": "letterSpacing",
-      "$value": "-1%"
-    },
-    "2": {
-      "$type": "letterSpacing",
-      "$value": "-0.5%"
-    },
-    "3": {
-      "$type": "letterSpacing",
-      "$value": "-0.25%"
-    },
-    "4": {
-      "$type": "letterSpacing",
-      "$value": "-0.15%"
-    },
-    "5": {
-      "$type": "letterSpacing",
-      "$value": "0%"
-    },
-    "6": {
-      "$type": "letterSpacing",
-      "$value": "0.15%"
-    },
-    "7": {
-      "$type": "letterSpacing",
-      "$value": "0.25%"
-    },
-    "8": {
-      "$type": "letterSpacing",
-      "$value": "0.5%"
-    },
-    "9": {
-      "$type": "letterSpacing",
-      "$value": "1.5%"
-    }
-  }
-}
\ No newline at end of file
diff --git a/design-tokens/primitives/modes/typography/size/medium/designsystemet.json b/design-tokens/primitives/modes/typography/size/medium/designsystemet.json
new file mode 100644
index 0000000000..3e38a2bb74
--- /dev/null
+++ b/design-tokens/primitives/modes/typography/size/medium/designsystemet.json
@@ -0,0 +1,94 @@
+{
+  "typography": {
+    "designsystemet": {
+      "primary": {
+        "font-size": {
+          "1": {
+            "$type": "fontSizes",
+            "$value": "12"
+          },
+          "2": {
+            "$type": "fontSizes",
+            "$value": "14"
+          },
+          "3": {
+            "$type": "fontSizes",
+            "$value": "16"
+          },
+          "4": {
+            "$type": "fontSizes",
+            "$value": "18"
+          },
+          "5": {
+            "$type": "fontSizes",
+            "$value": "21"
+          },
+          "6": {
+            "$type": "fontSizes",
+            "$value": "24"
+          },
+          "7": {
+            "$type": "fontSizes",
+            "$value": "30"
+          },
+          "8": {
+            "$type": "fontSizes",
+            "$value": "36"
+          },
+          "9": {
+            "$type": "fontSizes",
+            "$value": "48"
+          },
+          "10": {
+            "$type": "fontSizes",
+            "$value": "60"
+          }
+        }
+      },
+      "secondary": {
+        "font-size": {
+          "1": {
+            "$type": "fontSizes",
+            "$value": "13"
+          },
+          "2": {
+            "$type": "fontSizes",
+            "$value": "15"
+          },
+          "3": {
+            "$type": "fontSizes",
+            "$value": "17"
+          },
+          "4": {
+            "$type": "fontSizes",
+            "$value": "19"
+          },
+          "5": {
+            "$type": "fontSizes",
+            "$value": "22"
+          },
+          "6": {
+            "$type": "fontSizes",
+            "$value": "25"
+          },
+          "7": {
+            "$type": "fontSizes",
+            "$value": "32"
+          },
+          "8": {
+            "$type": "fontSizes",
+            "$value": "38"
+          },
+          "9": {
+            "$type": "fontSizes",
+            "$value": "50"
+          },
+          "10": {
+            "$type": "fontSizes",
+            "$value": "64"
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/design-tokens/primitives/modes/typography/size/small.json b/design-tokens/primitives/modes/typography/size/small.json
deleted file mode 100644
index 99e67f561f..0000000000
--- a/design-tokens/primitives/modes/typography/size/small.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-  "line-height": {
-    "sm": {
-      "$type": "lineHeights",
-      "$value": "130%"
-    },
-    "md": {
-      "$type": "lineHeights",
-      "$value": "150%"
-    },
-    "lg": {
-      "$type": "lineHeights",
-      "$value": "170%"
-    }
-  },
-  "font-size": {
-    "1": {
-      "$type": "fontSizes",
-      "$value": "11"
-    },
-    "2": {
-      "$type": "fontSizes",
-      "$value": "13"
-    },
-    "3": {
-      "$type": "fontSizes",
-      "$value": "14"
-    },
-    "4": {
-      "$type": "fontSizes",
-      "$value": "16"
-    },
-    "5": {
-      "$type": "fontSizes",
-      "$value": "18"
-    },
-    "6": {
-      "$type": "fontSizes",
-      "$value": "21"
-    },
-    "7": {
-      "$type": "fontSizes",
-      "$value": "24"
-    },
-    "8": {
-      "$type": "fontSizes",
-      "$value": "30"
-    },
-    "9": {
-      "$type": "fontSizes",
-      "$value": "36"
-    },
-    "10": {
-      "$type": "fontSizes",
-      "$value": "48"
-    }
-  },
-  "letter-spacing": {
-    "1": {
-      "$type": "letterSpacing",
-      "$value": "-1%"
-    },
-    "2": {
-      "$type": "letterSpacing",
-      "$value": "-0.5%"
-    },
-    "3": {
-      "$type": "letterSpacing",
-      "$value": "-0.25%"
-    },
-    "4": {
-      "$type": "letterSpacing",
-      "$value": "-0.15%"
-    },
-    "5": {
-      "$type": "letterSpacing",
-      "$value": "0%"
-    },
-    "6": {
-      "$type": "letterSpacing",
-      "$value": "0.15%"
-    },
-    "7": {
-      "$type": "letterSpacing",
-      "$value": "0.25%"
-    },
-    "8": {
-      "$type": "letterSpacing",
-      "$value": "0.5%"
-    },
-    "9": {
-      "$type": "letterSpacing",
-      "$value": "1.5%"
-    }
-  }
-}
\ No newline at end of file
diff --git a/design-tokens/primitives/modes/typography/size/small/designsystemet.json b/design-tokens/primitives/modes/typography/size/small/designsystemet.json
new file mode 100644
index 0000000000..d332e0266f
--- /dev/null
+++ b/design-tokens/primitives/modes/typography/size/small/designsystemet.json
@@ -0,0 +1,94 @@
+{
+  "typography": {
+    "designsystemet": {
+      "primary": {
+        "font-size": {
+          "1": {
+            "$type": "fontSizes",
+            "$value": "11"
+          },
+          "2": {
+            "$type": "fontSizes",
+            "$value": "13"
+          },
+          "3": {
+            "$type": "fontSizes",
+            "$value": "14"
+          },
+          "4": {
+            "$type": "fontSizes",
+            "$value": "16"
+          },
+          "5": {
+            "$type": "fontSizes",
+            "$value": "18"
+          },
+          "6": {
+            "$type": "fontSizes",
+            "$value": "21"
+          },
+          "7": {
+            "$type": "fontSizes",
+            "$value": "24"
+          },
+          "8": {
+            "$type": "fontSizes",
+            "$value": "30"
+          },
+          "9": {
+            "$type": "fontSizes",
+            "$value": "36"
+          },
+          "10": {
+            "$type": "fontSizes",
+            "$value": "48"
+          }
+        }
+      },
+      "secondary": {
+        "font-size": {
+          "1": {
+            "$type": "fontSizes",
+            "$value": "12"
+          },
+          "2": {
+            "$type": "fontSizes",
+            "$value": "14"
+          },
+          "3": {
+            "$type": "fontSizes",
+            "$value": "16"
+          },
+          "4": {
+            "$type": "fontSizes",
+            "$value": "18"
+          },
+          "5": {
+            "$type": "fontSizes",
+            "$value": "20"
+          },
+          "6": {
+            "$type": "fontSizes",
+            "$value": "22"
+          },
+          "7": {
+            "$type": "fontSizes",
+            "$value": "25"
+          },
+          "8": {
+            "$type": "fontSizes",
+            "$value": "32"
+          },
+          "9": {
+            "$type": "fontSizes",
+            "$value": "38"
+          },
+          "10": {
+            "$type": "fontSizes",
+            "$value": "50"
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/design-tokens/semantic/style.json b/design-tokens/semantic/style.json
index 8f999a8363..98cad342b1 100644
--- a/design-tokens/semantic/style.json
+++ b/design-tokens/semantic/style.json
@@ -4,71 +4,71 @@
       "2xl": {
         "$type": "typography",
         "$value": {
-          "fontFamily": "{font-family}",
-          "fontWeight": "{font-weight.medium}",
-          "lineHeight": "{line-height.sm}",
-          "fontSize": "{font-size.10}",
-          "letterSpacing": "{letter-spacing.1}"
+          "fontFamily": "{typography.secondary.font-family}",
+          "fontWeight": "{typography.secondary.font-weight.medium}",
+          "lineHeight": "{typography.secondary.line-height.sm}",
+          "fontSize": "{typography.secondary.font-size.10}",
+          "letterSpacing": "{typography.secondary.letter-spacing.1}"
         }
       },
       "xl": {
         "$type": "typography",
         "$value": {
-          "fontFamily": "{font-family}",
-          "fontWeight": "{font-weight.medium}",
-          "lineHeight": "{line-height.sm}",
-          "fontSize": "{font-size.9}",
-          "letterSpacing": "{letter-spacing.1}"
+          "fontFamily": "{typography.secondary.font-family}",
+          "fontWeight": "{typography.secondary.font-weight.medium}",
+          "lineHeight": "{typography.secondary.line-height.sm}",
+          "fontSize": "{typography.secondary.font-size.9}",
+          "letterSpacing": "{typography.secondary.letter-spacing.1}"
         }
       },
       "lg": {
         "$type": "typography",
         "$value": {
-          "fontFamily": "{font-family}",
-          "fontWeight": "{font-weight.medium}",
-          "lineHeight": "{line-height.sm}",
-          "fontSize": "{font-size.8}",
-          "letterSpacing": "{letter-spacing.2}"
+          "fontFamily": "{typography.secondary.font-family}",
+          "fontWeight": "{typography.secondary.font-weight.medium}",
+          "lineHeight": "{typography.secondary.line-height.sm}",
+          "fontSize": "{typography.secondary.font-size.8}",
+          "letterSpacing": "{typography.secondary.letter-spacing.2}"
         }
       },
       "md": {
         "$type": "typography",
         "$value": {
-          "fontFamily": "{font-family}",
-          "fontWeight": "{font-weight.medium}",
-          "lineHeight": "{line-height.sm}",
-          "fontSize": "{font-size.7}",
-          "letterSpacing": "{letter-spacing.3}"
+          "fontFamily": "{typography.secondary.font-family}",
+          "fontWeight": "{typography.secondary.font-weight.medium}",
+          "lineHeight": "{typography.secondary.line-height.sm}",
+          "fontSize": "{typography.secondary.font-size.7}",
+          "letterSpacing": "{typography.secondary.letter-spacing.3}"
         }
       },
       "sm": {
         "$type": "typography",
         "$value": {
-          "fontFamily": "{font-family}",
-          "fontWeight": "{font-weight.medium}",
-          "lineHeight": "{line-height.sm}",
-          "fontSize": "{font-size.6}",
-          "letterSpacing": "{letter-spacing.5}"
+          "fontFamily": "{typography.secondary.font-family}",
+          "fontWeight": "{typography.secondary.font-weight.medium}",
+          "lineHeight": "{typography.secondary.line-height.sm}",
+          "fontSize": "{typography.secondary.font-size.6}",
+          "letterSpacing": "{typography.secondary.letter-spacing.5}"
         }
       },
       "xs": {
         "$type": "typography",
         "$value": {
-          "fontFamily": "{font-family}",
-          "fontWeight": "{font-weight.medium}",
-          "lineHeight": "{line-height.sm}",
-          "fontSize": "{font-size.5}",
-          "letterSpacing": "{letter-spacing.6}"
+          "fontFamily": "{typography.secondary.font-family}",
+          "fontWeight": "{typography.secondary.font-weight.medium}",
+          "lineHeight": "{typography.secondary.line-height.sm}",
+          "fontSize": "{typography.secondary.font-size.5}",
+          "letterSpacing": "{typography.secondary.letter-spacing.6}"
         }
       },
       "2xs": {
         "$type": "typography",
         "$value": {
-          "fontFamily": "{font-family}",
-          "fontWeight": "{font-weight.medium}",
-          "lineHeight": "{line-height.sm}",
-          "fontSize": "{font-size.4}",
-          "letterSpacing": "{letter-spacing.6}"
+          "fontFamily": "{typography.secondary.font-family}",
+          "fontWeight": "{typography.secondary.font-weight.medium}",
+          "lineHeight": "{typography.secondary.line-height.sm}",
+          "fontSize": "{typography.secondary.font-size.4}",
+          "letterSpacing": "{typography.secondary.letter-spacing.6}"
         }
       }
     },
@@ -76,102 +76,102 @@
       "xl": {
         "$type": "typography",
         "$value": {
-          "fontFamily": "{font-family}",
-          "fontWeight": "{font-weight.regular}",
-          "lineHeight": "{line-height.md}",
-          "fontSize": "{font-size.6}",
-          "letterSpacing": "{letter-spacing.8}"
+          "fontFamily": "{typography.primary.font-family}",
+          "fontWeight": "{typography.primary.font-weight.regular}",
+          "lineHeight": "{typography.primary.line-height.md}",
+          "fontSize": "{typography.primary.font-size.6}",
+          "letterSpacing": "{typography.primary.letter-spacing.8}"
         }
       },
       "lg": {
         "$type": "typography",
         "$value": {
-          "fontFamily": "{font-family}",
-          "fontWeight": "{font-weight.regular}",
-          "lineHeight": "{line-height.md}",
-          "fontSize": "{font-size.5}",
-          "letterSpacing": "{letter-spacing.8}"
+          "fontFamily": "{typography.primary.font-family}",
+          "fontWeight": "{typography.primary.font-weight.regular}",
+          "lineHeight": "{typography.primary.line-height.md}",
+          "fontSize": "{typography.primary.font-size.5}",
+          "letterSpacing": "{typography.primary.letter-spacing.8}"
         }
       },
       "md": {
         "$type": "typography",
         "$value": {
-          "fontFamily": "{font-family}",
-          "fontWeight": "{font-weight.regular}",
-          "lineHeight": "{line-height.md}",
-          "fontSize": "{font-size.4}",
-          "letterSpacing": "{letter-spacing.8}"
+          "fontFamily": "{typography.primary.font-family}",
+          "fontWeight": "{typography.primary.font-weight.regular}",
+          "lineHeight": "{typography.primary.line-height.md}",
+          "fontSize": "{typography.primary.font-size.4}",
+          "letterSpacing": "{typography.primary.letter-spacing.8}"
         }
       },
       "sm": {
         "$type": "typography",
         "$value": {
-          "fontFamily": "{font-family}",
-          "fontWeight": "{font-weight.regular}",
-          "lineHeight": "{line-height.md}",
-          "fontSize": "{font-size.3}",
-          "letterSpacing": "{letter-spacing.7}"
+          "fontFamily": "{typography.primary.font-family}",
+          "fontWeight": "{typography.primary.font-weight.regular}",
+          "lineHeight": "{typography.primary.line-height.md}",
+          "fontSize": "{typography.primary.font-size.3}",
+          "letterSpacing": "{typography.primary.letter-spacing.7}"
         }
       },
       "xs": {
         "$type": "typography",
         "$value": {
-          "fontFamily": "{font-family}",
-          "fontWeight": "{font-weight.regular}",
-          "lineHeight": "{line-height.md}",
-          "fontSize": "{font-size.2}",
-          "letterSpacing": "{letter-spacing.6}"
+          "fontFamily": "{typography.primary.font-family}",
+          "fontWeight": "{typography.primary.font-weight.regular}",
+          "lineHeight": "{typography.primary.line-height.md}",
+          "fontSize": "{typography.primary.font-size.2}",
+          "letterSpacing": "{typography.primary.letter-spacing.6}"
         }
       },
       "short": {
         "xl": {
           "$type": "typography",
           "$value": {
-            "fontFamily": "{font-family}",
-            "fontWeight": "{font-weight.regular}",
-            "lineHeight": "{line-height.sm}",
-            "fontSize": "{font-size.6}",
-            "letterSpacing": "{letter-spacing.8}"
+            "fontFamily": "{typography.primary.font-family}",
+            "fontWeight": "{typography.primary.font-weight.regular}",
+            "lineHeight": "{typography.primary.line-height.sm}",
+            "fontSize": "{typography.primary.font-size.6}",
+            "letterSpacing": "{typography.primary.letter-spacing.8}"
           }
         },
         "lg": {
           "$type": "typography",
           "$value": {
-            "fontFamily": "{font-family}",
-            "fontWeight": "{font-weight.regular}",
-            "lineHeight": "{line-height.sm}",
-            "fontSize": "{font-size.5}",
-            "letterSpacing": "{letter-spacing.8}"
+            "fontFamily": "{typography.primary.font-family}",
+            "fontWeight": "{typography.primary.font-weight.regular}",
+            "lineHeight": "{typography.primary.line-height.sm}",
+            "fontSize": "{typography.primary.font-size.5}",
+            "letterSpacing": "{typography.primary.letter-spacing.8}"
           }
         },
         "md": {
           "$type": "typography",
           "$value": {
-            "fontFamily": "{font-family}",
-            "fontWeight": "{font-weight.regular}",
-            "lineHeight": "{line-height.sm}",
-            "fontSize": "{font-size.4}",
-            "letterSpacing": "{letter-spacing.8}"
+            "fontFamily": "{typography.primary.font-family}",
+            "fontWeight": "{typography.primary.font-weight.regular}",
+            "lineHeight": "{typography.primary.line-height.sm}",
+            "fontSize": "{typography.primary.font-size.4}",
+            "letterSpacing": "{typography.primary.letter-spacing.8}"
           }
         },
         "sm": {
           "$type": "typography",
           "$value": {
-            "fontFamily": "{font-family}",
-            "fontWeight": "{font-weight.regular}",
-            "lineHeight": "{line-height.sm}",
-            "fontSize": "{font-size.3}",
-            "letterSpacing": "{letter-spacing.7}"
+            "fontFamily": "{typography.primary.font-family}",
+            "fontWeight": "{typography.primary.font-weight.regular}",
+            "lineHeight": "{typography.primary.line-height.sm}",
+            "fontSize": "{typography.primary.font-size.3}",
+            "letterSpacing": "{typography.primary.letter-spacing.7}"
           }
         },
         "xs": {
           "$type": "typography",
           "$value": {
-            "fontFamily": "{font-family}",
-            "fontWeight": "{font-weight.regular}",
-            "lineHeight": "{line-height.sm}",
-            "fontSize": "{font-size.2}",
-            "letterSpacing": "{letter-spacing.6}"
+            "fontFamily": "{typography.primary.font-family}",
+            "fontWeight": "{typography.primary.font-weight.regular}",
+            "lineHeight": "{typography.primary.line-height.sm}",
+            "fontSize": "{typography.primary.font-size.2}",
+            "letterSpacing": "{typography.primary.letter-spacing.6}"
           }
         }
       },
@@ -179,51 +179,51 @@
         "xl": {
           "$type": "typography",
           "$value": {
-            "fontFamily": "{font-family}",
-            "fontWeight": "{font-weight.regular}",
-            "lineHeight": "{line-height.lg}",
-            "fontSize": "{font-size.6}",
-            "letterSpacing": "{letter-spacing.8}"
+            "fontFamily": "{typography.primary.font-family}",
+            "fontWeight": "{typography.primary.font-weight.regular}",
+            "lineHeight": "{typography.primary.line-height.lg}",
+            "fontSize": "{typography.primary.font-size.6}",
+            "letterSpacing": "{typography.primary.letter-spacing.8}"
           }
         },
         "lg": {
           "$type": "typography",
           "$value": {
-            "fontFamily": "{font-family}",
-            "fontWeight": "{font-weight.regular}",
-            "lineHeight": "{line-height.lg}",
-            "fontSize": "{font-size.5}",
-            "letterSpacing": "{letter-spacing.8}"
+            "fontFamily": "{typography.primary.font-family}",
+            "fontWeight": "{typography.primary.font-weight.regular}",
+            "lineHeight": "{typography.primary.line-height.lg}",
+            "fontSize": "{typography.primary.font-size.5}",
+            "letterSpacing": "{typography.primary.letter-spacing.8}"
           }
         },
         "md": {
           "$type": "typography",
           "$value": {
-            "fontFamily": "{font-family}",
-            "fontWeight": "{font-weight.regular}",
-            "lineHeight": "{line-height.lg}",
-            "fontSize": "{font-size.4}",
-            "letterSpacing": "{letter-spacing.8}"
+            "fontFamily": "{typography.primary.font-family}",
+            "fontWeight": "{typography.primary.font-weight.regular}",
+            "lineHeight": "{typography.primary.line-height.lg}",
+            "fontSize": "{typography.primary.font-size.4}",
+            "letterSpacing": "{typography.primary.letter-spacing.8}"
           }
         },
         "sm": {
           "$type": "typography",
           "$value": {
-            "fontFamily": "{font-family}",
-            "fontWeight": "{font-weight.regular}",
-            "lineHeight": "{line-height.lg}",
-            "fontSize": "{font-size.3}",
-            "letterSpacing": "{letter-spacing.7}"
+            "fontFamily": "{typography.primary.font-family}",
+            "fontWeight": "{typography.primary.font-weight.regular}",
+            "lineHeight": "{typography.primary.line-height.lg}",
+            "fontSize": "{typography.primary.font-size.3}",
+            "letterSpacing": "{typography.primary.letter-spacing.7}"
           }
         },
         "xs": {
           "$type": "typography",
           "$value": {
-            "fontFamily": "{font-family}",
-            "fontWeight": "{font-weight.regular}",
-            "lineHeight": "{line-height.lg}",
-            "fontSize": "{font-size.2}",
-            "letterSpacing": "{letter-spacing.6}"
+            "fontFamily": "{typography.primary.font-family}",
+            "fontWeight": "{typography.primary.font-weight.regular}",
+            "lineHeight": "{typography.primary.line-height.lg}",
+            "fontSize": "{typography.primary.font-size.2}",
+            "letterSpacing": "{typography.primary.letter-spacing.6}"
           }
         }
       }
diff --git a/design-tokens/themes/designsystemet.json b/design-tokens/themes/designsystemet.json
index 0bf29e07a2..83b24f892c 100644
--- a/design-tokens/themes/designsystemet.json
+++ b/design-tokens/themes/designsystemet.json
@@ -265,22 +265,234 @@
       }
     }
   },
-  "font-family": {
-    "$type": "fontFamilies",
-    "$value": "{designsystemet.font-family}"
-  },
-  "font-weight": {
-    "medium": {
-      "$type": "fontWeights",
-      "$value": "{designsystemet.font-weight.medium}"
-    },
-    "semibold": {
-      "$type": "fontWeights",
-      "$value": "{designsystemet.font-weight.semibold}"
+  "typography": {
+    "primary": {
+      "font-family": {
+        "$type": "fontFamilies",
+        "$value": "{typography.designsystemet.primary.font-family}"
+      },
+      "font-weight": {
+        "medium": {
+          "$type": "fontWeights",
+          "$value": "{typography.designsystemet.primary.font-weight.medium}"
+        },
+        "semibold": {
+          "$type": "fontWeights",
+          "$value": "{typography.designsystemet.primary.font-weight.semibold}"
+        },
+        "regular": {
+          "$type": "fontWeights",
+          "$value": "{typography.designsystemet.primary.font-weight.regular}"
+        }
+      },
+      "font-size": {
+        "1": {
+          "$type": "fontSizes",
+          "$value": "{typography.designsystemet.primary.font-size.1}"
+        },
+        "2": {
+          "$type": "fontSizes",
+          "$value": "{typography.designsystemet.primary.font-size.2}"
+        },
+        "3": {
+          "$type": "fontSizes",
+          "$value": "{typography.designsystemet.primary.font-size.3}"
+        },
+        "4": {
+          "$type": "fontSizes",
+          "$value": "{typography.designsystemet.primary.font-size.4}"
+        },
+        "5": {
+          "$type": "fontSizes",
+          "$value": "{typography.designsystemet.primary.font-size.5}"
+        },
+        "6": {
+          "$type": "fontSizes",
+          "$value": "{typography.designsystemet.primary.font-size.6}"
+        },
+        "7": {
+          "$type": "fontSizes",
+          "$value": "{typography.designsystemet.primary.font-size.7}"
+        },
+        "8": {
+          "$type": "fontSizes",
+          "$value": "{typography.designsystemet.primary.font-size.8}"
+        },
+        "9": {
+          "$type": "fontSizes",
+          "$value": "{typography.designsystemet.primary.font-size.9}"
+        },
+        "10": {
+          "$type": "fontSizes",
+          "$value": "{typography.designsystemet.primary.font-size.10}"
+        }
+      },
+      "line-height": {
+        "sm": {
+          "$type": "lineHeights",
+          "$value": "{typography.designsystemet.primary.line-height.sm}"
+        },
+        "md": {
+          "$type": "lineHeights",
+          "$value": "{typography.designsystemet.primary.line-height.md}"
+        },
+        "lg": {
+          "$type": "lineHeights",
+          "$value": "{typography.designsystemet.primary.line-height.lg}"
+        }
+      },
+      "letter-spacing": {
+        "1": {
+          "$type": "letterSpacing",
+          "$value": "{typography.designsystemet.primary.letter-spacing.1}"
+        },
+        "2": {
+          "$type": "letterSpacing",
+          "$value": "{typography.designsystemet.primary.letter-spacing.2}"
+        },
+        "3": {
+          "$type": "letterSpacing",
+          "$value": "{typography.designsystemet.primary.letter-spacing.3}"
+        },
+        "4": {
+          "$type": "letterSpacing",
+          "$value": "{typography.designsystemet.primary.letter-spacing.4}"
+        },
+        "5": {
+          "$type": "letterSpacing",
+          "$value": "{typography.designsystemet.primary.letter-spacing.5}"
+        },
+        "6": {
+          "$type": "letterSpacing",
+          "$value": "{typography.designsystemet.primary.letter-spacing.6}"
+        },
+        "7": {
+          "$type": "letterSpacing",
+          "$value": "{typography.designsystemet.primary.letter-spacing.7}"
+        },
+        "8": {
+          "$type": "letterSpacing",
+          "$value": "{typography.designsystemet.primary.letter-spacing.8}"
+        },
+        "9": {
+          "$type": "letterSpacing",
+          "$value": "{typography.designsystemet.primary.letter-spacing.9}"
+        }
+      }
     },
-    "regular": {
-      "$type": "fontWeights",
-      "$value": "{designsystemet.font-weight.regular}"
+    "secondary": {
+      "font-family": {
+        "$type": "fontFamilies",
+        "$value": "{typography.designsystemet.secondary.font-family}"
+      },
+      "font-weight": {
+        "medium": {
+          "$type": "fontWeights",
+          "$value": "{typography.designsystemet.secondary.font-weight.medium}"
+        },
+        "semibold": {
+          "$type": "fontWeights",
+          "$value": "{typography.designsystemet.secondary.font-weight.semibold}"
+        },
+        "regular": {
+          "$type": "fontWeights",
+          "$value": "{typography.designsystemet.secondary.font-weight.regular}"
+        }
+      },
+      "font-size": {
+        "1": {
+          "$type": "fontSizes",
+          "$value": "{typography.designsystemet.secondary.font-size.1}"
+        },
+        "2": {
+          "$type": "fontSizes",
+          "$value": "{typography.designsystemet.secondary.font-size.2}"
+        },
+        "3": {
+          "$type": "fontSizes",
+          "$value": "{typography.designsystemet.secondary.font-size.3}"
+        },
+        "4": {
+          "$type": "fontSizes",
+          "$value": "{typography.designsystemet.secondary.font-size.4}"
+        },
+        "5": {
+          "$type": "fontSizes",
+          "$value": "{typography.designsystemet.secondary.font-size.5}"
+        },
+        "6": {
+          "$type": "fontSizes",
+          "$value": "{typography.designsystemet.secondary.font-size.6}"
+        },
+        "7": {
+          "$type": "fontSizes",
+          "$value": "{typography.designsystemet.secondary.font-size.7}"
+        },
+        "8": {
+          "$type": "fontSizes",
+          "$value": "{typography.designsystemet.secondary.font-size.8}"
+        },
+        "9": {
+          "$type": "fontSizes",
+          "$value": "{typography.designsystemet.secondary.font-size.9}"
+        },
+        "10": {
+          "$type": "fontSizes",
+          "$value": "{typography.designsystemet.secondary.font-size.10}"
+        }
+      },
+      "line-height": {
+        "sm": {
+          "$type": "lineHeights",
+          "$value": "{typography.designsystemet.secondary.line-height.sm}"
+        },
+        "md": {
+          "$type": "lineHeights",
+          "$value": "{typography.designsystemet.secondary.line-height.md}"
+        },
+        "lg": {
+          "$type": "lineHeights",
+          "$value": "{typography.designsystemet.secondary.line-height.lg}"
+        }
+      },
+      "letter-spacing": {
+        "1": {
+          "$type": "letterSpacing",
+          "$value": "{typography.designsystemet.secondary.letter-spacing.1}"
+        },
+        "2": {
+          "$type": "letterSpacing",
+          "$value": "{typography.designsystemet.secondary.letter-spacing.2}"
+        },
+        "3": {
+          "$type": "letterSpacing",
+          "$value": "{typography.designsystemet.secondary.letter-spacing.3}"
+        },
+        "4": {
+          "$type": "letterSpacing",
+          "$value": "{typography.designsystemet.secondary.letter-spacing.4}"
+        },
+        "5": {
+          "$type": "letterSpacing",
+          "$value": "{typography.designsystemet.secondary.letter-spacing.5}"
+        },
+        "6": {
+          "$type": "letterSpacing",
+          "$value": "{typography.designsystemet.secondary.letter-spacing.6}"
+        },
+        "7": {
+          "$type": "letterSpacing",
+          "$value": "{typography.designsystemet.secondary.letter-spacing.7}"
+        },
+        "8": {
+          "$type": "letterSpacing",
+          "$value": "{typography.designsystemet.secondary.letter-spacing.8}"
+        },
+        "9": {
+          "$type": "letterSpacing",
+          "$value": "{typography.designsystemet.secondary.letter-spacing.9}"
+        }
+      }
     }
   },
   "border-radius": {