@duskmoon-dev/core 1.12.3 → 1.13.0

package/dist/index.css

@@ -1449,8 +1449,8 @@ html {
   }
 
   .btn:focus-visible {
-    outline: 2px solid var(--color-primary);
-    outline-offset: 2px;
+    outline: none;
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
   }
 
   .btn:disabled {
@@ -1472,10 +1472,6 @@ html {
     filter: none;
   }
 
-  .btn-primary:focus-visible {
-    outline-color: color-mix(in oklch, var(--color-primary), black 10%);
-  }
-
   /* Secondary Button */
   .btn-secondary {
     --btn-text-color: var(--color-secondary-content);
@@ -1489,10 +1485,6 @@ html {
     filter: none;
   }
 
-  .btn-secondary:focus-visible {
-    outline-color: color-mix(in oklch, var(--color-secondary), black 10%);
-  }
-
   /* Tertiary Button */
   .btn-tertiary {
     --btn-text-color: var(--color-tertiary-content);
@@ -1506,92 +1498,102 @@ html {
     filter: none;
   }
 
-  .btn-tertiary:focus-visible {
-    outline-color: color-mix(in oklch, var(--color-tertiary), black 10%);
-  }
-
-  /* Outline Variant */
-  .btn-outline {
+  /* Outline / Outlined Variant (.btn-outlined is an alias) */
+  .btn-outline,
+  .btn-outlined {
     --btn-text-color: var(--color-on-surface);
     background-color: transparent;
     border: 1px solid var(--color-outline);
   }
 
-  .btn-outline:hover {
+  .btn-outline:hover,
+  .btn-outlined:hover {
     background-color: var(--color-surface-container);
     filter: none;
   }
 
-  .btn-outline.btn-primary {
+  .btn-outline.btn-primary,
+  .btn-outlined.btn-primary {
     --btn-text-color: var(--color-primary);
     border-color: var(--color-primary);
   }
 
-  .btn-outline.btn-primary:hover {
+  .btn-outline.btn-primary:hover,
+  .btn-outlined.btn-primary:hover {
     --btn-text-color: var(--color-primary-content);
     background-color: var(--color-primary);
   }
 
-  .btn-outline.btn-secondary {
+  .btn-outline.btn-secondary,
+  .btn-outlined.btn-secondary {
     --btn-text-color: var(--color-secondary);
     border-color: var(--color-secondary);
   }
 
-  .btn-outline.btn-secondary:hover {
+  .btn-outline.btn-secondary:hover,
+  .btn-outlined.btn-secondary:hover {
     --btn-text-color: var(--color-secondary-content);
     background-color: var(--color-secondary);
   }
 
-  .btn-outline.btn-tertiary {
+  .btn-outline.btn-tertiary,
+  .btn-outlined.btn-tertiary {
     --btn-text-color: var(--color-tertiary);
     border-color: var(--color-tertiary);
   }
 
-  .btn-outline.btn-tertiary:hover {
+  .btn-outline.btn-tertiary:hover,
+  .btn-outlined.btn-tertiary:hover {
     --btn-text-color: var(--color-tertiary-content);
     background-color: var(--color-tertiary);
   }
 
-  /* Outlined Variant (alias for .btn-outline - documentation aligned) */
-  .btn-outlined {
-    --btn-text-color: var(--color-on-surface);
-    background-color: transparent;
-    border: 1px solid var(--color-outline);
+  .btn-outline.btn-info,
+  .btn-outlined.btn-info {
+    --btn-text-color: var(--color-info);
+    border-color: var(--color-info);
   }
 
-  .btn-outlined:hover {
-    background-color: var(--color-surface-container);
-    filter: none;
+  .btn-outline.btn-info:hover,
+  .btn-outlined.btn-info:hover {
+    --btn-text-color: var(--color-info-content);
+    background-color: var(--color-info);
   }
 
-  .btn-outlined.btn-primary {
-    --btn-text-color: var(--color-primary);
-    border-color: var(--color-primary);
+  .btn-outline.btn-success,
+  .btn-outlined.btn-success {
+    --btn-text-color: var(--color-success);
+    border-color: var(--color-success);
   }
 
-  .btn-outlined.btn-primary:hover {
-    --btn-text-color: var(--color-primary-content);
-    background-color: var(--color-primary);
+  .btn-outline.btn-success:hover,
+  .btn-outlined.btn-success:hover {
+    --btn-text-color: var(--color-success-content);
+    background-color: var(--color-success);
   }
 
-  .btn-outlined.btn-secondary {
-    --btn-text-color: var(--color-secondary);
-    border-color: var(--color-secondary);
+  .btn-outline.btn-warning,
+  .btn-outlined.btn-warning {
+    --btn-text-color: var(--color-warning);
+    border-color: var(--color-warning);
   }
 
-  .btn-outlined.btn-secondary:hover {
-    --btn-text-color: var(--color-secondary-content);
-    background-color: var(--color-secondary);
+  .btn-outline.btn-warning:hover,
+  .btn-outlined.btn-warning:hover {
+    --btn-text-color: var(--color-warning-content);
+    background-color: var(--color-warning);
   }
 
-  .btn-outlined.btn-tertiary {
-    --btn-text-color: var(--color-tertiary);
-    border-color: var(--color-tertiary);
+  .btn-outline.btn-error,
+  .btn-outlined.btn-error {
+    --btn-text-color: var(--color-error);
+    border-color: var(--color-error);
   }
 
-  .btn-outlined.btn-tertiary:hover {
-    --btn-text-color: var(--color-tertiary-content);
-    background-color: var(--color-tertiary);
+  .btn-outline.btn-error:hover,
+  .btn-outlined.btn-error:hover {
+    --btn-text-color: var(--color-error-content);
+    background-color: var(--color-error);
   }
 
   /* Ghost Variant */
@@ -1633,6 +1635,31 @@ html {
     background-color: var(--color-tertiary-container);
   }
 
+  .btn-ghost.btn-info    { --btn-text-color: var(--color-info); }
+  .btn-ghost.btn-success { --btn-text-color: var(--color-success); }
+  .btn-ghost.btn-warning { --btn-text-color: var(--color-warning); }
+  .btn-ghost.btn-error   { --btn-text-color: var(--color-error); }
+
+  .btn-ghost.btn-info:hover {
+    --btn-text-color: var(--color-on-info-container);
+    background-color: var(--color-info-container);
+  }
+
+  .btn-ghost.btn-success:hover {
+    --btn-text-color: var(--color-on-success-container);
+    background-color: var(--color-success-container);
+  }
+
+  .btn-ghost.btn-warning:hover {
+    --btn-text-color: var(--color-on-warning-container);
+    background-color: var(--color-warning-container);
+  }
+
+  .btn-ghost.btn-error:hover {
+    --btn-text-color: var(--color-on-error-container);
+    background-color: var(--color-error-container);
+  }
+
   /* Text Variant (alias for .btn-ghost - documentation aligned) */
   .btn-text {
     --btn-text-color: var(--color-on-surface);
@@ -1672,6 +1699,31 @@ html {
     background-color: var(--color-tertiary-container);
   }
 
+  .btn-text.btn-info    { --btn-text-color: var(--color-info); }
+  .btn-text.btn-success { --btn-text-color: var(--color-success); }
+  .btn-text.btn-warning { --btn-text-color: var(--color-warning); }
+  .btn-text.btn-error   { --btn-text-color: var(--color-error); }
+
+  .btn-text.btn-info:hover {
+    --btn-text-color: var(--color-on-info-container);
+    background-color: var(--color-info-container);
+  }
+
+  .btn-text.btn-success:hover {
+    --btn-text-color: var(--color-on-success-container);
+    background-color: var(--color-success-container);
+  }
+
+  .btn-text.btn-warning:hover {
+    --btn-text-color: var(--color-on-warning-container);
+    background-color: var(--color-warning-container);
+  }
+
+  .btn-text.btn-error:hover {
+    --btn-text-color: var(--color-on-error-container);
+    background-color: var(--color-error-container);
+  }
+
   /* Tonal Variant - uses container colors for subtle appearance */
   .btn-tonal {
     --btn-text-color: var(--color-on-primary-container);
@@ -2045,6 +2097,42 @@ html {
     color: var(--color-on-tertiary-container);
   }
 
+  .card-info {
+    background-color: var(--color-info-container);
+    color: var(--color-on-info-container);
+  }
+
+  .card-info .card-title {
+    color: var(--color-on-info-container);
+  }
+
+  .card-success {
+    background-color: var(--color-success-container);
+    color: var(--color-on-success-container);
+  }
+
+  .card-success .card-title {
+    color: var(--color-on-success-container);
+  }
+
+  .card-warning {
+    background-color: var(--color-warning-container);
+    color: var(--color-on-warning-container);
+  }
+
+  .card-warning .card-title {
+    color: var(--color-on-warning-container);
+  }
+
+  .card-error {
+    background-color: var(--color-error-container);
+    color: var(--color-on-error-container);
+  }
+
+  .card-error .card-title {
+    color: var(--color-on-error-container);
+  }
+
   /* Glass Effect */
   .card-glass {
     background-color: rgb(255 255 255 / 0.1);
@@ -2072,8 +2160,8 @@ html {
   }
 
   .card-interactive:focus-visible {
-    outline: 2px solid var(--color-primary);
-    outline-offset: 2px;
+    outline: none;
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
   }
 
   /* Full Image Card */
@@ -2119,7 +2207,7 @@ html {
     line-height: 1.5rem;
     background-color: var(--color-surface);
     color: var(--color-on-surface);
-    border: 1px solid transparent;
+    border: 1px solid currentColor;
     border-radius: 0.5rem;
     transition: border-color 150ms ease-in-out, box-shadow 150ms ease-in-out;
   }
@@ -2134,8 +2222,7 @@ html {
   }
 
   .input:focus-visible {
-    border-color: var(--color-primary);
-    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-primary) 10%, transparent);
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
     outline: none;
   }
 
@@ -2155,70 +2242,17 @@ html {
     border-color: var(--color-outline-variant);
   }
 
-  /* Color Variants */
-  .input-primary {
-    border-color: var(--color-primary);
-  }
-
-  .input-primary:focus-visible {
-    border-color: var(--color-primary);
-    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-primary) 10%, transparent);
-  }
-
-  .input-secondary {
-    border-color: var(--color-secondary);
-  }
-
-  .input-secondary:focus-visible {
-    border-color: var(--color-secondary);
-    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-secondary) 10%, transparent);
-  }
-
-  .input-tertiary {
-    border-color: var(--color-tertiary);
-  }
-
-  .input-tertiary:focus-visible {
-    border-color: var(--color-tertiary);
-    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-tertiary) 10%, transparent);
-  }
+  /* Color Variants — base .input:focus-visible uses currentColor 20%, so no per-variant
+     focus-visible overrides needed; setting color: here is sufficient. */
+  .input-primary   { color: var(--color-primary); }
+  .input-secondary { color: var(--color-secondary); }
+  .input-tertiary  { color: var(--color-tertiary); }
 
   /* Semantic Colors */
-  .input-info {
-    border-color: var(--color-info);
-  }
-
-  .input-info:focus-visible {
-    border-color: var(--color-info);
-    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-info) 10%, transparent);
-  }
-
-  .input-success {
-    border-color: var(--color-success);
-  }
-
-  .input-success:focus-visible {
-    border-color: var(--color-success);
-    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-success) 10%, transparent);
-  }
-
-  .input-warning {
-    border-color: var(--color-warning);
-  }
-
-  .input-warning:focus-visible {
-    border-color: var(--color-warning);
-    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-warning) 10%, transparent);
-  }
-
-  .input-error {
-    border-color: var(--color-error);
-  }
-
-  .input-error:focus-visible {
-    border-color: var(--color-error);
-    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-error) 10%, transparent);
-  }
+  .input-info    { color: var(--color-info); }
+  .input-success { color: var(--color-success); }
+  .input-warning { color: var(--color-warning); }
+  .input-error   { color: var(--color-error); }
 
   /* Size Variants */
   .input-xs {
@@ -2254,7 +2288,7 @@ html {
   .input-ghost:focus-visible {
     background-color: var(--color-surface-container);
     border-color: transparent;
-    box-shadow: none;
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
   }
 
   /* Filled Input */
@@ -2270,6 +2304,14 @@ html {
     box-shadow: none;
   }
 
+  .input-filled.input-primary:focus-visible { border-bottom-color: var(--color-primary); }
+  .input-filled.input-secondary:focus-visible { border-bottom-color: var(--color-secondary); }
+  .input-filled.input-tertiary:focus-visible { border-bottom-color: var(--color-tertiary); }
+  .input-filled.input-info:focus-visible { border-bottom-color: var(--color-info); }
+  .input-filled.input-success:focus-visible { border-bottom-color: var(--color-success); }
+  .input-filled.input-warning:focus-visible { border-bottom-color: var(--color-warning); }
+  .input-filled.input-error:focus-visible { border-bottom-color: var(--color-error); }
+
   /* Input with Icon */
   .input-group {
     display: flex;
@@ -2340,7 +2382,7 @@ html {
   }
 
   .file-input:focus-visible {
-    border-color: var(--color-primary);
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
     outline: none;
   }
 }
@@ -2360,6 +2402,7 @@ html {
     gap: 0.25rem;
     width: 100%;
     margin-bottom: 1rem;
+    color: var(--color-on-surface);
   }
 
   /* Label */
@@ -2373,7 +2416,7 @@ html {
   .label-text {
     font-size: 0.875rem;
     font-weight: 500;
-    color: var(--color-base-content);
+    color: var(--color-on-surface);
     padding-bottom: 0.25rem;
   }
 
@@ -3922,6 +3965,26 @@ html {
     color: var(--color-tertiary-content);
   }
 
+  .avatar-info {
+    background-color: var(--color-info);
+    color: var(--color-info-content);
+  }
+
+  .avatar-success {
+    background-color: var(--color-success);
+    color: var(--color-success-content);
+  }
+
+  .avatar-warning {
+    background-color: var(--color-warning);
+    color: var(--color-warning-content);
+  }
+
+  .avatar-error {
+    background-color: var(--color-error);
+    color: var(--color-error-content);
+  }
+
   /* Ring */
   .avatar-ring {
     outline: 2px solid var(--color-primary);
@@ -3990,8 +4053,8 @@ html {
 
   /* Focus State for Interactive Avatars */
   .avatar:focus-visible {
-    outline: 2px solid var(--color-primary);
-    outline-offset: 2px;
+    outline: none;
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
   }
 }
 
@@ -4211,8 +4274,8 @@ html {
   }
 
   .chip:focus-visible {
-    outline: 2px solid var(--color-primary);
-    outline-offset: 2px;
+    outline: none;
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
   }
 
   /* Color Variants - Filled */
@@ -4243,6 +4306,42 @@ html {
     background-color: color-mix(in oklch, var(--color-tertiary), black 10%);
   }
 
+  .chip-info {
+    background-color: var(--color-info);
+    color: var(--color-info-content);
+  }
+
+  .chip-info:hover {
+    background-color: color-mix(in oklch, var(--color-info), black 10%);
+  }
+
+  .chip-success {
+    background-color: var(--color-success);
+    color: var(--color-success-content);
+  }
+
+  .chip-success:hover {
+    background-color: color-mix(in oklch, var(--color-success), black 10%);
+  }
+
+  .chip-warning {
+    background-color: var(--color-warning);
+    color: var(--color-warning-content);
+  }
+
+  .chip-warning:hover {
+    background-color: color-mix(in oklch, var(--color-warning), black 10%);
+  }
+
+  .chip-error {
+    background-color: var(--color-error);
+    color: var(--color-error-content);
+  }
+
+  .chip-error:hover {
+    background-color: color-mix(in oklch, var(--color-error), black 10%);
+  }
+
   /* Outlined Variant */
   .chip-outlined {
     background-color: transparent;
@@ -4280,6 +4379,42 @@ html {
     background-color: var(--color-tertiary-container);
   }
 
+  .chip-outlined.chip-info {
+    border-color: var(--color-info);
+    color: var(--color-info);
+  }
+
+  .chip-outlined.chip-info:hover {
+    background-color: var(--color-info-container);
+  }
+
+  .chip-outlined.chip-success {
+    border-color: var(--color-success);
+    color: var(--color-success);
+  }
+
+  .chip-outlined.chip-success:hover {
+    background-color: var(--color-success-container);
+  }
+
+  .chip-outlined.chip-warning {
+    border-color: var(--color-warning);
+    color: var(--color-warning);
+  }
+
+  .chip-outlined.chip-warning:hover {
+    background-color: var(--color-warning-container);
+  }
+
+  .chip-outlined.chip-error {
+    border-color: var(--color-error);
+    color: var(--color-error);
+  }
+
+  .chip-outlined.chip-error:hover {
+    background-color: var(--color-error-container);
+  }
+
   /* Tonal/Soft Variant */
   .chip-tonal {
     background-color: var(--color-surface-container-high);
@@ -4300,7 +4435,55 @@ html {
     color: var(--color-on-tertiary-container);
   }
 
-  /* Size Variants */
+  .chip-tonal.chip-info {
+    background-color: var(--color-info-container);
+    color: var(--color-on-info-container);
+  }
+
+  .chip-tonal.chip-success {
+    background-color: var(--color-success-container);
+    color: var(--color-on-success-container);
+  }
+
+  .chip-tonal.chip-warning {
+    background-color: var(--color-warning-container);
+    color: var(--color-on-warning-container);
+  }
+
+  .chip-tonal.chip-error {
+    background-color: var(--color-error-container);
+    color: var(--color-on-error-container);
+  }
+
+  /* Ghost Variant */
+  .chip-ghost {
+    background-color: transparent;
+    border-color: transparent;
+  }
+
+  .chip-ghost:hover {
+    background-color: var(--color-surface-container);
+  }
+
+  /* Ghost + color sub-variants: transparent bg/border, colored text.
+     Hover uses container color (matches .chip-outlined.chip-*:hover pattern). */
+  .chip-ghost.chip-primary   { background-color: transparent; color: var(--color-primary); }
+  .chip-ghost.chip-secondary { background-color: transparent; color: var(--color-secondary); }
+  .chip-ghost.chip-tertiary  { background-color: transparent; color: var(--color-tertiary); }
+  .chip-ghost.chip-info      { background-color: transparent; color: var(--color-info); }
+  .chip-ghost.chip-success   { background-color: transparent; color: var(--color-success); }
+  .chip-ghost.chip-warning   { background-color: transparent; color: var(--color-warning); }
+  .chip-ghost.chip-error     { background-color: transparent; color: var(--color-error); }
+
+  .chip-ghost.chip-primary:hover   { background-color: var(--color-primary-container); }
+  .chip-ghost.chip-secondary:hover { background-color: var(--color-secondary-container); }
+  .chip-ghost.chip-tertiary:hover  { background-color: var(--color-tertiary-container); }
+  .chip-ghost.chip-info:hover      { background-color: var(--color-info-container); }
+  .chip-ghost.chip-success:hover   { background-color: var(--color-success-container); }
+  .chip-ghost.chip-warning:hover   { background-color: var(--color-warning-container); }
+  .chip-ghost.chip-error:hover     { background-color: var(--color-error-container); }
+
+  /* Size Variants */
   .chip-sm {
     padding: 0.25rem 0.5rem;
     font-size: 0.75rem;
@@ -4801,15 +4984,14 @@ html {
     line-height: 1.5;
     color: var(--color-on-surface);
     background-color: var(--color-surface);
-    border: 1px solid var(--color-outline);
+    border: 1px solid currentColor;
     border-radius: 0.5rem;
     transition: border-color 150ms ease-in-out, box-shadow 150ms ease-in-out;
   }
 
   .autocomplete-input:focus {
     outline: none;
-    border-color: var(--color-primary);
-    box-shadow: 0 0 0 3px var(--color-primary-container);
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
   }
 
   .autocomplete-input:disabled {
@@ -5031,6 +5213,67 @@ html {
     outline: none;
   }
 
+  /* Color Variants */
+  .autocomplete-primary .autocomplete-input {
+    color: var(--color-primary);
+  }
+  .autocomplete-primary .autocomplete-input:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-primary) 10%, transparent);
+  }
+
+  .autocomplete-secondary .autocomplete-input {
+    color: var(--color-secondary);
+  }
+  .autocomplete-secondary .autocomplete-input:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-secondary) 10%, transparent);
+  }
+
+  .autocomplete-tertiary .autocomplete-input {
+    color: var(--color-tertiary);
+  }
+  .autocomplete-tertiary .autocomplete-input:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-tertiary) 10%, transparent);
+  }
+
+  .autocomplete-info .autocomplete-input {
+    color: var(--color-info);
+  }
+  .autocomplete-info .autocomplete-input:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-info) 10%, transparent);
+  }
+
+  .autocomplete-success .autocomplete-input {
+    color: var(--color-success);
+  }
+  .autocomplete-success .autocomplete-input:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-success) 10%, transparent);
+  }
+
+  .autocomplete-warning .autocomplete-input {
+    color: var(--color-warning);
+  }
+  .autocomplete-warning .autocomplete-input:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-warning) 10%, transparent);
+  }
+
+  .autocomplete-error .autocomplete-input {
+    color: var(--color-error);
+  }
+  .autocomplete-error .autocomplete-input:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-error) 10%, transparent);
+  }
+
+  /* Ghost Variant */
+  .autocomplete-ghost .autocomplete-input {
+    background-color: transparent;
+    border-color: transparent;
+  }
+  .autocomplete-ghost .autocomplete-input:focus {
+    background-color: var(--color-surface-container);
+    border-color: transparent;
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
+  }
+
   /* Size Variants */
   .autocomplete-sm .autocomplete-input {
     padding: 0.5rem 0.75rem;
@@ -5075,20 +5318,19 @@ html {
     line-height: 1.5rem;
     color: var(--color-on-surface);
     background-color: var(--color-surface);
-    border: 1px solid var(--color-outline);
+    border: 1px solid currentColor;
     border-radius: 0.5rem;
     cursor: pointer;
     transition: border-color 150ms ease-in-out, box-shadow 150ms ease-in-out;
   }
 
   .cascader-trigger:hover:not(:disabled) {
-    border-color: var(--color-on-surface-variant);
+    background-color: var(--color-surface-container);
   }
 
   .cascader-trigger:focus {
     outline: none;
-    border-color: var(--color-primary);
-    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-primary) 10%, transparent);
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
   }
 
   .cascader-trigger:disabled {
@@ -5415,20 +5657,71 @@ html {
   }
 
   .cascader-filled .cascader-trigger:focus {
-    border-bottom-color: var(--color-primary);
+    border-bottom-color: currentColor;
     box-shadow: none;
   }
 
-  /* Error State */
-  .cascader-error .cascader-trigger {
-    border-color: var(--color-error);
+  /* Color Variants */
+  .cascader-primary .cascader-trigger {
+    color: var(--color-primary);
+  }
+  .cascader-primary .cascader-trigger:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-primary) 10%, transparent);
+  }
+
+  .cascader-secondary .cascader-trigger {
+    color: var(--color-secondary);
+  }
+  .cascader-secondary .cascader-trigger:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-secondary) 10%, transparent);
+  }
+
+  .cascader-tertiary .cascader-trigger {
+    color: var(--color-tertiary);
+  }
+  .cascader-tertiary .cascader-trigger:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-tertiary) 10%, transparent);
+  }
+
+  .cascader-info .cascader-trigger {
+    color: var(--color-info);
+  }
+  .cascader-info .cascader-trigger:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-info) 10%, transparent);
+  }
+
+  .cascader-success .cascader-trigger {
+    color: var(--color-success);
+  }
+  .cascader-success .cascader-trigger:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-success) 10%, transparent);
+  }
+
+  .cascader-warning .cascader-trigger {
+    color: var(--color-warning);
+  }
+  .cascader-warning .cascader-trigger:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-warning) 10%, transparent);
   }
 
