6 files changed, 58 insertions, 45 deletions

diff --git a/src/objects/_action-button.scss b/src/objects/_action-button.scss
index ca047bc..dcabb57 100644
--- a/src/objects/_action-button.scss
+++ b/src/objects/_action-button.scss
@@ -137,6 +137,10 @@
             }
         }
 
+        @include bem.elem('label') {
+            margin-inline: props.get(vars.$pad-i-label);
+        }
+
         @include -apply-theme(vars.$default-theme);
 
         @each $theme in map.keys(props.get(vars.$themes)) {
@@ -154,12 +158,16 @@
             }
         }
 
-        @each $mod, $pad-i, $pad-i-pill, $pad-b, $font-size in vars.$fixed-sizes {
+        @each $mod, $pad-i, $pad-i-label, $pad-i-pill, $pad-b, $font-size in vars.$fixed-sizes {
             @include bem.modifier($mod) {
                 padding-block:  props.get($pad-b);
                 padding-inline: props.get($pad-i);
                 font-size:      props.get($font-size);
 
+                @include bem.elem('label') {
+                    margin-inline: props.get($pad-i-label);
+                }
+
                 @include bem.modifier('pill') {
                     padding-inline: props.get($pad-i-pill);
                 }
@@ -170,7 +178,7 @@
             inline-size:    calc(1em * props.get(vars.$line-height) + 2 * props.get(vars.$pad-b));
             padding-inline: 0;
 
-            @each $mod, $pad-i, $pad-i-pill, $pad-b, $font-size in vars.$fixed-sizes {
+            @each $mod, $pad-i, $pad-i-label, $pad-i-pill, $pad-b, $font-size in vars.$fixed-sizes {
                 @include bem.modifier($mod) {
                     inline-size:    calc(1em * props.get(vars.$line-height) + 2 * props.get($pad-b));
                     padding-inline: 0;
diff --git a/src/objects/_action-button.vars.scss b/src/objects/_action-button.vars.scss
index 9afd5d7..9de985a 100644
--- a/src/objects/_action-button.vars.scss
+++ b/src/objects/_action-button.vars.scss
@@ -5,35 +5,39 @@
 
 $line-height:  props.def(--o-action-button--line-height, 1.4) !default;
 $pad-i:        props.def(--o-action-button--pad-i, props.get(core.$size--150)) !default;
+$pad-i-label:  props.def(--o-button--pad-i-label, props.get(core.$size--50)) !default;
 $pad-i-pill:   props.def(--o-action-button--pad-i-pill, props.get(core.$size--200)) !default;
 $pad-b:        props.def(--o-action-button--pad-b, props.get(core.$size--85)) !default;
 $border-width: props.def(--o-action-button--border-width, props.get(core.$border-width--thin)) !default;
 $rounding:     props.def(--o-action-button--rounding, props.get(core.$rounding)) !default;
 $font-size:    props.def(--o-action-button--font-size, props.get(core.$font-size--100)) !default;
 
-$pad-i--sm:      props.def(--o-action-button--sm--pad-i, props.get(core.$size--100)) !default;
-$pad-i-pill--sm: props.def(--o-action-button--sm--pad-i-pill, props.get(core.$size--150)) !default;
-$pad-b--sm:      props.def(--o-action-button--sm--pad-b, props.get(core.$size--40)) !default;
-$font-size--sm:  props.def(--o-action-button--sm--font-size, props.get(core.$font-size--75)) !default;
+$pad-i--sm:       props.def(--o-action-button--sm--pad-i, props.get(core.$size--100)) !default;
+$pad-i-label--sm: props.def(--o-button--sm--pad-i-label, props.get(core.$size--25)) !default;
+$pad-i-pill--sm:  props.def(--o-action-button--sm--pad-i-pill, props.get(core.$size--150)) !default;
+$pad-b--sm:       props.def(--o-action-button--sm--pad-b, props.get(core.$size--40)) !default;
+$font-size--sm:   props.def(--o-action-button--sm--font-size, props.get(core.$font-size--75)) !default;
 
-$pad-i--lg:      props.def(--o-action-button--lg--pad-i, props.get(core.$size--175)) !default;
-$pad-i-pill--lg: props.def(--o-action-button--lg--pad-i-pill, props.get(core.$size--225)) !default;
-$pad-b--lg:      props.def(--o-action-button--lg--pad-b, props.get(core.$size--115)) !default;
-$font-size--lg:  props.def(--o-action-button--lg--font-size, props.get(core.$font-size--150)) !default;
+$pad-i--lg:       props.def(--o-action-button--lg--pad-i, props.get(core.$size--175)) !default;
+$pad-i-label--lg: props.def(--o-button--lg--pad-i-label, props.get(core.$size--100)) !default;
+$pad-i-pill--lg:  props.def(--o-action-button--lg--pad-i-pill, props.get(core.$size--250)) !default;
+$pad-b--lg:       props.def(--o-action-button--lg--pad-b, props.get(core.$size--115)) !default;
+$font-size--lg:   props.def(--o-action-button--lg--font-size, props.get(core.$font-size--150)) !default;
 
-$pad-i--xl:      props.def(--o-action-button--xl--pad-i, props.get(core.$size--225)) !default;
-$pad-i-pill--xl: props.def(--o-action-button--xl--pad-i-pill, props.get(core.$size--300)) !default;
-$pad-b--xl:      props.def(--o-action-button--xl--pad-b, props.get(core.$size--150)) !default;
-$font-size--xl:  props.def(--o-action-button--xl--font-size, props.get(core.$font-size--200)) !default;
+$pad-i--xl:       props.def(--o-action-button--xl--pad-i, props.get(core.$size--225)) !default;
+$pad-i-label--xl: props.def(--o-button--xl--pad-i-label, props.get(core.$size--150)) !default;
+$pad-i-pill--xl:  props.def(--o-action-button--xl--pad-i-pill, props.get(core.$size--300)) !default;
+$pad-b--xl:       props.def(--o-action-button--xl--pad-b, props.get(core.$size--150)) !default;
+$font-size--xl:   props.def(--o-action-button--xl--font-size, props.get(core.$font-size--200)) !default;
 
 $key-focus--border-width:  props.def(--o-action-button--key-focus--border-width, props.get(core.$key-focus--border-width)) !default;
 $key-focus--border-offset: props.def(--o-action-button--key-focus--border-offset, props.get(core.$key-focus--border-offset)) !default;
 $key-focus--outline-width: props.def(--o-action-button--key-focus--outline-width, props.get(core.$key-focus--outline-width)) !default;
 
 $fixed-sizes: (
-    'sm' $pad-i--sm $pad-i-pill--sm $pad-b--sm $font-size--sm,
-    'lg' $pad-i--lg $pad-i-pill--lg $pad-b--lg $font-size--lg,
-    'xl' $pad-i--xl $pad-i-pill--xl $pad-b--xl $font-size--xl,
+    'sm' $pad-i--sm $pad-i-label--sm $pad-i-pill--sm $pad-b--sm $font-size--sm,
+    'lg' $pad-i--lg $pad-i-label--lg $pad-i-pill--lg $pad-b--lg $font-size--lg,
+    'xl' $pad-i--xl $pad-i-label--xl $pad-i-pill--xl $pad-b--xl $font-size--xl,
 ) !default;
 
 $themes: props.def(--o-action-button, (), 'color');
@@ -68,9 +72,9 @@ $default-theme: map.deep-merge((
     ),
 
     --selected: (
-        --bg-color:     props.get(core.$theme, --text-mute),
+        --bg-color:     props.get(core.$theme, --heading),
         --label-color:  props.get(core.$theme, --base, --50),
-        --border-color: props.get(core.$theme, --text-mute),
+        --border-color: props.get(core.$theme, --heading),
 
         --hover: (
             --bg-color:     props.get(core.$theme, --text),
@@ -79,9 +83,9 @@ $default-theme: map.deep-merge((
         ),
 
         --active: (
-            --bg-color:     props.get(core.$theme, --heading),
+            --bg-color:     props.get(core.$theme, --text-mute),
             --label-color:  props.get(core.$theme, --base, --50),
-            --border-color: props.get(core.$theme, --heading),
+            --border-color: props.get(core.$theme, --text-mute),
         ),
 
         --disabled: (
diff --git a/src/objects/_badge.vars.scss b/src/objects/_badge.vars.scss
index d96d6c4..6327e7b 100644
--- a/src/objects/_badge.vars.scss
+++ b/src/objects/_badge.vars.scss
@@ -40,7 +40,7 @@ $sizes: (
 
 $default-theme-override: () !default;
 $default-theme: props.def(--o-badge, (
-    --bg:    props.get(core.$theme, --text-mute),
+    --bg:    props.get(core.$theme, --heading),
     --label: props.get(core.$theme, --bg-l2),
     
     --hover: (
@@ -49,7 +49,7 @@ $default-theme: props.def(--o-badge, (
     ),
 
     --active: (
-        --bg:    props.get(core.$theme, --heading),
+        --bg:    props.get(core.$theme, --text-mute),
         --label: props.get(core.$theme, --bg-l2),
     ),
 
diff --git a/src/objects/_button.vars.scss b/src/objects/_button.vars.scss
index bd3de91..f70bde7 100644
--- a/src/objects/_button.vars.scss
+++ b/src/objects/_button.vars.scss
@@ -5,14 +5,14 @@
 
 $line-height:  props.def(--o-button--line-height, 1.4) !default;
 $pad-i:        props.def(--o-button--pad-i, props.get(core.$size--200)) !default;
-$pad-i-label:  props.def(--o-button--pad-i-label, props.get(core.$size--75)) !default;
+$pad-i-label:  props.def(--o-button--pad-i-label, props.get(core.$size--50)) !default;
 $pad-b:        props.def(--o-button--pad-b, props.get(core.$size--65)) !default;
 $border-width: props.def(--o-button--border-width, props.get(core.$border-width--medium)) !default;
 $rounding:     props.def(--o-button--rounding, 10em) !default;
 $font-size:    props.def(--o-button--font-size, props.get(core.$font-size--100)) !default;
 
 $pad-i--sm:       props.def(--o-button--sm--pad-i, props.get(core.$size--150)) !default;
-$pad-i-label--sm: props.def(--o-button--sm--pad-i-label, props.get(core.$size--50)) !default;
+$pad-i-label--sm: props.def(--o-button--sm--pad-i-label, props.get(core.$size--25)) !default;
 $pad-b--sm:       props.def(--o-button--sm--pad-b, props.get(core.$size--25)) !default;
 $font-size--sm:   props.def(--o-button--sm--font-size, props.get(core.$font-size--75)) !default;
 
@@ -66,19 +66,19 @@ $default-theme: props.def(--o-button, (
     ),
 
     --primary: (
-        --bg:             props.get(core.$theme, --base, --800),
-        --label:          props.get(core.$theme, --base, --800-text),
-        --outline-border: props.get(core.$theme, --base, --800),
+        --bg:             props.get(core.$theme, --base, --900),
+        --label:          props.get(core.$theme, --base, --900-text),
+        --outline-border: props.get(core.$theme, --base, --900),
         --outline-label:  props.get(core.$theme, --text),
 
         --hover: (
-            --bg:     props.get(core.$theme, --base, --900),
-            --label:  props.get(core.$theme, --base, --900-text),
+            --bg:     props.get(core.$theme, --base, --800),
+            --label:  props.get(core.$theme, --base, --800-text),
         ),
 
         --active: (
-            --bg:     props.get(core.$theme, --base, --900),
-            --label:  props.get(core.$theme, --base, --900-text),
+            --bg:     props.get(core.$theme, --base, --700),
+            --label:  props.get(core.$theme, --base, --700-text),
         ),
     ),
 ), 'color');
diff --git a/src/objects/_divider.scss b/src/objects/_divider.scss
index b746551..65f1718 100644
--- a/src/objects/_divider.scss
+++ b/src/objects/_divider.scss
@@ -13,18 +13,19 @@
     @include materialize-at-root(meta.module-variables('vars'));
 
     @include bem.object('divider') {
-        display:        flex;
-        flex:           0 0 auto;
-        flex-direction: row;
-        align-items:    center;
-        block-size:     1em;
-        margin-block:   props.get(vars.$margin-b);
-        font-size:      props.get(vars.$strong--label-font-size);
-        font-weight:    700;
-        line-height:    1;
-        color:          props.get(vars.$strong--label-color);
-        text-transform: uppercase;
-        letter-spacing: .5px;
+        display:          flex;
+        flex:             0 0 auto;
+        flex-direction:   row;
+        align-items:      center;
+        block-size:       1em;
+        margin-block:     props.get(vars.$margin-b);
+        font-size:        props.get(vars.$strong--label-font-size);
+        font-weight:      700;
+        line-height:      1;
+        color:            props.get(vars.$strong--label-color);
+        text-transform:   uppercase;
+        letter-spacing:   .5px;
+        background-color: transparent;
 
         &::before,
         &::after {
diff --git a/src/objects/_popover.scss b/src/objects/_popover.scss
index fa65ddb..afdcf32 100644
--- a/src/objects/_popover.scss
+++ b/src/objects/_popover.scss
@@ -10,7 +10,7 @@
     @include materialize-at-root(meta.module-variables('vars'));
 
     @include bem.object('popover') {
-        position:           absolute;
+        position:           fixed;
         inset-block-start:  0;
         inset-inline-start: 0;
         z-index:            props.get(vars.$z-index);