diff --git a/core/ui/ControlPanel/Settings/DefaultSidebarTab.tid b/core/ui/ControlPanel/Settings/DefaultSidebarTab.tid
@@ -3,6 +3,7 @@ tags: $:/tags/ControlPanel/Settings
 title: $:/core/ui/ControlPanel/Settings/DefaultSidebarTab
 
 \define lingo-base() $:/language/ControlPanel/Settings/DefaultSidebarTab/
+\whitespace trim
 
 <$link to="$:/config/DefaultSidebarTab"><<lingo Hint>></$link>
 

diff --git a/core/ui/ControlPanel/Settings/LinkToBehaviour.tid b/core/ui/ControlPanel/Settings/LinkToBehaviour.tid
@@ -3,6 +3,7 @@ tags: $:/tags/ControlPanel/Settings
 caption: {{$:/language/ControlPanel/Settings/LinkToBehaviour/Caption}}
 
 \define lingo-base() $:/language/ControlPanel/Settings/LinkToBehaviour/
+\whitespace trim
 
 <$link to="$:/config/Navigation/openLinkFromInsideRiver"><<lingo "InsideRiver/Hint">></$link>
 

diff --git a/core/ui/ControlPanel/Settings/ToolbarButtonStyle.tid b/core/ui/ControlPanel/Settings/ToolbarButtonStyle.tid
@@ -3,6 +3,7 @@ tags: $:/tags/ControlPanel/Settings
 caption: {{$:/language/ControlPanel/Settings/ToolbarButtonStyle/Caption}}
 
 \define lingo-base() $:/language/ControlPanel/Settings/ToolbarButtonStyle/
+\whitespace trim
 <$link to="$:/config/Toolbar/ButtonClass"><<lingo "Hint">></$link>
 
 <$select tiddler="$:/config/Toolbar/ButtonClass">

diff --git a/core/ui/ControlPanel/Toolbars.tid b/core/ui/ControlPanel/Toolbars.tid
@@ -2,6 +2,7 @@ title: $:/core/ui/ControlPanel/Toolbars
 tags: $:/tags/ControlPanel/Appearance
 caption: {{$:/language/ControlPanel/Toolbars/Caption}}
 
+\whitespace trim
 {{$:/language/ControlPanel/Toolbars/Hint}}
 
 <div class="tc-control-panel">

diff --git a/core/ui/ControlPanel/Toolbars/EditorItemTemplate.tid b/core/ui/ControlPanel/Toolbars/EditorItemTemplate.tid
@@ -3,7 +3,14 @@ title: $:/core/ui/ControlPanel/Toolbars/EditorItemTemplate
 \define config-title()
 $(config-base)$$(currentTiddler)$
 \end
+\whitespace trim
 
 <$draggable tiddler=<<currentTiddler>>>
-<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"/> <span class="tc-icon-wrapper"><$transclude tiddler={{!!icon}}/></span> <$transclude field="caption"/> -- <i class="tc-muted"><$transclude field="description"/></i>
+<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"/>
+&#32;
+<span class="tc-icon-wrapper"><$transclude tiddler={{!!icon}}/></span>
+&#32;
+<$transclude field="caption"/>
+&#32;--&#32;
+<i class="tc-muted"><$transclude field="description"/></i>
 </$draggable>
diff --git a/core/ui/ControlPanel/Toolbars/ItemTemplate.tid b/core/ui/ControlPanel/Toolbars/ItemTemplate.tid
@@ -3,7 +3,17 @@ title: $:/core/ui/ControlPanel/Toolbars/ItemTemplate
 \define config-title()
 $(config-base)$$(currentTiddler)$
 \end
+\whitespace trim
 
 <$draggable tiddler=<<currentTiddler>>>
-<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"/> <span class="tc-icon-wrapper"> <$transclude field="caption"/> <i class="tc-muted">-- <$transclude field="description"/></i></span>
+<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"/>
+&#32;
+<span class="tc-icon-wrapper">
+&#32;
+<$transclude field="caption"/>
+&#32;
+<i class="tc-muted">
+--&#32;
+<$transclude field="description"/>
+</i></span>
 </$draggable>
diff --git a/core/ui/DefaultSearchResultList.tid b/core/ui/DefaultSearchResultList.tid
@@ -5,6 +5,7 @@ first-search-filter: [!is[system]search:title<userInput>sort[title]limit[250]]
 second-search-filter: [!is[system]search<userInput>sort[title]limit[250]]
 
 \define searchResultList()
+\whitespace trim
 //<small>{{$:/language/Search/Matches/Title}}</small>//
 
 <$list filter="[<userInput>minlength[1]]" variable="ignore">

diff --git a/core/ui/EditTemplate.tid b/core/ui/EditTemplate.tid
@@ -1,19 +1,43 @@
 title: $:/core/ui/EditTemplate
 
-\define delete-edittemplate-state-tiddlers() <$action-deletetiddler $filter="[<newFieldNameTiddler>] [<newFieldValueTiddler>] [<newFieldNameInputTiddler>] [<newFieldNameSelectionTiddler>] [<newTagNameTiddler>] [<newTagNameInputTiddler>] [<newTagNameSelectionTiddler>] [<typeInputTiddler>] [<typeSelectionTiddler>]"/>
+\define delete-edittemplate-state-tiddlers() <$action-deletetiddler $filter="[<newFieldNameTiddler>] [prefix<newFieldValueTiddlerPrefix>] [<newFieldNameInputTiddler>] [<newFieldNameSelectionTiddler>] [<newTagNameTiddler>] [<newTagNameInputTiddler>] [<newTagNameSelectionTiddler>] [<typeInputTiddler>] [<typeSelectionTiddler>]"/>
+
+\define get-field-value-tiddler-filter() [subfilter<get-field-editor-filter>sha256[16]addprefix[/]addprefix<newFieldValueTiddlerPrefix>]
+\define get-field-editor-filter() [<newFieldNameTiddler>get[text]else[]] :cascade[all[shadows+tiddlers]tag[$:/tags/FieldEditorFilter]!is[draft]get[text]] :and[!is[blank]else{$:/core/ui/EditTemplate/fieldEditor/default}]
+
 \define save-tiddler-actions()
+\whitespace trim
 <$action-sendmessage $message="tm-add-tag" $param={{{ [<newTagNameTiddler>get[text]] }}}/>
-<$action-sendmessage $message="tm-add-field" $name={{{ [<newFieldNameTiddler>get[text]] }}} $value={{{ [<newFieldValueTiddler>get[text]] }}}/>
+<$action-sendmessage $message="tm-add-field" $name={{{ [<newFieldNameTiddler>get[text]] }}} $value={{{ [<newFieldNameTiddler>get[text]] :map[subfilter<get-field-value-tiddler-filter>get[text]] }}}/>
 <<delete-edittemplate-state-tiddlers>>
 <$action-sendmessage $message="tm-save-tiddler"/>
 \end
+
 \define cancel-delete-tiddler-actions(message)
+\whitespace trim
 <<delete-edittemplate-state-tiddlers>>
 <$action-sendmessage $message="tm-$message$-tiddler"/>
 \end
-<div data-tiddler-title=<<currentTiddler>> data-tags={{!!tags}} class={{{ tc-tiddler-frame tc-tiddler-edit-frame [<currentTiddler>is[tiddler]then[tc-tiddler-exists]] [<currentTiddler>is[missing]!is[shadow]then[tc-tiddler-missing]] [<currentTiddler>is[shadow]then[tc-tiddler-exists tc-tiddler-shadow]] [<currentTiddler>is[system]then[tc-tiddler-system]] [{!!class}] [<currentTiddler>tags[]encodeuricomponent[]addprefix[tc-tagged-]] +[join[ ]] }}}>
+
+\whitespace trim
+<div
+	data-tiddler-title=<<currentTiddler>>
+	data-tags={{!!tags}}
+	class={{{ tc-tiddler-frame tc-tiddler-edit-frame [<currentTiddler>is[tiddler]then[tc-tiddler-exists]] [<currentTiddler>is[missing]!is[shadow]then[tc-tiddler-missing]] [<currentTiddler>is[shadow]then[tc-tiddler-exists tc-tiddler-shadow]] [<currentTiddler>is[system]then[tc-tiddler-system]] [{!!class}] [<currentTiddler>tags[]encodeuricomponent[]addprefix[tc-tagged-]] +[join[ ]] }}}
+	role="region"
+	aria-label={{$:/language/EditTemplate/Caption}}>
 <$fieldmangler>
-<$vars storyTiddler=<<currentTiddler>> newTagNameTiddler=<<qualify "$:/temp/NewTagName">> newFieldNameTiddler=<<qualify "$:/temp/NewFieldName">> newFieldValueTiddler=<<qualify "$:/temp/NewFieldValue">> newFieldNameInputTiddler=<<qualify "$:/temp/NewFieldName/input">> newFieldNameSelectionTiddler=<<qualify "$:/temp/NewFieldName/selected-item">> newTagNameInputTiddler=<<qualify "$:/temp/NewTagName/input">> newTagNameSelectionTiddler=<<qualify "$:/temp/NewTagName/selected-item">> typeInputTiddler=<<qualify "$:/temp/Type/input">> typeSelectionTiddler=<<qualify "$:/temp/Type/selected-item">>>
+<$vars
+	storyTiddler=<<currentTiddler>>
+	newTagNameTiddler=<<qualify "$:/temp/NewTagName">>
+	newFieldNameTiddler=<<qualify "$:/temp/NewFieldName">>
+	newFieldValueTiddlerPrefix=<<qualify "$:/temp/NewFieldValue">>
+	newFieldNameInputTiddler=<<qualify "$:/temp/NewFieldName/input">>
+	newFieldNameSelectionTiddler=<<qualify "$:/temp/NewFieldName/selected-item">>
+	newTagNameInputTiddler=<<qualify "$:/temp/NewTagName/input">>
+	newTagNameSelectionTiddler=<<qualify "$:/temp/NewTagName/selected-item">>
+	typeInputTiddler=<<qualify "$:/temp/Type/input">>
+	typeSelectionTiddler=<<qualify "$:/temp/Type/selected-item">>>
 <$keyboard key="((cancel-edit-tiddler))" actions=<<cancel-delete-tiddler-actions "cancel">> tag="div">
 <$keyboard key="((save-tiddler))" actions=<<save-tiddler-actions>> tag="div">
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/EditTemplate]!has[draft.of]]" variable="listItem">

diff --git a/core/ui/EditTemplate/Preview/output.tid b/core/ui/EditTemplate/Preview/output.tid
@@ -2,7 +2,7 @@ title: $:/core/ui/EditTemplate/body/preview/output
 tags: $:/tags/EditPreview
 caption: {{$:/language/EditTemplate/Body/Preview/Type/Output}}
 
-\import [all[shadows+tiddlers]tag[$:/tags/Macro/View]!has[draft.of]]
+\import [all[shadows+tiddlers]tag[$:/tags/Macro/View]!has[draft.of]] [all[shadows+tiddlers]tag[$:/tags/Macro/View/Body]!has[draft.of]]
 <$set name="tv-tiddler-preview" value="yes">
 
 <$transclude />

diff --git a/core/ui/EditTemplate/body-editor.tid b/core/ui/EditTemplate/body-editor.tid
@@ -1,5 +1,7 @@
 title: $:/core/ui/EditTemplate/body/editor
 
+\whitespace trim
+
 <$edit
 
   field="text"

diff --git a/core/ui/EditTemplate/body/default.tid b/core/ui/EditTemplate/body/default.tid
@@ -8,9 +8,13 @@ $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$
 <$action-popup $state=<<importState>> $coords="(0,0,0,0)" $floating="yes"/>
 \end
 
