From d299f5216560f5a8c99baf8472c60ff3c9cd8f67 Mon Sep 17 00:00:00 2001
From: AlineNap <59806622+AlineNap@users.noreply.github.com>
Date: Mon, 14 Oct 2024 16:28:45 +0200
Subject: [PATCH 01/12] set aangemaakt voor checkbox

---
 .../design-tokens/src/imported/$metadata.json |  1 +
 .../design-tokens/src/imported/$themes.json   | 66 ++++++++++++-------
 .../src/imported/nl/utrecht-checkbox.json     |  1 +
 3 files changed, 46 insertions(+), 22 deletions(-)
 create mode 100644 proprietary/design-tokens/src/imported/nl/utrecht-checkbox.json

diff --git a/proprietary/design-tokens/src/imported/$metadata.json b/proprietary/design-tokens/src/imported/$metadata.json
index 20b12301a..dc59e5e79 100644
--- a/proprietary/design-tokens/src/imported/$metadata.json
+++ b/proprietary/design-tokens/src/imported/$metadata.json
@@ -45,6 +45,7 @@
     "nl/utrecht-pointer-target",
     "nl/utrecht-textarea",
     "nl/utrecht-pre-heading",
+    "nl/utrecht-checkbox",
     "nl/utrecht-text-input"
   ]
 }
\ No newline at end of file
diff --git a/proprietary/design-tokens/src/imported/$themes.json b/proprietary/design-tokens/src/imported/$themes.json
index 999a76eb7..78c2d817b 100644
--- a/proprietary/design-tokens/src/imported/$themes.json
+++ b/proprietary/design-tokens/src/imported/$themes.json
@@ -8,7 +8,8 @@
       "core/color": "enabled",
       "core/spacing": "enabled",
       "core/border": "enabled",
-      "core/other": "enabled"
+      "core/other": "enabled",
+      "nl/utrecht-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:7:1003",
     "$figmaModeId": "7:30",
@@ -188,7 +189,8 @@
     "name": "default",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "common/default": "enabled"
+      "common/default": "enabled",
+      "nl/utrecht-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:46:7",
     "$figmaModeId": "46:0",
@@ -204,7 +206,8 @@
     "name": "Logius",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "product/Logius": "enabled"
+      "product/Logius": "enabled",
+      "nl/utrecht-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:1:2",
     "$figmaModeId": "1:0",
@@ -253,7 +256,8 @@
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
       "product/Logius Blauw": "enabled",
-      "product/Logius": "source"
+      "product/Logius": "source",
+      "nl/utrecht-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:1:2",
     "$figmaModeId": "2641:0",
@@ -302,7 +306,8 @@
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
       "product/MijnOverheid": "enabled",
-      "product/Logius": "source"
+      "product/Logius": "source",
+      "nl/utrecht-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:1:2",
     "$figmaModeId": "1:3",
@@ -351,7 +356,8 @@
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
       "product/DigiD": "enabled",
-      "product/Logius": "source"
+      "product/Logius": "source",
+      "nl/utrecht-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:1:2",
     "$figmaModeId": "1:4",
@@ -399,7 +405,8 @@
     "name": "NLdoc",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "product/NLdoc-mapping": "enabled"
+      "product/NLdoc-mapping": "enabled",
+      "nl/utrecht-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:1:2",
     "$figmaModeId": "123:0",
@@ -434,7 +441,8 @@
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
       "product/Logius": "source",
-      "product/EVA": "enabled"
+      "product/EVA": "enabled",
+      "nl/utrecht-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:1:2",
     "$figmaModeId": "2418:0",
@@ -461,7 +469,8 @@
     "name": "xl",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "viewport/xl": "enabled"
+      "viewport/xl": "enabled",
+      "nl/utrecht-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:7:318",
     "$figmaModeId": "7:1",
@@ -496,7 +505,8 @@
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
       "viewport/xl": "source",
-      "viewport/lg": "enabled"
+      "viewport/lg": "enabled",
+      "nl/utrecht-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:7:318",
     "$figmaModeId": "9:0",
@@ -531,7 +541,8 @@
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
       "viewport/xl": "source",
-      "viewport/md": "enabled"
+      "viewport/md": "enabled",
+      "nl/utrecht-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:7:318",
     "$figmaModeId": "9:1",
@@ -566,7 +577,8 @@
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
       "viewport/xl": "source",
-      "viewport/sm": "enabled"
+      "viewport/sm": "enabled",
+      "nl/utrecht-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:7:318",
     "$figmaModeId": "9:2",
@@ -600,7 +612,8 @@
     "name": "xs",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "viewport/xs": "enabled"
+      "viewport/xs": "enabled",
+      "nl/utrecht-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:7:318",
     "$figmaModeId": "54:0",
@@ -634,7 +647,8 @@
     "name": "light",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "mode/light": "enabled"
+      "mode/light": "enabled",
+      "nl/utrecht-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:1:3",
     "$figmaModeId": "1:1",
@@ -688,7 +702,8 @@
     "name": "dark (beta)",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "mode/dark": "enabled"
+      "mode/dark": "enabled",
+      "nl/utrecht-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:1:3",
     "$figmaModeId": "1:2",
@@ -746,7 +761,8 @@
       "component/alert": "enabled",
       "component/button": "enabled",
       "component/login link": "enabled",
-      "component/icon-logo": "enabled"
+      "component/icon-logo": "enabled",
+      "nl/utrecht-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:1503:3470",
     "$figmaModeId": "1503:2",
@@ -883,7 +899,8 @@
       "nl/utrecht-form-label": "enabled",
       "nl/utrecht-document": "enabled",
       "nl/utrecht-heading": "enabled",
-      "nl/utrecht-pre-heading": "enabled"
+      "nl/utrecht-pre-heading": "enabled",
+      "nl/utrecht-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:2536:6472",
     "$figmaModeId": "2536:0",
@@ -985,7 +1002,8 @@
     "name": "default",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "NLdoc/default": "enabled"
+      "NLdoc/default": "enabled",
+      "nl/utrecht-checkbox": "disabled"
     },
     "group": "NLdoc"
   },
@@ -994,7 +1012,8 @@
     "name": "Rijksoverheid",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "NLdoc/Rijksoverheid": "enabled"
+      "NLdoc/Rijksoverheid": "enabled",
+      "nl/utrecht-checkbox": "disabled"
     },
     "group": "NLdoc"
   },
@@ -1003,7 +1022,8 @@
     "name": "Ridderkerk",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "NLdoc/Ridderkerk": "enabled"
+      "NLdoc/Ridderkerk": "enabled",
+      "nl/utrecht-checkbox": "disabled"
     },
     "group": "NLdoc"
   },
@@ -1012,7 +1032,8 @@
     "name": "Waterschap Hollandse Delta",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "NLdoc/Waterschap Hollandse Delta": "enabled"
+      "NLdoc/Waterschap Hollandse Delta": "enabled",
+      "nl/utrecht-checkbox": "disabled"
     },
     "group": "NLdoc"
   },
@@ -1022,7 +1043,8 @@
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
       "product/Digitoegankelijk": "enabled",
-      "product/Logius": "source"
+      "product/Logius": "source",
+      "nl/utrecht-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:1:2",
     "$figmaModeId": "2690:0",
diff --git a/proprietary/design-tokens/src/imported/nl/utrecht-checkbox.json b/proprietary/design-tokens/src/imported/nl/utrecht-checkbox.json
new file mode 100644
index 000000000..9e26dfeeb
--- /dev/null
+++ b/proprietary/design-tokens/src/imported/nl/utrecht-checkbox.json
@@ -0,0 +1 @@
+{}
\ No newline at end of file

From d0f4cbd759e90180917decbff5e439e4401c5741 Mon Sep 17 00:00:00 2001
From: AlineNap <59806622+AlineNap@users.noreply.github.com>
Date: Mon, 14 Oct 2024 16:34:32 +0200
Subject: [PATCH 02/12] ..

---
 .../design-tokens/src/imported/$themes.json   | 66 +++++++------------
 1 file changed, 22 insertions(+), 44 deletions(-)

diff --git a/proprietary/design-tokens/src/imported/$themes.json b/proprietary/design-tokens/src/imported/$themes.json
index 78c2d817b..999a76eb7 100644
--- a/proprietary/design-tokens/src/imported/$themes.json
+++ b/proprietary/design-tokens/src/imported/$themes.json
@@ -8,8 +8,7 @@
       "core/color": "enabled",
       "core/spacing": "enabled",
       "core/border": "enabled",
-      "core/other": "enabled",
-      "nl/utrecht-checkbox": "disabled"
+      "core/other": "enabled"
     },
     "$figmaCollectionId": "VariableCollectionId:7:1003",
     "$figmaModeId": "7:30",
@@ -189,8 +188,7 @@
     "name": "default",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "common/default": "enabled",
-      "nl/utrecht-checkbox": "disabled"
+      "common/default": "enabled"
     },
     "$figmaCollectionId": "VariableCollectionId:46:7",
     "$figmaModeId": "46:0",
@@ -206,8 +204,7 @@
     "name": "Logius",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "product/Logius": "enabled",
-      "nl/utrecht-checkbox": "disabled"
+      "product/Logius": "enabled"
     },
     "$figmaCollectionId": "VariableCollectionId:1:2",
     "$figmaModeId": "1:0",
@@ -256,8 +253,7 @@
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
       "product/Logius Blauw": "enabled",
-      "product/Logius": "source",
-      "nl/utrecht-checkbox": "disabled"
+      "product/Logius": "source"
     },
     "$figmaCollectionId": "VariableCollectionId:1:2",
     "$figmaModeId": "2641:0",
@@ -306,8 +302,7 @@
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
       "product/MijnOverheid": "enabled",
-      "product/Logius": "source",
-      "nl/utrecht-checkbox": "disabled"
+      "product/Logius": "source"
     },
     "$figmaCollectionId": "VariableCollectionId:1:2",
     "$figmaModeId": "1:3",
@@ -356,8 +351,7 @@
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
       "product/DigiD": "enabled",
-      "product/Logius": "source",
-      "nl/utrecht-checkbox": "disabled"
+      "product/Logius": "source"
     },
     "$figmaCollectionId": "VariableCollectionId:1:2",
     "$figmaModeId": "1:4",
@@ -405,8 +399,7 @@
     "name": "NLdoc",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "product/NLdoc-mapping": "enabled",
-      "nl/utrecht-checkbox": "disabled"
+      "product/NLdoc-mapping": "enabled"
     },
     "$figmaCollectionId": "VariableCollectionId:1:2",
     "$figmaModeId": "123:0",
@@ -441,8 +434,7 @@
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
       "product/Logius": "source",
-      "product/EVA": "enabled",
-      "nl/utrecht-checkbox": "disabled"
+      "product/EVA": "enabled"
     },
     "$figmaCollectionId": "VariableCollectionId:1:2",
     "$figmaModeId": "2418:0",
@@ -469,8 +461,7 @@
     "name": "xl",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "viewport/xl": "enabled",
-      "nl/utrecht-checkbox": "disabled"
+      "viewport/xl": "enabled"
     },
     "$figmaCollectionId": "VariableCollectionId:7:318",
     "$figmaModeId": "7:1",
@@ -505,8 +496,7 @@
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
       "viewport/xl": "source",
-      "viewport/lg": "enabled",
-      "nl/utrecht-checkbox": "disabled"
+      "viewport/lg": "enabled"
     },
     "$figmaCollectionId": "VariableCollectionId:7:318",
     "$figmaModeId": "9:0",
@@ -541,8 +531,7 @@
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
       "viewport/xl": "source",
-      "viewport/md": "enabled",
-      "nl/utrecht-checkbox": "disabled"
+      "viewport/md": "enabled"
     },
     "$figmaCollectionId": "VariableCollectionId:7:318",
     "$figmaModeId": "9:1",
@@ -577,8 +566,7 @@
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
       "viewport/xl": "source",
-      "viewport/sm": "enabled",
-      "nl/utrecht-checkbox": "disabled"
+      "viewport/sm": "enabled"
     },
     "$figmaCollectionId": "VariableCollectionId:7:318",
     "$figmaModeId": "9:2",
@@ -612,8 +600,7 @@
     "name": "xs",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "viewport/xs": "enabled",
-      "nl/utrecht-checkbox": "disabled"
+      "viewport/xs": "enabled"
     },
     "$figmaCollectionId": "VariableCollectionId:7:318",
     "$figmaModeId": "54:0",
@@ -647,8 +634,7 @@
     "name": "light",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "mode/light": "enabled",
-      "nl/utrecht-checkbox": "disabled"
+      "mode/light": "enabled"
     },
     "$figmaCollectionId": "VariableCollectionId:1:3",
     "$figmaModeId": "1:1",
@@ -702,8 +688,7 @@
     "name": "dark (beta)",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "mode/dark": "enabled",
-      "nl/utrecht-checkbox": "disabled"
+      "mode/dark": "enabled"
     },
     "$figmaCollectionId": "VariableCollectionId:1:3",
     "$figmaModeId": "1:2",
@@ -761,8 +746,7 @@
       "component/alert": "enabled",
       "component/button": "enabled",
       "component/login link": "enabled",
-      "component/icon-logo": "enabled",
-      "nl/utrecht-checkbox": "disabled"
+      "component/icon-logo": "enabled"
     },
     "$figmaCollectionId": "VariableCollectionId:1503:3470",
     "$figmaModeId": "1503:2",
@@ -899,8 +883,7 @@
       "nl/utrecht-form-label": "enabled",
       "nl/utrecht-document": "enabled",
       "nl/utrecht-heading": "enabled",
-      "nl/utrecht-pre-heading": "enabled",
-      "nl/utrecht-checkbox": "disabled"
+      "nl/utrecht-pre-heading": "enabled"
     },
     "$figmaCollectionId": "VariableCollectionId:2536:6472",
     "$figmaModeId": "2536:0",
@@ -1002,8 +985,7 @@
     "name": "default",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "NLdoc/default": "enabled",
-      "nl/utrecht-checkbox": "disabled"
+      "NLdoc/default": "enabled"
     },
     "group": "NLdoc"
   },
@@ -1012,8 +994,7 @@
     "name": "Rijksoverheid",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "NLdoc/Rijksoverheid": "enabled",
-      "nl/utrecht-checkbox": "disabled"
+      "NLdoc/Rijksoverheid": "enabled"
     },
     "group": "NLdoc"
   },
@@ -1022,8 +1003,7 @@
     "name": "Ridderkerk",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "NLdoc/Ridderkerk": "enabled",
-      "nl/utrecht-checkbox": "disabled"
+      "NLdoc/Ridderkerk": "enabled"
     },
     "group": "NLdoc"
   },
@@ -1032,8 +1012,7 @@
     "name": "Waterschap Hollandse Delta",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "NLdoc/Waterschap Hollandse Delta": "enabled",
-      "nl/utrecht-checkbox": "disabled"
+      "NLdoc/Waterschap Hollandse Delta": "enabled"
     },
     "group": "NLdoc"
   },
@@ -1043,8 +1022,7 @@
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
       "product/Digitoegankelijk": "enabled",
-      "product/Logius": "source",
-      "nl/utrecht-checkbox": "disabled"
+      "product/Logius": "source"
     },
     "$figmaCollectionId": "VariableCollectionId:1:2",
     "$figmaModeId": "2690:0",

From 1659ac49c10616c87d774050febb3ad35a0408ce Mon Sep 17 00:00:00 2001
From: AlineNap <59806622+AlineNap@users.noreply.github.com>
Date: Mon, 14 Oct 2024 17:11:32 +0200
Subject: [PATCH 03/12] token values ingevuld

---
 .../src/imported/NLdoc/Ridderkerk.json        |  28 +-
 .../src/imported/NLdoc/Rijksoverheid.json     |  28 +-
 .../NLdoc/Waterschap Hollandse Delta.json     |  28 +-
 .../src/imported/NLdoc/default.json           |  28 +-
 .../src/imported/common/default.json          |  16 +-
 .../src/imported/component/alert.json         |  70 +--
 .../src/imported/component/button.json        | 204 +++----
 .../src/imported/component/icon-logo.json     |  24 +-
 .../src/imported/component/link.json          |  64 +--
 .../src/imported/component/login link.json    | 134 ++---
 .../src/imported/component/paragraph.json     |  36 +-
 .../src/imported/component/section.json       |  28 +-
 .../src/imported/core/border.json             |  20 +-
 .../src/imported/core/color.json              | 538 +++++++++---------
 .../design-tokens/src/imported/core/font.json |  96 ++--
 .../src/imported/core/other.json              |   6 +-
 .../src/imported/core/spacing.json            |  44 +-
 .../design-tokens/src/imported/mode/dark.json | 240 ++++----
 .../src/imported/mode/light.json              | 240 ++++----
 .../src/imported/nl/utrecht-alert.json        | 120 ++--
 .../src/imported/nl/utrecht-button.json       | 438 +++++++-------
 .../src/imported/nl/utrecht-checkbox.json     | 303 +++++++++-
 .../src/imported/nl/utrecht-document.json     |  24 +-
 .../src/imported/nl/utrecht-focus.json        |  20 +-
 .../nl/utrecht-form-field-description.json    |  34 +-
 .../nl/utrecht-form-field-error-message.json  |  70 +--
 .../src/imported/nl/utrecht-form-field.json   |  16 +-
 .../src/imported/nl/utrecht-form-label.json   |  36 +-
 .../src/imported/nl/utrecht-heading.json      | 120 ++--
 .../src/imported/nl/utrecht-link.json         |  84 +--
 .../src/imported/nl/utrecht-paragraph.json    |  60 +-
 .../imported/nl/utrecht-pointer-target.json   |   4 +-
 .../src/imported/nl/utrecht-pre-heading.json  |  20 +-
 .../src/imported/nl/utrecht-text-input.json   | 140 ++---
 .../src/imported/nl/utrecht-textarea.json     | 136 ++---
 .../src/imported/product/DigiD.json           | 178 +++---
 .../imported/product/Digitoegankelijk.json    | 178 +++---
 .../src/imported/product/EVA.json             | 172 +++---
 .../src/imported/product/Logius Blauw.json    | 178 +++---
 .../src/imported/product/Logius.json          | 178 +++---
 .../src/imported/product/MijnOverheid.json    | 178 +++---
 .../src/imported/product/NLdoc-mapping.json   | 174 +++---
 .../src/imported/viewport/lg.json             |  96 ++--
 .../src/imported/viewport/md.json             |  96 ++--
 .../src/imported/viewport/sm.json             |  96 ++--
 .../src/imported/viewport/xl.json             |  96 ++--
 .../src/imported/viewport/xs.json             | 100 ++--
 47 files changed, 2759 insertions(+), 2458 deletions(-)

diff --git a/proprietary/design-tokens/src/imported/NLdoc/Ridderkerk.json b/proprietary/design-tokens/src/imported/NLdoc/Ridderkerk.json
index 14c40e0c1..4618fb887 100644
--- a/proprietary/design-tokens/src/imported/NLdoc/Ridderkerk.json
+++ b/proprietary/design-tokens/src/imported/NLdoc/Ridderkerk.json
@@ -4,36 +4,36 @@
       "brand": {
         "default": {
           "parent": "NLdoc / Organisatie/Ridderkerk",
-          "type": "color",
-          "value": "#028532",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "#028532"
         },
         "subdued": {
           "parent": "NLdoc / Organisatie/Ridderkerk",
-          "type": "color",
-          "value": "#d9ede0",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "#d9ede0"
         },
         "hover": {
           "parent": "NLdoc / Organisatie/Ridderkerk",
-          "type": "color",
-          "value": "#026732",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "#026732"
         }
       }
     },
     "button": {
       "color": {
         "parent": "NLdoc / Organisatie/Ridderkerk",
-        "type": "color",
-        "value": "{lux.color.grijs.700}",
-        "description": ""
+        "description": "",
+        "$type": "color",
+        "$value": "{lux.color.grijs.700}"
       }
     },
     "font-family": {
       "primary": {
-        "type": "fontFamilies",
-        "value": "Lato, Arial"
+        "$type": "fontFamilies",
+        "$value": "Lato, Arial"
       }
     }
   }
diff --git a/proprietary/design-tokens/src/imported/NLdoc/Rijksoverheid.json b/proprietary/design-tokens/src/imported/NLdoc/Rijksoverheid.json
index 934dabe01..88db88160 100644
--- a/proprietary/design-tokens/src/imported/NLdoc/Rijksoverheid.json
+++ b/proprietary/design-tokens/src/imported/NLdoc/Rijksoverheid.json
@@ -4,36 +4,36 @@
       "brand": {
         "default": {
           "parent": "NLdoc / Organisatie/Rijksoverheid",
-          "type": "color",
-          "value": "{lux.color.donkerblauw.500}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.donkerblauw.500}"
         },
         "subdued": {
           "parent": "NLdoc / Organisatie/Rijksoverheid",
-          "type": "color",
-          "value": "{lux.color.donkerblauw.50}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.donkerblauw.50}"
         },
         "hover": {
           "parent": "NLdoc / Organisatie/Rijksoverheid",
-          "type": "color",
-          "value": "{lux.color.donkerblauw.700}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.donkerblauw.700}"
         }
       }
     },
     "button": {
       "color": {
         "parent": "NLdoc / Organisatie/Rijksoverheid",
-        "type": "color",
-        "value": "{nldoc.color.brand.default}",
-        "description": ""
+        "description": "",
+        "$type": "color",
+        "$value": "{nldoc.color.brand.default}"
       }
     },
     "font-family": {
       "primary": {
-        "type": "fontFamilies",
-        "value": "{ro.font-family.primary}"
+        "$type": "fontFamilies",
+        "$value": "{ro.font-family.primary}"
       }
     }
   }
diff --git a/proprietary/design-tokens/src/imported/NLdoc/Waterschap Hollandse Delta.json b/proprietary/design-tokens/src/imported/NLdoc/Waterschap Hollandse Delta.json
index d521ac5a5..b771b779b 100644
--- a/proprietary/design-tokens/src/imported/NLdoc/Waterschap Hollandse Delta.json	
+++ b/proprietary/design-tokens/src/imported/NLdoc/Waterschap Hollandse Delta.json	
@@ -4,36 +4,36 @@
       "brand": {
         "default": {
           "parent": "NLdoc / Organisatie/Waterschap Hollandse Delta",
-          "type": "color",
-          "value": "#462e87",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "#462e87"
         },
         "subdued": {
           "parent": "NLdoc / Organisatie/Waterschap Hollandse Delta",
-          "type": "color",
-          "value": "#e3e0ed",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "#e3e0ed"
         },
         "hover": {
           "parent": "NLdoc / Organisatie/Waterschap Hollandse Delta",
-          "type": "color",
-          "value": "#2c1d54",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "#2c1d54"
         }
       }
     },
     "button": {
       "color": {
         "parent": "NLdoc / Organisatie/Waterschap Hollandse Delta",
-        "type": "color",
-        "value": "{nldoc.color.brand.default}",
-        "description": ""
+        "description": "",
+        "$type": "color",
+        "$value": "{nldoc.color.brand.default}"
       }
     },
     "font-family": {
       "primary": {
-        "type": "fontFamilies",
-        "value": "Verdana, Arial"
+        "$type": "fontFamilies",
+        "$value": "Verdana, Arial"
       }
     }
   }
diff --git a/proprietary/design-tokens/src/imported/NLdoc/default.json b/proprietary/design-tokens/src/imported/NLdoc/default.json
index cc99ae01b..8ec4a70b7 100644
--- a/proprietary/design-tokens/src/imported/NLdoc/default.json
+++ b/proprietary/design-tokens/src/imported/NLdoc/default.json
@@ -4,36 +4,36 @@
       "brand": {
         "default": {
           "parent": "NLdoc / Organisatie/NLdoc",
-          "type": "color",
-          "value": "{lux.color.violet.500}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.violet.500}"
         },
         "subdued": {
           "parent": "NLdoc / Organisatie/NLdoc",
-          "type": "color",
-          "value": "{lux.color.violet.50}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.violet.50}"
         },
         "hover": {
           "parent": "NLdoc / Organisatie/NLdoc",
-          "type": "color",
-          "value": "{lux.color.violet.700}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.violet.700}"
         }
       }
     },
     "button": {
       "color": {
         "parent": "NLdoc / Organisatie/NLdoc",
-        "type": "color",
-        "value": "{nldoc.color.brand.default}",
-        "description": ""
+        "description": "",
+        "$type": "color",
+        "$value": "{nldoc.color.brand.default}"
       }
     },
     "font-family": {
       "primary": {
-        "type": "fontFamilies",
-        "value": "{ro.font-family.primary}"
+        "$type": "fontFamilies",
+        "$value": "{ro.font-family.primary}"
       }
     }
   }
diff --git a/proprietary/design-tokens/src/imported/common/default.json b/proprietary/design-tokens/src/imported/common/default.json
index c8100b64d..028269c74 100644
--- a/proprietary/design-tokens/src/imported/common/default.json
+++ b/proprietary/design-tokens/src/imported/common/default.json
@@ -2,24 +2,24 @@
   "lux": {
     "focus": {
       "outline-offset": {
-        "type": "spacing",
-        "value": "{lux.space.25}"
+        "$type": "spacing",
+        "$value": "{lux.space.25}"
       }
     },
     "size": {
       "icon": {
         "parent": "common/default",
-        "type": "sizing",
-        "value": "1rem",
-        "description": ""
+        "description": "",
+        "$type": "sizing",
+        "$value": "1rem"
       }
     },
     "grid": {
       "max-inline": {
         "parent": "common/default",
-        "type": "sizing",
-        "value": "77.5rem",
-        "description": ""
+        "description": "",
+        "$type": "sizing",
+        "$value": "77.5rem"
       }
     }
   }
diff --git a/proprietary/design-tokens/src/imported/component/alert.json b/proprietary/design-tokens/src/imported/component/alert.json
index 9c3b91c4a..2b716b804 100644
--- a/proprietary/design-tokens/src/imported/component/alert.json
+++ b/proprietary/design-tokens/src/imported/component/alert.json
@@ -2,84 +2,84 @@
   "lux": {
     "alert": {
       "color": {
-        "type": "color",
-        "value": "{lux.color.grijs.700}"
+        "$type": "color",
+        "$value": "{lux.color.grijs.700}"
       },
       "border-color": {
-        "type": "color",
-        "value": "{lux.color.none}"
+        "$type": "color",
+        "$value": "{lux.color.none}"
       },
       "border-radius": {
-        "type": "borderRadius",
-        "value": "{lux.border-radius.default}"
+        "$type": "borderRadius",
+        "$value": "{lux.border-radius.default}"
       },
       "border-width": {
-        "type": "borderWidth",
-        "value": "{lux.border-width.default}"
+        "$type": "borderWidth",
+        "$value": "{lux.border-width.default}"
       },
       "column-gap": {
-        "type": "spacing",
-        "value": "{lux.space.100}"
+        "$type": "spacing",
+        "$value": "{lux.space.100}"
       },
       "padding-block-end": {
-        "type": "spacing",
-        "value": "{lux.space.150}"
+        "$type": "spacing",
+        "$value": "{lux.space.150}"
       },
       "padding-block-start": {
-        "type": "spacing",
-        "value": "{lux.space.150}"
+        "$type": "spacing",
+        "$value": "{lux.space.150}"
       },
       "padding-inline-end": {
-        "type": "spacing",
-        "value": "{lux.space.150}"
+        "$type": "spacing",
+        "$value": "{lux.space.150}"
       },
       "padding-inline-start": {
-        "type": "spacing",
-        "value": "{lux.space.150}"
+        "$type": "spacing",
+        "$value": "{lux.space.150}"
       },
       "icon": {
         "size": {
-          "type": "sizing",
-          "value": "24px"
+          "$type": "sizing",
+          "$value": "24px"
         },
         "inset-block-start": {
-          "value": "{lux.space.25}",
-          "type": "spacing"
+          "$type": "spacing",
+          "$value": "{lux.space.25}"
         }
       },
       "close-button-size": {
-        "type": "sizing",
-        "value": "{lux.size.icon}",
-        "description": "Mist in utrecht alert, wat gaan we hiermee doen? "
+        "$type": "sizing",
+        "$value": "{lux.size.icon}",
+        "$description": "Mist in utrecht alert, wat gaan we hiermee doen? "
       },
       "message": {
         "row-gap": {
-          "type": "spacing",
-          "value": "{lux.space.0}"
+          "$type": "spacing",
+          "$value": "{lux.space.0}"
         }
       },
       "info": {
         "background-color": {
-          "type": "color",
-          "value": "{lux.color.feedback.info.subdued}"
+          "$type": "color",
+          "$value": "{lux.color.feedback.info.subdued}"
         }
       },
       "success": {
         "background-color": {
-          "type": "color",
-          "value": "{lux.color.feedback.success.subdued}"
+          "$type": "color",
+          "$value": "{lux.color.feedback.success.subdued}"
         }
       },
       "error": {
         "background-color": {
-          "type": "color",
-          "value": "{lux.color.feedback.error.subdued}"
+          "$type": "color",
+          "$value": "{lux.color.feedback.error.subdued}"
         }
       },
       "warning": {
         "background-color": {
-          "type": "color",
-          "value": "{lux.color.feedback.warning.subdued}"
+          "$type": "color",
+          "$value": "{lux.color.feedback.warning.subdued}"
         }
       }
     }
diff --git a/proprietary/design-tokens/src/imported/component/button.json b/proprietary/design-tokens/src/imported/component/button.json
index cce5b096d..65d8b8978 100644
--- a/proprietary/design-tokens/src/imported/component/button.json
+++ b/proprietary/design-tokens/src/imported/component/button.json
@@ -2,234 +2,234 @@
   "lux": {
     "button": {
       "font-size": {
-        "type": "fontSizes",
-        "value": "{product.button.font-size}"
+        "$type": "fontSizes",
+        "$value": "{product.button.font-size}"
       },
       "primary": {
         "font-size": {
-          "type": "fontSizes",
-          "value": "{product.button.primary.font-size}"
+          "$type": "fontSizes",
+          "$value": "{product.button.primary.font-size}"
         },
         "background-color": {
-          "type": "color",
-          "value": "{lux.color.brand.default}"
+          "$type": "color",
+          "$value": "{lux.color.brand.default}"
         },
         "border-color": {
-          "type": "color",
-          "value": "{lux.color.none}"
+          "$type": "color",
+          "$value": "{lux.color.none}"
         },
         "color": {
-          "type": "color",
-          "value": "{lux.color.foreground.onEmphasis}"
+          "$type": "color",
+          "$value": "{lux.color.foreground.onEmphasis}"
         },
         "hover": {
           "background-color": {
-            "type": "color",
-            "value": "{lux.color.brand.hover}"
+            "$type": "color",
+            "$value": "{lux.color.brand.hover}"
           },
           "border-color": {
-            "type": "color",
-            "value": "{lux.color.none}"
+            "$type": "color",
+            "$value": "{lux.color.none}"
           },
           "color": {
-            "type": "color",
-            "value": "{lux.color.foreground.onEmphasis}"
+            "$type": "color",
+            "$value": "{lux.color.foreground.onEmphasis}"
           }
         },
         "active": {
           "background-color": {
-            "type": "color",
-            "value": "{lux.color.brand.default}"
+            "$type": "color",
+            "$value": "{lux.color.brand.default}"
           },
           "border-color": {
-            "type": "color",
-            "value": "{lux.color.none}"
+            "$type": "color",
+            "$value": "{lux.color.none}"
           },
           "color": {
-            "type": "color",
-            "value": "{lux.color.foreground.onEmphasis}"
+            "$type": "color",
+            "$value": "{lux.color.foreground.onEmphasis}"
           }
         },
         "disabled": {
           "background-color": {
-            "type": "color",
-            "value": "{lux.color.background.subdued}"
+            "$type": "color",
+            "$value": "{lux.color.background.subdued}"
           },
           "border-color": {
-            "type": "color",
-            "value": "{lux.color.none}"
+            "$type": "color",
+            "$value": "{lux.color.none}"
           },
           "color": {
-            "type": "color",
-            "value": "{lux.color.foreground.subdued}"
+            "$type": "color",
+            "$value": "{lux.color.foreground.subdued}"
           }
         }
       },
       "line-height": {
-        "type": "lineHeights",
-        "value": "{lux.line-height.large-scale.sm}"
+        "$type": "lineHeights",
+        "$value": "{lux.line-height.large-scale.sm}"
       },
       "padding-inline-start": {
-        "type": "spacing",
-        "value": "{lux.space.200}"
+        "$type": "spacing",
+        "$value": "{lux.space.200}"
       },
       "padding-block-start": {
-        "type": "spacing",
-        "value": "{lux.space.100}"
+        "$type": "spacing",
+        "$value": "{lux.space.100}"
       },
       "padding-inline-end": {
-        "type": "spacing",
-        "value": "{lux.space.200}"
+        "$type": "spacing",
+        "$value": "{lux.space.200}"
       },
       "padding-block-end": {
-        "type": "spacing",
-        "value": "{lux.space.100}"
+        "$type": "spacing",
+        "$value": "{lux.space.100}"
       },
       "column-gap": {
-        "type": "spacing",
-        "value": "{lux.space.100}"
+        "$type": "spacing",
+        "$value": "{lux.space.100}"
       },
       "min-inline-size": {
-        "type": "sizing",
-        "value": "{lux.size.target}"
+        "$type": "sizing",
+        "$value": "{lux.size.target}"
       },
       "min-block-size": {
-        "type": "sizing",
-        "value": "{lux.size.target}"
+        "$type": "sizing",
+        "$value": "{lux.size.target}"
       },
       "border-radius": {
-        "type": "borderRadius",
-        "value": "{lux.border-radius.default}"
+        "$type": "borderRadius",
+        "$value": "{lux.border-radius.default}"
       },
       "border-width": {
-        "type": "borderWidth",
-        "value": "{lux.border-width.default}"
+        "$type": "borderWidth",
+        "$value": "{lux.border-width.default}"
       },
       "icon": {
         "size": {
-          "type": "sizing",
-          "value": "{lux.size.icon}"
+          "$type": "sizing",
+          "$value": "{lux.size.icon}"
         }
       },
       "secondary": {
         "background-color": {
-          "type": "color",
-          "value": "{lux.color.none}"
+          "$type": "color",
+          "$value": "{lux.color.none}"
         },
         "border-color": {
-          "type": "color",
-          "value": "{mode.button.secondary.border-color}"
+          "$type": "color",
+          "$value": "{mode.button.secondary.border-color}"
         },
         "color": {
-          "type": "color",
-          "value": "{mode.button.secondary.color}"
+          "$type": "color",
+          "$value": "{mode.button.secondary.color}"
         },
         "hover": {
           "background-color": {
-            "type": "color",
-            "value": "{mode.button.secondary.hover.background-color}"
+            "$type": "color",
+            "$value": "{mode.button.secondary.hover.background-color}"
           },
           "border-color": {
-            "type": "color",
-            "value": "{mode.button.secondary.hover.border-color}"
+            "$type": "color",
+            "$value": "{mode.button.secondary.hover.border-color}"
           },
           "color": {
-            "type": "color",
-            "value": "{mode.button.secondary.hover.color}"
+            "$type": "color",
+            "$value": "{mode.button.secondary.hover.color}"
           }
         },
         "active": {
           "background-color": {
-            "type": "color",
-            "value": "{lux.color.none}"
+            "$type": "color",
+            "$value": "{lux.color.none}"
           },
           "border-color": {
-            "type": "color",
-            "value": "{mode.button.secondary.border-color}"
+            "$type": "color",
+            "$value": "{mode.button.secondary.border-color}"
           },
           "color": {
-            "type": "color",
-            "value": "{mode.button.secondary.color}"
+            "$type": "color",
+            "$value": "{mode.button.secondary.color}"
           }
         },
         "disabled": {
           "background-color": {
-            "type": "color",
-            "value": "{lux.color.background.subdued}"
+            "$type": "color",
+            "$value": "{lux.color.background.subdued}"
           },
           "border-color": {
-            "type": "color",
-            "value": "{lux.color.none}"
+            "$type": "color",
+            "$value": "{lux.color.none}"
           },
           "color": {
-            "type": "color",
-            "value": "{lux.color.foreground.subdued}"
+            "$type": "color",
+            "$value": "{lux.color.foreground.subdued}"
           }
         }
       },
       "tertiary": {
         "background-color": {
-          "type": "color",
-          "value": "{lux.color.none}"
+          "$type": "color",
+          "$value": "{lux.color.none}"
         },
         "border-color": {
-          "type": "color",
-          "value": "{lux.color.none}"
+          "$type": "color",
+          "$value": "{lux.color.none}"
         },
         "color": {
-          "type": "color",
-          "value": "{mode.button.tertiary.color}"
+          "$type": "color",
+          "$value": "{mode.button.tertiary.color}"
         },
         "hover": {
           "background-color": {
-            "type": "color",
-            "value": "{mode.button.tertiary.hover.background-color}"
+            "$type": "color",
+            "$value": "{mode.button.tertiary.hover.background-color}"
           },
           "border-color": {
-            "type": "color",
-            "value": "{lux.color.none}"
+            "$type": "color",
+            "$value": "{lux.color.none}"
           },
           "color": {
-            "type": "color",
-            "value": "{mode.button.tertiary.hover.color}"
+            "$type": "color",
+            "$value": "{mode.button.tertiary.hover.color}"
           }
         },
         "active": {
           "background-color": {
-            "type": "color",
-            "value": "{lux.color.none}"
+            "$type": "color",
+            "$value": "{lux.color.none}"
           },
           "border-color": {
-            "type": "color",
-            "value": "{lux.color.none}"
+            "$type": "color",
+            "$value": "{lux.color.none}"
           },
           "color": {
-            "type": "color",
-            "value": "{mode.button.tertiary.color}"
+            "$type": "color",
+            "$value": "{mode.button.tertiary.color}"
           }
         },
         "disabled": {
           "background-color": {
-            "type": "color",
-            "value": "{lux.color.background.subdued}"
+            "$type": "color",
+            "$value": "{lux.color.background.subdued}"
           },
           "border-color": {
-            "type": "color",
-            "value": "{lux.color.none}"
+            "$type": "color",
+            "$value": "{lux.color.none}"
           },
           "color": {
-            "type": "color",
-            "value": "{lux.color.foreground.subdued}"
+            "$type": "color",
+            "$value": "{lux.color.foreground.subdued}"
           }
         }
       },
       "font-weight": {
-        "type": "fontWeights",
-        "value": "{lux.font-weight.bold}"
+        "$type": "fontWeights",
+        "$value": "{lux.font-weight.bold}"
       },
       "font-family": {
-        "type": "fontFamilies",
-        "value": "{lux.font-family.primary}"
+        "$type": "fontFamilies",
+        "$value": "{lux.font-family.primary}"
       }
     }
   }
diff --git a/proprietary/design-tokens/src/imported/component/icon-logo.json b/proprietary/design-tokens/src/imported/component/icon-logo.json
index e57c9b41e..0aa42abfd 100644
--- a/proprietary/design-tokens/src/imported/component/icon-logo.json
+++ b/proprietary/design-tokens/src/imported/component/icon-logo.json
@@ -4,37 +4,37 @@
       "eherkenning": {
         "e-color": {
           "parent": "mode/light",
-          "type": "color",
-          "value": "{mode.icon-logo.eherkenning.e-color}"
+          "$type": "color",
+          "$value": "{mode.icon-logo.eherkenning.e-color}"
         }
       },
       "eidas": {
         "stars-color": {
           "parent": "mode/light",
-          "type": "color",
-          "value": "{mode.icon-logo.eidas.stars-color}"
+          "$type": "color",
+          "$value": "{mode.icon-logo.eidas.stars-color}"
         },
         "lock-color": {
           "parent": "mode/light",
-          "type": "color",
-          "value": "{mode.icon-logo.eidas.lock-color}"
+          "$type": "color",
+          "$value": "{mode.icon-logo.eidas.lock-color}"
         },
         "lines-color": {
           "parent": "mode/light",
-          "type": "color",
-          "value": "{mode.icon-logo.eidas.lines-color}"
+          "$type": "color",
+          "$value": "{mode.icon-logo.eidas.lines-color}"
         },
         "background-color": {
           "parent": "mode/light",
-          "type": "color",
-          "value": "{mode.icon-logo.eidas.background-color}"
+          "$type": "color",
+          "$value": "{mode.icon-logo.eidas.background-color}"
         }
       },
       "digid": {
         "border-color": {
           "parent": "mode/light",
-          "type": "color",
-          "value": "{mode.icon-logo.digid.border-color}"
+          "$type": "color",
+          "$value": "{mode.icon-logo.digid.border-color}"
         }
       }
     }
