diff --git a/core/ui/ControlPanel.tid b/core/ui/ControlPanel.tid
index 0171d1692..f6a4cecbd 100644
--- a/core/ui/ControlPanel.tid
+++ b/core/ui/ControlPanel.tid
@@ -1,3 +1,5 @@
 title: $:/ControlPanel
 
-<div class="tw-control-panel"><<tabs "[is[shadow]!has[draft.of]tag[$:/tags/ControlPanel]] [!is[shadow]!has[draft.of]tag[$:/tags/ControlPanel]] +[tag[$:/tags/ControlPanel]]" "$:/core/ui/ControlPanel/Basics">></div>
+<div class="tw-control-panel">
+<<tabs "[is[shadow]!has[draft.of]tag[$:/tags/ControlPanel]] [!is[shadow]!has[draft.of]tag[$:/tags/ControlPanel]] +[tag[$:/tags/ControlPanel]]" "$:/core/ui/ControlPanel/Basics">>
+</div>
diff --git a/core/ui/ControlPanel/Advanced.tid b/core/ui/ControlPanel/Advanced.tid
index 9ba7e742e..987aa5c65 100644
--- a/core/ui/ControlPanel/Advanced.tid
+++ b/core/ui/ControlPanel/Advanced.tid
@@ -4,4 +4,6 @@ caption: {{$:/language/ControlPanel/Advanced/Caption}}
 
 {{$:/language/ControlPanel/Advanced/Hint}}
 
-<div class="tw-control-panel"><<tabs "[is[shadow]!has[draft.of]tag[$:/tags/ControlPanel/Advanced]] [!is[shadow]!has[draft.of]tag[$:/tags/ControlPanel/Advanced]] +[tag[$:/tags/ControlPanel/Advanced]]" "$:/core/ui/ControlPanel/Advanced/TiddlerFields">></div>
+<div class="tw-control-panel">
+<<tabs "[is[shadow]!has[draft.of]tag[$:/tags/ControlPanel/Advanced]] [!is[shadow]!has[draft.of]tag[$:/tags/ControlPanel/Advanced]] +[tag[$:/tags/ControlPanel/Advanced]]" "$:/core/ui/ControlPanel/Advanced/TiddlerFields">>
+</div>
diff --git a/core/ui/ControlPanel/Appearance.tid b/core/ui/ControlPanel/Appearance.tid
index 2c424ac6a..519fc791c 100644
--- a/core/ui/ControlPanel/Appearance.tid
+++ b/core/ui/ControlPanel/Appearance.tid
@@ -4,4 +4,6 @@ caption: {{$:/language/ControlPanel/Appearance/Caption}}
 
 {{$:/language/ControlPanel/Appearance/Hint}}
 
-<div class="tw-control-panel"><<tabs "[is[shadow]!has[draft.of]tag[$:/tags/ControlPanel/Appearance]] [!is[shadow]!has[draft.of]tag[$:/tags/ControlPanel/Appearance]] +[tag[$:/tags/ControlPanel/Appearance]]" "$:/core/ui/ControlPanel/Appearance/Theme">></div>
+<div class="tw-control-panel">
+<<tabs "[is[shadow]!has[draft.of]tag[$:/tags/ControlPanel/Appearance]] [!is[shadow]!has[draft.of]tag[$:/tags/ControlPanel/Appearance]] +[tag[$:/tags/ControlPanel/Appearance]]" "$:/core/ui/ControlPanel/Appearance/Theme">>
+</div>
diff --git a/core/ui/ListItemTemplate.tid b/core/ui/ListItemTemplate.tid
index 008847b31..b85dda4c7 100644
--- a/core/ui/ListItemTemplate.tid
+++ b/core/ui/ListItemTemplate.tid
@@ -1,4 +1,7 @@
 title: $:/core/ui/ListItemTemplate
 
-<div class="tw-menu-list-item"><$link to={{!!title}}><$view field="title"/></$link>
+<div class="tw-menu-list-item">
+<$link to={{!!title}}>
+<$view field="title"/>
+</$link>
 </div>
\ No newline at end of file
diff --git a/core/ui/MissingTemplate.tid b/core/ui/MissingTemplate.tid
index 415dc9d1c..850aa7fe6 100644
--- a/core/ui/MissingTemplate.tid
+++ b/core/ui/MissingTemplate.tid
@@ -1,8 +1,14 @@
 title: $:/core/ui/MissingTemplate
 
