diff --git a/source/atemplates/layout.html b/source/atemplates/sidebar.html
similarity index 97%
rename from source/atemplates/layout.html
rename to source/atemplates/sidebar.html
index cfd6ae8e..bf579019 100644
--- a/source/atemplates/layout.html
+++ b/source/atemplates/sidebar.html
@@ -1,6 +1,4 @@
-{% extends "!layout.html" %}
-
-{% block sidebarsearch %}
+<div class="customsidebar">
   <div class="sphinxlocaltoc">
   <h3>{{ _('Useful Pages') }}</h3>
     <ul><li><ul>
@@ -20,7 +18,6 @@ <h3>{{ _('Useful Pages') }}</h3>
     <li><a href="http://dev-call.fuelcycle.org" target="_blank"><span style="font-variant:small-caps">Cyclus</span> Developers Hangout Link</a>
     </ul></li></ul>
   </div>
-    {{ super() }}
     <h3>Get Cyclus</h3>
     <br>
     Current version: <b>1.5.5</b>
@@ -53,4 +50,4 @@ <h3>Acknowledgements</h3>
     <a href="http://www.anl.gov" target="_blank"><img src="{{ pathto("_static/nnsa.png", 1) }}" width=150px></a>
 
 
-{% endblock %}
+</div>
diff --git a/source/conf.py b/source/conf.py
index 6d668117..957b2019 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -193,7 +193,9 @@
 #html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
+html_sidebars = {
+    '**': [ 'searchbox.html', 'sidebar.html']
+}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.