diff --git a/.phpdoc/template/components/sidebar.html.twig b/.phpdoc/template/components/sidebar.html.twig
new file mode 100644
index 0000000..80488dd
--- /dev/null
+++ b/.phpdoc/template/components/sidebar.html.twig
@@ -0,0 +1,31 @@
+<input class="phpdocumentor-sidebar__menu-button" type="checkbox" id="sidebar-button" name="sidebar-button" />
+<label class="phpdocumentor-sidebar__menu-icon" for="sidebar-button">
+    Menu
+</label>
+<aside class="phpdocumentor-column -three phpdocumentor-sidebar">
+    {% for version in project.versions %}
+        {% for toc in version.tableOfContents %}
+        <section class="phpdocumentor-sidebar__category -{{ toc.name|lower }}">
+            <h2 class="phpdocumentor-sidebar__category-header">{{ toc.name|title }}</h2>
+                {% for root in toc.roots %}
+                    {{ toc(root, 'components/menu.html.twig', 1) }}
+                {% endfor %}
+        </section>
+        {% endfor %}
+    {% endfor %}
+
+    <section class="phpdocumentor-sidebar__category -reports">
+        <h2 class="phpdocumentor-sidebar__category-header">Reports</h2>
+        {% if project.settings.custom['graphs.enabled'] %}
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="graphs/classes.html">Class Diagram</a></h3>
+        {% endif %}
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/deprecated.html">Deprecated</a></h3>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/errors.html">Errors</a></h3>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="reports/markers.html">Markers</a></h3>
+    </section>
+
+    <section class="phpdocumentor-sidebar__category -index">
+        <h2 class="phpdocumentor-sidebar__category-header">Index</h2>
+        <h3 class="phpdocumentor-sidebar__root-package"><a href="indices/files.html">Files</a></h3>
+    </section>
+</aside>
diff --git a/.phpdoc/template/css/custom.css.twig b/.phpdoc/template/css/custom.css.twig
index bd6e01d..376befb 100644
--- a/.phpdoc/template/css/custom.css.twig
+++ b/.phpdoc/template/css/custom.css.twig
@@ -1,7 +1,43 @@
 aside.phpdocumentor-sidebar
-    h2.phpdocumentor-sidebar__category-header
 {
-    text-transform: capitalize;
+    display: flex;
+    flex-direction: column;
+}
+
+aside.phpdocumentor-sidebar
+    section.-documentation
+{
+    order: 1;
+}
+
+aside.phpdocumentor-sidebar
+    section.-packages
+{
+    order: 2;
+}
+
+aside.phpdocumentor-sidebar
+    section.-namespaces
+{
+    order: 3;
+}
+
+aside.phpdocumentor-sidebar
+    section.-reports
+{
+    order: 4;
+}
+
+aside.phpdocumentor-sidebar
+    section.-index
+{
+    order: 5;
+}
+
+aside.phpdocumentor-sidebar
+    ul.phpdocumentor-list
+{
+    padding: 0 var(--spacing-md) !important;
 }
 
 code.prettyprint
@@ -14,6 +50,22 @@ code.prettyprint
     padding: var(--spacing-xxxs);
 }
 
+div.phpdocumentor-content
+    div.section
+        ul
+{
+    padding-left: var(--spacing-lg);
+}
+
+div.phpdocumentor-content
+    div.section
+        ul
+            li
+{
+    padding-bottom: 0;
+}
+
+
 dl.phpdocumentor-table-of-contents
     dt.phpdocumentor-table-of-contents__entry.-documentation:before
 {