diff --git a/README.md b/README.md
index 725b920..e899b08 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ The minimalist [Pelican](http://blog.getpelican.com/) theme.
 - [Representative image](https://github.com/getpelican/pelican-plugins/tree/master/representative_image)
 - [Neighbors](https://github.com/getpelican/pelican-plugins/tree/master/neighbors)
 - [Pelican Search](https://github.com/pelican-plugins/search)
-- [Tipue Search](https://github.com/getpelican/pelican-plugins/blob/master/tipue_search/)
+- [Tipue Search](https://github.com/getpelican/pelican-plugins/blob/master/tipue_search/) (deprecated)
 - [SEO](https://github.com/pelican-plugins/seo)
 
 ## Install
diff --git a/templates/base.html b/templates/base.html
index 005e690..6b715e9 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -78,10 +78,7 @@
   {% endif %}
 
   {% if PLUGINS and 'pelican.plugins.search' in PLUGINS %}
-    {% if THEME_COLOR_AUTO_DETECT_BROWSER_PREFERENCE or not THEME_COLOR or THEME_COLOR == "light" %}
       <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/stork/stork-dark.css" />
-    {% endif %}
-
   {% endif %}
 
   <link rel="stylesheet" type="text/css" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/font-awesome/css/fontawesome.css">
@@ -316,17 +313,6 @@
 
   {% block additional_js %}{% endblock %}
   
-  {% if PLUGINS and 'pelican.plugins.search' in PLUGINS %}
-  {% if STORK_VERSION %}
-  <script src="https://files.stork-search.net/releases/v{{ STORK_VERSION }}/stork.js"></script>
-  <script>
-    {% else %}
-    <script src="{{ SITEURL }}/static/stork.js"></script>
-  <script>
-          stork.initialize("{{ SITEURL }}/static/stork.wasm")
-          {% endif %}
-          stork.register("sitesearch", "{{ SITEURL }}/search-index.st", {showProgress: false})
-  </script>
-  {% endif %}
+  {% include 'partial/stork_search.html' %}
 </body>
 </html>
diff --git a/templates/partial/stork_search.html b/templates/partial/stork_search.html
new file mode 100644
index 0000000..c514940
--- /dev/null
+++ b/templates/partial/stork_search.html
@@ -0,0 +1,12 @@
+{% if PLUGINS and 'pelican.plugins.search' in PLUGINS %}
+{% if STORK_VERSION %}
+<script src="https://files.stork-search.net/releases/v{{ STORK_VERSION }}/stork.js"></script>
+<script>
+    {% else %}
+    <script src="{{ SITEURL }}/static/stork.js"></script>
+<script>
+        stork.initialize("{{ SITEURL }}/static/stork.wasm")
+        {% endif %}
+        stork.register("sitesearch", "{{ SITEURL }}/search-index.st", {showProgress: false})
+</script>
+{% endif %}