Tweaks to themes

And shaking out some paragraph tags in the sidebar

core/ui/PageStylesheet.tid

@@ -46,6 +46,13 @@ background-image: -ms-linear-gradient($gradient$);
 \define datauri(title)
 <$macrocall $name="makedatauri" type={{$title$!!type}} text={{$title$}}/>
 \end
+\define if-sidebar(text)
+<$reveal state="$:/state/sidebar" type="match" text="yes" default="yes">$text$</$reveal>
+\end
+\define if-no-sidebar(text)
+<$reveal state="$:/state/sidebar" type="nomatch" text="yes" default="yes">$text$</$reveal>
+\end
+
 
 <$list filter="[all[tiddlers+shadows]tag[$:/tags/stylesheet]]">
 <$transclude/>

core/ui/PageTemplate/sidebar.tid

@@ -2,14 +2,37 @@ title: $:/core/ui/PageTemplate/sidebar
 tags: $:/tags/PageTemplate
 
 <$scrollable fallthrough="no" class="tw-sidebar-scrollable">
-	<div class="sidebar-header">
-		<$reveal state="$:/state/sidebar" type="match" text="yes" default="yes" retain="yes">
-			<div class="tw-site-title">{{$:/SiteTitle}}</div>
-			<div class="tw-site-subtitle">{{$:/SiteSubtitle}}</div>
-			<div class="tw-page-controls">
-				<$list filter="[all[tiddlers+shadows]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list>
-			</div>
-			{{$:/core/ui/SideBarLists}}
-		</$reveal>
-	</div>
+
+<div class="sidebar-header">
+
+<$reveal state="$:/state/sidebar" type="match" text="yes" default="yes" retain="yes">
+
+<div class="tw-site-title">
+
+<$transclude tiddler="$:/SiteTitle" mode="inline"/>
+
+</div>
+
+<div class="tw-site-subtitle">
+
+<$transclude tiddler="$:/SiteSubtitle" mode="inline"/>
+
+</div>
+
+<div class="tw-page-controls">
+
+<$list filter="[all[tiddlers+shadows]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem">
+
+<$transclude tiddler=<<listItem>> mode="inline"/>
+
+</$list>
+
+</div>
+
+<$transclude tiddler="$:/core/ui/SideBarLists" mode="inline"/>
+
+</$reveal>
+
+</div>
+
 </$scrollable>

core/ui/PageTemplate/topleftbar.tid

@@ -2,5 +2,7 @@ title: $:/core/ui/PageTemplate/topleftbar
 tags: $:/tags/PageTemplate
 
 <span class="tw-topbar tw-topbar-left">
+
 <$list filter="[all[tiddlers+shadows]tag[$:/tags/TopLeftBar]!has[draft.of]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list>
+
 </span>

core/ui/PageTemplate/toprightbar.tid

@@ -2,5 +2,7 @@ title: $:/core/ui/PageTemplate/toprightbar
 tags: $:/tags/PageTemplate
 
 <span class="tw-topbar tw-topbar-right">
+
 <$list filter="[all[tiddlers+shadows]tag[$:/tags/TopRightBar]!has[draft.of]]" variable="listItem"><$transclude tiddler=<<listItem>>/></$list>
+
 </span>