diff --git a/core/ui/PageTemplate/sidebar.tid b/core/ui/PageTemplate/sidebar.tid
index 642289418..2d8e2bcac 100644
--- a/core/ui/PageTemplate/sidebar.tid
+++ b/core/ui/PageTemplate/sidebar.tid
@@ -2,28 +2,18 @@ title: $:/core/ui/PageTemplate/sidebar
 tags: $:/tags/PageTemplate
 
 \whitespace trim
-\define config-title()
-$:/config/SideBarSegments/Visibility/$(listItem)$
-\end
+\function config-title() [[$:/config/SideBarSegments/Visibility/$(listItem)$]substitute[]]
 
 <$scrollable fallthrough="no" class="tc-sidebar-scrollable">
-
-<div class="tc-sidebar-header">
-
-<$reveal state="$:/state/sidebar" type="match" text="yes" default="yes" retain="yes" animate="yes">
-
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/SideBarSegment]!has[draft.of]]" variable="listItem">
-
-<$reveal type="nomatch" state=<<config-title>> text="hide"  tag="div">
-
-<$transclude tiddler=<<listItem>> mode="block"/>
-
-</$reveal>
-
-</$list>
-
-</$reveal>
-
-</div>
-
+	<$reveal state="$:/state/sidebar"
+		tag="div" class="tc-sidebar-header"
+		type="match" text="yes" default="yes"
+		retain="yes" animate="yes"
+	>
+		<$list filter="[all[shadows+tiddlers]tag[$:/tags/SideBarSegment]!has[draft.of]]" variable="listItem">
+			<$reveal type="nomatch" state=<<config-title>> text="hide" tag="div">
+				<$transclude $tiddler=<<listItem>> $mode="block"/>
+			</$reveal>
+		</$list>
+	</$reveal>
 </$scrollable>