diff --git a/proprietary/design-tokens/src/imported/component/link.json b/proprietary/design-tokens/src/imported/component/link.json
index db7ab88ef..71e608f15 100644
--- a/proprietary/design-tokens/src/imported/component/link.json
+++ b/proprietary/design-tokens/src/imported/component/link.json
@@ -2,77 +2,77 @@
   "lux": {
     "link": {
       "color": {
-        "type": "color",
-        "value": "{mode.link.color}"
+        "$type": "color",
+        "$value": "{mode.link.color}"
       },
       "column-gap": {
-        "type": "spacing",
-        "value": "{lux.space.50}"
+        "$type": "spacing",
+        "$value": "{lux.space.50}"
       },
       "icon": {
         "size": {
-          "type": "sizing",
-          "value": "{lux.size.icon}"
+          "$type": "sizing",
+          "$value": "{lux.size.icon}"
         }
       },
       "hover": {
         "color": {
-          "type": "color",
-          "value": "{mode.link.hover.color}"
+          "$type": "color",
+          "$value": "{mode.link.hover.color}"
         },
         "text-decoration": {
-          "value": "none",
-          "type": "textDecoration"
+          "$type": "textDecoration",
+          "$value": "none"
         }
       },
       "active": {
         "color": {
-          "type": "color",
-          "value": "{mode.link.active.color}"
+          "$type": "color",
+          "$value": "{mode.link.active.color}"
         },
         "text-decoration": {
-          "value": "none",
-          "type": "textDecoration"
+          "$type": "textDecoration",
+          "$value": "none"
         }
       },
       "visited": {
         "color": {
-          "type": "color",
-          "value": "{mode.link.visited.color}"
+          "$type": "color",
+          "$value": "{mode.link.visited.color}"
         }
       },
       "font-family": {
-        "type": "fontFamilies",
-        "value": "{lux.font-family.primary}"
+        "$type": "fontFamilies",
+        "$value": "{lux.font-family.primary}"
       },
       "font-weight": {
-        "type": "fontWeights",
-        "value": "{lux.font-weight.regular}"
+        "$type": "fontWeights",
+        "$value": "{lux.font-weight.regular}"
       },
       "line-height": {
-        "type": "lineHeights",
-        "value": "{lux.line-height.body.default}"
+        "$type": "lineHeights",
+        "$value": "{lux.line-height.body.default}"
       },
       "font-size": {
-        "type": "fontSizes",
-        "value": "{lux.font-size.body.default}"
+        "$type": "fontSizes",
+        "$value": "{lux.font-size.body.default}"
       },
       "text-decoration": {
-        "value": "underline",
-        "type": "textDecoration"
+        "$type": "textDecoration",
+        "$value": "underline"
       },
       "focus": {
         "text-decoration": {
-          "value": "none",
-          "type": "textDecoration"
+          "$type": "textDecoration",
+          "$value": "none"
         },
         "color": {
-          "type": "color",
-          "value": "{lux.color.foreground.link}"
+          "$type": "color",
+          "$value": "{lux.color.foreground.link}"
         },
         "background-color": {
-          "value": "{lux.color.none}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.none}"
         }
       }
     }
diff --git a/proprietary/design-tokens/src/imported/component/login link.json b/proprietary/design-tokens/src/imported/component/login link.json
index f7aa69f8a..258d173e3 100644
--- a/proprietary/design-tokens/src/imported/component/login link.json	
+++ b/proprietary/design-tokens/src/imported/component/login link.json	
@@ -3,154 +3,154 @@
     "login-link": {
       "color": {
         "parent": "login link/default",
-        "type": "color",
-        "value": "{lux.color.foreground.default}"
+        "$type": "color",
+        "$value": "{lux.color.foreground.default}"
       },
       "background-color": {
         "parent": "login link/default",
-        "type": "color",
-        "value": "{lux.color.background.default}",
-        "description": ""
+        "description": "",
+        "$type": "color",
+        "$value": "{lux.color.background.default}"
       },
       "border-color": {
         "parent": "login link/default",
-        "type": "color",
-        "value": "{lux.color.border.default}",
-        "description": ""
+        "description": "",
+        "$type": "color",
+        "$value": "{lux.color.border.default}"
       },
       "hover": {
         "color": {
           "parent": "login link/default",
-          "type": "color",
-          "value": "{lux.color.foreground.default}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.foreground.default}"
         },
         "background-color": {
           "parent": "login link/default",
-          "type": "color",
-          "value": "{lux.color.background.hover}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.background.hover}"
         },
         "border-color": {
           "parent": "login link/default",
-          "type": "color",
-          "value": "{lux.color.border.default}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.border.default}"
         }
       },
       "active": {
         "color": {
           "parent": "login link/default",
-          "type": "color",
-          "value": "{lux.color.foreground.default}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.foreground.default}"
         },
         "background-color": {
           "parent": "login link/default",
-          "type": "color",
-          "value": "{mode.login-link.active.background-color}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{mode.login-link.active.background-color}"
         },
         "border-color": {
           "parent": "login link/default",
-          "type": "color",
-          "value": "{lux.color.border.strong}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.border.strong}"
         }
       },
       "padding-block-start": {
         "parent": "login link/default",
-        "type": "spacing",
-        "value": "{lux.space.50}",
-        "description": ""
+        "description": "",
+        "$type": "spacing",
+        "$value": "{lux.space.50}"
       },
       "padding-block-end": {
         "parent": "login link/default",
-        "type": "spacing",
-        "value": "{lux.space.50}",
-        "description": ""
+        "description": "",
+        "$type": "spacing",
+        "$value": "{lux.space.50}"
       },
       "font-size": {
         "parent": "login link/default",
-        "type": "fontSizes",
-        "value": "{lux.font-size.large-scale.sm}"
+        "$type": "fontSizes",
+        "$value": "{lux.font-size.large-scale.sm}"
       },
       "padding-inline-start": {
         "parent": "login link/default",
-        "type": "spacing",
-        "value": "{lux.space.50}"
+        "$type": "spacing",
+        "$value": "{lux.space.50}"
       },
       "padding-inline-end": {
         "parent": "login link/default",
-        "type": "spacing",
-        "value": "{lux.space.200}"
+        "$type": "spacing",
+        "$value": "{lux.space.200}"
       },
       "min-inline-size": {
         "parent": "login link/default",
-        "type": "sizing",
-        "value": "48px"
+        "$type": "sizing",
+        "$value": "48px"
       },
       "min-block-size": {
         "parent": "login link/default",
-        "type": "sizing",
-        "value": "48px"
+        "$type": "sizing",
+        "$value": "48px"
       },
       "column-gap": {
         "parent": "login link/default",
-        "type": "spacing",
-        "value": "{lux.space.100}"
+        "$type": "spacing",
+        "$value": "{lux.space.100}"
       },
       "border-radius": {
         "parent": "login link/default",
-        "type": "borderRadius",
-        "value": "{lux.border-radius.default}"
+        "$type": "borderRadius",
+        "$value": "{lux.border-radius.default}"
       },
       "border-width": {
         "parent": "login link/default",
-        "type": "borderWidth",
-        "value": "{lux.border-width.default}"
+        "$type": "borderWidth",
+        "$value": "{lux.border-width.default}"
       },
       "icon": {
         "size": {
           "parent": "login link/default",
-          "type": "sizing",
-          "value": "2.5rem",
-          "description": ""
+          "description": "",
+          "$type": "sizing",
+          "$value": "2.5rem"
         }
       },
       "line-height": {
-        "type": "lineHeights",
-        "value": "{lux.line-height.large-scale.sm}"
+        "$type": "lineHeights",
+        "$value": "{lux.line-height.large-scale.sm}"
       },
       "font-weight": {
-        "type": "fontWeights",
-        "value": "{lux.font-weight.regular}"
+        "$type": "fontWeights",
+        "$value": "{lux.font-weight.regular}"
       },
       "font-family": {
-        "type": "fontFamilies",
-        "value": "{lux.font-family.primary}"
+        "$type": "fontFamilies",
+        "$value": "{lux.font-family.primary}"
       },
       "border-style": {
-        "type": "other",
-        "value": "solid"
+        "$type": "other",
+        "$value": "solid"
       },
       "focus": {
         "color": {
           "parent": "login link/default",
-          "type": "color",
-          "value": "{lux.color.foreground.default}"
+          "$type": "color",
+          "$value": "{lux.color.foreground.default}"
         },
         "background-color": {
           "parent": "login link/default",
-          "type": "color",
-          "value": "{lux.color.background.default}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.background.default}"
         },
         "border-color": {
           "parent": "login link/default",
-          "type": "color",
-          "value": "{lux.color.border.default}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.border.default}"
         }
       }
     }
diff --git a/proprietary/design-tokens/src/imported/component/paragraph.json b/proprietary/design-tokens/src/imported/component/paragraph.json
index b9cb593de..65c1f12d8 100644
--- a/proprietary/design-tokens/src/imported/component/paragraph.json
+++ b/proprietary/design-tokens/src/imported/component/paragraph.json
@@ -2,45 +2,45 @@
   "lux": {
     "paragraph": {
       "color": {
-        "value": "{lux.color.foreground.default}",
-        "type": "color"
+        "$type": "color",
+        "$value": "{lux.color.foreground.default}"
       },
       "font-family": {
-        "value": "{lux.font-family.primary}",
-        "type": "fontFamilies"
+        "$type": "fontFamilies",
+        "$value": "{lux.font-family.primary}"
       },
       "default": {
         "font-size": {
-          "value": "{lux.font-size.body.default}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.body.default}"
         },
         "line-height": {
-          "value": "{lux.line-height.body.default}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.body.default}"
         }
       },
       "font-weight": {
-        "value": "{lux.font-weight.regular}",
-        "type": "fontWeights"
+        "$type": "fontWeights",
+        "$value": "{lux.font-weight.regular}"
       },
       "lead": {
         "font-size": {
-          "value": "{lux.font-size.body.large}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.body.large}"
         },
         "line-height": {
-          "value": "{lux.line-height.body.large}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.body.large}"
         }
       },
       "small": {
         "font-size": {
-          "value": "{lux.font-size.body.small}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.body.small}"
         },
         "line-height": {
-          "value": "{lux.line-height.body.small}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.body.small}"
         }
       }
     }
diff --git a/proprietary/design-tokens/src/imported/component/section.json b/proprietary/design-tokens/src/imported/component/section.json
index 4b91742a2..20258a49b 100644
--- a/proprietary/design-tokens/src/imported/component/section.json
+++ b/proprietary/design-tokens/src/imported/component/section.json
@@ -2,32 +2,32 @@
   "lux": {
     "section": {
       "background-color": {
-        "value": "{lux.color.background.default}",
-        "type": "color"
+        "$type": "color",
+        "$value": "{lux.color.background.default}"
       },
       "padding-block-end": {
-        "value": "{lux.space.400}",
-        "type": "spacing"
+        "$type": "spacing",
+        "$value": "{lux.space.400}"
       },
       "padding-block-start": {
-        "value": "{lux.space.400}",
-        "type": "spacing"
+        "$type": "spacing",
+        "$value": "{lux.space.400}"
       },
       "padding-inline-start": {
-        "value": "{lux.space.400}",
-        "type": "spacing"
+        "$type": "spacing",
+        "$value": "{lux.space.400}"
       },
       "padding-inline-end": {
-        "value": "{lux.space.400}",
-        "type": "spacing"
+        "$type": "spacing",
+        "$value": "{lux.space.400}"
       },
       "row-gap": {
-        "value": "{lux.space.400}",
-        "type": "spacing"
+        "$type": "spacing",
+        "$value": "{lux.space.400}"
       },
       "border-radius": {
-        "value": "{lux.border-radius.default}",
-        "type": "borderRadius"
+        "$type": "borderRadius",
+        "$value": "{lux.border-radius.default}"
       }
     }
   }
diff --git a/proprietary/design-tokens/src/imported/core/border.json b/proprietary/design-tokens/src/imported/core/border.json
index abf6decc2..b22761a1f 100644
--- a/proprietary/design-tokens/src/imported/core/border.json
+++ b/proprietary/design-tokens/src/imported/core/border.json
@@ -3,30 +3,30 @@
     "border-radius": {
       "circle": {
         "parent": "core/default",
-        "type": "borderRadius",
-        "value": "999px"
+        "$type": "borderRadius",
+        "$value": "999px"
       },
       "none": {
         "parent": "core/default",
-        "type": "borderRadius",
-        "value": "0px"
+        "$type": "borderRadius",
+        "$value": "0px"
       }
     },
     "border-width": {
       "default": {
         "parent": "core/default",
-        "type": "borderWidth",
-        "value": "1px"
+        "$type": "borderWidth",
+        "$value": "1px"
       },
       "m": {
         "parent": "core/default",
-        "type": "borderWidth",
-        "value": "2px"
+        "$type": "borderWidth",
+        "$value": "2px"
       },
       "none": {
         "parent": "core/default",
-        "type": "borderWidth",
-        "value": "0px"
+        "$type": "borderWidth",
+        "$value": "0px"
       }
     }
   }
diff --git a/proprietary/design-tokens/src/imported/core/color.json b/proprietary/design-tokens/src/imported/core/color.json
index c15ac1b9d..c507c6a24 100644
--- a/proprietary/design-tokens/src/imported/core/color.json
+++ b/proprietary/design-tokens/src/imported/core/color.json
@@ -4,638 +4,638 @@
       "grijs": {
         "100": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#fbfbfb",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "#fbfbfb"
         },
         "200": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#f3f3f3",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "#f3f3f3"
         },
         "300": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#e6e6e6",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "#e6e6e6"
         },
         "400": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#a7a7a7",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "#a7a7a7"
         },
         "500": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#696969",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "#696969"
         },
         "600": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#383838",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "#383838"
         },
         "700": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#282828",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "#282828"
         },
         "800": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#1d1d1d",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "#1d1d1d"
         },
         "900": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#171717",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "#171717"
         }
       },
       "zwart": {
         "parent": "core/default",
-        "type": "color",
-        "value": "#000000",
-        "description": ""
+        "description": "",
+        "$type": "color",
+        "$value": "#000000"
       },
       "wit": {
         "parent": "core/default",
-        "type": "color",
-        "value": "#ffffff",
-        "description": ""
+        "description": "",
+        "$type": "color",
+        "$value": "#ffffff"
       },
       "none": {
         "parent": "core/default",
-        "type": "color",
-        "value": "#ffffff00",
-        "description": ""
+        "description": "",
+        "$type": "color",
+        "$value": "#ffffff00"
       },
       "lichtblauw": {
         "50": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#eef7fb"
+          "$type": "color",
+          "$value": "#eef7fb"
         },
         "100": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#ddeff8"
+          "$type": "color",
+          "$value": "#ddeff8"
         },
         "200": {
-          "value": "#CCE7F4",
-          "type": "color"
+          "$type": "color",
+          "$value": "#CCE7F4"
         },
         "300": {
-          "value": "#BCDFF0",
-          "type": "color"
+          "$type": "color",
+          "$value": "#BCDFF0"
         },
         "400": {
-          "value": "#ABD7ED",
-          "type": "color"
+          "$type": "color",
+          "$value": "#ABD7ED"
         },
         "500": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#8fcae7"
+          "$type": "color",
+          "$value": "#8fcae7"
         }
       },
       "violet": {
         "50": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#f2d9e7"
+          "$type": "color",
+          "$value": "#f2d9e7"
         },
         "100": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#e5b3d0"
+          "$type": "color",
+          "$value": "#e5b3d0"
         },
         "200": {
-          "value": "#D88CB7",
-          "type": "color"
+          "$type": "color",
+          "$value": "#D88CB7"
         },
         "300": {
-          "value": "#CB66A0",
-          "type": "color"
+          "$type": "color",
+          "$value": "#CB66A0"
         },
         "400": {
-          "value": "#BE4088",
-          "type": "color"
+          "$type": "color",
+          "$value": "#BE4088"
         },
         "500": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#a90061"
+          "$type": "color",
+          "$value": "#a90061"
         },
         "700": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#52002f"
+          "$type": "color",
+          "$value": "#52002f"
         }
       },
       "paars": {
         "50": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#e3dce7"
+          "$type": "color",
+          "$value": "#e3dce7"
         },
         "100": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#c6b9cf"
+          "$type": "color",
+          "$value": "#c6b9cf"
         },
         "200": {
-          "value": "#A995B7",
-          "type": "color"
+          "$type": "color",
+          "$value": "#A995B7"
         },
         "300": {
-          "value": "#8D729F",
-          "type": "color"
+          "$type": "color",
+          "$value": "#8D729F"
         },
         "400": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#714f87"
+          "$type": "color",
+          "$value": "#714f87"
         },
         "500": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#42145f"
+          "$type": "color",
+          "$value": "#42145f"
         }
       },
       "hemelblauw": {
         "50": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#d9ebf7"
+          "$type": "color",
+          "$value": "#d9ebf7"
         },
         "100": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#b3d7ee"
+          "$type": "color",
+          "$value": "#b3d7ee"
         },
         "200": {
-          "value": "#8CC3E6",
-          "type": "color"
+          "$type": "color",
+          "$value": "#8CC3E6"
         },
         "300": {
-          "value": "#66AFDD",
-          "type": "color"
+          "$type": "color",
+          "$value": "#66AFDD"
         },
         "400": {
-          "value": "#409CD5",
-          "type": "color"
+          "$type": "color",
+          "$value": "#409CD5"
         },
         "500": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#007bc7"
+          "$type": "color",
+          "$value": "#007bc7"
         },
         "700": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#00436c"
+          "$type": "color",
+          "$value": "#00436c"
         }
       },
       "donkerblauw": {
         "50": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#d9e8f0"
+          "$type": "color",
+          "$value": "#d9e8f0"
         },
         "100": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#b3d2e1"
+          "$type": "color",
+          "$value": "#b3d2e1"
         },
         "200": {
-          "value": "#8CBBD2",
-          "type": "color"
+          "$type": "color",
+          "$value": "#8CBBD2"
         },
         "300": {
-          "value": "#66A4C3",
-          "type": "color"
+          "$type": "color",
+          "$value": "#66A4C3"
         },
         "400": {
-          "value": "#408EB4",
-          "type": "color"
+          "$type": "color",
+          "$value": "#408EB4"
         },
         "500": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#01689b"
+          "$type": "color",
+          "$value": "#01689b"
         },
         "700": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#013f5e"
+          "$type": "color",
+          "$value": "#013f5e"
         }
       },
       "mintgroen": {
         "50": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#eaf8f4"
+          "$type": "color",
+          "$value": "#eaf8f4"
         },
         "100": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#d6f2e9"
+          "$type": "color",
+          "$value": "#d6f2e9"
         },
         "200": {
-          "value": "#C1EBDE",
-          "type": "color"
+          "$type": "color",
+          "$value": "#C1EBDE"
         },
         "300": {
-          "value": "#ACE4D3",
-          "type": "color"
+          "$type": "color",
+          "$value": "#ACE4D3"
         },
         "400": {
-          "value": "#98DDC8",
-          "type": "color"
+          "$type": "color",
+          "$value": "#98DDC8"
         },
         "500": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#76d2b6"
+          "$type": "color",
+          "$value": "#76d2b6"
         }
       },
       "mosgroen": {
         "50": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#ebebd9"
+          "$type": "color",
+          "$value": "#ebebd9"
         },
         "100": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#d6d7b3"
+          "$type": "color",
+          "$value": "#d6d7b3"
         },
         "200": {
-          "value": "#C1C38C",
-          "type": "color"
+          "$type": "color",
+          "$value": "#C1C38C"
         },
         "300": {
-          "value": "#ADAF66",
-          "type": "color"
+          "$type": "color",
+          "$value": "#ADAF66"
         },
         "400": {
-          "value": "#999C40",
-          "type": "color"
+          "$type": "color",
+          "$value": "#999C40"
         },
         "500": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#777b00"
+          "$type": "color",
+          "$value": "#777b00"
         }
       },
       "groen": {
         "50": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#e1eddb"
+          "$type": "color",
+          "$value": "#e1eddb"
         },
         "100": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#c4dbb6"
+          "$type": "color",
+          "$value": "#c4dbb6"
         },
         "200": {
-          "value": "#A5C991",
-          "type": "color"
+          "$type": "color",
+          "$value": "#A5C991"
         },
         "300": {
-          "value": "#88B76D",
-          "type": "color"
+          "$type": "color",
+          "$value": "#88B76D"
         },
         "400": {
-          "value": "#6AA549",
-          "type": "color"
+          "$type": "color",
+          "$value": "#6AA549"
         },
         "500": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#39870c"
+          "$type": "color",
+          "$value": "#39870c"
         },
         "700": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#004b17"
+          "$type": "color",
+          "$value": "#004b17"
         }
       },
       "donkergroen": {
         "50": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#dfe6e1"
+          "$type": "color",
+          "$value": "#dfe6e1"
         },
         "100": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#becdc3"
+          "$type": "color",
+          "$value": "#becdc3"
         },
         "200": {
-          "value": "#9DB4A4",
-          "type": "color"
+          "$type": "color",
+          "$value": "#9DB4A4"
         },
         "300": {
-          "value": "#7D9B87",
-          "type": "color"
+          "$type": "color",
+          "$value": "#7D9B87"
         },
         "400": {
-          "value": "#5D8269",
-          "type": "color"
+          "$type": "color",
+          "$value": "#5D8269"
         },
         "500": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#275937"
+          "$type": "color",
+          "$value": "#275937"
         }
       },
       "bruin": {
         "50": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#efeada"
+          "$type": "color",
+          "$value": "#efeada"
         },
         "100": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#dfd4b6"
+          "$type": "color",
+          "$value": "#dfd4b6"
         },
         "200": {
-          "value": "#CFBF90",
-          "type": "color"
+          "$type": "color",
+          "$value": "#CFBF90"
         },
         "300": {
-          "value": "#BFA96C",
-          "type": "color"
+          "$type": "color",
+          "$value": "#BFA96C"
         },
         "400": {
-          "value": "#AF9447",
-          "type": "color"
+          "$type": "color",
+          "$value": "#AF9447"
         },
         "500": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#94710a"
+          "$type": "color",
+          "$value": "#94710a"
         }
       },
       "donkerbruin": {
         "50": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#e8e0df"
+          "$type": "color",
+          "$value": "#e8e0df"
         },
         "100": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#d1c2be"
+          "$type": "color",
+          "$value": "#d1c2be"
         },
         "200": {
-          "value": "#BAA39D",
-          "type": "color"
+          "$type": "color",
+          "$value": "#BAA39D"
         },
         "300": {
-          "value": "#A3847D",
-          "type": "color"
+          "$type": "color",
+          "$value": "#A3847D"
         },
         "400": {
-          "value": "#8D665D",
-          "type": "color"
+          "$type": "color",
+          "$value": "#8D665D"
         },
         "500": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#673327"
+          "$type": "color",
+          "$value": "#673327"
         }
       },
       "geel": {
         "50": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#fefbdd"
+          "$type": "color",
+          "$value": "#fefbdd"
         },
         "100": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#fdf6bc"
+          "$type": "color",
+          "$value": "#fdf6bc"
         },
         "200": {
-          "value": "#FCF199",
-          "type": "color"
+          "$type": "color",
+          "$value": "#FCF199"
         },
         "300": {
-          "value": "#FBED78",
-          "type": "color"
+          "$type": "color",
+          "$value": "#FBED78"
         },
         "400": {
-          "value": "#FAE856",
-          "type": "color"
+          "$type": "color",
+          "$value": "#FAE856"
         },
         "500": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#f9e11e"
+          "$type": "color",
+          "$value": "#f9e11e"
         }
       },
       "donkergeel": {
         "50": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#fff4db"
+          "$type": "color",
+          "$value": "#fff4db"
         },
         "100": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#ffe9b8"
+          "$type": "color",
+          "$value": "#ffe9b8"
         },
         "200": {
-          "value": "#FDDE94",
-          "type": "color"
+          "$type": "color",
+          "$value": "#FDDE94"
         },
         "300": {
-          "value": "#FDD370",
-          "type": "color"
+          "$type": "color",
+          "$value": "#FDD370"
         },
         "400": {
-          "value": "#FDC84D",
-          "type": "color"
+          "$type": "color",
+          "$value": "#FDC84D"
         },
         "500": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#ffb612"
+          "$type": "color",
+          "$value": "#ffb612"
         },
         "700": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#bf880d"
+          "$type": "color",
+          "$value": "#bf880d"
         }
       },
       "oranje": {
         "50": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#fbead9"
+          "$type": "color",
+          "$value": "#fbead9"
         },
         "100": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#f6d4b3"
+          "$type": "color",
+          "$value": "#f6d4b3"
         },
         "200": {
-          "value": "#F1BE8C",
-          "type": "color"
+          "$type": "color",
+          "$value": "#F1BE8C"
         },
         "300": {
-          "value": "#EDA966",
-          "type": "color"
+          "$type": "color",
+          "$value": "#EDA966"
         },
         "400": {
-          "value": "#E89440",
-          "type": "color"
+          "$type": "color",
+          "$value": "#E89440"
         },
         "500": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#e17000"
+          "$type": "color",
+          "$value": "#e17000"
         },
         "700": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#b35900"
+          "$type": "color",
+          "$value": "#b35900"
         }
       },
       "rood": {
         "50": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#f9dfdd"
+          "$type": "color",
+          "$value": "#f9dfdd"
         },
         "100": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#f2bfbc"
+          "$type": "color",
+          "$value": "#f2bfbc"
         },
         "200": {
-          "value": "#EC9F99",
-          "type": "color"
+          "$type": "color",
+          "$value": "#EC9F99"
         },
         "300": {
-          "value": "#E67F78",
-          "type": "color"
+          "$type": "color",
+          "$value": "#E67F78"
         },
         "400": {
-          "value": "#DF6056",
-          "type": "color"
+          "$type": "color",
+          "$value": "#DF6056"
         },
         "500": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#d52b1e"
+          "$type": "color",
+          "$value": "#d52b1e"
         },
         "700": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#542621"
+          "$type": "color",
+          "$value": "#542621"
         }
       },
       "roze": {
         "50": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#fdeff8"
+          "$type": "color",
+          "$value": "#fdeff8"
         },
         "100": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#fbdef0"
+          "$type": "color",
+          "$value": "#fbdef0"
         },
         "200": {
-          "value": "#F8CEE8",
-          "type": "color"
+          "$type": "color",
+          "$value": "#F8CEE8"
         },
         "300": {
-          "value": "#F6BDE1",
-          "type": "color"
+          "$type": "color",
+          "$value": "#F6BDE1"
         },
         "400": {
-          "value": "#F4ADD9",
-          "type": "color"
+          "$type": "color",
+          "$value": "#F4ADD9"
         },
         "500": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#f092cd"
+          "$type": "color",
+          "$value": "#f092cd"
         }
       },
       "robijnrood": {
         "50": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#f7d9e7"
+          "$type": "color",
+          "$value": "#f7d9e7"
         },
         "100": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#efb3ce"
+          "$type": "color",
+          "$value": "#efb3ce"
         },
         "200": {
-          "value": "#E78CB6",
-          "type": "color"
+          "$type": "color",
+          "$value": "#E78CB6"
         },
         "300": {
-          "value": "#DF669D",
-          "type": "color"
+          "$type": "color",
+          "$value": "#DF669D"
         },
         "400": {
-          "value": "#D74085",
-          "type": "color"
+          "$type": "color",
+          "$value": "#D74085"
         },
         "500": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#ca005d"
+          "$type": "color",
+          "$value": "#ca005d"
         }
       },
       "lintblauw": {
         "50": {
-          "value": "#dce3ea",
-          "type": "color"
+          "$type": "color",
+          "$value": "#dce3ea"
         },
         "100": {
-          "value": "#b8c6d5",
-          "type": "color"
+          "$type": "color",
+          "$value": "#b8c6d5"
         },
         "200": {
-          "value": "#95a9c0",
-          "type": "color"
+          "$type": "color",
+          "$value": "#95a9c0"
         },
         "300": {
-          "value": "#738eab",
-          "type": "color"
+          "$type": "color",
+          "$value": "#738eab"
         },
         "400": {
-          "value": "#4f7196",
-          "type": "color"
+          "$type": "color",
+          "$value": "#4f7196"
         },
         "500": {
           "parent": "core/default",
-          "type": "color",
-          "value": "#154273"
+          "$type": "color",
+          "$value": "#154273"
         }
       }
     }
   },
   "no-token": {
-    "type": "other",
-    "value": "/* */",
-    "description": "Discussie nodig"
+    "$type": "other",
+    "$value": "/* */",
+    "$description": "Discussie nodig"
   }
 }
