diff --git a/core/ui/EditorToolbar/link-dropdown.tid b/core/ui/EditorToolbar/link-dropdown.tid
index eacb17547..e2766935b 100644
--- a/core/ui/EditorToolbar/link-dropdown.tid
+++ b/core/ui/EditorToolbar/link-dropdown.tid
@@ -3,6 +3,7 @@ title: $:/core/ui/EditorToolbar/link-dropdown
 \define lingo-base() $:/language/Buttons/Link/
 
 \define add-link-actions()
+\whitespace trim
 <$action-sendmessage $message="tm-edit-text-operation" $param="make-link" text={{$(linkTiddler)$}} />
 <$action-deletetiddler $filter="[<dropdown-state>] [<searchTiddler>] [<linkTiddler>] [<storeTitle>] [<searchListState>]"/>
 \end
@@ -10,20 +11,22 @@ title: $:/core/ui/EditorToolbar/link-dropdown
 \define get-focus-selector() [data-tiddler-title="$(cssEscapedTitle)$"] .tc-create-wikitext-link input
 
 \define cancel-search-actions-inner()
-<$set name="userInput" value={{{ [<storeTitle>get[text]] }}}><$list filter="[<searchTiddler>get[text]!match<userInput>]" emptyMessage="""<$action-deletetiddler $filter="[<searchTiddler>] [<linkTiddler>] [<storeTitle>] [<searchListState>]"/>"""><$action-setfield $tiddler=<<searchTiddler>> text=<<userInput>>/><$action-setfield $tiddler=<<refreshTitle>> text="yes"/></$list></$set>
+<$set name="userInput" value={{{ [<storeTitle>get[text]] }}}><$list filter="[<searchTiddler>get[text]!match<userInput>]" emptyMessage="<$action-deletetiddler $filter='[<searchTiddler>] [<linkTiddler>] [<storeTitle>] [<searchListState>]'/>"><$action-setfield $tiddler=<<searchTiddler>> text=<<userInput>>/><$action-setfield $tiddler=<<refreshTitle>> text="yes"/></$list></$set>
 \end
 
-\define cancel-search-actions() <$list filter="[<storeTitle>!has[text]] +[<searchTiddler>!has[text]]" emptyMessage="""<<cancel-search-actions-inner>>"""><$action-sendmessage $message="tm-edit-text-operation" $param="focus-editor"/></$list>
+\define cancel-search-actions() <$list filter="[<storeTitle>!has[text]] +[<searchTiddler>!has[text]]" emptyMessage="<<cancel-search-actions-inner>>"><$action-sendmessage $message="tm-edit-text-operation" $param="focus-editor"/></$list>
 
 \define external-link()
+\whitespace trim
 <$button class="tc-btn-invisible" style="width: auto; display: inline-block; background-colour: inherit;" actions=<<add-link-actions>>>
 {{$:/core/images/chevron-right}}
 </$button>
 \end
 
-\define set-next-input-tab(beforeafter:"after") <$macrocall $name="change-input-tab" stateTitle="$:/state/tab/search-results/sidebar" tag="$:/tags/SearchResults" beforeafter="$beforeafter$" defaultState={{$:/config/SearchResults/Default}} actions="""<$action-setfield $tiddler="$:/state/search/currentTab" text=<<nextTab>>/>"""/>
+\define set-next-input-tab(beforeafter:"after") <$macrocall $name="change-input-tab" stateTitle="$:/state/tab/search-results/sidebar" tag="$:/tags/SearchResults" beforeafter="$beforeafter$" defaultState={{$:/config/SearchResults/Default}} actions="<$action-setfield $tiddler='$:/state/search/currentTab' text=<<nextTab>>/>"/>
 
 \define body(config-title)
+\whitespace trim
 ''<<lingo Hint>>''
 
 <$vars searchTiddler="""$config-title$/search""" linkTiddler="""$config-title$/link""" linktext="" searchListState=<<qualify "$:/temp/link-search/selected-item">> refreshTitle=<<qualify "$:/temp/link-search/refresh">> storeTitle=<<qualify "$:/temp/link-search/input">>>
@@ -33,13 +36,15 @@ title: $:/core/ui/EditorToolbar/link-dropdown
 <$keyboard key="((input-tab-left))" actions=<<set-next-input-tab "before">> class="tc-create-wikitext-link">
 <$macrocall $name="keyboard-driven-input" tiddler=<<searchTiddler>> storeTitle=<<storeTitle>>
 		selectionStateTitle=<<searchListState>> refreshTitle=<<refreshTitle>> type="search" filterMinLength="1"
