diff --git a/resources/assets/themes/base.scss b/resources/assets/themes/base.scss
index c699d3a8..5ddb42ec 100644
--- a/resources/assets/themes/base.scss
+++ b/resources/assets/themes/base.scss
@@ -5,6 +5,10 @@
 $link-decoration: none !default;
 $link-hover-decoration: underline !default;
 
+$nav-tabs-link-active-color:        #fff !default;
+$nav-tabs-link-active-bg:           $primary !default;
+$nav-tabs-link-active-border-color: none !default;
+
 // Imports
 @import "~bootstrap/scss/functions";
 @import "~bootstrap/scss/variables";
diff --git a/resources/assets/themes/dark.scss b/resources/assets/themes/dark.scss
index 408d6165..03e4c6cc 100644
--- a/resources/assets/themes/dark.scss
+++ b/resources/assets/themes/dark.scss
@@ -1,6 +1,4 @@
 // All dark themes
 $input-group-addon-color: #222;
 $input-disabled-bg: #111;
-$nav-tabs-link-active-color: #ADAFAE;
 $alert-bg-scale: 70%;
-
diff --git a/resources/assets/themes/theme0.scss b/resources/assets/themes/theme0.scss
index 539bc67c..41d7cee9 100644
--- a/resources/assets/themes/theme0.scss
+++ b/resources/assets/themes/theme0.scss
@@ -5,3 +5,12 @@ $primary: #337ab7;
 $light: #f5f5f5;
 
 @import "base.scss";
+
+
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
+  &.bg-primary,
+  &.bg-success,
+  &.bg-danger {
+      color: #fff;
+  }
+}
diff --git a/resources/assets/themes/theme1.scss b/resources/assets/themes/theme1.scss
index 44e093a9..9e095cd8 100644
--- a/resources/assets/themes/theme1.scss
+++ b/resources/assets/themes/theme1.scss
@@ -55,8 +55,6 @@ $state-danger-border:            darken($state-danger-bg, 3%);
 
 $headings-small-color:        $gray-light;
 
-$nav-tabs-link-active-color:     $gray-light;
-
 code {
   background-color: $state-info-bg;
   color: $state-info-text;
@@ -78,3 +76,10 @@ $alert-color-scale: 0%;
 // dark
 @import "cyborg_variables";
 @import "cyborg_styles";
+
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
+  &.bg-warning,
+  &.bg-info {
+      color: #000;
+  }
+}
diff --git a/resources/assets/themes/theme10.scss b/resources/assets/themes/theme10.scss
index 5bb46590..5731cb25 100644
--- a/resources/assets/themes/theme10.scss
+++ b/resources/assets/themes/theme10.scss
@@ -56,3 +56,9 @@ h1 {
     background-color: #000;
   }
 }
+
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
+    &.bg-warning {
+        color: #000;
+    }
+}
diff --git a/resources/assets/themes/theme11.scss b/resources/assets/themes/theme11.scss
index cf6870c5..765159b9 100644
--- a/resources/assets/themes/theme11.scss
+++ b/resources/assets/themes/theme11.scss
@@ -46,9 +46,6 @@ $btn-warning-border:             darken($btn-default-bg, 10%);
 $btn-danger-color:               #000;
 $btn-danger-border:              darken($btn-default-bg, 10%);
 
-//= Navigation
-$nav-tabs-link-active-color: $gray-lighter;
-
 
 //== Forms
 
diff --git a/resources/assets/themes/theme13.scss b/resources/assets/themes/theme13.scss
index 3936193b..ddc44551 100644
--- a/resources/assets/themes/theme13.scss
+++ b/resources/assets/themes/theme13.scss
@@ -156,3 +156,9 @@ body {
   background: rgba(0,0,0,0.8);
   backdrop-filter: blur(6px);
 }
+
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
+    &.bg-warning {
+        color: #000;
+    }
+}
diff --git a/resources/assets/themes/theme2.scss b/resources/assets/themes/theme2.scss
index 9e21b05c..d09821a3 100644
--- a/resources/assets/themes/theme2.scss
+++ b/resources/assets/themes/theme2.scss
@@ -31,3 +31,9 @@ $state-danger-bg:                lighten($brand-danger,50%);
 $state-danger-border:            $brand-danger;
 
 @import "base.scss";