\ No newline at end of file
diff --git a/proprietary/design-tokens/src/imported/core/font.json b/proprietary/design-tokens/src/imported/core/font.json
index 3d83d8746..9beac9040 100644
--- a/proprietary/design-tokens/src/imported/core/font.json
+++ b/proprietary/design-tokens/src/imported/core/font.json
@@ -2,67 +2,67 @@
   "lux": {
     "font-weight": {
       "regular": {
-        "type": "fontWeights",
-        "value": "Regular"
+        "$type": "fontWeights",
+        "$value": "Regular"
       },
       "bold": {
-        "type": "fontWeights",
-        "value": "Bold"
+        "$type": "fontWeights",
+        "$value": "Bold"
       }
     },
     "line-height": {
       "large-scale": {
         "xs": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "1.5rem"
+          "$type": "lineHeights",
+          "$value": "1.5rem"
         },
         "sm": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "1.75rem"
+          "$type": "lineHeights",
+          "$value": "1.75rem"
         },
         "md": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "2rem"
+          "$type": "lineHeights",
+          "$value": "2rem"
         },
         "lg": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "2.25rem"
+          "$type": "lineHeights",
+          "$value": "2.25rem"
         },
         "xl": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "3.5rem"
+          "$type": "lineHeights",
+          "$value": "3.5rem"
         }
       },
       "small-scale": {
         "xs": {
           "parent": "viewport (beta)/xs",
-          "type": "lineHeights",
-          "value": "1.5rem"
+          "$type": "lineHeights",
+          "$value": "1.5rem"
         },
         "sm": {
           "parent": "viewport (beta)/xs",
-          "type": "lineHeights",
-          "value": "1.5rem"
+          "$type": "lineHeights",
+          "$value": "1.5rem"
         },
         "md": {
           "parent": "viewport (beta)/xs",
-          "type": "lineHeights",
-          "value": "1.75rem"
+          "$type": "lineHeights",
+          "$value": "1.75rem"
         },
         "lg": {
           "parent": "viewport (beta)/xs",
-          "type": "lineHeights",
-          "value": "2rem"
+          "$type": "lineHeights",
+          "$value": "2rem"
         },
         "xl": {
           "parent": "viewport (beta)/xs",
-          "type": "lineHeights",
-          "value": "3rem"
+          "$type": "lineHeights",
+          "$value": "3rem"
         }
       }
     },
@@ -70,55 +70,55 @@
       "large-scale": {
         "xs": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "1rem"
+          "$type": "fontSizes",
+          "$value": "1rem"
         },
         "sm": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "1.125rem"
+          "$type": "fontSizes",
+          "$value": "1.125rem"
         },
         "md": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "1.375rem"
+          "$type": "fontSizes",
+          "$value": "1.375rem"
         },
         "lg": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "1.625rem"
+          "$type": "fontSizes",
+          "$value": "1.625rem"
         },
         "xl": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "2.5rem"
+          "$type": "fontSizes",
+          "$value": "2.5rem"
         }
       },
       "small-scale": {
         "xs": {
           "parent": "viewport (beta)/xs",
-          "type": "fontSizes",
-          "value": "0.875rem"
+          "$type": "fontSizes",
+          "$value": "0.875rem"
         },
         "sm": {
           "parent": "viewport (beta)/xs",
-          "type": "fontSizes",
-          "value": "1rem"
+          "$type": "fontSizes",
+          "$value": "1rem"
         },
         "md": {
           "parent": "viewport (beta)/xs",
-          "type": "fontSizes",
-          "value": "1.25rem"
+          "$type": "fontSizes",
+          "$value": "1.25rem"
         },
         "lg": {
           "parent": "viewport (beta)/xs",
-          "type": "fontSizes",
-          "value": "1.5rem"
+          "$type": "fontSizes",
+          "$value": "1.5rem"
         },
         "xl": {
           "parent": "viewport (beta)/xs",
-          "type": "fontSizes",
-          "value": "2.25rem"
+          "$type": "fontSizes",
+          "$value": "2.25rem"
         }
       }
     }
@@ -126,12 +126,12 @@
   "ro": {
     "font-family": {
       "primary": {
-        "type": "fontFamilies",
-        "value": "RijksoverheidSansWebText, Arial, Verdana, sans-serif"
+        "$type": "fontFamilies",
+        "$value": "RijksoverheidSansWebText, Arial, Verdana, sans-serif"
       },
       "secondary": {
-        "type": "fontFamilies",
-        "value": "RijksoverheidSerifWeb, 'Times New Roman', serif"
+        "$type": "fontFamilies",
+        "$value": "RijksoverheidSerifWeb, 'Times New Roman', serif"
       }
     }
   }
diff --git a/proprietary/design-tokens/src/imported/core/other.json b/proprietary/design-tokens/src/imported/core/other.json
index 2368a87f2..708e85aa9 100644
--- a/proprietary/design-tokens/src/imported/core/other.json
+++ b/proprietary/design-tokens/src/imported/core/other.json
@@ -1,7 +1,7 @@
 {
   "no-token": {
-    "type": "other",
-    "value": "/* */",
-    "description": "Discussie nodig"
+    "$type": "other",
+    "$value": "/* */",
+    "$description": "Discussie nodig"
   }
 }
\ No newline at end of file
diff --git a/proprietary/design-tokens/src/imported/core/spacing.json b/proprietary/design-tokens/src/imported/core/spacing.json
index 33c569ad3..a32956715 100644
--- a/proprietary/design-tokens/src/imported/core/spacing.json
+++ b/proprietary/design-tokens/src/imported/core/spacing.json
@@ -3,58 +3,58 @@
     "space": {
       "0": {
         "parent": "core/default",
-        "type": "spacing",
-        "value": "0"
+        "$type": "spacing",
+        "$value": "0"
       },
       "25": {
         "parent": "core/default",
-        "type": "spacing",
-        "value": "0.25 * 0.5rem"
+        "$type": "spacing",
+        "$value": "0.25 * 0.5rem"
       },
       "50": {
         "parent": "core/default",
-        "type": "spacing",
-        "value": "0.5 * 0.5rem"
+        "$type": "spacing",
+        "$value": "0.5 * 0.5rem"
       },
       "100": {
         "parent": "core/default",
-        "type": "spacing",
-        "value": "0.5rem"
+        "$type": "spacing",
+        "$value": "0.5rem"
       },
       "150": {
         "parent": "core/default",
-        "type": "spacing",
-        "value": "1.5 * 0.5rem"
+        "$type": "spacing",
+        "$value": "1.5 * 0.5rem"
       },
       "200": {
         "parent": "core/default",
-        "type": "spacing",
-        "value": "2 * 0.5rem"
+        "$type": "spacing",
+        "$value": "2 * 0.5rem"
       },
       "300": {
         "parent": "core/default",
-        "type": "spacing",
-        "value": "3 * 0.5rem"
+        "$type": "spacing",
+        "$value": "3 * 0.5rem"
       },
       "400": {
         "parent": "core/default",
-        "type": "spacing",
-        "value": "4 * 0.5rem"
+        "$type": "spacing",
+        "$value": "4 * 0.5rem"
       },
       "500": {
         "parent": "core/default",
-        "type": "spacing",
-        "value": "5 * 0.5rem"
+        "$type": "spacing",
+        "$value": "5 * 0.5rem"
       },
       "600": {
         "parent": "core/default",
-        "type": "spacing",
-        "value": "6 * 0.5rem"
+        "$type": "spacing",
+        "$value": "6 * 0.5rem"
       },
       "700": {
         "parent": "core/default",
-        "type": "spacing",
-        "value": "7 * 0.5rem"
+        "$type": "spacing",
+        "$value": "7 * 0.5rem"
       }
     }
   }
diff --git a/proprietary/design-tokens/src/imported/mode/dark.json b/proprietary/design-tokens/src/imported/mode/dark.json
index ec97e928a..48dace75a 100644
--- a/proprietary/design-tokens/src/imported/mode/dark.json
+++ b/proprietary/design-tokens/src/imported/mode/dark.json
@@ -4,137 +4,137 @@
       "foreground": {
         "default": {
           "parent": "mode/dark (beta)",
-          "type": "color",
-          "value": "{lux.color.grijs.100}",
-          "description": "Standaard kleur voor teksten en iconen. Gebruik deze voor body content, titels en labels."
+          "$type": "color",
+          "$value": "{lux.color.grijs.100}",
+          "$description": "Standaard kleur voor teksten en iconen. Gebruik deze voor body content, titels en labels."
         },
         "subdued": {
           "parent": "mode/dark (beta)",
-          "type": "color",
-          "value": "{lux.color.grijs.400}",
-          "description": "Gebruik voor content die extra context biedt, maar niet essentieel is om de interface te begrijpen."
+          "$type": "color",
+          "$value": "{lux.color.grijs.400}",
+          "$description": "Gebruik voor content die extra context biedt, maar niet essentieel is om de interface te begrijpen."
         },
         "onEmphasis": {
           "parent": "mode/dark (beta)",
-          "type": "color",
-          "value": "{lux.color.wit}",
-          "description": "Tekst en iconen die op een sterke achtergrond staan. Zoals het label in de primaire button of links in de footer."
+          "$type": "color",
+          "$value": "{lux.color.wit}",
+          "$description": "Tekst en iconen die op een sterke achtergrond staan. Zoals het label in de primaire button of links in de footer."
         },
         "link": {
-          "value": "{lux.color.lichtblauw.100}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.lichtblauw.100}"
         }
       },
       "background": {
         "default": {
           "parent": "mode/dark (beta)",
-          "type": "color",
-          "value": "{lux.color.grijs.700}",
-          "description": "Gebruik deze kleur voor de achtergrond van de website, hierbovenop komen de background kleuren."
+          "$type": "color",
+          "$value": "{lux.color.grijs.700}",
+          "$description": "Gebruik deze kleur voor de achtergrond van de website, hierbovenop komen de background kleuren."
         },
         "subdued": {
           "parent": "mode/dark (beta)",
-          "type": "color",
-          "value": "{lux.color.grijs.800}",
-          "description": "Subtiele achtergrond kleur"
+          "$type": "color",
+          "$value": "{lux.color.grijs.800}",
+          "$description": "Subtiele achtergrond kleur"
         },
         "hover": {
           "parent": "mode/dark (beta)",
-          "type": "color",
-          "value": "{lux.color.grijs.600}",
-          "description": "Kleur van elementen als je eroverheen gaat met je muis"
+          "$type": "color",
+          "$value": "{lux.color.grijs.600}",
+          "$description": "Kleur van elementen als je eroverheen gaat met je muis"
         }
       },
       "border": {
         "default": {
           "parent": "mode/dark (beta)",
-          "type": "color",
-          "value": "{lux.color.grijs.500}",
-          "description": "Border kleur"
+          "$type": "color",
+          "$value": "{lux.color.grijs.500}",
+          "$description": "Border kleur"
         },
         "subdued": {
           "parent": "mode/dark (beta)",
-          "type": "color",
-          "value": "{lux.color.grijs.600}",
-          "description": "Subtiele border"
+          "$type": "color",
+          "$value": "{lux.color.grijs.600}",
+          "$description": "Subtiele border"
         },
         "strong": {
           "parent": "mode/dark (beta)",
-          "type": "color",
-          "value": "{lux.color.foreground.default}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.foreground.default}"
         }
       },
       "canvas": {
         "parent": "mode/dark (beta)",
-        "type": "color",
-        "value": "{lux.color.zwart}",
-        "description": "Gebruik deze kleur voor de achtergrond van de website, hierbovenop komen de background kleuren."
+        "$type": "color",
+        "$value": "{lux.color.zwart}",
+        "$description": "Gebruik deze kleur voor de achtergrond van de website, hierbovenop komen de background kleuren."
       },
       "feedback": {
         "success": {
           "default": {
             "parent": "mode/dark (beta)",
-            "type": "color",
-            "value": "{lux.color.groen.500}",
-            "description": "Gebruik deze kleur om een positieve boodschap te benadrukken."
+            "$type": "color",
+            "$value": "{lux.color.groen.500}",
+            "$description": "Gebruik deze kleur om een positieve boodschap te benadrukken."
           },
           "subdued": {
             "parent": "mode/dark (beta)",
-            "type": "color",
-            "value": "{lux.color.groen.50}",
-            "description": "Gebruik deze kleur om een positieve boodschap te highlighten."
+            "$type": "color",
+            "$value": "{lux.color.groen.50}",
+            "$description": "Gebruik deze kleur om een positieve boodschap te highlighten."
           }
         },
         "info": {
           "default": {
             "parent": "mode/dark (beta)",
-            "type": "color",
-            "value": "{lux.color.hemelblauw.500}",
-            "description": "Gebruik deze kleur om een informatieve boodschap te benadrukken."
+            "$type": "color",
+            "$value": "{lux.color.hemelblauw.500}",
+            "$description": "Gebruik deze kleur om een informatieve boodschap te benadrukken."
           },
           "subdued": {
             "parent": "mode/dark (beta)",
-            "type": "color",
-            "value": "{lux.color.hemelblauw.50}",
-            "description": "Gebruik deze kleur om een informatieve boodschap te highlighten."
+            "$type": "color",
+            "$value": "{lux.color.hemelblauw.50}",
+            "$description": "Gebruik deze kleur om een informatieve boodschap te highlighten."
           }
         },
         "error": {
           "default": {
             "parent": "mode/dark (beta)",
-            "type": "color",
-            "value": "{lux.color.rood.500}",
-            "description": "Gebruik deze kleur om een negatieve boodschap te benadrukken."
+            "$type": "color",
+            "$value": "{lux.color.rood.500}",
+            "$description": "Gebruik deze kleur om een negatieve boodschap te benadrukken."
           },
           "subdued": {
             "parent": "mode/dark (beta)",
-            "type": "color",
-            "value": "{lux.color.rood.50}",
-            "description": "Gebruik deze kleur om een negatieve boodschap te highlighten."
+            "$type": "color",
+            "$value": "{lux.color.rood.50}",
+            "$description": "Gebruik deze kleur om een negatieve boodschap te highlighten."
           }
         },
         "warning": {
           "default": {
             "parent": "mode/dark (beta)",
-            "type": "color",
-            "value": "{lux.color.donkergeel.500}",
-            "description": "Gebruik deze kleur om een waarschuwing te benadrukken."
+            "$type": "color",
+            "$value": "{lux.color.donkergeel.500}",
+            "$description": "Gebruik deze kleur om een waarschuwing te benadrukken."
           },
           "subdued": {
             "parent": "mode/dark (beta)",
-            "type": "color",
-            "value": "{lux.color.donkergeel.50}",
-            "description": "Gebruik deze kleur om een waarschuwing te highlighten."
+            "$type": "color",
+            "$value": "{lux.color.donkergeel.50}",
+            "$description": "Gebruik deze kleur om een waarschuwing te highlighten."
           }
         }
       },
       "focus": {
         "outline": {
           "parent": "mode/dark (beta)",
-          "type": "color",
-          "value": "{lux.color.border.strong}",
-          "description": "Outline kleur voor de focus state."
+          "$type": "color",
+          "$value": "{lux.color.border.strong}",
+          "$description": "Outline kleur voor de focus state."
         }
       }
     }
@@ -143,31 +143,31 @@
     "link": {
       "color": {
         "parent": "mode/dark (beta)",
-        "type": "color",
-        "value": "{lux.color.lichtblauw.100}",
-        "description": "Gebruik deze kleur voor link tekst"
+        "$type": "color",
+        "$value": "{lux.color.lichtblauw.100}",
+        "$description": "Gebruik deze kleur voor link tekst"
       },
       "visited": {
         "color": {
           "parent": "mode/dark (beta)",
-          "type": "color",
-          "value": "{lux.color.paars.100}"
+          "$type": "color",
+          "$value": "{lux.color.paars.100}"
         }
       },
       "hover": {
         "color": {
           "parent": "mode/dark (beta)",
-          "type": "color",
-          "value": "{lux.color.lichtblauw.500}",
-          "description": "Gebruik deze kleur voor de hover van link tekst"
+          "$type": "color",
+          "$value": "{lux.color.lichtblauw.500}",
+          "$description": "Gebruik deze kleur voor de hover van link tekst"
         }
       },
       "active": {
         "color": {
           "parent": "mode/dark (beta)",
-          "type": "color",
-          "value": "{lux.color.paars.100}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.paars.100}"
         }
       }
     },
@@ -175,63 +175,63 @@
       "tertiary": {
         "color": {
           "parent": "mode/dark (beta)",
-          "type": "color",
-          "value": "{lux.color.foreground.default}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.foreground.default}"
         },
         "hover": {
           "background-color": {
             "parent": "mode/dark (beta)",
-            "type": "color",
-            "value": "{lux.color.background.hover}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{lux.color.background.hover}"
           },
           "color": {
             "parent": "mode/dark (beta)",
-            "type": "color",
-            "value": "{lux.color.foreground.default}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{lux.color.foreground.default}"
           }
         }
       },
       "secondary": {
         "color": {
           "parent": "mode/dark (beta)",
-          "type": "color",
-          "value": "{lux.color.foreground.default}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.foreground.default}"
         },
         "hover": {
           "background-color": {
             "parent": "mode/dark (beta)",
-            "type": "color",
-            "value": "{lux.color.background.hover}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{lux.color.background.hover}"
           },
           "color": {
             "parent": "mode/dark (beta)",
-            "type": "color",
-            "value": "{lux.color.foreground.default}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{lux.color.foreground.default}"
           },
           "border-color": {
             "parent": "mode/dark (beta)",
-            "type": "color",
-            "value": "{lux.color.border.default}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{lux.color.border.default}"
           }
         },
         "border-color": {
           "parent": "mode/dark (beta)",
-          "type": "color",
-          "value": "{lux.color.border.default}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.border.default}"
         },
         "background-color": {
           "parent": "mode/dark (beta)",
-          "type": "color",
-          "value": "{lux.color.none}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.none}"
         }
       }
     },
@@ -239,43 +239,43 @@
       "eherkenning": {
         "e-color": {
           "parent": "mode/dark (beta)",
-          "type": "color",
-          "value": "#ffffff",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "#ffffff"
         }
       },
       "eidas": {
         "stars-color": {
           "parent": "mode/dark (beta)",
-          "type": "color",
-          "value": "#ffffff",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "#ffffff"
         },
         "lock-color": {
           "parent": "mode/dark (beta)",
-          "type": "color",
-          "value": "#ffffff",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "#ffffff"
         },
         "lines-color": {
           "parent": "mode/dark (beta)",
-          "type": "color",
-          "value": "#ffffff",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "#ffffff"
         },
         "background-color": {
           "parent": "mode/dark (beta)",
-          "type": "color",
-          "value": "#ffffff00",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "#ffffff00"
         }
       },
       "digid": {
         "border-color": {
           "parent": "mode/dark (beta)",
-          "type": "color",
-          "value": "#d1d1d1",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "#d1d1d1"
         }
       }
     },
@@ -283,17 +283,17 @@
       "active": {
         "background-color": {
           "parent": "mode/dark (beta)",
-          "type": "color",
-          "value": "{lux.color.grijs.500}"
+          "$type": "color",
+          "$value": "{lux.color.grijs.500}"
         }
       }
     },
     "rijkslogo": {
       "color": {
         "parent": "mode/dark (beta)",
-        "type": "color",
-        "value": "{lux.color.wit}",
-        "description": ""
+        "description": "",
+        "$type": "color",
+        "$value": "{lux.color.wit}"
       }
     }
   }
diff --git a/proprietary/design-tokens/src/imported/mode/light.json b/proprietary/design-tokens/src/imported/mode/light.json
index 7ee7985ef..c9703f6f4 100644
--- a/proprietary/design-tokens/src/imported/mode/light.json
+++ b/proprietary/design-tokens/src/imported/mode/light.json
@@ -4,137 +4,137 @@
       "foreground": {
         "default": {
           "parent": "mode/light",
-          "type": "color",
-          "value": "{lux.color.grijs.700}",
-          "description": "Standaard kleur voor teksten en iconen. Gebruik deze voor body content, titels en labels."
+          "$type": "color",
+          "$value": "{lux.color.grijs.700}",
+          "$description": "Standaard kleur voor teksten en iconen. Gebruik deze voor body content, titels en labels."
         },
         "subdued": {
           "parent": "mode/light",
-          "type": "color",
-          "value": "{lux.color.grijs.500}",
-          "description": "Gebruik voor content die extra context biedt, maar niet essentieel is om de interface te begrijpen."
+          "$type": "color",
+          "$value": "{lux.color.grijs.500}",
+          "$description": "Gebruik voor content die extra context biedt, maar niet essentieel is om de interface te begrijpen."
         },
         "onEmphasis": {
           "parent": "mode/light",
-          "type": "color",
-          "value": "{lux.color.wit}",
-          "description": "Tekst en iconen die op een sterke achtergrond staan. Zoals het label in de primaire button of links in de footer."
+          "$type": "color",
+          "$value": "{lux.color.wit}",
+          "$description": "Tekst en iconen die op een sterke achtergrond staan. Zoals het label in de primaire button of links in de footer."
         },
         "link": {
-          "value": "{lux.color.donkerblauw.500}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.donkerblauw.500}"
         }
       },
       "background": {
         "default": {
           "parent": "mode/light",
-          "type": "color",
-          "value": "{lux.color.wit}",
-          "description": "Achtergrond kleur"
+          "$type": "color",
+          "$value": "{lux.color.wit}",
+          "$description": "Achtergrond kleur"
         },
         "subdued": {
           "parent": "mode/light",
-          "type": "color",
-          "value": "{lux.color.grijs.200}",
-          "description": "Subtiele achtergrond kleur"
+          "$type": "color",
+          "$value": "{lux.color.grijs.200}",
+          "$description": "Subtiele achtergrond kleur"
         },
         "hover": {
           "parent": "mode/light",
-          "type": "color",
-          "value": "{lux.color.grijs.300}",
-          "description": "Kleur van elementen als je eroverheen gaat met je muis"
+          "$type": "color",
+          "$value": "{lux.color.grijs.300}",
+          "$description": "Kleur van elementen als je eroverheen gaat met je muis"
         }
       },
       "border": {
         "default": {
           "parent": "mode/light",
-          "type": "color",
-          "value": "{lux.color.grijs.500}",
-          "description": "Border kleur"
+          "$type": "color",
+          "$value": "{lux.color.grijs.500}",
+          "$description": "Border kleur"
         },
         "subdued": {
           "parent": "mode/light",
-          "type": "color",
-          "value": "{lux.color.grijs.400}",
-          "description": "Subtiele border"
+          "$type": "color",
+          "$value": "{lux.color.grijs.400}",
+          "$description": "Subtiele border"
         },
         "strong": {
           "parent": "mode/light",
-          "type": "color",
-          "value": "{lux.color.foreground.default}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.foreground.default}"
         }
       },
       "canvas": {
         "parent": "mode/light",
-        "type": "color",
-        "value": "{lux.color.grijs.200}",
-        "description": "Gebruik deze kleur voor de achtergrond van de website, hierbovenop komen de background kleuren."
+        "$type": "color",
+        "$value": "{lux.color.grijs.200}",
+        "$description": "Gebruik deze kleur voor de achtergrond van de website, hierbovenop komen de background kleuren."
       },
       "feedback": {
         "success": {
           "default": {
             "parent": "mode/light",
-            "type": "color",
-            "value": "{lux.color.groen.500}",
-            "description": "Gebruik deze kleur om een positieve boodschap te benadrukken."
+            "$type": "color",
+            "$value": "{lux.color.groen.500}",
+            "$description": "Gebruik deze kleur om een positieve boodschap te benadrukken."
           },
           "subdued": {
             "parent": "mode/light",
-            "type": "color",
-            "value": "{lux.color.groen.50}",
-            "description": "Gebruik deze kleur om een positieve boodschap te highlighten."
+            "$type": "color",
+            "$value": "{lux.color.groen.50}",
+            "$description": "Gebruik deze kleur om een positieve boodschap te highlighten."
           }
         },
         "info": {
           "default": {
             "parent": "mode/light",
-            "type": "color",
-            "value": "{lux.color.hemelblauw.500}",
-            "description": "Gebruik deze kleur om een informatieve boodschap te benadrukken."
+            "$type": "color",
+            "$value": "{lux.color.hemelblauw.500}",
+            "$description": "Gebruik deze kleur om een informatieve boodschap te benadrukken."
           },
           "subdued": {
             "parent": "mode/light",
-            "type": "color",
-            "value": "{lux.color.hemelblauw.50}",
-            "description": "Gebruik deze kleur om een informatieve boodschap te highlighten."
+            "$type": "color",
+            "$value": "{lux.color.hemelblauw.50}",
+            "$description": "Gebruik deze kleur om een informatieve boodschap te highlighten."
           }
         },
         "error": {
           "default": {
             "parent": "mode/light",
-            "type": "color",
-            "value": "{lux.color.rood.500}",
-            "description": "Gebruik deze kleur om een negatieve boodschap te benadrukken."
+            "$type": "color",
+            "$value": "{lux.color.rood.500}",
+            "$description": "Gebruik deze kleur om een negatieve boodschap te benadrukken."
           },
           "subdued": {
             "parent": "mode/light",
-            "type": "color",
-            "value": "{lux.color.rood.50}",
-            "description": "Gebruik deze kleur om een negatieve boodschap te highlighten."
+            "$type": "color",
+            "$value": "{lux.color.rood.50}",
+            "$description": "Gebruik deze kleur om een negatieve boodschap te highlighten."
           }
         },
         "warning": {
           "default": {
             "parent": "mode/light",
-            "type": "color",
-            "value": "{lux.color.donkergeel.500}",
-            "description": "Gebruik deze kleur om een waarschuwing te benadrukken."
+            "$type": "color",
+            "$value": "{lux.color.donkergeel.500}",
+            "$description": "Gebruik deze kleur om een waarschuwing te benadrukken."
           },
           "subdued": {
             "parent": "mode/light",
-            "type": "color",
-            "value": "{lux.color.donkergeel.50}",
-            "description": "Gebruik deze kleur om een waarschuwing te highlighten."
+            "$type": "color",
+            "$value": "{lux.color.donkergeel.50}",
+            "$description": "Gebruik deze kleur om een waarschuwing te highlighten."
           }
         }
       },
       "focus": {
         "outline": {
           "parent": "mode/light",
-          "type": "color",
-          "value": "{lux.color.border.strong}",
-          "description": "Outline kleur voor de focus state."
+          "$type": "color",
+          "$value": "{lux.color.border.strong}",
+          "$description": "Outline kleur voor de focus state."
         }
       }
     }
@@ -143,30 +143,30 @@
     "link": {
       "color": {
         "parent": "mode/dark (beta)",
-        "type": "color",
-        "value": "{lux.color.donkerblauw.500}",
-        "description": "Gebruik deze kleur voor link tekst"
+        "$type": "color",
+        "$value": "{lux.color.donkerblauw.500}",
+        "$description": "Gebruik deze kleur voor link tekst"
       },
       "visited": {
         "color": {
           "parent": "mode/dark (beta)",
-          "type": "color",
-          "value": "{lux.color.paars.500}"
+          "$type": "color",
+          "$value": "{lux.color.paars.500}"
         }
       },
       "hover": {
         "color": {
           "parent": "mode/dark (beta)",
-          "type": "color",
-          "value": "{lux.color.donkerblauw.700}",
-          "description": "Gebruik deze kleur voor de hover van link tekst"
+          "$type": "color",
+          "$value": "{lux.color.donkerblauw.700}",
+          "$description": "Gebruik deze kleur voor de hover van link tekst"
         }
       },
       "active": {
         "color": {
           "parent": "mode/dark (beta)",
-          "type": "color",
-          "value": "{lux.color.paars.500}"
+          "$type": "color",
+          "$value": "{lux.color.paars.500}"
         }
       }
     },
@@ -174,63 +174,63 @@
       "tertiary": {
         "color": {
           "parent": "mode/light",
-          "type": "color",
-          "value": "{product.button.tertiary.color}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{product.button.tertiary.color}"
         },
         "hover": {
           "background-color": {
             "parent": "mode/light",
-            "type": "color",
-            "value": "{product.button.tertiary.hover.background-color}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{product.button.tertiary.hover.background-color}"
           },
           "color": {
             "parent": "mode/light",
-            "type": "color",
-            "value": "{product.button.tertiary.hover.color}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{product.button.tertiary.hover.color}"
           }
         }
       },
       "secondary": {
         "color": {
           "parent": "mode/light",
-          "type": "color",
-          "value": "{product.button.secondary.color}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{product.button.secondary.color}"
         },
         "hover": {
           "background-color": {
             "parent": "mode/light",
-            "type": "color",
-            "value": "{product.button.secondary.hover.background-color}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{product.button.secondary.hover.background-color}"
           },
           "color": {
             "parent": "mode/light",
-            "type": "color",
-            "value": "{product.button.secondary.hover.color}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{product.button.secondary.hover.color}"
           },
           "border-color": {
             "parent": "mode/light",
-            "type": "color",
-            "value": "{product.button.secondary.hover.border-color}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{product.button.secondary.hover.border-color}"
           }
         },
         "border-color": {
           "parent": "mode/light",
-          "type": "color",
-          "value": "{product.button.secondary.border-color}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{product.button.secondary.border-color}"
         },
         "background-color": {
           "parent": "mode/light",
-          "type": "color",
-          "value": "{product.button.secondary.background-color}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{product.button.secondary.background-color}"
         }
       }
     },
@@ -238,43 +238,43 @@
       "eherkenning": {
         "e-color": {
           "parent": "mode/light",
-          "type": "color",
-          "value": "#203a70",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "#203a70"
         }
       },
       "eidas": {
         "stars-color": {
           "parent": "mode/light",
-          "type": "color",
-          "value": "#f1cc49",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "#f1cc49"
         },
         "lock-color": {
           "parent": "mode/light",
-          "type": "color",
-          "value": "#ffffff",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "#ffffff"
         },
         "lines-color": {
           "parent": "mode/light",
-          "type": "color",
-          "value": "#6ba6f1",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "#6ba6f1"
         },
         "background-color": {
           "parent": "mode/light",
-          "type": "color",
-          "value": "#1d336a",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "#1d336a"
         }
       },
       "digid": {
         "border-color": {
           "parent": "mode/light",
-          "type": "color",
-          "value": "{lux.color.none}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.none}"
         }
       }
     },
@@ -283,18 +283,18 @@
         "background-color": {
           "parent": "mode/light",
           "oldValue": "{lux.color.grijs.400}",
-          "type": "color",
-          "value": "{lux.color.grijs.400}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.grijs.400}"
         }
       }
     },
     "rijkslogo": {
       "color": {
         "parent": "mode/light",
-        "type": "color",
-        "value": "{lux.color.zwart}",
-        "description": ""
+        "description": "",
+        "$type": "color",
+        "$value": "{lux.color.zwart}"
       }
     }
   }
