diff --git a/app.js b/app.js
index cbdfd26..39853ed 100644
--- a/app.js
+++ b/app.js
@@ -36,7 +36,6 @@ function activeSection(section) {
 function hideAll() {
     document.querySelectorAll(".section").forEach((s) => {
         s.classList.remove("selected");
-        // s.style.display = "none";
     });
 }
 const HIDDEN_CLASS = "hidden";
@@ -50,26 +49,12 @@ function hideThemeSwitcher(currentTheme) {
         document.getElementById("dark-icon")?.classList.remove(HIDDEN_CLASS);
     }
 }
-function getCurrentTheme() {
-    const fromProperty = document.documentElement.style.getPropertyValue("color-scheme");
-    if (fromProperty) return fromProperty;
-    const prefersTheme = window.matchMedia("(prefers-color-scheme: dark)") ? "dark" : "light";
-    return prefersTheme;
-}
-
 function setTheme(newTheme) {
     document.documentElement.style.setProperty("color-scheme", newTheme);
     hideThemeSwitcher(newTheme);
 }
 
 function switchTheme() {
-    let currentTheme = getCurrentTheme();
-    console.debug("Start theme switching to " + currentTheme + " theme");
-    setTheme(currentTheme == "dark" ? "light" : "dark");
+    setTheme(document.documentElement.style.getPropertyValue("color-scheme")=="dark"?"light":"dark");
 }
 
-function initColorTheme() {
-    const currentTheme = getCurrentTheme();
-    console.debug("Current theme is " + currentTheme + "");
-    setTheme(currentTheme);
-}
diff --git a/build.sh b/build.sh
index ba5902c..c64172a 100755
--- a/build.sh
+++ b/build.sh
@@ -113,14 +113,18 @@ done
 echo "</main>" >> ./index.html
 echo "<script>
   window.onload = () => {" >> ./index.html
-echo "hideAll();" >> ./index.html
-echo "initColorTheme();" >> ./index.html
+#echo "hideAll();" >> ./index.html
 for section in "${sections[@]}"; do
   echo "    loadPage('$section', 1);" >> ./index.html
 done
 
 echo "
   activeSection('${sections[0]}');
+  if (window.matchMedia('(prefers-color-scheme: dark)').matches){
+    setTheme('dark');
+  }else{
+    setTheme('light');
+  }
 }
 </script>" >> ./index.html