+  .cascader-error .cascader-trigger {
+    color: var(--color-error);
+  }
   .cascader-error .cascader-trigger:focus {
-    border-color: var(--color-error);
     box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-error) 10%, transparent);
   }
 
+  /* Ghost Variant */
+  .cascader-ghost .cascader-trigger {
+    background-color: transparent;
+    border-color: transparent;
+  }
+  .cascader-ghost .cascader-trigger:focus {
+    background-color: var(--color-surface-container);
+    border-color: transparent;
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
+  }
+
   /* Disabled State */
   .cascader-disabled .cascader-trigger {
     cursor: not-allowed;
@@ -5483,6 +5776,7 @@ html {
     --checkbox-size: 1.25rem;
     --checkbox-color: var(--color-primary);
     --checkbox-border-color: var(--color-on-surface-variant);
+    color: var(--color-on-surface);
 
     position: relative;
     display: inline-grid;
@@ -5505,8 +5799,8 @@ html {
     height: 0.35em;
     transform: scale(0) rotate(-45deg);
     transform-origin: center;
-    border-bottom: 2px solid var(--color-on-primary);
-    border-left: 2px solid var(--color-on-primary);
+    border-bottom: 2px solid var(--color-primary-content);
+    border-left: 2px solid var(--color-primary-content);
     transition: transform 150ms ease-in-out;
   }
 
@@ -5529,7 +5823,7 @@ html {
   .checkbox:indeterminate::before {
     width: 0.5em;
     height: 0;
-    border-bottom: 2px solid var(--color-on-primary);
+    border-bottom: 2px solid var(--color-primary-content);
     border-left: 0;
     transform: scale(1) rotate(0deg);
   }
@@ -5547,8 +5841,8 @@ html {
 
   /* Focus State */
   .checkbox:focus-visible {
-    outline: 2px solid var(--checkbox-color);
-    outline-offset: 2px;
+    outline: none;
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--checkbox-color) 20%, transparent);
   }
 
   /* Disabled State */
@@ -5648,6 +5942,15 @@ html {
     border-color: var(--color-info-content);
   }
 
+  /* Ghost Variant — borderless unchecked state */
+  .checkbox-ghost {
+    --checkbox-border-color: transparent;
+  }
+
+  .checkbox-ghost:hover:not(:disabled):not(:checked) {
+    border-color: transparent;
+  }
+
   /* ========================================
    * Checkbox with Label (wrapper pattern)
    * ======================================== */
@@ -5723,7 +6026,7 @@ html {
     line-height: 1.5;
     color: var(--color-on-surface);
     background-color: var(--color-surface);
-    border: 1px solid var(--color-outline);
+    border: 1px solid currentColor;
     border-radius: 0.5rem;
     transition: border-color 150ms ease-in-out, box-shadow 150ms ease-in-out;
   }
@@ -5742,8 +6045,7 @@ html {
 
   .datepicker-input:focus {
     outline: none;
-    border-color: var(--color-primary);
-    box-shadow: 0 0 0 3px var(--color-primary-container);
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
   }
 
   .datepicker-input:disabled {
@@ -6396,7 +6698,71 @@ html {
     box-shadow: none;
   }
 
-  /* Color Variants */
+  /* Input Color Variants */
+  .datepicker-primary .datepicker-input {
+    color: var(--color-primary);
+  }
+  .datepicker-primary .datepicker-input:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-primary) 10%, transparent);
+  }
+
+  .datepicker-secondary .datepicker-input {
+    color: var(--color-secondary);
+  }
+  .datepicker-secondary .datepicker-input:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-secondary) 10%, transparent);
+  }
+
+  .datepicker-tertiary .datepicker-input {
+    color: var(--color-tertiary);
+  }
+  .datepicker-tertiary .datepicker-input:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-tertiary) 10%, transparent);
+  }
+
+  .datepicker-info .datepicker-input {
+    color: var(--color-info);
+  }
+  .datepicker-info .datepicker-input:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-info) 10%, transparent);
+  }
+
+  .datepicker-info .datepicker-day-selected,
+  .datepicker-info .datepicker-day-range-start,
+  .datepicker-info .datepicker-day-range-end {
+    background-color: var(--color-info);
+    color: var(--color-info-content);
+  }
+
+  .datepicker-success .datepicker-input {
+    color: var(--color-success);
+  }
+  .datepicker-success .datepicker-input:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-success) 10%, transparent);
+  }
+
+  .datepicker-success .datepicker-day-selected,
+  .datepicker-success .datepicker-day-range-start,
+  .datepicker-success .datepicker-day-range-end {
+    background-color: var(--color-success);
+    color: var(--color-success-content);
+  }
+
+  .datepicker-warning .datepicker-input {
+    color: var(--color-warning);
+  }
+  .datepicker-warning .datepicker-input:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-warning) 10%, transparent);
+  }
+
+  .datepicker-warning .datepicker-day-selected,
+  .datepicker-warning .datepicker-day-range-start,
+  .datepicker-warning .datepicker-day-range-end {
+    background-color: var(--color-warning);
+    color: var(--color-warning-content);
+  }
+
+  /* Day Selected Color Variants */
   .datepicker-primary .datepicker-day-selected,
   .datepicker-primary .datepicker-day-range-start,
   .datepicker-primary .datepicker-day-range-end {
@@ -6421,15 +6787,25 @@ html {
   /* Error State */
   .datepicker-error .datepicker-input,
   .datetime-picker-error .datetime-picker-input {
-    border-color: var(--color-error);
+    color: var(--color-error);
   }
 
   .datepicker-error .datepicker-input:focus,
   .datetime-picker-error .datetime-picker-input:focus {
-    border-color: var(--color-error);
     box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-error) 10%, transparent);
   }
 
