diff --git a/docs/source/_static/theme-override.css b/docs/source/_static/theme-override.css
index eccbfa10eb..a49cb4414c 100644
--- a/docs/source/_static/theme-override.css
+++ b/docs/source/_static/theme-override.css
@@ -1,6 +1,29 @@
 :root {
     --link: #4a90e2;
     --link-hover: #1c6cd9;
+
+    --readthedocs-search-color: hsl(var(--foreground));
+    --readthedocs-search-link-color: var(--link);
+    --readthedocs-search-content-background-color: hsl(var(--background));
+    --readthedocs-search-content-border-color: hsl(var(--border));
+    --readthedocs-search-footer-background-color: hsl(var(--background));
+    --readthedocs-search-footer-color: hsl(var(--foreground));
+    --readthedocs-search-footer-code-background-color: hsl(var(--background));
+    --readthedocs-search-footer-code-border-color: hsl(var(--background));
+    --readthedocs-search-input-background-color: hsl(var(--accent));
+    --readthedocs-search-result-color: hsl(var(--foreground));
+    --readthedocs-search-result-icon-color: hsl(var(--foreground));
+    --readthedocs-search-result-heading-color: hsl(var(--foreground));
+    --readthedocs-search-result-subheading-color: hsl(var(--foreground));
+    --readthedocs-search-result-active-background-color: hsl(var(--accent));
+    --readthedocs-search-result-border-color: hsl(var(--border));
+
+    --readthedocs-flyout-background-color: hsl(var(--background));
+    --readthedocs-flyout-color: hsl(var(--foreground));
+    --readthedocs-flyout-current-version-color: hsl(var(--foreground));
+    --readthedocs-flyout-item-link-color: var(--link);
+    --readthedocs-flyout-link-color: var(--link);
+    --readthedocs-flyout-section-heading-color: hsl(var(--foreground));
 }
 
 /* Less aggressive dark background */
diff --git a/docs/source/conf.py b/docs/source/conf.py
index 722d46835b..b55d53705c 100644
--- a/docs/source/conf.py
+++ b/docs/source/conf.py
@@ -163,7 +163,7 @@ html_theme_options = asdict(ThemeOptions(
         "Lua API": "reference/lua-scripting/overview",
         "Postprocessing": "reference/postprocessing/index",
    },
-   show_scrolltop=True,
+   show_scrolltop=False, # Useful, but hard to position with the Flyout addon since the best place for that is bottom right
 ))
 
 html_permalinks_icon = Icons.permalinks_icon