diff --git a/proprietary/design-tokens/src/imported/nl/utrecht-alert.json b/proprietary/design-tokens/src/imported/nl/utrecht-alert.json
index 65beb45f4..ca4ecc2b7 100644
--- a/proprietary/design-tokens/src/imported/nl/utrecht-alert.json
+++ b/proprietary/design-tokens/src/imported/nl/utrecht-alert.json
@@ -2,143 +2,143 @@
   "utrecht": {
     "alert": {
       "background-color": {
-        "type": "color",
-        "value": "{lux.color.background.subdued}"
+        "$type": "color",
+        "$value": "{lux.color.background.subdued}"
       },
       "border-color": {
-        "type": "color",
-        "value": "{lux.alert.border-color}"
+        "$type": "color",
+        "$value": "{lux.alert.border-color}"
       },
       "border-radius": {
-        "type": "borderRadius",
-        "value": "{lux.alert.border-radius}"
+        "$type": "borderRadius",
+        "$value": "{lux.alert.border-radius}"
       },
       "border-width": {
-        "type": "borderWidth",
-        "value": "{lux.alert.border-width}"
+        "$type": "borderWidth",
+        "$value": "{lux.alert.border-width}"
       },
       "color": {
-        "type": "color",
-        "value": "{lux.alert.color}"
+        "$type": "color",
+        "$value": "{lux.alert.color}"
       },
       "column-gap": {
-        "type": "spacing",
-        "value": "{lux.alert.column-gap}"
+        "$type": "spacing",
+        "$value": "{lux.alert.column-gap}"
       },
       "padding-block-start": {
-        "type": "spacing",
-        "value": "{lux.alert.padding-block-start}"
+        "$type": "spacing",
+        "$value": "{lux.alert.padding-block-start}"
       },
       "padding-block-end": {
-        "type": "spacing",
-        "value": "{lux.alert.padding-block-end}"
+        "$type": "spacing",
+        "$value": "{lux.alert.padding-block-end}"
       },
       "padding-inline-start": {
-        "type": "spacing",
-        "value": "{lux.alert.padding-inline-start}"
+        "$type": "spacing",
+        "$value": "{lux.alert.padding-inline-start}"
       },
       "padding-inline-end": {
-        "type": "spacing",
-        "value": "{lux.alert.padding-inline-end}"
+        "$type": "spacing",
+        "$value": "{lux.alert.padding-inline-end}"
       },
       "warning": {
         "background-color": {
-          "type": "color",
-          "value": "{lux.alert.warning.background-color}"
+          "$type": "color",
+          "$value": "{lux.alert.warning.background-color}"
         },
         "color": {
-          "type": "color",
-          "value": "{lux.alert.color}"
+          "$type": "color",
+          "$value": "{lux.alert.color}"
         },
         "border-color": {
-          "type": "color",
-          "value": "{lux.alert.border-color}"
+          "$type": "color",
+          "$value": "{lux.alert.border-color}"
         }
       },
       "error": {
         "background-color": {
-          "type": "color",
-          "value": "{lux.alert.error.background-color}"
+          "$type": "color",
+          "$value": "{lux.alert.error.background-color}"
         },
         "color": {
-          "type": "color",
-          "value": "{lux.alert.color}"
+          "$type": "color",
+          "$value": "{lux.alert.color}"
         },
         "border-color": {
-          "type": "color",
-          "value": "{lux.alert.border-color}"
+          "$type": "color",
+          "$value": "{lux.alert.border-color}"
         }
       },
       "ok": {
         "background-color": {
-          "type": "color",
-          "value": "{lux.alert.success.background-color}"
+          "$type": "color",
+          "$value": "{lux.alert.success.background-color}"
         },
         "color": {
-          "type": "color",
-          "value": "{lux.alert.color}"
+          "$type": "color",
+          "$value": "{lux.alert.color}"
         },
         "border-color": {
-          "type": "color",
-          "value": "{lux.alert.border-color}"
+          "$type": "color",
+          "$value": "{lux.alert.border-color}"
         }
       },
       "icon": {
         "color": {
-          "type": "color",
-          "value": "{lux.color.grijs.700}"
+          "$type": "color",
+          "$value": "{lux.color.grijs.700}"
         },
         "error": {
           "color": {
-            "type": "color",
-            "value": "{lux.color.feedback.error.default}"
+            "$type": "color",
+            "$value": "{lux.color.feedback.error.default}"
           }
         },
         "warning": {
           "color": {
-            "type": "color",
-            "value": "{lux.color.feedback.warning.default}"
+            "$type": "color",
+            "$value": "{lux.color.feedback.warning.default}"
           }
         },
         "ok": {
           "color": {
-            "type": "color",
-            "value": "{lux.color.feedback.success.default}"
+            "$type": "color",
+            "$value": "{lux.color.feedback.success.default}"
           }
         },
         "inset-block-start": {
-          "value": "{lux.alert.icon.inset-block-start}",
-          "type": "spacing"
+          "$type": "spacing",
+          "$value": "{lux.alert.icon.inset-block-start}"
         },
         "info": {
           "color": {
-            "type": "color",
-            "value": "{lux.color.feedback.info.default}"
+            "$type": "color",
+            "$value": "{lux.color.feedback.info.default}"
           }
         },
         "size": {
-          "value": "{lux.alert.icon.size}",
-          "type": "sizing"
+          "$type": "sizing",
+          "$value": "{lux.alert.icon.size}"
         }
       },
       "message": {
         "row-gap": {
-          "value": "{lux.space.0}",
-          "type": "spacing"
+          "$type": "spacing",
+          "$value": "{lux.space.0}"
         }
       },
       "info": {
         "background-color": {
-          "type": "color",
-          "value": "{lux.alert.info.background-color}"
+          "$type": "color",
+          "$value": "{lux.alert.info.background-color}"
         },
         "color": {
-          "type": "color",
-          "value": "{lux.alert.color}"
+          "$type": "color",
+          "$value": "{lux.alert.color}"
         },
         "border-color": {
-          "type": "color",
-          "value": "{lux.alert.border-color}"
+          "$type": "color",
+          "$value": "{lux.alert.border-color}"
         }
       }
     }
diff --git a/proprietary/design-tokens/src/imported/nl/utrecht-button.json b/proprietary/design-tokens/src/imported/nl/utrecht-button.json
index ea5d64c67..97f795498 100644
--- a/proprietary/design-tokens/src/imported/nl/utrecht-button.json
+++ b/proprietary/design-tokens/src/imported/nl/utrecht-button.json
@@ -2,476 +2,476 @@
   "utrecht": {
     "button": {
       "background-color": {
-        "type": "color",
-        "value": "{lux.color.paars.100}"
+        "$type": "color",
+        "$value": "{lux.color.paars.100}"
       },
       "border-color": {
-        "type": "color",
-        "value": "{lux.color.paars.500}"
+        "$type": "color",
+        "$value": "{lux.color.paars.500}"
       },
       "border-radius": {
-        "type": "borderRadius",
-        "value": "{lux.button.border-radius}"
+        "$type": "borderRadius",
+        "$value": "{lux.button.border-radius}"
       },
       "border-width": {
-        "type": "borderWidth",
-        "value": "{lux.button.border-width}"
+        "$type": "borderWidth",
+        "$value": "{lux.button.border-width}"
       },
       "color": {
-        "type": "color",
-        "value": "{lux.color.paars.500}"
+        "$type": "color",
+        "$value": "{lux.color.paars.500}"
       },
       "font-family": {
-        "type": "fontFamilies",
-        "value": "{lux.button.font-family}"
+        "$type": "fontFamilies",
+        "$value": "{lux.button.font-family}"
       },
       "font-size": {
-        "type": "fontSizes",
-        "value": "{lux.button.font-size}"
+        "$type": "fontSizes",
+        "$value": "{lux.button.font-size}"
       },
       "primary-action": {
         "font-size": {
-          "type": "fontSizes",
-          "value": "{lux.button.primary.font-size}"
+          "$type": "fontSizes",
+          "$value": "{lux.button.primary.font-size}"
         },
         "background-color": {
-          "type": "color",
-          "value": "{lux.button.primary.background-color}"
+          "$type": "color",
+          "$value": "{lux.button.primary.background-color}"
         },
         "border-color": {
-          "type": "color",
-          "value": "{lux.button.primary.border-color}"
+          "$type": "color",
+          "$value": "{lux.button.primary.border-color}"
         },
         "border-width": {
-          "type": "borderWidth",
-          "value": "{lux.button.border-width}"
+          "$type": "borderWidth",
+          "$value": "{lux.button.border-width}"
         },
         "color": {
-          "type": "color",
-          "value": "{lux.button.primary.color}"
+          "$type": "color",
+          "$value": "{lux.button.primary.color}"
         },
         "font-weight": {
-          "type": "fontWeights",
-          "value": "{lux.button.font-weight}"
+          "$type": "fontWeights",
+          "$value": "{lux.button.font-weight}"
         },
         "active": {
           "background-color": {
-            "type": "color",
-            "value": "{lux.button.primary.active.background-color}"
+            "$type": "color",
+            "$value": "{lux.button.primary.active.background-color}"
           },
           "border-color": {
-            "type": "color",
-            "value": "{lux.button.primary.active.border-color}"
+            "$type": "color",
+            "$value": "{lux.button.primary.active.border-color}"
           },
           "color": {
-            "type": "color",
-            "value": "{lux.button.primary.active.color}"
+            "$type": "color",
+            "$value": "{lux.button.primary.active.color}"
           }
         },
         "disabled": {
           "background-color": {
-            "type": "color",
-            "value": "{lux.button.primary.disabled.background-color}"
+            "$type": "color",
+            "$value": "{lux.button.primary.disabled.background-color}"
           },
           "border-color": {
-            "type": "color",
-            "value": "{lux.button.primary.disabled.border-color}"
+            "$type": "color",
+            "$value": "{lux.button.primary.disabled.border-color}"
           },
           "color": {
-            "type": "color",
-            "value": "{lux.button.primary.disabled.color}"
+            "$type": "color",
+            "$value": "{lux.button.primary.disabled.color}"
           }
         },
         "hover": {
           "background-color": {
-            "type": "color",
-            "value": "{lux.button.primary.hover.background-color}"
+            "$type": "color",
+            "$value": "{lux.button.primary.hover.background-color}"
           },
           "border-color": {
-            "type": "color",
-            "value": "{lux.button.primary.hover.border-color}"
+            "$type": "color",
+            "$value": "{lux.button.primary.hover.border-color}"
           },
           "color": {
-            "type": "color",
-            "value": "{lux.button.primary.hover.color}"
+            "$type": "color",
+            "$value": "{lux.button.primary.hover.color}"
           },
           "scale": {
-            "type": "other",
-            "value": "{no-token}"
+            "$type": "other",
+            "$value": "{no-token}"
           }
         },
         "focus": {
           "background-color": {
-            "type": "color",
-            "value": "{lux.button.primary.background-color}"
+            "$type": "color",
+            "$value": "{lux.button.primary.background-color}"
           },
           "border-color": {
-            "type": "color",
-            "value": "{lux.button.primary.hover.border-color}"
+            "$type": "color",
+            "$value": "{lux.button.primary.hover.border-color}"
           },
           "color": {
-            "type": "color",
-            "value": "{lux.button.primary.color}"
+            "$type": "color",
+            "$value": "{lux.button.primary.color}"
           }
         },
         "pressed": {
           "background-color": {
-            "type": "color",
-            "value": "{lux.button.primary.hover.background-color}"
+            "$type": "color",
+            "$value": "{lux.button.primary.hover.background-color}"
           },
           "border-color": {
-            "type": "color",
-            "value": "{lux.button.primary.hover.border-color}"
+            "$type": "color",
+            "$value": "{lux.button.primary.hover.border-color}"
           },
           "color": {
-            "type": "color",
-            "value": "{lux.button.primary.hover.color}"
+            "$type": "color",
+            "$value": "{lux.button.primary.hover.color}"
           }
         },
         "line-height": {
-          "value": "{lux.button.line-height}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{lux.button.line-height}"
         }
       },
       "font-weight": {
-        "type": "fontWeights",
-        "value": "{lux.button.font-weight}"
+        "$type": "fontWeights",
+        "$value": "{lux.button.font-weight}"
       },
       "inline-size": {
-        "type": "sizing",
-        "value": "{no-token}",
-        "description": "Wat is dit voor token? Waarom zit deze in de button? "
+        "$type": "sizing",
+        "$value": "{no-token}",
+        "$description": "Wat is dit voor token? Waarom zit deze in de button? "
       },
       "line-height": {
-        "type": "lineHeights",
-        "value": "{lux.button.line-height}"
+        "$type": "lineHeights",
+        "$value": "{lux.button.line-height}"
       },
       "min-block-size": {
-        "type": "sizing",
-        "value": "{lux.button.min-block-size}"
+        "$type": "sizing",
+        "$value": "{lux.button.min-block-size}"
       },
       "min-inline-size": {
-        "type": "sizing",
-        "value": "{lux.button.min-inline-size}"
+        "$type": "sizing",
+        "$value": "{lux.button.min-inline-size}"
       },
       "column-gap": {
-        "type": "spacing",
-        "value": "{lux.button.column-gap}"
+        "$type": "spacing",
+        "$value": "{lux.button.column-gap}"
       },
       "padding-block-start": {
-        "type": "spacing",
-        "value": "{lux.button.padding-block-start}"
+        "$type": "spacing",
+        "$value": "{lux.button.padding-block-start}"
       },
       "padding-block-end": {
-        "type": "spacing",
-        "value": "{lux.button.padding-block-end}"
+        "$type": "spacing",
+        "$value": "{lux.button.padding-block-end}"
       },
       "padding-inline-start": {
-        "type": "spacing",
-        "value": "{lux.button.padding-inline-start}"
+        "$type": "spacing",
+        "$value": "{lux.button.padding-inline-start}"
       },
       "padding-inline-end": {
-        "type": "spacing",
-        "value": "{lux.button.padding-inline-end}"
+        "$type": "spacing",
+        "$value": "{lux.button.padding-inline-end}"
       },
       "text-transform": {
-        "type": "other",
-        "value": "{no-token}"
+        "$type": "other",
+        "$value": "{no-token}"
       },
       "active": {
         "background-color": {
-          "type": "color",
-          "value": "{utrecht.button.background-color}"
+          "$type": "color",
+          "$value": "{utrecht.button.background-color}"
         },
         "border-color": {
-          "type": "color",
-          "value": "{utrecht.button.border-color}"
+          "$type": "color",
+          "$value": "{utrecht.button.border-color}"
         },
         "color": {
-          "type": "color",
-          "value": "{utrecht.button.color}"
+          "$type": "color",
+          "$value": "{utrecht.button.color}"
         }
       },
       "icon": {
         "gap": {
-          "type": "spacing",
-          "value": "{utrecht.button.column-gap}"
+          "$type": "spacing",
+          "$value": "{utrecht.button.column-gap}"
         },
         "size": {
-          "type": "sizing",
-          "value": "{lux.button.icon.size}"
+          "$type": "sizing",
+          "$value": "{lux.button.icon.size}"
         }
       },
       "disabled": {
         "background-color": {
-          "type": "color",
-          "value": "{utrecht.button.background-color}"
+          "$type": "color",
+          "$value": "{utrecht.button.background-color}"
         },
         "border-color": {
-          "type": "color",
-          "value": "{utrecht.button.border-color}"
+          "$type": "color",
+          "$value": "{utrecht.button.border-color}"
         },
         "color": {
-          "type": "color",
-          "value": "{utrecht.button.color}"
+          "$type": "color",
+          "$value": "{utrecht.button.color}"
         }
       },
       "focus": {
         "background-color": {
-          "type": "color",
-          "value": "{utrecht.button.background-color}"
+          "$type": "color",
+          "$value": "{utrecht.button.background-color}"
         },
         "border-color": {
-          "type": "color",
-          "value": "{utrecht.button.border-color}"
+          "$type": "color",
+          "$value": "{utrecht.button.border-color}"
         },
         "color": {
-          "type": "color",
-          "value": "{utrecht.button.color}"
+          "$type": "color",
+          "$value": "{utrecht.button.color}"
         },
         "scale": {
-          "type": "other",
-          "value": "{no-token}"
+          "$type": "other",
+          "$value": "{no-token}"
         }
       },
       "hover": {
         "background-color": {
-          "type": "color",
-          "value": "{lux.color.paars.200}"
+          "$type": "color",
+          "$value": "{lux.color.paars.200}"
         },
         "border-color": {
-          "type": "color",
-          "value": "{utrecht.button.border-color}"
+          "$type": "color",
+          "$value": "{utrecht.button.border-color}"
         },
         "color": {
-          "type": "color",
-          "value": "{utrecht.button.color}"
+          "$type": "color",
+          "$value": "{utrecht.button.color}"
         },
         "scale": {
-          "type": "other",
-          "value": "{no-token}"
+          "$type": "other",
+          "$value": "{no-token}"
         }
       },
       "pressed": {
         "background-color": {
-          "type": "color",
-          "value": "{utrecht.button.background-color}"
+          "$type": "color",
+          "$value": "{utrecht.button.background-color}"
         },
         "border-color": {
-          "type": "color",
-          "value": "{utrecht.button.border-color}"
+          "$type": "color",
+          "$value": "{utrecht.button.border-color}"
         },
         "color": {
-          "type": "color",
-          "value": "{utrecht.button.color}"
+          "$type": "color",
+          "$value": "{utrecht.button.color}"
         }
       },
       "secondary-action": {
         "background-color": {
-          "type": "color",
-          "value": "{lux.button.secondary.background-color}"
+          "$type": "color",
+          "$value": "{lux.button.secondary.background-color}"
         },
         "border-color": {
-          "type": "color",
-          "value": "{lux.button.secondary.border-color}"
+          "$type": "color",
+          "$value": "{lux.button.secondary.border-color}"
         },
         "border-width": {
-          "type": "borderWidth",
-          "value": "{lux.button.border-width}"
+          "$type": "borderWidth",
+          "$value": "{lux.button.border-width}"
         },
         "color": {
-          "type": "color",
-          "value": "{lux.button.secondary.color}"
+          "$type": "color",
+          "$value": "{lux.button.secondary.color}"
         },
         "font-weight": {
-          "type": "fontWeights",
-          "value": "{lux.button.font-weight}"
+          "$type": "fontWeights",
+          "$value": "{lux.button.font-weight}"
         },
         "active": {
           "background-color": {
-            "type": "color",
-            "value": "{lux.button.secondary.active.background-color}"
+            "$type": "color",
+            "$value": "{lux.button.secondary.active.background-color}"
           },
           "border-color": {
-            "type": "color",
-            "value": "{lux.button.secondary.active.border-color}"
+            "$type": "color",
+            "$value": "{lux.button.secondary.active.border-color}"
           },
           "color": {
-            "type": "color",
-            "value": "{lux.button.secondary.active.color}"
+            "$type": "color",
+            "$value": "{lux.button.secondary.active.color}"
           }
         },
         "disabled": {
           "background-color": {
-            "type": "color",
-            "value": "{lux.button.secondary.disabled.background-color}"
+            "$type": "color",
+            "$value": "{lux.button.secondary.disabled.background-color}"
           },
           "border-color": {
-            "type": "color",
-            "value": "{lux.button.secondary.disabled.border-color}"
+            "$type": "color",
+            "$value": "{lux.button.secondary.disabled.border-color}"
           },
           "color": {
-            "type": "color",
-            "value": "{lux.button.secondary.disabled.color}"
+            "$type": "color",
+            "$value": "{lux.button.secondary.disabled.color}"
           }
         },
         "hover": {
           "background-color": {
-            "type": "color",
-            "value": "{lux.button.secondary.hover.background-color}"
+            "$type": "color",
+            "$value": "{lux.button.secondary.hover.background-color}"
           },
           "border-color": {
-            "type": "color",
-            "value": "{lux.button.secondary.hover.border-color}"
+            "$type": "color",
+            "$value": "{lux.button.secondary.hover.border-color}"
           },
           "color": {
-            "type": "color",
-            "value": "{lux.button.secondary.hover.color}"
+            "$type": "color",
+            "$value": "{lux.button.secondary.hover.color}"
           },
           "scale": {
-            "type": "other",
-            "value": "{no-token}"
+            "$type": "other",
+            "$value": "{no-token}"
           }
         },
         "focus": {
           "background-color": {
-            "type": "color",
-            "value": "{lux.button.secondary.background-color}"
+            "$type": "color",
+            "$value": "{lux.button.secondary.background-color}"
           },
           "border-color": {
-            "type": "color",
-            "value": "{lux.button.secondary.border-color}"
+            "$type": "color",
+            "$value": "{lux.button.secondary.border-color}"
           },
           "color": {
-            "type": "color",
-            "value": "{lux.button.secondary.color}"
+            "$type": "color",
+            "$value": "{lux.button.secondary.color}"
           }
         },
         "pressed": {
           "background-color": {
-            "type": "color",
-            "value": "{lux.button.secondary.hover.background-color}"
+            "$type": "color",
+            "$value": "{lux.button.secondary.hover.background-color}"
           },
           "border-color": {
-            "type": "color",
-            "value": "{lux.button.secondary.hover.border-color}"
+            "$type": "color",
+            "$value": "{lux.button.secondary.hover.border-color}"
           },
           "color": {
-            "type": "color",
-            "value": "{lux.button.secondary.hover.color}"
+            "$type": "color",
+            "$value": "{lux.button.secondary.hover.color}"
           }
         },
         "line-height": {
-          "value": "{lux.button.line-height}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{lux.button.line-height}"
         },
         "font-size": {
-          "type": "fontSizes",
-          "value": "{lux.button.font-size}"
+          "$type": "fontSizes",
+          "$value": "{lux.button.font-size}"
         }
       },
       "subtle": {
         "background-color": {
-          "type": "color",
-          "value": "{lux.button.tertiary.background-color}"
+          "$type": "color",
+          "$value": "{lux.button.tertiary.background-color}"
         },
         "border-color": {
-          "type": "color",
-          "value": "{lux.button.tertiary.border-color}"
+          "$type": "color",
+          "$value": "{lux.button.tertiary.border-color}"
         },
         "border-width": {
-          "type": "borderWidth",
-          "value": "{lux.button.border-width}"
+          "$type": "borderWidth",
+          "$value": "{lux.button.border-width}"
         },
         "color": {
-          "type": "color",
-          "value": "{lux.button.tertiary.color}"
+          "$type": "color",
+          "$value": "{lux.button.tertiary.color}"
         },
         "font-weight": {
-          "type": "fontWeights",
-          "value": "{lux.button.font-weight}"
+          "$type": "fontWeights",
+          "$value": "{lux.button.font-weight}"
         },
         "active": {
           "background-color": {
-            "type": "color",
-            "value": "{lux.button.tertiary.active.background-color}"
+            "$type": "color",
+            "$value": "{lux.button.tertiary.active.background-color}"
           },
           "border-color": {
-            "type": "color",
-            "value": "{lux.button.tertiary.active.border-color}"
+            "$type": "color",
+            "$value": "{lux.button.tertiary.active.border-color}"
           },
           "color": {
-            "type": "color",
-            "value": "{lux.button.tertiary.active.color}"
+            "$type": "color",
+            "$value": "{lux.button.tertiary.active.color}"
           }
         },
         "disabled": {
           "background-color": {
-            "type": "color",
-            "value": "{lux.button.tertiary.disabled.background-color}"
+            "$type": "color",
+            "$value": "{lux.button.tertiary.disabled.background-color}"
           },
           "border-color": {
-            "type": "color",
-            "value": "{lux.button.tertiary.disabled.border-color}"
+            "$type": "color",
+            "$value": "{lux.button.tertiary.disabled.border-color}"
           },
           "color": {
-            "type": "color",
-            "value": "{lux.button.tertiary.disabled.color}"
+            "$type": "color",
+            "$value": "{lux.button.tertiary.disabled.color}"
           }
         },
         "hover": {
           "background-color": {
-            "type": "color",
-            "value": "{lux.button.tertiary.hover.background-color}"
+            "$type": "color",
+            "$value": "{lux.button.tertiary.hover.background-color}"
           },
           "border-color": {
-            "type": "color",
-            "value": "{lux.button.tertiary.hover.border-color}"
+            "$type": "color",
+            "$value": "{lux.button.tertiary.hover.border-color}"
           },
           "color": {
-            "type": "color",
-            "value": "{lux.button.tertiary.hover.color}"
+            "$type": "color",
+            "$value": "{lux.button.tertiary.hover.color}"
           },
           "scale": {
-            "type": "other",
-            "value": "{no-token}"
+            "$type": "other",
+            "$value": "{no-token}"
           }
         },
         "focus": {
           "background-color": {
-            "type": "color",
-            "value": "{lux.button.tertiary.background-color}"
+            "$type": "color",
+            "$value": "{lux.button.tertiary.background-color}"
           },
           "border-color": {
-            "type": "color",
-            "value": "{lux.button.tertiary.border-color}"
+            "$type": "color",
+            "$value": "{lux.button.tertiary.border-color}"
           },
           "color": {
-            "type": "color",
-            "value": "{lux.button.tertiary.color}"
+            "$type": "color",
+            "$value": "{lux.button.tertiary.color}"
           }
         },
         "pressed": {
           "background-color": {
-            "type": "color",
-            "value": "{lux.button.tertiary.hover.background-color}"
+            "$type": "color",
+            "$value": "{lux.button.tertiary.hover.background-color}"
           },
           "border-color": {
-            "type": "color",
-            "value": "{lux.button.tertiary.hover.border-color}"
+            "$type": "color",
+            "$value": "{lux.button.tertiary.hover.border-color}"
           },
           "color": {
-            "type": "color",
-            "value": "{lux.button.tertiary.hover.color}"
+            "$type": "color",
+            "$value": "{lux.button.tertiary.hover.color}"
           }
         },
         "line-height": {
-          "value": "{lux.button.line-height}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{lux.button.line-height}"
         },
         "font-size": {
-          "type": "fontSizes",
-          "value": "{lux.button.font-size}"
+          "$type": "fontSizes",
+          "$value": "{lux.button.font-size}"
         }
       }
     }
@@ -480,16 +480,16 @@
     "button": {
       "small": {
         "min-block-size": {
-          "value": "2rem",
-          "type": "sizing"
+          "$type": "sizing",
+          "$value": "2rem"
         },
         "padding-block-end": {
-          "value": "{lux.space.25}",
-          "type": "spacing"
+          "$type": "spacing",
+          "$value": "{lux.space.25}"
         },
         "padding-block-start": {
-          "value": "{lux.space.25}",
-          "type": "spacing"
+          "$type": "spacing",
+          "$value": "{lux.space.25}"
         }
       }
     }
diff --git a/proprietary/design-tokens/src/imported/nl/utrecht-checkbox.json b/proprietary/design-tokens/src/imported/nl/utrecht-checkbox.json
index 9e26dfeeb..de68a3873 100644
--- a/proprietary/design-tokens/src/imported/nl/utrecht-checkbox.json
+++ b/proprietary/design-tokens/src/imported/nl/utrecht-checkbox.json
@@ -1 +1,302 @@
-{}
\ No newline at end of file
+{
+  "utrecht": {
+    "checkbox": {
+      "background-color": {
+        "$type": "color",
+        "$value": "{lux.color.background.default}"
+      },
+      "border-color": {
+        "$type": "color",
+        "$value": "{lux.color.border.strong}"
+      },
+      "color": {
+        "$type": "color",
+        "$value": "{utrecht.checkbox.border-color}"
+      },
+      "border-radius": {
+        "$type": "borderRadius",
+        "$value": "{lux.border-radius.default}"
+      },
+      "border-width": {
+        "$type": "borderWidth",
+        "$value": "1.5px"
+      },
+      "size": {
+        "$type": "sizing",
+        "$value": "1.125rem"
+      },
+      "icon": {
+        "size": {
+          "$type": "sizing",
+          "$value": "{lux.size.icon}"
+        }
+      },
+      "active": {
+        "background-color": {
+          "$type": "color",
+          "$value": "{lux.color.background.default}"
+        },
+        "border-color": {
+          "$type": "color",
+          "$value": "{lux.color.border.strong}"
+        },
+        "color": {
+          "$type": "color",
+          "$value": "{utrecht.checkbox.active.border-color}"
+        },
+        "border-width": {
+          "$type": "borderWidth",
+          "$value": "{utrecht.checkbox.border-width}"
+        }
+      },
+      "disabled": {
+        "background-color": {
+          "$type": "color",
+          "$value": "{lux.color.background.subdued}"
+        },
+        "border-color": {
+          "$type": "color",
+          "$value": "{lux.color.border.subdued}"
+        },
+        "color": {
+          "$type": "color",
+          "$value": "{utrecht.checkbox.disabled.border-color}"
+        }
+      },
+      "hover": {
+        "background-color": {
+          "$type": "color",
+          "$value": "{lux.color.background.default}"
+        },
+        "border-color": {
+          "$type": "color",
+          "$value": "{lux.color.border.strong}"
+        },
+        "color": {
+          "$type": "color",
+          "$value": "{utrecht.checkbox.hover.border-color}"
+        },
+        "border-width": {
+          "$type": "borderWidth",
+          "$value": "{lux.border-width.m}"
+        }
+      },
+      "focus": {
+        "background-color": {
+          "$type": "color",
+          "$value": "{lux.color.background.default}"
+        },
+        "border-color": {
+          "$type": "color",
+          "$value": "{lux.color.border.strong}"
+        },
+        "color": {
+          "$type": "color",
+          "$value": "{utrecht.checkbox.focus.border-color}"
+        },
+        "border-width": {
+          "$type": "borderWidth",
+          "$value": "{utrecht.checkbox.border-width}"
+        }
+      },
+      "invalid": {
+        "background-color": {
+          "$type": "color",
+          "$value": "{lux.color.feedback.error.subdued}"
+        },
+        "border-color": {
+          "$type": "color",
+          "$value": "{lux.color.feedback.error.default}"
+        },
+        "color": {
+          "$type": "color",
+          "$value": "{utrecht.checkbox.invalid.border-color}"
+        },
+        "border-width": {
+          "$type": "borderWidth",
+          "$value": "{utrecht.checkbox.border-width}"
+        }
+      },
+      "checked": {
+        "background-color": {
+          "$type": "color",
+          "$value": "{lux.color.brand.default}"
+        },
+        "border-color": {
+          "$type": "color",
+          "$value": "{lux.color.border.strong}"
+        },
+        "border-width": {
+          "$type": "borderWidth",
+          "$value": "{utrecht.checkbox.border-width}"
+        },
+        "color": {
+          "$type": "color",
+          "$value": "{lux.color.wit}"
+        }
+      },
+      "indeterminate": {
+        "background-color": {
+          "$type": "color",
+          "$value": "{lux.color.brand.default}"
+        },
+        "border-color": {
+          "$type": "color",
+          "$value": "{lux.color.border.strong}"
+        },
+        "border-width": {
+          "$type": "borderWidth",
+          "$value": "{utrecht.checkbox.border-width}"
+        },
+        "color": {
+          "$type": "color",
+          "$value": "{lux.color.wit}"
+        }
+      }
+    }
+  },
+  "todo": {
+    "checkbox": {
+      "checked": {
+        "focus": {
+          "border-width": {
+            "$type": "borderWidth",
+            "$value": "2px"
+          },
+          "background-color": {
+            "$type": "color",
+            "$value": "{utrecht.checkbox.checked.background-color}"
+          },
+          "border-color": {
+            "$type": "color",
+            "$value": "{utrecht.checkbox.checked.border-color}"
+          },
+          "color": {
+            "$type": "color",
+            "$value": "{utrecht.checkbox.checked.color}"
+          }
+        },
+        "hover": {
+          "border-width": {
+            "$type": "borderWidth",
+            "$value": "2px"
+          },
+          "background-color": {
+            "$type": "color",
+            "$value": "{lux.color.brand.hover}"
+          },
+          "border-color": {
+            "$type": "color",
+            "$value": "{lux.color.border.strong}"
+          },
+          "color": {
+            "$type": "color",
+            "$value": "{lux.color.wit}"
+          }
+        },
+        "active": {
+          "border-width": {
+            "$type": "borderWidth",
+            "$value": "1.5px"
+          },
+          "background-color": {
+            "$type": "color",
+            "$value": "{lux.color.brand.hover}"
+          },
+          "border-color": {
+            "$type": "color",
+            "$value": "{lux.color.border.strong}"
+          },
+          "color": {
+            "$type": "color",
+            "$value": "{lux.color.wit}"
+          }
+        },
+        "disabled": {
+          "background-color": {
+            "$type": "color",
+            "$value": "{lux.color.background.subdued}"
+          },
+          "border-color": {
+            "$type": "color",
+            "$value": "{lux.color.border.subdued}"
+          },
+          "color": {
+            "$type": "color",
+            "$value": "{lux.color.foreground.subdued}"
+          }
+        }
+      },
+      "indeterminate": {
+        "active": {
+          "border-width": {
+            "$type": "borderWidth",
+            "$value": "1.5px"
+          },
+          "background-color": {
+            "$type": "color",
+            "$value": "{todo.checkbox.checked.active.background-color}"
+          },
+          "border-color": {
+            "$type": "color",
+            "$value": "{todo.checkbox.checked.active.border-color}"
+          },
+          "color": {
+            "$type": "color",
+            "$value": "{todo.checkbox.checked.active.color}"
+          }
+        },
+        "hover": {
+          "border-width": {
+            "$type": "borderWidth",
+            "$value": "2px"
+          },
+          "background-color": {
+            "$type": "color",
+            "$value": "{todo.checkbox.checked.hover.background-color}"
+          },
+          "border-color": {
+            "$type": "color",
+            "$value": "transparent"
+          },
+          "color": {
+            "$type": "color",
+            "$value": "{todo.checkbox.checked.hover.color}"
+          }
+        },
+        "focus": {
+          "border-width": {
+            "$type": "borderWidth",
+            "$value": "2px"
+          },
+          "background-color": {
+            "$type": "color",
+            "$value": "{todo.checkbox.checked.focus.background-color}"
+          },
+          "border-color": {
+            "$type": "color",
+            "$value": "{todo.checkbox.checked.focus.border-color}"
+          },
+          "color": {
+            "$type": "color",
+            "$value": "{todo.checkbox.checked.focus.color}"
+          }
+        },
+        "disabled": {
+          "background-color": {
+            "$type": "color",
+            "$value": "{todo.checkbox.checked.disabled.background-color}"
+          },
+          "border-color": {
+            "$type": "color",
+            "$value": "{todo.checkbox.checked.disabled.border-color}"
+          },
+          "color": {
+            "$type": "color",
+            "$value": "{todo.checkbox.checked.disabled.color}"
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/proprietary/design-tokens/src/imported/nl/utrecht-document.json b/proprietary/design-tokens/src/imported/nl/utrecht-document.json
index bb64682ac..9d146b077 100644
--- a/proprietary/design-tokens/src/imported/nl/utrecht-document.json
+++ b/proprietary/design-tokens/src/imported/nl/utrecht-document.json
@@ -2,28 +2,28 @@
   "utrecht": {
     "document": {
       "font-family": {
-        "value": "{lux.font-family.primary}",
-        "type": "fontFamilies"
+        "$type": "fontFamilies",
+        "$value": "{lux.font-family.primary}"
       },
       "color": {
-        "value": "{lux.color.foreground.default}",
-        "type": "color"
+        "$type": "color",
+        "$value": "{lux.color.foreground.default}"
       },
       "font-weight": {
-        "value": "{lux.font-weight.regular}",
-        "type": "fontWeights"
+        "$type": "fontWeights",
+        "$value": "{lux.font-weight.regular}"
       },
       "line-height": {
-        "value": "{lux.line-height.body.default}",
-        "type": "lineHeights"
+        "$type": "lineHeights",
+        "$value": "{lux.line-height.body.default}"
       },
       "font-size": {
-        "value": "{lux.font-size.body.default}",
-        "type": "fontSizes"
+        "$type": "fontSizes",
+        "$value": "{lux.font-size.body.default}"
       },
       "background-color": {
-        "value": "{lux.color.background.default}",
-        "type": "color"
+        "$type": "color",
+        "$value": "{lux.color.background.default}"
       }
     }
   }
diff --git a/proprietary/design-tokens/src/imported/nl/utrecht-focus.json b/proprietary/design-tokens/src/imported/nl/utrecht-focus.json
index 0abf1ac8b..c7eb196bc 100644
--- a/proprietary/design-tokens/src/imported/nl/utrecht-focus.json
+++ b/proprietary/design-tokens/src/imported/nl/utrecht-focus.json
@@ -2,25 +2,25 @@
   "utrecht": {
     "focus": {
       "outline-color": {
-        "value": "{lux.color.focus.outline}",
-        "type": "color"
+        "$type": "color",
+        "$value": "{lux.color.focus.outline}"
       },
       "outline-offset": {
-        "value": "{lux.focus.outline-offset}",
-        "type": "spacing"
+        "$type": "spacing",
+        "$value": "{lux.focus.outline-offset}"
       },
       "outline-style": {
-        "value": "{lux.focus.outline.style}",
-        "type": "other"
+        "$type": "other",
+        "$value": "{lux.focus.outline.style}"
       },
       "outline-width": {
-        "value": "{lux.focus.outline-width}",
-        "type": "borderWidth"
+        "$type": "borderWidth",
+        "$value": "{lux.focus.outline-width}"
       },
       "inverse": {
         "outline-color": {
-          "value": "transparant",
-          "type": "color"
+          "$type": "color",
+          "$value": "transparant"
         }
       }
     }
diff --git a/proprietary/design-tokens/src/imported/nl/utrecht-form-field-description.json b/proprietary/design-tokens/src/imported/nl/utrecht-form-field-description.json
index ffb5e5a4d..109075d73 100644
--- a/proprietary/design-tokens/src/imported/nl/utrecht-form-field-description.json
+++ b/proprietary/design-tokens/src/imported/nl/utrecht-form-field-description.json
@@ -2,41 +2,41 @@
   "utrecht": {
     "form-field-description": {
       "color": {
-        "type": "color",
-        "value": "{lux.color.foreground.subdued}"
+        "$type": "color",
+        "$value": "{lux.color.foreground.subdued}"
       },
       "font-family": {
-        "value": "{lux.font-family.primary}",
-        "type": "fontFamilies"
+        "$type": "fontFamilies",
+        "$value": "{lux.font-family.primary}"
       },
       "font-size": {
-        "value": "{lux.font-size.body.default}",
-        "type": "fontSizes"
+        "$type": "fontSizes",
+        "$value": "{lux.font-size.body.default}"
       },
       "line-height": {
-        "value": "{lux.line-height.body.default}",
-        "type": "lineHeights"
+        "$type": "lineHeights",
+        "$value": "{lux.line-height.body.default}"
       },
       "invalid": {
         "color": {
-          "value": "{lux.color.foreground.subdued}",
-          "type": "color",
-          "description": "Checkvraag dev: bestaat deze echt in code? "
+          "$type": "color",
+          "$value": "{lux.color.foreground.subdued}",
+          "$description": "Checkvraag dev: bestaat deze echt in code? "
         }
       },
       "valid": {
         "color": {
-          "value": "{lux.color.foreground.subdued}",
-          "type": "color",
-          "description": "Checkvraag dev: bestaat deze echt in code? "
+          "$type": "color",
+          "$value": "{lux.color.foreground.subdued}",
+          "$description": "Checkvraag dev: bestaat deze echt in code? "
         }
       }
     },
     "invalid": {
       "font-weight": {
-        "value": "{no-token}",
-        "type": "fontWeights",
-        "description": "Controle vraag aan devs: bestaat deze echt in utrecht code?"
+        "$type": "fontWeights",
+        "$value": "{no-token}",
+        "$description": "Controle vraag aan devs: bestaat deze echt in utrecht code?"
       }
     }
   }
diff --git a/proprietary/design-tokens/src/imported/nl/utrecht-form-field-error-message.json b/proprietary/design-tokens/src/imported/nl/utrecht-form-field-error-message.json
index 55f4fe76a..433cfc79c 100644
--- a/proprietary/design-tokens/src/imported/nl/utrecht-form-field-error-message.json
+++ b/proprietary/design-tokens/src/imported/nl/utrecht-form-field-error-message.json
@@ -3,77 +3,77 @@
     "form-field-error-message": {
       "icon": {
         "size": {
-          "type": "sizing",
-          "value": "1.5rem"
+          "$type": "sizing",
+          "$value": "1.5rem"
         },
         "color": {
-          "value": "{lux.color.feedback.error.default}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.feedback.error.default}"
         }
       },
       "color": {
-        "type": "color",
-        "value": "{lux.color.feedback.error.default}"
+        "$type": "color",
+        "$value": "{lux.color.feedback.error.default}"
       },
       "font-family": {
-        "value": "{lux.font-family.primary}",
-        "type": "fontFamilies"
+        "$type": "fontFamilies",
+        "$value": "{lux.font-family.primary}"
       },
       "font-size": {
-        "value": "{lux.font-size.body.default}",
-        "type": "fontSizes"
+        "$type": "fontSizes",
+        "$value": "{lux.font-size.body.default}"
       },
       "font-weight": {
-        "value": "{lux.font-weight.regular}",
-        "type": "fontWeights"
+        "$type": "fontWeights",
+        "$value": "{lux.font-weight.regular}"
       },
       "background-color": {
-        "value": "{lux.color.none}",
-        "type": "color"
+        "$type": "color",
+        "$value": "{lux.color.none}"
       },
       "border-radius": {
-        "value": "{lux.border-radius.default}",
-        "type": "borderRadius",
-        "description": "todo token"
+        "$type": "borderRadius",
+        "$value": "{lux.border-radius.default}",
+        "$description": "todo token"
       },
       "padding-block-end": {
-        "value": "{lux.space.0}",
-        "type": "spacing"
+        "$type": "spacing",
+        "$value": "{lux.space.0}"
       },
       "padding-block-start": {
-        "value": "{lux.space.0}",
-        "type": "spacing"
+        "$type": "spacing",
+        "$value": "{lux.space.0}"
       },
       "padding-inline-end": {
-        "value": "{lux.space.0}",
-        "type": "spacing"
+        "$type": "spacing",
+        "$value": "{lux.space.0}"
       },
       "padding-inline-start": {
-        "value": "{lux.space.0}",
-        "type": "spacing"
+        "$type": "spacing",
+        "$value": "{lux.space.0}"
       },
       "column-gap": {
-        "value": "{lux.space.100}",
-        "type": "spacing"
+        "$type": "spacing",
+        "$value": "{lux.space.100}"
       },
       "line-height": {
-        "value": "{lux.line-height.body.default}",
-        "type": "lineHeights"
+        "$type": "lineHeights",
+        "$value": "{lux.line-height.body.default}"
       },
       "border-width": {
-        "value": "{lux.alert.border-width}",
-        "type": "borderWidth"
+        "$type": "borderWidth",
+        "$value": "{lux.alert.border-width}"
       },
       "border-color": {
-        "value": "{lux.color.none}",
-        "type": "color"
+        "$type": "color",
+        "$value": "{lux.color.none}"
       }
     },
     "alert": {
       "icon": {
         "inset-block-start": {
-          "value": "{lux.space.25}",
-          "type": "spacing"
+          "$type": "spacing",
+          "$value": "{lux.space.25}"
         }
       }
     }
diff --git a/proprietary/design-tokens/src/imported/nl/utrecht-form-field.json b/proprietary/design-tokens/src/imported/nl/utrecht-form-field.json
index b0dd5a41a..0c0f44451 100644
--- a/proprietary/design-tokens/src/imported/nl/utrecht-form-field.json
+++ b/proprietary/design-tokens/src/imported/nl/utrecht-form-field.json
@@ -3,21 +3,21 @@
     "form-field": {
       "invalid": {
         "border-inline-start-color": {
-          "value": "{lux.color.feedback.error.default}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.feedback.error.default}"
         },
         "border-inline-start-width": {
-          "value": "{lux.border-width.m}",
-          "type": "borderWidth"
+          "$type": "borderWidth",
+          "$value": "{lux.border-width.m}"
         },
         "padding-inline-start": {
-          "value": "{lux.space.200}",
-          "type": "spacing"
+          "$type": "spacing",
+          "$value": "{lux.space.200}"
         }
       },
       "row-gap": {
-        "value": "{lux.space.100}",
-        "type": "spacing"
+        "$type": "spacing",
+        "$value": "{lux.space.100}"
       }
     }
   }
diff --git a/proprietary/design-tokens/src/imported/nl/utrecht-form-label.json b/proprietary/design-tokens/src/imported/nl/utrecht-form-label.json
index 3417a44b9..3c3c3b116 100644
--- a/proprietary/design-tokens/src/imported/nl/utrecht-form-label.json
+++ b/proprietary/design-tokens/src/imported/nl/utrecht-form-label.json
@@ -2,47 +2,47 @@
   "utrecht": {
     "form-label": {
       "color": {
-        "value": "{lux.color.foreground.default}",
-        "type": "color"
+        "$type": "color",
+        "$value": "{lux.color.foreground.default}"
       },
       "font-weight": {
-        "value": "{lux.font-weight.bold}",
-        "type": "fontWeights"
+        "$type": "fontWeights",
+        "$value": "{lux.font-weight.bold}"
       },
       "font-size": {
-        "value": "{lux.font-size.body.default}",
-        "type": "fontSizes"
+        "$type": "fontSizes",
+        "$value": "{lux.font-size.body.default}"
       },
       "checkbox": {
         "font-weight": {
-          "value": "{lux.font-weight.bold}",
-          "type": "fontWeights"
+          "$type": "fontWeights",
+          "$value": "{lux.font-weight.bold}"
         },
         "color": {
-          "value": "{lux.color.foreground.default}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.foreground.default}"
         }
       },
       "checked": {
         "font-weight": {
-          "value": "{lux.font-weight.bold}",
-          "type": "fontWeights"
+          "$type": "fontWeights",
+          "$value": "{lux.font-weight.bold}"
         }
       },
       "disabled": {
         "color": {
-          "value": "{lux.color.foreground.subdued}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.foreground.subdued}"
         }
       },
       "radio": {
         "color": {
-          "value": "{lux.color.foreground.default}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.foreground.default}"
         },
         "font-weight": {
-          "value": "{lux.font-weight.bold}",
-          "type": "fontWeights"
+          "$type": "fontWeights",
+          "$value": "{lux.font-weight.bold}"
         }
       }
     }
diff --git a/proprietary/design-tokens/src/imported/nl/utrecht-heading.json b/proprietary/design-tokens/src/imported/nl/utrecht-heading.json
index 889ea9fd7..e0dc73b38 100644
--- a/proprietary/design-tokens/src/imported/nl/utrecht-heading.json
+++ b/proprietary/design-tokens/src/imported/nl/utrecht-heading.json
@@ -2,134 +2,134 @@
   "utrecht": {
     "heading-1": {
       "color": {
-        "value": "{lux.color.brand.default}",
-        "type": "color"
+        "$type": "color",
+        "$value": "{lux.color.brand.default}"
       },
       "font-family": {
-        "value": "{lux.font-family.primary}",
-        "type": "fontFamilies"
+        "$type": "fontFamilies",
+        "$value": "{lux.font-family.primary}"
       },
       "font-weight": {
-        "value": "{lux.font-weight.bold}",
-        "type": "fontWeights"
+        "$type": "fontWeights",
+        "$value": "{lux.font-weight.bold}"
       },
       "line-height": {
-        "value": "{lux.line-height.heading.level-1}",
-        "type": "lineHeights"
+        "$type": "lineHeights",
+        "$value": "{lux.line-height.heading.level-1}"
       },
       "font-size": {
-        "value": "{lux.font-size.heading.level-1}",
-        "type": "fontSizes"
+        "$type": "fontSizes",
+        "$value": "{lux.font-size.heading.level-1}"
       }
     },
     "heading-2": {
       "color": {
-        "value": "{lux.color.brand.default}",
-        "type": "color"
+        "$type": "color",
+        "$value": "{lux.color.brand.default}"
       },
       "font-family": {
-        "value": "{lux.font-family.primary}",
-        "type": "fontFamilies"
+        "$type": "fontFamilies",
+        "$value": "{lux.font-family.primary}"
       },
       "font-weight": {
-        "value": "{lux.font-weight.bold}",
-        "type": "fontWeights"
+        "$type": "fontWeights",
+        "$value": "{lux.font-weight.bold}"
       },
       "line-height": {
-        "value": "{lux.line-height.heading.level-2}",
-        "type": "lineHeights"
+        "$type": "lineHeights",
+        "$value": "{lux.line-height.heading.level-2}"
       },
       "font-size": {
-        "value": "{lux.font-size.heading.level-2}",
-        "type": "fontSizes"
+        "$type": "fontSizes",
+        "$value": "{lux.font-size.heading.level-2}"
       }
     },
     "heading-3": {
       "color": {
-        "value": "{lux.color.brand.default}",
-        "type": "color"
+        "$type": "color",
+        "$value": "{lux.color.brand.default}"
       },
       "font-family": {
-        "value": "{lux.font-family.primary}",
-        "type": "fontFamilies"
+        "$type": "fontFamilies",
+        "$value": "{lux.font-family.primary}"
       },
       "font-weight": {
-        "value": "{lux.font-weight.bold}",
-        "type": "fontWeights"
+        "$type": "fontWeights",
+        "$value": "{lux.font-weight.bold}"
       },
       "line-height": {
-        "value": "{lux.line-height.heading.level-3}",
-        "type": "lineHeights"
+        "$type": "lineHeights",
+        "$value": "{lux.line-height.heading.level-3}"
       },
       "font-size": {
-        "value": "{viewport.font-size.heading.level-3}",
-        "type": "fontSizes"
+        "$type": "fontSizes",
+        "$value": "{viewport.font-size.heading.level-3}"
       }
     },
     "heading-4": {
       "color": {
-        "value": "{lux.color.brand.default}",
-        "type": "color"
+        "$type": "color",
+        "$value": "{lux.color.brand.default}"
       },
       "font-family": {
-        "value": "{lux.font-family.primary}",
-        "type": "fontFamilies"
+        "$type": "fontFamilies",
+        "$value": "{lux.font-family.primary}"
       },
       "font-weight": {
-        "value": "{lux.font-weight.bold}",
-        "type": "fontWeights"
+        "$type": "fontWeights",
+        "$value": "{lux.font-weight.bold}"
       },
       "line-height": {
-        "value": "{lux.line-height.heading.level-4}",
-        "type": "lineHeights"
+        "$type": "lineHeights",
+        "$value": "{lux.line-height.heading.level-4}"
       },
       "font-size": {
-        "value": "{lux.font-size.heading.level-4}",
-        "type": "fontSizes"
+        "$type": "fontSizes",
+        "$value": "{lux.font-size.heading.level-4}"
       }
     },
     "heading-5": {
       "color": {
-        "value": "{lux.color.brand.default}",
-        "type": "color"
+        "$type": "color",
+        "$value": "{lux.color.brand.default}"
       },
       "font-family": {
-        "value": "{lux.font-family.primary}",
-        "type": "fontFamilies"
+        "$type": "fontFamilies",
+        "$value": "{lux.font-family.primary}"
       },
       "font-weight": {
-        "value": "{lux.font-weight.bold}",
-        "type": "fontWeights"
+        "$type": "fontWeights",
+        "$value": "{lux.font-weight.bold}"
       },
       "line-height": {
-        "value": "{lux.line-height.heading.level-5}",
-        "type": "lineHeights"
+        "$type": "lineHeights",
+        "$value": "{lux.line-height.heading.level-5}"
       },
       "font-size": {
-        "value": "{lux.font-size.heading.level-5}",
-        "type": "fontSizes"
+        "$type": "fontSizes",
+        "$value": "{lux.font-size.heading.level-5}"
       }
     },
     "heading-6": {
       "color": {
-        "value": "{lux.color.brand.default}",
-        "type": "color"
+        "$type": "color",
+        "$value": "{lux.color.brand.default}"
       },
       "font-family": {
-        "value": "{lux.font-family.primary}",
-        "type": "fontFamilies"
+        "$type": "fontFamilies",
+        "$value": "{lux.font-family.primary}"
       },
       "font-weight": {
-        "value": "{lux.font-weight.bold}",
-        "type": "fontWeights"
+        "$type": "fontWeights",
+        "$value": "{lux.font-weight.bold}"
       },
       "line-height": {
-        "value": "{lux.line-height.heading.level-5}",
-        "type": "lineHeights"
+        "$type": "lineHeights",
+        "$value": "{lux.line-height.heading.level-5}"
       },
       "font-size": {
-        "value": "{lux.font-size.heading.level-5}",
-        "type": "fontSizes"
+        "$type": "fontSizes",
+        "$value": "{lux.font-size.heading.level-5}"
       }
     }
   }
diff --git a/proprietary/design-tokens/src/imported/nl/utrecht-link.json b/proprietary/design-tokens/src/imported/nl/utrecht-link.json
index 5f4ff99c9..896cbd721 100644
--- a/proprietary/design-tokens/src/imported/nl/utrecht-link.json
+++ b/proprietary/design-tokens/src/imported/nl/utrecht-link.json
@@ -2,98 +2,98 @@
   "utrecht": {
     "link": {
       "color": {
-        "type": "color",
-        "value": "{lux.link.color}"
+        "$type": "color",
+        "$value": "{lux.link.color}"
       },
       "text-decoration-color": {
-        "type": "color",
-        "value": "{lux.link.color}"
+        "$type": "color",
+        "$value": "{lux.link.color}"
       },
       "text-decoration-thickness": {
-        "type": "other",
-        "value": "auto"
+        "$type": "other",
+        "$value": "auto"
       },
       "text-underline-offset": {
-        "type": "other",
-        "value": "auto"
+        "$type": "other",
+        "$value": "auto"
       },
       "active": {
         "color": {
-          "type": "color",
-          "value": "{lux.link.active.color}"
+          "$type": "color",
+          "$value": "{lux.link.active.color}"
         },
         "text-decoration": {
-          "value": "{lux.link.active.text-decoration}",
-          "type": "textDecoration"
+          "$type": "textDecoration",
+          "$value": "{lux.link.active.text-decoration}"
         }
       },
       "focus": {
         "color": {
-          "type": "color",
-          "value": "{lux.link.focus.color}"
+          "$type": "color",
+          "$value": "{lux.link.focus.color}"
         },
         "text-decoration-thickness": {
-          "type": "other",
-          "value": "auto"
+          "$type": "other",
+          "$value": "auto"
         },
         "background-color": {
-          "value": "{lux.link.focus.background-color}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.link.focus.background-color}"
         },
         "text-decoration": {
-          "value": "{lux.link.focus.text-decoration}",
-          "type": "textDecoration"
+          "$type": "textDecoration",
+          "$value": "{lux.link.focus.text-decoration}"
         }
       },
       "hover": {
         "color": {
-          "type": "color",
-          "value": "{lux.link.hover.color}"
+          "$type": "color",
+          "$value": "{lux.link.hover.color}"
         },
         "text-decoration-thickness": {
-          "type": "other",
-          "value": "auto"
+          "$type": "other",
+          "$value": "auto"
         },
         "text-decoration": {
-          "value": "{lux.link.hover.text-decoration}",
-          "type": "textDecoration"
+          "$type": "textDecoration",
+          "$value": "{lux.link.hover.text-decoration}"
         }
       },
       "font-weight": {
-        "type": "fontWeights",
-        "value": "{lux.link.font-weight}"
+        "$type": "fontWeights",
+        "$value": "{lux.link.font-weight}"
       },
       "visited": {
         "color": {
-          "type": "color",
-          "value": "{lux.link.visited.color}"
+          "$type": "color",
+          "$value": "{lux.link.visited.color}"
         }
       },
       "icon": {
         "size": {
-          "type": "sizing",
-          "value": "{lux.link.icon.size}"
+          "$type": "sizing",
+          "$value": "{lux.link.icon.size}"
         }
       },
       "font-family": {
-        "value": "{lux.link.font-family}",
-        "type": "fontFamilies"
+        "$type": "fontFamilies",
+        "$value": "{lux.link.font-family}"
       },
       "line-height": {
-        "value": "{lux.link.line-height}",
-        "type": "lineHeights"
+        "$type": "lineHeights",
+        "$value": "{lux.link.line-height}"
       },
       "font-size": {
-        "value": "{lux.link.font-size}",
-        "type": "fontSizes"
+        "$type": "fontSizes",
+        "$value": "{lux.link.font-size}"
       },
       "text-decoration": {
-        "value": "{lux.link.text-decoration}",
-        "type": "textDecoration"
+        "$type": "textDecoration",
+        "$value": "{lux.link.text-decoration}"
       },
       "column-gap": {
-        "value": "{lux.link.column-gap}",
-        "type": "spacing"
+        "$type": "spacing",
+        "$value": "{lux.link.column-gap}"
       }
     }
   }
diff --git a/proprietary/design-tokens/src/imported/nl/utrecht-paragraph.json b/proprietary/design-tokens/src/imported/nl/utrecht-paragraph.json
index 0f188de15..fe3494e4f 100644
--- a/proprietary/design-tokens/src/imported/nl/utrecht-paragraph.json
+++ b/proprietary/design-tokens/src/imported/nl/utrecht-paragraph.json
@@ -2,67 +2,67 @@
   "utrecht": {
     "paragraph": {
       "color": {
-        "value": "{lux.paragraph.color}",
-        "type": "color"
+        "$type": "color",
+        "$value": "{lux.paragraph.color}"
       },
       "font-family": {
-        "value": "{lux.paragraph.font-family}",
-        "type": "fontFamilies"
+        "$type": "fontFamilies",
+        "$value": "{lux.paragraph.font-family}"
       },
       "font-size": {
-        "value": "{lux.paragraph.default.font-size}",
-        "type": "fontSizes"
+        "$type": "fontSizes",
+        "$value": "{lux.paragraph.default.font-size}"
       },
       "font-weight": {
-        "value": "{lux.paragraph.font-weight}",
-        "type": "fontWeights"
+        "$type": "fontWeights",
+        "$value": "{lux.paragraph.font-weight}"
       },
       "line-height": {
-        "value": "{lux.paragraph.default.line-height}",
-        "type": "lineHeights"
+        "$type": "lineHeights",
+        "$value": "{lux.paragraph.default.line-height}"
       },
       "margin-block-end": {
-        "value": "{lux.space.0}",
-        "type": "spacing"
+        "$type": "spacing",
+        "$value": "{lux.space.0}"
       },
       "margin-block-start": {
-        "value": "{lux.space.0}",
-        "type": "spacing"
+        "$type": "spacing",
+        "$value": "{lux.space.0}"
       },
       "lead": {
         "color": {
-          "value": "{lux.paragraph.color}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.paragraph.color}"
         },
         "font-size": {
-          "value": "{lux.paragraph.lead.font-size}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{lux.paragraph.lead.font-size}"
         },
         "font-weight": {
-          "value": "{lux.paragraph.font-weight}",
-          "type": "fontWeights"
+          "$type": "fontWeights",
+          "$value": "{lux.paragraph.font-weight}"
         },
         "line-height": {
-          "value": "{lux.paragraph.lead.line-height}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{lux.paragraph.lead.line-height}"
         }
       },
       "small": {
         "color": {
-          "value": "{lux.paragraph.color}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.paragraph.color}"
         },
         "font-size": {
-          "value": "{lux.paragraph.small.font-size}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{lux.paragraph.small.font-size}"
         },
         "font-weight": {
-          "value": "{lux.paragraph.font-weight}",
-          "type": "fontWeights"
+          "$type": "fontWeights",
+          "$value": "{lux.paragraph.font-weight}"
         },
         "line-height": {
-          "value": "{lux.paragraph.small.line-height}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{lux.paragraph.small.line-height}"
         }
       }
     }
diff --git a/proprietary/design-tokens/src/imported/nl/utrecht-pointer-target.json b/proprietary/design-tokens/src/imported/nl/utrecht-pointer-target.json
index 944cc6d68..93bb5c0a3 100644
--- a/proprietary/design-tokens/src/imported/nl/utrecht-pointer-target.json
+++ b/proprietary/design-tokens/src/imported/nl/utrecht-pointer-target.json
@@ -2,8 +2,8 @@
   "utrecht": {
     "pointer-target": {
       "min-size": {
-        "value": "{lux.size.target}",
-        "type": "sizing"
+        "$type": "sizing",
+        "$value": "{lux.size.target}"
       }
     }
   }
diff --git a/proprietary/design-tokens/src/imported/nl/utrecht-pre-heading.json b/proprietary/design-tokens/src/imported/nl/utrecht-pre-heading.json
index fe2a0b7ad..a81f0d488 100644
--- a/proprietary/design-tokens/src/imported/nl/utrecht-pre-heading.json
+++ b/proprietary/design-tokens/src/imported/nl/utrecht-pre-heading.json
@@ -2,24 +2,24 @@
   "utrecht": {
     "pre-heading": {
       "color": {
-        "value": "{lux.color.foreground.default}",
-        "type": "color"
+        "$type": "color",
+        "$value": "{lux.color.foreground.default}"
       },
       "font-family": {
-        "value": "{lux.font-family.primary}",
-        "type": "fontFamilies"
+        "$type": "fontFamilies",
+        "$value": "{lux.font-family.primary}"
       },
       "font-weight": {
-        "value": "{lux.font-weight.bold}",
-        "type": "fontWeights"
+        "$type": "fontWeights",
+        "$value": "{lux.font-weight.bold}"
       },
       "line-height": {
-        "value": "{lux.line-height.body.default}",
-        "type": "lineHeights"
+        "$type": "lineHeights",
+        "$value": "{lux.line-height.body.default}"
       },
       "font-size": {
-        "value": "{lux.font-size.body.default}",
-        "type": "fontSizes"
+        "$type": "fontSizes",
+        "$value": "{lux.font-size.body.default}"
       }
     }
   }
diff --git a/proprietary/design-tokens/src/imported/nl/utrecht-text-input.json b/proprietary/design-tokens/src/imported/nl/utrecht-text-input.json
index 3421d8e1b..ab3fe4bef 100644
--- a/proprietary/design-tokens/src/imported/nl/utrecht-text-input.json
+++ b/proprietary/design-tokens/src/imported/nl/utrecht-text-input.json
@@ -2,144 +2,144 @@
   "utrecht": {
     "textbox": {
       "border-radius": {
-        "type": "borderRadius",
-        "value": "{lux.border-radius.default}"
+        "$type": "borderRadius",
+        "$value": "{lux.border-radius.default}"
       },
       "font-family": {
-        "value": "{lux.font-family.primary}",
-        "type": "fontFamilies"
+        "$type": "fontFamilies",
+        "$value": "{lux.font-family.primary}"
       },
       "font-size": {
-        "value": "{lux.font-size.body.default}",
-        "type": "fontSizes"
+        "$type": "fontSizes",
+        "$value": "{lux.font-size.body.default}"
       },
       "font-weight": {
-        "value": "{lux.font-weight.regular}",
-        "type": "fontWeights"
+        "$type": "fontWeights",
+        "$value": "{lux.font-weight.regular}"
       },
       "line-height": {
-        "value": "{lux.line-height.body.default}",
-        "type": "lineHeights"
+        "$type": "lineHeights",
+        "$value": "{lux.line-height.body.default}"
       },
       "max-inline-size": {
-        "value": "400px",
-        "type": "sizing"
+        "$type": "sizing",
+        "$value": "400px"
       },
       "padding-block-end": {
-        "value": "{lux.space.100}",
-        "type": "spacing"
+        "$type": "spacing",
+        "$value": "{lux.space.100}"
       },
       "padding-block-start": {
-        "value": "{lux.space.100}",
-        "type": "spacing"
+        "$type": "spacing",
+        "$value": "{lux.space.100}"
       },
       "padding-inline-end": {
-        "value": "{lux.space.200}",
-        "type": "spacing"
+        "$type": "spacing",
+        "$value": "{lux.space.200}"
       },
       "padding-inline-start": {
-        "value": "{lux.space.200}",
-        "type": "spacing"
+        "$type": "spacing",
+        "$value": "{lux.space.200}"
       },
       "background-color": {
-        "value": "{lux.color.background.default}",
-        "type": "color"
+        "$type": "color",
+        "$value": "{lux.color.background.default}"
       },
       "border-color": {
-        "value": "{lux.color.border.strong}",
-        "type": "color"
+        "$type": "color",
+        "$value": "{lux.color.border.strong}"
       },
       "color": {
-        "value": "{lux.color.foreground.default}",
-        "type": "color"
+        "$type": "color",
+        "$value": "{lux.color.foreground.default}"
       },
       "invalid": {
         "background-color": {
-          "value": "{lux.color.background.default}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.background.default}"
         },
         "border-color": {
-          "value": "{lux.color.border.strong}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.border.strong}"
         },
         "color": {
-          "value": "{lux.color.foreground.default}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.foreground.default}"
         },
         "border-width": {
-          "value": "{lux.border-width.default}",
-          "type": "borderWidth"
+          "$type": "borderWidth",
+          "$value": "{lux.border-width.default}"
         }
       },
       "placeholder": {
         "color": {
-          "value": "{lux.color.foreground.subdued}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.foreground.subdued}"
         }
       },
       "border-block-end-width": {
-        "value": "{lux.border-width.default}",
-        "type": "borderWidth"
+        "$type": "borderWidth",
+        "$value": "{lux.border-width.default}"
       },
       "border-width": {
-        "value": "{lux.border-width.default}",
-        "type": "borderWidth"
+        "$type": "borderWidth",
+        "$value": "{lux.border-width.default}"
       },
       "focus": {
         "border-width": {
-          "value": "{lux.border-width.m}",
-          "type": "borderWidth"
+          "$type": "borderWidth",
+          "$value": "{lux.border-width.m}"
         },
         "background-color": {
-          "value": "{lux.color.background.default}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.background.default}"
         },
         "border-color": {
-          "value": "{lux.color.border.strong}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.border.strong}"
         },
         "color": {
-          "value": "{lux.color.foreground.default}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.foreground.default}"
         }
       },
       "disabled": {
         "background-color": {
-          "value": "{lux.color.background.subdued}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.background.subdued}"
         },
         "border-color": {
-          "value": "{lux.color.border.subdued}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.border.subdued}"
         },
         "color": {
-          "value": "{lux.color.foreground.subdued}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.foreground.subdued}"
         }
       },
       "read-only": {
         "background-color": {
-          "value": "{lux.color.grijs.100}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.grijs.100}"
         },
         "border-color": {
-          "value": "{lux.color.none}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.none}"
         },
         "color": {
-          "value": "{lux.color.foreground.default}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.foreground.default}"
         }
       },
       "hover": {
         "border-width": {
-          "value": "{lux.border-width.default}",
-          "type": "borderWidth"
+          "$type": "borderWidth",
+          "$value": "{lux.border-width.default}"
         }
       },
       "min-block-size": {
-        "value": "{lux.size.target}",
-        "type": "sizing"
+        "$type": "sizing",
+        "$value": "{lux.size.target}"
       }
     }
   },
@@ -147,16 +147,16 @@
     "textbox": {
       "hover": {
         "background-color": {
-          "value": "{lux.color.background.default}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.background.default}"
         },
         "border-color": {
-          "value": "{lux.color.border.strong}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.border.strong}"
         },
         "color": {
-          "value": "{lux.color.foreground.default}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.foreground.default}"
         }
       }
     }
diff --git a/proprietary/design-tokens/src/imported/nl/utrecht-textarea.json b/proprietary/design-tokens/src/imported/nl/utrecht-textarea.json
index ca8f82b67..c9fcfc313 100644
--- a/proprietary/design-tokens/src/imported/nl/utrecht-textarea.json
+++ b/proprietary/design-tokens/src/imported/nl/utrecht-textarea.json
@@ -2,152 +2,152 @@
   "utrecht": {
     "textarea": {
       "max-inline-size": {
-        "value": "400px",
-        "type": "sizing"
+        "$type": "sizing",
+        "$value": "400px"
       },
       "padding-block-end": {
-        "value": "{lux.space.100}",
-        "type": "spacing"
+        "$type": "spacing",
+        "$value": "{lux.space.100}"
       },
       "padding-block-start": {
-        "value": "{lux.space.100}",
-        "type": "spacing"
+        "$type": "spacing",
+        "$value": "{lux.space.100}"
       },
       "padding-inline-end": {
-        "value": "{lux.space.200}",
-        "type": "spacing"
+        "$type": "spacing",
+        "$value": "{lux.space.200}"
       },
       "padding-inline-start": {
-        "value": "{lux.space.200}",
-        "type": "spacing"
+        "$type": "spacing",
+        "$value": "{lux.space.200}"
       },
       "background-color": {
-        "value": "{lux.color.background.default}",
-        "type": "color"
+        "$type": "color",
+        "$value": "{lux.color.background.default}"
       },
       "border-color": {
-        "value": "{lux.color.border.strong}",
-        "type": "color"
+        "$type": "color",
+        "$value": "{lux.color.border.strong}"
       },
       "color": {
-        "value": "{lux.color.foreground.default}",
-        "type": "color"
+        "$type": "color",
+        "$value": "{lux.color.foreground.default}"
       },
       "invalid": {
         "background-color": {
-          "value": "{lux.color.background.default}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.background.default}"
         },
         "border-color": {
-          "value": "{lux.color.feedback.error.default}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.feedback.error.default}"
         },
         "color": {
-          "value": "{lux.color.foreground.default}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.foreground.default}"
         },
         "border-width": {
-          "value": "{lux.border-width.default}",
-          "type": "borderWidth"
+          "$type": "borderWidth",
+          "$value": "{lux.border-width.default}"
         }
       },
       "placeholder": {
         "color": {
-          "value": "{lux.color.foreground.subdued}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.foreground.subdued}"
         }
       },
       "focus": {
         "background-color": {
-          "value": "{lux.color.background.default}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.background.default}"
         },
         "border-color": {
-          "value": "{lux.color.border.strong}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.border.strong}"
         },
         "color": {
-          "value": "{lux.color.foreground.default}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.foreground.default}"
         },
         "border-width": {
-          "value": "{lux.border-width.m}",
-          "type": "borderWidth"
+          "$type": "borderWidth",
+          "$value": "{lux.border-width.m}"
         }
       },
       "disabled": {
         "background-color": {
-          "value": "{lux.color.background.subdued}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.background.subdued}"
         },
         "border-color": {
-          "value": "{lux.color.border.subdued}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.border.subdued}"
         },
         "color": {
-          "value": "{lux.color.foreground.subdued}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.foreground.subdued}"
         }
       },
       "read-only": {
         "background-color": {
-          "value": "{lux.color.grijs.100}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.grijs.100}"
         },
         "border-color": {
-          "value": "{lux.color.none}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.none}"
         },
         "color": {
-          "value": "{lux.color.foreground.default}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.foreground.default}"
         }
       },
       "hover": {
         "background-color": {
-          "value": "{lux.color.background.default}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.background.default}"
         },
         "border-color": {
-          "value": "{lux.color.border.strong}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.border.strong}"
         },
         "color": {
-          "value": "{lux.color.foreground.default}",
-          "type": "color"
+          "$type": "color",
+          "$value": "{lux.color.foreground.default}"
         },
         "border-width": {
-          "value": "{lux.border-width.default}",
-          "type": "borderWidth"
+          "$type": "borderWidth",
+          "$value": "{lux.border-width.default}"
         }
       },
       "border-radius": {
-        "type": "borderRadius",
-        "value": "{lux.border-radius.default}"
+        "$type": "borderRadius",
+        "$value": "{lux.border-radius.default}"
       },
       "border-bottom-width": {
-        "value": "auto",
-        "type": "borderWidth"
+        "$type": "borderWidth",
+        "$value": "auto"
       },
       "border-width": {
-        "value": "{lux.border-width.default}",
-        "type": "borderWidth"
+        "$type": "borderWidth",
+        "$value": "{lux.border-width.default}"
       },
       "font-family": {
-        "value": "{lux.font-family.primary}",
-        "type": "fontFamilies"
+        "$type": "fontFamilies",
+        "$value": "{lux.font-family.primary}"
       },
       "font-weight": {
-        "value": "{lux.font-weight.regular}",
-        "type": "fontWeights"
+        "$type": "fontWeights",
+        "$value": "{lux.font-weight.regular}"
       },
       "line-height": {
-        "value": "{lux.line-height.body.default}",
-        "type": "lineHeights"
+        "$type": "lineHeights",
+        "$value": "{lux.line-height.body.default}"
       },
       "font-size": {
-        "value": "{lux.font-size.body.default}",
-        "type": "fontSizes"
+        "$type": "fontSizes",
+        "$value": "{lux.font-size.body.default}"
       }
     }
   }
diff --git a/proprietary/design-tokens/src/imported/product/DigiD.json b/proprietary/design-tokens/src/imported/product/DigiD.json
index 6ec37c90c..21b657e00 100644
--- a/proprietary/design-tokens/src/imported/product/DigiD.json
+++ b/proprietary/design-tokens/src/imported/product/DigiD.json
@@ -4,97 +4,97 @@
       "brand": {
         "default": {
           "parent": "product/DigiD",
-          "type": "color",
-          "value": "{lux.color.oranje.500}",
-          "description": "kleur van het product"
+          "$type": "color",
+          "$value": "{lux.color.oranje.500}",
+          "$description": "kleur van het product"
         },
         "subdued": {
           "parent": "product/DigiD",
-          "type": "color",
-          "value": "{lux.color.oranje.50}",
-          "description": "Subtiele kleur van het product"
+          "$type": "color",
+          "$value": "{lux.color.oranje.50}",
+          "$description": "Subtiele kleur van het product"
         },
         "hover": {
           "parent": "product/DigiD",
-          "type": "color",
-          "value": "{lux.color.oranje.700}",
-          "description": "Hover kleur van het product"
+          "$type": "color",
+          "$value": "{lux.color.oranje.700}",
+          "$description": "Hover kleur van het product"
         }
       }
     },
     "border-radius": {
       "default": {
         "parent": "product/DigiD",
-        "type": "borderRadius",
-        "value": "4px"
+        "$type": "borderRadius",
+        "$value": "4px"
       }
     },
     "focus": {
       "outline-width": {
         "parent": "product/DigiD",
-        "type": "borderWidth",
-        "value": "2px"
+        "$type": "borderWidth",
+        "$value": "2px"
       },
       "outline": {
         "style": {
-          "type": "other",
-          "value": "solid"
+          "$type": "other",
+          "$value": "solid"
         }
       }
     },
     "font-family": {
       "primary": {
-        "type": "fontFamilies",
-        "value": "{ro.font-family.primary}"
+        "$type": "fontFamilies",
+        "$value": "{ro.font-family.primary}"
       }
     },
     "size": {
       "target": {
-        "type": "sizing",
-        "value": "3rem",
-        "description": "Gebruik deze als minimale hit erea. Bijvoorbeeld als min-height en min-width bij de button. "
+        "$type": "sizing",
+        "$value": "3rem",
+        "$description": "Gebruik deze als minimale hit erea. Bijvoorbeeld als min-height en min-width bij de button. "
       }
     },
     "font-size": {
       "body": {
         "small": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{viewport.font-size.body.small}"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.body.small}"
         },
         "default": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{viewport.font-size.body.default}"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.body.default}"
         },
         "large": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{viewport.font-size.body.large}"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.body.large}"
         }
       },
       "heading": {
         "level-1": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{viewport.font-size.heading.level-1}"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.heading.level-1}"
         },
         "level-2": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{viewport.font-size.heading.level-2}"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.heading.level-2}"
         },
         "level-3": {
-          "value": "{viewport.font-size.heading.level-3}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.heading.level-3}"
         },
         "level-4": {
-          "value": "{viewport.font-size.heading.level-4}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.heading.level-4}"
         },
         "level-5": {
-          "value": "{viewport.font-size.heading.level-4}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.heading.level-4}"
         }
       }
     },
@@ -102,42 +102,42 @@
       "body": {
         "small": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{viewport.line-height.body.small}"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.body.small}"
         },
         "default": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{viewport.line-height.body.default}"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.body.default}"
         },
         "large": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{viewport.line-height.body.large}"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.body.large}"
         }
       },
       "heading": {
         "level-1": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{viewport.line-height.heading.level-1}"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.heading.level-1}"
         },
         "level-2": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{viewport.line-height.heading.level-2}"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.heading.level-2}"
         },
         "level-3": {
-          "value": "{viewport.line-height.heading.level-3}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.heading.level-3}"
         },
         "level-4": {
-          "value": "{viewport.line-height.heading.level-4}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.heading.level-4}"
         },
         "level-5": {
-          "value": "{viewport.line-height.heading.level-4}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.heading.level-4}"
         }
       }
     }