+  /* Ghost Variant */
+  .datepicker-ghost .datepicker-input {
+    background-color: transparent;
+    border-color: transparent;
+  }
+  .datepicker-ghost .datepicker-input:focus {
+    background-color: var(--color-surface-container);
+    border-color: transparent;
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
+  }
+
   /* Reduce Motion */
   @media (prefers-reduced-motion: reduce) {
     .datepicker-dropdown,
@@ -6468,25 +6844,25 @@ html {
     min-height: 10rem;
     padding: 2rem;
     background-color: var(--color-surface);
-    border: 2px dashed var(--color-outline);
+    border: 2px dashed currentColor;
     border-radius: 0.75rem;
     cursor: pointer;
     transition: border-color 150ms ease-in-out, background-color 150ms ease-in-out;
   }
 
   .file-upload-dropzone:hover {
-    border-color: var(--color-primary);
+    border-color: currentColor;
     background-color: var(--color-surface-container);
   }
 
   .file-upload-dropzone:focus-within {
-    border-color: var(--color-primary);
-    box-shadow: 0 0 0 3px var(--color-primary-container);
+    border-color: currentColor;
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
   }
 
   .file-upload-dropzone.dragging {
-    border-color: var(--color-primary);
-    background-color: var(--color-primary-container);
+    border-color: currentColor;
+    background-color: color-mix(in oklch, currentColor 10%, var(--color-surface));
   }
 
   .file-upload-dropzone.disabled {
@@ -6511,7 +6887,6 @@ html {
     justify-content: center;
     width: 3rem;
     height: 3rem;
-    color: var(--color-primary);
     font-size: 2rem;
   }
 
@@ -6533,7 +6908,7 @@ html {
   }
 
   .file-upload-browse {
-    color: var(--color-primary);
+    color: currentColor;
     font-weight: 500;
     text-decoration: underline;
     cursor: pointer;
@@ -6745,6 +7120,67 @@ html {
     cursor: not-allowed;
   }
 
+  /* Color Variants */
+  .file-upload-primary .file-upload-dropzone {
+    color: var(--color-primary);
+  }
+  .file-upload-primary .file-upload-dropzone:focus-within {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-primary) 10%, transparent);
+  }
+
+  .file-upload-secondary .file-upload-dropzone {
+    color: var(--color-secondary);
+  }
+  .file-upload-secondary .file-upload-dropzone:focus-within {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-secondary) 10%, transparent);
+  }
+
+  .file-upload-tertiary .file-upload-dropzone {
+    color: var(--color-tertiary);
+  }
+  .file-upload-tertiary .file-upload-dropzone:focus-within {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-tertiary) 10%, transparent);
+  }
+
+  .file-upload-info .file-upload-dropzone {
+    color: var(--color-info);
+  }
+  .file-upload-info .file-upload-dropzone:focus-within {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-info) 10%, transparent);
+  }
+
+  .file-upload-success .file-upload-dropzone {
+    color: var(--color-success);
+  }
+  .file-upload-success .file-upload-dropzone:focus-within {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-success) 10%, transparent);
+  }
+
+  .file-upload-warning .file-upload-dropzone {
+    color: var(--color-warning);
+  }
+  .file-upload-warning .file-upload-dropzone:focus-within {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-warning) 10%, transparent);
+  }
+
+  .file-upload-error .file-upload-dropzone {
+    color: var(--color-error);
+  }
+  .file-upload-error .file-upload-dropzone:focus-within {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-error) 10%, transparent);
+  }
+
+  /* Ghost Variant */
+  .file-upload-ghost .file-upload-dropzone {
+    background-color: transparent;
+    border-color: transparent;
+  }
+  .file-upload-ghost .file-upload-dropzone:focus-within {
+    background-color: var(--color-surface-container);
+    border-color: transparent;
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
+  }
+
   /* Size Variants */
   .file-upload-sm .file-upload-dropzone {
     min-height: 6rem;
@@ -7133,20 +7569,19 @@ html {
     line-height: 1.5rem;
     color: var(--color-on-surface);
     background-color: var(--color-surface);
-    border: 1px solid var(--color-outline);
+    border: 1px solid currentColor;
     border-radius: 0.5rem;
     cursor: pointer;
     transition: border-color 150ms ease-in-out, box-shadow 150ms ease-in-out;
   }
 
   .multi-select-trigger:hover:not(:disabled) {
-    border-color: var(--color-on-surface-variant);
+    background-color: var(--color-surface-container);
   }
 
   .multi-select-trigger:focus-within {
     outline: none;
-    border-color: var(--color-primary);
-    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-primary) 10%, transparent);
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
   }
 
   /* Placeholder */
@@ -7540,20 +7975,71 @@ html {
   }
 
   .multi-select-filled .multi-select-trigger:focus-within {
-    border-bottom-color: var(--color-primary);
+    border-bottom-color: currentColor;
     box-shadow: none;
   }
 
