1 files changed, 15 insertions, 14 deletions

diff --git a/src/objects/_palette.scss b/src/objects/_palette.scss
index 8291750..c4f8e96 100644
--- a/src/objects/_palette.scss
+++ b/src/objects/_palette.scss
@@ -1,32 +1,33 @@
-@use 'sass:map';
 @use 'sass:list';
+@use 'sass:map';
 @use 'sass:string';
 @use 'iro-sass/src/iro-sass' as iro;
-@use '../functions' as fn;
-@use '../config';
+@use '../themes';
+@use '../props';
+@use '../core.vars' as core;
 
-@include iro.props-namespace('palette') {
-    @include iro.bem-object(iro.props-namespace()) {
+@mixin styles {
+    @include iro.bem-object('palette') {
         display:    flex;
         block-size: 3em;
 
         @include iro.bem-elem('item') {
             flex: 1 1 auto;
 
-            $palette:   map.get(config.$themes, config.$theme-default, --palettes, --base);
-            $contrasts: map.get(config.$themes, config.$theme-default, --contrasts, list.nth($palette, 2));
+            $palette:   map.get(themes.$themes, themes.$theme-default, light, --palettes, --base);
+            $contrasts: map.get(themes.$themes, themes.$theme-default, light, --contrasts, list.nth($palette, 2));
 
             @for $i from 1 through list.length($contrasts) {
                 $key: list.nth(map.keys($contrasts), $i);
 
                 &:nth-child(#{$i}) {
-                    background-color: fn.global-color(--base $key);
+                    background-color: props.get(core.$theme, --base, $key);
                 }
             }
         }
 
-        @each $palette-name, $palette in map.get(config.$themes, config.$theme-default, --palettes) {
-            $contrasts: map.get(config.$themes, config.$theme-default, --contrasts, list.nth($palette, 2));
+        @each $palette-name, $palette in map.get(themes.$themes, themes.$theme-default, light, --palettes) {
+            $contrasts: map.get(themes.$themes, themes.$theme-default, light, --contrasts, list.nth($palette, 2));
 
             @include iro.bem-modifier(string.slice($palette-name, 3)) {
                 @include iro.bem-elem('item') {
@@ -34,7 +35,7 @@
                         $key: list.nth(map.keys($contrasts), $i);
         
                         &:nth-child(#{$i}) {
-                            background-color: fn.global-color($palette-name $key);
+                            background-color: props.get(core.$theme, $palette-name, $key);
                         }
                     }
                 }
@@ -42,8 +43,8 @@
         }
 
         @include iro.bem-modifier('static') {
-            @each $palette-name, $palette in map.get(config.$static-colors, --palettes) {
-                $contrasts: map.get(config.$static-colors, --contrasts);
+            @each $palette-name, $palette in map.get(themes.$static-colors, --palettes) {
+                $contrasts: map.get(themes.$static-colors, --contrasts);
 
                 @include iro.bem-modifier(string.slice($palette-name, 3)) {
                     @include iro.bem-elem('item') {
@@ -51,7 +52,7 @@
                             $key: list.nth(map.keys($contrasts), $i);
             
                             &:nth-child(#{$i}) {
-                                background-color: fn.global-color(#{$palette-name}-static $key);
+                                background-color: props.get(core.$static-colors, $palette-name, $key);
                             }
                         }
                     }