diff --git a/assets/scripts/features/theme/index.js b/assets/scripts/features/theme/index.js
index fb60421..52d0282 100644
--- a/assets/scripts/features/theme/index.js
+++ b/assets/scripts/features/theme/index.js
@@ -2,8 +2,8 @@ import * as params from '@params';
 const PERSISTENCE_KEY = 'theme-scheme'
 
 const themeOptions = params.theme || {}
-const THEME_DARK = typeof themeOptions.dark === 'undefined' ? false : themeOptions.dark;
-const THEME_LIGHT = typeof themeOptions.light === 'undefined' ? false : themeOptions.light;
+const THEME_DARK = typeof themeOptions.dark === 'undefined' ? true : themeOptions.dark;
+const THEME_LIGHT = typeof themeOptions.light === 'undefined' ? true : themeOptions.light;
 const THEME_DEFAULT = typeof themeOptions.default === 'undefined' ? "system" : themeOptions.default;
 
 window.addEventListener('load', async () => {
@@ -55,7 +55,7 @@ window.addEventListener('load', async () => {
 
     // save preference to local storage
     saveScheme(newScheme)
-
+  
     setImages(theme)
   }
 
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 0bc76f7..dc1850a 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -12,7 +12,7 @@
     <!--================= add analytics if enabled =========================-->
     {{- partial "analytics.html" . -}}
     <script>
-      theme = localStorage.getItem('theme-scheme') || localStorage.getItem('darkmode:color-scheme') || 'system';
+      theme = localStorage.getItem('theme-scheme') || localStorage.getItem('darkmode:color-scheme') || 'light';
       if (theme == 'system') {
         if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches) {
           theme = 'dark';
diff --git a/layouts/index.html b/layouts/index.html
index 8ec6715..b149f28 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -18,7 +18,7 @@
     <!--================= add analytics if enabled =========================-->
     {{- partial "analytics.html" . -}}
     <script>
-      theme = localStorage.getItem('theme-scheme') || localStorage.getItem('darkmode:color-scheme') || 'system';
+      theme = localStorage.getItem('theme-scheme') || localStorage.getItem('darkmode:color-scheme') || 'light';
       if (theme == 'system') {
         if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches) {
           theme = 'dark';
diff --git a/layouts/partials/navigators/theme-selector.html b/layouts/partials/navigators/theme-selector.html
index fb9b1b2..52d93ad 100644
--- a/layouts/partials/navigators/theme-selector.html
+++ b/layouts/partials/navigators/theme-selector.html
@@ -22,8 +22,10 @@
     <img class="theme-icon" src="{{ "icons/moon-svgrepo-com.svg" | relURL }}" width=20 alt="Dark Theme">
   </a>
   {{ end }}
+  {{ if and $lightEnabled $darkEnabled }}
   <a class="dropdown-item nav-link" href="#" data-scheme="system">
     <img class="theme-icon" src="{{ "icons/computer-svgrepo-com.svg" | relURL }}" width=20 alt="System Theme">
   </a>
+  {{ end }}
 </div>
 </li>