-<$set name="edit-preview-state" value={{{ [{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[<qualify "$:/state/showeditpreview">] }}}>
-<$vars importTitle=<<qualify $:/ImportImage>> importState=<<qualify $:/state/ImportImage>> >
-<$dropzone importTitle=<<importTitle>> autoOpenOnImport="no" contentTypesFilter={{$:/config/Editor/ImportContentTypesFilter}} class="tc-dropzone-editor" enable={{{ [{$:/config/DragAndDrop/Enable}match[no]] :else[subfilter{$:/config/Editor/EnableImportFilter}then[yes]else[no]] }}} filesOnly="yes" actions=<<importFileActions>> ><$reveal stateTitle=<<edit-preview-state>> type="match" text="yes" tag="div">
+\whitespace trim
+<$let
+	edit-preview-state={{{ [{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[<qualify "$:/state/showeditpreview">] }}}
+	importTitle=<<qualify $:/ImportImage>>
+	importState=<<qualify $:/state/ImportImage>> >
+<$dropzone importTitle=<<importTitle>> autoOpenOnImport="no" contentTypesFilter={{$:/config/Editor/ImportContentTypesFilter}} class="tc-dropzone-editor" enable={{{ [{$:/config/DragAndDrop/Enable}match[no]] :else[subfilter{$:/config/Editor/EnableImportFilter}then[yes]else[no]] }}} filesOnly="yes" actions=<<importFileActions>> >
+<$reveal stateTitle=<<edit-preview-state>> type="match" text="yes" tag="div">
 <div class="tc-tiddler-preview">
 
 <$transclude tiddler="$:/core/ui/EditTemplate/body/editor" mode="inline"/>
@@ -34,5 +38,4 @@ $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$
 
 </$reveal>
 </$dropzone>
-</$vars>
-</$set>
+</$let>
diff --git a/core/ui/EditTemplate/controls.tid b/core/ui/EditTemplate/controls.tid
@@ -4,6 +4,7 @@ tags: $:/tags/EditTemplate
 \define config-title()
 $:/config/EditToolbarButtons/Visibility/$(listItem)$
 \end
+\whitespace trim
 <div class="tc-tiddler-title tc-tiddler-edit-title">
 <$view field="title"/>
 <span class="tc-tiddler-controls tc-titlebar"><$list filter="[all[shadows+tiddlers]tag[$:/tags/EditToolbar]!has[draft.of]]" variable="listItem"><$reveal type="nomatch" state=<<config-title>> text="hide"><$transclude tiddler=<<listItem>>/></$reveal></$list></span>

diff --git a/core/ui/EditTemplate/fieldEditor-default.tid b/core/ui/EditTemplate/fieldEditor-default.tid
@@ -1,3 +1,3 @@
 title: $:/core/ui/EditTemplate/fieldEditor/default
 
-<$edit-text tiddler=<<currentTiddler>> field=<<currentField>> default="" class="tc-edit-texteditor" placeholder={{$:/language/EditTemplate/Fields/Add/Value/Placeholder}} tabindex={{$:/config/EditTabIndex}} cancelPopups="yes"/>
+<$edit-text tiddler=<<currentTiddler>> field=<<currentField>> tag="input" default="" class="tc-edit-texteditor tc-edit-fieldeditor" placeholder={{$:/language/EditTemplate/Fields/Add/Value/Placeholder}} tabindex={{$:/config/EditTabIndex}} cancelPopups="yes"/>
diff --git a/core/ui/EditTemplate/fields.tid b/core/ui/EditTemplate/fields.tid
@@ -15,35 +15,44 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$
 \end
 
 \define new-field-actions()
-<$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>]"/>
+\whitespace trim
+<$action-sendmessage $message="tm-add-field" $name={{{ [<newFieldNameTiddler>get[text]] }}} $value={{{ [<newFieldNameTiddler>get[text]] :map[subfilter<get-field-value-tiddler-filter>get[text]] }}}/>
+<$action-deletetiddler $filter="[<newFieldNameTiddler>] [prefix<newFieldValueTiddlerPrefix>] [<storeTitle>] [<searchListState>]"/>
 <$action-sendmessage $message="tm-focus-selector" $param=<<current-tiddler-new-field-selector>>/>
 \end
 
 \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>>>
 <$action-sendmessage $message="tm-add-field"
 $name=<<name>>
-$value={{{ [<newFieldValueTiddler>get<name>] }}}/>
-<$action-deletetiddler $filter="[<newFieldNameTiddler>] [<newFieldValueTiddler>] [<storeTitle>] [<searchListState>]"/>
+$value={{{ [subfilter<get-field-value-tiddler-filter>get[text]] }}}/>
+<$action-deletetiddler $filter="[<newFieldNameTiddler>] [prefix<newFieldValueTiddlerPrefix>] [<storeTitle>] [<searchListState>]"/>
 <<lingo Fields/Add/Button>>
 </$button>
 </$reveal>
@@ -126,13 +135,11 @@ $value={{{ [<newFieldValueTiddler>get<name>] }}}/>
 </div>
 </$reveal>
 </div>
-<$let currentTiddler=<<newFieldValueTiddler>> currentField={{{ [<newFieldNameTiddler>get[text]] }}}>
+<$let currentTiddlerCSSescaped={{{ [<currentTiddler>escapecss[]] }}} currentTiddler={{{ [subfilter<get-field-value-tiddler-filter>] }}} currentField="text" currentFieldName={{{ [<newFieldNameTiddler>get[text]] }}}>
 <span class="tc-edit-field-add-value tc-small-gap-right">
-<$set name="currentTiddlerCSSescaped" value={{{ [<currentTiddler>escapecss[]] }}}>
 <$keyboard key="((add-field))" actions=<<new-field-actions>>>
-<$transclude tiddler={{{ [<currentField>] :cascade[all[shadows+tiddlers]tag[$:/tags/FieldEditorFilter]!is[draft]get[text]] :and[!is[blank]else{$:/core/ui/EditTemplate/fieldEditor/default}] }}} />
+<$transclude tiddler={{{ [subfilter<get-field-editor-filter>] }}} />
 </$keyboard>
-</$set>
 </span>
 <span class="tc-edit-field-add-button">
 <$macrocall $name="new-field"/>

diff --git a/core/ui/EditTemplate/shadow.tid b/core/ui/EditTemplate/shadow.tid
@@ -3,10 +3,12 @@ tags: $:/tags/EditTemplate
 
 \define lingo-base() $:/language/EditTemplate/Shadow/
 \define pluginLinkBody()
+\whitespace trim
 <$link to="""$(pluginTitle)$""">
 <$text text="""$(pluginTitle)$"""/>
 </$link>
 \end
+\whitespace trim
 <$list filter="[all[current]get[draft.of]is[shadow]!is[tiddler]]">
 
 <$list filter="[all[current]shadowsource[]]" variable="pluginTitle">

diff --git a/core/ui/EditTemplate/title.tid b/core/ui/EditTemplate/title.tid
@@ -1,6 +1,7 @@
 title: $:/core/ui/EditTemplate/title
 tags: $:/tags/EditTemplate
 
+\whitespace trim
 <$edit-text field="draft.title" class="tc-titlebar tc-edit-texteditor" focus={{{ [{$:/config/AutoFocus}match[title]then[true]] ~[[false]] }}} tabindex={{$:/config/EditTabIndex}} cancelPopups="yes"/>
 
 <$vars pattern="""[\|\[\]{}]""" bad-chars="""`| [ ] { }`""">
@@ -9,7 +10,7 @@ tags: $:/tags/EditTemplate
 
 <div class="tc-message-box">
 
-{{$:/core/images/warning}} {{$:/language/EditTemplate/Title/BadCharacterWarning}}
+{{$:/core/images/warning}}&#32;{{$:/language/EditTemplate/Title/BadCharacterWarning}}
 
 </div>
 
@@ -23,7 +24,7 @@ tags: $:/tags/EditTemplate
 
 <div class="tc-message-box">
 
-{{$:/core/images/warning}} {{$:/language/EditTemplate/Title/Exists/Prompt}}: <$link to={{!!draft.title}} />
+{{$:/core/images/warning}}&#32;{{$:/language/EditTemplate/Title/Exists/Prompt}}:&#32;<$link to={{!!draft.title}} />
 
 </div>
 
@@ -33,18 +34,22 @@ tags: $:/tags/EditTemplate
 
 <$vars fromTitle={{!!draft.of}} toTitle={{!!draft.title}}>
 
-<$checkbox tiddler="$:/config/RelinkOnRename" field="text" checked="yes" unchecked="no" default="no"> {{$:/language/EditTemplate/Title/Relink/Prompt}}</$checkbox>
+<$checkbox tiddler="$:/config/RelinkOnRename" field="text" checked="yes" unchecked="no" default="no">&#32;{{$:/language/EditTemplate/Title/Relink/Prompt}}</$checkbox>
 
 <$list filter="[title<fromTitle>backlinks[]limit[1]]" variable="listItem">
 
 <$vars stateTiddler=<<qualify "$:/state/edit/references">> >
 
 <$reveal type="nomatch" state=<<stateTiddler>> text="show">
-<$button set=<<stateTiddler>> setTo="show" class="tc-btn-invisible">{{$:/core/images/right-arrow}} 
+<$button set=<<stateTiddler>> setTo="show" class="tc-btn-invisible">
+{{$:/core/images/right-arrow}}
+&#32;
 <<lingo EditTemplate/Title/References/Prompt>></$button>
 </$reveal>
 <$reveal type="match" state=<<stateTiddler>> text="show">
-<$button set=<<stateTiddler>> setTo="hide" class="tc-btn-invisible">{{$:/core/images/down-arrow}} 
+<$button set=<<stateTiddler>> setTo="hide" class="tc-btn-invisible">
+{{$:/core/images/down-arrow}}
+&#32;
 <<lingo EditTemplate/Title/References/Prompt>></$button>
 </$reveal>
 

diff --git a/core/ui/EditorToolbar/editor-height.tid b/core/ui/EditorToolbar/editor-height.tid
@@ -7,6 +7,7 @@ description: {{$:/language/Buttons/EditorHeight/Hint}}
 condition: [<targetTiddler>type[]] [<targetTiddler>get[type]prefix[text/]] [<targetTiddler>get[type]match[application/javascript]] [<targetTiddler>get[type]match[application/json]] [<targetTiddler>get[type]match[application/x-tiddler-dictionary]] [<targetTiddler>get[type]match[image/svg+xml]] +[first[]]
 dropdown: $:/core/ui/EditorToolbar/editor-height-dropdown
 
+\whitespace trim
 <$reveal tag="span" state="$:/config/TextEditor/EditorHeight/Mode" type="match" text="fixed">
 {{$:/core/images/fixed-height}}
 </$reveal>

diff --git a/core/ui/EditorToolbar/excise-dropdown.tid b/core/ui/EditorToolbar/excise-dropdown.tid
@@ -3,9 +3,10 @@ title: $:/core/ui/EditorToolbar/excise-dropdown
 \define lingo-base() $:/language/Buttons/Excise/
 
 \define body(config-title)
+\whitespace trim
 ''<<lingo Hint>>''
 
-<<lingo Caption/NewTitle>> <$edit-text tag="input" tiddler="$config-title$/new-title" default="" focus="true"/>
+<<lingo Caption/NewTitle>>&#32;<$edit-text tag="input" tiddler="$config-title$/new-title" default="" focus="true"/>
 
 <$set name="new-title" value={{$config-title$/new-title}}>
 <$list filter="""[<new-title>is[tiddler]]""">
@@ -15,16 +16,16 @@ title: $:/core/ui/EditorToolbar/excise-dropdown
 </$list>
 </$set>
 
-<$checkbox tiddler="""$config-title$/tagnew""" field="text" checked="yes" unchecked="no" default="false"> <<lingo Caption/Tag>></$checkbox>
+<$checkbox tiddler="""$config-title$/tagnew""" field="text" checked="yes" unchecked="no" default="false">&#32;<<lingo Caption/Tag>></$checkbox>
 
-<<lingo Caption/Replace>> <$select tiddler="""$config-title$/type""" default="transclude">
+<<lingo Caption/Replace>>&#32;<$select tiddler="""$config-title$/type""" default="transclude">
 <option value="link"><<lingo Caption/Replace/Link>></option>
 <option value="transclude"><<lingo Caption/Replace/Transclusion>></option>
 <option value="macro"><<lingo Caption/Replace/Macro>></option>
 </$select>
 
 <$reveal state="""$config-title$/type""" type="match" text="macro">
-<<lingo Caption/MacroName>> <$edit-text tag="input" tiddler="""$config-title$/macro-title""" default="translink"/>
+<<lingo Caption/MacroName>>&#32;<$edit-text tag="input" tiddler="""$config-title$/macro-title""" default="translink"/>
 </$reveal>
 
 <$button>

diff --git a/core/ui/EditorToolbar/file-import.tid b/core/ui/EditorToolbar/file-import.tid
@@ -13,6 +13,7 @@ condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]
 \define replacement-text-file() [[$title$]]
 
 \define postImportActions()
+\whitespace trim
 <$list filter="[<importTitle>links[]] :reduce[get[type]prefix[image]then<replacement-text-image>else<replacement-text-file>search-replace[$title$],<currentTiddler>addprefix<accumulator>]" variable="imageTitle">
 <$action-sendmessage
 	$message="tm-edit-text-operation"
@@ -24,10 +25,13 @@ condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]
 \end
 
 \define buttons()
+\whitespace trim
 <$button class="tc-btn-invisible" actions=<<closePopupActions>> ><<lingo Listing/Cancel/Caption>></$button>
+&#32;
 <$button class="tc-btn-invisible" message="tm-perform-import" param=<<importTitle>> actions=<<postImportActions>> ><<lingo Listing/Import/Caption>></$button>
 \end
 
+\whitespace trim
 <$reveal type="popup" state=<<importState>> tag="div" class="tc-editor-importpopup">
 <div class="tc-editor-import">
 <$list filter="[<importTitle>field:plugin-type[import]]">

diff --git a/core/ui/EditorToolbar/link-dropdown.tid b/core/ui/EditorToolbar/link-dropdown.tid
@@ -3,27 +3,30 @@ 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
 
 \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/EditorToolbar/more-dropdown.tid b/core/ui/EditorToolbar/more-dropdown.tid
@@ -5,10 +5,14 @@ $:/config/EditorToolbarButtons/Visibility/$(toolbarItem)$
 \end
 
 \define conditional-button()
+\whitespace trim
 <$list filter={{$(toolbarItem)$!!condition}} variable="condition">
-<$transclude tiddler="$:/core/ui/EditTemplate/body/toolbar/button" mode="inline"/> <$transclude tiddler=<<toolbarItem>> field="description"/>
+<$transclude tiddler="$:/core/ui/EditTemplate/body/toolbar/button" mode="inline"/>
+&#32;
+<$transclude tiddler=<<toolbarItem>> field="description"/>
 </$list>
 \end
+\whitespace trim
 
 <div class="tc-text-editor-toolbar-more">
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/EditorToolbar]!has[draft.of]] -[[$:/core/ui/EditorToolbar/more]]">

