diff --git a/packages/voorbeeld-design-tokens/figma/voorbeeld.tokens.json b/packages/voorbeeld-design-tokens/figma/voorbeeld.tokens.json
index 8c4f4a16d..61d6108bd 100644
--- a/packages/voorbeeld-design-tokens/figma/voorbeeld.tokens.json
+++ b/packages/voorbeeld-design-tokens/figma/voorbeeld.tokens.json
@@ -914,6 +914,21 @@
     }
   },
   "common": {
+    "basis": {
+      "typography": {
+        "scale": {
+          "xx-small": { "font-size": { "$value": "8px", "comment": "8px" } },
+          "x-small": { "font-size": { "$value": "12px", "comment": "12px" } },
+          "small": { "font-size": { "$value": "14px", "comment": "14px" } },
+          "medium": { "font-size": { "$value": "16px", "comment": "16px" } },
+          "large": { "font-size": { "$value": "20px", "comment": "20px" } },
+          "x-large": { "font-size": { "$value": "24px", "comment": "24px" } },
+          "xx-large": { "font-size": { "$value": "32px", "comment": "32px" } },
+          "xxx-large": { "font-size": { "$value": "40px", "comment": "40px" } },
+          "xxxx-large": { "font-size": { "$value": "48px", "comment": "48px" } }
+        }
+      }
+    },
     "utrecht": {
       "document": {
         "background-color": {
@@ -930,7 +945,7 @@
         },
         "font-size": {
           "$type": "fontSizes",
-          "$value": "{voorbeeld.typography.font-size.md}"
+          "$value": "{basis.typography.scale.medium.font-size}"
         },
         "font-weight": {
           "$type": "fontWeights",
@@ -1697,7 +1712,7 @@
           },
           "font-size": {
             "$type": "fontSizes",
-            "$value": "{voorbeeld.typography.font-size.xl}"
+            "$value": "{basis.typography.scale.x-large.font-size}"
           }
         }
       }
@@ -1816,6 +1831,30 @@
           "$type": "textCase",
           "$value": "None"
         },
+        "font-size": {
+          "$type": "fontSizes",
+          "$value": "{basis.typography.scale.small.font-size}"
+        },
+        "min-block-size": {
+          "$type": "sizing",
+          "$value": "{voorbeeld.size.xs}"
+        },
+        "min-inline-size": {
+          "$type": "sizing",
+          "$value": "{voorbeeld.size.xs}"
+        },
+        "font-weight": {
+          "$type": "fontWeights",
+          "$value": "{voorbeeld.document.strong.font-weight}"
+        },
+        "border-radius": {
+          "$type": "borderRadius",
+          "$value": "{voorbeeld.border-radius.round}"
+        },
+        "font-family": {
+          "$type": "fontFamilies",
+          "$value": "{utrecht.document.font-family}"
+        },
         "letter-spacing": {
           "$type": "letterSpacing",
           "$value": "None"
@@ -1917,7 +1956,7 @@
         "attribution": {
           "font-size": {
             "$type": "fontSizes",
-            "$value": "{voorbeeld.typography.font-size.sm}"
+            "$value": "{basis.typography.scale.small.font-size}"
           },
           "color": {
             "$type": "color",
@@ -1927,7 +1966,7 @@
         "content": {
           "font-size": {
             "$type": "fontSizes",
-            "$value": "{voorbeeld.typography.font-size.xl}"
+            "$value": "{basis.typography.scale.x-large.font-size}"
           },
           "color": {
             "$type": "color",
@@ -3550,7 +3589,7 @@
         },
         "font-size": {
           "$type": "fontSizes",
-          "$value": "{voorbeeld.typography.font-size.3xl}"
+          "$value": "{basis.typography.scale.xxx-large.font-size}"
         }
       },
       "heading-2": {
@@ -3572,7 +3611,7 @@
         },
         "font-size": {
           "$type": "fontSizes",
-          "$value": "{voorbeeld.typography.font-size.2xl}"
+          "$value": "{basis.typography.scale.xx-large.font-size}"
         }
       },
       "heading-3": {
@@ -3594,7 +3633,7 @@
         },
         "font-size": {
           "$type": "fontSizes",
-          "$value": "{voorbeeld.typography.font-size.xl}"
+          "$value": "{basis.typography.scale.x-large.font-size}"
         }
       },
       "heading-4": {
@@ -3616,7 +3655,7 @@
         },
         "font-size": {
           "$type": "fontSizes",
-          "$value": "{voorbeeld.typography.font-size.lg}"
+          "$value": "{basis.typography.scale.large.font-size}"
         }
       },
       "heading-5": {
@@ -3638,7 +3677,7 @@
         },
         "font-size": {
           "$type": "fontSizes",
-          "$value": "{voorbeeld.typography.font-size.md}"
+          "$value": "{basis.typography.scale.medium.font-size}"
         }
       },
       "heading-6": {
@@ -3660,7 +3699,7 @@
         },
         "font-size": {
           "$type": "fontSizes",
-          "$value": "{voorbeeld.typography.font-size.sm}"
+          "$value": "{basis.typography.scale.small.font-size}"
         }
       }
     }
