diff --git a/layouts/partials/theme-switcher.html b/layouts/partials/theme-switcher.html
index a2e22f9..90e85f5 100644
--- a/layouts/partials/theme-switcher.html
+++ b/layouts/partials/theme-switcher.html
@@ -1,79 +1,65 @@
 {{ $style := "light-without-switcher" }}
 {{ if and (isset site.Params "style") (ne site.Params.style "") }}
-    {{ $style = site.Params.style | lower }}
+{{ $style = site.Params.style | lower }}
 {{ end }}
 
 {{ if not (in (slice "light-without-switcher" "dark-without-switcher") $style) }}
-    {{ if ne "auto-without-switcher" $style }}
-        <div class="theme-switcher">
-            {{ partial "font-awesome.html" (dict "iconName" "theme-light" "custom" false) }}
-        </div>
-    {{ end }}
+{{ if ne "auto-without-switcher" $style }}
+<div class="theme-switcher">
+    {{ partial "font-awesome.html" (dict "iconName" "theme-light" "custom" false) }}
+</div>
+{{ end }}
 
-    <script>
-        const STORAGE_KEY = 'user-color-scheme'
-        const defaultTheme = {{ $style }}
+<script>
+    const STORAGE_KEY = 'user-color-scheme'
+    const defaultTheme = {{ $style }}
 
-        let currentTheme
-        let switchButton
-        let autoDefinedScheme = window.matchMedia('(prefers-color-scheme: dark)')
+    let currentTheme
+    let switchButton
+    let autoDefinedScheme = window.matchMedia('(prefers-color-scheme: dark)')
 
-        const autoChangeScheme = e => {
-            currentTheme = e.matches ? 'dark' : 'light'
+    const autoChangeScheme = e => {
+        currentTheme = e.matches ? 'dark' : 'light'
+        document.documentElement.setAttribute('data-theme', currentTheme)
+    }
+
+    document.addEventListener('DOMContentLoaded', function () {
+        switchButton = document.querySelector('.theme-switcher')
+        currentTheme = detectCurrentScheme()
+        
+        if (currentTheme === 'auto') {
+            autoChangeScheme(autoDefinedScheme);
+            autoDefinedScheme.addListener(autoChangeScheme);
+        } else {
             document.documentElement.setAttribute('data-theme', currentTheme)
         }
-
-        document.addEventListener('DOMContentLoaded', function() {
-            switchButton = document.querySelector('.theme-switcher')
-            currentTheme = detectCurrentScheme()
-            if (currentTheme == 'dark') {
-                document.documentElement.setAttribute('data-theme', 'dark')
-            }
-            if (currentTheme == 'auto') {
-                autoChangeScheme(autoDefinedScheme);
-                autoDefinedScheme.addListener(autoChangeScheme);
-            }
-
-            if (switchButton) {
-                switchButton.addEventListener('click', switchTheme, false)
-            }
-        
-            showContent()
-        })
-
-        function detectCurrentScheme() {
-            if (localStorage !== null && localStorage.getItem(STORAGE_KEY)) {
-                return localStorage.getItem(STORAGE_KEY)
-            } 
-            if (defaultTheme) {
-                return defaultTheme
-            } 
-            if (!window.matchMedia) {
-                return 'light'
-            } 
-            if (window.matchMedia('(prefers-color-scheme: dark)').matches) {
-                return 'dark'
-            }
-            return 'light'
+    
+        if (switchButton) {
+            switchButton.addEventListener('click', switchTheme, false)
         }
 
-        function switchTheme(e) {
-            if (currentTheme == 'dark') {
-                if (localStorage !== null)
-                    localStorage.setItem(STORAGE_KEY, 'light')
-                document.documentElement.setAttribute('data-theme', 'light')
-                currentTheme = 'light'
-            } else {
-                if (localStorage !== null)
-                    localStorage.setItem(STORAGE_KEY, 'dark')
-                document.documentElement.setAttribute('data-theme', 'dark')
-                currentTheme = 'dark'
-            }
-        }
+        showContent()
+    })
 
-        function showContent() {
-            document.body.style.visibility = 'visible';
-            document.body.style.opacity = 1;
+    function detectCurrentScheme() {
+        if (localStorage !== null && localStorage.getItem(STORAGE_KEY)) {
+            return localStorage.getItem(STORAGE_KEY)
         }
-    </script>
-{{ end }}
+        if (defaultTheme) {
+            return defaultTheme
+        }
+        return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
+    }
+
+    function switchTheme(e) {
+        currentTheme = (currentTheme === 'dark') ? 'light' : 'dark';
+        if (localStorage) localStorage.setItem(STORAGE_KEY, currentTheme);
+        document.documentElement.setAttribute('data-theme', currentTheme);
+    }
+
+    function showContent() {
+        document.body.style.visibility = 'visible';
+        document.body.style.opacity = 1;
+    }
+</script>
+{{ end }}
\ No newline at end of file