-  /* Error State */
-  .multi-select-error .multi-select-trigger {
-    border-color: var(--color-error);
+  /* Color Variants */
+  .multi-select-primary .multi-select-trigger {
+    color: var(--color-primary);
+  }
+  .multi-select-primary .multi-select-trigger:focus-within {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-primary) 10%, transparent);
   }
 
-  .multi-select-error .multi-select-trigger:focus-within {
-    border-color: var(--color-error);
+  .multi-select-secondary .multi-select-trigger {
+    color: var(--color-secondary);
+  }
+  .multi-select-secondary .multi-select-trigger:focus-within {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-secondary) 10%, transparent);
+  }
+
+  .multi-select-tertiary .multi-select-trigger {
+    color: var(--color-tertiary);
+  }
+  .multi-select-tertiary .multi-select-trigger:focus-within {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-tertiary) 10%, transparent);
+  }
+
+  .multi-select-info .multi-select-trigger {
+    color: var(--color-info);
+  }
+  .multi-select-info .multi-select-trigger:focus-within {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-info) 10%, transparent);
+  }
+
+  .multi-select-success .multi-select-trigger {
+    color: var(--color-success);
+  }
+  .multi-select-success .multi-select-trigger:focus-within {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-success) 10%, transparent);
+  }
+
+  .multi-select-warning .multi-select-trigger {
+    color: var(--color-warning);
+  }
+  .multi-select-warning .multi-select-trigger:focus-within {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-warning) 10%, transparent);
+  }
+
+  .multi-select-error .multi-select-trigger {
+    color: var(--color-error);
+  }
+  .multi-select-error .multi-select-trigger:focus-within {
     box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-error) 10%, transparent);
   }
 
+  /* Ghost Variant */
+  .multi-select-ghost .multi-select-trigger {
+    background-color: transparent;
+    border-color: transparent;
+  }
+  .multi-select-ghost .multi-select-trigger:focus-within {
+    background-color: var(--color-surface-container);
+    border-color: transparent;
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
+  }
+
   /* Disabled State */
   .multi-select-disabled .multi-select-trigger {
     cursor: not-allowed;
@@ -7622,7 +8108,7 @@ html {
     text-align: center;
     color: var(--color-on-surface);
     background-color: var(--color-surface);
-    border: 2px solid var(--color-outline);
+    border: 2px solid currentColor;
     border-radius: 0.5rem;
     outline: none;
     transition: border-color 150ms ease-in-out, box-shadow 150ms ease-in-out;
@@ -7635,12 +8121,11 @@ html {
   }
 
   .otp-input-field:hover:not(:disabled):not(:focus) {
-    border-color: var(--color-on-surface-variant);
+    background-color: var(--color-surface-container);
   }
 
   .otp-input-field:focus {
-    border-color: var(--color-primary);
-    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-primary) 10%, transparent);
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
   }
 
   .otp-input-field:disabled {
@@ -7723,41 +8208,74 @@ html {
   }
 
   /* Color Variants */
+  .otp-input-primary .otp-input-field {
+    color: var(--color-primary);
+  }
+
   .otp-input-primary .otp-input-field:focus {
-    border-color: var(--color-primary);
     box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-primary) 10%, transparent);
   }
 
+  .otp-input-secondary .otp-input-field {
+    color: var(--color-secondary);
+  }
+
   .otp-input-secondary .otp-input-field:focus {
-    border-color: var(--color-secondary);
     box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-secondary) 10%, transparent);
   }
 
+  .otp-input-tertiary .otp-input-field {
+    color: var(--color-tertiary);
+  }
+
   .otp-input-tertiary .otp-input-field:focus {
-    border-color: var(--color-tertiary);
     box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-tertiary) 10%, transparent);
   }
 
-  /* Error State */
-  .otp-input-error .otp-input-field {
-    border-color: var(--color-error);
+  .otp-input-info .otp-input-field {
+    color: var(--color-info);
   }
 
-  .otp-input-error .otp-input-field:focus {
-    border-color: var(--color-error);
-    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-error) 10%, transparent);
+  .otp-input-info .otp-input-field:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-info) 10%, transparent);
   }
 
-  /* Success State */
   .otp-input-success .otp-input-field {
-    border-color: var(--color-success);
+    color: var(--color-success);
   }
 
   .otp-input-success .otp-input-field:focus {
-    border-color: var(--color-success);
     box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-success) 10%, transparent);
   }
 
+  .otp-input-warning .otp-input-field {
+    color: var(--color-warning);
+  }
+
+  .otp-input-warning .otp-input-field:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-warning) 10%, transparent);
+  }
+
+  .otp-input-error .otp-input-field {
+    color: var(--color-error);
+  }
+
+  .otp-input-error .otp-input-field:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-error) 10%, transparent);
+  }
+
+  /* Ghost Variant */
+  .otp-input-ghost .otp-input-field {
+    background-color: transparent;
+    border-color: transparent;
+  }
+
+  .otp-input-ghost .otp-input-field:focus {
+    background-color: var(--color-surface-container);
+    border-color: transparent;
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
+  }
+
   /* Masked Input (dots) */
   .otp-input-masked .otp-input-field {
     -webkit-text-security: disc;
@@ -7818,7 +8336,7 @@ html {
     text-align: center;
     color: var(--color-on-surface);
     background-color: var(--color-surface);
-    border: 2px solid var(--color-outline);
+    border: 2px solid currentColor;
     border-radius: 0.5rem;
     outline: none;
     transition: border-color 150ms ease-in-out, box-shadow 150ms ease-in-out;
@@ -7832,12 +8350,11 @@ html {
   }
 
   .pin-input-field:hover:not(:disabled):not(:focus) {
-    border-color: var(--color-on-surface-variant);
+    background-color: var(--color-surface-container);
   }
 
   .pin-input-field:focus {
-    border-color: var(--color-primary);
-    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-primary) 10%, transparent);
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
   }
 
   .pin-input-field:disabled {
@@ -7908,29 +8425,60 @@ html {
   }
 
   /* Color Variants */
+  .pin-input-primary .pin-input-field {
+    color: var(--color-primary);
+  }
+
   .pin-input-primary .pin-input-field:focus {
-    border-color: var(--color-primary);
     box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-primary) 10%, transparent);
   }
 
+  .pin-input-secondary .pin-input-field {
+    color: var(--color-secondary);
+  }
+
   .pin-input-secondary .pin-input-field:focus {
-    border-color: var(--color-secondary);
     box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-secondary) 10%, transparent);
   }
 
+  .pin-input-tertiary .pin-input-field {
+    color: var(--color-tertiary);
+  }
+
   .pin-input-tertiary .pin-input-field:focus {
-    border-color: var(--color-tertiary);
     box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-tertiary) 10%, transparent);
   }
 
-  /* Error State */
+  .pin-input-info .pin-input-field {
+    color: var(--color-info);
+  }
+
+  .pin-input-info .pin-input-field:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-info) 10%, transparent);
+  }
+
+  .pin-input-success .pin-input-field {
+    color: var(--color-success);
+  }
+
+  .pin-input-success .pin-input-field:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-success) 10%, transparent);
+  }
+
+  .pin-input-warning .pin-input-field {
+    color: var(--color-warning);
+  }
+
+  .pin-input-warning .pin-input-field:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-warning) 10%, transparent);
+  }
+
   .pin-input-error .pin-input-field {
-    border-color: var(--color-error);
+    color: var(--color-error);
     animation: pin-shake 300ms ease-in-out;
   }
 
   .pin-input-error .pin-input-field:focus {
-    border-color: var(--color-error);
     box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-error) 10%, transparent);
   }
 
@@ -7940,9 +8488,16 @@ html {
     40%, 80% { transform: translateX(4px); }
   }
 
-  /* Success State */
-  .pin-input-success .pin-input-field {
-    border-color: var(--color-success);
+  /* Ghost Variant */
+  .pin-input-ghost .pin-input-field {
+    background-color: transparent;
+    border-color: transparent;
+  }
+
+  .pin-input-ghost .pin-input-field:focus {
+    background-color: var(--color-surface-container);
+    border-color: transparent;
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
   }
 
   /* PIN Group with Label */
@@ -7994,6 +8549,7 @@ html {
     --radio-size: 1.25rem;
     --radio-color: var(--color-primary);
     --radio-border-color: var(--color-on-surface-variant);
+    color: var(--color-on-surface);
 
     position: relative;
     display: inline-grid;
@@ -8044,8 +8600,8 @@ html {
 
   /* Focus State */
   .radio:focus-visible {
-    outline: 2px solid var(--radio-color);
-    outline-offset: 2px;
+    outline: none;
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--radio-color) 20%, transparent);
   }
 
   /* Disabled State */
@@ -8110,6 +8666,15 @@ html {
     --radio-color: var(--color-info);
   }
 
+  /* Ghost Variant — borderless unchecked state */
+  .radio-ghost {
+    --radio-border-color: transparent;
+  }
+
+  .radio-ghost:hover:not(:disabled):not(:checked) {
+    border-color: transparent;
+  }
+
   /* ========================================
    * Radio with Label (wrapper pattern)
    * ======================================== */
@@ -8175,6 +8740,7 @@ html {
     display: inline-flex;
     align-items: center;
     gap: 0.125rem;
+    color: var(--color-on-surface);
   }
 
   /* Rating Item */
@@ -8278,6 +8844,21 @@ html {
     color: var(--color-success);
   }
 
+  .rating-tertiary .rating-item.filled {
+    color: var(--color-tertiary);
+  }
+
+  .rating-info .rating-item.filled {
+    color: var(--color-info);
+  }
+
+  /* Note: .rating-warning is explicit even though the default rating filled color is
+     already --color-warning. This allows resetting to warning after applying another
+     color variant (e.g. class="rating rating-primary rating-warning"). */
+  .rating-warning .rating-item.filled {
+    color: var(--color-warning);
+  }
+
   /* Read Only */
   .rating-readonly .rating-item {
     cursor: default;
@@ -8321,13 +8902,29 @@ html {
     color: var(--color-warning);
   }
 
-  /* Focus Visible */
+  .rating-primary:not(.rating-readonly):hover .rating-item   { color: var(--color-primary); }
+  .rating-secondary:not(.rating-readonly):hover .rating-item { color: var(--color-secondary); }
+  .rating-tertiary:not(.rating-readonly):hover .rating-item  { color: var(--color-tertiary); }
+  .rating-info:not(.rating-readonly):hover .rating-item      { color: var(--color-info); }
+  .rating-success:not(.rating-readonly):hover .rating-item   { color: var(--color-success); }
+  .rating-error:not(.rating-readonly):hover .rating-item     { color: var(--color-error); }
+
+  /* Focus Visible — use warning (the default fill color) for the base ring;
+     per-variant overrides below match the active fill color for each variant. */
   .rating-item:focus-visible {
-    outline: 2px solid var(--color-primary);
-    outline-offset: 2px;
+    outline: none;
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-warning) 20%, transparent);
     border-radius: 0.25rem;
   }
 