@@ -4389,7 +4428,7 @@
           },
           "font-size": {
             "$type": "fontSizes",
-            "$value": "{voorbeeld.typography.font-size.lg}"
+            "$value": "{basis.typography.scale.large.font-size}"
           },
           "font-weight": {
             "$type": "fontWeights",
@@ -4407,7 +4446,7 @@
           },
           "font-size": {
             "$type": "fontSizes",
-            "$value": "{voorbeeld.typography.font-size.sm}"
+            "$value": "{basis.typography.scale.small.font-size}"
           },
           "font-weight": {
             "$type": "fontWeights",
@@ -5036,7 +5075,7 @@
       "status-badge": {
         "font-size": {
           "$type": "fontSizes",
-          "$value": "{voorbeeld.typography.font-size.sm}"
+          "$value": "{basis.typography.scale.small.font-size}"
         },
         "line-height": {
           "$type": "lineHeights",
@@ -5473,7 +5512,7 @@
           },
           "font-size": {
             "$type": "fontSizes",
-            "$value": "{voorbeeld.typography.font-size.xl}"
+            "$value": "{basis.typography.scale.x-large.font-size}"
           },
           "font-weight": {
             "$type": "fontWeights",
diff --git a/proprietary/basic-theme-design-tokens/src/_responsive.scss b/proprietary/basic-theme-design-tokens/src/_responsive.scss
deleted file mode 100644
index 6258ac8e8..000000000
--- a/proprietary/basic-theme-design-tokens/src/_responsive.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * @license SEE LICENSE.md
- * Copyright (c) 2021 NL Design System Community
- * All rights reserved
- */
-
-/* stylelint-disable no-duplicate-selectors */
diff --git a/proprietary/basic-theme-design-tokens/src/custom.scss b/proprietary/basic-theme-design-tokens/src/custom.scss
deleted file mode 100644
index f3ba0c515..000000000
--- a/proprietary/basic-theme-design-tokens/src/custom.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * @license SEE LICENSE.md
- * Copyright (c) 2021 NL Design System Community
- * All rights reserved
- */
-
-@import "./index.css";
diff --git a/proprietary/basic-theme-design-tokens/src/index.scss b/proprietary/basic-theme-design-tokens/src/index.scss
deleted file mode 100644
index 404f0becc..000000000
--- a/proprietary/basic-theme-design-tokens/src/index.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * @license SEE LICENSE.md
- * Copyright (c) 2021 NL Design System Community
- * All rights reserved
- */
-
-@import "./design-tokens.css";
-@import "./responsive";
diff --git a/proprietary/groningen-design-tokens/figma/figma.tokens.json b/proprietary/groningen-design-tokens/figma/figma.tokens.json
index 7510cafaf..43e471a86 100644
--- a/proprietary/groningen-design-tokens/figma/figma.tokens.json
+++ b/proprietary/groningen-design-tokens/figma/figma.tokens.json
@@ -595,7 +595,7 @@
           "type": "fontFamilies"
         },
         "font-size": {
-          "value": "{groningen.typography.font-size.s}",
+          "value": "{basis.typography.scale.small.font-size}",
           "type": "fontSizes"
         },
         "font-weight": {
@@ -919,6 +919,21 @@
           }
         }
       }