-<div class="tw-tiddler-missing"><$button popup=<<qualify "$:/state/missingpopup">> class="btn-invisible tw-missing-tiddler-label"><$view field="title" format="text" /></$button>
-<$reveal state=<<qualify "$:/state/missingpopup">> type="popup" position="below" animate="yes"><div class="tw-drop-down">
+<div class="tw-tiddler-missing">
+<$button popup=<<qualify "$:/state/missingpopup">> class="btn-invisible tw-missing-tiddler-label">
+<$view field="title" format="text" />
+</$button>
+<$reveal state=<<qualify "$:/state/missingpopup">> type="popup" position="below" animate="yes">
+<div class="tw-drop-down">
 <$transclude tiddler="$:/core/ui/ListItemTemplate"/>
 <hr>
 <$list filter="[is[current]backlinks[]sort[title]]" template="$:/core/ui/ListItemTemplate"/>
-</div></$reveal></div>
+</div>
+</$reveal>
+</div>
diff --git a/core/ui/PageMacros.tid b/core/ui/PageMacros.tid
index 8aec1f640..294d8f5f8 100644
--- a/core/ui/PageMacros.tid
+++ b/core/ui/PageMacros.tid
@@ -7,7 +7,12 @@ title: $:/core/ui/PageMacros
 <<colour $name$>>
 \end
 \define tabs(tabsList,default,state:"$:/state/tab")
-<div class="tw-tab-buttons"><$list filter="$tabsList$" variable="currentTab"><$button set=<<qualify "$state$">> setTo=<<currentTab>> default="$default$" selectedClass="tw-tab-selected"><$transclude tiddler=<<currentTab>> field="caption"><$macrocall $name="currentTab" $type="text/plain" $output="text/plain"/></$transclude> </$button>
+<div class="tw-tab-buttons">
+<$list filter="$tabsList$" variable="currentTab">
+<$button set=<<qualify "$state$">> setTo=<<currentTab>> default="$default$" selectedClass="tw-tab-selected">
+<$transclude tiddler=<<currentTab>> field="caption">
+<$macrocall $name="currentTab" $type="text/plain" $output="text/plain"/>
+</$transclude> </$button>
 </$list>
 </div>
 <div class="tw-tab-divider"/>
diff --git a/core/ui/SideBarLists.tid b/core/ui/SideBarLists.tid
index ceb9de19a..747d66799 100644
--- a/core/ui/SideBarLists.tid
+++ b/core/ui/SideBarLists.tid
@@ -2,7 +2,15 @@ title: $:/core/ui/SideBarLists
 
 <div class="tw-sidebar-lists">
 
-<div class="tw-search"><$edit-text tiddler="$:/temp/search" type="search" tag="input"/> <$reveal state="$:/temp/search" type="nomatch" text=""><$linkcatcher to="$:/temp/search"><$link to="" class="btn-invisible">{{$:/core/images/close-button}}</$link></$linkcatcher></$reveal><$reveal state="$:/temp/search" type="match" text=""> &nbsp;<$link to="$:/AdvancedSearch" class="btn-invisible">&hellip;</$link></$reveal></div>
+<div class="tw-search">
+<$edit-text tiddler="$:/temp/search" type="search" tag="input"/> <$reveal state="$:/temp/search" type="nomatch" text="">
+<$linkcatcher to="$:/temp/search">
+<$link to="" class="btn-invisible">{{$:/core/images/close-button}}</$link>
+</$linkcatcher>
+</$reveal>
+<$reveal state="$:/temp/search" type="match" text=""> &nbsp;<$link to="$:/AdvancedSearch" class="btn-invisible">&hellip;</$link>
+</$reveal>
+</div>
 
 <$reveal state="$:/temp/search" type="nomatch" text="">
 
diff --git a/core/ui/TagManager.tid b/core/ui/TagManager.tid
index 09410e6c9..42a30ba13 100644
--- a/core/ui/TagManager.tid
+++ b/core/ui/TagManager.tid
@@ -6,7 +6,10 @@ title: $:/TagManager
 <$reveal state=<<qualify "$:/state/iconDropdown/$title$">> type="nomatch" text="" default="">
 <$linkcatcher to="$title$!!icon">
 <div class="tw-block-dropdown tw-edit-type-dropdown">
