6 files changed, 33 insertions, 34 deletions

diff --git a/src_demo/_base.scss b/src_demo/_base.scss
index 129b319..67dfa06 100644
--- a/src_demo/_base.scss
+++ b/src_demo/_base.scss
@@ -1,13 +1,13 @@
 body {
     display:               grid;
-    grid-template-columns: auto 1fr;
     grid-template-areas:   'sidebar content';
+    grid-template-columns: auto 1fr;
 }
 
 @font-face {
     font-family:  'Garet';
     font-style:   normal;
     font-weight:  50 950;
-    font-display: swap;
     src:          url('/garet.woff2') format('woff2-variations');
+    font-display: swap;
 }
diff --git a/src_demo/components/_box.scss b/src_demo/components/_box.scss
index c746c33..ac217c0 100644
--- a/src_demo/components/_box.scss
+++ b/src_demo/components/_box.scss
@@ -1,16 +1,9 @@
 @use 'iro-sass/src/iro-sass' as iro;
-@use '../../src/functions' as fn;
+@use '../../src/props';
+@use '../../src/core.vars';
 
-@include iro.props-namespace('box') {
-    @include iro.props-store((
-        --colors: (
-            --border: fn.global-color(--border),
-        ),
-    ));
-
-    @include iro.bem-component(iro.props-namespace()) {
-        margin-block: 2em;
-        padding:      2em;
-        border:       1px solid fn.color(--border);
-    }
+@include iro.bem-component('box') {
+    padding:      2em;
+    margin-block: 2em;
+    border:       1px solid props.get(core.$theme, --border);
 }
diff --git a/src_demo/components/_content.scss b/src_demo/components/_content.scss
index 262b116..cd38954 100644
--- a/src_demo/components/_content.scss
+++ b/src_demo/components/_content.scss
@@ -1,8 +1,6 @@
 @use 'iro-sass/src/iro-sass' as iro;
 
-@include iro.props-namespace('content') {
-    @include iro.bem-component(iro.props-namespace()) {
-        grid-area: content;
-        overflow:  auto;
-    }
+@include iro.bem-component('content') {
+    grid-area: content;
+    overflow:  auto;
 }
diff --git a/src_demo/components/_sidebar.scss b/src_demo/components/_sidebar.scss
index b9f8730..4cce9b8 100644
--- a/src_demo/components/_sidebar.scss
+++ b/src_demo/components/_sidebar.scss
@@ -1,10 +1,7 @@
 @use 'iro-sass/src/iro-sass' as iro;
-@use '../../src/functions' as fn;
 
-@include iro.props-namespace('sidebar') {
-    @include iro.bem-component(iro.props-namespace()) {
-        grid-area:        sidebar;
-        min-inline-size:  15em;
-        min-block-size:   0;
-    }
+@include iro.bem-component('sidebar') {
+    grid-area:        sidebar;
+    min-inline-size:  15em;
+    min-block-size:   0;
 }
diff --git a/src_demo/components/_view.scss b/src_demo/components/_view.scss
index c0547d3..9516b12 100644
--- a/src_demo/components/_view.scss
+++ b/src_demo/components/_view.scss
@@ -1,12 +1,9 @@
 @use 'iro-sass/src/iro-sass' as iro;
-@use '../../src/functions' as fn;
 
-@include iro.props-namespace('view') {
-    @include iro.bem-component(iro.props-namespace()) {
-        display: none;
+@include iro.bem-component('view') {
+    display: none;
 
-        &:target {
-            display: block;
-        }
+    &:target {
+        display: block;
     }
 }
diff --git a/src_demo/index.scss b/src_demo/index.scss
index 93fa156..7fc1d99 100644
--- a/src_demo/index.scss
+++ b/src_demo/index.scss
@@ -8,6 +8,7 @@
 @include iro.s-headings--styles;
 @include iro.s-links--styles;
 @include iro.s-lists--styles;
+@include iro.s-tables--styles;
 
 @include iro.l-button-group--styles;
 @include iro.l-card-list--styles;
@@ -37,3 +38,16 @@
 @include iro.o-radio--styles;
 @include iro.o-side-nav--styles;
 @include iro.o-status-indicator--styles;
+@include iro.o-switch--styles;
+@include iro.o-table--styles;
+@include iro.o-text-field--styles;
+
+@include iro.utils--styles;
+
+@include iro.themes--styles;
+
+@import 'base';
+@import 'components/box';
+@import 'components/content';
+@import 'components/sidebar';
+@import 'components/view';