@@ -146,21 +146,21 @@
     "focus": {
       "outline-radius": {
         "parent": "product/DigiD",
-        "type": "borderRadius",
-        "value": "6px"
+        "$type": "borderRadius",
+        "$value": "6px"
       }
     },
     "size": {
       "icon": {
         "wrapper-height": {
-          "value": "{figma.viewport.size.icon.wrapper-height}",
-          "type": "sizing"
+          "$type": "sizing",
+          "$value": "{figma.viewport.size.icon.wrapper-height}"
         }
       }
     },
     "product": {
-      "value": "DigiD",
-      "type": "text"
+      "$type": "text",
+      "$value": "DigiD"
     }
   },
   "product": {
@@ -168,73 +168,73 @@
       "secondary": {
         "background-color": {
           "parent": "product/DigiD",
-          "type": "color",
-          "value": "{lux.color.none}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.none}"
         },
         "border-color": {
           "parent": "product/DigiD",
-          "type": "color",
-          "value": "{lux.color.border.default}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.border.default}"
         },
         "color": {
           "parent": "product/DigiD",
-          "type": "color",
-          "value": "{lux.color.foreground.default}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.foreground.default}"
         },
         "hover": {
           "border-color": {
             "parent": "product/DigiD",
-            "type": "color",
-            "value": "{lux.color.border.default}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{lux.color.border.default}"
           },
           "color": {
             "parent": "product/DigiD",
-            "type": "color",
-            "value": "{lux.color.foreground.default}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{lux.color.foreground.default}"
           },
           "background-color": {
             "parent": "product/DigiD",
-            "type": "color",
-            "value": "{lux.color.background.hover}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{lux.color.background.hover}"
           }
         }
       },
       "tertiary": {
         "color": {
           "parent": "product/DigiD",
-          "type": "color",
-          "value": "{lux.color.foreground.default}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.foreground.default}"
         },
         "hover": {
           "color": {
             "parent": "product/DigiD",
-            "type": "color",
-            "value": "{lux.color.foreground.default}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{lux.color.foreground.default}"
           },
           "background-color": {
             "parent": "product/DigiD",
-            "type": "color",
-            "value": "{lux.color.background.hover}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{lux.color.background.hover}"
           }
         }
       },
       "font-size": {
-        "type": "fontSizes",
-        "value": "{lux.font-size.large-scale.sm}"
+        "$type": "fontSizes",
+        "$value": "{lux.font-size.large-scale.sm}"
       },
       "primary": {
         "font-size": {
-          "type": "fontSizes",
-          "value": "1.1875rem"
+          "$type": "fontSizes",
+          "$value": "1.1875rem"
         }
       }
     }
