diff --git a/core/ui/AdvancedSearch/FilterButtons/delete.tid b/core/ui/AdvancedSearch/FilterButtons/delete.tid
index fea48a667..85d9b224e 100644
--- a/core/ui/AdvancedSearch/FilterButtons/delete.tid
+++ b/core/ui/AdvancedSearch/FilterButtons/delete.tid
@@ -1,6 +1,7 @@
 title: $:/core/ui/AdvancedSearch/Filter/FilterButtons/delete
 tags: $:/tags/AdvancedSearch/FilterButton
 
+\whitespace trim
 <$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
 <$button popup=<<qualify "$:/state/filterDeleteDropdown">> class="tc-btn-invisible">
 {{$:/core/images/delete-button}}
diff --git a/core/ui/AdvancedSearch/Standard.tid b/core/ui/AdvancedSearch/Standard.tid
index d3616de33..0690130e4 100644
--- a/core/ui/AdvancedSearch/Standard.tid
+++ b/core/ui/AdvancedSearch/Standard.tid
@@ -3,15 +3,17 @@ tags: $:/tags/AdvancedSearch
 caption: {{$:/language/Search/Standard/Caption}}
 
 \define lingo-base() $:/language/Search/
-\define set-next-input-tab(beforeafter:"after") <$macrocall $name="change-input-tab" stateTitle="$:/state/tab--1498284803" tag="$:/tags/AdvancedSearch" beforeafter="$beforeafter$" defaultState="$:/core/ui/AdvancedSearch/System" actions="""<$action-setfield $tiddler="$:/state/advancedsearch/currentTab" text=<<nextTab>>/>"""/>
+\define set-next-input-tab(beforeafter:"after") <$macrocall $name="change-input-tab" stateTitle="$:/state/tab--1498284803" tag="$:/tags/AdvancedSearch" beforeafter="$beforeafter$" defaultState="$:/core/ui/AdvancedSearch/System" actions="<$action-setfield $tiddler='$:/state/advancedsearch/currentTab' text=<<nextTab>>/>"/>
 
-\define next-search-tab(beforeafter:"after") <$macrocall $name="change-input-tab" stateTitle="$:/state/tab/search-results/advancedsearch" tag="$:/tags/SearchResults" beforeafter="$beforeafter$" defaultState={{$:/config/SearchResults/Default}} actions="""<$action-setfield $tiddler="$:/state/advancedsearch/standard/currentTab" text=<<nextTab>>/>"""/>
+\define next-search-tab(beforeafter:"after") <$macrocall $name="change-input-tab" stateTitle="$:/state/tab/search-results/advancedsearch" tag="$:/tags/SearchResults" beforeafter="$beforeafter$" defaultState={{$:/config/SearchResults/Default}} actions="<$action-setfield $tiddler='$:/state/advancedsearch/standard/currentTab' text=<<nextTab>>/>"/>
 
-\define cancel-search-actions() <$list filter="[{$:/temp/advancedsearch}!match{$:/temp/advancedsearch/input}]" emptyMessage="""<$action-deletetiddler $filter="[[$:/temp/advancedsearch]] [[$:/temp/advancedsearch/input]] [[$:/temp/advancedsearch/selected-item]]" />"""><$action-setfield $tiddler="$:/temp/advancedsearch/input" text={{$:/temp/advancedsearch}}/><$action-setfield $tiddler="$:/temp/advancedsearch/refresh" text="yes"/></$list><$action-sendmessage $message="tm-focus-selector" $param=""".tc-advanced-search input"""/>
+\define cancel-search-actions() <$list filter="[{$:/temp/advancedsearch}!match{$:/temp/advancedsearch/input}]" emptyMessage="<$action-deletetiddler $filter='[[$:/temp/advancedsearch]] [[$:/temp/advancedsearch/input]] [[$:/temp/advancedsearch/selected-item]]' />"><$action-setfield $tiddler="$:/temp/advancedsearch/input" text={{$:/temp/advancedsearch}}/><$action-setfield $tiddler="$:/temp/advancedsearch/refresh" text="yes"/></$list><$action-sendmessage $message="tm-focus-selector" $param=".tc-advanced-search input"/>
 
-\define input-accept-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="""<$list filter="[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]"><$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/></$list>"""><$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/></$list>
+\define input-accept-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="<$list filter='[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]'><$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/></$list>"><$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/></$list>
 