diff --git a/core/ui/EditorToolbar/paint.tid b/core/ui/EditorToolbar/paint.tid
@@ -9,6 +9,7 @@ dropdown: $:/core/ui/EditorToolbar/paint-dropdown
 \define toolbar-paint()
 <div style="display: inline-block; vertical-align: middle; background-color: $(colour-picker-value)$; width: 1em; height: 1em; border-radius: 50%;"/>
 \end
+\whitespace trim
 <$set name="colour-picker-value" value={{$:/config/BitmapEditor/Colour}}>
 <<toolbar-paint>>
 </$set>
diff --git a/core/ui/EditorToolbar/preview.tid b/core/ui/EditorToolbar/preview.tid
@@ -8,6 +8,7 @@ condition: [<targetTiddler>]
 button-classes: tc-text-editor-toolbar-item-start-group
 shortcuts: ((preview))
 
+\whitespace trim
 <$reveal state=<<edit-preview-state>> type="match" text="yes" tag="span">
 {{$:/core/images/preview-open}}
 <$action-setfield $tiddler=<<edit-preview-state>> $value="no"/>

diff --git a/core/ui/EditorToolbar/size-dropdown.tid b/core/ui/EditorToolbar/size-dropdown.tid
@@ -33,9 +33,14 @@ title: $:/core/ui/EditorToolbar/size-dropdown
 \end
 
 \define toolbar-button-size(config-title)
+\whitespace trim
 ''{{$:/language/Buttons/Size/Hint}}''
 
-<<lingo Caption/Width>> <$edit-text tag="input" tiddler="""$config-title$/new-width""" default=<<tv-bitmap-editor-width>> focus="true" size="8"/> <<lingo Caption/Height>> <$edit-text tag="input" tiddler="""$config-title$/new-height""" default=<<tv-bitmap-editor-height>> size="8"/> <$button popup="""$config-title$/presets-popup""" class="tc-btn-invisible tc-popup-keep" style="width: auto; display: inline-block; background-colour: inherit;" selectedClass="tc-selected">
+<<lingo Caption/Width>>&#32;<$edit-text tag="input" tiddler="""$config-title$/new-width""" default=<<tv-bitmap-editor-width>> focus="true" size="8"/>
+&#32;
+<<lingo Caption/Height>>&#32;<$edit-text tag="input" tiddler="""$config-title$/new-height""" default=<<tv-bitmap-editor-height>> size="8"/>
+&#32;
+<$button popup="""$config-title$/presets-popup""" class="tc-btn-invisible tc-popup-keep" style="width: auto; display: inline-block; background-colour: inherit;" selectedClass="tc-selected">
 {{$:/core/images/down-arrow}}
 </$button>
 

diff --git 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/ImportListing.tid b/core/ui/ImportListing.tid
@@ -7,6 +7,7 @@ title: $:/core/ui/ImportListing
 \define payloadTitleFilter() [<currentTiddler>get<renameField>minlength[1]else<payloadTiddler>]
 
 \define overWriteWarning()
+\whitespace trim
 <$list filter="[<currentTiddler>!has<suppressedField>]">
 <$text text={{{[subfilter<payloadTitleFilter>!is[tiddler]then[]] ~[<lingo-base>addsuffix[Listing/Rename/OverwriteWarning]get[text]]}}}/>
 </$list>
@@ -43,16 +44,19 @@ title: $:/core/ui/ImportListing
 \define renameFieldState() $(currentTiddler)$!!state-rename-$(payloadTiddler)$
 
 \define select-all-actions()
+\whitespace trim
 <$list filter="[all[current]plugintiddlers[]sort[title]]" variable="payloadTiddler">
 <$action-setfield $field={{{ [<payloadTiddler>addprefix[selection-]] }}} $value={{$:/state/import/select-all}}/>
 </$list>
 \end
 
+\whitespace trim
 <table class="tc-import-table">
 <tbody>
 <tr>
 <th align="left">
 <$checkbox tiddler="$:/state/import/select-all" field="text" checked="checked" unchecked="unchecked" default="checked" actions=<<select-all-actions>>>
+&#32;
 <<lingo Listing/Select/Caption>>
 </$checkbox>
 </th>
@@ -88,16 +92,30 @@ title: $:/core/ui/ImportListing
 </td>
 <td>
 <<selectionInfo>>
+&#32;
 <<libraryInfo>>
+&#32;
 <<overWriteWarning>>
 </td>
 </tr>
 <$reveal type="match" state=<<renameFieldState>> text="yes" tag="tr">
-<td colspan="3">
-<div class="tc-flex">
-<$edit-text tiddler=<<newImportTitleTiddler>>  default={{{[subfilter<payloadTitleFilter>]}}} tag="input" class="tc-import-rename tc-flex-grow-1"/><span class="tc-small-gap-left"><$button  class="tc-btn-invisible" set=<<renameFieldState>> setTo="no" tooltip={{{[<lingo-base>addsuffix[Listing/Rename/CancelRename]get[text]]}}}>{{$:/core/images/close-button}}<$action-deletetiddler $tiddler=<<newImportTitleTiddler>>/></$button><span class="tc-small-gap-right"/></span><$button  class="tc-btn-invisible" set=<<renameFieldState>> setTo="no" tooltip={{{[<lingo-base>addsuffix[Listing/Rename/ConfirmRename]get[text]]}}}>{{$:/core/images/done-button}}<$action-setfield $field=<<renameField>> $value={{{[<newImportTitleTiddler>get[text]minlength[1]else<payloadTiddler>]}}} /><$action-deletetiddler $tiddler=<<newImportTitleTiddler>>/></$button>
-</div>
-</td>
+	<td colspan="3">
+		<div class="tc-flex">
+			<$edit-text tiddler=<<newImportTitleTiddler>>  default={{{[subfilter<payloadTitleFilter>]}}} tag="input" class="tc-import-rename tc-flex-grow-1"/>
+			<span class="tc-small-gap-left">
+				<$button  class="tc-btn-invisible" set=<<renameFieldState>> setTo="no" tooltip={{{[<lingo-base>addsuffix[Listing/Rename/CancelRename]get[text]]}}}>
+					{{$:/core/images/close-button}}
+					<$action-deletetiddler $tiddler=<<newImportTitleTiddler>>/>
+				</$button>
+				<span class="tc-small-gap-right"/>
+			</span>
+			<$button  class="tc-btn-invisible" set=<<renameFieldState>> setTo="no" tooltip={{{[<lingo-base>addsuffix[Listing/Rename/ConfirmRename]get[text]]}}}>
+				{{$:/core/images/done-button}}
+				<$action-setfield $field=<<renameField>> $value={{{[<newImportTitleTiddler>get[text]minlength[1]else<payloadTiddler>]}}} />
+				<$action-deletetiddler $tiddler=<<newImportTitleTiddler>>/>
+			</$button>
+		</div>
+	</td>
 </$reveal>
 <tr>
 <td colspan="3">

diff --git 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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/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/ListItemTemplate.tid b/core/ui/ListItemTemplate.tid
@@ -1,5 +1,3 @@
 title: $:/core/ui/ListItemTemplate
 
-<div class="tc-menu-list-item">
-<$link />
-</div>
+<div class="tc-menu-list-item"><$link /></div>
diff --git 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/Manager.tid b/core/ui/Manager.tid
@@ -5,16 +5,17 @@ color: #bbb
 \define lingo-base() $:/language/Manager/
 
 \define list-item-content-item()
+\whitespace trim
 <div class="tc-manager-list-item-content-item">
 	<$vars state-title="""$:/state/popup/manager/item/$(listItem)$""">
 		<$reveal state=<<state-title>> type="match" text="show" default="show" tag="div">
 			<$button set=<<state-title>> setTo="hide" class="tc-btn-invisible tc-manager-list-item-content-item-heading">
-				{{$:/core/images/down-arrow}} <$transclude tiddler=<<listItem>> field="caption"/>
+				{{$:/core/images/down-arrow}}&#32;<$transclude tiddler=<<listItem>> field="caption"/>
 			</$button>
 		</$reveal>
 		<$reveal state=<<state-title>> type="nomatch" text="show" default="show" tag="div">
 			<$button set=<<state-title>> setTo="show" class="tc-btn-invisible tc-manager-list-item-content-item-heading">
-				{{$:/core/images/right-arrow}} <$transclude tiddler=<<listItem>> field="caption"/>
+				{{$:/core/images/right-arrow}}&#32;<$transclude tiddler=<<listItem>> field="caption"/>
 			</$button>
 		</$reveal>
 		<$reveal state=<<state-title>> type="match" text="show" default="show" tag="div" class="tc-manager-list-item-content-item-body">
@@ -24,27 +25,28 @@ color: #bbb
 </div>
 \end
 
+\whitespace trim
 <div class="tc-manager-wrapper">
 	<div class="tc-manager-controls">
 		<div class="tc-manager-control">
-			<<lingo Controls/Show/Prompt>> <$select tiddler="$:/config/Manager/Show" default="tiddlers">
+			<<lingo Controls/Show/Prompt>>&#32;<$select tiddler="$:/config/Manager/Show" default="tiddlers">
 				<option value="tiddlers"><<lingo Controls/Show/Option/Tiddlers>></option>
 				<option value="tags"><<lingo Controls/Show/Option/Tags>></option>
 			</$select>
 		</div>
 		<div class="tc-manager-control">
-			<<lingo Controls/Search/Prompt>> <$edit-text tiddler="$:/config/Manager/Filter" tag="input" default="" placeholder={{$:/language/Manager/Controls/Search/Placeholder}}/>
+			<<lingo Controls/Search/Prompt>>&#32;<$edit-text tiddler="$:/config/Manager/Filter" tag="input" default="" placeholder={{$:/language/Manager/Controls/Search/Placeholder}}/>
 		</div>
 		<div class="tc-manager-control">
-			<<lingo Controls/FilterByTag/Prompt>> <$select tiddler="$:/config/Manager/Tag" default="">
+			<<lingo Controls/FilterByTag/Prompt>>&#32;<$select tiddler="$:/config/Manager/Tag" default="">
 				<option value=""><<lingo Controls/FilterByTag/None>></option>
 				<$list filter="[!is{$:/config/Manager/System}tags[]!is[system]sort[title]]" variable="tag">
 					<option value=<<tag>>><$text text=<<tag>>/></option>
 				</$list>
 			</$select>
 		</div>
 		<div class="tc-manager-control">
-			<<lingo Controls/Sort/Prompt>> <$select tiddler="$:/config/Manager/Sort" default="title">
+			<<lingo Controls/Sort/Prompt>>&#32;<$select tiddler="$:/config/Manager/Sort" default="title">
 				<optgroup label="Common">
 					<$list filter="title modified modifier created creator created" variable="field">
 						<option value=<<field>>><$text text=<<field>>/></option>
@@ -56,12 +58,15 @@ color: #bbb
 					</$list>
 				</optgroup>
 			</$select>
+			&#32;
 			<$checkbox tiddler="$:/config/Manager/Order" field="text" checked="reverse" unchecked="forward" default="forward">
+				&#32;
 				<<lingo Controls/Order/Prompt>>
 			</$checkbox>
 		</div>
 		<div class="tc-manager-control">
 			<$checkbox tiddler="$:/config/Manager/System" field="text" checked="" unchecked="system" default="system">
+				&#32;
 				{{$:/language/SystemTiddlers/Include/Prompt}}
 			</$checkbox>
 		</div>

diff --git a/core/ui/Manager/ItemMainFields.tid b/core/ui/Manager/ItemMainFields.tid
@@ -2,6 +2,7 @@ title: $:/Manager/ItemMain/Fields
 tags: $:/tags/Manager/ItemMain
 caption: {{$:/language/Manager/Item/Fields}}
 
+\whitespace trim
 <table>
 <tbody>
 <$list filter="[all[current]fields[]sort[title]] -text" template="$:/core/ui/TiddlerFieldTemplate" variable="listItem"/>

diff --git a/core/ui/Manager/ItemSidebarColour.tid b/core/ui/Manager/ItemSidebarColour.tid
@@ -7,9 +7,12 @@ height: 1em;
 background-color: $(colour)$
 \end
 