diff --git a/proprietary/design-tokens/src/imported/product/Digitoegankelijk.json b/proprietary/design-tokens/src/imported/product/Digitoegankelijk.json
index 598a71628..6dc8abf52 100644
--- a/proprietary/design-tokens/src/imported/product/Digitoegankelijk.json
+++ b/proprietary/design-tokens/src/imported/product/Digitoegankelijk.json
@@ -4,97 +4,97 @@
       "brand": {
         "default": {
           "parent": "product/Logius",
-          "type": "color",
-          "value": "{lux.color.violet.500}",
-          "description": "kleur van het product"
+          "$type": "color",
+          "$value": "{lux.color.violet.500}",
+          "$description": "kleur van het product"
         },
         "subdued": {
           "parent": "product/Logius",
-          "type": "color",
-          "value": "{lux.color.violet.50}",
-          "description": "Subtiele kleur van het product"
+          "$type": "color",
+          "$value": "{lux.color.violet.50}",
+          "$description": "Subtiele kleur van het product"
         },
         "hover": {
           "parent": "product/Logius",
-          "type": "color",
-          "value": "{lux.color.violet.700}",
-          "description": "Hover kleur van het product"
+          "$type": "color",
+          "$value": "{lux.color.violet.700}",
+          "$description": "Hover kleur van het product"
         }
       }
     },
     "border-radius": {
       "default": {
         "parent": "product/Logius",
-        "type": "borderRadius",
-        "value": "4px"
+        "$type": "borderRadius",
+        "$value": "4px"
       }
     },
     "focus": {
       "outline-width": {
         "parent": "product/Logius",
-        "type": "borderWidth",
-        "value": "2px"
+        "$type": "borderWidth",
+        "$value": "2px"
       },
       "outline": {
         "style": {
-          "type": "other",
-          "value": "solid"
+          "$type": "other",
+          "$value": "solid"
         }
       }
     },
     "font-family": {
       "primary": {
-        "type": "fontFamilies",
-        "value": "{ro.font-family.primary}"
+        "$type": "fontFamilies",
+        "$value": "{ro.font-family.primary}"
       }
     },
     "size": {
       "target": {
-        "type": "sizing",
-        "value": "3rem",
-        "description": "Gebruik deze als minimale hit erea. Bijvoorbeeld als min-height en min-width bij de button. "
+        "$type": "sizing",
+        "$value": "3rem",
+        "$description": "Gebruik deze als minimale hit erea. Bijvoorbeeld als min-height en min-width bij de button. "
       }
     },
     "font-size": {
       "body": {
         "small": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{viewport.font-size.body.small}"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.body.small}"
         },
         "default": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{viewport.font-size.body.default}"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.body.default}"
         },
         "large": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{viewport.font-size.body.large}"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.body.large}"
         }
       },
       "heading": {
         "level-1": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{viewport.font-size.heading.level-1}"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.heading.level-1}"
         },
         "level-2": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{viewport.font-size.heading.level-2}"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.heading.level-2}"
         },
         "level-3": {
-          "value": "{viewport.font-size.heading.level-3}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.heading.level-3}"
         },
         "level-4": {
-          "value": "{viewport.font-size.heading.level-4}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.heading.level-4}"
         },
         "level-5": {
-          "value": "{viewport.font-size.heading.level-4}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.heading.level-4}"
         }
       }
     },
@@ -102,42 +102,42 @@
       "body": {
         "small": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{viewport.line-height.body.small}"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.body.small}"
         },
         "default": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{viewport.line-height.body.default}"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.body.default}"
         },
         "large": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{viewport.line-height.body.large}"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.body.large}"
         }
       },
       "heading": {
         "level-1": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{viewport.line-height.heading.level-1}"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.heading.level-1}"
         },
         "level-2": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{viewport.line-height.heading.level-2}"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.heading.level-2}"
         },
         "level-3": {
-          "value": "{viewport.line-height.heading.level-3}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.heading.level-3}"
         },
         "level-4": {
-          "value": "{viewport.line-height.heading.level-4}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.heading.level-4}"
         },
         "level-5": {
-          "value": "{viewport.line-height.heading.level-4}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.heading.level-4}"
         }
       }
     }
@@ -146,21 +146,21 @@
     "focus": {
       "outline-radius": {
         "parent": "product/Logius",
-        "type": "borderRadius",
-        "value": "6px"
+        "$type": "borderRadius",
+        "$value": "6px"
       }
     },
     "size": {
       "icon": {
         "wrapper-height": {
-          "type": "sizing",
-          "value": "{figma.viewport.size.icon.wrapper-height}"
+          "$type": "sizing",
+          "$value": "{figma.viewport.size.icon.wrapper-height}"
         }
       }
     },
     "product": {
-      "value": "Digitoegankelijk",
-      "type": "text"
+      "$type": "text",
+      "$value": "Digitoegankelijk"
     }
   },
   "product": {
@@ -168,73 +168,73 @@
       "secondary": {
         "background-color": {
           "parent": "product/Logius",
-          "type": "color",
-          "value": "{lux.color.none}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.none}"
         },
         "border-color": {
           "parent": "product/Logius",
-          "type": "color",
-          "value": "{lux.color.brand.default}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.brand.default}"
         },
         "color": {
           "parent": "product/Logius",
-          "type": "color",
-          "value": "{lux.color.brand.default}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.brand.default}"
         },
         "hover": {
           "border-color": {
             "parent": "product/Logius",
-            "type": "color",
-            "value": "{lux.color.brand.hover}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{lux.color.brand.hover}"
           },
           "color": {
             "parent": "product/Logius",
-            "type": "color",
-            "value": "{lux.color.brand.hover}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{lux.color.brand.hover}"
           },
           "background-color": {
             "parent": "product/Logius",
-            "type": "color",
-            "value": "{lux.color.brand.subdued}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{lux.color.brand.subdued}"
           }
         }
       },
       "tertiary": {
         "color": {
           "parent": "product/Logius",
-          "type": "color",
-          "value": "{lux.color.brand.default}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.brand.default}"
         },
         "hover": {
           "color": {
             "parent": "product/Logius",
-            "type": "color",
-            "value": "{lux.color.brand.hover}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{lux.color.brand.hover}"
           },
           "background-color": {
             "parent": "product/Logius",
-            "type": "color",
-            "value": "{lux.color.brand.subdued}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{lux.color.brand.subdued}"
           }
         }
       },
       "font-size": {
-        "type": "fontSizes",
-        "value": "{lux.font-size.large-scale.sm}"
+        "$type": "fontSizes",
+        "$value": "{lux.font-size.large-scale.sm}"
       },
       "primary": {
         "font-size": {
-          "type": "fontSizes",
-          "value": "{lux.font-size.large-scale.sm}"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.large-scale.sm}"
         }
       }
     }
diff --git a/proprietary/design-tokens/src/imported/product/EVA.json b/proprietary/design-tokens/src/imported/product/EVA.json
index e715ca3ab..dbf7dceb6 100644
--- a/proprietary/design-tokens/src/imported/product/EVA.json
+++ b/proprietary/design-tokens/src/imported/product/EVA.json
@@ -4,20 +4,18 @@
       "brand": {
         "default": {
           "parent": "product/Eila",
-          "type": "color",
-          "value": "{lux.color.robijnrood.500}",
-          "description": "kleur van het product"
+          "$type": "color",
+          "$value": "{lux.color.robijnrood.500}",
+          "$description": "kleur van het product"
         },
         "subdued": {
           "parent": "product/Eila",
-          "type": "color",
-          "value": "{lux.color.robijnrood.50}",
-          "description": "Subtiele kleur van het product"
+          "$type": "color",
+          "$value": "{lux.color.robijnrood.50}",
+          "$description": "Subtiele kleur van het product"
         },
         "hover": {
           "parent": "product/Eila",
-          "type": "color",
-          "value": "{lux.color.robijnrood.500}",
           "$extensions": {
             "studio.tokens": {
               "modify": {
@@ -27,83 +25,85 @@
               }
             }
           },
-          "description": "Hover kleur van het product"
+          "$type": "color",
+          "$value": "{lux.color.robijnrood.500}",
+          "$description": "Hover kleur van het product"
         }
       }
     },
     "border-radius": {
       "default": {
         "parent": "product/Eila",
-        "type": "borderRadius",
-        "value": "4px"
+        "$type": "borderRadius",
+        "$value": "4px"
       }
     },
     "focus": {
       "outline-width": {
         "parent": "product/Eila",
-        "type": "borderWidth",
-        "value": "2px"
+        "$type": "borderWidth",
+        "$value": "2px"
       },
       "outline": {
         "style": {
-          "type": "other",
-          "value": "solid"
+          "$type": "other",
+          "$value": "solid"
         }
       }
     },
     "font-family": {
       "primary": {
-        "type": "fontFamilies",
-        "value": "{ro.font-family.primary}"
+        "$type": "fontFamilies",
+        "$value": "{ro.font-family.primary}"
       }
     },
     "size": {
       "target": {
-        "type": "sizing",
-        "value": "3rem",
-        "description": "Gebruik deze als minimale hit erea. Bijvoorbeeld als min-height en min-width bij de button. "
+        "$type": "sizing",
+        "$value": "3rem",
+        "$description": "Gebruik deze als minimale hit erea. Bijvoorbeeld als min-height en min-width bij de button. "
       }
     },
     "font-size": {
       "body": {
         "small": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{viewport.font-size.body.small}"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.body.small}"
         },
         "default": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{viewport.font-size.body.default}"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.body.default}"
         },
         "large": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{viewport.font-size.body.large}"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.body.large}"
         }
       },
       "heading": {
         "level-1": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{viewport.font-size.heading.level-1}"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.heading.level-1}"
         },
         "level-2": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{viewport.font-size.heading.level-2}"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.heading.level-2}"
         },
         "level-3": {
-          "value": "{viewport.font-size.heading.level-3}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.heading.level-3}"
         },
         "level-4": {
-          "value": "{viewport.font-size.heading.level-4}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.heading.level-4}"
         },
         "level-5": {
-          "value": "{viewport.font-size.heading.level-4}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.heading.level-4}"
         }
       }
     },
@@ -111,42 +111,42 @@
       "body": {
         "small": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{viewport.line-height.body.small}"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.body.small}"
         },
         "default": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{viewport.line-height.body.default}"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.body.default}"
         },
         "large": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{viewport.line-height.body.large}"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.body.large}"
         }
       },
       "heading": {
         "level-1": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{viewport.line-height.heading.level-1}"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.heading.level-1}"
         },
         "level-2": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{viewport.line-height.heading.level-2}"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.heading.level-2}"
         },
         "level-3": {
-          "value": "{viewport.line-height.heading.level-3}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.heading.level-3}"
         },
         "level-4": {
-          "value": "{viewport.line-height.heading.level-4}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.heading.level-4}"
         },
         "level-5": {
-          "value": "{viewport.line-height.heading.level-4}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.heading.level-4}"
         }
       }
     }
@@ -155,21 +155,21 @@
     "focus": {
       "outline-radius": {
         "parent": "product/Eila",
-        "type": "borderRadius",
-        "value": "6px"
+        "$type": "borderRadius",
+        "$value": "6px"
       }
     },
     "size": {
       "icon": {
         "wrapper-height": {
-          "value": "{figma.viewport.size.icon.wrapper-height}",
-          "type": "sizing"
+          "$type": "sizing",
+          "$value": "{figma.viewport.size.icon.wrapper-height}"
         }
       }
     },
     "product": {
-      "value": "EVA",
-      "type": "text"
+      "$type": "text",
+      "$value": "EVA"
     }
   },
   "product": {
@@ -177,70 +177,70 @@
       "secondary": {
         "background-color": {
           "parent": "product/Eila",
-          "type": "color",
-          "value": "{lux.color.none}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.none}"
         },
         "border-color": {
           "parent": "product/Eila",
-          "type": "color",
-          "value": "{lux.color.brand.default}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.brand.default}"
         },
         "color": {
           "parent": "product/Eila",
-          "type": "color",
-          "value": "{lux.color.brand.default}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.brand.default}"
         },
         "hover": {
           "border-color": {
             "parent": "product/Eila",
-            "type": "color",
-            "value": "{lux.color.brand.default}"
+            "$type": "color",
+            "$value": "{lux.color.brand.default}"
           },
           "color": {
             "parent": "product/Eila",
-            "type": "color",
-            "value": "{lux.color.brand.default}"
+            "$type": "color",
+            "$value": "{lux.color.brand.default}"
           },
           "background-color": {
             "parent": "product/Eila",
-            "type": "color",
-            "value": "{lux.color.brand.subdued}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{lux.color.brand.subdued}"
           }
         }
       },
       "tertiary": {
         "color": {
           "parent": "product/Eila",
-          "type": "color",
-          "value": "{lux.color.brand.default}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.brand.default}"
         },
         "hover": {
           "color": {
             "parent": "product/Eila",
-            "type": "color",
-            "value": "{lux.color.brand.default}"
+            "$type": "color",
+            "$value": "{lux.color.brand.default}"
           },
           "background-color": {
             "parent": "product/Eila",
-            "type": "color",
-            "value": "{lux.color.brand.subdued}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{lux.color.brand.subdued}"
           }
         }
       },
       "font-size": {
-        "type": "fontSizes",
-        "value": "{lux.font-size.large-scale.sm}"
+        "$type": "fontSizes",
+        "$value": "{lux.font-size.large-scale.sm}"
       },
       "primary": {
         "font-size": {
-          "type": "fontSizes",
-          "value": "{lux.font-size.large-scale.sm}"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.large-scale.sm}"
         }
       }
     }
diff --git a/proprietary/design-tokens/src/imported/product/Logius Blauw.json b/proprietary/design-tokens/src/imported/product/Logius Blauw.json
index cd91d1f4e..0a5842876 100644
--- a/proprietary/design-tokens/src/imported/product/Logius Blauw.json	
+++ b/proprietary/design-tokens/src/imported/product/Logius Blauw.json	
@@ -4,97 +4,97 @@
       "brand": {
         "default": {
           "parent": "product/Logius",
-          "type": "color",
-          "value": "{lux.color.hemelblauw.500}",
-          "description": "kleur van het product"
+          "$type": "color",
+          "$value": "{lux.color.hemelblauw.500}",
+          "$description": "kleur van het product"
         },
         "subdued": {
           "parent": "product/Logius",
-          "type": "color",
-          "value": "{lux.color.hemelblauw.50}",
-          "description": "Subtiele kleur van het product"
+          "$type": "color",
+          "$value": "{lux.color.hemelblauw.50}",
+          "$description": "Subtiele kleur van het product"
         },
         "hover": {
           "parent": "product/Logius",
-          "type": "color",
-          "value": "{lux.color.hemelblauw.700}",
-          "description": "Hover kleur van het product"
+          "$type": "color",
+          "$value": "{lux.color.hemelblauw.700}",
+          "$description": "Hover kleur van het product"
         }
       }
     },
     "border-radius": {
       "default": {
         "parent": "product/Logius",
-        "type": "borderRadius",
-        "value": "4px"
+        "$type": "borderRadius",
+        "$value": "4px"
       }
     },
     "focus": {
       "outline-width": {
         "parent": "product/Logius",
-        "type": "borderWidth",
-        "value": "2px"
+        "$type": "borderWidth",
+        "$value": "2px"
       },
       "outline": {
         "style": {
-          "type": "other",
-          "value": "solid"
+          "$type": "other",
+          "$value": "solid"
         }
       }
     },
     "font-family": {
       "primary": {
-        "type": "fontFamilies",
-        "value": "{ro.font-family.primary}"
+        "$type": "fontFamilies",
+        "$value": "{ro.font-family.primary}"
       }
     },
     "size": {
       "target": {
-        "type": "sizing",
-        "value": "3rem",
-        "description": "Gebruik deze als minimale hit erea. Bijvoorbeeld als min-height en min-width bij de button. "
+        "$type": "sizing",
+        "$value": "3rem",
+        "$description": "Gebruik deze als minimale hit erea. Bijvoorbeeld als min-height en min-width bij de button. "
       }
     },
     "font-size": {
       "body": {
         "small": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{viewport.font-size.body.small}"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.body.small}"
         },
         "default": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{viewport.font-size.body.default}"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.body.default}"
         },
         "large": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{viewport.font-size.body.large}"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.body.large}"
         }
       },
       "heading": {
         "level-1": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{viewport.font-size.heading.level-1}"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.heading.level-1}"
         },
         "level-2": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{viewport.font-size.heading.level-2}"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.heading.level-2}"
         },
         "level-3": {
-          "value": "{viewport.font-size.heading.level-3}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.heading.level-3}"
         },
         "level-4": {
-          "value": "{viewport.font-size.heading.level-4}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.heading.level-4}"
         },
         "level-5": {
-          "value": "{viewport.font-size.heading.level-4}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.heading.level-4}"
         }
       }
     },
@@ -102,42 +102,42 @@
       "body": {
         "small": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{viewport.line-height.body.small}"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.body.small}"
         },
         "default": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{viewport.line-height.body.default}"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.body.default}"
         },
         "large": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{viewport.line-height.body.large}"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.body.large}"
         }
       },
       "heading": {
         "level-1": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{viewport.line-height.heading.level-1}"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.heading.level-1}"
         },
         "level-2": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{viewport.line-height.heading.level-2}"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.heading.level-2}"
         },
         "level-3": {
-          "value": "{viewport.line-height.heading.level-3}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.heading.level-3}"
         },
         "level-4": {
-          "value": "{viewport.line-height.heading.level-4}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.heading.level-4}"
         },
         "level-5": {
-          "value": "{viewport.line-height.heading.level-4}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.heading.level-4}"
         }
       }
     }
@@ -146,21 +146,21 @@
     "focus": {
       "outline-radius": {
         "parent": "product/Logius",
-        "type": "borderRadius",
-        "value": "6px"
+        "$type": "borderRadius",
+        "$value": "6px"
       }
     },
     "size": {
       "icon": {
         "wrapper-height": {
-          "type": "sizing",
-          "value": "{figma.viewport.size.icon.wrapper-height}"
+          "$type": "sizing",
+          "$value": "{figma.viewport.size.icon.wrapper-height}"
         }
       }
     },
     "product": {
-      "value": "Logius Blauw",
-      "type": "text"
+      "$type": "text",
+      "$value": "Logius Blauw"
     }
   },
   "product": {
@@ -168,73 +168,73 @@
       "secondary": {
         "background-color": {
           "parent": "product/Logius",
-          "type": "color",
-          "value": "{lux.color.none}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.none}"
         },
         "border-color": {
           "parent": "product/Logius",
-          "type": "color",
-          "value": "{lux.color.brand.default}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.brand.default}"
         },
         "color": {
           "parent": "product/Logius",
-          "type": "color",
-          "value": "{lux.color.brand.default}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.brand.default}"
         },
         "hover": {
           "border-color": {
             "parent": "product/Logius",
-            "type": "color",
-            "value": "{lux.color.brand.hover}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{lux.color.brand.hover}"
           },
           "color": {
             "parent": "product/Logius",
-            "type": "color",
-            "value": "{lux.color.brand.hover}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{lux.color.brand.hover}"
           },
           "background-color": {
             "parent": "product/Logius",
-            "type": "color",
-            "value": "{lux.color.brand.subdued}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{lux.color.brand.subdued}"
           }
         }
       },
       "tertiary": {
         "color": {
           "parent": "product/Logius",
-          "type": "color",
-          "value": "{lux.color.brand.default}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.brand.default}"
         },
         "hover": {
           "color": {
             "parent": "product/Logius",
-            "type": "color",
-            "value": "{lux.color.brand.hover}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{lux.color.brand.hover}"
           },
           "background-color": {
             "parent": "product/Logius",
-            "type": "color",
-            "value": "{lux.color.brand.subdued}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{lux.color.brand.subdued}"
           }
         }
       },
       "font-size": {
-        "type": "fontSizes",
-        "value": "{lux.font-size.large-scale.sm}"
+        "$type": "fontSizes",
+        "$value": "{lux.font-size.large-scale.sm}"
       },
       "primary": {
         "font-size": {
-          "type": "fontSizes",
-          "value": "{lux.font-size.large-scale.sm}"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.large-scale.sm}"
         }
       }
     }
diff --git a/proprietary/design-tokens/src/imported/product/Logius.json b/proprietary/design-tokens/src/imported/product/Logius.json
index 3b6d68764..9903061a8 100644
--- a/proprietary/design-tokens/src/imported/product/Logius.json
+++ b/proprietary/design-tokens/src/imported/product/Logius.json
@@ -4,97 +4,97 @@
       "brand": {
         "default": {
           "parent": "product/Logius",
-          "type": "color",
-          "value": "{lux.color.groen.500}",
-          "description": "kleur van het product"
+          "$type": "color",
+          "$value": "{lux.color.groen.500}",
+          "$description": "kleur van het product"
         },
         "subdued": {
           "parent": "product/Logius",
-          "type": "color",
-          "value": "{lux.color.groen.50}",
-          "description": "Subtiele kleur van het product"
+          "$type": "color",
+          "$value": "{lux.color.groen.50}",
+          "$description": "Subtiele kleur van het product"
         },
         "hover": {
           "parent": "product/Logius",
-          "type": "color",
-          "value": "{lux.color.groen.700}",
-          "description": "Hover kleur van het product"
+          "$type": "color",
+          "$value": "{lux.color.groen.700}",
+          "$description": "Hover kleur van het product"
         }
       }
     },
     "border-radius": {
       "default": {
         "parent": "product/Logius",
-        "type": "borderRadius",
-        "value": "4px"
+        "$type": "borderRadius",
+        "$value": "4px"
       }
     },
     "focus": {
       "outline-width": {
         "parent": "product/Logius",
-        "type": "borderWidth",
-        "value": "2px"
+        "$type": "borderWidth",
+        "$value": "2px"
       },
       "outline": {
         "style": {
-          "type": "other",
-          "value": "solid"
+          "$type": "other",
+          "$value": "solid"
         }
       }
     },
     "font-family": {
       "primary": {
-        "type": "fontFamilies",
-        "value": "{ro.font-family.primary}"
+        "$type": "fontFamilies",
+        "$value": "{ro.font-family.primary}"
       }
     },
     "size": {
       "target": {
-        "type": "sizing",
-        "value": "3rem",
-        "description": "Gebruik deze als minimale hit erea. Bijvoorbeeld als min-height en min-width bij de button. "
+        "$type": "sizing",
+        "$value": "3rem",
+        "$description": "Gebruik deze als minimale hit erea. Bijvoorbeeld als min-height en min-width bij de button. "
       }
     },
     "line-height": {
       "body": {
         "small": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{viewport.line-height.body.small}"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.body.small}"
         },
         "default": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{viewport.line-height.body.default}"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.body.default}"
         },
         "large": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{viewport.line-height.body.large}"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.body.large}"
         }
       },
       "heading": {
         "level-1": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{viewport.line-height.heading.level-1}"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.heading.level-1}"
         },
         "level-2": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{viewport.line-height.heading.level-2}"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.heading.level-2}"
         },
         "level-3": {
-          "value": "{viewport.line-height.heading.level-3}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.heading.level-3}"
         },
         "level-4": {
-          "value": "{viewport.line-height.heading.level-4}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.heading.level-4}"
         },
         "level-5": {
-          "value": "{viewport.line-height.heading.level-4}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{viewport.line-height.heading.level-4}"
         }
       }
     },
@@ -102,42 +102,42 @@
       "body": {
         "small": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{viewport.font-size.body.small}"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.body.small}"
         },
         "default": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{viewport.font-size.body.default}"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.body.default}"
         },
         "large": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{viewport.font-size.body.large}"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.body.large}"
         }
       },
       "heading": {
         "level-1": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{viewport.font-size.heading.level-1}"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.heading.level-1}"
         },
         "level-2": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{viewport.font-size.heading.level-2}"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.heading.level-2}"
         },
         "level-3": {
-          "value": "{viewport.font-size.heading.level-3}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.heading.level-3}"
         },
         "level-4": {
-          "value": "{viewport.font-size.heading.level-4}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.heading.level-4}"
         },
         "level-5": {
-          "value": "{viewport.font-size.heading.level-4}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{viewport.font-size.heading.level-4}"
         }
       }
     }
@@ -146,21 +146,21 @@
     "focus": {
       "outline-radius": {
         "parent": "product/Logius",
-        "type": "borderRadius",
-        "value": "6px"
+        "$type": "borderRadius",
+        "$value": "6px"
       }
     },
     "size": {
       "icon": {
         "wrapper-height": {
-          "type": "sizing",
-          "value": "{figma.viewport.size.icon.wrapper-height}"
+          "$type": "sizing",
+          "$value": "{figma.viewport.size.icon.wrapper-height}"
         }
       }
     },
     "product": {
-      "value": "Logius",
-      "type": "text"
+      "$type": "text",
+      "$value": "Logius"
     }
   },
   "product": {
@@ -168,73 +168,73 @@
       "secondary": {
         "background-color": {
           "parent": "product/Logius",
-          "type": "color",
-          "value": "{lux.color.none}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.none}"
         },
         "border-color": {
           "parent": "product/Logius",
-          "type": "color",
-          "value": "{lux.color.brand.default}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.brand.default}"
         },
         "color": {
           "parent": "product/Logius",
-          "type": "color",
-          "value": "{lux.color.brand.default}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.brand.default}"
         },
         "hover": {
           "border-color": {
             "parent": "product/Logius",
-            "type": "color",
-            "value": "{lux.color.brand.hover}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{lux.color.brand.hover}"
           },
           "color": {
             "parent": "product/Logius",
-            "type": "color",
-            "value": "{lux.color.brand.hover}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{lux.color.brand.hover}"
           },
           "background-color": {
             "parent": "product/Logius",
-            "type": "color",
-            "value": "{lux.color.brand.subdued}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{lux.color.brand.subdued}"
           }
         }
       },
       "tertiary": {
         "color": {
           "parent": "product/Logius",
-          "type": "color",
-          "value": "{lux.color.brand.default}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.brand.default}"
         },
         "hover": {
           "color": {
             "parent": "product/Logius",
-            "type": "color",
-            "value": "{lux.color.brand.hover}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{lux.color.brand.hover}"
           },
           "background-color": {
             "parent": "product/Logius",
-            "type": "color",
-            "value": "{lux.color.brand.subdued}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{lux.color.brand.subdued}"
           }
         }
       },
       "font-size": {
-        "type": "fontSizes",
-        "value": "{lux.font-size.large-scale.sm}"
+        "$type": "fontSizes",
+        "$value": "{lux.font-size.large-scale.sm}"
       },
       "primary": {
         "font-size": {
-          "type": "fontSizes",
-          "value": "{lux.font-size.large-scale.sm}"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.large-scale.sm}"
         }
       }
     }
diff --git a/proprietary/design-tokens/src/imported/product/MijnOverheid.json b/proprietary/design-tokens/src/imported/product/MijnOverheid.json
index 480e770ee..35cffe202 100644
--- a/proprietary/design-tokens/src/imported/product/MijnOverheid.json
+++ b/proprietary/design-tokens/src/imported/product/MijnOverheid.json
@@ -4,90 +4,90 @@
       "brand": {
         "default": {
           "parent": "product/MijnOverheid",
-          "type": "color",
-          "value": "{lux.color.hemelblauw.500}",
-          "description": "kleur van het product"
+          "$type": "color",
+          "$value": "{lux.color.hemelblauw.500}",
+          "$description": "kleur van het product"
         },
         "subdued": {
           "parent": "product/MijnOverheid",
-          "type": "color",
-          "value": "{lux.color.hemelblauw.50}",
-          "description": "Subtiele kleur van het product"
+          "$type": "color",
+          "$value": "{lux.color.hemelblauw.50}",
+          "$description": "Subtiele kleur van het product"
         },
         "hover": {
           "parent": "product/MijnOverheid",
-          "type": "color",
-          "value": "{lux.color.hemelblauw.700}",
-          "description": "Hover kleur van het product"
+          "$type": "color",
+          "$value": "{lux.color.hemelblauw.700}",
+          "$description": "Hover kleur van het product"
         }
       }
     },
     "border-radius": {
       "default": {
         "parent": "product/MijnOverheid",
-        "type": "borderRadius",
-        "value": "4px"
+        "$type": "borderRadius",
+        "$value": "4px"
       }
     },
     "focus": {
       "outline-width": {
         "parent": "product/MijnOverheid",
-        "type": "borderWidth",
-        "value": "2px"
+        "$type": "borderWidth",
+        "$value": "2px"
       },
       "outline": {
         "style": {
-          "type": "other",
-          "value": "solid"
+          "$type": "other",
+          "$value": "solid"
         }
       }
     },
     "font-family": {
       "primary": {
-        "type": "fontFamilies",
-        "value": "{ro.font-family.primary}"
+        "$type": "fontFamilies",
+        "$value": "{ro.font-family.primary}"
       }
     },
     "line-height": {
       "body": {
         "small": {
           "parent": "viewport (beta)/xs",
-          "type": "lineHeights",
-          "value": "{lux.line-height.small-scale.xs}"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.small-scale.xs}"
         },
         "default": {
           "parent": "viewport (beta)/xs",
-          "type": "lineHeights",
-          "value": "{lux.line-height.small-scale.sm}"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.small-scale.sm}"
         },
         "large": {
           "parent": "viewport (beta)/xs",
-          "type": "lineHeights",
-          "value": "{lux.line-height.small-scale.md}"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.small-scale.md}"
         }
       },
       "heading": {
         "level-1": {
           "parent": "viewport (beta)/xs",
-          "type": "lineHeights",
-          "value": "{lux.line-height.small-scale.xl}"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.small-scale.xl}"
         },
         "level-2": {
           "parent": "viewport (beta)/xs",
-          "type": "lineHeights",
-          "value": "{lux.line-height.small-scale.lg}"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.small-scale.lg}"
         },
         "level-3": {
-          "value": "{lux.line-height.small-scale.md}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.small-scale.md}"
         },
         "level-4": {
-          "value": "{lux.line-height.small-scale.sm}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.small-scale.sm}"
         },
         "level-5": {
-          "value": "{lux.line-height.small-scale.sm}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.small-scale.sm}"
         }
       }
     },
