diff --git a/src/_templates/navigation.html b/src/_templates/navigation.html
index d08bdd01..c7c5d4b6 100644
--- a/src/_templates/navigation.html
+++ b/src/_templates/navigation.html
@@ -1,4 +1,4 @@
-{{ toctree(includehidden=theme_sidebar_includehidden) }}
+{{ toctree(includehidden=theme_sidebar_includehidden, collapse=theme_sidebar_collapse) }}
 {% if theme_extra_nav_links %}
 <hr />
 <ul>
diff --git a/src/conf.py b/src/conf.py
index 1d83f076..42eeaca2 100644
--- a/src/conf.py
+++ b/src/conf.py
@@ -118,12 +118,12 @@ html_theme = 'alabaster'
 html_theme_options = {
     'logo': 'cdist-logo.jpeg',
     'description': 'usable configuration management',
-    'github_button': False,
+    'github_button': 'false',
     'extra_nav_links': {
         'Source code repository': 'https://code.ungleich.ch/ungleich-public/cdist',
         'ungleich Home': 'https://ungleich.ch',
     },
-    'show_powered_by': False,
+    'show_powered_by': 'false',
     'sidebar_width' : '300px',
     'font_family': 'Raleway',
     'head_font_family': 'Raleway',
@@ -169,6 +169,15 @@ html_extra_path = ['extra', 'speeches', ]
 
 # Custom sidebar templates, maps document names to template names.
 # html_sidebars = {}
+html_sidebars = {
+    '**': [
+        'about.html',
+        'navigation.html',
+        'relations.html',
+        'searchbox.html',
+        'donate.html',
+    ]
+}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
@@ -218,95 +227,3 @@ html_extra_path = ['extra', 'speeches', ]
 
 # Output file base name for HTML help builder.
 # htmlhelp_basename =
-
-# -- Options for LaTeX output ---------------------------------------------
-
-# latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-# 'papersize': 'letterpaper',
-
-# The font size ('10pt', '11pt' or '12pt').
-# 'pointsize': '10pt',
-
-# Additional stuff for the LaTeX preamble.
-# 'preamble': '',
-
-# Latex figure (float) alignment
-# 'figure_align': 'htbp',
-# }
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title,
-#  author, documentclass [howto, manual, or own class]).
-# latex_documents = []
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-# latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-# latex_use_parts = False
-
-# If true, show page references after internal links.
-# latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-# latex_show_urls = False
-
-# Documents to append as an appendix to all manuals.
-# latex_appendices = []
-
-# If false, no module index is generated.
-# latex_domain_indices = True
-
-
-# -- Options for manual page output ---------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-# root_mandir = os.path.dirname(os.path.realpath(__file__))
-# mandirs = []
-# for mansubdir in ('man1', 'man7'):
-#     mandirs.append((os.path.join(root_mandir, mansubdir), mansubdir[-1]))
-# man_pages = []
-# for mandir, section in mandirs:
-#     for root, dirs, files in os.walk(mandir):
-#         for fname in files:
-#             froot, fext = os.path.splitext(fname)
-#             if fext == '.rst':
-#                 man_page = (os.path.join('man' + str(section), froot),
-#                             froot, '', [], section)
-#                 man_pages.append(man_page)
-
-# man_pages = [
-#    ('cdist-type', 'cdist-type', 'cdist-type documentation',
-#         [author], 1),
-#    ('man7/cdist-type__file', 'cdist-type__file',
-#        '', [], 1),
-#    ('cdist-type__directory', 'cdist-type__directory',
-#        'cdist-type__directory documentation', [author], 1),
-# ]
-
-# If true, show URL addresses after external links.
-# man_show_urls = False
-
-
-# -- Options for Texinfo output -------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-# texinfo_documents = []
-
-# Documents to append as an appendix to all manuals.
-# texinfo_appendices = []
-
-# If false, no module index is generated.
-# texinfo_domain_indices = True
-
-# How to display URL addresses: 'footnote', 'no', or 'inline'.
-# texinfo_show_urls = 'footnote'
-
-# If true, do not generate a @detailmenu in the "Top" node's menu.
-# texinfo_no_detailmenu = False