diff --git a/_sass/minimal-mistakes/minimal-mistakes/_base.scss b/_sass/minimal-mistakes/minimal-mistakes/_base.scss
index 2bc5a9fb..b1559fe0 100644
--- a/_sass/minimal-mistakes/minimal-mistakes/_base.scss
+++ b/_sass/minimal-mistakes/minimal-mistakes/_base.scss
@@ -27,6 +27,7 @@ h3,
 h4,
 h5,
 h6 {
+  color: $heading-color;
   margin: 2em 0 0.5em;
   line-height: 1.2;
   font-family: $header-font-family;
diff --git a/_sass/minimal-mistakes/minimal-mistakes/_navigation.scss b/_sass/minimal-mistakes/minimal-mistakes/_navigation.scss
index 1a453a5e..0eab33f1 100644
--- a/_sass/minimal-mistakes/minimal-mistakes/_navigation.scss
+++ b/_sass/minimal-mistakes/minimal-mistakes/_navigation.scss
@@ -901,6 +901,7 @@
   }
 
   h4 {
+	color: $toc-header-color;
     margin-top: 0;
     margin-bottom: 0;  }
 }
diff --git a/_sass/minimal-mistakes/minimal-mistakes/_page.scss b/_sass/minimal-mistakes/minimal-mistakes/_page.scss
index b61817ba..55336311 100644
--- a/_sass/minimal-mistakes/minimal-mistakes/_page.scss
+++ b/_sass/minimal-mistakes/minimal-mistakes/_page.scss
@@ -89,7 +89,7 @@ body {
   line-height: 1;
 
   a {
-    color: $text-color;
+    color: $page-title-color;
     text-decoration: none;
   }
 
diff --git a/_sass/minimal-mistakes/minimal-mistakes/_syntax.scss b/_sass/minimal-mistakes/minimal-mistakes/_syntax.scss
index 334c171f..ac5a8a3d 100644
--- a/_sass/minimal-mistakes/minimal-mistakes/_syntax.scss
+++ b/_sass/minimal-mistakes/minimal-mistakes/_syntax.scss
@@ -75,7 +75,7 @@ figure.highlight {
     margin: 0;
     padding: 0;
     outline: none;
-    color: $link-color;
+    color: $code-header-text-color;
     background-color: transparent;
     font-size: 1em;
 
diff --git a/_sass/minimal-mistakes/minimal-mistakes/_variables.scss b/_sass/minimal-mistakes/minimal-mistakes/_variables.scss
index 4414e0b7..b746efd7 100644
--- a/_sass/minimal-mistakes/minimal-mistakes/_variables.scss
+++ b/_sass/minimal-mistakes/minimal-mistakes/_variables.scss
@@ -106,6 +106,10 @@ $tooltip-color: mix($gray, $text-color, 50%) !default;
 $tooltip-box-shadow-color: $box-shadow-color !default; // rgba(mix($black, $background-color, 70%), 0.5) !default;
 //$tooltip-border-color: $border-color !default; // rgba(mix($black, $background-color, 80%), 0.9) !default;
 
+$page-title-color: $text-color !default;
+$heading-color: $text-color !default;
+$toc-header-color: $menuitem-color !default;
+
 /* YIQ color contrast */
 $yiq-contrasted-dark-default: $dark-gray !default;
 $yiq-contrasted-light-default: $white !default;
@@ -146,6 +150,7 @@ $link-color-selected: $selection-color !default;
 $masthead-link-color: $primary-color !default;
 $masthead-link-color-hover: mix($black, $primary-color, 25%) !default;
 $navicon-link-color-hover: mix($white, $primary-color, 75%) !default;
+$code-header-text-color: $link-color !default;
 
 /* notices */
 $notice-background-mix: 80% !default;
diff --git a/_sass/minimal-mistakes/minimal-mistakes/skins/_oi-light.scss b/_sass/minimal-mistakes/minimal-mistakes/skins/_oi-light.scss
index 4a72d311..8a1fe774 100644
--- a/_sass/minimal-mistakes/minimal-mistakes/skins/_oi-light.scss
+++ b/_sass/minimal-mistakes/minimal-mistakes/skins/_oi-light.scss
@@ -1,5 +1,5 @@
 /* ==========================================================================
-   OID skin
+   OI Light skin
    ========================================================================== */
 
 /* Colors */
@@ -45,36 +45,13 @@ $masthead-link-color        : $primary-color !default;
 $masthead-link-color-hover  : mix($black, $primary-color, 25%) !default;
 $menuitem-hovered-background-color :$oid-blue !default;
 $menuitem-selected-background-color: $oid-gray !default;
+$heading-color: $link-color !default;
+$page-title-color: $link-color !default;
+$code-header-text-color: $text-color !default;
+$toc-header-color: $text-color !default;
 
 /* notices */
 $notice-background-mix: 60% !default;
 $code-notice-background-mix: 65% !default;
 
 $base01	: $oid-blue !default;
-
-.page__title {
-	a { 
-		color: $link-color !important;
-	}
-}
-
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-	color: $link-color !important;
-}
-
-.toc {
-	h4 {
-		color: $text-color !important;
-	}
-}
-
-.highlight-header {
-	.btn {
-		color: $text-color !important;
-	}
-}