1 files changed, 15 insertions, 27 deletions

diff --git a/src/_core.vars.scss b/src/_core.vars.scss
index 3b23c32..83d3a6a 100644
--- a/src/_core.vars.scss
+++ b/src/_core.vars.scss
@@ -1,3 +1,5 @@
+// stylelint-disable scss/dollar-variable-pattern
+
 @use 'sass:map';
 @use 'sass:meta';
 @use 'sass:list';
@@ -98,15 +100,15 @@ $key-focus--border-width:  props.def(--key-focus--border-width, props.get($borde
 $key-focus--border-offset: props.def(--key-focus--border-offset, props.get($border-width--medium)) !default;
 
 $list--indent:         props.def(--list--indent, props.get($size--400)) !default;
-$list--compact-indent: props.def(--list--indent, props.get($size--250)) !default;
+$list--compact-indent: props.def(--list--compact-indent, props.get($size--250)) !default;
 
 //
 
-$static-colors: props.def(--static-colors);
+$-static-colors: ();
 
 @each $palette-name, $palette in map.get(config.$static-colors, --palettes) {
     $palette: fn.palette($palette, map.get(config.$static-colors, --contrasts), 1, map.get(config.$static-colors, --base));
-    $static-colors: props.merge($static-colors, ( $palette-name: $palette ));
+    $-static-colors: map.merge($-static-colors, ( $palette-name: $palette ));
 }
 
 //
@@ -129,6 +131,10 @@ $themes: ();
     @each $variant-name, $variant in $theme {
         $compiled: props.def(--colors);
 
+        @each $palette-name, $palette in $-static-colors {
+            $compiled: props.merge($compiled, ( #{$palette-name}-static: $palette ));
+        }
+
         @each $palette-name, $palette in map.get($variant, --palettes) {
             $base-color: list.nth($palette, 1);
             $contrasts:  list.nth($palette, 2);
@@ -147,32 +153,14 @@ $themes: ();
 
             @if meta.type-of($ref) == 'map' {
                 @each $key, $r in $ref {
-                    $repo-name: list.nth($r, 1);
-                    $re1:       list.nth($r, 2);
-                    $re2:       iro.fn-list-slice($r, 3);
-
-                    $res2: null;
-
-                    @if $repo-name == --static {
-                        $res2: props.get($static-colors, $re1, $re2...);
-                    } @else {
-                        $res2: props.get($compiled, $re1, $re2...);
-                    }
-
-                    $res: map.merge($res, ($key: $res2));
+                    $re1: list.nth($r, 1);
+                    $re2: iro.fn-list-slice($r, 2);
+                    $res: map.merge($res, ($key: props.get($compiled, $re1, $re2...)));
                 }
             } @else {
-                $repo-name: list.nth($ref, 1);
-                $ref1:      list.nth($ref, 2);
-                $ref2:      iro.fn-list-slice($ref, 3);
-
-                $res: null;
-
-                @if $repo-name == --static {
-                    $res: props.get($static-colors, $ref1, $ref2...);
-                } @else {
-                    $res: props.get($compiled, $ref1, $ref2...);
-                }
+                $ref1: list.nth($ref, 1);
+                $ref2: iro.fn-list-slice($ref, 2);
+                $res:  props.get($compiled, $ref1, $ref2...);
             }
 
             $compiled: props.merge($compiled, ( $color: $res ));