+  .rating-primary .rating-item:focus-visible   { box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-primary)   20%, transparent); }
+  .rating-secondary .rating-item:focus-visible { box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-secondary) 20%, transparent); }
+  .rating-tertiary .rating-item:focus-visible  { box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-tertiary)  20%, transparent); }
+  .rating-info .rating-item:focus-visible      { box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-info)      20%, transparent); }
+  .rating-success .rating-item:focus-visible   { box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-success)   20%, transparent); }
+  .rating-error .rating-item:focus-visible     { box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-error)     20%, transparent); }
+  .rating-warning .rating-item:focus-visible   { box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-warning)   20%, transparent); }
+
   /* Rating Display (static) */
   .rating-display {
     display: inline-flex;
@@ -8405,6 +9002,7 @@ html {
   .segment-control {
     display: inline-flex;
     align-items: stretch;
+    color: var(--color-on-surface);
     background-color: var(--color-surface-container);
     border: 1px solid var(--color-outline);
     border-radius: 1.25rem;
@@ -8438,8 +9036,8 @@ html {
   }
 
   .segment-item:focus-visible {
-    outline: 2px solid var(--color-primary);
-    outline-offset: 2px;
+    outline: none;
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
   }
 
   .segment-item:disabled {
@@ -8509,6 +9107,26 @@ html {
     color: var(--color-on-tertiary-container);
   }
 
+  .segment-control-info .segment-item-active {
+    background-color: var(--color-info-container);
+    color: var(--color-on-info-container);
+  }
+
+  .segment-control-success .segment-item-active {
+    background-color: var(--color-success-container);
+    color: var(--color-on-success-container);
+  }
+
+  .segment-control-warning .segment-item-active {
+    background-color: var(--color-warning-container);
+    color: var(--color-on-warning-container);
+  }
+
+  .segment-control-error .segment-item-active {
+    background-color: var(--color-error-container);
+    color: var(--color-on-error-container);
+  }
+
   /* Full Width */
   .segment-control-full {
     display: flex;
@@ -8597,7 +9215,7 @@ html {
     line-height: 1.5rem;
     color: var(--color-on-surface);
     background-color: var(--color-surface);
-    border: 1px solid var(--color-outline);
+    border: 1px solid currentColor;
     border-radius: 0.5rem;
     outline: none;
     cursor: pointer;
@@ -8610,7 +9228,7 @@ html {
   }
 
   .select:hover:not(:disabled) {
-    border-color: var(--color-on-surface-variant);
+    background-color: var(--color-surface-container);
   }
 
   .select:focus {
@@ -8618,8 +9236,7 @@ html {
   }
 
   .select:focus-visible {
-    border-color: var(--color-primary);
-    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-primary) 10%, transparent);
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
   }
 
   .select:disabled {
@@ -8646,6 +9263,14 @@ html {
     box-shadow: none;
   }
 
+  .select-filled.select-primary:focus-visible { border-bottom-color: var(--color-primary); }
+  .select-filled.select-secondary:focus-visible { border-bottom-color: var(--color-secondary); }
+  .select-filled.select-tertiary:focus-visible { border-bottom-color: var(--color-tertiary); }
+  .select-filled.select-info:focus-visible { border-bottom-color: var(--color-info); }
+  .select-filled.select-success:focus-visible { border-bottom-color: var(--color-success); }
+  .select-filled.select-warning:focus-visible { border-bottom-color: var(--color-warning); }
+  .select-filled.select-error:focus-visible { border-bottom-color: var(--color-error); }
+
   /* Outlined Variant (default is outlined) */
   .select-outlined {
     background-color: transparent;
@@ -8653,40 +9278,17 @@ html {
     border-radius: 0.5rem;
   }
 
-  /* Color Variants */
-  .select-primary:focus-visible {
-    border-color: var(--color-primary);
-    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-primary) 10%, transparent);
-  }
-
-  .select-secondary:focus-visible {
-    border-color: var(--color-secondary);
-    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-secondary) 10%, transparent);
-  }
-
-  .select-tertiary:focus-visible {
-    border-color: var(--color-tertiary);
-    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-tertiary) 10%, transparent);
-  }
+  /* Color Variants — base .select:focus-visible uses currentColor 20%, so no per-variant
+     focus-visible overrides needed; setting color: here is sufficient. */
+  .select-primary   { color: var(--color-primary); }
+  .select-secondary { color: var(--color-secondary); }
+  .select-tertiary  { color: var(--color-tertiary); }
 
   /* Semantic Colors */
-  .select-error {
-    border-color: var(--color-error);
-  }
-
-  .select-error:focus-visible {
-    border-color: var(--color-error);
-    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-error) 10%, transparent);
-  }
-
-  .select-success {
-    border-color: var(--color-success);
-  }
-
-  .select-success:focus-visible {
-    border-color: var(--color-success);
-    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-success) 10%, transparent);
-  }
+  .select-info    { color: var(--color-info); }
+  .select-success { color: var(--color-success); }
+  .select-warning { color: var(--color-warning); }
+  .select-error   { color: var(--color-error); }
 
   /* Size Variants */
   .select-xs {
@@ -8777,7 +9379,7 @@ html {
   .select-ghost:focus-visible {
     background-color: var(--color-surface-container);
     border-color: transparent;
-    box-shadow: none;
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
   }
 
   /* Reduce Motion */
@@ -8803,6 +9405,7 @@ html {
     height: 2.5rem;
     touch-action: none;
     user-select: none;
+    color: var(--color-on-surface);
   }
 
   /* Slider Track */
@@ -8863,7 +9466,7 @@ html {
     margin-bottom: 0.5rem;
     font-size: 0.75rem;
     font-weight: 500;
-    color: var(--color-on-primary);
+    color: var(--color-primary-content);
     background-color: var(--color-primary);
     border-radius: 0.25rem;
     white-space: nowrap;
@@ -8917,7 +9520,7 @@ html {
   }
 
   .slider-mark-active {
-    background-color: var(--color-on-primary);
+    background-color: var(--color-primary-content);
   }
 
   /* Mark Label */
@@ -8968,6 +9571,27 @@ html {
   }
 
   /* Color Variants */
+  .slider-primary .slider-track-filled,
+  .slider-primary .slider-thumb {
+    background-color: var(--color-primary);
+  }
+
+  .slider-primary .slider-mark-active   { background-color: var(--color-primary-content); }
+
+  .slider-primary .slider-thumb:hover,
+  .slider-primary .slider-thumb:focus-visible {
+    box-shadow: 0 0 0 8px var(--color-primary-container), 0 2px 4px rgb(0 0 0 / 0.2);
+  }
+
+  .slider-primary .slider-thumb-label {
+    background-color: var(--color-primary);
+    color: var(--color-primary-content);
+  }
+
+  .slider-primary .slider-thumb-label::after {
+    border-top-color: var(--color-primary);
+  }
+
   .slider-secondary .slider-track-filled,
   .slider-secondary .slider-thumb {
     background-color: var(--color-secondary);
@@ -8978,9 +9602,11 @@ html {
     box-shadow: 0 0 0 8px var(--color-secondary-container), 0 2px 4px rgb(0 0 0 / 0.2);
   }
 
+  .slider-secondary .slider-mark-active { background-color: var(--color-secondary-content); }
+
   .slider-secondary .slider-thumb-label {
     background-color: var(--color-secondary);
-    color: var(--color-on-secondary);
+    color: var(--color-secondary-content);
   }
 
   .slider-secondary .slider-thumb-label::after {
@@ -8997,13 +9623,103 @@ html {
     box-shadow: 0 0 0 8px var(--color-tertiary-container), 0 2px 4px rgb(0 0 0 / 0.2);
   }
 
-  .slider-tertiary .slider-thumb-label {
-    background-color: var(--color-tertiary);
-    color: var(--color-on-tertiary);
+  .slider-tertiary .slider-mark-active { background-color: var(--color-tertiary-content); }
+
+  .slider-tertiary .slider-thumb-label {
+    background-color: var(--color-tertiary);
+    color: var(--color-tertiary-content);
+  }
+
+  .slider-tertiary .slider-thumb-label::after {
+    border-top-color: var(--color-tertiary);
+  }
+
+  /* Info */
+  .slider-info .slider-track-filled,
+  .slider-info .slider-thumb {
+    background-color: var(--color-info);
+  }
+
+  .slider-info .slider-thumb:hover,
+  .slider-info .slider-thumb:focus-visible {
+    box-shadow: 0 0 0 8px var(--color-info-container), 0 2px 4px rgb(0 0 0 / 0.2);
+  }
+
+  .slider-info .slider-mark-active { background-color: var(--color-info-content); }
+
+  .slider-info .slider-thumb-label {
+    background-color: var(--color-info);
+    color: var(--color-info-content);
+  }
+
+  .slider-info .slider-thumb-label::after {
+    border-top-color: var(--color-info);
+  }
+
+  /* Success */
+  .slider-success .slider-track-filled,
+  .slider-success .slider-thumb {
+    background-color: var(--color-success);
+  }
+
+  .slider-success .slider-thumb:hover,
+  .slider-success .slider-thumb:focus-visible {
+    box-shadow: 0 0 0 8px var(--color-success-container), 0 2px 4px rgb(0 0 0 / 0.2);
+  }
+
+  .slider-success .slider-mark-active { background-color: var(--color-success-content); }
+
+  .slider-success .slider-thumb-label {
+    background-color: var(--color-success);
+    color: var(--color-success-content);
+  }
+
+  .slider-success .slider-thumb-label::after {
+    border-top-color: var(--color-success);
+  }
+
+  /* Warning */
+  .slider-warning .slider-track-filled,
+  .slider-warning .slider-thumb {
+    background-color: var(--color-warning);
+  }
+
+  .slider-warning .slider-thumb:hover,
+  .slider-warning .slider-thumb:focus-visible {
+    box-shadow: 0 0 0 8px var(--color-warning-container), 0 2px 4px rgb(0 0 0 / 0.2);
+  }
+
+  .slider-warning .slider-mark-active { background-color: var(--color-warning-content); }
+
+  .slider-warning .slider-thumb-label {
+    background-color: var(--color-warning);
+    color: var(--color-warning-content);
+  }
+
+  .slider-warning .slider-thumb-label::after {
+    border-top-color: var(--color-warning);
+  }
+
+  /* Error */
+  .slider-error .slider-track-filled,
+  .slider-error .slider-thumb {
+    background-color: var(--color-error);
+  }
+
+  .slider-error .slider-thumb:hover,
+  .slider-error .slider-thumb:focus-visible {
+    box-shadow: 0 0 0 8px var(--color-error-container), 0 2px 4px rgb(0 0 0 / 0.2);
+  }
+
+  .slider-error .slider-mark-active { background-color: var(--color-error-content); }
+
+  .slider-error .slider-thumb-label {
+    background-color: var(--color-error);
+    color: var(--color-error-content);
   }
 
-  .slider-tertiary .slider-thumb-label::after {
-    border-top-color: var(--color-tertiary);
+  .slider-error .slider-thumb-label::after {
+    border-top-color: var(--color-error);
   }
 
   /* Disabled State */
@@ -9062,9 +9778,18 @@ html {
     right: 100%;
     transform: translateY(-50%);
     border-top-color: transparent;
-    border-right-color: var(--color-primary);
+    border-right-color: var(--color-primary); /* overridden per-variant below */
   }
 
+  /* Variant-specific vertical arrow colors (border-right-color cannot use currentColor
+     since it must match the label background, not the text color) */
+  .slider-secondary.slider-vertical .slider-thumb-label::after { border-right-color: var(--color-secondary); }
+  .slider-tertiary.slider-vertical .slider-thumb-label::after  { border-right-color: var(--color-tertiary); }
+  .slider-info.slider-vertical .slider-thumb-label::after      { border-right-color: var(--color-info); }
+  .slider-success.slider-vertical .slider-thumb-label::after   { border-right-color: var(--color-success); }
+  .slider-warning.slider-vertical .slider-thumb-label::after   { border-right-color: var(--color-warning); }
+  .slider-error.slider-vertical .slider-thumb-label::after     { border-right-color: var(--color-error); }
+
   .slider-vertical .slider-marks {
     flex-direction: column;
     top: 0;
@@ -9104,7 +9829,8 @@ html {
 
   .slider-input:focus {
     outline: none;
-    border-color: var(--color-primary);
+    border-color: currentColor;
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
   }
 
   /* Reduce Motion */
@@ -9129,8 +9855,11 @@ html {
   .switch {
     --switch-width: 3.25rem;
     --switch-height: 2rem;
+    color: var(--color-on-surface);
     --switch-thumb-size: 1rem;
     --switch-color: var(--color-primary);
+    --switch-content-color: var(--color-primary-content);
+    --switch-container-color: var(--color-primary-container);
     --switch-track-color: var(--color-surface-container-highest);
     --switch-border-color: var(--color-outline);
     --switch-thumb-color: var(--color-outline);
@@ -9176,7 +9905,7 @@ html {
   }
 
   .switch:checked::before {
-    background-color: var(--color-primary-content);
+    background-color: var(--switch-content-color);
   }
 
   /* Hover State (unchecked) */
@@ -9195,13 +9924,13 @@ html {
   }
 
   .switch:checked:hover:not(:disabled)::before {
-    background-color: var(--color-primary-container);
+    background-color: var(--switch-container-color);
   }
 
   /* Focus State */
   .switch:focus-visible {
-    outline: 2px solid var(--switch-color);
-    outline-offset: 2px;
+    outline: none;
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--switch-color) 20%, transparent);
   }
 
   /* Pressed/Active State - expand thumb slightly */
@@ -9278,30 +10007,50 @@ html {
 
   .switch-primary {
     --switch-color: var(--color-primary);
+    --switch-content-color: var(--color-primary-content);
+    --switch-container-color: var(--color-primary-container);
   }
 
   .switch-secondary {
     --switch-color: var(--color-secondary);
+    --switch-content-color: var(--color-secondary-content);
+    --switch-container-color: var(--color-secondary-container);
   }
 
   .switch-tertiary {
     --switch-color: var(--color-tertiary);
+    --switch-content-color: var(--color-tertiary-content);
+    --switch-container-color: var(--color-tertiary-container);
   }
 
   .switch-success {
     --switch-color: var(--color-success);
+    --switch-content-color: var(--color-success-content);
+    --switch-container-color: var(--color-success-container);
   }
 
   .switch-warning {
     --switch-color: var(--color-warning);
+    --switch-content-color: var(--color-warning-content);
+    --switch-container-color: var(--color-warning-container);
   }
 
   .switch-error {
     --switch-color: var(--color-error);
+    --switch-content-color: var(--color-error-content);
+    --switch-container-color: var(--color-error-container);
   }
 
   .switch-info {
     --switch-color: var(--color-info);
+    --switch-content-color: var(--color-info-content);
+    --switch-container-color: var(--color-info-container);
+  }
+
+  /* Ghost Variant — borderless track */
+  .switch-ghost {
+    --switch-border-color: transparent;
+    --switch-track-color: transparent;
   }
 
   /* ========================================
@@ -9445,7 +10194,7 @@ html {
     font-family: inherit;
     color: var(--color-on-surface);
     background-color: var(--color-surface);
-    border: 1px solid var(--color-outline);
+    border: 1px solid currentColor;
     border-radius: 0.5rem;
     outline: none;
     resize: vertical;
@@ -9458,7 +10207,7 @@ html {
   }
 
   .textarea:hover:not(:disabled) {
-    border-color: var(--color-on-surface-variant);
+    background-color: var(--color-surface-container);
   }
 
   .textarea:focus {
@@ -9466,8 +10215,7 @@ html {
   }
 
   .textarea:focus-visible {
-    border-color: var(--color-primary);
-    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-primary) 10%, transparent);
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
   }
 
   .textarea:disabled {
@@ -9509,6 +10257,14 @@ html {
     box-shadow: none;
   }
 
+  .textarea-filled.textarea-primary:focus-visible { border-bottom-color: var(--color-primary); }
+  .textarea-filled.textarea-secondary:focus-visible { border-bottom-color: var(--color-secondary); }
+  .textarea-filled.textarea-tertiary:focus-visible { border-bottom-color: var(--color-tertiary); }
+  .textarea-filled.textarea-info:focus-visible { border-bottom-color: var(--color-info); }
+  .textarea-filled.textarea-success:focus-visible { border-bottom-color: var(--color-success); }
+  .textarea-filled.textarea-warning:focus-visible { border-bottom-color: var(--color-warning); }
+  .textarea-filled.textarea-error:focus-visible { border-bottom-color: var(--color-error); }
+
   /* Outlined Variant (default) */
   .textarea-outlined {
     background-color: transparent;
@@ -9530,109 +10286,27 @@ html {
   .textarea-ghost:focus-visible {
     background-color: var(--color-surface-container);
     border-color: transparent;
-    box-shadow: none;
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
   }
 
   /* ============================================
    * COLOR VARIANTS
    * ============================================ */
 
-  /* Primary */
-  .textarea-primary {
-    border-color: var(--color-primary);
-  }
-
-  .textarea-primary:focus-visible {
-    border-color: var(--color-primary);
-    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-primary) 10%, transparent);
-  }
-
-  .textarea-filled.textarea-primary {
-    border-bottom-color: var(--color-primary);
-  }
-
-  .textarea-filled.textarea-primary:focus-visible {
-    border-bottom-color: var(--color-primary);
-  }
-
-  /* Secondary */
-  .textarea-secondary {
-    border-color: var(--color-secondary);
-  }
-
-  .textarea-secondary:focus-visible {
-    border-color: var(--color-secondary);
-    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-secondary) 10%, transparent);
-  }
-
-  .textarea-filled.textarea-secondary {
-    border-bottom-color: var(--color-secondary);
-  }
-
-  .textarea-filled.textarea-secondary:focus-visible {
-    border-bottom-color: var(--color-secondary);
-  }
-
-  /* Tertiary */
-  .textarea-tertiary {
-    border-color: var(--color-tertiary);
-  }
-
-  .textarea-tertiary:focus-visible {
-    border-color: var(--color-tertiary);
-    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-tertiary) 10%, transparent);
-  }
-
-  .textarea-filled.textarea-tertiary {
-    border-bottom-color: var(--color-tertiary);
-  }
-
-  .textarea-filled.textarea-tertiary:focus-visible {
-    border-bottom-color: var(--color-tertiary);
-  }
+  /* Color Variants — base .textarea:focus-visible uses currentColor 20%, so no per-variant
+     focus-visible overrides needed; setting color: here is sufficient. */
+  .textarea-primary   { color: var(--color-primary); }
+  .textarea-secondary { color: var(--color-secondary); }
+  .textarea-tertiary  { color: var(--color-tertiary); }
 
   /* ============================================
    * SEMANTIC COLORS
    * ============================================ */
 
-  .textarea-error {
-    border-color: var(--color-error);
-  }
-
-  .textarea-error:focus-visible {
-    border-color: var(--color-error);
-    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-error) 10%, transparent);
-  }
-
-  .textarea-filled.textarea-error {
-    border-bottom-color: var(--color-error);
-  }
-
-  .textarea-success {
-    border-color: var(--color-success);
-  }
-
-  .textarea-success:focus-visible {
-    border-color: var(--color-success);
-    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-success) 10%, transparent);
-  }
-
-  .textarea-filled.textarea-success {
-    border-bottom-color: var(--color-success);
-  }
-
-  .textarea-warning {
-    border-color: var(--color-warning);
-  }
-
-  .textarea-warning:focus-visible {
-    border-color: var(--color-warning);
-    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-warning) 10%, transparent);
-  }
-
-  .textarea-filled.textarea-warning {
-    border-bottom-color: var(--color-warning);
-  }
+  .textarea-info    { color: var(--color-info); }
+  .textarea-success { color: var(--color-success); }
+  .textarea-warning { color: var(--color-warning); }
+  .textarea-error   { color: var(--color-error); }
 
   /* ============================================
    * SIZE VARIANTS
@@ -10049,9 +10723,9 @@ html {
     font-size: 0.875rem;
     font-weight: 500;
     line-height: 1.25rem;
-    color: var(--color-on-surface-variant);
+    color: var(--color-on-surface);
     background-color: transparent;
-    border: 1px solid var(--color-outline);
+    border: 1px solid currentColor;
     border-radius: 0.5rem;
     cursor: pointer;
     transition: all 0.2s cubic-bezier(0.4, 0, 0.2, 1);
@@ -10061,7 +10735,6 @@ html {
   /* Hover state */
   .toggle-btn:hover:not(:disabled) {
     background-color: color-mix(in oklch, var(--color-surface-variant) 50%, transparent);
-    border-color: var(--color-outline-variant);
   }
 
   /* Active/Selected state */
