diff --git a/_shared_assets/themes/owncloud/layout.html b/_shared_assets/themes/owncloud/layout.html
index b65ee22d2..7f6e87cfc 100644
--- a/_shared_assets/themes/owncloud/layout.html
+++ b/_shared_assets/themes/owncloud/layout.html
@@ -164,9 +164,11 @@
 					<div class="sidebar">
 						<div class="well">
 							<div class="menu-support-container">
-                <a href="{{ pathto(master_doc) }}">Overview</a>
 								<ul id="menu-support" class="menu">
-                  {{ toctree(maxdepth=2) }}
+									<ul>
+										<li><a href="{{ pathto(master_doc) }}">Overview</a></li>
+									</ul>
+                  {{ toctree(maxdepth=3) }}
 								</ul>
 							</div>
 						</div>
diff --git a/_shared_assets/themes/owncloud/static/style.css b/_shared_assets/themes/owncloud/static/style.css
index 8bb5cf966..37eb790a5 100644
--- a/_shared_assets/themes/owncloud/static/style.css
+++ b/_shared_assets/themes/owncloud/static/style.css
@@ -1090,12 +1090,10 @@ img.alignleft{ margin-right: 20px; }
 		font-weight: bold;
 	}
 
-.indextable a {
-	color: #fefefe;
-}
 
 .indextable dt {
-	border-radius: 5px;
+	border-radius: 0;
+	background-color: #fefefe !important;
 }
 
 .headerlink {
@@ -1110,3 +1108,17 @@ tt.file {
 tt.file:before {
     content: "file: ";
 }
+
+.fixed_table_of_contents {
+	position: fixed;
+	top: 132px;
+}
+
+.documentation_content {
+	margin-left: 260px;
+}
+
+#menu-support > ul {
+	margin-left: 15px;
+	padding-left: 0;
+}
diff --git a/developer_manual/templates.rst b/developer_manual/templates.rst
index 7afe8c912..5bb559fb7 100644
--- a/developer_manual/templates.rst
+++ b/developer_manual/templates.rst
@@ -58,11 +58,12 @@ Templates can also include other templates by using the $this->inc('templateName
 
 
 
-Template class
---------------
+OC_Template
+-----------
 
 .. php:class:: OC_Template
 
+
   This class provides the templates for owncloud. It is used for loading template files, assign variables to it and render the whole template.
 
   .. php:method:: __construct($app, $name[, $renderas])
@@ -274,6 +275,9 @@ Template class
 
 Template syntax
 ---------------
+html_select_options
+~~~~~~~~~~~~~~~~~~~
+
 .. php:function::  html_select_options($options, $selected[, $params])
 
   :param array $options: an array of the form value => label