+
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
+    &.bg-danger {
+        color: #fff;
+    }
+}
diff --git a/resources/assets/themes/theme3.scss b/resources/assets/themes/theme3.scss
index 7ef9d52a..ab0471f7 100644
--- a/resources/assets/themes/theme3.scss
+++ b/resources/assets/themes/theme3.scss
@@ -67,3 +67,9 @@ $navbar-default-brand-hover-bg:     #000;
 }
 
 @import "base.scss";
+
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
+    &.bg-info {
+        color: #fff;
+    }
+}
diff --git a/resources/assets/themes/theme4.scss b/resources/assets/themes/theme4.scss
index 6ec8b599..ed1b9297 100644
--- a/resources/assets/themes/theme4.scss
+++ b/resources/assets/themes/theme4.scss
@@ -91,9 +91,6 @@ $badge-color:                 #fff;
 $headings-small-color:        $gray-light;
 
 
-// Navigation tabs
-$nav-tabs-link-active-color: $gray-light;
-
 // Bootswatch
 // -----------------------------------------------------
 @import "cyborg_variables.scss";
@@ -119,3 +116,9 @@ code {
   background-color: $state-info-bg;
   color: $state-info-text;
 }
+
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
+    &.bg-warning {
+        color: #000;
+    }
+}
diff --git a/resources/assets/themes/theme5.scss b/resources/assets/themes/theme5.scss
index 84900a28..2b000f81 100644
--- a/resources/assets/themes/theme5.scss
+++ b/resources/assets/themes/theme5.scss
@@ -35,3 +35,9 @@ $state-danger-border:            $brand-danger;
 }
 
 @import "base.scss";
+
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
+    &.bg-primary {
+        color: #fff;
+    }
+}
diff --git a/resources/assets/themes/theme6.scss b/resources/assets/themes/theme6.scss
index 3de34996..db4b7914 100644
--- a/resources/assets/themes/theme6.scss
+++ b/resources/assets/themes/theme6.scss
@@ -151,3 +151,9 @@ code {
   background-color: $input-bg;
   color: $input-color;
 }
+
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
+    &.bg-warning {
+        color: #000;
+    }
+}
diff --git a/resources/assets/themes/theme7.scss b/resources/assets/themes/theme7.scss
index 12c4918d..f4c60b20 100644
--- a/resources/assets/themes/theme7.scss
+++ b/resources/assets/themes/theme7.scss
@@ -99,9 +99,6 @@ $navbar-default-link-hover-color:   $link-hover-color;
 $navbar-default-link-active-color:  $brand-primary;
 $navbar-default-brand-color:        $brand-primary;
 $navbar-default-brand-hover-color:  lighten($brand-primary, 10%);
-$nav-tabs-link-active-color:        #fff;
-$nav-tabs-link-active-bg:           $brand-primary;
-$nav-tabs-link-active-border-color: none;
 
 
 //== changed Pagination
@@ -263,4 +260,12 @@ h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
   code {
     color: $headings-color;
   }
+
+  &.bg-primary,
+  &.bg-secondary,
+  &.bg-success,
+  &.bg-danger,
+  &.bg-info {
+      color: #fff;
+  }
 }
diff --git a/resources/assets/themes/theme8.scss b/resources/assets/themes/theme8.scss
index 5f49b1bd..bf7055eb 100644
--- a/resources/assets/themes/theme8.scss
+++ b/resources/assets/themes/theme8.scss
@@ -55,3 +55,9 @@ h1 {
     background-color: #000;
   }
 }
+
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
+    &.bg-warning {
+        color: #000;
+    }
+}
diff --git a/resources/assets/themes/theme9.scss b/resources/assets/themes/theme9.scss
index b140793a..16dfbb8b 100644
--- a/resources/assets/themes/theme9.scss
+++ b/resources/assets/themes/theme9.scss
@@ -56,3 +56,10 @@ h1 {
     background-color: #000;
   }
 }
+
+h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 {
+    &.bg-primary,
+    &.bg-warning {
+        color: #000;
+    }
+}