diff --git a/static/assets/color_mode_switcher.52334129.js b/static/assets/color_mode_switcher.52334129.js
deleted file mode 100644
index d963ca8..0000000
--- a/static/assets/color_mode_switcher.52334129.js
+++ /dev/null
@@ -1 +0,0 @@
-function a(){const t=localStorage.getItem("theme");return t||(window.matchMedia("(prefers-color-scheme: dark)").matches?"dark":"light")}function c(t){const r=document.querySelector(".theme-switch i.fas");r.classList.toggle("fa-moon",t==="dark"),r.classList.toggle("fa-sun",t!=="dark")}let e=a();document.documentElement.setAttribute("data-bs-theme",e);window.matchMedia("(prefers-color-scheme: dark)").addEventListener("change",()=>{e=a(),document.documentElement.setAttribute("data-bs-theme",e),c(e)});window.addEventListener("load",()=>{c(e),document.querySelectorAll(".theme-switch").forEach(t=>{t.addEventListener("click",r=>{e=e==="light"?"dark":"light",document.documentElement.setAttribute("data-bs-theme",e),localStorage.setItem("theme",e),c(e),r.preventDefault()})})});
diff --git a/static/manifest.json b/static/manifest.json
index 8f15350..5f8b102 100644
--- a/static/manifest.json
+++ b/static/manifest.json
@@ -116,11 +116,6 @@
       "assets/js/index.js"
     ]
   },
-  "assets/js/color_mode_switcher.js": {
-    "file": "assets/color_mode_switcher.52334129.js",
-    "src": "assets/js/color_mode_switcher.js",
-    "isEntry": true
-  },
   "_echarts.128204f2.js": {
     "file": "assets/echarts.128204f2.js"
   },
diff --git a/templates/base.html b/templates/base.html
index fadd017..d7de133 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -6,6 +6,43 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <link rel="shortcut icon" href="{{ Configs.ctf_small_icon }}" type="image/x-icon">
 
+  <script>
+    // This script is inlined to reduce color flashing issues
+    function getPreferredTheme() {
+      const storedTheme = localStorage.getItem("theme");
+      if (storedTheme) {
+        return storedTheme;
+      }
+      return window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "light";
+    }
+    function showActiveTheme(theme) {
+      const activeThemeIcon = document.querySelector(".theme-switch i.fas");
+      activeThemeIcon.classList.toggle("fa-moon", theme === "dark");
+      activeThemeIcon.classList.toggle("fa-sun", theme !== "dark");
+    }
+    // Change body theme early to prevent flash
+    let currentTheme = getPreferredTheme();
+    document.documentElement.setAttribute("data-bs-theme", currentTheme);
+    // On browser color-scheme change, update
+    window.matchMedia("(prefers-color-scheme: dark)").addEventListener("change", () => {
+      currentTheme = getPreferredTheme();
+      document.documentElement.setAttribute("data-bs-theme", currentTheme);
+      showActiveTheme(currentTheme);
+    });
+    window.addEventListener("load", () => {
+      showActiveTheme(currentTheme);
+      document.querySelectorAll(".theme-switch").forEach(e => {
+        e.addEventListener("click", ev => {
+          currentTheme = currentTheme === "light" ? "dark" : "light";
+          document.documentElement.setAttribute("data-bs-theme", currentTheme);
+          localStorage.setItem("theme", currentTheme);
+          showActiveTheme(currentTheme);
+          ev.preventDefault();
+        });
+      });
+    });
+  </script>
+
   {{ meta | safe }}
 
   {% block stylesheets %}
@@ -14,8 +51,6 @@
 
   {{ Plugins.styles }}
 
-  {{ Assets.js("assets/js/color_mode_switcher.js", defer=False) }}
-
   <script type="text/javascript">
       window.init = {
           'urlRoot': "{{ request.script_root }}",
diff --git a/vite.config.js b/vite.config.js
index 438fc11..f28b683 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -63,7 +63,6 @@ export default defineConfig({
         users_private: resolve(__dirname, "assets/js/users/private.js"),
         users_list: resolve(__dirname, "assets/js/users/list.js"),
         main: resolve(__dirname, "assets/scss/main.scss"),
-        color_mode_switcher: resolve(__dirname, "assets/js/color_mode_switcher.js"),
       },
     },
   },