1 files changed, 26 insertions, 2 deletions

diff --git a/src/objects/_heading.scss b/src/objects/_heading.scss
index 82e03f3..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 *;
@@ -32,31 +34,53 @@
                         transparent               props.get(vars.$bg-end));
                 }
 
-                @each $mod, $font-family, $line-height, $font-size, $font-weight, $letter-spacing, $feature-settings, $text-transform in vars.$sizes {
+                @each $mod, $font-family, $line-height, $font-size, $font-weight, $letter-spacing, $feature-settings, $text-transform, $text-color in vars.$sizes {
                         @include bem.modifier($mod) {
                                 font-family:           props.get($font-family);
                                 font-size:             props.get($font-size);
                                 font-weight:           props.get($font-weight);
                                 font-feature-settings: props.get($feature-settings);
                                 line-height:           props.get($line-height);
+                                color:                 props.get($text-color);
                                 text-transform:        props.get($text-transform);
                                 letter-spacing:        props.get($letter-spacing);
                         }
                 }
 
                 @include bem.modifier('display') {
-                        @each $mod, $font-family, $line-height, $font-size, $font-weight, $letter-spacing, $feature-settings, $text-transform in vars.$display--sizes {
+                        @each $mod, $font-family, $line-height, $font-size, $font-weight, $letter-spacing, $feature-settings, $text-transform, $text-color in vars.$display--sizes {
                                 @include bem.modifier($mod) {
                                         font-family:           props.get($font-family);
                                         font-size:             props.get($font-size);
                                         font-weight:           props.get($font-weight);
                                         font-feature-settings: props.get($feature-settings);
                                         line-height:           props.get($line-height);
+                                        color:                 props.get($text-color);
                                         text-transform:        props.get($text-transform);
                                         letter-spacing:        props.get($letter-spacing);
                                         transform:             translateX(props.get(vars.$offset));
                                 }
                         }
                 }
+
+                @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);
+                                                }
+                                        }
+                                }
+                        }
+                }
         }
 }