diff --git a/_includes/header.html b/_includes/header.html
index 208e4e50..5c92ee22 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -72,7 +72,20 @@
     {% include "favicon.html" %}
     {% include "style.html" %}
     <script>
-        document.documentElement.setAttribute('data-bs-theme', window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light');
+        (function () {
+            var syncTheme = function () {
+                var desired = window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
+                if (document.documentElement.getAttribute('data-bs-theme') !== desired) {
+                    document.documentElement.setAttribute('data-bs-theme', desired);
+                }
+            };
+            syncTheme();
+            window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', syncTheme);
+            new MutationObserver(syncTheme).observe(document.documentElement, {
+                attributes: true,
+                attributeFilter: ['data-bs-theme']
+            });
+        })();
     </script>
 </head>
 
diff --git a/_includes/js.html b/_includes/js.html
index 6f498c01..d1cf0117 100644
--- a/_includes/js.html
+++ b/_includes/js.html
@@ -2,9 +2,6 @@
 <script src="/js/tablesort-vendor.js"></script>
 <script src="/js/tablesort-init.js"></script>
 <script>
-  window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', e => {
-    document.documentElement.setAttribute('data-bs-theme', e.matches ? 'dark' : 'light');
-  });
   const toggler = document.querySelector('button.navbar-toggler');
   if (toggler) {
     toggler.addEventListener('click', function() {
diff --git a/public/css/scangov.css b/public/css/scangov.css
index 891c4d63..b4d657ec 100644
--- a/public/css/scangov.css
+++ b/public/css/scangov.css
@@ -796,12 +796,19 @@ button.btn-secondary-outline {
     cursor: pointer;
     position: fixed;
     bottom: 1rem;
-    right: 1rem;
+    left: 50%;
+    transform: translateX(-50%);
     z-index: 1000;
     text-decoration: none;
     transition: opacity 0.25s ease, visibility 0.25s ease, filter 0.25s ease, box-shadow 0.25s ease;
 }
 
+.feedback.feedback-right {
+    left: auto;
+    right: 1rem;
+    transform: none;
+}
+
 .feedback.is-visible {
     opacity: 1;
     pointer-events: auto;