diff --git a/layouts/partials/sidebar.html b/layouts/partials/sidebar.html
index 030fcaa..9dd5c84 100644
--- a/layouts/partials/sidebar.html
+++ b/layouts/partials/sidebar.html
@@ -17,14 +17,14 @@
     <ul class="flex flex-col gap-1 md:hidden">
       {{/* Mobile Navigation */}}
       {{ $treeMobile := partialCached "sidebar/section-tree" site.Home site.Home }}
-      {{ template "sidebar-render-tree" (dict "context" site.Home "page" $context "tree" ($treeMobile | unmarshal)) }}
+      {{ partial "sidebar/render-tree" (dict "context" site.Home "page" $context "tree" ($treeMobile | unmarshal)) }}
       {{ partialCached "sidebar/extra" $context }}
     </ul>
 
     {{/* Sidebar on large screen */}}
     <ul class="flex flex-col gap-1 max-md:hidden">
       {{ $tree := partialCached "sidebar/section-tree" $navRoot $navRoot }}
-      {{ template "sidebar-render-tree" (dict "context" $navRoot "page" $context "tree" ($tree | unmarshal)) }}
+      {{ partial "sidebar/render-tree" (dict "context" $navRoot "page" $context "tree" ($tree | unmarshal)) }}
       {{ partialCached "sidebar/extra" $context }}
     </ul>
   </div>
@@ -32,44 +32,6 @@
   {{ partial "sidebar/switches" (dict "context" $context "disableSidebar" $disableSidebar) }}
 </aside>
 
-{{- define "sidebar-render-tree" -}}
-  {{- $context := .context -}}
-  {{- $page := .page -}}
-  {{- $pageLink := .page.RelPermalink -}}
-  {{- range .tree -}}
-    {{- $active := eq $pageLink .link -}}
-    {{- $shouldOpen := or (.open) (hasPrefix $pageLink .link) $active | default true }}
-    <li class="{{ if $shouldOpen }}open{{ end }}">
-      {{- template "sidebar-item-link" (dict "context" . "active" $active "title" .title "link" .link) -}}
-      {{- if .section -}}
-        {{- template "sidebar-render-tree-branch" (dict "context" $context "entry" .section "page" $page) -}}
-      {{- end -}}
-    </li>
-  {{ end }}
-{{- end -}}
-
-{{- define "sidebar-render-tree-branch" -}}
-  {{- $context := .context -}}
-  {{- $page := .page -}}
-  {{- $entry := .entry -}}
-  {{- $pageLink := .page.RelPermalink -}}
-
-  <div class="pt-1 ltr:pr-0 overflow-hidden transition-all ease-in-out duration-200">
-    <ul class='relative flex flex-col gap-1 before:absolute before:inset-y-1 before:w-px before:bg-gray-200 before:content-[""] ltr:ml-3 ltr:pl-3 ltr:before:left-0 rtl:mr-3 rtl:pr-3 rtl:before:right-0 dark:before:bg-neutral-800'>
-      {{- range $entry }}
-        {{- $active := eq $pageLink .link -}}
-        {{- $shouldOpen := or (.open) (hasPrefix $pageLink .link) $active | default true }}
-        <li class="flex flex-col gap-1 {{ if $shouldOpen }}open{{ end }}">
-          {{- template "sidebar-item-link" (dict "context" . "active" $active "title" .title "link" .link) -}}
-          {{- if .section -}}
-            {{- template "sidebar-render-tree-branch" (dict "context" $context "entry" .section "page" $page) -}}
-          {{- end -}}
-        </li>
-      {{- end -}}
-    </ul>
-  </div>
-{{- end -}}
-
 {{- define "partials/sidebar/mobile-search" -}}
   <div class="px-4 pt-4 md:hidden">
     {{- partialCached "search.html" . -}}
diff --git a/layouts/partials/sidebar/render-tree-branch.html b/layouts/partials/sidebar/render-tree-branch.html
new file mode 100644
index 0000000..457d294
--- /dev/null
+++ b/layouts/partials/sidebar/render-tree-branch.html
@@ -0,0 +1,19 @@
+{{- $context := .context -}}
+{{- $page := .page -}}
+{{- $entry := .entry -}}
+{{- $pageLink := .page.RelPermalink -}}
+
+<div class="pt-1 ltr:pr-0 overflow-hidden transition-all ease-in-out duration-200">
+  <ul class='relative flex flex-col gap-1 before:absolute before:inset-y-1 before:w-px before:bg-gray-200 before:content-[""] ltr:ml-3 ltr:pl-3 ltr:before:left-0 rtl:mr-3 rtl:pr-3 rtl:before:right-0 dark:before:bg-neutral-800'>
+    {{- range $entry }}
+      {{- $active := eq $pageLink .link -}}
+      {{- $shouldOpen := or (.open) (hasPrefix $pageLink .link) $active | default true }}
+      <li class="flex flex-col gap-1 {{ if $shouldOpen }}open{{ end }}">
+        {{- template "sidebar-item-link" (dict "context" . "active" $active "title" .title "link" .link) -}}
+        {{- if .section -}}
+          {{- partial "sidebar/render-tree-branch" (dict "context" $context "entry" .section "page" $page) -}}
+        {{- end -}}
+      </li>
+    {{- end -}}
+  </ul>
+</div>
diff --git a/layouts/partials/sidebar/render-tree.html b/layouts/partials/sidebar/render-tree.html
new file mode 100644
index 0000000..ac4c075
--- /dev/null
+++ b/layouts/partials/sidebar/render-tree.html
@@ -0,0 +1,13 @@
+{{- $context := .context -}}
+{{- $page := .page -}}
+{{- $pageLink := .page.RelPermalink -}}
+{{- range .tree -}}
+  {{- $active := eq $pageLink .link -}}
+  {{- $shouldOpen := or (.open) (hasPrefix $pageLink .link) $active | default true }}
+  <li class="{{ if $shouldOpen }}open{{ end }}">
+    {{- template "sidebar-item-link" (dict "context" . "active" $active "title" .title "link" .link) -}}
+    {{- if .section -}}
+      {{- partial "sidebar/render-tree-branch" (dict "context" $context "entry" .section "page" $page) -}}
+    {{- end -}}
+  </li>
+{{ end }}