diff --git a/_includes/head.html b/_includes/head.html
index e640f97ff6e9def01b20a41a475938248d384cb1..16ffe3dd018bfc139bd6db6c57e0474f19b6038e 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -12,12 +12,7 @@
 
   <link rel="shortcut icon" href="{{ 'favicon.ico' | absolute_url }}" type="image/x-icon">
 
-  {% if site.color_scheme == nil or site.color_scheme == "nil" %}
-    {% assign color_scheme = 'light' %}
-  {% else %}
-    {% assign color_scheme = site.color_scheme %}
-  {% endif %}
-  <link rel="stylesheet" href="{{ color_scheme | prepend: '/assets/css/just-the-docs-' | append: '.css' | absolute_url }}">
+  <link rel="stylesheet" href="{{ '/assets/css/just-the-docs-default.css' | absolute_url }}">
 
   {% if site.ga_tracking != nil %}
     <script async src="https://www.googletagmanager.com/gtag/js?id={{ site.ga_tracking }}"></script>
diff --git a/_sass/color_schemes/dark.scss b/_sass/color_schemes/dark.scss
index 333c2b19eda0e8114038ed4a331bcb7b83520bb1..9a0b9ea4c932b12b4e641b84ec61d2bf518041af 100644
--- a/_sass/color_schemes/dark.scss
+++ b/_sass/color_schemes/dark.scss
@@ -1,5 +1,3 @@
-// override this file to change the dark theme
-
 $body-background-color: $grey-dk-300;
 $sidebar-color: $grey-dk-300;
 $border-color: $grey-dk-200;
diff --git a/_sass/color_schemes/light.scss b/_sass/color_schemes/light.scss
index 5932f2980f2a9cc6eb12a8084e3c4c65d4085250..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/_sass/color_schemes/light.scss
+++ b/_sass/color_schemes/light.scss
@@ -1 +0,0 @@
-// override this file to change the light (default) theme
diff --git a/assets/css/just-the-docs-default.scss b/assets/css/just-the-docs-default.scss
new file mode 100644
index 0000000000000000000000000000000000000000..63fde26e1c570de46d36491f4490d2ac307623a3
--- /dev/null
+++ b/assets/css/just-the-docs-default.scss
@@ -0,0 +1,8 @@
+---
+---
+{% if site.color_scheme and site.color_scheme != "nil" %}
+  {% assign color_scheme = site.color_scheme %}
+{% else %}
+  {% assign color_scheme = "light" %}
+{% endif %}
+{% include css/just-the-docs.scss.liquid color_scheme=color_scheme %}