@bi-digital/css 0.11.11 → 0.12.0

package/dist/salesforce.css

@@ -140,15 +140,34 @@
   --bi-scale-16x: 4rem;
   --bi-scale-18x: 4.5rem;
   --bi-scale-20x: 5rem;
+  --bi-scale-21x: 5.25rem;
   --bi-scale-24x: 6rem;
   --bi-scale-32x: 8rem;
   --bi-scale-36x: 9rem;
+  --bi-scale-38x: 9.5rem;
   --bi-scale-40x: 10rem;
   --bi-scale-48x: 12rem;
   --bi-scale-56x: 14rem;
   --bi-scale-64x: 16rem;
   --bi-scale-80x: 20rem;
+  --bi-scale-84x: 21rem;
+  --bi-scale-128x: 32rem;
   --bi-scale-max: 624.938rem;
+  --bi-color-primary-text-secondary: #042f5bb3;
+  --bi-color-info-text-secondary: #2e0b61b3;
+  --bi-color-warning-text-secondary: #4a3c01b3;
+  --bi-color-success-text-secondary: #143a16b3;
+  --bi-color-alert-text-secondary: #6a1b16b3;
+  --bi-color-stroke-basic-subtle: #0000001a;
+  --bi-color-stroke-basic: #0003;
+  --bi-color-stroke-basic-strong: #0000004d;
+  --bi-color-stroke-basic-contrast: #00000080;
+  --bi-states-hover: #26333f1a;
+  --bi-states-press: #26333f26;
+  --bi-states-hover-dark: #26333f1a;
+  --bi-states-hover-light: #ffffff1a;
+  --bi-states-press-dark: #26333f26;
+  --bi-states-press-light: #ffffff26;
   --bi-opacity-dark-80: #26333f33;
   --bi-opacity-dark-50: #26333f80;
   --bi-opacity-light-100: #fff0;
@@ -156,19 +175,127 @@
   --bi-opacity-light-50: #ffffff80;
   --bi-stroke-medium: .09375rem;
   --bi-elevation-25: #26333f26;
-  --bi-font-family-plain: "museo-sans", Arial, sans-serif;
   --bi-font-family-brand: "museo-slab", serif;
+  --bi-font-family-plain: "museo-sans", Arial, sans-serif;
   --bi-font-weight-bold: 700;
   --bi-font-weight-regular: 500;
-  --bi-font-color-secondary-dark-background-2: #ffffffb3;
+  --bi-font-color-secondary-dark-background: #ffffffb3;
   --bi-font-color-disabled-dark-background: #ffffffb3;
-  --bi-states-hover-dark: #26333f1a;
-  --bi-states-hover-light: #ffffff1a;
-  --bi-states-press-dark: #26333f26;
-  --bi-states-press-light: #ffffff26;
+  --bi-font-color-secondary-light-blue-background: #042f5bb3;
+  --bi-font-color-disabled-light-blue-background: #042f5bb3;
+  --bi-color-neutral-background: var(--bi-neutral-5);
+  --bi-color-neutral-surface-subtle: var(--bi-basic-white);
+  --bi-color-neutral-surface: var(--bi-neutral-5);
+  --bi-color-neutral-surface-strong: var(--bi-neutral-10);
+  --bi-color-neutral-surface-active: var(--bi-neutral-20);
+  --bi-color-neutral-stroke-subtle: var(--bi-neutral-10);
+  --bi-color-neutral-stroke: var(--bi-neutral-15);
+  --bi-color-neutral-stroke-strong: var(--bi-neutral-25);
+  --bi-color-neutral-stroke-contrast: var(--bi-neutral-50);
+  --bi-color-neutral-stroke-accent: var(--bi-primary-50);
+  --bi-color-neutral-text: var(--bi-neutral-95);
+  --bi-color-neutral-text-secondary: var(--bi-neutral-60);
+  --bi-color-neutral-text-subtle: var(--bi-neutral-90);
+  --bi-color-neutral-text-accent: var(--bi-primary-60);
+  --bi-color-neutral-contrast: var(--bi-neutral-90);
+  --bi-color-neutral-contrast-hover: var(--bi-neutral-95);
+  --bi-color-neutral-fill: var(--bi-neutral-50);
+  --bi-color-neutral-on-fill: var(--bi-basic-white);
+  --bi-color-primary-background: var(--bi-primary-0);
+  --bi-color-primary-surface-subtle: var(--bi-basic-white);
+  --bi-color-primary-surface: var(--bi-primary-5);
+  --bi-color-primary-surface-strong: var(--bi-primary-10);
+  --bi-color-primary-surface-active: var(--bi-primary-20);
+  --bi-color-primary-stroke-subtle: var(--bi-primary-10);
+  --bi-color-primary-stroke: var(--bi-primary-15);
+  --bi-color-primary-stroke-strong: var(--bi-primary-25);
+  --bi-color-primary-stroke-contrast: var(--bi-primary-60);
+  --bi-color-primary-stroke-accent: var(--bi-primary-50);
+  --bi-color-primary-text: var(--bi-primary-95);
+  --bi-color-primary-text-subtle: var(--bi-primary-90);
+  --bi-color-primary-text-accent: var(--bi-primary-75);
+  --bi-color-primary-contrast: var(--bi-primary-50);
+  --bi-color-primary-contrast-hover: var(--bi-primary-60);
+  --bi-color-primary-fill: var(--bi-primary-50);
+  --bi-color-primary-on-fill: var(--bi-basic-white);
+  --bi-color-info-background: var(--bi-info-0);
+  --bi-color-info-surface-subtle: var(--bi-basic-white);
+  --bi-color-info-surface: var(--bi-info-5);
+  --bi-color-info-surface-strong: var(--bi-info-10);
+  --bi-color-info-surface-active: var(--bi-info-20);
+  --bi-color-info-stroke-subtle: var(--bi-info-10);
+  --bi-color-info-stroke: var(--bi-info-15);
+  --bi-color-info-stroke-strong: var(--bi-info-25);
+  --bi-color-info-stroke-contrast: var(--bi-info-60);
+  --bi-color-info-stroke-accent: var(--bi-info-50);
+  --bi-color-info-text: var(--bi-info-95);
+  --bi-color-info-text-subtle: var(--bi-info-90);
+  --bi-color-info-text-accent: var(--bi-info-75);
+  --bi-color-info-contrast: var(--bi-info-90);
+  --bi-color-info-contrast-hover: var(--bi-info-95);
+  --bi-color-info-fill: var(--bi-info-50);
+  --bi-color-info-on-fill: var(--bi-basic-white);
+  --bi-color-warning-background: var(--bi-warning-0);
+  --bi-color-warning-surface-subtle: var(--bi-basic-white);
+  --bi-color-warning-surface: var(--bi-warning-10);
+  --bi-color-warning-surface-strong: var(--bi-warning-15);
+  --bi-color-warning-surface-active: var(--bi-warning-20);
+  --bi-color-warning-stroke-subtle: var(--bi-warning-10);
+  --bi-color-warning-stroke: var(--bi-warning-15);
+  --bi-color-warning-stroke-strong: var(--bi-warning-60);
+  --bi-color-warning-stroke-contrast: var(--bi-warning-75);
+  --bi-color-warning-stroke-accent: var(--bi-secondary-50);
+  --bi-color-warning-text: var(--bi-warning-95);
+  --bi-color-warning-text-subtle: var(--bi-warning-90);
+  --bi-color-warning-text-accent: var(--bi-warning-80);
+  --bi-color-warning-contrast: var(--bi-warning-90);
+  --bi-color-warning-contrast-hover: var(--bi-warning-95);
+  --bi-color-warning-fill: var(--bi-warning-75);
+  --bi-color-warning-on-fill: var(--bi-basic-white);
+  --bi-color-success-background: var(--bi-success-0);
+  --bi-color-success-surface-subtle: var(--bi-basic-white);
+  --bi-color-success-surface: var(--bi-success-5);
+  --bi-color-success-surface-strong: var(--bi-success-10);
+  --bi-color-success-surface-active: var(--bi-success-20);
+  --bi-color-success-stroke-subtle: var(--bi-success-10);
+  --bi-color-success-stroke: var(--bi-success-15);
+  --bi-color-success-stroke-strong: var(--bi-success-25);
+  --bi-color-success-stroke-contrast: var(--bi-success-60);
+  --bi-color-success-stroke-accent: var(--bi-success-50);
+  --bi-color-success-text: var(--bi-success-95);
+  --bi-color-success-text-subtle: var(--bi-success-90);
+  --bi-color-success-text-accent: var(--bi-success-75);
+  --bi-color-success-contrast: var(--bi-success-90);
+  --bi-color-success-contrast-hover: var(--bi-success-95);
+  --bi-color-success-fill: var(--bi-success-70);
+  --bi-color-success-on-fill: var(--bi-basic-white);
+  --bi-color-alert-background: var(--bi-alert-0);
+  --bi-color-alert-surface-subtle: var(--bi-basic-white);
+  --bi-color-alert-surface: var(--bi-alert-10);
+  --bi-color-alert-surface-strong: var(--bi-alert-15);
+  --bi-color-alert-surface-active: var(--bi-alert-20);
+  --bi-color-alert-stroke-subtle: var(--bi-alert-10);
+  --bi-color-alert-stroke: var(--bi-alert-15);
+  --bi-color-alert-stroke-strong: var(--bi-alert-25);
+  --bi-color-alert-stroke-contrast: var(--bi-alert-60);
+  --bi-color-alert-stroke-accent: var(--bi-alert-50);
+  --bi-color-alert-text: var(--bi-alert-95);
+  --bi-color-alert-text-subtle: var(--bi-alert-90);
+  --bi-color-alert-text-accent: var(--bi-alert-75);
+  --bi-color-alert-contrast: var(--bi-alert-90);
+  --bi-color-alert-contrast-hover: var(--bi-alert-95);
+  --bi-color-alert-fill: var(--bi-alert-60);
+  --bi-color-alert-on-fill: var(--bi-basic-white);
+  --bi-states-focus: var(--bi-primary-50);
+  --bi-states-focus-background: var(--bi-basic-white);
+  --bi-states-required: var(--bi-primary-50);
   --bi-stroke-none: var(--bi-scale-0);
   --bi-stroke-thin: var(--bi-scale-0-25x);
-  --bi-stroke-thick: var(--bi-scale-0-50x);
+  --bi-stroke-thick: var(--bi-scale-0-75x);
+  --bi-stroke-focus: var(--bi-scale-0-75x);
+  --bi-stroke-subtle: var(--bi-neutral-10);
+  --bi-stroke-default: var(--bi-neutral-15);
+  --bi-stroke-strong: var(--bi-neutral-25);
   --bi-radius-none: var(--bi-scale-0);
   --bi-radius-small: var(--bi-scale-0-50x);
   --bi-radius-medium: var(--bi-scale-1x);
@@ -189,9 +316,13 @@
   --bi-font-color-secondary: var(--bi-neutral-60);
   --bi-font-color-disabled: var(--bi-neutral-50);
   --bi-font-color-accent: var(--bi-primary-60);
-  --bi-font-color-link: var(--bi-primary-50);
+  --bi-font-color-strong-accent: var(--bi-primary-50);
   --bi-font-color-primary-dark-background: var(--bi-basic-white);
   --bi-font-color-accent-dark-background: var(--bi-primary-20);
+  --bi-font-color-strong-accent-dark-background: var(--bi-primary-30);
+  --bi-font-color-primary-light-blue-background: var(--bi-primary-90);
+  --bi-font-color-accent-light-blue-background: var(--bi-primary-75);
+  --bi-font-color-strong-accent-light-blue-background: var(--bi-primary-50);
   --bi-layout-navbar-height: var(--bi-scale-16x);
   --bi-font-display-large: var(--bi-font-weight-regular) 4rem/4.5rem var(--bi-font-family-brand);
   --bi-font-display-medium: var(--bi-font-weight-regular) 3rem/3.5rem var(--bi-font-family-brand);
@@ -224,19 +355,385 @@
   --bi-font-body-xs: var(--bi-font-weight-regular) .75rem/1.125rem var(--bi-font-family-plain);
 }
 