@@ -95,52 +95,52 @@
       "body": {
         "small": {
           "parent": "viewport (beta)/xs",
-          "type": "fontSizes",
-          "value": "{lux.font-size.small-scale.xs}"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.small-scale.xs}"
         },
         "default": {
           "parent": "viewport (beta)/xs",
-          "type": "fontSizes",
-          "value": "{lux.font-size.small-scale.sm}"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.small-scale.sm}"
         },
         "large": {
           "parent": "viewport (beta)/xs",
-          "type": "fontSizes",
-          "value": "{lux.font-size.small-scale.md}"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.small-scale.md}"
         }
       },
       "heading": {
         "level-1": {
           "parent": "viewport (beta)/xs",
-          "type": "fontSizes",
-          "value": "{lux.font-size.small-scale.xl}"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.small-scale.xl}"
         },
         "level-2": {
           "parent": "viewport (beta)/xs",
-          "type": "fontSizes",
-          "value": "{lux.font-size.small-scale.lg}"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.small-scale.lg}"
         },
         "level-3": {
           "parent": "viewport (beta)/xs",
-          "type": "fontSizes",
-          "value": "{lux.font-size.small-scale.md}"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.small-scale.md}"
         },
         "level-4": {
           "parent": "viewport (beta)/xs",
-          "type": "fontSizes",
-          "value": "{lux.font-size.small-scale.sm}"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.small-scale.sm}"
         },
         "level-5": {
-          "value": "{lux.font-size.small-scale.sm}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.small-scale.sm}"
         }
       }
     },
     "size": {
       "target": {
-        "type": "sizing",
-        "value": "3rem",
-        "description": "Gebruik deze als minimale hit erea. Bijvoorbeeld als min-height en min-width bij de button. "
+        "$type": "sizing",
+        "$value": "3rem",
+        "$description": "Gebruik deze als minimale hit erea. Bijvoorbeeld als min-height en min-width bij de button. "
       }
     }
   },
@@ -148,21 +148,21 @@
     "focus": {
       "outline-radius": {
         "parent": "product/MijnOverheid",
-        "type": "borderRadius",
-        "value": "6px"
+        "$type": "borderRadius",
+        "$value": "6px"
       }
     },
     "size": {
       "icon": {
         "wrapper-height": {
-          "value": "1.5rem",
-          "type": "sizing"
+          "$type": "sizing",
+          "$value": "1.5rem"
         }
       }
     },
     "product": {
-      "value": "MijnOverheid",
-      "type": "text"
+      "$type": "text",
+      "$value": "MijnOverheid"
     }
   },
   "product": {
@@ -170,73 +170,73 @@
       "secondary": {
         "background-color": {
           "parent": "product/MijnOverheid",
-          "type": "color",
-          "value": "{lux.color.none}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.none}"
         },
         "border-color": {
           "parent": "product/MijnOverheid",
-          "type": "color",
-          "value": "{lux.color.brand.default}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.brand.default}"
         },
         "color": {
           "parent": "product/MijnOverheid",
-          "type": "color",
-          "value": "{lux.color.brand.default}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.brand.default}"
         },
         "hover": {
           "border-color": {
             "parent": "product/MijnOverheid",
-            "type": "color",
-            "value": "{lux.color.brand.hover}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{lux.color.brand.hover}"
           },
           "color": {
             "parent": "product/MijnOverheid",
-            "type": "color",
-            "value": "{lux.color.brand.hover}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{lux.color.brand.hover}"
           },
           "background-color": {
             "parent": "product/MijnOverheid",
-            "type": "color",
-            "value": "{lux.color.brand.subdued}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{lux.color.brand.subdued}"
           }
         }
       },
       "tertiary": {
         "color": {
           "parent": "product/MijnOverheid",
-          "type": "color",
-          "value": "{lux.color.brand.default}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.brand.default}"
         },
         "hover": {
           "color": {
             "parent": "product/MijnOverheid",
-            "type": "color",
-            "value": "{lux.color.brand.hover}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{lux.color.brand.hover}"
           },
           "background-color": {
             "parent": "product/MijnOverheid",
-            "type": "color",
-            "value": "{lux.color.brand.subdued}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{lux.color.brand.subdued}"
           }
         }
       },
       "font-size": {
-        "type": "fontSizes",
-        "value": "{lux.font-size.large-scale.sm}"
+        "$type": "fontSizes",
+        "$value": "{lux.font-size.large-scale.sm}"
       },
       "primary": {
         "font-size": {
-          "type": "fontSizes",
-          "value": "{lux.font-size.large-scale.sm}"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.large-scale.sm}"
         }
       }
     }
diff --git a/proprietary/design-tokens/src/imported/product/NLdoc-mapping.json b/proprietary/design-tokens/src/imported/product/NLdoc-mapping.json
index d9d416943..d579c9712 100644
--- a/proprietary/design-tokens/src/imported/product/NLdoc-mapping.json
+++ b/proprietary/design-tokens/src/imported/product/NLdoc-mapping.json
@@ -4,92 +4,92 @@
       "brand": {
         "default": {
           "parent": "product/NLdoc",
-          "type": "color",
-          "value": "{nldoc.color.brand.default}",
-          "description": "kleur van het product"
+          "$type": "color",
+          "$value": "{nldoc.color.brand.default}",
+          "$description": "kleur van het product"
         },
         "subdued": {
           "parent": "product/NLdoc",
-          "type": "color",
-          "value": "{nldoc.color.brand.subdued}",
-          "description": "Subtiele kleur van het product"
+          "$type": "color",
+          "$value": "{nldoc.color.brand.subdued}",
+          "$description": "Subtiele kleur van het product"
         },
         "hover": {
           "parent": "product/NLdoc",
-          "type": "color",
-          "value": "{nldoc.color.brand.hover}",
-          "description": "Hover kleur van het product"
+          "$type": "color",
+          "$value": "{nldoc.color.brand.hover}",
+          "$description": "Hover kleur van het product"
         }
       }
     },
     "border-radius": {
       "default": {
         "parent": "product/NLdoc",
-        "type": "borderRadius",
-        "value": "0px"
+        "$type": "borderRadius",
+        "$value": "0px"
       }
     },
     "focus": {
       "outline-width": {
         "parent": "product/NLdoc",
-        "type": "borderWidth",
-        "value": "1px"
+        "$type": "borderWidth",
+        "$value": "1px"
       },
       "outline": {
         "style": {
-          "type": "other",
-          "value": "dotted"
+          "$type": "other",
+          "$value": "dotted"
         }
       }
     },
     "font-family": {
       "primary": {
-        "type": "fontFamilies",
-        "value": "{nldoc.font-family.primary}"
+        "$type": "fontFamilies",
+        "$value": "{nldoc.font-family.primary}"
       }
     },
     "line-height": {
       "body": {
         "small": {
           "parent": "viewport (beta)/xs",
-          "type": "lineHeights",
-          "value": "{lux.font-size.body.small} * 1.5"
+          "$type": "lineHeights",
+          "$value": "{lux.font-size.body.small} * 1.5"
         },
         "default": {
           "parent": "viewport (beta)/xs",
-          "type": "lineHeights",
-          "value": "{lux.font-size.body.default} * 1.5"
+          "$type": "lineHeights",
+          "$value": "{lux.font-size.body.default} * 1.5"
         },
         "large": {
           "parent": "viewport (beta)/xs",
-          "type": "lineHeights",
-          "value": "{lux.font-size.body.large} * 1.5"
+          "$type": "lineHeights",
+          "$value": "{lux.font-size.body.large} * 1.5"
         }
       },
       "heading": {
         "level-1": {
           "parent": "viewport (beta)/xs",
-          "type": "lineHeights",
-          "value": "{lux.font-size.heading.level-1} * 1.5"
+          "$type": "lineHeights",
+          "$value": "{lux.font-size.heading.level-1} * 1.5"
         },
         "level-2": {
           "parent": "viewport (beta)/xs",
-          "type": "lineHeights",
-          "value": "{lux.font-size.heading.level-2} * 1.5"
+          "$type": "lineHeights",
+          "$value": "{lux.font-size.heading.level-2} * 1.5"
         },
         "level-3": {
           "parent": "viewport (beta)/xs",
-          "type": "lineHeights",
-          "value": "{lux.font-size.heading.level-3} * 1.5"
+          "$type": "lineHeights",
+          "$value": "{lux.font-size.heading.level-3} * 1.5"
         },
         "level-4": {
           "parent": "viewport (beta)/xs",
-          "type": "lineHeights",
-          "value": "{lux.font-size.heading.level-4} * 1.5"
+          "$type": "lineHeights",
+          "$value": "{lux.font-size.heading.level-4} * 1.5"
         },
         "level-5": {
-          "value": "{lux.font-size.heading.level-5} * 1.5",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{lux.font-size.heading.level-5} * 1.5"
         }
       }
     },
@@ -97,52 +97,52 @@
       "body": {
         "small": {
           "parent": "viewport (beta)/xs",
-          "type": "fontSizes",
-          "value": "0.875rem"
+          "$type": "fontSizes",
+          "$value": "0.875rem"
         },
         "default": {
           "parent": "viewport (beta)/xs",
-          "type": "fontSizes",
-          "value": "1rem"
+          "$type": "fontSizes",
+          "$value": "1rem"
         },
         "large": {
           "parent": "viewport (beta)/xs",
-          "type": "fontSizes",
-          "value": "1.25rem"
+          "$type": "fontSizes",
+          "$value": "1.25rem"
         }
       },
       "heading": {
         "level-1": {
           "parent": "viewport (beta)/xs",
-          "type": "fontSizes",
-          "value": "2.5rem"
+          "$type": "fontSizes",
+          "$value": "2.5rem"
         },
         "level-2": {
           "parent": "viewport (beta)/xs",
-          "type": "fontSizes",
-          "value": "2rem"
+          "$type": "fontSizes",
+          "$value": "2rem"
         },
         "level-3": {
           "parent": "viewport (beta)/xs",
-          "type": "fontSizes",
-          "value": "1.5rem"
+          "$type": "fontSizes",
+          "$value": "1.5rem"
         },
         "level-4": {
           "parent": "viewport (beta)/xs",
-          "type": "fontSizes",
-          "value": "1.25rem"
+          "$type": "fontSizes",
+          "$value": "1.25rem"
         },
         "level-5": {
-          "value": "1rem",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "1rem"
         }
       }
     },
     "size": {
       "target": {
-        "type": "sizing",
-        "value": "2.5rem",
-        "description": "Gebruik deze als minimale hit erea. Bijvoorbeeld als min-height en min-width bij de button. "
+        "$type": "sizing",
+        "$value": "2.5rem",
+        "$description": "Gebruik deze als minimale hit erea. Bijvoorbeeld als min-height en min-width bij de button. "
       }
     }
   },
@@ -150,15 +150,15 @@
     "focus": {
       "outline-radius": {
         "parent": "product/NLdoc",
-        "type": "borderRadius",
-        "value": "0px"
+        "$type": "borderRadius",
+        "$value": "0px"
       }
     },
     "size": {
       "icon": {
         "wrapper-height": {
-          "value": "1.5rem",
-          "type": "sizing"
+          "$type": "sizing",
+          "$value": "1.5rem"
         }
       }
     }
@@ -168,73 +168,73 @@
       "secondary": {
         "background-color": {
           "parent": "product/NLdoc",
-          "type": "color",
-          "value": "{lux.color.none}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{lux.color.none}"
         },
         "border-color": {
           "parent": "product/NLdoc",
-          "type": "color",
-          "value": "{nldoc.button.color}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{nldoc.button.color}"
         },
         "color": {
           "parent": "product/NLdoc",
-          "type": "color",
-          "value": "{nldoc.button.color}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{nldoc.button.color}"
         },
         "hover": {
           "border-color": {
             "parent": "product/NLdoc",
-            "type": "color",
-            "value": "{nldoc.color.brand.hover}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{nldoc.color.brand.hover}"
           },
           "color": {
             "parent": "product/NLdoc",
-            "type": "color",
-            "value": "{nldoc.button.color}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{nldoc.button.color}"
           },
           "background-color": {
             "parent": "product/NLdoc",
-            "type": "color",
-            "value": "{nldoc.color.brand.subdued}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{nldoc.color.brand.subdued}"
           }
         }
       },
       "tertiary": {
         "color": {
           "parent": "product/NLdoc",
-          "type": "color",
-          "value": "{nldoc.button.color}",
-          "description": ""
+          "description": "",
+          "$type": "color",
+          "$value": "{nldoc.button.color}"
         },
         "hover": {
           "color": {
             "parent": "product/NLdoc",
-            "type": "color",
-            "value": "{nldoc.button.color}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{nldoc.button.color}"
           },
           "background-color": {
             "parent": "product/NLdoc",
-            "type": "color",
-            "value": "{nldoc.color.brand.subdued}",
-            "description": ""
+            "description": "",
+            "$type": "color",
+            "$value": "{nldoc.color.brand.subdued}"
           }
         }
       },
       "font-size": {
-        "type": "fontSizes",
-        "value": "1rem"
+        "$type": "fontSizes",
+        "$value": "1rem"
       },
       "primary": {
         "font-size": {
-          "type": "fontSizes",
-          "value": "1rem"
+          "$type": "fontSizes",
+          "$value": "1rem"
         }
       }
     }
diff --git a/proprietary/design-tokens/src/imported/viewport/lg.json b/proprietary/design-tokens/src/imported/viewport/lg.json
index 7f05cdf86..0f255de90 100644
--- a/proprietary/design-tokens/src/imported/viewport/lg.json
+++ b/proprietary/design-tokens/src/imported/viewport/lg.json
@@ -3,24 +3,24 @@
     "rijkslint": {
       "variant": {
         "parent": "viewport (beta)/lg",
-        "type": "text",
-        "value": "default",
-        "description": ""
+        "description": "",
+        "$type": "text",
+        "$value": "default"
       }
     },
     "screen-size": {
       "parent": "viewport (beta)/lg",
-      "type": "sizing",
-      "value": "64rem",
-      "description": ""
+      "description": "",
+      "$type": "sizing",
+      "$value": "64rem"
     },
     "viewport": {
       "size": {
         "icon": {
           "wrapper-height": {
             "parent": "viewport (beta)/lg",
-            "type": "sizing",
-            "value": "1.75rem"
+            "$type": "sizing",
+            "$value": "1.75rem"
           }
         }
       }
@@ -30,15 +30,15 @@
     "grid": {
       "gutter": {
         "parent": "viewport (beta)/lg",
-        "type": "spacing",
-        "value": "2rem",
-        "description": ""
+        "description": "",
+        "$type": "spacing",
+        "$value": "2rem"
       },
       "margin": {
         "parent": "viewport (beta)/lg",
-        "type": "spacing",
-        "value": "2.5rem",
-        "description": ""
+        "description": "",
+        "$type": "spacing",
+        "$value": "2.5rem"
       }
     }
   },
@@ -48,17 +48,17 @@
         "75%": {
           "padding-block-start": {
             "parent": "viewport (beta)/lg",
-            "type": "spacing",
-            "value": "2.5rem",
-            "description": ""
+            "description": "",
+            "$type": "spacing",
+            "$value": "2.5rem"
           }
         },
         "default": {
           "padding-block-start": {
             "parent": "viewport (beta)/lg",
-            "type": "spacing",
-            "value": "3.125rem",
-            "description": ""
+            "description": "",
+            "$type": "spacing",
+            "$value": "3.125rem"
           }
         }
       }
@@ -67,37 +67,37 @@
       "heading": {
         "level-1": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{lux.line-height.large-scale.xl}"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.large-scale.xl}"
         },
         "level-2": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{lux.line-height.large-scale.lg}"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.large-scale.lg}"
         },
         "level-3": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{lux.line-height.large-scale.md}"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.large-scale.md}"
         },
         "level-4": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{lux.line-height.large-scale.sm}"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.large-scale.sm}"
         }
       },
       "body": {
         "default": {
-          "value": "{lux.line-height.large-scale.sm}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.large-scale.sm}"
         },
         "large": {
-          "value": "{lux.line-height.large-scale.md}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.large-scale.md}"
         },
         "small": {
-          "value": "{lux.line-height.large-scale.xs}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.large-scale.xs}"
         }
       }
     },
@@ -105,37 +105,37 @@
       "heading": {
         "level-1": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{lux.font-size.large-scale.xl}"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.large-scale.xl}"
         },
         "level-2": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{lux.font-size.large-scale.lg}"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.large-scale.lg}"
         },
         "level-3": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{lux.font-size.large-scale.md}"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.large-scale.md}"
         },
         "level-4": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{lux.font-size.large-scale.sm}"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.large-scale.sm}"
         }
       },
       "body": {
         "default": {
-          "value": "{lux.font-size.large-scale.sm}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.large-scale.sm}"
         },
         "large": {
-          "value": "{lux.font-size.large-scale.md}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.large-scale.md}"
         },
         "small": {
-          "value": "{lux.font-size.large-scale.xs}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.large-scale.xs}"
         }
       }
     }
diff --git a/proprietary/design-tokens/src/imported/viewport/md.json b/proprietary/design-tokens/src/imported/viewport/md.json
index 67246ed79..745f17482 100644
--- a/proprietary/design-tokens/src/imported/viewport/md.json
+++ b/proprietary/design-tokens/src/imported/viewport/md.json
@@ -3,24 +3,24 @@
     "rijkslint": {
       "variant": {
         "parent": "viewport (beta)/md",
-        "type": "text",
-        "value": "default",
-        "description": ""
+        "description": "",
+        "$type": "text",
+        "$value": "default"
       }
     },
     "screen-size": {
       "parent": "viewport (beta)/md",
-      "type": "sizing",
-      "value": "48rem",
-      "description": ""
+      "description": "",
+      "$type": "sizing",
+      "$value": "48rem"
     },
     "viewport": {
       "size": {
         "icon": {
           "wrapper-height": {
             "parent": "viewport (beta)/md",
-            "type": "sizing",
-            "value": "1.75rem"
+            "$type": "sizing",
+            "$value": "1.75rem"
           }
         }
       }
@@ -30,15 +30,15 @@
     "grid": {
       "gutter": {
         "parent": "viewport (beta)/md",
-        "type": "spacing",
-        "value": "1.5rem",
-        "description": ""
+        "description": "",
+        "$type": "spacing",
+        "$value": "1.5rem"
       },
       "margin": {
         "parent": "viewport (beta)/md",
-        "type": "spacing",
-        "value": "2rem",
-        "description": ""
+        "description": "",
+        "$type": "spacing",
+        "$value": "2rem"
       }
     }
   },
@@ -48,17 +48,17 @@
         "75%": {
           "padding-block-start": {
             "parent": "viewport (beta)/md",
-            "type": "spacing",
-            "value": "2.5rem",
-            "description": ""
+            "description": "",
+            "$type": "spacing",
+            "$value": "2.5rem"
           }
         },
         "default": {
           "padding-block-start": {
             "parent": "viewport (beta)/md",
-            "type": "spacing",
-            "value": "3.125rem",
-            "description": ""
+            "description": "",
+            "$type": "spacing",
+            "$value": "3.125rem"
           }
         }
       }
@@ -67,37 +67,37 @@
       "heading": {
         "level-1": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{lux.line-height.large-scale.xl}"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.large-scale.xl}"
         },
         "level-2": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{lux.line-height.large-scale.lg}"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.large-scale.lg}"
         },
         "level-3": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{lux.line-height.large-scale.md}"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.large-scale.md}"
         },
         "level-4": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{lux.line-height.large-scale.sm}"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.large-scale.sm}"
         }
       },
       "body": {
         "default": {
-          "value": "{lux.line-height.large-scale.sm}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.large-scale.sm}"
         },
         "large": {
-          "value": "{lux.line-height.large-scale.md}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.large-scale.md}"
         },
         "small": {
-          "value": "{lux.line-height.large-scale.xs}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.large-scale.xs}"
         }
       }
     },
@@ -105,37 +105,37 @@
       "heading": {
         "level-1": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{lux.font-size.large-scale.xl}"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.large-scale.xl}"
         },
         "level-2": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{lux.font-size.large-scale.lg}"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.large-scale.lg}"
         },
         "level-3": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{lux.font-size.large-scale.md}"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.large-scale.md}"
         },
         "level-4": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{lux.font-size.large-scale.sm}"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.large-scale.sm}"
         }
       },
       "body": {
         "default": {
-          "value": "{lux.font-size.large-scale.sm}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.large-scale.sm}"
         },
         "large": {
-          "value": "{lux.font-size.large-scale.md}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.large-scale.md}"
         },
         "small": {
-          "value": "{lux.font-size.large-scale.xs}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.large-scale.xs}"
         }
       }
     }
diff --git a/proprietary/design-tokens/src/imported/viewport/sm.json b/proprietary/design-tokens/src/imported/viewport/sm.json
index 974bc39dc..3a66be53e 100644
--- a/proprietary/design-tokens/src/imported/viewport/sm.json
+++ b/proprietary/design-tokens/src/imported/viewport/sm.json
@@ -3,24 +3,24 @@
     "rijkslint": {
       "variant": {
         "parent": "viewport (beta)/sm",
-        "type": "text",
-        "value": "default",
-        "description": ""
+        "description": "",
+        "$type": "text",
+        "$value": "default"
       }
     },
     "screen-size": {
       "parent": "viewport (beta)/sm",
-      "type": "sizing",
-      "value": "36rem",
-      "description": ""
+      "description": "",
+      "$type": "sizing",
+      "$value": "36rem"
     },
     "viewport": {
       "size": {
         "icon": {
           "wrapper-height": {
             "parent": "viewport (beta)/sm",
-            "type": "sizing",
-            "value": "1.75rem"
+            "$type": "sizing",
+            "$value": "1.75rem"
           }
         }
       }
@@ -30,15 +30,15 @@
     "grid": {
       "gutter": {
         "parent": "viewport (beta)/sm",
-        "type": "spacing",
-        "value": "1.5rem",
-        "description": ""
+        "description": "",
+        "$type": "spacing",
+        "$value": "1.5rem"
       },
       "margin": {
         "parent": "viewport (beta)/sm",
-        "type": "spacing",
-        "value": "1.5rem",
-        "description": ""
+        "description": "",
+        "$type": "spacing",
+        "$value": "1.5rem"
       }
     }
   },
@@ -48,17 +48,17 @@
         "75%": {
           "padding-block-start": {
             "parent": "viewport (beta)/sm",
-            "type": "spacing",
-            "value": "2.5rem",
-            "description": ""
+            "description": "",
+            "$type": "spacing",
+            "$value": "2.5rem"
           }
         },
         "default": {
           "padding-block-start": {
             "parent": "viewport (beta)/sm",
-            "type": "spacing",
-            "value": "3.125rem",
-            "description": ""
+            "description": "",
+            "$type": "spacing",
+            "$value": "3.125rem"
           }
         }
       }
@@ -67,37 +67,37 @@
       "heading": {
         "level-1": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{lux.line-height.large-scale.xl}"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.large-scale.xl}"
         },
         "level-2": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{lux.line-height.large-scale.lg}"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.large-scale.lg}"
         },
         "level-3": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{lux.line-height.large-scale.md}"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.large-scale.md}"
         },
         "level-4": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{lux.line-height.large-scale.sm}"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.large-scale.sm}"
         }
       },
       "body": {
         "default": {
-          "value": "{lux.line-height.large-scale.sm}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.large-scale.sm}"
         },
         "large": {
-          "value": "{lux.line-height.large-scale.md}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.large-scale.md}"
         },
         "small": {
-          "value": "{lux.line-height.large-scale.xs}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.large-scale.xs}"
         }
       }
     },
@@ -105,37 +105,37 @@
       "heading": {
         "level-1": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{lux.font-size.large-scale.xl}"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.large-scale.xl}"
         },
         "level-2": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{lux.font-size.large-scale.lg}"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.large-scale.lg}"
         },
         "level-3": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{lux.font-size.large-scale.md}"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.large-scale.md}"
         },
         "level-4": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{lux.font-size.large-scale.sm}"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.large-scale.sm}"
         }
       },
       "body": {
         "default": {
-          "value": "{lux.font-size.large-scale.sm}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.large-scale.sm}"
         },
         "large": {
-          "value": "{lux.font-size.large-scale.md}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.large-scale.md}"
         },
         "small": {
-          "value": "{lux.font-size.large-scale.xs}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.large-scale.xs}"
         }
       }
     }
diff --git a/proprietary/design-tokens/src/imported/viewport/xl.json b/proprietary/design-tokens/src/imported/viewport/xl.json
index 7fdc4ef9c..8aae54c7f 100644
--- a/proprietary/design-tokens/src/imported/viewport/xl.json
+++ b/proprietary/design-tokens/src/imported/viewport/xl.json
@@ -3,24 +3,24 @@
     "rijkslint": {
       "variant": {
         "parent": "viewport (beta)/xl",
-        "type": "text",
-        "value": "default",
-        "description": ""
+        "description": "",
+        "$type": "text",
+        "$value": "default"
       }
     },
     "screen-size": {
       "parent": "viewport (beta)/xl",
-      "type": "sizing",
-      "value": "90rem",
-      "description": ""
+      "description": "",
+      "$type": "sizing",
+      "$value": "90rem"
     },
     "viewport": {
       "size": {
         "icon": {
           "wrapper-height": {
             "parent": "viewport (beta)/xl",
-            "type": "sizing",
-            "value": "1.75rem"
+            "$type": "sizing",
+            "$value": "1.75rem"
           }
         }
       }
@@ -30,15 +30,15 @@
     "grid": {
       "gutter": {
         "parent": "viewport (beta)/xl",
-        "type": "spacing",
-        "value": "2rem",
-        "description": ""
+        "description": "",
+        "$type": "spacing",
+        "$value": "2rem"
       },
       "margin": {
         "parent": "viewport (beta)/xl",
-        "type": "spacing",
-        "value": "2.5rem",
-        "description": ""
+        "description": "",
+        "$type": "spacing",
+        "$value": "2.5rem"
       }
     }
   },
@@ -47,37 +47,37 @@
       "heading": {
         "level-1": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{lux.font-size.large-scale.xl}"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.large-scale.xl}"
         },
         "level-2": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{lux.font-size.large-scale.lg}"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.large-scale.lg}"
         },
         "level-3": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{lux.font-size.large-scale.md}"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.large-scale.md}"
         },
         "level-4": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{lux.font-size.large-scale.sm}"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.large-scale.sm}"
         }
       },
       "body": {
         "default": {
-          "value": "{lux.font-size.large-scale.sm}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.large-scale.sm}"
         },
         "large": {
-          "value": "{lux.font-size.large-scale.md}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.large-scale.md}"
         },
         "small": {
-          "value": "{lux.font-size.large-scale.xs}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.large-scale.xs}"
         }
       }
     },
@@ -85,37 +85,37 @@
       "heading": {
         "level-1": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{lux.line-height.large-scale.xl}"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.large-scale.xl}"
         },
         "level-2": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{lux.line-height.large-scale.lg}"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.large-scale.lg}"
         },
         "level-3": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{lux.line-height.large-scale.md}"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.large-scale.md}"
         },
         "level-4": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{lux.line-height.large-scale.sm}"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.large-scale.sm}"
         }
       },
       "body": {
         "default": {
-          "value": "{lux.line-height.large-scale.sm}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.large-scale.sm}"
         },
         "large": {
-          "value": "{lux.line-height.large-scale.md}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.large-scale.md}"
         },
         "small": {
-          "value": "{lux.line-height.large-scale.xs}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.large-scale.xs}"
         }
       }
     },
@@ -124,17 +124,17 @@
         "75%": {
           "padding-block-start": {
             "parent": "viewport (beta)/xl",
-            "type": "spacing",
-            "value": "2.5rem",
-            "description": ""
+            "description": "",
+            "$type": "spacing",
+            "$value": "2.5rem"
           }
         },
         "default": {
           "padding-block-start": {
             "parent": "viewport (beta)/xl",
-            "type": "spacing",
-            "value": "3.125rem",
-            "description": ""
+            "description": "",
+            "$type": "spacing",
+            "$value": "3.125rem"
           }
         }
       }
diff --git a/proprietary/design-tokens/src/imported/viewport/xs.json b/proprietary/design-tokens/src/imported/viewport/xs.json
index 36b02ffd7..304e041c4 100644
--- a/proprietary/design-tokens/src/imported/viewport/xs.json
+++ b/proprietary/design-tokens/src/imported/viewport/xs.json
@@ -3,24 +3,24 @@
     "rijkslint": {
       "variant": {
         "parent": "viewport (beta)/xs",
-        "type": "text",
-        "value": "small",
-        "description": ""
+        "description": "",
+        "$type": "text",
+        "$value": "small"
       }
     },
     "screen-size": {
       "parent": "viewport (beta)/xs",
-      "type": "sizing",
-      "value": "23.4375rem",
-      "description": ""
+      "description": "",
+      "$type": "sizing",
+      "$value": "23.4375rem"
     },
     "viewport": {
       "size": {
         "icon": {
           "wrapper-height": {
             "parent": "viewport (beta)/xs",
-            "type": "sizing",
-            "value": "1.5rem"
+            "$type": "sizing",
+            "$value": "1.5rem"
           }
         }
       }
@@ -30,22 +30,22 @@
     "grid": {
       "gutter": {
         "parent": "viewport (beta)/xs",
-        "type": "spacing",
-        "value": "0rem",
-        "description": ""
+        "description": "",
+        "$type": "spacing",
+        "$value": "0rem"
       },
       "margin": {
         "parent": "viewport (beta)/xs",
-        "type": "spacing",
-        "value": "1rem",
-        "description": ""
+        "description": "",
+        "$type": "spacing",
+        "$value": "1rem"
       }
     },
     "alert": {
       "icon": {
         "inset-block-start": {
-          "value": "{lux.space.0}",
-          "type": "spacing"
+          "$type": "spacing",
+          "$value": "{lux.space.0}"
         }
       }
     }
@@ -56,17 +56,17 @@
         "75%": {
           "padding-block-start": {
             "parent": "viewport (beta)/xs",
-            "type": "spacing",
-            "value": "1.25rem",
-            "description": ""
+            "description": "",
+            "$type": "spacing",
+            "$value": "1.25rem"
           }
         },
         "default": {
           "padding-block-start": {
             "parent": "viewport (beta)/xs",
-            "type": "spacing",
-            "value": "1.25rem",
-            "description": ""
+            "description": "",
+            "$type": "spacing",
+            "$value": "1.25rem"
           }
         }
       }
@@ -75,37 +75,37 @@
       "heading": {
         "level-1": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{lux.line-height.small-scale.xl}"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.small-scale.xl}"
         },
         "level-2": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{lux.line-height.small-scale.lg}"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.small-scale.lg}"
         },
         "level-3": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{lux.line-height.small-scale.md}"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.small-scale.md}"
         },
         "level-4": {
           "parent": "viewport (beta)/xl",
-          "type": "lineHeights",
-          "value": "{lux.line-height.small-scale.sm}"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.small-scale.sm}"
         }
       },
       "body": {
         "default": {
-          "value": "{lux.line-height.small-scale.sm}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.small-scale.sm}"
         },
         "large": {
-          "value": "{lux.line-height.small-scale.md}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.small-scale.md}"
         },
         "small": {
-          "value": "{lux.line-height.small-scale.xs}",
-          "type": "lineHeights"
+          "$type": "lineHeights",
+          "$value": "{lux.line-height.small-scale.xs}"
         }
       }
     },
@@ -113,37 +113,37 @@
       "heading": {
         "level-1": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{lux.font-size.small-scale.xl}"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.small-scale.xl}"
         },
         "level-2": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{lux.font-size.small-scale.lg}"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.small-scale.lg}"
         },
         "level-3": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{lux.font-size.small-scale.md}"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.small-scale.md}"
         },
         "level-4": {
           "parent": "viewport (beta)/xl",
-          "type": "fontSizes",
-          "value": "{lux.font-size.small-scale.sm}"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.small-scale.sm}"
         }
       },
       "body": {
         "default": {
-          "value": "{lux.font-size.small-scale.sm}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.small-scale.sm}"
         },
         "large": {
-          "value": "{lux.font-size.small-scale.md}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.small-scale.md}"
         },
         "small": {
-          "value": "{lux.font-size.small-scale.xs}",
-          "type": "fontSizes"
+          "$type": "fontSizes",
+          "$value": "{lux.font-size.small-scale.xs}"
         }
       }
     }

From df6966da8c8b9909650297e40d5cf04a5adeadfa Mon Sep 17 00:00:00 2001
From: AlineNap <59806622+AlineNap@users.noreply.github.com>
Date: Tue, 15 Oct 2024 16:36:39 +0200
Subject: [PATCH 04/12] set voor single-checkbox toegevoegd

---
 .../design-tokens/src/imported/$metadata.json |   1 +
 .../design-tokens/src/imported/$themes.json   |  66 +++++---
 .../imported/component/single-checkbox.json   | 154 ++++++++++++++++++
 3 files changed, 199 insertions(+), 22 deletions(-)
 create mode 100644 proprietary/design-tokens/src/imported/component/single-checkbox.json

diff --git a/proprietary/design-tokens/src/imported/$metadata.json b/proprietary/design-tokens/src/imported/$metadata.json
index dc59e5e79..78b968db9 100644
--- a/proprietary/design-tokens/src/imported/$metadata.json
+++ b/proprietary/design-tokens/src/imported/$metadata.json
@@ -31,6 +31,7 @@
     "component/link",
     "component/paragraph",
     "component/section",
