diff --git a/proprietary/design-tokens/src/imported/$metadata.json b/proprietary/design-tokens/src/imported/$metadata.json
index d8246953..7cc08bc0 100644
--- a/proprietary/design-tokens/src/imported/$metadata.json
+++ b/proprietary/design-tokens/src/imported/$metadata.json
@@ -24,12 +24,8 @@
     "NLdoc/Ridderkerk",
     "NLdoc/Rijksoverheid",
     "NLdoc/Waterschap Hollandse Delta",
-    "component/alert",
-    "component/button",
     "component/icon-logo",
-    "component/link",
     "component/login link",
-    "component/paragraph",
     "component/radio-group",
     "component/section",
     "nl/utrecht-alert",
diff --git a/proprietary/design-tokens/src/imported/$themes.json b/proprietary/design-tokens/src/imported/$themes.json
index 0b0638e5..4218f2e8 100644
--- a/proprietary/design-tokens/src/imported/$themes.json
+++ b/proprietary/design-tokens/src/imported/$themes.json
@@ -742,9 +742,6 @@
     "name": "default",
     "$figmaStyleReferences": {},
     "selectedTokenSets": {
-      "component/link": "enabled",
-      "component/alert": "enabled",
-      "component/button": "enabled",
       "component/login link": "enabled",
       "component/icon-logo": "enabled"
     },
