diff --git a/docs/custom_theme/searchbox.html b/docs/custom_theme/searchbox.html
new file mode 100644
index 00000000..33ed3e24
--- /dev/null
+++ b/docs/custom_theme/searchbox.html
@@ -0,0 +1,5 @@
+<div role="search">
+  <form id ="rtd-search-form-alt" class="wy-form" action="{{ base_url }}/search.html" method="get">
+    <input type="text" name="q" placeholder="Search docs" />
+  </form>
+</div>
diff --git a/mkdocs.yml b/mkdocs.yml
index b81da566..87642eb3 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -3,6 +3,8 @@ site_url: http://hyperledger-fabric.readthedocs.io
 theme: readthedocs
 repo_url: http://gerrit.hyperledger.org/r/fabric
 site_description: 'Welcome to the Hyperledger fabric documentation'
+strict: true
+theme_dir: 'docs/custom_theme'
 
 pages:
 - Home: index.md