+\whitespace trim
 <$vars colour={{!!color}}>
 <p style=<<swatch-styles>>/>
 </$vars>
 <p>
-<$edit-text field="color" tag="input" type="color"/> / <$edit-text field="color" tag="input" type="text" size="9"/>
+<$edit-text field="color" tag="input" type="color"/>
+&#32;/&#32;
+<$edit-text field="color" tag="input" type="text" size="9"/>
 </p>
diff --git a/core/ui/Manager/ItemSidebarIcon.tid b/core/ui/Manager/ItemSidebarIcon.tid
@@ -2,6 +2,7 @@ title: $:/Manager/ItemSidebar/Icon
 tags: $:/tags/Manager/ItemSidebar
 caption: {{$:/language/Manager/Item/Icon}}
 
+\whitespace trim
 <p>
 <div class="tc-manager-icon-editor">
 <$button popup=<<qualify "$:/state/popup/image-picker">> class="tc-btn-invisible">
@@ -12,10 +13,9 @@ caption: {{$:/language/Manager/Item/Icon}}
 <div class="tc-block-dropdown-wrapper" style="position: static;">
 <$reveal state=<<qualify "$:/state/popup/image-picker">> type="nomatch" text="" default="" tag="div" class="tc-popup">
 <div class="tc-block-dropdown tc-popup-keep" style="width: 80%; left: 10%; right: 10%; padding: 0.5em;">
-<$macrocall $name="image-picker-include-tagged-images" actions="""
-<$action-setfield $field="icon" $value=<<imageTitle>>/>
-<$action-deletetiddler $tiddler=<<qualify "$:/state/popup/image-picker">>/>
-"""/>
+<$macrocall
+	$name="image-picker-include-tagged-images"
+	actions="<$action-setfield $field='icon' $value=<<imageTitle>>/><$action-deletetiddler $tiddler=<<qualify '$:/state/popup/image-picker'>>/>"/>
 </div>
 </$reveal>
 </div>

diff --git a/core/ui/Manager/ItemSidebarTools.tid b/core/ui/Manager/ItemSidebarTools.tid
@@ -2,9 +2,14 @@ title: $:/Manager/ItemSidebar/Tools
 tags: $:/tags/Manager/ItemSidebar
 caption: {{$:/language/Manager/Item/Tools}}
 
+\whitespace trim
 <p>
-<$button to=<<currentTiddler>>>{{$:/core/images/link}} open</$button>
+<$button to=<<currentTiddler>>>
+{{$:/core/images/link}}&#32;open
+</$button>
 </p>
 <p>
-<$button message="tm-edit-tiddler" param=<<currentTiddler>>>{{$:/core/images/edit-button}} edit</$button>
+<$button message="tm-edit-tiddler" param=<<currentTiddler>>>
+{{$:/core/images/edit-button}}&#32;edit
+</$button>
 </p>
diff --git 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
@@ -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/PageControls/controlpanel.tid b/core/ui/PageControls/controlpanel.tid
@@ -16,6 +16,6 @@ description: {{$:/language/Buttons/ControlPanel/Hint}}
 </$button>
 \end
 
-<$list filter="[list[$:/StoryList]] +[field:title[$:/ControlPanel]]" emptyMessage=<<control-panel-button>>>
+<$list filter="[list<tv-story-list>] +[field:title[$:/ControlPanel]]" emptyMessage=<<control-panel-button>>>
 <<control-panel-button "tc-selected">>
 </$list>
diff --git 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/PageTemplate/story.tid b/core/ui/PageTemplate/story.tid
@@ -2,7 +2,7 @@ title: $:/core/ui/PageTemplate/story
 tags: $:/tags/PageTemplate
 
 \whitespace trim
-<section class="tc-story-river">
+<section class="tc-story-river" role="main">
 
 <section class="story-backdrop">
 

diff --git a/core/ui/PaletteManager.tid b/core/ui/PaletteManager.tid
@@ -8,13 +8,15 @@ title: $:/PaletteManager
  edit $(colourName)$
 \end
 \define colour-tooltip(showhide) $showhide$ editor for $(newColourName)$ 
+
 \define resolve-colour(macrocall)
 \import $:/core/macros/utils
 \whitespace trim
 <$wikify name="name" text="""$macrocall$""">
 <<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,26 @@ 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>
