better font config

assets/sass/_theme/_configuration.sass

@@ -24,6 +24,7 @@ $line-height-base: 160% !default
 $heading-font-weight: normal !default
 
 // h1
+$h1-font-family: $heading-font-family !default
 $h1-size-md: px2rem(60) !default
 $h1-size: px2rem(30) !default
 $h1-line-height: 120% !default
@@ -31,6 +32,7 @@ $h1-weight: bold !default
 $h1-text-transform: none !default
 
 // h2
+$h2-font-family: $heading-font-family !default
 $h2-size-md: px2rem(40) !default
 $h2-size: px2rem(24) !default
 $h2-line-height: 120% !default
@@ -38,6 +40,7 @@ $h2-weight: $heading-font-weight !default
 $h2-text-transform: none !default
 
 // h3
+$h3-font-family: $heading-font-family !default
 $h3-size-md: px2rem(28) !default
 $h3-size: px2rem(20) !default
 $h3-line-height: 130% !default
@@ -45,6 +48,7 @@ $h3-weight: bold !default
 $h3-text-transform: none !default
 
 // h4
+$h4-font-family: $heading-font-family !default
 $h4-size-md: px2rem(22) !default
 $h4-size: px2rem(16) !default
 $h4-line-height: 130% !default
@@ -52,6 +56,7 @@ $h4-weight: bold !default
 $h4-text-transform: none !default
 
 // h5 or Section
+$h5-font-family: $heading-font-family !default
 $h5-size-md: px2rem(24) !default
 $h5-size: px2rem(20) !default
 $h5-line-height: 130% !default
@@ -59,6 +64,7 @@ $h5-weight: $heading-font-weight !default
 $h5-text-transform: uppercase !default
 
 // h6 or Tab
+$h6-font-family: $heading-font-family !default
 $h6-size-md: px2rem(20) !default
 $h6-size: px2rem(14) !default
 $h6-line-height: 18% !default

assets/sass/_theme/design-system/typography.sass

@@ -20,11 +20,8 @@ h1, h2, h3, h4, h5, h6
     margin-top: 0
     margin-bottom: 0
 
-@mixin heading
-    font-family: $heading-font-family
-
 @mixin h1
-    @include heading
+    font-family: $h1-font-family
     font-size: $h1-size
     font-weight: $h1-weight
     line-height: $h1-line-height
@@ -36,7 +33,7 @@ h1, .h1
     @include h1
 
 @mixin h2
-    @include heading
+    font-family: $h2-font-family
     font-size: $h2-size
     font-weight: $h2-weight
     line-height: $h2-line-height
@@ -48,7 +45,7 @@ h2, .h2
     @include h2
 
 @mixin h3
-    @include heading
+    font-family: $h3-font-family
     font-size: $h3-size
     font-weight: $h3-weight
     line-height: $h3-line-height
@@ -60,7 +57,7 @@ h3, .h3
     @include h3
 
 @mixin h4
-    @include heading
+    font-family: $h4-font-family
     font-size: $h4-size
     font-weight: $h4-weight
     line-height: $h4-line-height
@@ -72,7 +69,7 @@ h4, .h4
     @include h4
 
 @mixin h5
-    @include heading
+    font-family: $h5-font-family
     font-size: $h5-size
     font-weight: $h5-weight
     line-height: $h5-line-height
@@ -86,7 +83,7 @@ h5, .h5
     @include h5
 
 @mixin h6
-    @include heading
+    font-family: $h6-font-family
     font-size: $h6-size
     font-weight: $h6-weight
     line-height: $h6-line-height