@@ -10077,6 +10750,14 @@ html {
     background-color: color-mix(in oklch, var(--color-primary-container) 90%, transparent);
   }
 
+  /* Primary variant */
+  .toggle-btn-primary.toggle-btn-active,
+  .toggle-btn-primary.active {
+    color: var(--color-on-primary-container);
+    background-color: var(--color-primary-container);
+    border-color: var(--color-primary);
+  }
+
   /* Secondary variant */
   .toggle-btn-secondary.toggle-btn-active,
   .toggle-btn-secondary.active {
@@ -10093,10 +10774,60 @@ html {
     border-color: var(--color-tertiary);
   }
 
+  /* Info variant */
+  .toggle-btn-info.toggle-btn-active,
+  .toggle-btn-info.active {
+    color: var(--color-on-info-container);
+    background-color: var(--color-info-container);
+    border-color: var(--color-info);
+  }
+
+  /* Success variant */
+  .toggle-btn-success.toggle-btn-active,
+  .toggle-btn-success.active {
+    color: var(--color-on-success-container);
+    background-color: var(--color-success-container);
+    border-color: var(--color-success);
+  }
+
+  /* Warning variant */
+  .toggle-btn-warning.toggle-btn-active,
+  .toggle-btn-warning.active {
+    color: var(--color-on-warning-container);
+    background-color: var(--color-warning-container);
+    border-color: var(--color-warning);
+  }
+
+  /* Error variant */
+  .toggle-btn-error.toggle-btn-active,
+  .toggle-btn-error.active {
+    color: var(--color-on-error-container);
+    background-color: var(--color-error-container);
+    border-color: var(--color-error);
+  }
+
+  /* Ghost Variant */
+  .toggle-btn-ghost {
+    background-color: transparent;
+    border-color: transparent;
+  }
+  .toggle-btn-ghost:hover:not(:disabled) {
+    background-color: var(--color-surface-container);
+    border-color: transparent;
+  }
+
+  .toggle-btn-ghost.toggle-btn-primary   { color: var(--color-primary); }
+  .toggle-btn-ghost.toggle-btn-secondary { color: var(--color-secondary); }
+  .toggle-btn-ghost.toggle-btn-tertiary  { color: var(--color-tertiary); }
+  .toggle-btn-ghost.toggle-btn-info      { color: var(--color-info); }
+  .toggle-btn-ghost.toggle-btn-success   { color: var(--color-success); }
+  .toggle-btn-ghost.toggle-btn-warning   { color: var(--color-warning); }
+  .toggle-btn-ghost.toggle-btn-error     { color: var(--color-error); }
+
   /* Focus state */
   .toggle-btn:focus-visible {
-    outline: 2px solid var(--color-primary);
-    outline-offset: 2px;
+    outline: none;
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
   }
 
   /* Disabled state */
@@ -10233,7 +10964,7 @@ html {
   .toggle-filled.toggle-btn-active,
   .toggle-filled.active {
     background-color: var(--color-primary);
-    color: var(--color-on-primary);
+    color: var(--color-primary-content);
   }
 
   /* With badge/indicator */
@@ -10329,19 +11060,18 @@ html {
     line-height: 1.5rem;
     color: var(--color-on-surface);
     background-color: var(--color-surface);
-    border: 1px solid var(--color-outline);
+    border: 1px solid currentColor;
     border-radius: 0.5rem;
     outline: none;
     transition: border-color 150ms ease-in-out, box-shadow 150ms ease-in-out;
   }
 
   .time-input-field:hover:not(:disabled) {
-    border-color: var(--color-on-surface-variant);
+    background-color: var(--color-surface-container);
   }
 
   .time-input-field:focus {
-    border-color: var(--color-primary);
-    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-primary) 10%, transparent);
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
   }
 
   .time-input-field:disabled {
@@ -10370,7 +11100,7 @@ html {
     gap: 0.125rem;
     padding: 0.75rem 1rem;
     background-color: var(--color-surface);
-    border: 1px solid var(--color-outline);
+    border: 1px solid currentColor;
     border-radius: 0.5rem;
   }
 
@@ -10463,37 +11193,87 @@ html {
 
   .time-input-filled .time-input-field:focus,
   .time-input-filled .time-input-segments:focus-within {
-    border-bottom-color: var(--color-primary);
+    border-bottom-color: currentColor;
     box-shadow: none;
   }
 
   /* Color Variants */
+  .time-input-primary .time-input-field,
+  .time-input-primary .time-input-segments {
+    color: var(--color-primary);
+  }
+
   .time-input-primary .time-input-field:focus {
-    border-color: var(--color-primary);
     box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-primary) 10%, transparent);
   }
 
