diff --git a/static/css-include/pelican.css b/static/css-include/pelican.css
index e0fa82a..fa73aa8 100644
--- a/static/css-include/pelican.css
+++ b/static/css-include/pelican.css
@@ -31,15 +31,15 @@
 /* This is the stuff for my reading library     */
 
 .wip {
-    width: 150px;
+    width: 170px;
     opacity: 75%;
     border: 5px solid #d11586
 }
 .read {
-    width: 150px;
+    width: 170px;
 }
 .dnf {
-    width: 150px;
+    width: 170px;
     opacity: 75%;
     filter: grayscale(100%);
 }
diff --git a/static/style.css b/static/style.css
index 81dfe37..ae665a5 100644
--- a/static/style.css
+++ b/static/style.css
@@ -83,3 +83,8 @@ form {
   height: 170px;
 }
 
+/* -- search ------------------------------------------------------------ */
+
+#search { margin-left: auto; 
+margin-right: 0;
+}
diff --git a/templates/base.html b/templates/base.html
index d045b2c..25fe15f 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -7,7 +7,9 @@
       <meta name="generator" content="Pelican" />
       <meta name="viewport" content="width=device-width, initial-scale=1.0">
       <link rel="stylesheet" href="{{ SITEURL }}/{{ THEME_STATIC_DIR }}/style.css">
+      {% if WEBMENTIONIOURL %}
       <link rel="webmention" href="https://webmention.io/jeffmackinnon.com/webmention" />
+      {% endif %}
 
 
       <!-- The CSS needs a little work, I want to keep it extra simple
@@ -57,6 +59,10 @@
     {% if TRACKING == True %}
       {% include 'include/trackingcode.html' %}
     {% endif %}
+
+    {% if ENABLE_SEARCH == True %}
+    <link rel="stylesheet" href="https://files.stork-search.net/basic.css" />
+    {% endif %}
   
   {% endblock head %}
 
@@ -74,7 +80,9 @@
     {% if (page and page.navminimal is defined )%}
       {% else %} 
     <header>
-      <hgroup><h1><a href="{{ SITEURL }}/">{{ SITENAME }}</a></h1>{% if SITESUBTITLE %}<p>{{ SITESUBTITLE }}</p>{% endif %}</hgroup>
+      <hgroup><h1><a href="{{ SITEURL }}/">{{ SITENAME }}</a></h1>
+      {% if SITESUBTITLE %}<p>{{ SITESUBTITLE }}</p>{% endif %}     
+      </hgroup>
       {% if BIO_IMAGE %}
       <img src="{{ SITEURL }}/images/{{ BIO_IMAGE }}" style="max-width: 75%; display: inline; float: center; border-radius: 50%;" />
       {% endif %}
@@ -108,8 +116,12 @@
           {% endfor %}
         </ul>
         {% endif %}
+        {% if ENABLE_SEARCH == True %}<input placeholder="search" style="float:right" data-stork="sitesearch" />
+        <div data-stork="sitesearch-output">
+        {% endif %}
         {% endif %}
       </nav>
+
       
     </header>
     {% endif %}
@@ -216,5 +228,16 @@
     {% block content_footer %}
     {% endblock %}
 
+
+    {% if ENABLE_SEARCH == True %}
+    <script src="https://files.stork-search.net/releases/v1.5.0/stork.js"></script>
+    <script>
+      stork.register("sitesearch", "{{ SITEURL }}/search-index.st");
+    </script>
+    {% endif %}
+
   </body>
 </html>
+
+
+