-\define input-accept-variant-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="""<$list filter="[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]"><$list filter="[<__tiddler__>get[text]minlength[1]]"><$action-sendmessage $message="tm-edit-tiddler" $param={{{  [<__tiddler__>get[text]] }}}/></$list></$list>"""><$list filter="[<__tiddler__>get[text]minlength[1]]"><$action-sendmessage $message="tm-edit-tiddler" $param={{{  [<__tiddler__>get[text]] }}}/></$list></$list>
+\define input-accept-variant-actions() <$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]" emptyMessage="<$list filter='[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]'><$list filter='[<__tiddler__>get[text]minlength[1]]'><$action-sendmessage $message='tm-edit-tiddler' $param={{{  [<__tiddler__>get[text]] }}}/></$list></$list>"><$list filter="[<__tiddler__>get[text]minlength[1]]"><$action-sendmessage $message="tm-edit-tiddler" $param={{{  [<__tiddler__>get[text]] }}}/></$list></$list>
+
+\whitespace trim
 
 <<lingo Standard/Hint>>
 
@@ -20,12 +22,19 @@ caption: {{$:/language/Search/Standard/Caption}}
 <$keyboard key="((input-tab-left))" actions=<<set-next-input-tab "before">>>
 <$keyboard key="shift-alt-Right" actions=<<next-search-tab>>>
 <$keyboard key="shift-alt-Left" actions=<<next-search-tab "before">>>
-<$macrocall $name="keyboard-driven-input" tiddler="$:/temp/advancedsearch/input" storeTitle="$:/temp/advancedsearch"
-		refreshTitle="$:/temp/advancedsearch/refresh" selectionStateTitle="$:/temp/advancedsearch/selected-item" type="search"
-		tag="input" focus={{$:/config/Search/AutoFocus}} inputCancelActions=<<cancel-search-actions>> 
-		inputAcceptActions=<<input-accept-actions>> inputAcceptVariantActions=<<input-accept-variant-actions>> 
-		configTiddlerFilter="[[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}]"
-		filterMinLength={{$:/config/Search/MinLength}}/>
+<$macrocall $name="keyboard-driven-input"
+	tiddler="$:/temp/advancedsearch/input"
+	storeTitle="$:/temp/advancedsearch"
+	refreshTitle="$:/temp/advancedsearch/refresh"
+	selectionStateTitle="$:/temp/advancedsearch/selected-item"
+	type="search"
+	tag="input"
+	focus={{$:/config/Search/AutoFocus}}
+	inputCancelActions=<<cancel-search-actions>>
+	inputAcceptActions=<<input-accept-actions>>
+	inputAcceptVariantActions=<<input-accept-variant-actions>>
+	configTiddlerFilter="[[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}]"
+	filterMinLength={{$:/config/Search/MinLength}}/>
 </$keyboard>
 </$keyboard>
 </$keyboard>
@@ -39,14 +48,22 @@ caption: {{$:/language/Search/Standard/Caption}}
 </div>
 
 <$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
