From e7422936bca273de78fc5e5ba28ec59aefe58d7b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 3 Jun 2026 23:14:48 +0000
Subject: [PATCH 1/6] Adjust theme toggle to respect system preference

---
 templates/base.html.jinja | 31 ++++++++++++++++++++++++++++---
 1 file changed, 28 insertions(+), 3 deletions(-)
diff --git a/templates/base.html.jinja b/templates/base.html.jinja
index 980d31e15..544355aba 100644
--- a/templates/base.html.jinja
+++ b/templates/base.html.jinja
@@ -16,11 +16,27 @@
   </head>
   <body>
     <script>
+      var colorSchemeMediaQuery = matchMedia('(prefers-color-scheme: dark)');
+      function getPreferredTheme() {
+        return colorSchemeMediaQuery.matches ? 'dark' : 'light';
+      }
+      function getStoredTheme() {
+        return localStorage.getItem('theme');
+      }
+      function getTheme() {
+        var preferred = getPreferredTheme();
+        var stored = getStoredTheme();
+        if (stored === preferred) {
+          localStorage.removeItem('theme');
+          return preferred;
+        }
+        return stored || preferred;
+      }
       function applyTheme(t) {
         document.documentElement.setAttribute('data-bs-theme', t);
         document.documentElement.classList.toggle('dark', t === 'dark');
       }
-      applyTheme(localStorage.getItem('theme') || (matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'));
+      applyTheme(getTheme());
     </script>
     <header>
       <nav class="navbar navbar-expand-md fixed-top">
@@ -136,8 +152,17 @@
     window.addEventListener('resize', padnavbar);
     document.getElementById('theme-toggle').addEventListener('click', function() {
       var next = document.documentElement.getAttribute('data-bs-theme') === 'dark' ? 'light' : 'dark';
-      localStorage.setItem('theme', next);
-      applyTheme(next);
+      if (next === getPreferredTheme()) {
+        localStorage.removeItem('theme');
+      } else {
+        localStorage.setItem('theme', next);
+      }
+      applyTheme(getTheme());
+    });
+    colorSchemeMediaQuery.addEventListener('change', function() {
+      if (!getStoredTheme()) {
+        applyTheme(getTheme());
+      }
     });
   </script>
   <script src="https://code.jquery.com/jquery-4.0.0.slim.min.js" integrity="sha256-8DGpv13HIm+5iDNWw1XqxgFB4mj+yOKFNb+tHBZOowc=" crossorigin="anonymous">

From c9eb981b367e09747474918762bd7a0b3a500595 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 3 Jun 2026 23:15:43 +0000
Subject: [PATCH 2/6] Refine theme resolution helpers

---
 templates/base.html.jinja | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/templates/base.html.jinja b/templates/base.html.jinja
index 544355aba..399b996c6 100644
--- a/templates/base.html.jinja
+++ b/templates/base.html.jinja
@@ -16,26 +16,26 @@
   </head>
   <body>
     <script>
-      var colorSchemeMediaQuery = matchMedia('(prefers-color-scheme: dark)');
+      var colorSchemeMediaQuery = window.matchMedia('(prefers-color-scheme: dark)');
       function getPreferredTheme() {
         return colorSchemeMediaQuery.matches ? 'dark' : 'light';
       }
       function getStoredTheme() {
         return localStorage.getItem('theme');
       }
-      function getTheme() {
-        var preferred = getPreferredTheme();
-        var stored = getStoredTheme();
-        if (stored === preferred) {
+      function normalizeStoredTheme() {
+        if (getStoredTheme() === getPreferredTheme()) {
           localStorage.removeItem('theme');
-          return preferred;
         }
-        return stored || preferred;
+      }
+      function getTheme() {
+        return getStoredTheme() || getPreferredTheme();
       }
       function applyTheme(t) {
         document.documentElement.setAttribute('data-bs-theme', t);
         document.documentElement.classList.toggle('dark', t === 'dark');
       }
+      normalizeStoredTheme();
       applyTheme(getTheme());
     </script>
     <header>
@@ -157,6 +157,7 @@
       } else {
         localStorage.setItem('theme', next);
       }
+      normalizeStoredTheme();
       applyTheme(getTheme());
     });
     colorSchemeMediaQuery.addEventListener('change', function() {

From 4bc2cd06eff550a8c8c59718e84e6e37c8b9b92f Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 3 Jun 2026 23:16:29 +0000
Subject: [PATCH 3/6] Remove redundant theme normalization in toggle handler

---
 templates/base.html.jinja | 1 -
 1 file changed, 1 deletion(-)

diff --git a/templates/base.html.jinja b/templates/base.html.jinja
index 399b996c6..d497fb2cf 100644
--- a/templates/base.html.jinja
+++ b/templates/base.html.jinja
@@ -157,7 +157,6 @@
       } else {
         localStorage.setItem('theme', next);
       }
-      normalizeStoredTheme();
       applyTheme(getTheme());
     });
     colorSchemeMediaQuery.addEventListener('change', function() {

From 83e87fe676e017066a1579202722d34937368a36 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 3 Jun 2026 23:26:28 +0000
Subject: [PATCH 4/6] Remove normalizeStoredTheme helper

---
 templates/base.html.jinja | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/templates/base.html.jinja b/templates/base.html.jinja
index d497fb2cf..87e1d9cae 100644
--- a/templates/base.html.jinja
+++ b/templates/base.html.jinja
@@ -23,11 +23,6 @@
       function getStoredTheme() {
         return localStorage.getItem('theme');
       }
-      function normalizeStoredTheme() {
-        if (getStoredTheme() === getPreferredTheme()) {
-          localStorage.removeItem('theme');
-        }
-      }
       function getTheme() {
         return getStoredTheme() || getPreferredTheme();
       }
@@ -35,7 +30,9 @@
         document.documentElement.setAttribute('data-bs-theme', t);
         document.documentElement.classList.toggle('dark', t === 'dark');
       }
-      normalizeStoredTheme();
+      if (getStoredTheme() === getPreferredTheme()) {
+        localStorage.removeItem('theme');
+      }
       applyTheme(getTheme());
     </script>
     <header>

From 885667ad699ea4b6d371623e66b2bef0a9602964 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 3 Jun 2026 23:31:56 +0000
Subject: [PATCH 5/6] Remove startup cleanup from theme script

---
 templates/base.html.jinja | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/templates/base.html.jinja b/templates/base.html.jinja
index 87e1d9cae..609f1b15a 100644
--- a/templates/base.html.jinja
+++ b/templates/base.html.jinja
@@ -30,9 +30,6 @@
         document.documentElement.setAttribute('data-bs-theme', t);
         document.documentElement.classList.toggle('dark', t === 'dark');
       }