-<$list filter="[is[shadow]is[image]] [!is[shadow]is[image]] [is[shadow]tag[$:/tags/Image]] [!is[shadow]tag[$:/tags/Image]] +[sort[title]]"><$link to={{!!title}}><$view field="title"/></$link>
+<$list filter="[is[shadow]is[image]] [!is[shadow]is[image]] [is[shadow]tag[$:/tags/Image]] [!is[shadow]tag[$:/tags/Image]] +[sort[title]]">
+<$link to={{!!title}}>
+<$view field="title"/>
+</$link>
 </$list>
 </div>
 </$linkcatcher>
diff --git a/core/ui/TiddlerFieldTemplate.tid b/core/ui/TiddlerFieldTemplate.tid
index a91813f40..0a990810a 100644
--- a/core/ui/TiddlerFieldTemplate.tid
+++ b/core/ui/TiddlerFieldTemplate.tid
@@ -1,3 +1,10 @@
 title: $:/core/ui/TiddlerFieldTemplate
 
-<tr class="tw-view-field"><td class="tw-view-field-name"><<listItem>></td><td class="tw-view-field-value"><$view field=<<listItem>>/></td></tr>
\ No newline at end of file
+<tr class="tw-view-field">
+<td class="tw-view-field-name">
+<<listItem>>
+</td>
+<td class="tw-view-field-value">
+<$view field=<<listItem>>/>
+</td>
+</tr>
\ No newline at end of file
diff --git a/core/ui/TiddlerFields.tid b/core/ui/TiddlerFields.tid
index 897615dd0..f73d028be 100644
--- a/core/ui/TiddlerFields.tid
+++ b/core/ui/TiddlerFields.tid
@@ -1,5 +1,7 @@
 title: $:/core/ui/TiddlerFields
 
-<table class="tw-view-field-table"><tbody><$list filter="[is[current]fields[]sort[title]] -text" template="$:/core/ui/TiddlerFieldTemplate" variable="listItem"/>
+<table class="tw-view-field-table">
+<tbody>
+<$list filter="[is[current]fields[]sort[title]] -text" template="$:/core/ui/TiddlerFieldTemplate" variable="listItem"/>
 </tbody>
 </table>
diff --git a/core/ui/UntaggedTemplate.tid b/core/ui/UntaggedTemplate.tid
index 4d28c851f..3bc170c8c 100644
--- a/core/ui/UntaggedTemplate.tid
+++ b/core/ui/UntaggedTemplate.tid
@@ -1,7 +1,11 @@
 title: $:/core/ui/UntaggedTemplate
 
 \define lingo-base() $:/language/SideBar/
-<$button popup=<<qualify "$:/state/tagpopup">> class="btn-invisible tw-untagged-label tw-tag-label"><<lingo Tags/Untagged/Caption>></$button>
-<$reveal state=<<qualify "$:/state/tagpopup">> type="popup" position="below"><div class="tw-drop-down">
+<$button popup=<<qualify "$:/state/tagpopup">> class="btn-invisible tw-untagged-label tw-tag-label">
+<<lingo Tags/Untagged/Caption>>
+</$button>
+<$reveal state=<<qualify "$:/state/tagpopup">> type="popup" position="below">
+<div class="tw-drop-down">
 <$list filter="[untagged[]!is[system]] -[tags[]] +[sort[title]]" template="$:/core/ui/ListItemTemplate"/>
-</div></$reveal>
+</div>
+</$reveal>
diff --git a/core/ui/ViewTemplate/subtitle.tid b/core/ui/ViewTemplate/subtitle.tid
index a82054d60..5856dd70e 100644
--- a/core/ui/ViewTemplate/subtitle.tid
+++ b/core/ui/ViewTemplate/subtitle.tid
@@ -1,4 +1,8 @@
 title: $:/core/ui/ViewTemplate/subtitle
 tags: $:/tags/ViewTemplate
 
-<div class="tw-subtitle"><$link to={{!!modifier}}><$view field="modifier"/></$link> <$view field="modified" format="relativedate"/></div>
+<div class="tw-subtitle">
+<$link to={{!!modifier}}>
+<$view field="modifier"/>
+</$link> <$view field="modified" format="relativedate"/>
+</div>