-""">
-<<palette-manager-colour-row>>
-</$list>
-</$list>
+<$set name="colorList" filter="[{$:/state/palettemanager/showexternal}match[yes]]"
+   value="[all[shadows+tiddlers]tag[$:/tags/Palette]indexes[]]" emptyValue="[<currentTiddler>indexes[]]">
+<$list filter=<<colorList>> variable="colourName"> <<palette-manager-colour-row>> </$list>
+</$set>
 </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/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
@@ -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
@@ -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
@@ -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/SideBar/Open.tid b/core/ui/SideBar/Open.tid
@@ -26,12 +26,12 @@ $button$
 <div class="tc-sidebar-tab-open">
 <$list filter="[list<tv-story-list>]" history=<<tv-history-list>> storyview="pop">
 <div class="tc-sidebar-tab-open-item">
-<$macrocall $name="droppable-item" button="""<$button message="tm-close-tiddler" tooltip={{$:/language/Buttons/Close/Hint}} aria-label={{$:/language/Buttons/Close/Caption}} class="tc-btn-invisible tc-btn-mini tc-small-gap-right">{{$:/core/images/close-button}}</$button><$link to={{!!title}}><$view field="title"/></$link>"""/>
+<$macrocall $name="droppable-item" button="<$button message='tm-close-tiddler' tooltip={{$:/language/Buttons/Close/Hint}} aria-label={{$:/language/Buttons/Close/Caption}} class='tc-btn-invisible tc-btn-mini tc-small-gap-right'>{{$:/core/images/close-button}}</$button><$link to={{!!title}}><$view field='title'/></$link>"/>
 </div>
 </$list>
 <$tiddler tiddler="">
 <div>
-<$macrocall $name="droppable-item" button="""<$button message="tm-close-all-tiddlers" class="tc-btn-invisible tc-btn-mini"><<lingo Button>></$button>"""/>
+<$macrocall $name="droppable-item" button="<$button message='tm-close-all-tiddlers' class='tc-btn-invisible tc-btn-mini'><<lingo Button>></$button>"/>
 </div>
 </$tiddler>
 </div>
diff --git a/core/ui/SideBarSegments/search.tid b/core/ui/SideBarSegments/search.tid
@@ -51,12 +51,14 @@ tags: $:/tags/SideBarSegment
 <$keyboard key="((input-tab-right))" actions=<<set-next-input-tab>>>
 <$keyboard key="((input-tab-left))" actions=<<set-next-input-tab "before">>>
 <$keyboard key="((advanced-search-sidebar))" actions=<<advanced-search-actions>>>
+<form class="tc-form-inline">
 <$macrocall $name="keyboard-driven-input" tiddler=<<editTiddler>> storeTitle=<<searchTiddler>> 
 		selectionStateTitle=<<searchListState>> refreshTitle="$:/temp/search/refresh" type="search" 
 		tag="input" focus={{$:/config/Search/AutoFocus}} focusPopup=<<qualify "$:/state/popup/search-dropdown">> 
 		class="tc-popup-handle" filterMinLength={{$:/config/Search/MinLength}} inputCancelActions=<<cancel-search-actions>> 
 		inputAcceptActions=<<input-accept-actions>> inputAcceptVariantActions=<<input-accept-variant-actions>> cancelPopups="yes" 
 		configTiddlerFilter="[[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}]"/>
+</form>
 </$keyboard>
 </$keyboard>
 </$keyboard>

diff --git a/core/ui/SideBarSegments/tabs.tid b/core/ui/SideBarSegments/tabs.tid
@@ -1,7 +1,7 @@
 title: $:/core/ui/SideBarSegments/tabs
 tags: $:/tags/SideBarSegment
 
-<div class="tc-sidebar-lists tc-sidebar-tabs">
+<div class="tc-sidebar-lists tc-sidebar-tabs" role="region" aria-label={{$:/language/SideBar/Caption}}>
 
 <$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/SideBar]!has[draft.of]]" default={{$:/config/DefaultSidebarTab}} state="$:/state/tab/sidebar" class="tc-sidebar-tabs-main" explicitState="$:/state/tab/sidebar--595412856"/>
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/ui/ViewTemplate.tid b/core/ui/ViewTemplate.tid
@@ -7,7 +7,7 @@ $:/state/folded/$(currentTiddler)$
 \define cancel-delete-tiddler-actions(message) <$action-sendmessage $message="tm-$message$-tiddler"/>
 \import [all[shadows+tiddlers]tag[$:/tags/Macro/View]!has[draft.of]]
 <$vars storyTiddler=<<currentTiddler>> tiddlerInfoState=<<qualify "$:/state/popup/tiddler-info">>>
-<div data-tiddler-title=<<currentTiddler>> data-tags={{!!tags}} class={{{ tc-tiddler-frame tc-tiddler-view-frame [<currentTiddler>is[tiddler]then[tc-tiddler-exists]] [<currentTiddler>is[missing]!is[shadow]then[tc-tiddler-missing]] [<currentTiddler>is[shadow]then[tc-tiddler-exists tc-tiddler-shadow]] [<currentTiddler>is[shadow]is[tiddler]then[tc-tiddler-overridden-shadow]] [<currentTiddler>is[system]then[tc-tiddler-system]] [{!!class}] [<currentTiddler>tags[]encodeuricomponent[]addprefix[tc-tagged-]] +[join[ ]] }}}>
+<div data-tiddler-title=<<currentTiddler>> data-tags={{!!tags}} class={{{ tc-tiddler-frame tc-tiddler-view-frame [<currentTiddler>is[tiddler]then[tc-tiddler-exists]] [<currentTiddler>is[missing]!is[shadow]then[tc-tiddler-missing]] [<currentTiddler>is[shadow]then[tc-tiddler-exists tc-tiddler-shadow]] [<currentTiddler>is[shadow]is[tiddler]then[tc-tiddler-overridden-shadow]] [<currentTiddler>is[system]then[tc-tiddler-system]] [{!!class}] [<currentTiddler>tags[]encodeuricomponent[]addprefix[tc-tagged-]] +[join[ ]] }}} role="article">
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate]!has[draft.of]]" variable="listItem">
 <$transclude tiddler=<<listItem>>/>
 </$list>

diff --git a/core/ui/ViewTemplate/body.tid b/core/ui/ViewTemplate/body.tid
@@ -1,6 +1,8 @@
 title: $:/core/ui/ViewTemplate/body
 tags: $:/tags/ViewTemplate
 
+\import [all[shadows+tiddlers]tag[$:/tags/Macro/View/Body]!has[draft.of]]
+
 <$reveal tag="div" class="tc-tiddler-body" type="nomatch" stateTitle=<<folded-state>> text="hide" retain="yes" animate="yes">
 
 <$transclude tiddler={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/ViewTemplateBodyFilter]!is[draft]get[text]] :and[!is[blank]else[$:/core/ui/ViewTemplate/body/default]] }}} />

diff --git a/core/ui/ViewTemplate/body/import.tid b/core/ui/ViewTemplate/body/import.tid
@@ -3,21 +3,26 @@ title: $:/core/ui/ViewTemplate/body/import
 \define lingo-base() $:/language/Import/
 
 \define confirmCancel()
+\whitespace trim
 <$action-confirm $message={{$:/language/Import/Listing/Cancel/Warning}} >
 <$action-deletetiddler $tiddler=<<currentTiddler>>/>
 <$action-sendmessage $message="tm-close-tiddler" title=<<currentTiddler>>/>
 </$action-confirm>
 \end
 
 \define buttons()
+\whitespace trim
 <$button actions=<<confirmCancel>> ><<lingo Listing/Cancel/Caption>></$button>
+&#32;
 <$button message="tm-perform-import" param=<<currentTiddler>>><<lingo Listing/Import/Caption>></$button>
-<<lingo Listing/Preview>> <$select tiddler="$:/state/importpreviewtype" default="$:/core/ui/ImportPreviews/Text">
+&#32;
+<<lingo Listing/Preview>>&#32;<$select tiddler="$:/state/importpreviewtype" default="$:/core/ui/ImportPreviews/Text">
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/ImportPreview]!has[draft.of]]">
 <option value=<<currentTiddler>>>{{!!caption}}</option>
 </$list>
 </$select>
 \end
+\whitespace trim
 
 <$list filter="[all[current]field:plugin-type[import]]">
 

diff --git a/core/ui/ViewTemplate/body/plugin.tid b/core/ui/ViewTemplate/body/plugin.tid
@@ -1,5 +1,6 @@
 title: $:/core/ui/ViewTemplate/body/plugin
 
+\whitespace trim
 <div class="tc-tiddler-plugin-info">
 <$let plugin-type={{!!plugin-type}}
 	default-popup-state="yes"

diff --git a/core/ui/ViewTemplate/body/rendered-plain-text.tid b/core/ui/ViewTemplate/body/rendered-plain-text.tid
@@ -0,0 +1,7 @@
+title: $:/core/ui/ViewTemplate/body/rendered-plain-text
+code-body: yes
+
+\whitespace trim
+<$wikify name="text" text={{!!text}} type={{!!type}}>
+<$codeblock code=<<text>> language="css"/>
+</$wikify>
diff --git a/core/ui/ViewTemplate/classic.tid b/core/ui/ViewTemplate/classic.tid
@@ -2,6 +2,7 @@ title: $:/core/ui/ViewTemplate/classic
 tags: $:/tags/ViewTemplate $:/tags/EditTemplate
 
 \define lingo-base() $:/language/ClassicWarning/
+\whitespace trim
 <$list filter="[all[current]type[text/x-tiddlywiki]]">
 <div class="tc-message-box">
 

diff --git a/core/ui/ViewTemplate/subtitle.tid b/core/ui/ViewTemplate/subtitle.tid
@@ -4,7 +4,11 @@ tags: $:/tags/ViewTemplate
 \whitespace trim
 <$reveal type="nomatch" stateTitle=<<folded-state>> text="hide" tag="div" retain="yes" animate="yes">
 <div class="tc-subtitle">
-<$link to={{!!modifier}} />
-<$view field="modified" format="date" template={{$:/language/Tiddler/DateFormat}}/>
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate/Subtitle]!has[draft.of]]" variable="subtitleTiddler" counter="indexSubtitleTiddler">
+<$list filter="[<indexSubtitleTiddler-first>match[no]]" variable="ignore">
+&nbsp;
+</$list>
+<$transclude tiddler=<<subtitleTiddler>> mode="inline"/>
+</$list>
 </div>
 </$reveal>
diff --git a/core/ui/ViewTemplate/subtitle/modified.tid b/core/ui/ViewTemplate/subtitle/modified.tid
@@ -0,0 +1,4 @@
+title: $:/core/ui/ViewTemplate/subtitle/modified
+tags: $:/tags/ViewTemplate/Subtitle
+
+<$view field="modified" format="date" template={{$:/language/Tiddler/DateFormat}}/>
diff --git a/core/ui/ViewTemplate/subtitle/modifier.tid b/core/ui/ViewTemplate/subtitle/modifier.tid
@@ -0,0 +1,4 @@
+title: $:/core/ui/ViewTemplate/subtitle/modifier
+tags: $:/tags/ViewTemplate/Subtitle
+
+<$link to={{!!modifier}}/>
diff --git a/core/ui/ViewTemplate/tags.tid b/core/ui/ViewTemplate/tags.tid
@@ -1,6 +1,7 @@
 title: $:/core/ui/ViewTemplate/tags
 tags: $:/tags/ViewTemplate
 
+\whitespace trim
 <$reveal type="nomatch" stateTitle=<<folded-state>> text="hide" tag="div" retain="yes" animate="yes">
 <div class="tc-tags-wrapper"><$list filter="[all[current]tags[]sort[title]]" template="$:/core/ui/TagTemplate" storyview="pop"/></div>
 </$reveal>
diff --git a/core/ui/ViewTemplate/title.tid b/core/ui/ViewTemplate/title.tid
@@ -12,11 +12,13 @@ fill:$(foregroundColor)$;
 </span>
 <$set name="tv-wikilinks" value={{$:/config/Tiddlers/TitleLinks}}>
 <$link>
+<$list filter="[<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] +[!is[blank]]" variable="ignore">
 <$let foregroundColor={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}}>
 <span class="tc-tiddler-title-icon" style=<<title-styles>>>
 {{||$:/core/ui/TiddlerIcon}}
 </span>
 </$let>
+</$list>
 <$transclude tiddler={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/ViewTemplateTitleFilter]!is[draft]get[text]] :and[!is[blank]else[$:/core/ui/ViewTemplate/title/default]] }}} />
 </$link>
 </$set>

diff --git 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/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/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/config/OfficialPluginLibrary.tid b/core/wiki/config/OfficialPluginLibrary.tid
@@ -1,6 +1,6 @@
 title: $:/config/OfficialPluginLibrary
 tags: $:/tags/PluginLibrary
-url: https://tiddlywiki.com/library/v5.2.2/index.html
+url: https://tiddlywiki.com/library/v5.2.3/index.html
 caption: {{$:/language/OfficialPluginLibrary}}
 
 {{$:/language/OfficialPluginLibrary/Hint}}
diff --git a/core/wiki/config/ViewTemplateBodyFilters.multids b/core/wiki/config/ViewTemplateBodyFilters.multids
@@ -1,7 +1,8 @@
 title: $:/config/ViewTemplateBodyFilters/
 tags: $:/tags/ViewTemplateBodyFilter
 
-system: [prefix[$:/boot/]] [prefix[$:/config/]] [prefix[$:/core/macros]] [prefix[$:/core/save/]] [prefix[$:/core/templates/]] [prefix[$:/core/ui/]split[/]count[]compare:number:eq[4]] [prefix[$:/info/]] [prefix[$:/language/]] [prefix[$:/languages/]] [prefix[$:/snippets/]] [prefix[$:/state/]] [prefix[$:/status/]] [prefix[$:/info/]] [prefix[$:/temp/]] +[limit[1]then[$:/core/ui/ViewTemplate/body/code]]
+stylesheet: [tag[$:/tags/Stylesheet]then[$:/core/ui/ViewTemplate/body/rendered-plain-text]]
+system: [prefix[$:/boot/]] [prefix[$:/config/]] [prefix[$:/core/macros]] [prefix[$:/core/save/]] [prefix[$:/core/templates/]] [prefix[$:/core/ui/]split[/]count[]compare:number:eq[4]] [prefix[$:/info/]] [prefix[$:/language/]] [prefix[$:/languages/]] [prefix[$:/snippets/]] [prefix[$:/state/]] [prefix[$:/status/]] [prefix[$:/info/]] [prefix[$:/temp/]] +[!is[image]limit[1]then[$:/core/ui/ViewTemplate/body/code]]
 code-body: [field:code-body[yes]then[$:/core/ui/ViewTemplate/body/code]]
 import: [field:plugin-type[import]then[$:/core/ui/ViewTemplate/body/import]]
 plugin: [has[plugin-type]then[$:/core/ui/ViewTemplate/body/plugin]]

diff --git 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/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/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>
diff --git a/core/wiki/languageswitcher.tid b/core/wiki/languageswitcher.tid
@@ -3,6 +3,7 @@ title: $:/snippets/languageswitcher
 \define flag-title()
 $(languagePluginTitle)$/icon
 \end
+\whitespace trim
 
 <$linkcatcher to="$:/language">
 <div class="tc-chooser tc-language-chooser">
@@ -18,6 +19,7 @@ $(languagePluginTitle)$/icon
 </$transclude>
 </$set>
 </span>
+&#32;
 <$view field="description">
 <$view field="name">
 <$view field="title"/>

diff --git a/core/wiki/macros/colour-picker.tid b/core/wiki/macros/colour-picker.tid
@@ -21,30 +21,37 @@ $actions$
 \end
 
 \define colour-picker-recent-inner(actions)
+\whitespace trim
 <$set name="colour-picker-value" value="$(recentColour)$">
 <$macrocall $name="colour-picker-inner" actions="""$actions$"""/>
 </$set>
 \end
 
 \define colour-picker-recent(actions)
-{{$:/language/ColourPicker/Recent}} <$list filter="[list[$:/config/ColourPicker/Recent]]" variable="recentColour">
-<$macrocall $name="colour-picker-recent-inner" actions="""$actions$"""/></$list>
+\whitespace trim
+{{$:/language/ColourPicker/Recent}}<$list filter="[list[$:/config/ColourPicker/Recent]]" variable="recentColour">
+&#32;
+<$macrocall $name="colour-picker-recent-inner" actions="""$actions$"""/>
+</$list>
 \end
 
 \define colour-picker(actions)
+\whitespace trim
 <div class="tc-colour-chooser">
 
 <$macrocall $name="colour-picker-recent" actions="""$actions$"""/>
 
 ---
 
 <$list filter="LightPink Pink Crimson LavenderBlush PaleVioletRed HotPink DeepPink MediumVioletRed Orchid Thistle Plum Violet Magenta Fuchsia DarkMagenta Purple MediumOrchid DarkViolet DarkOrchid Indigo BlueViolet MediumPurple MediumSlateBlue SlateBlue DarkSlateBlue Lavender GhostWhite Blue MediumBlue MidnightBlue DarkBlue Navy RoyalBlue CornflowerBlue LightSteelBlue LightSlateGrey SlateGrey DodgerBlue AliceBlue SteelBlue LightSkyBlue SkyBlue DeepSkyBlue LightBlue PowderBlue CadetBlue Azure LightCyan PaleTurquoise Cyan Aqua DarkTurquoise DarkSlateGrey DarkCyan Teal MediumTurquoise LightSeaGreen Turquoise Aquamarine MediumAquamarine MediumSpringGreen MintCream SpringGreen MediumSeaGreen SeaGreen Honeydew LightGreen PaleGreen DarkSeaGreen LimeGreen Lime ForestGreen Green DarkGreen Chartreuse LawnGreen GreenYellow DarkOliveGreen YellowGreen OliveDrab Beige LightGoldenrodYellow Ivory LightYellow Yellow Olive DarkKhaki LemonChiffon PaleGoldenrod Khaki Gold Cornsilk Goldenrod DarkGoldenrod FloralWhite OldLace Wheat Moccasin Orange PapayaWhip BlanchedAlmond NavajoWhite AntiqueWhite Tan BurlyWood Bisque DarkOrange Linen Peru PeachPuff SandyBrown Chocolate SaddleBrown Seashell Sienna LightSalmon Coral OrangeRed DarkSalmon Tomato MistyRose Salmon Snow LightCoral RosyBrown IndianRed Red Brown FireBrick DarkRed Maroon White WhiteSmoke Gainsboro LightGrey Silver DarkGrey Grey DimGrey Black" variable="colour-picker-value">
+&#32;
 <$macrocall $name="colour-picker-inner" actions="""$actions$"""/>
 </$list>
 
 ---
 
 <$edit-text tiddler="$:/config/ColourPicker/New" tag="input" default="" placeholder=""/>
+&#32;
 <$edit-text tiddler="$:/config/ColourPicker/New" type="color" tag="input"/>
 <$set name="colour-picker-value" value={{$:/config/ColourPicker/New}}>
 <$macrocall $name="colour-picker-inner" actions="""$actions$"""/>

diff --git a/core/wiki/macros/copy-to-clipboard.tid b/core/wiki/macros/copy-to-clipboard.tid
@@ -2,16 +2,19 @@ title: $:/core/macros/copy-to-clipboard
 tags: $:/tags/Macro
 
 \define copy-to-clipboard(src,class:"tc-btn-invisible",style)
+\whitespace trim
 <$button class=<<__class__>> style=<<__style__>> message="tm-copy-to-clipboard" param=<<__src__>> tooltip={{$:/language/Buttons/CopyToClipboard/Hint}}>
-{{$:/core/images/copy-clipboard}} <$text text={{$:/language/Buttons/CopyToClipboard/Caption}}/>
+{{$:/core/images/copy-clipboard}}
+&#32;
+<$text text={{$:/language/Buttons/CopyToClipboard/Caption}}/>
 </$button>
 \end
 
 \define copy-to-clipboard-above-right(src,class:"tc-btn-invisible",style)
+\whitespace trim
 <div style="position: relative;">
 <div style="position: absolute; bottom: 0; right: 0;">
 <$macrocall $name="copy-to-clipboard" src=<<__src__>> class=<<__class__>> style=<<__style__>>/>
 </div>
 </div>
 \end
-
diff --git a/core/wiki/macros/diff.tid b/core/wiki/macros/diff.tid
@@ -2,6 +2,7 @@ title: $:/core/macros/diff
 tags: $:/tags/Macro
 
 \define compareTiddlerText(sourceTiddlerTitle,sourceSubTiddlerTitle,destTiddlerTitle,destSubTiddlerTitle)
+\whitespace trim
 <$set name="source" tiddler=<<__sourceTiddlerTitle__>> subtiddler=<<__sourceSubTiddlerTitle__>>>
 <$set name="dest" tiddler=<<__destTiddlerTitle__>> subtiddler=<<__destSubTiddlerTitle__>>>
 <$diff-text source=<<source>> dest=<<dest>>/>
@@ -10,20 +11,20 @@ tags: $:/tags/Macro
 \end
 
 \define compareTiddlers(sourceTiddlerTitle,sourceSubTiddlerTitle,destTiddlerTitle,destSubTiddlerTitle,exclude)
+\whitespace trim
 <table class="tc-diff-tiddlers">
 <tbody>
 <$set name="sourceFields" filter="[<__sourceTiddlerTitle__>fields[]sort[]]">
 <$set name="destFields" filter="[<__destSubTiddlerTitle__>subtiddlerfields<__destTiddlerTitle__>sort[]]">
 <$list filter="[enlist<sourceFields>] [enlist<destFields>] -[enlist<__exclude__>] +[sort[]]" variable="fieldName">
 <tr>
 <th>
-<$text text=<<fieldName>>/> 
+<$text text=<<fieldName>>/>
 </th>
 <td>
 <$set name="source" tiddler=<<__sourceTiddlerTitle__>> subtiddler=<<__sourceSubTiddlerTitle__>> field=<<fieldName>>>
 <$set name="dest" tiddler=<<__destTiddlerTitle__>> subtiddler=<<__destSubTiddlerTitle__>> field=<<fieldName>>>
-<$diff-text source=<<source>> dest=<<dest>>>
-</$diff-text>
+<$diff-text source=<<source>> dest=<<dest>>>&#32;</$diff-text>
 </$set>
 </$set>
 </td>

diff --git a/core/wiki/macros/dumpvariables.tid b/core/wiki/macros/dumpvariables.tid
@@ -2,6 +2,7 @@ title: $:/core/macros/dumpvariables
 tags: $:/tags/Macro
 
 \define dumpvariables()
+\whitespace trim
 <ul>
 <$list filter="[variables[]]" variable="varname">
 <li>

diff --git a/core/wiki/macros/image-picker.tid b/core/wiki/macros/image-picker.tid
@@ -5,22 +5,23 @@ title: $:/core/macros/image-picker
 type: text/vnd.tiddlywiki
 
 \define image-picker-thumbnail(actions)
-<$button tag="a" tooltip="""$(imageTitle)$""">
-$actions$
-<$transclude tiddler=<<imageTitle>>/>
-</$button>
+<$button tag="a" tooltip="""$(imageTitle)$""">$actions$<$transclude tiddler=<<imageTitle>>/></$button>
 \end
 
 \define image-picker-list(filter,actions)
+\whitespace trim
 <$list filter="""$filter$""" variable="imageTitle">
 <$macrocall $name="image-picker-thumbnail" actions="""$actions$"""/>
+&#32;
 </$list>
 \end
 
 \define image-picker(actions,filter:"[all[shadows+tiddlers]is[image]] -[type[application/pdf]] +[!has[draft.of]$subfilter$sort[title]]",subfilter:"")
+\whitespace trim
 <div class="tc-image-chooser">
 <$vars state-system=<<qualify "$:/state/image-picker/system">>>
 <$checkbox tiddler=<<state-system>> field="text" checked="show" unchecked="hide" default="hide">
+&#32;
 {{$:/language/SystemTiddlers/Include/Prompt}}
 </$checkbox>
 <$reveal state=<<state-system>> type="match" text="hide" default="hide" tag="div">

diff --git a/core/wiki/macros/keyboard-driven-input.tid b/core/wiki/macros/keyboard-driven-input.tid
@@ -2,17 +2,21 @@ title: $:/core/macros/keyboard-driven-input
 tags: $:/tags/Macro
 
 \define change-input-tab(stateTitle,tag,beforeafter,defaultState,actions)
+\whitespace trim
 <$set name="tabsList" filter="[all[shadows+tiddlers]tag<__tag__>!has[draft.of]]">
-<$vars currentState={{{ [<__stateTitle__>!is[missing]get[text]] ~[<__defaultState__>] }}} firstTab={{{ [enlist<tabsList>nth[1]] }}} lastTab={{{ [enlist<tabsList>last[]] }}}>
-<$set name="nextTab" value={{{ [all[shadows+tiddlers]tag<__tag__>!has[draft.of]$beforeafter$<currentState>] ~[[$beforeafter$]removeprefix[after]suffix[]addprefix<firstTab>] ~[[$beforeafter$]removeprefix[before]suffix[]addprefix<lastTab>] }}}>
+<$let
+	currentState={{{ [<__stateTitle__>!is[missing]get[text]] ~[<__defaultState__>] }}}
+	firstTab={{{ [enlist<tabsList>nth[1]] }}}
+	lastTab={{{ [enlist<tabsList>last[]] }}}
+	nextTab={{{ [all[shadows+tiddlers]tag<__tag__>!has[draft.of]$beforeafter$<currentState>] ~[[$beforeafter$]removeprefix[after]suffix[]addprefix<firstTab>] ~[[$beforeafter$]removeprefix[before]suffix[]addprefix<lastTab>] }}}>
 <$action-setfield $tiddler=<<__stateTitle__>> text=<<nextTab>>/>
 $actions$
-</$set>
-</$vars>
+</$let>
 </$set>
 \end
 
 \define keyboard-input-actions()
+\whitespace trim
 <$list filter="[<__index__>match[]]">
 <$action-setfield $tiddler=<<__storeTitle__>> text={{{ [<__tiddler__>get<__field__>] }}}/>
 </$list>
@@ -22,6 +26,7 @@ $actions$
 \end
 
 \define input-next-actions-inner()
+\whitespace trim
 <$list filter="[<nextItem>minlength[1]]" variable="ignore">
 <$action-setfield $tiddler=<<__selectionStateTitle__>> text=<<nextItem>>/>
 <$list filter="[<__index__>match[]]">
@@ -35,12 +40,19 @@ $actions$
 \end
 
 \define input-next-actions(afterOrBefore:"after",reverse:"")
+\whitespace trim
 <$list filter="[<__storeTitle__>get[text]minlength<__filterMinLength__>] [<__filterMinLength__>match[0]] +[limit[1]]" variable="ignore">
-<$vars userInput={{{ [<__storeTitle__>get[text]] }}} selectedItem={{{ [<__selectionStateTitle__>get[text]] }}}>
-<$set name="configTiddler" value={{{ [subfilter<__configTiddlerFilter__>] }}}>
-<$vars primaryListFilter={{{ [<configTiddler>get<__firstSearchFilterField__>] }}} secondaryListFilter={{{ [<configTiddler>get<__secondSearchFilterField__>] }}}>
+<$let
+	userInput={{{ [<__storeTitle__>get[text]] }}}
+	selectedItem={{{ [<__selectionStateTitle__>get[text]] }}}
+	configTiddler={{{ [subfilter<__configTiddlerFilter__>] }}}
+	primaryListFilter={{{ [<configTiddler>get<__firstSearchFilterField__>] }}}
+	secondaryListFilter={{{ [<configTiddler>get<__secondSearchFilterField__>] }}}>
 <$set name="filteredList" filter="[subfilter<primaryListFilter>addsuffix[-primaryList]] =[subfilter<secondaryListFilter>addsuffix[-secondaryList]]">
-<$vars nextItem={{{ [enlist<filteredList>$afterOrBefore$<selectedItem>] ~[enlist<filteredList>$reverse$nth[1]] }}} firstItem={{{ [enlist<filteredList>nth[1]] }}} lastItem={{{ [enlist<filteredList>last[]] }}}>
+<$let
+	nextItem={{{ [enlist<filteredList>$afterOrBefore$<selectedItem>] ~[enlist<filteredList>$reverse$nth[1]] }}}
+	firstItem={{{ [enlist<filteredList>nth[1]] }}}
+	lastItem={{{ [enlist<filteredList>last[]] }}}>
 <$list filter="[<selectedItem>match<firstItem>!match<lastItem>]" variable="ignore">
 <$set name="nextItem" value={{{ [[$afterOrBefore$]match[before]then<userInput>addsuffix[-userInput]] ~[<nextItem>] }}}>
 <<input-next-actions-inner>>
@@ -59,11 +71,9 @@ $actions$
 <$list filter="[<selectedItem>!match<firstItem>!match<lastItem>]" variable="ignore">
 <<input-next-actions-inner>>
 </$list>
-</$vars>
-</$set>
-</$vars>
+</$let>
 </$set>
-</$vars>
+</$let>
 </$list>
 \end
 

diff --git a/core/wiki/macros/list.tid b/core/wiki/macros/list.tid
@@ -7,9 +7,11 @@ tags: $:/tags/Macro
 <$list filter="$filter$" emptyMessage=<<__emptyMessage__>>>
 <$subtype$>
 <$link to={{!!title}}>
+<$let tv-wikilinks="no">
 <$transclude field="caption">
 <$view field="title"/>
 </$transclude>
+</$let>
 </$link>
 </$subtype$>
 </$list>
@@ -20,20 +22,22 @@ tags: $:/tags/Macro
 <$action-listops $tiddler=<<targetTiddler>> $field=<<targetField>> $subfilter="+[insertbefore<actionTiddler>,<currentTiddler>]"/>
 \end
 
-\define list-links-draggable(tiddler,field:"list",type:"ul",subtype:"li",class:"",itemTemplate)
+\define list-links-draggable(tiddler,field:"list",emptyMessage,type:"ul",subtype:"li",class:"",itemTemplate)
 \whitespace trim
 <span class="tc-links-draggable-list">
 <$vars targetTiddler="""$tiddler$""" targetField="""$field$""">
 <$type$ class="$class$">
-<$list filter="[list[$tiddler$!!$field$]]">
+<$list filter="[list[$tiddler$!!$field$]]" emptyMessage=<<__emptyMessage__>>>
 <$droppable actions=<<list-links-draggable-drop-actions>> tag="""$subtype$""" enable=<<tv-enable-drag-and-drop>>>
 <div class="tc-droppable-placeholder"/>
 <div>
 <$transclude tiddler="""$itemTemplate$""">
 <$link to={{!!title}}>
+<$let tv-wikilinks="no">
 <$transclude field="caption">
 <$view field="title"/>
 </$transclude>
+</$let>
 </$link>
 </$transclude>
 </div>
@@ -53,6 +57,7 @@ tags: $:/tags/Macro
 \end
 
 \define list-tagged-draggable-drop-actions(tag)
+\whitespace trim
 <!-- Save the current ordering of the tiddlers with this tag -->
 <$set name="order" filter="[<__tag__>tagging[]]">
 <!-- Remove any list-after or list-before fields from the tiddlers with this tag -->

diff --git a/core/wiki/macros/tabs.tid b/core/wiki/macros/tabs.tid
@@ -1,38 +1,63 @@
 title: $:/core/macros/tabs
 tags: $:/tags/Macro
+code-body: yes
 
-\define tabs(tabsList,default,state:"$:/state/tab",class,template,buttonTemplate,retain,actions,explicitState)
-<$set name="qualifiedState" value=<<qualify "$state$">>>
-<$vars tabsState={{{ [<__explicitState__>minlength[1]] ~[<qualifiedState>] }}}>
-<div class="tc-tab-set $class$">
-<div class="tc-tab-buttons $class$">
-<$list filter="$tabsList$" variable="currentTab" storyview="pop"><$set name="save-currentTiddler" value=<<currentTiddler>>><$tiddler tiddler=<<currentTab>>><$button set=<<tabsState>> setTo=<<currentTab>> default="$default$" selectedClass="tc-tab-selected" tooltip={{!!tooltip}}>
-<$tiddler tiddler=<<save-currentTiddler>>>
-<$set name="tv-wikilinks" value="no">
-<$transclude tiddler="$buttonTemplate$" mode="inline">
-<$transclude tiddler=<<currentTab>> field="caption">
-<$macrocall $name="currentTab" $type="text/plain" $output="text/plain"/>
-</$transclude>
-</$transclude>
-</$set></$tiddler>$actions$</$button></$tiddler></$set></$list>
-</div>
-<div class="tc-tab-divider $class$"/>
-<div class="tc-tab-content $class$">
-<$list filter="$tabsList$" variable="currentTab">
-
-<$reveal type="match" state=<<tabsState>> text=<<currentTab>> default="$default$" retain="""$retain$""">
-
-<$transclude tiddler="$template$" mode="block">
-
-<$transclude tiddler=<<currentTab>> mode="block"/>
+\define tabs-button()
+\whitespace trim
+<$button set=<<tabsState>> setTo=<<currentTab>> default=<<__default__>> selectedClass="tc-tab-selected" tooltip={{!!tooltip}} role="switch">
+	<$tiddler tiddler=<<save-currentTiddler>>>
+		<$set name="tv-wikilinks" value="no">
+			<$transclude tiddler=<<__buttonTemplate__>> mode="inline">
+				<$transclude tiddler=<<currentTab>> field="caption">
+					<$macrocall $name="currentTab" $type="text/plain" $output="text/plain"/>
+				</$transclude>
+			</$transclude>
+		</$set>
+	</$tiddler>
+	<<__actions__>>
+</$button>
+\end
 
-</$transclude>
+\define tabs-tab()
+\whitespace trim
+<$set name="save-currentTiddler" value=<<currentTiddler>>>
+	<$tiddler tiddler=<<currentTab>>>
+		<<tabs-button>>
+	</$tiddler>
+</$set>
+\end
 
-</$reveal>
+\define tabs-tab-list()
+\whitespace trim
+<$list filter=<<__tabsList__>> variable="currentTab" storyview="pop">
+	<<tabs-tab>>
+</$list>
+\end
 
+\define tabs-tab-body()
+\whitespace trim
+<$list filter=<<__tabsList__>> variable="currentTab">
+	<$reveal type="match" state=<<tabsState>> text=<<currentTab>> default=<<__default__>> retain=<<__retain__>> tag="div">
+		<$transclude tiddler=<<__template__>> mode="block">
+			<$transclude tiddler=<<currentTab>> mode="block"/>
+		</$transclude>
+	</$reveal>
 </$list>
-</div>
-</div>
-</$vars>
-</$set>
+\end
+
+\define tabs(tabsList,default,state:"$:/state/tab",class,template,buttonTemplate,retain,actions,explicitState)
+\whitespace trim
+<$qualify title=<<__state__>> name="qualifiedState">
+	<$let tabsState={{{ [<__explicitState__>minlength[1]] ~[<qualifiedState>] }}}>
+		<div class={{{ [[tc-tab-set]addsuffix[ ]addsuffix<__class__>] }}}>
+			<div class={{{ [[tc-tab-buttons]addsuffix[ ]addsuffix<__class__>] }}}>
+				<<tabs-tab-list>>
+			</div>
+			<div class={{{ [[tc-tab-divider]addsuffix[ ]addsuffix<__class__>] }}}/>
+			<div class={{{ [[tc-tab-content]addsuffix[ ]addsuffix<__class__>] }}}>
+				<<tabs-tab-body>>
+			</div>
+		</div>
+	</$let>
+</$qualify>
 \end
diff --git a/core/wiki/macros/tag-picker.tid b/core/wiki/macros/tag-picker.tid
@@ -8,11 +8,10 @@ second-search-filter: [tags[]is[system]search:title<userInput>sort[]]
 \define delete-tag-state-tiddlers() <$action-deletetiddler $filter="[<newTagNameTiddler>] [<storeTitle>] [<tagSelectionState>]"/>
 
 \define add-tag-actions(actions,tagField:"tags")
+\whitespace trim
 <$set name="tag" value={{{ [<__tiddler__>get[text]] }}}>
-<$list filter="[<saveTiddler>!contains:$tagField$<tag>!match[]]" variable="ignore" emptyMessage="""
-<$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter="-[<tag>]"/>
-""">
-<$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter="[<tag>]"/>
+<$list filter="[<saveTiddler>!contains:$tagField$<tag>!match[]]" variable="ignore" emptyMessage="<$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter='-[<tag>]'/>">
+<$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter="[<tag>trim[]]"/>
 $actions$
 </$list>
 </$set>
@@ -21,14 +20,16 @@ $actions$
 \end
 
 \define clear-tags-actions-inner()
-<$list filter="[<storeTitle>has[text]] [<newTagNameTiddler>has[text]]" variable="ignore" emptyMessage="""<<cancel-delete-tiddler-actions "cancel">>""">
+\whitespace trim
+<$list filter="[<storeTitle>has[text]] [<newTagNameTiddler>has[text]]" variable="ignore" emptyMessage="<<cancel-delete-tiddler-actions 'cancel'>>">
 <<delete-tag-state-tiddlers>>
 </$list>
 \end
 
 \define clear-tags-actions()
+\whitespace trim
 <$set name="userInput" value={{{ [<storeTitle>get[text]] }}}>
-<$list filter="[<newTagNameTiddler>get[text]!match<userInput>]" emptyMessage="""<<clear-tags-actions-inner>>""">
+<$list filter="[<newTagNameTiddler>get[text]!match<userInput>]" emptyMessage="<<clear-tags-actions-inner>>">
 <$action-setfield $tiddler=<<newTagNameTiddler>> text=<<userInput>>/><$action-setfield $tiddler=<<refreshTitle>> text="yes"/>
 </$list>
 </$set>
@@ -43,15 +44,15 @@ $actions$
 <div>
 <span class="tc-add-tag-name tc-small-gap-right">
 <$macrocall $name="keyboard-driven-input" tiddler=<<newTagNameTiddler>> storeTitle=<<storeTitle>> refreshTitle=<<refreshTitle>>
-		selectionStateTitle=<<tagSelectionState>> inputAcceptActions="""<$macrocall $name="add-tag-actions" actions=<<__actions__>> tagField=<<__tagField__>>/>"""
+		selectionStateTitle=<<tagSelectionState>> inputAcceptActions="<$macrocall $name='add-tag-actions' actions=<<__actions__>> tagField=<<__tagField__>>/>"
 		inputCancelActions=<<clear-tags-actions>> tag="input" placeholder={{$:/language/EditTemplate/Tags/Add/Placeholder}}
 		focusPopup=<<qualify "$:/state/popup/tags-auto-complete">> class="tc-edit-texteditor tc-popup-handle" tabindex=<<tabIndex>> 
 		focus={{{ [{$:/config/AutoFocus}match[tags]then[true]] ~[[false]] }}} filterMinLength={{$:/config/Tags/MinLength}} 
 		cancelPopups=<<cancelPopups>> configTiddlerFilter="[[$:/core/macros/tag-picker]]"/>
 </span><$button popup=<<qualify "$:/state/popup/tags-auto-complete">> class="tc-btn-invisible tc-btn-dropdown" tooltip={{$:/language/EditTemplate/Tags/Dropdown/Hint}} aria-label={{$:/language/EditTemplate/Tags/Dropdown/Caption}}>{{$:/core/images/down-arrow}}</$button><$reveal state=<<storeTitle>> type="nomatch" text=""><$button class="tc-btn-invisible tc-small-gap tc-btn-dropdown" tooltip={{$:/language/EditTemplate/Tags/ClearInput/Hint}} aria-label={{$:/language/EditTemplate/Tags/ClearInput/Caption}}>{{$:/core/images/close-button}}<<delete-tag-state-tiddlers>></$button></$reveal><span class="tc-add-tag-button tc-small-gap-left">
 <$set name="tag" value={{{ [<newTagNameTiddler>get[text]] }}}>
 <$button set=<<newTagNameTiddler>> setTo="" class="">
-<$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter="[<tag>]"/>
+<$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter="[<tag>trim[]]"/>
 $actions$
 <$set name="currentTiddlerCSSEscaped" value={{{ [<saveTiddler>escapecss[]] }}}>
 <<delete-tag-state-tiddlers>><$action-sendmessage $message="tm-focus-selector" $param=<<get-tagpicker-focus-selector>>/>
@@ -65,16 +66,16 @@ $actions$
 <$reveal state=<<qualify "$:/state/popup/tags-auto-complete">> type="nomatch" text="" default="">
 <div class="tc-block-dropdown tc-block-tags-dropdown">
 <$set name="userInput" value={{{ [<storeTitle>get[text]] }}}>
-<$list filter="[<userInput>minlength{$:/config/Tags/MinLength}limit[1]]" emptyMessage="""<div class="tc-search-results">{{$:/language/Search/Search/TooShort}}</div>""" variable="listItem">
+<$list filter="[<userInput>minlength{$:/config/Tags/MinLength}limit[1]]" emptyMessage="<div class='tc-search-results'>{{$:/language/Search/Search/TooShort}}</div>" variable="listItem">
 <$list filter=<<nonSystemTagsFilter>> variable="tag">
-<$list filter="[<tag>addsuffix[-primaryList]] -[<tagSelectionState>get[text]]" emptyMessage="""<$vars button-classes="tc-btn-invisible tc-tag-button-selected" actions=<<__actions__>> tagField=<<__tagField__>> currentTiddler=<<tag>>>{{||$:/core/ui/TagPickerTagTemplate}}</$vars>""">
+<$list filter="[<tag>addsuffix[-primaryList]] -[<tagSelectionState>get[text]]" emptyMessage="<$vars button-classes='tc-btn-invisible tc-tag-button-selected' actions=<<__actions__>> tagField=<<__tagField__>> currentTiddler=<<tag>>>{{||$:/core/ui/TagPickerTagTemplate}}</$vars>">
 <$vars button-classes="tc-btn-invisible" actions=<<__actions__>> tagField=<<__tagField__>> currentTiddler=<<tag>>>{{||$:/core/ui/TagPickerTagTemplate}}</$vars>
 </$list>
 </$list></$list>
 <hr>
-<$list filter="[<userInput>minlength{$:/config/Tags/MinLength}limit[1]]" emptyMessage="""<div class="tc-search-results">{{$:/language/Search/Search/TooShort}}</div>""" variable="listItem">
+<$list filter="[<userInput>minlength{$:/config/Tags/MinLength}limit[1]]" emptyMessage="<div class='tc-search-results'>{{$:/language/Search/Search/TooShort}}</div>" variable="listItem">
 <$list filter=<<systemTagsFilter>> variable="tag">
-<$list filter="[<tag>addsuffix[-secondaryList]] -[<tagSelectionState>get[text]]" emptyMessage="""<$vars button-classes="tc-btn-invisible tc-tag-button-selected" actions=<<__actions__>> tagField=<<__tagField__>> currentTiddler=<<tag>>>{{||$:/core/ui/TagPickerTagTemplate}}</$vars>""">
+<$list filter="[<tag>addsuffix[-secondaryList]] -[<tagSelectionState>get[text]]" emptyMessage="<$vars button-classes='tc-btn-invisible tc-tag-button-selected' actions=<<__actions__>> tagField=<<__tagField__>> currentTiddler=<<tag>>>{{||$:/core/ui/TagPickerTagTemplate}}</$vars>">
 <$vars button-classes="tc-btn-invisible" actions=<<__actions__>> tagField=<<__tagField__>> currentTiddler=<<tag>>>{{||$:/core/ui/TagPickerTagTemplate}}</$vars>
 </$list>
 </$list></$list>
@@ -90,7 +91,7 @@ $actions$
 \define tag-picker(actions,tagField:"tags")
 \whitespace trim
 <$vars saveTiddler=<<currentTiddler>> palette={{$:/palette}}>
-<$list filter="[<newTagNameTiddler>match[]]" emptyMessage="""<$macrocall $name="tag-picker-inner" actions=<<__actions__>> tagField=<<__tagField__>>/>""">
+<$list filter="[<newTagNameTiddler>match[]]" emptyMessage="<$macrocall $name='tag-picker-inner' actions=<<__actions__>> tagField=<<__tagField__>>/>">
 <$set name="newTagNameTiddler" value=<<qualify "$:/temp/NewTagName">>>
 <$macrocall $name="tag-picker-inner" actions=<<__actions__>> tagField=<<__tagField__>>/>
 </$set>

diff --git a/core/wiki/macros/tag.tid b/core/wiki/macros/tag.tid
@@ -7,19 +7,24 @@ fill:$(foregroundColor)$;
 color:$(foregroundColor)$;
 \end
 
+<!-- This has no whitespace trim to avoid modifying $actions$. Closing tags omitted for brevity. -->
 \define tag-pill-inner(tag,icon,colour,fallbackTarget,colourA,colourB,element-tag,element-attributes,actions)
-<$vars foregroundColor=<<contrastcolour target:"""$colour$""" fallbackTarget:"""$fallbackTarget$""" colourA:"""$colourA$""" colourB:"""$colourB$""">> backgroundColor="""$colour$""">
-<$element-tag$ $element-attributes$ class="tc-tag-label tc-btn-invisible" style=<<tag-pill-styles>>>
-$actions$<$transclude tiddler="""$icon$"""/><$view tiddler=<<__tag__>> field="title" format="text" />
-</$element-tag$>
-</$vars>
+<$vars
+	foregroundColor=<<contrastcolour target:"""$colour$""" fallbackTarget:"""$fallbackTarget$""" colourA:"""$colourA$""" colourB:"""$colourB$""">>
+	backgroundColor="""$colour$"""
+><$element-tag$
+	$element-attributes$
+	class="tc-tag-label tc-btn-invisible"
+	style=<<tag-pill-styles>>
+>$actions$<$transclude tiddler="""$icon$"""/><$view tiddler=<<__tag__>> field="title" format="text" /></$element-tag$>
 \end
 
 \define tag-pill-body(tag,icon,colour,palette,element-tag,element-attributes,actions)
 <$macrocall $name="tag-pill-inner" tag=<<__tag__>> icon="""$icon$""" colour="""$colour$""" fallbackTarget={{$palette$##tag-background}} colourA={{$palette$##foreground}} colourB={{$palette$##background}} element-tag="""$element-tag$""" element-attributes="""$element-attributes$""" actions="""$actions$"""/>
 \end
 
 \define tag-pill(tag,element-tag:"span",element-attributes:"",actions:"")
+\whitespace trim
 <span class="tc-tag-list-item" data-tag-title=<<__tag__>>>
 <$let currentTiddler=<<__tag__>>>
 <$macrocall $name="tag-pill-body" tag=<<__tag__>> icon={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] }}} colour={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}} palette={{$:/palette}} element-tag="""$element-tag$""" element-attributes="""$element-attributes$""" actions="""$actions$"""/>

diff --git a/core/wiki/macros/thumbnails.tid b/core/wiki/macros/thumbnails.tid
@@ -1,16 +1,28 @@
 title: $:/core/macros/thumbnails
 tags: $:/tags/Macro
 
+<!-- This macro does not use \whitespace trim because it could affect the caption -->
 \define thumbnail(link,icon,color,background-color,image,caption,width:"280",height:"157")
-<$link to="""$link$"""><div class="tc-thumbnail-wrapper">
-<div class="tc-thumbnail-image" style="width:$width$px;height:$height$px;"><$reveal type="nomatch" text="" default="""$image$""" tag="div" style="width:$width$px;height:$height$px;">
-[img[$image$]]
-</$reveal><$reveal type="match" text="" default="""$image$""" tag="div" class="tc-thumbnail-background" style="width:$width$px;height:$height$px;background-color:$background-color$;"></$reveal></div><div class="tc-thumbnail-icon" style="fill:$color$;color:$color$;">
-$icon$
-</div><div class="tc-thumbnail-caption">
-$caption$
-</div>
-</div></$link>
+<$link to="""$link$"""><div class="tc-thumbnail-wrapper"
+><div
+	class="tc-thumbnail-image"
+	style="width:$width$px;height:$height$px;"><$reveal
+	type="nomatch"
+	text=""
+	default="""$image$"""
+	tag="div"
+	style="width:$width$px;height:$height$px;"
+>[img[$image$]]</$reveal><$reveal
+	type="match"
+	text=""
+	default="""$image$"""
+	tag="div"
+	class="tc-thumbnail-background"
+	style="width:$width$px;height:$height$px;background-color:$background-color$;"
+></$reveal></div><div
+	class="tc-thumbnail-icon"
+	style="fill:$color$;color:$color$;"
+>$icon$</div><div class="tc-thumbnail-caption">$caption$</div></div></$link>
 \end
 
 \define thumbnail-right(link,icon,color,background-color,image,caption,width:"280",height:"157")

diff --git 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">

diff --git a/core/wiki/macros/toc.tid b/core/wiki/macros/toc.tid
@@ -2,17 +2,21 @@ title: $:/core/macros/toc
 tags: $:/tags/Macro
 
 \define toc-caption()
+\whitespace trim
+<span class="tc-toc-caption tc-tiny-gap-left">
 <$set name="tv-wikilinks" value="no">
   <$transclude field="caption">
     <$view field="title"/>
   </$transclude>
 </$set>
+</span>
 \end
 
 \define toc-body(tag,sort:"",itemClassFilter,exclude,path)
+\whitespace trim
 <ol class="tc-toc">
   <$list filter="""[all[shadows+tiddlers]tag<__tag__>!has[draft.of]$sort$] -[<__tag__>] -[enlist<__exclude__>]""">
-    <$vars item=<<currentTiddler>> path={{{ [<__path__>addsuffix[/]addsuffix<__tag__>] }}}>
+    <$let item=<<currentTiddler>> path={{{ [<__path__>addsuffix[/]addsuffix<__tag__>] }}}>
       <$set name="excluded" filter="""[enlist<__exclude__>] [<__tag__>]""">
         <$set name="toc-item-class" filter=<<__itemClassFilter__>> emptyValue="toc-item-selected" value="toc-item">
           <li class=<<toc-item-class>>>
@@ -23,7 +27,7 @@ tags: $:/tags/Macro
           </li>
         </$set>
       </$set>
-    </$vars>
+    </$let>
   </$list>
 </ol>
 \end
@@ -33,6 +37,7 @@ tags: $:/tags/Macro
 \end
 
 \define toc-linked-expandable-body(tag,sort:"",itemClassFilter,exclude,path)
+\whitespace trim
 <!-- helper function -->
 <$qualify name="toc-state" title={{{ [[$:/state/toc]addsuffix<__path__>addsuffix[-]addsuffix<currentTiddler>] }}}>
   <$set name="toc-item-class" filter=<<__itemClassFilter__>> emptyValue="toc-item-selected" value="toc-item">
@@ -59,6 +64,7 @@ tags: $:/tags/Macro
 \end
 
 \define toc-unlinked-expandable-body(tag,sort:"",itemClassFilter,exclude,path)
+\whitespace trim
 <!-- helper function -->
 <$qualify name="toc-state" title={{{ [[$:/state/toc]addsuffix<__path__>addsuffix[-]addsuffix<currentTiddler>] }}}>
   <$set name="toc-item-class" filter=<<__itemClassFilter__>> emptyValue="toc-item-selected" value="toc-item">
@@ -88,7 +94,8 @@ tags: $:/tags/Macro
 \end
 
 \define toc-expandable(tag,sort:"",itemClassFilter:"",exclude,path)
-<$vars tag=<<__tag__>> sort=<<__sort__>> itemClassFilter=<<__itemClassFilter__>> path={{{ [<__path__>addsuffix[/]addsuffix<__tag__>] }}}>
+\whitespace trim
+<$let tag=<<__tag__>> sort=<<__sort__>> itemClassFilter=<<__itemClassFilter__>> path={{{ [<__path__>addsuffix[/]addsuffix<__tag__>] }}}>
   <$set name="excluded" filter="""[enlist<__exclude__>] [<__tag__>]""">
     <ol class="tc-toc toc-expandable">
       <$list filter="""[all[shadows+tiddlers]tag<__tag__>!has[draft.of]$sort$] -[<__tag__>] -[enlist<__exclude__>]""">
@@ -98,10 +105,11 @@ tags: $:/tags/Macro
       </$list>
     </ol>
   </$set>
-</$vars>
+</$let>
 \end
 
 \define toc-linked-selective-expandable-body(tag,sort:"",itemClassFilter,exclude,path)
+\whitespace trim
 <$qualify name="toc-state" title={{{ [[$:/state/toc]addsuffix<__path__>addsuffix[-]addsuffix<currentTiddler>] }}}>
   <$set name="toc-item-class" filter=<<__itemClassFilter__>> emptyValue="toc-item-selected" value="toc-item" >
     <li class=<<toc-item-class>>>
@@ -129,6 +137,7 @@ tags: $:/tags/Macro
 \end
 
 \define toc-unlinked-selective-expandable-body(tag,sort:"",itemClassFilter,exclude,path)
+\whitespace trim
 <$qualify name="toc-state" title={{{ [[$:/state/toc]addsuffix<__path__>addsuffix[-]addsuffix<currentTiddler>] }}}>
   <$set name="toc-item-class" filter=<<__itemClassFilter__>> emptyValue="toc-item-selected" value="toc-item">
     <li class=<<toc-item-class>>>
@@ -159,8 +168,9 @@ tags: $:/tags/Macro
 \end
 
 \define toc-selective-expandable(tag,sort:"",itemClassFilter,exclude,path)
-<$vars tag=<<__tag__>> sort=<<__sort__>> itemClassFilter=<<__itemClassFilter__>> path={{{ [<__path__>addsuffix[/]addsuffix<__tag__>] }}}>
-  <$set name="excluded" filter="""[enlist<__exclude__>] [<__tag__>]""">
+\whitespace trim
+<$let tag=<<__tag__>> sort=<<__sort__>> itemClassFilter=<<__itemClassFilter__>> path={{{ [<__path__>addsuffix[/]addsuffix<__tag__>] }}}>
+  <$set name="excluded" filter="[enlist<__exclude__>] [<__tag__>]">
     <ol class="tc-toc toc-selective-expandable">
       <$list filter="""[all[shadows+tiddlers]tag<__tag__>!has[draft.of]$sort$] -[<__tag__>] -[enlist<__exclude__>]""">
         <$list filter="[all[current]toc-link[no]]" variable="ignore" emptyMessage=<<toc-selective-expandable-empty-message>> >
@@ -169,10 +179,11 @@ tags: $:/tags/Macro
       </$list>
     </ol>
   </$set>
-</$vars>
+</$let>
 \end
 
 \define toc-tabbed-external-nav(tag,sort:"",selectedTiddler:"$:/temp/toc/selectedTiddler",unselectedText,missingText,template:"")
+\whitespace trim
 <$tiddler tiddler={{{ [<__selectedTiddler__>get[text]] }}}>
   <div class="tc-tabbed-table-of-contents">
     <$linkcatcher to=<<__selectedTiddler__>>>
@@ -196,8 +207,8 @@ tags: $:/tags/Macro
 \end
 
 \define toc-tabbed-internal-nav(tag,sort:"",selectedTiddler:"$:/temp/toc/selectedTiddler",unselectedText,missingText,template:"")
+\whitespace trim
 <$linkcatcher to=<<__selectedTiddler__>>>
   <$macrocall $name="toc-tabbed-external-nav" tag=<<__tag__>> sort=<<__sort__>> selectedTiddler=<<__selectedTiddler__>> unselectedText=<<__unselectedText__>> missingText=<<__missingText__>> template=<<__template__>>/>
 </$linkcatcher>
 \end
-
diff --git a/core/wiki/macros/translink.tid b/core/wiki/macros/translink.tid
@@ -2,6 +2,7 @@ title: $:/core/macros/translink
 tags: $:/tags/Macro
 
 \define translink(title,mode:"block")
+\whitespace trim
 <div style="border:1px solid #ccc; padding: 0.5em; background: black; foreground; white;">
 <$link to="""$title$""">
 <$text text="""$title$"""/>

diff --git a/core/wiki/macros/tree.tid b/core/wiki/macros/tree.tid
@@ -6,28 +6,31 @@ tags: $:/tags/Macro
 \end
 
 \define leaf-node(prefix,chunk)
+\whitespace trim
 <li>
 <$list filter="[<__prefix__>addsuffix<__chunk__>is[shadow]] [<__prefix__>addsuffix<__chunk__>is[tiddler]]" variable="full-title">
 <$list filter="[<full-title>removeprefix<__prefix__>]" variable="chunk">
-<span>{{$:/core/images/file}}</span> <$macrocall $name="leaf-link" full-title=<<full-title>> chunk=<<chunk>>/>
+<span>{{$:/core/images/file}}</span>&#32;<$macrocall $name="leaf-link" full-title=<<full-title>> chunk=<<chunk>>/>
 </$list>
 </$list>
 </li>
 \end
 
 \define branch-node(prefix,chunk,separator: "/")
+\whitespace trim
 <li>
 <$set name="reveal-state" value={{{ [[$:/state/tree/]addsuffix<__prefix__>addsuffix<__chunk__>] }}}>
 <$reveal type="nomatch" stateTitle=<<reveal-state>> text="show">
 <$button setTitle=<<reveal-state>> setTo="show" class="tc-btn-invisible">
-{{$:/core/images/folder}} <$text text=<<__chunk__>>/>
+{{$:/core/images/folder}}&#32;<$text text=<<__chunk__>>/>
 </$button>
 </$reveal>
 <$reveal type="match" stateTitle=<<reveal-state>> text="show">
 <$button setTitle=<<reveal-state>> setTo="hide" class="tc-btn-invisible">
-{{$:/core/images/folder}} <$text text=<<__chunk__>>/>
+{{$:/core/images/folder}}&#32;<$text text=<<__chunk__>>/>
 </$button>
 </$reveal>
+&#32;
 <span>(<$count filter="[all[shadows+tiddlers]removeprefix<__prefix__>removeprefix<__chunk__>] -[<__prefix__>addsuffix<__chunk__>]"/>)</span>
 <$reveal type="match" stateTitle=<<reveal-state>> text="show">
 <$macrocall $name="tree-node" prefix={{{ [<__prefix__>addsuffix<__chunk__>] }}} separator=<<__separator__>>/>
@@ -37,6 +40,7 @@ tags: $:/tags/Macro
 \end
 
 \define tree-node(prefix,separator: "/")
+\whitespace trim
 <ol>
 <$list filter="[all[shadows+tiddlers]removeprefix<__prefix__>splitbefore<__separator__>sort[]!suffix<__separator__>]" variable="chunk">
 <$macrocall $name="leaf-node" prefix=<<__prefix__>> chunk=<<chunk>> separator=<<__separator__>>/>
@@ -48,6 +52,7 @@ tags: $:/tags/Macro
 \end
 
 \define tree(prefix: "$:/",separator: "/")
+\whitespace trim
 <div class="tc-tree">
 <span><$text text=<<__prefix__>>/></span>
 <div>

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/peek-stylesheets.tid b/core/wiki/peek-stylesheets.tid
@@ -23,11 +23,7 @@ title: $:/snippets/peek-stylesheets
 <$reveal type="match" state=<<state>> text="yes" tag="div">
 <$set name="source" tiddler=<<currentTiddler>>>
 <$wikify name="styles" text=<<source>>>
-<pre>
-<code>
-<$text text=<<styles>>/>
-</code>
-</pre>
+<$codeblock code=<<styles>> language="css"/>
 </$wikify>
 </$set>
 </$reveal>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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>
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,7 @@ tags: $:/tags/TiddlerInfo/Advanced @@
     <$list filter="[all[current]shadowsource[]]">
     <$set name="pluginTiddler" value=<<currentTiddler>>>
     <<lingo Shadow/Source>>
     </$set>
@@ Expand Down @@