+  .time-input-secondary .time-input-field,
+  .time-input-secondary .time-input-segments {
+    color: var(--color-secondary);
+  }
+
   .time-input-secondary .time-input-field:focus {
-    border-color: var(--color-secondary);
     box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-secondary) 10%, transparent);
   }
 
+  .time-input-tertiary .time-input-field,
+  .time-input-tertiary .time-input-segments {
+    color: var(--color-tertiary);
+  }
+
   .time-input-tertiary .time-input-field:focus {
-    border-color: var(--color-tertiary);
     box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-tertiary) 10%, transparent);
   }
 
-  /* Error State */
+  .time-input-info .time-input-field,
+  .time-input-info .time-input-segments {
+    color: var(--color-info);
+  }
+
+  .time-input-info .time-input-field:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-info) 10%, transparent);
+  }
+
+  .time-input-success .time-input-field,
+  .time-input-success .time-input-segments {
+    color: var(--color-success);
+  }
+
+  .time-input-success .time-input-field:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-success) 10%, transparent);
+  }
+
+  .time-input-warning .time-input-field,
+  .time-input-warning .time-input-segments {
+    color: var(--color-warning);
+  }
+
+  .time-input-warning .time-input-field:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-warning) 10%, transparent);
+  }
+
   .time-input-error .time-input-field,
   .time-input-error .time-input-segments {
-    border-color: var(--color-error);
+    color: var(--color-error);
   }
 
   .time-input-error .time-input-field:focus {
-    border-color: var(--color-error);
     box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-error) 10%, transparent);
   }
 
+  /* Ghost Variant */
+  .time-input-ghost .time-input-field,
+  .time-input-ghost .time-input-segments {
+    background-color: transparent;
+    border-color: transparent;
+  }
+
+  .time-input-ghost .time-input-field:focus {
+    background-color: var(--color-surface-container);
+    border-color: transparent;
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
+  }
+
   /* Time Picker Dropdown */
   .time-picker-dropdown {
     position: absolute;
@@ -10585,20 +11365,19 @@ html {
     line-height: 1.5rem;
     color: var(--color-on-surface);
     background-color: var(--color-surface);
-    border: 1px solid var(--color-outline);
+    border: 1px solid currentColor;
     border-radius: 0.5rem;
     cursor: pointer;
     transition: border-color 150ms ease-in-out, box-shadow 150ms ease-in-out;
   }
 
   .tree-select-trigger:hover:not(:disabled) {
-    border-color: var(--color-on-surface-variant);
+    background-color: var(--color-surface-container);
   }
 
   .tree-select-trigger:focus {
     outline: none;
-    border-color: var(--color-primary);
-    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-primary) 10%, transparent);
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
   }
 
   .tree-select-trigger:disabled,
@@ -10615,8 +11394,7 @@ html {
 
   div.tree-select-trigger:focus-visible {
     outline: none;
-    border-color: var(--color-primary);
-    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-primary) 10%, transparent);
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
   }
 
   /* Value Display */
@@ -10933,7 +11711,7 @@ html {
   }
 
   .tree-select-filled .tree-select-trigger:focus {
-    border-bottom-color: var(--color-primary);
+    border-bottom-color: currentColor;
     box-shadow: none;
   }
 
@@ -10943,16 +11721,67 @@ html {
     gap: 0.25rem;
   }
 
-  /* Error State */
-  .tree-select-error .tree-select-trigger {
-    border-color: var(--color-error);
+  /* Color Variants */
+  .tree-select-primary .tree-select-trigger {
+    color: var(--color-primary);
+  }
+  .tree-select-primary .tree-select-trigger:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-primary) 10%, transparent);
+  }
+
+  .tree-select-secondary .tree-select-trigger {
+    color: var(--color-secondary);
+  }
+  .tree-select-secondary .tree-select-trigger:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-secondary) 10%, transparent);
+  }
+
+  .tree-select-tertiary .tree-select-trigger {
+    color: var(--color-tertiary);
+  }
+  .tree-select-tertiary .tree-select-trigger:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-tertiary) 10%, transparent);
+  }
+
+  .tree-select-info .tree-select-trigger {
+    color: var(--color-info);
+  }
+  .tree-select-info .tree-select-trigger:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-info) 10%, transparent);
+  }
+
+  .tree-select-success .tree-select-trigger {
+    color: var(--color-success);
+  }
+  .tree-select-success .tree-select-trigger:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-success) 10%, transparent);
+  }
+
+  .tree-select-warning .tree-select-trigger {
+    color: var(--color-warning);
+  }
+  .tree-select-warning .tree-select-trigger:focus {
+    box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-warning) 10%, transparent);
   }
 
+  .tree-select-error .tree-select-trigger {
+    color: var(--color-error);
+  }
   .tree-select-error .tree-select-trigger:focus {
-    border-color: var(--color-error);
     box-shadow: 0 0 0 3px color-mix(in oklch, var(--color-error) 10%, transparent);
   }
 
