Make saved theme override stale URL theme across pages

Author: Bikram Gole

about.html

@@ -19,7 +19,7 @@
         const params = new URLSearchParams(window.location.search);
         const urlTheme = params.get("theme");
         const savedTheme = window.localStorage.getItem(themeKey);
-        const selected = validThemes.has(urlTheme) ? urlTheme : (validThemes.has(savedTheme) ? savedTheme : null);
+        const selected = validThemes.has(savedTheme) ? savedTheme : (validThemes.has(urlTheme) ? urlTheme : null);
         if (selected) {
           document.body.dataset.theme = selected;
           if (selected !== savedTheme) {

contact.html

@@ -19,7 +19,7 @@
         const params = new URLSearchParams(window.location.search);
         const urlTheme = params.get("theme");
         const savedTheme = window.localStorage.getItem(themeKey);
-        const selected = validThemes.has(urlTheme) ? urlTheme : (validThemes.has(savedTheme) ? savedTheme : null);
+        const selected = validThemes.has(savedTheme) ? savedTheme : (validThemes.has(urlTheme) ? urlTheme : null);
         if (selected) {
           document.body.dataset.theme = selected;
           if (selected !== savedTheme) {

index.html

@@ -19,7 +19,7 @@
         const params = new URLSearchParams(window.location.search);
         const urlTheme = params.get("theme");
         const savedTheme = window.localStorage.getItem(themeKey);
-        const selected = validThemes.has(urlTheme) ? urlTheme : (validThemes.has(savedTheme) ? savedTheme : null);
+        const selected = validThemes.has(savedTheme) ? savedTheme : (validThemes.has(urlTheme) ? urlTheme : null);
         if (selected) {
           document.body.dataset.theme = selected;
           if (selected !== savedTheme) {

script.js

@@ -625,8 +625,8 @@ function initThemeSwitcher() {
   try {
     urlTheme = getThemeFromUrl();
     const storedTheme = window.localStorage.getItem(THEME_STORAGE_KEY);
-    savedTheme = urlTheme || storedTheme || "neo";
-    if (urlTheme && storedTheme !== urlTheme) {
+    savedTheme = storedTheme || urlTheme || "neo";
+    if (!storedTheme && urlTheme) {
       window.localStorage.setItem(THEME_STORAGE_KEY, urlTheme);
     }
   } catch (error) {
@@ -637,7 +637,7 @@ function initThemeSwitcher() {
   window.addEventListener("pageshow", () => {
     let latestTheme = "neo";
     try {
-      latestTheme = getThemeFromUrl() || window.localStorage.getItem(THEME_STORAGE_KEY) || "neo";
+      latestTheme = window.localStorage.getItem(THEME_STORAGE_KEY) || getThemeFromUrl() || "neo";
     } catch (error) {
       latestTheme = "neo";
     }