-		tag="input" focus="true" class="tc-popup-handle" inputCancelActions=<<cancel-search-actions>> 
-		inputAcceptActions=<<add-link-actions>> placeholder={{$:/language/Search/Search}} default="" 
+		tag="input" focus="true" class="tc-popup-handle" inputCancelActions=<<cancel-search-actions>>
+		inputAcceptActions=<<add-link-actions>> placeholder={{$:/language/Search/Search}} default=""
 		configTiddlerFilter="[[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}]" />
 </$keyboard>
 </$keyboard>
+&#32;
 <$reveal tag="span" state=<<storeTitle>> type="nomatch" text="">
 <<external-link>>
+&#32;
 <$button class="tc-btn-invisible" style="width: auto; display: inline-block; background-colour: inherit;">
 <<cancel-search-actions>><$set name="cssEscapedTitle" value={{{ [<storyTiddler>escapecss[]] }}}><$action-sendmessage $message="tm-focus-selector" $param=<<get-focus-selector>>/></$set>
 {{$:/core/images/close-button}}
diff --git a/core/ui/ImportPreviews/Fields.tid b/core/ui/ImportPreviews/Fields.tid
index 58c167acb..6303cb7d5 100644
--- a/core/ui/ImportPreviews/Fields.tid
+++ b/core/ui/ImportPreviews/Fields.tid
@@ -2,6 +2,7 @@ title: $:/core/ui/ImportPreviews/Fields
 tags: $:/tags/ImportPreview
 caption: {{$:/language/Import/Listing/Preview/Fields}}
 
+\whitespace trim
 <table class="tc-view-field-table">
 <tbody>
 <$list filter="[<payloadTiddler>subtiddlerfields<currentTiddler>sort[]] -text" variable="fieldName">
diff --git a/core/ui/LayoutSwitcher.tid b/core/ui/LayoutSwitcher.tid
index 28bc19158..2c5243553 100644
--- a/core/ui/LayoutSwitcher.tid
+++ b/core/ui/LayoutSwitcher.tid
@@ -2,14 +2,26 @@ title: $:/snippets/LayoutSwitcher
 tags: $:/tags/ControlPanel/Appearance
 caption: {{$:/language/ControlPanel/LayoutSwitcher/Caption}}
 
+\whitespace trim
 <$linkcatcher to="$:/layout">
 <div class="tc-chooser">
 <$list filter="[all[tiddlers+shadows]tag[$:/tags/Layout]] [[$:/core/ui/PageTemplate]] +[!is[draft]sort[name]]">