-      if (getStoredTheme() === getPreferredTheme()) {
-        localStorage.removeItem('theme');
-      }
       applyTheme(getTheme());
     </script>
     <header>

From 0ed123f91a4cc16ca84a7905e1e58a8ed0eabd7a Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Wed, 3 Jun 2026 23:40:37 +0000
Subject: [PATCH 6/6] Rename system theme helper function

---
 templates/base.html.jinja | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/base.html.jinja b/templates/base.html.jinja
index 609f1b15a..92c4fb3fe 100644
--- a/templates/base.html.jinja
+++ b/templates/base.html.jinja
@@ -17,14 +17,14 @@
   <body>
     <script>
       var colorSchemeMediaQuery = window.matchMedia('(prefers-color-scheme: dark)');
-      function getPreferredTheme() {
+      function getSystemTheme() {
         return colorSchemeMediaQuery.matches ? 'dark' : 'light';
       }
       function getStoredTheme() {
         return localStorage.getItem('theme');
       }
       function getTheme() {
-        return getStoredTheme() || getPreferredTheme();
+        return getStoredTheme() || getSystemTheme();
       }
       function applyTheme(t) {
         document.documentElement.setAttribute('data-bs-theme', t);
@@ -146,7 +146,7 @@
     window.addEventListener('resize', padnavbar);
     document.getElementById('theme-toggle').addEventListener('click', function() {
       var next = document.documentElement.getAttribute('data-bs-theme') === 'dark' ? 'light' : 'dark';
-      if (next === getPreferredTheme()) {
+      if (next === getSystemTheme()) {
         localStorage.removeItem('theme');
       } else {
         localStorage.setItem('theme', next);