+:root, [data-color-scheme="light"] {
+  --bi-color-neutral-background: var(--bi-neutral-5);
+  --bi-color-neutral-surface-subtle: var(--bi-basic-white);
+  --bi-color-neutral-surface: var(--bi-neutral-5);
+  --bi-color-neutral-surface-strong: var(--bi-neutral-10);
+  --bi-color-neutral-surface-active: var(--bi-neutral-20);
+  --bi-color-neutral-stroke-subtle: var(--bi-neutral-10);
+  --bi-color-neutral-stroke: var(--bi-neutral-15);
+  --bi-color-neutral-stroke-strong: var(--bi-neutral-25);
+  --bi-color-neutral-stroke-contrast: var(--bi-neutral-50);
+  --bi-color-neutral-stroke-accent: var(--bi-primary-50);
+  --bi-color-neutral-text: var(--bi-neutral-95);
+  --bi-color-neutral-text-secondary: var(--bi-neutral-60);
+  --bi-color-neutral-text-subtle: var(--bi-neutral-90);
+  --bi-color-neutral-text-accent: var(--bi-primary-60);
+  --bi-color-neutral-contrast: var(--bi-neutral-90);
+  --bi-color-neutral-contrast-hover: var(--bi-neutral-95);
+  --bi-color-neutral-fill: var(--bi-neutral-50);
+  --bi-color-neutral-on-fill: var(--bi-basic-white);
+  --bi-color-primary-background: var(--bi-primary-0);
+  --bi-color-primary-surface-subtle: var(--bi-basic-white);
+  --bi-color-primary-surface: var(--bi-primary-5);
+  --bi-color-primary-surface-strong: var(--bi-primary-10);
+  --bi-color-primary-surface-active: var(--bi-primary-20);
+  --bi-color-primary-stroke-subtle: var(--bi-primary-10);
+  --bi-color-primary-stroke: var(--bi-primary-15);
+  --bi-color-primary-stroke-strong: var(--bi-primary-25);
+  --bi-color-primary-stroke-contrast: var(--bi-primary-60);
+  --bi-color-primary-stroke-accent: var(--bi-primary-50);
+  --bi-color-primary-text: var(--bi-primary-95);
+  --bi-color-primary-text-secondary: #042f5bb2;
+  --bi-color-primary-text-subtle: var(--bi-primary-90);
+  --bi-color-primary-text-accent: var(--bi-primary-75);
+  --bi-color-primary-contrast: var(--bi-primary-50);
+  --bi-color-primary-contrast-hover: var(--bi-primary-60);
+  --bi-color-primary-fill: var(--bi-primary-50);
+  --bi-color-primary-on-fill: var(--bi-basic-white);
+  --bi-color-info-background: var(--bi-info-0);
+  --bi-color-info-surface-subtle: var(--bi-basic-white);
+  --bi-color-info-surface: var(--bi-info-5);
+  --bi-color-info-surface-strong: var(--bi-info-10);
+  --bi-color-info-surface-active: var(--bi-info-20);
+  --bi-color-info-stroke-subtle: var(--bi-info-10);
+  --bi-color-info-stroke: var(--bi-info-15);
+  --bi-color-info-stroke-strong: var(--bi-info-25);
+  --bi-color-info-stroke-contrast: var(--bi-info-60);
+  --bi-color-info-stroke-accent: var(--bi-info-50);
+  --bi-color-info-text: var(--bi-info-95);
+  --bi-color-info-text-secondary: #2e0b61b2;
+  --bi-color-info-text-subtle: var(--bi-info-90);
+  --bi-color-info-text-accent: var(--bi-info-75);
+  --bi-color-info-contrast: var(--bi-info-90);
+  --bi-color-info-contrast-hover: var(--bi-info-95);
+  --bi-color-info-fill: var(--bi-info-50);
+  --bi-color-info-on-fill: var(--bi-basic-white);
+  --bi-color-warning-background: var(--bi-warning-0);
+  --bi-color-warning-surface-subtle: var(--bi-basic-white);
+  --bi-color-warning-surface: var(--bi-warning-10);
+  --bi-color-warning-surface-strong: var(--bi-warning-15);
+  --bi-color-warning-surface-active: var(--bi-warning-20);
+  --bi-color-warning-stroke-subtle: var(--bi-warning-10);
+  --bi-color-warning-stroke: var(--bi-warning-15);
+  --bi-color-warning-stroke-strong: var(--bi-warning-60);
+  --bi-color-warning-stroke-contrast: var(--bi-warning-75);
+  --bi-color-warning-stroke-accent: var(--bi-secondary-50);
+  --bi-color-warning-text: var(--bi-warning-95);
+  --bi-color-warning-text-secondary: #4a3c01b2;
+  --bi-color-warning-text-subtle: var(--bi-warning-90);
+  --bi-color-warning-text-accent: var(--bi-warning-80);
+  --bi-color-warning-contrast: var(--bi-warning-90);
+  --bi-color-warning-contrast-hover: var(--bi-warning-95);
+  --bi-color-warning-fill: var(--bi-warning-75);
+  --bi-color-warning-on-fill: var(--bi-basic-white);
+  --bi-color-success-background: var(--bi-success-0);
+  --bi-color-success-surface-subtle: var(--bi-basic-white);
+  --bi-color-success-surface: var(--bi-success-5);
+  --bi-color-success-surface-strong: var(--bi-success-10);
+  --bi-color-success-surface-active: var(--bi-success-20);
+  --bi-color-success-stroke-subtle: var(--bi-success-10);
+  --bi-color-success-stroke: var(--bi-success-15);
+  --bi-color-success-stroke-strong: var(--bi-success-25);
+  --bi-color-success-stroke-contrast: var(--bi-success-60);
+  --bi-color-success-stroke-accent: var(--bi-success-50);
+  --bi-color-success-text: var(--bi-success-95);
+  --bi-color-success-text-secondary: #143a16b2;
+  --bi-color-success-text-subtle: var(--bi-success-90);
+  --bi-color-success-text-accent: var(--bi-success-75);
+  --bi-color-success-contrast: var(--bi-success-90);
+  --bi-color-success-contrast-hover: var(--bi-success-95);
+  --bi-color-success-fill: var(--bi-success-70);
+  --bi-color-success-on-fill: var(--bi-basic-white);
+  --bi-color-alert-background: var(--bi-alert-0);
+  --bi-color-alert-surface-subtle: var(--bi-basic-white);
+  --bi-color-alert-surface: var(--bi-alert-10);
+  --bi-color-alert-surface-strong: var(--bi-alert-15);
+  --bi-color-alert-surface-active: var(--bi-alert-20);
+  --bi-color-alert-stroke-subtle: var(--bi-alert-10);
+  --bi-color-alert-stroke: var(--bi-alert-15);
+  --bi-color-alert-stroke-strong: var(--bi-alert-25);
+  --bi-color-alert-stroke-contrast: var(--bi-alert-60);
+  --bi-color-alert-stroke-accent: var(--bi-alert-50);
+  --bi-color-alert-text: var(--bi-alert-95);
+  --bi-color-alert-text-secondary: #6a1b16b2;
+  --bi-color-alert-text-subtle: var(--bi-alert-90);
+  --bi-color-alert-text-accent: var(--bi-alert-75);
+  --bi-color-alert-contrast: var(--bi-alert-90);
+  --bi-color-alert-contrast-hover: var(--bi-alert-95);
+  --bi-color-alert-fill: var(--bi-alert-60);
+  --bi-color-alert-on-fill: var(--bi-basic-white);
+  --bi-color-stroke-basic-subtle: #0000001a;
+  --bi-color-stroke-basic: #0003;
+  --bi-color-stroke-basic-strong: #0000004d;
+  --bi-color-stroke-basic-contrast: #00000080;
+  --bi-states-hover: #26333f1a;
+  --bi-states-press: #26333f26;
+  --bi-states-focus: var(--bi-primary-50);
+  --bi-states-focus-background: var(--bi-basic-white);
+  --bi-states-required: var(--bi-primary-50);
+}
+
+[data-color-scheme="dark"] {
+  --bi-color-neutral-background: var(--bi-neutral-100);
+  --bi-color-neutral-surface-subtle: var(--bi-neutral-95);
+  --bi-color-neutral-surface: var(--bi-neutral-90);
+  --bi-color-neutral-surface-strong: var(--bi-neutral-85);
+  --bi-color-neutral-surface-active: var(--bi-neutral-70);
+  --bi-color-neutral-stroke-subtle: var(--bi-neutral-90);
+  --bi-color-neutral-stroke: var(--bi-neutral-85);
+  --bi-color-neutral-stroke-strong: var(--bi-neutral-70);
+  --bi-color-neutral-stroke-contrast: var(--bi-neutral-50);
+  --bi-color-neutral-stroke-accent: var(--bi-primary-50);
+  --bi-color-neutral-text: var(--bi-basic-white);
+  --bi-color-neutral-text-secondary: #ffffffb2;
+  --bi-color-neutral-text-subtle: var(--bi-neutral-15);
+  --bi-color-neutral-text-accent: var(--bi-primary-30);
+  --bi-color-neutral-contrast: var(--bi-neutral-5);
+  --bi-color-neutral-contrast-hover: var(--bi-neutral-15);
+  --bi-color-neutral-fill: var(--bi-neutral-50);
+  --bi-color-neutral-on-fill: var(--bi-basic-white);
+  --bi-color-primary-background: var(--bi-primary-100);
+  --bi-color-primary-surface-subtle: var(--bi-primary-95);
+  --bi-color-primary-surface: var(--bi-primary-90);
+  --bi-color-primary-surface-strong: var(--bi-primary-85);
+  --bi-color-primary-surface-active: var(--bi-primary-70);
+  --bi-color-primary-stroke-subtle: var(--bi-primary-90);
+  --bi-color-primary-stroke: var(--bi-primary-85);
+  --bi-color-primary-stroke-strong: var(--bi-primary-75);
+  --bi-color-primary-stroke-contrast: var(--bi-primary-30);
+  --bi-color-primary-stroke-accent: var(--bi-primary-50);
+  --bi-color-primary-text: var(--bi-basic-white);
+  --bi-color-primary-text-secondary: #ffffffb2;
+  --bi-color-primary-text-subtle: var(--bi-primary-10);
+  --bi-color-primary-text-accent: var(--bi-primary-30);
+  --bi-color-primary-contrast: var(--bi-primary-20);
+  --bi-color-primary-contrast-hover: var(--bi-primary-30);
+  --bi-color-primary-fill: var(--bi-primary-50);
+  --bi-color-primary-on-fill: var(--bi-basic-white);
+  --bi-color-info-background: var(--bi-info-100);
+  --bi-color-info-surface-subtle: var(--bi-info-90);
+  --bi-color-info-surface: var(--bi-info-90);
+  --bi-color-info-surface-strong: var(--bi-info-85);
+  --bi-color-info-surface-active: var(--bi-info-70);
+  --bi-color-info-stroke-subtle: var(--bi-info-90);
+  --bi-color-info-stroke: var(--bi-info-85);
+  --bi-color-info-stroke-strong: var(--bi-info-75);
+  --bi-color-info-stroke-contrast: var(--bi-info-40);
+  --bi-color-info-stroke-accent: var(--bi-info-50);
+  --bi-color-info-text: var(--bi-basic-white);
+  --bi-color-info-text-secondary: #ffffffb2;
+  --bi-color-info-text-subtle: var(--bi-info-15);
+  --bi-color-info-text-accent: var(--bi-info-25);
+  --bi-color-info-contrast: var(--bi-info-5);
+  --bi-color-info-contrast-hover: var(--bi-info-15);
+  --bi-color-info-fill: var(--bi-info-50);
+  --bi-color-info-on-fill: var(--bi-basic-white);
+  --bi-color-warning-background: var(--bi-warning-100);
+  --bi-color-warning-surface-subtle: var(--bi-warning-90);
+  --bi-color-warning-surface: var(--bi-warning-90);
+  --bi-color-warning-surface-strong: var(--bi-warning-85);
+  --bi-color-warning-surface-active: var(--bi-warning-70);
+  --bi-color-warning-stroke-subtle: var(--bi-warning-90);
+  --bi-color-warning-stroke: var(--bi-warning-85);
+  --bi-color-warning-stroke-strong: var(--bi-warning-75);
+  --bi-color-warning-stroke-contrast: var(--bi-warning-40);
+  --bi-color-warning-stroke-accent: var(--bi-secondary-50);
+  --bi-color-warning-text: var(--bi-basic-white);
+  --bi-color-warning-text-secondary: #ffffffb2;
+  --bi-color-warning-text-subtle: var(--bi-warning-15);
+  --bi-color-warning-text-accent: var(--bi-warning-50);
+  --bi-color-warning-contrast: var(--bi-warning-5);
+  --bi-color-warning-contrast-hover: var(--bi-warning-15);
+  --bi-color-warning-fill: var(--bi-warning-75);
+  --bi-color-warning-on-fill: var(--bi-basic-white);
+  --bi-color-success-background: var(--bi-success-100);
+  --bi-color-success-surface-subtle: var(--bi-success-90);
+  --bi-color-success-surface: var(--bi-success-90);
+  --bi-color-success-surface-strong: var(--bi-success-85);
+  --bi-color-success-surface-active: var(--bi-success-70);
+  --bi-color-success-stroke-subtle: var(--bi-success-90);
+  --bi-color-success-stroke: var(--bi-success-85);
+  --bi-color-success-stroke-strong: var(--bi-success-75);
+  --bi-color-success-stroke-contrast: var(--bi-success-40);
+  --bi-color-success-stroke-accent: var(--bi-success-50);
+  --bi-color-success-text: var(--bi-basic-white);
+  --bi-color-success-text-secondary: #ffffffb2;
+  --bi-color-success-text-subtle: var(--bi-success-10);
+  --bi-color-success-text-accent: var(--bi-success-25);
+  --bi-color-success-contrast: var(--bi-success-5);
+  --bi-color-success-contrast-hover: var(--bi-success-15);
+  --bi-color-success-fill: var(--bi-success-70);
+  --bi-color-success-on-fill: var(--bi-basic-white);
+  --bi-color-alert-background: var(--bi-alert-100);
+  --bi-color-alert-surface-subtle: var(--bi-alert-90);
+  --bi-color-alert-surface: var(--bi-alert-90);
+  --bi-color-alert-surface-strong: var(--bi-alert-85);
+  --bi-color-alert-surface-active: var(--bi-alert-70);
+  --bi-color-alert-stroke-subtle: var(--bi-alert-90);
+  --bi-color-alert-stroke: var(--bi-alert-85);
+  --bi-color-alert-stroke-strong: var(--bi-alert-75);
+  --bi-color-alert-stroke-contrast: var(--bi-alert-40);
+  --bi-color-alert-stroke-accent: var(--bi-alert-50);
+  --bi-color-alert-text: var(--bi-basic-white);
+  --bi-color-alert-text-secondary: #ffffffb2;
+  --bi-color-alert-text-subtle: var(--bi-alert-15);
+  --bi-color-alert-text-accent: var(--bi-alert-25);
+  --bi-color-alert-contrast: var(--bi-alert-5);
+  --bi-color-alert-contrast-hover: var(--bi-alert-15);
+  --bi-color-alert-fill: var(--bi-alert-60);
+  --bi-color-alert-on-fill: var(--bi-basic-white);
+  --bi-color-stroke-basic-subtle: #ffffff1a;
+  --bi-color-stroke-basic: #fff3;
+  --bi-color-stroke-basic-strong: #ffffff4d;
+  --bi-color-stroke-basic-contrast: #fff6;
+  --bi-states-hover: #ffffff1a;
+  --bi-states-press: #ffffff26;
+  --bi-states-focus: var(--bi-primary-30);
+  --bi-states-focus-background: var(--bi-neutral-95);
+  --bi-states-required: var(--bi-secondary-50);
+}
+
+:root, [data-color-scheme], [data-color="neutral"] {
+  --bi-color-background: var(--bi-color-neutral-background);
+  --bi-color-surface-subtle: var(--bi-color-neutral-surface-subtle);
+  --bi-color-surface: var(--bi-color-neutral-surface);
+  --bi-color-surface-strong: var(--bi-color-neutral-surface-strong);
+  --bi-color-surface-active: var(--bi-color-neutral-surface-active);
+  --bi-color-stroke-subtle: var(--bi-color-neutral-stroke-subtle);
+  --bi-color-stroke: var(--bi-color-neutral-stroke);
+  --bi-color-stroke-strong: var(--bi-color-neutral-stroke-strong);
+  --bi-color-stroke-contrast: var(--bi-color-neutral-stroke-contrast);
+  --bi-color-stroke-accent: var(--bi-color-neutral-stroke-accent);
+  --bi-color-text: var(--bi-color-neutral-text);
+  --bi-color-text-secondary: var(--bi-color-neutral-text-secondary);
+  --bi-color-text-subtle: var(--bi-color-neutral-text-subtle);
+  --bi-color-text-accent: var(--bi-color-neutral-text-accent);
+  --bi-color-contrast: var(--bi-color-neutral-contrast);
+  --bi-color-contrast-hover: var(--bi-color-neutral-contrast-hover);
+  --bi-color-fill: var(--bi-color-neutral-fill);
+  --bi-color-on-fill: var(--bi-color-neutral-on-fill);
+}
+
+[data-color="alert"], [data-color-scheme][data-color="alert"] {
+  --bi-color-background: var(--bi-color-alert-background);
+  --bi-color-surface-subtle: var(--bi-color-alert-surface-subtle);
+  --bi-color-surface: var(--bi-color-alert-surface);
+  --bi-color-surface-strong: var(--bi-color-alert-surface-strong);
+  --bi-color-surface-active: var(--bi-color-alert-surface-active);
+  --bi-color-stroke-subtle: var(--bi-color-alert-stroke-subtle);
+  --bi-color-stroke: var(--bi-color-alert-stroke);
+  --bi-color-stroke-strong: var(--bi-color-alert-stroke-strong);
+  --bi-color-stroke-contrast: var(--bi-color-alert-stroke-contrast);
+  --bi-color-stroke-accent: var(--bi-color-alert-stroke-accent);
+  --bi-color-text: var(--bi-color-alert-text);
+  --bi-color-text-secondary: var(--bi-color-alert-text-secondary);
+  --bi-color-text-subtle: var(--bi-color-alert-text-subtle);
+  --bi-color-text-accent: var(--bi-color-alert-text-accent);
+  --bi-color-contrast: var(--bi-color-alert-contrast);
+  --bi-color-contrast-hover: var(--bi-color-alert-contrast-hover);
+  --bi-color-fill: var(--bi-color-alert-fill);
+  --bi-color-on-fill: var(--bi-color-alert-on-fill);
+}
+
+[data-color="info"], [data-color-scheme][data-color="info"] {
+  --bi-color-background: var(--bi-color-info-background);
+  --bi-color-surface-subtle: var(--bi-color-info-surface-subtle);
+  --bi-color-surface: var(--bi-color-info-surface);
+  --bi-color-surface-strong: var(--bi-color-info-surface-strong);
+  --bi-color-surface-active: var(--bi-color-info-surface-active);
+  --bi-color-stroke-subtle: var(--bi-color-info-stroke-subtle);
+  --bi-color-stroke: var(--bi-color-info-stroke);
+  --bi-color-stroke-strong: var(--bi-color-info-stroke-strong);
+  --bi-color-stroke-contrast: var(--bi-color-info-stroke-contrast);
+  --bi-color-stroke-accent: var(--bi-color-info-stroke-accent);
+  --bi-color-text: var(--bi-color-info-text);
+  --bi-color-text-secondary: var(--bi-color-info-text-secondary);
+  --bi-color-text-subtle: var(--bi-color-info-text-subtle);
+  --bi-color-text-accent: var(--bi-color-info-text-accent);
+  --bi-color-contrast: var(--bi-color-info-contrast);
+  --bi-color-contrast-hover: var(--bi-color-info-contrast-hover);
+  --bi-color-fill: var(--bi-color-info-fill);
+  --bi-color-on-fill: var(--bi-color-info-on-fill);
+}
+
+[data-color="primary"], [data-color-scheme][data-color="primary"] {
+  --bi-color-background: var(--bi-color-primary-background);
+  --bi-color-surface-subtle: var(--bi-color-primary-surface-subtle);
+  --bi-color-surface: var(--bi-color-primary-surface);
+  --bi-color-surface-strong: var(--bi-color-primary-surface-strong);
+  --bi-color-surface-active: var(--bi-color-primary-surface-active);
+  --bi-color-stroke-subtle: var(--bi-color-primary-stroke-subtle);
+  --bi-color-stroke: var(--bi-color-primary-stroke);
+  --bi-color-stroke-strong: var(--bi-color-primary-stroke-strong);
+  --bi-color-stroke-contrast: var(--bi-color-primary-stroke-contrast);
+  --bi-color-stroke-accent: var(--bi-color-primary-stroke-accent);
+  --bi-color-text: var(--bi-color-primary-text);
+  --bi-color-text-secondary: var(--bi-color-primary-text-secondary);
+  --bi-color-text-subtle: var(--bi-color-primary-text-subtle);
+  --bi-color-text-accent: var(--bi-color-primary-text-accent);
+  --bi-color-contrast: var(--bi-color-primary-contrast);
+  --bi-color-contrast-hover: var(--bi-color-primary-contrast-hover);
+  --bi-color-fill: var(--bi-color-primary-fill);
+  --bi-color-on-fill: var(--bi-color-primary-on-fill);
+}
+
+[data-color="success"], [data-color-scheme][data-color="success"] {
+  --bi-color-background: var(--bi-color-success-background);
+  --bi-color-surface-subtle: var(--bi-color-success-surface-subtle);
+  --bi-color-surface: var(--bi-color-success-surface);
+  --bi-color-surface-strong: var(--bi-color-success-surface-strong);
+  --bi-color-surface-active: var(--bi-color-success-surface-active);
+  --bi-color-stroke-subtle: var(--bi-color-success-stroke-subtle);
+  --bi-color-stroke: var(--bi-color-success-stroke);
+  --bi-color-stroke-strong: var(--bi-color-success-stroke-strong);
+  --bi-color-stroke-contrast: var(--bi-color-success-stroke-contrast);
+  --bi-color-stroke-accent: var(--bi-color-success-stroke-accent);
+  --bi-color-text: var(--bi-color-success-text);
+  --bi-color-text-secondary: var(--bi-color-success-text-secondary);
+  --bi-color-text-subtle: var(--bi-color-success-text-subtle);
+  --bi-color-text-accent: var(--bi-color-success-text-accent);
+  --bi-color-contrast: var(--bi-color-success-contrast);
+  --bi-color-contrast-hover: var(--bi-color-success-contrast-hover);
+  --bi-color-fill: var(--bi-color-success-fill);
+  --bi-color-on-fill: var(--bi-color-success-on-fill);
+}
+
+[data-color="warning"], [data-color-scheme][data-color="warning"] {
+  --bi-color-background: var(--bi-color-warning-background);
+  --bi-color-surface-subtle: var(--bi-color-warning-surface-subtle);
+  --bi-color-surface: var(--bi-color-warning-surface);
+  --bi-color-surface-strong: var(--bi-color-warning-surface-strong);
+  --bi-color-surface-active: var(--bi-color-warning-surface-active);
+  --bi-color-stroke-subtle: var(--bi-color-warning-stroke-subtle);
+  --bi-color-stroke: var(--bi-color-warning-stroke);
+  --bi-color-stroke-strong: var(--bi-color-warning-stroke-strong);
+  --bi-color-stroke-contrast: var(--bi-color-warning-stroke-contrast);
+  --bi-color-stroke-accent: var(--bi-color-warning-stroke-accent);
+  --bi-color-text: var(--bi-color-warning-text);
+  --bi-color-text-secondary: var(--bi-color-warning-text-secondary);
+  --bi-color-text-subtle: var(--bi-color-warning-text-subtle);
+  --bi-color-text-accent: var(--bi-color-warning-text-accent);
+  --bi-color-contrast: var(--bi-color-warning-contrast);
+  --bi-color-contrast-hover: var(--bi-color-warning-contrast-hover);
+  --bi-color-fill: var(--bi-color-warning-fill);
+  --bi-color-on-fill: var(--bi-color-warning-on-fill);
+}
+
 .bi-alert {
-  --bic-alert-background: var(--bi-primary-5);
-  --bic-alert-border-color: var(--bi-primary-10);
+  --bic-alert-background: var(--bi-color-primary-surface-strong);
+  --bic-alert-border-color: var(--bi-color-primary-stroke);
   --bic-alert-border-width: var(--bi-stroke-thin);
-  --bic-alert-color: var(--bi-primary-90);
+  --bic-alert-color: var(--bi-color-primary-text-subtle);
   --bic-alert-icon-size: var(--bi-icon-medium);
   --bic-alert-gap: var(--bi-scale-1x);
   --bic-alert-padding: var(--bi-scale-2x);
 
-  &[data-dark="true"] {
-    --bic-alert-background: var(--bi-primary-95);
-    --bic-alert-border-color: var(--bi-primary-85);
-    --bic-alert-color: var(--bi-primary-5);
+  &[data-color] {
+    --bic-alert-background: var(--bi-color-surface-strong);
+    --bic-alert-border-color: var(--bi-color-stroke);
+    --bic-alert-color: var(--bi-color-text-subtle);
   }
 
   background: var(--bic-alert-background);
@@ -283,66 +780,6 @@
     --bic-alert-gap: var(--bi-scale-2x);
   }
 
-  &[data-variant="success"] {
-    --bic-alert-background: var(--bi-success-5);
-    --bic-alert-border-color: var(--bi-success-10);
-    --bic-alert-color: var(--bi-success-90);
-
-    &[data-dark="true"] {
-      --bic-alert-background: var(--bi-success-95);
-      --bic-alert-border-color: var(--bi-success-85);
-      --bic-alert-color: var(--bi-success-5);
-    }
-  }
-
-  &[data-variant="alert"] {
-    --bic-alert-background: var(--bi-alert-10);
-    --bic-alert-border-color: var(--bi-alert-15);
-    --bic-alert-color: var(--bi-alert-90);
-
-    &[data-dark="true"] {
-      --bic-alert-background: var(--bi-alert-95);
-      --bic-alert-border-color: var(--bi-alert-85);
-      --bic-alert-color: var(--bi-alert-5);
-    }
-  }
-
-  &[data-variant="warning"] {
-    --bic-alert-background: var(--bi-warning-10);
-    --bic-alert-border-color: var(--bi-warning-15);
-    --bic-alert-color: var(--bi-warning-90);
-
-    &[data-dark="true"] {
-      --bic-alert-background: var(--bi-warning-95);
-      --bic-alert-border-color: var(--bi-warning-85);
-      --bic-alert-color: var(--bi-warning-5);
-    }
-  }
-
-  &[data-variant="info"] {
-    --bic-alert-background: var(--bi-info-5);
-    --bic-alert-border-color: var(--bi-info-10);
-    --bic-alert-color: var(--bi-info-90);
-
-    &[data-dark="true"] {
-      --bic-alert-background: var(--bi-info-90);
-      --bic-alert-border-color: var(--bi-info-80);
-      --bic-alert-color: var(--bi-info-10);
-    }
-  }
-
-  &[data-variant="neutral"] {
-    --bic-alert-background: var(--bi-neutral-10);
-    --bic-alert-border-color: var(--bi-neutral-15);
-    --bic-alert-color: var(--bi-neutral-95);
-
-    &[data-dark="true"] {
-      --bic-alert-background: var(--bi-neutral-90);
-      --bic-alert-border-color: var(--bi-neutral-90);
-      --bic-alert-color: var(--bi-neutral-30);
-    }
-  }
-
   &:has( > .bi-alert--footer) {
     width: 100%;
   }
@@ -357,16 +794,10 @@
 }
 
 .bi-avatar {
-  --bic-avatar-background-color: var(--bi-primary-10);
-  --bic-avatar-color: var(--bi-primary-90);
+  --bic-avatar-background-color: var(--bi-color-surface-strong);
+  --bic-avatar-color: var(--bi-color-text-subtle);
   --bic-avatar-size: var(--bi-scale-24x);
   --bic-avatar-font-size: 1.75rem;
-
-  &[data-dark="true"] {
-    --bic-avatar-background-color: var(--bi-primary-85);
-    --bic-avatar-color: var(--bi-primary-10);
-  }
-
   border-radius: var(--bi-radius-full);
   background-color: var(--bic-avatar-background-color);
   color: var(--bic-avatar-color);
@@ -387,46 +818,6 @@
   display: flex;
   overflow: hidden;
 
-  &[data-color="info"] {
-    --bic-avatar-background-color: var(--bi-info-10);
-    --bic-avatar-color: var(--bi-info-90);
-
-    &[data-dark="true"] {
-      --bic-avatar-background-color: var(--bi-info-85);
-      --bic-avatar-color: var(--bi-info-10);
-    }
-  }
-
-  &[data-color="warning"] {
-    --bic-avatar-background-color: var(--bi-warning-10);
-    --bic-avatar-color: var(--bi-warning-90);
-
-    &[data-dark="true"] {
-      --bic-avatar-background-color: var(--bi-warning-85);
-      --bic-avatar-color: var(--bi-warning-10);
-    }
-  }
-
-  &[data-color="success"] {
-    --bic-avatar-background-color: var(--bi-success-10);
-    --bic-avatar-color: var(--bi-success-90);
-
-    &[data-dark="true"] {
-      --bic-avatar-background-color: var(--bi-success-85);
-      --bic-avatar-color: var(--bi-success-10);
-    }
-  }
-
-  &[data-color="alert"] {
-    --bic-avatar-background-color: var(--bi-alert-10);
-    --bic-avatar-color: var(--bi-alert-90);
-
-    &[data-dark="true"] {
-      --bic-avatar-background-color: var(--bi-alert-85);
-      --bic-avatar-color: var(--bi-alert-10);
-    }
-  }
-
   &[data-size="small"] {
     --bic-avatar-size: var(--bi-scale-16x);
     --bic-avatar-font-size: 1.25rem;
@@ -440,14 +831,19 @@
 }
 
 .bi-badge {
-  --bic-badge-background: transparent;
-  --bic-badge-color: var(--bi-neutral-60);
-  --bic-badge-border-color: var(--bi-neutral-25);
+  --bic-badge-background: var(--bi-color-neutral-fill);
+  --bic-badge-color: var(--bi-color-neutral-on-fill);
   --bic-badge-border-radius: var(--bi-radius-medium);
   --bic-badge-border-width: var(--bi-stroke-thin);
   --bic-badge-height: var(--bi-scale-6x);
   --bic-badge-font: var(--bi-font-body-medium);
   --bic-badge-padding: 0 var(--bi-scale-1-5x);
+
+  &[data-color] {
+    --bic-badge-background: var(--bi-color-fill);
+    --bic-badge-color: var(--bi-color-on-fill);
+  }
+
   padding: var(--bic-badge-padding);
   border-radius: var(--bic-badge-border-radius);
   background-color: var(--bic-badge-background);
@@ -456,17 +852,11 @@
   width: max-content;
   height: fit-content;
   min-height: var(--bic-badge-height);
-  box-shadow: 0 0 0 var(--bic-badge-border-width) var(--bic-badge-border-color) inset;
   word-break: break-word;
   justify-content: center;
   align-items: center;
   display: inline-flex;
 
-  &[data-dark="true"] {
-    --bic-badge-border-color: var(--bi-neutral-50);
-    --bic-badge-color: var(--bi-neutral-10);
-  }
-
   &[data-single-letter="true"]:not([data-size="xs"]) {
     --bic-badge-border-radius: var(--bi-radius-full);
     min-width: var(--bic-badge-height);
@@ -484,72 +874,6 @@
     --bic-badge-font: var(--bi-font-body-xs);
     --bic-badge-height: var(--bi-scale-5x);
   }
-
-  &[data-color="warning"] {
-    --bic-badge-background: var(--bi-secondary-10);
-    --bic-badge-color: var(--bi-secondary-95);
-    --bic-badge-border-color: var(--bic-badge-background);
-
-    &[data-dark="true"] {
-      --bic-badge-background: var(--bi-secondary-100);
-      --bic-badge-color: var(--bi-secondary-10);
-    }
-  }
-
-  &[data-color="alert"] {
-    --bic-badge-background: var(--bi-alert-10);
-    --bic-badge-color: var(--bi-alert-85);
-    --bic-badge-border-color: var(--bic-badge-background);
-
-    &[data-dark="true"] {
-      --bic-badge-background: var(--bi-alert-100);
-      --bic-badge-color: var(--bi-alert-10);
-    }
-  }
-
-  &[data-color="success"] {
-    --bic-badge-background: var(--bi-success-10);
-    --bic-badge-color: var(--bi-success-95);
-    --bic-badge-border-color: var(--bic-badge-background);
-
-    &[data-dark="true"] {
-      --bic-badge-background: var(--bi-success-100);
-      --bic-badge-color: var(--bi-success-10);
-    }
-  }
-
-  &[data-color="brand"] {
-    --bic-badge-background: var(--bi-primary-10);
-    --bic-badge-color: var(--bi-primary-85);
-    --bic-badge-border-color: var(--bic-badge-background);
-
-    &[data-dark="true"] {
-      --bic-badge-background: var(--bi-primary-100);
-      --bic-badge-color: var(--bi-primary-10);
-    }
-  }
-
-  &[data-color="info"] {
-    --bic-badge-background: var(--bi-info-10);
-    --bic-badge-color: var(--bi-info-9);
-    --bic-badge-border-color: var(--bic-badge-background);
-
-    &[data-dark="true"] {
-      --bic-badge-background: var(--bi-info-100);
-      --bic-badge-color: var(--bi-info-10);
-    }
-  }
-
-  &[data-color="negative"] {
-    --bic-badge-background: var(--bi-neutral-90);
-    --bic-badge-color: var(--bi-basic-white);
-    --bic-badge-border-color: var(--bic-badge-background);
-
-    &[data-dark="true"] {
-      --bic-badge-background: var(--bi-neutral-100);
-      --bic-badge-color: var(--bi-neutral-10);
-    }
-  }
 }
 
 .bi-button {
@@ -560,13 +884,17 @@
   --bic-button-size: var(--bi-scale-11x);
   --bic-button-font-size: 1rem;
   --bic-button-line-height: 1.5;
-  --bic-button-color: var(--bi-basic-white);
-  --bic-button-background: transparent;
-  --bic-button-background-hover: transparent;
-  --bic-button-background-press: transparent;
-  --bic-button-active-color: var(--bi-primary-50);
-  --bic-button-focus-shadow-color: var(--bi-basic-white);
-  --bic-button-focus-outline-color: var(--bi-primary-50);
+  --bic-button-color: var(--bi-color-primary-on-fill);
+  --bic-button-background: var(--bi-color-primary-fill);
+  --bic-button-background-hover: linear-gradient(0deg, var(--bi-states-hover) 0%, var(--bi-states-hover) 100%), var(--bic-button-background);
+  --bic-button-background-press: linear-gradient(0deg, var(--bi-states-press) 0%, var(--bi-states-press) 100%), var(--bic-button-background);
+  --bic-button-active-color: var(--bi-states-focus);
+
+  &[data-color] {
+    --bic-button-color: var(--bi-color-on-fill);
+    --bic-button-background: var(--bi-color-fill);
+  }
+
   font-family: var(--bi-font-family-plain);
   font-size: var(--bic-button-font-size);
   line-height: var(--bic-button-line-height);
@@ -595,12 +923,6 @@
   position: relative;
   overflow: hidden;
 
-  &[data-dark="true"] {
-    --bic-button-active-color: var(--bi-primary-30);
-    --bic-button-focus-shadow-color: var(--bi-neutral-95);
-    --bic-button-focus-outline-color: var(--bi-primary-30);
-  }
-
   &[data-fullwidth="true"] {
     width: 100%;
   }
@@ -610,8 +932,8 @@
   }
 
   &:focus-visible {
-    box-shadow: var(--_bi--focus, 0 0 0 4.5px var(--bic-button-focus-shadow-color), var(--bic-button-box-shadow));
-    outline: var(--_bi--focus, 3px solid var(--bic-button-focus-outline-color));
+    box-shadow: var(--bic-button-box-shadow), var(--_bi--focus, 0 0 0 4.5px var(--bi-states-focus-background));
+    outline: var(--_bi--focus, 3px solid var(--bi-states-focus));
     outline-offset: var(--_bi--focus, 2px);
 
     & * {
@@ -664,57 +986,36 @@
   }
 
   &:not([data-variant]), &[data-variant="filled"] {
-    --bic-button-color: var(--bi-basic-white);
-    --bic-button-background: var(--bi-primary-50);
-    --bic-button-background-hover: linear-gradient(0deg, var(--bi-states-hover-dark) 0%, var(--bi-states-hover-dark) 100%),
-      var(--bic-button-background);
-    --bic-button-background-press: linear-gradient(0deg, var(--bi-states-press-dark) 0%, var(--bi-states-press-dark) 100%),
-      var(--bic-button-background);
     --bic-button-box-shadow: 0px 0px 0px 2px #ffffff1f inset, 0px 0px 0px 1px #0a0d122e inset,
       0px -2px 0px 0px #0a0d120d inset, 0px 1px 2px 0px #0a0d120d;
   }
 
   &[data-variant="outlined"] {
-    --bic-button-color: var(--bi-primary-50);
-    --bic-button-box-shadow: 0px 0px 0px 1.5px var(--bi-primary-50) inset;
-    --bic-button-background-hover: var(--bi-states-hover-dark);
-    --bic-button-background-press: var(--bi-states-press-dark);
+    --bic-button-color: var(--bi-color-primary-contrast);
+    --bic-button-background: transparent;
+    --bic-button-box-shadow: 0px 0px 0px 1.5px var(--bic-button-color) inset;
+    --bic-button-background-hover: var(--bi-states-hover);
+    --bic-button-background-press: var(--bi-states-press);
 
-    &[data-dark="true"] {
-      --bic-button-color: var(--bi-basic-white);
-      --bic-button-box-shadow: 0px 0px 0px 1.5px var(--bi-basic-white) inset;
-      --bic-button-background-hover: var(--bi-states-hover-light);
-      --bic-button-background-press: var(--bi-states-press-light);
+    &[data-color] {
+      --bic-button-color: var(--bi-color-contrast);
     }
   }
 
   &[data-variant="text"] {
-    --bic-button-color: var(--bi-neutral-90);
-    --bic-button-background-hover: var(--bi-states-hover-dark);
-    --bic-button-background-press: var(--bi-states-press-dark);
-
-    &[data-dark="true"] {
-      --bic-button-color: var(--bi-basic-white);
-      --bic-button-background-hover: var(--bi-states-hover-light);
-      --bic-button-background-press: var(--bi-states-press-light);
-    }
+    --bic-button-color: var(--bi-color-text);
+    --bic-button-background: transparent;
+    --bic-button-background-hover: var(--bi-states-hover);
+    --bic-button-background-press: var(--bi-states-press);
   }
 
   &[data-variant="flat"] {
-    --bic-button-color: var(--bi-primary-90);
-    --bic-button-background: var(--bi-primary-5);
-    --bic-button-background-hover: linear-gradient(0deg, var(--bi-states-hover-dark) 0%, var(--bi-states-hover-dark) 100%),
-      var(--bic-button-background);
-    --bic-button-background-press: linear-gradient(0deg, var(--bi-states-press-dark) 0%, var(--bi-states-press-dark) 100%),
-      var(--bic-button-background);
+    --bic-button-color: var(--bi-color-primary-text);
+    --bic-button-background: var(--bi-color-primary-surface-strong);
 
-    &[data-dark="true"] {
-      --bic-button-color: var(--bi-basic-white);
-      --bic-button-background: #ffffff1a;
-      --bic-button-background-hover: linear-gradient(0deg, var(--bi-states-hover-light) 0%, var(--bi-states-hover-light) 100%),
-        var(--bic-button-background);
-      --bic-button-background-press: linear-gradient(0deg, var(--bi-states-press-light) 0%, var(--bi-states-press-light) 100%),
-        var(--bic-button-background);
+    &[data-color] {
+      --bic-button-color: var(--bi-color-text);
+      --bic-button-background: var(--bi-color-surface-strong);
     }
   }
 
@@ -747,14 +1048,13 @@
 }
 
 .bi-card {
-  --bic-card-background-color: var(--bi-basic-white);
-  --bic-card-box-shadow: 0 0 0 var(--bi-stroke-thin) var(--bic-card-border-color);
-  --bic-card-border-color: var(--bi-neutral-15);
-  --bic-card-color: var(--bi-neutral-95);
-  --bic-card-header-title-color: var(--bi-neutral-95);
-  --bic-card-header-bold-color: var(--bi-primary-60);
-  --bic-card-header-label-color: var(--bi-neutral-50);
-  --bic-card-content-color: var(--bi-neutral-50);
+  --bic-card-background-color: var(--bi-color-surface-subtle);
+  --bic-card-box-shadow: 0 0 0 var(--bi-stroke-thin) var(--bi-color-stroke);
+  --bic-card-color: var(--bi-color-text-secondary);
+  --bic-card-header-title-color: var(--bi-color-text);
+  --bic-card-header-bold-color: var(--bi-color-text-accent);
+  --bic-card-header-label-color: var(--bi-color-text-secondary);
+  --bic-card-content-color: var(--bi-color-text-secondary);
   --bic-card-content-padding: var(--bi-scale-4x);
   --bic-card-border-radius: var(--bi-radius-medium);
   --bic-card-content-lines: 2;
@@ -762,40 +1062,11 @@
   --bic-card-media-date-width: 3.1875rem;
   --bic-card-media-date-height: 2.875rem;
   --bic-card-actions-flex-direction: column;
-  --bic-card-actions-background-color: var(--bi-neutral-10);
-  --bic-card-actions-icon-color: var(--bi-primary-50);
-  --bic-card-border-hover-color: var(--bi-neutral-50);
+  --bic-card-actions-background-color: var(--bi-color-surface-strong);
+  --bic-card-actions-icon-color: var(--bi-color-contrast);
+  --bic-card-border-hover-color: var(--bi-color-stroke-contrast);
   --bic-card-box-shadow-hover-color: #0000000d;
-  --bic-card-box-shadow-focus-color: var(--bi-primary-50);
-  --bic-card-box-shadow-focus-background-color: var(--bi-basic-white);
-  --bic-card-box-shadow-focus-outer-border: 6px;
-  --bic-card-box-shadow-focus-inner-border: 4px;
-  --bic-card-border-active-color: var(--bi-primary-50);
   --bic-card-box-shadow-active-color: #0000000d;
-  --bic-card-box-shadow-active-outer-border: 20px;
-  --bic-card-box-shadow-active-inner-border: 10px;
-
-  &[data-dark="true"] {
-    --bic-card-background-color: var(--bi-neutral-90);
-    --bic-card-box-shadow: 0 0 0 var(--bi-stroke-thin) var(--bi-neutral-70);
-    --bic-card-border-color: var(--bi-neutral-70);
-    --bic-card-color: var(--bi-neutral-5);
-    --bic-card-header-title-color: var(--bi-neutral-5);
-    --bic-card-header-bold-color: var(--bi-primary-20);
-    --bic-card-header-label-color: var(--bi-neutral-30);
-    --bic-card-content-color: var(--bi-neutral-30);
-    --bic-card-actions-background-color: var(--bi-neutral-75);
-    --bic-card-actions-icon-color: var(--bi-neutral-10);
-    --bic-card-border-hover-color: var(--bi-neutral-25);
-    --bic-card-box-shadow-hover-color: #b2cdf40d;
-    --bic-card-box-shadow-focus-color: var(--bi-primary-30);
-    --bic-card-box-shadow-focus-background-color: var(--bi-neutral-95);
-    --bic-card-box-shadow-focus-outer-border: 4.5px;
-    --bic-card-box-shadow-focus-inner-border: 4px;
-    --bic-card-border-active-color: var(--bi-primary-50);
-    --bic-card-box-shadow-active-color: #b2cdf40d;
-  }
-
   width: 100%;
   box-shadow: var(--bic-card-box-shadow);
   border-radius: var(--bic-card-border-radius);
@@ -848,44 +1119,8 @@
     }
   }
 
-  &[data-color="info"] {
-    --bic-card-background-color: var(--bi-info-5);
-    --bic-card-color: var(--bi-info-90);
-    --bic-card-border-color: var(--bi-info-15);
-    --bic-card-header-title-color: var(--bi-info-90);
-    --bic-card-header-bold-color: var(--bi-info-90);
-    --bic-card-header-label-color: var(--bi-info-90);
-  }
-
-  &[data-color="warning"] {
-    --bic-card-background-color: var(--bi-warning-10);
-    --bic-card-color: var(--bi-warning-90);
-    --bic-card-border-color: var(--bi-warning-15);
-    --bic-card-header-title-color: var(--bi-warning-90);
-    --bic-card-header-bold-color: var(--bi-warning-90);
-    --bic-card-header-label-color: var(--bi-warning-90);
-  }
-
-  &[data-color="primary"][data-dark="true"] {
-    --bic-card-background-color: var(--bi-primary-90);
-    --bic-card-box-shadow: 0 0 0 var(--bi-stroke-thin) var(--bi-primary-75);
-    --bic-card-border-color: var(--bi-primary-75);
-    --bic-card-color: var(--bi-neutral-5);
-    --bic-card-header-title-color: var(--bi-neutral-5);
-    --bic-card-header-bold-color: var(--bi-primary-20);
-    --bic-card-header-label-color: var(--bi-neutral-30);
-    --bic-card-content-color: var(--bi-neutral-30);
-    --bic-card-actions-background-color: var(--bi-primary-85);
-    --bic-card-actions-icon-color: var(--bi-primary-10);
-    --bic-card-border-hover-color: var(--bi-primary-40);
-    --bic-card-box-shadow-focus-color: var(--bi-neutral-15);
-    --bic-card-box-shadow-focus-background-color: var(--bi-primary-30);
-    --bic-card-border-active-color: var(--bi-primary-10);
-  }
-
   &[data-error="true"] {
-    box-shadow: 0 0 0 var(--bi-stroke-thick) var(--bi-alert-50);
-    --bic-card-border-color: transparent;
+    box-shadow: 0 0 0 var(--bi-stroke-thick) var(--bi-color-alert-fill);
   }
 
   & .bi-card--content {
@@ -927,9 +1162,8 @@
 
       &:not(.disabled) {
         &:focus-visible {
-          box-shadow: 0 0 0 var(--bic-card-box-shadow-focus-inner-border) var(--bic-card-box-shadow-focus-background-color),
-            0 0 0 var(--bic-card-box-shadow-focus-outer-border) var(--bic-card-box-shadow-focus-color);
-          outline: var(--_bi--focus, 1.5px solid var(--bic-card-box-shadow-focus-color));
+          box-shadow: var(--bic-card-box-shadow), var(--_bi--focus, 0 0 0 4.5px var(--bi-states-focus-background));
+          outline: var(--_bi--focus, 3px solid var(--bi-states-focus));
           outline-offset: var(--_bi--focus, 2px);
 
           & * {
@@ -946,7 +1180,7 @@
         }
 
         &:active {
-          box-shadow: 0px 0px 0px var(--bi-stroke-medium) var(--bic-card-border-active-color),
+          box-shadow: 0px 0px 0px var(--bi-stroke-medium) var(--bi-states-focus),
             0px 0px 20px var(--bi-scale-1-5x) var(--bic-card-box-shadow-active-color),
             0px 0px 10px 0px var(--bic-card-box-shadow-active-color);
         }
@@ -979,6 +1213,10 @@
       @media (width < 600px) {
         --bic-button-size: var(--bi-scale-11x);
       }
+
+      &[data-color] {
+        --bic-card-actions-icon-color: var(--bi-color-contrast);
+      }
     }
   }
 
@@ -1087,13 +1325,9 @@
 }
 
 .bi-checkbox-subsection {
-  --bic-checkbox-subsection-line-bg: var(--bi-neutral-30);
+  --bic-checkbox-subsection-line-bg: var(--bi-color-neutral-stroke-strong);
   display: flex;
 
-  &[data-dark="true"] {
-    --bic-checkbox-subsection-line-bg: var(--bi-neutral-50);
-  }
-
   & > div:first-child {
     margin: 0 var(--bi-scale-3x) 0 var(--bi-scale-5x);
     background-color: var(--bic-checkbox-subsection-line-bg);
@@ -1110,12 +1344,10 @@
 }
 
 .bi-chip {
-  --bic-chip-background: var(--bi-primary-5);
-  --bic-chip-focus-inner: var(--bi-basic-white);
-  --bic-chip-focus-outer: var(--bi-primary-50);
-  --bic-chip-background-hover: var(--bi-states-hover-dark);
-  --bic-chip-background-press: var(--bi-states-press-dark);
-  --bic-chip-text-color: var(--bi-neutral-90);
+  --bic-chip-background: var(--bi-color-surface);
+  --bic-chip-background-selected: var(--bi-color-fill);
+  --bic-chip-text-color: var(--bi-color-text-subtle);
+  --bic-chip-text-color-selected: var(--bi-color-on-fill);
   --bic-chip-padding: var(--bi-scale-1x) var(--bi-scale-2x);
   --bic-chip-icon-size: var(--bi-scale-6x);
   --bic-chip-font: var(--bi-font-body-medium);
@@ -1142,149 +1374,9 @@
     --bic-chip-font: var(--bi-font-body-large);
   }
 
-  &[data-dark="true"] {
-    --bic-chip-focus-inner: var(--bi-neutral-95);
-    --bic-chip-focus-outer: var(--bi-primary-30);
-    --bic-chip-background-hover: var(--bi-states-hover-light);
-    --bic-chip-background-press: var(--bi-states-press-light);
-  }
-
   &[data-selected="true"] {
-    --bic-chip-background-hover: var(--bi-states-hover-light);
-    --bic-chip-background-press: var(--bi-states-press-light);
-  }
-
-  &[data-color="white"] {
-    --bic-chip-background: var(--bi-basic-white);
-
-    &[data-selected="true"] {
-      --bic-chip-background: var(--bi-neutral-60);
-      --bic-chip-text-color: var(--bi-basic-white);
-    }
-
-    &[data-dark="true"] {
-      --bic-chip-background: var(--bi-neutral-100);
-      --bic-chip-text-color: var(--bi-basic-white);
-    }
-
-    &[data-dark="true"][data-selected="true"] {
-      --bic-chip-background: var(--bi-neutral-50);
-      --bic-chip-text-color: var(--bi-basic-white);
-    }
-  }
-
-  &[data-color="neutral"] {
-    --bic-chip-background: var(--bi-neutral-5);
-
-    &[data-selected="true"] {
-      --bic-chip-background: var(--bi-neutral-60);
-      --bic-chip-text-color: var(--bi-basic-white);
-    }
-
-    &[data-dark="true"] {
-      --bic-chip-background: var(--bi-neutral-95);
-      --bic-chip-text-color: var(--bi-basic-white);
-    }
-
-    &[data-dark="true"][data-selected="true"] {
-      --bic-chip-background: var(--bi-neutral-50);
-      --bic-chip-text-color: var(--bi-basic-white);
-    }
-  }
-
-  &[data-color="primary"] {
-    --bic-chip-background: var(--bi-primary-5);
-
-    &[data-selected="true"] {
-      --bic-chip-background: var(--bi-primary-50);
-      --bic-chip-text-color: var(--bi-basic-white);
-    }
-
-    &[data-dark="true"] {
-      --bic-chip-background: var(--bi-primary-85);
-      --bic-chip-text-color: var(--bi-primary-10);
-    }
-
-    &[data-dark="true"][data-selected="true"] {
-      --bic-chip-background: var(--bi-primary-50);
-      --bic-chip-text-color: var(--bi-basic-white);
-    }
-  }
-
-  &[data-color="info"] {
-    --bic-chip-background: var(--bi-info-5);
-
-    &[data-selected="true"] {
-      --bic-chip-background: var(--bi-info-50);
-      --bic-chip-text-color: var(--bi-basic-white);
-    }
-
-    &[data-dark="true"] {
-      --bic-chip-background: var(--bi-info-95);
-      --bic-chip-text-color: var(--bi-info-15);
-    }
-
-    &[data-dark="true"][data-selected="true"] {
-      --bic-chip-background: var(--bi-info-50);
-      --bic-chip-text-color: var(--bi-basic-white);
-    }
-  }
-
-  &[data-color="alert"] {
-    --bic-chip-background: var(--bi-alert-10);
-
-    &[data-selected="true"] {
-      --bic-chip-background: var(--bi-alert-60);
-      --bic-chip-text-color: var(--bi-basic-white);
-    }
-
-    &[data-dark="true"] {
-      --bic-chip-background: var(--bi-alert-95);
-      --bic-chip-text-color: var(--bi-alert-15);
-    }
-
-    &[data-dark="true"][data-selected="true"] {
-      --bic-chip-background: var(--bi-alert-60);
-      --bic-chip-text-color: var(--bi-basic-white);
-    }
-  }
-
-  &[data-color="warning"] {
-    --bic-chip-background: var(--bi-warning-10);
-
-    &[data-selected="true"] {
-      --bic-chip-background: var(--bi-warning-75);
-      --bic-chip-text-color: var(--bi-basic-white);
-    }
-
-    &[data-dark="true"] {
-      --bic-chip-background: var(--bi-warning-90);
-      --bic-chip-text-color: var(--bi-warning-15);
-    }
-
-    &[data-dark="true"][data-selected="true"] {
-      --bic-chip-background: var(--bi-warning-70);
-      --bic-chip-text-color: var(--bi-basic-white);
-    }
-  }
-
-  &[data-color="success"] {
-    --bic-chip-background: var(--bi-success-5);
-
-    &[data-selected="true"] {
-      --bic-chip-background: var(--bi-success-70);
-      --bic-chip-text-color: var(--bi-basic-white);
-    }
-
-    &[data-dark="true"] {
-      --bic-chip-background: var(--bi-success-90);
-      --bic-chip-text-color: var(--bi-success-10);
-    }
-
-    &[data-dark="true"][data-selected="true"] {
-      --bic-chip-background: var(--bi-success-70);
-      --bic-chip-text-color: var(--bi-basic-white);
-    }
+    --bic-chip-background: var(--bic-chip-background-selected);
+    color: var(--bic-chip-text-color-selected);
   }
 
   &:is(button), &:is(a) {
@@ -1293,21 +1385,19 @@
     text-decoration: none;
 
     &:focus-visible {
-      box-shadow: var(--bic-chip-focus-outer), var(--_bi--focus, 0 0 0 4.5px var(--bic-chip-focus-inner));
-      outline: var(--_bi--focus, 3px solid var(--bic-chip-focus-outer));
+      box-shadow: var(--_bi--focus, 0 0 0 4.5px var(--bi-states-focus-background));
+      outline: var(--_bi--focus, 3px solid var(--bi-states-focus));
       outline-offset: var(--_bi--focus, 2px);
     }
 
     @media (hover: hover) and (pointer: fine) {
       &:hover {
-        background: linear-gradient(0deg, var(--bic-chip-background-hover) 0%, var(--bic-chip-background-hover) 100%),
-          var(--bic-chip-background);
+        background: linear-gradient(0deg, var(--bi-states-hover) 0%, var(--bi-states-hover) 100%), var(--bic-chip-background);
       }
     }
 
     &:active {
-      background: linear-gradient(0deg, var(--bic-chip-background-press) 0%, var(--bic-chip-background-press) 100%),
-        var(--bic-chip-background);
+      background: linear-gradient(0deg, var(--bi-states-press) 0%, var(--bi-states-press) 100%), var(--bic-chip-background);
     }
   }
 
@@ -1318,29 +1408,13 @@
 }
 
 details.bi-details {
-  --bic-details-background: var(--bi-basic-white);
-  --bic-details-background-hover: linear-gradient(0deg, var(--bi-states-hover-dark) 0%, var(--bi-states-hover-dark) 100%),
-    var(--bic-details-background);
-  --bic-details-background-press: linear-gradient(0deg, var(--bi-states-press-dark) 0%, var(--bi-states-press-dark) 100%),
-    var(--bic-details-background);
-  --bic-details-color: var(--bi-neutral-90);
-  --bic-details-border-color: var(--bi-neutral-15);
+  --bic-details-background: transparent;
+  --bic-details-background-hover: linear-gradient(0deg, var(--bi-states-hover) 0%, var(--bi-states-hover) 100%), var(--bic-details-background);
+  --bic-details-background-press: linear-gradient(0deg, var(--bi-states-press) 0%, var(--bi-states-press) 100%), var(--bic-details-background);
+  --bic-details-color: var(--bi-color-text-secondary);
+  --bic-details-summary-color: var(--bi-color-text);
+  --bic-details-border-color: var(--bi-color-stroke);
   --bic-details-padding: var(--bi-scale-4x);
-  --bic-details-focus-shadow-color: var(--bi-basic-white);
-  --bic-details-focus-outline-color: var(--bi-primary-50);
-
-  &[data-dark="true"] {
-    --bic-details-background: var(--bi-neutral-90);
-    --bic-details-background-hover: linear-gradient(0deg, var(--bi-states-hover-light) 0%, var(--bi-states-hover-light) 100%),
-      var(--bic-details-background);
-    --bic-details-background-press: linear-gradient(0deg, var(--bi-states-press-light) 0%, var(--bi-states-press-light) 100%),
-      var(--bic-details-background);
-    --bic-details-border-color: var(--bi-neutral-70);
-    --bic-details-color: var(--bi-basic-white);
-    --bic-details-focus-shadow-color: var(--bi-neutral-95);
-    --bic-details-focus-outline-color: var(--bi-primary-30);
-  }
-
   font: var(--bi-font-body-large);
   background-color: var(--bic-details-background);
   color: var(--bic-details-color);
@@ -1356,6 +1430,7 @@ details.bi-details {
 
   & summary {
     padding: var(--bic-details-padding);
+    color: var(--bic-details-summary-color);
     cursor: pointer;
     justify-content: space-between;
     align-items: center;
@@ -1379,8 +1454,8 @@ details.bi-details {
     }
 
     &:focus-visible {
-      box-shadow: var(--_bi--focus, 0 0 0 4.5px inset var(--bic-details-focus-shadow-color));
-      outline: var(--_bi--focus, var(--bi-stroke-thick) solid var(--bic-details-focus-outline-color));
+      box-shadow: var(--_bi--focus, 0 0 0 4.5px var(--bi-states-focus-background));
+      outline: var(--_bi--focus, var(--bi-stroke-thick) solid var(--bi-states-focus));
       outline-offset: var(--_bi--focus, -2px);
       border-radius: var(--bi-radius-medium);
 
@@ -1464,21 +1539,14 @@ details.bi-details {
   --bic-dialog-anchor-closed-translate: 0, var(--bi-scale-12x);
   --bic-dialog-animation-duration: .2s;
   --bic-dialog-backdrop-background: #00000080;
-  --bic-dialog-background: var(--bi-basic-white);
+  --bic-dialog-background: var(--bi-color-background);
   --bic-dialog-border-radius: var(--bi-radius-large);
-  --bic-dialog-border-color: var(--bi-neutral-15);
+  --bic-dialog-border-color: var(--bi-color-stroke);
   --bic-dialog-icon-spacing: .625rem;
-  --bic-dialog-color: var(--bi-neutral-90);
+  --bic-dialog-color: var(--bi-color-text);
   --bic-dialog-max-height: 80vh;
   --bic-dialog-max-width: 40rem;
   --bic-dialog-padding: var(--bi-scale-4x);
-
-  &[data-dark="true"] {
-    --bic-dialog-background: var(--bi-primary-95);
-    --bic-dialog-border-color: var(--bi-neutral-70);
-    --bic-dialog-color: var(--bi-basic-white);
-  }
-
   animation: bi-dialog-fade-in-animation var(--bic-dialog-animation-duration) forwards;
   background: var(--bic-dialog-background);
   border-radius: var(--bic-dialog-border-radius);
@@ -1644,25 +1712,16 @@ body:has(.bi-dialog:modal) {
 
 .bi-popover {
   --bic-popover-arrow-size: var(--bi-scale-3x);
-  --bic-popover-background: var(--bi-basic-white);
+  --bic-popover-background: var(--bi-color-surface-subtle);
   --bic-popover-border-width: var(--bi-stroke-thin);
   --bic-popover-border-style: solid;
-  --bic-popover-border-color: var(--bi-neutral-15);
-  --bic-popover-color: var(--bi-neutral-90);
+  --bic-popover-border-color: var(--bi-color-stroke);
+  --bic-popover-color: var(--bi-color-text);
   --bic-popover-border-radius: var(--bi-radius-medium);
   --bic-popover-max-width: 300px;
   --bic-popover-padding: var(--bi-scale-1x);
   --bic-popover-box-shadow: 0px 8px 16px -4px #26333f14, 4px 4px 6px -2px #26333f08,
     0px 2px 2px -1px #26333f0a;
-
-  &[data-dark="true"] {
-    --bic-popover-background: var(--bi-neutral-95);
-    --bic-popover-border-color: var(--bi-neutral-70);
-    --bic-popover-color: var(--bi-neutral-5);
-    --bic-popover-box-shadow: 0px 8px 16px -4px #26333f14, 4px 4px 6px -2px #26333f08,
-      0px 2px 2px -1px #26333f0a;
-  }
-
   background: var(--bic-popover-background);
   border-radius: var(--bic-popover-border-radius);
   border-width: var(--bic-popover-border-width);
@@ -1734,22 +1793,13 @@ body:has(.bi-dialog:modal) {
   --bic-dropdown-padding: var(--bi-scale-1x);
   --bic-dropdown-item-padding: var(--bi-scale-2x) var(--bi-scale-3x);
   --bic-dropdown-item-size: var(--bi-scale-11x);
-  --bic-dropdown-background: var(--bi-basic-white);
+  --bic-dropdown-background: var(--bi-color-surface-subtle);
   --bic-dropdown-border-width: var(--bi-stroke-thin);
   --bic-dropdown-border-style: solid;
-  --bic-dropdown-border-color: var(--bi-neutral-15);
+  --bic-dropdown-border-color: var(--bi-color-stroke);
   --bic-dropdown-box-shadow: 0px 8px 16px -4px #26333f14, 4px 4px 6px -2px #26333f08,
     0px 2px 2px -1px #26333f0a;
   --bic-dropdown-min-width: var(--bi-scale-64x);
-
-  &[data-dark="true"] {
-    --bic-dropdown-background: var(--bi-neutral-100);
-    --bic-dropdown-border-color: var(--bi-neutral-90);
-    --bic-dropdown-color: var(--bi-neutral-5);
-    --bic-dropdown-box-shadow: 0px 8px 16px -4px #26333f14, 4px 4px 6px -2px #26333f08,
-      0px 2px 2px -1px #26333f0a;
-  }
-
   background: var(--bic-dropdown-background);
   border-radius: var(--bi-radius-medium);
   border-width: var(--bic-dropdown-border-width);
@@ -1782,47 +1832,37 @@ body:has(.bi-dialog:modal) {
   }
 }
 
+:root, [data-color-scheme="light"] {
+  --_bic-input-select-chevron: url("data:image/svg+xml,<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"1em\" height=\"1em\" fill=\"none\" viewBox=\"0 0 24 24\"><path fill=\"%23222d38\" fill-rule=\"evenodd\" d=\"M5.97 9.47a.75.75 0 0 1 1.06 0L12 14.44l4.97-4.97a.75.75 0 1 1 1.06 1.06l-5.5 5.5a.75.75 0 0 1-1.06 0l-5.5-5.5a.75.75 0 0 1 0-1.06\" clip-rule=\"evenodd\"></path></svg>");
+}
+
+[data-color-scheme="dark"] {
+  --_bic-input-select-chevron: url("data:image/svg+xml,<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"1em\" height=\"1em\" fill=\"none\" viewBox=\"0 0 24 24\"><path fill=\"white\" fill-rule=\"evenodd\" d=\"M5.97 9.47a.75.75 0 0 1 1.06 0L12 14.44l4.97-4.97a.75.75 0 1 1 1.06 1.06l-5.5 5.5a.75.75 0 0 1-1.06 0l-5.5-5.5a.75.75 0 0 1 0-1.06\" clip-rule=\"evenodd\"></path></svg>");
+}
+
 :where(.bi-input) {
   margin: 0;
 }
 
 .bi-input {
-  --bic-input-border-color-invalid: var(--bi-alert-50);
   --bic-input-box-shadow: 0 0 0 var(--bi-stroke-thin) var(--bic-input-border-color);
-  --bic-input-box-shadow-hover: 0 0 0 var(--bi-stroke-thick) var(--bic-input-border-color-hover);
-  --bic-input-caret-color: var(--bi-primary-50);
+  --bic-input-caret-color: var(--bi-color-primary-fill);
   --bic-input-font-size: 1rem;
   --bic-input-padding: var(--bi-scale-3x);
   --bic-input-size: var(--bi-scale-11x);
-  --bic-input-toggle-background: var(--bi-primary-50);
-  --bic-input-toggle-color: var(--bi-basic-white);
+  --bic-input-toggle-background: var(--bi-color-primary-fill);
+  --bic-input-toggle-color: var(--bi-color-primary-on-fill);
   --bic-input-toggle-size: 1.125rem;
-  --bic-input-background: var(--bi-basic-white);
-  --bic-input-background-readonly: var(--bi-neutral-10);
-  --bic-input-border-color: var(--bi-neutral-50);
-  --bic-input-border-color-hover: var(--bi-neutral-50);
-  --bic-input-border-color-readonly: var(--bi-neutral-50);
-  --bic-input-color-readonly: var(--bi-neutral-95);
-  --bic-input-color: var(--bi-neutral-95);
-  --bic-input-disabled-color: var(--bi-neutral-50);
-  --bic-input-placeholder-color: var(--bi-neutral-60);
-  --bic-input-focus-outline-color: var(--bi-primary-50);
-  --bic-input-focus-shadow-color: var(--bi-basic-white);
-  --bic-input-select-chevron: url("data:image/svg+xml,<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"1em\" height=\"1em\" fill=\"none\" viewBox=\"0 0 24 24\"><path fill=\"%23222d38\" fill-rule=\"evenodd\" d=\"M5.97 9.47a.75.75 0 0 1 1.06 0L12 14.44l4.97-4.97a.75.75 0 1 1 1.06 1.06l-5.5 5.5a.75.75 0 0 1-1.06 0l-5.5-5.5a.75.75 0 0 1 0-1.06\" clip-rule=\"evenodd\"></path></svg>");
-
-  &[data-dark="true"] {
-    --bic-input-background: var(--bi-neutral-95);
-    --bic-input-background-readonly: var(--bi-neutral-50);
-    --bic-input-border-color-hover: var(--bi-neutral-25);
-    --bic-input-color-readonly: var(--bi-basic-white);
-    --bic-input-color: var(--bi-basic-white);
-    --bic-input-disabled-color: var(--bi-neutral-40);
-    --bic-input-placeholder-color: var(--bi-neutral-30);
-    --bic-input-focus-outline-color: var(--bi-primary-30);
-    --bic-input-focus-shadow-color: var(--bi-neutral-95);
-    --bic-input-select-chevron: url("data:image/svg+xml,<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"1em\" height=\"1em\" fill=\"none\" viewBox=\"0 0 24 24\"><path fill=\"white\" fill-rule=\"evenodd\" d=\"M5.97 9.47a.75.75 0 0 1 1.06 0L12 14.44l4.97-4.97a.75.75 0 1 1 1.06 1.06l-5.5 5.5a.75.75 0 0 1-1.06 0l-5.5-5.5a.75.75 0 0 1 0-1.06\" clip-rule=\"evenodd\"></path></svg>");
-  }
-
+  --bic-input-background: var(--bi-color-surface-subtle);
+  --bic-input-background-readonly: var(--bi-color-surface);
+  --bic-input-border-color: var(--bi-color-stroke-contrast);
+  --bic-input-border-color-invalid: var(--bi-color-alert-stroke-contrast);
+  --bic-input-color-readonly: var(--bi-color-text-subtle);
+  --bic-input-color: var(--bi-color-text);
+  --bic-input-disabled-color: var(--bi-color-text-subtle);
+  --bic-input-placeholder-color: var(--bi-color-text-secondary);
+  --bic-input-focus-outline-color: var(--bi-states-focus);
+  --bic-input-focus-shadow-color: var(--bi-states-focus-background);
   appearance: none;
   background: var(--bic-input-background);
   border-radius: var(--bi-radius-medium);
@@ -1848,11 +1888,13 @@ body:has(.bi-dialog:modal) {
 
   &:where(:not([type="checkbox"], [type="radio"])) {
     &:hover {
-      box-shadow: var(--_bi--hover, var(--bic-input-box-shadow-hover));
+      background: var(--_bi--hover, linear-gradient(0deg, var(--bi-states-hover) 0%, var(--bi-states-hover) 100%),
+        var(--bic-input-background));
     }
 
     &:focus-visible {
       --bic-input-border-color: var(--bic-input-focus-outline-color);
+      background: var(--_bi--focus, var(--bic-input-background));
     }
   }
 
@@ -1861,10 +1903,6 @@ body:has(.bi-dialog:modal) {
     outline-offset: 0;
     box-shadow: var(--_bi--focus, 0px 0px 20px var(--bi-scale-1-5x) #0000000d,
       0px 0px 10px 0px #0000000d);
-
-    & * {
-      --_bi--focus: ;
-    }
   }
 
   &::placeholder {
@@ -1881,11 +1919,11 @@ body:has(.bi-dialog:modal) {
 
   &[aria-invalid="true"] {
     --bic-input-border-color: var(--bic-input-border-color-invalid);
+    --bic-input-focus-outline-color: var(--bic-input-border-color-invalid);
   }
 
   &[readonly], &:disabled, &[aria-disabled="true"] {
     background: var(--bic-input-background-readonly);
-    --bic-input-border-color: var(--bic-input-border-color-readonly);
     color: var(--bic-input-color-readonly);
   }
 
@@ -1904,7 +1942,7 @@ body:has(.bi-dialog:modal) {
       cursor: pointer;
     }
 
-    background-image: var(--bic-input-select-chevron);
+    background-image: var(--_bic-input-select-chevron);
     background-position: calc(100% - .5em);
     background-repeat: no-repeat;
     background-size: 1.5em;
@@ -1926,10 +1964,6 @@ body:has(.bi-dialog:modal) {
       box-shadow: var(--_bi--focus, 0 0 0 4.5px var(--bic-input-focus-shadow-color));
       outline: var(--_bi--focus, 3px solid var(--bic-input-focus-outline-color));
       outline-offset: var(--_bi--focus, 3px);
-
-      & * {
-        --_bi--focus: ;
-      }
     }
 
     &:read-only:not([readonly], [aria-disabled="true"], :disabled) {
@@ -2018,40 +2052,21 @@ body:has(.bi-dialog:modal) {
 }
 
 .bi-field {
-  --bic-field-border-color-invalid: var(--bi-alert-50);
   --bic-field-box-shadow: 0 0 0 var(--bi-stroke-thin) var(--bic-field-border-color);
-  --bic-field-box-shadow-hover: 0 0 0 var(--bi-stroke-thick) var(--bic-field-border-color-hover);
   --bic-field-content-spacing: var(--bi-scale-0-50x);
   --bic-field-padding-inline: var(--bi-scale-3x);
-  --bic-field-affix-color: var(--bi-neutral-60);
-  --bic-field-background: var(--bi-basic-white);
-  --bic-field-background-hover: var(--bi-states-hover-dark);
-  --bic-field-background-press: var(--bi-states-press-dark);
-  --bic-field-background-readonly: var(--bi-neutral-10);
-  --bic-field-border-color: var(--bi-neutral-50);
-  --bic-field-border-color-hover: var(--bi-neutral-50);
-  --bic-field-border-color-readonly: var(--bi-neutral-50);
-  --bic-field-disabled-color: var(--bi-neutral-50);
-  --bic-field-description-color: var(--bi-neutral-60);
-  --bic-field-label-color: var(--bi-neutral-95);
-  --bic-field-label-required-color: var(--bi-primary-50);
-  --bic-field-focus-outline-color: var(--bi-primary-50);
-  --bic-field-focus-shadow-color: var(--bi-basic-white);
-
-  &[data-dark="true"] {
-    --bic-field-affix-color: var(--bi-neutral-30);
-    --bic-field-background: var(--bi-neutral-95);
-    --bic-field-background-hover: var(--bi-states-hover-light);
-    --bic-field-background-press: var(--bi-states-press-light);
-    --bic-field-background-readonly: var(--bi-neutral-50);
-    --bic-field-border-color-hover: var(--bi-neutral-25);
-    --bic-field-disabled-color: var(--bi-neutral-40);
-    --bic-field-description-color: var(--bi-neutral-15);
-    --bic-field-label-color: var(--bi-basic-white);
-    --bic-field-label-required-color: var(--bi-secondary-50);
-    --bic-field-focus-outline-color: var(--bi-primary-30);
-    --bic-field-focus-shadow-color: var(--bi-neutral-95);
-  }
+  --bic-field-affix-color: var(--bi-color-text);
+  --bic-field-background: var(--bi-color-surface-subtle);
+  --bic-field-background-hover: var(--bi-states-hover);
+  --bic-field-background-press: var(--bi-states-press);
+  --bic-field-border-color: var(--bi-color-stroke-contrast);
+  --bic-field-border-color-invalid: var(--bi-color-alert-stroke-contrast);
+  --bic-field-disabled-color: var(--bi-color-text-subtle);
+  --bic-field-description-color: var(--bi-color-text-secondary);
+  --bic-field-label-color: var(--bi-color-text);
+  --bic-field-label-required-color: var(--bi-states-required);
+  --bic-field-focus-outline-color: var(--bi-states-focus);
+  --bic-field-focus-shadow-color: var(--bi-states-focus-background);
 
   & > * {
     margin-block: 0;
@@ -2073,6 +2088,7 @@ body:has(.bi-dialog:modal) {
 
   &:has(.bi-input[aria-invalid="true"]) {
     --bic-field-border-color: var(--bic-field-border-color-invalid);
+    --bic-field-focus-outline-color: var(--bic-field-border-color-invalid);
   }
 
   &:has([aria-disabled="true"]:not([role="option"][aria-disabled="true"]), :disabled:not(option)) > * {
@@ -2201,7 +2217,7 @@ body:has(.bi-dialog:modal) {
     }
 
     &:hover {
-      box-shadow: var(--_bi--hover, var(--bic-field-box-shadow-hover));
+      background: linear-gradient(0deg, var(--bi-states-hover) 0%, var(--bi-states-hover) 100%), var(--bic-field-background);
 
       & * {
         --_bi--hover: ;
@@ -2247,14 +2263,8 @@ body:has(.bi-dialog:modal) {
 }
 
 .bi-fieldset {
-  --bic-fieldset-color: var(--bi-neutral-95);
-  --bic-fieldset-description-color: var(--bi-neutral-60);
-
-  &[data-dark="true"] {
-    --bic-fieldset-color: var(--bi-basic-white);
-    --bic-fieldset-description-color: var(--bi-neutral-15);
-  }
-
+  --bic-fieldset-color: var(--bi-color-text);
+  --bic-fieldset-description-color: var(--bi-color-text-subtle);
   border: 0;
   min-width: 0;
   margin: 0;
@@ -2282,30 +2292,12 @@ body:has(.bi-dialog:modal) {
 }
 
 .bi-filter-group {
-  --bic-filter-group-background: var(--bi-basic-white);
-  --bic-filter-group-background-hover: linear-gradient(0deg, var(--bi-states-hover-dark) 0%, var(--bi-states-hover-dark) 100%),
-    var(--bic-filter-group-background);
-  --bic-filter-group-background-press: linear-gradient(0deg, var(--bi-states-press-dark) 0%, var(--bi-states-press-dark) 100%),
-    var(--bic-filter-group-background);
-  --bic-filter-group-background-expanded: var(--bi-neutral-15);
-  --bic-filter-group-border-color: var(--bi-neutral-15);
-  --bic-filter-group-text-color: var(--bi-neutral-90);
-  --bic-filter-focus-shadow-color: var(--bi-basic-white);
-  --bic-filter-focus-outline-color: var(--bi-primary-50);
-
-  &[data-dark="true"] {
-    --bic-filter-group-background: var(--bi-neutral-90);
-    --bic-filter-group-background-hover: linear-gradient(0deg, var(--bi-states-hover-light) 0%, var(--bi-states-hover-light) 100%),
-      var(--bic-filter-group-background);
-    --bic-filter-group-background-press: linear-gradient(0deg, var(--bi-states-press-light) 0%, var(--bi-states-press-light) 100%),
-      var(--bic-filter-group-background);
-    --bic-filter-group-background-expanded: var(--bi-neutral-80);
-    --bic-filter-group-border-color: var(--bi-neutral-70);
-    --bic-filter-group-text-color: var(--bi-basic-white);
-    --bic-filter-focus-shadow-color: var(--bi-neutral-95);
-    --bic-filter-focus-outline-color: var(--bi-primary-30);
-  }
-
+  --bic-filter-group-background: var(--bi-color-surface-subtle);
+  --bic-filter-group-background-hover: linear-gradient(0deg, var(--bi-states-hover) 0%, var(--bi-states-hover) 100%), var(--bic-filter-group-background);
+  --bic-filter-group-background-press: linear-gradient(0deg, var(--bi-states-press) 0%, var(--bi-states-press) 100%), var(--bic-filter-group-background);
+  --bic-filter-group-background-expanded: var(--bi-color-surface-active);
+  --bic-filter-group-border-color: var(--bi-color-stroke);
+  --bic-filter-group-text-color: var(--bi-color-text);
   flex-direction: column;
   display: flex;
 
@@ -2337,8 +2329,8 @@ body:has(.bi-dialog:modal) {
     }
 
     &:focus-visible {
-      box-shadow: 0 0 0 4.5px var(--bic-filter-focus-shadow-color);
-      outline: 3px solid var(--bic-filter-focus-outline-color);
+      box-shadow: 0 0 0 4.5px var(--bi-states-focus-background);
+      outline: 3px solid var(--bi-states-focus);
       outline-offset: 3px;
       border-radius: var(--bi-radius-small);
     }
@@ -2393,15 +2385,21 @@ body:has(.bi-dialog:modal) {
   }
 }
 
-.bi-footer {
-  --bic-footer-color: var(--bi-basic-key);
-  --bic-footer-background: var(--bi-basic-white);
+:root, [data-color-scheme="light"] {
+  --_bic-footer-aacsb-logo: url("./assets/accreditations/aacsb.svg");
+  --_bic-footer-amba-logo: url("./assets/accreditations/amba.svg");
+  --_bic-footer-equis-logo: url("./assets/accreditations/equis.svg");
+}
 
-  &[data-dark="true"] {
-    --bic-footer-color: var(--bi-basic-white);
-    --bic-footer-background: var(--bi-primary-95);
-  }
+[data-color-scheme="dark"] {
+  --_bic-footer-aacsb-logo: url("./assets/accreditations/aacsb-neg.svg");
+  --_bic-footer-amba-logo: url("./assets/accreditations/amba-neg.svg");
+  --_bic-footer-equis-logo: url("./assets/accreditations/equis-neg.svg");
+}
 
+.bi-footer {
+  --bic-footer-color: var(--bi-color-neutral-text);
+  --bic-footer-background: var(--bi-color-neutral-surface-subtle);
   width: 100%;
   color: var(--bic-footer-color);
   background-color: var(--bic-footer-background);
@@ -2485,30 +2483,18 @@ body:has(.bi-dialog:modal) {
     }
 
     & .bi-footer--aacsb {
-      background-image: url("./assets/accreditations/aacsb.svg");
+      background-image: var(--_bic-footer-aacsb-logo);
       width: 127px;
-
-      &:is([data-dark="true"] .bi-footer--aacsb) {
-        background-image: url("./assets/accreditations/aacsb-neg.svg");
-      }
     }
 
     & .bi-footer--amba {
-      background-image: url("./assets/accreditations/amba.svg");
+      background-image: var(--_bic-footer-amba-logo);
       width: 122px;
-
-      &:is([data-dark="true"] .bi-footer--amba) {
-        background-image: url("./assets/accreditations/amba-neg.svg");
-      }
     }
 
     & .bi-footer--equis {
-      background-image: url("./assets/accreditations/equis.svg");
+      background-image: var(--_bic-footer-equis-logo);
       width: 104px;
-
-      &:is([data-dark="true"] .bi-footer--equis) {
-        background-image: url("./assets/accreditations/equis-neg.svg");
-      }
     }
   }
 
@@ -2579,14 +2565,8 @@ svg {
 }
 
 .bi-label {
-  --bic-label-color: var(--bic-field-label-color, var(--bi-neutral-95));
-  --bic-label-required-color: var(--bic-field-label-required-color, var(--bi-primary-50));
-
-  &[data-dark="true"] {
-    --bic-label-color: var(--bic-field-label-color, var(--bi-basic-white));
-    --bic-label-required-color: var(--bic-field-label-required-color, var(--bi-secondary-50));
-  }
-
+  --bic-label-color: var(--bic-field-label-color, var(--bi-color-text));
+  --bic-label-required-color: var(--bic-field-label-required-color, var(--bi-states-required));
   color: var(--bic-label-color);
   font: var(--bi-font-label-medium);
 
@@ -2608,14 +2588,16 @@ svg {
 }
 
 .bi-link {
-  --bic-link-background-active: var(--bi-primary-20);
-  --bic-link-color-active: var(--bi-primary-60);
-  --bic-link-color-hover: var(--bi-primary-60);
-  --bic-link-color: var(--bi-primary-50);
+  --bic-link-color-hover: var(--bi-color-primary-contrast-hover);
+  --bic-link-color: var(--bi-color-primary-contrast);
   --bic-link-text-decoration-thickness--hover: .125em;
   --bic-link-text-decoration-thickness: .0625em;
-  --bic-link-focus-shadow-color: var(--bi-basic-white);
-  --bic-link-focus-outline-color: var(--bi-primary-50);
+
+  &[data-color] {
+    --bic-link-color-hover: var(--bi-color-contrast-hover);
+    --bic-link-color: var(--bi-color-contrast);
+  }
+
   color: var(--bic-link-color);
   text-decoration-line: underline;
   text-decoration-style: solid;
@@ -2627,29 +2609,6 @@ svg {
     vertical-align: middle;
   }
 
-  &[data-dark="true"] {
-    --bic-link-background-active: var(--bi-primary-80);
-    --bic-link-color-active: var(--bi-primary-30);
-    --bic-link-color-hover: var(--bi-primary-30);
-    --bic-link-color: var(--bi-primary-40);
-    --bic-link-focus-shadow-color: var(--bi-neutral-95);
-    --bic-link-focus-outline-color: var(--bi-primary-30);
-  }
-
-  &[data-color="neutral"] {
-    --bic-link-background-active: var(--bi-neutral-10);
-    --bic-link-color-active: var(--bi-neutral-100);
-    --bic-link-color-hover: var(--bi-neutral-100);
-    --bic-link-color: var(--bi-neutral-90);
-
-    &[data-dark="true"] {
-      --bic-link-background-active: var(--bi-neutral-90);
-      --bic-link-color-active: var(--bi-neutral-15);
-      --bic-link-color-hover: var(--bi-neutral-15);
-      --bic-link-color: var(--bi-neutral-5);
-    }
-  }
-
   &[data-underline="hover"]:not(:hover) {
     text-decoration: none;
   }
@@ -2666,10 +2625,11 @@ svg {
   }
 
   &:focus-visible {
-    box-shadow: var(--_bi--focus, 0 0 0 4.5px var(--bic-link-focus-shadow-color), var(--bic-button-box-shadow));
-    outline: var(--_bi--focus, 3px solid var(--bic-link-focus-outline-color));
+    box-shadow: var(--_bi--focus, 0 0 0 4.5px var(--bi-states-focus-background));
+    outline: var(--_bi--focus, 3px solid var(--bi-states-focus));
     outline-offset: var(--_bi--focus, 2px);
     border-radius: var(--bi-radius-small);
+    text-decoration: none;
 
     & * {
       --_bi--focus: ;
@@ -2677,25 +2637,31 @@ svg {
   }
 
   &:active {
-    background: var(--bic-link-background-active);
-    color: var(--bic-link-color-active);
+    background-color: var(--bi-states-press);
+    border-radius: var(--bi-radius-small);
   }
 }
 
-[data-bi-pride="true"] {
+:root, [data-color-scheme="light"] {
+  --bic-logo-international-vertical: url("./assets/logos/vertical.svg");
+  --bic-logo-international: url("./assets/logos/international.svg");
+  --bic-logo-default: url("./assets/logos/default.svg");
   --bic-logo-pride-international-vertical: url("./assets/logos/pride-vertical.svg");
   --bic-logo-pride-international: url("./assets/logos/pride-international.svg");
   --bic-logo-pride-default: url("./assets/logos/pride-default.svg");
-  --bic-logo-pride-dark-international-vertical: url("./assets/logos/pride-vertical-dark.svg");
-  --bic-logo-pride-dark-international: url("./assets/logos/pride-international-dark.svg");
-  --bic-logo-pride-dark-default: url("./assets/logos/pride-dark.svg");
+}
+
+[data-color-scheme="dark"] {
+  --bic-logo-international-vertical: url("./assets/logos/vertical-dark.svg");
+  --bic-logo-international: url("./assets/logos/international-dark.svg");
+  --bic-logo-default: url("./assets/logos/dark.svg");
+  --bic-logo-pride-international-vertical: url("./assets/logos/pride-vertical-dark.svg");
+  --bic-logo-pride-international: url("./assets/logos/pride-international-dark.svg");
+  --bic-logo-pride-default: url("./assets/logos/pride-dark.svg");
 }
 
 .bi-logo {
   --bic-logo-height: var(--bi-scale-12x);
-  --bic-logo-international-vertical: var(--bic-logo-pride-international-vertical, url("./assets/logos/vertical.svg"));
-  --bic-logo-international: var(--bic-logo-pride-international, url("./assets/logos/international.svg"));
-  --bic-logo-default: var(--bic-logo-pride-default, url("./assets/logos/default.svg"));
   height: var(--bic-logo-height);
   aspect-ratio: 1;
   background-position: center;
@@ -2704,10 +2670,10 @@ svg {
   justify-content: center;
   display: flex;
 
-  &[data-dark="true"] {
-    --bic-logo-international-vertical: var(--bic-logo-pride-dark-international-vertical, url("./assets/logos/vertical-dark.svg"));
-    --bic-logo-international: var(--bic-logo-pride-dark-international, url("./assets/logos/international-dark.svg"));
-    --bic-logo-default: var(--bic-logo-pride-dark-default, url("./assets/logos/dark.svg"));
+  &[data-pride="true"] {
+    --bic-logo-international-vertical: var(--bic-logo-pride-international-vertical);
+    --bic-logo-international: var(--bic-logo-pride-international);
+    --bic-logo-default: var(--bic-logo-pride-default);
   }
 
   &[data-size="xs"] {
@@ -2760,19 +2726,20 @@ svg {
 }
 
 .bi-navbar {
-  --bic-navbar-background-color: var(--bi-basic-white);
-  --bic-navbar-color: var(--bi-basic-key);
+  --bic-navbar-background-color: var(--bi-color-primary-surface-subtle);
+  --bic-navbar-color: var(--bi-color-primary-text);
+
+  &[data-color] {
+    --bic-navbar-background-color: var(--bi-color-surface-subtle);
+    --bic-navbar-color: var(--bi-color-text);
+  }
+
   height: var(--bi-layout-navbar-height);
   background-color: var(--bic-navbar-background-color);
   width: 100%;
   color: var(--bic-navbar-color);
   display: flex;
 
-  &[data-dark="true"] {
-    --bic-navbar-background-color: var(--bi-primary-95);
-    --bic-navbar-color: var(--bi-basic-white);
-  }
-
   & > header {
     height: var(--bi-layout-navbar-height);
     align-items: center;
@@ -2830,23 +2797,25 @@ svg {
   position: relative;
 
   & .bi-sub-navbar {
-    --bic-sub-navbar-background-color: var(--bi-basic-white);
-    --bic-sub-navbar-color: var(--bi-basic-key);
-    --bic-sub-navbar-border-color: var(--bi-neutral-15);
+    --bic-sub-navbar-background-color: var(--bi-color-primary-surface-subtle);
+    --bic-sub-navbar-color: var(--bi-color-primary-text);
+    --bic-sub-navbar-border-color: var(--bi-color-primary-stroke);
+
+    &[data-color] {
+      --bic-sub-navbar-background-color: var(--bi-color-surface-subtle);
+      --bic-sub-navbar-color: var(--bi-color-text);
+      --bic-sub-navbar-border-color: var(--bi-color-stroke);
+    }
+
     height: var(--bi-layout-navbar-height);
     background-color: var(--bic-sub-navbar-background-color);
     border-bottom: 1px solid var(--bic-sub-navbar-border-color);
     width: 100%;
+    color: var(--bic-sub-navbar-color);
     position: absolute;
     top: 0;
     left: 0;
 
-    &[data-dark="true"] {
-      --bic-sub-navbar-background-color: var(--bi-primary-95);
-      --bic-sub-navbar-color: var(--bi-basic-white);
-      --bic-sub-navbar-border-color: var(--bi-neutral-70);
-    }
-
     &[data-fixed="true"] {
       z-index: 120;
       position: fixed;
@@ -2860,13 +2829,8 @@ svg {
 
 .bi-pagination {
   --bic-pagination-gap: var(--bi-scale-2x);
-  --bic-pagination-color: var(--bi-basic-key);
-  --bic-pagination-selected-background: var(--bi-primary-5);
-
-  &[data-dark="true"] {
-    --bic-pagination-color: var(--bi-basic-white);
-    --bic-pagination-selected-background: var(--bi-primary-80);
-  }
+  --bic-pagination-color: var(--bi-color-text);
+  --bic-pagination-selected-background: var(--bi-color-surface);
 
   & :is(ol, ul) {
     color: var(--bic-pagination-color);
@@ -2901,7 +2865,7 @@ svg {
 .bi-search {
   &:has(:focus-visible) {
     & .bi-field--affix:first-child {
-      color: var(--bi-primary-50);
+      color: var(--bi-states-focus);
     }
   }
 
@@ -3005,24 +2969,12 @@ svg {
 }
 
 .bi-tabs {
-  --bic-tabs-tab-color: var(--bi-neutral-90);
-  --bic-tabs-tab-color-selected: var(--bi-primary-50);
-  --bic-tabs-tab-background-hover: var(--bi-states-hover-dark);
-  --bic-tabs-tab-background-press: var(--bi-states-press-dark);
+  --bic-tabs-tab-color: var(--bi-color-text);
+  --bic-tabs-tab-color-selected: var(--bi-color-contrast);
+  --bic-tabs-tab-background-hover: var(--bi-states-hover);
+  --bic-tabs-tab-background-press: var(--bi-states-press);
   --bic-tabs-tab-font: var(--bi-font-title-bold-xs);
   --bic-tabs-panel-padding: var(--bi-scale-4x) var(--bi-scale-5x);
-  --bic-tabs-focus-shadow-color: var(--bi-basic-white);
-  --bic-tabs-focus-outline-color: var(--bi-primary-50);
-
-  &[data-dark="true"] {
-    --bic-tabs-tab-color: var(--bi-neutral-5);
-    --bic-tabs-tab-color-selected: var(--bi-primary-30);
-    --bic-tabs-tab-background-hover: var(--bi-states-hover-light);
-    --bic-tabs-tab-background-press: var(--bi-states-press-light);
-    --bic-tabs-focus-shadow-color: var(--bi-neutral-95);
-    --bic-tabs-focus-outline-color: var(--bi-primary-30);
-  }
-
   flex-direction: column;
   display: flex;
   overflow: hidden;
@@ -3079,8 +3031,8 @@ svg {
       }
 
       &:focus-visible {
-        box-shadow: var(--_bi--focus, 0 0 0 4.5px inset var(--bic-tabs-focus-shadow-color));
-        outline: var(--_bi--focus, 3px solid var(--bic-tabs-focus-outline-color));
+        box-shadow: var(--_bi--focus, 0 0 0 4.5px inset var(--bi-states-focus-background));
+        outline: var(--_bi--focus, 3px solid var(--bi-states-focus));
         outline-offset: var(--_bi--focus, -3px);
 
         &:after {
@@ -3127,7 +3079,7 @@ svg {
 
   & :is([role="tabpanel"], ds-tabpanel) {
     padding: var(--bic-tabs-panel-padding);
-    color: var(--bic-tabs-tab-color);
+    color: var(--bi-color-text);
     outline: none;
     flex-grow: 1;
   }
@@ -3135,8 +3087,8 @@ svg {
 
 .bi-tooltip {
   --_ds-floating: var(--bic-tooltip-placement);
-  --bic-tooltip-background: var(--bi-neutral-85);
-  --bic-tooltip-color: var(--bi-neutral-0);
+  --bic-tooltip-background: var(--bi-color-surface);
+  --bic-tooltip-color: var(--bi-color-text);
   --bic-tooltip-border-radius: var(--bi-radius-medium);
   --bic-tooltip-padding: var(--bi-scale-1x) var(--bi-scale-2x);
   --bic-tooltip-shift-size: var(--bi-scale-2x);
@@ -3200,8 +3152,8 @@ svg {
 .bi-validation-message {
   --bic-validation-message-icon-size: var(--bi-icon-small);
   --bic-validation-message-padding: var(--bi-scale-2x);
-  --bic-validation-message-background: var(--bi-alert-10);
-  --bic-validation-message-color: var(--bi-alert-95);
+  --bic-validation-message-background: var(--bi-color-alert-surface);
+  --bic-validation-message-color: var(--bi-color-alert-text);
   color: var(--bic-validation-message-color);
   padding: var(--bic-validation-message-padding);
   background: var(--bic-validation-message-background);