-<$list filter="[{$:/layout}!has[text]]" variable="ignore" emptyMessage="""
-<$set name="cls" filter="[all[current]field:title{$:/layout}]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item"><div class=<<cls>>><$link to={{!!title}}>''<$transclude field="name"/>'' - <$transclude field="description"/></$link></div>
-</$set>
+<$list
+	filter="[{$:/layout}!has[text]]"
+	variable="ignore"
+	emptyMessage="""\whitespace trim
+		<$set name="cls" filter="[all[current]field:title{$:/layout}]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item">
+		<div class=<<cls>>>
+		<$link to={{!!title}}>
+		''<$transclude field="name"/>''&#32;-&#32;<$transclude field="description"/>
+		</$link></div></$set>
 """>
-<$set name="cls" filter="[all[current]field:title[$:/core/ui/PageTemplate]]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item"><div class=<<cls>>><$link to={{!!title}}>''<$transclude field="name"/>'' - <$transclude field="description"/></$link></div>
+<$set name="cls" filter="[all[current]field:title[$:/core/ui/PageTemplate]]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item">
+<div class=<<cls>>>
+<$link to={{!!title}}>
+''<$transclude field="name"/>''&#32;-&#32;<$transclude field="description"/>
+</$link>
+</div>
 </$set>
 </$list>
 </$list>
diff --git a/core/ui/ListTaggedCascade.tid b/core/ui/ListTaggedCascade.tid
index 3342838a2..e1116d09d 100644
--- a/core/ui/ListTaggedCascade.tid
+++ b/core/ui/ListTaggedCascade.tid
@@ -1,5 +1,6 @@
 title: $:/snippets/ListTaggedCascade
 
+\whitespace trim
 {{||$:/language/ControlPanel/Cascades/TagPrompt}}
 
 <ol>
diff --git a/core/ui/ViewTemplate/unfold.tid b/core/ui/ViewTemplate/unfold.tid
index edfccfa1f..68fc27117 100644
--- a/core/ui/ViewTemplate/unfold.tid
+++ b/core/ui/ViewTemplate/unfold.tid
@@ -1,6 +1,7 @@
 title: $:/core/ui/ViewTemplate/unfold
 tags: $:/tags/ViewTemplate
 
+\whitespace trim
 <$reveal tag="div" type="nomatch" state="$:/config/ViewToolbarButtons/Visibility/$:/core/ui/Buttons/fold-bar" text="hide">
 <$reveal tag="div" type="nomatch" stateTitle=<<folded-state>> text="hide" default="show" retain="yes" animate="yes">
 <$button tooltip={{$:/language/Buttons/Fold/Hint}} aria-label={{$:/language/Buttons/Fold/Caption}} class="tc-fold-banner">
diff --git a/core/wiki/allfields.tid b/core/wiki/allfields.tid
index 882f61567..f148640d4 100644
--- a/core/wiki/allfields.tid
+++ b/core/wiki/allfields.tid
@@ -3,5 +3,11 @@ title: $:/snippets/allfields
 \define renderfield(title)
 <tr class="tc-view-field"><td class="tc-view-field-name">''<$text text=<<__title__>>/>'':</td><td class="tc-view-field-value">//{{$:/language/Docs/Fields/$title$}}//</td></tr>
 \end
-<table class="tc-view-field-table"><tbody><$list filter="[fields[]sort[title]]" variable="listItem"><$macrocall $name="renderfield" title=<<listItem>>/></$list>
-</tbody></table>
+\whitespace trim
+<table class="tc-view-field-table">
+<tbody>
+<$list filter="[fields[]sort[title]]" variable="listItem">
+<$macrocall $name="renderfield" title=<<listItem>>/>
+</$list>
+</tbody>
+</table>
diff --git a/core/wiki/download-wiki-button.tid b/core/wiki/download-wiki-button.tid
index a31db59a8..69711ee0a 100644
--- a/core/wiki/download-wiki-button.tid
+++ b/core/wiki/download-wiki-button.tid
@@ -1,7 +1,8 @@
 title: $:/snippets/download-wiki-button
 
 \define lingo-base() $:/language/ControlPanel/Tools/Download/
+\whitespace trim
 <$button class="tc-btn-big-green">
 <$action-sendmessage $message="tm-download-file" $param="$:/core/save/all" filename="index.html"/>
-<<lingo Full/Caption>> {{$:/core/images/save-button}}
+<<lingo Full/Caption>>&#32;{{$:/core/images/save-button}}
 </$button>
\ No newline at end of file
diff --git a/core/wiki/minifocusswitcher.tid b/core/wiki/minifocusswitcher.tid
index 979db1f6c..5a0d16d6e 100644
--- a/core/wiki/minifocusswitcher.tid
+++ b/core/wiki/minifocusswitcher.tid
@@ -1,5 +1,6 @@
 title: $:/snippets/minifocusswitcher
 
+\whitespace trim
 <$select tiddler="$:/config/AutoFocus">
 <$list filter="title tags text type fields">
 <option value=<<currentTiddler>>><<currentTiddler>></option>
diff --git a/core/wiki/minilanguageswitcher.tid b/core/wiki/minilanguageswitcher.tid
index 91f2b7404..4079d0e9f 100644
--- a/core/wiki/minilanguageswitcher.tid
+++ b/core/wiki/minilanguageswitcher.tid
@@ -1,5 +1,6 @@
 title: $:/snippets/minilanguageswitcher
 
+\whitespace trim
 <$select tiddler="$:/language">
 <$list filter="[[$:/languages/en-GB]] [plugin-type[language]sort[title]]">
 <option value=<<currentTiddler>>><$view field="description"><$view field="name"><$view field="title"/></$view></$view></option>
diff --git a/core/wiki/minithemeswitcher.tid b/core/wiki/minithemeswitcher.tid
index 32b8060f8..5b3a9cfd8 100644
--- a/core/wiki/minithemeswitcher.tid
+++ b/core/wiki/minithemeswitcher.tid
@@ -1,7 +1,8 @@
 title: $:/snippets/minithemeswitcher
 
 \define lingo-base() $:/language/ControlPanel/Theme/
-<<lingo Prompt>> <$select tiddler="$:/theme">
+\whitespace trim
+<<lingo Prompt>>&#32;<$select tiddler="$:/theme">
 <$list filter="[plugin-type[theme]sort[title]]">
 <option value=<<currentTiddler>>><$view field="name"><$view field="title"/></$view></option>
 </$list>
diff --git a/core/wiki/modules.tid b/core/wiki/modules.tid
index fac2ef7d6..3861a9342 100644
--- a/core/wiki/modules.tid
+++ b/core/wiki/modules.tid
@@ -3,6 +3,7 @@ title: $:/snippets/modules
 \define describeModuleType(type)
 {{$:/language/Docs/ModuleTypes/$type$}}
 \end
+\whitespace trim
 <$list filter="[moduletypes[]]">
 
 !! <$macrocall $name="currentTiddler" $type="text/plain" $output="text/plain"/>
diff --git a/core/wiki/palettepreview.tid b/core/wiki/palettepreview.tid
index e3debf8d6..bfd0fe24d 100644
--- a/core/wiki/palettepreview.tid
+++ b/core/wiki/palettepreview.tid
@@ -1,5 +1,6 @@
 title: $:/snippets/palettepreview
 
+\whitespace trim
 <$set name="currentTiddler" value={{$:/palette}}>
 {{||$:/snippets/currpalettepreview}}
 </$set>
diff --git a/core/wiki/paletteswitcher.tid b/core/wiki/paletteswitcher.tid
index 42cda4481..e79c0aabe 100644
--- a/core/wiki/paletteswitcher.tid
+++ b/core/wiki/paletteswitcher.tid
@@ -1,8 +1,19 @@
 title: $:/snippets/paletteswitcher
 
+\whitespace trim
 <$linkcatcher to="$:/palette">
-<div class="tc-chooser"><$list filter="[all[shadows+tiddlers]tag[$:/tags/Palette]sort[name]]"><$set name="cls" filter="[all[current]prefix{$:/palette}]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item"><div class=<<cls>>><$link to={{!!title}}>''<$view field="name" format="text"/>'' - <$view field="description" format="text"/>{{||$:/snippets/currpalettepreview}}</$link>
-</div></$set>
+<div class="tc-chooser">
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/Palette]sort[name]]">
+<$set name="cls" filter="[all[current]prefix{$:/palette}]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item">
+<div class=<<cls>>>
+<$link to={{!!title}}>
+''<$view field="name" format="text"/>''
+&#32;-&#32;
+<$view field="description" format="text"/>
+{{||$:/snippets/currpalettepreview}}
+</$link>
+</div>
+</$set>
 </$list>
 </div>
 </$linkcatcher>
diff --git a/core/wiki/themeswitcher.tid b/core/wiki/themeswitcher.tid
index 4e8f8d759..6259af063 100644
--- a/core/wiki/themeswitcher.tid
+++ b/core/wiki/themeswitcher.tid
@@ -1,7 +1,16 @@
 title: $:/snippets/themeswitcher
 
+\whitespace trim
 <$linkcatcher to="$:/theme">
-<div class="tc-chooser"><$list filter="[plugin-type[theme]sort[title]]"><$set name="cls" filter="[all[current]field:title{$:/theme}] [[$:/theme]!has[text]addsuffix[s/tiddlywiki/vanilla]field:title<currentTiddler>] +[limit[1]]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item"><div class=<<cls>>><$link to={{!!title}}>''<$view field="name" format="text"/>'' <$view field="description" format="text"/></$link></div>
+<div class="tc-chooser">
+<$list filter="[plugin-type[theme]sort[title]]">
+<$set name="cls" filter="[all[current]field:title{$:/theme}] [[$:/theme]!has[text]addsuffix[s/tiddlywiki/vanilla]field:title<currentTiddler>] +[limit[1]]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item">
+<div class=<<cls>>><$link to={{!!title}}>
+''<$view field="name" format="text"/>''
+&#32;
+<$view field="description" format="text"/>
+</$link>
+</div>
 </$set>
 </$list>
 </div>
diff --git a/core/wiki/viewswitcher.tid b/core/wiki/viewswitcher.tid
index 011bf3cdb..b82fcb264 100644
--- a/core/wiki/viewswitcher.tid
+++ b/core/wiki/viewswitcher.tid
@@ -3,6 +3,7 @@ title: $:/snippets/viewswitcher
 \define icon()
 $:/core/images/storyview-$(storyview)$
 \end
+\whitespace trim
 <$linkcatcher to="$:/view">
 <div class="tc-chooser tc-viewswitcher">
 <$list filter="[storyviews[]]" variable="storyview">