5 files changed, 88 insertions, 4 deletions

diff --git a/src/objects/_card.vars.scss b/src/objects/_card.vars.scss
index ebfba10..1e6448a 100644
--- a/src/objects/_card.vars.scss
+++ b/src/objects/_card.vars.scss
@@ -37,3 +37,6 @@ $key-focus--outline-color: props.def(--o-card--key-focus--outline-color, props.g
 
 $quiet--image-color:        props.def(--o-card--quiet--image-color, props.get(core.$theme, --bg-base), 'color') !default;
 $quiet--hover--image-color: props.def(--o-card--quiet--hover--image-color, props.get(core.$theme, --border), 'color') !default;
+
+$pad-i--sm: props.def(--o-card--pad-i, props.get(core.$size--200), 'sm') !default;
+$pad-b--sm: props.def(--o-card--pad-b, props.get(core.$size--175), 'sm') !default;
diff --git a/src/objects/_heading.scss b/src/objects/_heading.scss
index 2d27658..1d6e2dc 100644
--- a/src/objects/_heading.scss
+++ b/src/objects/_heading.scss
@@ -1,4 +1,6 @@
+@use 'sass:map';
 @use 'sass:meta';
+@use 'sass:string';
 @use 'iro-sass/src/bem';
 @use 'iro-sass/src/props';
 @use '../props' as *;
@@ -60,5 +62,25 @@
                                 }
                         }
                 }
+
+                @each $theme in map.keys(props.get(vars.$static-themes)) {
+                        @include bem.modifier(string.slice($theme, 3)) {
+                                color: props.get(vars.$static-themes, $theme, --text-color);
+                                                
+                                @each $mod, $value in vars.$sizes {
+                                        @include bem.modifier($mod) {
+                                                color: props.get(vars.$static-themes, $theme, --#{$mod}, --text-color);
+                                        }
+                                }
+
+                                @include bem.modifier('display') {      
+                                        @each $mod, $value in vars.$sizes {
+                                                @include bem.modifier($mod) {
+                                                        color: props.get(vars.$static-themes, $theme, --display, --#{$mod}, --text-color);
+                                                }
+                                        }
+                                }
+                        }
+                }
         }
 }
diff --git a/src/objects/_heading.vars.scss b/src/objects/_heading.vars.scss
index ccef017..cf07488 100644
--- a/src/objects/_heading.vars.scss
+++ b/src/objects/_heading.vars.scss
@@ -1,3 +1,5 @@
+@use 'sass:map';
+@use 'sass:string';
 @use 'iro-sass/src/props';
 @use '../core.vars' as core;
 
@@ -151,3 +153,55 @@ $display--sizes: (
         'xl'  $display--font-family--xl $display--line-height--xl $display--font-size--xl $display--font-weight--xl $display--letter-spacing--xl $display--feature-settings--xl $display--text-transform--xl $display--text-color--xl,
         'xxl' $display--font-family--xxl $display--line-height--xxl $display--font-size--xxl $display--font-weight--xxl $display--letter-spacing--xxl $display--feature-settings--xxl $display--text-transform--xxl $display--text-color--xxl,
 ) !default;
+
+$static-themes: props.def(--o-heading, (), 'color');
+
+@each $theme in map.keys(props.get(core.$transparent-colors)) {
+        $heading-theme: --static-#{string.slice($theme, 3)};
+
+        $static-themes: props.merge($static-themes, (
+                $heading-theme: (
+                        --text-color: props.get(core.$transparent-colors, $theme, --900),
+
+                        --xxl: (
+                                --text-color: props.get(core.$transparent-colors, $theme, --900),
+                        ),
+                        --xl: (
+                                --text-color: props.get(core.$transparent-colors, $theme, --900),
+                        ),
+                        --lg: (
+                                --text-color: props.get(core.$transparent-colors, $theme, --900),
+                        ),
+                        --md: (
+                                --text-color: props.get(core.$transparent-colors, $theme, --900),
+                        ),
+                        --sm: (
+                                --text-color: props.get(core.$transparent-colors, $theme, --500),
+                        ),
+                        --xs: (
+                                --text-color: props.get(core.$transparent-colors, $theme, --500),
+                        ),
+
+                        --display: (
+                                --xxl: (
+                                        --text-color: props.get(core.$transparent-colors, $theme, --900),
+                                ),
+                                --xl: (
+                                        --text-color: props.get(core.$transparent-colors, $theme, --900),
+                                ),
+                                --lg: (
+                                        --text-color: props.get(core.$transparent-colors, $theme, --900),
+                                ),
+                                --md: (
+                                        --text-color: props.get(core.$transparent-colors, $theme, --900),
+                                ),
+                                --sm: (
+                                        --text-color: props.get(core.$transparent-colors, $theme, --900),
+                                ),
+                                --xs: (
+                                        --text-color: props.get(core.$transparent-colors, $theme, --500),
+                                ),
+                        ),
+                )
+        ));
+}
diff --git a/src/objects/_tabbar.scss b/src/objects/_tabbar.scss
index a9daaae..631c5c8 100644
--- a/src/objects/_tabbar.scss
+++ b/src/objects/_tabbar.scss
@@ -18,8 +18,8 @@
 
                 &::after {
                         display:            block;
-                        block-size:         props.get(vars.$indicator--width);
-                        margin-block-start: calc(-1 * props.get(vars.$indicator--width));
+                        block-size:         props.get(vars.$border--width);
+                        margin-block-start: calc(-1 * props.get(vars.$border--width));
                         content:            '';
                         background-color:   props.get(vars.$railing--bg-color);
                 }
@@ -27,7 +27,6 @@
                 @include bem.elem('tabs') {
                         display:         flex;
                         block-size:      100%;
-                        margin-inline:   calc(-.5 * props.get(vars.$spacing));
                         overflow-inline: auto;
                 }
 
@@ -38,12 +37,13 @@
                 @include bem.modifier('adapt') {
                         block-size: 100%;
                 }
-
+                
                 @include bem.elem('tab') {
                         position:       relative;
                         display:        flex;
                         align-items:    center;
                         padding-inline: calc(.5 * props.get(vars.$spacing));
+                        margin-inline:  calc(-.5 * props.get(vars.$spacing));
                         color:          props.get(vars.$tab--text-color);
                         white-space:    nowrap;
 
@@ -89,6 +89,10 @@
                                 }
                         }
 
+                        @include bem.next-twin-elem {
+                                margin-inline-start: calc(.5 * props.get(vars.$spacing));
+                        }
+
                         @include bem.is('selected') {
                                 color: props.get(vars.$tab--selected--text-color);
                 
diff --git a/src/objects/_tabbar.vars.scss b/src/objects/_tabbar.vars.scss
index 4095629..3cf01fd 100644
--- a/src/objects/_tabbar.vars.scss
+++ b/src/objects/_tabbar.vars.scss
@@ -8,6 +8,7 @@ $rounding:   props.def(--o-tabbar--rounding, props.get(core.$rounding--sm)) !def
 $spacing:    props.def(--o-tabbar--spacing, props.get(core.$size--400)) !default;
 $tab--pad-i: props.def(--o-tabbar--tab--pad-i, props.get(core.$size--50)) !default;
 
+$border--width:    props.def(--o-tabbar--border--width, props.get(core.$border-width--thin)) !default;
 $indicator--width: props.def(--o-tabbar--indicator--width, props.get(core.$border-width--medium)) !default; 
 
 $key-focus--border-width:  props.def(--o-tabbar--key-focus--border-width, props.get(core.$key-focus--border-width)) !default;