diff --git a/proprietary/design-tokens/src/imported/component/alert.json b/proprietary/design-tokens/src/imported/component/alert.json
deleted file mode 100644
index 9c3b91c4..00000000
--- a/proprietary/design-tokens/src/imported/component/alert.json
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-  "lux": {
-    "alert": {
-      "color": {
-        "type": "color",
-        "value": "{lux.color.grijs.700}"
-      },
-      "border-color": {
-        "type": "color",
-        "value": "{lux.color.none}"
-      },
-      "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}"
-      },
-      "padding-block-end": {
-        "type": "spacing",
-        "value": "{lux.space.150}"
-      },
-      "padding-block-start": {
-        "type": "spacing",
-        "value": "{lux.space.150}"
-      },
-      "padding-inline-end": {
-        "type": "spacing",
-        "value": "{lux.space.150}"
-      },
-      "padding-inline-start": {
-        "type": "spacing",
-        "value": "{lux.space.150}"
-      },
-      "icon": {
-        "size": {
-          "type": "sizing",
-          "value": "24px"
-        },
-        "inset-block-start": {
-          "value": "{lux.space.25}",
-          "type": "spacing"
-        }
-      },
-      "close-button-size": {
-        "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}"
-        }
-      },
-      "info": {
-        "background-color": {
-          "type": "color",
-          "value": "{lux.color.feedback.info.subdued}"
-        }
-      },
-      "success": {
-        "background-color": {
-          "type": "color",
-          "value": "{lux.color.feedback.success.subdued}"
-        }
-      },
-      "error": {
-        "background-color": {
-          "type": "color",
-          "value": "{lux.color.feedback.error.subdued}"
-        }
-      },
-      "warning": {
-        "background-color": {
-          "type": "color",
-          "value": "{lux.color.feedback.warning.subdued}"
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/proprietary/design-tokens/src/imported/component/button.json b/proprietary/design-tokens/src/imported/component/button.json
deleted file mode 100644
index cce5b096..00000000
--- a/proprietary/design-tokens/src/imported/component/button.json
+++ /dev/null
@@ -1,236 +0,0 @@
-{
-  "lux": {
-    "button": {
-      "font-size": {
-        "type": "fontSizes",
-        "value": "{product.button.font-size}"
-      },
-      "primary": {
-        "font-size": {
-          "type": "fontSizes",
-          "value": "{product.button.primary.font-size}"
-        },
-        "background-color": {
-          "type": "color",
-          "value": "{lux.color.brand.default}"
-        },
-        "border-color": {
-          "type": "color",
-          "value": "{lux.color.none}"
-        },
-        "color": {
-          "type": "color",
-          "value": "{lux.color.foreground.onEmphasis}"
-        },
-        "hover": {
-          "background-color": {
-            "type": "color",
-            "value": "{lux.color.brand.hover}"
-          },
-          "border-color": {
-            "type": "color",
-            "value": "{lux.color.none}"
-          },
-          "color": {
-            "type": "color",
-            "value": "{lux.color.foreground.onEmphasis}"
-          }
-        },
-        "active": {
-          "background-color": {
-            "type": "color",
-            "value": "{lux.color.brand.default}"
-          },
-          "border-color": {
-            "type": "color",
-            "value": "{lux.color.none}"
-          },
-          "color": {
-            "type": "color",
-            "value": "{lux.color.foreground.onEmphasis}"
-          }
-        },
-        "disabled": {
-          "background-color": {
-            "type": "color",
-            "value": "{lux.color.background.subdued}"
-          },
-          "border-color": {
-            "type": "color",
-            "value": "{lux.color.none}"
-          },
-          "color": {
-            "type": "color",
-            "value": "{lux.color.foreground.subdued}"
-          }
-        }
-      },
-      "line-height": {
-        "type": "lineHeights",
-        "value": "{lux.line-height.large-scale.sm}"
-      },
-      "padding-inline-start": {
-        "type": "spacing",
-        "value": "{lux.space.200}"
-      },
-      "padding-block-start": {
-        "type": "spacing",
-        "value": "{lux.space.100}"
-      },
-      "padding-inline-end": {
-        "type": "spacing",
-        "value": "{lux.space.200}"
-      },
-      "padding-block-end": {
-        "type": "spacing",
-        "value": "{lux.space.100}"
-      },
-      "column-gap": {
-        "type": "spacing",
-        "value": "{lux.space.100}"
-      },
-      "min-inline-size": {
-        "type": "sizing",
-        "value": "{lux.size.target}"
-      },
-      "min-block-size": {
-        "type": "sizing",
-        "value": "{lux.size.target}"
-      },
-      "border-radius": {
-        "type": "borderRadius",
-        "value": "{lux.border-radius.default}"
-      },
-      "border-width": {
-        "type": "borderWidth",
-        "value": "{lux.border-width.default}"
-      },
-      "icon": {
-        "size": {
-          "type": "sizing",
-          "value": "{lux.size.icon}"
-        }
-      },
-      "secondary": {
-        "background-color": {
-          "type": "color",
-          "value": "{lux.color.none}"
-        },
-        "border-color": {
-          "type": "color",
-          "value": "{mode.button.secondary.border-color}"
-        },
-        "color": {
-          "type": "color",
-          "value": "{mode.button.secondary.color}"
-        },
-        "hover": {
-          "background-color": {
-            "type": "color",
-            "value": "{mode.button.secondary.hover.background-color}"
-          },
-          "border-color": {
-            "type": "color",
-            "value": "{mode.button.secondary.hover.border-color}"
-          },
-          "color": {
-            "type": "color",
-            "value": "{mode.button.secondary.hover.color}"
-          }
-        },
-        "active": {
-          "background-color": {
-            "type": "color",
-            "value": "{lux.color.none}"
-          },
-          "border-color": {
-            "type": "color",
-            "value": "{mode.button.secondary.border-color}"
-          },
-          "color": {
-            "type": "color",
-            "value": "{mode.button.secondary.color}"
-          }
-        },
-        "disabled": {
-          "background-color": {
-            "type": "color",
-            "value": "{lux.color.background.subdued}"
-          },
-          "border-color": {
-            "type": "color",
-            "value": "{lux.color.none}"
-          },
-          "color": {
-            "type": "color",
-            "value": "{lux.color.foreground.subdued}"
-          }
-        }
-      },
-      "tertiary": {
-        "background-color": {
-          "type": "color",
-          "value": "{lux.color.none}"
-        },
-        "border-color": {
-          "type": "color",
-          "value": "{lux.color.none}"
-        },
-        "color": {
-          "type": "color",
-          "value": "{mode.button.tertiary.color}"
-        },
-        "hover": {
-          "background-color": {
-            "type": "color",
-            "value": "{mode.button.tertiary.hover.background-color}"
-          },
-          "border-color": {
-            "type": "color",
-            "value": "{lux.color.none}"
-          },
-          "color": {
-            "type": "color",
-            "value": "{mode.button.tertiary.hover.color}"
-          }
-        },
-        "active": {
-          "background-color": {
-            "type": "color",
-            "value": "{lux.color.none}"
-          },
-          "border-color": {
-            "type": "color",
-            "value": "{lux.color.none}"
-          },
-          "color": {
-            "type": "color",
-            "value": "{mode.button.tertiary.color}"
-          }
-        },
-        "disabled": {
-          "background-color": {
-            "type": "color",
-            "value": "{lux.color.background.subdued}"
-          },
-          "border-color": {
-            "type": "color",
-            "value": "{lux.color.none}"
-          },
-          "color": {
-            "type": "color",
-            "value": "{lux.color.foreground.subdued}"
-          }
-        }
-      },
-      "font-weight": {
-        "type": "fontWeights",
-        "value": "{lux.font-weight.bold}"
-      },
-      "font-family": {
-        "type": "fontFamilies",
-        "value": "{lux.font-family.primary}"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/proprietary/design-tokens/src/imported/component/link.json b/proprietary/design-tokens/src/imported/component/link.json
deleted file mode 100644
index db7ab88e..00000000
--- a/proprietary/design-tokens/src/imported/component/link.json
+++ /dev/null
@@ -1,80 +0,0 @@
-{
-  "lux": {
-    "link": {
-      "color": {
-        "type": "color",
-        "value": "{mode.link.color}"
-      },
-      "column-gap": {
-        "type": "spacing",
-        "value": "{lux.space.50}"
-      },
-      "icon": {
-        "size": {
-          "type": "sizing",
-          "value": "{lux.size.icon}"
-        }
-      },
-      "hover": {
-        "color": {
-          "type": "color",
-          "value": "{mode.link.hover.color}"
-        },
-        "text-decoration": {
-          "value": "none",
-          "type": "textDecoration"
-        }
-      },
-      "active": {
-        "color": {
-          "type": "color",
-          "value": "{mode.link.active.color}"
-        },
-        "text-decoration": {
-          "value": "none",
-          "type": "textDecoration"
-        }
-      },
-      "visited": {
-        "color": {
-          "type": "color",
-          "value": "{mode.link.visited.color}"
-        }
-      },
-      "font-family": {
-        "type": "fontFamilies",
-        "value": "{lux.font-family.primary}"
-      },
-      "font-weight": {
-        "type": "fontWeights",
-        "value": "{lux.font-weight.regular}"
-      },
-      "line-height": {
-        "type": "lineHeights",
-        "value": "{lux.line-height.body.default}"
-      },
-      "font-size": {
-        "type": "fontSizes",
-        "value": "{lux.font-size.body.default}"
-      },
-      "text-decoration": {
-        "value": "underline",
-        "type": "textDecoration"
-      },
-      "focus": {
-        "text-decoration": {
-          "value": "none",
-          "type": "textDecoration"
-        },
-        "color": {
-          "type": "color",
-          "value": "{lux.color.foreground.link}"
-        },
-        "background-color": {
-          "value": "{lux.color.none}",
-          "type": "color"
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/proprietary/design-tokens/src/imported/component/paragraph.json b/proprietary/design-tokens/src/imported/component/paragraph.json
deleted file mode 100644
index b9cb593d..00000000
--- a/proprietary/design-tokens/src/imported/component/paragraph.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "lux": {
-    "paragraph": {
-      "color": {
-        "value": "{lux.color.foreground.default}",
-        "type": "color"
-      },
-      "font-family": {
-        "value": "{lux.font-family.primary}",
-        "type": "fontFamilies"
-      },
-      "default": {
-        "font-size": {
-          "value": "{lux.font-size.body.default}",
-          "type": "fontSizes"
-        },
-        "line-height": {
-          "value": "{lux.line-height.body.default}",
-          "type": "lineHeights"
-        }
-      },
-      "font-weight": {
-        "value": "{lux.font-weight.regular}",
-        "type": "fontWeights"
-      },
-      "lead": {
-        "font-size": {
-          "value": "{lux.font-size.body.large}",
-          "type": "fontSizes"
-        },
-        "line-height": {
-          "value": "{lux.line-height.body.large}",
-          "type": "lineHeights"
-        }
-      },
-      "small": {
-        "font-size": {
-          "value": "{lux.font-size.body.small}",
-          "type": "fontSizes"
-        },
-        "line-height": {
-          "value": "{lux.line-height.body.small}",
-          "type": "lineHeights"
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/proprietary/design-tokens/src/imported/nl/utrecht-alert.json b/proprietary/design-tokens/src/imported/nl/utrecht-alert.json
index 45654c6e..82092c57 100644
--- a/proprietary/design-tokens/src/imported/nl/utrecht-alert.json
+++ b/proprietary/design-tokens/src/imported/nl/utrecht-alert.json
@@ -7,15 +7,15 @@
       },
       "border-color": {
         "type": "color",
-        "value": "{lux.alert.border-color}"
+        "value": "{lux.color.none}"
       },
       "border-radius": {
         "type": "borderRadius",
-        "value": "{lux.alert.border-radius}"
+        "value": "{lux.border-radius.default}"
       },
       "border-width": {
         "type": "borderWidth",
-        "value": "{lux.alert.border-width}"
+        "value": "{lux.border-width.default}"
       },
       "color": {
         "type": "color",
@@ -23,64 +23,64 @@
       },
       "column-gap": {
         "type": "spacing",
-        "value": "{lux.alert.column-gap}"
+        "value": "{lux.space.100}"
       },
       "padding-block-start": {
         "type": "spacing",
-        "value": "{lux.alert.padding-block-start}"
+        "value": "{lux.space.150}"
       },
       "padding-block-end": {
         "type": "spacing",
-        "value": "{lux.alert.padding-block-end}"
+        "value": "{lux.space.150}"
       },
       "padding-inline-start": {
         "type": "spacing",
-        "value": "{lux.alert.padding-inline-start}"
+        "value": "{lux.space.150}"
       },
       "padding-inline-end": {
         "type": "spacing",
-        "value": "{lux.alert.padding-inline-end}"
+        "value": "{lux.space.150}"
       },
       "warning": {
         "background-color": {
           "type": "color",
-          "value": "{lux.alert.warning.background-color}"
+          "value": "{lux.color.feedback.warning.subdued}"
         },
         "color": {
           "type": "color",
-          "value": "{lux.alert.color}"
+          "value": "{lux.color.grijs.700}"
         },
         "border-color": {
           "type": "color",
-          "value": "{lux.alert.border-color}"
+          "value": "{lux.color.none}"
         }
       },
       "error": {
         "background-color": {
           "type": "color",
-          "value": "{lux.alert.error.background-color}"
+          "value": "{lux.color.feedback.error.subdued}"
         },
         "color": {
           "type": "color",
-          "value": "{lux.alert.color}"
+          "value": "{lux.color.grijs.700}"
         },
         "border-color": {
           "type": "color",
-          "value": "{lux.alert.border-color}"
+          "value": "{lux.color.none}"
         }
       },
       "ok": {
         "background-color": {
           "type": "color",
-          "value": "{lux.alert.success.background-color}"
+          "value": "{lux.color.feedback.success.subdued}"
         },
         "color": {
           "type": "color",
-          "value": "{lux.alert.color}"
+          "value": "{lux.color.grijs.700}"
         },
         "border-color": {
           "type": "color",
-          "value": "{lux.alert.border-color}"
+          "value": "{lux.color.none}"
         }
       },
       "icon": {
@@ -117,7 +117,7 @@
           }
         },
         "size": {
-          "value": "{lux.alert.icon.size}",
+          "value": "1.5rem",
           "type": "sizing"
         }
       },
@@ -130,21 +130,35 @@
       "info": {
         "background-color": {
           "type": "color",
-          "value": "{lux.alert.info.background-color}"
+          "value": "{lux.color.feedback.info.subdued}"
         },
         "color": {
           "type": "color",
-          "value": "{lux.alert.color}"
+          "value": "{lux.color.grijs.700}"
         },
         "border-color": {
           "type": "color",
-          "value": "{lux.alert.border-color}"
+          "value": "{lux.color.none}"
         }
       }
     }
   },
   "lux": {
     "alert": {
+      "color": {
+        "type": "color",
+        "value": "{lux.color.grijs.700}"
+      },
+      "icon": {
+        "inset-block-start": {
+          "value": "{lux.space.25}",
+          "type": "spacing"
+        },
+        "size": {
+          "value": "1.5rem",
+          "type": "sizing"
+        }
+      },
       "heading": {
         "font-family": {
           "value": "{lux.font-family.primary}",
diff --git a/proprietary/design-tokens/src/imported/nl/utrecht-button.json b/proprietary/design-tokens/src/imported/nl/utrecht-button.json
index ea5d64c6..dc074bb4 100644
--- a/proprietary/design-tokens/src/imported/nl/utrecht-button.json
+++ b/proprietary/design-tokens/src/imported/nl/utrecht-button.json
@@ -11,11 +11,11 @@
       },
       "border-radius": {
         "type": "borderRadius",
-        "value": "{lux.button.border-radius}"
+        "value": "{lux.border-radius.default}"
       },
       "border-width": {
         "type": "borderWidth",
-        "value": "{lux.button.border-width}"
+        "value": "{lux.border-width.default}"
       },
       "color": {
         "type": "color",
@@ -23,77 +23,77 @@
       },
       "font-family": {
         "type": "fontFamilies",
-        "value": "{lux.button.font-family}"
+        "value": "{lux.font-family.primary}"
       },
       "font-size": {
         "type": "fontSizes",
-        "value": "{lux.button.font-size}"
+        "value": "{product.button.font-size}"
       },
       "primary-action": {
         "font-size": {
           "type": "fontSizes",
-          "value": "{lux.button.primary.font-size}"
+          "value": "{product.button.primary.font-size}"
         },
         "background-color": {
           "type": "color",
-          "value": "{lux.button.primary.background-color}"
+          "value": "{lux.color.brand.default}"
         },
         "border-color": {
           "type": "color",
-          "value": "{lux.button.primary.border-color}"
+          "value": "{lux.color.none}"
         },
         "border-width": {
           "type": "borderWidth",
-          "value": "{lux.button.border-width}"
+          "value": "{lux.border-width.default}"
         },
         "color": {
           "type": "color",
-          "value": "{lux.button.primary.color}"
+          "value": "{lux.color.foreground.onEmphasis}"
         },
         "font-weight": {
           "type": "fontWeights",
-          "value": "{lux.button.font-weight}"
+          "value": "{lux.font-weight.bold}"
         },
         "active": {
           "background-color": {
             "type": "color",
-            "value": "{lux.button.primary.active.background-color}"
+            "value": "{lux.color.brand.default}"
           },
           "border-color": {
             "type": "color",
-            "value": "{lux.button.primary.active.border-color}"
+            "value": "{lux.color.none}"
           },
           "color": {
             "type": "color",
-            "value": "{lux.button.primary.active.color}"
+            "value": "{lux.color.foreground.onEmphasis}"
           }
         },
         "disabled": {
           "background-color": {
             "type": "color",
-            "value": "{lux.button.primary.disabled.background-color}"
+            "value": "{lux.color.background.subdued}"
           },
           "border-color": {
             "type": "color",
-            "value": "{lux.button.primary.disabled.border-color}"
+            "value": "{lux.color.none}"
           },
           "color": {
             "type": "color",
-            "value": "{lux.button.primary.disabled.color}"
+            "value": "{lux.color.foreground.subdued}"
           }
         },
         "hover": {
           "background-color": {
             "type": "color",
-            "value": "{lux.button.primary.hover.background-color}"
+            "value": "{lux.color.brand.hover}"
           },
           "border-color": {
             "type": "color",
-            "value": "{lux.button.primary.hover.border-color}"
+            "value": "{lux.color.none}"
           },
           "color": {
             "type": "color",
-            "value": "{lux.button.primary.hover.color}"
+            "value": "{lux.color.foreground.onEmphasis}"
           },
           "scale": {
             "type": "other",
@@ -103,39 +103,39 @@
         "focus": {
           "background-color": {
             "type": "color",
-            "value": "{lux.button.primary.background-color}"
+            "value": "{lux.color.brand.default}"
           },
           "border-color": {
             "type": "color",
-            "value": "{lux.button.primary.hover.border-color}"
+            "value": "{lux.color.none}"
           },
           "color": {
             "type": "color",
-            "value": "{lux.button.primary.color}"
+            "value": "{lux.color.foreground.onEmphasis}"
           }
         },
         "pressed": {
           "background-color": {
             "type": "color",
-            "value": "{lux.button.primary.hover.background-color}"
+            "value": "{lux.color.brand.hover}"
           },
           "border-color": {
             "type": "color",
-            "value": "{lux.button.primary.hover.border-color}"
+            "value": "{lux.color.none}"
           },
           "color": {
             "type": "color",
-            "value": "{lux.button.primary.hover.color}"
+            "value": "{lux.color.foreground.onEmphasis}"
           }
         },
         "line-height": {
-          "value": "{lux.button.line-height}",
+          "value": "{lux.line-height.large-scale.sm}",
           "type": "lineHeights"
         }
       },
       "font-weight": {
         "type": "fontWeights",
-        "value": "{lux.button.font-weight}"
+        "value": "{lux.font-weight.bold}"
       },
       "inline-size": {
         "type": "sizing",
@@ -144,35 +144,35 @@
       },
       "line-height": {
         "type": "lineHeights",
-        "value": "{lux.button.line-height}"
+        "value": "{lux.line-height.large-scale.sm}"
       },
       "min-block-size": {
         "type": "sizing",
-        "value": "{lux.button.min-block-size}"
+        "value": "{lux.size.target}"
       },
       "min-inline-size": {
         "type": "sizing",
-        "value": "{lux.button.min-inline-size}"
+        "value": "{lux.size.target}"
       },
       "column-gap": {
         "type": "spacing",
-        "value": "{lux.button.column-gap}"
+        "value": "{lux.space.100}"
       },
       "padding-block-start": {
         "type": "spacing",
-        "value": "{lux.button.padding-block-start}"
+        "value": "{lux.space.100}"
       },
       "padding-block-end": {
         "type": "spacing",
-        "value": "{lux.button.padding-block-end}"
+        "value": "{lux.space.100}"
       },
       "padding-inline-start": {
         "type": "spacing",
-        "value": "{lux.button.padding-inline-start}"
+        "value": "{lux.space.200}"
       },
       "padding-inline-end": {
         "type": "spacing",
-        "value": "{lux.button.padding-inline-end}"
+        "value": "{lux.space.200}"
       },
       "text-transform": {
         "type": "other",
@@ -199,7 +199,7 @@
         },
         "size": {
           "type": "sizing",
-          "value": "{lux.button.icon.size}"
+          "value": "{lux.size.icon}"
         }
       },
       "disabled": {
@@ -269,64 +269,64 @@
       "secondary-action": {
         "background-color": {
           "type": "color",
-          "value": "{lux.button.secondary.background-color}"
+          "value": "{lux.color.none}"
         },
         "border-color": {
           "type": "color",
-          "value": "{lux.button.secondary.border-color}"
+          "value": "{mode.button.secondary.border-color}"
         },
         "border-width": {
           "type": "borderWidth",
-          "value": "{lux.button.border-width}"
+          "value": "{lux.border-width.default}"
         },
         "color": {
           "type": "color",
-          "value": "{lux.button.secondary.color}"
+          "value": "{mode.button.secondary.color}"
         },
         "font-weight": {
           "type": "fontWeights",
-          "value": "{lux.button.font-weight}"
+          "value": "{lux.font-weight.bold}"
         },
         "active": {
           "background-color": {
             "type": "color",
-            "value": "{lux.button.secondary.active.background-color}"
+            "value": "{lux.color.none}"
           },
           "border-color": {
             "type": "color",
-            "value": "{lux.button.secondary.active.border-color}"
+            "value": "{mode.button.secondary.border-color}"
           },
           "color": {
             "type": "color",
-            "value": "{lux.button.secondary.active.color}"
+            "value": "{mode.button.secondary.color}"
           }
         },
         "disabled": {
           "background-color": {
             "type": "color",
-            "value": "{lux.button.secondary.disabled.background-color}"
+            "value": "{lux.color.background.subdued}"
           },
           "border-color": {
             "type": "color",
-            "value": "{lux.button.secondary.disabled.border-color}"
+            "value": "{lux.color.none}"
           },
           "color": {
             "type": "color",
-            "value": "{lux.button.secondary.disabled.color}"
+            "value": "{lux.color.foreground.subdued}"
           }
         },
         "hover": {
           "background-color": {
             "type": "color",
-            "value": "{lux.button.secondary.hover.background-color}"
+            "value": "{mode.button.secondary.hover.background-color}"
           },
           "border-color": {
             "type": "color",
-            "value": "{lux.button.secondary.hover.border-color}"
+            "value": "{mode.button.secondary.hover.border-color}"
           },
           "color": {
             "type": "color",
-            "value": "{lux.button.secondary.hover.color}"
+            "value": "{mode.button.secondary.hover.color}"
           },
           "scale": {
             "type": "other",
@@ -336,101 +336,101 @@
         "focus": {
           "background-color": {
             "type": "color",
-            "value": "{lux.button.secondary.background-color}"
+            "value": "{lux.color.none}"
           },
           "border-color": {
             "type": "color",
-            "value": "{lux.button.secondary.border-color}"
+            "value": "{mode.button.secondary.border-color}"
           },
           "color": {
             "type": "color",
-            "value": "{lux.button.secondary.color}"
+            "value": "{mode.button.secondary.color}"
           }
         },
         "pressed": {
           "background-color": {
             "type": "color",
-            "value": "{lux.button.secondary.hover.background-color}"
+            "value": "{mode.button.secondary.hover.background-color}"
           },
           "border-color": {
             "type": "color",
-            "value": "{lux.button.secondary.hover.border-color}"
+            "value": "{mode.button.secondary.hover.border-color}"
           },
           "color": {
             "type": "color",
-            "value": "{lux.button.secondary.hover.color}"
+            "value": "{mode.button.secondary.hover.color}"
           }
         },
         "line-height": {
-          "value": "{lux.button.line-height}",
+          "value": "{lux.line-height.large-scale.sm}",
           "type": "lineHeights"
         },
         "font-size": {
           "type": "fontSizes",
-          "value": "{lux.button.font-size}"
+          "value": "{product.button.font-size}"
         }
       },
       "subtle": {
         "background-color": {
           "type": "color",
-          "value": "{lux.button.tertiary.background-color}"
+          "value": "{lux.color.none}"
         },
         "border-color": {
           "type": "color",
-          "value": "{lux.button.tertiary.border-color}"
+          "value": "{lux.color.none}"
         },
         "border-width": {
           "type": "borderWidth",
-          "value": "{lux.button.border-width}"
+          "value": "{lux.border-width.default}"
         },
         "color": {
           "type": "color",
-          "value": "{lux.button.tertiary.color}"
+          "value": "{mode.button.tertiary.color}"
         },
         "font-weight": {
           "type": "fontWeights",
-          "value": "{lux.button.font-weight}"
+          "value": "{lux.font-weight.bold}"
         },
         "active": {
           "background-color": {
             "type": "color",
-            "value": "{lux.button.tertiary.active.background-color}"
+            "value": "{lux.color.none}"
           },
           "border-color": {
             "type": "color",
-            "value": "{lux.button.tertiary.active.border-color}"
+            "value": "{lux.color.none}"
           },
           "color": {
             "type": "color",
-            "value": "{lux.button.tertiary.active.color}"
+            "value": "{mode.button.tertiary.color}"
           }
         },
         "disabled": {
           "background-color": {
             "type": "color",
-            "value": "{lux.button.tertiary.disabled.background-color}"
+            "value": "{lux.color.background.subdued}"
           },
           "border-color": {
             "type": "color",
-            "value": "{lux.button.tertiary.disabled.border-color}"
+            "value": "{lux.color.none}"
           },
           "color": {
             "type": "color",
-            "value": "{lux.button.tertiary.disabled.color}"
+            "value": "{lux.color.foreground.subdued}"
           }
         },
         "hover": {
           "background-color": {
             "type": "color",
-            "value": "{lux.button.tertiary.hover.background-color}"
+            "value": "{mode.button.tertiary.hover.background-color}"
           },
           "border-color": {
             "type": "color",
-            "value": "{lux.button.tertiary.hover.border-color}"
+            "value": "{lux.color.none}"
           },
           "color": {
             "type": "color",
-            "value": "{lux.button.tertiary.hover.color}"
+            "value": "{mode.button.tertiary.hover.color}"
           },
           "scale": {
             "type": "other",
@@ -440,38 +440,38 @@
         "focus": {
           "background-color": {
             "type": "color",
-            "value": "{lux.button.tertiary.background-color}"
+            "value": "{lux.color.none}"
           },
           "border-color": {
             "type": "color",
-            "value": "{lux.button.tertiary.border-color}"
+            "value": "{lux.color.none}"
           },
           "color": {
             "type": "color",
-            "value": "{lux.button.tertiary.color}"
+            "value": "{mode.button.tertiary.color}"
           }
         },
         "pressed": {
           "background-color": {
             "type": "color",
-            "value": "{lux.button.tertiary.hover.background-color}"
+            "value": "{mode.button.tertiary.hover.background-color}"
           },
           "border-color": {
             "type": "color",
-            "value": "{lux.button.tertiary.hover.border-color}"
+            "value": "{lux.color.none}"
           },
           "color": {
             "type": "color",
-            "value": "{lux.button.tertiary.hover.color}"
+            "value": "{mode.button.tertiary.hover.color}"
           }
         },
         "line-height": {
-          "value": "{lux.button.line-height}",
+          "value": "{lux.line-height.large-scale.sm}",
           "type": "lineHeights"
         },
         "font-size": {
           "type": "fontSizes",
-          "value": "{lux.button.font-size}"
+          "value": "{product.button.font-size}"
         }
       }
     }
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 55f4fe76..52da35e7 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
@@ -31,11 +31,6 @@
         "value": "{lux.color.none}",
         "type": "color"
       },
-      "border-radius": {
-        "value": "{lux.border-radius.default}",
-        "type": "borderRadius",
-        "description": "todo token"
-      },
       "padding-block-end": {
         "value": "{lux.space.0}",
         "type": "spacing"
@@ -60,10 +55,6 @@
         "value": "{lux.line-height.body.default}",
         "type": "lineHeights"
       },
-      "border-width": {
-        "value": "{lux.alert.border-width}",
-        "type": "borderWidth"
-      },
       "border-color": {
         "value": "{lux.color.none}",
         "type": "color"
@@ -77,5 +68,18 @@
         }
       }
     }
+  },
+  "todo": {
+    "form-field-error-message": {
+      "border-radius": {
+        "value": "{lux.border-radius.default}",
+        "type": "borderRadius",
+        "description": "todo token"
+      },
+      "border-width": {
+        "value": "{lux.border-width.default}",
+        "type": "borderWidth"
+      }
+    }
   }
 }
\ No newline at end of file
diff --git a/proprietary/design-tokens/src/imported/nl/utrecht-link.json b/proprietary/design-tokens/src/imported/nl/utrecht-link.json
index 5f4ff99c..803e9c73 100644
--- a/proprietary/design-tokens/src/imported/nl/utrecht-link.json
+++ b/proprietary/design-tokens/src/imported/nl/utrecht-link.json
@@ -3,11 +3,11 @@
     "link": {
       "color": {
         "type": "color",
-        "value": "{lux.link.color}"
+        "value": "{lux.color.foreground.link}"
       },
       "text-decoration-color": {
         "type": "color",
-        "value": "{lux.link.color}"
+        "value": "{lux.color.foreground.link}"
       },
       "text-decoration-thickness": {
         "type": "other",
@@ -20,79 +20,79 @@
       "active": {
         "color": {
           "type": "color",
-          "value": "{lux.link.active.color}"
+          "value": "{mode.link.active.color}"
         },
         "text-decoration": {
-          "value": "{lux.link.active.text-decoration}",
+          "value": "none",
           "type": "textDecoration"
         }
       },
       "focus": {
         "color": {
           "type": "color",
-          "value": "{lux.link.focus.color}"
+          "value": "{lux.color.foreground.link}"
         },
         "text-decoration-thickness": {
           "type": "other",
           "value": "auto"
         },
         "background-color": {
-          "value": "{lux.link.focus.background-color}",
+          "value": "{lux.color.none}",
           "type": "color"
         },
         "text-decoration": {
-          "value": "{lux.link.focus.text-decoration}",
+          "value": "none",
           "type": "textDecoration"
         }
       },
       "hover": {
         "color": {
           "type": "color",
-          "value": "{lux.link.hover.color}"
+          "value": "{mode.link.hover.color}"
         },
         "text-decoration-thickness": {
           "type": "other",
           "value": "auto"
         },
         "text-decoration": {
-          "value": "{lux.link.hover.text-decoration}",
+          "value": "none",
           "type": "textDecoration"
         }
       },
       "font-weight": {
         "type": "fontWeights",
-        "value": "{lux.link.font-weight}"
+        "value": "{lux.font-weight.regular}"
       },
       "visited": {
         "color": {
           "type": "color",
-          "value": "{lux.link.visited.color}"
+          "value": "{mode.link.visited.color}"
         }
       },
       "icon": {
         "size": {
           "type": "sizing",
-          "value": "{lux.link.icon.size}"
+          "value": "{lux.size.icon}"
         }
       },
       "font-family": {
-        "value": "{lux.link.font-family}",
+        "value": "{lux.font-family.primary}",
         "type": "fontFamilies"
       },
       "line-height": {
-        "value": "{lux.link.line-height}",
+        "value": "{lux.line-height.body.default}",
         "type": "lineHeights"
       },
       "font-size": {
-        "value": "{lux.link.font-size}",
+        "value": "{lux.font-size.body.default}",
         "type": "fontSizes"
       },
       "text-decoration": {
-        "value": "{lux.link.text-decoration}",
+        "value": "underline",
         "type": "textDecoration"
       },
       "column-gap": {
-        "value": "{lux.link.column-gap}",
+        "value": "{lux.space.50}",
         "type": "spacing"
       }
     }
diff --git a/proprietary/design-tokens/src/imported/nl/utrecht-paragraph.json b/proprietary/design-tokens/src/imported/nl/utrecht-paragraph.json
index 0f188de1..336baeef 100644
--- a/proprietary/design-tokens/src/imported/nl/utrecht-paragraph.json
+++ b/proprietary/design-tokens/src/imported/nl/utrecht-paragraph.json
@@ -2,23 +2,23 @@
   "utrecht": {
     "paragraph": {
       "color": {
-        "value": "{lux.paragraph.color}",
+        "value": "{lux.color.foreground.default}",
         "type": "color"
       },
       "font-family": {
-        "value": "{lux.paragraph.font-family}",
+        "value": "{lux.font-family.primary}",
         "type": "fontFamilies"
       },
       "font-size": {
-        "value": "{lux.paragraph.default.font-size}",
+        "value": "{lux.font-size.body.default}",
         "type": "fontSizes"
       },
       "font-weight": {
-        "value": "{lux.paragraph.font-weight}",
+        "value": "{lux.font-weight.regular}",
         "type": "fontWeights"
       },
       "line-height": {
-        "value": "{lux.paragraph.default.line-height}",
+        "value": "{lux.line-height.body.default}",
         "type": "lineHeights"
       },
       "margin-block-end": {
@@ -31,37 +31,37 @@
       },
       "lead": {
         "color": {
-          "value": "{lux.paragraph.color}",
+          "value": "{lux.color.foreground.default}",
           "type": "color"
         },
         "font-size": {
-          "value": "{lux.paragraph.lead.font-size}",
+          "value": "{lux.font-size.body.large}",
           "type": "fontSizes"
         },
         "font-weight": {
-          "value": "{lux.paragraph.font-weight}",
+          "value": "{lux.font-weight.regular}",
           "type": "fontWeights"
         },
         "line-height": {
-          "value": "{lux.paragraph.lead.line-height}",
+          "value": "{lux.line-height.body.large}",
           "type": "lineHeights"
         }
       },
       "small": {
         "color": {
-          "value": "{lux.paragraph.color}",
+          "value": "{lux.color.foreground.default}",
           "type": "color"
         },
         "font-size": {
-          "value": "{lux.paragraph.small.font-size}",
+          "value": "{lux.font-size.body.small}",
           "type": "fontSizes"
         },
         "font-weight": {
-          "value": "{lux.paragraph.font-weight}",
+          "value": "{lux.font-weight.regular}",
           "type": "fontWeights"
         },
         "line-height": {
-          "value": "{lux.paragraph.small.line-height}",
+          "value": "{lux.line-height.body.small}",
           "type": "lineHeights"
         }
       }
diff --git a/proprietary/design-tokens/src/imported/nl/utrecht-radio-button.json b/proprietary/design-tokens/src/imported/nl/utrecht-radio-button.json
index 514a2a98..134d05eb 100644
--- a/proprietary/design-tokens/src/imported/nl/utrecht-radio-button.json
+++ b/proprietary/design-tokens/src/imported/nl/utrecht-radio-button.json
@@ -29,7 +29,7 @@
       },
       "invalid": {
         "background-color": {
-          "value": "{lux.alert.error.background-color}",
+          "value": "{lux.color.feedback.error.default}",
           "type": "color"
         },
         "border-color": {