diff --git a/core/ui/ExportTiddlyWikiCore.tid b/core/ui/ExportTiddlyWikiCore.tid
index a6bb68c13..8c85c87a4 100644
--- a/core/ui/ExportTiddlyWikiCore.tid
+++ b/core/ui/ExportTiddlyWikiCore.tid
@@ -3,20 +3,30 @@ title: $:/core/ui/ExportTiddlyWikiCore
 \define jsFileName() tiddlywikicore-$(version)$.js
 \define noExportMsg()
 It appears that you have a wiki with an external ~TiddlyWiki core. The export action cannot be performed.
-<p>You will need to view the page source in your browser. Then go to the very bottom the the source, find the last `<script>` 
+<p>You will need to view the page source in your browser. Then go to the very bottom the the source, find the last `<script>`
 element, and right-click its `src` URI. Save the link as ''$(jsFileName)$''</p>
 \end
+\rules except wikilink
+\whitespace trim
 
 ''For advanced users''
 
-Export the ~TiddlyWiki core ~JavaScript code for running with external ~JavaScript:
+Export the TiddlyWiki core JavaScript code for running with external JavaScript:
 
-<$button tooltip="Export the ~TiddlyWiki core code for running with external ~JavaScript" aria-label="export TiddlyWiki core" class="tc-btn-big-green">
-<$list filter="[[$:/boot/boot.js]is[missing]]" variable="ignore" emptyMessage="""<$action-sendmessage $message="tm-download-file" $param="$:/core/templates/tiddlywiki5.js" filename=<<jsFileName>>/>""" >
+<$button
+	tooltip="Export the TiddlyWiki core code for running with external JavaScript"
+	aria-label="export TiddlyWiki core"
+	class="tc-btn-big-green">
+<$list
+	filter="[[$:/boot/boot.js]is[missing]]"
+	variable="ignore"
+	emptyMessage="<$action-sendmessage $message='tm-download-file' $param='$:/core/templates/tiddlywiki5.js' filename=<<jsFileName>>/>" >
 <$action-setfield $tiddler=<<qualify "$:/temp/alert">> text=<<noExportMsg>> subtitle="Export ~TiddllyWiki Core"/>
 <$action-sendmessage $message="tm-modal" $param=<<qualify "$:/temp/alert">>/>
 </$list>
