diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss
index 3f7e80090..d70f00c05 100644
--- a/src/scss/_variables.scss
+++ b/src/scss/_variables.scss
@@ -5,9 +5,9 @@ $td-widget-background: $td-light !default;
 $td-font-color: #000 !default;
 $td-timepicker-font-size: 1.2em !default;
 $td-active-bg: #0d6efd !default;
-$td-range-bg: color.scale($td-active-bg, $lightness: -40%);
+$td-range-bg: color.scale($td-active-bg, $lightness: -40%) !default;
 $td-active-color: $td-light !default;
-$td-active-border-color: $td-light;
+$td-active-border-color: $td-light !default;
 $td-border-radius: 999px !default;
 $td-btn-hover-bg: #e9ecef !default;
 $td-disabled-color: #6c757d !default;
@@ -16,15 +16,15 @@ $td-secondary-border-color: #ccc !default;
 $td-secondary-border-color-rgba: rgba(0, 0, 0, 0.2) !default;
 $td-primary-border-color: $td-light !default;
 $td-text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25) !default;
-$td-dow-color: rgba(0, 0, 0, 0.5);
+$td-dow-color: rgba(0, 0, 0, 0.5) !default;
 
 $td-dark: #1b1b1b !default;
 $td-dark-widget-background: $td-dark !default;
-$td-dark-font-color: #e3e3e3;
+$td-dark-font-color: #e3e3e3 !default;
 $td-dark-active-bg: #4db2ff !default;
-$td-dark-range-bg: color.scale($td-dark-active-bg, $lightness: -40%);
+$td-dark-range-bg: color.scale($td-dark-active-bg, $lightness: -40%) !default;
 $td-dark-active-color: #fff !default;
-$td-dark-active-border-color: $td-dark;
+$td-dark-active-border-color: $td-dark !default;
 $td-dark-btn-hover-bg: rgb(35, 38, 39) !default;
 $td-dark-disabled-color: #6c757d !default;
 $td-dark-alternate-color: rgba(232, 230, 227, 0.38) !default;
@@ -32,7 +32,9 @@ $td-dark-secondary-border-color: #ccc !default;
 $td-dark-secondary-border-color-rgba: rgba(232, 230, 227, 0.2) !default;
 $td-dark-primary-border-color: $td-dark !default;
 $td-dark-text-shadow: 0 -1px 0 rgba(232, 230, 227, 0.25) !default;
-$td-dark-dow-color: rgba(232, 230, 227, 0.5);
+$td-dark-dow-color: rgba(232, 230, 227, 0.5) !default;
+
+$td-widget-z-index: 9999 !default;
 
 :root {
   --td-light: #{$td-light};
@@ -68,4 +70,6 @@ $td-dark-dow-color: rgba(232, 230, 227, 0.5);
   --td-dark-primary-border-color: #{$td-dark-primary-border-color};
   --td-dark-text-shadow: #{$td-dark-text-shadow};
   --td-dark-dow-color: #{$td-dark-dow-color};
+
+  --td-widget-z-index: #{$td-widget-z-index};
 }
diff --git a/src/scss/tempus-dominus.scss b/src/scss/tempus-dominus.scss
index a64ef30fc..82feafc24 100644
--- a/src/scss/tempus-dominus.scss
+++ b/src/scss/tempus-dominus.scss
@@ -18,7 +18,7 @@
   width: 19rem;
   border-radius: 4px;
   display: none;
-  z-index: 9999;
+  z-index: var(--td-widget-z-index);
   box-shadow: 0 2px 4px -1px rgba(0, 0, 0, 0.2), 0 4px 5px 0 rgba(0, 0, 0, 0.14),
     0 1px 10px 0 rgba(0, 0, 0, 0.12);