diff --git a/README.md b/README.md
index d990004..8040ada 100644
--- a/README.md
+++ b/README.md
@@ -367,18 +367,6 @@ As an alternative, you may use [Shariff](https://github.com/heiseonline/shariff)
 
 For a detailed description of each setting, refer to [data attributes](https://github.com/heiseonline/shariff#options-data-attributes) description at the [Shariff README](https://github.com/heiseonline/shariff).
 
-### Tipue Search
-
-This theme has support for the
-[Tipue Search plugin](https://github.com/getpelican/pelican-plugins/tree/master/tipue_search).
-
-All you have to do, is:
-- enable the plugin, and the theme will add a search box on the right
-  side of the menu
-- Add `'search'` to the `DIRECT_TEMPLATES` in your `pelicanconf.py`. E.g. `DIRECT_TEMPLATES = ('index', 'categories', 'authors', 'archives', 'search').
-By default, the Tipue search page is configured at "/search.html", but you can override that with the `SEARCH_URL` 
-setting, which comes in handy if you have fancy rewrite rules in your Apache or Nginx configuration.
-
 ### Flattr
 
 This theme has support for linking your domain with [Flattr](https://flattr.com). To enable this provide your `FLATTR_ID`. Be aware that you will also have to go [Flattr's domain settings](https://flattr.com/settings/domains) and link your domain.
diff --git a/templates/article.html b/templates/article.html
index 6abc958..25bb30f 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -85,7 +85,9 @@
                         {% include "includes/article_info.html" %}
                     </div>
                 </div>
+				<main>
                 {{ article.content }}
+				</main>
             </div>
             <!-- /.entry-content -->
             {% include 'includes/related-posts.html' %}
diff --git a/templates/base.html b/templates/base.html
index 3e4dd76..0c3ff20 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -144,12 +144,8 @@
 -->
 					</ul>
 					{% if 'search' in PLUGINS %}
-					<form class="form-inline my-2 my-lg-0" action="{{ SITEURL }}/search.html">
 					Search: <input data-stork="sitesearch" />
 					<div data-stork="sitesearch-output"></div>
-					<input class="form-control mr-sm-2 search-query" type="text" placeholder="" name="q" id="search_input" pattern=".{3,}" required>
-					<button class="btn btn-secondary my-2 my-sm-0 search_button" type="submit"><div class="search_icon">&#9906;</div></button>
-					</form>
 					{% endif %}
 				</div>
 			</div>
diff --git a/templates/search.html b/templates/search.html
deleted file mode 100644
index fb11f8c..0000000
--- a/templates/search.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% extends 'base.html' %}
-
-{% block title %}
-{{ _('Search') }} - {{ super() }}
-{% endblock %}
-
-{% block content %}
-<div data-stork="sitesearch-output"></div>
-{% endblock %}