24 files changed, 284 insertions, 77 deletions

diff --git a/src/_config.defaults.scss b/src/_config.defaults.scss
index 3f02ecc..799ee47 100644
--- a/src/_config.defaults.scss
+++ b/src/_config.defaults.scss
@@ -126,7 +126,8 @@ $theme-light: (
         --bg-base: --base --200,
 
         --box: (
-            --border: --base --200,
+            --border:        --base --200,
+            --border-strong: --base --300,
         ),
     )),
 
@@ -183,13 +184,14 @@ $theme-dark: (
         --bg-base: --base --50,
         --bg-l1:   --base --75,
         --bg-l2:   --base --100,
-    )),
-
-    --constants: (
-        --shadow: rgba(#000, .1),
 
         --box: (
-            --border: rgba(#000, .1),
+            --border:        --base --100,
+            --border-strong: --base --100,
         ),
+    )),
+
+    --constants: (
+        --shadow: rgba(#000, .35),
     ),
 );
diff --git a/src/_core.vars.scss b/src/_core.vars.scss
index 7c546d7..19ebce2 100644
--- a/src/_core.vars.scss
+++ b/src/_core.vars.scss
@@ -95,9 +95,9 @@ $shadow--l1--blur: props.def(--shadow--l1--blur, 3px) !default;
 $shadow--l1--grow: props.def(--shadow--l1--grow, -1px) !default;
 
 $shadow--l2--x:    props.def(--shadow--l2--x, 0) !default;
-$shadow--l2--y:    props.def(--shadow--l2--y, 4px) !default;
-$shadow--l2--blur: props.def(--shadow--l2--blur, 8px) !default;
-$shadow--l2--grow: props.def(--shadow--l2--grow, -3px) !default;
+$shadow--l2--y:    props.def(--shadow--l2--y, 5px) !default;
+$shadow--l2--blur: props.def(--shadow--l2--blur, 12px) !default;
+$shadow--l2--grow: props.def(--shadow--l2--grow, -4px) !default;
 
 $rounding:     props.def(--rounding, 8px) !default;
 $rounding--sm: props.def(--rounding--sm, 4px) !default;
diff --git a/src/_utils.scss b/src/_utils.scss
index 445e5c6..1311d32 100644
--- a/src/_utils.scss
+++ b/src/_utils.scss
@@ -271,6 +271,10 @@ $-sizes: (
         border-radius: props.get(vars.$rounding);
     }
 
+    @include bem.utility('br-round-sm') {
+        border-radius: props.get(vars.$rounding--sm);
+    }
+
     @each $dir, $suffix in $-dirs {
         @include bem.utility('m#{$dir}-auto') {
             margin#{$suffix}: auto;
diff --git a/src/layouts/_card-list.scss b/src/layouts/_card-list.scss
index c8c3d18..cca6e72 100644
--- a/src/layouts/_card-list.scss
+++ b/src/layouts/_card-list.scss
@@ -6,7 +6,6 @@
 
 @forward 'card-list.vars';
 @use 'card-list.vars' as vars;
-@use '../objects/card.vars' as card;
 
 @mixin styles {
     @include materialize-at-root(meta.module-variables('vars'));
@@ -17,22 +16,33 @@
         gap:            props.get(vars.$row-gap);
 
         @include bem.modifier('merge') {
-            position:   relative;
-            gap:        0;
+            position:         relative;
+            gap:              calc(2 * props.get(vars.$merge-padding) + props.get(vars.$border-width));
+            padding:          props.get(vars.$merge-padding);
+            background-color: props.get(vars.$card-bg-color);
+            border:           props.get(vars.$border-width) solid props.get(vars.$border-color);
+            border-radius:    calc(props.get(vars.$rounding) + props.get(vars.$merge-padding));
 
             @include bem.elem('card') {
-                transition: none;
-
                 &:not(:last-child) {
-                    margin-bottom:           calc(-1 * props.get(card.$border-width));
+                    position:                relative;
                     border-end-start-radius: 0;
                     border-end-end-radius:   0;
+
+                    &::after {
+                        position:          absolute;
+                        inset-block-start: calc(100% + props.get(vars.$merge-padding) + props.get(vars.$border-width));
+                        inset-inline:      calc(-1 * props.get(vars.$merge-padding) - props.get(vars.$border-width));
+                        content:           '';
+                        display:           block;
+                        block-size:        props.get(vars.$border-width);
+                        background-color:  props.get(vars.$border-color);
+                    }
                 }
 
                 &:hover,
                 &:active,
                 &:focus-visible {
-                    z-index:    10;
                     transform:  none;
                 }
 
@@ -41,6 +51,27 @@
                     border-start-end-radius:   0;
                 }
             }
+
+            @include bem.modifier('borderless') {
+                border-color: props.get(vars.$card-bg-color);
+
+                @include bem.elem('card') {
+                    &:not(:last-child) {
+                        &::after {
+                            inset-inline: calc(-1 * props.get(vars.$merge-padding) - 2 * props.get(vars.$border-width));
+                        }
+                    }
+                }
+            }
+
+            @include bem.modifier('shadow') {
+                box-shadow:
+                    props.get(vars.$shadow-x)
+                    props.get(vars.$shadow-y)
+                    props.get(vars.$shadow-blur)
+                    props.get(vars.$shadow-grow)
+                    props.get(vars.$shadow-color);
+            }
         }
 
         @include bem.modifier('quiet') {
@@ -63,7 +94,7 @@
             gap:                   props.get(vars.$grid-sm--row-gap) props.get(vars.$grid-sm--col-gap);
 
             @include bem.modifier("grid-sm") {
-                @include iro.media--media("<=md") {
+                @include media.media("<=md") {
                     display: flex;
                     gap:     props.get(vars.$row-gap);
                 }
diff --git a/src/layouts/_card-list.vars.scss b/src/layouts/_card-list.vars.scss
index 1c49c0f..75e72cc 100644
--- a/src/layouts/_card-list.vars.scss
+++ b/src/layouts/_card-list.vars.scss
@@ -1,7 +1,12 @@
 @use 'iro-sass/src/props';
 @use '../core.vars' as core;
+@use '../objects/card' as card;
 
-$row-gap:        props.def(--l-card-list--row-gap, props.get(core.$size--100)) !default;
+$border-width:   props.def(--l-card-list--border-width, props.get(card.$border-width)) !default;
+$merge-padding:  props.def(--l-card-list--merge-padding, props.get(core.$border-width--thick)) !default;
+$rounding:       props.def(--l-card-list--rounding, props.get(card.$rounding)) !default;
+
+$row-gap:        props.def(--l-card-list--row-gap, props.get(core.$size--200)) !default;
 $quiet--row-gap: props.def(--l-card-list--quiet--row-gap, props.get(core.$size--800)) !default;
 
 $grid--row-gap:        props.def(--l-card-list--grid--row-gap, props.get(core.$size--400)) !default;
@@ -9,8 +14,8 @@ $grid--col-gap:        props.def(--l-card-list--grid--col-gap, props.get(core.$s
 $grid--col-width:      props.def(--l-card-list--grid--col-width, props.get(core.$size--3200)) !default;
 $grid--quiet--row-gap: props.def(--l-card-list--grid--quiet--row-gap, props.get(core.$size--800)) !default;
 
-$grid-sm--row-gap:        props.def(--l-card-list--grid-md--row-gap, props.get(core.$size--150)) !default;
-$grid-sm--col-gap:        props.def(--l-card-list--grid-md--col-gap, props.get(core.$size--150)) !default;
+$grid-sm--row-gap:        props.def(--l-card-list--grid-md--row-gap, props.get(core.$size--200)) !default;
+$grid-sm--col-gap:        props.def(--l-card-list--grid-md--col-gap, props.get(core.$size--200)) !default;
 $grid-sm--col-width:      props.def(--l-card-list--grid-md--col-width, props.get(core.$size--4600)) !default;
 $grid-sm--quiet--row-gap: props.def(--l-card-list--grid-sm--quiet--row-gap, props.get(core.$size--800)) !default;
 
@@ -24,4 +29,13 @@ $masonry-h--col-gap:        props.def(--l-card-list--masonry-h--col-gap, props.g
 $masonry-h--row-height:     props.def(--l-card-list--masonry-h--row-height, props.get(core.$size--3200)) !default;
 $masonry-h--quiet--row-gap: props.def(--l-card-list--masonry-h--quiet--row-gap, props.get(core.$size--800)) !default;
 
-$border-color: props.def(--l-card-list--border-color, props.get(core.$theme, --border), 'color') !default;
+$shadow-x:    props.def(--l-card-list--shadow-x, props.get(card.$shadow-x)) !default;
+$shadow-y:    props.def(--l-card-list--shadow-y, props.get(card.$shadow-y)) !default;
+$shadow-blur: props.def(--l-card-list--shadow-blur, props.get(card.$shadow-blur)) !default;
+$shadow-grow: props.def(--l-card-list--shadow-grow, props.get(card.$shadow-grow)) !default;
+
+$card-bg-color:      props.def(--l-card-list--bg-color, props.get(card.$bg-color), 'color') !default;
+$border-color:       props.def(--l-card-list--border-color, props.get(card.$border-color), 'color') !default;
+$shadow-color:       props.def(--l-card-list--shadow-color, props.get(card.$shadow-color), 'color') !default;
+
+$border-color-dark:  props.def(--l-card-list--border-color, props.get(core.$theme, --bg-l1), 'dark') !default;
diff --git a/src/objects/_action-button.scss b/src/objects/_action-button.scss
index f4a9a46..c997679 100644
--- a/src/objects/_action-button.scss
+++ b/src/objects/_action-button.scss
@@ -53,30 +53,30 @@
     }
 
     @include bem.modifier('static') {
-        color:            props.get($theme, list.join($key, --quiet --hover --label-color)...);
-        background-color: props.get($theme, list.join($key, --quiet --hover --bg-color)...);
-        border-color:     transparent;
+        color:            props.get($theme, list.join($key, --static --label-color)...);
+        background-color: props.get($theme, list.join($key, --static --bg-color)...);
+        border-color:     props.get($theme, list.join($key, --static --border-color)...);
         box-shadow:       none;
 
         &:link,
         &:visited,
         &:enabled {
-            color:            props.get($theme, list.join($key, --quiet --hover --label-color)...);
-            background-color: props.get($theme, list.join($key, --quiet --hover --bg-color)...);
-            border-color:     transparent;
+            color:            props.get($theme, list.join($key, --static --label-color)...);
+            background-color: props.get($theme, list.join($key, --static --bg-color)...);
+            border-color:     props.get($theme, list.join($key, --static --border-color)...);
             box-shadow:       none;
 
             &:hover,
             &:focus-visible {
-                color:            props.get($theme, list.join($key, --quiet --active --label-color)...);
-                background-color: props.get($theme, list.join($key, --quiet --active --bg-color)...);
-                border-color:     transparent;
+                color:            props.get($theme, list.join($key, --static --hover --label-color)...);
+                background-color: props.get($theme, list.join($key, --static --hover --bg-color)...);
+                border-color:     props.get($theme, list.join($key, --static --hover --border-color)...);
             }
 
             &:active {
-                color:            props.get($theme, list.join($key, --quiet --active --label-color)...);
-                background-color: props.get($theme, list.join($key, --quiet --active --bg-color)...);
-                border-color:     transparent;
+                color:            props.get($theme, list.join($key, --static --active --label-color)...);
+                background-color: props.get($theme, list.join($key, --static --active --bg-color)...);
+                border-color:     props.get($theme, list.join($key, --static --active --border-color)...);
             }
         }
     }
diff --git a/src/objects/_action-button.vars.scss b/src/objects/_action-button.vars.scss
index 84bb415..6693b61 100644
--- a/src/objects/_action-button.vars.scss
+++ b/src/objects/_action-button.vars.scss
@@ -52,7 +52,7 @@ $default-theme-override: () !default;
 $default-theme: map.deep-merge((
     --bg-color:             props.get(core.$theme, --bg-l2),
     --label-color:          props.get(core.$theme, --text),
-    --border-color:         props.get(core.$theme, --border-mute) props.get(core.$theme, --border-mute) props.get(core.$theme, --border),
+    --border-color:         props.get(core.$theme, --box, --border) props.get(core.$theme, --box, --border) props.get(core.$theme, --box, --border-strong),
     --shadow-color:         props.get(core.$theme, --shadow),
 
     --hover: (
@@ -102,6 +102,24 @@ $default-theme: map.deep-merge((
         ),
     ),
 
+    --static: (
+        --bg-color:     props.get(core.$theme, --border-mute),
+        --label-color:  props.get(core.$theme, --heading),
+        --border-color: props.get(core.$theme, --border-mute),
+
+        --hover: (
+            --bg-color:     props.get(core.$theme, --border),
+            --label-color:  props.get(core.$theme, --heading),
+            --border-color: props.get(core.$theme, --border),
+        ),
+
+        --active: (
+            --bg-color:     props.get(core.$theme, --border-strong),
+            --label-color:  props.get(core.$theme, --heading),
+            --border-color: props.get(core.$theme, --border-strong),
+        ),
+    ),
+
     --quiet: (
         --label-color:  props.get(core.$theme, --text),
 
@@ -200,6 +218,24 @@ $default-theme-dark: props.def(--o-action-button, $default-theme-dark, 'dark');
                 ),
             ),
 
+            --static: (
+                --bg-color:     props.get(core.$transparent-colors, $theme, --200),
+                --label-color:  props.get(core.$transparent-colors, $theme, --900),
+                --border-color: transparent,
+        
+                --hover: (
+                    --bg-color:     props.get(core.$transparent-colors, $theme, --300),
+                    --label-color:  props.get(core.$transparent-colors, $theme, --900),
+                    --border-color: transparent,
+                ),
+        
+                --active: (
+                    --bg-color:     props.get(core.$transparent-colors, $theme, --400),
+                    --label-color:  props.get(core.$transparent-colors, $theme, --900),
+                    --border-color: transparent,
+                ),
+            ),
+
             --quiet: (
                 --label-color:  props.get(core.$transparent-colors, $theme, --900),
         
@@ -283,6 +319,24 @@ $themes-config: (
                 ),
             ),
 
+            --static: (
+                --bg-color:     props.get(core.$theme, $key, --100),
+                --label-color:  props.get(core.$theme, $key, --1100),
+                --border-color: props.get(core.$theme, $key, --300),
+        
+                --hover: (
+                    --bg-color:     props.get(core.$theme, $key, --200),
+                    --label-color:  props.get(core.$theme, $key, --1200),
+                    --border-color: props.get(core.$theme, $key, --400),
+                ),
+        
+                --active: (
+                    --bg-color:     props.get(core.$theme, $key, --300),
+                    --label-color:  props.get(core.$theme, $key, --1300),
+                    --border-color: props.get(core.$theme, $key, --500),
+                ),
+            ),
+
             --quiet: (
                 --label-color:  props.get(core.$theme, $key, --1100),
         
diff --git a/src/objects/_card.scss b/src/objects/_card.scss
index 6b80e2f..e80df2c 100644
--- a/src/objects/_card.scss
+++ b/src/objects/_card.scss
@@ -14,12 +14,11 @@
         position:         relative;
         display:          flex;
         flex-direction:   column;
-        background-clip:  content-box;
         background-color: props.get(vars.$bg-color);
         border:           props.get(vars.$border-width) solid transparent;
         border-color:     props.get(vars.$border-color);
         border-radius:    props.get(vars.$rounding);
-        transition:       transform .2s, background-color .2s, border-color .2s;
+        transition:       transform .2s, background-color .2s, border-color .2s, box-shadow .2s;
 
         @include bem.multi('&:link, &:visited, &:enabled', 'modifier' 'interactive') {
             &:hover,
@@ -28,6 +27,7 @@
                 transform:        translateY(props.get(vars.$hover--offset-b));
                 background-color: props.get(vars.$hover--bg-color);
                 border-color:     props.get(vars.$hover--border-color);
+                box-shadow:       none;
             }
 
             &:focus-visible {
@@ -42,19 +42,44 @@
             }
         }
 
+        @include bem.modifier('borderless') {
+            border-color: props.get(vars.$bg-color);
+        }
+
+        @include bem.modifier('shadow') {
+            box-shadow:
+                props.get(vars.$shadow-x)
+                props.get(vars.$shadow-y)
+                props.get(vars.$shadow-blur)
+                props.get(vars.$shadow-grow)
+                props.get(vars.$shadow-color);
+
+            @include bem.modifier('quiet') {
+                @include bem.elem('image') {
+                    box-shadow:
+                        props.get(vars.$shadow-x)
+                        props.get(vars.$shadow-y)
+                        props.get(vars.$shadow-blur)
+                        props.get(vars.$shadow-grow)
+                        props.get(vars.$shadow-color);
+                }
+            }
+        }
+
         @include bem.elem('avatar') {
             margin-block-start:  props.get(vars.$pad-b);
             margin-inline-start: props.get(vars.$pad-i);
         }
 
         @include bem.elem('image') {
-            position:    relative;
-            display:     block;
-            flex:        0 0 auto;
-            inline-size: 100%;
-            overflow:    hidden;
-            object-fit:  cover;
-            transition:  background-color .2s, transform .2s, opacity .2s;
+            position:      relative;
+            display:       block;
+            flex:          0 0 auto;
+            inline-size:   calc(100% + 2 * props.get(vars.$border-width));
+            margin:        calc(-1 * props.get(vars.$border-width));
+            overflow:      hidden;
+            object-fit:    cover;
+            transition:    background-color .2s, transform .2s, opacity .2s;
 
             &:first-child {
                 border-start-start-radius: calc(props.get(vars.$rounding) - props.get(vars.$border-width));
@@ -179,8 +204,6 @@
 
         @include bem.modifier('thumbnail') {
             @include bem.elem('image') {
-                inline-size:   calc(100% + 2 * props.get(vars.$border-width));
-                margin:        calc(-1 * props.get(vars.$border-width));
                 border-radius: props.get(vars.$rounding);
             }
 
diff --git a/src/objects/_card.vars.scss b/src/objects/_card.vars.scss
index c5bbc0d..ebfba10 100644
--- a/src/objects/_card.vars.scss
+++ b/src/objects/_card.vars.scss
@@ -14,10 +14,16 @@ $image-overlay--pad-b: props.def(--o-card--image-overlay--pad-b, props.get($pad-
 
 $hover--offset-b: props.def(--o-card--hover--offset-b, calc(-1 * props.get(core.$size--65))) !default;
 
+$shadow-x:    props.def(--o-card--shadow-x, props.get(core.$shadow--l1--x)) !default;
+$shadow-y:    props.def(--o-card--shadow-y, props.get(core.$shadow--l1--y)) !default;
+$shadow-blur: props.def(--o-card--shadow-blur, props.get(core.$shadow--l1--blur)) !default;
+$shadow-grow: props.def(--o-card--shadow-grow, props.get(core.$shadow--l1--grow)) !default;
+
 $key-focus--border-width:  props.def(--o-card--key-focus--border-width, props.get(core.$key-focus--border-width)) !default;
 $key-focus--border-offset: props.def(--o-card--key-focus--border-offset, props.get(core.$key-focus--border-offset)) !default;
 $key-focus--outline-width: props.def(--o-card--key-focus--outline-width, props.get(core.$key-focus--outline-width)) !default;
 
+$shadow-color:  props.def(--o-card--shadow-color, props.get(core.$theme, --shadow), 'color') !default;
 $bg-color:      props.def(--o-card--bg-color, props.get(core.$theme, --bg-l2), 'color') !default;
 $border-color:  props.def(--o-card--border-color, props.get(core.$theme, --box, --border), 'color') !default;
 $divider-color: props.def(--o-card--divider-color, props.get(core.$theme, --border-mute), 'color') !default;
diff --git a/src/objects/_checkbox.vars.scss b/src/objects/_checkbox.vars.scss
index aee26e6..25a0d3d 100644
--- a/src/objects/_checkbox.vars.scss
+++ b/src/objects/_checkbox.vars.scss
@@ -7,7 +7,7 @@ $label-gap:       props.def(--o-checkbox--label-gap, props.get(core.$size--125))
 $border-width:    props.def(--o-checkbox--border-width, props.get(core.$border-width--medium)) !default;
 $pad-i:           props.def(--o-checkbox--pad-i, props.get(core.$size--65)) !default;
 $pad-b:           props.def(--o-checkbox--pad-b, props.get(core.$size--65)) !default;
-$rounding:        props.def(--o-checkbox--rounding, props.get(core.$rounding)) !default;
+$rounding:        props.def(--o-checkbox--rounding, props.get(core.$rounding--sm)) !default;
 $spacing-sibling: props.def(--o-checkbox--spacing-sibling, props.get(core.$size--300)) !default;
 
 $key-focus--border-width:  props.def(--o-checkbox--key-focus--border-width, props.get(core.$key-focus--border-width)) !default;
diff --git a/src/objects/_divider.scss b/src/objects/_divider.scss
index 4ed8092..9b58e77 100644
--- a/src/objects/_divider.scss
+++ b/src/objects/_divider.scss
@@ -91,6 +91,26 @@
             }
         }
 
+        @include bem.modifier('quiet') {
+            font-size:   props.get(vars.$quiet--label-font-size);
+            font-weight: 500;
+            color:       props.get(vars.$quiet--label-color);
+
+            &::before,
+            &::after {
+                block-size:       props.get(vars.$quiet--border-width);
+                background-color: props.get(vars.$quiet--bg-color);
+            }
+
+            @include bem.modifier('vertical') {
+                background-color: props.get(vars.$vertical--quiet--bg-color);
+            }
+
+            @include bem.modifier('dot') {
+                background-color: props.get(vars.$dot--quiet--bg-color);
+            }
+        }
+
         @include bem.modifier('faint') {
             font-size:   props.get(vars.$faint--label-font-size);
             font-weight: 500;
@@ -103,11 +123,11 @@
             }
 
             @include bem.modifier('vertical') {
-                background-color: props.get(vars.$vertical--faint--bg-color);
+                background-color: props.get(vars.$vertical--quiet--bg-color);
             }
 
             @include bem.modifier('dot') {
-                background-color: props.get(vars.$dot--faint--bg-color);
+                background-color: props.get(vars.$dot--quiet--bg-color);
             }
         }
 
@@ -157,6 +177,17 @@
                     }
                 }
     
+                @include bem.modifier('quiet') {
+                    &::before,
+                    &::after {
+                        background-color: props.get(vars.$static-themes, $theme, --quiet, --bg);
+                    }
+    
+                    @include bem.elem('label') {
+                        color: props.get(vars.$static-themes, $theme, --quiet, --label);
+                    }
+                }
+    
                 @include bem.modifier('faint') {
                     &::before,
                     &::after {
diff --git a/src/objects/_divider.vars.scss b/src/objects/_divider.vars.scss
index 5cd68c1..5a5639b 100644
--- a/src/objects/_divider.vars.scss
+++ b/src/objects/_divider.vars.scss
@@ -13,6 +13,9 @@ $strong--label-font-size: props.def(--o-divider--strong--label-font-size, props.
 $medium--border-width:    props.def(--o-divider--medium--border-width, props.get(core.$border-width--medium)) !default;
 $medium--label-font-size: props.def(--o-divider--medium--label-font-size, props.get(core.$font-size--75)) !default;
 
+$quiet--border-width:    props.def(--o-divider--quiet--border-width, props.get(core.$border-width--thin)) !default;
+$quiet--label-font-size: props.def(--o-divider--quiet--label-font-size, props.get(core.$font-size--50)) !default;
+
 $faint--border-width:    props.def(--o-divider--faint--border-width, props.get(core.$border-width--thin)) !default;
 $faint--label-font-size: props.def(--o-divider--faint--label-font-size, props.get(core.$font-size--50)) !default;
 
@@ -22,12 +25,15 @@ $strong--label-color: props.def(--o-divider--strong--label-color, props.get(core
 $medium--bg-color:    props.def(--o-divider--medium--bg-color, props.get(core.$theme, --border), 'color') !default;
 $medium--label-color: props.def(--o-divider--medium--label-color, props.get(core.$theme, --text-mute), 'color') !default;
 
-$faint--bg-color:    props.def(--o-divider--faint--bg-color, props.get(core.$theme, --border), 'color') !default;
-$faint--label-color: props.def(--o-divider--faint--label-color, props.get(core.$theme, --text-mute-more), 'color') !default;
+$quiet--bg-color:    props.def(--o-divider--quiet--bg-color, props.get(core.$theme, --border), 'color') !default;
+$quiet--label-color: props.def(--o-divider--quiet--label-color, props.get(core.$theme, --text-mute-more), 'color') !default;
+
+$faint--bg-color:    props.def(--o-divider--faint--bg-color, props.get(core.$theme, --border-mute), 'color') !default;
+$faint--label-color: props.def(--o-divider--faint--label-color, props.get(core.$theme, --text-disabled), 'color') !default;
 
-$vertical--faint--bg-color:    props.def(--o-divider--vertical--faint--bg-color, props.get(core.$theme, --border-mute), 'color') !default;
+$vertical--quiet--bg-color:    props.def(--o-divider--vertical--quiet--bg-color, props.get(core.$theme, --border-mute), 'color') !default;
 
-$dot--faint--bg-color:    props.def(--o-divider--dot--faint--bg-color, props.get(core.$theme, --border-mute), 'color') !default;
+$dot--quiet--bg-color:    props.def(--o-divider--dot--quiet--bg-color, props.get(core.$theme, --border-mute), 'color') !default;
 
 $static-themes: props.def(--o-divider, (), 'color');
 
@@ -44,10 +50,14 @@ $static-themes: props.def(--o-divider, (), 'color');
                 --bg:    props.get(core.$transparent-colors, $theme, --300),
                 --label: props.get(core.$transparent-colors, $theme, --500),
             ),
-            --faint: (
+            --quiet: (
                 --bg:    props.get(core.$transparent-colors, $theme, --300),
                 --label: props.get(core.$transparent-colors, $theme, --500),
             ),
+            --faint: (
+                --bg:    props.get(core.$transparent-colors, $theme, --200),
+                --label: props.get(core.$transparent-colors, $theme, --400),
+            ),
         )
     ));
 }
diff --git a/src/objects/_emoji.vars.scss b/src/objects/_emoji.vars.scss
index fbfb935..073f88b 100644
--- a/src/objects/_emoji.vars.scss
+++ b/src/objects/_emoji.vars.scss
@@ -4,7 +4,7 @@
 
 $size:     props.def(--o-emoji--size, calc(1 / 14 * 18em)) !default;
 $pad:      props.def(--o-emoji--pad, .3em) !default;
-$rounding: props.def(--o-emoji--rounding, props.get(core.$rounding)) !default;
+$rounding: props.def(--o-emoji--rounding, props.get(core.$rounding--sm)) !default;
 $zoom:     props.def(--o-emoji--zoom, 3) !default;
 $valign:   props.def(--o-emoji--valign, -.25em) !default;
 
diff --git a/src/objects/_popover.vars.scss b/src/objects/_popover.vars.scss
index 451cc18..e560d1b 100644
--- a/src/objects/_popover.vars.scss
+++ b/src/objects/_popover.vars.scss
@@ -14,9 +14,6 @@ $shadow-y:    props.def(--o-popover--shadow-y, props.get(core.$shadow--l2--y)) !
 $shadow-blur: props.def(--o-popover--shadow-blur, props.get(core.$shadow--l2--blur)) !default;
 $shadow-grow: props.def(--o-popover--shadow-grow, props.get(core.$shadow--l2--grow)) !default;
 
-$bg-color:     props.def(--o-popover--bg-color, props.get(core.$theme, --bg-l2), 'color') !default;
-$border-color: props.def(--o-popover--border-color, props.get(core.$theme, --border-mute) props.get(core.$theme, --border-mute) props.get(core.$theme, --border), 'color') !default;
-
-$shadow-color:  props.def(--o-popover--shadow-color, props.get(core.$transparent-colors, --black, --200), 'color') !default;
-
-$border-color-dark:  props.def(--o-popover--border-color, props.get(core.$theme, --border-mute), 'dark') !default;
+$bg-color:      props.def(--o-popover--bg-color, props.get(core.$theme, --bg-l2), 'color') !default;
+$border-color:  props.def(--o-popover--border-color, props.get(core.$theme, --box, --border) props.get(core.$theme, --box, --border) props.get(core.$theme, --box, --border-strong), 'color') !default;
+$shadow-color:  props.def(--o-popover--shadow-color, props.get(core.$theme, --shadow), 'color') !default;
diff --git a/src/objects/_radio.vars.scss b/src/objects/_radio.vars.scss
index 51ea581..b18ae2b 100644
--- a/src/objects/_radio.vars.scss
+++ b/src/objects/_radio.vars.scss
@@ -7,7 +7,7 @@ $label-gap:        props.def(--o-radio--label-gap, props.get(core.$size--125)) !
 $border-width:     props.def(--o-radio--border-width, props.get(core.$border-width--medium)) !default;
 $pad-i:            props.def(--o-radio--pad-i, props.get(core.$size--65)) !default;
 $pad-b:            props.def(--o-radio--pad-b, props.get(core.$size--65)) !default;
-$rounding:         props.def(--o-radio--rounding, props.get(core.$rounding)) !default;
+$rounding:         props.def(--o-radio--rounding, props.get(core.$rounding--sm)) !default;
 $spacing-sibling:  props.def(--o-radio--spacing-sibling, props.get(core.$size--300)) !default;
 
 $key-focus--border-width:  props.def(--o-radio--key-focus--border-width, props.get(core.$key-focus--border-width)) !default;
diff --git a/src/objects/_side-nav.vars.scss b/src/objects/_side-nav.vars.scss
index 122dba6..711b2a7 100644
--- a/src/objects/_side-nav.vars.scss
+++ b/src/objects/_side-nav.vars.scss
@@ -8,7 +8,7 @@ $separator:         props.def(--o-side-nav--separator, props.get(core.$size--200
 
 $item--pad-i:         props.def(--o-side-nav--item--pad-i, props.get(core.$size--150)) !default;
 $item--pad-b:         props.def(--o-side-nav--item--pad-b, props.get(core.$size--100)) !default;
-$item--rounding:      props.def(--o-side-nav--item--rounding, props.get(core.$rounding)) !default;
+$item--rounding:      props.def(--o-side-nav--item--rounding, props.get(core.$rounding--sm)) !default;
 
 $item--key-focus--border-width:  props.def(--o-side-nav--item--key-focus--border-width, props.get(core.$key-focus--border-width)) !default;
 $item--key-focus--border-offset: props.def(--o-side-nav--item--key-focus--border-offset, props.get(core.$key-focus--border-offset)) !default;
diff --git a/src/objects/_switch.vars.scss b/src/objects/_switch.vars.scss
index 85596af..10489a5 100644
--- a/src/objects/_switch.vars.scss
+++ b/src/objects/_switch.vars.scss
@@ -8,7 +8,7 @@ $label-gap:       props.def(--o-switch--label-gap, props.get(core.$size--125)) !
 $border-width:    props.def(--o-switch--border-width, props.get(core.$border-width--medium)) !default;
 $pad-i:           props.def(--o-switch--pad-i, props.get(core.$size--65)) !default;
 $pad-b:           props.def(--o-switch--pad-b, props.get(core.$size--65)) !default;
-$rounding:        props.def(--o-switch--rounding, props.get(core.$rounding)) !default;
+$rounding:        props.def(--o-switch--rounding, props.get(core.$rounding--sm)) !default;
 $spacing-sibling: props.def(--o-switch--spacing-sibling, props.get(core.$size--300)) !default;
 
 $key-focus--border-width:  props.def(--o-switch--key-focus--border-width, props.get(core.$key-focus--border-width)) !default;
diff --git a/src/objects/_tabbar.vars.scss b/src/objects/_tabbar.vars.scss
index f4486d6..4095629 100644
--- a/src/objects/_tabbar.vars.scss
+++ b/src/objects/_tabbar.vars.scss
@@ -4,7 +4,7 @@
 @use '../core.vars' as core;
 
 $block-size: props.def(--o-tabbar--block-size, props.get(core.$size--700)) !default;
-$rounding:   props.def(--o-tabbar--rounding, props.get(core.$rounding)) !default;
+$rounding:   props.def(--o-tabbar--rounding, props.get(core.$rounding--sm)) !default;
 $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;
 
diff --git a/src/objects/_table.vars.scss b/src/objects/_table.vars.scss
index d1d53d7..b8d8093 100644
--- a/src/objects/_table.vars.scss
+++ b/src/objects/_table.vars.scss
@@ -4,7 +4,7 @@
 
 $pad-i:        props.def(--o-table--pad-i, props.get(core.$size--175)) !default;
 $pad-b:        props.def(--o-table--pad-b, props.get(core.$size--125)) !default;
-$rounding:     props.def(--o-table--rounding, props.get(core.$rounding)) !default;
+$rounding:     props.def(--o-table--rounding, props.get(core.$rounding--sm)) !default;
 $border-width: props.def(--o-table--border-width, props.get(core.$border-width--thin)) !default;
 
 $heading--font-family:    props.def(--o-table--heading--font-family, props.get(core.$font--standard--family)) !default;
diff --git a/src/objects/_thumbnail.vars.scss b/src/objects/_thumbnail.vars.scss
index ba8cebe..60bf2e9 100644
--- a/src/objects/_thumbnail.vars.scss
+++ b/src/objects/_thumbnail.vars.scss
@@ -4,7 +4,7 @@
 @use '../core.vars' as core;
 
 $size:         props.def(--o-thumbnail--size, props.get(core.$size--700)) !default;
-$rounding:     props.def(--o-thumbnail--rounding, props.get(core.$rounding)) !default;
+$rounding:     props.def(--o-thumbnail--rounding, props.get(core.$rounding--sm)) !default;
 $spacing:      props.def(--o-thumbnail--spacing, props.get(core.$size--100)) !default;
 $border-width: props.def(--o-thumbnail--border-width, props.get(core.$border-width--thin)) !default;
 
diff --git a/src/scopes/_code.vars.scss b/src/scopes/_code.vars.scss
index 8a040c2..08472f2 100644
--- a/src/scopes/_code.vars.scss
+++ b/src/scopes/_code.vars.scss
@@ -4,12 +4,12 @@
 
 $inline--pad-i:    props.def(--s-code--inline--pad-i, props.get(core.$size--50)) !default;
 $inline--pad-b:    props.def(--s-code--inline--pad-b, props.get(core.$size--10)) !default;
-$inline--rounding: props.def(--s-code--inline--rounding, props.get(core.$rounding)) !default;
+$inline--rounding: props.def(--s-code--inline--rounding, props.get(core.$rounding--sm)) !default;
 
 $block--pad-i:     props.def(--s-code--block--pad-i, props.get(core.$size--150)) !default;
 $block--pad-b:     props.def(--s-code--block--pad-b, props.get(core.$size--85)) !default;
 $block--margin-bs: props.def(--s-code--block--margin-bs, props.get(implicit.$paragraph--margin-bs)) !default;
-$block--rounding:  props.def(--s-code--block--rounding, props.get(core.$rounding)) !default;
+$block--rounding:  props.def(--s-code--block--rounding, props.get(core.$rounding--sm)) !default;
 
 $inline--fg: props.def(--s-code--inline--fg, props.get(core.$theme, --heading), 'color') !default;
 $inline--bg: props.def(--s-code--inline--bg, props.get(core.$theme, --base, --200), 'color') !default;
diff --git a/tpl/objects/card.pug b/tpl/objects/card.pug
index 1db2fe5..feb1441 100644
--- a/tpl/objects/card.pug
+++ b/tpl/objects/card.pug
@@ -1,9 +1,11 @@
 mixin card
     -
         let classes = {
-            'o-card':            true,
-            'o-card--quiet':     !!attributes.quiet,
-            'o-card--thumbnail': !!attributes.thumbnail,
+            'o-card':             true,
+            'o-card--borderless': !!attributes.borderless,
+            'o-card--shadow':     !!attributes.shadow,
+            'o-card--quiet':      !!attributes.quiet,
+            'o-card--thumbnail':  !!attributes.thumbnail,
         }
 
         if (attributes.class) {
diff --git a/tpl/views/card.pug b/tpl/views/card.pug
index 5e48dde..9a35b37 100644
--- a/tpl/views/card.pug
+++ b/tpl/views/card.pug
@@ -5,11 +5,15 @@ mixin view-card
                 +card-body
                     strong= 'Lorem ipsum dolor'
                     = 'sit amet'
-            +card(href='#' class='l-card-list__card')
+            +card(href='#' class='l-card-list__card' shadow=true)
                 +card-body
                     strong= 'Lorem ipsum dolor'
                     = 'sit amet'
-            +card(href='#' class='l-card-list__card')
+            +card(href='#' class='l-card-list__card' borderless=true)
+                +card-body
+                    strong= 'Lorem ipsum dolor'
+                    = 'sit amet'
+            +card(href='#' class='l-card-list__card' shadow=true borderless=true)
                 +card-body
                     strong= 'Lorem ipsum dolor'
                     = 'sit amet'
@@ -17,15 +21,31 @@ mixin view-card
         +divider('faint')(class='u-mb-700')
 
         .l-card-list.l-card-list--merge
-            +card(href='#' class='l-card-list__card')
+            +card(href='#' class='l-card-list__card' borderless=true)
                 +card-body
                     strong= 'Lorem ipsum dolor'
                     = 'sit amet'
-            +card(href='#' class='l-card-list__card')
+            +card(href='#' class='l-card-list__card' borderless=true)
                 +card-body
                     strong= 'Lorem ipsum dolor'
                     = 'sit amet'
-            +card(href='#' class='l-card-list__card')
+            +card(href='#' class='l-card-list__card' borderless=true)
+                +card-body
+                    strong= 'Lorem ipsum dolor'
+                    = 'sit amet'
+
+        +divider('faint')(class='u-mb-700')
+
+        .l-card-list.l-card-list--merge.l-card-list--borderless.l-card-list--shadow
+            +card(href='#' class='l-card-list__card' borderless=true)
+                +card-body
+                    strong= 'Lorem ipsum dolor'
+                    = 'sit amet'
+            +card(href='#' class='l-card-list__card' borderless=true)
+                +card-body
+                    strong= 'Lorem ipsum dolor'
+                    = 'sit amet'
+            +card(href='#' class='l-card-list__card' borderless=true)
                 +card-body
                     strong= 'Lorem ipsum dolor'
                     = 'sit amet'
@@ -86,7 +106,7 @@ mixin view-card
 
                 let classes = {
                     'l-card-list': true,
-                    'l-card-list--aspect-5/4': layout === 'grid',
+                    'l-card-list--aspect-5/4': ['grid', 'grid-sm'].includes(layout),
                     'l-card-list--quiet': quiet,
                 }
                 classes[`l-card-list--${layout}`] = true;
diff --git a/tpl/views/divider.pug b/tpl/views/divider.pug
index ea08984..5429ab5 100644
--- a/tpl/views/divider.pug
+++ b/tpl/views/divider.pug
@@ -12,34 +12,45 @@ mixin view-divider
 
         .c-box
             +div-heading('xs')= 'Heading'
+            +divider('quiet')
+            p= loremIpsum
+
+        .c-box
+            +div-heading('xs')= 'Heading'
             +divider('faint')
             p= loremIpsum
 
         .c-box
             +divider('strong')= 'Strong'
             +divider('medium')= 'Medium'
+            +divider('quiet')= 'Quiet'
             +divider('faint')= 'Faint'
             +divider('strong')
             +divider('medium')
+            +divider('quiet')
             +divider('faint')
 
         .c-box
             .l-media(style="height: 1em")
                 +divider('strong')(vertical=true class="l-media__block")
                 +divider('medium')(vertical=true class="l-media__block")
+                +divider('quiet')(vertical=true class="l-media__block")
                 +divider('faint')(vertical=true class="l-media__block")
             .l-media(style="height: 1em")
                 +divider('strong')(dot=true class="l-media__block")
                 +divider('medium')(dot=true class="l-media__block")
+                +divider('quiet')(dot=true class="l-media__block")
                 +divider('faint')(dot=true class="l-media__block")
 
         each theme in ['accent', 'negative']
             .c-box
                 +divider('strong')(color=theme)= 'Strong'
                 +divider('medium')(color=theme)= 'Medium'
+                +divider('quiet')(color=theme)= 'Quiet'
                 +divider('faint')(color=theme)= 'Faint'
                 +divider('strong')(color=theme)
                 +divider('medium')(color=theme)
+                +divider('quiet')(color=theme)
                 +divider('faint')(color=theme)
 
         each theme in ['static-black', 'static-white']
@@ -49,7 +60,9 @@ mixin view-divider
             .c-box(style=`background-color: var(--colors--blue-static--${bg});`)
                 +divider('strong')(color=theme)= 'Strong'
                 +divider('medium')(color=theme)= 'Medium'
+                +divider('quiet')(color=theme)= 'Quiet'
                 +divider('faint')(color=theme)= 'Faint'
                 +divider('strong')(color=theme)
                 +divider('medium')(color=theme)
+                +divider('quiet')(color=theme)
                 +divider('faint')(color=theme)