+    },
+    "basis": {
+      "typography": {
+        "scale": {
+          "xx-small": { "font-size": { "value": "12px", "comment": "12px" } },
+          "x-small": { "font-size": { "value": "14px", "comment": "14px" } },
+          "small": { "font-size": { "value": "16px", "comment": "16px" } },
+          "medium": { "font-size": { "value": "18px", "comment": "18px" } },
+          "large": { "font-size": { "value": "24px", "comment": "24px" } },
+          "x-large": { "font-size": { "value": "32px", "comment": "32px" } },
+          "xx-large": { "font-size": { "value": "40px", "comment": "40px" } },
+          "xxx-large": { "font-size": { "value": "48px", "comment": "48px" } },
+          "xxxx-large": { "font-size": { "value": "50px", "comment": "50px" } }
+        }
+      }
     }
   },
   "components/accordion": {
@@ -1142,7 +1157,7 @@
             "type": "lineHeights"
           },
           "font-size": {
-            "value": "{groningen.typography.font-size.l}",
+            "value": "{basis.typography.scale.large.font-size}",
             "type": "fontSizes"
           }
         },
@@ -1406,7 +1421,7 @@
       "blockquote": {
         "attribution": {
           "font-size": {
-            "value": "{groningen.typography.font-size.xs}",
+            "value": "{basis.typography.scale.x-small.font-size}",
             "type": "fontSizes"
           },
           "font-family": {
@@ -1440,7 +1455,7 @@
             "type": "fontWeights"
           },
           "font-size": {
-            "value": "{groningen.typography.font-size.l}",
+            "value": "{basis.typography.scale.large.font-size}",
             "type": "fontSizes"
           },
           "color": {
@@ -2273,7 +2288,7 @@
     "utrecht": {
       "counter-badge": {
         "font-size": {
-          "value": "{groningen.typography.font-size.xs}",
+          "value": "{basis.typography.scale.x-small.font-size}",
           "type": "fontSizes"
         },
         "line-height": {
@@ -2777,7 +2792,7 @@
           "type": "lineHeights"
         },
         "font-size": {
-          "value": "{groningen.typography.font-size.xxl}",
+          "value": "{basis.typography.scale.xx-large.font-size}",
           "type": "fontSizes"
         }
       },
@@ -2799,7 +2814,7 @@
           "type": "lineHeights"
         },
         "font-size": {
-          "value": "{groningen.typography.font-size.xl}",
+          "value": "{basis.typography.scale.x-large.font-size}",
           "type": "fontSizes"
         }
       },
@@ -2821,7 +2836,7 @@
           "type": "lineHeights"
         },
         "font-size": {
-          "value": "{groningen.typography.font-size.l}",
+          "value": "{basis.typography.scale.large.font-size}",
           "type": "fontSizes"
         }
       },
@@ -2843,7 +2858,7 @@
           "type": "lineHeights"
         },
         "font-size": {
-          "value": "{groningen.typography.font-size.m}",
+          "value": "{basis.typography.scale.medium.font-size}",
           "type": "fontSizes"
         }
       },
@@ -2865,7 +2880,7 @@
           "type": "lineHeights"
         },
         "font-size": {
-          "value": "{groningen.typography.font-size.m}",
+          "value": "{basis.typography.scale.medium.font-size}",
           "type": "fontSizes"
         }
       },
@@ -2887,7 +2902,7 @@
           "type": "lineHeights"
         },
         "font-size": {
-          "value": "{groningen.typography.font-size.xs}",
+          "value": "{basis.typography.scale.x-small.font-size}",
           "type": "fontSizes"
         }
       }
@@ -3535,7 +3550,7 @@
           "type": "lineHeights"
         },
         "font-size": {
-          "value": "{groningen.typography.font-size.m}",
+          "value": "{basis.typography.scale.medium.font-size}",
           "type": "fontSizes"
         }
       },