-{{$:/core/images/download-button}} Download ~TiddlyWiki core
+{{$:/core/images/download-button}}
+&#32;
+Download TiddlyWiki core
 </$button>
 
 [[Further information|https://tiddlywiki.com/#Using%20the%20external%20JavaScript%20template]]
diff --git a/core/ui/KeyboardShortcuts/advanced-search.tid b/core/ui/KeyboardShortcuts/advanced-search.tid
index 6b98006bf..79c9df619 100644
--- a/core/ui/KeyboardShortcuts/advanced-search.tid
+++ b/core/ui/KeyboardShortcuts/advanced-search.tid
@@ -2,6 +2,7 @@ title: $:/core/ui/KeyboardShortcuts/advanced-search
 tags: $:/tags/KeyboardShortcut
 key: ((advanced-search))
 
+\whitespace trim
 <$navigator story="$:/StoryList" history="$:/HistoryList">
 <$action-navigate $to="$:/AdvancedSearch"/>
 <$action-sendmessage $message="tm-focus-selector" $param="""[data-tiddler-title="$:/AdvancedSearch"] .tc-search input""" preventScroll="true"/>
diff --git a/core/ui/KeyboardShortcuts/change-sidebar-layout.tid b/core/ui/KeyboardShortcuts/change-sidebar-layout.tid
index 6c9a45bc5..1c1c3ae76 100644
--- a/core/ui/KeyboardShortcuts/change-sidebar-layout.tid
+++ b/core/ui/KeyboardShortcuts/change-sidebar-layout.tid
@@ -2,7 +2,9 @@ title: $:/core/ui/KeyboardShortcuts/change-sidebar-layout
 tags: $:/tags/KeyboardShortcut
 key: ((change-sidebar-layout))
 
-<$list filter="[{$:/themes/tiddlywiki/vanilla/options/sidebarlayout}match[fixed-fluid]]" 
-emptyMessage="""<$action-setfield $tiddler="$:/themes/tiddlywiki/vanilla/options/sidebarlayout" text="fixed-fluid"/>""">
+\whitespace trim
+<$list
+	filter="[{$:/themes/tiddlywiki/vanilla/options/sidebarlayout}match[fixed-fluid]]"
+	emptyMessage="<$action-setfield $tiddler='$:/themes/tiddlywiki/vanilla/options/sidebarlayout' text='fixed-fluid'/>">
 <$action-setfield $tiddler="$:/themes/tiddlywiki/vanilla/options/sidebarlayout" text="fluid-fixed"/>
 </$list>
diff --git a/core/ui/KeyboardShortcuts/new-image.tid b/core/ui/KeyboardShortcuts/new-image.tid
index de9f0d207..115d77c6a 100644
--- a/core/ui/KeyboardShortcuts/new-image.tid
+++ b/core/ui/KeyboardShortcuts/new-image.tid
@@ -2,6 +2,7 @@ title: $:/core/ui/KeyboardShortcuts/new-image
 tags: $:/tags/KeyboardShortcut
 key: ((new-image))
 
+\whitespace trim
 <$navigator story="$:/StoryList" history="$:/HistoryList" openLinkFromInsideRiver={{$:/config/Navigation/openLinkFromInsideRiver}} openLinkFromOutsideRiver={{$:/config/Navigation/openLinkFromOutsideRiver}} relinkOnRename={{$:/config/RelinkOnRename}}>
 {{$:/core/ui/Actions/new-image}}
 </$navigator>
diff --git a/core/ui/KeyboardShortcuts/new-journal.tid b/core/ui/KeyboardShortcuts/new-journal.tid
index 466e361da..e302eb33f 100644
--- a/core/ui/KeyboardShortcuts/new-journal.tid
+++ b/core/ui/KeyboardShortcuts/new-journal.tid
@@ -2,6 +2,7 @@ title: $:/core/ui/KeyboardShortcuts/new-journal
 tags: $:/tags/KeyboardShortcut
 key: ((new-journal))
 
+\whitespace trim
 <$navigator story="$:/StoryList" history="$:/HistoryList" openLinkFromInsideRiver={{$:/config/Navigation/openLinkFromInsideRiver}} openLinkFromOutsideRiver={{$:/config/Navigation/openLinkFromOutsideRiver}} relinkOnRename={{$:/config/RelinkOnRename}}>
 {{$:/core/ui/Actions/new-journal}}
 </$navigator>
diff --git a/core/ui/KeyboardShortcuts/new-tiddler.tid b/core/ui/KeyboardShortcuts/new-tiddler.tid
index 91177411a..b52ad2a40 100644
--- a/core/ui/KeyboardShortcuts/new-tiddler.tid
+++ b/core/ui/KeyboardShortcuts/new-tiddler.tid
@@ -2,6 +2,7 @@ title: $:/core/ui/KeyboardShortcuts/new-tiddler
 tags: $:/tags/KeyboardShortcut
 key: ((new-tiddler))
 
+\whitespace trim
 <$navigator story="$:/StoryList" history="$:/HistoryList" openLinkFromInsideRiver={{$:/config/Navigation/openLinkFromInsideRiver}} openLinkFromOutsideRiver={{$:/config/Navigation/openLinkFromOutsideRiver}} relinkOnRename={{$:/config/RelinkOnRename}}>
 {{$:/core/ui/Actions/new-tiddler}}
 </$navigator>
diff --git a/core/ui/KeyboardShortcuts/save-wiki.tid b/core/ui/KeyboardShortcuts/save-wiki.tid
index 15210e6b5..86dd61da8 100644
--- a/core/ui/KeyboardShortcuts/save-wiki.tid
+++ b/core/ui/KeyboardShortcuts/save-wiki.tid
@@ -2,6 +2,7 @@ title: $:/core/ui/KeyboardShortcuts/save-wiki
 tags: $:/tags/KeyboardShortcut
 key: ((save-wiki))
 
+\whitespace trim
 <$wikify name="site-title" text={{$:/config/SaveWikiButton/Filename}}>
 <$action-sendmessage $message="tm-save-wiki" $param={{$:/config/SaveWikiButton/Template}} filename=<<site-title>>/>
 </$wikify>
diff --git a/core/ui/KeyboardShortcuts/toggle-sidebar.tid b/core/ui/KeyboardShortcuts/toggle-sidebar.tid
index ab9ef8583..227b2c9db 100644
--- a/core/ui/KeyboardShortcuts/toggle-sidebar.tid
+++ b/core/ui/KeyboardShortcuts/toggle-sidebar.tid
@@ -2,8 +2,9 @@ title: $:/core/ui/KeyboardShortcuts/toggle-sidebar
 tags: $:/tags/KeyboardShortcut
 key: ((toggle-sidebar))
 
-<$list filter="[[$:/state/sidebar]is[missing]] [{$:/state/sidebar}removeprefix[yes]]" emptyMessage="""
-<$action-setfield $tiddler="$:/state/sidebar" text="yes"/>
-""">
+\whitespace trim
+<$list
+	filter="[[$:/state/sidebar]is[missing]] [{$:/state/sidebar}removeprefix[yes]]"
+	emptyMessage="<$action-setfield $tiddler='$:/state/sidebar' text='yes'/>">
 <$action-setfield $tiddler="$:/state/sidebar" text="no"/>
 </$list>
diff --git a/core/ui/ListItemTemplate.tid b/core/ui/ListItemTemplate.tid
index 3887e1263..51597a37a 100644
--- a/core/ui/ListItemTemplate.tid
+++ b/core/ui/ListItemTemplate.tid
@@ -1,5 +1,3 @@
 title: $:/core/ui/ListItemTemplate
 
-<div class="tc-menu-list-item">
-<$link />
-</div>
\ No newline at end of file
+<div class="tc-menu-list-item"><$link /></div>
\ No newline at end of file
diff --git a/core/ui/MissingTemplate.tid b/core/ui/MissingTemplate.tid
index 66be1a1e0..0332623f7 100644
--- a/core/ui/MissingTemplate.tid
+++ b/core/ui/MissingTemplate.tid
@@ -1,5 +1,6 @@
 title: $:/core/ui/MissingTemplate
 
+\whitespace trim
 <div class="tc-tiddler-missing">
 <$button popup=<<qualify "$:/state/popup/missing">> class="tc-btn-invisible tc-missing-tiddler-label">
 <$view field="title" format="text" />
diff --git a/core/ui/MoreSideBar/Types.tid b/core/ui/MoreSideBar/Types.tid
index a23d729bb..afa110a15 100644
--- a/core/ui/MoreSideBar/Types.tid
+++ b/core/ui/MoreSideBar/Types.tid
@@ -2,6 +2,7 @@ title: $:/core/ui/MoreSideBar/Types
 tags: $:/tags/MoreSideBar
 caption: {{$:/language/SideBar/Types/Caption}}
 
+\whitespace trim
 <$list filter={{$:/core/Filters/TypedTiddlers!!filter}}>
 <div class="tc-menu-list-item">
 <$view field="type"/>
diff --git a/core/ui/PageStylesheet.tid b/core/ui/PageStylesheet.tid
index 952124b62..f7df349e9 100644
--- a/core/ui/PageStylesheet.tid
+++ b/core/ui/PageStylesheet.tid
@@ -1,6 +1,7 @@
 title: $:/core/ui/PageStylesheet
 
 \import [[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]
+\whitespace trim
 
 <$set name="currentTiddler" value={{$:/language}}>
 
diff --git a/core/ui/PluginInfo.tid b/core/ui/PluginInfo.tid
index d8944bf35..0e699f4fa 100644
--- a/core/ui/PluginInfo.tid
+++ b/core/ui/PluginInfo.tid
@@ -9,6 +9,7 @@ $(currentTiddler)$/$(currentTab)$
 \define default-tiddler-title()
 $:/core/ui/PluginInfo/Default/$(currentTab)$
 \end
+\whitespace trim
 <$transclude tiddler=<<localised-info-tiddler-title>> mode="block">
 <$transclude tiddler=<<currentTiddler>> subtiddler=<<localised-info-tiddler-title>> mode="block">
 <$transclude tiddler=<<currentTiddler>> subtiddler=<<info-tiddler-title>> mode="block">
diff --git a/core/ui/PluginInfoDefaultContents.tid b/core/ui/PluginInfoDefaultContents.tid
index b5685f327..9cf3250bc 100644
--- a/core/ui/PluginInfoDefaultContents.tid
+++ b/core/ui/PluginInfoDefaultContents.tid
@@ -1,6 +1,7 @@
 title: $:/core/ui/PluginInfo/Default/contents
 
 \define lingo-base() $:/language/TiddlerInfo/Advanced/PluginInfo/
+\whitespace trim
 <<lingo Hint>>
 <ul>
 <$list filter="[all[current]plugintiddlers[]sort[title]]" emptyMessage=<<lingo Empty/Hint>>>
diff --git a/core/ui/SearchResults.tid b/core/ui/SearchResults.tid
index 0fc832df4..fe73f2789 100644
--- a/core/ui/SearchResults.tid
+++ b/core/ui/SearchResults.tid
@@ -2,13 +2,15 @@ title: $:/core/ui/SearchResults
 
 <div class="tc-search-results">
 
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]butfirst[]limit[1]]" emptyMessage="""
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]">
-<$transclude mode="block"/>
-</$list>
-""">
+<$list
+	filter="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]butfirst[]limit[1]]"
+	emptyMessage="<$list filter='[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]'><$transclude mode='block'/></$list>">
 
-<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]" default={{$:/config/SearchResults/Default}} actions="""<$action-setfield $tiddler="$:/state/search/currentTab" text=<<currentTab>>/>""" explicitState="$:/state/tab/search-results/sidebar"/>
+<$macrocall $name="tabs"
+	tabsList="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]"
+	default={{$:/config/SearchResults/Default}}
+	actions="<$action-setfield $tiddler='$:/state/search/currentTab' text=<<currentTab>>/>"
+	explicitState="$:/state/tab/search-results/sidebar"/>
 
 </$list>
 
diff --git a/core/ui/SideBar/More.tid b/core/ui/SideBar/More.tid
index 2d3acd38f..93c25aec2 100644
--- a/core/ui/SideBar/More.tid
+++ b/core/ui/SideBar/More.tid
@@ -2,6 +2,7 @@ title: $:/core/ui/SideBar/More
 tags: $:/tags/SideBar
 caption: {{$:/language/SideBar/More/Caption}}
 
+\whitespace trim
 <div class="tc-more-sidebar">
 <$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/MoreSideBar]!has[draft.of]]" default={{$:/config/DefaultMoreSidebarTab}} state="$:/state/tab/moresidebar" class="tc-vertical tc-sidebar-tabs-more" explicitState="$:/state/tab/moresidebar-1850697562"/>
 </div>
diff --git a/core/ui/TiddlerFieldTemplate.tid b/core/ui/TiddlerFieldTemplate.tid
index ac528a818..c699a870e 100644
--- a/core/ui/TiddlerFieldTemplate.tid
+++ b/core/ui/TiddlerFieldTemplate.tid
@@ -1,5 +1,6 @@
 title: $:/core/ui/TiddlerFieldTemplate
 
+\whitespace trim
 <tr class="tc-view-field">
 <td class="tc-view-field-name">
 <$text text=<<listItem>>/>
diff --git a/core/ui/TiddlerFields.tid b/core/ui/TiddlerFields.tid
index 5bf74c9a4..921ace393 100644
--- a/core/ui/TiddlerFields.tid
+++ b/core/ui/TiddlerFields.tid
@@ -1,5 +1,6 @@
 title: $:/core/ui/TiddlerFields
 
+\whitespace trim
 <table class="tc-view-field-table">
 <tbody>
 <$list filter="[all[current]fields[]sort[title]] -text" template="$:/core/ui/TiddlerFieldTemplate" variable="listItem"/>
diff --git a/core/ui/TiddlerInfo.tid b/core/ui/TiddlerInfo.tid
index 6385ca379..045fe8dec 100644
--- a/core/ui/TiddlerInfo.tid
+++ b/core/ui/TiddlerInfo.tid
@@ -1,5 +1,6 @@
 title: $:/core/ui/TiddlerInfo
 
+\whitespace trim
 <div style="position:relative;">
 <div class="tc-tiddler-controls" style="position:absolute;right:0;">
 <$reveal state="$:/config/TiddlerInfo/Mode" type="match" text="sticky">
diff --git a/core/ui/TiddlerInfo/Advanced.tid b/core/ui/TiddlerInfo/Advanced.tid
index 2742a8398..17c477ac9 100644
--- a/core/ui/TiddlerInfo/Advanced.tid
+++ b/core/ui/TiddlerInfo/Advanced.tid
@@ -5,4 +5,5 @@ caption: {{$:/language/TiddlerInfo/Advanced/Caption}}
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/TiddlerInfo/Advanced]!has[draft.of]]" variable="listItem">
 
 <$transclude tiddler=<<listItem>> mode="block"/>
+
 </$list>
diff --git a/core/ui/TiddlerInfo/Advanced/PluginInfo.tid b/core/ui/TiddlerInfo/Advanced/PluginInfo.tid
index 9d487c19f..3a58cd255 100644
--- a/core/ui/TiddlerInfo/Advanced/PluginInfo.tid
+++ b/core/ui/TiddlerInfo/Advanced/PluginInfo.tid
@@ -2,6 +2,7 @@ title: $:/core/ui/TiddlerInfo/Advanced/PluginInfo
 tags: $:/tags/TiddlerInfo/Advanced
 
 \define lingo-base() $:/language/TiddlerInfo/Advanced/PluginInfo/
+\whitespace trim
 <$list filter="[all[current]has[plugin-type]]">
 
 ! <<lingo Heading>>
diff --git a/core/ui/TiddlerInfo/Advanced/ShadowInfo.tid b/core/ui/TiddlerInfo/Advanced/ShadowInfo.tid
index 9d42bbac2..960cfed6b 100644
--- a/core/ui/TiddlerInfo/Advanced/ShadowInfo.tid
+++ b/core/ui/TiddlerInfo/Advanced/ShadowInfo.tid
@@ -19,6 +19,7 @@ tags: $:/tags/TiddlerInfo/Advanced
 <$list filter="[all[current]shadowsource[]]">
 
 <$set name="pluginTiddler" value=<<currentTiddler>>>
+
 <<lingo Shadow/Source>>
 </$set>
 
diff --git a/core/ui/TopRightBar/menu.tid b/core/ui/TopRightBar/menu.tid
index f9fe839ab..3ea1ccf8f 100644
--- a/core/ui/TopRightBar/menu.tid
+++ b/core/ui/TopRightBar/menu.tid
@@ -1,6 +1,7 @@
 title: $:/core/ui/TopBar/menu
 tags: $:/tags/TopRightBar
 
+\whitespace trim
 <$list filter="[[$:/state/sidebar]get[text]] +[else[yes]!match[no]]" variable="ignore">
 <$button set="$:/state/sidebar" setTo="no" tooltip={{$:/language/Buttons/HideSideBar/Hint}} aria-label={{$:/language/Buttons/HideSideBar/Caption}} class="tc-btn-invisible tc-hide-sidebar-btn">{{$:/core/images/chevron-right}}</$button>
 </$list>
diff --git a/core/ui/UntaggedTemplate.tid b/core/ui/UntaggedTemplate.tid
index 17cd082c5..95ebcd695 100644
--- a/core/ui/UntaggedTemplate.tid
+++ b/core/ui/UntaggedTemplate.tid
@@ -1,6 +1,7 @@
 title: $:/core/ui/UntaggedTemplate
 
 \define lingo-base() $:/language/SideBar/
+\whitespace trim
 <$button popup=<<qualify "$:/state/popup/tag">> class="tc-btn-invisible tc-untagged-label tc-tag-label">
 <<lingo Tags/Untagged/Caption>>
 </$button>
diff --git a/core/wiki/debugstylesheets.tid b/core/wiki/debugstylesheets.tid
index 39621d2e9..474b65971 100644
--- a/core/wiki/debugstylesheets.tid
+++ b/core/wiki/debugstylesheets.tid
@@ -1,5 +1,6 @@
 title: $:/snippets/DebugStylesheets
 
+\whitespace trim
 <style>[test]{list-style:'❌'}</style>
 <ul>
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/Stylesheet]has[modified]]" counter="n">
diff --git a/core/wiki/title.tid b/core/wiki/title.tid
index d1f36adf2..e2e8bef3f 100644
--- a/core/wiki/title.tid
+++ b/core/wiki/title.tid
@@ -1,6 +1,7 @@
 title: $:/core/wiki/title
 
+\whitespace trim
 {{$:/SiteTitle}}
 <$list filter="[{$:/SiteSubtitle}trim[]minlength[1]]" variable="ignore">
---- {{$:/SiteSubtitle}}
+&#32;---&#32;{{$:/SiteSubtitle}}
 </$list>
\ No newline at end of file