diff --git a/searx/static/themes/oscar/css/logicodev-dark.min.css.map b/searx/static/themes/oscar/css/logicodev-dark.min.css.map
index 32293f3a4..eafe5f348 100644
Binary files a/searx/static/themes/oscar/css/logicodev-dark.min.css.map and b/searx/static/themes/oscar/css/logicodev-dark.min.css.map differ
diff --git a/searx/static/themes/oscar/js/searxng.min.js.map b/searx/static/themes/oscar/js/searxng.min.js.map
index 526f0beda..3ce24b689 100644
Binary files a/searx/static/themes/oscar/js/searxng.min.js.map and b/searx/static/themes/oscar/js/searxng.min.js.map differ
diff --git a/searx/static/themes/simple/css/searxng-rtl.css b/searx/static/themes/simple/css/searxng-rtl.css
index ff499dce6..e5e5a6875 100644
--- a/searx/static/themes/simple/css/searxng-rtl.css
+++ b/searx/static/themes/simple/css/searxng-rtl.css
@@ -819,7 +819,7 @@ template {
   --color-toolkit-loader-borderleft: rgba(255, 255, 255, 0);
 }
 @media (prefers-color-scheme: dark) {
-  :root {
+  :root.theme-auto {
     --color-base-font: #bbb;
     --color-base-font-rgb: 187, 187, 187;
     --color-base-background: #222;
@@ -904,6 +904,90 @@ template {
     --color-toolkit-loader-borderleft: rgba(0, 0, 0, 0);
   }
 }
+:root.theme-dark {
+  --color-base-font: #bbb;
+  --color-base-font-rgb: 187, 187, 187;
+  --color-base-background: #222;
+  --color-url-font: #8af;
+  --color-url-visited-font: #96b;
+  --color-header-background: #181818;
+  --color-header-border: #333;
+  --color-footer-background: #181818;
+  --color-footer-border: #333;
+  --color-sidebar-border: #555;
+  --color-sidebar-font: #fff;
+  --color-backtotop-font: #bbb;
+  --color-backtotop-border: #333;
+  --color-backtotop-background: #181818;
+  --color-btn-background: #58f;
+  --color-btn-font: #222;
+  --color-search-border: #555;
+  --color-search-background: #222;
+  --color-search-font: #fff;
+  --color-search-background-hover: #58f;
+  --color-error: #f55b5b;
+  --color-error-background: #390a0a;
+  --color-warning: #f1d561;
+  --color-warning-background: #39300a;
+  --color-success: #79f56e;
+  --color-success-background: #0e390a;
+  --color-categories-item-selected-font: #58f;
+  --color-categories-item-border-selected: #58f;
+  --color-autocomplete-font: #fff;
+  --color-autocomplete-border: #555;
+  --color-autocomplete-background: #222;
+  --color-autocomplete-background-hover: #181818;
+  --color-answer-border: #333;
+  --color-answer-font: #bbb;
+  --color-answer-background: #181818;
+  --color-result-border: #333;
+  --color-result-url-font: #fff;
+  --color-result-vim-selected: #181818;
+  --color-result-vim-arrow: #8af;
+  --color-result-description-highlight-font: #fff;
+  --color-result-link-font: #8af;
+  --color-result-link-font-highlight: #8af;
+  --color-result-link-visited-font: #96b;
+  --color-result-publishdate-font: #777;
+  --color-result-engines-font: #777;
+  --color-result-search-url-border: #555;
+  --color-result-search-url-font: #fff;
+  --color-result-detail-font: #fff;
+  --color-result-detail-label-font: lightgray;
+  --color-result-detail-background: #000;
+  --color-result-detail-hr: #555;
+  --color-result-detail-link: #8af;
+  --color-result-detail-loader-border: rgba(255, 255, 255, 0.2);
+  --color-result-detail-loader-borderleft: rgba(0, 0, 0, 0);
+  --color-result-image-span-background-hover: rgba(0, 0, 0, 0.6);
+  --color-result-image-span-font: #fff;
+  --color-result-image-background: #8af;
+  --color-settings-tr-hover: #2d2d2d;
+  --color-settings-engine-description-font: #909090;
+  --color-toolkit-badge-font: #fff;
+  --color-toolkit-badge-background: #777;
+  --color-toolkit-kbd-font: #000;
+  --color-toolkit-kbd-background: #fff;
+  --color-toolkit-dialog-border: #555;
+  --color-toolkit-dialog-background: #222;
+  --color-toolkit-tabs-label-border: #222;
+  --color-toolkit-tabs-section-border: #555;
+  --color-toolkit-select-border: #555;
+  --color-toolkit-select-border-hover: #777;
+  --color-toolkit-input-text-font: #fff;
+  --color-toolkit-input-text-border: #555;
+  --color-toolkit-input-text-border-hover: #777;
+  --color-toolkit-checkbox-onoff-background: #3c3b31;
+  --color-toolkit-checkbox-onoff-label-background: #58f;
+  --color-toolkit-checkbox-onoff-checked-background: #ddd;
+  --color-toolkit-checkbox-label-background: #fff;
+  --color-toolkit-checkbox-label-border: #333;
+  --color-toolkit-checkbox-input-border: #58f;
+  --color-toolkit-engine-tooltip-border: #333;
+  --color-toolkit-engine-tooltip-background: #222;
+  --color-toolkit-loader-border: rgba(255, 255, 255, 0.2);
+  --color-toolkit-loader-borderleft: rgba(0, 0, 0, 0);
+}
 /*
 * SearXNG, A privacy-respecting, hackable metasearch engine
 */
@@ -1601,10 +1685,14 @@ select:focus {
     background-color: var(--color-base-background);
   }
   @media (prefers-color-scheme: dark) {
-    select {
+    html.theme-auto select,
+    html.theme-dark select {
       background-image: url("data:image/svg+xml;charset=UTF-8,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%0A%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%22512%22%20height%3D%22512%22%20viewBox%3D%220%200%20512%20512%22%3E%0A%3Cg%3E%3Cpolygon%20fill%3D%22%23ddd%22%20points%3D%22128%2C192%20256%2C320%20384%2C192%22%2F%3E%3C%2Fg%3E%0A%3C%2Fsvg%3E");
     }
   }
+  html.theme-dark select {
+    background-image: url("data:image/svg+xml;charset=UTF-8,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%0A%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%22512%22%20height%3D%22512%22%20viewBox%3D%220%200%20512%20512%22%3E%0A%3Cg%3E%3Cpolygon%20fill%3D%22%23ddd%22%20points%3D%22128%2C192%20256%2C320%20384%2C192%22%2F%3E%3C%2Fg%3E%0A%3C%2Fsvg%3E");
+  }
 }
 /* -- checkbox-onoff -- */
 @supports (border-radius: 50px) {
diff --git a/searx/static/themes/simple/css/searxng-rtl.min.css b/searx/static/themes/simple/css/searxng-rtl.min.css
index f4134fceb..f7746b5a9 100644
Binary files a/searx/static/themes/simple/css/searxng-rtl.min.css and b/searx/static/themes/simple/css/searxng-rtl.min.css differ
diff --git a/searx/static/themes/simple/css/searxng-rtl.min.css.map b/searx/static/themes/simple/css/searxng-rtl.min.css.map
index ee9f543d7..048871108 100644
Binary files a/searx/static/themes/simple/css/searxng-rtl.min.css.map and b/searx/static/themes/simple/css/searxng-rtl.min.css.map differ
diff --git a/searx/static/themes/simple/css/searxng.css b/searx/static/themes/simple/css/searxng.css
index 27feda2f3..500b556a0 100644
--- a/searx/static/themes/simple/css/searxng.css
+++ b/searx/static/themes/simple/css/searxng.css
@@ -819,7 +819,7 @@ template {
   --color-toolkit-loader-borderleft: rgba(255, 255, 255, 0);
 }
 @media (prefers-color-scheme: dark) {
-  :root {
+  :root.theme-auto {
     --color-base-font: #bbb;
     --color-base-font-rgb: 187, 187, 187;
     --color-base-background: #222;
@@ -904,6 +904,90 @@ template {
     --color-toolkit-loader-borderleft: rgba(0, 0, 0, 0);
   }
 }
+:root.theme-dark {
+  --color-base-font: #bbb;
+  --color-base-font-rgb: 187, 187, 187;
+  --color-base-background: #222;
+  --color-url-font: #8af;
+  --color-url-visited-font: #96b;
+  --color-header-background: #181818;
+  --color-header-border: #333;
+  --color-footer-background: #181818;
+  --color-footer-border: #333;
+  --color-sidebar-border: #555;
+  --color-sidebar-font: #fff;
+  --color-backtotop-font: #bbb;
+  --color-backtotop-border: #333;
+  --color-backtotop-background: #181818;
+  --color-btn-background: #58f;
+  --color-btn-font: #222;
+  --color-search-border: #555;
+  --color-search-background: #222;
+  --color-search-font: #fff;
+  --color-search-background-hover: #58f;
+  --color-error: #f55b5b;
+  --color-error-background: #390a0a;
+  --color-warning: #f1d561;
+  --color-warning-background: #39300a;
+  --color-success: #79f56e;
+  --color-success-background: #0e390a;
+  --color-categories-item-selected-font: #58f;
+  --color-categories-item-border-selected: #58f;
+  --color-autocomplete-font: #fff;
+  --color-autocomplete-border: #555;
+  --color-autocomplete-background: #222;
+  --color-autocomplete-background-hover: #181818;
+  --color-answer-border: #333;
+  --color-answer-font: #bbb;
+  --color-answer-background: #181818;
+  --color-result-border: #333;
+  --color-result-url-font: #fff;
+  --color-result-vim-selected: #181818;
+  --color-result-vim-arrow: #8af;
+  --color-result-description-highlight-font: #fff;
+  --color-result-link-font: #8af;
+  --color-result-link-font-highlight: #8af;
+  --color-result-link-visited-font: #96b;
+  --color-result-publishdate-font: #777;
+  --color-result-engines-font: #777;
+  --color-result-search-url-border: #555;
+  --color-result-search-url-font: #fff;
+  --color-result-detail-font: #fff;
+  --color-result-detail-label-font: lightgray;
+  --color-result-detail-background: #000;
+  --color-result-detail-hr: #555;
+  --color-result-detail-link: #8af;
+  --color-result-detail-loader-border: rgba(255, 255, 255, 0.2);
+  --color-result-detail-loader-borderleft: rgba(0, 0, 0, 0);
+  --color-result-image-span-background-hover: rgba(0, 0, 0, 0.6);
+  --color-result-image-span-font: #fff;
+  --color-result-image-background: #8af;
+  --color-settings-tr-hover: #2d2d2d;
+  --color-settings-engine-description-font: #909090;
+  --color-toolkit-badge-font: #fff;
+  --color-toolkit-badge-background: #777;
+  --color-toolkit-kbd-font: #000;
+  --color-toolkit-kbd-background: #fff;
+  --color-toolkit-dialog-border: #555;
+  --color-toolkit-dialog-background: #222;
+  --color-toolkit-tabs-label-border: #222;
+  --color-toolkit-tabs-section-border: #555;
+  --color-toolkit-select-border: #555;
+  --color-toolkit-select-border-hover: #777;
+  --color-toolkit-input-text-font: #fff;
+  --color-toolkit-input-text-border: #555;
+  --color-toolkit-input-text-border-hover: #777;
+  --color-toolkit-checkbox-onoff-background: #3c3b31;
+  --color-toolkit-checkbox-onoff-label-background: #58f;
+  --color-toolkit-checkbox-onoff-checked-background: #ddd;
+  --color-toolkit-checkbox-label-background: #fff;
+  --color-toolkit-checkbox-label-border: #333;
+  --color-toolkit-checkbox-input-border: #58f;
+  --color-toolkit-engine-tooltip-border: #333;
+  --color-toolkit-engine-tooltip-background: #222;
+  --color-toolkit-loader-border: rgba(255, 255, 255, 0.2);
+  --color-toolkit-loader-borderleft: rgba(0, 0, 0, 0);
+}
 /*
 * SearXNG, A privacy-respecting, hackable metasearch engine
 */
@@ -1601,10 +1685,14 @@ select:focus {
     background-color: var(--color-base-background);
   }
   @media (prefers-color-scheme: dark) {
-    select {
+    html.theme-auto select,
+    html.theme-dark select {
       background-image: url("data:image/svg+xml;charset=UTF-8,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%0A%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%22512%22%20height%3D%22512%22%20viewBox%3D%220%200%20512%20512%22%3E%0A%3Cg%3E%3Cpolygon%20fill%3D%22%23ddd%22%20points%3D%22128%2C192%20256%2C320%20384%2C192%22%2F%3E%3C%2Fg%3E%0A%3C%2Fsvg%3E");
     }
   }
+  html.theme-dark select {
+    background-image: url("data:image/svg+xml;charset=UTF-8,%3C%3Fxml%20version%3D%221.0%22%20encoding%3D%22utf-8%22%3F%3E%0A%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%22512%22%20height%3D%22512%22%20viewBox%3D%220%200%20512%20512%22%3E%0A%3Cg%3E%3Cpolygon%20fill%3D%22%23ddd%22%20points%3D%22128%2C192%20256%2C320%20384%2C192%22%2F%3E%3C%2Fg%3E%0A%3C%2Fsvg%3E");
+  }
 }
 /* -- checkbox-onoff -- */
 @supports (border-radius: 50px) {
diff --git a/searx/static/themes/simple/css/searxng.min.css b/searx/static/themes/simple/css/searxng.min.css
index 6e08f1ff3..dc3243411 100644
Binary files a/searx/static/themes/simple/css/searxng.min.css and b/searx/static/themes/simple/css/searxng.min.css differ
diff --git a/searx/static/themes/simple/css/searxng.min.css.map b/searx/static/themes/simple/css/searxng.min.css.map
index 04485519e..3abcd3400 100644
Binary files a/searx/static/themes/simple/css/searxng.min.css.map and b/searx/static/themes/simple/css/searxng.min.css.map differ
diff --git a/searx/static/themes/simple/js/searxng.head.js b/searx/static/themes/simple/js/searxng.head.js
index d359a9174..21b1754bf 100644
--- a/searx/static/themes/simple/js/searxng.head.js
+++ b/searx/static/themes/simple/js/searxng.head.js
@@ -27,5 +27,10 @@
     };
 
     // update the css
-    d.getElementsByTagName("html")[0].className = (w.searxng.touch)?"js touch":"js";
+    var hmtlElement = d.getElementsByTagName("html")[0];
+    hmtlElement.classList.remove('no-js');
+    hmtlElement.classList.add('js');
+    if (w.searxng.touch) {
+        hmtlElement.classList.add('touch');
+    }
 })(window, document);
\ No newline at end of file
diff --git a/searx/static/themes/simple/js/searxng.head.min.js b/searx/static/themes/simple/js/searxng.head.min.js
index af2f861e8..f42fcbe77 100644
Binary files a/searx/static/themes/simple/js/searxng.head.min.js and b/searx/static/themes/simple/js/searxng.head.min.js differ
diff --git a/searx/static/themes/simple/js/searxng.head.min.js.map b/searx/static/themes/simple/js/searxng.head.min.js.map
index a7533ce8b..5c841a70d 100644
Binary files a/searx/static/themes/simple/js/searxng.head.min.js.map and b/searx/static/themes/simple/js/searxng.head.min.js.map differ
diff --git a/searx/static/themes/simple/js/searxng.min.js.map b/searx/static/themes/simple/js/searxng.min.js.map
index 3f941fbce..040648c1f 100644
Binary files a/searx/static/themes/simple/js/searxng.min.js.map and b/searx/static/themes/simple/js/searxng.min.js.map differ