+  /* Ghost Variant */
+  .tree-select-ghost .tree-select-trigger {
+    background-color: transparent;
+    border-color: transparent;
+  }
+  .tree-select-ghost .tree-select-trigger:focus {
+    background-color: var(--color-surface-container);
+    border-color: transparent;
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
+  }
+
   /* Disabled State */
   .tree-select-disabled .tree-select-trigger {
     cursor: not-allowed;
@@ -11112,8 +11941,8 @@ html {
   }
 
   .alert-close:focus-visible {
-    outline: 2px solid currentColor;
-    outline-offset: 2px;
+    outline: none;
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
   }
 
   /* Type Variants */
@@ -11129,15 +11958,33 @@ html {
     border-color: transparent;
   }
 
-  .alert-warning {
-    background-color: var(--color-warning-container);
-    color: var(--color-on-warning-container);
+  .alert-warning {
+    background-color: var(--color-warning-container);
+    color: var(--color-on-warning-container);
+    border-color: transparent;
+  }
+
+  .alert-error {
+    background-color: var(--color-error-container);
+    color: var(--color-on-error-container);
+    border-color: transparent;
+  }
+
+  .alert-primary {
+    background-color: var(--color-primary-container);
+    color: var(--color-on-primary-container);
+    border-color: transparent;
+  }
+
+  .alert-secondary {
+    background-color: var(--color-secondary-container);
+    color: var(--color-on-secondary-container);
     border-color: transparent;
   }
 
-  .alert-error {
-    background-color: var(--color-error-container);
-    color: var(--color-on-error-container);
+  .alert-tertiary {
+    background-color: var(--color-tertiary-container);
+    color: var(--color-on-tertiary-container);
     border-color: transparent;
   }
 
@@ -11162,6 +12009,21 @@ html {
     color: var(--color-error-content);
   }
 
+  .alert-filled.alert-primary {
+    background-color: var(--color-primary);
+    color: var(--color-primary-content);
+  }
+
+  .alert-filled.alert-secondary {
+    background-color: var(--color-secondary);
+    color: var(--color-secondary-content);
+  }
+
+  .alert-filled.alert-tertiary {
+    background-color: var(--color-tertiary);
+    color: var(--color-tertiary-content);
+  }
+
   /* Outlined Variants */
   .alert-outlined {
     background-color: transparent;
@@ -11187,6 +12049,35 @@ html {
     color: var(--color-error);
   }
 
+  .alert-outlined.alert-primary {
+    border-color: var(--color-primary);
+    color: var(--color-primary);
+  }
+
+  .alert-outlined.alert-secondary {
+    border-color: var(--color-secondary);
+    color: var(--color-secondary);
+  }
+
+  .alert-outlined.alert-tertiary {
+    border-color: var(--color-tertiary);
+    color: var(--color-tertiary);
+  }
+
+  /* Ghost Variant */
+  .alert-ghost {
+    background-color: transparent;
+    border-color: transparent;
+  }
+
+  .alert-ghost.alert-primary   { color: var(--color-primary); }
+  .alert-ghost.alert-secondary { color: var(--color-secondary); }
+  .alert-ghost.alert-tertiary  { color: var(--color-tertiary); }
+  .alert-ghost.alert-info      { color: var(--color-info); }
+  .alert-ghost.alert-success   { color: var(--color-success); }
+  .alert-ghost.alert-warning   { color: var(--color-warning); }
+  .alert-ghost.alert-error     { color: var(--color-error); }
+
   /* Dismissible */
   .alert-dismissible {
     padding-right: 2.5rem;
@@ -12330,8 +13221,8 @@ html {
   }
 
   .toast-close:focus-visible {
-    outline: 2px solid var(--color-primary);
-    outline-offset: 2px;
+    outline: none;
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
   }
 
   /* Toast Actions */
@@ -12374,6 +13265,30 @@ html {
     color: var(--color-error);
   }
 
+  .toast-primary {
+    border-color: var(--color-primary);
+  }
+
+  .toast-primary .toast-icon {
+    color: var(--color-primary);
+  }
+
+  .toast-secondary {
+    border-color: var(--color-secondary);
+  }
+
+  .toast-secondary .toast-icon {
+    color: var(--color-secondary);
+  }
+
+  .toast-tertiary {
+    border-color: var(--color-tertiary);
+  }
+
+  .toast-tertiary .toast-icon {
+    color: var(--color-tertiary);
+  }
+
   /* Filled Variants */
   .toast-filled.toast-info {
     background-color: var(--color-info-container);
@@ -12399,13 +13314,58 @@ html {
     color: var(--color-on-error-container);
   }
 
+  .toast-filled.toast-primary {
+    background-color: var(--color-primary-container);
+    border-color: transparent;
+    color: var(--color-on-primary-container);
+  }
+
+  .toast-filled.toast-secondary {
+    background-color: var(--color-secondary-container);
+    border-color: transparent;
+    color: var(--color-on-secondary-container);
+  }
+
+  .toast-filled.toast-tertiary {
+    background-color: var(--color-tertiary-container);
+    border-color: transparent;
+    color: var(--color-on-tertiary-container);
+  }
+
+  /* Filled variant sub-element color inheritance fix.
+     .toast-title and .toast-message have explicit color rules that would otherwise
+     override the filled variant's inherited on-container color. */
+  .toast-filled .toast-title,
+  .toast-filled .toast-message {
+    color: inherit;
+  }
+
+  /* Ghost Variant */
+  .toast-ghost {
+    background-color: transparent;
+    border-color: transparent;
+  }
+
+  .toast-ghost.toast-primary   { color: var(--color-primary); }
+  .toast-ghost.toast-secondary { color: var(--color-secondary); }
+  .toast-ghost.toast-tertiary  { color: var(--color-tertiary); }
+  .toast-ghost.toast-info      { color: var(--color-info); }
+  .toast-ghost.toast-success   { color: var(--color-success); }
+  .toast-ghost.toast-warning   { color: var(--color-warning); }
+  .toast-ghost.toast-error     { color: var(--color-error); }
+
+  .toast-ghost .toast-title,
+  .toast-ghost .toast-message {
+    color: inherit;
+  }
+
   /* Progress Bar (for auto-dismiss) */
   .toast-progress {
     position: absolute;
     bottom: 0;
     left: 0;
     height: 3px;
-    background-color: var(--color-primary);
+    background-color: currentColor;
     border-radius: 0 0 0.75rem 0.75rem;
     animation: toast-progress linear forwards;
   }
@@ -12668,6 +13628,90 @@ html {
     border-right-color: var(--color-error);
   }
 
+  .tooltip.tooltip-tertiary .tooltip-content {
+    background-color: var(--color-tertiary);
+    color: var(--color-tertiary-content);
+  }
+
+  .tooltip.tooltip-tertiary .tooltip-content::before {
+    border-top-color: var(--color-tertiary);
+  }
+
+  .tooltip.tooltip-tertiary.tooltip-bottom .tooltip-content::before {
+    border-bottom-color: var(--color-tertiary);
+  }
+
+  .tooltip.tooltip-tertiary.tooltip-left .tooltip-content::before {
+    border-left-color: var(--color-tertiary);
+  }
+
+  .tooltip.tooltip-tertiary.tooltip-right .tooltip-content::before {
+    border-right-color: var(--color-tertiary);
+  }
+
+  .tooltip.tooltip-info .tooltip-content {
+    background-color: var(--color-info);
+    color: var(--color-info-content);
+  }
+
+  .tooltip.tooltip-info .tooltip-content::before {
+    border-top-color: var(--color-info);
+  }
+
+  .tooltip.tooltip-info.tooltip-bottom .tooltip-content::before {
+    border-bottom-color: var(--color-info);
+  }
+
+  .tooltip.tooltip-info.tooltip-left .tooltip-content::before {
+    border-left-color: var(--color-info);
+  }
+
+  .tooltip.tooltip-info.tooltip-right .tooltip-content::before {
+    border-right-color: var(--color-info);
+  }
+
+  .tooltip.tooltip-success .tooltip-content {
+    background-color: var(--color-success);
+    color: var(--color-success-content);
+  }
+
+  .tooltip.tooltip-success .tooltip-content::before {
+    border-top-color: var(--color-success);
+  }
+
+  .tooltip.tooltip-success.tooltip-bottom .tooltip-content::before {
+    border-bottom-color: var(--color-success);
+  }
+
+  .tooltip.tooltip-success.tooltip-left .tooltip-content::before {
+    border-left-color: var(--color-success);
+  }
+
+  .tooltip.tooltip-success.tooltip-right .tooltip-content::before {
+    border-right-color: var(--color-success);
+  }
+
+  .tooltip.tooltip-warning .tooltip-content {
+    background-color: var(--color-warning);
+    color: var(--color-warning-content);
+  }
+
+  .tooltip.tooltip-warning .tooltip-content::before {
+    border-top-color: var(--color-warning);
+  }
+
+  .tooltip.tooltip-warning.tooltip-bottom .tooltip-content::before {
+    border-bottom-color: var(--color-warning);
+  }
+
+  .tooltip.tooltip-warning.tooltip-left .tooltip-content::before {
+    border-left-color: var(--color-warning);
+  }
+
+  .tooltip.tooltip-warning.tooltip-right .tooltip-content::before {
+    border-right-color: var(--color-warning);
+  }
+
   /* Multi-line Tooltip */
   .tooltip-multiline .tooltip-content {
     white-space: normal;
@@ -12826,8 +13870,8 @@ html {
   }
 
   .appbar-nav:focus-visible {
-    outline: 2px solid var(--color-primary);
-    outline-offset: 2px;
+    outline: none;
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
   }
 
   /* App Bar Title */
@@ -12889,8 +13933,8 @@ html {
   }
 
   .appbar-action:focus-visible {
-    outline: 2px solid var(--color-primary);
-    outline-offset: 2px;
+    outline: none;
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
   }
 
   /* App Bar Logo/Brand */
@@ -13005,8 +14049,8 @@ html {
   }
 
   .appbar-back:focus-visible {
-    outline: 2px solid var(--color-primary);
-    outline-offset: 2px;
+    outline: none;
+    box-shadow: 0 0 0 3px color-mix(in oklch, currentColor 20%, transparent);
   }
 
   /* Search Input (direct on element) */
@@ -13037,64 +14081,162 @@ html {
   /* Color Variants */
   .appbar-primary {
     background-color: var(--color-primary);
-    color: var(--color-on-primary);
+    color: var(--color-primary-content);
   }
 
   .appbar-primary .appbar-nav,
-  .appbar-primary .appbar-action {
-    color: var(--color-on-primary);
+  .appbar-primary .appbar-action,
+  .appbar-primary .appbar-back {
+    color: var(--color-primary-content);
   }
 
   .appbar-primary .appbar-nav:hover,
-  .appbar-primary .appbar-action:hover {
+  .appbar-primary .appbar-action:hover,
+  .appbar-primary .appbar-back:hover {
     background-color: var(--color-primary-container);
     color: var(--color-on-primary-container);
   }
 
   .appbar-primary .appbar-subtitle {
-    color: var(--color-on-primary);
+    color: var(--color-primary-content);
     opacity: 0.8;
   }
 
   .appbar-secondary {
     background-color: var(--color-secondary);
-    color: var(--color-on-secondary);
+    color: var(--color-secondary-content);
   }
 
   .appbar-secondary .appbar-nav,
-  .appbar-secondary .appbar-action {
-    color: var(--color-on-secondary);
+  .appbar-secondary .appbar-action,
+  .appbar-secondary .appbar-back {
+    color: var(--color-secondary-content);
   }
 
   .appbar-secondary .appbar-nav:hover,
-  .appbar-secondary .appbar-action:hover {
+  .appbar-secondary .appbar-action:hover,
+  .appbar-secondary .appbar-back:hover {
     background-color: var(--color-secondary-container);
     color: var(--color-on-secondary-container);
   }
 
   .appbar-secondary .appbar-subtitle {
-    color: var(--color-on-secondary);
+    color: var(--color-secondary-content);
     opacity: 0.8;
   }
 
   .appbar-tertiary {
     background-color: var(--color-tertiary);
-    color: var(--color-on-tertiary);
+    color: var(--color-tertiary-content);
   }
 
   .appbar-tertiary .appbar-nav,
-  .appbar-tertiary .appbar-action {
-    color: var(--color-on-tertiary);
+  .appbar-tertiary .appbar-action,
+  .appbar-tertiary .appbar-back {
+    color: var(--color-tertiary-content);
   }
 
   .appbar-tertiary .appbar-nav:hover,
-  .appbar-tertiary .appbar-action:hover {
+  .appbar-tertiary .appbar-action:hover,
+  .appbar-tertiary .appbar-back:hover {
     background-color: var(--color-tertiary-container);
     color: var(--color-on-tertiary-container);
   }
 
   .appbar-tertiary .appbar-subtitle {
-    color: var(--color-on-tertiary);
+    color: var(--color-tertiary-content);
+    opacity: 0.8;
+  }
+
+  .appbar-info {
+    background-color: var(--color-info);
+    color: var(--color-info-content);
+  }
+
+  .appbar-info .appbar-nav,
+  .appbar-info .appbar-action,
+  .appbar-info .appbar-back {
+    color: var(--color-info-content);
+  }
+
+  .appbar-info .appbar-nav:hover,
+  .appbar-info .appbar-action:hover,
+  .appbar-info .appbar-back:hover {
+    background-color: var(--color-info-container);
+    color: var(--color-on-info-container);
+  }
+
+  .appbar-info .appbar-subtitle {
+    color: var(--color-info-content);
+    opacity: 0.8;
+  }
+
+  .appbar-success {
+    background-color: var(--color-success);
+    color: var(--color-success-content);
+  }
+
+  .appbar-success .appbar-nav,
+  .appbar-success .appbar-action,
+  .appbar-success .appbar-back {
+    color: var(--color-success-content);
+  }
+
+  .appbar-success .appbar-nav:hover,
+  .appbar-success .appbar-action:hover,
+  .appbar-success .appbar-back:hover {
+    background-color: var(--color-success-container);
+    color: var(--color-on-success-container);
+  }
+
+  .appbar-success .appbar-subtitle {
+    color: var(--color-success-content);
+    opacity: 0.8;
+  }
+
+  .appbar-warning {
+    background-color: var(--color-warning);
+    color: var(--color-warning-content);
+  }
+
+  .appbar-warning .appbar-nav,
+  .appbar-warning .appbar-action,
+  .appbar-warning .appbar-back {
+    color: var(--color-warning-content);
+  }
+
+  .appbar-warning .appbar-nav:hover,
+  .appbar-warning .appbar-action:hover,
+  .appbar-warning .appbar-back:hover {
+    background-color: var(--color-warning-container);
+    color: var(--color-on-warning-container);
+  }
+
+  .appbar-warning .appbar-subtitle {
+    color: var(--color-warning-content);
+    opacity: 0.8;
+  }
+
+  .appbar-error {
+    background-color: var(--color-error);
+    color: var(--color-error-content);
+  }
+
+  .appbar-error .appbar-nav,
+  .appbar-error .appbar-action,
+  .appbar-error .appbar-back {
+    color: var(--color-error-content);
+  }
+
+  .appbar-error .appbar-nav:hover,
+  .appbar-error .appbar-action:hover,
+  .appbar-error .appbar-back:hover {
+    background-color: var(--color-error-container);
+    color: var(--color-on-error-container);
+  }
+
+  .appbar-error .appbar-subtitle {
+    color: var(--color-error-content);
     opacity: 0.8;
   }
 
@@ -15525,6 +16667,38 @@ html {
     background-color: var(--color-tertiary-container);
   }
 
+  .collapse-info .collapse-trigger {
+    color: var(--color-info);
+  }
+
+  .collapse-info .collapse-trigger:hover {
+    background-color: var(--color-info-container);
+  }
+
+  .collapse-success .collapse-trigger {
+    color: var(--color-success);
+  }
+
+  .collapse-success .collapse-trigger:hover {
+    background-color: var(--color-success-container);
+  }
+
+  .collapse-warning .collapse-trigger {
+    color: var(--color-warning);
+  }
+
+  .collapse-warning .collapse-trigger:hover {
+    background-color: var(--color-warning-container);
+  }
+
+  .collapse-error .collapse-trigger {
+    color: var(--color-error);
+  }
+
+  .collapse-error .collapse-trigger:hover {
+    background-color: var(--color-error-container);
+  }
+
   /* Size Variants */
   .collapse-sm .collapse-trigger {
     padding: 0.5rem 0.75rem;