1 files changed, 30 insertions, 43 deletions

diff --git a/src/scopes/_headings.scss b/src/scopes/_headings.scss
index fc4991a..5b05b45 100644
--- a/src/scopes/_headings.scss
+++ b/src/scopes/_headings.scss
@@ -20,65 +20,52 @@
 
 
         h1 {
-            color:     fn.foreign-color(--heading, --strong);
-            font-size: fn.global-dim(--font-size --400);
+            @include mx.heading-strong(fn.global-dim(--heading --lg));
         }
 
         h2 {
-            color:     fn.foreign-color(--heading, --strong);
-            font-size: fn.global-dim(--font-size --300);
-        }
-
-        h3 {
-            color:     fn.foreign-color(--heading, --strong);
-            font-size: fn.global-dim(--font-size --200);
-        }
-
-        h4 {
-            color:     fn.foreign-color(--heading, --strong);
-            font-size: fn.global-dim(--font-size --150);
-        }
-
-        h5 {
-            @include mx.set-font(--standard, (
-                --line-height: null,
-                --size:        fn.global-dim(--font-size --75),
-                --weight:      bold,
-                --transform:   uppercase,
-                --spacing:     1px
-            ));
-
-            transform: none;
-            color:     fn.foreign-color(--heading, --strong);
+            @include mx.heading-medium(fn.global-dim(--heading --md));
         }
 
+        h3,
+        h4,
+        h5,
         h6 {
-            @include mx.set-font(--standard, (
-                --line-height: null,
-                --size:        fn.global-dim(--font-size --50),
-                --weight:      500,
-                --transform:   uppercase,
-                --spacing:     1px
-            ));
-
-            transform: none;
-            color:     fn.foreign-color(--heading, --light);
+            @include mx.heading-faint(fn.global-dim(--heading --sm));
         }
 
         @include iro.bem-modifier('display') {
+            h1,
+            h2,
+            h3,
+            h4,
+            h5,
+            h6 {
+                @include mx.set-font(--headline);
+            }
+
             h1 {
-                color:     fn.foreign-color(--heading, --strong);
-                font-size: fn.global-dim(--font-size --900);
+                @include mx.heading-strong(fn.global-dim(--heading --display --xxl));
             }
     
             h2 {
-                color:     fn.foreign-color(--heading, --strong);
-                font-size: fn.global-dim(--font-size --600);
+                @include mx.heading-strong(fn.global-dim(--heading --display --xl));
             }
     
             h3 {
-                color:     fn.foreign-color(--heading, --strong);
-                font-size: fn.global-dim(--font-size --300);
+                @include mx.heading-strong(fn.global-dim(--heading --display --lg));
+            }
+    
+            h4 {
+                @include mx.heading-strong(fn.global-dim(--heading --display --md));
+            }
+
+            h5 {
+                @include mx.heading-medium(fn.global-dim(--heading --display --sm));
+            }
+
+            h6 {
+                @include mx.heading-faint(fn.global-dim(--heading --display --xs));
             }
         }
     }