1 files changed, 20 insertions, 18 deletions

diff --git a/src/objects/_badge.vars.scss b/src/objects/_badge.vars.scss
index f9a4ed5..4941ccf 100644
--- a/src/objects/_badge.vars.scss
+++ b/src/objects/_badge.vars.scss
@@ -38,10 +38,6 @@ $sizes: (
     'xl' $pad-b--xl $pad-i--xl $pad-i-pill--xl $pad-i-label--xl $font-size--xl,
 ) !default;
 
-$key-focus--label-color:   props.def(--o-badge--key-focus--label-color, props.get(core.$theme, --focus, --text)) !default;
-$key-focus--border-color:  props.def(--o-badge--key-focus--border-color, props.get(core.$theme, --focus, --border)) !default;
-$key-focus--outline-color: props.def(--o-badge--key-focus--outline-color, props.get(core.$theme, --focus, --outline)) !default;
-
 $default-theme-override: () !default;
 $default-theme: props.def(--o-badge, (
     --bg:    props.get(core.$theme, --text-mute),
@@ -57,6 +53,12 @@ $default-theme: props.def(--o-badge, (
         --label: props.get(core.$theme, --bg-l2),
     ),
 
+    --key-focus: (
+        --label:   props.get(core.$theme, --focus, --text),
+        --border:  props.get(core.$theme, --focus, --border),
+        --outline: props.get(core.$theme, --focus, --outline),
+    ),
+
     --quiet: (
         --bg:    props.get(core.$theme, --border-mute),
         --label: props.get(core.$theme, --heading),
@@ -117,36 +119,36 @@ $static-themes: props.def(--o-badge);
     ));
 }
 
-$themes-config: --accent --positive --negative --warning !default;
+$themes-config: accent positive negative warning !default;
 
 $themes: props.def(--o-badge);
 
 @each $theme in $themes-config {
     $themes: props.merge($themes, (
-        $theme: (
-            --bg:    props.get(core.$static-colors, $theme, --900),
-            --label: props.get(core.$static-colors, $theme, --900-text),
+        --#{$theme}: (
+            --bg:    props.get(core.$theme, --#{$theme}-static, --900),
+            --label: props.get(core.$theme, --#{$theme}-static, --900-text),
             
             --hover: (
-                --bg:    props.get(core.$static-colors, $theme, --1000),
-                --label: props.get(core.$static-colors, $theme, --1000-text),
+                --bg:    props.get(core.$theme, --#{$theme}-static, --1000),
+                --label: props.get(core.$theme, --#{$theme}-static, --1000-text),
             ),
 
             --active: (
-                --bg:    props.get(core.$static-colors, $theme, --1100),
-                --label: props.get(core.$static-colors, $theme, --1000-text),
+                --bg:    props.get(core.$theme, --#{$theme}-static, --1100),
+                --label: props.get(core.$theme, --#{$theme}-static, --1000-text),
             ),
 
             --quiet: (
-                --bg:    props.get(core.$theme, $theme, --200),
-                --label: props.get(core.$theme, $theme, --1100),
+                --bg:    props.get(core.$theme, --#{$theme}, --200),
+                --label: props.get(core.$theme, --#{$theme}, --1100),
                 --hover: (
-                    --bg:    props.get(core.$theme, $theme, --300),
-                    --label: props.get(core.$theme, $theme, --1200),
+                    --bg:    props.get(core.$theme, --#{$theme}, --300),
+                    --label: props.get(core.$theme, --#{$theme}, --1200),
                 ),
                 --active: (
-                    --bg:    props.get(core.$theme, $theme, --400),
-                    --label: props.get(core.$theme, $theme, --1300),
+                    --bg:    props.get(core.$theme, --#{$theme}, --400),
+                    --label: props.get(core.$theme, --#{$theme}, --1300),
                 ),
             )
         )