1 files changed, 28 insertions, 33 deletions

diff --git a/src/objects/_badge.vars.scss b/src/objects/_badge.vars.scss
index 6a3dd15..c49474b 100644
--- a/src/objects/_badge.vars.scss
+++ b/src/objects/_badge.vars.scss
@@ -43,35 +43,35 @@ $key-focus--outline-color: props.def(--o-avatar--key-focus--outline-color, props
 
 $default-theme-override: () !default;
 $default-theme: props.def(--o-badge, (
-    --bg:    props.def(--o-badge--bg-color, props.get(core.$theme, --text-mute)),
-    --label: props.def(--o-badge--label-color, props.get(core.$theme, --bg-l2)),
+    --bg:    props.get(core.$theme, --text-mute),
+    --label: props.get(core.$theme, --bg-l2),
     
     --hover: (
-        --bg:    props.def(--o-badge--hover--bg-color, props.get(core.$theme, --text)),
-        --label: props.def(--o-badge--label-color, props.get(core.$theme, --bg-l2)),
+        --bg:    props.get(core.$theme, --text),
+        --label: props.get(core.$theme, --bg-l2),
     ),
 
     --active: (
-        --bg:    props.def(--o-badge--active--bg-color, props.get(core.$theme, --heading)),
-        --label: props.def(--o-badge--label-color, props.get(core.$theme, --bg-l2)),
+        --bg:    props.get(core.$theme, --heading),
+        --label: props.get(core.$theme, --bg-l2),
     ),
 
     --quiet: (
-        --bg:    props.def(--o-badge--quiet--bg-color, props.get(core.$theme, --border-mute)),
-        --label: props.def(--o-badge--quiet--label-color, props.get(core.$theme, --heading)),
+        --bg:    props.get(core.$theme, --border-mute),
+        --label: props.get(core.$theme, --heading),
 
         --hover: (
-            --bg:    props.def(--o-badge--quiet--hover--bg-color, props.get(core.$theme, --border)),
-            --label: props.def(--o-badge--quiet--label-color, props.get(core.$theme, --heading)),
+            --bg:    props.get(core.$theme, --border),
+            --label: props.get(core.$theme, --heading),
         ),
 
         --active: (
-            --bg:    props.def(--o-badge--quiet--active--bg-color, props.get(core.$theme, --border-strong)),
-            --label: props.def(--o-badge--quiet--label-color, props.get(core.$theme, --heading)),
+            --bg:     props.get(core.$theme, --border-strong),
+            --label: props.get(core.$theme, --heading),
         ),
     )
 ));
-$default-theme: props.merge(--o-badge, $default-theme-override);
+$default-theme: props.merge($default-theme, $default-theme-override);
 
 $static-themes: props.def(--o-badge);
 
@@ -116,41 +116,36 @@ $static-themes: props.def(--o-badge);
     ));
 }
 
-$themes-config: (
-    accent:   --accent,
-    positive: --positive,
-    negative: --negative,
-    warning:  --warning,
-) !default;
+$themes-config: --accent --positive --negative --warning !default;
 
 $themes: props.def(--o-badge);
 
-@each $theme, $key in $themes-config {
+@each $theme in $themes-config {
     $themes: props.merge($themes, (
-        $key: (
-            --bg:    props.get(core.$static-colors, $key, --900),
-            --label: props.get(core.$static-colors, $key, --900-text),
+        $theme: (
+            --bg:    props.get(core.$static-colors, $theme, --900),
+            --label: props.get(core.$static-colors, $theme, --900-text),
             
             --hover: (
-                --bg:    props.get(core.$static-colors, $key, --1000),
-                --label: props.get(core.$static-colors, $key, --1000-text),
+                --bg:    props.get(core.$static-colors, $theme, --1000),
+                --label: props.get(core.$static-colors, $theme, --1000-text),
             ),
 
             --active: (
-                --bg:    props.get(core.$static-colors, $key, --1100),
-                --label: props.get(core.$static-colors, $key, --1000-text),
+                --bg:    props.get(core.$static-colors, $theme, --1100),
+                --label: props.get(core.$static-colors, $theme, --1000-text),
             ),
 
             --quiet: (
-                --bg:    props.get(core.$theme, $key, --200),
-                --label: props.get(core.$theme, $key, --1100),
+                --bg:    props.get(core.$theme, $theme, --200),
+                --label: props.get(core.$theme, $theme, --1100),
                 --hover: (
-                    --bg:    props.get(core.$theme, $key, --300),
-                    --label: props.get(core.$theme, $key, --1200),
+                    --bg:    props.get(core.$theme, $theme, --300),
+                    --label: props.get(core.$theme, $theme, --1200),
                 ),
                 --active: (
-                    --bg:    props.get(core.$theme, $key, --400),
-                    --label: props.get(core.$theme, $key, --1300),
+                    --bg:    props.get(core.$theme, $theme, --400),
+                    --label: props.get(core.$theme, $theme, --1300),
                 ),
             )
         )