4 files changed, 34 insertions, 18 deletions

diff --git a/src/scopes/_body.scss b/src/scopes/_body.scss
index 6742a2a..65c6d2f 100644
--- a/src/scopes/_body.scss
+++ b/src/scopes/_body.scss
@@ -12,33 +12,47 @@
     @include bem.scope('body') {
         font-size: props.get(vars.$font-size);
 
-        p {
+        strong {
+            color: props.get(vars.$strong--text-color);
+        }
+
+        p,
+        ul,
+        ol {
+            max-inline-size: props.get(vars.$paragraph--max-inline-size);
             margin-block-start: props.get(vars.$paragraph--margin-bs);
         }
 
+        ul,
+        ol {
+            box-sizing: border-box;
+        }
+
         img {
-            display:         block;
-            inline-size:     auto;
-            max-inline-size: 100%;
-            block-size:      auto;
-            max-block-size:  props.get(vars.$img--max-block-size);
-            margin-block:    props.get(vars.$block--margin-b);
+            display:            block;
+            inline-size:        auto;
+            max-inline-size:    100%;
+            block-size:         auto;
+            max-block-size:     props.get(vars.$img--max-block-size);
+            margin-block-start: props.get(vars.$paragraph--margin-bs);
         }
 
         figure {
-            margin-block: props.get(vars.$block--margin-b);
+            margin-block-start: props.get(vars.$paragraph--margin-bs);
 
             img {
                 margin-block: 0;
             }
         }
 
-        ul,
-        ol,
+        hr {
+            margin-block: calc(2 * props.get(vars.$paragraph--margin-bs));
+        }
+
         table,
         pre,
         blockquote {
-            margin-block: props.get(vars.$block--margin-b);
+            margin-block-start: props.get(vars.$paragraph--margin-bs);
         }
     } 
 }
diff --git a/src/scopes/_body.vars.scss b/src/scopes/_body.vars.scss
index 98f23bd..6c38c3f 100644
--- a/src/scopes/_body.vars.scss
+++ b/src/scopes/_body.vars.scss
@@ -1,9 +1,11 @@
 @use 'iro-sass/src/props';
 @use '../core.vars' as core;
 
-$font-size: props.def(--s-body--font-size, props.get(core.$font-size--150)) !default;
+@use '../layouts/container.vars' as container;
 
-$paragraph--margin-bs: props.def(--s-body--paragraph--margin-bs, props.get(core.$size--300)) !default;
-$block--margin-b:      props.def(--s-body--block--margin-b, calc(2 * props.get($paragraph--margin-bs))) !default;
+$font-size:                  props.def(--s-body--font-size, props.get(core.$font-size--150)) !default;
+$paragraph--margin-bs:       props.def(--s-body--paragraph--margin-bs, props.get(core.$size--300)) !default;
+$paragraph--max-inline-size: props.def(--s-body--paragraph--max-inline-size, props.get(container.$fixed)) !default;
+$img--max-block-size:        props.def(--s-body--img--max-block-size, calc(100vh - props.get(core.$size--2400))) !default;
 
-$img--max-block-size: props.def(--s-body--img--max-block-size, calc(100vh - props.get(core.$size--2400))) !default;
+$strong--text-color: props.def(--s-body--strong--text-color, props.get(core.$theme, --heading), 'color') !default;
diff --git a/src/scopes/_code.vars.scss b/src/scopes/_code.vars.scss
index e06971b..8a040c2 100644
--- a/src/scopes/_code.vars.scss
+++ b/src/scopes/_code.vars.scss
@@ -11,8 +11,8 @@ $block--pad-b:     props.def(--s-code--block--pad-b, props.get(core.$size--85))
 $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;
 
-$inline--fg: props.def(--s-code--inline--fg, props.get(core.$theme, --red, --1200), 'color') !default;
-$inline--bg: props.def(--s-code--inline--bg, props.get(core.$theme, --red, --200), 'color') !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;
 
 $block--fg: props.def(--s-code--block--fg, props.get(core.$theme, --text), 'color') !default;
 $block--bg: props.def(--s-code--block--bg, props.get(core.$theme, --base, --50), 'color') !default;
diff --git a/src/scopes/_implicit.vars.scss b/src/scopes/_implicit.vars.scss
index e809ac3..388f0af 100644
--- a/src/scopes/_implicit.vars.scss
+++ b/src/scopes/_implicit.vars.scss
@@ -23,4 +23,4 @@ $heading--font-weight:       props.def(--s-implicit--heading--font-weight, bold)
 $heading--font-size:         props.def(--s-implicit--heading--font-size, props.get(core.$font-size--100));
 $heading--feature-settings:  props.def(--s-implicit--heading--feature-settings, props.get(core.$font--standard--feature-settings)) !default;
 
-$heading--color: props.def(--s-implicit--heading--color, props.get(core.$theme, --heading), 'color');
+$heading--color: props.def(--s-implicit--heading--color, props.get(core.$theme, --heading), 'color') !default;