+    "component/single-checkbox",
     "nl/utrecht-alert",
     "nl/utrecht-button",
     "nl/utrecht-document",
diff --git a/proprietary/design-tokens/src/imported/$themes.json b/proprietary/design-tokens/src/imported/$themes.json
index 999a76eb7..21dcd4597 100644
--- a/proprietary/design-tokens/src/imported/$themes.json
+++ b/proprietary/design-tokens/src/imported/$themes.json
@@ -8,7 +8,8 @@
       "core/color": "enabled",
       "core/spacing": "enabled",
       "core/border": "enabled",
-      "core/other": "enabled"
+      "core/other": "enabled",
+      "component/single-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:7:1003",
     "$figmaModeId": "7:30",
@@ -188,7 +189,8 @@
     "name": "default",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "common/default": "enabled"
+      "common/default": "enabled",
+      "component/single-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:46:7",
     "$figmaModeId": "46:0",
@@ -204,7 +206,8 @@
     "name": "Logius",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "product/Logius": "enabled"
+      "product/Logius": "enabled",
+      "component/single-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:1:2",
     "$figmaModeId": "1:0",
@@ -253,7 +256,8 @@
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
       "product/Logius Blauw": "enabled",
-      "product/Logius": "source"
+      "product/Logius": "source",
+      "component/single-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:1:2",
     "$figmaModeId": "2641:0",
@@ -302,7 +306,8 @@
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
       "product/MijnOverheid": "enabled",
-      "product/Logius": "source"
+      "product/Logius": "source",
+      "component/single-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:1:2",
     "$figmaModeId": "1:3",
@@ -351,7 +356,8 @@
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
       "product/DigiD": "enabled",
-      "product/Logius": "source"
+      "product/Logius": "source",
+      "component/single-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:1:2",
     "$figmaModeId": "1:4",
@@ -399,7 +405,8 @@
     "name": "NLdoc",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "product/NLdoc-mapping": "enabled"
+      "product/NLdoc-mapping": "enabled",
+      "component/single-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:1:2",
     "$figmaModeId": "123:0",
@@ -434,7 +441,8 @@
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
       "product/Logius": "source",
-      "product/EVA": "enabled"
+      "product/EVA": "enabled",
+      "component/single-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:1:2",
     "$figmaModeId": "2418:0",
@@ -461,7 +469,8 @@
     "name": "xl",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "viewport/xl": "enabled"
+      "viewport/xl": "enabled",
+      "component/single-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:7:318",
     "$figmaModeId": "7:1",
@@ -496,7 +505,8 @@
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
       "viewport/xl": "source",
-      "viewport/lg": "enabled"
+      "viewport/lg": "enabled",
+      "component/single-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:7:318",
     "$figmaModeId": "9:0",
@@ -531,7 +541,8 @@
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
       "viewport/xl": "source",
-      "viewport/md": "enabled"
+      "viewport/md": "enabled",
+      "component/single-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:7:318",
     "$figmaModeId": "9:1",
@@ -566,7 +577,8 @@
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
       "viewport/xl": "source",
-      "viewport/sm": "enabled"
+      "viewport/sm": "enabled",
+      "component/single-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:7:318",
     "$figmaModeId": "9:2",
@@ -600,7 +612,8 @@
     "name": "xs",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "viewport/xs": "enabled"
+      "viewport/xs": "enabled",
+      "component/single-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:7:318",
     "$figmaModeId": "54:0",
@@ -634,7 +647,8 @@
     "name": "light",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "mode/light": "enabled"
+      "mode/light": "enabled",
+      "component/single-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:1:3",
     "$figmaModeId": "1:1",
@@ -688,7 +702,8 @@
     "name": "dark (beta)",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "mode/dark": "enabled"
+      "mode/dark": "enabled",
+      "component/single-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:1:3",
     "$figmaModeId": "1:2",
@@ -746,7 +761,8 @@
       "component/alert": "enabled",
       "component/button": "enabled",
       "component/login link": "enabled",
-      "component/icon-logo": "enabled"
+      "component/icon-logo": "enabled",
+      "component/single-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:1503:3470",
     "$figmaModeId": "1503:2",
@@ -883,7 +899,8 @@
       "nl/utrecht-form-label": "enabled",
       "nl/utrecht-document": "enabled",
       "nl/utrecht-heading": "enabled",
-      "nl/utrecht-pre-heading": "enabled"
+      "nl/utrecht-pre-heading": "enabled",
+      "component/single-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:2536:6472",
     "$figmaModeId": "2536:0",
@@ -985,7 +1002,8 @@
     "name": "default",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "NLdoc/default": "enabled"
+      "NLdoc/default": "enabled",
+      "component/single-checkbox": "disabled"
     },
     "group": "NLdoc"
   },
@@ -994,7 +1012,8 @@
     "name": "Rijksoverheid",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "NLdoc/Rijksoverheid": "enabled"
+      "NLdoc/Rijksoverheid": "enabled",
+      "component/single-checkbox": "disabled"
     },
     "group": "NLdoc"
   },
@@ -1003,7 +1022,8 @@
     "name": "Ridderkerk",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "NLdoc/Ridderkerk": "enabled"
+      "NLdoc/Ridderkerk": "enabled",
+      "component/single-checkbox": "disabled"
     },
     "group": "NLdoc"
   },
@@ -1012,7 +1032,8 @@
     "name": "Waterschap Hollandse Delta",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "NLdoc/Waterschap Hollandse Delta": "enabled"
+      "NLdoc/Waterschap Hollandse Delta": "enabled",
+      "component/single-checkbox": "disabled"
     },
     "group": "NLdoc"
   },
@@ -1022,7 +1043,8 @@
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
       "product/Digitoegankelijk": "enabled",
-      "product/Logius": "source"
+      "product/Logius": "source",
+      "component/single-checkbox": "disabled"
     },
     "$figmaCollectionId": "VariableCollectionId:1:2",
     "$figmaModeId": "2690:0",
diff --git a/proprietary/design-tokens/src/imported/component/single-checkbox.json b/proprietary/design-tokens/src/imported/component/single-checkbox.json
new file mode 100644
index 000000000..43e9fdfe9
--- /dev/null
+++ b/proprietary/design-tokens/src/imported/component/single-checkbox.json
@@ -0,0 +1,154 @@
+{
+  "lux": {
+    "single-checkbox": {
+      "background-color": {
+        "$type": "color",
+        "$value": "{lux.color.none}"
+      },
+      "color": {
+        "$type": "color",
+        "$value": "{lux.color.foreground.default}"
+      },
+      "border-color": {
+        "$type": "color",
+        "$value": "{lux.color.brand.default}"
+      },
+      "border-radius": {
+        "$type": "borderRadius",
+        "$value": "{lux.border-radius.default}"
+      },
+      "border-width": {
+        "$type": "borderWidth",
+        "$value": "{lux.border-width.default}"
+      },
+      "column-gap": {
+        "$type": "spacing",
+        "$value": "{lux.space.100}"
+      },
+      "font-family": {
+        "$type": "fontFamilies",
+        "$value": "{lux.font-family.primary}"
+      },
+      "font-size": {
+        "$type": "fontSizes",
+        "$value": "{lux.font-size.body.default}"
+      },
+      "font-weight": {
+        "$type": "fontWeights",
+        "$value": "{lux.font-weight.regular}"
+      },
+      "line-height": {
+        "$type": "lineHeights",
+        "$value": "{lux.line-height.body.default}"
+      },
+      "padding-inline-end": {
+        "$type": "spacing",
+        "$value": "{lux.space.200}"
+      },
+      "padding-inline-start": {
+        "$type": "spacing",
+        "$value": "{lux.space.200}"
+      },
+      "padding-block-start": {
+        "$type": "spacing",
+        "$value": "{lux.space.100}"
+      },
+      "padding-block-end": {
+        "$type": "spacing",
+        "$value": "{lux.space.100}"
+      },
+      "min-block-size": {
+        "$type": "sizing",
+        "$value": "{lux.size.target}"
+      },
+      "invalid": {
+        "background-color": {
+          "$type": "color",
+          "$value": "{lux.color.none}"
+        },
+        "color": {
+          "$type": "color",
+          "$value": "{lux.color.foreground.default}"
+        },
+        "border-color": {
+          "$type": "color",
+          "$value": "{lux.color.feedback.error.default}"
+        },
+        "row-gap": {
+          "$type": "spacing",
+          "$value": "{lux.space.100}"
+        }
+      },
+      "hover": {
+        "background-color": {
+          "$type": "color",
+          "$value": "{lux.color.brand.subdued}"
+        },
+        "color": {
+          "$type": "color",
+          "$value": "{lux.color.foreground.default}"
+        },
+        "border-color": {
+          "$type": "color",
+          "$value": "{lux.color.brand.default}"
+        }
+      },
+      "active": {
+        "background-color": {
+          "$type": "color",
+          "$value": "{lux.color.none}"
+        },
+        "color": {
+          "$type": "color",
+          "$value": "{lux.color.foreground.default}"
+        },
+        "border-color": {
+          "$type": "color",
+          "$value": "{lux.color.feedback.error.default}"
+        }
+      },
+      "focus-visable": {
+        "background-color": {
+          "$type": "color",
+          "$value": "{lux.color.none}"
+        },
+        "color": {
+          "$type": "color",
+          "$value": "{lux.color.foreground.default}"
+        },
+        "border-color": {
+          "$type": "color",
+          "$value": "{lux.color.feedback.error.default}"
+        }
+      },
+      "disabled": {
+        "background-color": {
+          "$type": "color",
+          "$value": "{lux.color.none}"
+        },
+        "color": {
+          "$type": "color",
+          "$value": "{lux.color.foreground.default}"
+        },
+        "border-color": {
+          "$type": "color",
+          "$value": "{lux.color.feedback.error.default}"
+        }
+      },
+      "checked": {
+        "background-color": {
+          "$type": "color",
+          "$value": "{lux.color.none}"
+        },
+        "color": {
+          "$type": "color",
+          "$value": "{lux.color.foreground.default}"
+        },
+        "border-color": {
+          "$type": "color",
+          "$value": "{lux.color.feedback.error.default}"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file

From 1a07535027541e068bcc5685ef1daa46bbfaaffc Mon Sep 17 00:00:00 2001
From: AlineNap <59806622+AlineNap@users.noreply.github.com>
Date: Tue, 15 Oct 2024 16:37:41 +0200
Subject: [PATCH 05/12] ..

---
 .../design-tokens/src/imported/$themes.json   | 66 +++++++------------
 1 file changed, 22 insertions(+), 44 deletions(-)

diff --git a/proprietary/design-tokens/src/imported/$themes.json b/proprietary/design-tokens/src/imported/$themes.json
index 21dcd4597..999a76eb7 100644
--- a/proprietary/design-tokens/src/imported/$themes.json
+++ b/proprietary/design-tokens/src/imported/$themes.json
@@ -8,8 +8,7 @@
       "core/color": "enabled",
       "core/spacing": "enabled",
       "core/border": "enabled",
-      "core/other": "enabled",
-      "component/single-checkbox": "disabled"
+      "core/other": "enabled"
     },
     "$figmaCollectionId": "VariableCollectionId:7:1003",
     "$figmaModeId": "7:30",
@@ -189,8 +188,7 @@
     "name": "default",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "common/default": "enabled",
-      "component/single-checkbox": "disabled"
+      "common/default": "enabled"
     },
     "$figmaCollectionId": "VariableCollectionId:46:7",
     "$figmaModeId": "46:0",
@@ -206,8 +204,7 @@
     "name": "Logius",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "product/Logius": "enabled",
-      "component/single-checkbox": "disabled"
+      "product/Logius": "enabled"
     },
     "$figmaCollectionId": "VariableCollectionId:1:2",
     "$figmaModeId": "1:0",
@@ -256,8 +253,7 @@
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
       "product/Logius Blauw": "enabled",
-      "product/Logius": "source",
-      "component/single-checkbox": "disabled"
+      "product/Logius": "source"
     },
     "$figmaCollectionId": "VariableCollectionId:1:2",
     "$figmaModeId": "2641:0",
@@ -306,8 +302,7 @@
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
       "product/MijnOverheid": "enabled",
-      "product/Logius": "source",
-      "component/single-checkbox": "disabled"
+      "product/Logius": "source"
     },
     "$figmaCollectionId": "VariableCollectionId:1:2",
     "$figmaModeId": "1:3",
@@ -356,8 +351,7 @@
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
       "product/DigiD": "enabled",
-      "product/Logius": "source",
-      "component/single-checkbox": "disabled"
+      "product/Logius": "source"
     },
     "$figmaCollectionId": "VariableCollectionId:1:2",
     "$figmaModeId": "1:4",
@@ -405,8 +399,7 @@
     "name": "NLdoc",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "product/NLdoc-mapping": "enabled",
-      "component/single-checkbox": "disabled"
+      "product/NLdoc-mapping": "enabled"
     },
     "$figmaCollectionId": "VariableCollectionId:1:2",
     "$figmaModeId": "123:0",
@@ -441,8 +434,7 @@
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
       "product/Logius": "source",
-      "product/EVA": "enabled",
-      "component/single-checkbox": "disabled"
+      "product/EVA": "enabled"
     },
     "$figmaCollectionId": "VariableCollectionId:1:2",
     "$figmaModeId": "2418:0",
@@ -469,8 +461,7 @@
     "name": "xl",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "viewport/xl": "enabled",
-      "component/single-checkbox": "disabled"
+      "viewport/xl": "enabled"
     },
     "$figmaCollectionId": "VariableCollectionId:7:318",
     "$figmaModeId": "7:1",
@@ -505,8 +496,7 @@
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
       "viewport/xl": "source",
-      "viewport/lg": "enabled",
-      "component/single-checkbox": "disabled"
+      "viewport/lg": "enabled"
     },
     "$figmaCollectionId": "VariableCollectionId:7:318",
     "$figmaModeId": "9:0",
@@ -541,8 +531,7 @@
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
       "viewport/xl": "source",
-      "viewport/md": "enabled",
-      "component/single-checkbox": "disabled"
+      "viewport/md": "enabled"
     },
     "$figmaCollectionId": "VariableCollectionId:7:318",
     "$figmaModeId": "9:1",
@@ -577,8 +566,7 @@
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
       "viewport/xl": "source",
-      "viewport/sm": "enabled",
-      "component/single-checkbox": "disabled"
+      "viewport/sm": "enabled"
     },
     "$figmaCollectionId": "VariableCollectionId:7:318",
     "$figmaModeId": "9:2",
@@ -612,8 +600,7 @@
     "name": "xs",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "viewport/xs": "enabled",
-      "component/single-checkbox": "disabled"
+      "viewport/xs": "enabled"
     },
     "$figmaCollectionId": "VariableCollectionId:7:318",
     "$figmaModeId": "54:0",
@@ -647,8 +634,7 @@
     "name": "light",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "mode/light": "enabled",
-      "component/single-checkbox": "disabled"
+      "mode/light": "enabled"
     },
     "$figmaCollectionId": "VariableCollectionId:1:3",
     "$figmaModeId": "1:1",
@@ -702,8 +688,7 @@
     "name": "dark (beta)",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "mode/dark": "enabled",
-      "component/single-checkbox": "disabled"
+      "mode/dark": "enabled"
     },
     "$figmaCollectionId": "VariableCollectionId:1:3",
     "$figmaModeId": "1:2",
@@ -761,8 +746,7 @@
       "component/alert": "enabled",
       "component/button": "enabled",
       "component/login link": "enabled",
-      "component/icon-logo": "enabled",
-      "component/single-checkbox": "disabled"
+      "component/icon-logo": "enabled"
     },
     "$figmaCollectionId": "VariableCollectionId:1503:3470",
     "$figmaModeId": "1503:2",
@@ -899,8 +883,7 @@
       "nl/utrecht-form-label": "enabled",
       "nl/utrecht-document": "enabled",
       "nl/utrecht-heading": "enabled",
-      "nl/utrecht-pre-heading": "enabled",
-      "component/single-checkbox": "disabled"
+      "nl/utrecht-pre-heading": "enabled"
     },
     "$figmaCollectionId": "VariableCollectionId:2536:6472",
     "$figmaModeId": "2536:0",
@@ -1002,8 +985,7 @@
     "name": "default",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "NLdoc/default": "enabled",
-      "component/single-checkbox": "disabled"
+      "NLdoc/default": "enabled"
     },
     "group": "NLdoc"
   },
@@ -1012,8 +994,7 @@
     "name": "Rijksoverheid",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "NLdoc/Rijksoverheid": "enabled",
-      "component/single-checkbox": "disabled"
+      "NLdoc/Rijksoverheid": "enabled"
     },
     "group": "NLdoc"
   },
@@ -1022,8 +1003,7 @@
     "name": "Ridderkerk",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "NLdoc/Ridderkerk": "enabled",
-      "component/single-checkbox": "disabled"
+      "NLdoc/Ridderkerk": "enabled"
     },
     "group": "NLdoc"
   },
@@ -1032,8 +1012,7 @@
     "name": "Waterschap Hollandse Delta",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "NLdoc/Waterschap Hollandse Delta": "enabled",
-      "component/single-checkbox": "disabled"
+      "NLdoc/Waterschap Hollandse Delta": "enabled"
     },
     "group": "NLdoc"
   },
@@ -1043,8 +1022,7 @@
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
       "product/Digitoegankelijk": "enabled",
-      "product/Logius": "source",
-      "component/single-checkbox": "disabled"
+      "product/Logius": "source"
     },
     "$figmaCollectionId": "VariableCollectionId:1:2",
     "$figmaModeId": "2690:0",

From 077a1ac8eb695067b74193ed343f20dac9d6f842 Mon Sep 17 00:00:00 2001
From: AlineNap <59806622+AlineNap@users.noreply.github.com>
Date: Tue, 15 Oct 2024 16:59:49 +0200
Subject: [PATCH 06/12] push

---
 .../src/imported/component/single-checkbox.json      | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/proprietary/design-tokens/src/imported/component/single-checkbox.json b/proprietary/design-tokens/src/imported/component/single-checkbox.json
index 43e9fdfe9..140d1eb74 100644
--- a/proprietary/design-tokens/src/imported/component/single-checkbox.json
+++ b/proprietary/design-tokens/src/imported/component/single-checkbox.json
@@ -91,6 +91,10 @@
         "border-color": {
           "$type": "color",
           "$value": "{lux.color.brand.default}"
+        },
+        "border-width": {
+          "$type": "borderWidth",
+          "$value": "{lux.border-width.m}"
         }
       },
       "active": {
@@ -104,7 +108,7 @@
         },
         "border-color": {
           "$type": "color",
-          "$value": "{lux.color.feedback.error.default}"
+          "$value": "{lux.color.brand.default}"
         }
       },
       "focus-visable": {
@@ -118,7 +122,7 @@
         },
         "border-color": {
           "$type": "color",
-          "$value": "{lux.color.feedback.error.default}"
+          "$value": "{lux.single-checkbox.border-color}"
         }
       },
       "disabled": {
@@ -128,11 +132,11 @@
         },
         "color": {
           "$type": "color",
-          "$value": "{lux.color.foreground.default}"
+          "$value": "{lux.color.foreground.subdued}"
         },
         "border-color": {
           "$type": "color",
-          "$value": "{lux.color.feedback.error.default}"
+          "$value": "{lux.color.border.subdued}"
         }
       },
       "checked": {

From 49da0d539979195f588b8ffca281070ca2f289c5 Mon Sep 17 00:00:00 2001
From: AlineNap <59806622+AlineNap@users.noreply.github.com>
Date: Wed, 16 Oct 2024 10:01:56 +0200
Subject: [PATCH 07/12] Update

---
 .../src/imported/component/single-checkbox.json    | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/proprietary/design-tokens/src/imported/component/single-checkbox.json b/proprietary/design-tokens/src/imported/component/single-checkbox.json
index 140d1eb74..77c955010 100644
--- a/proprietary/design-tokens/src/imported/component/single-checkbox.json
+++ b/proprietary/design-tokens/src/imported/component/single-checkbox.json
@@ -77,12 +77,24 @@
         "row-gap": {
           "$type": "spacing",
           "$value": "{lux.space.100}"
+        },
+        "padding-inline-start": {
+          "$type": "spacing",
+          "$value": "{lux.space.200}"
+        },
+        "border-inline-start-color": {
+          "$type": "color",
+          "$value": "{lux.color.feedback.error.default}"
+        },
+        "border-inline-start-width": {
+          "$type": "borderWidth",
+          "$value": "{lux.border-width.m}"
         }
       },
       "hover": {
         "background-color": {
           "$type": "color",
-          "$value": "{lux.color.brand.subdued}"
+          "$value": "{lux.color.none}"
         },
         "color": {
           "$type": "color",

From be40b2c17a90a235676f7119bbf2744252484ae1 Mon Sep 17 00:00:00 2001
From: AlineNap <59806622+AlineNap@users.noreply.github.com>
Date: Thu, 17 Oct 2024 10:59:03 +0200
Subject: [PATCH 08/12] Checkbox achtergrond

---
 .../design-tokens/src/imported/component/single-checkbox.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/proprietary/design-tokens/src/imported/component/single-checkbox.json b/proprietary/design-tokens/src/imported/component/single-checkbox.json
index 77c955010..aeebe07f0 100644
--- a/proprietary/design-tokens/src/imported/component/single-checkbox.json
+++ b/proprietary/design-tokens/src/imported/component/single-checkbox.json
@@ -154,7 +154,7 @@
       "checked": {
         "background-color": {
           "$type": "color",
-          "$value": "{lux.color.none}"
+          "$value": "{lux.color.brand.subdued}"
         },
         "color": {
           "$type": "color",
@@ -162,7 +162,7 @@
         },
         "border-color": {
           "$type": "color",
-          "$value": "{lux.color.feedback.error.default}"
+          "$value": "{lux.color.brand.default}"
         }
       }
     }

From bc30b62fdc657dd01ccc1bfed97f881c57ff9e58 Mon Sep 17 00:00:00 2001
From: AlineNap <59806622+AlineNap@users.noreply.github.com>
Date: Tue, 29 Oct 2024 13:28:33 +0100
Subject: [PATCH 09/12] checked tokens veranderd van todo naar lux

---
 .../src/imported/nl/utrecht-checkbox.json     | 96 +++++++++++--------
 1 file changed, 54 insertions(+), 42 deletions(-)

diff --git a/proprietary/design-tokens/src/imported/nl/utrecht-checkbox.json b/proprietary/design-tokens/src/imported/nl/utrecht-checkbox.json
index de68a3873..3ab143efd 100644
--- a/proprietary/design-tokens/src/imported/nl/utrecht-checkbox.json
+++ b/proprietary/design-tokens/src/imported/nl/utrecht-checkbox.json
@@ -162,18 +162,38 @@
           "border-width": {
             "$type": "borderWidth",
             "$value": "2px"
+          }
+        },
+        "hover": {
+          "border-width": {
+            "$type": "borderWidth",
+            "$value": "2px"
+          }
+        },
+        "active": {
+          "border-width": {
+            "$type": "borderWidth",
+            "$value": "1.5px"
+          }
+        }
+      },
+      "indeterminate": {
+        "active": {
+          "border-width": {
+            "$type": "borderWidth",
+            "$value": "1.5px"
           },
           "background-color": {
             "$type": "color",
-            "$value": "{utrecht.checkbox.checked.background-color}"
+            "$value": "{lux.checkbox.checked.active.background-color}"
           },
           "border-color": {
             "$type": "color",
-            "$value": "{utrecht.checkbox.checked.border-color}"
+            "$value": "{lux.checkbox.checked.active.border-color}"
           },
           "color": {
             "$type": "color",
-            "$value": "{utrecht.checkbox.checked.color}"
+            "$value": "{lux.checkbox.checked.active.color}"
           }
         },
         "hover": {
@@ -183,117 +203,109 @@
           },
           "background-color": {
             "$type": "color",
-            "$value": "{lux.color.brand.hover}"
+            "$value": "{lux.checkbox.checked.hover.background-color}"
           },
           "border-color": {
             "$type": "color",
-            "$value": "{lux.color.border.strong}"
+            "$value": "transparent"
           },
           "color": {
             "$type": "color",
-            "$value": "{lux.color.wit}"
+            "$value": "{lux.checkbox.checked.hover.color}"
           }
         },
-        "active": {
+        "focus": {
           "border-width": {
             "$type": "borderWidth",
-            "$value": "1.5px"
+            "$value": "2px"
           },
           "background-color": {
             "$type": "color",
-            "$value": "{lux.color.brand.hover}"
+            "$value": "{lux.checkbox.checked.focus.background-color}"
           },
           "border-color": {
             "$type": "color",
-            "$value": "{lux.color.border.strong}"
+            "$value": "{lux.checkbox.checked.focus.border-color}"
           },
           "color": {
             "$type": "color",
-            "$value": "{lux.color.wit}"
+            "$value": "{lux.checkbox.checked.focus.color}"
           }
         },
         "disabled": {
           "background-color": {
             "$type": "color",
-            "$value": "{lux.color.background.subdued}"
+            "$value": "{lux.checkbox.checked.disabled.background-color}"
           },
           "border-color": {
             "$type": "color",
-            "$value": "{lux.color.border.subdued}"
+            "$value": "{lux.checkbox.checked.disabled.border-color}"
           },
           "color": {
             "$type": "color",
-            "$value": "{lux.color.foreground.subdued}"
+            "$value": "{lux.checkbox.checked.disabled.color}"
           }
         }
-      },
-      "indeterminate": {
-        "active": {
-          "border-width": {
-            "$type": "borderWidth",
-            "$value": "1.5px"
-          },
+      }
+    }
+  },
+  "lux": {
+    "checkbox": {
+      "checked": {
+        "focus": {
           "background-color": {
             "$type": "color",
-            "$value": "{todo.checkbox.checked.active.background-color}"
+            "$value": "{utrecht.checkbox.checked.background-color}"
           },
           "border-color": {
             "$type": "color",
-            "$value": "{todo.checkbox.checked.active.border-color}"
+            "$value": "{utrecht.checkbox.checked.border-color}"
           },
           "color": {
             "$type": "color",
-            "$value": "{todo.checkbox.checked.active.color}"
+            "$value": "{utrecht.checkbox.checked.color}"
           }
         },
         "hover": {
-          "border-width": {
-            "$type": "borderWidth",
-            "$value": "2px"
-          },
           "background-color": {
             "$type": "color",
-            "$value": "{todo.checkbox.checked.hover.background-color}"
+            "$value": "{lux.color.brand.hover}"
           },
           "border-color": {
             "$type": "color",
-            "$value": "transparent"
+            "$value": "{lux.color.border.strong}"
           },
           "color": {
             "$type": "color",
-            "$value": "{todo.checkbox.checked.hover.color}"
+            "$value": "{lux.color.wit}"
           }
         },
-        "focus": {
-          "border-width": {
-            "$type": "borderWidth",
-            "$value": "2px"
-          },
+        "active": {
           "background-color": {
             "$type": "color",
-            "$value": "{todo.checkbox.checked.focus.background-color}"
+            "$value": "{lux.color.brand.hover}"
           },
           "border-color": {
             "$type": "color",
-            "$value": "{todo.checkbox.checked.focus.border-color}"
+            "$value": "{lux.color.border.strong}"
           },
           "color": {
             "$type": "color",
-            "$value": "{todo.checkbox.checked.focus.color}"
+            "$value": "{lux.color.wit}"
           }
         },
         "disabled": {
           "background-color": {
             "$type": "color",
-            "$value": "{todo.checkbox.checked.disabled.background-color}"
+            "$value": "{lux.color.background.subdued}"
           },
           "border-color": {
             "$type": "color",
-            "$value": "{todo.checkbox.checked.disabled.border-color}"
+            "$value": "{lux.color.border.subdued}"
           },
           "color": {
             "$type": "color",
-            "$value": "{todo.checkbox.checked.disabled.color}"
+            "$value": "{lux.color.foreground.subdued}"
           }
         }
       }

From 9f832d42416b432d130a1c2b677b97485f11ee14 Mon Sep 17 00:00:00 2001
From: AlineNap <59806622+AlineNap@users.noreply.github.com>
Date: Wed, 30 Oct 2024 10:00:23 +0100
Subject: [PATCH 10/12] checked states toegevoegd

---
 .../imported/component/single-checkbox.json   | 58 ++++++++++++++++++-
 1 file changed, 57 insertions(+), 1 deletion(-)

diff --git a/proprietary/design-tokens/src/imported/component/single-checkbox.json b/proprietary/design-tokens/src/imported/component/single-checkbox.json
index aeebe07f0..400edacbc 100644
--- a/proprietary/design-tokens/src/imported/component/single-checkbox.json
+++ b/proprietary/design-tokens/src/imported/component/single-checkbox.json
@@ -126,7 +126,7 @@
       "focus-visable": {
         "background-color": {
           "$type": "color",
-          "$value": "{lux.color.none}"
+          "$value": "{lux.color.background.subdued}"
         },
         "color": {
           "$type": "color",
@@ -163,6 +163,62 @@
         "border-color": {
           "$type": "color",
           "$value": "{lux.color.brand.default}"
+        },
+        "focus-visable": {
+          "background-color": {
+            "$type": "color",
+            "$value": "{lux.color.brand.subdued}"
+          },
+          "color": {
+            "$type": "color",
+            "$value": "{lux.color.foreground.default}"
+          },
+          "border-color": {
+            "$type": "color",
+            "$value": "{lux.color.brand.default}"
+          }
+        },
+        "hover": {
+          "background-color": {
+            "$type": "color",
+            "$value": "{lux.color.brand.subdued}"
+          },
+          "color": {
+            "$type": "color",
+            "$value": "{lux.color.foreground.default}"
+          },
+          "border-color": {
+            "$type": "color",
+            "$value": "{lux.color.brand.default}"
+          }
+        },
+        "active": {
+          "background-color": {
+            "$type": "color",
+            "$value": "{lux.color.brand.subdued}"
+          },
+          "color": {
+            "$type": "color",
+            "$value": "{lux.color.foreground.default}"
+          },
+          "border-color": {
+            "$type": "color",
+            "$value": "{lux.color.brand.default}"
+          }
+        },
+        "disabled": {
+          "background-color": {
+            "$type": "color",
+            "$value": "{lux.color.background.subdued}"
+          },
+          "color": {
+            "$type": "color",
+            "$value": "{lux.color.foreground.subdued}"
+          },
+          "border-color": {
+            "$type": "color",
+            "$value": "{lux.color.border.subdued}"
+          }
         }
       }
     }

From 23d92b4957bb852bfd6c1adf1278174f974f1864 Mon Sep 17 00:00:00 2001
From: AlineNap <59806622+AlineNap@users.noreply.github.com>
Date: Wed, 30 Oct 2024 10:10:21 +0100
Subject: [PATCH 11/12] value update

---
 .../design-tokens/src/imported/component/single-checkbox.json   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proprietary/design-tokens/src/imported/component/single-checkbox.json b/proprietary/design-tokens/src/imported/component/single-checkbox.json
index 400edacbc..ed1c92de1 100644
--- a/proprietary/design-tokens/src/imported/component/single-checkbox.json
+++ b/proprietary/design-tokens/src/imported/component/single-checkbox.json
@@ -126,7 +126,7 @@
       "focus-visable": {
         "background-color": {
           "$type": "color",
-          "$value": "{lux.color.background.subdued}"
+          "$value": "{lux.color.none}"
         },
         "color": {
           "$type": "color",

From 18c7344550e0af4fa6f0438a5e6aecdacf9a6902 Mon Sep 17 00:00:00 2001
From: AlineNap <59806622+AlineNap@users.noreply.github.com>
Date: Wed, 30 Oct 2024 15:44:04 +0100
Subject: [PATCH 12/12] update

---
 .../imported/component/single-checkbox.json   | 76 +------------------
 1 file changed, 1 insertion(+), 75 deletions(-)

diff --git a/proprietary/design-tokens/src/imported/component/single-checkbox.json b/proprietary/design-tokens/src/imported/component/single-checkbox.json
index ed1c92de1..c05cadcb2 100644
--- a/proprietary/design-tokens/src/imported/component/single-checkbox.json
+++ b/proprietary/design-tokens/src/imported/component/single-checkbox.json
@@ -94,7 +94,7 @@
       "hover": {
         "background-color": {
           "$type": "color",
-          "$value": "{lux.color.none}"
+          "$value": "{lux.color.brand.subdued}"
         },
         "color": {
           "$type": "color",
@@ -103,10 +103,6 @@
         "border-color": {
           "$type": "color",
           "$value": "{lux.color.brand.default}"
-        },
-        "border-width": {
-          "$type": "borderWidth",
-          "$value": "{lux.border-width.m}"
         }
       },
       "active": {
@@ -150,76 +146,6 @@
           "$type": "color",
           "$value": "{lux.color.border.subdued}"
         }
-      },
-      "checked": {
-        "background-color": {
-          "$type": "color",
-          "$value": "{lux.color.brand.subdued}"
-        },
-        "color": {
-          "$type": "color",
-          "$value": "{lux.color.foreground.default}"
-        },
-        "border-color": {
-          "$type": "color",
-          "$value": "{lux.color.brand.default}"
-        },
-        "focus-visable": {
-          "background-color": {
-            "$type": "color",
-            "$value": "{lux.color.brand.subdued}"
-          },
-          "color": {
-            "$type": "color",
-            "$value": "{lux.color.foreground.default}"
-          },
-          "border-color": {
-            "$type": "color",
-            "$value": "{lux.color.brand.default}"
-          }
-        },
-        "hover": {
-          "background-color": {
-            "$type": "color",
-            "$value": "{lux.color.brand.subdued}"
-          },
-          "color": {
-            "$type": "color",
-            "$value": "{lux.color.foreground.default}"
-          },
-          "border-color": {
-            "$type": "color",
-            "$value": "{lux.color.brand.default}"
-          }
-        },
-        "active": {
-          "background-color": {
-            "$type": "color",
-            "$value": "{lux.color.brand.subdued}"
-          },
-          "color": {
-            "$type": "color",
-            "$value": "{lux.color.foreground.default}"
-          },
-          "border-color": {
-            "$type": "color",
-            "$value": "{lux.color.brand.default}"
-          }
-        },
-        "disabled": {
-          "background-color": {
-            "$type": "color",
-            "$value": "{lux.color.background.subdued}"
-          },
-          "color": {
-            "$type": "color",
-            "$value": "{lux.color.foreground.subdued}"
-          },
-          "border-color": {
-            "$type": "color",
-            "$value": "{lux.color.border.subdued}"
-          }
-        }
       }
     }
   }