@@ -3557,7 +3572,7 @@
           "type": "lineHeights"
         },
         "font-size": {
-          "value": "{groningen.typography.font-size.xs}",
+          "value": "{basis.typography.scale.x-small.font-size}",
           "type": "fontSizes"
         }
       }
@@ -4135,7 +4150,7 @@
     "utrecht": {
       "status-badge": {
         "font-size": {
-          "value": "{groningen.typography.font-size.xs}",
+          "value": "{basis.typography.scale.x-small.font-size}",
           "type": "fontSizes"
         },
         "line-height": {
@@ -4284,7 +4299,7 @@
             "type": "fontWeights"
           },
           "font-size": {
-            "value": "{groningen.typography.font-size.l}",
+            "value": "{basis.typography.scale.large.font-size}",
             "type": "fontSizes"
           }
         },
diff --git a/proprietary/nora-design-tokens/figma/figma.tokens.json b/proprietary/nora-design-tokens/figma/figma.tokens.json
index 23855e3ec..70b145b12 100644
--- a/proprietary/nora-design-tokens/figma/figma.tokens.json
+++ b/proprietary/nora-design-tokens/figma/figma.tokens.json
@@ -625,11 +625,9 @@
           "$type": "fontFamilies",
           "$value": "{nora.typography.font-family.primary}"
         },
