diff --git a/src/assets/fonts/noto-sans/NotoSans-Bold.woff2 b/src/assets/fonts/noto-sans/NotoSans-Bold.woff2
new file mode 100644
index 00000000..bb0ecf33
Binary files /dev/null and b/src/assets/fonts/noto-sans/NotoSans-Bold.woff2 differ
diff --git a/src/assets/fonts/noto-sans/NotoSans-Regular.woff2 b/src/assets/fonts/noto-sans/NotoSans-Regular.woff2
new file mode 100644
index 00000000..0ce57f4c
Binary files /dev/null and b/src/assets/fonts/noto-sans/NotoSans-Regular.woff2 differ
diff --git a/src/lib/providers/prime-preset/tokens/components/accordion.ts b/src/lib/providers/prime-preset/tokens/components/accordion.ts
index b9b38aa9..500facbb 100644
--- a/src/lib/providers/prime-preset/tokens/components/accordion.ts
+++ b/src/lib/providers/prime-preset/tokens/components/accordion.ts
@@ -5,8 +5,8 @@
 export const accordionCss = ({ dt }: { dt: (token: string) => string }): string => `
   /* ─── Шрифт заголовка ─── */
   .p-accordionheader {
-    font-family: ${dt('fonts.fontFamily.base')};
-    font-size: ${dt('fonts.fontSize.300')};
+    font-family: ${dt('accordion.extend.fonts_fontFamily_base')};
+    font-size: ${dt('accordion.extend.fonts_fontSize_300')};
   }
 
   /* ─── Размер иконки toggle ─── */
diff --git a/src/lib/providers/prime-preset/tokens/components/autocomplete.ts b/src/lib/providers/prime-preset/tokens/components/autocomplete.ts
index e1119016..b989d14b 100644
--- a/src/lib/providers/prime-preset/tokens/components/autocomplete.ts
+++ b/src/lib/providers/prime-preset/tokens/components/autocomplete.ts
@@ -8,14 +8,14 @@ export const autocompleteCss = ({ dt }: { dt: (token: string) => string }): stri
   .p-autocomplete:has(input:disabled) .p-autocomplete-input,
   .p-autocomplete:has(input:disabled) .p-autocomplete-input-multiple,
   .p-autocomplete:has(input:disabled) .p-autocomplete-dropdown {
-    border-color: ${dt('form.borderColor')};
+    border-color: ${dt('autocomplete.extend.form_borderColor')};
   }
 
   /* ─── Инпут и границы ─── */
   .p-autocomplete .p-autocomplete-input {
     width: 100%;
     padding: ${dt('autocomplete.root.paddingY')} ${dt('autocomplete.root.paddingX')};
-    line-height: ${dt('fonts.lineHeight.250')};
+    line-height: ${dt('autocomplete.extend.fonts_lineHeight_250')};
   }
 
   /* Монолитный вид: убираем стыкующиеся границы инпута и dropdown-кнопки.
@@ -34,12 +34,12 @@ export const autocompleteCss = ({ dt }: { dt: (token: string) => string }): stri
   .p-autocomplete.p-component:not(:has(input:disabled)):hover .p-inputtext.p-autocomplete-input,
   .p-autocomplete.p-component:not(:has(input:disabled)):hover .p-autocomplete-dropdown,
   .p-autocomplete.p-component:not(:has(input:disabled)):has(.p-autocomplete-input:hover) .p-autocomplete-dropdown {
-    border-color: ${dt('form.hoverBorderSecondaryColor')};
+    border-color: ${dt('autocomplete.extend.form_hoverBorderSecondaryColor')};
   }
 
   /* ─── States: Focus ─── */
   .p-autocomplete:has(.p-autocomplete-input:focus) .p-autocomplete-dropdown {
-    border-color: ${dt('form.focusBorderSecondaryColor')};
+    border-color: ${dt('autocomplete.extend.form_focusBorderSecondaryColor')};
   }
 
   /* ─── Иконки ─── */
@@ -49,12 +49,12 @@ export const autocompleteCss = ({ dt }: { dt: (token: string) => string }): stri
   }
 
   .p-autocomplete.p-component:has(.p-autocomplete-dropdown) .p-autocomplete-clear-icon {
-    inset-inline-end: ${dt('form.width.300')};
+    inset-inline-end: ${dt('autocomplete.extend.form_width_300')};
   }
 
   /* ─── Multiple: чипсы ─── */
   .p-autocomplete .p-autocomplete-input-multiple {
-    line-height: ${dt('fonts.lineHeight.250')};
+    line-height: ${dt('autocomplete.extend.fonts_lineHeight_250')};
     padding: ${dt('autocomplete.root.paddingY')} ${dt('autocomplete.root.paddingX')};
   }
 
@@ -138,8 +138,8 @@ export const autocompleteCss = ({ dt }: { dt: (token: string) => string }): stri
   }
 
   .p-autocomplete.p-component .p-inputtext-xlg .p-autocomplete-chip {
-    padding-top: ${dt('spacing.2x')};
-    padding-bottom: ${dt('spacing.2x')};
-    font-size: ${dt('fonts.fontSize.300')};
+    padding-top: ${dt('autocomplete.extend.dimension_space_200')};
+    padding-bottom: ${dt('autocomplete.extend.dimension_space_200')};
+    font-size: ${dt('autocomplete.extend.fonts_fontSize_300')};
   }
 `;
diff --git a/src/lib/providers/prime-preset/tokens/components/avatar.ts b/src/lib/providers/prime-preset/tokens/components/avatar.ts
index 2c80d571..732298c4 100644
--- a/src/lib/providers/prime-preset/tokens/components/avatar.ts
+++ b/src/lib/providers/prime-preset/tokens/components/avatar.ts
@@ -2,10 +2,10 @@ export const avatarCss = ({ dt }: { dt: (token: string) => string }): string =>
   :root {
     --p-avatar-extend-border-color:         ${dt('avatar.extend.borderColor')};
     --p-avatar-extend-circle-border-radius: ${dt('avatar.extend.circle.borderRadius')};
-    --p-avatar-group-border-color:          ${dt('content.background')};
-    --p-avatar-group-offset:                calc(-1 * ${dt('media.padding.300')});
-    --p-avatar-lg-group-offset:             calc(-1 * ${dt('media.padding.300')});
-    --p-avatar-xl-group-offset:             calc(-1 * ${dt('media.padding.600')});
+    --p-avatar-group-border-color:          ${dt('avatar.extend.content_background')};
+    --p-avatar-group-offset:                calc(-1 * ${dt('avatar.extend.media_padding_300')});
+    --p-avatar-lg-group-offset:             calc(-1 * ${dt('avatar.extend.media_padding_300')});
+    --p-avatar-xl-group-offset:             calc(-1 * ${dt('avatar.extend.media_padding_600')});
   }
 
   /* ─── Группировка: отступы для кастомных классов хост-элемента <avatar> ─── */
diff --git a/src/lib/providers/prime-preset/tokens/components/breadcrumb.ts b/src/lib/providers/prime-preset/tokens/components/breadcrumb.ts
index 5c6fe006..dc5f80ad 100644
--- a/src/lib/providers/prime-preset/tokens/components/breadcrumb.ts
+++ b/src/lib/providers/prime-preset/tokens/components/breadcrumb.ts
@@ -1,7 +1,7 @@
 export const breadcrumbCss = ({ dt }: { dt: (token: string) => string }): string => `
   .p-breadcrumb-item-link {
     padding: ${dt('breadcrumb.extend.extItem.padding')};
-    font-size: ${dt('fonts.fontSize.200')};
+    font-size: ${dt('breadcrumb.extend.fonts_fontSize_200')};
   }
 
   .p-breadcrumb-item-link:hover {
@@ -13,12 +13,12 @@ export const breadcrumbCss = ({ dt }: { dt: (token: string) => string }): string
   }
 
   .p-breadcrumb-item:last-child .p-breadcrumb-item-link {
-    opacity: ${dt('opacity.500')};
+    opacity: ${dt('breadcrumb.extend.opacity_500')};
     pointer-events: none;
     cursor: default;
   }
 
   .p-breadcrumb-item:last-child .p-breadcrumb-item-link:hover {
-    background: ${dt('transparent')};
+    background: ${dt('breadcrumb.extend.transparent')};
   }
 `;
diff --git a/src/lib/providers/prime-preset/tokens/components/card.ts b/src/lib/providers/prime-preset/tokens/components/card.ts
index 7bfac62c..c5d96940 100644
--- a/src/lib/providers/prime-preset/tokens/components/card.ts
+++ b/src/lib/providers/prime-preset/tokens/components/card.ts
@@ -19,7 +19,7 @@ export const cardCss = ({ dt }: { dt: (token: string) => string }): string => `
 
   /* ─── Overlay variant ─── */
   .p-card.p-component.shadow-md {
-    box-shadow: ${dt('overlay.popover.shadow')};
+    box-shadow: ${dt('card.extend.overlay_popover_shadow')};
   }
 
   /* ─── Caption (Title & Subtitle wrapper) ─── */
@@ -31,8 +31,8 @@ export const cardCss = ({ dt }: { dt: (token: string) => string }): string => `
 
   /* ─── Subtitle typography ─── */
   .p-card-subtitle {
-    font-family: ${dt('fonts.fontFamily.heading')};
-    font-size: ${dt('fonts.fontSize.200')};
-    font-weight: ${dt('fonts.fontWeight.regular')};
+    font-family: ${dt('card.extend.fonts_fontFamily_heading')};
+    font-size: ${dt('card.extend.fonts_fontSize_200')};
+    font-weight: ${dt('card.extend.fonts_fontWeight_regular')};
   }
 `;
diff --git a/src/lib/providers/prime-preset/tokens/components/carousel.ts b/src/lib/providers/prime-preset/tokens/components/carousel.ts
index 298a3d13..f1ca8dfe 100644
--- a/src/lib/providers/prime-preset/tokens/components/carousel.ts
+++ b/src/lib/providers/prime-preset/tokens/components/carousel.ts
@@ -1,21 +1,21 @@
 export const carouselCss = ({ dt }: { dt: (token: string) => string }): string => `
   .p-carousel .p-carousel-prev-button.p-button-secondary,
   .p-carousel .p-carousel-next-button.p-button-secondary {
-    background: ${dt('surface.200')};
-    color: ${dt('text.color')};
+    background: ${dt('carousel.extend.surface_200')};
+    color: ${dt('carousel.extend.text_color')};
     border-color: transparent;
   }
 
   .p-carousel .p-carousel-prev-button.p-button-secondary:not(:disabled):hover,
   .p-carousel .p-carousel-next-button.p-button-secondary:not(:disabled):hover {
-    background: ${dt('surface.300')};
-    color: ${dt('text.color')};
+    background: ${dt('carousel.extend.surface_300')};
+    color: ${dt('carousel.extend.text_color')};
   }
 
   .p-carousel .p-carousel-prev-button.p-button-secondary:not(:disabled):active,
   .p-carousel .p-carousel-next-button.p-button-secondary:not(:disabled):active {
-    background: ${dt('surface.400')};
-    color: ${dt('text.color')};
+    background: ${dt('carousel.extend.surface_400')};
+    color: ${dt('carousel.extend.text_color')};
   }
 
   .p-carousel .p-button-icon-only.p-button-rounded {
diff --git a/src/lib/providers/prime-preset/tokens/components/checkbox.ts b/src/lib/providers/prime-preset/tokens/components/checkbox.ts
index a1e3d355..8a2dde52 100644
--- a/src/lib/providers/prime-preset/tokens/components/checkbox.ts
+++ b/src/lib/providers/prime-preset/tokens/components/checkbox.ts
@@ -3,37 +3,37 @@ export const checkboxCss = ({ dt }: { dt: (token: string) => string }): string =
 .checkbox-label {
   display: flex;
   align-items: center;
-  color: ${dt('text.color')};
-  font-family: ${dt('fonts.fontFamily.base')};
-  font-size: ${dt('fonts.fontSize.300')};
-  font-weight: ${dt('fonts.fontWeight.regular')};
+  color: ${dt('checkbox.extend.text_color')};
+  font-family: ${dt('checkbox.extend.fonts_fontFamily_base')};
+  font-size: ${dt('checkbox.extend.fonts_fontSize_300')};
+  font-weight: ${dt('checkbox.extend.fonts_fontWeight_regular')};
   line-height: normal;
   cursor: pointer;
 }
 
 .checkbox-label--hover {
-  color: ${dt('text.primaryColor')};
+  color: ${dt('checkbox.extend.text_brand')};
 }
 
 .checkbox-label--disabled {
-  color: ${dt('text.mutedColor')};
+  color: ${dt('checkbox.extend.text_mutedColor')};
   cursor: default;
 }
 
 .checkbox-caption {
-  color: ${dt('text.secondaryColor')};
-  font-family: ${dt('fonts.fontFamily.heading')};
-  font-size: ${dt('fonts.fontSize.200')};
-  font-weight: ${dt('fonts.fontWeight.regular')};
+  color: ${dt('checkbox.extend.text_subtle')};
+  font-family: ${dt('checkbox.extend.fonts_fontFamily_heading')};
+  font-size: ${dt('checkbox.extend.fonts_fontSize_200')};
+  font-weight: ${dt('checkbox.extend.fonts_fontWeight_regular')};
   line-height: normal;
 }
 
 .checkbox-caption--hover {
-  color: ${dt('text.primaryColor')};
+  color: ${dt('checkbox.extend.text_brand')};
 }
 
 .checkbox-caption--disabled {
-  color: ${dt('text.disabledColor')};
+  color: ${dt('checkbox.extend.text_disabled')};
 }
 
 /* Переопределение ширины border для checkbox */
@@ -62,13 +62,13 @@ export const checkboxCss = ({ dt }: { dt: (token: string) => string }): string =
 .p-checkbox:not(.p-disabled):not(.p-checkbox-checked):not(.p-invalid):has(.p-checkbox-input:focus-visible) .p-checkbox-box,
 .p-checkbox-checked:not(.p-disabled):not(.p-invalid):has(.p-checkbox-input:focus-visible) .p-checkbox-box,
 .p-checkbox-indeterminate:not(.p-disabled):not(.p-invalid):has(.p-checkbox-input:focus-visible) .p-checkbox-box {
-  box-shadow: 0 0 0 ${dt('checkbox.root.focusRing.focusRing')} ${dt('focusRing.extend.success')};
+  box-shadow: 0 0 0 ${dt('checkbox.root.focusRing.focusRing')} ${dt('checkbox.extend.focusRing_success')};
 }
 
 /* Focus ring с красным цветом для состояний с ошибкой */
 .p-checkbox.p-invalid .p-checkbox-box,
 .p-checkbox-checked.p-invalid .p-checkbox-box,
 .p-checkbox-indeterminate.p-invalid .p-checkbox-box {
-  box-shadow: 0 0 0 ${dt('focusRing.width')} ${dt('focusRing.extend.invalid')};
+  box-shadow: 0 0 0 ${dt('checkbox.extend.focusRing_width')} ${dt('checkbox.extend.focusRing_invalid')};
 }
 `;
diff --git a/src/lib/providers/prime-preset/tokens/components/chip.ts b/src/lib/providers/prime-preset/tokens/components/chip.ts
index d4e93526..460ad4f2 100644
--- a/src/lib/providers/prime-preset/tokens/components/chip.ts
+++ b/src/lib/providers/prime-preset/tokens/components/chip.ts
@@ -17,10 +17,10 @@ export const chipCss = ({ dt }: { dt: (token: string) => string }): string => `
 
   /* ─── Типографика лейбла ─── */
   .p-chip-label {
-    font-family: ${dt('fonts.fontFamily.base')};
-    font-size: ${dt('fonts.fontSize.300')};
-    font-weight: ${dt('fonts.fontWeight.regular')};
-    line-height: ${dt('fonts.lineHeight.400')};
+    font-family: ${dt('chip.extend.fonts_fontFamily_base')};
+    font-size: ${dt('chip.extend.fonts_fontSize_300')};
+    font-weight: ${dt('chip.extend.fonts_fontWeight_regular')};
+    line-height: ${dt('chip.extend.fonts_lineHeight_400')};
   }
 
   /* ─── Сброс уменьшенного padding PrimeNG при наличии кнопки удаления ─── */
@@ -30,12 +30,12 @@ export const chipCss = ({ dt }: { dt: (token: string) => string }): string => `
 
   /* ─── Focus ring иконки удаления ─── */
   .p-chip-remove-icon:focus-visible {
-    outline: ${dt('chip.removeIcon.focusRing.width')} solid ${dt('focusRing.extend.success')};
+    outline: ${dt('chip.removeIcon.focusRing.width')} solid ${dt('chip.extend.focusRing_success')};
   }
 
   /* ─── Disabled состояние ─── */
   .p-chip.p-disabled {
-    opacity: ${dt('opacity.500')};
+    opacity: ${dt('chip.extend.opacity_500')};
     pointer-events: none;
   }
 
diff --git a/src/lib/providers/prime-preset/tokens/components/confirm-dialog.ts b/src/lib/providers/prime-preset/tokens/components/confirm-dialog.ts
index bc9e3ffd..ce681c42 100644
--- a/src/lib/providers/prime-preset/tokens/components/confirm-dialog.ts
+++ b/src/lib/providers/prime-preset/tokens/components/confirm-dialog.ts
@@ -15,19 +15,19 @@ export const confirmDialogCss = ({ dt }: { dt: (token: string) => string }): str
 
   /* Размеры */
   .p-confirmdialog.p-dialog {
-    width: ${dt('overlay.width')};
+    width: ${dt('confirmdialog.extend.dimension_overlayWidth_base')};
   }
 
   .p-confirmdialog-sm.p-dialog {
-    width: ${dt('sizing.80x')};
+    width: ${dt('confirmdialog.extend.dimension_overlayWidth_sm')};
   }
 
   .p-confirmdialog-lg.p-dialog {
-    width: ${dt('sizing.120x')};
+    width: ${dt('confirmdialog.extend.dimension_overlayWidth_lg')};
   }
 
   .p-confirmdialog-xlg.p-dialog {
-    width: ${dt('sizing.128x')};
+    width: ${dt('confirmdialog.extend.dimension_overlayWidth_xlg')};
   }
 
   /* Цвета иконок по severity */
diff --git a/src/lib/providers/prime-preset/tokens/components/data-table.ts b/src/lib/providers/prime-preset/tokens/components/data-table.ts
index d5d0960e..5745eafa 100644
--- a/src/lib/providers/prime-preset/tokens/components/data-table.ts
+++ b/src/lib/providers/prime-preset/tokens/components/data-table.ts
@@ -23,6 +23,6 @@ export const dataTableCss = ({ dt }: { dt: (token: string) => string }): string
   }
 
   .p-datatable .p-datatable-sortable-column:not(.p-datatable-column-sorted):hover {
-    color: ${dt('text.hoverColor')};
+    color: ${dt('datatable.extend.text_hoverColor')};
   }
 `;
diff --git a/src/lib/providers/prime-preset/tokens/components/date-picker.ts b/src/lib/providers/prime-preset/tokens/components/date-picker.ts
index a923663f..378c6a7f 100644
--- a/src/lib/providers/prime-preset/tokens/components/date-picker.ts
+++ b/src/lib/providers/prime-preset/tokens/components/date-picker.ts
@@ -50,7 +50,7 @@ export const datePickerCss = ({ dt }: { dt: (token: string) => string }): string
 }
 
 .p-datepicker-today.p-datepicker-today > .p-datepicker-day:not(.p-datepicker-day-selected) {
-  border: ${dt('form.borderWidth')} solid ${dt(
+  border: ${dt('datepicker.extend.form_borderWidth')} solid ${dt(
   'datepicker.extend.extToday.borderColor'
 )};
 }
@@ -73,16 +73,16 @@ export const datePickerCss = ({ dt }: { dt: (token: string) => string }): string
 
 /* ─── Weekday header text ─── */
 .p-datepicker-weekday {
-  font-family: ${dt('fonts.fontFamily.base')};
-  font-size: ${dt('fonts.fontSize.300')};
-  font-weight: ${dt('fonts.fontWeight.demibold')};
+  font-family: ${dt('datepicker.extend.fonts_fontFamily_base')};
+  font-size: ${dt('datepicker.extend.fonts_fontSize_300')};
+  font-weight: ${dt('datepicker.extend.fonts_fontWeight_demibold')};
 }
 
 /* ─── Day cell text ─── */
 .p-datepicker-day {
-  font-family: ${dt('fonts.fontFamily.base')};
-  font-size: ${dt('fonts.fontSize.300')};
-  font-weight: ${dt('fonts.fontWeight.regular')};
+  font-family: ${dt('datepicker.extend.fonts_fontFamily_base')};
+  font-size: ${dt('datepicker.extend.fonts_fontSize_300')};
+  font-weight: ${dt('datepicker.extend.fonts_fontWeight_regular')};
 }
 
 /* ─── Скрываем нативный time picker (заменён кастомным в footer) ─── */
@@ -94,7 +94,7 @@ export const datePickerCss = ({ dt }: { dt: (token: string) => string }): string
   background: transparent;
   color: ${dt('button.colorScheme.light.text.primary.color')};
   border: 0 none;
-  font-family: ${dt('fonts.fontFamily.heading')};
+  font-family: ${dt('datepicker.extend.fonts_fontFamily_heading')};
   font-weight: ${dt('button.root.label.fontWeight')};
   transition: background-color ${dt('button.root.transitionDuration')};
 }
@@ -141,7 +141,7 @@ export const datePickerCss = ({ dt }: { dt: (token: string) => string }): string
   justify-content: center;
   gap: ${dt('datepicker.timePicker.gap')};
   padding: ${dt('datepicker.timePicker.padding')};
-  border-top: ${dt('form.borderWidth')} solid ${dt('datepicker.panel.borderColor')};
+  border-top: ${dt('datepicker.extend.form_borderWidth')} solid ${dt('datepicker.panel.borderColor')};
 }
 
 .p-datepicker-time-picker-custom .p-datepicker-time-field {
@@ -153,9 +153,9 @@ export const datePickerCss = ({ dt }: { dt: (token: string) => string }): string
 }
 
 .p-datepicker-time-picker-custom .p-datepicker-time-label {
-  font-family: ${dt('fonts.fontFamily.heading')};
-  font-size: ${dt('fonts.fontSize.100')};
-  font-weight: ${dt('fonts.fontWeight.regular')};
+  font-family: ${dt('datepicker.extend.fonts_fontFamily_heading')};
+  font-size: ${dt('datepicker.extend.fonts_fontSize_100')};
+  font-weight: ${dt('datepicker.extend.fonts_fontWeight_regular')};
   line-height: 1;
   color: ${dt('datepicker.extend.extTimePicker.color')};
 }
@@ -167,12 +167,12 @@ export const datePickerCss = ({ dt }: { dt: (token: string) => string }): string
 }
 
 .p-datepicker-time-picker-custom .p-datepicker-separator {
-  font-family: ${dt('fonts.fontFamily.heading')};
-  font-size: ${dt('fonts.fontSize.100')};
-  font-weight: ${dt('fonts.fontWeight.regular')};
+  font-family: ${dt('datepicker.extend.fonts_fontFamily_heading')};
+  font-size: ${dt('datepicker.extend.fonts_fontSize_100')};
+  font-weight: ${dt('datepicker.extend.fonts_fontWeight_regular')};
   line-height: 1;
   color: ${dt('datepicker.extend.extTimePicker.color')};
-  margin-top: calc(${dt('fonts.fontSize.100')} + ${dt('datepicker.timePicker.buttonGap')});
+  margin-top: calc(${dt('datepicker.extend.fonts_fontSize_100')} + ${dt('datepicker.timePicker.buttonGap')});
 }
 
 :is(.p-datepicker-month-select, .p-datepicker-year-select) .p-select-dropdown {
@@ -180,7 +180,7 @@ export const datePickerCss = ({ dt }: { dt: (token: string) => string }): string
 }
 
 :is(.p-datepicker-month-select, .p-datepicker-year-select) .p-select-label {
-  width: ${dt('sizing.24x')};
+  width: ${dt('datepicker.extend.dimension_size_1000')};
 }
 
 `;
diff --git a/src/lib/providers/prime-preset/tokens/components/dialog.ts b/src/lib/providers/prime-preset/tokens/components/dialog.ts
index 7426012c..925d1829 100644
--- a/src/lib/providers/prime-preset/tokens/components/dialog.ts
+++ b/src/lib/providers/prime-preset/tokens/components/dialog.ts
@@ -1,20 +1,20 @@
 export const dialogCss = ({ dt }: { dt: (token: string) => string }): string => `
   .p-dialog .p-dialog-title {
-    font-family: ${dt('fonts.fontFamily.heading')};
+    font-family: ${dt('dialog.extend.fonts_fontFamily_heading')};
     font-size: ${dt('dialog.title.fontSize')};
     font-weight: ${dt('dialog.title.fontWeight')};
-    line-height: ${dt('fonts.lineHeight.550')};
+    line-height: ${dt('dialog.extend.fonts_lineHeight_550')};
   }
 
   .p-dialog .p-dialog-content {
-    font-family: ${dt('fonts.fontFamily.base')};
-    font-size: ${dt('fonts.fontSize.300')};
-    font-weight: ${dt('fonts.fontWeight.regular')};
-    line-height: ${dt('fonts.lineHeight.500')};
+    font-family: ${dt('dialog.extend.fonts_fontFamily_base')};
+    font-size: ${dt('dialog.extend.fonts_fontSize_300')};
+    font-weight: ${dt('dialog.extend.fonts_fontWeight_regular')};
+    line-height: ${dt('dialog.extend.fonts_lineHeight_500')};
   }
 
   .p-dialog .p-dialog-header {
-    border-bottom: ${dt('borderWidth.100')} solid ${dt('dialog.root.borderColor')};
+    border-bottom: ${dt('dialog.extend.dimension_borderWidth_100')} solid ${dt('dialog.root.borderColor')};
     display: flex;
     align-items: center;
     justify-content: space-between;
@@ -36,18 +36,18 @@ export const dialogCss = ({ dt }: { dt: (token: string) => string }): string =>
   }
 
   .p-dialog {
-    width: ${dt('overlay.width')};
+    width: ${dt('dialog.extend.dimension_overlayWidth_base')};
   }
 
   .p-dialog.p-component.p-dialog-sm {
-    width: ${dt('sizing.80x')};
+    width: ${dt('dialog.extend.dimension_overlayWidth_sm')};
   }
 
   .p-dialog.p-component.p-dialog-lg {
-    width: ${dt('sizing.120x')};
+    width: ${dt('dialog.extend.dimension_overlayWidth_lg')};
   }
 
   .p-dialog.p-component.p-dialog-xlg {
-    width: ${dt('sizing.128x')};
+    width: ${dt('dialog.extend.dimension_overlayWidth_xlg')};
   }
 `;
diff --git a/src/lib/providers/prime-preset/tokens/components/divider.ts b/src/lib/providers/prime-preset/tokens/components/divider.ts
index de3e3581..f3141b06 100644
--- a/src/lib/providers/prime-preset/tokens/components/divider.ts
+++ b/src/lib/providers/prime-preset/tokens/components/divider.ts
@@ -15,9 +15,9 @@ export const dividerCss = ({ dt }: { dt: (token: string) => string }): string =>
     display: flex;
     align-items: center;
     gap: var(--p-divider-extend-content-gap);
-    font-family: ${dt('fonts.fontFamily.heading')};
-    font-size: ${dt('fonts.fontSize.200')};
-    font-weight: ${dt('fonts.fontWeight.demibold')};
+    font-family: ${dt('divider.extend.fonts_fontFamily_heading')};
+    font-size: ${dt('divider.extend.fonts_fontSize_200')};
+    font-weight: ${dt('divider.extend.fonts_fontWeight_demibold')};
   }
 
   .p-divider-content .ti {
diff --git a/src/lib/providers/prime-preset/tokens/components/drawer.ts b/src/lib/providers/prime-preset/tokens/components/drawer.ts
index 8783c865..bedc92e4 100644
--- a/src/lib/providers/prime-preset/tokens/components/drawer.ts
+++ b/src/lib/providers/prime-preset/tokens/components/drawer.ts
@@ -8,7 +8,7 @@ const drawerCss = ({ dt }: { dt: (token: string) => string }): string => `
 /* Нижняя граница и внутренние отступы заголовка */
 .p-drawer.p-component .p-drawer-header {
   border-bottom: 1px solid ${dt('drawer.extend.extHeader.borderColor')};
-  padding: ${dt('overlay.modal.padding.300')} ${dt('overlay.modal.padding.300')} ${dt('overlay.modal.padding.100')} ${dt('overlay.modal.padding.300')};
+  padding: ${dt('drawer.extend.overlay_modal_padding_300')} ${dt('drawer.extend.overlay_modal_padding_300')} ${dt('drawer.extend.dimension_space_400')} ${dt('drawer.extend.overlay_modal_padding_300')};
 }
 
 /* Типографика */
@@ -24,11 +24,11 @@ const drawerCss = ({ dt }: { dt: (token: string) => string }): string => `
 
 /* Внутренние отступы контента и футера */
 .p-drawer.p-component .p-drawer-content {
-  padding: ${dt('overlay.modal.padding.300')};
+  padding: ${dt('drawer.extend.overlay_modal_padding_300')};
 }
 
 .p-drawer.p-component .p-drawer-footer {
-  padding: 0 ${dt('overlay.modal.padding.300')} ${dt('overlay.modal.padding.300')} ${dt('overlay.modal.padding.300')};
+  padding: 0 ${dt('drawer.extend.overlay_modal_padding_300')} ${dt('drawer.extend.overlay_modal_padding_300')} ${dt('drawer.extend.overlay_modal_padding_300')};
 }
 
 /* Боковые drawer (слева/справа) - базовые размеры и отступы от краев экрана */
diff --git a/src/lib/providers/prime-preset/tokens/components/galleria.ts b/src/lib/providers/prime-preset/tokens/components/galleria.ts
index b247c67c..d0314890 100644
--- a/src/lib/providers/prime-preset/tokens/components/galleria.ts
+++ b/src/lib/providers/prime-preset/tokens/components/galleria.ts
@@ -2,7 +2,7 @@ export const galleriaCss = ({ dt }: { dt: (token: string) => string }): string =
   /* ─── Подпись к изображению ─── */
   .p-galleria .p-galleria-caption {
     background: ${dt('galleria.caption.background')};
-    padding: ${dt('spacing.2x')};
+    padding: ${dt('galleria.extend.dimension_space_200')};
   }
 
   /* ─── Кнопки навигации в полноэкранном режиме ─── */
diff --git a/src/lib/providers/prime-preset/tokens/components/inputnumber.ts b/src/lib/providers/prime-preset/tokens/components/inputnumber.ts
index 950a3c1c..124351e0 100644
--- a/src/lib/providers/prime-preset/tokens/components/inputnumber.ts
+++ b/src/lib/providers/prime-preset/tokens/components/inputnumber.ts
@@ -2,15 +2,15 @@ export const inputnumberCss = ({ dt }: { dt: (token: string) => string }): strin
 
 /* ─── Базовые стили ─── */
 .p-inputnumber .p-inputnumber-input {
-  font-family: ${dt('fonts.fontFamily.base')};
+  font-family: ${dt('inputnumber.extend.fonts_fontFamily_base')};
 }
 
 .p-inputnumber .p-inputnumber-input::placeholder {
-  font-family: ${dt('fonts.fontFamily.base')};
+  font-family: ${dt('inputnumber.extend.fonts_fontFamily_base')};
 }
 
 .p-floatlabel:has(.p-inputnumber) label {
-  font-family: ${dt('fonts.fontFamily.base')};
+  font-family: ${dt('inputnumber.extend.fonts_fontFamily_base')};
 }
 
 /* ─── Кнопки увеличения/уменьшения ─── */
diff --git a/src/lib/providers/prime-preset/tokens/components/inputotp.ts b/src/lib/providers/prime-preset/tokens/components/inputotp.ts
index de80e1d9..10961cd7 100644
--- a/src/lib/providers/prime-preset/tokens/components/inputotp.ts
+++ b/src/lib/providers/prime-preset/tokens/components/inputotp.ts
@@ -25,7 +25,7 @@ export const inputotpCss = ({ dt }: { dt: (token: string) => string }): string =
 /* ─── Invalid + Focus ─── */
 .p-inputotp.p-component .p-inputtext.p-invalid:focus {
   border-color: ${dt('inputtext.root.invalidBorderColor')};
-  box-shadow: 0 0 0 ${dt('inputtext.focusRing.width')} ${dt('focusRing.extend.invalid')};
+  box-shadow: 0 0 0 ${dt('inputtext.focusRing.width')} ${dt('inputotp.extend.focusRing_invalid')};
 }
 
 /* ─── Small ─── */
diff --git a/src/lib/providers/prime-preset/tokens/components/inputtext.ts b/src/lib/providers/prime-preset/tokens/components/inputtext.ts
index 8f0131cc..5949c04d 100644
--- a/src/lib/providers/prime-preset/tokens/components/inputtext.ts
+++ b/src/lib/providers/prime-preset/tokens/components/inputtext.ts
@@ -2,16 +2,16 @@ export const inputtextCss = ({ dt }: { dt: (token: string) => string }): string
 
 /* ─── Базовые стили ─── */
 .p-inputtext {
-  line-height: ${dt('fonts.lineHeight.250')};
-  font-family: ${dt('fonts.fontFamily.base')};
+  line-height: ${dt('inputtext.extend.fonts_lineHeight_250')};
+  font-family: ${dt('inputtext.extend.fonts_fontFamily_base')};
 }
 
 .p-inputtext::placeholder {
-  font-family: ${dt('fonts.fontFamily.base')};
+  font-family: ${dt('inputtext.extend.fonts_fontFamily_base')};
 }
 
 .p-floatlabel:has(.p-inputtext) label {
-  font-family: ${dt('fonts.fontFamily.base')};
+  font-family: ${dt('inputtext.extend.fonts_fontFamily_base')};
 }
 
 /* ─── Disabled ─── */
@@ -34,7 +34,7 @@ export const inputtextCss = ({ dt }: { dt: (token: string) => string }): string
 /* ─── Invalid + Focus ─── */
 .p-inputtext.p-invalid:focus {
   border-color: ${dt('inputtext.root.invalidBorderColor')};
-  box-shadow: 0 0 0 ${dt('inputtext.focusRing.width')} ${dt('focusRing.extend.invalid')};
+  box-shadow: 0 0 0 ${dt('inputtext.focusRing.width')} ${dt('inputtext.extend.focusRing_invalid')};
 }
 
 /* ─── Extra Large ─── */
diff --git a/src/lib/providers/prime-preset/tokens/components/listbox.ts b/src/lib/providers/prime-preset/tokens/components/listbox.ts
index 05489d17..2bd5ad9e 100644
--- a/src/lib/providers/prime-preset/tokens/components/listbox.ts
+++ b/src/lib/providers/prime-preset/tokens/components/listbox.ts
@@ -33,8 +33,8 @@ export const listboxCss = ({ dt }: { dt: (token: string) => string }): string =>
   /* ─── Подпись элемента списка ─── */
   .p-listbox-option-caption {
     color: var(--p-listbox-extend-ext-option-caption-color);
-    font-size: ${dt('fonts.fontSize.200')};
-    font-family: ${dt('fonts.fontFamily.heading')};
+    font-size: ${dt('listbox.extend.fonts_fontSize_200')};
+    font-family: ${dt('listbox.extend.fonts_fontFamily_heading')};
   }
 
   /* ─── Галочка выбора ─── */
diff --git a/src/lib/providers/prime-preset/tokens/components/megamenu.ts b/src/lib/providers/prime-preset/tokens/components/megamenu.ts
index 542864b7..13d244c6 100644
--- a/src/lib/providers/prime-preset/tokens/components/megamenu.ts
+++ b/src/lib/providers/prime-preset/tokens/components/megamenu.ts
@@ -7,8 +7,8 @@ export const megamenuCss = ({ dt }: { dt: (token: string) => string }): string =
 
 /* ─── Типографика пунктов меню ─── */
 .p-megamenu-item-label {
-  font-size: ${dt('fonts.fontSize.300')};
-  font-weight: ${dt('fonts.fontWeight.regular')};
+  font-size: ${dt('megamenu.extend.fonts_fontSize_300')};
+  font-weight: ${dt('megamenu.extend.fonts_fontWeight_regular')};
 }
 
 /* ─── Caption (описание) для кастомных пунктов ─── */
@@ -19,7 +19,7 @@ export const megamenuCss = ({ dt }: { dt: (token: string) => string }): string =
 }
 
 .p-megamenu .megamenu-item-caption {
-  font-size: ${dt('fonts.fontSize.200')};
+  font-size: ${dt('megamenu.extend.fonts_fontSize_200')};
   color: ${dt('megamenu.extend.extItem.caption.color')};
 }
 
diff --git a/src/lib/providers/prime-preset/tokens/components/menu.ts b/src/lib/providers/prime-preset/tokens/components/menu.ts
index 2ef5fcfc..21732f10 100644
--- a/src/lib/providers/prime-preset/tokens/components/menu.ts
+++ b/src/lib/providers/prime-preset/tokens/components/menu.ts
@@ -4,10 +4,10 @@ export const menuCss = ({ dt }: { dt: (token: string) => string }): string => `
   }
 
   .p-menu .p-menu-item-content .p-menu-item-link .p-menu-item-label {
-    font-family: ${dt('fonts.fontFamily.base')};
-    font-size: ${dt('fonts.fontSize.300')};
-    font-weight: ${dt('fonts.fontWeight.regular')};
-    line-height: ${dt('fonts.lineHeight.400')};
+    font-family: ${dt('menu.extend.fonts_fontFamily_base')};
+    font-size: ${dt('menu.extend.fonts_fontSize_300')};
+    font-weight: ${dt('menu.extend.fonts_fontWeight_regular')};
+    line-height: ${dt('menu.extend.fonts_lineHeight_400')};
   }
 
   .p-menu .p-menu-item-content .menu-item-label {
@@ -17,9 +17,9 @@ export const menuCss = ({ dt }: { dt: (token: string) => string }): string => `
   }
 
   .p-menu .p-menu-item-content .menu-item-caption {
-    font-family: ${dt('fonts.fontFamily.base')};
-    font-size: ${dt('fonts.fontSize.200')};
-    font-weight: ${dt('fonts.fontWeight.regular')};
+    font-family: ${dt('menu.extend.fonts_fontFamily_base')};
+    font-size: ${dt('menu.extend.fonts_fontSize_200')};
+    font-weight: ${dt('menu.extend.fonts_fontWeight_regular')};
     color: ${dt('menu.colorScheme.light.extend.extItem.caption.color')};
   }
 
@@ -60,8 +60,8 @@ export const menuCss = ({ dt }: { dt: (token: string) => string }): string => `
 
   .p-menu .p-menu-submenu-label {
     text-transform: uppercase;
-    font-size: ${dt('fonts.fontSize.200')};
-    font-family: ${dt('fonts.fontFamily.heading')};
-    line-height: ${dt('fonts.lineHeight.400')};
+    font-size: ${dt('menu.extend.fonts_fontSize_200')};
+    font-family: ${dt('menu.extend.fonts_fontFamily_heading')};
+    line-height: ${dt('menu.extend.fonts_lineHeight_400')};
   }
 `;
diff --git a/src/lib/providers/prime-preset/tokens/components/menubar.ts b/src/lib/providers/prime-preset/tokens/components/menubar.ts
index 6e2202a7..cd566216 100644
--- a/src/lib/providers/prime-preset/tokens/components/menubar.ts
+++ b/src/lib/providers/prime-preset/tokens/components/menubar.ts
@@ -5,13 +5,13 @@ export const menubarCss = ({ dt }: { dt: (token: string) => string }): string =>
   }
 
   .p-menubar-item-label {
-    font-family: ${dt('fonts.fontFamily.base')};
-    font-size: ${dt('fonts.fontSize.300')};
-    font-weight: ${dt('fonts.fontWeight.regular')};
+    font-family: ${dt('menubar.extend.fonts_fontFamily_base')};
+    font-size: ${dt('menubar.extend.fonts_fontSize_300')};
+    font-weight: ${dt('menubar.extend.fonts_fontWeight_regular')};
   }
 
   .p-menubar-item-caption {
-    font-size: ${dt('fonts.fontSize.200')};
+    font-size: ${dt('menubar.extend.fonts_fontSize_200')};
     color: ${dt('menubar.extend.extItem.caption.color')};
   }
 
@@ -22,7 +22,7 @@ export const menubarCss = ({ dt }: { dt: (token: string) => string }): string =>
   }
 
   .p-menubar .menubar-item-caption {
-    font-size: ${dt('fonts.fontSize.200')};
+    font-size: ${dt('menubar.extend.fonts_fontSize_200')};
     color: ${dt('menubar.extend.extItem.caption.color')};
   }
 
diff --git a/src/lib/providers/prime-preset/tokens/components/message.ts b/src/lib/providers/prime-preset/tokens/components/message.ts
index 6e39b2bc..bf0c8fce 100644
--- a/src/lib/providers/prime-preset/tokens/components/message.ts
+++ b/src/lib/providers/prime-preset/tokens/components/message.ts
@@ -24,18 +24,18 @@ export const messageCss = ({ dt }: { dt: (token: string) => string }): string =>
 
   /* Заголовок message */
   .p-message-summary {
-    font-family: ${dt('fonts.fontFamily.base')};
+    font-family: ${dt('message.extend.fonts_fontFamily_base')};
     font-weight: ${dt('message.text.fontWeight')};
-    line-height: ${dt('fonts.lineHeight.250')};
+    line-height: ${dt('message.extend.fonts_lineHeight_250')};
     font-size: ${dt('message.text.fontSize')};
   }
 
   /* Детальное описание message */
   .p-message .p-message-detail {
-    font-family: ${dt('fonts.fontFamily.base')};
-    font-size: ${dt('fonts.fontSize.200')};
-    line-height: ${dt('fonts.lineHeight.250')};
-    font-weight: ${dt('fonts.fontWeight.regular')};
+    font-family: ${dt('message.extend.fonts_fontFamily_base')};
+    font-size: ${dt('message.extend.fonts_fontSize_200')};
+    line-height: ${dt('message.extend.fonts_lineHeight_250')};
+    font-weight: ${dt('message.extend.fonts_fontWeight_regular')};
   }
 
   /* Кнопка закрытия message */
diff --git a/src/lib/providers/prime-preset/tokens/components/metergroup.ts b/src/lib/providers/prime-preset/tokens/components/metergroup.ts
index 91b53797..b4864b69 100644
--- a/src/lib/providers/prime-preset/tokens/components/metergroup.ts
+++ b/src/lib/providers/prime-preset/tokens/components/metergroup.ts
@@ -1,16 +1,16 @@
 export const metergroupCss = ({ dt }: { dt: (path: string) => string }) => `
   .p-metergroup-label-text {
-    font-family: ${dt('fonts.fontFamily.base')};
-    font-size: ${dt('fonts.fontSize.200')};
-    font-weight: ${dt('fonts.fontWeight.regular')};
-    line-height: ${dt('fonts.lineHeight.200')};
+    font-family: ${dt('metergroup.extend.fonts_fontFamily_base')};
+    font-size: ${dt('metergroup.extend.fonts_fontSize_200')};
+    font-weight: ${dt('metergroup.extend.fonts_fontWeight_regular')};
+    line-height: ${dt('metergroup.extend.fonts_lineHeight_200')};
     color: ${dt('metergroup.extend.extLabel.color')};
   }
   .p-metergroup-label .p-metergroup-label-text + span {
-    font-family: ${dt('fonts.fontFamily.base')};
-    font-size: ${dt('fonts.fontSize.200')};
-    font-weight: ${dt('fonts.fontWeight.medium')};
-    color: ${dt('text.color')};
+    font-family: ${dt('metergroup.extend.fonts_fontFamily_base')};
+    font-size: ${dt('metergroup.extend.fonts_fontSize_200')};
+    font-weight: ${dt('metergroup.extend.fonts_fontWeight_medium')};
+    color: ${dt('metergroup.extend.text_color')};
   }
   .p-metergroup-horizontal .p-metergroup-meter { min-height: 100%; }
   .p-metergroup-vertical .p-metergroup-meter { min-width: 100%; }
diff --git a/src/lib/providers/prime-preset/tokens/components/paginator.ts b/src/lib/providers/prime-preset/tokens/components/paginator.ts
index 061b759f..2161399c 100644
--- a/src/lib/providers/prime-preset/tokens/components/paginator.ts
+++ b/src/lib/providers/prime-preset/tokens/components/paginator.ts
@@ -1,18 +1,18 @@
 export const paginatorCss = ({ dt }: { dt: (token: string) => string }): string => `
   /* ─── Current page report ─── */
   .p-paginator .p-paginator-current {
-    font-family: ${dt('fonts.fontFamily.base')};
-    font-size: ${dt('fonts.fontSize.300')};
-    font-weight: ${dt('fonts.fontWeight.regular')};
-    line-height: ${dt('fonts.lineHeight.250')};
+    font-family: ${dt('paginator.extend.fonts_fontFamily_base')};
+    font-size: ${dt('paginator.extend.fonts_fontSize_300')};
+    font-weight: ${dt('paginator.extend.fonts_fontWeight_regular')};
+    line-height: ${dt('paginator.extend.fonts_lineHeight_250')};
     color: ${dt('paginator.currentPageReport.color')};
   }
 
   /* ─── Page number buttons ─── */
   .p-paginator .p-paginator-page {
-    font-family: ${dt('fonts.fontFamily.base')};
-    font-size: ${dt('fonts.fontSize.300')};
-    font-weight: ${dt('fonts.fontWeight.regular')};
-    line-height: ${dt('fonts.lineHeight.250')};
+    font-family: ${dt('paginator.extend.fonts_fontFamily_base')};
+    font-size: ${dt('paginator.extend.fonts_fontSize_300')};
+    font-weight: ${dt('paginator.extend.fonts_fontWeight_regular')};
+    line-height: ${dt('paginator.extend.fonts_lineHeight_250')};
   }
 `;
diff --git a/src/lib/providers/prime-preset/tokens/components/panelmenu.ts b/src/lib/providers/prime-preset/tokens/components/panelmenu.ts
index 0ef79947..15177a06 100644
--- a/src/lib/providers/prime-preset/tokens/components/panelmenu.ts
+++ b/src/lib/providers/prime-preset/tokens/components/panelmenu.ts
@@ -9,7 +9,7 @@ export const panelmenuCss = ({ dt }: { dt: (token: string) => string }): string
 
   .p-panelmenu-header-content,
   .p-panelmenu-item-content {
-    font-size: ${dt('fonts.fontSize.300')};
+    font-size: ${dt('panelmenu.extend.fonts_fontSize_300')};
   }
 
   .p-panelmenu-submenu-icon {
@@ -61,8 +61,8 @@ export const panelmenuCss = ({ dt }: { dt: (token: string) => string }): string
   }
 
   .p-panelmenu .panelmenu-item-caption {
-    font-size: ${dt('fonts.fontSize.200')};
-    line-height: ${dt('fonts.lineHeight.450')};
+    font-size: ${dt('panelmenu.extend.fonts_fontSize_200')};
+    line-height: ${dt('panelmenu.extend.fonts_lineHeight_450')};
     color: ${dt('panelmenu.extend.extItem.caption.color')};
   }
 `;
diff --git a/src/lib/providers/prime-preset/tokens/components/password.ts b/src/lib/providers/prime-preset/tokens/components/password.ts
index b682ad02..48931769 100644
--- a/src/lib/providers/prime-preset/tokens/components/password.ts
+++ b/src/lib/providers/prime-preset/tokens/components/password.ts
@@ -16,10 +16,10 @@ export const passwordCss = ({ dt }: { dt: (token: string) => string }): string =
   }
 
   .p-password-meter-text {
-    font-family: ${dt('fonts.fontFamily.base')};
-    font-size: ${dt('fonts.fontSize.200')};
-    font-weight: ${dt('fonts.fontWeight.regular')};
-    line-height: ${dt('fonts.lineHeight.250')};
+    font-family: ${dt('password.extend.fonts_fontFamily_base')};
+    font-size: ${dt('password.extend.fonts_fontSize_200')};
+    font-weight: ${dt('password.extend.fonts_fontWeight_regular')};
+    line-height: ${dt('password.extend.fonts_lineHeight_250')};
     color: ${dt('password.overlay.color')};
   }
 
@@ -31,7 +31,7 @@ export const passwordCss = ({ dt }: { dt: (token: string) => string }): string =
 
   /* ─── Invalid + Focus ─── */
   .p-password:has(.p-inputtext.p-invalid:focus) {
-    box-shadow: 0 0 0 ${dt('inputtext.focusRing.width')} ${dt('focusRing.extend.invalid')};
+    box-shadow: 0 0 0 ${dt('inputtext.focusRing.width')} ${dt('password.extend.focusRing_invalid')};
     border-radius: ${dt('inputtext.root.borderRadius')};
   }
 
@@ -41,20 +41,20 @@ export const passwordCss = ({ dt }: { dt: (token: string) => string }): string =
 
   /* ─── FloatLabel ─── */
   .p-floatlabel:has(.p-password) label {
-    font-family: ${dt('fonts.fontFamily.base')};
-    font-weight: ${dt('floatlabel.root.fontWeight')};
-    line-height: ${dt('fonts.lineHeight.250')};
-    color: ${dt('floatlabel.root.color')};
+    font-family: ${dt('password.extend.fonts_fontFamily_base')};
+    font-weight: ${dt('password.extend.floatlabel_root_fontWeight')};
+    line-height: ${dt('password.extend.fonts_lineHeight_250')};
+    color: ${dt('password.extend.floatlabel_root_color')};
   }
 
   .p-floatlabel:has(.p-password) .p-floatlabel-active label {
-    font-weight: ${dt('floatlabel.root.active.fontWeight')};
+    font-weight: ${dt('password.extend.floatlabel_root_active_fontWeight')};
   }
 
   .p-floatlabel-in .p-password .p-inputtext {
-    font-family: ${dt('fonts.fontFamily.base')};
-    padding-block-start: ${dt('floatlabel.in.input.paddingTop')};
-    padding-block-end: ${dt('floatlabel.in.input.paddingBottom')};
+    font-family: ${dt('password.extend.fonts_fontFamily_base')};
+    padding-block-start: ${dt('password.extend.floatlabel_in_input_paddingTop')};
+    padding-block-end: ${dt('password.extend.floatlabel_in_input_paddingBottom')};
   }
 
   /* ─── Кастомный контент (правила пароля) ─── */
@@ -71,20 +71,20 @@ export const passwordCss = ({ dt }: { dt: (token: string) => string }): string =
     display: flex;
     align-items: center;
     gap: ${dt('password.content.gap')};
-    font-family: ${dt('fonts.fontFamily.base')};
-    font-size: ${dt('fonts.fontSize.200')};
-    font-weight: ${dt('fonts.fontWeight.regular')};
-    line-height: ${dt('fonts.lineHeight.250')};
+    font-family: ${dt('password.extend.fonts_fontFamily_base')};
+    font-size: ${dt('password.extend.fonts_fontSize_200')};
+    font-weight: ${dt('password.extend.fonts_fontWeight_regular')};
+    line-height: ${dt('password.extend.fonts_lineHeight_250')};
     color: ${dt('password.overlay.color')};
   }
 
   /* ─── Состояния иконок правил ─── */
   .p-password-rule i {
-    font-size: ${dt('fonts.fontSize.200')};
+    font-size: ${dt('password.extend.fonts_fontSize_200')};
   }
 
   .p-password-rule .ti-circle {
-    color: ${dt('surface.400')};
+    color: ${dt('password.extend.surface_400')};
   }
 
   .p-password-rule .ti-circle-check {
diff --git a/src/lib/providers/prime-preset/tokens/components/progressbar.ts b/src/lib/providers/prime-preset/tokens/components/progressbar.ts
index eda95979..1ce30601 100644
--- a/src/lib/providers/prime-preset/tokens/components/progressbar.ts
+++ b/src/lib/providers/prime-preset/tokens/components/progressbar.ts
@@ -1,5 +1,5 @@
 export const progressbarCss = ({ dt }: { dt: (path: string) => string }) => `
   .p-progressbar-label {
-    font-family: ${dt('fonts.fontFamily.base')};
+    font-family: ${dt('progressbar.extend.fonts_fontFamily_base')};
   }
 `;
diff --git a/src/lib/providers/prime-preset/tokens/components/progressspinner.ts b/src/lib/providers/prime-preset/tokens/components/progressspinner.ts
index d901e3e1..8967afa1 100644
--- a/src/lib/providers/prime-preset/tokens/components/progressspinner.ts
+++ b/src/lib/providers/prime-preset/tokens/components/progressspinner.ts
@@ -5,7 +5,7 @@ export const progressspinnerCss = ({ dt }: { dt: (token: string) => string }): s
 
 /* multicolor false */
 .p-progressspinner.p-progressspinner-monochrome .p-progressspinner-circle {
-    stroke: ${dt('primary.color')};
+    stroke: ${dt('progressspinner.extend.primary_color')};
     animation: p-progressspinner-dash 1.5s ease-in-out infinite;
 }
 
diff --git a/src/lib/providers/prime-preset/tokens/components/radiobutton.ts b/src/lib/providers/prime-preset/tokens/components/radiobutton.ts
index 975dce6f..8f6b0c1a 100644
--- a/src/lib/providers/prime-preset/tokens/components/radiobutton.ts
+++ b/src/lib/providers/prime-preset/tokens/components/radiobutton.ts
@@ -3,7 +3,7 @@ export const radiobuttonCss = ({ dt }: { dt: (token: string) => string }): strin
 .p-radiobutton:not(.p-disabled):not(.p-invalid):has(.p-radiobutton-input:focus-visible) .p-radiobutton-box,
 .p-radiobutton-checked:not(.p-disabled):not(.p-invalid):has(.p-radiobutton-input:focus-visible) .p-radiobutton-box {
   outline: none;
-  box-shadow: 0 0 0 ${dt('radiobutton.focusRing.width')} ${dt('focusRing.extend.success')};
+  box-shadow: 0 0 0 ${dt('radiobutton.focusRing.width')} ${dt('radiobutton.extend.focusRing_success')};
 }
 
 /* Focus ring с красным цветом для состояний с ошибкой */
@@ -11,6 +11,6 @@ export const radiobuttonCss = ({ dt }: { dt: (token: string) => string }): strin
 .p-radiobutton.p-invalid:not(.p-disabled):has(.p-radiobutton-input:focus-visible) .p-radiobutton-box,
 .p-radiobutton-checked.p-invalid .p-radiobutton-box,
 .p-radiobutton-checked.p-invalid:not(.p-disabled):has(.p-radiobutton-input:focus-visible) .p-radiobutton-box {
-  box-shadow: 0 0 0 ${dt('radiobutton.focusRing.width')} ${dt('focusRing.extend.invalid')};
+  box-shadow: 0 0 0 ${dt('radiobutton.focusRing.width')} ${dt('radiobutton.extend.focusRing_invalid')};
 }
 `;
diff --git a/src/lib/providers/prime-preset/tokens/components/select.ts b/src/lib/providers/prime-preset/tokens/components/select.ts
index 9a3bfd52..21f5d564 100644
--- a/src/lib/providers/prime-preset/tokens/components/select.ts
+++ b/src/lib/providers/prime-preset/tokens/components/select.ts
@@ -3,12 +3,12 @@ export const selectCss = ({ dt }: { dt: (token: string) => string }): string =>
   .p-select.p-component {
     width: 100%;
     border-width: ${dt('select.extend.borderWidth')};
-    line-height: ${dt('fonts.lineHeight.250')};
+    line-height: ${dt('select.extend.fonts_lineHeight_250')};
   }
 
   .p-select.p-component .p-select-label,
   .p-select-option {
-    font-family: ${dt('fonts.fontFamily.base')};
+    font-family: ${dt('select.extend.fonts_fontFamily_base')};
   }
 
   /* ─── Focus ─── */
@@ -19,7 +19,7 @@ export const selectCss = ({ dt }: { dt: (token: string) => string }): string =>
   /* ─── Invalid + Focus ─── */
   .p-select.p-component.p-invalid.p-focus {
     border-color: ${dt('select.root.invalidBorderColor')};
-    box-shadow: 0 0 0 ${dt('select.root.focusRing.width')} ${dt('focusRing.extend.invalid')};
+    box-shadow: 0 0 0 ${dt('select.root.focusRing.width')} ${dt('select.extend.focusRing_invalid')};
   }
 
   /* ─── Readonly ─── */
@@ -44,20 +44,20 @@ export const selectCss = ({ dt }: { dt: (token: string) => string }): string =>
 
   /* ─── FloatLabel ─── */
   .p-floatlabel:has(.p-select.p-component) label {
-    font-family: ${dt('fonts.fontFamily.base')};
-    font-weight: ${dt('floatlabel.root.fontWeight')};
-    line-height: ${dt('fonts.lineHeight.250')};
-    color: ${dt('floatlabel.root.color')};
+    font-family: ${dt('select.extend.fonts_fontFamily_base')};
+    font-weight: ${dt('select.extend.floatlabel_root_fontWeight')};
+    line-height: ${dt('select.extend.fonts_lineHeight_250')};
+    color: ${dt('select.extend.floatlabel_root_color')};
   }
 
   .p-floatlabel:has(.p-select.p-component) .p-floatlabel-active label {
-    font-weight: ${dt('floatlabel.root.active.fontWeight')};
+    font-weight: ${dt('select.extend.floatlabel_root_active_fontWeight')};
   }
 
   .p-floatlabel-in .p-select.p-component .p-select-label {
-    font-family: ${dt('fonts.fontFamily.base')};
-    padding-block-start: ${dt('floatlabel.in.input.paddingTop')};
-    padding-block-end: ${dt('floatlabel.in.input.paddingBottom')};
+    font-family: ${dt('select.extend.fonts_fontFamily_base')};
+    padding-block-start: ${dt('select.extend.floatlabel_in_input_paddingTop')};
+    padding-block-end: ${dt('select.extend.floatlabel_in_input_paddingBottom')};
   }
 
   /* ─── Checkmark: выбранный элемент ─── */
diff --git a/src/lib/providers/prime-preset/tokens/components/selectbutton.ts b/src/lib/providers/prime-preset/tokens/components/selectbutton.ts
index d02fd4fd..5eeb74a9 100644
--- a/src/lib/providers/prime-preset/tokens/components/selectbutton.ts
+++ b/src/lib/providers/prime-preset/tokens/components/selectbutton.ts
@@ -3,21 +3,21 @@ export const selectbuttonCss = ({ dt }: { dt: (token: string) => string }): stri
   background: ${dt('selectbutton.colorScheme.light.extend.background')};
   padding: ${dt('selectbutton.extend.paddingY')} ${dt('selectbutton.extend.paddingX')};
   gap: ${dt('selectbutton.extend.gap')};
-  font-family: ${dt('fonts.fontFamily.heading')};
-  font-weight: ${dt('fonts.fontWeight.demibold')};
+  font-family: ${dt('selectbutton.extend.fonts_fontFamily_heading')};
+  font-weight: ${dt('selectbutton.extend.fonts_fontWeight_demibold')};
 }
 
 .p-selectbutton.p-component .p-togglebutton.p-component {
-  font-family: ${dt('fonts.fontFamily.heading')};
-  font-weight: ${dt('fonts.fontWeight.demibold')};
-  line-height: ${dt('fonts.lineHeight.500')};
-  height: ${dt('controls.iconOnly.700')};
+  font-family: ${dt('selectbutton.extend.fonts_fontFamily_heading')};
+  font-weight: ${dt('selectbutton.extend.fonts_fontWeight_demibold')};
+  line-height: ${dt('selectbutton.extend.fonts_lineHeight_500')};
+  height: ${dt('selectbutton.extend.controls_iconOnly_700')};
   border-radius: ${dt('selectbutton.extend.ext.borderRadius')};
 }
 
 .p-selectbutton.p-component .p-togglebutton .p-togglebutton-label,
 .p-selectbutton.p-component .p-togglebutton .p-togglebutton-content > span {
-  line-height: ${dt('fonts.lineHeight.400')};
+  line-height: ${dt('selectbutton.extend.fonts_lineHeight_400')};
 }
 
 .p-selectbutton.p-component .p-togglebutton.p-togglebutton-checked.p-component,
@@ -35,13 +35,13 @@ export const selectbuttonCss = ({ dt }: { dt: (token: string) => string }): stri
 
 /* Size: small */
 .p-selectbutton.p-selectbutton-small.p-component .p-togglebutton.p-component {
-  line-height: ${dt('fonts.lineHeight.300')};
-  height: ${dt('controls.iconOnly.600')};
+  line-height: ${dt('selectbutton.extend.fonts_lineHeight_300')};
+  height: ${dt('selectbutton.extend.controls_iconOnly_600')};
 }
 
 .p-selectbutton.p-selectbutton-small.p-component .p-togglebutton .p-togglebutton-label,
 .p-selectbutton.p-selectbutton-small.p-component .p-togglebutton .p-togglebutton-content > span {
-  line-height: ${dt('fonts.lineHeight.250')};
+  line-height: ${dt('selectbutton.extend.fonts_lineHeight_250')};
 }
 
 .p-selectbutton.p-selectbutton-small.p-component .p-togglebutton .p-togglebutton-icon,
@@ -57,13 +57,13 @@ export const selectbuttonCss = ({ dt }: { dt: (token: string) => string }): stri
 
 /* Size: large */
 .p-selectbutton.p-selectbutton-large.p-component .p-togglebutton.p-component {
-  line-height: ${dt('fonts.lineHeight.550')};
-  height: ${dt('controls.iconOnly.850')};
+  line-height: ${dt('selectbutton.extend.fonts_lineHeight_550')};
+  height: ${dt('selectbutton.extend.controls_iconOnly_850')};
 }
 
 .p-selectbutton.p-selectbutton-large.p-component .p-togglebutton .p-togglebutton-label,
 .p-selectbutton.p-selectbutton-large.p-component .p-togglebutton .p-togglebutton-content > span {
-  line-height: ${dt('fonts.lineHeight.550')};
+  line-height: ${dt('selectbutton.extend.fonts_lineHeight_550')};
 }
 
 .p-selectbutton.p-selectbutton-large.p-component .p-togglebutton .p-togglebutton-icon,
@@ -73,14 +73,14 @@ export const selectbuttonCss = ({ dt }: { dt: (token: string) => string }): stri
 
 /* Size: xlarge */
 .p-selectbutton.p-selectbutton-xlarge.p-component .p-togglebutton.p-component {
-  font-size: ${dt('fonts.fontSize.600')};
-  line-height: ${dt('fonts.lineHeight.550')};
-  height: ${dt('controls.iconOnly.900')};
+  font-size: ${dt('selectbutton.extend.fonts_fontSize_600')};
+  line-height: ${dt('selectbutton.extend.fonts_lineHeight_550')};
+  height: ${dt('selectbutton.extend.controls_iconOnly_900')};
 }
 
 .p-selectbutton.p-selectbutton-xlarge.p-component .p-togglebutton .p-togglebutton-label,
 .p-selectbutton.p-selectbutton-xlarge.p-component .p-togglebutton .p-togglebutton-content > span {
-  line-height: ${dt('fonts.lineHeight.700')};
+  line-height: ${dt('selectbutton.extend.fonts_lineHeight_700')};
 }
 
 .p-selectbutton.p-selectbutton-xlarge.p-component .p-togglebutton .p-togglebutton-icon,
diff --git a/src/lib/providers/prime-preset/tokens/components/slider.ts b/src/lib/providers/prime-preset/tokens/components/slider.ts
index 0fb55b17..6fca119d 100644
--- a/src/lib/providers/prime-preset/tokens/components/slider.ts
+++ b/src/lib/providers/prime-preset/tokens/components/slider.ts
@@ -5,7 +5,7 @@
 export const sliderCss = ({ dt }: { dt: (token: string) => string }): string => `
   /* ─── Focus ring ползунка ─── */
   .p-slider-handle:focus-visible {
-    outline: ${dt('slider.handle.focusRing.width')} ${dt('slider.handle.focusRing.style')} ${dt('focusRing.extend.success')};
+    outline: ${dt('slider.handle.focusRing.width')} ${dt('slider.handle.focusRing.style')} ${dt('slider.extend.focusRing_success')};
     outline-offset: ${dt('slider.handle.focusRing.offset')};
     box-shadow: none;
   }
diff --git a/src/lib/providers/prime-preset/tokens/components/stepper.ts b/src/lib/providers/prime-preset/tokens/components/stepper.ts
index b6fd0534..ed130d89 100644
--- a/src/lib/providers/prime-preset/tokens/components/stepper.ts
+++ b/src/lib/providers/prime-preset/tokens/components/stepper.ts
@@ -5,7 +5,7 @@ export const stepperCss = ({ dt }: { dt: (token: string) => string }): string =>
   display: flex;
   flex-direction: column;
   gap: ${dt('stepper.extend.extCaption.gap')};
-  line-height: ${dt('fonts.lineHeight.200')};
+  line-height: ${dt('stepper.extend.fonts_lineHeight_200')};
   align-items: flex-start;
   text-align: left;
 }
@@ -14,19 +14,19 @@ export const stepperCss = ({ dt }: { dt: (token: string) => string }): string =>
 .p-stepper .p-step-title .caption-secondary {
   display: flex;
   justify-content: flex-start;
-  font-family: ${dt('fonts.fontFamily.base')};
-  font-size: ${dt('fonts.fontSize.200')};
-  font-weight: ${dt('fonts.fontWeight.regular')};
+  font-family: ${dt('stepper.extend.fonts_fontFamily_base')};
+  font-size: ${dt('stepper.extend.fonts_fontSize_200')};
+  font-weight: ${dt('stepper.extend.fonts_fontWeight_regular')};
   line-height: normal;
-  color: ${dt('text.mutedColor')};
+  color: ${dt('stepper.extend.text_mutedColor')};
 }
 
 /* Номер шага */
 .p-stepper .p-step-number {
-  font-family: ${dt('fonts.fontFamily.base')};
-  font-size: ${dt('fonts.fontSize.300')};
-  font-weight: ${dt('fonts.fontWeight.medium')};
-  line-height: ${dt('fonts.lineHeight.150')};
+  font-family: ${dt('stepper.extend.fonts_fontFamily_base')};
+  font-size: ${dt('stepper.extend.fonts_fontSize_300')};
+  font-weight: ${dt('stepper.extend.fonts_fontWeight_medium')};
+  line-height: ${dt('stepper.extend.fonts_lineHeight_150')};
 }
 
 /* Border для номера шага */
@@ -43,8 +43,8 @@ export const stepperCss = ({ dt }: { dt: (token: string) => string }): string =>
 
 /* Step-number с иконкой */
 .p-stepper .p-step-number:has(i) {
-  background: ${dt('colorScheme.light.transparent')};
-  border-color: ${dt('colorScheme.light.transparent')};
+  background: ${dt('stepper.extend.background_transparent')};
+  border-color: ${dt('stepper.extend.background_transparent')};
 }
 
 /* Размер иконок в step-number */
@@ -59,6 +59,6 @@ export const stepperCss = ({ dt }: { dt: (token: string) => string }): string =>
 
 /* Прозрачный фон для панелей */
 .p-stepper .p-steppanel {
-  background: ${dt('colorScheme.light.transparent')};
+  background: ${dt('stepper.extend.background_transparent')};
 }
 `;
diff --git a/src/lib/providers/prime-preset/tokens/components/tabs.ts b/src/lib/providers/prime-preset/tokens/components/tabs.ts
index e9cc5dcf..1bf7a783 100644
--- a/src/lib/providers/prime-preset/tokens/components/tabs.ts
+++ b/src/lib/providers/prime-preset/tokens/components/tabs.ts
@@ -12,9 +12,9 @@ export const tabsCss = ({ dt }: { dt: (token: string) => string }): string => `
   display: flex;
   align-items: center;
   gap: ${dt('tabs.tab.gap')};
-  font-family: ${dt('fonts.fontFamily.heading')};
-  font-size: ${dt('fonts.fontSize.300')};
-  font-weight: ${dt('fonts.fontWeight.demibold')};
+  font-family: ${dt('tabs.extend.fonts_fontFamily_heading')};
+  font-size: ${dt('tabs.extend.fonts_fontSize_300')};
+  font-weight: ${dt('tabs.extend.fonts_fontWeight_demibold')};
 }
 
 /* Стили для tablist с правильной границей */
diff --git a/src/lib/providers/prime-preset/tokens/components/tag.ts b/src/lib/providers/prime-preset/tokens/components/tag.ts
index 7f84dbe3..4d288fcb 100644
--- a/src/lib/providers/prime-preset/tokens/components/tag.ts
+++ b/src/lib/providers/prime-preset/tokens/components/tag.ts
@@ -1,6 +1,6 @@
 export const tagCss = ({ dt }: { dt: (token: string) => string }): string => `
   .p-tag {
-    font-family: ${dt('fonts.fontFamily.base')};
-    line-height: ${dt('fonts.lineHeight.250')};
+    font-family: ${dt('tag.extend.fonts_fontFamily_base')};
+    line-height: ${dt('tag.extend.fonts_lineHeight_250')};
   }
 `;
diff --git a/src/lib/providers/prime-preset/tokens/components/textarea.ts b/src/lib/providers/prime-preset/tokens/components/textarea.ts
index 263e6886..1bc0d1e2 100644
--- a/src/lib/providers/prime-preset/tokens/components/textarea.ts
+++ b/src/lib/providers/prime-preset/tokens/components/textarea.ts
@@ -3,17 +3,17 @@ export const textareaCss = ({ dt }: { dt: (token: string) => string }): string =
 /* --- Base --- */
 .p-textarea {
   border-width: ${dt('textarea.extend.borderWidth')};
-  line-height: ${dt('fonts.lineHeight.250')};
+  line-height: ${dt('textarea.extend.fonts_lineHeight_250')};
   min-height: ${dt('textarea.extend.minHeight')};
-  font-family: ${dt('fonts.fontFamily.base')};
+  font-family: ${dt('textarea.extend.fonts_fontFamily_base')};
 }
 
 .p-textarea::placeholder {
-  font-family: ${dt('fonts.fontFamily.base')};
+  font-family: ${dt('textarea.extend.fonts_fontFamily_base')};
 }
 
 .p-floatlabel:has(.p-textarea) label {
-  font-family: ${dt('fonts.fontFamily.base')};
+  font-family: ${dt('textarea.extend.fonts_fontFamily_base')};
 }
 
 /* --- Sizes --- */
@@ -42,7 +42,7 @@ export const textareaCss = ({ dt }: { dt: (token: string) => string }): string =
 /* --- Invalid + Focus --- */
 .p-textarea.p-invalid:focus {
   border-color: ${dt('textarea.invalidBorderColor')};
-  box-shadow: 0 0 0 ${dt('textarea.focusRing.width')} ${dt('focusRing.extend.invalid')};
+  box-shadow: 0 0 0 ${dt('textarea.focusRing.width')} ${dt('textarea.extend.focusRing_invalid')};
 }
 
 /* --- ClearButton (showClear) --- */
@@ -52,11 +52,11 @@ export const textareaCss = ({ dt }: { dt: (token: string) => string }): string =
 }
 
 .p-iconfield:has(.p-textarea) .p-textarea {
-  padding-right: ${dt('form.padding.700')};
+  padding-right: ${dt('textarea.extend.form_padding_700')};
 }
 
 .p-iconfield:has(.p-textarea) .p-inputicon {
-  top: ${dt('form.padding.500')};
+  top: ${dt('textarea.extend.form_padding_500')};
   transform: none;
   font-size: ${dt('textarea.extend.iconSize')};
   width: ${dt('textarea.extend.iconSize')};
diff --git a/src/lib/providers/prime-preset/tokens/components/tieredmenu.ts b/src/lib/providers/prime-preset/tokens/components/tieredmenu.ts
index bdef994f..8acda6c8 100644
--- a/src/lib/providers/prime-preset/tokens/components/tieredmenu.ts
+++ b/src/lib/providers/prime-preset/tokens/components/tieredmenu.ts
@@ -4,7 +4,7 @@ export const tieredmenuCss = ({ dt }: { dt: (token: string) => string }): string
   }
 
   .p-tieredmenu-item-content {
-    font-size: ${dt('fonts.fontSize.300')};
+    font-size: ${dt('tieredmenu.extend.fonts_fontSize_300')};
   }
 
   .p-tieredmenu-submenu-icon {
@@ -46,7 +46,7 @@ export const tieredmenuCss = ({ dt }: { dt: (token: string) => string }): string
   }
 
   .p-tieredmenu .p-tieredmenu-item-caption-text {
-    font-size: ${dt('fonts.fontSize.200')};
+    font-size: ${dt('tieredmenu.extend.fonts_fontSize_200')};
     color: ${dt('tieredmenu.extend.extItem.caption.color')};
   }
 `;
diff --git a/src/lib/providers/prime-preset/tokens/components/timeline.ts b/src/lib/providers/prime-preset/tokens/components/timeline.ts
index 562376ec..454737d3 100644
--- a/src/lib/providers/prime-preset/tokens/components/timeline.ts
+++ b/src/lib/providers/prime-preset/tokens/components/timeline.ts
@@ -2,10 +2,10 @@ export const timelineCss = ({ dt }: { dt: (token: string) => string }): string =
 
 /* ─── Типографика ─── */
 .p-timeline {
-  font-family: ${dt('fonts.fontFamily.base')};
-  font-size: ${dt('fonts.fontSize.300')};
-  line-height: ${dt('fonts.lineHeight.500')};
-  color: ${dt('text.color')};
+  font-family: ${dt('timeline.extend.fonts_fontFamily_base')};
+  font-size: ${dt('timeline.extend.fonts_fontSize_300')};
+  line-height: ${dt('timeline.extend.fonts_lineHeight_500')};
+  color: ${dt('timeline.extend.text_color')};
 }
 
 /* ─── Маркер ─── */
diff --git a/src/lib/providers/prime-preset/tokens/components/toast.ts b/src/lib/providers/prime-preset/tokens/components/toast.ts
index adc64305..36506ea2 100644
--- a/src/lib/providers/prime-preset/tokens/components/toast.ts
+++ b/src/lib/providers/prime-preset/tokens/components/toast.ts
@@ -24,14 +24,14 @@ export const toastCss = ({ dt }: { dt: (token: string) => string }): string => `
 
   /* Заголовок toast */
   .p-toast-summary {
-    font-family: ${dt('fonts.fontFamily.base')};
-    line-height: ${dt('fonts.lineHeight.250')};
+    font-family: ${dt('toast.extend.fonts_fontFamily_base')};
+    line-height: ${dt('toast.extend.fonts_lineHeight_250')};
   }
 
   /* Детальное описание toast */
   .p-toast-message .p-toast-detail {
-    font-family: ${dt('fonts.fontFamily.base')};
-    line-height: ${dt('fonts.lineHeight.250')};
+    font-family: ${dt('toast.extend.fonts_fontFamily_base')};
+    line-height: ${dt('toast.extend.fonts_lineHeight_250')};
   }
 
   /* Кнопка закрытия toast-сообщения */
diff --git a/src/lib/providers/prime-preset/tokens/components/togglebutton.ts b/src/lib/providers/prime-preset/tokens/components/togglebutton.ts
index 228d2d39..68e7b83f 100644
--- a/src/lib/providers/prime-preset/tokens/components/togglebutton.ts
+++ b/src/lib/providers/prime-preset/tokens/components/togglebutton.ts
@@ -2,9 +2,9 @@ export const togglebuttonCss = ({ dt }: { dt: (token: string) => string }): stri
 
 /* ─── Типографика ─── */
 .p-togglebutton.p-component {
-  font-family: ${dt('fonts.fontFamily.heading')};
-  font-weight: ${dt('fonts.fontWeight.demibold')};
-  line-height: ${dt('fonts.lineHeight.500')};
+  font-family: ${dt('togglebutton.extend.fonts_fontFamily_heading')};
+  font-weight: ${dt('togglebutton.extend.fonts_fontWeight_demibold')};
+  line-height: ${dt('togglebutton.extend.fonts_lineHeight_500')};
 }
 
 /* ─── Hover unchecked ─── */
@@ -21,10 +21,10 @@ export const togglebuttonCss = ({ dt }: { dt: (token: string) => string }): stri
 
 /* ─── Small ─── */
 .p-togglebutton.p-togglebutton.p-component.p-togglebutton-sm {
-  line-height: ${dt('fonts.lineHeight.300')};
+  line-height: ${dt('togglebutton.extend.fonts_lineHeight_300')};
 }
 .p-togglebutton.p-togglebutton.p-component.p-togglebutton-sm .p-togglebutton-label {
-  line-height: ${dt('fonts.lineHeight.250')};
+  line-height: ${dt('togglebutton.extend.fonts_lineHeight_250')};
 }
 .p-togglebutton.p-togglebutton.p-component.p-togglebutton-sm .p-togglebutton-icon {
   font-size: ${dt('togglebutton.extend.iconSize.sm')};
@@ -37,7 +37,7 @@ export const togglebuttonCss = ({ dt }: { dt: (token: string) => string }): stri
 
 /* ─── Large ─── */
 .p-togglebutton.p-togglebutton.p-component.p-togglebutton-lg {
-  line-height: ${dt('fonts.lineHeight.550')};
+  line-height: ${dt('togglebutton.extend.fonts_lineHeight_550')};
   gap: ${dt('togglebutton.root.gap')};
 }
 .p-togglebutton.p-togglebutton.p-component.p-togglebutton-lg .p-togglebutton-content {
@@ -50,8 +50,8 @@ export const togglebuttonCss = ({ dt }: { dt: (token: string) => string }): stri
 /* ─── Extra Large ─── */
 .p-togglebutton.p-togglebutton.p-component.p-togglebutton-xlarge {
   padding: ${dt('togglebutton.extend.extXlg.padding')};
-  font-size: ${dt('fonts.fontSize.500')};
-  line-height: ${dt('fonts.lineHeight.550')};
+  font-size: ${dt('togglebutton.extend.fonts_fontSize_500')};
+  line-height: ${dt('togglebutton.extend.fonts_lineHeight_550')};
   display: inline-flex;
   align-items: center;
   justify-content: center;
diff --git a/src/lib/providers/prime-preset/tokens/components/toggleswitch.ts b/src/lib/providers/prime-preset/tokens/components/toggleswitch.ts
index 8793c207..2c57e480 100644
--- a/src/lib/providers/prime-preset/tokens/components/toggleswitch.ts
+++ b/src/lib/providers/prime-preset/tokens/components/toggleswitch.ts
@@ -1,11 +1,11 @@
 export const toggleswitchCss = ({ dt }: { dt: (token: string) => string }): string => `
   /* Focus ring для валидных состояний */
   .p-toggleswitch:not(.p-disabled):not(.p-invalid):has(.p-toggleswitch-input:focus-visible) .p-toggleswitch-slider {
-    box-shadow: 0 0 0 ${dt('toggleswitch.root.focusRing.width')} ${dt('focusRing.extend.success')};
+    box-shadow: 0 0 0 ${dt('toggleswitch.root.focusRing.width')} ${dt('toggleswitch.extend.focusRing_success')};
   }
 
   /* Focus ring для состояния ошибки */
   .p-toggleswitch.p-invalid:not(.p-disabled):has(.p-toggleswitch-input:focus-visible) .p-toggleswitch-slider {
-    box-shadow: 0 0 0 ${dt('focusRing.width')} ${dt('focusRing.extend.invalid')};
+    box-shadow: 0 0 0 ${dt('toggleswitch.extend.focusRing_width')} ${dt('toggleswitch.extend.focusRing_invalid')};
   }
 `;
diff --git a/src/lib/providers/prime-preset/tokens/components/tooltip.ts b/src/lib/providers/prime-preset/tokens/components/tooltip.ts
index 8bbc215f..3284de1b 100644
--- a/src/lib/providers/prime-preset/tokens/components/tooltip.ts
+++ b/src/lib/providers/prime-preset/tokens/components/tooltip.ts
@@ -1,9 +1,9 @@
 export const tooltipCss = ({ dt }: { dt: (token: string) => string }): string => `
 /* Типографика для Tooltip */
 .p-tooltip .p-tooltip-text {
-  font-family: ${dt('fonts.fontFamily.base')};
-  font-size: ${dt('fonts.fontSize.200')};
-  font-weight: ${dt('fonts.fontWeight.regular')};
-  line-height: ${dt('fonts.lineHeight.300')};
+  font-family: ${dt('tooltip.extend.fonts_fontFamily_base')};
+  font-size: ${dt('tooltip.extend.fonts_fontSize_200')};
+  font-weight: ${dt('tooltip.extend.fonts_fontWeight_regular')};
+  line-height: ${dt('tooltip.extend.fonts_lineHeight_300')};
 }
 `;
diff --git a/src/lib/providers/prime-preset/tokens/tokens.json b/src/lib/providers/prime-preset/tokens/tokens.json
index 869e9334..e69e9a6f 100644
--- a/src/lib/providers/prime-preset/tokens/tokens.json
+++ b/src/lib/providers/prime-preset/tokens/tokens.json
@@ -3,7 +3,12 @@
     "colors": {
       "alpha": {
         "white": {
+          "10": "rgba(255, 255, 255, 0.0100)",
+          "40": "rgba(255, 255, 255, 0.0400)",
+          "50": "rgba(255, 255, 255, 0.0500)",
+          "60": "rgba(255, 255, 255, 0.0600)",
           "100": "rgba(255, 255, 255, 0.1000)",
+          "160": "rgba(255, 255, 255, 0.1600)",
           "200": "rgba(255, 255, 255, 0.2000)",
           "300": "rgba(255, 255, 255, 0.3000)",
           "400": "rgba(255, 255, 255, 0.4000)",
@@ -11,6 +16,7 @@
           "600": "rgba(255, 255, 255, 0.6000)",
           "700": "rgba(255, 255, 255, 0.7000)",
           "800": "rgba(255, 255, 255, 0.8000)",
+          "870": "rgba(255, 255, 255, 0.8700)",
           "900": "rgba(255, 255, 255, 0.9000)",
           "1000": "#ffffff"
         },
@@ -316,25 +322,10 @@
         }
       }
     },
-    "borderRadius": {
-      "100": "0.25rem",
-      "200": "0.5rem",
-      "300": "0.75rem",
-      "400": "1rem",
-      "500": "1.5rem",
-      "none": "0rem",
-      "max": "71.3571rem"
-    },
-    "borderWidth": {
-      "100": "0.0714rem",
-      "200": "0.1429rem",
-      "300": "0.25rem",
-      "none": "0rem"
-    },
     "fonts": {
       "fontFamily": {
         "heading": "TT Fellows",
-        "base": "PT Sans"
+        "base": "Noto Sans"
       },
       "fontWeight": {
         "regular": "400",
@@ -376,32 +367,38 @@
         "auto": "auto"
       }
     },
-    "spacing": {
-      "none": "0rem",
-      "1x": "0.25rem",
-      "2x": "0.5rem",
-      "3x": "0.75rem",
-      "4x": "1rem",
-      "5x": "1.25rem",
-      "6x": "1.5rem",
-      "7x": "1.75rem",
-      "8x": "2rem",
-      "9x": "2.25rem",
-      "10x": "2.5rem",
-      "11x": "2.75rem",
-      "12x": "3rem",
-      "14x": "3.5rem",
-      "16x": "4rem",
-      "20x": "5rem",
-      "24x": "6rem",
-      "28x": "7rem",
-      "32x": "8rem",
-      "36x": "9rem",
-      "40x": "10rem"
+    "shadows": {
+      "100": "0 0 0.1rem {colors.alpha.black.200}",
+      "200": "0 0 0.25rem {colors.alpha.black.200}",
+      "300": "0 0.1rem 0.25rem {colors.alpha.black.200}",
+      "400": "0 0.25rem 0.5rem {colors.alpha.black.200}",
+      "500": "0 0.5rem 1rem 0 {colors.alpha.black.200}",
+      "none": "none"
+    },
+    "transition": {
+      "easing": {
+        "linear": "linear",
+        "in": "cubic-bezier(0.55, 0.06, 0.7, 0.2)",
+        "out": "cubic-bezier(0.2, 0.6, 0.4, 1)",
+        "inOut": "cubic-bezier(0.65, 0.05, 0.35, 1)"
+      },
+      "duration": {
+        "100": "140ms",
+        "200": "180ms",
+        "300": "240ms",
+        "400": "320ms",
+        "500": "400ms"
+      }
+    },
+    "opacity": {
+      "250": "0.25",
+      "500": "0.5",
+      "1000": "1"
     },
-    "sizing": {
+    "size": {
       "none": "0rem",
       "min": "0.0714rem",
+      "2px": "0.1429rem",
       "1x": "0.25rem",
       "2x": "0.5rem",
       "3x": "0.75rem",
@@ -448,483 +445,163 @@
       "136x": "54rem",
       "140x": "58rem",
       "144x": "60rem",
+      "pill": "71.3571rem",
       "max": "100%"
-    },
-    "shadows": {
-      "100": "0 0 0.1rem {colors.alpha.black.200}",
-      "200": "0 0 0.25rem {colors.alpha.black.200}",
-      "300": "0 0.1rem 0.25rem {colors.alpha.black.200}",
-      "400": "0 0.25rem 0.5rem {colors.alpha.black.200}",
-      "500": "0 0.5rem 1rem 0 {colors.alpha.black.200}",
-      "none": "none"
-    },
-    "transition": {
-      "easing": {
-        "linear": "linear",
-        "in": "cubic-bezier(0.55, 0.06, 0.7, 0.2)",
-        "out": "cubic-bezier(0.2, 0.6, 0.4, 1)",
-        "inOut": "cubic-bezier(0.65, 0.05, 0.35, 1)"
-      },
-      "duration": {
-        "100": "140ms",
-        "200": "180ms",
-        "300": "240ms",
-        "400": "320ms",
-        "500": "400ms"
-      }
-    },
-    "opacity": {
-      "250": "0.25",
-      "500": "0.5",
-      "1000": "1"
     }
   },
   "semantic": {
-    "list": {
-      "padding": "{spacing.1x}",
-      "gap": {
-        "100": "{spacing.1x}",
-        "200": "{spacing.2x}"
-      },
-      "header": {
-        "padding": "{spacing.4x} {spacing.4x} 0 {spacing.4x}"
-      },
-      "option": {
-        "padding": "{spacing.2x} {spacing.3x}",
-        "borderRadius": "{borderRadius.200}"
-      },
-      "optionGroup": {
-        "padding": "{spacing.2x} {spacing.3x}",
-        "fontWeight": "{fonts.fontWeight.demibold}"
-      }
-    },
-    "focusRing": {
-      "width": "{borderWidth.300}",
-      "style": "none",
-      "color": "{focusRing.extend.success}",
-      "offset": "0rem"
-    },
-    "form": {
-      "padding": {
-        "100": "{spacing.1x}",
-        "200": "{spacing.2x}",
-        "300": "{spacing.3x}",
-        "400": "{spacing.4x}",
-        "500": "{spacing.5x}",
-        "600": "{spacing.6x}",
-        "700": "{spacing.7x}"
-      },
-      "borderRadius": {
-        "100": "{borderRadius.200}",
-        "200": "{borderRadius.300}",
-        "300": "{borderRadius.max}"
-      },
-      "borderWidth": "{borderWidth.100}",
-      "icon": {
-        "100": "{sizing.2x}",
-        "200": "{sizing.3x}",
-        "300": "{sizing.4x}",
-        "400": "{sizing.5x}",
-        "500": "{sizing.6x}"
-      },
-      "transitionDuration": "{transition.duration.200}",
-      "size": {
-        "100": "{sizing.min}",
-        "150": "{sizing.1x}",
-        "200": "{sizing.2x}",
-        "250": "{sizing.3x}",
-        "300": "{sizing.4x}",
-        "350": "{sizing.5x}",
-        "400": "{sizing.6x}",
-        "500": "{sizing.8x}",
-        "600": "{sizing.10x}",
-        "700": "{sizing.12x}",
-        "800": "{sizing.16x}",
-        "900": "{sizing.20x}"
-      },
-      "width": {
-        "100": "{sizing.6x}",
-        "200": "{sizing.8x}",
-        "300": "{sizing.10x}",
-        "350": "{sizing.11x}",
-        "400": "{sizing.12x}",
-        "500": "{sizing.60x}",
-        "full": "{sizing.max}"
-      },
-      "gap": {
-        "100": "{spacing.1x}",
-        "200": "{spacing.2x}",
-        "300": "{spacing.3x}",
-        "400": "{spacing.4x}"
-      },
-      "focusRing": {
-        "width": "{focusRing.width}",
-        "style": "{focusRing.style}",
-        "color": "{focusRing.color}",
-        "offset": "{focusRing.offset}"
-      },
-      "sm": {
-        "width": "{sizing.60x}",
-        "fontSize": "{fonts.fontSize.300}",
-        "paddingX": "{spacing.3x}",
-        "paddingY": "{spacing.3x}"
-      },
-      "fontSize": "{fonts.fontSize.300}",
-      "paddingX": "{spacing.4x}",
-      "paddingY": "{spacing.4x}",
-      "lg": {
-        "width": "{sizing.76x}",
-        "fontSize": "{fonts.fontSize.300}",
-        "paddingX": "{spacing.5x}",
-        "paddingY": "{spacing.5x}"
-      },
-      "xlg": {
-        "width": "{sizing.84x}",
-        "fontSize": "{fonts.fontSize.300}",
-        "paddingX": "{spacing.6x}",
-        "paddingY": "{spacing.6x}"
-      }
-    },
-    "content": {
-      "borderRadius": "{borderRadius.300}",
-      "padding": {
-        "100": "{spacing.1x}",
-        "200": "{spacing.2x}",
-        "300": "{spacing.4x}",
-        "400": "{spacing.6x}",
-        "500": "{spacing.7x}"
-      },
-      "borderWidth": "{sizing.min}",
-      "gap": {
-        "100": "{spacing.1x}",
-        "200": "{spacing.2x}",
-        "300": "{spacing.3x}",
-        "400": "{spacing.4x}"
-      }
-    },
-    "navigation": {
-      "width": {
-        "100": "{borderWidth.100}",
-        "200": "{borderWidth.300}"
-      },
-      "borderRadius": "{borderRadius.100}",
-      "padding": {
-        "100": "{spacing.1x}",
-        "200": "{spacing.3x}",
-        "300": "{spacing.4x}",
-        "400": "{spacing.6x}"
-      },
-      "size": {
-        "100": "{sizing.1x}",
-        "200": "{sizing.2x}",
-        "300": "{sizing.5x}",
-        "400": "{sizing.8x}",
-        "500": "{sizing.16x}"
-      },
-      "submenu": {
-        "padding": "{spacing.5x}"
-      },
-      "list": {
-        "padding": {
-          "100": "{spacing.1x}",
-          "200": "{spacing.2x}"
-        },
-        "gap": "{spacing.1x}"
-      },
-      "item": {
-        "padding": "{spacing.2x} {spacing.3x}",
-        "borderRadius": "{borderRadius.200}",
-        "gap": "{spacing.2x}"
-      },
-      "submenuLabel": {
-        "padding": "{spacing.2x} {spacing.3x}",
-        "fontWeight": "{fonts.fontWeight.regular}"
-      },
-      "submenuIcon": {
-        "size": "{fonts.fontSize.500}"
-      }
-    },
-    "overlay": {
-      "mask": {
-        "transitionDuration": "{transition.duration.200}"
-      },
-      "select": {
-        "borderRadius": "{borderRadius.300}",
-        "padding": "{spacing.1x}"
-      },
-      "borderWidth": "{borderWidth.100}",
-      "icon": {
-        "size": {
-          "100": "{sizing.4x}",
-          "200": "{sizing.6x}",
-          "300": "{sizing.7x}",
-          "400": "{sizing.8x}",
-          "500": "{sizing.9x}"
-        }
-      },
-      "popover": {
-        "borderRadius": "{borderRadius.200}",
-        "width": {
-          "100": "{sizing.2x}",
-          "200": "{sizing.3x}"
-        },
-        "padding": {
-          "100": "{spacing.3x}",
-          "200": "{spacing.5x}"
-        }
-      },
-      "modal": {
-        "borderRadius": "{borderRadius.500}",
-        "padding": {
-          "100": "{spacing.4x}",
-          "200": "{spacing.5x}",
-          "300": "{spacing.6x}"
-        }
-      },
-      "gap": {
-        "100": "{spacing.1x}",
-        "200": "{spacing.2x}",
-        "300": "{spacing.3x}",
-        "400": "{spacing.4x}"
-      },
-      "width": "{sizing.100x}",
-      "drawer": {
-        "padding": "{spacing.2x}"
-      },
-      "sm": {
-        "width": "{sizing.80x}"
-      },
-      "lg": {
-        "width": "{sizing.120x}"
-      },
-      "xlg": {
-        "width": "{sizing.128x}"
-      }
-    },
-    "feedback": {
-      "transitionDuration": "{transition.duration.200}",
-      "width": {
-        "100": "{sizing.min}",
-        "200": "{sizing.1x}",
-        "300": "{sizing.2x}",
-        "400": "{sizing.3x}",
-        "500": "{sizing.4x}",
-        "550": "{sizing.5x}",
-        "600": "{sizing.6x}",
-        "650": "{sizing.7x}",
-        "700": "{sizing.8x}",
-        "800": "{sizing.12x}",
-        "900": "{sizing.16x}"
-      },
-      "icon": {
-        "size": {
-          "100": "{sizing.2x}",
-          "200": "{sizing.4x}",
-          "300": "{sizing.6x}",
-          "350": "{sizing.7x}",
-          "400": "{sizing.8x}",
-          "500": "{sizing.9x}"
-        }
-      },
-      "padding": {
-        "100": "{spacing.2x}",
-        "200": "{spacing.4x}"
-      },
-      "height": {
-        "100": "{sizing.2x}",
-        "200": "{sizing.3x}",
-        "300": "{sizing.4x}",
-        "400": "{sizing.5x}",
-        "500": "{sizing.6x}",
-        "600": "{sizing.7x}",
-        "650": "{sizing.8x}",
-        "700": "{sizing.9x}",
-        "750": "{sizing.10x}",
-        "800": "{sizing.11x}",
-        "850": "{sizing.12x}",
-        "900": "{sizing.16x}"
-      },
-      "gap": {
-        "100": "{spacing.1x}",
-        "200": "{spacing.2x}",
-        "300": "{spacing.3x}",
-        "400": "{spacing.4x}"
-      }
-    },
-    "data": {
-      "padding": {
-        "100": "{spacing.1x}",
-        "200": "{spacing.2x}",
-        "300": "{spacing.3x}",
-        "400": "{spacing.4x}",
-        "500": "{spacing.5x}"
-      },
-      "icon": {
-        "size": {
-          "100": "{sizing.4x}",
-          "200": "{sizing.5x}",
-          "300": "{sizing.6x}",
-          "400": "{sizing.7x}",
-          "500": "{sizing.8x}",
-          "600": "{sizing.9x}",
-          "700": "{sizing.10x}"
-        }
-      },
-      "transitionDuration": "{transition.duration.200}",
-      "borderWidth": "{borderWidth.none}",
-      "borderRadius": "{borderRadius.100}",
-      "gap": {
-        "100": "{spacing.1x}",
-        "200": "{spacing.2x}",
-        "300": "{spacing.3x}"
-      },
-      "width": {
-        "100": "{sizing.min}",
-        "200": "{sizing.1x}",
-        "300": "{sizing.2x}",
-        "400": "{sizing.20x}"
-      }
-    },
-    "media": {
-      "size": {
-        "100": "{sizing.1x}",
-        "200": "{sizing.2x}",
-        "300": "{sizing.8x}",
-        "400": "{sizing.10x}",
-        "500": "{sizing.14x}",
-        "600": "{sizing.16x}"
-      },
-      "borderRadius": {
-        "100": "{borderRadius.200}",
-        "200": "{borderRadius.300}",
-        "300": "{borderRadius.400}",
-        "400": "{borderRadius.500}",
-        "max": "{borderRadius.max}"
-      },
-      "icon": {
-        "size": {
-          "100": "{sizing.4x}",
-          "200": "{sizing.6x}",
-          "300": "{sizing.8x}"
-        }
-      },
-      "transitionDuration": "{transition.duration.200}",
-      "padding": {
-        "100": "{spacing.1x}",
-        "200": "{spacing.2x}",
-        "300": "{spacing.3x}",
-        "400": "{spacing.4x}",
-        "500": "{spacing.5x}",
-        "600": "{spacing.6x}"
-      },
-      "gap": {
-        "100": "{spacing.1x}",
-        "200": "{spacing.2x}"
-      }
-    },
-    "controls": {
-      "iconOnly": {
-        "100": "{sizing.2x}",
-        "200": "{sizing.4x}",
-        "300": "{sizing.5x}",
-        "400": "{sizing.6x}",
-        "500": "{sizing.7x}",
-        "600": "{sizing.8x}",
-        "700": "{sizing.10x}",
-        "800": "{sizing.11x}",
-        "850": "{sizing.14x}",
-        "900": "{sizing.16x}"
-      },
-      "borderRadius": {
-        "100": "{borderRadius.300}",
-        "200": "{borderRadius.400}",
-        "max": "{borderRadius.max}"
-      },
-      "transitionDuration": "{transition.duration.200}",
-      "padding": {
-        "100": "{spacing.1x}",
-        "200": "{spacing.2x}",
-        "300": "{spacing.3x}",
-        "400": "{spacing.4x}",
-        "500": "{spacing.5x}",
-        "600": "{spacing.6x}"
-      },
-      "gap": {
-        "100": "{spacing.2x}",
-        "200": "{spacing.3x}",
-        "300": "{spacing.4x}"
-      },
-      "width": {
-        "100": "{sizing.min}"
-      }
-    },
     "colorScheme": {
       "light": {
-        "success": {
-          "50": "{colors.solid.green.50}",
-          "100": "{colors.solid.green.100}",
-          "200": "{colors.solid.green.200}",
-          "300": "{colors.solid.green.300}",
-          "400": "{colors.solid.green.400}",
-          "500": "{colors.solid.green.500}",
-          "600": "{colors.solid.green.600}",
-          "700": "{colors.solid.green.700}",
-          "800": "{colors.solid.green.800}",
-          "900": "{colors.solid.green.900}",
-          "950": "{colors.solid.green.950}"
+        "background": {
+          "surface": {
+            "ground": "{colors.solid.zinc.100}",
+            "section": "{colors.alpha.white.1000}",
+            "field": "{colors.alpha.white.1000}",
+            "raised": "{colors.alpha.white.1000}",
+            "overlay": "{colors.alpha.white.1000}",
+            "sunken": "{colors.solid.zinc.100}",
+            "canvas": "{colors.alpha.white.1000}",
+            "inverse": "{colors.solid.zinc.800}",
+            "inverseStrong": "{colors.solid.zinc.950}",
+            "hover": {
+              "section": "{colors.solid.zinc.100}",
+              "raised": "{colors.solid.zinc.100}"
+            }
+          },
+          "brand": {
+            "subtle": "{colors.solid.green.50}",
+            "subtleHover": "{colors.solid.green.100}",
+            "bold": "{colors.solid.green.500}",
+            "boldHover": "{colors.solid.green.600}",
+            "boldActive": "{colors.solid.green.700}"
+          },
+          "neutral": {
+            "subtle": "{colors.solid.zinc.50}",
+            "subtleHover": "{colors.solid.zinc.100}",
+            "bold": "{colors.solid.zinc.500}",
+            "boldHover": "{colors.solid.zinc.600}"
+          },
+          "selected": "{colors.solid.zinc.900}",
+          "disabled": "{colors.solid.zinc.200}",
+          "scrim": {
+            "default": "{colors.alpha.black.400}",
+            "modal": "{colors.alpha.black.300}"
+          },
+          "translucent": {
+            "light": {
+              "subtle": "{colors.alpha.white.100}",
+              "default": "{colors.alpha.white.200}",
+              "strong": "{colors.alpha.white.500}"
+            },
+            "dark": {
+              "default": "{colors.alpha.black.500}"
+            }
+          },
+          "transparent": "{background.transparent}",
+          "selectedStrong": "{colors.solid.zinc.700}",
+          "success": {
+            "subtle": "{colors.solid.green.50}",
+            "subtleHover": "{colors.solid.green.100}",
+            "bold": "{colors.solid.green.500}",
+            "boldHover": "{colors.solid.green.600}"
+          },
+          "info": {
+            "subtle": "{colors.solid.blue.50}",
+            "subtleHover": "{colors.solid.blue.100}",
+            "bold": "{colors.solid.blue.500}",
+            "boldHover": "{colors.solid.blue.600}"
+          },
+          "warning": {
+            "subtle": "{colors.solid.yellow.50}",
+            "subtleHover": "{colors.solid.yellow.100}",
+            "bold": "{colors.solid.yellow.500}",
+            "boldHover": "{colors.solid.yellow.600}"
+          },
+          "danger": {
+            "subtle": "{colors.solid.red.50}",
+            "subtleHover": "{colors.solid.red.100}",
+            "bold": "{colors.solid.red.500}",
+            "boldHover": "{colors.solid.red.600}"
+          },
+          "help": {
+            "subtle": "{colors.solid.purple.50}",
+            "subtleHover": "{colors.solid.purple.100}",
+            "bold": "{colors.solid.purple.500}",
+            "boldHover": "{colors.solid.purple.600}"
+          }
         },
-        "info": {
-          "50": "{colors.solid.blue.50}",
-          "100": "{colors.solid.blue.100}",
-          "200": "{colors.solid.blue.200}",
-          "300": "{colors.solid.blue.300}",
-          "400": "{colors.solid.blue.400}",
-          "500": "{colors.solid.blue.500}",
-          "600": "{colors.solid.blue.600}",
-          "700": "{colors.solid.blue.700}",
-          "800": "{colors.solid.blue.800}",
-          "900": "{colors.solid.blue.900}",
-          "950": "{colors.solid.blue.950}"
-        },
-        "warn": {
-          "50": "{colors.solid.yellow.50}",
-          "100": "{colors.solid.yellow.100}",
-          "200": "{colors.solid.yellow.200}",
-          "300": "{colors.solid.yellow.300}",
-          "400": "{colors.solid.yellow.400}",
-          "500": "{colors.solid.yellow.500}",
-          "600": "{colors.solid.yellow.600}",
-          "700": "{colors.solid.yellow.700}",
-          "800": "{colors.solid.yellow.800}",
-          "900": "{colors.solid.yellow.900}",
-          "950": "{colors.solid.yellow.950}"
-        },
-        "transparent": "rgba(255, 255, 255, 0.0001)",
-        "help": {
-          "50": "{colors.solid.purple.50}",
-          "100": "{colors.solid.purple.100}",
-          "200": "{colors.solid.purple.200}",
-          "300": "{colors.solid.purple.300}",
-          "400": "{colors.solid.purple.400}",
-          "500": "{colors.solid.purple.500}",
-          "600": "{colors.solid.purple.600}",
-          "700": "{colors.solid.purple.700}",
-          "800": "{colors.solid.purple.800}",
-          "900": "{colors.solid.purple.900}",
-          "950": "{colors.solid.purple.950}"
-        },
-        "error": {
-          "50": "{colors.solid.red.50}",
-          "100": "{colors.solid.red.100}",
-          "200": "{colors.solid.red.200}",
-          "300": "{colors.solid.red.300}",
-          "400": "{colors.solid.red.400}",
-          "500": "{colors.solid.red.500}",
-          "600": "{colors.solid.red.600}",
-          "700": "{colors.solid.red.700}",
-          "800": "{colors.solid.red.800}",
-          "900": "{colors.solid.red.900}",
-          "950": "{colors.solid.red.950}"
+        "text": {
+          "default": "{colors.solid.zinc.900}",
+          "subtle": "{colors.solid.zinc.600}",
+          "muted": "{colors.solid.zinc.500}",
+          "placeholder": "{colors.solid.zinc.500}",
+          "disabled": "{colors.solid.zinc.300}",
+          "onBold": "{colors.alpha.white.1000}",
+          "staticDark": "{colors.solid.zinc.900}",
+          "staticLight": "{colors.alpha.white.1000}",
+          "brand": "{colors.solid.green.600}",
+          "link": "{colors.solid.green.600}",
+          "linkHover": "{colors.solid.green.700}",
+          "neutral": "{colors.solid.zinc.600}",
+          "hover": {
+            "default": "{colors.solid.zinc.700}",
+            "subtle": "{colors.solid.zinc.400}",
+            "muted": "{colors.solid.zinc.300}",
+            "brand": "{colors.solid.green.700}"
+          },
+          "defaultHover": "{colors.solid.zinc.950}",
+          "neutralHover": "{colors.solid.zinc.950}",
+          "transparent": "{background.transparent}",
+          "success": "{colors.solid.green.600}",
+          "info": "{colors.solid.blue.600}",
+          "warning": "{colors.solid.yellow.600}",
+          "danger": "{colors.solid.red.600}",
+          "help": "{colors.solid.purple.600}",
+          "color": "{text.hover.default}",
+          "hoverColor": "{colors.solid.zinc.800}",
+          "mutedColor": "{text.muted}",
+          "hoverMutedColor": "{text.subtle}"
+        },
+        "border": {
+          "subtle": "{colors.solid.zinc.200}",
+          "default": "{colors.solid.zinc.300}",
+          "strong": "{colors.solid.zinc.900}",
+          "disabled": "{colors.solid.zinc.200}",
+          "brand": "{colors.solid.green.600}",
+          "neutral": "{colors.solid.zinc.400}",
+          "inverse": "{colors.solid.zinc.800}",
+          "transparent": "{background.transparent}",
+          "checked": "{colors.solid.green.500}",
+          "success": "{colors.solid.green.400}",
+          "info": "{colors.solid.blue.400}",
+          "warning": "{colors.solid.yellow.400}",
+          "danger": "{colors.solid.red.400}",
+          "help": "{colors.solid.purple.400}"
+        },
+        "icon": {
+          "default": "{colors.solid.zinc.950}",
+          "subtle": "{colors.solid.zinc.500}",
+          "disabled": "{colors.solid.zinc.300}",
+          "onBold": "{colors.alpha.white.1000}",
+          "brand": "{colors.solid.green.600}",
+          "neutral": "{colors.solid.zinc.600}",
+          "strong": "{colors.solid.zinc.900}",
+          "strongMuted": "{colors.solid.zinc.900}",
+          "strongHover": "{colors.solid.zinc.700}",
+          "success": "{colors.solid.green.600}",
+          "info": "{colors.solid.blue.600}",
+          "warning": "{colors.solid.yellow.600}",
+          "danger": "{colors.solid.red.600}",
+          "help": "{colors.solid.purple.600}"
+        },
+        "focusRing": {
+          "default": "{colors.solid.green.500}",
+          "invalid": "{colors.solid.red.200}",
+          "success": "{colors.solid.green.200}",
+          "warning": "{colors.solid.yellow.200}",
+          "info": "{colors.solid.blue.200}",
+          "help": "{colors.solid.purple.200}",
+          "shadow": "{shadow.200}"
         },
         "surface": {
           "0": "{colors.alpha.white.1000}",
@@ -944,384 +621,648 @@
           "color": "{colors.solid.green.500}",
           "contrastColor": "{colors.alpha.white.1000}",
           "hoverColor": "{colors.solid.green.600}",
-          "activeColor": "{colors.solid.green.700}",
-          "hoverBackground": "{colors.solid.green.50}",
-          "activeBackground": "{colors.solid.green.100}",
-          "borderColor": "{colors.solid.green.200}",
-          "selectedBackground": "{colors.solid.green.500}",
-          "selectedHoverBackground": "{colors.solid.green.600}"
+          "activeColor": "{colors.solid.green.700}"
         },
         "highlight": {
-          "background": "{colors.solid.zinc.900}",
-          "focusBackground": "{colors.solid.zinc.800}",
-          "color": "{colors.alpha.white.1000}",
-          "focusColor": "{colors.alpha.white.1000}"
-        },
-        "focusRing": {
-          "shadow": "{shadows.200}",
-          "extend": {
-            "invalid": "{colors.solid.red.200}",
-            "success": "{colors.solid.green.200}",
-            "warning": "{colors.solid.yellow.200}",
-            "info": "{colors.solid.blue.200}"
-          }
+          "background": "{colors.solid.green.50}",
+          "focusBackground": "{colors.solid.green.100}",
+          "color": "{colors.solid.green.700}",
+          "focusColor": "{colors.solid.green.800}"
         },
         "mask": {
           "background": "{colors.alpha.black.400}",
-          "color": "{surface.200}"
-        },
-        "form": {
-          "background": "{colors.alpha.white.1000}",
-          "disabledBackground": "{colors.solid.zinc.200}",
-          "readonlyBackground": "{colors.solid.zinc.100}",
-          "filledBackground": "{colors.alpha.white.1000}",
-          "filledHoverBackground": "{colors.alpha.white.1000}",
-          "filledFocusBackground": "{colors.alpha.white.1000}",
-          "borderColor": "{colors.solid.zinc.300}",
-          "hoverBorderPrimaryColor": "{colors.solid.zinc.900}",
-          "focusBorderPrimaryColor": "{colors.solid.zinc.900}",
-          "hoverBorderSecondaryColor": "{colors.solid.green.600}",
-          "focusBorderSecondaryColor": "{colors.solid.green.600}",
+          "color": "{colors.solid.zinc.200}"
+        },
+        "formField": {
+          "background": "{background.surface.raised}",
+          "disabledBackground": "{background.disabled}",
+          "filledBackground": "{background.neutral.subtle}",
+          "filledHoverBackground": "{background.neutral.subtle}",
+          "filledFocusBackground": "{background.neutral.subtle}",
+          "borderColor": "{border.default}",
+          "hoverBorderColor": "{border.neutral}",
+          "focusBorderColor": "{border.brand}",
           "invalidBorderColor": "{colors.solid.red.400}",
-          "color": "{colors.solid.zinc.950}",
-          "disabledColor": "{colors.solid.zinc.500}",
-          "placeholderColor": "{colors.solid.zinc.500}",
+          "color": "{text.hover.default}",
+          "disabledColor": "{text.muted}",
+          "placeholderColor": "{text.muted}",
           "invalidPlaceholderColor": "{colors.solid.red.600}",
-          "floatLabelColor": "{colors.solid.zinc.500}",
-          "floatLabelFocusColor": "{colors.solid.zinc.500}",
-          "floatLabelActiveColor": "{colors.solid.zinc.500}",
-          "floatLabelInvalidColor": "{form.invalidPlaceholderColor}",
-          "iconColor": "{colors.solid.zinc.950}",
-          "backgroundHandler": "{colors.alpha.white.1000}",
-          "shadow": "{shadows.200}"
-        },
-        "text": {
-          "color": "{colors.solid.zinc.900}",
-          "extend": {
-            "colorPrimaryStatic": "{colors.solid.zinc.900}",
-            "colorSecondaryStatic": "{colors.alpha.white.1000}",
-            "colorInverted": "{colors.alpha.white.1000}"
-          },
-          "hoverColor": "{colors.solid.zinc.700}",
-          "primaryColor": "{colors.solid.green.600}",
-          "hoverPrimaryColor": "{colors.solid.green.700}",
-          "secondaryColor": "{colors.solid.zinc.600}",
-          "hoverSecondaryColor": "{colors.solid.zinc.400}",
-          "mutedColor": "{colors.solid.zinc.500}",
-          "hoverMutedColor": "{colors.solid.zinc.300}",
-          "disabledColor": "{colors.solid.zinc.300}",
-          "infoColor": "{colors.solid.blue.600}",
-          "successColor": "{colors.solid.green.700}",
-          "dangerColor": "{colors.solid.red.600}",
-          "warningColor": "{colors.solid.yellow.600}",
-          "helpColor": "{colors.solid.purple.600}"
+          "floatLabelColor": "{text.muted}",
+          "floatLabelFocusColor": "{colors.solid.green.600}",
+          "floatLabelActiveColor": "{text.muted}",
+          "floatLabelInvalidColor": "{text.danger}",
+          "iconColor": "{colors.solid.zinc.400}",
+          "shadow": "0 0 #0000, 0 0 #0000, 0 1px 2px 0 rgba(18, 18, 23, 0.05)"
         },
         "content": {
-          "background": "{colors.alpha.white.1000}",
-          "hoverBackground": "{colors.solid.zinc.100}",
-          "borderColor": "{colors.solid.zinc.200}",
-          "activeBorderColor": "{colors.solid.zinc.800}",
-          "color": "{text.color}",
-          "hoverColor": "{text.hoverColor}",
-          "shadow": "{shadows.400}"
-        },
-        "list": {
-          "option": {
-            "background": "{colors.alpha.white.1000}",
-            "focusBackground": "{colors.solid.zinc.100}",
-            "selectedBackground": "{colors.solid.zinc.900}",
-            "selectedFocusBackground": "{colors.solid.zinc.700}",
-            "color": "{text.color}",
-            "focusColor": "{text.color}",
-            "selectedColor": "{text.extend.colorInverted}",
-            "selectedFocusColor": "{text.extend.colorInverted}",
-            "icon": {
-              "color": "{text.color}",
-              "focusColor": "{text.color}"
-            }
-          },
-          "optionGroup": {
-            "background": "{colors.alpha.white.1000}",
-            "color": "{text.mutedColor}"
-          }
+          "background": "{background.surface.raised}",
+          "hoverBackground": "{background.neutral.subtleHover}",
+          "borderColor": "{border.subtle}",
+          "color": "{text.default}",
+          "hoverColor": "{text.hover.default}"
         },
         "overlay": {
           "select": {
-            "background": "{colors.alpha.white.1000}",
-            "borderColor": "{colors.solid.zinc.200}",
-            "color": "{text.color}",
-            "shadow": "0 0.25rem 0.5rem {colors.alpha.black.200}"
+            "background": "{background.surface.raised}",
+            "borderColor": "{border.subtle}",
+            "color": "{text.default}"
           },
           "popover": {
-            "background": "{colors.alpha.white.1000}",
-            "borderColor": "{form.borderColor}",
-            "color": "{text.color}",
-            "shadow": "{shadows.400}"
+            "background": "{background.surface.raised}",
+            "borderColor": "{border.subtle}",
+            "color": "{text.default}"
           },
           "modal": {
-            "background": "{colors.alpha.white.1000}",
-            "backdrop": "{colors.alpha.black.300}",
-            "borderColor": "{colors.solid.zinc.200}",
-            "color": "{text.color}",
-            "shadow": "{shadows.200}"
+            "background": "{background.surface.raised}",
+            "borderColor": "{border.subtle}",
+            "color": "{text.default}"
           }
         },
-        "navigation": {
-          "submenuLabel": {
-            "background": "rgba(255, 255, 255, 0.0000)",
-            "color": "{text.mutedColor}"
-          },
-          "submenuIcon": {
-            "color": "{colors.solid.zinc.900}",
-            "focusColor": "{colors.solid.zinc.900}",
-            "activeColor": "{colors.alpha.white.1000}"
+        "list": {
+          "option": {
+            "focusBackground": "{background.neutral.subtleHover}",
+            "selectedBackground": "{background.brand.subtleHover}",
+            "selectedFocusBackground": "{background.brand.subtle}",
+            "color": "{text.default}",
+            "focusColor": "{text.hover.default}",
+            "selectedColor": "{text.brand}",
+            "selectedFocusColor": "{text.brand}",
+            "icon": {
+              "color": "{text.hover.subtle}",
+              "focusColor": "{text.muted}"
+            }
           },
+          "optionGroup": {
+            "background": "transparent",
+            "color": "{text.muted}"
+          }
+        },
+        "navigation": {
           "item": {
-            "focusBackground": "{colors.solid.zinc.100}",
-            "activeBackground": "{colors.solid.zinc.900}",
-            "color": "{colors.solid.zinc.900}",
-            "focusColor": "{colors.solid.zinc.900}",
+            "focusBackground": "{background.neutral.subtleHover}",
+            "activeBackground": "{background.neutral.subtleHover}",
+            "color": "{text.default}",
+            "focusColor": "{text.hover.default}",
+            "activeColor": "{text.hover.default}",
             "icon": {
-              "color": "{colors.solid.zinc.900}",
-              "focusColor": "{colors.solid.zinc.900}",
-              "activeColor": "{colors.alpha.white.1000}"
-            },
-            "activeColor": "{colors.alpha.white.1000}"
+              "color": "{text.hover.subtle}",
+              "focusColor": "{text.muted}",
+              "activeColor": "{text.muted}"
+            }
           },
-          "shadow": "{shadows.400}"
+          "submenuLabel": {
+            "background": "transparent",
+            "color": "{text.muted}"
+          },
+          "submenuIcon": {
+            "color": "{text.hover.subtle}",
+            "focusColor": "{text.muted}",
+            "activeColor": "{text.muted}"
+          }
         }
       },
       "dark": {
-        "success": {
-          "50": "{colors.solid.green.950}",
-          "100": "{colors.solid.green.900}",
-          "200": "{colors.solid.green.800}",
-          "300": "{colors.solid.green.700}",
-          "400": "{colors.solid.green.600}",
-          "500": "{colors.solid.green.500}",
-          "600": "{colors.solid.green.400}",
-          "700": "{colors.solid.green.300}",
-          "800": "{colors.solid.green.200}",
-          "900": "{colors.solid.green.100}",
-          "950": "{colors.solid.green.50}"
+        "background": {
+          "surface": {
+            "ground": "{colors.solid.zinc.950}",
+            "section": "{colors.solid.zinc.900}",
+            "field": "{colors.solid.zinc.950}",
+            "raised": "{colors.solid.zinc.900}",
+            "overlay": "{colors.solid.zinc.900}",
+            "sunken": "{colors.solid.zinc.950}",
+            "canvas": "{colors.alpha.black.1000}",
+            "inverse": "{colors.solid.zinc.200}",
+            "inverseStrong": "{colors.solid.zinc.50}",
+            "hover": {
+              "section": "{colors.solid.zinc.800}",
+              "raised": "{colors.solid.zinc.800}"
+            }
+          },
+          "brand": {
+            "subtle": "{colors.solid.green.950}",
+            "subtleHover": "{colors.solid.green.900}",
+            "bold": "{colors.solid.green.500}",
+            "boldHover": "{colors.solid.green.400}",
+            "boldActive": "{colors.solid.green.300}"
+          },
+          "neutral": {
+            "subtle": "{colors.solid.zinc.950}",
+            "subtleHover": "{colors.solid.zinc.900}",
+            "bold": "{colors.solid.zinc.500}",
+            "boldHover": "{colors.solid.zinc.400}"
+          },
+          "selected": "{colors.solid.zinc.100}",
+          "disabled": "{colors.solid.zinc.800}",
+          "scrim": {
+            "default": "{colors.alpha.black.600}",
+            "modal": "{colors.alpha.black.300}"
+          },
+          "translucent": {
+            "light": {
+              "subtle": "{colors.alpha.white.100}",
+              "default": "{colors.alpha.white.200}",
+              "strong": "{colors.alpha.white.500}"
+            },
+            "dark": {
+              "default": "{colors.alpha.black.500}"
+            }
+          },
+          "transparent": "{background.transparent}",
+          "selectedStrong": "{colors.solid.zinc.300}",
+          "success": {
+            "subtle": "{colors.solid.green.950}",
+            "subtleHover": "{colors.solid.green.900}",
+            "bold": "{colors.solid.green.500}",
+            "boldHover": "{colors.solid.green.400}"
+          },
+          "info": {
+            "subtle": "{colors.solid.blue.950}",
+            "subtleHover": "{colors.solid.blue.900}",
+            "bold": "{colors.solid.blue.500}",
+            "boldHover": "{colors.solid.blue.400}"
+          },
+          "warning": {
+            "subtle": "{colors.solid.yellow.950}",
+            "subtleHover": "{colors.solid.yellow.900}",
+            "bold": "{colors.solid.yellow.500}",
+            "boldHover": "{colors.solid.yellow.400}"
+          },
+          "danger": {
+            "subtle": "{colors.solid.red.950}",
+            "subtleHover": "{colors.solid.red.900}",
+            "bold": "{colors.solid.red.500}",
+            "boldHover": "{colors.solid.red.400}"
+          },
+          "help": {
+            "subtle": "{colors.solid.purple.950}",
+            "subtleHover": "{colors.solid.purple.900}",
+            "bold": "{colors.solid.purple.500}",
+            "boldHover": "{colors.solid.purple.400}"
+          }
         },
-        "info": {
-          "50": "{colors.solid.blue.950}",
-          "100": "{colors.solid.blue.900}",
-          "200": "{colors.solid.blue.800}",
-          "300": "{colors.solid.blue.700}",
-          "400": "{colors.solid.blue.600}",
-          "500": "{colors.solid.blue.500}",
-          "600": "{colors.solid.blue.400}",
-          "700": "{colors.solid.blue.300}",
-          "800": "{colors.solid.blue.200}",
-          "900": "{colors.solid.blue.100}",
-          "950": "{colors.solid.blue.50}"
-        },
-        "warn": {
-          "50": "{colors.solid.yellow.950}",
-          "100": "{colors.solid.yellow.900}",
-          "200": "{colors.solid.yellow.800}",
-          "300": "{colors.solid.yellow.700}",
-          "400": "{colors.solid.yellow.600}",
-          "500": "{colors.solid.yellow.500}",
-          "600": "{colors.solid.yellow.400}",
-          "700": "{colors.solid.yellow.300}",
-          "800": "{colors.solid.yellow.200}",
-          "900": "{colors.solid.yellow.100}",
-          "950": "{colors.solid.yellow.50}"
-        },
-        "transparent": "rgba(0, 0, 0, 0.0001)",
-        "help": {
-          "50": "{colors.solid.purple.950}",
-          "100": "{colors.solid.purple.900}",
-          "200": "{colors.solid.purple.800}",
-          "300": "{colors.solid.purple.700}",
-          "400": "{colors.solid.purple.600}",
-          "500": "{colors.solid.purple.500}",
-          "600": "{colors.solid.purple.400}",
-          "700": "{colors.solid.purple.300}",
-          "800": "{colors.solid.purple.200}",
-          "900": "{colors.solid.purple.100}",
-          "950": "{colors.solid.purple.50}"
-        },
-        "error": {
-          "50": "{colors.solid.red.950}",
-          "100": "{colors.solid.red.900}",
-          "200": "{colors.solid.red.800}",
-          "300": "{colors.solid.red.700}",
-          "400": "{colors.solid.red.600}",
-          "500": "{colors.solid.red.500}",
-          "600": "{colors.solid.red.400}",
-          "700": "{colors.solid.red.300}",
-          "800": "{colors.solid.red.200}",
-          "900": "{colors.solid.red.100}",
-          "950": "{colors.solid.red.50}"
+        "text": {
+          "default": "{colors.alpha.white.1000}",
+          "subtle": "{colors.solid.zinc.400}",
+          "muted": "{colors.solid.zinc.500}",
+          "placeholder": "{colors.solid.zinc.500}",
+          "disabled": "{colors.solid.zinc.700}",
+          "onBold": "{colors.solid.zinc.900}",
+          "staticDark": "{colors.solid.zinc.900}",
+          "staticLight": "{colors.alpha.white.1000}",
+          "brand": "{colors.solid.green.400}",
+          "link": "{colors.solid.green.400}",
+          "linkHover": "{colors.solid.green.300}",
+          "neutral": "{colors.solid.zinc.400}",
+          "hover": {
+            "default": "{colors.solid.zinc.300}",
+            "subtle": "{colors.solid.zinc.600}",
+            "muted": "{colors.solid.zinc.700}",
+            "brand": "{colors.solid.green.300}"
+          },
+          "defaultHover": "{colors.alpha.white.1000}",
+          "neutralHover": "{colors.solid.zinc.50}",
+          "transparent": "{background.transparent}",
+          "success": "{colors.solid.green.400}",
+          "info": "{colors.solid.blue.400}",
+          "warning": "{colors.solid.yellow.400}",
+          "danger": "{colors.solid.red.400}",
+          "help": "{colors.solid.purple.400}",
+          "color": "{text.onBold}",
+          "hoverColor": "{text.onBold}",
+          "mutedColor": "{text.hover.subtle}",
+          "hoverMutedColor": "{text.disabled}"
+        },
+        "border": {
+          "subtle": "{colors.solid.zinc.800}",
+          "default": "{colors.solid.zinc.700}",
+          "strong": "{colors.solid.zinc.100}",
+          "disabled": "{colors.solid.zinc.800}",
+          "brand": "{colors.solid.green.400}",
+          "neutral": "{colors.solid.zinc.600}",
+          "inverse": "{colors.solid.zinc.200}",
+          "transparent": "{background.transparent}",
+          "checked": "{colors.solid.green.500}",
+          "success": "{colors.solid.green.600}",
+          "info": "{colors.solid.blue.600}",
+          "warning": "{colors.solid.yellow.600}",
+          "danger": "{colors.solid.red.600}",
+          "help": "{colors.solid.purple.600}"
+        },
+        "icon": {
+          "default": "{colors.alpha.white.1000}",
+          "subtle": "{colors.solid.zinc.500}",
+          "disabled": "{colors.solid.zinc.700}",
+          "onBold": "{colors.solid.zinc.900}",
+          "brand": "{colors.solid.green.400}",
+          "neutral": "{colors.solid.zinc.400}",
+          "strong": "{colors.alpha.white.1000}",
+          "strongMuted": "{colors.solid.zinc.100}",
+          "strongHover": "{colors.solid.zinc.300}",
+          "success": "{colors.solid.green.400}",
+          "info": "{colors.solid.blue.400}",
+          "warning": "{colors.solid.yellow.400}",
+          "danger": "{colors.solid.red.400}",
+          "help": "{colors.solid.purple.400}"
+        },
+        "focusRing": {
+          "default": "{colors.solid.green.500}",
+          "invalid": "{colors.solid.red.800}",
+          "success": "{colors.solid.green.800}",
+          "warning": "{colors.solid.yellow.800}",
+          "info": "{colors.solid.blue.800}",
+          "help": "{colors.solid.purple.800}",
+          "shadow": "{shadow.200}"
         },
         "surface": {
-          "0": "{colors.alpha.black.1000}",
-          "50": "{colors.solid.zinc.950}",
-          "100": "{colors.solid.zinc.900}",
-          "200": "{colors.solid.zinc.800}",
-          "300": "{colors.solid.zinc.700}",
-          "400": "{colors.solid.zinc.600}",
+          "0": "{colors.alpha.white.1000}",
+          "50": "{colors.solid.zinc.50}",
+          "100": "{colors.solid.zinc.100}",
+          "200": "{colors.solid.zinc.200}",
+          "300": "{colors.solid.zinc.300}",
+          "400": "{colors.solid.zinc.400}",
           "500": "{colors.solid.zinc.500}",
-          "600": "{colors.solid.zinc.400}",
-          "700": "{colors.solid.zinc.300}",
-          "800": "{colors.solid.zinc.200}",
-          "900": "{colors.solid.zinc.100}",
-          "950": "{colors.solid.zinc.50}"
+          "600": "{colors.solid.zinc.600}",
+          "700": "{colors.solid.zinc.700}",
+          "800": "{colors.solid.zinc.800}",
+          "900": "{colors.solid.zinc.900}",
+          "950": "{colors.solid.zinc.950}"
         },
         "primary": {
-          "color": "{colors.solid.green.500}",
-          "contrastColor": "{colors.solid.zinc.900}",
-          "hoverColor": "{colors.solid.green.400}",
-          "activeColor": "{colors.solid.green.300}",
-          "hoverBackground": "{colors.solid.green.950}",
-          "activeBackground": "{colors.solid.green.900}",
-          "borderColor": "{colors.solid.green.800}",
-          "selectedBackground": "{colors.solid.green.500}",
-          "selectedHoverBackground": "{colors.solid.green.600}"
+          "color": "{colors.solid.green.400}",
+          "contrastColor": "{text.default}",
+          "hoverColor": "{colors.solid.green.300}",
+          "activeColor": "{colors.solid.green.200}"
         },
         "highlight": {
-          "background": "{colors.solid.zinc.100}",
-          "focusBackground": "{colors.solid.zinc.200}",
-          "color": "{colors.solid.zinc.900}",
-          "focusColor": "{colors.solid.zinc.900}"
-        },
-        "focusRing": {
-          "shadow": "{shadows.200}",
-          "extend": {
-            "invalid": "{colors.solid.red.800}",
-            "success": "{colors.solid.green.800}",
-            "warning": "{colors.solid.yellow.800}",
-            "info": "{colors.solid.blue.800}"
-          }
+          "background": "color-mix(in srgb, {colors.solid.green.400}, transparent 84%)",
+          "focusBackground": "color-mix(in srgb, {colors.solid.green.400}, transparent 76%)",
+          "color": "{colors.alpha.white.870}",
+          "focusColor": "{colors.alpha.white.870}"
         },
         "mask": {
           "background": "{colors.alpha.black.600}",
-          "color": "{surface.800}"
-        },
-        "form": {
-          "background": "{colors.solid.zinc.950}",
-          "disabledBackground": "{colors.solid.zinc.800}",
-          "readonlyBackground": "{colors.solid.zinc.900}",
-          "filledBackground": "{colors.solid.zinc.950}",
-          "filledHoverBackground": "{colors.solid.zinc.950}",
-          "filledFocusBackground": "{colors.solid.zinc.950}",
-          "borderColor": "{colors.solid.zinc.700}",
-          "hoverBorderPrimaryColor": "{colors.solid.zinc.100}",
-          "focusBorderPrimaryColor": "{colors.solid.zinc.100}",
-          "hoverBorderSecondaryColor": "{colors.solid.green.400}",
-          "focusBorderSecondaryColor": "{colors.solid.green.400}",
-          "invalidBorderColor": "{colors.solid.red.600}",
-          "color": "{colors.alpha.white.1000}",
-          "disabledColor": "{colors.solid.zinc.500}",
-          "placeholderColor": "{colors.solid.zinc.500}",
+          "color": "{colors.solid.zinc.200}"
+        },
+        "formField": {
+          "background": "{background.surface.inverseStrong}",
+          "disabledBackground": "{background.selectedStrong}",
+          "filledBackground": "{background.surface.inverse}",
+          "filledHoverBackground": "{background.surface.inverse}",
+          "filledFocusBackground": "{background.surface.inverse}",
+          "borderColor": "{colors.solid.zinc.600}",
+          "hoverBorderColor": "{colors.solid.zinc.500}",
+          "focusBorderColor": "{border.brand}",
+          "invalidBorderColor": "{colors.solid.red.300}",
+          "color": "{text.onBold}",
+          "disabledColor": "{text.hover.subtle}",
+          "placeholderColor": "{text.hover.subtle}",
           "invalidPlaceholderColor": "{colors.solid.red.400}",
-          "floatLabelColor": "{colors.solid.zinc.500}",
-          "floatLabelFocusColor": "{colors.solid.zinc.500}",
-          "floatLabelActiveColor": "{colors.solid.zinc.500}",
-          "floatLabelInvalidColor": "{form.invalidPlaceholderColor}",
-          "iconColor": "{colors.alpha.white.1000}",
-          "backgroundHandler": "{colors.alpha.white.1000}",
-          "shadow": "{shadows.200}"
-        },
-        "text": {
-          "color": "{colors.alpha.white.1000}",
-          "extend": {
-            "colorPrimaryStatic": "{colors.solid.zinc.900}",
-            "colorSecondaryStatic": "{colors.alpha.white.1000}",
-            "colorInverted": "{colors.solid.zinc.900}"
-          },
-          "hoverColor": "{colors.solid.zinc.300}",
-          "primaryColor": "{colors.solid.green.400}",
-          "hoverPrimaryColor": "{colors.solid.green.300}",
-          "secondaryColor": "{colors.solid.zinc.400}",
-          "hoverSecondaryColor": "{colors.solid.zinc.600}",
-          "mutedColor": "{colors.solid.zinc.500}",
-          "hoverMutedColor": "{colors.solid.zinc.700}",
-          "disabledColor": "{colors.solid.zinc.700}",
-          "infoColor": "{colors.solid.blue.400}",
-          "successColor": "{colors.solid.green.400}",
-          "dangerColor": "{colors.solid.red.400}",
-          "warningColor": "{colors.solid.yellow.400}",
-          "helpColor": "{colors.solid.purple.400}"
+          "floatLabelColor": "{text.hover.subtle}",
+          "floatLabelFocusColor": "{text.brand}",
+          "floatLabelActiveColor": "{text.hover.subtle}",
+          "floatLabelInvalidColor": "{text.danger}",
+          "iconColor": "{colors.solid.zinc.400}",
+          "shadow": "0 0 #0000, 0 0 #0000, 0 1px 2px 0 rgba(18, 18, 23, 0.05)"
         },
         "content": {
-          "background": "{colors.solid.zinc.900}",
-          "hoverBackground": "{colors.solid.zinc.800}",
-          "borderColor": "{colors.solid.zinc.800}",
-          "activeBorderColor": "{colors.solid.zinc.200}",
-          "color": "{text.color}",
-          "hoverColor": "{text.hoverColor}",
-          "shadow": "{shadows.400}"
-        },
-        "list": {
-          "option": {
-            "background": "{colors.solid.zinc.900}",
-            "focusBackground": "{colors.solid.zinc.800}",
-            "selectedBackground": "{colors.solid.zinc.100}",
-            "selectedFocusBackground": "{colors.solid.zinc.300}",
-            "color": "{text.color}",
-            "focusColor": "{text.color}",
-            "selectedColor": "{text.extend.colorInverted}",
-            "selectedFocusColor": "{text.extend.colorInverted}",
-            "icon": {
-              "color": "{text.color}",
-              "focusColor": "{text.color}"
-            }
-          },
-          "optionGroup": {
-            "background": "{colors.solid.zinc.900}",
-            "color": "{text.mutedColor}"
-          }
+          "background": "{background.selected}",
+          "hoverBackground": "{background.surface.inverse}",
+          "borderColor": "{colors.solid.zinc.700}",
+          "color": "{text.default}",
+          "hoverColor": "{text.hover.default}"
         },
         "overlay": {
           "select": {
-            "background": "{colors.solid.zinc.900}",
-            "borderColor": "{colors.solid.zinc.800}",
-            "color": "{text.color}",
-            "shadow": "{shadows.400}"
+            "background": "{background.selected}",
+            "borderColor": "{colors.solid.zinc.700}",
+            "color": "{text.default}"
           },
           "popover": {
-            "background": "{colors.solid.zinc.900}",
-            "borderColor": "{form.borderColor}",
-            "color": "{text.color}",
-            "shadow": "{shadows.400}"
+            "background": "{background.selected}",
+            "borderColor": "{colors.solid.zinc.700}",
+            "color": "{text.default}"
           },
           "modal": {
-            "background": "{colors.solid.zinc.900}",
-            "backdrop": "{colors.alpha.black.300}",
-            "borderColor": "{colors.solid.zinc.800}",
-            "color": "{text.color}",
-            "shadow": "{shadows.200}"
+            "background": "{background.selected}",
+            "borderColor": "{colors.solid.zinc.700}",
+            "color": "{text.default}"
           }
         },
-        "navigation": {
-          "submenuLabel": {
-            "background": "rgba(255, 255, 255, 0.0000)",
-            "color": "{text.mutedColor}"
-          },
-          "submenuIcon": {
-            "color": "{colors.solid.zinc.100}",
-            "focusColor": "{colors.solid.zinc.100}",
-            "activeColor": "{colors.solid.zinc.900}"
+        "list": {
+          "option": {
+            "focusBackground": "{background.surface.inverse}",
+            "selectedBackground": "{background.brand.subtleHover}",
+            "selectedFocusBackground": "{background.brand.subtle}",
+            "color": "{text.default}",
+            "focusColor": "{text.hover.default}",
+            "selectedColor": "{text.brand}",
+            "selectedFocusColor": "{text.brand}",
+            "icon": {
+              "color": "{text.muted}",
+              "focusColor": "{text.hover.subtle}"
+            }
           },
+          "optionGroup": {
+            "background": "transparent",
+            "color": "{text.muted}"
+          }
+        },
+        "navigation": {
           "item": {
-            "focusBackground": "{colors.solid.zinc.900}",
-            "activeBackground": "{colors.solid.zinc.100}",
-            "color": "{colors.alpha.white.1000}",
-            "focusColor": "{colors.alpha.white.1000}",
+            "focusBackground": "{background.surface.inverse}",
+            "activeBackground": "{background.surface.inverse}",
+            "color": "{text.default}",
+            "focusColor": "{text.hover.default}",
+            "activeColor": "{text.hover.default}",
             "icon": {
-              "color": "{colors.alpha.white.1000}",
-              "focusColor": "{colors.alpha.white.1000}",
-              "activeColor": "{colors.solid.zinc.900}"
-            },
-            "activeColor": "{colors.solid.zinc.900}"
+              "color": "{text.muted}",
+              "focusColor": "{text.hover.subtle}",
+              "activeColor": "{text.hover.subtle}"
+            }
+          },
+          "submenuLabel": {
+            "background": "transparent",
+            "color": "{text.muted}"
           },
-          "shadow": "{shadows.400}"
+          "submenuIcon": {
+            "color": "{text.muted}",
+            "focusColor": "{text.hover.subtle}",
+            "activeColor": "{text.hover.subtle}"
+          }
+        }
+      }
+    },
+    "dimension": {
+      "space": {
+        "100": "{size.1x}",
+        "200": "{size.2x}",
+        "300": "{size.3x}",
+        "400": "{size.4x}",
+        "500": "{size.5x}",
+        "600": "{size.6x}",
+        "700": "{size.7x}",
+        "800": "{size.8x}",
+        "900": "{size.10x}",
+        "none": "{size.none}"
+      },
+      "size": {
+        "100": "{size.min}",
+        "150": "{size.1x}",
+        "200": "{size.2x}",
+        "250": "{size.3x}",
+        "300": "{size.4x}",
+        "350": "{size.5x}",
+        "400": "{size.6x}",
+        "450": "{size.7x}",
+        "500": "{size.8x}",
+        "550": "{size.9x}",
+        "600": "{size.10x}",
+        "700": "{size.12x}",
+        "750": "{size.14x}",
+        "800": "{size.16x}",
+        "900": "{size.20x}",
+        "1000": "{size.24x}"
+      },
+      "radius": {
+        "100": "{size.1x}",
+        "200": "{size.2x}",
+        "300": "{size.3x}",
+        "400": "{size.4x}",
+        "500": "{size.6x}",
+        "none": "{size.none}",
+        "max": "{size.pill}"
+      },
+      "borderWidth": {
+        "100": "{size.min}",
+        "200": "{size.2px}",
+        "300": "{size.1x}",
+        "none": "{size.none}"
+      },
+      "focusRing": {
+        "width": "{size.1x}",
+        "offset": "{size.none}",
+        "style": "none"
+      },
+      "duration": {
+        "100": "{transition.duration.100}",
+        "200": "{transition.duration.200}",
+        "300": "{transition.duration.300}",
+        "400": "{transition.duration.400}",
+        "500": "{transition.duration.500}"
+      },
+      "overlayWidth": {
+        "narrow": "{size.60x}",
+        "sm": "{size.80x}",
+        "base": "{size.100x}",
+        "lg": "{size.120x}",
+        "xlg": "{size.128x}"
+      }
+    },
+    "typography": {
+      "display": {
+        "lg": {
+          "fontFamily": "{fonts.fontFamily.heading}",
+          "fontSize": "{fonts.fontSize.1000}",
+          "fontWeight": "{fonts.fontWeight.bold}",
+          "lineHeight": "{fonts.lineHeight.auto}"
+        },
+        "md": {
+          "fontFamily": "{fonts.fontFamily.heading}",
+          "fontSize": "{fonts.fontSize.900}",
+          "fontWeight": "{fonts.fontWeight.bold}",
+          "lineHeight": "{fonts.lineHeight.auto}"
+        },
+        "sm": {
+          "fontFamily": "{fonts.fontFamily.heading}",
+          "fontSize": "{fonts.fontSize.800}",
+          "fontWeight": "{fonts.fontWeight.bold}",
+          "lineHeight": "{fonts.lineHeight.auto}"
+        }
+      },
+      "heading": {
+        "xl": {
+          "fontFamily": "{fonts.fontFamily.heading}",
+          "fontSize": "{fonts.fontSize.750}",
+          "fontWeight": "{fonts.fontWeight.bold}",
+          "lineHeight": "{fonts.lineHeight.auto}"
+        },
+        "lg": {
+          "fontFamily": "{fonts.fontFamily.heading}",
+          "fontSize": "{fonts.fontSize.700}",
+          "fontWeight": "{fonts.fontWeight.demibold}",
+          "lineHeight": "{fonts.lineHeight.900}"
+        },
+        "md": {
+          "fontFamily": "{fonts.fontFamily.heading}",
+          "fontSize": "{fonts.fontSize.600}",
+          "fontWeight": "{fonts.fontWeight.demibold}",
+          "lineHeight": "{fonts.lineHeight.700}"
+        },
+        "sm": {
+          "fontFamily": "{fonts.fontFamily.heading}",
+          "fontSize": "{fonts.fontSize.500}",
+          "fontWeight": "{fonts.fontWeight.demibold}",
+          "lineHeight": "{fonts.lineHeight.600}"
+        }
+      },
+      "body": {
+        "lg": {
+          "fontFamily": "{fonts.fontFamily.base}",
+          "fontSize": "{fonts.fontSize.400}",
+          "fontWeight": "{fonts.fontWeight.regular}",
+          "lineHeight": "{fonts.lineHeight.550}"
+        },
+        "md": {
+          "fontFamily": "{fonts.fontFamily.base}",
+          "fontSize": "{fonts.fontSize.300}",
+          "fontWeight": "{fonts.fontWeight.regular}",
+          "lineHeight": "{fonts.lineHeight.500}"
+        },
+        "sm": {
+          "fontFamily": "{fonts.fontFamily.base}",
+          "fontSize": "{fonts.fontSize.200}",
+          "fontWeight": "{fonts.fontWeight.regular}",
+          "lineHeight": "{fonts.lineHeight.400}"
+        }
+      },
+      "label": {
+        "lg": {
+          "fontFamily": "{fonts.fontFamily.base}",
+          "fontSize": "{fonts.fontSize.300}",
+          "fontWeight": "{fonts.fontWeight.medium}",
+          "lineHeight": "{fonts.lineHeight.500}"
+        },
+        "md": {
+          "fontFamily": "{fonts.fontFamily.base}",
+          "fontSize": "{fonts.fontSize.200}",
+          "fontWeight": "{fonts.fontWeight.medium}",
+          "lineHeight": "{fonts.lineHeight.400}"
+        },
+        "sm": {
+          "fontFamily": "{fonts.fontFamily.base}",
+          "fontSize": "{fonts.fontSize.100}",
+          "fontWeight": "{fonts.fontWeight.medium}",
+          "lineHeight": "{fonts.lineHeight.300}"
         }
+      },
+      "caption": {
+        "fontFamily": "{fonts.fontFamily.base}",
+        "fontSize": "{fonts.fontSize.100}",
+        "fontWeight": "{fonts.fontWeight.regular}",
+        "lineHeight": "{fonts.lineHeight.250}"
+      }
+    },
+    "shadow": {
+      "100": "{shadows.100}",
+      "200": "{shadows.200}",
+      "300": "{shadows.300}",
+      "400": "{shadows.400}",
+      "500": "{shadows.500}",
+      "none": "{shadows.none}"
+    },
+    "transitionDuration": "0.2s",
+    "focusRing": {
+      "width": "1px",
+      "style": "solid",
+      "color": "{text.brand}",
+      "offset": "2px",
+      "shadow": "none"
+    },
+    "disabledOpacity": "0.6",
+    "iconSize": "{dimension.space.400}",
+    "anchorGutter": "2px",
+    "primary": {
+      "50": "{colors.solid.green.50}",
+      "100": "{colors.solid.green.100}",
+      "200": "{colors.solid.green.200}",
+      "300": "{colors.solid.green.300}",
+      "400": "{colors.solid.green.400}",
+      "500": "{colors.solid.green.500}",
+      "600": "{colors.solid.green.600}",
+      "700": "{colors.solid.green.700}",
+      "800": "{colors.solid.green.800}",
+      "900": "{colors.solid.green.900}",
+      "950": "{colors.solid.green.950}"
+    },
+    "formField": {
+      "paddingX": "{dimension.space.300}",
+      "paddingY": "{dimension.space.200}",
+      "sm": {
+        "fontSize": "{dimension.space.400}",
+        "paddingX": "{dimension.space.300}",
+        "paddingY": "{dimension.space.200}"
+      },
+      "lg": {
+        "fontSize": "{dimension.space.500}",
+        "paddingX": "{dimension.space.400}",
+        "paddingY": "{dimension.space.300}"
+      },
+      "borderRadius": "{dimension.radius.200}",
+      "focusRing": {
+        "width": "0",
+        "style": "none",
+        "color": "transparent",
+        "offset": "0",
+        "shadow": "none"
+      },
+      "transitionDuration": "{dimension.duration.200}"
+    },
+    "list": {
+      "padding": "{dimension.space.100} {dimension.space.100}",
+      "gap": "2px",
+      "header": {
+        "padding": "{dimension.space.200} {dimension.space.400} {dimension.space.100} {dimension.space.400}"
+      },
+      "option": {
+        "padding": "{dimension.space.200} {dimension.space.300}",
+        "borderRadius": "{dimension.radius.100}"
+      },
+      "optionGroup": {
+        "padding": "{dimension.space.200} {dimension.space.300}",
+        "fontWeight": "600"
+      }
+    },
+    "content": {
+      "borderRadius": "{dimension.radius.200}"
+    },
+    "mask": {
+      "transitionDuration": "0.15s"
+    },
+    "navigation": {
+      "list": {
+        "padding": "{dimension.space.100} {dimension.space.100}",
+        "gap": "2px"
+      },
+      "item": {
+        "padding": "{dimension.space.200} {dimension.space.300}",
+        "borderRadius": "{dimension.radius.100}",
+        "gap": "{dimension.space.200}"
+      },
+      "submenuLabel": {
+        "padding": "{dimension.space.200} {dimension.space.300}",
+        "fontWeight": "600"
+      },
+      "submenuIcon": {
+        "size": "{dimension.space.400}"
+      }
+    },
+    "overlay": {
+      "select": {
+        "borderRadius": "{dimension.radius.200}",
+        "shadow": "0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -2px rgba(0, 0, 0, 0.1)"
+      },
+      "popover": {
+        "borderRadius": "{dimension.radius.200}",
+        "padding": "{dimension.space.300}",
+        "shadow": "0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -2px rgba(0, 0, 0, 0.1)"
+      },
+      "modal": {
+        "borderRadius": "{dimension.radius.300}",
+        "padding": "{dimension.space.500}",
+        "shadow": "0 20px 25px -5px rgba(0, 0, 0, 0.1), 0 8px 10px -6px rgba(0, 0, 0, 0.1)"
+      },
+      "navigation": {
+        "shadow": "0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -2px rgba(0, 0, 0, 0.1)"
       }
     }
   },
@@ -1329,75 +1270,96 @@
     "accordion": {
       "extend": {
         "extHeader": {
-          "iconSize": "{controls.iconOnly.300}",
-          "gap": "{controls.gap.100}"
-        }
+          "iconSize": "{dimension.size.350}",
+          "gap": "{dimension.space.200}"
+        },
+        "fonts_fontFamily_base": "{typography.body.lg.fontFamily}",
+        "fonts_fontSize_300": "{typography.body.md.fontSize}"
       },
       "colorScheme": {
         "light": {
           "header": {
-            "background": "{transparent}",
-            "hoverBackground": "{transparent}",
-            "activeBackground": "{transparent}",
-            "activeHoverBackground": "{transparent}"
+            "background": "{background.transparent}",
+            "hoverBackground": "{background.transparent}",
+            "activeBackground": "{background.transparent}",
+            "activeHoverBackground": "{background.transparent}"
+          }
+        },
+        "dark": {
+          "header": {
+            "background": "{background.transparent}",
+            "hoverBackground": "{background.transparent}",
+            "activeBackground": "{background.transparent}",
+            "activeHoverBackground": "{background.transparent}"
           }
         }
       },
       "header": {
-        "color": "{text.color}",
-        "hoverColor": "{text.hoverColor}",
-        "activeColor": "{text.color}",
-        "activeHoverColor": "{text.hoverColor}",
-        "borderColor": "{transparent}",
-        "padding": "{navigation.padding.300} 0 {navigation.padding.300} 0",
-        "fontWeight": "{fonts.fontWeight.bold}",
-        "borderRadius": "{borderRadius.none}",
-        "borderWidth": "{borderWidth.none}",
+        "color": "{text.default}",
+        "hoverColor": "{text.hover.default}",
+        "activeColor": "{text.default}",
+        "activeHoverColor": "{text.hover.default}",
+        "borderColor": "{border.transparent}",
+        "padding": "{dimension.space.400} 0 {dimension.space.400} 0",
+        "fontWeight": "{typography.heading.xl.fontWeight}",
+        "borderRadius": "{dimension.radius.none}",
+        "borderWidth": "{dimension.borderWidth.none}",
         "focusRing": {
-          "width": "{focusRing.width}",
-          "style": "{focusRing.style}",
-          "color": "{focusRing.color}",
-          "offset": "{focusRing.offset}",
-          "shadow": "inset {focus.ring.shadow}"
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{background.success.subtleHover}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "inset {shadow.200}"
         },
         "toggleIcon": {
-          "color": "{text.color}",
-          "hoverColor": "{text.hoverColor}",
-          "activeColor": "{text.color}",
-          "activeHoverColor": "{text.hoverColor}"
+          "color": "{icon.strong}",
+          "hoverColor": "{icon.strongHover}",
+          "activeColor": "{icon.strong}",
+          "activeHoverColor": "{icon.strongHover}"
         },
         "last": {
-          "bottomBorderRadius": "{borderRadius.none}",
-          "activeBottomBorderRadius": "{borderRadius.none}"
+          "bottomBorderRadius": "{dimension.radius.none}",
+          "activeBottomBorderRadius": "{dimension.radius.none}"
         },
         "first": {
-          "borderWidth": "{borderWidth.none}",
-          "topBorderRadius": "{borderRadius.none}"
-        }
+          "borderWidth": "{dimension.borderWidth.none}",
+          "topBorderRadius": "{dimension.radius.none}"
+        },
+        "background": "{background.surface.raised}",
+        "hoverBackground": "{background.surface.raised}",
+        "activeBackground": "{background.surface.raised}",
+        "activeHoverBackground": "{background.surface.raised}"
       },
       "root": {
-        "transitionDuration": "{controls.transitionDuration}"
+        "transitionDuration": "{dimension.duration.200}"
       },
       "panel": {
-        "borderWidth": "{borderWidth.none} {borderWidth.none} {navigation.width.100} {borderWidth.none}",
-        "borderColor": "{form.borderColor}"
+        "borderWidth": "{dimension.borderWidth.none} {dimension.borderWidth.none} {dimension.borderWidth.100} {dimension.borderWidth.none}",
+        "borderColor": "{border.default}"
       },
       "content": {
-        "borderWidth": "{content.borderWidth} {borderWidth.none} {borderWidth.none} {borderWidth.none}",
-        "borderColor": "{transparent}",
-        "background": "{transparent}",
-        "color": "{text.color}",
-        "padding": "0 {content.padding.400} {content.padding.300} {content.padding.400}"
+        "borderWidth": "{dimension.borderWidth.100} {dimension.borderWidth.none} {dimension.borderWidth.none} {dimension.borderWidth.none}",
+        "borderColor": "{border.transparent}",
+        "background": "{background.transparent}",
+        "color": "{text.default}",
+        "padding": "0 {dimension.space.600} {dimension.space.400} {dimension.space.600}"
       }
     },
     "autocomplete": {
       "extend": {
         "extOption": {
-          "gap": "{form.gap.200}"
+          "gap": "{dimension.space.200}"
         },
         "extOptionGroup": {
-          "gap": "{form.gap.200}"
-        }
+          "gap": "{dimension.space.200}"
+        },
+        "dimension_space_200": "{dimension.space.200}",
+        "fonts_fontSize_300": "{typography.body.md.fontSize}",
+        "fonts_lineHeight_250": "{typography.caption.lineHeight}",
+        "form_borderColor": "{text.disabled}",
+        "form_focusBorderSecondaryColor": "{background.brand.boldHover}",
+        "form_hoverBorderSecondaryColor": "{background.brand.boldHover}",
+        "form_width_300": "{dimension.space.900}"
       },
       "colorScheme": {
         "light": {
@@ -1406,1307 +1368,1608 @@
             "focusColor": "{chip.colorScheme.light.root.color}"
           },
           "dropdown": {
-            "background": "{form.background}",
-            "hoverBackground": "{form.background}",
-            "activeBackground": "{form.background}",
-            "color": "{form.color}",
-            "hoverColor": "{form.color}",
-            "activeColor": "{form.color}"
+            "background": "{background.surface.field}",
+            "hoverBackground": "{background.surface.field}",
+            "activeBackground": "{background.surface.field}",
+            "color": "{text.defaultHover}",
+            "hoverColor": "{text.defaultHover}",
+            "activeColor": "{text.defaultHover}"
+          }
+        },
+        "dark": {
+          "chip": {
+            "focusBackground": "{background.selectedStrong}",
+            "focusColor": "{text.onBold}"
+          },
+          "dropdown": {
+            "background": "{background.surface.inverse}",
+            "hoverBackground": "{background.selectedStrong}",
+            "activeBackground": "{background.neutral.boldHover}",
+            "color": "{text.disabled}",
+            "hoverColor": "{colors.solid.zinc.200}",
+            "activeColor": "{colors.solid.zinc.100}"
           }
         }
       },
       "root": {
-        "background": "{form.background}",
-        "disabledBackground": "{form.disabledBackground}",
-        "filledBackground": "{form.filledBackground}",
-        "filledHoverBackground": "{form.filledHoverBackground}",
-        "filledFocusBackground": "{form.filledFocusBackground}",
-        "borderColor": "{form.borderColor}",
-        "hoverBorderColor": "{form.hoverBorderSecondaryColor}",
-        "focusBorderColor": "{form.focusBorderSecondaryColor}",
-        "invalidBorderColor": "{form.invalidBorderColor}",
-        "color": "{form.color}",
-        "disabledColor": "{form.disabledColor}",
-        "placeholderColor": "{form.placeholderColor}",
-        "invalidPlaceholderColor": "{form.invalidPlaceholderColor}",
+        "background": "{background.surface.field}",
+        "disabledBackground": "{background.disabled}",
+        "filledBackground": "{background.surface.field}",
+        "filledHoverBackground": "{background.surface.field}",
+        "filledFocusBackground": "{background.surface.field}",
+        "borderColor": "{border.default}",
+        "hoverBorderColor": "{border.brand}",
+        "focusBorderColor": "{border.brand}",
+        "invalidBorderColor": "{border.danger}",
+        "color": "{text.defaultHover}",
+        "disabledColor": "{text.muted}",
+        "placeholderColor": "{text.muted}",
+        "invalidPlaceholderColor": "{text.danger}",
         "shadow": "0",
-        "paddingX": "{form.padding.300}",
-        "paddingY": "{form.padding.300}",
-        "borderRadius": "{form.borderRadius.200}",
-        "transitionDuration": "{form.transitionDuration}",
+        "paddingX": "{dimension.space.300}",
+        "paddingY": "{dimension.space.300}",
+        "borderRadius": "{dimension.radius.300}",
+        "transitionDuration": "{dimension.duration.200}",
         "focusRing": {
-          "width": "{focusRing.width}",
-          "style": "{form.focusRing.style}",
-          "color": "{form.focusRing.color}",
-          "offset": "{form.focusRing.offset}",
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{focusRing.success}",
+          "offset": "{dimension.focusRing.offset}",
           "shadow": "0"
         }
       },
       "overlay": {
-        "background": "{overlay.select.background}",
-        "borderColor": "{overlay.select.borderColor}",
-        "borderRadius": "{overlay.select.borderRadius}",
-        "color": "{overlay.select.color}",
-        "shadow": "{form.shadow}"
+        "background": "{background.surface.raised}",
+        "borderColor": "{border.subtle}",
+        "borderRadius": "{dimension.radius.300}",
+        "color": "{text.default}",
+        "shadow": "{shadow.200}"
       },
       "list": {
-        "padding": "{list.padding}",
-        "gap": "{list.gap.100}"
+        "padding": "{dimension.space.100}",
+        "gap": "{dimension.space.100}"
       },
       "option": {
-        "focusBackground": "{list.option.focusBackground}",
-        "selectedBackground": "{list.option.selectedBackground}",
-        "selectedFocusBackground": "{list.option.selectedFocusBackground}",
-        "color": "{list.option.color}",
-        "focusColor": "{list.option.focusColor}",
-        "selectedColor": "{list.option.selectedColor}",
-        "selectedFocusColor": "{list.option.selectedFocusColor}",
-        "padding": "{list.option.padding}",
-        "borderRadius": "{list.option.borderRadius}"
+        "focusBackground": "{background.surface.hover.section}",
+        "selectedBackground": "{background.selected}",
+        "selectedFocusBackground": "{background.selectedStrong}",
+        "color": "{text.default}",
+        "focusColor": "{text.default}",
+        "selectedColor": "{text.onBold}",
+        "selectedFocusColor": "{text.onBold}",
+        "padding": "{dimension.space.200} {dimension.space.300}",
+        "borderRadius": "{dimension.radius.200}"
       },
       "optionGroup": {
-        "background": "{list.optionGroup.background}",
-        "color": "{list.optionGroup.color}",
-        "fontWeight": "{fonts.fontWeight.demibold}",
-        "padding": "{list.optionGroup.padding}"
+        "background": "{background.surface.raised}",
+        "color": "{text.muted}",
+        "fontWeight": "{typography.heading.lg.fontWeight}",
+        "padding": "{dimension.space.200} {dimension.space.300}"
       },
       "dropdown": {
-        "width": "{form.width.300}",
-        "borderColor": "{form.borderColor}",
-        "hoverBorderColor": "{form.hoverBorderSecondaryColor}",
-        "activeBorderColor": "{form.focusBorderSecondaryColor}",
-        "borderRadius": "{form.borderRadius.200}",
+        "width": "{dimension.size.600}",
+        "borderColor": "{border.default}",
+        "hoverBorderColor": "{border.brand}",
+        "activeBorderColor": "{border.brand}",
+        "borderRadius": "{dimension.radius.300}",
         "focusRing": {
-          "width": "{focusRing.width}",
-          "style": "{form.focusRing.style}",
-          "color": "{form.focusRing.color}",
-          "offset": "{form.focusRing.offset}",
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{focusRing.success}",
+          "offset": "{dimension.focusRing.offset}",
           "shadow": "0"
         },
         "sm": {
-          "width": "{form.width.200}"
+          "width": "{dimension.size.500}"
         },
         "lg": {
-          "width": "{form.width.400}"
+          "width": "{dimension.size.700}"
         }
       },
       "chip": {
         "borderRadius": "{chip.root.borderRadius}"
       },
       "emptyMessage": {
-        "padding": "{list.option.padding}"
+        "padding": "{dimension.space.200} {dimension.space.300}"
       }
     },
     "avatar": {
       "extend": {
-        "borderColor": "{form.borderColor}",
+        "borderColor": "{border.default}",
         "circle": {
-          "borderRadius": "{media.borderRadius.max}"
-        }
+          "borderRadius": "{dimension.radius.max}"
+        },
+        "content_background": "{background.surface.raised}",
+        "media_padding_300": "{dimension.space.300}",
+        "media_padding_600": "{dimension.space.600}"
       },
       "root": {
-        "width": "{media.size.300}",
-        "height": "{media.size.300}",
-        "fontSize": "{fonts.fontSize.200}",
-        "color": "{text.extend.colorPrimaryStatic}",
-        "background": "{primary.color}",
-        "borderRadius": "{media.borderRadius.200}"
+        "width": "{dimension.size.500}",
+        "height": "{dimension.size.500}",
+        "fontSize": "{typography.body.sm.fontSize}",
+        "color": "{text.staticDark}",
+        "background": "{background.brand.bold}",
+        "borderRadius": "{dimension.radius.300}"
       },
       "icon": {
-        "size": "{media.icon.size.100}"
+        "size": "{dimension.size.300}"
       },
       "group": {
-        "borderColor": "{content.background}",
-        "offset": "-{media.padding.300}"
+        "borderColor": "{background.surface.raised}",
+        "offset": "-{dimension.space.300}"
       },
       "lg": {
-        "width": "{media.size.400}",
-        "height": "{media.size.400}",
-        "fontSize": "{fonts.fontSize.300}",
+        "width": "{dimension.size.600}",
+        "height": "{dimension.size.600}",
+        "fontSize": "{typography.body.md.fontSize}",
         "icon": {
-          "size": "{media.icon.size.100}"
+          "size": "{dimension.size.300}"
         },
         "group": {
-          "offset": "-{media.padding.300}"
+          "offset": "-{dimension.space.300}"
         }
       },
       "xl": {
-        "width": "{media.size.500}",
-        "height": "{media.size.500}",
+        "width": "{dimension.size.750}",
+        "height": "{dimension.size.750}",
         "icon": {
-          "size": "{media.icon.size.200}"
+          "size": "{dimension.size.400}"
         },
         "group": {
-          "offset": "-{media.padding.600}"
+          "offset": "-{dimension.space.600}"
         },
-        "fontSize": "{fonts.fontSize.500}"
+        "fontSize": "{typography.heading.sm.fontSize}"
       }
     },
     "badge": {
       "extend": {
         "extDot": {
           "success": {
-            "background": "{colors.solid.green.400}"
+            "background": "{background.success.bold}"
           },
           "info": {
-            "background": "{info.400}"
+            "background": "{background.info.bold}"
           },
           "warn": {
-            "background": "{warn.400}"
+            "background": "{background.warning.bold}"
           },
           "danger": {
-            "background": "{error.400}"
+            "background": "{background.danger.bold}"
           },
           "lg": {
-            "size": "{feedback.width.400}"
+            "size": "{dimension.size.250}"
           },
           "xlg": {
-            "size": "{feedback.width.500}"
+            "size": "{dimension.size.300}"
           }
         },
         "ext": {
-          "padding": "0rem"
+          "padding": "{dimension.space.none}"
         }
       },
       "colorScheme": {
         "light": {
           "primary": {
-            "color": "{text.extend.colorPrimaryStatic}",
-            "background": "{primary.color}"
+            "color": "{text.staticDark}",
+            "background": "{background.brand.bold}"
+          },
+          "secondary": {
+            "color": "{text.onBold}",
+            "background": "{background.selected}"
+          },
+          "success": {
+            "color": "{text.success}",
+            "background": "{background.success.subtleHover}"
+          },
+          "info": {
+            "color": "{text.info}",
+            "background": "{background.info.subtleHover}"
+          },
+          "warn": {
+            "color": "{text.warning}",
+            "background": "{background.warning.subtleHover}"
+          },
+          "danger": {
+            "color": "{text.danger}",
+            "background": "{background.danger.subtleHover}"
+          },
+          "contrast": {
+            "background": "{background.surface.inverseStrong}",
+            "color": "{text.onBold}"
+          }
+        },
+        "dark": {
+          "primary": {
+            "background": "{background.brand.bold}",
+            "color": "{text.onBold}"
           },
           "secondary": {
-            "color": "{text.extend.colorInverted}",
-            "background": "{surface.900}"
+            "background": "{background.surface.inverse}",
+            "color": "{text.disabled}"
           },
           "success": {
-            "color": "{success.900}",
-            "background": "{success.300}"
+            "background": "{primary.color}",
+            "color": "{colors.solid.green.950}"
           },
           "info": {
-            "color": "{info.900}",
-            "background": "{info.300}"
+            "background": "{background.info.boldHover}",
+            "color": "{colors.solid.blue.950}"
           },
           "warn": {
-            "color": "{warn.900}",
-            "background": "{warn.300}"
+            "background": "{background.warning.boldHover}",
+            "color": "{colors.solid.yellow.950}"
           },
           "danger": {
-            "color": "{error.900}",
-            "background": "{error.300}"
+            "background": "{background.danger.boldHover}",
+            "color": "{colors.solid.red.950}"
+          },
+          "contrast": {
+            "background": "{background.surface.raised}",
+            "color": "{text.defaultHover}"
           }
         }
       },
       "root": {
-        "borderRadius": "{feedback.width.300}",
-        "padding": "{feedback.padding.100}",
-        "fontSize": "{fonts.fontSize.100}",
-        "fontWeight": "{fonts.fontWeight.regular}",
-        "minWidth": "{feedback.width.600}",
-        "height": "{feedback.height.500}"
+        "borderRadius": "{dimension.size.200}",
+        "padding": "{dimension.space.200}",
+        "fontSize": "{typography.label.sm.fontSize}",
+        "fontWeight": "{typography.body.lg.fontWeight}",
+        "minWidth": "{dimension.size.400}",
+        "height": "{dimension.size.400}"
       },
       "dot": {
-        "size": "{feedback.width.300}"
+        "size": "{dimension.size.200}"
       },
       "sm": {
-        "fontSize": "{fonts.fontSize.100}",
-        "minWidth": "0rem",
-        "height": "0rem"
+        "fontSize": "{typography.label.sm.fontSize}",
+        "minWidth": "{dimension.space.none}",
+        "height": "{dimension.space.none}"
       },
       "lg": {
-        "fontSize": "{fonts.fontSize.100}",
-        "minWidth": "{feedback.width.650}",
-        "height": "{feedback.height.600}"
+        "fontSize": "{typography.label.sm.fontSize}",
+        "minWidth": "{dimension.size.450}",
+        "height": "{dimension.size.450}"
       },
       "xl": {
-        "fontSize": "{fonts.fontSize.100}",
-        "minWidth": "{feedback.width.700}",
-        "height": "{feedback.height.650}"
+        "fontSize": "{typography.label.sm.fontSize}",
+        "minWidth": "{dimension.size.500}",
+        "height": "{dimension.size.500}"
       }
     },
     "breadcrumb": {
       "extend": {
-        "hoverBackground": "{surface.100}",
-        "iconSize": "{navigation.size.300}",
+        "hoverBackground": "{background.neutral.subtleHover}",
+        "iconSize": "{dimension.size.350}",
         "extItem": {
-          "padding": "{navigation.padding.100}"
-        }
+          "padding": "{dimension.space.100}"
+        },
+        "fonts_fontSize_200": "{typography.body.sm.fontSize}",
+        "opacity_500": "{opacity.500}",
+        "transparent": "{background.transparent}"
       },
       "root": {
-        "padding": "0rem",
-        "background": "{transparent}",
-        "gap": "0rem",
-        "transitionDuration": "{form.transitionDuration}"
+        "padding": "{dimension.space.none}",
+        "background": "{background.transparent}",
+        "gap": "{dimension.space.none}",
+        "transitionDuration": "{dimension.duration.200}"
       },
       "focusRing": {
-        "width": "{focusRing.width}",
-        "style": "{focusRing.style}",
-        "color": "{focusRing.color}",
-        "offset": "{focusRing.offset}",
-        "shadow": "{focusRing.shadow}"
+        "width": "{dimension.borderWidth.300}",
+        "style": "{dimension.focusRing.style}",
+        "color": "{background.success.subtleHover}",
+        "offset": "{dimension.focusRing.offset}",
+        "shadow": "{shadow.200}"
       },
       "item": {
-        "color": "{text.color}",
-        "hoverColor": "{text.hoverColor}",
-        "borderRadius": "{navigation.borderRadius}",
-        "gap": "{navigation.item.gap}",
+        "color": "{text.default}",
+        "hoverColor": "{text.hover.default}",
+        "borderRadius": "{dimension.radius.100}",
+        "gap": "{dimension.space.200}",
         "icon": {
-          "color": "{text.color}",
-          "hoverColor": "{text.hoverColor}"
+          "color": "{icon.strong}",
+          "hoverColor": "{icon.strongHover}"
+        },
+        "focusRing": {
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{focusRing.default}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "0"
         }
       },
       "separator": {
-        "color": "{text.color}"
+        "color": "{text.default}"
       }
     },
     "button": {
       "extend": {
-        "disabledBackground": "{form.disabledBackground}",
+        "disabledBackground": "{background.disabled}",
         "extOutlined": {
           "danger": {
-            "focusBackground": "{transparent}"
+            "focusBackground": "{background.transparent}"
           },
           "warn": {
-            "focusBackground": "{transparent}"
+            "focusBackground": "{background.transparent}"
           },
           "info": {
-            "focusBackground": "{transparent}"
+            "focusBackground": "{background.transparent}"
           },
           "help": {
-            "focusBackground": "{transparent}"
+            "focusBackground": "{background.transparent}"
           },
           "success": {
-            "focusBackground": "{transparent}"
+            "focusBackground": "{background.transparent}"
           }
         },
-        "disabledColor": "{form.disabledColor}",
+        "disabledColor": "{text.muted}",
         "extText": {
           "danger": {
-            "focusBackground": "{transparent}"
+            "focusBackground": "{background.transparent}"
           },
           "warn": {
-            "focusBackground": "{transparent}"
+            "focusBackground": "{background.transparent}"
           },
           "info": {
-            "focusBackground": "{transparent}"
+            "focusBackground": "{background.transparent}"
           },
           "help": {
-            "focusBackground": "{transparent}"
+            "focusBackground": "{background.transparent}"
           },
           "success": {
-            "focusBackground": "{transparent}"
+            "focusBackground": "{background.transparent}"
           }
         },
         "extLink": {
-          "background": "{transparent}",
-          "colorHover": "{text.hoverColor}",
-          "paddingX": "0rem",
-          "paddingY": "{controls.padding.100}",
+          "background": "{background.transparent}",
+          "colorHover": "{background.selectedStrong}",
+          "paddingX": "{dimension.space.none}",
+          "paddingY": "{dimension.space.100}",
           "sm": {
-            "iconOnlyWidth": "{controls.iconOnly.200}"
+            "iconOnlyWidth": "{dimension.size.300}"
           },
           "base": {
-            "iconOnlyWidth": "{controls.iconOnly.400}"
+            "iconOnlyWidth": "{dimension.size.400}"
           },
           "lg": {
-            "iconOnlyWidth": "{controls.iconOnly.500}"
+            "iconOnlyWidth": "{dimension.size.450}"
           },
           "xlg": {
-            "iconOnlyWidth": "{controls.iconOnly.600}"
+            "iconOnlyWidth": "{dimension.size.500}"
           }
         },
         "extSm": {
-          "borderRadius": "{controls.borderRadius.100}",
-          "gap": "{controls.gap.100}"
+          "borderRadius": "{dimension.radius.300}",
+          "gap": "{dimension.space.200}"
         },
         "extLg": {
-          "borderRadius": "{controls.borderRadius.200}",
-          "gap": "{controls.gap.200}",
-          "height": "{controls.iconOnly.850}"
+          "borderRadius": "{dimension.radius.400}",
+          "gap": "{dimension.space.300}",
+          "height": "{dimension.size.750}"
         },
         "extXlg": {
-          "borderRadius": "{controls.borderRadius.200}",
-          "gap": "{controls.gap.200}",
-          "iconOnlyWidth": "{controls.iconOnly.900}",
-          "paddingX": "{controls.padding.600}",
-          "paddingY": "{controls.padding.500}",
-          "height": "{controls.iconOnly.900}"
-        },
-        "borderWidth": "{controls.width.100}",
+          "borderRadius": "{dimension.radius.400}",
+          "gap": "{dimension.space.300}",
+          "iconOnlyWidth": "{dimension.size.800}",
+          "paddingX": "{dimension.space.600}",
+          "paddingY": "{dimension.space.500}",
+          "height": "{dimension.size.800}"
+        },
+        "borderWidth": "{dimension.size.100}",
         "iconSize": {
-          "sm": "{controls.iconOnly.200}",
-          "md": "{controls.iconOnly.300}",
-          "lg": "{controls.iconOnly.400}"
+          "sm": "{dimension.size.300}",
+          "md": "{dimension.size.350}",
+          "lg": "{dimension.size.400}"
         }
       },
       "colorScheme": {
         "light": {
           "root": {
             "primary": {
-              "background": "{primary.color}",
-              "hoverBackground": "{primary.hoverColor}",
-              "activeBackground": "{primary.activeColor}",
-              "borderColor": "{transparent}",
-              "hoverBorderColor": "{transparent}",
-              "activeBorderColor": "{transparent}",
-              "color": "{text.extend.colorPrimaryStatic}",
-              "hoverColor": "{text.extend.colorPrimaryStatic}",
-              "activeColor": "{text.extend.colorPrimaryStatic}",
+              "background": "{background.brand.bold}",
+              "hoverBackground": "{background.brand.boldHover}",
+              "activeBackground": "{background.brand.boldActive}",
+              "borderColor": "{border.transparent}",
+              "hoverBorderColor": "{border.transparent}",
+              "activeBorderColor": "{border.transparent}",
+              "color": "{text.staticDark}",
+              "hoverColor": "{text.staticDark}",
+              "activeColor": "{text.staticDark}",
               "focusRing": {
-                "color": "{focusRing.color}",
-                "shadow": "{focusRing.shadow}"
+                "color": "{background.success.subtleHover}",
+                "shadow": "{shadow.200}"
               }
             },
             "secondary": {
-              "background": "{surface.900}",
-              "hoverBackground": "{surface.800}",
-              "activeBackground": "{surface.700}",
-              "borderColor": "{transparent}",
-              "hoverBorderColor": "{transparent}",
-              "activeBorderColor": "{transparent}",
-              "color": "{text.extend.colorInverted}",
-              "hoverColor": "{text.extend.colorInverted}",
-              "activeColor": "{text.extend.colorInverted}",
+              "background": "{background.selected}",
+              "hoverBackground": "{background.surface.inverse}",
+              "activeBackground": "{background.selectedStrong}",
+              "borderColor": "{border.transparent}",
+              "hoverBorderColor": "{border.transparent}",
+              "activeBorderColor": "{border.transparent}",
+              "color": "{text.onBold}",
+              "hoverColor": "{text.onBold}",
+              "activeColor": "{text.onBold}",
               "focusRing": {
-                "color": "{focusRing.color}",
-                "shadow": "{focusRing.shadow}"
+                "color": "{background.success.subtleHover}",
+                "shadow": "{shadow.200}"
               }
             },
             "contrast": {
-              "background": "{surface.200}",
-              "hoverBackground": "{surface.300}",
-              "activeBackground": "{surface.400}",
-              "borderColor": "{transparent}",
-              "hoverBorderColor": "{transparent}",
-              "activeBorderColor": "{transparent}",
-              "color": "{text.color}",
-              "hoverColor": "{text.color}",
-              "activeColor": "{text.color}",
+              "background": "{background.disabled}",
+              "hoverBackground": "{text.disabled}",
+              "activeBackground": "{text.hover.subtle}",
+              "borderColor": "{border.transparent}",
+              "hoverBorderColor": "{border.transparent}",
+              "activeBorderColor": "{border.transparent}",
+              "color": "{text.default}",
+              "hoverColor": "{text.default}",
+              "activeColor": "{text.default}",
               "focusRing": {
-                "color": "{focusRing.color}",
-                "shadow": "{focusRing.shadow}"
+                "color": "{background.success.subtleHover}",
+                "shadow": "{shadow.200}"
               }
             },
             "info": {
-              "background": "{info.300}",
-              "hoverBackground": "{info.400}",
-              "activeBackground": "{info.500}",
-              "borderColor": "{transparent}",
-              "hoverBorderColor": "{transparent}",
-              "activeBorderColor": "{transparent}",
-              "color": "{info.900}",
-              "hoverColor": "{info.950}",
-              "activeColor": "{info.900}"
+              "background": "{background.info.subtleHover}",
+              "hoverBackground": "{background.info.bold}",
+              "activeBackground": "{background.info.bold}",
+              "borderColor": "{border.transparent}",
+              "hoverBorderColor": "{border.transparent}",
+              "activeBorderColor": "{border.transparent}",
+              "color": "{text.info}",
+              "hoverColor": "{text.info}",
+              "activeColor": "{text.info}",
+              "focusRing": {
+                "color": "{focusRing.info}",
+                "shadow": "none"
+              }
             },
             "success": {
-              "background": "{success.300}",
-              "hoverBackground": "{success.400}",
-              "activeBackground": "{success.500}",
-              "borderColor": "{transparent}",
-              "hoverBorderColor": "{transparent}",
-              "activeBorderColor": "{transparent}",
-              "color": "{success.900}",
-              "hoverColor": "{success.950}",
-              "activeColor": "{success.900}"
+              "background": "{background.success.subtleHover}",
+              "hoverBackground": "{background.success.bold}",
+              "activeBackground": "{background.brand.bold}",
+              "borderColor": "{border.transparent}",
+              "hoverBorderColor": "{border.transparent}",
+              "activeBorderColor": "{border.transparent}",
+              "color": "{text.success}",
+              "hoverColor": "{text.success}",
+              "activeColor": "{text.success}",
+              "focusRing": {
+                "color": "{focusRing.success}",
+                "shadow": "none"
+              }
             },
             "warn": {
-              "background": "{warn.300}",
-              "hoverBackground": "{warn.400}",
-              "activeBackground": "{warn.500}",
-              "borderColor": "{transparent}",
-              "hoverBorderColor": "{transparent}",
-              "activeBorderColor": "{transparent}",
-              "color": "{warn.900}",
-              "hoverColor": "{warn.950}",
-              "activeColor": "{warn.900}"
+              "background": "{background.warning.subtleHover}",
+              "hoverBackground": "{background.warning.bold}",
+              "activeBackground": "{background.warning.bold}",
+              "borderColor": "{border.transparent}",
+              "hoverBorderColor": "{border.transparent}",
+              "activeBorderColor": "{border.transparent}",
+              "color": "{text.warning}",
+              "hoverColor": "{text.warning}",
+              "activeColor": "{text.warning}",
+              "focusRing": {
+                "color": "{focusRing.warning}",
+                "shadow": "none"
+              }
             },
             "help": {
-              "background": "{help.300}",
-              "hoverBackground": "{help.400}",
-              "activeBackground": "{help.500}",
-              "borderColor": "{transparent}",
-              "hoverBorderColor": "{transparent}",
-              "activeBorderColor": "{transparent}",
-              "color": "{help.900}",
-              "hoverColor": "{help.950}",
-              "activeColor": "{help.900}"
+              "background": "{background.help.subtleHover}",
+              "hoverBackground": "{background.help.bold}",
+              "activeBackground": "{background.help.bold}",
+              "borderColor": "{border.transparent}",
+              "hoverBorderColor": "{border.transparent}",
+              "activeBorderColor": "{border.transparent}",
+              "color": "{text.help}",
+              "hoverColor": "{text.help}",
+              "activeColor": "{text.help}",
+              "focusRing": {
+                "color": "{focusRing.help}",
+                "shadow": "none"
+              }
             },
             "danger": {
-              "background": "{error.300}",
-              "hoverBackground": "{error.400}",
-              "activeBackground": "{error.500}",
-              "borderColor": "{transparent}",
-              "hoverBorderColor": "{transparent}",
-              "activeBorderColor": "{transparent}",
-              "color": "{error.900}",
-              "hoverColor": "{error.950}",
-              "activeColor": "{error.900}"
+              "background": "{background.danger.subtleHover}",
+              "hoverBackground": "{background.danger.bold}",
+              "activeBackground": "{background.danger.bold}",
+              "borderColor": "{border.transparent}",
+              "hoverBorderColor": "{border.transparent}",
+              "activeBorderColor": "{border.transparent}",
+              "color": "{text.danger}",
+              "hoverColor": "{text.danger}",
+              "activeColor": "{text.danger}",
+              "focusRing": {
+                "color": "{focusRing.invalid}",
+                "shadow": "none"
+              }
             }
           },
           "outlined": {
             "primary": {
-              "hoverBackground": "{primary.hoverBackground}",
-              "activeBackground": "{primary.activeBackground}",
-              "borderColor": "{primary.borderColor}",
-              "color": "{primary.color}"
+              "hoverBackground": "{background.brand.subtle}",
+              "activeBackground": "{background.brand.subtleHover}",
+              "borderColor": "{border.success}",
+              "color": "{text.success}"
             },
             "success": {
-              "hoverBackground": "{success.100}",
-              "activeBackground": "{success.200}",
-              "borderColor": "{success.600}",
-              "color": "{success.600}"
+              "hoverBackground": "{background.brand.subtleHover}",
+              "activeBackground": "{background.success.subtleHover}",
+              "borderColor": "{border.brand}",
+              "color": "{text.brand}"
             },
             "info": {
-              "hoverBackground": "{info.100}",
-              "activeBackground": "{info.200}",
-              "borderColor": "{info.600}",
-              "color": "{info.600}"
+              "hoverBackground": "{background.info.subtleHover}",
+              "activeBackground": "{background.info.subtleHover}",
+              "borderColor": "{border.info}",
+              "color": "{text.info}"
             },
             "warn": {
-              "hoverBackground": "{warn.100}",
-              "activeBackground": "{warn.200}",
-              "borderColor": "{warn.600}",
-              "color": "{warn.600}"
+              "hoverBackground": "{background.warning.subtleHover}",
+              "activeBackground": "{background.warning.subtleHover}",
+              "borderColor": "{border.warning}",
+              "color": "{text.warning}"
             },
             "help": {
-              "hoverBackground": "{help.100}",
-              "activeBackground": "{help.200}",
-              "borderColor": "{help.600}",
-              "color": "{help.600}"
+              "hoverBackground": "{background.help.subtleHover}",
+              "activeBackground": "{background.help.subtleHover}",
+              "borderColor": "{border.help}",
+              "color": "{text.help}"
             },
             "danger": {
-              "hoverBackground": "{error.100}",
-              "activeBackground": "{error.200}",
-              "borderColor": "{error.600}",
-              "color": "{error.600}"
+              "hoverBackground": "{background.danger.subtleHover}",
+              "activeBackground": "{background.danger.subtleHover}",
+              "borderColor": "{border.danger}",
+              "color": "{text.danger}"
+            },
+            "secondary": {
+              "hoverBackground": "{background.neutral.subtle}",
+              "activeBackground": "{background.neutral.subtleHover}",
+              "borderColor": "{border.subtle}",
+              "color": "{text.muted}"
+            },
+            "contrast": {
+              "hoverBackground": "{background.neutral.subtle}",
+              "activeBackground": "{background.neutral.subtleHover}",
+              "borderColor": "{colors.solid.zinc.700}",
+              "color": "{text.defaultHover}"
+            },
+            "plain": {
+              "hoverBackground": "{background.neutral.subtle}",
+              "activeBackground": "{background.neutral.subtleHover}",
+              "borderColor": "{border.subtle}",
+              "color": "{text.hover.default}"
             }
           },
           "text": {
             "primary": {
-              "hoverBackground": "{surface.100}",
-              "activeBackground": "{surface.200}",
-              "color": "{text.color}"
+              "hoverBackground": "{background.neutral.subtleHover}",
+              "activeBackground": "{background.disabled}",
+              "color": "{text.default}"
             },
             "success": {
-              "hoverBackground": "{success.100}",
-              "activeBackground": "{success.200}",
-              "color": "{success.600}"
+              "hoverBackground": "{background.brand.subtleHover}",
+              "activeBackground": "{background.success.subtleHover}",
+              "color": "{text.brand}"
             },
             "info": {
-              "hoverBackground": "{info.100}",
-              "activeBackground": "{info.200}",
-              "color": "{info.600}"
+              "hoverBackground": "{background.info.subtleHover}",
+              "activeBackground": "{background.info.subtleHover}",
+              "color": "{text.info}"
             },
             "warn": {
-              "hoverBackground": "{warn.100}",
-              "activeBackground": "{warn.200}",
-              "color": "{warn.600}"
+              "hoverBackground": "{background.warning.subtleHover}",
+              "activeBackground": "{background.warning.subtleHover}",
+              "color": "{text.warning}"
             },
             "help": {
-              "hoverBackground": "{help.100}",
-              "activeBackground": "{help.200}",
-              "color": "{help.600}"
+              "hoverBackground": "{background.help.subtleHover}",
+              "activeBackground": "{background.help.subtleHover}",
+              "color": "{text.help}"
             },
             "danger": {
-              "hoverBackground": "{error.100}",
-              "activeBackground": "{error.200}",
-              "color": "{error.600}"
+              "hoverBackground": "{background.danger.subtleHover}",
+              "activeBackground": "{background.danger.subtleHover}",
+              "color": "{text.danger}"
+            },
+            "secondary": {
+              "hoverBackground": "{background.neutral.subtle}",
+              "activeBackground": "{background.neutral.subtleHover}",
+              "color": "{text.muted}"
+            },
+            "contrast": {
+              "hoverBackground": "{background.neutral.subtle}",
+              "activeBackground": "{background.neutral.subtleHover}",
+              "color": "{text.defaultHover}"
+            },
+            "plain": {
+              "hoverBackground": "{background.neutral.subtle}",
+              "activeBackground": "{background.neutral.subtleHover}",
+              "color": "{text.hover.default}"
             }
           },
           "link": {
-            "color": "{text.color}",
-            "hoverColor": "{text.hoverColor}",
-            "activeColor": "{text.mutedColor}"
+            "color": "{text.default}",
+            "hoverColor": "{text.hover.default}",
+            "activeColor": "{text.muted}"
           }
         },
         "dark": {
           "root": {
             "primary": {
-              "background": "{primary.color}",
-              "hoverBackground": "{primary.hoverColor}",
-              "activeBackground": "{primary.activeColor}",
-              "borderColor": "{transparent}",
-              "hoverBorderColor": "{transparent}",
-              "activeBorderColor": "{transparent}",
-              "color": "{text.extend.colorPrimaryStatic}",
-              "hoverColor": "{text.extend.colorPrimaryStatic}",
-              "activeColor": "{text.extend.colorPrimaryStatic}",
+              "background": "{background.brand.bold}",
+              "hoverBackground": "{background.brand.boldHover}",
+              "activeBackground": "{background.brand.boldActive}",
+              "borderColor": "{border.transparent}",
+              "hoverBorderColor": "{border.transparent}",
+              "activeBorderColor": "{border.transparent}",
+              "color": "{text.staticDark}",
+              "hoverColor": "{text.staticDark}",
+              "activeColor": "{text.staticDark}",
               "focusRing": {
-                "color": "{focusRing.color}",
-                "shadow": "{focusRing.shadow}"
+                "color": "{background.success.subtleHover}",
+                "shadow": "{shadow.200}"
               }
             },
             "secondary": {
-              "background": "{surface.200}",
-              "hoverBackground": "{surface.300}",
-              "activeBackground": "{surface.400}",
-              "borderColor": "{transparent}",
-              "hoverBorderColor": "{transparent}",
-              "activeBorderColor": "{transparent}",
-              "color": "{surface.950}",
-              "hoverColor": "{surface.950}",
-              "activeColor": "{surface.950}",
+              "background": "{background.disabled}",
+              "hoverBackground": "{text.disabled}",
+              "activeBackground": "{text.hover.subtle}",
+              "borderColor": "{border.transparent}",
+              "hoverBorderColor": "{border.transparent}",
+              "activeBorderColor": "{border.transparent}",
+              "color": "{text.neutralHover}",
+              "hoverColor": "{text.neutralHover}",
+              "activeColor": "{text.neutralHover}",
               "focusRing": {
-                "color": "{focusRing.color}",
-                "shadow": "{focusRing.shadow}"
+                "color": "{background.success.subtleHover}",
+                "shadow": "{shadow.200}"
               }
             },
             "contrast": {
-              "background": "{surface.950}",
-              "hoverBackground": "{surface.900}",
-              "activeBackground": "{surface.800}",
-              "borderColor": "{transparent}",
-              "hoverBorderColor": "{transparent}",
-              "activeBorderColor": "{transparent}",
-              "color": "{surface.0}",
-              "hoverColor": "{surface.0}",
-              "activeColor": "{surface.0}",
+              "background": "{background.surface.inverseStrong}",
+              "hoverBackground": "{background.selected}",
+              "activeBackground": "{background.surface.inverse}",
+              "borderColor": "{border.transparent}",
+              "hoverBorderColor": "{border.transparent}",
+              "activeBorderColor": "{border.transparent}",
+              "color": "{background.surface.canvas}",
+              "hoverColor": "{background.surface.canvas}",
+              "activeColor": "{background.surface.canvas}",
               "focusRing": {
-                "color": "{focusRing.color}",
-                "shadow": "{focusRing.shadow}"
+                "color": "{background.success.subtleHover}",
+                "shadow": "{shadow.200}"
               }
             },
             "info": {
-              "background": "{info.500}",
-              "hoverBackground": "{info.400}",
-              "activeBackground": "{info.300}",
-              "borderColor": "{transparent}",
-              "hoverBorderColor": "{transparent}",
-              "activeBorderColor": "{transparent}",
-              "color": "{text.extend.colorPrimaryStatic}",
-              "hoverColor": "{text.extend.colorPrimaryStatic}",
-              "activeColor": "{text.extend.colorPrimaryStatic}"
+              "background": "{background.info.bold}",
+              "hoverBackground": "{background.info.bold}",
+              "activeBackground": "{background.info.subtleHover}",
+              "borderColor": "{border.transparent}",
+              "hoverBorderColor": "{border.transparent}",
+              "activeBorderColor": "{border.transparent}",
+              "color": "{text.staticDark}",
+              "hoverColor": "{text.staticDark}",
+              "activeColor": "{text.staticDark}",
+              "focusRing": {
+                "color": "{focusRing.info}",
+                "shadow": "none"
+              }
             },
             "success": {
-              "background": "{success.500}",
-              "hoverBackground": "{success.400}",
-              "activeBackground": "{success.300}",
-              "borderColor": "{transparent}",
-              "hoverBorderColor": "{transparent}",
-              "activeBorderColor": "{transparent}",
-              "color": "{text.extend.colorPrimaryStatic}",
-              "hoverColor": "{text.extend.colorPrimaryStatic}",
-              "activeColor": "{text.extend.colorPrimaryStatic}"
+              "background": "{background.brand.bold}",
+              "hoverBackground": "{background.success.bold}",
+              "activeBackground": "{background.success.subtleHover}",
+              "borderColor": "{border.transparent}",
+              "hoverBorderColor": "{border.transparent}",
+              "activeBorderColor": "{border.transparent}",
+              "color": "{text.staticDark}",
+              "hoverColor": "{text.staticDark}",
+              "activeColor": "{text.staticDark}",
+              "focusRing": {
+                "color": "{focusRing.success}",
+                "shadow": "none"
+              }
             },
             "warn": {
-              "background": "{warn.500}",
-              "hoverBackground": "{warn.400}",
-              "activeBackground": "{warn.300}",
-              "borderColor": "{transparent}",
-              "hoverBorderColor": "{transparent}",
-              "activeBorderColor": "{transparent}",
-              "color": "{text.extend.colorPrimaryStatic}",
-              "hoverColor": "{text.extend.colorPrimaryStatic}",
-              "activeColor": "{text.extend.colorPrimaryStatic}"
+              "background": "{background.warning.bold}",
+              "hoverBackground": "{background.warning.bold}",
+              "activeBackground": "{background.warning.subtleHover}",
+              "borderColor": "{border.transparent}",
+              "hoverBorderColor": "{border.transparent}",
+              "activeBorderColor": "{border.transparent}",
+              "color": "{text.staticDark}",
+              "hoverColor": "{text.staticDark}",
+              "activeColor": "{text.staticDark}",
+              "focusRing": {
+                "color": "{focusRing.warning}",
+                "shadow": "none"
+              }
             },
             "help": {
-              "background": "{help.500}",
-              "hoverBackground": "{help.400}",
-              "activeBackground": "{help.300}",
-              "borderColor": "{transparent}",
-              "hoverBorderColor": "{transparent}",
-              "activeBorderColor": "{transparent}",
-              "color": "{text.extend.colorPrimaryStatic}",
-              "hoverColor": "{text.extend.colorPrimaryStatic}",
-              "activeColor": "{text.extend.colorPrimaryStatic}"
+              "background": "{background.help.bold}",
+              "hoverBackground": "{background.help.bold}",
+              "activeBackground": "{background.help.subtleHover}",
+              "borderColor": "{border.transparent}",
+              "hoverBorderColor": "{border.transparent}",
+              "activeBorderColor": "{border.transparent}",
+              "color": "{text.staticDark}",
+              "hoverColor": "{text.staticDark}",
+              "activeColor": "{text.staticDark}",
+              "focusRing": {
+                "color": "{focusRing.help}",
+                "shadow": "none"
+              }
             },
             "danger": {
-              "background": "{error.500}",
-              "hoverBackground": "{error.400}",
-              "activeBackground": "{error.300}",
-              "borderColor": "{transparent}",
-              "hoverBorderColor": "{transparent}",
-              "activeBorderColor": "{transparent}",
-              "color": "{text.extend.colorPrimaryStatic}",
-              "hoverColor": "{text.extend.colorPrimaryStatic}",
-              "activeColor": "{text.extend.colorPrimaryStatic}"
+              "background": "{background.danger.bold}",
+              "hoverBackground": "{background.danger.bold}",
+              "activeBackground": "{background.danger.subtleHover}",
+              "borderColor": "{border.transparent}",
+              "hoverBorderColor": "{border.transparent}",
+              "activeBorderColor": "{border.transparent}",
+              "color": "{text.staticDark}",
+              "hoverColor": "{text.staticDark}",
+              "activeColor": "{text.staticDark}",
+              "focusRing": {
+                "color": "{focusRing.invalid}",
+                "shadow": "none"
+              }
             }
           },
           "outlined": {
             "primary": {
-              "hoverBackground": "{primary.hoverBackground}",
-              "activeBackground": "{primary.activeBackground}",
-              "borderColor": "{primary.borderColor}",
-              "color": "{primary.color}"
+              "hoverBackground": "{background.brand.subtle}",
+              "activeBackground": "{background.brand.subtleHover}",
+              "borderColor": "{border.success}",
+              "color": "{text.success}"
             },
             "success": {
-              "hoverBackground": "{success.950}",
-              "activeBackground": "{success.900}",
-              "borderColor": "{success.500}",
-              "color": "{success.500}"
+              "hoverBackground": "{text.success}",
+              "activeBackground": "{background.success.bold}",
+              "borderColor": "{border.checked}",
+              "color": "{text.success}"
             },
             "info": {
-              "hoverBackground": "{info.950}",
-              "activeBackground": "{info.900}",
-              "borderColor": "{info.500}",
-              "color": "{info.500}"
+              "hoverBackground": "{text.info}",
+              "activeBackground": "{background.info.bold}",
+              "borderColor": "{border.info}",
+              "color": "{text.info}"
             },
             "warn": {
-              "hoverBackground": "{warn.950}",
-              "activeBackground": "{warn.900}",
-              "borderColor": "{warn.500}",
-              "color": "{warn.500}"
+              "hoverBackground": "{text.warning}",
+              "activeBackground": "{background.warning.bold}",
+              "borderColor": "{border.warning}",
+              "color": "{text.warning}"
             },
             "help": {
-              "hoverBackground": "{help.950}",
-              "activeBackground": "{help.900}",
-              "borderColor": "{help.500}",
-              "color": "{help.500}"
+              "hoverBackground": "{text.help}",
+              "activeBackground": "{background.help.bold}",
+              "borderColor": "{border.help}",
+              "color": "{text.help}"
             },
             "danger": {
-              "hoverBackground": "{error.950}",
-              "activeBackground": "{error.900}",
-              "borderColor": "{error.500}",
-              "color": "{error.500}"
+              "hoverBackground": "{text.danger}",
+              "activeBackground": "{background.danger.bold}",
+              "borderColor": "{border.danger}",
+              "color": "{text.danger}"
+            },
+            "secondary": {
+              "hoverBackground": "{colors.alpha.white.40}",
+              "activeBackground": "{colors.alpha.white.160}",
+              "borderColor": "{border.default}",
+              "color": "{text.hover.subtle}"
+            },
+            "contrast": {
+              "hoverBackground": "{background.surface.inverse}",
+              "activeBackground": "{background.selectedStrong}",
+              "borderColor": "{colors.solid.zinc.500}",
+              "color": "{text.onBold}"
+            },
+            "plain": {
+              "hoverBackground": "{background.surface.inverse}",
+              "activeBackground": "{background.selectedStrong}",
+              "borderColor": "{border.neutral}",
+              "color": "{text.onBold}"
             }
           },
           "text": {
             "primary": {
-              "hoverBackground": "{surface.800}",
-              "activeBackground": "{surface.700}",
-              "color": "{text.color}"
+              "hoverBackground": "{background.surface.inverse}",
+              "activeBackground": "{background.selectedStrong}",
+              "color": "{text.default}"
             },
             "success": {
-              "hoverBackground": "{success.950}",
-              "activeBackground": "{success.900}",
-              "color": "{success.500}"
+              "hoverBackground": "{text.success}",
+              "activeBackground": "{background.success.bold}",
+              "color": "{text.success}"
             },
             "info": {
-              "hoverBackground": "{info.950}",
-              "activeBackground": "{info.900}",
-              "color": "{info.500}"
+              "hoverBackground": "{text.info}",
+              "activeBackground": "{background.info.bold}",
+              "color": "{text.info}"
             },
             "warn": {
-              "hoverBackground": "{warn.950}",
-              "activeBackground": "{warn.900}",
-              "color": "{warn.500}"
+              "hoverBackground": "{text.warning}",
+              "activeBackground": "{background.warning.bold}",
+              "color": "{text.warning}"
             },
             "help": {
-              "hoverBackground": "{help.950}",
-              "activeBackground": "{help.900}",
-              "color": "{help.500}"
+              "hoverBackground": "{text.help}",
+              "activeBackground": "{background.help.bold}",
+              "color": "{text.help}"
             },
             "danger": {
-              "hoverBackground": "{error.950}",
-              "activeBackground": "{error.900}",
-              "color": "{error.500}"
+              "hoverBackground": "{text.danger}",
+              "activeBackground": "{background.danger.bold}",
+              "color": "{text.danger}"
+            },
+            "secondary": {
+              "hoverBackground": "{background.surface.inverse}",
+              "activeBackground": "{background.selectedStrong}",
+              "color": "{text.hover.subtle}"
+            },
+            "contrast": {
+              "hoverBackground": "{background.surface.inverse}",
+              "activeBackground": "{background.selectedStrong}",
+              "color": "{text.onBold}"
+            },
+            "plain": {
+              "hoverBackground": "{background.surface.inverse}",
+              "activeBackground": "{background.selectedStrong}",
+              "color": "{text.onBold}"
             }
           },
           "link": {
-            "color": "{text.color}",
-            "hoverColor": "{text.hoverColor}",
-            "activeColor": "{text.mutedColor}"
+            "color": "{text.default}",
+            "hoverColor": "{text.hover.default}",
+            "activeColor": "{text.muted}"
           }
         }
       },
       "root": {
-        "borderRadius": "{controls.borderRadius.100}",
-        "roundedBorderRadius": "{controls.borderRadius.max}",
-        "gap": "{controls.gap.100}",
-        "fontSize": "{fonts.fontSize.200}",
-        "paddingX": "{controls.padding.400}",
-        "paddingY": "{controls.padding.200}",
-        "iconOnlyWidth": "{controls.iconOnly.700}",
+        "borderRadius": "{dimension.radius.300}",
+        "roundedBorderRadius": "{dimension.radius.max}",
+        "gap": "{dimension.space.200}",
+        "fontSize": "{typography.body.sm.fontSize}",
+        "paddingX": "{dimension.space.400}",
+        "paddingY": "{dimension.space.200}",
+        "iconOnlyWidth": "{dimension.size.600}",
         "raisedShadow": "none",
-        "badgeSize": "{feedback.width.500}",
-        "transitionDuration": "{controls.transitionDuration}",
+        "badgeSize": "{dimension.size.300}",
+        "transitionDuration": "{dimension.duration.200}",
         "focusRing": {
-          "width": "{focusRing.width}",
-          "style": "{focusRing.style}",
-          "offset": "{focusRing.offset}"
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "offset": "{dimension.focusRing.offset}"
         },
         "sm": {
-          "fontSize": "{fonts.fontSize.200}",
-          "iconOnlyWidth": "{controls.iconOnly.600}",
-          "paddingX": "{controls.padding.300}",
-          "paddingY": "{controls.padding.200}"
+          "fontSize": "{typography.body.sm.fontSize}",
+          "iconOnlyWidth": "{dimension.size.500}",
+          "paddingX": "{dimension.space.300}",
+          "paddingY": "{dimension.space.200}"
         },
         "lg": {
-          "fontSize": "{fonts.fontSize.500}",
-          "iconOnlyWidth": "{controls.iconOnly.850}",
-          "paddingX": "{controls.padding.600}",
-          "paddingY": "{controls.padding.400}"
+          "fontSize": "{typography.heading.sm.fontSize}",
+          "iconOnlyWidth": "{dimension.size.750}",
+          "paddingX": "{dimension.space.600}",
+          "paddingY": "{dimension.space.400}"
         },
         "label": {
-          "fontWeight": "{fonts.fontWeight.demibold}"
+          "fontWeight": "{typography.heading.lg.fontWeight}"
         }
       }
     },
     "card": {
       "extend": {
-        "borderColor": "{content.borderColor}",
-        "borderWidth": "{content.borderWidth}"
+        "borderColor": "{border.subtle}",
+        "borderWidth": "{dimension.size.100}",
+        "fonts_fontFamily_heading": "{typography.heading.lg.fontFamily}",
+        "fonts_fontSize_200": "{typography.body.sm.fontSize}",
+        "fonts_fontWeight_regular": "{typography.body.lg.fontWeight}",
+        "overlay_popover_shadow": "{shadow.400}"
       },
       "root": {
-        "background": "{content.background}",
-        "borderRadius": "{content.gap.400}",
-        "color": "{content.color}"
+        "background": "{background.surface.raised}",
+        "borderRadius": "{dimension.space.400}",
+        "color": "{text.default}",
+        "shadow": "0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px -1px rgba(0, 0, 0, 0.1)"
       },
       "body": {
-        "padding": "{content.padding.300}",
-        "gap": "{content.gap.400}"
+        "padding": "{dimension.space.400}",
+        "gap": "{dimension.space.400}"
       },
       "caption": {
-        "gap": "{content.gap.100}"
+        "gap": "{dimension.space.100}"
       },
       "title": {
-        "fontSize": "{fonts.fontSize.400}",
-        "fontWeight": "{fonts.fontWeight.demibold}"
+        "fontSize": "{typography.body.lg.fontSize}",
+        "fontWeight": "{typography.heading.lg.fontWeight}"
       },
       "subtitle": {
-        "color": "{text.mutedColor}"
+        "color": "{text.muted}"
       }
     },
     "carousel": {
       "colorScheme": {
         "light": {
           "indicator": {
-            "background": "{surface.300}",
-            "hoverBackground": "{surface.400}",
-            "activeBackground": "{surface.900}"
+            "background": "{text.disabled}",
+            "hoverBackground": "{text.hover.subtle}",
+            "activeBackground": "{background.selected}"
+          }
+        },
+        "dark": {
+          "indicator": {
+            "background": "{background.selectedStrong}",
+            "hoverBackground": "{background.neutral.boldHover}",
+            "activeBackground": "{background.brand.bold}"
           }
         }
       },
       "root": {
-        "transitionDuration": "{media.transitionDuration}"
+        "transitionDuration": "{dimension.duration.200}"
       },
       "content": {
-        "gap": "{media.gap.200}"
+        "gap": "{dimension.space.200}"
       },
       "indicatorList": {
-        "padding": "{media.padding.400}",
-        "gap": "{media.gap.200}"
+        "padding": "{dimension.space.400}",
+        "gap": "{dimension.space.200}"
       },
       "indicator": {
-        "width": "{controls.iconOnly.100}",
-        "height": "{controls.iconOnly.100}",
-        "borderRadius": "{media.borderRadius.400}",
+        "width": "{dimension.size.200}",
+        "height": "{dimension.size.200}",
+        "borderRadius": "{dimension.radius.500}",
         "focusRing": {
-          "width": "{focusRing.width}",
-          "style": "{focusRing.style}",
-          "color": "{focusRing.color}",
-          "offset": "{focusRing.offset}",
-          "shadow": "{focusRing.shadow}"
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{background.success.subtleHover}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "{shadow.200}"
         }
+      },
+      "extend": {
+        "surface_200": "{background.disabled}",
+        "surface_300": "{text.disabled}",
+        "surface_400": "{text.hover.subtle}",
+        "text_color": "{text.default}"
       }
     },
     "checkbox": {
       "root": {
-        "borderRadius": "{form.borderRadius.100}",
+        "borderRadius": "{dimension.radius.200}",
         "extend": {
-          "borderWidth": "{form.borderWidth}"
-        },
-        "width": "{form.size.400}",
-        "height": "{form.size.400}",
-        "background": "{form.background}",
-        "checkedBackground": "{surface.900}",
-        "checkedHoverBackground": "{surface.800}",
-        "disabledBackground": "{form.disabledBackground}",
-        "filledBackground": "{form.filledBackground}",
-        "borderColor": "{form.borderColor}",
-        "hoverBorderColor": "{form.hoverBorderPrimaryColor}",
-        "focusBorderColor": "{form.focusBorderPrimaryColor}",
-        "checkedBorderColor": "{surface.900}",
-        "checkedHoverBorderColor": "{surface.800}",
-        "checkedFocusBorderColor": "{primary.color}",
-        "checkedDisabledBorderColor": "{form.borderColor}",
-        "invalidBorderColor": "{form.invalidBorderColor}",
+          "borderWidth": "{dimension.borderWidth.100}"
+        },
+        "width": "{dimension.size.400}",
+        "height": "{dimension.size.400}",
+        "background": "{background.surface.field}",
+        "checkedBackground": "{background.selected}",
+        "checkedHoverBackground": "{background.surface.inverse}",
+        "disabledBackground": "{background.disabled}",
+        "filledBackground": "{background.surface.field}",
+        "borderColor": "{border.default}",
+        "hoverBorderColor": "{border.strong}",
+        "focusBorderColor": "{border.strong}",
+        "checkedBorderColor": "{border.strong}",
+        "checkedHoverBorderColor": "{border.inverse}",
+        "checkedFocusBorderColor": "{border.checked}",
+        "checkedDisabledBorderColor": "{border.default}",
+        "invalidBorderColor": "{border.danger}",
         "shadow": "0",
         "focusRing": {
-          "focusRing": "{focusRing.width}",
-          "style": "{focusRing.style}",
-          "color": "{focusRing.color}",
-          "offset": "{focusRing.offset}",
-          "shadow": "{focusRing.shadow}"
+          "focusRing": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{focusRing.success}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "{shadow.200}",
+          "width": "{dimension.borderWidth.300}"
         },
         "sm": {
-          "width": "{form.size.200}",
-          "height": "{form.size.200}"
+          "width": "{dimension.size.200}",
+          "height": "{dimension.size.200}"
         },
         "lg": {
-          "width": "{form.size.350}",
-          "height": "{form.size.350}"
+          "width": "{dimension.size.350}",
+          "height": "{dimension.size.350}"
         },
-        "transitionDuration": "{form.transitionDuration}"
+        "transitionDuration": "{dimension.duration.200}"
       },
       "icon": {
-        "size": "{form.icon.300}",
-        "color": "{form.color}",
-        "checkedColor": "{primary.contrastColor}",
-        "checkedHoverColor": "{primary.contrastColor}",
-        "disabledColor": "{form.disabledColor}",
+        "size": "{dimension.size.300}",
+        "color": "{icon.default}",
+        "checkedColor": "{icon.onBold}",
+        "checkedHoverColor": "{icon.onBold}",
+        "disabledColor": "{icon.subtle}",
         "sm": {
-          "size": "{form.icon.200}"
+          "size": "{dimension.size.250}"
         },
         "lg": {
-          "size": "{form.icon.400}"
+          "size": "{dimension.size.350}"
         }
+      },
+      "extend": {
+        "focusRing_invalid": "{focusRing.invalid}",
+        "focusRing_success": "{focusRing.success}",
+        "fonts_fontFamily_base": "{typography.body.lg.fontFamily}",
+        "fonts_fontFamily_heading": "{typography.heading.lg.fontFamily}",
+        "fonts_fontSize_200": "{typography.body.sm.fontSize}",
+        "fonts_fontSize_300": "{typography.body.md.fontSize}",
+        "fonts_fontWeight_regular": "{typography.body.lg.fontWeight}",
+        "text_brand": "{text.brand}",
+        "text_color": "{text.default}",
+        "text_disabled": "{text.disabled}",
+        "text_mutedColor": "{text.muted}",
+        "text_subtle": "{text.subtle}",
+        "focusRing_width": "{dimension.space.100}"
       }
     },
     "chip": {
       "extend": {
-        "borderColor": "{transparent}",
-        "borderWidth": "{controls.width.100}"
+        "borderColor": "{border.transparent}",
+        "borderWidth": "{dimension.size.100}",
+        "focusRing_success": "{focusRing.success}",
+        "fonts_fontFamily_base": "{typography.body.lg.fontFamily}",
+        "fonts_fontSize_300": "{typography.body.md.fontSize}",
+        "fonts_fontWeight_regular": "{typography.body.lg.fontWeight}",
+        "fonts_lineHeight_400": "{typography.body.sm.lineHeight}",
+        "opacity_500": "{opacity.500}"
       },
       "root": {
-        "borderRadius": "{media.borderRadius.100}",
-        "paddingX": "{media.padding.200}",
-        "paddingY": "{media.padding.100}",
-        "gap": "{media.gap.200}",
-        "transitionDuration": "{media.transitionDuration}"
+        "borderRadius": "{dimension.radius.200}",
+        "paddingX": "{dimension.space.200}",
+        "paddingY": "{dimension.space.100}",
+        "gap": "{dimension.space.200}",
+        "transitionDuration": "{dimension.duration.200}"
       },
       "colorScheme": {
         "light": {
           "root": {
-            "background": "{surface.200}",
-            "color": "{text.color}"
+            "background": "{background.disabled}",
+            "color": "{text.default}"
+          },
+          "icon": {
+            "color": "{icon.strong}"
+          },
+          "removeIcon": {
+            "color": "{icon.strong}"
+          }
+        },
+        "dark": {
+          "root": {
+            "background": "{background.surface.inverse}",
+            "color": "{text.onBold}"
           },
           "icon": {
-            "color": "{text.color}"
+            "color": "{text.onBold}"
           },
           "removeIcon": {
-            "color": "{text.color}"
+            "color": "{text.onBold}"
           }
         }
       },
       "image": {
-        "width": "0rem",
-        "height": "0rem"
+        "width": "{dimension.space.none}",
+        "height": "{dimension.space.none}"
       },
       "icon": {
-        "size": "{media.icon.size.100}"
+        "size": "{dimension.size.300}"
       },
       "removeIcon": {
-        "size": "{media.icon.size.100}",
+        "size": "{dimension.size.300}",
         "focusRing": {
-          "width": "{form.focusRing.width}",
-          "style": "{form.focusRing.style}",
-          "color": "{focusRing.color}",
-          "offset": "{form.focusRing.offset}",
-          "shadow": "{focusRing.shadow}"
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{background.success.subtleHover}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "{shadow.200}"
         }
       }
     },
     "confirmdialog": {
       "extend": {
         "extIcon": {
-          "success": "{success.500}",
-          "info": "{info.500}",
-          "help": "{help.500}",
-          "warn": "{warn.500}",
-          "danger": "{error.500}"
-        }
+          "success": "{background.brand.bold}",
+          "info": "{background.info.bold}",
+          "help": "{background.help.bold}",
+          "warn": "{background.warning.bold}",
+          "danger": "{background.danger.bold}"
+        },
+        "dimension_overlayWidth_base": "{dimension.overlayWidth.base}",
+        "dimension_overlayWidth_lg": "{dimension.overlayWidth.lg}",
+        "dimension_overlayWidth_sm": "{dimension.overlayWidth.sm}",
+        "dimension_overlayWidth_xlg": "{dimension.overlayWidth.xlg}"
       },
       "icon": {
-        "size": "{overlay.icon.size.200}",
-        "color": "{overlay.modal.color}"
+        "size": "{dimension.size.400}",
+        "color": "{icon.strong}"
       },
       "content": {
-        "gap": "0rem"
+        "gap": "{dimension.space.none}"
       }
     },
     "confirmpopup": {
       "root": {
-        "background": "{overlay.popover.background}",
-        "color": "{overlay.popover.color}",
-        "shadow": "{overlay.popover.shadow}",
-        "gutter": "{overlay.gap.300}",
-        "arrowOffset": "{overlay.modal.padding.200}"
+        "background": "{background.surface.raised}",
+        "color": "{text.default}",
+        "shadow": "{shadow.400}",
+        "gutter": "{dimension.space.300}",
+        "arrowOffset": "{dimension.space.500}",
+        "borderColor": "{border.subtle}",
+        "borderRadius": "{dimension.radius.300}"
       },
       "content": {
-        "padding": "{overlay.popover.padding.100}",
-        "gap": "{overlay.gap.400}"
+        "padding": "{dimension.space.300}",
+        "gap": "{dimension.space.400}"
       },
       "icon": {
-        "size": "{overlay.icon.size.200}",
-        "color": "{overlay.popover.color}"
+        "size": "{dimension.size.400}",
+        "color": "{icon.strong}"
       },
       "footer": {
-        "gap": "{overlay.gap.200}",
-        "padding": "0 {overlay.popover.padding} {overlay.popover.padding} {overlay.popover.padding}"
+        "gap": "{dimension.space.200}",
+        "padding": "0 {dimension.space.300} {dimension.space.500} {dimension.space.300}"
       }
     },
     "contextmenu": {
       "root": {
-        "background": "{content.background}",
-        "color": "{content.color}",
-        "shadow": "{navigation.shadow}"
+        "background": "{background.surface.raised}",
+        "color": "{text.default}",
+        "shadow": "{shadow.400}",
+        "borderColor": "{border.subtle}",
+        "borderRadius": "{dimension.radius.300}",
+        "transitionDuration": "{dimension.duration.200}"
       },
       "list": {
-        "padding": "{navigation.list.padding.md} 0",
-        "gap": "{navigation.list.gap}"
+        "padding": "{dimension.space.100} 0",
+        "gap": "{dimension.space.100}"
       },
       "item": {
-        "padding": "{navigation.item.padding}",
-        "gap": "{navigation.item.gap}"
+        "padding": "{dimension.space.200} {dimension.space.300}",
+        "gap": "{dimension.space.200}",
+        "focusBackground": "{background.surface.hover.section}",
+        "activeBackground": "{background.selected}",
+        "color": "{text.default}",
+        "focusColor": "{text.default}",
+        "activeColor": "{text.default}",
+        "borderRadius": "{dimension.radius.200}",
+        "icon": {
+          "color": "{icon.subtle}",
+          "focusColor": "{icon.default}",
+          "activeColor": "{icon.default}"
+        }
       },
       "submenu": {
-        "mobileIndent": "{navigation.submenu.padding}"
+        "mobileIndent": "{dimension.space.500}"
+      },
+      "submenuIcon": {
+        "size": "{dimension.size.300}",
+        "color": "{icon.subtle}",
+        "focusColor": "{icon.default}",
+        "activeColor": "{icon.default}"
+      },
+      "separator": {
+        "borderColor": "{border.subtle}"
       }
     },
     "datatable": {
       "colorScheme": {
         "light": {
           "root": {
-            "color": "{text.color}",
-            "borderColor": "{content.borderColor}"
+            "color": "{text.default}",
+            "borderColor": "{border.subtle}"
           },
           "header": {
-            "background": "{surface.50}",
-            "color": "{text.color}"
+            "background": "{background.neutral.subtle}",
+            "color": "{text.default}"
           },
           "headerCell": {
-            "background": "{surface.50}",
-            "hoverBackground": "{surface.100}",
-            "color": "{text.color}"
+            "background": "{background.neutral.subtle}",
+            "hoverBackground": "{background.neutral.subtleHover}",
+            "color": "{text.default}"
           },
           "footer": {
-            "background": "{surface.100}",
-            "color": "{text.color}"
+            "background": "{background.neutral.subtleHover}",
+            "color": "{text.default}"
           },
           "footerCell": {
-            "background": "{content.hoverBackground}",
-            "color": "{text.color}"
+            "background": "{background.surface.hover.section}",
+            "color": "{text.default}"
+          },
+          "row": {
+            "stripedBackground": "{background.surface.hover.section}"
+          },
+          "bodyCell": {
+            "selectedBorderColor": "{border.subtle}"
+          }
+        },
+        "dark": {
+          "root": {
+            "borderColor": "{border.inverse}"
           },
           "row": {
-            "stripedBackground": "{content.hoverBackground}"
+            "stripedBackground": "{background.surface.inverseStrong}"
           },
           "bodyCell": {
-            "selectedBorderColor": "{content.borderColor}"
+            "selectedBorderColor": "{colors.solid.green.900}"
           }
         }
       },
       "extended": {
         "extHeaderCell": {
-          "selectedHoverBackground": "{surface.800}"
+          "selectedHoverBackground": "{background.surface.inverse}"
         },
         "extRow": {
-          "selectedHoverBackground": "{surface.800}",
-          "stripedHoverBackground": "{surface.100}"
+          "selectedHoverBackground": "{background.surface.inverse}",
+          "stripedHoverBackground": "{background.neutral.subtleHover}"
         }
       },
       "root": {
-        "transitionDuration": "{data.transitionDuration}"
+        "transitionDuration": "{dimension.duration.200}"
       },
       "header": {
-        "borderColor": "{content.borderColor}",
-        "borderWidth": "{data.width.100} 0 {data.width.100} 0",
-        "padding": "{data.padding.400}",
+        "borderColor": "{border.subtle}",
+        "borderWidth": "{dimension.size.100} 0 {dimension.size.100} 0",
+        "padding": "{dimension.space.400}",
         "sm": {
-          "padding": "{data.padding.200}"
+          "padding": "{dimension.space.200}"
         },
         "lg": {
-          "padding": "{data.padding.500}"
-        }
+          "padding": "{dimension.space.500}"
+        },
+        "background": "{background.surface.raised}",
+        "color": "{text.default}"
       },
       "headerCell": {
-        "selectedBackground": "{highlight.background}",
-        "borderColor": "{content.borderColor}",
-        "hoverColor": "{text.extend.colorInverted}",
-        "selectedColor": "{highlight.color}",
-        "gap": "{data.gap.200}",
-        "padding": "{data.padding.400}",
+        "selectedBackground": "{background.selected}",
+        "borderColor": "{border.subtle}",
+        "hoverColor": "{text.onBold}",
+        "selectedColor": "{text.onBold}",
+        "gap": "{dimension.space.200}",
+        "padding": "{dimension.space.400}",
         "focusRing": {
-          "width": "{focusRing.width}",
-          "style": "{focusRing.style}",
-          "color": "{focusRing.color}",
-          "offset": "{focusRing.offset}",
-          "shadow": "inset {focus.ring.shadow}"
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{background.success.subtleHover}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "inset {shadow.200}"
         },
         "sm": {
-          "padding": "{data.padding.200}"
+          "padding": "{dimension.space.200}"
         },
         "lg": {
-          "padding": "{data.padding.500}"
-        }
+          "padding": "{dimension.space.500}"
+        },
+        "background": "{background.surface.raised}",
+        "hoverBackground": "{background.surface.hover.section}",
+        "color": "{text.default}"
       },
       "columnTitle": {
-        "fontWeight": "{fonts.fontWeight.bold}"
+        "fontWeight": "{typography.heading.xl.fontWeight}"
       },
       "row": {
-        "background": "{content.background}",
-        "hoverBackground": "{content.hoverBackground}",
-        "selectedBackground": "{highlight.background}",
-        "color": "{content.color}",
-        "hoverColor": "{content.hoverColor}",
-        "selectedColor": "{highlight.color}",
+        "background": "{background.surface.raised}",
+        "hoverBackground": "{background.surface.hover.section}",
+        "selectedBackground": "{background.selected}",
+        "color": "{text.default}",
+        "hoverColor": "{text.hover.default}",
+        "selectedColor": "{text.onBold}",
         "focusRing": {
-          "width": "{focusRing.width}",
-          "style": "{focusRing.style}",
-          "color": "{focusRing.color}",
-          "offset": "{focusRing.offset}",
-          "shadow": "inset {focus.ring.shadow}"
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{background.success.subtleHover}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "inset {shadow.200}"
         }
       },
       "bodyCell": {
-        "borderColor": "{content.borderColor}",
-        "padding": "{data.padding.400}",
+        "borderColor": "{border.subtle}",
+        "padding": "{dimension.space.400}",
         "sm": {
-          "padding": "{data.padding.200}"
+          "padding": "{dimension.space.200}"
         },
         "lg": {
-          "padding": "{data.padding.500}"
+          "padding": "{dimension.space.500}"
         }
       },
       "footerCell": {
-        "borderColor": "{content.borderColor}",
-        "padding": "{data.padding.400}",
+        "borderColor": "{border.subtle}",
+        "padding": "{dimension.space.400}",
         "sm": {
-          "padding": "{data.padding.200}"
+          "padding": "{dimension.space.200}"
         },
         "lg": {
-          "padding": "{data.padding.500}"
-        }
+          "padding": "{dimension.space.500}"
+        },
+        "background": "{background.surface.raised}",
+        "color": "{text.default}"
       },
       "columnFooter": {
-        "fontWeight": "{fonts.fontWeight.bold}"
+        "fontWeight": "{typography.heading.xl.fontWeight}"
       },
       "dropPoint": {
-        "color": "{highlight.background}"
+        "color": "{background.selected}"
       },
       "footer": {
-        "borderColor": "{content.borderColor}",
-        "borderWidth": "0 0 {data.width.100} 0",
-        "padding": "{data.padding.400}",
+        "borderColor": "{border.subtle}",
+        "borderWidth": "0 0 {dimension.size.100} 0",
+        "padding": "{dimension.space.400}",
         "sm": {
-          "padding": "{data.padding.200}"
+          "padding": "{dimension.space.200}"
         },
         "lg": {
-          "padding": "{data.padding.500}"
-        }
+          "padding": "{dimension.space.500}"
+        },
+        "background": "{background.surface.raised}",
+        "color": "{text.default}"
       },
       "columnResizer": {
-        "width": "{data.width.300}"
+        "width": "{dimension.size.200}"
       },
       "resizeIndicator": {
-        "width": "{data.width.100}",
-        "color": "{highlight.background}"
+        "width": "{dimension.size.100}",
+        "color": "{background.selected}"
       },
       "sortIcon": {
-        "color": "{text.color}",
-        "hoverColor": "{text.hoverColor}",
-        "size": "{data.icon.size.100}"
+        "color": "{icon.strong}",
+        "hoverColor": "{icon.strongHover}",
+        "size": "{dimension.size.300}"
       },
       "loadingIcon": {
-        "size": "{data.icon.size.500}"
+        "size": "{dimension.size.500}"
       },
       "rowToggleButton": {
-        "hoverBackground": "{content.hoverBackground}",
-        "selectedHoverBackground": "{content.hoverBackground}",
-        "color": "{text.color}",
-        "hoverColor": "{text.color}",
-        "selectedHoverColor": "{text.color}",
-        "size": "{data.icon.size.500}",
-        "borderRadius": "{content.borderRadius}",
+        "hoverBackground": "{background.surface.hover.section}",
+        "selectedHoverBackground": "{background.surface.hover.section}",
+        "color": "{text.default}",
+        "hoverColor": "{text.default}",
+        "selectedHoverColor": "{text.default}",
+        "size": "{dimension.size.500}",
+        "borderRadius": "{dimension.radius.300}",
         "focusRing": {
-          "width": "{focusRing.width}",
-          "style": "{focusRing.style}",
-          "color": "{focusRing.color}",
-          "offset": "{focusRing.offset}",
-          "shadow": "{focusRing.shadow}"
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{background.success.subtleHover}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "{shadow.200}"
         }
       },
       "filter": {
-        "inlineGap": "{data.gap.200}",
+        "inlineGap": "{dimension.space.200}",
         "rule": {
-          "borderColor": "{content.borderColor}"
+          "borderColor": "{border.subtle}"
         },
         "constraintList": {
-          "padding": "{list.padding}",
-          "gap": "{list.gap.100}"
+          "padding": "{dimension.space.100}",
+          "gap": "{dimension.space.100}"
         },
         "constraint": {
-          "focusBackground": "{list.option.focusBackground}",
-          "selectedBackground": "{list.option.selectedBackground}",
-          "selectedFocusBackground": "{list.option.selectedFocusBackground}",
-          "color": "{list.option.color}",
-          "focusColor": "{list.option.focusColor}",
-          "selectedColor": "{list.option.selectedColor}",
-          "selectedFocusColor": "{list.option.selectedFocusColor}",
-          "padding": "{list.option.padding}",
-          "borderRadius": "{list.option.borderRadius}",
+          "focusBackground": "{background.surface.hover.section}",
+          "selectedBackground": "{background.selected}",
+          "selectedFocusBackground": "{background.selectedStrong}",
+          "color": "{text.default}",
+          "focusColor": "{text.default}",
+          "selectedColor": "{text.onBold}",
+          "selectedFocusColor": "{text.onBold}",
+          "padding": "{dimension.space.200} {dimension.space.300}",
+          "borderRadius": "{dimension.radius.200}",
           "separator": {
-            "borderColor": "{content.borderColor}"
+            "borderColor": "{border.subtle}"
           }
         },
         "overlaySelect": {
-          "background": "{overlay.select.background}",
-          "color": "{overlay.select.color}",
-          "borderColor": "{overlay.select.borderColor}",
-          "borderRadius": "{overlay.select.borderRadius}",
-          "shadow": "{overlay.select.shadow}"
+          "background": "{background.surface.raised}",
+          "color": "{text.default}",
+          "borderColor": "{border.subtle}",
+          "borderRadius": "{dimension.radius.300}",
+          "shadow": "{shadow.400}"
         },
         "overlayPopover": {
-          "background": "{overlay.popover.background}",
-          "color": "{overlay.popover.color}",
-          "borderColor": "{overlay.select.borderColor}",
-          "borderRadius": "{overlay.select.borderRadius}",
-          "shadow": "{overlay.popover.shadow}",
-          "padding": "{overlay.popover.padding.100}",
-          "gap": "{list.gap.100}"
+          "background": "{background.surface.raised}",
+          "color": "{text.default}",
+          "borderColor": "{border.subtle}",
+          "borderRadius": "{dimension.radius.300}",
+          "shadow": "{shadow.400}",
+          "padding": "{dimension.space.300}",
+          "gap": "{dimension.space.100}"
         }
       },
       "paginatorTop": {
-        "borderColor": "{form.borderColor}",
-        "borderWidth": "0 0 {data.width.100} 0"
+        "borderColor": "{border.default}",
+        "borderWidth": "0 0 {dimension.size.100} 0"
       },
       "paginatorBottom": {
-        "borderWidth": "0 0 {data.width.100} 0",
-        "borderColor": "{content.borderColor}"
+        "borderWidth": "0 0 {dimension.size.100} 0",
+        "borderColor": "{border.subtle}"
+      },
+      "extend": {
+        "text_hoverColor": "{text.hover.default}"
       }
     },
     "dataview": {
       "root": {
-        "borderWidth": "{data.width.100}",
-        "borderRadius": "{data.borderRadius}",
-        "padding": "0rem",
-        "borderColor": "{content.borderColor}"
+        "borderWidth": "{dimension.size.100}",
+        "borderRadius": "{dimension.radius.100}",
+        "padding": "{dimension.space.none}",
+        "borderColor": "{border.subtle}"
       },
       "header": {
-        "borderWidth": "0 0 {data.width.100} 0",
-        "padding": "{data.padding.200} {data.padding.300}",
+        "borderWidth": "0 0 {dimension.size.100} 0",
+        "padding": "{dimension.space.200} {dimension.space.300}",
         "borderRadius": "0 0 0 0",
-        "color": "{text.color}"
+        "color": "{text.default}",
+        "background": "{background.surface.raised}",
+        "borderColor": "{border.subtle}"
       },
       "content": {
-        "background": "{content.background}",
-        "color": "{content.color}",
-        "borderColor": "{content.borderColor}",
-        "borderWidth": "0rem",
-        "padding": "0rem",
+        "background": "{background.surface.raised}",
+        "color": "{text.default}",
+        "borderColor": "{border.subtle}",
+        "borderWidth": "{dimension.space.none}",
+        "padding": "{dimension.space.none}",
         "borderRadius": "0"
       },
       "footer": {
-        "background": "{surface.100}",
-        "color": "{text.color}",
-        "borderWidth": "{data.width.100} 0 0 0",
-        "padding": "{data.padding.200} {data.padding.300}",
-        "borderRadius": "0 0 0 0"
+        "background": "{background.neutral.subtleHover}",
+        "color": "{text.default}",
+        "borderWidth": "{dimension.size.100} 0 0 0",
+        "padding": "{dimension.space.200} {dimension.space.300}",
+        "borderRadius": "0 0 0 0",
+        "borderColor": "{border.subtle}"
       },
       "paginatorTop": {
-        "borderWidth": "0 0 {data.width.100} 0"
+        "borderWidth": "0 0 {dimension.size.100} 0",
+        "borderColor": "{border.subtle}"
       },
       "paginatorBottom": {
-        "borderWidth": "{data.width.100} 0 0 0"
+        "borderWidth": "{dimension.size.100} 0 0 0",
+        "borderColor": "{border.subtle}"
       }
     },
     "datepicker": {
       "extend": {
         "extDate": {
-          "selectedHoverBackground": "{surface.800}"
+          "selectedHoverBackground": "{background.surface.inverse}"
         },
         "extToday": {
-          "hoverBackground": "{content.hoverBackground}",
-          "borderColor": "{content.activeBorderColor}"
+          "hoverBackground": "{background.surface.hover.section}",
+          "borderColor": "{border.inverse}"
         },
         "extTitle": {
-          "width": "{form.width.500}"
+          "width": "{dimension.overlayWidth.narrow}"
         },
         "extTimePicker": {
-          "minWidth": "{form.width.400}",
-          "color": "{content.color}"
-        }
+          "minWidth": "{dimension.size.700}",
+          "color": "{text.default}"
+        },
+        "extSelectYear": {
+          "minWidth": "{dimension.size.1000}"
+        },
+        "dimension_size_1000": "{dimension.size.1000}",
+        "fonts_fontFamily_base": "{typography.body.lg.fontFamily}",
+        "fonts_fontFamily_heading": "{typography.heading.lg.fontFamily}",
+        "fonts_fontSize_100": "{typography.label.sm.fontSize}",
+        "fonts_fontSize_300": "{typography.body.md.fontSize}",
+        "fonts_fontWeight_demibold": "{typography.heading.lg.fontWeight}",
+        "fonts_fontWeight_regular": "{typography.body.lg.fontWeight}",
+        "form_borderWidth": "{dimension.size.100}"
       },
       "colorScheme": {
         "light": {
           "dropdown": {
-            "background": "{content.background}",
-            "hoverBackground": "{navigation.item.focusBackground}",
-            "activeBackground": "{navigation.item.activeBackground}",
-            "color": "{navigation.item.color}",
-            "hoverColor": "{navigation.item.focusColor}",
-            "activeColor": "{navigation.item.activeColor}"
+            "background": "{background.surface.raised}",
+            "hoverBackground": "{background.neutral.subtleHover}",
+            "activeBackground": "{background.selected}",
+            "color": "{text.default}",
+            "hoverColor": "{text.default}",
+            "activeColor": "{text.onBold}"
+          },
+          "today": {
+            "background": "{background.transparent}",
+            "color": "{text.staticDark}"
+          }
+        },
+        "dark": {
+          "dropdown": {
+            "background": "{background.surface.inverse}",
+            "hoverBackground": "{background.selectedStrong}",
+            "activeBackground": "{background.neutral.boldHover}",
+            "color": "{text.disabled}",
+            "hoverColor": "{colors.solid.zinc.200}",
+            "activeColor": "{colors.solid.zinc.100}"
           },
           "today": {
-            "background": "{transparent}",
-            "color": "{text.extend.colorPrimaryStatic}"
+            "background": "{background.selectedStrong}",
+            "color": "{text.onBold}"
           }
         }
       },
       "panel": {
-        "background": "{content.background}",
-        "borderColor": "{content.borderColor}",
-        "color": "{content.color}",
-        "borderRadius": "{content.borderRadius}",
-        "shadow": "{overlay.popover.shadow}",
-        "padding": "0rem"
+        "background": "{background.surface.raised}",
+        "borderColor": "{border.subtle}",
+        "color": "{text.default}",
+        "borderRadius": "{dimension.radius.300}",
+        "shadow": "{shadow.400}",
+        "padding": "{dimension.space.none}"
       },
       "header": {
-        "background": "{content.background}",
-        "borderColor": "{content.borderColor}",
-        "color": "{content.color}",
-        "padding": "{overlay.popover.padding.100}"
+        "background": "{background.surface.raised}",
+        "borderColor": "{border.subtle}",
+        "color": "{text.default}",
+        "padding": "{dimension.space.300}"
       },
       "title": {
-        "gap": "{form.gap.200}",
-        "fontWeight": "{fonts.fontWeight.bold}"
+        "gap": "{dimension.space.200}",
+        "fontWeight": "{typography.heading.xl.fontWeight}"
       },
       "selectMonth": {
-        "hoverBackground": "{content.hoverBackground}",
-        "color": "{content.color}",
-        "hoverColor": "{content.hoverColor}",
-        "borderRadius": "{content.borderRadius}",
-        "padding": "{form.padding.200}"
+        "hoverBackground": "{background.surface.hover.section}",
+        "color": "{text.default}",
+        "hoverColor": "{text.hover.default}",
+        "borderRadius": "{dimension.radius.300}",
+        "padding": "{dimension.space.200}"
       },
       "inputIcon": {
-        "color": "{form.floatLabelColor}"
+        "color": "{icon.subtle}"
       },
       "dropdown": {
-        "width": "{form.width.300}",
-        "borderColor": "{form.borderColor}",
-        "hoverBorderColor": "{form.borderColor}",
-        "activeBorderColor": "{form.borderColor}",
-        "borderRadius": "{form.borderRadius.200}",
+        "width": "{dimension.size.600}",
+        "borderColor": "{border.default}",
+        "hoverBorderColor": "{border.default}",
+        "activeBorderColor": "{border.default}",
+        "borderRadius": "{dimension.radius.300}",
         "focusRing": {
-          "width": "{form.focusRing.width}",
-          "style": "{form.focusRing.style}",
-          "color": "{form.focusRing.color}",
-          "offset": "{form.focusRing.offset}",
-          "shadow": "{focusRing.shadow}"
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{focusRing.success}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "{shadow.200}"
         },
         "sm": {
-          "width": "0rem"
+          "width": "{dimension.space.none}"
         },
         "lg": {
-          "width": "0rem"
+          "width": "{dimension.space.none}"
         }
       },
       "group": {
-        "borderColor": "{content.borderColor}",
-        "gap": "{overlay.popover.padding.100}"
+        "borderColor": "{border.subtle}",
+        "gap": "{dimension.space.300}"
       },
       "selectYear": {
-        "hoverBackground": "{content.hoverBackground}",
-        "color": "{content.color}",
-        "hoverColor": "{content.hoverColor}",
-        "borderRadius": "{content.borderRadius}",
-        "padding": "{overlay.select.padding}"
+        "hoverBackground": "{background.surface.hover.section}",
+        "color": "{text.default}",
+        "hoverColor": "{text.hover.default}",
+        "borderRadius": "{dimension.radius.300}",
+        "padding": "{dimension.space.100}"
       },
       "dayView": {
-        "margin": "{overlay.popover.padding.100}"
+        "margin": "{dimension.space.300}"
       },
       "weekDay": {
-        "padding": "{form.padding.100}",
-        "fontWeight": "{fonts.fontWeight.bold}",
-        "color": "{content.color}"
+        "padding": "{dimension.space.100}",
+        "fontWeight": "{typography.heading.xl.fontWeight}",
+        "color": "{text.default}"
       },
       "date": {
-        "hoverBackground": "{content.hoverBackground}",
-        "selectedBackground": "{highlight.background}",
-        "rangeSelectedBackground": "{list.option.focusBackground}",
-        "color": "{content.color}",
-        "hoverColor": "{content.color}",
-        "selectedColor": "{text.extend.colorInverted}",
-        "rangeSelectedColor": "{text.color}",
-        "width": "{form.size.500}",
-        "height": "{form.size.500}",
-        "borderRadius": "{form.borderRadius.100}",
-        "padding": "{form.padding.100}",
+        "hoverBackground": "{background.surface.hover.section}",
+        "selectedBackground": "{background.selected}",
+        "rangeSelectedBackground": "{background.surface.hover.section}",
+        "color": "{text.default}",
+        "hoverColor": "{text.default}",
+        "selectedColor": "{text.onBold}",
+        "rangeSelectedColor": "{text.default}",
+        "width": "{dimension.size.500}",
+        "height": "{dimension.size.500}",
+        "borderRadius": "{dimension.radius.200}",
+        "padding": "{dimension.space.100}",
         "focusRing": {
-          "width": "{form.focusRing.width}",
-          "style": "{form.focusRing.style}",
-          "color": "{form.focusRing.color}",
-          "offset": "{form.focusRing.offset}",
-          "shadow": "{focusRing.shadow}"
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{focusRing.success}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "{shadow.200}"
         }
       },
       "monthView": {
@@ -2714,469 +2977,557 @@
       },
       "month": {
         "padding": "0",
-        "borderRadius": "0rem"
+        "borderRadius": "{dimension.space.none}"
       },
       "yearView": {
         "margin": "0 0 0 0"
       },
       "year": {
         "padding": "0",
-        "borderRadius": "0rem"
+        "borderRadius": "{dimension.space.none}"
       },
       "buttonbar": {
-        "padding": "{overlay.popover.padding.100}",
-        "borderColor": "{content.borderColor}"
+        "padding": "{dimension.space.300}",
+        "borderColor": "{border.subtle}"
       },
       "timePicker": {
-        "padding": "{form.padding.300}",
-        "borderColor": "{content.borderColor}",
-        "gap": "{form.gap.200}",
-        "buttonGap": "{form.gap.100}"
+        "padding": "{dimension.space.300}",
+        "borderColor": "{border.subtle}",
+        "gap": "{dimension.space.200}",
+        "buttonGap": "{dimension.space.100}"
       },
       "root": {
-        "transitionDuration": "{form.transitionDuration}"
+        "transitionDuration": "{dimension.duration.200}"
       }
     },
     "dialog": {
       "extend": {
-        "borderWidth": "{overlay.borderWidth}",
-        "backdrop": "{overlay.modal.backdrop}"
+        "borderWidth": "{dimension.borderWidth.100}",
+        "backdrop": "{background.scrim.modal}",
+        "dimension_borderWidth_100": "{dimension.borderWidth.100}",
+        "dimension_overlayWidth_base": "{dimension.overlayWidth.base}",
+        "dimension_overlayWidth_lg": "{dimension.overlayWidth.lg}",
+        "dimension_overlayWidth_sm": "{dimension.overlayWidth.sm}",
+        "dimension_overlayWidth_xlg": "{dimension.overlayWidth.xlg}",
+        "fonts_fontFamily_base": "{typography.body.lg.fontFamily}",
+        "fonts_fontFamily_heading": "{typography.heading.lg.fontFamily}",
+        "fonts_fontSize_300": "{typography.body.md.fontSize}",
+        "fonts_fontWeight_regular": "{typography.body.lg.fontWeight}",
+        "fonts_lineHeight_500": "{typography.body.md.lineHeight}",
+        "fonts_lineHeight_550": "{typography.body.lg.lineHeight}"
       },
       "root": {
-        "background": "{overlay.modal.background}",
-        "borderColor": "{overlay.modal.borderColor}",
-        "color": "{overlay.modal.color}",
-        "borderRadius": "{overlay.modal.borderRadius}",
-        "shadow": "{overlay.popover.shadow}"
+        "background": "{background.surface.raised}",
+        "borderColor": "{border.subtle}",
+        "color": "{text.default}",
+        "borderRadius": "{dimension.radius.500}",
+        "shadow": "{shadow.400}"
       },
       "header": {
-        "padding": "{overlay.modal.padding.300} {overlay.modal.padding.300} 1rem {overlay.modal.padding.300}",
-        "gap": "{overlay.gap.200}"
+        "padding": "{dimension.space.600} {dimension.space.600} 1rem {dimension.space.600}",
+        "gap": "{dimension.space.200}"
       },
       "title": {
-        "fontSize": "{fonts.fontSize.500}",
-        "fontWeight": "{fonts.fontWeight.demibold}"
+        "fontSize": "{typography.heading.sm.fontSize}",
+        "fontWeight": "{typography.heading.lg.fontWeight}"
       },
       "content": {
-        "padding": "{content.padding.400}"
+        "padding": "{dimension.space.600}"
       },
       "footer": {
-        "padding": "0 {overlay.modal.padding.300} {overlay.modal.padding.300} {overlay.modal.padding.300}",
-        "gap": "{content.gap.200}"
+        "padding": "0 {dimension.space.600} {dimension.space.600} {dimension.space.600}",
+        "gap": "{dimension.space.200}"
       }
     },
     "divider": {
       "colorScheme": {
         "light": {
           "content": {
-            "background": "{content.background}",
-            "color": "{text.mutedColor}"
+            "background": "{background.surface.raised}",
+            "color": "{text.muted}"
           },
-          "borderColor": "{content.borderColor}"
+          "borderColor": "{border.subtle}"
+        },
+        "dark": {
+          "content": {
+            "background": "{background.surface.raised}",
+            "color": "{text.muted}"
+          },
+          "borderColor": "{border.subtle}"
         }
       },
       "extend": {
         "content": {
-          "gap": "{content.gap.200}"
+          "gap": "{dimension.space.200}"
         },
-        "iconSize": "{media.icon.size.100}"
+        "iconSize": "{dimension.size.300}",
+        "fonts_fontFamily_heading": "{typography.heading.lg.fontFamily}",
+        "fonts_fontSize_200": "{typography.body.sm.fontSize}",
+        "fonts_fontWeight_demibold": "{typography.heading.lg.fontWeight}"
       },
       "horizontal": {
-        "margin": "{content.padding.300} 0",
-        "padding": "0 {content.padding.300}",
+        "margin": "{dimension.space.400} 0",
+        "padding": "0 {dimension.space.400}",
         "content": {
-          "padding": "0 {content.padding.200}"
+          "padding": "0 {dimension.space.200}"
         }
       },
       "vertical": {
-        "margin": "0 {content.padding.300}",
-        "padding": "{content.padding.300} 0",
+        "margin": "0 {dimension.space.400}",
+        "padding": "{dimension.space.400} 0",
         "content": {
-          "padding": "{content.padding.200} 0"
+          "padding": "{dimension.space.200} 0"
         }
+      },
+      "root": {
+        "borderColor": "{border.subtle}"
+      },
+      "content": {
+        "background": "{background.surface.raised}",
+        "color": "{text.default}"
       }
     },
     "drawer": {
       "extend": {
-        "borderRadius": "{overlay.popover.borderRadius}",
-        "borderWidth": "{overlay.borderWidth}",
-        "width": "{overlay.width}",
+        "borderRadius": "{dimension.radius.200}",
+        "borderWidth": "{dimension.borderWidth.100}",
+        "width": "{dimension.overlayWidth.base}",
         "extHeader": {
-          "gap": "{overlay.gap.200}",
+          "gap": "{dimension.space.200}",
           "borderColor": "{drawer.root.borderColor}"
         },
-        "padding": "{overlay.drawer.padding}",
-        "scale": "0.125rem",
-        "backdrop": "{overlay.modal.backdrop}"
+        "padding": "{dimension.space.200}",
+        "scale": "{dimension.borderWidth.200}",
+        "backdrop": "{background.scrim.modal}",
+        "dimension_space_400": "{dimension.space.400}",
+        "overlay_modal_padding_300": "{dimension.space.600}"
       },
       "root": {
-        "background": "{overlay.modal.background}",
-        "borderColor": "{overlay.modal.borderColor}",
-        "color": "{overlay.modal.color}",
-        "shadow": "{overlay.modal.shadow}",
-        "width": "{overlay.width}"
+        "background": "{background.surface.raised}",
+        "borderColor": "{border.subtle}",
+        "color": "{text.default}",
+        "shadow": "{shadow.200}",
+        "width": "{dimension.overlayWidth.base}"
       },
       "sm": {
-        "width": "{overlay.sm.width}"
+        "width": "{dimension.overlayWidth.sm}"
       },
       "lg": {
-        "width": "{overlay.lg.width}"
+        "width": "{dimension.overlayWidth.lg}"
       },
       "xlg": {
-        "width": "{overlay.xlg.width}"
+        "width": "{dimension.overlayWidth.xlg}"
       },
       "header": {
-        "padding": "{overlay.modal.padding.300} {overlay.modal.padding.300} {overlay.modal.padding.200} {overlay.modal.padding.300} "
+        "padding": "{dimension.space.600} {dimension.space.600} {dimension.space.500} {dimension.space.600} "
       },
       "title": {
-        "fontSize": "{fonts.fontSize.500}",
-        "fontWeight": "{fonts.fontWeight.demibold}"
+        "fontSize": "{typography.heading.sm.fontSize}",
+        "fontWeight": "{typography.heading.lg.fontWeight}"
       },
       "content": {
-        "padding": "{overlay.modal.padding.300}"
+        "padding": "{dimension.space.600}"
       },
       "footer": {
-        "padding": "0 {overlay.modal.padding.300} {overlay.modal.padding.300} {overlay.modal.padding.300} "
+        "padding": "0 {dimension.space.600} {dimension.space.600} {dimension.space.600} "
       }
     },
     "fileupload": {
       "extend": {
         "extDragNdrop": {
-          "background": "{surface.0}",
-          "borderRadius": "{form.borderRadius.200}",
-          "iconSize": "{form.size.500}",
-          "padding": "{form.padding.400}",
+          "background": "{background.surface.canvas}",
+          "borderRadius": "{dimension.radius.300}",
+          "iconSize": "{dimension.size.500}",
+          "padding": "{dimension.space.400}",
           "info": {
-            "gap": "{form.gap.100}"
+            "gap": "{dimension.space.100}"
           }
         },
         "extFile": {
-          "iconSize": "{form.size.350}"
+          "iconSize": "{dimension.size.350}"
         },
         "extContent": {
-          "borderRadius": "{content.borderRadius}",
-          "highlightBorderDefault": "{form.borderColor}"
+          "borderRadius": "{dimension.radius.300}",
+          "highlightBorderDefault": "{text.disabled}"
         }
       },
       "colorScheme": {
         "light": {
           "header": {
-            "background": "{surface.0}",
-            "color": "{text.color}"
+            "background": "{background.surface.canvas}",
+            "color": "{text.default}"
+          }
+        },
+        "dark": {
+          "header": {
+            "background": "{background.surface.canvas}",
+            "color": "{text.default}"
           }
         }
       },
       "root": {
-        "background": "{content.background}",
-        "borderColor": "{content.borderColor}",
-        "color": "{content.color}",
-        "borderRadius": "{content.borderRadius}",
-        "transitionDuration": "{form.transitionDuration}"
+        "background": "{background.surface.raised}",
+        "borderColor": "{border.subtle}",
+        "color": "{text.default}",
+        "borderRadius": "{dimension.radius.300}",
+        "transitionDuration": "{dimension.duration.200}"
       },
       "header": {
-        "borderColor": "{content.borderColor}",
-        "borderWidth": "0rem",
-        "padding": "0rem",
-        "borderRadius": "0rem",
-        "gap": "{content.gap.200}"
+        "borderColor": "{border.subtle}",
+        "borderWidth": "{dimension.space.none}",
+        "padding": "{dimension.space.none}",
+        "borderRadius": "{dimension.space.none}",
+        "gap": "{dimension.space.200}",
+        "background": "transparent",
+        "color": "{text.default}"
       },
       "content": {
-        "highlightBorderColor": "{surface.900}",
-        "padding": "0rem",
-        "gap": "{content.gap.200}"
+        "highlightBorderColor": "{border.strong}",
+        "padding": "{dimension.space.none}",
+        "gap": "{dimension.space.200}"
       },
       "file": {
-        "padding": "{content.padding.200}",
-        "gap": "{content.gap.200}",
-        "borderColor": "{form.borderColor}",
+        "padding": "{dimension.space.200}",
+        "gap": "{dimension.space.200}",
+        "borderColor": "{border.default}",
         "info": {
-          "gap": "{content.gap.100}"
+          "gap": "{dimension.space.100}"
         }
       },
       "fileList": {
-        "gap": "{content.gap.200}"
+        "gap": "{dimension.space.200}"
       },
       "progressbar": {
-        "height": "{feedback.height.100}"
+        "height": "{dimension.size.200}"
       },
       "basic": {
-        "gap": "{content.gap.200}"
+        "gap": "{dimension.space.200}"
       }
     },
     "floatlabel": {
       "extend": {
-        "height": "{form.size.800}",
-        "iconSize": "{form.icon.400}"
+        "height": "{dimension.size.800}",
+        "iconSize": "{dimension.size.350}"
       },
       "root": {
-        "color": "{form.floatLabelColor}",
-        "focusColor": "{form.floatLabelFocusColor}",
-        "activeColor": "{form.floatLabelActiveColor}",
-        "invalidColor": "{form.floatLabelInvalidColor}",
-        "transitionDuration": "{form.transitionDuration}",
-        "positionX": "{form.padding.300}",
-        "positionY": "{form.padding.300}",
-        "fontWeight": "{fonts.fontWeight.regular}",
+        "color": "{text.muted}",
+        "focusColor": "{text.muted}",
+        "activeColor": "{text.muted}",
+        "invalidColor": "{text.danger}",
+        "transitionDuration": "{dimension.duration.200}",
+        "positionX": "{dimension.space.300}",
+        "positionY": "{dimension.space.300}",
+        "fontWeight": "{typography.body.lg.fontWeight}",
         "active": {
-          "fontSize": "{fonts.fontSize.100}",
-          "fontWeight": "{fonts.fontWeight.regular}"
+          "fontSize": "{typography.label.sm.fontSize}",
+          "fontWeight": "{typography.body.lg.fontWeight}"
         }
       },
       "over": {
         "active": {
-          "top": "{form.padding.400}"
+          "top": "{dimension.space.400}"
         }
       },
       "in": {
         "input": {
-          "paddingTop": "{form.padding.700}",
-          "paddingBottom": "{form.padding.300}"
+          "paddingTop": "{dimension.space.700}",
+          "paddingBottom": "{dimension.space.300}"
         },
         "active": {
-          "top": "{form.padding.300}"
+          "top": "{dimension.space.300}"
         }
       },
       "on": {
-        "borderRadius": "0rem",
+        "borderRadius": "{dimension.space.none}",
         "active": {
-          "padding": "0 {form.padding.100}",
-          "background": "{form.background}"
+          "padding": "0 {dimension.space.100}",
+          "background": "{background.surface.field}"
         }
       }
     },
     "galleria": {
       "extend": {
-        "backdrop": "{overlay.modal.backdrop}"
+        "backdrop": "{background.scrim.modal}",
+        "dimension_space_200": "{dimension.space.200}"
       },
       "colorScheme": {
         "light": {
           "thumbnailContent": {
-            "background": "{surface.100}"
+            "background": "{background.neutral.subtleHover}"
+          },
+          "thumbnailNavButton": {
+            "hoverBackground": "{background.translucent.light.default}",
+            "color": "{text.default}",
+            "hoverColor": "{text.hover.default}"
           },
+          "indicatorButton": {
+            "background": "{text.disabled}",
+            "hoverBackground": "{text.hover.subtle}"
+          }
+        },
+        "dark": {
           "thumbnailNavButton": {
-            "hoverBackground": "{colors.alpha.white.200}",
-            "color": "{text.color}",
-            "hoverColor": "{text.hoverColor}"
+            "hoverBackground": "{background.selectedStrong}",
+            "color": "{text.hover.subtle}",
+            "hoverColor": "{text.onBold}"
           },
           "indicatorButton": {
-            "background": "{surface.300}",
-            "hoverBackground": "{surface.400}"
+            "background": "{background.selectedStrong}",
+            "hoverBackground": "{background.neutral.boldHover}"
           }
         }
       },
       "root": {
-        "borderWidth": "{content.borderWidth}",
-        "borderColor": "{content.borderColor}",
-        "borderRadius": "{content.borderRadius}",
-        "transitionDuration": "{media.transitionDuration}"
+        "borderWidth": "{dimension.size.100}",
+        "borderColor": "{border.subtle}",
+        "borderRadius": "{dimension.radius.300}",
+        "transitionDuration": "{dimension.duration.200}"
       },
       "navButton": {
-        "background": "{transparent}",
-        "hoverBackground": "{colors.alpha.white.200}",
-        "color": "{text.extend.colorInverted}",
-        "hoverColor": "{text.extend.colorInverted}",
-        "size": "{media.size.600}",
-        "gutter": "{media.gap.200}",
+        "background": "{background.transparent}",
+        "hoverBackground": "{background.translucent.light.default}",
+        "color": "{text.onBold}",
+        "hoverColor": "{text.onBold}",
+        "size": "{dimension.size.800}",
+        "gutter": "{dimension.space.200}",
         "prev": {
-          "borderRadius": "{navigation.item.borderRadius}"
+          "borderRadius": "{dimension.radius.200}"
         },
         "next": {
-          "borderRadius": "{navigation.item.borderRadius}"
+          "borderRadius": "{dimension.radius.200}"
         },
         "focusRing": {
-          "width": "{focusRing.width}",
-          "style": "{focusRing.style}",
-          "color": "{focusRing.color}",
-          "offset": "{focusRing.offset}",
-          "shadow": "{focusRing.shadow}"
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{background.success.subtleHover}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "{shadow.200}"
         }
       },
       "navIcon": {
-        "size": "{media.icon.size.300}"
+        "size": "{dimension.size.500}"
       },
       "thumbnailsContent": {
-        "padding": "{media.padding.100}"
+        "padding": "{dimension.space.100}",
+        "background": "{background.surface.raised}"
       },
       "thumbnailNavButton": {
-        "size": "{media.size.300}",
-        "borderRadius": "{content.borderRadius}",
-        "gutter": "{media.gap.200}",
+        "size": "{dimension.size.500}",
+        "borderRadius": "{dimension.radius.300}",
+        "gutter": "{dimension.space.200}",
         "focusRing": {
-          "width": "{focusRing.width}",
-          "style": "{focusRing.style}",
-          "color": "{focusRing.color}",
-          "offset": "{focusRing.offset}",
-          "shadow": "{focusRing.shadow}"
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{background.success.subtleHover}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "{shadow.200}"
         }
       },
       "thumbnailNavButtonIcon": {
-        "size": "{media.icon.size.100}"
+        "size": "{dimension.size.300}"
       },
       "caption": {
-        "background": "{colors.alpha.white.500}",
-        "color": "{text.color}",
-        "padding": "{media.gap.200}"
+        "background": "{background.translucent.light.strong}",
+        "color": "{text.default}",
+        "padding": "{dimension.space.200}"
       },
       "indicatorList": {
-        "gap": "{media.gap.200}",
-        "padding": "{media.padding.400}"
+        "gap": "{dimension.space.200}",
+        "padding": "{dimension.space.400}"
       },
       "indicatorButton": {
-        "width": "{media.size.200}",
-        "height": "{media.size.200}",
-        "activeBackground": "{surface.900}",
-        "borderRadius": "{content.borderRadius}",
+        "width": "{dimension.size.200}",
+        "height": "{dimension.size.200}",
+        "activeBackground": "{background.selected}",
+        "borderRadius": "{dimension.radius.300}",
         "focusRing": {
-          "width": "{focusRing.width}",
-          "style": "{focusRing.style}",
-          "color": "{focusRing.color}",
-          "offset": "{focusRing.offset}",
-          "shadow": "{focusRing.shadow}"
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{background.success.subtleHover}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "{shadow.200}"
         }
       },
       "insetIndicatorList": {
-        "background": "{colors.alpha.black.500}"
+        "background": "{background.translucent.dark.default}"
       },
       "insetIndicatorButton": {
-        "background": "{colors.alpha.white.100}",
-        "hoverBackground": "{colors.alpha.white.200}",
-        "activeBackground": "{colors.alpha.white.500}"
+        "background": "{background.translucent.light.subtle}",
+        "hoverBackground": "{background.translucent.light.default}",
+        "activeBackground": "{background.translucent.light.strong}"
       },
       "closeButton": {
-        "size": "{media.size.600}",
-        "gutter": "{media.gap.200}",
-        "background": "{colors.alpha.white.100}",
-        "hoverBackground": "{colors.alpha.white.200}",
-        "color": "{text.extend.colorInverted}",
-        "hoverColor": "{text.extend.colorInverted}",
-        "borderRadius": "{controls.borderRadius.200}",
+        "size": "{dimension.size.800}",
+        "gutter": "{dimension.space.200}",
+        "background": "{background.translucent.light.subtle}",
+        "hoverBackground": "{background.translucent.light.default}",
+        "color": "{text.onBold}",
+        "hoverColor": "{text.onBold}",
+        "borderRadius": "{dimension.radius.400}",
         "focusRing": {
-          "width": "{focusRing.width}",
-          "style": "{focusRing.style}",
-          "color": "{focusRing.color}",
-          "offset": "{focusRing.offset}",
-          "shadow": "{focusRing.shadow}"
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{background.success.subtleHover}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "{shadow.200}"
         }
       },
       "closeButtonIcon": {
-        "size": "{media.icon.size.300}"
+        "size": "{dimension.size.500}"
       }
     },
     "inputgroup": {
       "extend": {
-        "borderWidth": "{form.borderWidth}",
-        "iconSize": "{form.icon.300}"
+        "borderWidth": "{dimension.borderWidth.100}",
+        "iconSize": "{dimension.size.300}"
       },
       "colorScheme": {
         "light": {
           "addon": {
-            "background": "{form.background}",
-            "borderColor": "{form.borderColor}",
-            "color": "{text.mutedColor}"
+            "background": "{background.surface.field}",
+            "borderColor": "{border.default}",
+            "color": "{text.muted}"
+          }
+        },
+        "dark": {
+          "addon": {
+            "background": "{background.surface.field}",
+            "borderColor": "{border.default}",
+            "color": "{text.muted}"
           }
         }
       },
       "addon": {
-        "borderRadius": "{form.borderRadius.200}",
-        "padding": "{form.padding.300}",
-        "minWidth": "{form.width.300}"
+        "borderRadius": "{dimension.radius.300}",
+        "padding": "{dimension.space.300}",
+        "minWidth": "{dimension.size.600}",
+        "background": "{background.surface.field}",
+        "borderColor": "{border.default}",
+        "color": "{icon.subtle}"
       }
     },
     "inputnumber": {
       "extend": {
-        "borderWidth": "{form.borderWidth}",
+        "borderWidth": "{dimension.borderWidth.100}",
         "extButton": {
-          "height": "{form.size.600}",
-          "iconSize": "{form.icon.300}"
-        }
+          "height": "{dimension.size.600}",
+          "iconSize": "{dimension.size.300}"
+        },
+        "fonts_fontFamily_base": "{typography.body.lg.fontFamily}"
       },
       "colorScheme": {
         "light": {
           "button": {
-            "background": "{content.background}",
-            "hoverBackground": "{content.hoverBackground}",
-            "activeBackground": "{transparent}",
-            "borderColor": "{form.borderColor}",
-            "hoverBorderColor": "{form.borderColor}",
-            "activeBorderColor": "{form.borderColor}",
-            "color": "{text.color}",
-            "hoverColor": "{text.hoverColor}",
-            "activeColor": "{text.color}"
+            "background": "{background.surface.raised}",
+            "hoverBackground": "{background.surface.hover.section}",
+            "activeBackground": "{background.transparent}",
+            "borderColor": "{border.default}",
+            "hoverBorderColor": "{border.default}",
+            "activeBorderColor": "{border.default}",
+            "color": "{text.default}",
+            "hoverColor": "{text.hover.default}",
+            "activeColor": "{text.default}"
+          }
+        },
+        "dark": {
+          "button": {
+            "background": "transparent",
+            "hoverBackground": "{background.surface.inverse}",
+            "activeBackground": "{background.selectedStrong}",
+            "borderColor": "{border.default}",
+            "hoverBorderColor": "{border.default}",
+            "activeBorderColor": "{border.default}",
+            "color": "{text.hover.subtle}",
+            "hoverColor": "{text.disabled}",
+            "activeColor": "{colors.solid.zinc.200}"
           }
         }
       },
       "transitionDuration": {
-        "transitionDuration": "{form.transitionDuration}"
+        "transitionDuration": "{dimension.duration.200}"
       },
       "button": {
-        "width": "{form.size.600}",
-        "borderRadius": "{form.borderRadius.200}",
-        "verticalPadding": "{form.padding.300}"
+        "width": "{dimension.size.600}",
+        "borderRadius": "{dimension.radius.300}",
+        "verticalPadding": "{dimension.space.300}"
+      },
+      "root": {
+        "transitionDuration": "{dimension.duration.200}"
       }
     },
     "inputotp": {
       "extend": {
-        "height": "{form.size.600}",
-        "borderWidth": "{form.borderWidth}"
+        "height": "{dimension.size.600}",
+        "borderWidth": "{dimension.borderWidth.100}",
+        "focusRing_invalid": "{focusRing.invalid}"
       },
       "root": {
-        "gap": "{form.gap.200}"
+        "gap": "{dimension.space.200}"
       },
       "input": {
-        "width": "{form.width.400}"
+        "width": "{dimension.size.700}",
+        "sm": {
+          "width": "{dimension.space.800}"
+        },
+        "lg": {
+          "width": "{dimension.size.700}"
+        }
       },
       "sm": {
-        "width": "0rem"
+        "width": "{dimension.space.none}"
       },
       "lg": {
-        "width": "0rem"
+        "width": "{dimension.space.none}"
       }
     },
     "inputtext": {
       "extend": {
-        "readonlyBackground": "{form.readonlyBackground}",
-        "iconSize": "{form.icon.300}",
-        "borderWidth": "{form.borderWidth}",
+        "readonlyBackground": "{background.neutral.subtleHover}",
+        "iconSize": "{dimension.size.300}",
+        "borderWidth": "{dimension.borderWidth.100}",
         "extXlg": {
-          "fontSize": "{form.xlg.fontSize}",
-          "paddingX": "{form.padding.300}",
-          "paddingY": "{form.padding.600}"
-        }
+          "fontSize": "{typography.body.md.fontSize}",
+          "paddingX": "{dimension.space.300}",
+          "paddingY": "{dimension.space.600}"
+        },
+        "focusRing_invalid": "{focusRing.invalid}",
+        "fonts_fontFamily_base": "{typography.body.lg.fontFamily}",
+        "fonts_lineHeight_250": "{typography.caption.lineHeight}"
       },
       "root": {
-        "background": "{form.background}",
-        "disabledBackground": "{form.disabledBackground}",
-        "filledBackground": "{form.filledBackground}",
-        "filledHoverBackground": "{form.filledHoverBackground}",
-        "filledFocusBackground": "{form.filledFocusBackground}",
-        "borderColor": "{form.borderColor}",
-        "hoverBorderColor": "{form.hoverBorderSecondaryColor}",
-        "focusBorderColor": "{form.focusBorderSecondaryColor}",
-        "invalidBorderColor": "{form.invalidBorderColor}",
-        "color": "{text.color}",
-        "disabledColor": "{form.disabledColor}",
-        "placeholderColor": "{form.placeholderColor}",
-        "invalidPlaceholderColor": "{form.invalidPlaceholderColor}",
+        "background": "{background.surface.field}",
+        "disabledBackground": "{background.disabled}",
+        "filledBackground": "{background.surface.field}",
+        "filledHoverBackground": "{background.surface.field}",
+        "filledFocusBackground": "{background.surface.field}",
+        "borderColor": "{border.default}",
+        "hoverBorderColor": "{border.brand}",
+        "focusBorderColor": "{border.brand}",
+        "invalidBorderColor": "{border.danger}",
+        "color": "{text.default}",
+        "disabledColor": "{text.muted}",
+        "placeholderColor": "{text.muted}",
+        "invalidPlaceholderColor": "{text.danger}",
         "shadow": "0",
-        "paddingX": "{form.padding.300}",
-        "paddingY": "{form.padding.300}",
-        "borderRadius": "{form.borderRadius.200}",
-        "transitionDuration": "{form.transitionDuration}",
+        "paddingX": "{dimension.space.300}",
+        "paddingY": "{dimension.space.300}",
+        "borderRadius": "{dimension.radius.300}",
+        "transitionDuration": "{dimension.duration.200}",
         "sm": {
-          "fontSize": "{fonts.fontSize.300}",
-          "paddingX": "{form.padding.300}",
-          "paddingY": "{form.padding.200}"
+          "fontSize": "{typography.body.md.fontSize}",
+          "paddingX": "{dimension.space.300}",
+          "paddingY": "{dimension.space.200}"
         },
         "lg": {
-          "fontSize": "{fonts.fontSize.300}",
-          "paddingX": "{form.padding.300}",
-          "paddingY": "{form.padding.400}"
+          "fontSize": "{typography.body.md.fontSize}",
+          "paddingX": "{dimension.space.300}",
+          "paddingY": "{dimension.space.400}"
         },
         "focusRing": {
-          "width": "{form.focusRing.width}",
-          "style": "{form.focusRing.style}",
-          "color": "{form.focusRing.color}",
-          "offset": "{form.focusRing.offset}",
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{focusRing.success}",
+          "offset": "{dimension.focusRing.offset}",
           "shadow": "0"
         }
       }
@@ -3185,958 +3536,1270 @@
       "extend": {
         "extOption": {
           "label": {
-            "gap": "{list.gap.100}"
+            "gap": "{dimension.space.100}"
           },
           "caption": {
-            "color": "{text.mutedColor}",
-            "stripedColor": "{text.mutedColor}"
+            "color": "{text.muted}",
+            "stripedColor": "{text.muted}"
           },
-          "gap": "{list.gap.200}"
-        }
+          "gap": "{dimension.space.200}"
+        },
+        "fonts_fontFamily_heading": "{typography.heading.lg.fontFamily}",
+        "fonts_fontSize_200": "{typography.body.sm.fontSize}"
       },
       "colorScheme": {
         "light": {
           "option": {
-            "stripedBackground": "{surface.50}"
+            "stripedBackground": "{background.neutral.subtle}"
+          }
+        },
+        "dark": {
+          "option": {
+            "stripedBackground": "{background.selected}"
           }
         }
       },
       "root": {
-        "background": "{form.background}",
-        "disabledBackground": "{form.disabledBackground}",
-        "borderColor": "{form.borderColor}",
-        "invalidBorderColor": "{form.invalidBorderColor}",
-        "color": "{form.color}",
-        "disabledColor": "{form.disabledColor}",
+        "background": "{background.surface.field}",
+        "disabledBackground": "{background.disabled}",
+        "borderColor": "{border.default}",
+        "invalidBorderColor": "{border.danger}",
+        "color": "{text.defaultHover}",
+        "disabledColor": "{text.muted}",
         "shadow": "0",
-        "borderRadius": "{form.borderRadius.200}",
-        "transitionDuration": "{form.transitionDuration}"
+        "borderRadius": "{dimension.radius.300}",
+        "transitionDuration": "{dimension.duration.200}"
       },
       "list": {
-        "padding": "{list.padding}",
-        "gap": "{list.gap.100}",
+        "padding": "{dimension.space.100}",
+        "gap": "{dimension.space.100}",
         "header": {
-          "padding": "{list.header.padding}"
+          "padding": "{dimension.space.400} {dimension.space.400} 0 {dimension.space.400}"
         }
       },
       "option": {
-        "focusBackground": "{list.option.focusBackground}",
-        "selectedBackground": "{list.option.selectedBackground}",
-        "selectedFocusBackground": "{list.option.selectedFocusBackground}",
-        "color": "{list.option.color}",
-        "focusColor": "{list.option.focusColor}",
-        "selectedColor": "{list.option.selectedColor}",
-        "selectedFocusColor": "{list.option.selectedFocusColor}",
-        "padding": "{list.option.padding}",
-        "borderRadius": "{list.option.borderRadius}"
+        "focusBackground": "{background.surface.hover.section}",
+        "selectedBackground": "{background.selected}",
+        "selectedFocusBackground": "{background.selectedStrong}",
+        "color": "{text.default}",
+        "focusColor": "{text.default}",
+        "selectedColor": "{text.onBold}",
+        "selectedFocusColor": "{text.onBold}",
+        "padding": "{dimension.space.200} {dimension.space.300}",
+        "borderRadius": "{dimension.radius.200}"
       },
       "optionGroup": {
-        "background": "{list.optionGroup.background}",
-        "color": "{list.optionGroup.color}",
-        "fontWeight": "{fonts.fontWeight.regular}",
-        "padding": "{list.option.padding}"
+        "background": "{background.surface.raised}",
+        "color": "{text.muted}",
+        "fontWeight": "{typography.body.lg.fontWeight}",
+        "padding": "{dimension.space.200} {dimension.space.300}"
       },
       "checkmark": {
-        "color": "{list.option.color}",
-        "gutterStart": "-{list.gap.200}",
-        "gutterEnd": "{list.gap.200}"
+        "color": "{text.default}",
+        "gutterStart": "-{dimension.space.200}",
+        "gutterEnd": "{dimension.space.200}"
       },
       "emptyMessage": {
-        "padding": "{list.option.padding}"
+        "padding": "{dimension.space.200} {dimension.space.300}"
       }
     },
     "megamenu": {
       "extend": {
         "extItem": {
           "caption": {
-            "color": "{text.mutedColor}",
-            "gap": "{content.gap.100}"
+            "color": "{text.muted}",
+            "gap": "{dimension.space.100}"
           }
         },
-        "iconSize": "{navigation.submenuIcon.size}"
+        "iconSize": "{typography.heading.sm.fontSize}",
+        "fonts_fontSize_200": "{typography.body.sm.fontSize}",
+        "fonts_fontSize_300": "{typography.body.md.fontSize}",
+        "fonts_fontWeight_regular": "{typography.body.lg.fontWeight}"
       },
       "colorScheme": {
         "light": {
           "root": {
-            "background": "{transparent}"
+            "background": "{background.transparent}"
+          }
+        },
+        "dark": {
+          "root": {
+            "background": "{background.transparent}"
           }
         }
       },
       "root": {
-        "borderColor": "{transparent}",
-        "borderRadius": "{content.borderRadius}",
-        "color": "{content.color}",
-        "gap": "{content.gap.100}",
-        "transitionDuration": "{form.transitionDuration}",
+        "borderColor": "{border.transparent}",
+        "borderRadius": "{dimension.radius.300}",
+        "color": "{text.default}",
+        "gap": "{dimension.space.100}",
+        "transitionDuration": "{dimension.duration.200}",
         "verticalOrientation": {
-          "padding": "{navigation.list.padding.100}",
-          "gap": "{navigation.list.gap}"
+          "padding": "{dimension.space.100}",
+          "gap": "{dimension.space.100}"
         },
         "horizontalOrientation": {
-          "padding": "{navigation.list.padding.100}",
-          "gap": "{navigation.list.gap}"
-        }
+          "padding": "{dimension.space.100}",
+          "gap": "{dimension.space.100}"
+        },
+        "background": "{background.surface.raised}"
       },
       "baseItem": {
-        "borderRadius": "{content.borderRadius}",
-        "padding": "{navigation.item.padding}"
+        "borderRadius": "{dimension.radius.300}",
+        "padding": "{dimension.space.200} {dimension.space.300}"
       },
       "item": {
-        "focusBackground": "{navigation.item.focusBackground}",
-        "activeBackground": "{navigation.item.activeBackground}",
-        "color": "{navigation.item.color}",
-        "focusColor": "{navigation.item.focusColor}",
-        "activeColor": "{navigation.item.activeColor}",
-        "padding": "{navigation.item.padding}",
-        "borderRadius": "{navigation.item.borderRadius}",
-        "gap": "{navigation.item.gap}",
+        "focusBackground": "{background.neutral.subtleHover}",
+        "activeBackground": "{background.selected}",
+        "color": "{text.default}",
+        "focusColor": "{text.default}",
+        "activeColor": "{text.onBold}",
+        "padding": "{dimension.space.200} {dimension.space.300}",
+        "borderRadius": "{dimension.radius.200}",
+        "gap": "{dimension.space.200}",
         "icon": {
-          "color": "{navigation.item.icon.color}",
-          "focusColor": "{navigation.item.icon.focusColor}",
-          "activeColor": "{navigation.item.icon.activeColor}"
+          "color": "{icon.strong}",
+          "focusColor": "{icon.strong}",
+          "activeColor": "{icon.onBold}"
         }
       },
       "overlay": {
-        "padding": "{content.padding.100}",
-        "background": "{content.background}",
-        "borderColor": "{content.borderColor}",
-        "borderRadius": "{content.borderRadius}",
-        "color": "{content.color}",
-        "shadow": "{navigation.shadow}",
-        "gap": "0rem"
+        "padding": "{dimension.space.100}",
+        "background": "{background.surface.raised}",
+        "borderColor": "{border.subtle}",
+        "borderRadius": "{dimension.radius.300}",
+        "color": "{text.default}",
+        "shadow": "{shadow.400}",
+        "gap": "{dimension.space.none}"
       },
       "submenu": {
-        "padding": "{navigation.list.padding.100}",
-        "gap": "{navigation.list.gap}"
+        "padding": "{dimension.space.100}",
+        "gap": "{dimension.space.100}"
       },
       "submenuLabel": {
-        "fontWeight": "{navigation.submenuLabel.fontWeight}",
-        "padding": "{navigation.submenuLabel.padding}",
-        "background": "{navigation.submenuLabel.background}",
-        "color": "{navigation.submenuLabel.color}"
+        "fontWeight": "{typography.body.lg.fontWeight}",
+        "padding": "{dimension.space.200} {dimension.space.300}",
+        "background": "{background.transparent}",
+        "color": "{text.muted}"
       },
       "submenuIcon": {
-        "size": "{navigation.submenuIcon.size}",
-        "color": "{navigation.submenuIcon.color}",
-        "focusColor": "{navigation.submenuIcon.focusColor}",
-        "activeColor": "{navigation.submenuIcon.activeColor}"
+        "size": "{typography.heading.sm.fontSize}",
+        "color": "{icon.strongMuted}",
+        "focusColor": "{icon.strongMuted}",
+        "activeColor": "{icon.onBold}"
       },
       "separator": {
-        "borderColor": "{content.borderColor}"
+        "borderColor": "{border.subtle}"
       },
       "mobileButton": {
-        "borderRadius": "{navigation.item.borderRadius}",
-        "size": "{controls.iconOnly.600}",
-        "color": "{text.color}",
-        "hoverColor": "{text.hoverColor}",
-        "hoverBackground": "{content.hoverBackground}",
+        "borderRadius": "{dimension.radius.200}",
+        "size": "{dimension.size.500}",
+        "color": "{text.default}",
+        "hoverColor": "{text.hover.default}",
+        "hoverBackground": "{background.surface.hover.section}",
         "focusRing": {
-          "width": "{focusRing.width}",
-          "style": "{focusRing.style}",
-          "color": "{focusRing.color}",
-          "offset": "{focusRing.offset}",
-          "shadow": "{focusRing.shadow}"
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{background.success.subtleHover}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "{shadow.200}"
         }
       }
     },
     "menu": {
       "extend": {
-        "paddingX": "0.25rem",
-        "iconSize": "{navigation.submenuIcon.size}",
-        "paddingY": "0.25rem",
+        "paddingX": "{dimension.space.100}",
+        "iconSize": "{typography.heading.sm.fontSize}",
+        "paddingY": "{dimension.space.100}",
         "extItem": {
           "caption": {
-            "gap": "{content.gap.100}"
+            "gap": "{dimension.space.100}"
           },
-          "activeBackground": "{navigation.item.activeBackground}",
-          "activeColor": "{navigation.item.activeColor}"
-        }
+          "activeBackground": "{background.selected}",
+          "activeColor": "{text.onBold}"
+        },
+        "fonts_fontFamily_base": "{typography.body.lg.fontFamily}",
+        "fonts_fontFamily_heading": "{typography.heading.lg.fontFamily}",
+        "fonts_fontSize_200": "{typography.body.sm.fontSize}",
+        "fonts_fontSize_300": "{typography.body.md.fontSize}",
+        "fonts_fontWeight_regular": "{typography.body.lg.fontWeight}",
+        "fonts_lineHeight_400": "{typography.body.sm.lineHeight}"
       },
       "colorScheme": {
         "light": {
           "extend": {
             "extItem": {
               "caption": {
-                "color": "{text.mutedColor}"
+                "color": "{text.muted}"
+              },
+              "icon": {
+                "activeColor": "{icon.onBold}"
+              }
+            }
+          },
+          "root": {
+            "background": "{background.surface.raised}",
+            "borderColor": "{border.subtle}",
+            "color": "{text.default}"
+          },
+          "item": {
+            "focusBackground": "{background.neutral.subtleHover}",
+            "color": "{text.default}",
+            "focusColor": "{text.default}",
+            "icon": {
+              "color": "{icon.strong}",
+              "focusColor": "{icon.strong}"
+            }
+          }
+        },
+        "dark": {
+          "extend": {
+            "extItem": {
+              "caption": {
+                "color": "{text.muted}"
               },
               "icon": {
-                "activeColor": "{navigation.item.icon.activeColor}"
+                "activeColor": "{icon.onBold}"
               }
             }
           },
           "root": {
-            "background": "{content.background}",
-            "borderColor": "{content.borderColor}",
-            "color": "{content.color}"
+            "background": "{background.surface.raised}",
+            "borderColor": "{border.subtle}",
+            "color": "{text.default}"
           },
           "item": {
-            "focusBackground": "{navigation.item.focusBackground}",
-            "color": "{navigation.item.color}",
-            "focusColor": "{navigation.item.focusColor}",
+            "focusBackground": "{background.neutral.subtleHover}",
+            "color": "{text.default}",
+            "focusColor": "{text.default}",
             "icon": {
-              "color": "{navigation.item.icon.color}",
-              "focusColor": "{navigation.item.icon.focusColor}"
+              "color": "{icon.strong}",
+              "focusColor": "{icon.strong}"
             }
           }
         }
       },
       "root": {
-        "borderRadius": "{content.borderRadius}",
-        "shadow": "{navigation.shadow}",
-        "transitionDuration": "{form.transitionDuration}"
+        "borderRadius": "{dimension.radius.300}",
+        "shadow": "{shadow.400}",
+        "transitionDuration": "{dimension.duration.200}",
+        "background": "{background.surface.raised}",
+        "borderColor": "{border.subtle}",
+        "color": "{text.default}"
       },
       "list": {
-        "padding": "{navigation.list.padding.100}",
-        "gap": "{navigation.list.gap}"
+        "padding": "{dimension.space.100}",
+        "gap": "{dimension.space.100}"
       },
       "submenuLabel": {
-        "padding": "{navigation.submenuLabel.padding}",
-        "fontWeight": "{fonts.fontWeight.regular}",
-        "background": "{navigation.submenuLabel.background}",
-        "color": "{navigation.submenuLabel.color}"
+        "padding": "{dimension.space.200} {dimension.space.300}",
+        "fontWeight": "{typography.body.lg.fontWeight}",
+        "background": "{background.transparent}",
+        "color": "{text.muted}"
       },
       "separator": {
-        "borderColor": "{content.borderColor}"
+        "borderColor": "{border.subtle}"
       },
       "item": {
-        "padding": "{navigation.item.padding}",
-        "borderRadius": "{navigation.item.borderRadius}",
-        "gap": "{navigation.item.gap}"
+        "padding": "{dimension.space.200} {dimension.space.300}",
+        "borderRadius": "{dimension.radius.200}",
+        "gap": "{dimension.space.200}",
+        "focusBackground": "{background.surface.hover.section}",
+        "color": "{text.default}",
+        "focusColor": "{text.default}",
+        "icon": {
+          "color": "{icon.subtle}",
+          "focusColor": "{icon.default}"
+        }
       }
     },
     "menubar": {
       "extend": {
-        "iconSize": "{navigation.submenuIcon.size}",
+        "iconSize": "{typography.heading.sm.fontSize}",
         "extItem": {
           "caption": {
-            "color": "{text.mutedColor}",
-            "gap": "{content.padding.100}"
+            "color": "{text.muted}",
+            "gap": "{dimension.space.100}"
           }
         },
         "extSubmenuLabel": {
-          "padding": "{navigation.submenuLabel.padding}",
-          "fontWeight": "{fonts.fontWeight.demibold}",
-          "background": "{navigation.submenuLabel.background}",
-          "color": "{navigation.submenuLabel.color}"
-        }
+          "padding": "{dimension.space.200} {dimension.space.300}",
+          "fontWeight": "{typography.heading.lg.fontWeight}",
+          "background": "{background.transparent}",
+          "color": "{text.muted}"
+        },
+        "fonts_fontFamily_base": "{typography.body.lg.fontFamily}",
+        "fonts_fontSize_200": "{typography.body.sm.fontSize}",
+        "fonts_fontSize_300": "{typography.body.md.fontSize}",
+        "fonts_fontWeight_regular": "{typography.body.lg.fontWeight}"
       },
       "colorScheme": {
         "light": {
           "root": {
-            "background": "{transparent}"
+            "background": "{background.transparent}"
+          }
+        },
+        "dark": {
+          "root": {
+            "background": "{background.transparent}"
           }
         }
       },
       "root": {
-        "borderColor": "{transparent}",
-        "borderRadius": "{navigation.item.borderRadius}",
-        "color": "{content.color}",
-        "gap": "{content.padding.100}",
-        "padding": "{navigation.list.padding.100}",
-        "transitionDuration": "{form.transitionDuration}"
+        "borderColor": "{border.transparent}",
+        "borderRadius": "{dimension.radius.200}",
+        "color": "{text.default}",
+        "gap": "{dimension.space.100}",
+        "padding": "{dimension.space.100}",
+        "transitionDuration": "{dimension.duration.200}",
+        "background": "{background.surface.raised}"
       },
       "baseItem": {
-        "borderRadius": "{navigation.item.borderRadius}",
-        "padding": "{navigation.item.padding}"
+        "borderRadius": "{dimension.radius.200}",
+        "padding": "{dimension.space.200} {dimension.space.300}"
       },
       "item": {
-        "focusBackground": "{navigation.item.focusBackground}",
-        "activeBackground": "{navigation.item.activeBackground}",
-        "color": "{navigation.item.color}",
-        "focusColor": "{navigation.item.focusColor}",
-        "activeColor": "{navigation.item.activeColor}",
-        "padding": "{navigation.item.padding}",
-        "borderRadius": "{navigation.item.borderRadius}",
-        "gap": "{navigation.item.gap}",
+        "focusBackground": "{background.neutral.subtleHover}",
+        "activeBackground": "{background.selected}",
+        "color": "{text.default}",
+        "focusColor": "{text.default}",
+        "activeColor": "{text.onBold}",
+        "padding": "{dimension.space.200} {dimension.space.300}",
+        "borderRadius": "{dimension.radius.200}",
+        "gap": "{dimension.space.200}",
         "icon": {
-          "color": "{navigation.item.icon.color}",
-          "focusColor": "{navigation.item.icon.focusColor}",
-          "activeColor": "{navigation.item.icon.activeColor}"
+          "color": "{icon.strong}",
+          "focusColor": "{icon.strong}",
+          "activeColor": "{icon.onBold}"
         }
       },
       "submenu": {
-        "padding": "{navigation.list.padding.100}",
-        "gap": "{navigation.list.gap}",
-        "background": "{content.background}",
-        "borderColor": "{content.borderColor}",
-        "borderRadius": "{content.borderRadius}",
-        "shadow": "{navigation.shadow}",
-        "mobileIndent": "{navigation.padding.200}",
+        "padding": "{dimension.space.100}",
+        "gap": "{dimension.space.100}",
+        "background": "{background.surface.raised}",
+        "borderColor": "{border.subtle}",
+        "borderRadius": "{dimension.radius.300}",
+        "shadow": "{shadow.400}",
+        "mobileIndent": "{dimension.space.300}",
         "icon": {
-          "size": "{navigation.submenuIcon.size}",
-          "color": "{navigation.submenuIcon.color}",
-          "focusColor": "{navigation.submenuIcon.focusColor}",
-          "activeColor": "{navigation.submenuIcon.activeColor}"
+          "size": "{typography.heading.sm.fontSize}",
+          "color": "{icon.strongMuted}",
+          "focusColor": "{icon.strongMuted}",
+          "activeColor": "{icon.onBold}"
         }
       },
       "separator": {
-        "borderColor": "{content.borderColor}"
+        "borderColor": "{border.subtle}"
       },
       "mobileButton": {
-        "borderRadius": "{navigation.item.borderRadius}",
-        "size": "{controls.iconOnly.600}",
-        "color": "{text.color}",
-        "hoverColor": "{text.hoverColor}",
-        "hoverBackground": "{content.hoverBackground}",
+        "borderRadius": "{dimension.radius.200}",
+        "size": "{dimension.size.500}",
+        "color": "{text.default}",
+        "hoverColor": "{text.hover.default}",
+        "hoverBackground": "{background.surface.hover.section}",
         "focusRing": {
-          "width": "{focusRing.width}",
-          "style": "{focusRing.style}",
-          "color": "{focusRing.color}",
-          "offset": "{focusRing.offset}",
-          "shadow": "{focusRing.shadow}"
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{background.success.subtleHover}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "{shadow.200}"
         }
       }
     },
     "message": {
       "extend": {
-        "width": "{messages.width}",
+        "width": "{dimension.overlayWidth.base}",
         "extText": {
-          "gap": "{feedback.gap.100}"
+          "gap": "{dimension.space.100}"
         },
         "extInfo": {
-          "color": "{info.500}",
+          "color": "{text.info}",
           "closeButton": {
-            "color": "{info.500}",
-            "borderColor": "{info.500}"
+            "color": "{text.info}",
+            "borderColor": "{border.info}"
           },
           "caption": {
-            "color": "{text.color}"
+            "color": "{text.default}"
           }
         },
         "extAccentLine": {
-          "width": "{feedback.width.200}"
+          "width": "{dimension.size.150}"
         },
         "extCloseButton": {
-          "width": "{feedback.width.100}"
+          "width": "{dimension.size.100}"
         },
         "extSuccess": {
-          "color": "{success.500}",
+          "color": "{text.success}",
           "closeButton": {
-            "color": "{success.500}",
-            "borderColor": "{success.500}"
+            "color": "{text.success}",
+            "borderColor": "{border.checked}"
           },
           "caption": {
-            "color": "{text.color}"
+            "color": "{text.default}"
           }
         },
         "extWarn": {
-          "color": "{warn.500}",
+          "color": "{text.warning}",
           "closeButton": {
-            "color": "{warn.500}",
-            "borderColor": "{warn.500}"
+            "color": "{text.warning}",
+            "borderColor": "{border.warning}"
           },
           "caption": {
-            "color": "{text.color}"
+            "color": "{text.default}"
           }
         },
         "extError": {
-          "color": "{error.500}",
+          "color": "{text.danger}",
           "closeButton": {
-            "color": "{error.500}",
-            "borderColor": "{error.500}"
+            "color": "{text.danger}",
+            "borderColor": "{border.danger}"
           },
           "caption": {
-            "color": "{text.color}"
+            "color": "{text.default}"
           }
-        }
+        },
+        "fonts_fontFamily_base": "{typography.body.lg.fontFamily}",
+        "fonts_fontSize_200": "{typography.body.sm.fontSize}",
+        "fonts_fontWeight_regular": "{typography.body.lg.fontWeight}",
+        "fonts_lineHeight_250": "{typography.caption.lineHeight}"
       },
       "colorScheme": {
         "light": {
           "success": {
-            "background": "{success.50}",
-            "borderColor": "{success.500}",
-            "color": "{text.color}",
+            "background": "{background.brand.subtle}",
+            "borderColor": "{border.checked}",
+            "color": "{text.default}",
             "shadow": "none",
             "outlined": {
-              "color": "{text.color}",
-              "borderColor": "{success.500}"
+              "color": "{text.default}",
+              "borderColor": "{border.checked}"
             },
             "closeButton": {
-              "hoverBackground": "{success.200}",
+              "hoverBackground": "{background.success.subtleHover}",
               "focusRing": {
-                "color": "{focusRing.color}",
-                "shadow": "{focusRing.shadow}"
+                "color": "{background.success.subtleHover}",
+                "shadow": "{shadow.200}"
               }
             },
             "simple": {
-              "color": "{text.color}"
+              "color": "{text.default}"
             }
           },
           "outlined": {
             "root": {
-              "borderWidth": "0rem"
+              "borderWidth": "{dimension.space.none}"
             },
             "closeButton": {
-              "hoverBackground": "{transparent}",
+              "hoverBackground": "{background.transparent}",
               "focusRing": {
-                "color": "{focusRing.color}",
-                "shadow": "{focusRing.shadow}"
+                "color": "{background.success.subtleHover}",
+                "shadow": "{shadow.200}"
               }
             },
             "outlined": {
-              "color": "{transparent}",
-              "borderColor": "{transparent}"
+              "color": "{text.transparent}",
+              "borderColor": "{border.transparent}"
             },
             "simple": {
-              "color": "{transparent}"
+              "color": "{text.transparent}"
             }
           },
           "simple": {
             "content": {
-              "padding": "0rem"
+              "padding": "{dimension.space.none}"
             }
           },
           "warn": {
-            "background": "{warn.50}",
-            "borderColor": "{warn.500}",
-            "color": "{text.color}",
+            "background": "{background.warning.subtle}",
+            "borderColor": "{border.warning}",
+            "color": "{text.default}",
             "shadow": "none",
             "outlined": {
-              "color": "{text.color}",
-              "borderColor": "{warn.500}"
+              "color": "{text.default}",
+              "borderColor": "{border.warning}"
             },
             "closeButton": {
-              "hoverBackground": "{warn.200}",
+              "hoverBackground": "{background.warning.subtleHover}",
               "focusRing": {
-                "color": "{focusRing.color}",
-                "shadow": "{focusRing.shadow}"
+                "color": "{background.success.subtleHover}",
+                "shadow": "{shadow.200}"
               }
             },
             "simple": {
-              "color": "{text.color}"
+              "color": "{text.default}"
             }
           },
           "error": {
-            "background": "{error.50}",
-            "borderColor": "{error.500}",
-            "color": "{text.color}",
+            "background": "{background.danger.subtle}",
+            "borderColor": "{border.danger}",
+            "color": "{text.default}",
             "shadow": "none",
             "outlined": {
-              "color": "{text.color}",
-              "borderColor": "{error.500}"
+              "color": "{text.default}",
+              "borderColor": "{border.danger}"
             },
             "closeButton": {
-              "hoverBackground": "{error.200}",
+              "hoverBackground": "{background.danger.subtleHover}",
               "focusRing": {
-                "color": "{focusRing.color}",
-                "shadow": "{focusRing.shadow}"
+                "color": "{background.success.subtleHover}",
+                "shadow": "{shadow.200}"
               }
             },
             "simple": {
-              "color": "{text.color}"
+              "color": "{text.default}"
             }
           },
           "secondary": {
-            "borderColor": "{transparent}",
+            "borderColor": "{border.transparent}",
             "shadow": "none",
             "closeButton": {
-              "hoverBackground": "{transparent}",
+              "hoverBackground": "{background.transparent}",
               "focusRing": {
-                "color": "{focusRing.color}",
-                "shadow": "{focusRing.shadow}"
+                "color": "{background.success.subtleHover}",
+                "shadow": "{shadow.200}"
               }
             },
             "simple": {
-              "color": "{transparent}"
+              "color": "{text.transparent}"
             },
             "outlined": {
-              "color": "{transparent}",
-              "borderColor": "{transparent}"
-            }
+              "color": "{text.transparent}",
+              "borderColor": "{border.transparent}"
+            },
+            "background": "{background.neutral.subtleHover}",
+            "color": "{text.subtle}"
           },
           "contrast": {
-            "borderColor": "{transparent}",
+            "borderColor": "{border.transparent}",
             "shadow": "none",
             "closeButton": {
-              "hoverBackground": "{transparent}",
+              "hoverBackground": "{background.transparent}",
               "focusRing": {
-                "color": "{focusRing.color}",
-                "shadow": "{focusRing.shadow}"
+                "color": "{background.success.subtleHover}",
+                "shadow": "{shadow.200}"
               }
             },
             "simple": {
-              "color": "{transparent}"
+              "color": "{text.transparent}"
             },
             "outlined": {
-              "color": "{transparent}",
-              "borderColor": "{transparent}"
-            }
+              "color": "{text.transparent}",
+              "borderColor": "{border.transparent}"
+            },
+            "background": "{background.selected}",
+            "color": "{colors.solid.zinc.50}"
           },
           "info": {
-            "background": "{info.50}",
-            "borderColor": "{info.500}",
-            "color": "{text.color}",
+            "background": "{background.info.subtle}",
+            "borderColor": "{border.info}",
+            "color": "{text.default}",
             "shadow": "none",
             "closeButton": {
-              "hoverBackground": "{info.200}",
+              "hoverBackground": "{background.info.subtleHover}",
+              "focusRing": {
+                "color": "{background.success.subtleHover}",
+                "shadow": "{shadow.200}"
+              }
+            },
+            "outlined": {
+              "color": "{text.default}",
+              "borderColor": "{border.info}"
+            },
+            "simple": {
+              "color": "{text.default}"
+            }
+          }
+        },
+        "dark": {
+          "info": {
+            "background": "color-mix(in srgb, {background.info.bold}, transparent 84%)",
+            "borderColor": "color-mix(in srgb, {colors.solid.blue.700}, transparent 64%)",
+            "color": "{colors.solid.blue.500}",
+            "shadow": "0px 4px 8px 0px color-mix(in srgb, {background.info.bold}, transparent 96%)",
+            "closeButton": {
+              "hoverBackground": "{colors.alpha.white.50}",
+              "focusRing": {
+                "color": "{focusRing.info}",
+                "shadow": "none"
+              }
+            },
+            "outlined": {
+              "color": "{colors.solid.blue.500}",
+              "borderColor": "{colors.solid.blue.500}"
+            },
+            "simple": {
+              "color": "{colors.solid.blue.500}"
+            }
+          },
+          "success": {
+            "background": "color-mix(in srgb, {background.brand.bold}, transparent 84%)",
+            "borderColor": "color-mix(in srgb, {colors.solid.green.700}, transparent 64%)",
+            "color": "{colors.solid.green.500}",
+            "shadow": "0px 4px 8px 0px color-mix(in srgb, {background.brand.bold}, transparent 96%)",
+            "closeButton": {
+              "hoverBackground": "{colors.alpha.white.50}",
               "focusRing": {
-                "color": "{focusRing.color}",
-                "shadow": "{focusRing.shadow}"
+                "color": "{focusRing.success}",
+                "shadow": "none"
+              }
+            },
+            "outlined": {
+              "color": "{colors.solid.green.500}",
+              "borderColor": "{border.checked}"
+            },
+            "simple": {
+              "color": "{colors.solid.green.500}"
+            }
+          },
+          "warn": {
+            "background": "color-mix(in srgb, {background.warning.bold}, transparent 84%)",
+            "borderColor": "color-mix(in srgb, {colors.solid.yellow.700}, transparent 64%)",
+            "color": "{colors.solid.yellow.500}",
+            "shadow": "0px 4px 8px 0px color-mix(in srgb, {background.warning.bold}, transparent 96%)",
+            "closeButton": {
+              "hoverBackground": "{colors.alpha.white.50}",
+              "focusRing": {
+                "color": "{focusRing.warning}",
+                "shadow": "none"
+              }
+            },
+            "outlined": {
+              "color": "{colors.solid.yellow.500}",
+              "borderColor": "{colors.solid.yellow.500}"
+            },
+            "simple": {
+              "color": "{colors.solid.yellow.500}"
+            }
+          },
+          "error": {
+            "background": "color-mix(in srgb, {background.danger.bold}, transparent 84%)",
+            "borderColor": "color-mix(in srgb, {colors.solid.red.700}, transparent 64%)",
+            "color": "{colors.solid.red.500}",
+            "shadow": "0px 4px 8px 0px color-mix(in srgb, {background.danger.bold}, transparent 96%)",
+            "closeButton": {
+              "hoverBackground": "{colors.alpha.white.50}",
+              "focusRing": {
+                "color": "{focusRing.invalid}",
+                "shadow": "none"
+              }
+            },
+            "outlined": {
+              "color": "{colors.solid.red.500}",
+              "borderColor": "{colors.solid.red.500}"
+            },
+            "simple": {
+              "color": "{colors.solid.red.500}"
+            }
+          },
+          "secondary": {
+            "background": "{background.surface.inverse}",
+            "borderColor": "{border.default}",
+            "color": "{text.disabled}",
+            "shadow": "0px 4px 8px 0px color-mix(in srgb, {background.neutral.bold}, transparent 96%)",
+            "closeButton": {
+              "hoverBackground": "{background.selectedStrong}",
+              "focusRing": {
+                "color": "{text.disabled}",
+                "shadow": "none"
+              }
+            },
+            "outlined": {
+              "color": "{text.hover.subtle}",
+              "borderColor": "{border.neutral}"
+            },
+            "simple": {
+              "color": "{text.hover.subtle}"
+            }
+          },
+          "contrast": {
+            "background": "{background.surface.raised}",
+            "borderColor": "{border.strong}",
+            "color": "{text.defaultHover}",
+            "shadow": "0px 4px 8px 0px color-mix(in srgb, {background.surface.inverseStrong}, transparent 96%)",
+            "closeButton": {
+              "hoverBackground": "{background.neutral.subtleHover}",
+              "focusRing": {
+                "color": "{text.defaultHover}",
+                "shadow": "none"
               }
             },
             "outlined": {
-              "color": "{text.color}",
-              "borderColor": "{info.500}"
+              "color": "{text.onBold}",
+              "borderColor": "{colors.alpha.white.1000}"
             },
             "simple": {
-              "color": "{text.color}"
+              "color": "{text.onBold}"
             }
           }
         }
       },
       "root": {
-        "borderRadius": "{content.borderRadius}",
-        "borderWidth": "{feedback.width.100}",
-        "transitionDuration": "{feedback.transitionDuration}"
+        "borderRadius": "{dimension.radius.300}",
+        "borderWidth": "{dimension.size.100}",
+        "transitionDuration": "{dimension.duration.200}"
       },
       "content": {
-        "padding": "{feedback.padding.200}",
-        "gap": "{feedback.gap.400}",
+        "padding": "{dimension.space.400}",
+        "gap": "{dimension.space.400}",
         "sm": {
-          "padding": "{feedback.padding.200}"
+          "padding": "{dimension.space.400}"
         },
         "lg": {
-          "padding": "{feedback.padding.200}"
+          "padding": "{dimension.space.400}"
         }
       },
       "text": {
-        "fontSize": "{fonts.fontSize.300}",
-        "fontWeight": "{fonts.fontWeight.bold}",
+        "fontSize": "{typography.body.md.fontSize}",
+        "fontWeight": "{typography.heading.xl.fontWeight}",
         "sm": {
-          "fontSize": "{fonts.fontSize.300}"
+          "fontSize": "{typography.body.md.fontSize}"
         },
         "lg": {
-          "fontSize": "{fonts.fontSize.300}"
+          "fontSize": "{typography.body.md.fontSize}"
         }
       },
       "icon": {
-        "size": "{feedback.icon.size.500}",
+        "size": "{dimension.size.550}",
         "sm": {
-          "size": "{feedback.icon.size.500}"
+          "size": "{dimension.size.550}"
         },
         "lg": {
-          "size": "{feedback.icon.size.500}"
+          "size": "{dimension.size.550}"
         }
       },
       "closeButton": {
-        "width": "{controls.iconOnly.600}",
-        "height": "{controls.iconOnly.600}",
-        "borderRadius": "{controls.borderRadius.100}",
+        "width": "{dimension.size.500}",
+        "height": "{dimension.size.500}",
+        "borderRadius": "{dimension.radius.300}",
         "focusRing": {
-          "width": "{focusRing.width}",
-          "style": "{focusRing.style}",
-          "offset": "{focusRing.offset}"
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "offset": "{dimension.focusRing.offset}"
         }
       },
       "closeIcon": {
-        "size": "{feedback.icon.size.200}",
+        "size": "{dimension.size.300}",
         "sm": {
-          "size": "{feedback.icon.size.200}"
+          "size": "{dimension.size.300}"
         },
         "lg": {
-          "size": "{feedback.icon.size.200}"
+          "size": "{dimension.size.300}"
+        }
+      },
+      "outlined": {
+        "root": {
+          "borderWidth": "1px"
+        }
+      },
+      "simple": {
+        "content": {
+          "padding": "0"
         }
       }
     },
     "metergroup": {
       "extend": {
         "extLabel": {
-          "color": "{text.mutedColor}"
-        }
+          "color": "{text.muted}"
+        },
+        "fonts_fontFamily_base": "{typography.body.lg.fontFamily}",
+        "fonts_fontSize_200": "{typography.body.sm.fontSize}",
+        "fonts_fontWeight_medium": "{typography.label.lg.fontWeight}",
+        "fonts_fontWeight_regular": "{typography.body.lg.fontWeight}",
+        "fonts_lineHeight_200": "{typography.caption.lineHeight}",
+        "text_color": "{text.default}"
       },
       "root": {
-        "borderRadius": "{content.borderRadius}",
-        "gap": "{feedback.gap.300}"
+        "borderRadius": "{dimension.radius.300}",
+        "gap": "{dimension.space.300}"
       },
       "meters": {
-        "size": "{feedback.height.100}",
-        "background": "{content.borderColor}"
+        "size": "{dimension.size.200}",
+        "background": "{background.disabled}"
       },
       "label": {
-        "gap": "{feedback.gap.100}"
+        "gap": "{dimension.space.100}"
       },
       "labelMarker": {
-        "size": "{feedback.icon.size.100}"
+        "size": "{dimension.size.200}"
       },
       "labelIcon": {
-        "size": "{feedback.icon.size.200}"
+        "size": "{dimension.size.300}"
       },
       "labelList": {
-        "verticalGap": "{feedback.gap.200}",
-        "horizontalGap": "{feedback.gap.300}"
+        "verticalGap": "{dimension.space.200}",
+        "horizontalGap": "{dimension.space.300}"
       }
     },
     "multiselect": {
       "colorScheme": {
         "overlay": {
-          "background": "{overlay.select.background}",
-          "borderColor": "{overlay.select.borderColor}",
-          "color": "{overlay.select.color}"
+          "background": "{background.surface.raised}",
+          "borderColor": "{border.subtle}",
+          "color": "{text.default}"
         },
         "option": {
-          "focusBackground": "{list.option.focusBackground}",
-          "selectedBackground": "{list.option.selectedBackground}",
-          "selectedFocusBackground": "{list.option.selectedFocusBackground}",
-          "color": "{list.option.color}",
-          "focusColor": "{list.option.focusColor}",
-          "selectedColor": "{list.option.selectedColor}",
-          "selectedFocusColor": "{list.option.selectedFocusColor}"
+          "focusBackground": "{background.surface.hover.section}",
+          "selectedBackground": "{background.selected}",
+          "selectedFocusBackground": "{background.selectedStrong}",
+          "color": "{text.default}",
+          "focusColor": "{text.default}",
+          "selectedColor": "{text.onBold}",
+          "selectedFocusColor": "{text.onBold}"
         },
         "root": {
-          "background": "{form.background}",
-          "disabledBackground": "{form.disabledBackground}",
-          "filledBackground": "{form.filledBackground}",
-          "filledHoverBackground": "{form.filledHoverBackground}",
-          "filledFocusBackground": "{form.filledFocusBackground}",
-          "borderColor": "{form.borderColor}",
-          "hoverBorderColor": "{form.hoverBorderSecondaryColor}",
-          "focusBorderColor": "{form.focusBorderSecondaryColor}",
-          "invalidBorderColor": "{form.invalidBorderColor}",
-          "color": "{form.color}",
-          "disabledColor": "{form.disabledColor}",
-          "placeholderColor": "{form.placeholderColor}",
-          "invalidPlaceholderColor": "{form.invalidPlaceholderColor}",
+          "background": "{background.surface.field}",
+          "disabledBackground": "{background.disabled}",
+          "filledBackground": "{background.surface.field}",
+          "filledHoverBackground": "{background.surface.field}",
+          "filledFocusBackground": "{background.surface.field}",
+          "borderColor": "{border.default}",
+          "hoverBorderColor": "{border.brand}",
+          "focusBorderColor": "{border.brand}",
+          "invalidBorderColor": "{border.danger}",
+          "color": "{text.defaultHover}",
+          "disabledColor": "{text.muted}",
+          "placeholderColor": "{text.muted}",
+          "invalidPlaceholderColor": "{text.danger}",
           "focusRing": {
-            "color": "{form.focusRing.color}"
+            "color": "{background.success.subtleHover}"
           }
         },
         "dropdown": {
-          "color": "{form.floatLabelColor}"
+          "color": "{text.muted}"
         },
         "optionGroup": {
-          "background": "{list.optionGroup.background}",
-          "color": "{list.optionGroup.color}"
+          "background": "{background.surface.raised}",
+          "color": "{text.muted}"
         },
         "clearIcon": {
-          "color": "{form.floatLabelColor}"
+          "color": "{icon.subtle}"
         }
       },
       "extend": {
-        "paddingX": "0.3571rem",
-        "paddingY": "0.3571rem",
-        "borderWidth": "{form.borderWidth}",
-        "iconSize": "{form.icon.300}",
-        "width": "{form.width}",
-        "readonlyBackground": "{form.readonlyBackground}"
+        "paddingX": "{dimension.space.100}",
+        "paddingY": "{dimension.space.100}",
+        "borderWidth": "{dimension.borderWidth.100}",
+        "iconSize": "{dimension.size.300}",
+        "width": "{dimension.overlayWidth.narrow}",
+        "readonlyBackground": "{background.neutral.subtleHover}"
       },
       "root": {
         "shadow": "0",
-        "paddingX": "{form.paddingX}",
-        "paddingY": "{form.paddingY}",
-        "borderRadius": "{form.borderRadius.200}",
-        "transitionDuration": "{form.transitionDuration}",
+        "paddingX": "{dimension.space.400}",
+        "paddingY": "{dimension.space.400}",
+        "borderRadius": "{dimension.radius.300}",
+        "transitionDuration": "{dimension.duration.200}",
         "sm": {
-          "fontSize": "{fonts.fontSize.300}",
-          "paddingX": "{form.padding.200}",
-          "paddingY": "{form.padding.200}"
+          "fontSize": "{typography.body.md.fontSize}",
+          "paddingX": "{dimension.space.200}",
+          "paddingY": "{dimension.space.200}"
         },
         "lg": {
-          "fontSize": "{fonts.fontSize.300}",
-          "paddingX": "{form.padding.400}",
-          "paddingY": "{form.padding.400}"
+          "fontSize": "{typography.body.md.fontSize}",
+          "paddingX": "{dimension.space.400}",
+          "paddingY": "{dimension.space.400}"
         },
         "focusRing": {
-          "width": "{form.focusRing.width}",
-          "style": "{form.focusRing.style}",
-          "offset": "{form.focusRing.offset}",
-          "shadow": "0"
-        }
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "0",
+          "color": "{focusRing.default}"
+        },
+        "background": "{background.surface.field}",
+        "disabledBackground": "{background.disabled}",
+        "filledBackground": "{background.surface.field}",
+        "filledHoverBackground": "{background.surface.field}",
+        "filledFocusBackground": "{background.surface.field}",
+        "borderColor": "{border.default}",
+        "hoverBorderColor": "{border.brand}",
+        "focusBorderColor": "{border.brand}",
+        "invalidBorderColor": "{border.danger}",
+        "color": "{text.default}",
+        "disabledColor": "{text.muted}",
+        "placeholderColor": "{text.placeholder}",
+        "invalidPlaceholderColor": "{text.danger}"
       },
       "dropdown": {
-        "width": "{form.width.300}"
+        "width": "{dimension.size.600}",
+        "color": "{icon.subtle}"
       },
       "overlay": {
-        "borderRadius": "{overlay.select.borderRadius}",
-        "shadow": "{overlay.select.shadow}"
+        "borderRadius": "{dimension.radius.300}",
+        "shadow": "{shadow.400}",
+        "background": "{background.surface.overlay}",
+        "borderColor": "{border.subtle}",
+        "color": "{text.default}"
       },
       "list": {
-        "padding": "{list.padding}",
+        "padding": "{dimension.space.100}",
         "header": {
-          "padding": "{list.header.padding}"
+          "padding": "{dimension.space.400} {dimension.space.400} 0 {dimension.space.400}"
         },
-        "gap": "{list.gap.100}"
+        "gap": "{dimension.space.100}"
       },
       "chip": {
-        "borderRadius": "{form.borderRadius.100}"
+        "borderRadius": "{dimension.radius.200}"
       },
       "option": {
-        "padding": "{list.option.padding}",
-        "borderRadius": "{list.option.borderRadius}",
-        "gap": "{list.gap.200}"
+        "padding": "{dimension.space.200} {dimension.space.300}",
+        "borderRadius": "{dimension.radius.200}",
+        "gap": "{dimension.space.200}",
+        "focusBackground": "{background.surface.hover.section}",
+        "selectedBackground": "{background.selected}",
+        "selectedFocusBackground": "{background.selectedStrong}",
+        "color": "{text.default}",
+        "focusColor": "{text.default}",
+        "selectedColor": "{text.onBold}",
+        "selectedFocusColor": "{text.onBold}"
       },
       "optionGroup": {
-        "fontWeight": "{fonts.fontWeight.demibold}",
-        "padding": "{list.optionGroup.padding}"
+        "fontWeight": "{typography.heading.lg.fontWeight}",
+        "padding": "{dimension.space.200} {dimension.space.300}",
+        "background": "{background.surface.raised}",
+        "color": "{text.muted}"
       },
       "emptyMessage": {
-        "padding": "{list.option.padding}"
+        "padding": "{dimension.space.200} {dimension.space.300}"
+      },
+      "clearIcon": {
+        "color": "{icon.subtle}"
       }
     },
     "paginator": {
       "root": {
-        "padding": "0 {data.padding.200}",
-        "gap": "{data.gap.200}",
-        "borderRadius": "{content.borderRadius}",
-        "background": "{transparent}",
-        "color": "{content.color}",
-        "transitionDuration": "{data.transitionDuration}"
+        "padding": "0 {dimension.space.200}",
+        "gap": "{dimension.space.200}",
+        "borderRadius": "{dimension.radius.300}",
+        "background": "{background.transparent}",
+        "color": "{text.default}",
+        "transitionDuration": "{dimension.duration.200}"
       },
       "currentPageReport": {
-        "color": "{text.mutedColor}"
+        "color": "{text.muted}"
       },
       "navButton": {
-        "background": "{transparent}",
-        "hoverBackground": "{content.hoverBackground}",
-        "selectedBackground": "{highlight.background}",
-        "color": "{text.color}",
-        "hoverColor": "{text.hoverColor}",
-        "selectedColor": "{text.extend.colorInverted}",
-        "width": "{data.icon.size.700}",
-        "height": "{data.icon.size.700}",
-        "borderRadius": "{content.borderRadius}",
+        "background": "{background.transparent}",
+        "hoverBackground": "{background.surface.hover.section}",
+        "selectedBackground": "{background.selected}",
+        "color": "{text.default}",
+        "hoverColor": "{text.hover.default}",
+        "selectedColor": "{text.onBold}",
+        "width": "{dimension.size.600}",
+        "height": "{dimension.size.600}",
+        "borderRadius": "{dimension.radius.300}",
         "focusRing": {
-          "width": "{focusRing.width}",
-          "style": "{focusRing.style}",
-          "color": "{focusRing.color}",
-          "offset": "{focusRing.offset}",
-          "focus": "{focusRing.shadow}"
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{background.success.subtleHover}",
+          "offset": "{dimension.focusRing.offset}",
+          "focus": "{shadow.200}",
+          "shadow": "0"
         }
       },
       "jumpToPageInput": {
-        "maxWidth": "{data.width.400}"
+        "maxWidth": "{dimension.size.900}"
+      },
+      "extend": {
+        "fonts_fontFamily_base": "{typography.body.lg.fontFamily}",
+        "fonts_fontSize_300": "{typography.body.md.fontSize}",
+        "fonts_fontWeight_regular": "{typography.body.lg.fontWeight}",
+        "fonts_lineHeight_250": "{typography.caption.lineHeight}"
       }
     },
     "panelmenu": {
       "extend": {
         "extPanel": {
-          "gap": "{content.gap.100}"
+          "gap": "{dimension.space.100}"
         },
-        "iconSize": "{navigation.submenuIcon.size}",
+        "iconSize": "{typography.heading.sm.fontSize}",
         "extItem": {
-          "activeBackground": "{navigation.item.activeBackground}",
-          "activeColor": "{navigation.item.activeColor}",
+          "activeBackground": "{background.selected}",
+          "activeColor": "{text.onBold}",
           "caption": {
-            "color": "{text.mutedColor}",
-            "gap": "{content.gap.100}"
+            "color": "{text.muted}",
+            "gap": "{dimension.space.100}"
           }
-        }
+        },
+        "fonts_fontSize_200": "{typography.body.sm.fontSize}",
+        "fonts_fontSize_300": "{typography.body.md.fontSize}",
+        "fonts_lineHeight_450": "{typography.body.md.lineHeight}"
       },
       "root": {
-        "gap": "{content.gap.100}",
-        "transitionDuration": "{form.transitionDuration}"
+        "gap": "{dimension.space.100}",
+        "transitionDuration": "{dimension.duration.200}"
       },
       "panel": {
-        "background": "{transparent}",
-        "borderColor": "{transparent}",
-        "borderWidth": "{navigation.width.100}",
-        "color": "{content.color}",
-        "padding": "{content.padding.100}",
-        "borderRadius": "{content.borderRadius}",
+        "background": "{background.transparent}",
+        "borderColor": "{border.transparent}",
+        "borderWidth": "{dimension.borderWidth.100}",
+        "color": "{text.default}",
+        "padding": "{dimension.space.100}",
+        "borderRadius": "{dimension.radius.300}",
         "first": {
-          "borderWidth": "{navigation.width.100} {navigation.width.100} 0 {navigation.width.100}",
-          "topBorderRadius": "{content.borderRadius}"
+          "borderWidth": "{dimension.borderWidth.100} {dimension.borderWidth.100} 0 {dimension.borderWidth.100}",
+          "topBorderRadius": "{dimension.radius.300}"
         },
         "last": {
-          "borderWidth": "0 {navigation.width.100} {navigation.width.100} {navigation.width.100}",
-          "topBorderRadius": "{content.borderRadius}"
+          "borderWidth": "0 {dimension.borderWidth.100} {dimension.borderWidth.100} {dimension.borderWidth.100}",
+          "topBorderRadius": "{dimension.radius.300}",
+          "bottomBorderRadius": "{dimension.radius.300}"
         }
       },
       "item": {
-        "focusBackground": "{navigation.item.focusBackground}",
-        "color": "{navigation.item.color}",
-        "focusColor": "{navigation.item.focusColor}",
-        "gap": "{navigation.item.gap}",
-        "padding": "{navigation.item.padding}",
-        "borderRadius": "{navigation.item.borderRadius}",
+        "focusBackground": "{background.neutral.subtleHover}",
+        "color": "{text.default}",
+        "focusColor": "{text.default}",
+        "gap": "{dimension.space.200}",
+        "padding": "{dimension.space.200} {dimension.space.300}",
+        "borderRadius": "{dimension.radius.200}",
         "icon": {
-          "color": "{navigation.item.icon.color}",
-          "focusColor": "{navigation.item.icon.focusColor}"
+          "color": "{icon.strong}",
+          "focusColor": "{icon.strong}"
         }
       },
       "submenu": {
-        "indent": "{navigation.padding.400}"
+        "indent": "{dimension.space.600}"
       },
       "separator": {
-        "borderColor": "{content.borderColor}"
+        "borderColor": "{border.subtle}"
       },
       "submenuIcon": {
-        "color": "{navigation.submenuIcon.color}",
-        "focusColor": "{navigation.submenuIcon.focusColor}"
+        "color": "{icon.strongMuted}",
+        "focusColor": "{icon.strongMuted}"
       }
     },
     "password": {
       "extend": {
-        "borderWidth": "{form.borderWidth}"
+        "borderWidth": "{dimension.borderWidth.100}",
+        "floatlabel_root_color": "{background.neutral.bold}",
+        "focusRing_invalid": "{focusRing.invalid}",
+        "fonts_fontFamily_base": "{typography.body.lg.fontFamily}",
+        "fonts_fontSize_200": "{typography.body.sm.fontSize}",
+        "fonts_fontWeight_regular": "{typography.body.lg.fontWeight}",
+        "fonts_lineHeight_250": "{typography.caption.lineHeight}",
+        "surface_400": "{text.hover.subtle}",
+        "floatlabel_in_input_paddingBottom": "{dimension.space.300}",
+        "floatlabel_in_input_paddingTop": "{dimension.space.700}",
+        "floatlabel_root_active_fontWeight": "{typography.body.lg.fontWeight}",
+        "floatlabel_root_fontWeight": "{typography.body.lg.fontWeight}"
       },
       "colorScheme": {
         "light": {
           "strength": {
-            "weakBackground": "{error.500}",
-            "mediumBackground": "{warn.500}",
-            "strongBackground": "{success.600}"
+            "weakBackground": "{background.danger.bold}",
+            "mediumBackground": "{background.warning.bold}",
+            "strongBackground": "{background.brand.boldHover}"
           },
           "icon": {
-            "color": "{form.placeholderColor}"
+            "color": "{icon.subtle}"
           }
         },
         "dark": {
           "strength": {
-            "weakBackground": "{error.500}",
-            "mediumBackground": "{warn.500}",
-            "strongBackground": "{success.600}"
+            "weakBackground": "{background.danger.bold}",
+            "mediumBackground": "{background.warning.bold}",
+            "strongBackground": "{background.brand.boldHover}"
           },
           "icon": {
-            "color": "{form.placeholderColor}"
+            "color": "{icon.subtle}"
           }
         }
       },
       "meter": {
-        "background": "{content.borderColor}",
-        "borderRadius": "{content.borderRadius}",
-        "height": "{feedback.height.100}"
+        "background": "{background.disabled}",
+        "borderRadius": "{dimension.radius.300}",
+        "height": "{dimension.size.200}"
       },
       "overlay": {
-        "background": "{overlay.popover.background}",
-        "borderColor": "{overlay.popover.borderColor}",
-        "borderRadius": "{overlay.popover.borderRadius}",
-        "color": "{overlay.popover.color}",
-        "padding": "{overlay.popover.padding.100}",
-        "shadow": "{overlay.popover.shadow}"
+        "background": "{background.surface.raised}",
+        "borderColor": "{border.default}",
+        "borderRadius": "{dimension.radius.200}",
+        "color": "{text.default}",
+        "padding": "{dimension.space.300}",
+        "shadow": "{shadow.400}"
       },
       "content": {
-        "gap": "{content.gap.200}"
+        "gap": "{dimension.space.200}"
+      },
+      "icon": {
+        "color": "{icon.subtle}"
       }
     },
     "popover": {
       "extend": {
-        "borderWidth": "{overlay.borderWidth}",
+        "borderWidth": "{dimension.borderWidth.100}",
         "arrow": {
-          "width": "{overlay.popover.width.200}",
-          "height": "{overlay.popover.width.100}"
+          "width": "{dimension.size.250}",
+          "height": "{dimension.size.200}"
         }
       },
       "root": {
-        "background": "{overlay.popover.background}",
-        "borderColor": "{overlay.popover.borderColor}",
-        "color": "{overlay.popover.color}",
-        "borderRadius": "{overlay.popover.borderRadius}",
-        "shadow": "{overlay.popover.shadow}",
-        "gutter": "{overlay.gap.300}",
-        "arrowOffset": "{overlay.popover.padding.200}",
+        "background": "{background.surface.raised}",
+        "borderColor": "{border.default}",
+        "color": "{text.default}",
+        "borderRadius": "{dimension.radius.200}",
+        "shadow": "{shadow.400}",
+        "gutter": "{dimension.space.300}",
+        "arrowOffset": "{dimension.space.500}",
         "arrowLeft": "0px"
       },
       "content": {
-        "padding": "{overlay.popover.padding.100}"
+        "padding": "{dimension.space.300}"
       }
     },
     "progressbar": {
       "label": {
-        "color": "{text.extend.colorPrimaryStatic}",
-        "fontSize": "{fonts.fontSize.100}",
-        "fontWeight": "{fonts.fontWeight.regular}"
+        "color": "{text.staticDark}",
+        "fontSize": "{typography.label.sm.fontSize}",
+        "fontWeight": "{typography.body.lg.fontWeight}"
       },
       "root": {
-        "background": "{content.borderColor}",
-        "borderRadius": "{content.borderRadius}",
-        "height": "{feedback.height.300}"
+        "background": "{background.disabled}",
+        "borderRadius": "{dimension.radius.300}",
+        "height": "{dimension.size.300}"
       },
       "value": {
-        "background": "{primary.color}"
+        "background": "{background.brand.bold}"
+      },
+      "extend": {
+        "fonts_fontFamily_base": "{typography.body.lg.fontFamily}"
       }
     },
     "progressspinner": {
       "extend": {
-        "small": "{feedback.width.500}",
-        "medium": "{feedback.width.700}",
-        "large": "{feedback.width.800}",
-        "xlarge": "{feedback.width.900}"
+        "small": "{dimension.size.300}",
+        "medium": "{dimension.size.500}",
+        "large": "{dimension.size.700}",
+        "xlarge": "{dimension.size.800}",
+        "primary_color": "{background.brand.bold}"
       },
       "colorScheme": {
         "light": {
           "root": {
-            "colorOne": "{success.500}",
-            "colorTwo": "{info.500}",
-            "colorThree": "{error.500}",
-            "colorFour": "{warn.500}"
+            "colorOne": "{background.brand.bold}",
+            "colorTwo": "{background.info.bold}",
+            "colorThree": "{background.danger.bold}",
+            "colorFour": "{background.warning.bold}"
+          }
+        },
+        "dark": {
+          "root": {
+            "colorOne": "{colors.solid.red.400}",
+            "colorTwo": "{colors.solid.blue.400}",
+            "colorThree": "{colors.solid.green.400}",
+            "colorFour": "{colors.solid.yellow.400}"
           }
         }
       },
       "root": {
-        "borderWidth": "{feedback.width.200}"
+        "borderWidth": "{dimension.size.150}"
       }
     },
     "radiobutton": {
       "root": {
-        "width": "{form.size.400}",
-        "height": "{form.size.400}",
-        "background": "{form.background}",
-        "checkedBackground": "{surface.900}",
-        "checkedHoverBackground": "{surface.800}",
-        "disabledBackground": "{form.disabledBackground}",
-        "filledBackground": "{form.filledBackground}",
-        "borderColor": "{form.borderColor}",
-        "hoverBorderColor": "{form.hoverBorderPrimaryColor}",
-        "focusBorderColor": "{form.borderColor}",
-        "checkedBorderColor": "{surface.900}",
-        "checkedHoverBorderColor": "{form.hoverBorderPrimaryColor}",
-        "checkedFocusBorderColor": "{form.focusBorderPrimaryColor}",
-        "checkedDisabledBorderColor": "{form.borderColor}",
-        "invalidBorderColor": "{form.invalidBorderColor}",
+        "width": "{dimension.size.400}",
+        "height": "{dimension.size.400}",
+        "background": "{background.surface.field}",
+        "checkedBackground": "{background.selected}",
+        "checkedHoverBackground": "{background.surface.inverse}",
+        "disabledBackground": "{background.disabled}",
+        "filledBackground": "{background.surface.field}",
+        "borderColor": "{border.default}",
+        "hoverBorderColor": "{border.strong}",
+        "focusBorderColor": "{border.default}",
+        "checkedBorderColor": "{border.strong}",
+        "checkedHoverBorderColor": "{border.strong}",
+        "checkedFocusBorderColor": "{border.strong}",
+        "checkedDisabledBorderColor": "{border.default}",
+        "invalidBorderColor": "{border.danger}",
         "shadow": "0",
-        "transitionDuration": "{form.transitionDuration}"
+        "transitionDuration": "{dimension.duration.200}",
+        "focusRing": {
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{focusRing.success}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "0"
+        },
+        "sm": {
+          "width": "{dimension.space.400}",
+          "height": "{dimension.space.400}"
+        },
+        "lg": {
+          "width": "{dimension.space.600}",
+          "height": "{dimension.space.600}"
+        }
       },
       "focusRing": {
-        "width": "{focusRing.width}",
-        "style": "{focusRing.style}",
-        "color": "{focusRing.color}",
-        "offset": "{focusRing.offset}",
-        "shadow": "{focusRing.shadow}"
+        "width": "{dimension.borderWidth.300}",
+        "style": "{dimension.focusRing.style}",
+        "color": "{focusRing.success}",
+        "offset": "{dimension.focusRing.offset}",
+        "shadow": "{shadow.200}"
       },
       "sm": {
-        "width": "{form.size.300}",
-        "height": "{form.size.300}"
+        "width": "{dimension.size.300}",
+        "height": "{dimension.size.300}"
       },
       "lg": {
-        "width": "{form.size.350}",
-        "height": "{form.size.350}"
+        "width": "{dimension.size.350}",
+        "height": "{dimension.size.350}"
       },
       "icon": {
-        "size": "0.7rem",
-        "checkedColor": "{text.extend.colorInverted}",
-        "checkedHoverColor": "{text.extend.colorInverted}",
-        "disabledColor": "{text.mutedColor}",
+        "size": "{dimension.space.300}",
+        "checkedColor": "{icon.onBold}",
+        "checkedHoverColor": "{icon.onBold}",
+        "disabledColor": "{icon.subtle}",
         "sm": {
-          "size": "{form.icon.100}"
+          "size": "{dimension.size.200}"
         },
         "lg": {
-          "size": "{form.icon.300}"
+          "size": "{dimension.size.300}"
         }
+      },
+      "extend": {
+        "focusRing_invalid": "{focusRing.invalid}",
+        "focusRing_success": "{focusRing.success}"
       }
     },
     "rating": {
       "root": {
-        "gap": "{form.gap.200}",
-        "transitionDuration": "{form.transitionDuration}"
+        "gap": "{dimension.space.200}",
+        "transitionDuration": "{dimension.duration.200}",
+        "focusRing": {
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{focusRing.success}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "0"
+        }
       },
       "focusRing": {
-        "width": "{form.focusRing.width}",
-        "style": "{form.focusRing.style}",
-        "color": "{form.focusRing.color}",
-        "offset": "{form.focusRing.offset}",
-        "shadow": "{focusRing.shadow}"
+        "width": "{dimension.borderWidth.300}",
+        "style": "{dimension.focusRing.style}",
+        "color": "{focusRing.success}",
+        "offset": "{dimension.focusRing.offset}",
+        "shadow": "{shadow.200}"
       },
       "icon": {
-        "size": "{form.icon.500}",
-        "color": "{surface.500}",
-        "hoverColor": "{warn.500}",
-        "activeColor": "{warn.500}"
+        "size": "{dimension.size.400}",
+        "color": "{icon.subtle}",
+        "hoverColor": "{background.warning.bold}",
+        "activeColor": "{background.warning.bold}"
       }
     },
     "ripple": {
       "colorScheme": {
         "light": {
           "root": {
-            "background": "rgba(255, 255, 255, 0.0100)"
+            "background": "{colors.alpha.white.10}"
+          }
+        },
+        "dark": {
+          "root": {
+            "background": "{colors.alpha.white.300}"
           }
         }
       }
@@ -4145,321 +4808,411 @@
       "colorScheme": {
         "light": {
           "bar": {
-            "background": "{surface.300}"
+            "background": "{text.disabled}"
+          }
+        },
+        "dark": {
+          "bar": {
+            "background": "{background.surface.inverse}"
           }
         }
       },
       "root": {
-        "transitionDuration": "{media.transitionDuration}"
+        "transitionDuration": "{dimension.duration.200}"
       },
       "bar": {
-        "size": "{media.size.200}",
-        "borderRadius": "{media.borderRadius.100}",
+        "size": "{dimension.size.200}",
+        "borderRadius": "{dimension.radius.200}",
         "focusRing": {
-          "width": "0rem",
-          "style": "{focusRing.style}",
-          "color": "{focusRing.color}",
-          "offset": "{focusRing.offset}",
-          "shadow": "{focusRing.shadow}"
+          "width": "{dimension.space.none}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{background.success.subtleHover}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "{shadow.200}"
         }
       }
     },
     "select": {
       "extend": {
         "extOption": {
-          "background": "{list.option.background}",
-          "gap": "{list.gap.200}"
+          "background": "{background.surface.raised}",
+          "gap": "{dimension.space.200}"
         },
         "extOptionGroup": {
-          "gap": "{list.gap.200}"
-        },
-        "readonlyBackground": "{form.readonlyBackground}",
-        "borderWidth": "{form.borderWidth}",
-        "iconSize": "{form.icon.300}"
+          "gap": "{dimension.space.200}"
+        },
+        "readonlyBackground": "{background.neutral.subtleHover}",
+        "borderWidth": "{dimension.borderWidth.100}",
+        "iconSize": "{dimension.size.300}",
+        "floatlabel_root_color": "{background.neutral.bold}",
+        "focusRing_invalid": "{focusRing.invalid}",
+        "fonts_fontFamily_base": "{typography.body.lg.fontFamily}",
+        "fonts_lineHeight_250": "{typography.caption.lineHeight}",
+        "floatlabel_in_input_paddingBottom": "{dimension.space.300}",
+        "floatlabel_in_input_paddingTop": "{dimension.space.700}",
+        "floatlabel_root_active_fontWeight": "{typography.body.lg.fontWeight}",
+        "floatlabel_root_fontWeight": "{typography.body.lg.fontWeight}"
       },
       "root": {
-        "background": "{form.background}",
-        "disabledBackground": "{form.disabledBackground}",
-        "filledBackground": "{form.filledBackground}",
-        "filledHoverBackground": "{form.filledHoverBackground}",
-        "filledFocusBackground": "{form.filledFocusBackground}",
-        "borderColor": "{form.borderColor}",
-        "hoverBorderColor": "{form.hoverBorderSecondaryColor}",
-        "focusBorderColor": "{form.focusBorderSecondaryColor}",
-        "invalidBorderColor": "{form.invalidBorderColor}",
-        "color": "{text.color}",
-        "disabledColor": "{form.disabledColor}",
-        "placeholderColor": "{form.placeholderColor}",
-        "invalidPlaceholderColor": "{form.invalidPlaceholderColor}",
+        "background": "{background.surface.field}",
+        "disabledBackground": "{background.disabled}",
+        "filledBackground": "{background.surface.field}",
+        "filledHoverBackground": "{background.surface.field}",
+        "filledFocusBackground": "{background.surface.field}",
+        "borderColor": "{border.default}",
+        "hoverBorderColor": "{border.brand}",
+        "focusBorderColor": "{border.brand}",
+        "invalidBorderColor": "{border.danger}",
+        "color": "{text.default}",
+        "disabledColor": "{text.muted}",
+        "placeholderColor": "{text.muted}",
+        "invalidPlaceholderColor": "{text.danger}",
         "shadow": "0",
-        "paddingX": "{form.padding.300}",
-        "paddingY": "{form.padding.300}",
-        "borderRadius": "{form.borderRadius.200}",
-        "transitionDuration": "{form.transitionDuration}",
+        "paddingX": "{dimension.space.300}",
+        "paddingY": "{dimension.space.300}",
+        "borderRadius": "{dimension.radius.300}",
+        "transitionDuration": "{dimension.duration.200}",
         "sm": {
-          "fontSize": "{fonts.fontSize.300}",
-          "paddingX": "{form.padding.300}",
-          "paddingY": "{form.padding.200}"
+          "fontSize": "{typography.body.md.fontSize}",
+          "paddingX": "{dimension.space.300}",
+          "paddingY": "{dimension.space.200}"
         },
         "lg": {
-          "fontSize": "{fonts.fontSize.300}",
-          "paddingX": "{form.padding.300}",
-          "paddingY": "{form.padding.400}"
+          "fontSize": "{typography.body.md.fontSize}",
+          "paddingX": "{dimension.space.300}",
+          "paddingY": "{dimension.space.400}"
         },
         "focusRing": {
-          "width": "{form.focusRing.width}",
-          "style": "{form.focusRing.style}",
-          "color": "{form.focusRing.color}",
-          "offset": "{form.focusRing.offset}",
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{focusRing.success}",
+          "offset": "{dimension.focusRing.offset}",
           "shadow": "0"
         }
       },
       "dropdown": {
-        "width": "{form.width.300}",
-        "color": "{form.iconColor}"
+        "width": "{dimension.size.600}",
+        "color": "{text.defaultHover}"
       },
       "overlay": {
-        "background": "{overlay.select.background}",
-        "borderColor": "{overlay.select.borderColor}",
-        "borderRadius": "{overlay.select.borderRadius}",
-        "color": "{overlay.select.color}",
-        "shadow": "{overlay.select.shadow}"
+        "background": "{background.surface.raised}",
+        "borderColor": "{border.subtle}",
+        "borderRadius": "{dimension.radius.300}",
+        "color": "{text.default}",
+        "shadow": "{shadow.400}"
       },
       "list": {
-        "padding": "{list.padding}",
-        "gap": "{list.gap.100}",
+        "padding": "{dimension.space.100}",
+        "gap": "{dimension.space.100}",
         "header": {
-          "padding": "{list.header.padding}"
+          "padding": "{dimension.space.400} {dimension.space.400} 0 {dimension.space.400}"
         }
       },
       "option": {
-        "focusBackground": "{list.option.focusBackground}",
-        "selectedBackground": "{list.option.selectedBackground}",
-        "selectedFocusBackground": "{list.option.selectedFocusBackground}",
-        "color": "{list.option.color}",
-        "focusColor": "{list.option.focusColor}",
-        "selectedColor": "{list.option.selectedColor}",
-        "selectedFocusColor": "{list.option.selectedFocusColor}",
-        "padding": "{list.option.padding}",
-        "borderRadius": "{list.option.borderRadius}"
+        "focusBackground": "{background.surface.hover.section}",
+        "selectedBackground": "{background.selected}",
+        "selectedFocusBackground": "{background.selectedStrong}",
+        "color": "{text.default}",
+        "focusColor": "{text.default}",
+        "selectedColor": "{text.onBold}",
+        "selectedFocusColor": "{text.onBold}",
+        "padding": "{dimension.space.200} {dimension.space.300}",
+        "borderRadius": "{dimension.radius.200}"
       },
       "optionGroup": {
-        "background": "{list.optionGroup.background}",
-        "color": "{list.optionGroup.color}",
-        "fontWeight": "{fonts.fontWeight.regular}",
-        "padding": "{list.option.padding}"
+        "background": "{background.surface.raised}",
+        "color": "{text.muted}",
+        "fontWeight": "{typography.body.lg.fontWeight}",
+        "padding": "{dimension.space.200} {dimension.space.300}"
       },
       "clearIcon": {
-        "color": "{form.iconColor}"
+        "color": "{icon.default}"
       },
       "checkmark": {
-        "color": "{list.option.color}",
-        "gutterStart": "-{form.padding.200}",
-        "gutterEnd": "{form.padding.200}"
+        "color": "{text.default}",
+        "gutterStart": "-{dimension.space.200}",
+        "gutterEnd": "{dimension.space.200}"
       },
       "emptyMessage": {
-        "padding": "{list.option.padding}"
+        "padding": "{dimension.space.200} {dimension.space.300}"
       }
     },
     "selectbutton": {
       "extend": {
-        "gap": "{form.gap.100}",
-        "paddingX": "{controls.padding.100}",
-        "paddingY": "{controls.padding.100}",
-        "checkedBackground": "{form.background}",
+        "gap": "{dimension.space.100}",
+        "paddingX": "{dimension.space.100}",
+        "paddingY": "{dimension.space.100}",
+        "checkedBackground": "{background.surface.field}",
         "iconSize": {
-          "sm": "{controls.iconOnly.200}",
-          "md": "{controls.iconOnly.300}",
-          "lg": "{controls.iconOnly.400}",
-          "xlg": "{controls.iconOnly.500}"
+          "sm": "{dimension.size.300}",
+          "md": "{dimension.size.350}",
+          "lg": "{dimension.size.400}",
+          "xlg": "{dimension.size.450}"
         },
-        "checkedBorderColor": "{form.background}",
-        "checkedColor": "{form.color}",
+        "checkedBorderColor": "{background.surface.field}",
+        "checkedColor": "{text.defaultHover}",
         "ext": {
-          "borderRadius": "{borderRadius.200}"
-        }
+          "borderRadius": "{dimension.radius.200}"
+        },
+        "fonts_fontFamily_heading": "{typography.heading.lg.fontFamily}",
+        "fonts_fontSize_600": "{typography.heading.md.fontSize}",
+        "fonts_fontWeight_demibold": "{typography.heading.lg.fontWeight}",
+        "fonts_lineHeight_250": "{typography.caption.lineHeight}",
+        "fonts_lineHeight_300": "{typography.label.sm.lineHeight}",
+        "fonts_lineHeight_400": "{typography.body.sm.lineHeight}",
+        "fonts_lineHeight_500": "{typography.body.md.lineHeight}",
+        "fonts_lineHeight_550": "{typography.body.lg.lineHeight}",
+        "fonts_lineHeight_700": "{typography.heading.md.lineHeight}",
+        "controls_iconOnly_600": "{dimension.space.800}",
+        "controls_iconOnly_700": "{dimension.space.900}",
+        "controls_iconOnly_850": "{dimension.size.750}",
+        "controls_iconOnly_900": "{dimension.size.800}"
       },
       "colorScheme": {
         "light": {
           "root": {
-            "invalidBorderColor": "{form.invalidBorderColor}"
+            "invalidBorderColor": "{border.danger}"
           },
           "extend": {
-            "background": "{surface.200}"
+            "background": "{background.disabled}"
+          }
+        },
+        "dark": {
+          "root": {
+            "invalidBorderColor": "{border.danger}"
           }
         }
       },
       "root": {
-        "borderRadius": "{form.borderRadius.200}"
+        "borderRadius": "{dimension.radius.300}"
       }
     },
     "skeleton": {
       "extend": {
-        "minWidth": "{feedback.width.700}",
-        "height": "{feedback.height.650}"
+        "minWidth": "{dimension.size.500}",
+        "height": "{dimension.size.500}"
       },
       "colorScheme": {
         "light": {
           "root": {
-            "background": "{surface.200}",
-            "animationBackground": "{surface.100}"
+            "background": "{background.disabled}",
+            "animationBackground": "{background.neutral.subtleHover}"
+          }
+        },
+        "dark": {
+          "root": {
+            "background": "{colors.alpha.white.60}",
+            "animationBackground": "{colors.alpha.white.40}"
           }
         }
       },
       "root": {
-        "borderRadius": "{content.borderRadius}"
+        "borderRadius": "{dimension.radius.300}"
       }
     },
     "slider": {
       "colorScheme": {
         "handle": {
           "content": {
-            "background": "{surface.0}"
+            "background": "{background.surface.canvas}"
+          }
+        },
+        "light": {
+          "handle": {
+            "content": {
+              "background": "{background.surface.raised}"
+            }
+          }
+        },
+        "dark": {
+          "handle": {
+            "content": {
+              "background": "{background.surface.inverseStrong}"
+            }
           }
         }
       },
       "root": {
-        "transitionDuration": "{form.transitionDuration}"
+        "transitionDuration": "{dimension.duration.200}"
       },
       "track": {
-        "background": "{content.borderColor}",
-        "borderRadius": "{content.borderRadius}",
-        "size": "{form.size.150}"
+        "background": "{background.disabled}",
+        "borderRadius": "{dimension.radius.300}",
+        "size": "{dimension.size.150}"
       },
       "range": {
-        "background": "{surface.900}"
+        "background": "{background.selected}"
       },
       "handle": {
-        "width": "{form.size.350}",
-        "height": "{form.size.350}",
-        "borderRadius": "{form.borderRadius.300}",
-        "background": "{surface.900}",
-        "hoverBackground": "{surface.900}",
+        "width": "{dimension.size.350}",
+        "height": "{dimension.size.350}",
+        "borderRadius": "{dimension.radius.max}",
+        "background": "{background.selected}",
+        "hoverBackground": "{background.selected}",
         "focusRing": {
-          "width": "{form.focusRing.width}",
-          "style": "{form.focusRing.style}",
-          "color": "{form.focusRing.color}",
-          "offset": "{form.focusRing.offset}",
-          "shadow": "{focusRing.shadow}"
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{focusRing.success}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "{shadow.200}"
         },
         "content": {
-          "borderRadius": "{form.borderRadius.300}",
-          "hoverBackground": "{surface.900}",
-          "width": "{form.size.250}",
-          "height": "{form.size.250}",
+          "borderRadius": "{dimension.radius.max}",
+          "hoverBackground": "{background.selected}",
+          "width": "{dimension.size.250}",
+          "height": "{dimension.size.250}",
           "shadow": "none"
         }
+      },
+      "extend": {
+        "focusRing_success": "{focusRing.success}"
       }
     },
     "splitter": {
       "colorScheme": {
         "light": {
           "handle": {
-            "background": "{surface.900}"
+            "background": "{background.selected}"
+          }
+        },
+        "dark": {
+          "handle": {
+            "background": "{background.selected}"
           }
         }
       },
       "gutter": {
-        "background": "{surface.100}"
+        "background": "{background.neutral.subtleHover}"
       },
       "root": {
-        "background": "{content.background}",
-        "borderColor": "{content.borderColor}",
-        "color": "{content.color}",
-        "transitionDuration": "{controls.transitionDuration}"
+        "background": "{background.surface.raised}",
+        "borderColor": "{border.subtle}",
+        "color": "{text.default}",
+        "transitionDuration": "{dimension.duration.200}"
       },
       "handle": {
-        "size": "{form.size.150}",
-        "borderRadius": "{content.borderRadius}",
+        "size": "{dimension.size.150}",
+        "borderRadius": "{dimension.radius.300}",
         "focusRing": {
-          "width": "{form.focusRing.width}",
-          "style": "{form.focusRing.style}",
-          "color": "{form.focusRing.color}",
-          "offset": "{form.focusRing.offset}",
-          "shadow": "{focusRing.shadow}"
-        }
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{background.success.subtleHover}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "{shadow.200}"
+        },
+        "background": "transparent"
       }
     },
     "stepper": {
       "extend": {
         "extCaption": {
-          "gap": "{feedback.gap.100}"
+          "gap": "{dimension.space.100}"
         },
         "extStepNumber": {
-          "invalidBackground": "{error.400}",
-          "invalidColor": "{error.900}",
-          "invalidBorderColor": "{error.400}",
-          "borderWidth": "{feedback.width.100}",
-          "iconSize": "{feedback.icon.size.300}"
-        }
+          "invalidBackground": "{background.danger.bold}",
+          "invalidColor": "{text.danger}",
+          "invalidBorderColor": "{border.danger}",
+          "borderWidth": "{dimension.size.100}",
+          "iconSize": "{dimension.size.400}"
+        },
+        "background_transparent": "{background.transparent}",
+        "fonts_fontFamily_base": "{typography.body.lg.fontFamily}",
+        "fonts_fontSize_200": "{typography.body.sm.fontSize}",
+        "fonts_fontSize_300": "{typography.body.md.fontSize}",
+        "fonts_fontWeight_medium": "{typography.label.lg.fontWeight}",
+        "fonts_fontWeight_regular": "{typography.body.lg.fontWeight}",
+        "fonts_lineHeight_150": "{typography.caption.lineHeight}",
+        "fonts_lineHeight_200": "{typography.caption.lineHeight}",
+        "text_mutedColor": "{text.muted}"
       },
       "root": {
-        "transitionDuration": "{feedback.transitionDuration}"
+        "transitionDuration": "{dimension.duration.200}"
       },
       "separator": {
-        "background": "{content.borderColor}",
-        "activeBackground": "{form.focusBorderPrimaryColor}",
+        "background": "{background.disabled}",
+        "activeBackground": "{background.selected}",
         "margin": "0 0 0 1.625rem",
-        "size": "{form.size.100}"
+        "size": "{dimension.size.100}"
       },
       "step": {
-        "padding": "{feedback.padding.100}",
-        "gap": "{feedback.gap.200}"
+        "padding": "{dimension.space.200}",
+        "gap": "{dimension.space.200}"
       },
       "stepHeader": {
-        "padding": "0rem",
-        "borderRadius": "0rem",
-        "gap": "{feedback.gap.200}",
+        "padding": "{dimension.space.none}",
+        "borderRadius": "{dimension.space.none}",
+        "gap": "{dimension.space.200}",
         "focusRing": {
-          "width": "{focusRing.width}",
-          "style": "{focusRing.style}",
-          "color": "{focusRing.color}",
-          "offset": "{focusRing.offset}",
-          "shadow": "{focusRing.shadow}"
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{background.success.subtleHover}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "{shadow.200}"
         }
       },
       "stepTitle": {
-        "color": "{text.color}",
-        "activeColor": "{text.color}",
-        "fontWeight": "{fonts.fontWeight.regular}"
+        "color": "{text.default}",
+        "activeColor": "{text.default}",
+        "fontWeight": "{typography.body.lg.fontWeight}"
       },
       "stepNumber": {
-        "background": "{content.background}",
-        "activeBackground": "{primary.color}",
-        "borderColor": "{content.borderColor}",
-        "activeBorderColor": "{primary.color}",
-        "color": "{text.color}",
-        "activeColor": "{text.extend.colorPrimaryStatic}",
-        "size": "{form.size.400}",
-        "fontSize": "{fonts.fontSize.300}",
-        "fontWeight": "{fonts.fontWeight.bold}",
-        "borderRadius": "{form.borderRadius.300}",
+        "background": "{background.surface.raised}",
+        "activeBackground": "{background.brand.bold}",
+        "borderColor": "{border.subtle}",
+        "activeBorderColor": "{border.checked}",
+        "color": "{text.default}",
+        "activeColor": "{text.staticDark}",
+        "size": "{dimension.size.400}",
+        "fontSize": "{typography.body.md.fontSize}",
+        "fontWeight": "{typography.heading.xl.fontWeight}",
+        "borderRadius": "{dimension.radius.max}",
         "shadow": "none"
       },
       "steppanels": {
-        "padding": "{feedback.padding.200}"
+        "padding": "{dimension.space.400}"
       },
       "steppanel": {
-        "background": "{content.background}",
-        "color": "{content.color}",
-        "padding": "0rem",
-        "indent": "0rem"
+        "background": "{background.surface.raised}",
+        "color": "{text.default}",
+        "padding": "{dimension.space.none}",
+        "indent": "{dimension.space.none}"
       }
     },
     "steps": {
       "itemLink": {
-        "gap": "{form.gap.200}"
-      },
+        "gap": "{dimension.space.200}",
+        "borderRadius": "{dimension.radius.300}",
+        "focusRing": {
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{focusRing.default}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "0"
+        }
+      },
       "itemLabel": {
-        "fontWeight": "{fonts.fontWeight.regular}"
+        "fontWeight": "{typography.body.lg.fontWeight}",
+        "color": "{text.muted}",
+        "activeColor": "{text.brand}"
       },
       "itemNumber": {
-        "background": "{content.background}",
-        "size": "{form.size.500}",
-        "fontSize": "{fonts.fontSize.300}",
-        "fontWeight": "{fonts.fontWeight.bold}",
-        "borderRadius": "{form.borderRadius.300}",
-        "shadow": "none"
+        "background": "{background.surface.raised}",
+        "size": "{dimension.size.500}",
+        "fontSize": "{typography.body.md.fontSize}",
+        "fontWeight": "{typography.heading.xl.fontWeight}",
+        "borderRadius": "{dimension.radius.max}",
+        "shadow": "none",
+        "activeBackground": "{background.surface.raised}",
+        "borderColor": "{border.subtle}",
+        "activeBorderColor": "{border.subtle}",
+        "color": "{text.muted}",
+        "activeColor": "{text.brand}"
+      },
+      "root": {
+        "transitionDuration": "{dimension.duration.200}"
+      },
+      "separator": {
+        "background": "{border.subtle}"
       }
     },
     "tabs": {
@@ -4469,410 +5222,594 @@
             "shadow": "none"
           },
           "tab": {
-            "background": "{transparent}",
-            "hoverBackground": "{transparent}",
-            "activeBackground": "{transparent}"
+            "background": "{background.transparent}",
+            "hoverBackground": "{background.transparent}",
+            "activeBackground": "{background.transparent}"
+          }
+        },
+        "dark": {
+          "navButton": {
+            "shadow": "0px 0px 10px 50px color-mix(in srgb, {background.surface.raised}, transparent 50%)"
           }
         }
       },
       "root": {
-        "transitionDuration": "{data.transitionDuration}"
+        "transitionDuration": "{dimension.duration.200}"
       },
       "tablist": {
-        "borderWidth": "0 0 {data.width.100} 0",
-        "background": "{transparent}",
-        "borderColor": "{content.borderColor}"
+        "borderWidth": "0 0 {dimension.size.100} 0",
+        "background": "{background.transparent}",
+        "borderColor": "{border.subtle}"
       },
       "tab": {
         "borderWidth": "0",
-        "borderColor": "{content.borderColor}",
-        "hoverBorderColor": "{content.borderColor}",
-        "activeBorderColor": "{content.activeBorderColor}",
-        "color": "{text.mutedColor}",
-        "hoverColor": "{text.color}",
-        "activeColor": "{text.color}",
-        "padding": "{content.padding.300}",
-        "fontWeight": "{fonts.fontWeight.demibold}",
+        "borderColor": "{border.subtle}",
+        "hoverBorderColor": "{border.subtle}",
+        "activeBorderColor": "{border.inverse}",
+        "color": "{text.muted}",
+        "hoverColor": "{text.default}",
+        "activeColor": "{text.default}",
+        "padding": "{dimension.space.400}",
+        "fontWeight": "{typography.heading.lg.fontWeight}",
         "margin": "0",
-        "gap": "{content.gap.200}",
+        "gap": "{dimension.space.200}",
         "focusRing": {
-          "width": "{focusRing.width}",
-          "style": "{focusRing.style}",
-          "color": "{focusRing.color}",
-          "offset": "{focusRing.offset}",
-          "shadow": "{focusRing.shadow}"
-        }
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{background.success.subtleHover}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "{shadow.200}"
+        },
+        "background": "transparent",
+        "hoverBackground": "transparent",
+        "activeBackground": "transparent"
       },
       "tabpanel": {
-        "background": "{transparent}",
-        "color": "{text.color}",
-        "padding": "{spacing.4x}",
+        "background": "{background.transparent}",
+        "color": "{text.default}",
+        "padding": "{dimension.space.400}",
         "focusRing": {
-          "width": "{focusRing.width}",
-          "style": "{focusRing.style}",
-          "color": "{focusRing.color}",
-          "offset": "{focusRing.offset}",
-          "shadow": "{focusRing.shadow}"
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{background.success.subtleHover}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "{shadow.200}"
         }
       },
       "navButton": {
-        "background": "{content.background}",
-        "color": "{content.color}",
-        "hoverColor": "{content.hoverColor}",
-        "width": "{controls.iconOnly.400}",
+        "background": "{background.surface.raised}",
+        "color": "{text.default}",
+        "hoverColor": "{text.hover.default}",
+        "width": "{dimension.size.400}",
         "focusRing": {
-          "width": "{focusRing.width}",
-          "style": "{focusRing.style}",
-          "color": "{focusRing.color}",
-          "offset": "{focusRing.offset}",
-          "shadow": "{focusRing.shadow}"
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{background.success.subtleHover}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "{shadow.200}"
         }
       },
       "activeBar": {
-        "height": "0.18rem",
+        "height": "{dimension.borderWidth.200}",
         "bottom": "-0.18rem",
-        "background": "{content.color}"
+        "background": "{text.default}"
+      },
+      "extend": {
+        "fonts_fontFamily_heading": "{typography.heading.lg.fontFamily}",
+        "fonts_fontSize_300": "{typography.body.md.fontSize}",
+        "fonts_fontWeight_demibold": "{typography.heading.lg.fontWeight}"
       }
     },
     "toast": {
       "extend": {
         "extInfo": {
-          "color": "{info.500}",
+          "color": "{text.info}",
           "closeButton": {
-            "color": "{info.500}",
-            "borderColor": "{info.500}"
+            "color": "{text.info}",
+            "borderColor": "{border.info}"
           },
           "caption": {
-            "color": "{text.color}"
+            "color": "{text.default}"
           }
         },
         "extAccentLine": {
-          "width": "{feedback.width.200}"
+          "width": "{dimension.size.150}"
         },
         "extCloseButton": {
-          "width": "{feedback.width.100}"
+          "width": "{dimension.size.100}"
         },
         "extSuccess": {
-          "color": "{success.500}",
+          "color": "{text.success}",
           "closeButton": {
-            "color": "{success.500}",
-            "borderColor": "{success.500}"
+            "color": "{text.success}",
+            "borderColor": "{border.checked}"
           },
           "caption": {
-            "color": "{text.color}"
+            "color": "{text.default}"
           }
         },
         "extWarn": {
-          "color": "{warn.500}",
+          "color": "{text.warning}",
           "closeButton": {
-            "color": "{warn.500}",
-            "borderColor": "{warn.500}"
+            "color": "{text.warning}",
+            "borderColor": "{border.warning}"
           },
           "caption": {
-            "color": "{text.color}"
+            "color": "{text.default}"
           }
         },
         "extError": {
-          "color": "{error.500}",
+          "color": "{text.danger}",
           "closeButton": {
-            "color": "{error.500}",
-            "borderColor": "{error.500}"
+            "color": "{text.danger}",
+            "borderColor": "{border.danger}"
           },
           "caption": {
-            "color": "{text.color}"
+            "color": "{text.default}"
           }
-        }
+        },
+        "fonts_fontFamily_base": "{typography.body.lg.fontFamily}",
+        "fonts_lineHeight_250": "{typography.caption.lineHeight}"
       },
       "colorScheme": {
         "light": {
           "info": {
-            "background": "{info.50}",
-            "borderColor": "{info.500}",
-            "color": "{text.color}",
-            "detailColor": "{text.color}",
-            "shadow": "{overlay.popover.shadow}",
+            "background": "{background.info.subtle}",
+            "borderColor": "{border.info}",
+            "color": "{text.default}",
+            "detailColor": "{text.default}",
+            "shadow": "{shadow.400}",
+            "closeButton": {
+              "hoverBackground": "{background.info.subtleHover}",
+              "focusRing": {
+                "color": "{background.success.subtleHover}",
+                "shadow": "{shadow.200}"
+              }
+            }
+          },
+          "success": {
+            "background": "{background.brand.subtle}",
+            "borderColor": "{border.checked}",
+            "color": "{text.default}",
+            "detailColor": "{text.default}",
+            "shadow": "{shadow.400}",
+            "closeButton": {
+              "hoverBackground": "{background.success.subtleHover}",
+              "focusRing": {
+                "color": "{background.success.subtleHover}",
+                "shadow": "{shadow.200}"
+              }
+            }
+          },
+          "warn": {
+            "background": "{background.warning.subtle}",
+            "borderColor": "{border.warning}",
+            "color": "{text.default}",
+            "detailColor": "{text.default}",
+            "shadow": "{shadow.400}",
+            "closeButton": {
+              "hoverBackground": "{background.warning.subtleHover}",
+              "focusRing": {
+                "color": "{background.success.subtleHover}",
+                "shadow": "none"
+              }
+            }
+          },
+          "error": {
+            "background": "{background.danger.subtle}",
+            "borderColor": "{border.danger}",
+            "color": "{text.default}",
+            "detailColor": "{text.default}",
+            "shadow": "{shadow.400}",
+            "closeButton": {
+              "hoverBackground": "{background.danger.subtleHover}",
+              "focusRing": {
+                "color": "{background.success.subtleHover}",
+                "shadow": "{shadow.200}"
+              }
+            }
+          },
+          "secondary": {
+            "shadow": "{shadow.400}",
+            "background": "{background.neutral.subtleHover}",
+            "borderColor": "{border.subtle}",
+            "color": "{text.subtle}",
+            "detailColor": "{text.hover.default}",
+            "closeButton": {
+              "hoverBackground": "{background.disabled}",
+              "focusRing": {
+                "color": "{text.subtle}",
+                "shadow": "none"
+              }
+            }
+          },
+          "contrast": {
+            "shadow": "{shadow.400}",
+            "background": "{background.selected}",
+            "borderColor": "{colors.solid.zinc.950}",
+            "color": "{colors.solid.zinc.50}",
+            "detailColor": "{text.onBold}",
+            "closeButton": {
+              "hoverBackground": "{background.surface.inverse}",
+              "focusRing": {
+                "color": "{focusRing.default}",
+                "shadow": "none"
+              }
+            }
+          },
+          "root": {
+            "blur": "1.5px"
+          }
+        },
+        "dark": {
+          "root": {
+            "blur": "10px"
+          },
+          "info": {
+            "background": "color-mix(in srgb, {background.info.bold}, transparent 84%)",
+            "borderColor": "color-mix(in srgb, {colors.solid.blue.700}, transparent 64%)",
+            "color": "{colors.solid.blue.500}",
+            "detailColor": "{text.onBold}",
+            "shadow": "0px 4px 8px 0px color-mix(in srgb, {background.info.bold}, transparent 96%)",
             "closeButton": {
-              "hoverBackground": "{info.200}",
+              "hoverBackground": "{colors.alpha.white.50}",
               "focusRing": {
-                "color": "{focusRing.color}",
-                "shadow": "{focusRing.shadow}"
+                "color": "{focusRing.info}",
+                "shadow": "none"
               }
             }
           },
           "success": {
-            "background": "{success.50}",
-            "borderColor": "{success.500}",
-            "color": "{text.color}",
-            "detailColor": "{text.color}",
-            "shadow": "{overlay.popover.shadow}",
+            "background": "color-mix(in srgb, {background.brand.bold}, transparent 84%)",
+            "borderColor": "color-mix(in srgb, {colors.solid.green.700}, transparent 64%)",
+            "color": "{colors.solid.green.500}",
+            "detailColor": "{text.onBold}",
+            "shadow": "0px 4px 8px 0px color-mix(in srgb, {background.brand.bold}, transparent 96%)",
             "closeButton": {
-              "hoverBackground": "{success.200}",
+              "hoverBackground": "{colors.alpha.white.50}",
               "focusRing": {
-                "color": "{focusRing.color}",
-                "shadow": "{focusRing.shadow}"
+                "color": "{focusRing.success}",
+                "shadow": "none"
               }
             }
           },
           "warn": {
-            "background": "{warn.50}",
-            "borderColor": "{warn.500}",
-            "color": "{text.color}",
-            "detailColor": "{text.color}",
-            "shadow": "{overlay.popover.shadow}",
+            "background": "color-mix(in srgb, {background.warning.bold}, transparent 84%)",
+            "borderColor": "color-mix(in srgb, {colors.solid.yellow.700}, transparent 64%)",
+            "color": "{colors.solid.yellow.500}",
+            "detailColor": "{text.onBold}",
+            "shadow": "0px 4px 8px 0px color-mix(in srgb, {background.warning.bold}, transparent 96%)",
             "closeButton": {
-              "hoverBackground": "{warn.200}",
+              "hoverBackground": "{colors.alpha.white.50}",
               "focusRing": {
-                "color": "{focusRing.color}",
+                "color": "{focusRing.warning}",
                 "shadow": "none"
               }
             }
           },
           "error": {
-            "background": "{error.50}",
-            "borderColor": "{error.500}",
-            "color": "{text.color}",
-            "detailColor": "{text.color}",
-            "shadow": "{overlay.popover.shadow}",
+            "background": "color-mix(in srgb, {background.danger.bold}, transparent 84%)",
+            "borderColor": "color-mix(in srgb, {colors.solid.red.700}, transparent 64%)",
+            "color": "{colors.solid.red.500}",
+            "detailColor": "{text.onBold}",
+            "shadow": "0px 4px 8px 0px color-mix(in srgb, {background.danger.bold}, transparent 96%)",
             "closeButton": {
-              "hoverBackground": "{error.200}",
+              "hoverBackground": "{colors.alpha.white.50}",
               "focusRing": {
-                "color": "{focusRing.color}",
-                "shadow": "{focusRing.shadow}"
+                "color": "{focusRing.invalid}",
+                "shadow": "none"
               }
             }
           },
           "secondary": {
-            "shadow": "{overlay.popover.shadow}"
+            "background": "{background.surface.inverse}",
+            "borderColor": "{border.default}",
+            "color": "{text.disabled}",
+            "detailColor": "{text.onBold}",
+            "shadow": "0px 4px 8px 0px color-mix(in srgb, {background.neutral.bold}, transparent 96%)",
+            "closeButton": {
+              "hoverBackground": "{background.selectedStrong}",
+              "focusRing": {
+                "color": "{text.disabled}",
+                "shadow": "none"
+              }
+            }
           },
           "contrast": {
-            "shadow": "{overlay.popover.shadow}"
+            "background": "{background.surface.raised}",
+            "borderColor": "{border.strong}",
+            "color": "{text.defaultHover}",
+            "detailColor": "{text.defaultHover}",
+            "shadow": "0px 4px 8px 0px color-mix(in srgb, {background.surface.inverseStrong}, transparent 96%)",
+            "closeButton": {
+              "hoverBackground": "{background.neutral.subtleHover}",
+              "focusRing": {
+                "color": "{text.defaultHover}",
+                "shadow": "none"
+              }
+            }
           }
         }
       },
       "root": {
-        "width": "{messages.width}",
-        "borderWidth": "{feedback.width.100}",
-        "borderRadius": "{content.borderRadius}",
-        "transitionDuration": "{feedback.transitionDuration}"
+        "width": "{dimension.overlayWidth.base}",
+        "borderWidth": "{dimension.size.100}",
+        "borderRadius": "{dimension.radius.300}",
+        "transitionDuration": "{dimension.duration.200}"
       },
       "icon": {
-        "size": "{feedback.icon.size.500}"
+        "size": "{dimension.size.550}"
       },
       "content": {
-        "padding": "{feedback.padding.200}",
-        "gap": "{feedback.gap.400}"
+        "padding": "{dimension.space.400}",
+        "gap": "{dimension.space.400}"
       },
       "text": {
-        "gap": "{feedback.gap.100}"
+        "gap": "{dimension.space.100}"
       },
       "summary": {
-        "fontWeight": "{fonts.fontWeight.bold}",
-        "fontSize": "{fonts.fontSize.300}"
+        "fontWeight": "{typography.heading.xl.fontWeight}",
+        "fontSize": "{typography.body.md.fontSize}"
       },
       "detail": {
-        "fontWeight": "{fonts.fontWeight.regular}",
-        "fontSize": "{fonts.fontSize.200}"
+        "fontWeight": "{typography.body.lg.fontWeight}",
+        "fontSize": "{typography.body.sm.fontSize}"
       },
       "closeButton": {
-        "width": "{feedback.icon.size.400}",
-        "height": "{feedback.icon.size.400}",
-        "borderRadius": "{controls.borderRadius.100}",
+        "width": "{dimension.size.500}",
+        "height": "{dimension.size.500}",
+        "borderRadius": "{dimension.radius.300}",
         "focusRing": {
-          "width": "{focusRing.width}",
-          "style": "{focusRing.style}",
-          "offset": "{focusRing.offset}"
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "offset": "{dimension.focusRing.offset}"
         }
       },
       "closeIcon": {
-        "size": "{feedback.icon.size.200}"
+        "size": "{dimension.size.300}"
       }
     },
     "tag": {
       "colorScheme": {
         "light": {
           "primary": {
-            "background": "{primary.selectedBackground}",
-            "color": "{text.color}"
+            "background": "{background.brand.bold}",
+            "color": "{text.default}"
           },
           "secondary": {
-            "background": "{surface.200}",
-            "color": "{text.color}"
+            "background": "{background.disabled}",
+            "color": "{text.default}"
           },
           "success": {
-            "background": "{success.400}",
-            "color": "{success.900}"
+            "background": "{background.success.bold}",
+            "color": "{text.success}"
           },
           "info": {
-            "background": "{info.300}",
-            "color": "{info.900}"
+            "background": "{background.info.subtleHover}",
+            "color": "{text.info}"
           },
           "warn": {
-            "background": "{warn.300}",
-            "color": "{warn.900}"
+            "background": "{background.warning.subtleHover}",
+            "color": "{text.warning}"
           },
           "danger": {
-            "background": "{error.300}",
-            "color": "{error.900}"
+            "background": "{background.danger.subtleHover}",
+            "color": "{text.danger}"
+          },
+          "contrast": {
+            "background": "{background.surface.inverseStrong}",
+            "color": "{text.onBold}"
+          }
+        },
+        "dark": {
+          "primary": {
+            "background": "color-mix(in srgb, {background.brand.bold}, transparent 84%)",
+            "color": "{text.linkHover}"
+          },
+          "secondary": {
+            "background": "{background.surface.inverse}",
+            "color": "{text.disabled}"
+          },
+          "success": {
+            "background": "color-mix(in srgb, {background.brand.bold}, transparent 84%)",
+            "color": "{text.linkHover}"
+          },
+          "info": {
+            "background": "color-mix(in srgb, {background.info.bold}, transparent 84%)",
+            "color": "{colors.solid.blue.300}"
+          },
+          "warn": {
+            "background": "color-mix(in srgb, {background.warning.bold}, transparent 84%)",
+            "color": "{colors.solid.yellow.300}"
+          },
+          "danger": {
+            "background": "color-mix(in srgb, {background.danger.bold}, transparent 84%)",
+            "color": "{colors.solid.red.300}"
+          },
+          "contrast": {
+            "background": "{background.surface.raised}",
+            "color": "{text.defaultHover}"
           }
         }
       },
       "root": {
-        "fontSize": "{fonts.fontSize.100}",
-        "fontWeight": "{fonts.fontWeight.regular}",
-        "padding": "{media.padding.100} {media.padding.200}",
-        "gap": "{media.gap.100}",
-        "borderRadius": "{media.size.200}",
-        "roundedBorderRadius": "{media.borderRadius.400}"
+        "fontSize": "{typography.label.sm.fontSize}",
+        "fontWeight": "{typography.body.lg.fontWeight}",
+        "padding": "{dimension.space.100} {dimension.space.200}",
+        "gap": "{dimension.space.100}",
+        "borderRadius": "{dimension.size.200}",
+        "roundedBorderRadius": "{dimension.radius.500}"
       },
       "icon": {
-        "size": "{media.icon.size.100}"
+        "size": "{dimension.size.300}"
+      },
+      "extend": {
+        "fonts_fontFamily_base": "{typography.body.lg.fontFamily}",
+        "fonts_lineHeight_250": "{typography.caption.lineHeight}"
       }
     },
     "textarea": {
       "extend": {
-        "readonlyBackground": "{form.readonlyBackground}",
-        "borderWidth": "{form.borderWidth}",
-        "iconSize": "{form.icon.300}",
-        "minHeight": "{form.size.900}",
+        "readonlyBackground": "{background.neutral.subtleHover}",
+        "borderWidth": "{dimension.borderWidth.100}",
+        "iconSize": "{dimension.size.300}",
+        "minHeight": "{dimension.size.900}",
         "extXlg": {
-          "fontSize": "{fonts.fontSize.300}",
-          "paddingX": "{form.padding.300}",
-          "paddingY": "{form.padding.500}"
-        }
+          "fontSize": "{typography.body.md.fontSize}",
+          "paddingX": "{dimension.space.300}",
+          "paddingY": "{dimension.space.500}"
+        },
+        "focusRing_invalid": "{focusRing.invalid}",
+        "fonts_fontFamily_base": "{typography.body.lg.fontFamily}",
+        "fonts_lineHeight_250": "{typography.caption.lineHeight}",
+        "form_padding_500": "{dimension.space.500}",
+        "form_padding_700": "{dimension.space.700}"
       },
       "root": {
-        "background": "{form.background}",
-        "disabledBackground": "{form.disabledBackground}",
-        "filledBackground": "{form.filledBackground}",
-        "filledHoverBackground": "{form.filledHoverBackground}",
-        "filledFocusBackground": "{form.filledFocusBackground}",
-        "borderColor": "{form.borderColor}",
-        "hoverBorderColor": "{form.hoverBorderSecondaryColor}",
-        "focusBorderColor": "{form.focusBorderSecondaryColor}",
-        "invalidBorderColor": "{form.invalidBorderColor}",
-        "color": "{form.color}",
-        "disabledColor": "{form.disabledColor}",
-        "placeholderColor": "{form.placeholderColor}",
-        "invalidPlaceholderColor": "{form.invalidPlaceholderColor}",
+        "background": "{background.surface.field}",
+        "disabledBackground": "{background.disabled}",
+        "filledBackground": "{background.surface.field}",
+        "filledHoverBackground": "{background.surface.field}",
+        "filledFocusBackground": "{background.surface.field}",
+        "borderColor": "{border.default}",
+        "hoverBorderColor": "{border.brand}",
+        "focusBorderColor": "{border.brand}",
+        "invalidBorderColor": "{border.danger}",
+        "color": "{text.defaultHover}",
+        "disabledColor": "{text.muted}",
+        "placeholderColor": "{text.muted}",
+        "invalidPlaceholderColor": "{text.danger}",
         "shadow": "0",
-        "paddingX": "{form.padding.300}",
-        "paddingY": "{form.padding.300}",
-        "borderRadius": "{form.borderRadius.200}",
-        "transitionDuration": "{form.transitionDuration}",
+        "paddingX": "{dimension.space.300}",
+        "paddingY": "{dimension.space.300}",
+        "borderRadius": "{dimension.radius.300}",
+        "transitionDuration": "{dimension.duration.200}",
         "focusRing": {
-          "width": "{form.focusRing.width}",
-          "style": "{form.focusRing.style}",
-          "color": "{form.focusRing.color}",
-          "offset": "{form.focusRing.offset}",
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{focusRing.success}",
+          "offset": "{dimension.focusRing.offset}",
           "shadow": "0"
         },
         "sm": {
-          "fontSize": "{fonts.fontSize.300}",
-          "paddingX": "{form.padding.300}",
-          "paddingY": "{form.padding.200}"
+          "fontSize": "{typography.body.md.fontSize}",
+          "paddingX": "{dimension.space.300}",
+          "paddingY": "{dimension.space.200}"
         },
         "lg": {
-          "fontSize": "{fonts.fontSize.300}",
-          "paddingX": "{form.padding.300}",
-          "paddingY": "{form.padding.400}"
+          "fontSize": "{typography.body.md.fontSize}",
+          "paddingX": "{dimension.space.300}",
+          "paddingY": "{dimension.space.400}"
         }
       }
     },
     "tieredmenu": {
       "extend": {
         "extSubmenu": {
-          "borderColor": "{content.borderColor}",
-          "background": "{content.background}"
+          "borderColor": "{border.subtle}",
+          "background": "{background.surface.raised}"
         },
-        "iconSize": "{navigation.submenuIcon.size}",
+        "iconSize": "{typography.heading.sm.fontSize}",
         "extItem": {
           "caption": {
-            "gap": "{content.gap.100}",
-            "color": "{text.mutedColor}"
+            "gap": "{dimension.space.100}",
+            "color": "{text.muted}"
           }
-        }
+        },
+        "fonts_fontSize_200": "{typography.body.sm.fontSize}",
+        "fonts_fontSize_300": "{typography.body.md.fontSize}"
       },
       "root": {
-        "background": "{content.background}",
-        "borderColor": "{transparent}",
-        "color": "{content.color}",
-        "borderRadius": "{content.borderRadius}",
-        "shadow": "{navigation.shadow}",
-        "transitionDuration": "{feedback.transitionDuration}"
+        "background": "{background.surface.raised}",
+        "borderColor": "{border.transparent}",
+        "color": "{text.default}",
+        "borderRadius": "{dimension.radius.300}",
+        "shadow": "{shadow.400}",
+        "transitionDuration": "{dimension.duration.200}"
       },
       "list": {
-        "padding": "{navigation.list.padding.100}",
-        "gap": "{navigation.list.gap}"
+        "padding": "{dimension.space.100}",
+        "gap": "{dimension.space.100}"
       },
       "item": {
-        "focusBackground": "{navigation.item.focusBackground}",
-        "activeBackground": "{navigation.item.activeBackground}",
-        "color": "{navigation.item.color}",
-        "focusColor": "{navigation.item.focusColor}",
-        "activeColor": "{navigation.item.activeColor}",
-        "padding": "{navigation.item.padding}",
-        "borderRadius": "{navigation.item.borderRadius}",
-        "gap": "{navigation.item.gap}",
+        "focusBackground": "{background.neutral.subtleHover}",
+        "activeBackground": "{background.selected}",
+        "color": "{text.default}",
+        "focusColor": "{text.default}",
+        "activeColor": "{text.onBold}",
+        "padding": "{dimension.space.200} {dimension.space.300}",
+        "borderRadius": "{dimension.radius.200}",
+        "gap": "{dimension.space.200}",
         "icon": {
-          "color": "{navigation.item.icon.color}",
-          "focusColor": "{navigation.item.icon.focusColor}",
-          "activeColor": "{navigation.item.icon.activeColor}"
+          "color": "{icon.strong}",
+          "focusColor": "{icon.strong}",
+          "activeColor": "{icon.onBold}"
         }
       },
       "submenu": {
-        "mobileIndent": "{overlay.popover.padding.100}"
+        "mobileIndent": "{dimension.space.300}"
       },
       "separator": {
-        "borderColor": "{content.borderColor}"
+        "borderColor": "{border.subtle}"
+      },
+      "submenuIcon": {
+        "size": "{dimension.size.300}",
+        "color": "{icon.subtle}",
+        "focusColor": "{icon.default}",
+        "activeColor": "{icon.default}"
       }
     },
     "timeline": {
       "extend": {
         "extEvent": {
-          "gap": "{feedback.gap.100}"
-        }
+          "gap": "{dimension.space.100}"
+        },
+        "fonts_fontFamily_base": "{typography.body.lg.fontFamily}",
+        "fonts_fontSize_300": "{typography.body.md.fontSize}",
+        "fonts_lineHeight_500": "{typography.body.md.lineHeight}",
+        "text_color": "{text.default}"
       },
       "event": {
-        "minHeight": "{feedback.height.900}"
+        "minHeight": "{dimension.size.800}"
       },
       "vertical": {
         "eventContent": {
-          "padding": "0 {feedback.padding.100}"
+          "padding": "0 {dimension.space.200}"
         }
       },
       "horizontal": {
         "eventContent": {
-          "padding": "{feedback.padding.100} 0"
+          "padding": "{dimension.space.200} 0"
         }
       },
       "eventMarker": {
-        "size": "{feedback.width.500}",
-        "borderRadius": "{content.borderRadius}",
-        "borderWidth": "{feedback.width.200}",
-        "background": "{content.background}",
-        "borderColor": "{primary.color}",
+        "size": "{dimension.size.300}",
+        "borderRadius": "{dimension.radius.300}",
+        "borderWidth": "{dimension.size.150}",
+        "background": "{background.surface.raised}",
+        "borderColor": "{border.checked}",
         "content": {
-          "borderRadius": "{content.borderRadius}",
-          "size": "{feedback.width.400}",
-          "background": "{transparent}",
+          "borderRadius": "{dimension.radius.300}",
+          "size": "{dimension.size.250}",
+          "background": "{background.transparent}",
           "insetShadow": "none"
         }
       },
       "eventConnector": {
-        "color": "{content.borderColor}",
-        "size": "{feedback.width.100}"
+        "color": "{background.disabled}",
+        "size": "{dimension.size.100}"
       },
       "colorScheme": {
         "light": {
           "eventMarker": {
-            "background": "{content.background}",
-            "borderColor": "{primary.color}"
+            "background": "{background.surface.raised}",
+            "borderColor": "{border.checked}"
           }
         },
         "dark": {
           "eventMarker": {
-            "background": "{content.background}",
-            "borderColor": "{primary.color}"
+            "background": "{background.surface.raised}",
+            "borderColor": "{border.checked}"
           }
         }
       }
@@ -4880,191 +5817,1156 @@
     "togglebutton": {
       "extend": {
         "ext": {
-          "gap": "{form.gap.300}"
+          "gap": "{dimension.space.300}"
         },
         "iconSize": {
-          "sm": "{controls.iconOnly.200}",
-          "md": "{controls.iconOnly.300}",
-          "lg": "{controls.iconOnly.400}"
-        },
-        "iconOnlyWidth": "{form.size.600}",
-        "hoverBorderColor": "{surface.300}",
-        "checkedHoverColor": "{text.extend.colorInverted}",
-        "checkedHoverBackground": "{surface.800}",
-        "checkedHoverBorderColor": "{surface.800}",
+          "sm": "{dimension.size.300}",
+          "md": "{dimension.size.350}",
+          "lg": "{dimension.size.400}"
+        },
+        "iconOnlyWidth": "{dimension.size.600}",
+        "hoverBorderColor": "{border.default}",
+        "checkedHoverColor": "{text.onBold}",
+        "checkedHoverBackground": "{background.surface.inverse}",
+        "checkedHoverBorderColor": "{border.inverse}",
         "extXlg": {
-          "padding": "{form.padding.500} {form.padding.600}",
-          "iconOnlyWidth": "4.0714rem"
+          "padding": "{dimension.space.500} {dimension.space.600}",
+          "iconOnlyWidth": "{dimension.size.800}"
         },
         "extSm": {
-          "iconOnlyWidth": "2.1429rem"
+          "iconOnlyWidth": "{dimension.size.550}"
         },
         "extLg": {
-          "iconOnlyWidth": "3.5714rem"
-        }
+          "iconOnlyWidth": "{dimension.size.750}"
+        },
+        "fonts_fontFamily_heading": "{typography.heading.lg.fontFamily}",
+        "fonts_fontSize_500": "{typography.heading.sm.fontSize}",
+        "fonts_fontWeight_demibold": "{typography.heading.lg.fontWeight}",
+        "fonts_lineHeight_250": "{typography.caption.lineHeight}",
+        "fonts_lineHeight_300": "{typography.label.sm.lineHeight}",
+        "fonts_lineHeight_500": "{typography.body.md.lineHeight}",
+        "fonts_lineHeight_550": "{typography.body.lg.lineHeight}"
       },
       "colorScheme": {
         "light": {
           "root": {
-            "background": "{surface.200}",
-            "hoverBackground": "{surface.300}",
-            "borderColor": "{surface.200}",
-            "color": "{text.color}",
-            "hoverColor": "{text.color}",
-            "checkedBackground": "{surface.900}",
-            "checkedColor": "{text.extend.colorInverted}",
-            "checkedBorderColor": "{surface.900}",
-            "disabledBackground": "{form.disabledBackground}",
-            "disabledBorderColor": "{form.disabledBackground}",
-            "disabledColor": "{form.disabledColor}",
-            "invalidBorderColor": "{form.invalidBorderColor}"
+            "background": "{background.disabled}",
+            "hoverBackground": "{text.disabled}",
+            "borderColor": "{border.subtle}",
+            "color": "{text.default}",
+            "hoverColor": "{text.default}",
+            "checkedBackground": "{background.selected}",
+            "checkedColor": "{text.onBold}",
+            "checkedBorderColor": "{border.strong}",
+            "disabledBackground": "{background.disabled}",
+            "disabledBorderColor": "{border.subtle}",
+            "disabledColor": "{text.muted}",
+            "invalidBorderColor": "{border.danger}"
           },
           "icon": {
-            "color": "{text.color}",
-            "hoverColor": "{text.color}",
-            "checkedColor": "{text.extend.colorInverted}",
-            "disabledColor": "{form.disabledColor}"
+            "color": "{icon.strong}",
+            "hoverColor": "{icon.strong}",
+            "checkedColor": "{icon.onBold}",
+            "disabledColor": "{icon.subtle}"
           },
           "content": {
-            "checkedBackground": "{transparent}"
+            "checkedBackground": "{background.transparent}"
+          }
+        },
+        "dark": {
+          "root": {
+            "background": "{background.surface.inverseStrong}",
+            "checkedBackground": "{background.surface.inverseStrong}",
+            "hoverBackground": "{background.surface.inverseStrong}",
+            "borderColor": "{colors.solid.zinc.950}",
+            "color": "{text.hover.subtle}",
+            "hoverColor": "{text.disabled}",
+            "checkedColor": "{text.onBold}",
+            "checkedBorderColor": "{colors.solid.zinc.950}"
+          },
+          "content": {
+            "checkedBackground": "{background.surface.inverse}"
+          },
+          "icon": {
+            "color": "{text.hover.subtle}",
+            "hoverColor": "{text.disabled}",
+            "checkedColor": "{text.onBold}"
           }
         }
       },
       "root": {
-        "padding": "{form.padding.200} {form.padding.400}",
-        "borderRadius": "{form.borderRadius.300}",
-        "gap": "{form.gap.200}",
-        "fontWeight": "{fonts.fontWeight.demibold}",
+        "padding": "{dimension.space.200} {dimension.space.400}",
+        "borderRadius": "{dimension.radius.max}",
+        "gap": "{dimension.space.200}",
+        "fontWeight": "{typography.heading.lg.fontWeight}",
         "focusRing": {
-          "width": "{form.focusRing.width}",
-          "style": "{form.focusRing.style}",
-          "color": "{form.focusRing.color}",
-          "offset": "{form.focusRing.offset}",
-          "shadow": "{focusRing.shadow}"
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{focusRing.success}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "{shadow.200}"
         },
         "sm": {
-          "fontSize": "{fonts.fontSize.200}",
-          "padding": "{form.padding.100} {form.padding.300}"
+          "fontSize": "{typography.body.sm.fontSize}",
+          "padding": "{dimension.space.100} {dimension.space.300}"
         },
         "lg": {
-          "fontSize": "{fonts.fontSize.500}",
-          "padding": "{form.padding.400} {form.padding.600}"
+          "fontSize": "{typography.heading.sm.fontSize}",
+          "padding": "{dimension.space.400} {dimension.space.600}"
         },
-        "transitionDuration": "{form.transitionDuration}"
+        "transitionDuration": "{dimension.duration.200}",
+        "disabledBackground": "{background.disabled}",
+        "disabledBorderColor": "{background.disabled}",
+        "disabledColor": "{text.muted}",
+        "invalidBorderColor": "{border.danger}"
       },
       "content": {
         "checkedShadow": "none",
-        "padding": "0rem",
-        "borderRadius": "0rem",
+        "padding": "{dimension.space.none}",
+        "borderRadius": "{dimension.space.none}",
         "sm": {
-          "padding": "0rem"
+          "padding": "{dimension.space.none}"
         },
         "lg": {
-          "padding": "0rem"
+          "padding": "{dimension.space.none}"
         }
+      },
+      "icon": {
+        "disabledColor": "{text.muted}"
       }
     },
     "toggleswitch": {
       "colorScheme": {
         "light": {
           "root": {
-            "background": "{surface.400}",
-            "hoverBackground": "{surface.500}",
-            "disabledBackground": "{form.disabledBackground}",
-            "checkedBackground": "{surface.900}",
-            "checkedHoverBackground": "{surface.800}"
+            "background": "{text.hover.subtle}",
+            "hoverBackground": "{background.neutral.bold}",
+            "disabledBackground": "{background.disabled}",
+            "checkedBackground": "{background.selected}",
+            "checkedHoverBackground": "{background.surface.inverse}"
+          },
+          "handle": {
+            "background": "{text.staticLight}",
+            "hoverBackground": "{text.staticLight}",
+            "disabledBackground": "{background.neutral.bold}",
+            "checkedBackground": "{background.surface.canvas}",
+            "checkedHoverBackground": "{background.surface.canvas}",
+            "color": "{text.default}",
+            "hoverColor": "{text.default}",
+            "checkedColor": "{text.default}",
+            "checkedHoverColor": "{text.default}"
+          }
+        },
+        "dark": {
+          "root": {
+            "background": "{background.selectedStrong}",
+            "disabledBackground": "{background.neutral.boldHover}",
+            "hoverBackground": "{background.neutral.boldHover}",
+            "checkedBackground": "{background.brand.bold}",
+            "checkedHoverBackground": "{background.brand.boldHover}"
           },
           "handle": {
-            "background": "{form.backgroundHandler}",
-            "hoverBackground": "{form.backgroundHandler}",
-            "disabledBackground": "{form.disabledColor}",
-            "checkedBackground": "{surface.0}",
-            "checkedHoverBackground": "{surface.0}",
-            "color": "{text.color}",
-            "hoverColor": "{text.color}",
-            "checkedColor": "{text.color}",
-            "checkedHoverColor": "{text.color}"
+            "background": "{surface.400}",
+            "disabledBackground": "{background.selected}",
+            "hoverBackground": "{surface.300}",
+            "checkedBackground": "{background.selected}",
+            "checkedHoverBackground": "{background.selected}",
+            "color": "{text.default}",
+            "hoverColor": "{colors.solid.zinc.800}",
+            "checkedColor": "{text.brand}",
+            "checkedHoverColor": "{background.brand.boldHover}"
           }
         }
       },
       "root": {
-        "width": "{form.size.600}",
-        "height": "{form.size.400}",
-        "borderRadius": "{form.borderRadius.300}",
-        "gap": "{form.gap.100}",
-        "borderWidth": "{form.borderWidth}",
+        "width": "{dimension.size.600}",
+        "height": "{dimension.size.400}",
+        "borderRadius": "{dimension.radius.max}",
+        "gap": "{dimension.space.100}",
+        "borderWidth": "{dimension.borderWidth.100}",
         "shadow": "none",
         "focusRing": {
-          "width": "{form.focusRing.width}",
-          "style": "{form.focusRing.style}",
-          "color": "{form.focusRing.color}",
-          "offset": "{form.focusRing.offset}",
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{focusRing.success}",
+          "offset": "{dimension.focusRing.offset}",
           "shadow": "0"
         },
-        "borderColor": "{transparent}",
-        "hoverBorderColor": "{transparent}",
-        "checkedBorderColor": "{transparent}",
-        "checkedHoverBorderColor": "{transparent}",
-        "invalidBorderColor": "{form.invalidBorderColor}",
-        "transitionDuration": "{form.transitionDuration}",
-        "slideDuration": "{form.transitionDuration}"
+        "borderColor": "{border.transparent}",
+        "hoverBorderColor": "{border.transparent}",
+        "checkedBorderColor": "{border.transparent}",
+        "checkedHoverBorderColor": "{border.transparent}",
+        "invalidBorderColor": "{border.danger}",
+        "transitionDuration": "{dimension.duration.200}",
+        "slideDuration": "{dimension.duration.200}"
       },
       "handle": {
-        "borderRadius": "{form.borderRadius.300}",
-        "size": "{form.size.300}"
+        "borderRadius": "{dimension.radius.max}",
+        "size": "{dimension.size.300}"
+      },
+      "extend": {
+        "focusRing_invalid": "{focusRing.invalid}",
+        "focusRing_success": "{focusRing.success}",
+        "focusRing_width": "{dimension.space.100}"
       }
     },
     "tooltip": {
       "colorScheme": {
         "light": {
           "root": {
-            "background": "{surface.900}",
-            "color": "{text.extend.colorInverted}"
+            "background": "{background.selected}",
+            "color": "{text.onBold}"
+          }
+        },
+        "dark": {
+          "root": {
+            "background": "{background.selectedStrong}",
+            "color": "{text.onBold}"
           }
         }
       },
       "root": {
-        "maxWidth": "{overlay.width}",
-        "gutter": "{feedback.gap.100}",
-        "shadow": "{overlay.popover.shadow}",
-        "padding": "{feedback.padding.100} {feedback.padding.200} ",
-        "borderRadius": "{overlay.popover.borderRadius}"
+        "maxWidth": "{dimension.overlayWidth.base}",
+        "gutter": "{dimension.space.100}",
+        "shadow": "{shadow.400}",
+        "padding": "{dimension.space.200} {dimension.space.400} ",
+        "borderRadius": "{dimension.radius.200}"
+      },
+      "extend": {
+        "fonts_fontFamily_base": "{typography.body.lg.fontFamily}",
+        "fonts_fontSize_200": "{typography.body.sm.fontSize}",
+        "fonts_fontWeight_regular": "{typography.body.lg.fontWeight}",
+        "fonts_lineHeight_300": "{typography.label.sm.lineHeight}"
       }
     },
     "tree": {
       "root": {
-        "background": "{content.background}",
-        "color": "{content.color}",
-        "padding": "{data.padding.400}",
-        "gap": "{data.gap.100}",
-        "indent": "{data.padding.400}"
+        "background": "{background.surface.raised}",
+        "color": "{text.default}",
+        "padding": "{dimension.space.400}",
+        "gap": "{dimension.space.100}",
+        "indent": "{dimension.space.400}",
+        "transitionDuration": "{dimension.duration.200}"
       },
       "node": {
-        "padding": "{data.padding.200} {data.padding.300}",
-        "color": "{text.color}",
-        "selectedColor": "{text.extend.colorInverted}",
-        "gap": "{data.gap.100}"
+        "padding": "{dimension.space.200} {dimension.space.300}",
+        "color": "{text.default}",
+        "selectedColor": "{text.onBold}",
+        "gap": "{dimension.space.100}",
+        "borderRadius": "{dimension.radius.300}",
+        "hoverBackground": "{background.surface.hover.section}",
+        "selectedBackground": "{background.brand.subtleHover}",
+        "hoverColor": "{text.hover.default}",
+        "focusRing": {
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{focusRing.default}",
+          "offset": "-1px",
+          "shadow": "0"
+        }
       },
       "nodeIcon": {
-        "selectedColor": "{text.extend.colorInverted}"
+        "selectedColor": "{icon.onBold}",
+        "color": "{text.muted}",
+        "hoverColor": "{text.hover.muted}"
       },
       "nodeToggleButton": {
-        "borderRadius": "{data.borderRadius}",
-        "size": "{data.icon.size.400}",
-        "selectedHoverBackground": "{surface.900}"
+        "borderRadius": "{dimension.radius.100}",
+        "size": "{dimension.size.450}",
+        "selectedHoverBackground": "{background.selected}",
+        "hoverBackground": "{background.surface.hover.section}",
+        "color": "{text.muted}",
+        "hoverColor": "{text.hover.muted}",
+        "selectedHoverColor": "{text.brand}",
+        "focusRing": {
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{focusRing.default}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "0"
+        }
       },
       "loadingIcon": {
-        "size": "{data.icon.size.100}"
+        "size": "{dimension.size.300}"
       },
       "filter": {
-        "margin": "0 0 {data.padding.200} 0"
+        "margin": "0 0 {dimension.space.200} 0"
       }
     },
     "overlaybadge": {
       "root": {
         "outline": {
-          "width": "0rem",
-          "color": "{transparent}"
+          "width": "{dimension.space.none}",
+          "color": "{text.transparent}"
+        }
+      }
+    },
+    "blockui": {
+      "root": {
+        "borderRadius": "{dimension.radius.300}"
+      }
+    },
+    "cascadeselect": {
+      "root": {
+        "background": "{background.surface.field}",
+        "disabledBackground": "{background.disabled}",
+        "filledBackground": "{background.surface.field}",
+        "filledHoverBackground": "{background.surface.field}",
+        "filledFocusBackground": "{background.surface.field}",
+        "borderColor": "{border.default}",
+        "hoverBorderColor": "{border.brand}",
+        "focusBorderColor": "{border.brand}",
+        "invalidBorderColor": "{border.danger}",
+        "color": "{text.default}",
+        "disabledColor": "{text.muted}",
+        "placeholderColor": "{text.placeholder}",
+        "invalidPlaceholderColor": "{text.danger}",
+        "shadow": "0",
+        "paddingX": "{dimension.space.300}",
+        "paddingY": "{dimension.space.300}",
+        "borderRadius": "{dimension.radius.300}",
+        "focusRing": {
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{focusRing.default}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "0"
+        },
+        "transitionDuration": "{dimension.duration.200}",
+        "sm": {
+          "fontSize": "{typography.body.md.fontSize}",
+          "paddingX": "{dimension.space.300}",
+          "paddingY": "{dimension.space.200}"
+        },
+        "lg": {
+          "fontSize": "{typography.body.md.fontSize}",
+          "paddingX": "{dimension.space.300}",
+          "paddingY": "{dimension.space.400}"
+        }
+      },
+      "dropdown": {
+        "width": "{dimension.space.900}",
+        "color": "{icon.subtle}"
+      },
+      "overlay": {
+        "background": "{background.surface.overlay}",
+        "borderColor": "{border.subtle}",
+        "borderRadius": "{dimension.radius.300}",
+        "color": "{text.default}",
+        "shadow": "{shadow.400}"
+      },
+      "list": {
+        "padding": "{dimension.space.100}",
+        "gap": "{dimension.space.100}",
+        "mobileIndent": "{dimension.space.400}"
+      },
+      "option": {
+        "focusBackground": "{background.surface.hover.section}",
+        "selectedBackground": "{background.selected}",
+        "selectedFocusBackground": "{background.selectedStrong}",
+        "color": "{text.default}",
+        "focusColor": "{text.default}",
+        "selectedColor": "{text.onBold}",
+        "selectedFocusColor": "{text.onBold}",
+        "padding": "{dimension.space.200}",
+        "borderRadius": "{dimension.radius.200}",
+        "icon": {
+          "color": "{icon.subtle}",
+          "focusColor": "{icon.default}",
+          "size": "{dimension.space.400}"
+        }
+      },
+      "clearIcon": {
+        "color": "{icon.subtle}"
+      }
+    },
+    "colorpicker": {
+      "root": {
+        "transitionDuration": "{dimension.duration.200}"
+      },
+      "preview": {
+        "width": "{dimension.space.600}",
+        "height": "{dimension.space.600}",
+        "borderRadius": "{dimension.radius.300}",
+        "focusRing": {
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{focusRing.default}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "0"
+        }
+      },
+      "panel": {
+        "shadow": "{shadow.400}",
+        "borderRadius": "{dimension.radius.300}"
+      },
+      "colorScheme": {
+        "light": {
+          "panel": {
+            "background": "{background.surface.inverse}",
+            "borderColor": "{border.strong}"
+          },
+          "handle": {
+            "color": "{text.onBold}"
+          }
+        },
+        "dark": {
+          "panel": {
+            "background": "{background.selected}",
+            "borderColor": "{border.default}"
+          },
+          "handle": {
+            "color": "{text.onBold}"
+          }
+        }
+      }
+    },
+    "dock": {
+      "root": {
+        "background": "{colors.alpha.white.100}",
+        "borderColor": "{colors.alpha.white.200}",
+        "padding": "{dimension.space.200}",
+        "borderRadius": "{dimension.radius.300}"
+      },
+      "item": {
+        "borderRadius": "{dimension.radius.300}",
+        "padding": "{dimension.space.200}",
+        "size": "{dimension.size.700}",
+        "focusRing": {
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{focusRing.default}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "0"
+        }
+      }
+    },
+    "editor": {
+      "toolbar": {
+        "background": "{background.surface.raised}",
+        "borderColor": "{border.subtle}",
+        "borderRadius": "{dimension.radius.300}"
+      },
+      "toolbarItem": {
+        "color": "{text.muted}",
+        "hoverColor": "{text.default}",
+        "activeColor": "{text.brand}"
+      },
+      "overlay": {
+        "background": "{background.surface.overlay}",
+        "borderColor": "{border.subtle}",
+        "borderRadius": "{dimension.radius.300}",
+        "color": "{text.default}",
+        "shadow": "{shadow.400}",
+        "padding": "{dimension.space.100}"
+      },
+      "overlayOption": {
+        "focusBackground": "{background.surface.hover.section}",
+        "color": "{text.default}",
+        "focusColor": "{text.default}",
+        "padding": "{dimension.space.200}",
+        "borderRadius": "{dimension.radius.200}"
+      },
+      "content": {
+        "background": "{background.surface.raised}",
+        "borderColor": "{border.subtle}",
+        "color": "{text.default}",
+        "borderRadius": "{dimension.radius.300}"
+      }
+    },
+    "fieldset": {
+      "root": {
+        "background": "{background.surface.raised}",
+        "borderColor": "{border.subtle}",
+        "borderRadius": "{dimension.radius.300}",
+        "color": "{text.default}",
+        "padding": "0 1.125rem 1.125rem 1.125rem",
+        "transitionDuration": "{dimension.duration.200}"
+      },
+      "legend": {
+        "background": "{background.surface.raised}",
+        "hoverBackground": "{background.surface.hover.section}",
+        "color": "{text.default}",
+        "hoverColor": "{text.hover.default}",
+        "borderRadius": "{dimension.radius.300}",
+        "borderWidth": "1px",
+        "borderColor": "transparent",
+        "padding": "{dimension.space.200} {dimension.space.300}",
+        "gap": "{dimension.space.200}",
+        "fontWeight": "600",
+        "focusRing": {
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{focusRing.default}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "0"
+        }
+      },
+      "toggleIcon": {
+        "color": "{text.muted}",
+        "hoverColor": "{text.hover.muted}"
+      },
+      "content": {
+        "padding": "0"
+      }
+    },
+    "iftalabel": {
+      "root": {
+        "color": "{text.muted}",
+        "focusColor": "{text.brand}",
+        "invalidColor": "{text.danger}",
+        "transitionDuration": "0.2s",
+        "positionX": "{dimension.space.300}",
+        "top": "{dimension.space.300}",
+        "fontSize": "{dimension.space.300}",
+        "fontWeight": "400"
+      },
+      "input": {
+        "paddingTop": "{dimension.space.600}",
+        "paddingBottom": "{dimension.space.300}"
+      }
+    },
+    "iconfield": {
+      "icon": {
+        "color": "{icon.subtle}"
+      }
+    },
+    "image": {
+      "root": {
+        "transitionDuration": "{dimension.duration.200}"
+      },
+      "preview": {
+        "icon": {
+          "size": "{dimension.space.600}"
+        },
+        "mask": {
+          "background": "{background.scrim.modal}",
+          "color": "{text.muted}"
+        }
+      },
+      "toolbar": {
+        "position": {
+          "left": "auto",
+          "right": "{dimension.space.400}",
+          "top": "{dimension.space.400}",
+          "bottom": "auto"
+        },
+        "blur": "8px",
+        "background": "{colors.alpha.white.100}",
+        "borderColor": "{colors.alpha.white.200}",
+        "borderWidth": "1px",
+        "borderRadius": "30px",
+        "padding": "{dimension.space.200}",
+        "gap": "{dimension.space.200}"
+      },
+      "action": {
+        "hoverBackground": "{colors.alpha.white.100}",
+        "color": "{colors.solid.zinc.50}",
+        "hoverColor": "{text.onBold}",
+        "size": "{dimension.size.700}",
+        "iconSize": "{dimension.space.600}",
+        "borderRadius": "50%",
+        "focusRing": {
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{focusRing.default}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "0"
+        }
+      }
+    },
+    "imagecompare": {
+      "handle": {
+        "size": "15px",
+        "hoverSize": "30px",
+        "background": "{colors.alpha.white.300}",
+        "hoverBackground": "{colors.alpha.white.300}",
+        "borderColor": "unset",
+        "hoverBorderColor": "unset",
+        "borderWidth": "0",
+        "borderRadius": "50%",
+        "transitionDuration": "{dimension.duration.200}",
+        "focusRing": {
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{colors.alpha.white.300}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "0"
+        }
+      }
+    },
+    "inlinemessage": {
+      "root": {
+        "padding": "{dimension.space.300} {dimension.space.300}",
+        "borderRadius": "{dimension.radius.300}",
+        "gap": "{dimension.space.200}"
+      },
+      "text": {
+        "fontWeight": "500"
+      },
+      "icon": {
+        "size": "{dimension.space.400}"
+      },
+      "colorScheme": {
+        "light": {
+          "info": {
+            "background": "color-mix(in srgb, {background.info.subtle}, transparent 5%)",
+            "borderColor": "{colors.solid.blue.200}",
+            "color": "{text.info}",
+            "shadow": "0px 4px 8px 0px color-mix(in srgb, {background.info.bold}, transparent 96%)"
+          },
+          "success": {
+            "background": "color-mix(in srgb, {background.brand.subtle}, transparent 5%)",
+            "borderColor": "{colors.solid.green.200}",
+            "color": "{text.link}",
+            "shadow": "0px 4px 8px 0px color-mix(in srgb, {primary.color}, transparent 96%)"
+          },
+          "warn": {
+            "background": "color-mix(in srgb,{background.warning.subtle}, transparent 5%)",
+            "borderColor": "{colors.solid.yellow.200}",
+            "color": "{text.warning}",
+            "shadow": "0px 4px 8px 0px color-mix(in srgb, {background.warning.bold}, transparent 96%)"
+          },
+          "error": {
+            "background": "color-mix(in srgb, {background.danger.subtle}, transparent 5%)",
+            "borderColor": "{colors.solid.red.200}",
+            "color": "{text.danger}",
+            "shadow": "0px 4px 8px 0px color-mix(in srgb, {background.danger.bold}, transparent 96%)"
+          },
+          "secondary": {
+            "background": "{background.neutral.subtleHover}",
+            "borderColor": "{border.subtle}",
+            "color": "{text.subtle}",
+            "shadow": "0px 4px 8px 0px color-mix(in srgb, {background.neutral.bold}, transparent 96%)"
+          },
+          "contrast": {
+            "background": "{background.selected}",
+            "borderColor": "{colors.solid.zinc.950}",
+            "color": "{colors.solid.zinc.50}",
+            "shadow": "0px 4px 8px 0px color-mix(in srgb, {background.surface.inverseStrong}, transparent 96%)"
+          }
+        },
+        "dark": {
+          "info": {
+            "background": "color-mix(in srgb, {background.info.bold}, transparent 84%)",
+            "borderColor": "color-mix(in srgb, {colors.solid.blue.700}, transparent 64%)",
+            "color": "{colors.solid.blue.500}",
+            "shadow": "0px 4px 8px 0px color-mix(in srgb, {background.info.bold}, transparent 96%)"
+          },
+          "success": {
+            "background": "color-mix(in srgb, {background.brand.bold}, transparent 84%)",
+            "borderColor": "color-mix(in srgb, {colors.solid.green.700}, transparent 64%)",
+            "color": "{colors.solid.green.500}",
+            "shadow": "0px 4px 8px 0px color-mix(in srgb, {background.brand.bold}, transparent 96%)"
+          },
+          "warn": {
+            "background": "color-mix(in srgb, {background.warning.bold}, transparent 84%)",
+            "borderColor": "color-mix(in srgb, {colors.solid.yellow.700}, transparent 64%)",
+            "color": "{colors.solid.yellow.500}",
+            "shadow": "0px 4px 8px 0px color-mix(in srgb, {background.warning.bold}, transparent 96%)"
+          },
+          "error": {
+            "background": "color-mix(in srgb, {background.danger.bold}, transparent 84%)",
+            "borderColor": "color-mix(in srgb, {colors.solid.red.700}, transparent 64%)",
+            "color": "{colors.solid.red.500}",
+            "shadow": "0px 4px 8px 0px color-mix(in srgb, {background.danger.bold}, transparent 96%)"
+          },
+          "secondary": {
+            "background": "{background.surface.inverse}",
+            "borderColor": "{border.default}",
+            "color": "{text.disabled}",
+            "shadow": "0px 4px 8px 0px color-mix(in srgb, {background.neutral.bold}, transparent 96%)"
+          },
+          "contrast": {
+            "background": "{background.surface.raised}",
+            "borderColor": "{border.strong}",
+            "color": "{text.defaultHover}",
+            "shadow": "0px 4px 8px 0px color-mix(in srgb, {background.surface.inverseStrong}, transparent 96%)"
+          }
+        }
+      }
+    },
+    "inplace": {
+      "root": {
+        "padding": "{dimension.space.300} {dimension.space.300}",
+        "borderRadius": "{dimension.radius.300}",
+        "focusRing": {
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{focusRing.default}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "0"
+        },
+        "transitionDuration": "{dimension.duration.200}"
+      },
+      "display": {
+        "hoverBackground": "{background.surface.hover.section}",
+        "hoverColor": "{text.hover.default}"
+      }
+    },
+    "inputchips": {
+      "root": {
+        "background": "{background.surface.field}",
+        "disabledBackground": "{background.disabled}",
+        "filledBackground": "{background.surface.field}",
+        "filledFocusBackground": "{background.surface.field}",
+        "borderColor": "{border.default}",
+        "hoverBorderColor": "{border.brand}",
+        "focusBorderColor": "{border.brand}",
+        "invalidBorderColor": "{border.danger}",
+        "color": "{text.default}",
+        "disabledColor": "{text.muted}",
+        "placeholderColor": "{text.placeholder}",
+        "shadow": "0",
+        "paddingX": "{dimension.space.300}",
+        "paddingY": "{dimension.space.300}",
+        "borderRadius": "{dimension.radius.300}",
+        "focusRing": {
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{focusRing.default}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "0"
+        },
+        "transitionDuration": "{dimension.duration.200}"
+      },
+      "chip": {
+        "borderRadius": "{dimension.radius.100}"
+      },
+      "colorScheme": {
+        "light": {
+          "chip": {
+            "focusBackground": "{background.disabled}",
+            "color": "{text.hoverColor}"
+          }
+        },
+        "dark": {
+          "chip": {
+            "focusBackground": "{background.selectedStrong}",
+            "color": "{text.onBold}"
+          }
+        }
+      }
+    },
+    "knob": {
+      "root": {
+        "transitionDuration": "{dimension.duration.200}",
+        "focusRing": {
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{focusRing.default}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "0"
+        }
+      },
+      "value": {
+        "background": "{background.brand.bold}"
+      },
+      "range": {
+        "background": "{border.subtle}"
+      },
+      "text": {
+        "color": "{text.muted}"
+      }
+    },
+    "orderlist": {
+      "root": {
+        "gap": "{dimension.space.500}"
+      },
+      "controls": {
+        "gap": "{dimension.space.200}"
+      }
+    },
+    "organizationchart": {
+      "root": {
+        "gutter": "{dimension.space.300}",
+        "transitionDuration": "{dimension.duration.200}"
+      },
+      "node": {
+        "background": "{background.surface.raised}",
+        "hoverBackground": "{background.surface.hover.section}",
+        "selectedBackground": "{background.brand.subtleHover}",
+        "borderColor": "{border.subtle}",
+        "color": "{text.default}",
+        "selectedColor": "{text.brand}",
+        "hoverColor": "{text.hover.default}",
+        "padding": "{dimension.space.300} {dimension.space.400}",
+        "toggleablePadding": "{dimension.space.300} {dimension.space.400} {dimension.space.500} {dimension.space.400}",
+        "borderRadius": "{dimension.radius.300}"
+      },
+      "nodeToggleButton": {
+        "background": "{background.surface.raised}",
+        "hoverBackground": "{background.surface.hover.section}",
+        "borderColor": "{border.subtle}",
+        "color": "{text.muted}",
+        "hoverColor": "{text.default}",
+        "size": "{dimension.space.600}",
+        "borderRadius": "50%",
+        "focusRing": {
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{focusRing.default}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "0"
+        }
+      },
+      "connector": {
+        "color": "{border.subtle}",
+        "borderRadius": "{dimension.radius.300}",
+        "height": "24px"
+      }
+    },
+    "panel": {
+      "root": {
+        "background": "{background.surface.raised}",
+        "borderColor": "{border.subtle}",
+        "color": "{text.default}",
+        "borderRadius": "{dimension.radius.300}"
+      },
+      "header": {
+        "background": "transparent",
+        "color": "{text.default}",
+        "padding": "{dimension.space.500}",
+        "borderColor": "{border.subtle}",
+        "borderWidth": "0",
+        "borderRadius": "0"
+      },
+      "toggleableHeader": {
+        "padding": "0.375rem 1.125rem"
+      },
+      "title": {
+        "fontWeight": "600"
+      },
+      "content": {
+        "padding": "0 1.125rem 1.125rem 1.125rem"
+      },
+      "footer": {
+        "padding": "0 1.125rem 1.125rem 1.125rem"
+      }
+    },
+    "picklist": {
+      "root": {
+        "gap": "{dimension.space.500}"
+      },
+      "controls": {
+        "gap": "{dimension.space.200}"
+      }
+    },
+    "speeddial": {
+      "root": {
+        "gap": "{dimension.space.200}",
+        "transitionDuration": "{dimension.duration.200}"
+      }
+    },
+    "splitbutton": {
+      "root": {
+        "borderRadius": "{dimension.radius.300}",
+        "roundedBorderRadius": "{dimension.space.800}",
+        "raisedShadow": "0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12)"
+      }
+    },
+    "tabmenu": {
+      "root": {
+        "transitionDuration": "{dimension.duration.200}"
+      },
+      "tablist": {
+        "borderWidth": "0 0 1px 0",
+        "background": "{background.surface.raised}",
+        "borderColor": "{border.subtle}"
+      },
+      "item": {
+        "background": "transparent",
+        "hoverBackground": "transparent",
+        "activeBackground": "transparent",
+        "borderWidth": "0 0 1px 0",
+        "borderColor": "{border.subtle}",
+        "hoverBorderColor": "{border.subtle}",
+        "activeBorderColor": "{border.brand}",
+        "color": "{text.muted}",
+        "hoverColor": "{text.default}",
+        "activeColor": "{text.brand}",
+        "padding": "{dimension.space.400} 1.125rem",
+        "fontWeight": "600",
+        "margin": "0 0 -1px 0",
+        "gap": "{dimension.space.200}",
+        "focusRing": {
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{focusRing.default}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "0"
+        }
+      },
+      "itemIcon": {
+        "color": "{text.muted}",
+        "hoverColor": "{text.default}",
+        "activeColor": "{text.brand}"
+      },
+      "activeBar": {
+        "height": "1px",
+        "bottom": "-1px",
+        "background": "{background.brand.bold}"
+      }
+    },
+    "tabview": {
+      "root": {
+        "transitionDuration": "{dimension.duration.200}"
+      },
+      "tabList": {
+        "background": "{background.surface.raised}",
+        "borderColor": "{border.subtle}"
+      },
+      "tab": {
+        "borderColor": "{border.subtle}",
+        "activeBorderColor": "{border.brand}",
+        "color": "{text.muted}",
+        "hoverColor": "{text.default}",
+        "activeColor": "{text.brand}"
+      },
+      "tabPanel": {
+        "background": "{background.surface.raised}",
+        "color": "{text.default}"
+      },
+      "navButton": {
+        "background": "{background.surface.raised}",
+        "color": "{text.muted}",
+        "hoverColor": "{text.default}"
+      },
+      "colorScheme": {
+        "light": {
+          "navButton": {
+            "shadow": "0px 0px 10px 50px rgba(255, 255, 255, 0.6)"
+          }
+        },
+        "dark": {
+          "navButton": {
+            "shadow": "0px 0px 10px 50px color-mix(in srgb, {background.surface.raised}, transparent 50%)"
+          }
+        }
+      }
+    },
+    "terminal": {
+      "root": {
+        "background": "{background.surface.field}",
+        "borderColor": "{border.default}",
+        "color": "{text.default}",
+        "height": "{size.72x}",
+        "padding": "{dimension.space.300} {dimension.space.300}",
+        "borderRadius": "{dimension.radius.300}"
+      },
+      "prompt": {
+        "gap": "{dimension.space.100}"
+      },
+      "commandResponse": {
+        "margin": "2px 0"
+      }
+    },
+    "treeselect": {
+      "root": {
+        "background": "{background.surface.field}",
+        "disabledBackground": "{background.disabled}",
+        "filledBackground": "{background.surface.field}",
+        "filledHoverBackground": "{background.surface.field}",
+        "filledFocusBackground": "{background.surface.field}",
+        "borderColor": "{border.default}",
+        "hoverBorderColor": "{border.brand}",
+        "focusBorderColor": "{border.brand}",
+        "invalidBorderColor": "{border.danger}",
+        "color": "{text.default}",
+        "disabledColor": "{text.muted}",
+        "placeholderColor": "{text.placeholder}",
+        "invalidPlaceholderColor": "{text.danger}",
+        "shadow": "0",
+        "paddingX": "{dimension.space.300}",
+        "paddingY": "{dimension.space.300}",
+        "borderRadius": "{dimension.radius.300}",
+        "focusRing": {
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{focusRing.default}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "0"
+        },
+        "transitionDuration": "{dimension.duration.200}",
+        "sm": {
+          "fontSize": "{typography.body.md.fontSize}",
+          "paddingX": "{dimension.space.300}",
+          "paddingY": "{dimension.space.200}"
+        },
+        "lg": {
+          "fontSize": "{typography.body.md.fontSize}",
+          "paddingX": "{dimension.space.300}",
+          "paddingY": "{dimension.space.400}"
+        }
+      },
+      "dropdown": {
+        "width": "{dimension.space.900}",
+        "color": "{icon.subtle}"
+      },
+      "overlay": {
+        "background": "{background.surface.overlay}",
+        "borderColor": "{border.subtle}",
+        "borderRadius": "{dimension.radius.300}",
+        "color": "{text.default}",
+        "shadow": "{shadow.400}"
+      },
+      "tree": {
+        "padding": "{dimension.space.100}"
+      },
+      "emptyMessage": {
+        "padding": "{dimension.space.200}"
+      },
+      "chip": {
+        "borderRadius": "{dimension.radius.100}"
+      },
+      "clearIcon": {
+        "color": "{icon.subtle}"
+      }
+    },
+    "treetable": {
+      "root": {
+        "transitionDuration": "{dimension.duration.200}"
+      },
+      "header": {
+        "background": "{background.surface.raised}",
+        "borderColor": "{border.subtle}",
+        "color": "{text.default}",
+        "borderWidth": "0 0 1px 0",
+        "padding": "{dimension.space.300} {dimension.space.400}"
+      },
+      "headerCell": {
+        "background": "{background.surface.raised}",
+        "hoverBackground": "{background.surface.hover.section}",
+        "selectedBackground": "{background.brand.subtleHover}",
+        "borderColor": "{border.subtle}",
+        "color": "{text.default}",
+        "hoverColor": "{text.hover.default}",
+        "selectedColor": "{text.brand}",
+        "gap": "{dimension.space.200}",
+        "padding": "{dimension.space.300} {dimension.space.400}",
+        "focusRing": {
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{focusRing.default}",
+          "offset": "-1px",
+          "shadow": "0"
+        }
+      },
+      "columnTitle": {
+        "fontWeight": "600"
+      },
+      "row": {
+        "background": "{background.surface.raised}",
+        "hoverBackground": "{background.surface.hover.section}",
+        "selectedBackground": "{background.brand.subtleHover}",
+        "color": "{text.default}",
+        "hoverColor": "{text.hover.default}",
+        "selectedColor": "{text.brand}",
+        "focusRing": {
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{focusRing.default}",
+          "offset": "-1px",
+          "shadow": "0"
+        }
+      },
+      "bodyCell": {
+        "borderColor": "{border.subtle}",
+        "padding": "{dimension.space.300} {dimension.space.400}",
+        "gap": "{dimension.space.200}"
+      },
+      "footerCell": {
+        "background": "{background.surface.raised}",
+        "borderColor": "{border.subtle}",
+        "color": "{text.default}",
+        "padding": "{dimension.space.300} {dimension.space.400}"
+      },
+      "columnFooter": {
+        "fontWeight": "600"
+      },
+      "footer": {
+        "background": "{background.surface.raised}",
+        "borderColor": "{border.subtle}",
+        "color": "{text.default}",
+        "borderWidth": "0 0 1px 0",
+        "padding": "{dimension.space.300} {dimension.space.400}"
+      },
+      "columnResizer": {
+        "width": "{dimension.space.200}"
+      },
+      "resizeIndicator": {
+        "width": "1px",
+        "color": "{text.brand}"
+      },
+      "sortIcon": {
+        "color": "{text.muted}",
+        "hoverColor": "{text.hover.muted}",
+        "size": "{dimension.space.400}"
+      },
+      "loadingIcon": {
+        "size": "{dimension.space.800}"
+      },
+      "nodeToggleButton": {
+        "hoverBackground": "{background.surface.hover.section}",
+        "selectedHoverBackground": "{background.surface.raised}",
+        "color": "{text.muted}",
+        "hoverColor": "{text.default}",
+        "selectedHoverColor": "{text.brand}",
+        "size": "{dimension.space.700}",
+        "borderRadius": "50%",
+        "focusRing": {
+          "width": "{dimension.borderWidth.300}",
+          "style": "{dimension.focusRing.style}",
+          "color": "{focusRing.default}",
+          "offset": "{dimension.focusRing.offset}",
+          "shadow": "0"
+        }
+      },
+      "paginatorTop": {
+        "borderColor": "{border.subtle}",
+        "borderWidth": "0 0 1px 0"
+      },
+      "paginatorBottom": {
+        "borderColor": "{border.subtle}",
+        "borderWidth": "0 0 1px 0"
+      },
+      "colorScheme": {
+        "light": {
+          "root": {
+            "borderColor": "{border.subtle}"
+          },
+          "bodyCell": {
+            "selectedBorderColor": "{colors.solid.green.100}"
+          }
+        },
+        "dark": {
+          "root": {
+            "borderColor": "{border.inverse}"
+          },
+          "bodyCell": {
+            "selectedBorderColor": "{colors.solid.green.900}"
+          }
+        }
+      }
+    },
+    "toolbar": {
+      "root": {
+        "background": "{background.surface.raised}",
+        "borderColor": "{border.subtle}",
+        "borderRadius": "{dimension.radius.300}",
+        "color": "{text.default}",
+        "gap": "{dimension.space.200}",
+        "padding": "{dimension.space.300}"
+      }
+    },
+    "virtualscroller": {
+      "loader": {
+        "mask": {
+          "background": "{background.surface.raised}",
+          "color": "{text.muted}"
+        },
+        "icon": {
+          "size": "{dimension.space.800}"
         }
       }
     }
diff --git a/src/styles.scss b/src/styles.scss
index 9449e0df..b00a7b8f 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -18,6 +18,20 @@
   font-style: normal;
 }
 
+@font-face {
+  font-family: 'Noto Sans';
+  src: url('./assets/fonts/noto-sans/NotoSans-Regular.woff2') format('woff2');
+  font-weight: 400;
+  font-style: normal;
+}
+
+@font-face {
+  font-family: 'Noto Sans';
+  src: url('./assets/fonts/noto-sans/NotoSans-Bold.woff2') format('woff2');
+  font-weight: 700;
+  font-style: normal;
+}
+
 html {
   font-size: 14px;
 }