-<$list filter="[{$:/temp/advancedsearch}minlength{$:/config/Search/MinLength}limit[1]]" emptyMessage="""<div class="tc-search-results">{{$:/language/Search/Search/TooShort}}</div>""" variable="listItem">
-<$vars userInput={{{ [[$:/temp/advancedsearch]get[text]] }}} configTiddler={{{ [[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}] }}} searchListState="$:/temp/advancedsearch/selected-item">
-<$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/>
-</$list>
-""">
-<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]" default={{$:/config/SearchResults/Default}} actions="""<$action-setfield $tiddler="$:/state/advancedsearch/standard/currentTab" text=<<currentTab>>/>""" explicitState="$:/state/tab/search-results/advancedsearch" />
+<$list
+	filter="[{$:/temp/advancedsearch}minlength{$:/config/Search/MinLength}limit[1]]"
+	emptyMessage="<div class='tc-search-results'>{{$:/language/Search/Search/TooShort}}</div>"
+	variable="listItem">
+<$vars
+	userInput={{{ [[$:/temp/advancedsearch]get[text]] }}}
+	configTiddler={{{ [[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}] }}}
+	searchListState="$:/temp/advancedsearch/selected-item">
+<$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/></$list>">
+<$macrocall $name="tabs"
+	tabsList="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]"
+	default={{$:/config/SearchResults/Default}}
+	actions="<$action-setfield $tiddler='$:/state/advancedsearch/standard/currentTab' text=<<currentTab>>/>"
+	explicitState="$:/state/tab/search-results/advancedsearch" />
 </$list>
 </$vars>
 </$list>
diff --git a/core/ui/EditTemplate/fields.tid b/core/ui/EditTemplate/fields.tid
index 5a1aca083..c57bfb679 100644
--- a/core/ui/EditTemplate/fields.tid
+++ b/core/ui/EditTemplate/fields.tid
@@ -15,6 +15,7 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$
 \end
 
 \define new-field-actions()
+\whitespace trim
 <$action-sendmessage $message="tm-add-field" $name={{{ [<newFieldNameTiddler>get[text]] }}} $value={{{ [<newFieldNameTiddler>get[text]] :map[<newFieldValueTiddler>get<currentTiddler>] }}}/>
 <$action-deletetiddler $filter="[<newFieldNameTiddler>] [<newFieldValueTiddler>] [<storeTitle>] [<searchListState>]"/>
 <$action-sendmessage $message="tm-focus-selector" $param=<<current-tiddler-new-field-selector>>/>
@@ -23,20 +24,28 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$
 \define delete-state-tiddlers() <$action-deletetiddler $filter="[<newFieldNameTiddler>] [<storeTitle>] [<searchListState>]"/>
 
 \define cancel-search-actions-inner()
-<$list filter="[<storeTitle>has[text]] [<newFieldNameTiddler>has[text]]" variable="ignore" emptyMessage="""<<cancel-delete-tiddler-actions "cancel">>""">
+\whitespace trim
+<$list
+	filter="[<storeTitle>has[text]] [<newFieldNameTiddler>has[text]]"
+	variable="ignore"
+	emptyMessage="<<cancel-delete-tiddler-actions 'cancel'>>">
 <<delete-state-tiddlers>>
 </$list>
 \end
 
 \define cancel-search-actions()
+\whitespace trim
 <$set name="userInput" value={{{ [<storeTitle>get[text]] }}}>
-<$list filter="[<newFieldNameTiddler>get[text]!match<userInput>]" emptyMessage="""<<cancel-search-actions-inner>>""">
+<$list
+	filter="[<newFieldNameTiddler>get[text]!match<userInput>]"
+	emptyMessage="<<cancel-search-actions-inner>>">
 <$action-setfield $tiddler=<<newFieldNameTiddler>> text=<<userInput>>/><$action-setfield $tiddler=<<refreshTitle>> text="yes"/>
 </$list>
 </$set>
 \end
 
 \define new-field()
+\whitespace trim
 <$vars name={{{ [<newFieldNameTiddler>get[text]] }}}>
 <$reveal type="nomatch" text="" default=<<name>>>
 <$button tooltip=<<lingo Fields/Add/Button/Hint>>>
diff --git a/core/ui/PaletteManager.tid b/core/ui/PaletteManager.tid
index e9953729f..c39bbee45 100644
--- a/core/ui/PaletteManager.tid
+++ b/core/ui/PaletteManager.tid
@@ -8,6 +8,7 @@ title: $:/PaletteManager
  edit $(colourName)$
 \end
 \define colour-tooltip(showhide) $showhide$ editor for $(newColourName)$ 
+
 \define resolve-colour(macrocall)
 \import $:/core/macros/utils
 \whitespace trim
@@ -15,6 +16,7 @@ title: $:/PaletteManager
 <<name>>
 </$wikify>
 \end
+
 \define delete-colour-index-actions() <$action-setfield $index=<<colourName>>/>
 \define palette-manager-colour-row-segment()
 \whitespace trim
@@ -41,6 +43,7 @@ title: $:/PaletteManager
 </$set>
 </$list>
 \end
+
 \define palette-manager-colour-row()
 \whitespace trim
 <tr>
@@ -57,28 +60,30 @@ title: $:/PaletteManager
 </td>
 </tr>
 \end
+
 \define palette-manager-table()
 \whitespace trim
 <table>
 <tbody>
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/Palette]indexes[]]" variable="colourName">
-<$list filter="[<currentTiddler>indexes[]removeprefix<colourName>suffix[]]" variable="ignore" emptyMessage="""
-<$list filter="[{$:/state/palettemanager/showexternal}removeprefix[yes]suffix[]]" variable="ignore">
-<<palette-manager-colour-row>>
-</$list>
-""">
+<$list
+	filter="[<currentTiddler>indexes[]removeprefix<colourName>suffix[]]"
+	variable="ignore"
+	emptyMessage="<$list filter='[{$:/state/palettemanager/showexternal}removeprefix[yes]suffix[]]' variable='ignore'><<palette-manager-colour-row>></$list>">
 <<palette-manager-colour-row>>
 </$list>
 </$list>
 </tbody>
 </table>
 \end
+\whitespace trim
 <$set name="currentTiddler" value={{$:/palette}}>
 
-<<lingo Prompt>> <$link to={{$:/palette}}><$macrocall $name="currentTiddler" $output="text/plain"/></$link>
+<<lingo Prompt>>&#32;<$link to={{$:/palette}}><$macrocall $name="currentTiddler" $output="text/plain"/></$link>
 
 <$list filter="[all[current]is[shadow]is[tiddler]]" variable="listItem">
 <<lingo Prompt/Modified>>
+&#32;
 <$button message="tm-delete-tiddler" param={{$:/palette}}><<lingo Reset/Caption>></$button>
 </$list>
 
diff --git a/core/ui/ViewToolbar/new-here.tid b/core/ui/ViewToolbar/new-here.tid
index dd4a969e1..25721f5fd 100644
--- a/core/ui/ViewToolbar/new-here.tid
+++ b/core/ui/ViewToolbar/new-here.tid
@@ -5,6 +5,7 @@ description: {{$:/language/Buttons/NewHere/Hint}}
 
 \whitespace trim
 \define newHereActions()
+\whitespace trim
 <$set name="tags" filter="[<currentTiddler>] [{$:/config/NewTiddler/Tags}]">
 <$action-sendmessage $message="tm-new-tiddler" tags=<<tags>>/>
 </$set>
diff --git a/core/wiki/currpalettepreview.tid b/core/wiki/currpalettepreview.tid
index b5f549666..61356edd0 100644
--- a/core/wiki/currpalettepreview.tid
+++ b/core/wiki/currpalettepreview.tid
@@ -11,31 +11,36 @@ title: $:/snippets/currpalettepreview
 background-color: $(swatchColour)$;
 \end
 \define swatch-inner()
+\whitespace trim
 <$set name="swatchColour" value={{##$(colourResolved)$}}>
 <$list filter="[<swatchColour>!prefix[<<colour ]!suffix[>>]]" variable="ignore">
 <div class="tc-swatch" style=<<swatchStyle>> title=<<swatchTitle>>/>
+&#32;
 </$list>
 <$list filter="[<swatchColour>prefix[<<colour ]suffix[>>]]" variable="ignore">
-<$wikify name="colourResolved" text="""<$macrocall $name="resolve-colour" macrocall=<<swatchColour>>/>""">
+<$wikify name="colourResolved" text="<$macrocall $name='resolve-colour' macrocall=<<swatchColour>>/>">
 <<swatch-inner>>
 </$wikify>
 </$list>
 </$set>
 \end
 \define swatch()
+\whitespace trim
 <$set name="swatchColour" value={{##$(colour)$}}>
 <$set name="swatchTitle" value=<<colour>>>
 <$list filter="[<swatchColour>!prefix[<<colour ]!suffix[>>]]" variable="ignore">
 <div class="tc-swatch" style=<<swatchStyle>> title=<<swatchTitle>>/>
+&#32;
 </$list>
 <$list filter="[<swatchColour>prefix[<<colour ]suffix[>>]]" variable="ignore">
-<$wikify name="colourResolved" text="""<$macrocall $name="resolve-colour" macrocall=<<swatchColour>>/>""">
+<$wikify name="colourResolved" text="<$macrocall $name='resolve-colour' macrocall=<<swatchColour>>/>">
 <<swatch-inner>>
 </$wikify>
 </$list>
 </$set>
 </$set>
 \end
+\whitespace trim
 <div class="tc-swatches-horiz"><$list filter="
 foreground
 background
diff --git a/core/wiki/macros/timeline.tid b/core/wiki/macros/timeline.tid
index b949d0432..a01c4bdaf 100644
--- a/core/wiki/macros/timeline.tid
+++ b/core/wiki/macros/timeline.tid
@@ -12,6 +12,7 @@ title: $:/core/macros/timeline
 <$view field="title"/>
 \end
 \define timeline(limit:"100",format:"DDth MMM YYYY",subfilter:"",dateField:"modified")
+\whitespace trim
 <div class="tc-timeline">
 <$list filter="[!is[system]$subfilter$has[$dateField$]!sort[$dateField$]limit[$limit$]eachday[$dateField$]]">
 <div class="tc-menu-list-item">