-        "small-vw": {
-          "font-size": {
-            "$type": "fontSizes",
-            "$value": "{nora.typography.font-size.md}"
-          }
+        "font-size": {
+          "$type": "fontSizes",
+          "$value": "{nora.typography.font-size.md}"
         },
         "line-height": {
           "$type": "lineHeights",
@@ -1189,27 +1187,25 @@
   "components/icon-only-button": {
     "todo": {
       "icon-only-button": {
-        "small-vw": {
-          "padding-block-end": {
-            "$type": "spacing",
-            "$value": "{nora.space.75}"
-          },
-          "padding-block-start": {
-            "$type": "spacing",
-            "$value": "{nora.space.75}"
-          },
-          "padding-inline-end": {
-            "$type": "spacing",
-            "$value": "{nora.space.75}"
-          },
-          "padding-inline-start": {
-            "$type": "spacing",
-            "$value": "{nora.space.75}"
-          },
-          "icon-size": {
-            "$type": "sizing",
-            "$value": "{nora.size.icon.xl}"
-          }
+        "padding-block-end": {
+          "$type": "spacing",
+          "$value": "{nora.space.75}"
+        },
+        "padding-block-start": {
+          "$type": "spacing",
+          "$value": "{nora.space.75}"
+        },
+        "padding-inline-end": {
+          "$type": "spacing",
+          "$value": "{nora.space.75}"
+        },
+        "padding-inline-start": {
+          "$type": "spacing",
+          "$value": "{nora.space.75}"
+        },
+        "icon-size": {
+          "$type": "sizing",
+          "$value": "{nora.size.icon.xl}"
         },
         "border-radius": {
           "$type": "borderRadius",
@@ -1443,11 +1439,9 @@
           "$type": "lineHeights",
           "$value": "{nora.typography.line-height.115}"
         },
-        "small-vw": {
-          "font-size": {
-            "$type": "fontSizes",
-            "$value": "{nora.typography.font-size.2xl}"
-          }
+        "font-size": {
+          "$type": "fontSizes",
+          "$value": "{nora.typography.font-size.2xl}"
         },
         "large-vw": {
           "font-size": {
@@ -1473,11 +1467,9 @@
           "$type": "lineHeights",
           "$value": "{nora.typography.line-height.115}"
         },
-        "small-vw": {
-          "font-size": {
-            "$type": "fontSizes",
-            "$value": "{nora.typography.font-size.xl}"
-          }
+        "font-size": {
+          "$type": "fontSizes",
+          "$value": "{nora.typography.font-size.xl}"
         },
         "large-vw": {
           "font-size": {
@@ -1503,11 +1495,9 @@
           "$type": "lineHeights",
           "$value": "{nora.typography.line-height.115}"
         },
-        "small-vw": {
-          "font-size": {
-            "$type": "fontSizes",
-            "$value": "{nora.typography.font-size.lg}"
-          }
+        "font-size": {
+          "$type": "fontSizes",
+          "$value": "{nora.typography.font-size.lg}"
         },
         "large-vw": {
           "font-size": {
@@ -1533,11 +1523,9 @@
           "$type": "lineHeights",
           "$value": "{nora.typography.line-height.115}"
         },
-        "small-vw": {
-          "font-size": {
-            "$type": "fontSizes",
-            "$value": "{nora.typography.font-size.md}"
-          }
+        "font-size": {
+          "$type": "fontSizes",
+          "$value": "{nora.typography.font-size.md}"
         },
         "large-vw": {
           "font-size": {
@@ -1563,11 +1551,9 @@
           "$type": "lineHeights",
           "$value": "{nora.typography.line-height.115}"
         },
-        "small-vw": {
-          "font-size": {
-            "$type": "fontSizes",
-            "$value": "{nora.typography.font-size.sm}"
-          }
+        "font-size": {
+          "$type": "fontSizes",
+          "$value": "{nora.typography.font-size.sm}"
         },
         "large-vw": {
           "font-size": {
@@ -1593,11 +1579,9 @@
           "$type": "lineHeights",
           "$value": "{nora.typography.line-height.115}"
         },
-        "small-vw": {
-          "font-size": {
-            "$type": "fontSizes",
-            "$value": "{nora.typography.font-size.sm}"
-          }
+        "font-size": {
+          "$type": "fontSizes",
+          "$value": "{nora.typography.font-size.sm}"
         },
         "large-vw": {
           "font-size": {
@@ -1611,23 +1595,21 @@
   "components/navigation-bar": {
     "nora": {
       "navigation-bar": {
-        "small-vw": {
-          "padding-inline-start": {
-            "$type": "spacing",
-            "$value": "{nora.space.200}"
-          },
-          "padding-block-start": {
-            "$type": "spacing",
-            "$value": "{nora.space.100}"
-          },
-          "padding-block-end": {
-            "$type": "spacing",
-            "$value": "{nora.space.100}"
-          },
-          "padding-inline-end": {
-            "$type": "spacing",
-            "$value": "{nora.space.100}"
-          }
+        "padding-inline-start": {
+          "$type": "spacing",
+          "$value": "{nora.space.200}"
+        },
+        "padding-block-start": {
+          "$type": "spacing",
+          "$value": "{nora.space.100}"
+        },
+        "padding-block-end": {
+          "$type": "spacing",
+          "$value": "{nora.space.100}"
+        },
+        "padding-inline-end": {
+          "$type": "spacing",
+          "$value": "{nora.space.100}"
         },
         "large-vw": {
           "padding-inline-start": {
@@ -1786,11 +1768,9 @@
           }
         },
         "utilities-container": {
-          "small-vw": {
-            "column-gap": {
-              "$type": "spacing",
-              "$value": "{nora.space.100}"
-            }
+          "column-gap": {
+            "$type": "spacing",
+            "$value": "{nora.space.100}"
           },
           "large-vw": {
             "column-gap": {
@@ -1808,11 +1788,9 @@
           }
         },
         "navigation-container": {
-          "small-vw": {
-            "column-gap": {
-              "$type": "spacing",
-              "$value": "{nora.space.150}"
-            }
+          "column-gap": {
+            "$type": "spacing",
+            "$value": "{nora.space.150}"
           },
           "large-vw": {
             "column-gap": {
@@ -1886,27 +1864,25 @@
               }
             }
           },
-          "small-vw": {
-            "padding-inline-start": {
-              "$type": "spacing",
-              "$value": "{nora.space.150}"
-            },
-            "padding-inline-end": {
-              "$type": "spacing",
-              "$value": "{nora.space.200}"
-            },
-            "padding-block-start": {
-              "$type": "spacing",
-              "$value": "{nora.space.175}"
-            },
-            "padding-block-end": {
-              "$type": "spacing",
-              "$value": "{nora.space.175}"
-            },
-            "min-height": {
-              "$type": "sizing",
-              "$value": "{nora.size.1200}"
-            }
+          "padding-inline-start": {
+            "$type": "spacing",
+            "$value": "{nora.space.150}"
+          },
+          "padding-inline-end": {
+            "$type": "spacing",
+            "$value": "{nora.space.200}"
+          },
+          "padding-block-start": {
+            "$type": "spacing",
+            "$value": "{nora.space.175}"
+          },
+          "padding-block-end": {
+            "$type": "spacing",
+            "$value": "{nora.space.175}"
+          },
+          "min-height": {
+            "$type": "sizing",
+            "$value": "{nora.size.1200}"
           },
           "large-vw": {
             "padding-inline-start": {
@@ -2024,23 +2000,21 @@
               "$value": "{nora.size.icon.xl}"
             }
           },
-          "small-vw": {
-            "padding-inline-start": {
-              "$type": "spacing",
-              "$value": "{nora.space.125}"
-            },
-            "padding-inline-end": {
-              "$type": "spacing",
-              "$value": "{nora.space.125}"
-            },
-            "padding-block-start": {
-              "$type": "spacing",
-              "$value": "{nora.space.125}"
-            },
-            "padding-block-end": {
-              "$type": "spacing",
-              "$value": "{nora.space.125}"
-            }
+          "padding-inline-start": {
+            "$type": "spacing",
+            "$value": "{nora.space.125}"
+          },
+          "padding-inline-end": {
+            "$type": "spacing",
+            "$value": "{nora.space.125}"
+          },
+          "padding-block-start": {
+            "$type": "spacing",
+            "$value": "{nora.space.125}"
+          },
+          "padding-block-end": {
+            "$type": "spacing",
+            "$value": "{nora.space.125}"
           }
         },
         "search-form": {
@@ -2050,11 +2024,9 @@
           }
         },
         "logo": {
-          "small-vw": {
-            "height": {
-              "$type": "sizing",
-              "$value": "{nora.size.700}"
-            }
+          "height": {
+            "$type": "sizing",
+            "$value": "{nora.size.700}"
           },
           "large-vw": {
             "height": {
@@ -2137,11 +2109,9 @@
           "$type": "fontFamilies",
           "$value": "{nora.document.font-family}"
         },
-        "small-vw": {
-          "font-size": {
-            "$type": "fontSizes",
-            "$value": "{nora.document.small-vw.font-size}"
-          }
+        "font-size": {
+          "$type": "fontSizes",
+          "$value": "{nora.document.font-size}"
         },
         "line-height": {
           "$type": "lineHeights",
@@ -2286,27 +2256,25 @@
     "nora": {
       "link-overview": {
         "item": {
-          "small-vw": {
-            "padding-inline-start": {
-              "$type": "dimension",
-              "$value": "0px"
-            },
-            "padding-inline-end": {
-              "$type": "dimension",
-              "$value": "0px"
-            },
-            "padding-block-start": {
-              "$type": "dimension",
-              "$value": "{nora.space.150}"
-            },
-            "padding-block-end": {
-              "$type": "dimension",
-              "$value": "{nora.space.150}"
-            },
-            "gap": {
-              "$type": "dimension",
-              "$value": "{nora.space.300}"
-            }
+          "padding-inline-start": {
+            "$type": "dimension",
+            "$value": "0px"
+          },
+          "padding-inline-end": {
+            "$type": "dimension",
+            "$value": "0px"
+          },
+          "padding-block-start": {
+            "$type": "dimension",
+            "$value": "{nora.space.150}"
+          },
+          "padding-block-end": {
+            "$type": "dimension",
+            "$value": "{nora.space.150}"
+          },
+          "gap": {
+            "$type": "dimension",
+            "$value": "{nora.space.300}"
           },
           "large-vw": {
             "padding-inline-start": {
@@ -2389,11 +2357,9 @@
             }
           },
           "content": {
-            "small-vw": {
-              "gap": {
-                "$type": "dimension",
-                "$value": "{nora.space.25}"
-              }
+            "gap": {
+              "$type": "dimension",
+              "$value": "{nora.space.25}"
             },
             "large-vw": {
               "gap": {