diff --git a/boot/boot.js b/boot/boot.js
index ea20c83fd..b4bdc00f2 100644
--- a/boot/boot.js
+++ b/boot/boot.js
@@ -386,8 +386,8 @@ $tw.utils.parseDate = function(value) {
 				parseInt(value.substr(10,2)||"00",10),
 				parseInt(value.substr(12,2)||"00",10),
 				parseInt(value.substr(14,3)||"000",10)));
-		  d.setUTCFullYear(year); // See https://stackoverflow.com/a/5870822
-		  return d;
+		d.setUTCFullYear(year); // See https://stackoverflow.com/a/5870822
+		return d;
 	} else if($tw.utils.isDate(value)) {
 		return value;
 	} else {
diff --git a/core/language/en-GB/Buttons.multids b/core/language/en-GB/Buttons.multids
index 30f89eec7..2fa732fd9 100644
--- a/core/language/en-GB/Buttons.multids
+++ b/core/language/en-GB/Buttons.multids
@@ -133,6 +133,7 @@ Excise/Caption/Replace/Link: link
 Excise/Caption/Replace/Transclusion: transclusion
 Excise/Caption/Tag: Tag new tiddler with the title of this tiddler
 Excise/Caption/TiddlerExists: Warning: tiddler already exists
+Excise/DefaultTitle: New Excision
 Excise/Hint: Excise the selected text into a new tiddler
 Heading1/Caption: heading 1
 Heading1/Hint: Apply heading level 1 formatting to lines containing selection
diff --git a/core/language/en-GB/EditTemplate.multids b/core/language/en-GB/EditTemplate.multids
index c4bfa5e56..9b61f71ec 100644
--- a/core/language/en-GB/EditTemplate.multids
+++ b/core/language/en-GB/EditTemplate.multids
@@ -26,6 +26,7 @@ Tags/ClearInput/Caption: clear input
 Tags/ClearInput/Hint: Clear tag input
 Tags/Dropdown/Caption: tag list
 Tags/Dropdown/Hint: Show tag list
+Tags/EmptyMessage: (no search result)
 Title/BadCharacterWarning: Warning: avoid using any of the characters <<bad-chars>> in tiddler titles
 Title/Exists/Prompt: Target tiddler already exists
 Title/Relink/Prompt: Update ''<$text text=<<fromTitle>>/>'' to ''<$text text=<<toTitle>>/>'' in the //tags// and //list// fields of other tiddlers
diff --git a/core/language/en-GB/Search.multids b/core/language/en-GB/Search.multids
index 2a57a6416..f5aa478bf 100644
--- a/core/language/en-GB/Search.multids
+++ b/core/language/en-GB/Search.multids
@@ -6,6 +6,8 @@ Filter/Hint: Search via a [[filter expression|https://tiddlywiki.com/static/Filt
 Filter/Matches: //<small><<resultCount>> matches</small>//
 Matches: //<small><<resultCount>> matches</small>//
 Matches/All: All matches:
+Matches/NoMatch: //No match//
+Matches/NoResult: //No search result//
 Matches/Title: Title matches:
 Search: Search
 Search/TooShort: Search text too short
diff --git a/core/modules/editor/operations/text/excise.js b/core/modules/editor/operations/text/excise.js
index ced771719..bb5840c2e 100644
--- a/core/modules/editor/operations/text/excise.js
+++ b/core/modules/editor/operations/text/excise.js
@@ -12,20 +12,27 @@ Text editor operation to excise the selection to a new tiddler
 /*global $tw: false */
 "use strict";
 
+function isMarkdown(mediaType) {
+	return mediaType === 'text/markdown' || mediatype === 'text/x-markdown';
+}
+
 exports["excise"] = function(event,operation) {
 	var editTiddler = this.wiki.getTiddler(this.editTitle),
-		editTiddlerTitle = this.editTitle;
+		editTiddlerTitle = this.editTitle,
+		wikiLinks = !isMarkdown(editTiddler.fields.type),
+		excisionBaseTitle = $tw.language.getString("Buttons/Excise/DefaultTitle");
 	if(editTiddler && editTiddler.fields["draft.of"]) {
 		editTiddlerTitle = editTiddler.fields["draft.of"];
 	}
-	var excisionTitle = event.paramObject.title || this.wiki.generateNewTitle("New Excision");
+	var excisionTitle = event.paramObject.title || this.wiki.generateNewTitle(excisionBaseTitle);
 	this.wiki.addTiddler(new $tw.Tiddler(
 		this.wiki.getCreationFields(),
 		this.wiki.getModificationFields(),
 		{
 			title: excisionTitle,
 			text: operation.selection,
-			tags: event.paramObject.tagnew === "yes" ?  [editTiddlerTitle] : []
+			tags: event.paramObject.tagnew === "yes" ?  [editTiddlerTitle] : [],
+			type: editTiddler.fields.type
 		}
 	));
 	operation.replacement = excisionTitle;
@@ -34,7 +41,8 @@ exports["excise"] = function(event,operation) {
 			operation.replacement = "{{" + operation.replacement+ "}}";
 			break;
 		case "link":
-			operation.replacement = "[[" + operation.replacement+ "]]";
+			operation.replacement = wikiLinks ? "[[" + operation.replacement+ "]]"
+				: ("[" + operation.replacement + "](<#" + operation.replacement + ">)");
 			break;
 		case "macro":
 			operation.replacement = "<<" + (event.paramObject.macro || "translink") + " \"\"\"" + operation.replacement + "\"\"\">>";
diff --git a/core/modules/editor/operations/text/wrap-selection.js b/core/modules/editor/operations/text/wrap-selection.js
index 6800cbe5b..665d72eb4 100644
--- a/core/modules/editor/operations/text/wrap-selection.js
+++ b/core/modules/editor/operations/text/wrap-selection.js
@@ -13,37 +13,125 @@ Text editor operation to wrap the selection with the specified prefix and suffix
 "use strict";
 
 exports["wrap-selection"] = function(event,operation) {
-	if(operation.selStart === operation.selEnd) {
-		// No selection; check if we're within the prefix/suffix
-		if(operation.text.substring(operation.selStart - event.paramObject.prefix.length,operation.selStart + event.paramObject.suffix.length) === event.paramObject.prefix + event.paramObject.suffix) {
+	var o = operation,
+		prefix = event.paramObject.prefix,
+		suffix = event.paramObject.suffix,
+		trimSelection = event.paramObject.trimSelection || "no",
+		selLength = o.selEnd - o.selStart;
+
+	// This function detects, if trailing spaces are part of the selection __and__ if the user wants to handle them
+	// Returns "yes", "start", "end", "no" (default)
+	//	yes .. there are trailing spaces at both ends
+	//	start .. there are trailing spaces at the start
+	//	end .. there are trailing spaces at the end
+	//	no .. no trailing spaces are taken into account
+	var trailingSpaceAt = function(sel) {
+		var _start,
+			_end,
+			result;
+		// trimSelection is a user parameter, which this evaluations takes into account
+		switch(trimSelection) {
+			case "end":
+				result = (sel.trimEnd().length !== selLength) ? "end" : "no";
+				break;
+			case "yes":
+				_start = sel.trimStart().length !== selLength;
+				_end = sel.trimEnd().length !== selLength;
+				result = (_start && _end) ? "yes" : (_start) ? "start" : (_end) ? "end" : "no";
+				break;
+			case "start":
+				result = (sel.trimStart().length !== selLength) ? "start" : "no";
+				break;
+			default:
+				result = "no";
+				break;
+		}
+		return result;
+	}
+
+	function togglePrefixSuffix() {
+		if(o.text.substring(o.selStart - prefix.length, o.selStart + suffix.length) === prefix + suffix) {
 			// Remove the prefix and suffix
-			operation.cutStart = operation.selStart - event.paramObject.prefix.length;
-			operation.cutEnd = operation.selEnd + event.paramObject.suffix.length;
-			operation.replacement = "";
-			operation.newSelStart = operation.cutStart;
-			operation.newSelEnd = operation.newSelStart;
+			o.cutStart = o.selStart - prefix.length;
+			o.cutEnd = o.selEnd + suffix.length;
+			o.replacement = "";
+			o.newSelStart = o.cutStart;
+			o.newSelEnd = o.newSelStart;
 		} else {
 			// Wrap the cursor instead
-			operation.cutStart = operation.selStart;
-			operation.cutEnd = operation.selEnd;
-			operation.replacement = event.paramObject.prefix + event.paramObject.suffix;
-			operation.newSelStart = operation.selStart + event.paramObject.prefix.length;
-			operation.newSelEnd = operation.newSelStart;
+			o.cutStart = o.selStart;
+			o.cutEnd = o.selEnd;
+			o.replacement = prefix + suffix;
+			o.newSelStart = o.selStart + prefix.length;
+			o.newSelEnd = o.newSelStart;
 		}
-	} else if(operation.text.substring(operation.selStart,operation.selStart + event.paramObject.prefix.length) === event.paramObject.prefix && operation.text.substring(operation.selEnd - event.paramObject.suffix.length,operation.selEnd) === event.paramObject.suffix) {
+	}
+
+	// options: lenPrefix, lenSuffix
+	function removePrefixSuffix(options) {
+		options = options || {};
+		var _lenPrefix = options.lenPrefix || 0;
+		var _lenSuffix = options.lenSuffix || 0;
+
+		o.cutStart = o.selStart - _lenPrefix;
+		o.cutEnd = o.selEnd + _lenSuffix;
+		o.replacement = (_lenPrefix || _lenSuffix) ? o.selection : o.selection.substring(prefix.length, o.selection.length - suffix.length);
+		o.newSelStart = o.cutStart;
+		o.newSelEnd = o.cutStart + o.replacement.length;
+	}
+
+	function addPrefixSuffix() {
+		// remove trailing space if requested
+		switch(trailingSpaceAt(o.selection)) {
+			case "no":
+				// has no trailing spaces
+				o.cutStart = o.selStart;
+				o.cutEnd = o.selEnd;
+				o.replacement = prefix + o.selection + suffix;
+				o.newSelStart = o.selStart;
+				o.newSelEnd = o.selStart + o.replacement.length;
+				break;
+			case "yes":
+				// handle both ends
+				o.cutStart = o.selEnd - (o.selection.trimStart().length);
+				o.cutEnd = o.selection.trimEnd().length + o.selStart;
+				o.replacement = prefix + o.selection.trim() + suffix;
+				o.newSelStart = o.cutStart;
+				o.newSelEnd = o.cutStart + o.replacement.length;
+				break;
+			case "start":
+				// handle leading
+				o.cutStart = o.selEnd - (o.selection.trimStart().length);
+				o.cutEnd = o.selEnd;
+				o.replacement = prefix + o.selection.trimStart() + suffix;
+				o.newSelStart = o.cutStart;
+				o.newSelEnd = o.cutStart + o.replacement.length;
+				break;
+			case "end":
+				// handle trailing
+				o.cutStart = o.selStart;
+				o.cutEnd = o.selection.trimEnd().length + o.selStart;
+				o.replacement = prefix + o.selection.trimEnd() + suffix;
+				o.newSelStart = o.selStart;
+				o.newSelEnd = o.selStart + o.replacement.length;
+				break;
+		}
+	}
+
+	if(o.selStart === o.selEnd) {
+		// No selection; Create prefix and suffix. Set cursor in between them: ""|""
+		togglePrefixSuffix();
+	} else if(o.text.substring(o.selStart, o.selStart + prefix.length) === prefix &&
+				o.text.substring(o.selEnd - suffix.length,o.selEnd) === suffix) {
 		// Prefix and suffix are already present, so remove them
-		operation.cutStart = operation.selStart;
-		operation.cutEnd = operation.selEnd;
-		operation.replacement = operation.selection.substring(event.paramObject.prefix.length,operation.selection.length - event.paramObject.suffix.length);
-		operation.newSelStart = operation.selStart;
-		operation.newSelEnd = operation.selStart + operation.replacement.length;
+		removePrefixSuffix();
+	} else if(o.text.substring(o.selStart - prefix.length, o.selStart) === prefix &&
+				o.text.substring(o.selEnd, o.selEnd + suffix.length) === suffix) {
+		// Prefix and suffix are present BUT not selected -> remove them
+		removePrefixSuffix({"lenPrefix": prefix.length, "lenSuffix": suffix.length});
 	} else {
 		// Add the prefix and suffix
-		operation.cutStart = operation.selStart;
-		operation.cutEnd = operation.selEnd;
-		operation.replacement = event.paramObject.prefix + operation.selection + event.paramObject.suffix;
-		operation.newSelStart = operation.selStart;
-		operation.newSelEnd = operation.selStart + operation.replacement.length;
+		addPrefixSuffix();
 	}
 };
 
diff --git a/core/modules/filters/encodings.js b/core/modules/filters/encodings.js
index a43a15f76..231e4d119 100644
--- a/core/modules/filters/encodings.js
+++ b/core/modules/filters/encodings.js
@@ -18,8 +18,8 @@ Export our filter functions
 
 exports.decodebase64 = function(source,operator,options) {
 	var results = [];
-	var binary = operator.suffixes && operator.suffixes.indexOf("binary") !== -1;
-	var urlsafe = operator.suffixes && operator.suffixes.indexOf("urlsafe") !== -1;
+	var binary = operator.suffixes && operator.suffixes[0].indexOf("binary") !== -1;
+	var urlsafe = operator.suffixes && operator.suffixes[0].indexOf("urlsafe") !== -1;
 	source(function(tiddler,title) {
 		results.push($tw.utils.base64Decode(title,binary,urlsafe));
 	});
@@ -28,8 +28,8 @@ exports.decodebase64 = function(source,operator,options) {
 
 exports.encodebase64 = function(source,operator,options) {
 	var results = [];
-	var binary = operator.suffixes && operator.suffixes.indexOf("binary") !== -1;
-	var urlsafe = operator.suffixes && operator.suffixes.indexOf("urlsafe") !== -1;
+	var binary = operator.suffixes && operator.suffixes[0].indexOf("binary") !== -1;
+	var urlsafe = operator.suffixes && operator.suffixes[0].indexOf("urlsafe") !== -1;
 	source(function(tiddler,title) {
 		results.push($tw.utils.base64Encode(title,binary,urlsafe));
 	});
diff --git a/core/modules/macros/unusedtitle.js b/core/modules/macros/unusedtitle.js
index 952bd0264..8a61c425e 100644
--- a/core/modules/macros/unusedtitle.js
+++ b/core/modules/macros/unusedtitle.js
@@ -16,20 +16,22 @@ exports.name = "unusedtitle";
 exports.params = [
 	{name: "baseName"},
 	{name: "separator"},
-	{name: "template"}
+	{name: "template"},
+	{name: "startCount"}
 ];
 
 /*
 Run the macro
 */
-exports.run = function(baseName,separator,template) {
+exports.run = function(baseName,separator,template,startCount) {
 	separator = separator || " ";
+	startCount = startCount || 0;
 	if(!baseName) {
 		baseName = $tw.language.getString("DefaultNewTiddlerTitle");
 	}
 	// $tw.wiki.generateNewTitle = function(baseTitle,options)
-	// options.prefix must be a string! 
-	return this.wiki.generateNewTitle(baseName, {"prefix": separator, "template": template});
+	// options.prefix must be a string!
+	return this.wiki.generateNewTitle(baseName, {"prefix": separator, "template": template, "startCount": startCount});
 };
 
 })();
diff --git a/core/modules/parsers/wikiparser/rules/conditional.js b/core/modules/parsers/wikiparser/rules/conditional.js
index 23940fd88..c2d6a43b8 100644
--- a/core/modules/parsers/wikiparser/rules/conditional.js
+++ b/core/modules/parsers/wikiparser/rules/conditional.js
@@ -6,7 +6,7 @@ module-type: wikirule
 Conditional shortcut syntax
 
 ```
-This is a <% if [{something}] %>Elephant<% elseif [{else}] %>Pelican<% else %>Crocodile<% endif %>
+This is a <%if [{something}] %>Elephant<%elseif [{else}] %>Pelican<%else%>Crocodile<%endif%>
 ```
 
 \*/
@@ -27,7 +27,7 @@ exports.init = function(parser) {
 };
 
 exports.findNextMatch = function(startPos) {
-	// Look for the next <% if shortcut
+	// Look for the next <%if shortcut
 	this.matchRegExp.lastIndex = startPos;
 	this.match = this.matchRegExp.exec(this.parser.source);
 	// If not found then return no match
diff --git a/core/modules/savers/put.js b/core/modules/savers/put.js
index a1ebef4bb..69689e6db 100644
--- a/core/modules/savers/put.js
+++ b/core/modules/savers/put.js
@@ -20,7 +20,7 @@ Retrieve ETag if available
 */
 var retrieveETag = function(self) {
 	var headers = {
-		Accept: "*/*;charset=UTF-8"
+		Accept: "*/*"
 	};
 	$tw.utils.httpRequest({
 		url: self.uri(),
@@ -55,7 +55,7 @@ var PutSaver = function(wiki) {
 		callback: function(err,data,xhr) {
 			// Check DAV header http://www.webdav.org/specs/rfc2518.html#rfc.section.9.1
 			if(!err) {
-				self.serverAcceptsPuts = xhr.status === 200 && !!xhr.getResponseHeader("dav");
+				self.serverAcceptsPuts = xhr.status >= 200 && xhr.status < 300 && !!xhr.getResponseHeader("dav");
 			}
 		}
 	});
diff --git a/core/modules/utils/edition-info.js b/core/modules/utils/edition-info.js
index f8a5cab06..b9d97f962 100644
--- a/core/modules/utils/edition-info.js
+++ b/core/modules/utils/edition-info.js
@@ -29,10 +29,14 @@ exports.getEditionInfo = function() {
 			for(var entryIndex=0; entryIndex<entries.length; entryIndex++) {
 				var entry = entries[entryIndex];
 				// Check if directories have a valid tiddlywiki.info
-				if(!editionInfo[entry] && $tw.utils.isDirectory(path.resolve(editionPath,entry))) {
-					var info = $tw.utils.parseJSONSafe(fs.readFileSync(path.resolve(editionPath,entry,"tiddlywiki.info"),"utf8"),null);
-					if(info) {
-						editionInfo[entry] = info;
+				// Check if the entry is a hidden directory
+				if((entry.charAt(0) !== ".") && !editionInfo[entry] && $tw.utils.isDirectory(path.resolve(editionPath,entry))) {
+					var file=path.resolve(editionPath,entry,"tiddlywiki.info");
+					if(fs.existsSync(file)) {
+						var info = $tw.utils.parseJSONSafe(fs.readFileSync(file,"utf8"),null);
+						if(info) {
+							editionInfo[entry] = info;
+						}
 					}
 				}
 			}
@@ -41,4 +45,4 @@ exports.getEditionInfo = function() {
 	return editionInfo;
 };
 
-})();
+})();
\ No newline at end of file
diff --git a/core/modules/utils/utils.js b/core/modules/utils/utils.js
index 878f83fbb..234de0c75 100644
--- a/core/modules/utils/utils.js
+++ b/core/modules/utils/utils.js
@@ -330,16 +330,18 @@ exports.formatTitleString = function(template,options) {
 			}]
 		];
 	while(t.length){
-		var matchString = "";
+		var matchString = "",
+			found = false;
 		$tw.utils.each(matches, function(m) {
 			var match = m[0].exec(t);
 			if(match) {
+				found = true;
 				matchString = m[1].call(null,match);
 				t = t.substr(match[0].length);
 				return false;
 			}
 		});
-		if(matchString) {
+		if(found) {
 			result += matchString;
 		} else {
 			result += t.charAt(0);
diff --git a/core/modules/widgets/data.js b/core/modules/widgets/data.js
index c3da00919..5d76f5abd 100644
--- a/core/modules/widgets/data.js
+++ b/core/modules/widgets/data.js
@@ -123,7 +123,6 @@ DataWidget.prototype.computeDataTiddlerValues = function() {
 		}
 	} else {
 		// Apply the item fields to each of the tiddlers
-		delete item.title; // Do not overwrite the title
 		if(Object.keys(item).length > 0) {
 			$tw.utils.each(tiddlers,function(tiddler,index) {
 				tiddlers[index] = new $tw.Tiddler(tiddler,item);
diff --git a/core/modules/widgets/keyboard.js b/core/modules/widgets/keyboard.js
index ce3162f51..9515f5a3b 100644
--- a/core/modules/widgets/keyboard.js
+++ b/core/modules/widgets/keyboard.js
@@ -96,13 +96,15 @@ KeyboardWidget.prototype.execute = function() {
 	this.param = this.getAttribute("param","");
 	this.key = this.getAttribute("key","");
 	this.tag = this.getAttribute("tag","");
-	this.keyInfoArray = $tw.keyboardManager.parseKeyDescriptors(this.key);
-	if(this.key.substr(0,2) === "((" && this.key.substr(-2,2) === "))") {
-		this.shortcutTiddlers = [];
-		var name = this.key.substring(2,this.key.length -2);
-		$tw.utils.each($tw.keyboardManager.lookupNames,function(platformDescriptor) {
-			self.shortcutTiddlers.push("$:/config/" + platformDescriptor + "/" + name);
-		});
+	if($tw.keyboardManager) {
+		this.keyInfoArray = $tw.keyboardManager.parseKeyDescriptors(this.key);
+		if(this.key.substr(0,2) === "((" && this.key.substr(-2,2) === "))") {
+			this.shortcutTiddlers = [];
+			var name = this.key.substring(2,this.key.length -2);
+			$tw.utils.each($tw.keyboardManager.lookupNames,function(platformDescriptor) {
+				self.shortcutTiddlers.push("$:/config/" + platformDescriptor + "/" + name);
+			});
+		}	
 	}
 	// Make child widgets
 	this.makeChildWidgets();
@@ -126,7 +128,7 @@ KeyboardWidget.prototype.refresh = function(changedTiddlers) {
 		this.assignDomNodeClasses();
 	}
 	// Update the keyInfoArray if one of its shortcut-config-tiddlers has changed
-	if(this.shortcutTiddlers && $tw.utils.hopArray(changedTiddlers,this.shortcutTiddlers)) {
+	if(this.shortcutTiddlers && $tw.utils.hopArray(changedTiddlers,this.shortcutTiddlers) && $tw.keyboardManager) {
 		this.keyInfoArray = $tw.keyboardManager.parseKeyDescriptors(this.key);
 	}
 	return this.refreshChildren(changedTiddlers);
diff --git a/core/modules/widgets/navigator.js b/core/modules/widgets/navigator.js
index fcca17ba0..fbd340935 100755
--- a/core/modules/widgets/navigator.js
+++ b/core/modules/widgets/navigator.js
@@ -184,7 +184,7 @@ NavigatorWidget.prototype.handleCloseOtherTiddlersEvent = function(event) {
 // Place a tiddler in edit mode
 NavigatorWidget.prototype.handleEditTiddlerEvent = function(event) {
 	var editTiddler = $tw.hooks.invokeHook("th-editing-tiddler",event),
-	    win = event.event && event.event.view ? event.event.view : window;
+		win = event.event && event.event.view ? event.event.view : window;
 	if(!editTiddler) {
 		return false;
 	}
@@ -308,7 +308,7 @@ NavigatorWidget.prototype.handleSaveTiddlerEvent = function(event) {
 	var title = event.param || event.tiddlerTitle,
 		tiddler = this.wiki.getTiddler(title),
 		storyList = this.getStoryList(),
-	    	win = event.event && event.event.view ? event.event.view : window;
+		win = event.event && event.event.view ? event.event.view : window;
 	// Replace the original tiddler with the draft
 	if(tiddler) {
 		var draftTitle = (tiddler.fields["draft.title"] || "").trim(),
@@ -414,7 +414,8 @@ NavigatorWidget.prototype.handleNewTiddlerEvent = function(event) {
 	event = $tw.hooks.invokeHook("th-new-tiddler", event);
 	// Get the story details
 	var storyList = this.getStoryList(),
-		templateTiddler, additionalFields, title, draftTitle, existingTiddler;
+		templateTiddler, additionalFields, title, draftTitle, existingTiddler,
+		templateHasTags = false;
 	// Get the template tiddler (if any)
 	if(typeof event.param === "string") {
 		// Get the template tiddler
@@ -459,8 +460,10 @@ NavigatorWidget.prototype.handleNewTiddlerEvent = function(event) {
 		// Merge tags
 		mergedTags = $tw.utils.pushTop(mergedTags,$tw.utils.parseStringArray(additionalFields.tags));
 	}
+	var additionalFieldsHasTags = !!(additionalFields && (additionalFields.tags === ""));
 	if(templateTiddler && templateTiddler.fields.tags) {
 		// Merge tags
+		templateHasTags = true;
 		mergedTags = $tw.utils.pushTop(mergedTags,templateTiddler.fields.tags);
 	}
 	// Save the draft tiddler
@@ -476,7 +479,8 @@ NavigatorWidget.prototype.handleNewTiddlerEvent = function(event) {
 		{
 			title: draftTitle,
 			"draft.of": title,
-			tags: mergedTags
+			// If template or additionalFields have "tags" even if empty a tags field will be created.
+			tags: ((mergedTags.length > 0) || templateHasTags || additionalFieldsHasTags) ? mergedTags : undefined
 		},this.wiki.getModificationFields());
 	this.wiki.addTiddler(draftTiddler);
 	// Update the story to insert the new draft at the top and remove any existing tiddler
@@ -528,7 +532,7 @@ NavigatorWidget.prototype.handleImportTiddlersEvent = function(event) {
 	var systemMessage = $tw.language.getString("Import/Upgrader/Tiddler/Unselected");
 	$tw.utils.each(messages,function(message,title) {
 		newFields["message-" + title] = message;
-		if (message.indexOf(systemMessage) !== -1) {
+		if(message.indexOf(systemMessage) !== -1) {
 			newFields["selection-" + title] = "unchecked";
 		}
 	});
diff --git a/core/modules/wiki.js b/core/modules/wiki.js
index 5673c9e3b..29a839c7a 100755
--- a/core/modules/wiki.js
+++ b/core/modules/wiki.js
@@ -194,18 +194,24 @@ options.prefix must be a string
 */
 exports.generateNewTitle = function(baseTitle,options) {
 	options = options || {};
-	var c = 0,
-		title = baseTitle,
-		template = options.template,
+	var title = baseTitle,
+		template = options.template || "",
+		// test if .startCount is a positive integer. If not set to 0
+		c = (parseInt(options.startCount,10) > 0) ? parseInt(options.startCount,10) : 0,
 		prefix = (typeof(options.prefix) === "string") ? options.prefix : " ";
+
 	if (template) {
 		// "count" is important to avoid an endless loop in while(...)!!
 		template = (/\$count:?(\d+)?\$/i.test(template)) ? template : template + "$count$";
-		title = $tw.utils.formatTitleString(template,{"base":baseTitle,"separator":prefix,"counter":c});
+		// .formatTitleString() expects strings as input
+		title = $tw.utils.formatTitleString(template,{"base":baseTitle,"separator":prefix,"counter":c+""});
 		while(this.tiddlerExists(title) || this.isShadowTiddler(title) || this.findDraft(title)) {
-			title = $tw.utils.formatTitleString(template,{"base":baseTitle,"separator":prefix,"counter":(++c)});
+			title = $tw.utils.formatTitleString(template,{"base":baseTitle,"separator":prefix,"counter":(++c)+""});
 		}
 	} else {
+		if (c > 0) {
+			title = baseTitle + prefix + c;
+		}
 		while(this.tiddlerExists(title) || this.isShadowTiddler(title) || this.findDraft(title)) {
 			title = baseTitle + prefix + (++c);
 		}
diff --git a/core/palettes/SolarFlare.tid b/core/palettes/SolarFlare.tid
index 932256665..9f394f10c 100644
--- a/core/palettes/SolarFlare.tid
+++ b/core/palettes/SolarFlare.tid
@@ -142,6 +142,10 @@ sidebar-controls-foreground-hover:
 sidebar-muted-foreground-hover:
 sidebar-tab-background: #ded8c5
 sidebar-tiddler-link-foreground-hover:
+stability-deprecated: <<colour red>>
+stability-experimental: <<colour yellow>>
+stability-legacy: <<colour blue>>
+stability-stable: <<colour green>>
 static-alert-foreground: #aaaaaa
 tab-border: #cccccc
     modal-footer-border: <<colour tab-border>>
diff --git a/core/templates/server/static.tiddler.wikitext.tid b/core/templates/server/static.tiddler.wikitext.tid
index 2d2bdaba6..1f2ee3cf4 100644
--- a/core/templates/server/static.tiddler.wikitext.tid
+++ b/core/templates/server/static.tiddler.wikitext.tid
@@ -1,23 +1,23 @@
 title: $:/core/templates/server/static.tiddler.wikitext
 
 \whitespace trim
-<div class="tc-tiddler-title">
+<div class="tc-tiddler-title tc-clearfix">
 <div class="tc-titlebar">
 <h2><$text text=<<currentTiddler>>/></h2>
 </div>
 </div>
-<div class="tc-subtitle">
+<div class="tc-subtitle tc-clearfix">
 <$link to={{!!modifier}}>
 <$view field="modifier"/>
 </$link> <$view field="modified" format="date" template={{$:/language/Tiddler/DateFormat}}/>
 </div>
-<div class="tc-tags-wrapper">
+<div class="tc-tags-wrapper" tc-clearfix>
 <$list filter="[all[current]tags[]sort[title]]">
 <a href={{{ [<currentTiddler>encodeuricomponent[]] }}}>
 <$macrocall $name="tag-pill" tag=<<currentTiddler>>/>
 </a>
 </$list>
 </div>
-<div class="tc-tiddler-body">
+<div class="tc-tiddler-body tc-clearfix">
 <$transclude mode="block"/>
 </div>
diff --git a/core/templates/social-metadata.tid b/core/templates/social-metadata.tid
index 6f9dc11bc..eb89418bb 100644
--- a/core/templates/social-metadata.tid
+++ b/core/templates/social-metadata.tid
@@ -4,7 +4,7 @@ tags: $:/tags/RawMarkupWikified
 \procedure meta-plain(name,source,name-attribute:"name")
 \whitespace trim
 <%if [<source>has[text]] %>
-	&lt;meta <$text text=<<name-attribute>>/>="<$text text=<<name>>/>" content="<$text text={{{ [<source>get[text]encodehtml[]] }}}/>"&gt;
+	&lt;meta&#32;<$text text=<<name-attribute>>/>="<$text text=<<name>>/>" content="<$text text={{{ [<source>get[text]encodehtml[]] }}}/>"&gt;
 	<$text text={{{ [charcode[10]] }}}/>
 <%endif%>
 \end meta-plain
@@ -13,7 +13,7 @@ tags: $:/tags/RawMarkupWikified
 \whitespace trim
 <%if [<source>has[text]] %>
 	<$wikify name="html" text={{{ [<source>get[text]] }}} output="text">
-		&lt;meta <$text text=<<name-attribute>>/>="<$text text=<<name>>/>" content="<$text text={{{ [<html>encodehtml[]] }}}/>"&gt;
+		&lt;meta&#32;<$text text=<<name-attribute>>/>="<$text text=<<name>>/>" content="<$text text={{{ [<html>encodehtml[]] }}}/>"&gt;
 		<$text text={{{ [charcode[10]] }}}/>
 	</$wikify>
 <%endif%>
@@ -27,7 +27,7 @@ tags: $:/tags/RawMarkupWikified
 <<meta-plain "og:type" "website" "property">>
 <<meta-wikified "og:title" "$:/SiteTitle" "property">>
 <<meta-wikified "og:description" "$:/SiteSubtitle" "property">>
-<<meta-plain "og:image" "$:/SitePreviewImageUrl" "property">>
+<<meta-plain "og:image" "$:/SitePreviewUrl" "property">>
 
 <!-- Twitter Meta Tags -->
 <<meta-plain "twitter:card" "summary_large_image">>
@@ -35,4 +35,4 @@ tags: $:/tags/RawMarkupWikified
 <<meta-plain "twitter:url" "$:/SiteUrl" "property">>
 <<meta-wikified "twitter:title" "$:/SiteTitle">>
 <<meta-wikified "twitter:description" "$:/SiteSubtitle">>
-<<meta-plain "twitter:image" "$:/SitePreviewImageUrl">>
+<<meta-plain "twitter:image" "$:/SitePreviewUrl">>
diff --git a/core/templates/tiddlywiki5.html.tid b/core/templates/tiddlywiki5.html.tid
index a94ae2693..721b3d9ce 100644
--- a/core/templates/tiddlywiki5.html.tid
+++ b/core/templates/tiddlywiki5.html.tid
@@ -57,3 +57,4 @@ title: $:/core/templates/tiddlywiki5.html
 `{{{ [enlist<saveTiddlerAndShadowsFilter>tag[$:/tags/RawMarkupWikified/BottomBody]] ||$:/core/templates/raw-static-tiddler}}}`
 </body>
 </html>`
+</$set>
diff --git a/core/ui/Actions/new-journal.tid b/core/ui/Actions/new-journal.tid
index 9df31cb97..9d663e537 100644
--- a/core/ui/Actions/new-journal.tid
+++ b/core/ui/Actions/new-journal.tid
@@ -2,10 +2,10 @@ title: $:/core/ui/Actions/new-journal
 tags: $:/tags/Actions
 description: create a new journal tiddler
 
-\define get-tags() $(textFieldTags)$ $(tagsFieldTags)$
 \whitespace trim
-<$vars journalTitleTemplate={{$:/config/NewJournal/Title}} textFieldTags={{$:/config/NewJournal/Tags}} tagsFieldTags={{$:/config/NewJournal/Tags!!tags}} journalText={{$:/config/NewJournal/Text}}>
-<$wikify name="journalTitle" text="<$macrocall $name='now' format=<<journalTitleTemplate>>/>">
+\function get-tags() [<textFieldTags>] [<tagsFieldTags>] +[join[ ]]
+<$let journalTitleTemplate={{$:/config/NewJournal/Title}} textFieldTags={{$:/config/NewJournal/Tags}} tagsFieldTags={{$:/config/NewJournal/Tags!!tags}} journalText={{$:/config/NewJournal/Text}}>
+<$wikify name="journalTitle" text="<$transclude $variable='now' format=<<journalTitleTemplate>>/>">
 <$reveal type="nomatch" state=<<journalTitle>> text="">
 <$action-sendmessage $message="tm-new-tiddler" title=<<journalTitle>> tags=<<get-tags>> text={{{ [<journalTitle>get[]] }}}/>
 </$reveal>
@@ -13,4 +13,4 @@ description: create a new journal tiddler
 <$action-sendmessage $message="tm-new-tiddler" title=<<journalTitle>> tags=<<get-tags>> text=<<journalText>>/>
 </$reveal>
 </$wikify>
-</$vars>
+</$let>
diff --git a/core/ui/Actions/new-tiddler.tid b/core/ui/Actions/new-tiddler.tid
index f71331327..847130800 100644
--- a/core/ui/Actions/new-tiddler.tid
+++ b/core/ui/Actions/new-tiddler.tid
@@ -2,8 +2,8 @@ title: $:/core/ui/Actions/new-tiddler
 tags: $:/tags/Actions
 description: create a new empty tiddler
 
-\define get-tags() $(textFieldTags)$ $(tagsFieldTags)$
 \whitespace trim
-<$vars textFieldTags={{$:/config/NewTiddler/Tags}} tagsFieldTags={{$:/config/NewTiddler/Tags!!tags}}>
+\function get-tags() [<textFieldTags>] [<tagsFieldTags>] +[join[ ]]
+<$let textFieldTags={{$:/config/NewTiddler/Tags}} tagsFieldTags={{$:/config/NewTiddler/Tags!!tags}}>
 <$action-sendmessage $message="tm-new-tiddler" tags=<<get-tags>>/>
-</$vars>
+</$let>
diff --git a/core/ui/AdvancedSearch/Filter.tid b/core/ui/AdvancedSearch/Filter.tid
index 5b82f9b32..a8baf9d30 100644
--- a/core/ui/AdvancedSearch/Filter.tid
+++ b/core/ui/AdvancedSearch/Filter.tid
@@ -9,14 +9,16 @@ caption: {{$:/language/Search/Filter/Caption}}
 	tag="$:/tags/AdvancedSearch"
 	beforeafter="$beforeafter$"
 	defaultState="$:/core/ui/AdvancedSearch/System"
-	actions="<$action-setfield $tiddler='$:/state/advancedsearch/currentTab' text=<<nextTab>>/>"/>
+	actions="<$action-setfield $tiddler='$:/state/advancedsearch/currentTab' text=<<nextTab>>/>"
+/>
 \end
 
 \define cancel-search-actions()
 \whitespace trim
-<$list
-	filter="[{$:/temp/advancedsearch/input}!match{$:/temp/advancedsearch}]"
-	emptyMessage="<$action-deletetiddler $filter='[[$:/temp/advancedsearch]] [[$:/temp/advancedsearch/input]] [[$:/temp/advancedsearch/selected-item]]' />">
+<$list filter="[{$:/temp/advancedsearch/input}!match{$:/temp/advancedsearch}]">
+	<$list-empty>
+		<$action-deletetiddler $filter="[[$:/temp/advancedsearch]] [[$:/temp/advancedsearch/input]] [[$:/temp/advancedsearch/selected-item]]"/>
+	</$list-empty>
 	<$action-setfield $tiddler="$:/temp/advancedsearch/input" text={{$:/temp/advancedsearch}}/>
 	<$action-setfield $tiddler="$:/temp/advancedsearch/refresh" text="yes"/>
 </$list>
@@ -24,54 +26,67 @@ caption: {{$:/language/Search/Filter/Caption}}
 
 \define input-accept-actions()
 \whitespace trim
-<$list
-	filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]"
-	emptyMessage="<$list filter='[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]'><$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/></$list>">
+<$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]">
+	<$list-empty>
+		<$list filter="[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]">
+			<$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/>
+		</$list>
+	<$/list-empty>
 	<$action-navigate $to={{{ [<__tiddler__>get[text]] }}}/>
 </$list>
 \end
 
 \define input-accept-variant-actions()
 \whitespace trim
-<$list
-	filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]"
-	emptyMessage="<$list filter='[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]'><$list filter='[<__tiddler__>get[text]minlength[1]]'><$action-sendmessage $message='tm-edit-tiddler' $param={{{  [<__tiddler__>get[text]] }}}/></$list></$list>">
+<$list filter="[{$:/config/Search/NavigateOnEnter/enable}match[yes]]">
+	<$list-empty>
+		<$list filter="[<__tiddler__>get[text]!is[missing]] ~[<__tiddler__>get[text]is[shadow]]">
+			<$list filter="[<__tiddler__>get[text]minlength[1]]">
+				<$action-sendmessage $message="tm-edit-tiddler" $param={{{  [<__tiddler__>get[text]] }}}/>
+			</$list>
+		</$list>
+	</$list-empty>
 	<$list filter="[<__tiddler__>get[text]minlength[1]]">
 		<$action-sendmessage $message="tm-edit-tiddler" $param={{{  [<__tiddler__>get[text]] }}}/>
-</$list></$list>
-\end
-\whitespace trim
-<<lingo Filter/Hint>>
-<div class="tc-search tc-advanced-search">
-<$keyboard key="((input-tab-right))" actions=<<set-next-input-tab>>>
-<$keyboard key="((input-tab-left))" actions=<<set-next-input-tab "before">>>
-<$macrocall $name="keyboard-driven-input"
-	tiddler="$:/temp/advancedsearch/input"
-	storeTitle="$:/temp/advancedsearch"
-	refreshTitle="$:/temp/advancedsearch/refresh"
-	selectionStateTitle="$:/temp/advancedsearch/selected-item"
-	type="search"
-	tag="input"
-	focus={{$:/config/Search/AutoFocus}}
-	configTiddlerFilter="[[$:/temp/advancedsearch]]"
-	firstSearchFilterField="text"
-	inputAcceptActions=<<input-accept-actions>>
-	inputAcceptVariantActions=<<input-accept-variant-actions>>
-	inputCancelActions=<<cancel-search-actions>>/>
-</$keyboard>
-</$keyboard>
-&#32;
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/AdvancedSearch/FilterButton]!has[draft.of]]"><$transclude/></$list>
-</div>
-<$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
-<$set name="resultCount" value="<$count filter={{$:/temp/advancedsearch}}/>">
-<div class="tc-search-results">
-<p><<lingo Filter/Matches>></p>
-<$list filter={{$:/temp/advancedsearch}}>
-<span class={{{[<currentTiddler>addsuffix[-primaryList]] -[[$:/temp/advancedsearch/selected-item]get[text]] +[then[]else[tc-list-item-selected]] }}}>
-<$transclude tiddler="$:/core/ui/ListItemTemplate"/>
-</span>
+	</$list>
 </$list>
+\end
+
+\whitespace trim
+
+<<lingo Filter/Hint>>
+
+<div class="tc-search tc-advanced-search">
+	<$keyboard key="((input-tab-right))" actions=<<set-next-input-tab>> class="tc-small-gap-right">
+		<$keyboard key="((input-tab-left))" actions=<<set-next-input-tab "before">>>
+			<$macrocall $name="keyboard-driven-input"
+				tiddler="$:/temp/advancedsearch/input"
+				storeTitle="$:/temp/advancedsearch"
+				refreshTitle="$:/temp/advancedsearch/refresh"
+				selectionStateTitle="$:/temp/advancedsearch/selected-item"
+				type="search"
+				tag="input"
+				focus={{$:/config/Search/AutoFocus}}
+				configTiddlerFilter="[[$:/temp/advancedsearch]]"
+				firstSearchFilterField="text"
+				inputAcceptActions=<<input-accept-actions>>
+				inputAcceptVariantActions=<<input-accept-variant-actions>>
+				inputCancelActions=<<cancel-search-actions>>
+			/>
+		</$keyboard>
+	</$keyboard>
+	<$list filter="[all[shadows+tiddlers]tag[$:/tags/AdvancedSearch/FilterButton]!has[draft.of]]">
+		<$transclude/>
+	</$list>
 </div>
-</$set>
+
+<$reveal state="$:/temp/advancedsearch" type="nomatch" text="" tag="div" class="tc-search-results">
+	<$set name="resultCount" value="<$count filter={{$:/temp/advancedsearch}}/>">
+		<p><<lingo Filter/Matches>></p>
+		<$list filter={{$:/temp/advancedsearch}}>
+			<span class={{{[<currentTiddler>addsuffix[-primaryList]] -[[$:/temp/advancedsearch/selected-item]get[text]] +[then[]else[tc-list-item-selected]] }}}>
+				<$transclude tiddler="$:/core/ui/ListItemTemplate"/>
+			</span>
+		</$list>
+	</$set>
 </$reveal>
diff --git a/core/ui/AdvancedSearch/Shadows.tid b/core/ui/AdvancedSearch/Shadows.tid
index e2ffa305f..043aee590 100644
--- a/core/ui/AdvancedSearch/Shadows.tid
+++ b/core/ui/AdvancedSearch/Shadows.tid
@@ -79,11 +79,15 @@ first-search-filter: [all[shadows]search<userInput>sort[title]limit[250]] -[[$:/
 
 <$list filter="[{$:/temp/advancedsearch}minlength{$:/config/Search/MinLength}limit[1]]" emptyMessage="<div class='tc-search-results'>{{$:/language/Search/Search/TooShort}}</div>" variable="listItem">
 
-<$set name="resultCount" value="<$count filter='[all[shadows]search{$:/temp/advancedsearch}] -[[$:/temp/advancedsearch]] -[[$:/temp/advancedsearch/input]]'/>">
+<$set name="resultCount" value={{{ [all[shadows]search{$:/temp/advancedsearch}] -[[$:/temp/advancedsearch]] -[[$:/temp/advancedsearch/input]] +[count[]]}}}>
 
 <div class="tc-search-results">
 
-<<lingo Shadows/Matches>>
+<%if [<resultCount>match[0]] %>
+	{{$:/language/Search/Matches/NoMatch}}
+<%else%>
+	<<lingo Shadows/Matches>>
+<%endif%>
 
 <$list filter="[all[shadows]search{$:/temp/advancedsearch}sort[title]limit[250]] -[[$:/temp/advancedsearch]] -[[$:/temp/advancedsearch/input]]">
 <span class={{{[<currentTiddler>addsuffix[-primaryList]] -[[$:/temp/advancedsearch/selected-item]get[text]] +[then[]else[tc-list-item-selected]] }}}>
diff --git a/core/ui/AdvancedSearch/Standard.tid b/core/ui/AdvancedSearch/Standard.tid
index e6ed18a7a..c0a2ebe3d 100644
--- a/core/ui/AdvancedSearch/Standard.tid
+++ b/core/ui/AdvancedSearch/Standard.tid
@@ -39,6 +39,7 @@ caption: {{$:/language/Search/Standard/Caption}}
 </$keyboard>
 </$keyboard>
 </$keyboard>
+&#32;
 <$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
 <$button class="tc-btn-invisible">
 <<cancel-search-actions>>
@@ -57,15 +58,15 @@ caption: {{$:/language/Search/Standard/Caption}}
 	configTiddler={{{ [[$:/state/advancedsearch/standard/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}] }}}
 	searchListState="$:/temp/advancedsearch/selected-item">
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]butfirst[]limit[1]]">
+<$list-empty>
+<$list filter='[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]'><$transclude mode="block"/></$list>
+</$list-empty>
 <$macrocall $name="tabs"
 	tabsList="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]"
 	default={{$:/config/SearchResults/Default}}
 	actions="<$action-setfield $tiddler='$:/state/advancedsearch/standard/currentTab' text=<<currentTab>>/>"
 	explicitState="$:/state/tab/search-results/advancedsearch" />
 </$list>
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]butfirst[]limit[1]]  :else[[]]">
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]"><$transclude mode="block"/></$list>
-</$list>
 </$vars>
 </$list>
 </$reveal>
diff --git a/core/ui/AdvancedSearch/System.tid b/core/ui/AdvancedSearch/System.tid
index 6804b80a8..5e1ec0254 100644
--- a/core/ui/AdvancedSearch/System.tid
+++ b/core/ui/AdvancedSearch/System.tid
@@ -78,11 +78,15 @@ first-search-filter: [is[system]search<userInput>sort[title]limit[250]] -[[$:/te
 
 <$list filter="[{$:/temp/advancedsearch}minlength{$:/config/Search/MinLength}limit[1]]" emptyMessage="<div class='tc-search-results'>{{$:/language/Search/Search/TooShort}}</div>" variable="listItem">
 
-<$set name="resultCount" value="<$count filter='[is[system]search{$:/temp/advancedsearch}] -[[$:/temp/advancedsearch]] -[[$:/temp/advancedsearch/input]] -[[$:/temp/advancedsearch/selected-item]]'/>">
+<$set name="resultCount" value={{{ [is[system]search{$:/temp/advancedsearch}] -[[$:/temp/advancedsearch]] -[[$:/temp/advancedsearch/input]] -[[$:/temp/advancedsearch/selected-item]] +[count[]] }}}>
 
 <div class="tc-search-results">
 
-<<lingo System/Matches>>
+<%if [<resultCount>match[0]] %>
+	{{$:/language/Search/Matches/NoMatch}}
+<%else%>
+	<<lingo System/Matches>>
+<%endif%>
 
 <$list filter="[is[system]search{$:/temp/advancedsearch}sort[title]limit[250]] -[[$:/temp/advancedsearch]] -[[$:/temp/advancedsearch/input]] -[[$:/temp/advancedsearch/selected-item]]">
 <span class={{{[<currentTiddler>addsuffix[-primaryList]] -[[$:/temp/advancedsearch/selected-item]get[text]] +[then[]else[tc-list-item-selected]] }}}>
diff --git a/core/ui/ControlPanel/Basics.tid b/core/ui/ControlPanel/Basics.tid
index b2ef2832a..f494c2af6 100644
--- a/core/ui/ControlPanel/Basics.tid
+++ b/core/ui/ControlPanel/Basics.tid
@@ -2,22 +2,7 @@ title: $:/core/ui/ControlPanel/Basics
 tags: $:/tags/ControlPanel/Info
 caption: {{$:/language/ControlPanel/Basics/Caption}}
 
-\define lingo-base() $:/language/ControlPanel/Basics/
-
-\define show-filter-count(filter)
-\whitespace trim
-<$button class="tc-btn-invisible">
-<$action-setfield $tiddler="$:/temp/advancedsearch" $value="""$filter$"""/>
-<$action-setfield $tiddler="$:/temp/advancedsearch/input" $value="""$filter$"""/>
-<$action-setfield $tiddler="$:/temp/advancedsearch/refresh" text="yes"/>
-<$action-setfield $tiddler="$:/state/tab--1498284803" $value="$:/core/ui/AdvancedSearch/Filter"/>
-<$action-navigate $to="$:/AdvancedSearch"/>
-<$action-sendmessage $message="tm-focus-selector" $param=".tc-advanced-search input"/>
-''<$count filter="""$filter$"""/>''
-&#32;
-{{$:/core/images/advanced-search-button}}
-</$button>
-\end
+\procedure lingo-base() $:/language/ControlPanel/Basics/
 \whitespace trim
 
 |tc-max-width tc-edit-max-width|k
@@ -25,7 +10,7 @@ caption: {{$:/language/ControlPanel/Basics/Caption}}
 |<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
 |<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
 |<$link to="$:/status/UserName"><<lingo Username/Prompt>></$link> |<$edit-text tiddler="$:/status/UserName" default="" tag="input"/> |
-|<$link to="$:/config/AnimationDuration"><<lingo AnimDuration/Prompt>></$link> |<$edit-text tiddler="$:/config/AnimationDuration" default="" tag="input"/> |
+|<$link to="$:/config/AnimationDuration"><<lingo AnimDuration/Prompt>></$link> |<$edit-text tiddler="$:/config/AnimationDuration" default="" tag="input" type="number"/> |
 |<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit class="tc-edit-texteditor" tiddler="$:/DefaultTiddlers" autoHeight="yes"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
 |<$link to="$:/language/DefaultNewTiddlerTitle"><<lingo NewTiddler/Title/Prompt>></$link> |<$edit-text tiddler="$:/language/DefaultNewTiddlerTitle" default="" tag="input"/> |
 |<$link to="$:/config/NewJournal/Title"><<lingo NewJournal/Title/Prompt>></$link> |<$edit-text tiddler="$:/config/NewJournal/Title" default="" tag="input"/> |
diff --git a/core/ui/ControlPanel/Saving/GitHub.tid b/core/ui/ControlPanel/Saving/GitHub.tid
index 5782d0dcd..ba13dc252 100644
--- a/core/ui/ControlPanel/Saving/GitHub.tid
+++ b/core/ui/ControlPanel/Saving/GitHub.tid
@@ -13,4 +13,4 @@ caption: {{$:/language/ControlPanel/Saving/GitService/GitHub/Caption}}
 |<<lingo Branch>> |<$edit-text tiddler="$:/GitHub/Branch" default="main" tag="input"/> |
 |<<lingo Path>> |<$edit-text tiddler="$:/GitHub/Path" default="" tag="input"/> |
 |<<lingo Filename>> |<$edit-text tiddler="$:/GitHub/Filename" default="" tag="input"/> |
-|<<lingo ServerURL>> |<$edit-text tiddler="$:/GitHub/ServerURL" default="https://api.github.com" tag="input"/> |
\ No newline at end of file
+|<<lingo ServerURL>> |<$edit-text tiddler="$:/GitHub/ServerURL" default="https://api.github.com" tag="input" type="url"/> |
\ No newline at end of file
diff --git a/core/ui/ControlPanel/Saving/GitLab.tid b/core/ui/ControlPanel/Saving/GitLab.tid
index dbe198824..b4f0fd8e9 100644
--- a/core/ui/ControlPanel/Saving/GitLab.tid
+++ b/core/ui/ControlPanel/Saving/GitLab.tid
@@ -13,4 +13,4 @@ caption: {{$:/language/ControlPanel/Saving/GitService/GitLab/Caption}}
 |<<lingo Branch>> |<$edit-text tiddler="$:/GitLab/Branch" default="master" tag="input"/> |
 |<<lingo Path>> |<$edit-text tiddler="$:/GitLab/Path" default="" tag="input"/> |
 |<<lingo Filename>> |<$edit-text tiddler="$:/GitLab/Filename" default="" tag="input"/> |
-|<<lingo ServerURL>> |<$edit-text tiddler="$:/GitLab/ServerURL" default="https://gitlab.com/api/v4" tag="input"/> |
\ No newline at end of file
+|<<lingo ServerURL>> |<$edit-text tiddler="$:/GitLab/ServerURL" default="https://gitlab.com/api/v4" tag="input" type="url"/> |
\ No newline at end of file
diff --git a/core/ui/ControlPanel/Saving/TiddlySpot.tid b/core/ui/ControlPanel/Saving/TiddlySpot.tid
index a36115ec4..65613d87d 100644
--- a/core/ui/ControlPanel/Saving/TiddlySpot.tid
+++ b/core/ui/ControlPanel/Saving/TiddlySpot.tid
@@ -34,7 +34,7 @@ http://$(userName)$.tiddlyspot.com/$path$/
 
 ''<<lingo Advanced/Heading>>''
 
-|<<lingo ServerURL>>  |<$edit-text tiddler="$:/UploadURL" default="" tag="input"/> |
+|<<lingo ServerURL>>  |<$edit-text tiddler="$:/UploadURL" default="" tag="input" type="url"/> |
 |<<lingo Filename>> |<$edit-text tiddler="$:/UploadFilename" default="index.html" tag="input"/> |
 |<<lingo UploadDir>> |<$edit-text tiddler="$:/UploadDir" default="." tag="input"/> |
 |<<lingo BackupDir>> |<$edit-text tiddler="$:/UploadBackupDir" default="." tag="input"/> |
diff --git a/core/ui/ControlPanel/Saving/gitea.tid b/core/ui/ControlPanel/Saving/gitea.tid
index 48a4c4ca1..cc4d83369 100644
--- a/core/ui/ControlPanel/Saving/gitea.tid
+++ b/core/ui/ControlPanel/Saving/gitea.tid
@@ -13,4 +13,4 @@ caption: {{$:/language/ControlPanel/Saving/GitService/Gitea/Caption}}
 |<<lingo Branch>> |<$edit-text tiddler="$:/Gitea/Branch" default="master" tag="input"/> |
 |<<lingo Path>> |<$edit-text tiddler="$:/Gitea/Path" default="" tag="input"/> |
 |<<lingo Filename>> |<$edit-text tiddler="$:/Gitea/Filename" default="" tag="input"/> |
-|<<lingo ServerURL>> |<$edit-text tiddler="$:/Gitea/ServerURL" default="https://gitea/api/v1" tag="input"/> |
+|<<lingo ServerURL>> |<$edit-text tiddler="$:/Gitea/ServerURL" default="https://gitea/api/v1" tag="input" type="url"/> |
diff --git a/core/ui/ControlPanel/SocialCard.tid b/core/ui/ControlPanel/SocialCard.tid
index 591c6550f..41c9ebfa0 100644
--- a/core/ui/ControlPanel/SocialCard.tid
+++ b/core/ui/ControlPanel/SocialCard.tid
@@ -8,9 +8,9 @@ caption: {{$:/language/ControlPanel/SocialCard/Caption}}
 
 |<$link to="$:/SiteTitle"><<lingo Basics/Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
 |<$link to="$:/SiteSubtitle"><<lingo Basics/Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
-|<$link to="$:/SiteDomain"><<lingo SocialCard/Domain/Prompt>></$link> |<$edit-text tiddler="$:/SiteDomain" default="" tag="input"/> |
-|<$link to="$:/SiteUrl"><<lingo SocialCard/Url/Prompt>></$link> |<$edit-text tiddler="$:/SiteUrl" default="" tag="input"/> |
-|<$link to="$:/SitePreviewUrl"><<lingo SocialCard/PreviewUrl/Prompt>></$link> |<$edit-text tiddler="$:/SitePreviewUrl" default="" tag="input"/> |
+|<$link to="$:/SiteDomain"><<lingo SocialCard/Domain/Prompt>></$link> |<$edit-text tiddler="$:/SiteDomain" default="" tag="input" type="url"/> |
+|<$link to="$:/SiteUrl"><<lingo SocialCard/Url/Prompt>></$link> |<$edit-text tiddler="$:/SiteUrl" default="" tag="input" type="url"/> |
+|<$link to="$:/SitePreviewUrl"><<lingo SocialCard/PreviewUrl/Prompt>></$link> |<$edit-text tiddler="$:/SitePreviewUrl" default="" tag="input" type="url"/> |
 
 <%if [[$:/SitePreviewUrl]get[text]else[]!is[blank]] %>
 <div>
diff --git a/core/ui/DefaultSearchResultList.tid b/core/ui/DefaultSearchResultList.tid
index 223efe6d7..19b3d7187 100644
--- a/core/ui/DefaultSearchResultList.tid
+++ b/core/ui/DefaultSearchResultList.tid
@@ -9,7 +9,7 @@ second-search-filter: [!is[system]search<userInput>sort[title]limit[250]]
 //<small>{{$:/language/Search/Matches/Title}}</small>//
 
 <$list filter="[<userInput>minlength[1]]" variable="ignore">
-<$list filter={{{ [<configTiddler>get[first-search-filter]] }}}>
+<$list filter={{{ [<configTiddler>get[first-search-filter]] }}} emptyMessage={{$:/language/Search/Matches/NoResult}}>
 <span class={{{[<currentTiddler>addsuffix[-primaryList]] -[<searchListState>get[text]] +[then[]else[tc-list-item-selected]] }}}>
 <$transclude tiddler="$:/core/ui/ListItemTemplate"/>
 </span>
@@ -19,7 +19,7 @@ second-search-filter: [!is[system]search<userInput>sort[title]limit[250]]
 //<small>{{$:/language/Search/Matches/All}}</small>//
 
 <$list filter="[<userInput>minlength[1]]" variable="ignore">
-<$list filter={{{ [<configTiddler>get[second-search-filter]] }}}>
+<$list filter={{{ [<configTiddler>get[second-search-filter]] }}} emptyMessage={{$:/language/Search/Matches/NoResult}}>
 <span class={{{[<currentTiddler>addsuffix[-secondaryList]] -[<searchListState>get[text]] +[then[]else[tc-list-item-selected]] }}}>
 <$transclude tiddler="$:/core/ui/ListItemTemplate"/>
 </span>
diff --git a/core/ui/EditTemplate/controls.tid b/core/ui/EditTemplate/controls.tid
index e97cedd78..3bb90aac1 100644
--- a/core/ui/EditTemplate/controls.tid
+++ b/core/ui/EditTemplate/controls.tid
@@ -3,7 +3,7 @@ tags: $:/tags/EditTemplate
 
 \define config-title() $:/config/EditToolbarButtons/Visibility/$(listItem)$
 \whitespace trim
-<div class="tc-tiddler-title tc-tiddler-edit-title">
+<div class="tc-tiddler-title tc-tiddler-edit-title tc-clearfix">
 	<$view field="title"/>
 	<span class="tc-tiddler-controls tc-titlebar">
 		<$list filter="[all[shadows+tiddlers]tag[$:/tags/EditToolbar]!has[draft.of]]" variable="listItem">
@@ -14,5 +14,4 @@ tags: $:/tags/EditTemplate
 			</$let>
 		</$list>
 	</span>
-	<div style="clear: both;"></div>
 </div>
diff --git a/core/ui/EditToolbar/cancel.tid b/core/ui/EditToolbar/cancel.tid
index fe21c2e99..ae41fd4af 100644
--- a/core/ui/EditToolbar/cancel.tid
+++ b/core/ui/EditToolbar/cancel.tid
@@ -4,11 +4,15 @@ caption: {{$:/core/images/cancel-button}} {{$:/language/Buttons/Cancel/Caption}}
 description: {{$:/language/Buttons/Cancel/Hint}}
 
 \whitespace trim
-<$button actions=<<cancel-delete-tiddler-actions "cancel">> tooltip={{$:/language/Buttons/Cancel/Hint}} aria-label={{$:/language/Buttons/Cancel/Caption}} class=<<tv-config-toolbar-class>>>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
-{{$:/core/images/cancel-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/Cancel/Caption}}/></span>
-</$list>
+<$button actions=<<cancel-delete-tiddler-actions "cancel">>
+	tooltip={{$:/language/Buttons/Cancel/Hint}}
+	aria-label={{$:/language/Buttons/Cancel/Hint}}
+	class=<<tv-config-toolbar-class>>
+>
+	<%if [<tv-config-toolbar-icons>match[yes]] %>
+		{{$:/core/images/cancel-button}}
+	<%endif%>
+	<%if [<tv-config-toolbar-text>match[yes]] %>
+		<span class="tc-btn-text"><$text text={{$:/language/Buttons/Cancel/Caption}}/></span>
+	<%endif%>
 </$button>
diff --git a/core/ui/EditToolbar/delete.tid b/core/ui/EditToolbar/delete.tid
index fcaed4b48..1e6451da1 100644
--- a/core/ui/EditToolbar/delete.tid
+++ b/core/ui/EditToolbar/delete.tid
@@ -4,11 +4,15 @@ caption: {{$:/core/images/delete-button}} {{$:/language/Buttons/Delete/Caption}}
 description: {{$:/language/Buttons/Delete/Hint}}
 
 \whitespace trim
-<$button actions=<<cancel-delete-tiddler-actions "delete">> tooltip={{$:/language/Buttons/Delete/Hint}} aria-label={{$:/language/Buttons/Delete/Caption}} class=<<tv-config-toolbar-class>>>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
-{{$:/core/images/delete-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
-<span class="tc-btn-text"><$text text={{$:/language/Buttons/Delete/Caption}}/></span>
-</$list>
+<$button actions=<<cancel-delete-tiddler-actions "delete">>
+	tooltip={{$:/language/Buttons/Delete/Hint}}
+	aria-label={{$:/language/Buttons/Delete/Hint}}
+	class=<<tv-config-toolbar-class>>
+>
+	<%if [<tv-config-toolbar-icons>match[yes]] %>
+		{{$:/core/images/delete-button}}
+	<%endif%>
+	<%if [<tv-config-toolbar-text>match[yes]] %>
+		<span class="tc-btn-text"><$text text={{$:/language/Buttons/Delete/Caption}}/></span>
+	<%endif%>
 </$button>
diff --git a/core/ui/EditToolbar/save.tid b/core/ui/EditToolbar/save.tid
index 3872e7674..d62daf981 100644
--- a/core/ui/EditToolbar/save.tid
+++ b/core/ui/EditToolbar/save.tid
@@ -4,21 +4,20 @@ caption: {{$:/core/images/done-button}} {{$:/language/Buttons/Save/Caption}}
 description: {{$:/language/Buttons/Save/Hint}}
 
 \whitespace trim
-\define save-tiddler-button()
-\whitespace trim
+\procedure save-tiddler-button()
 <$fieldmangler>
 	<$button
 		tooltip={{$:/language/Buttons/Save/Hint}}
-		aria-label={{$:/language/Buttons/Save/Caption}}
+		aria-label={{$:/language/Buttons/Save/Hint}}
 		class=<<tv-config-toolbar-class>>
 	>
 		<<save-tiddler-actions>>
-		<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+		<%if [<tv-config-toolbar-icons>match[yes]] %>
 			{{$:/core/images/done-button}}
-		</$list>
-		<$list filter="[<tv-config-toolbar-text>match[yes]]">
+		<%endif%>
+		<%if [<tv-config-toolbar-text>match[yes]] %>
 			<span class="tc-btn-text"><$text text={{$:/language/Buttons/Save/Caption}}/></span>
-		</$list>
+		<%endif%>
 	</$button>
 </$fieldmangler>
 \end
diff --git a/core/ui/EditorToolbar/bold.tid b/core/ui/EditorToolbar/bold.tid
index 1cde1be39..258b13d75 100644
--- a/core/ui/EditorToolbar/bold.tid
+++ b/core/ui/EditorToolbar/bold.tid
@@ -11,4 +11,5 @@ shortcuts: ((bold))
 	$param="wrap-selection"
 	prefix="''"
 	suffix="''"
+	trimSelection="yes"
 />
diff --git a/core/ui/EditorToolbar/excise.tid b/core/ui/EditorToolbar/excise.tid
index fe5c5288b..8bb17edd5 100644
--- a/core/ui/EditorToolbar/excise.tid
+++ b/core/ui/EditorToolbar/excise.tid
@@ -3,7 +3,7 @@ tags: $:/tags/EditorToolbar
 icon: $:/core/images/excise
 caption: {{$:/language/Buttons/Excise/Caption}}
 description: {{$:/language/Buttons/Excise/Hint}}
-condition: [<targetTiddler>type[]] [<targetTiddler>get[type]prefix[text/vnd.tiddlywiki]] +[first[]]
+condition: [<targetTiddler>type[]] [<targetTiddler>type[text/vnd.tiddlywiki]] [<targetTiddler>type[text/markdown]] [<targetTiddler>type[text/x-markdown]] +[first[]]
 shortcuts: ((excise))
 dropdown: $:/core/ui/EditorToolbar/excise-dropdown
 
diff --git a/core/ui/EditorToolbar/italic.tid b/core/ui/EditorToolbar/italic.tid
index 7f3505ddb..47c86b46d 100644
--- a/core/ui/EditorToolbar/italic.tid
+++ b/core/ui/EditorToolbar/italic.tid
@@ -11,4 +11,5 @@ shortcuts: ((italic))
 	$param="wrap-selection"
 	prefix="//"
 	suffix="//"
+	trimSelection="yes"
 />
diff --git a/core/ui/EditorToolbar/linkify.tid b/core/ui/EditorToolbar/linkify.tid
index e8b5fed62..f500669ad 100644
--- a/core/ui/EditorToolbar/linkify.tid
+++ b/core/ui/EditorToolbar/linkify.tid
@@ -12,4 +12,5 @@ tags: $:/tags/EditorToolbar
 	$param="wrap-selection"
 	prefix="[["
 	suffix="]]"
+	trimSelection="yes"
 />
diff --git a/core/ui/EditorToolbar/mono-line.tid b/core/ui/EditorToolbar/mono-line.tid
index 2df863171..cfad08e71 100644
--- a/core/ui/EditorToolbar/mono-line.tid
+++ b/core/ui/EditorToolbar/mono-line.tid
@@ -11,4 +11,5 @@ shortcuts: ((mono-line))
 	$param="wrap-selection"
 	prefix="`"
 	suffix="`"
+	trimSelection="yes"
 />
diff --git a/core/ui/EditorToolbar/stamp-dropdown-item-template.tid b/core/ui/EditorToolbar/stamp-dropdown-item-template.tid
index 5e5acb162..cef3de8b0 100644
--- a/core/ui/EditorToolbar/stamp-dropdown-item-template.tid
+++ b/core/ui/EditorToolbar/stamp-dropdown-item-template.tid
@@ -21,7 +21,7 @@ title: $:/core/ui/EditorToolbar/StampDropdown/ItemTemplate
 	$message="tm-edit-text-operation"
 	$param="wrap-selection"
 	prefix={{{ [<currentTiddler>addsuffix[/prefix]get[text]] }}}
-  suffix={{{ [<currentTiddler>addsuffix[/suffix]get[text]] }}}
+	suffix={{{ [<currentTiddler>addsuffix[/suffix]get[text]] }}}
 />
 
 </$list>
diff --git a/core/ui/EditorToolbar/strikethrough.tid b/core/ui/EditorToolbar/strikethrough.tid
index 0b00df486..51dbbede2 100644
--- a/core/ui/EditorToolbar/strikethrough.tid
+++ b/core/ui/EditorToolbar/strikethrough.tid
@@ -11,4 +11,5 @@ shortcuts: ((strikethrough))
 	$param="wrap-selection"
 	prefix="~~"
 	suffix="~~"
+	trimSelection="yes"
 />
diff --git a/core/ui/EditorToolbar/subscript.tid b/core/ui/EditorToolbar/subscript.tid
index 1c980a896..4be11ba54 100644
--- a/core/ui/EditorToolbar/subscript.tid
+++ b/core/ui/EditorToolbar/subscript.tid
@@ -11,4 +11,5 @@ shortcuts: ((subscript))
 	$param="wrap-selection"
 	prefix=",,"
 	suffix=",,"
+	trimSelection="yes"
 />
diff --git a/core/ui/EditorToolbar/superscript.tid b/core/ui/EditorToolbar/superscript.tid
index ee4713409..02cb1176e 100644
--- a/core/ui/EditorToolbar/superscript.tid
+++ b/core/ui/EditorToolbar/superscript.tid
@@ -11,4 +11,5 @@ shortcuts: ((superscript))
 	$param="wrap-selection"
 	prefix="^^"
 	suffix="^^"
+	trimSelection="yes"
 />
diff --git a/core/ui/EditorToolbar/transcludify.tid b/core/ui/EditorToolbar/transcludify.tid
index d24b2041c..61195ed1e 100644
--- a/core/ui/EditorToolbar/transcludify.tid
+++ b/core/ui/EditorToolbar/transcludify.tid
@@ -12,4 +12,5 @@ tags: $:/tags/EditorToolbar
 	$param="wrap-selection"
 	prefix="{{"
 	suffix="}}"
+	trimSelection="yes"
 />
diff --git a/core/ui/EditorToolbar/underline.tid b/core/ui/EditorToolbar/underline.tid
index 9f0fc9c30..9d4c4d151 100644
--- a/core/ui/EditorToolbar/underline.tid
+++ b/core/ui/EditorToolbar/underline.tid
@@ -11,4 +11,5 @@ shortcuts: ((underline))
 	$param="wrap-selection"
 	prefix="__"
 	suffix="__"
+	trimSelection="yes"
 />
diff --git a/core/ui/PageControls/advanced-search.tid b/core/ui/PageControls/advanced-search.tid
index 1549b07f4..4aa49e6e5 100644
--- a/core/ui/PageControls/advanced-search.tid
+++ b/core/ui/PageControls/advanced-search.tid
@@ -4,15 +4,14 @@ caption: {{$:/core/images/advanced-search-button}} {{$:/language/Buttons/Advance
 description: {{$:/language/Buttons/AdvancedSearch/Hint}}
 
 \whitespace trim
-\define advanced-search-button(class)
-\whitespace trim
-<$button to="$:/AdvancedSearch" tooltip={{$:/language/Buttons/AdvancedSearch/Hint}} aria-label={{$:/language/Buttons/AdvancedSearch/Caption}} class="""$(tv-config-toolbar-class)$ $class$""">
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+\procedure advanced-search-button(class)
+<$button to="$:/AdvancedSearch" tooltip={{$:/language/Buttons/AdvancedSearch/Hint}} aria-label={{$:/language/Buttons/AdvancedSearch/Caption}} class=`$(tv-config-toolbar-class)$ $(class)$`>
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/advanced-search-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/AdvancedSearch/Caption}}/></span>
-</$list>
+<%endif%>
 </$button>
 \end
 
diff --git a/core/ui/PageControls/closeall.tid b/core/ui/PageControls/closeall.tid
index 2665fff0d..23aefa8be 100644
--- a/core/ui/PageControls/closeall.tid
+++ b/core/ui/PageControls/closeall.tid
@@ -5,12 +5,12 @@ description: {{$:/language/Buttons/CloseAll/Hint}}
 
 \whitespace trim
 <$button message="tm-close-all-tiddlers" tooltip={{$:/language/Buttons/CloseAll/Hint}} aria-label={{$:/language/Buttons/CloseAll/Caption}} class=<<tv-config-toolbar-class>>>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/close-all-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/language/Buttons/CloseAll/Caption}}/>
 </span>
-</$list>
-</$button>
\ No newline at end of file
+<%endif%>
+</$button>
diff --git a/core/ui/PageControls/controlpanel.tid b/core/ui/PageControls/controlpanel.tid
index 872d640ac..8b9db8d9a 100644
--- a/core/ui/PageControls/controlpanel.tid
+++ b/core/ui/PageControls/controlpanel.tid
@@ -4,15 +4,14 @@ caption: {{$:/core/images/options-button}} {{$:/language/Buttons/ControlPanel/Ca
 description: {{$:/language/Buttons/ControlPanel/Hint}}
 
 \whitespace trim
-\define control-panel-button(class)
-\whitespace trim
-<$button to="$:/ControlPanel" tooltip={{$:/language/Buttons/ControlPanel/Hint}} aria-label={{$:/language/Buttons/ControlPanel/Caption}} class="""$(tv-config-toolbar-class)$ $class$""">
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+\procedure control-panel-button(class)
+<$button to="$:/ControlPanel" tooltip={{$:/language/Buttons/ControlPanel/Hint}} aria-label={{$:/language/Buttons/ControlPanel/Caption}} class=`$(tv-config-toolbar-class)$ $(class)$`>
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/options-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/ControlPanel/Caption}}/></span>
-</$list>
+<%endif%>
 </$button>
 \end
 
diff --git a/core/ui/PageControls/encryption.tid b/core/ui/PageControls/encryption.tid
index 9f8ae0bd6..572d162de 100644
--- a/core/ui/PageControls/encryption.tid
+++ b/core/ui/PageControls/encryption.tid
@@ -6,25 +6,25 @@ description: {{$:/language/Buttons/Encryption/Hint}}
 \whitespace trim
 <$reveal type="match" state="$:/isEncrypted" text="yes">
 <$button message="tm-clear-password" tooltip={{$:/language/Buttons/Encryption/ClearPassword/Hint}} aria-label={{$:/language/Buttons/Encryption/ClearPassword/Caption}} class=<<tv-config-toolbar-class>>>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/locked-padlock}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/language/Buttons/Encryption/ClearPassword/Caption}}/>
 </span>
-</$list>
+<%endif%>
 </$button>
 </$reveal>
 <$reveal type="nomatch" state="$:/isEncrypted" text="yes">
 <$button message="tm-set-password" tooltip={{$:/language/Buttons/Encryption/SetPassword/Hint}} aria-label={{$:/language/Buttons/Encryption/SetPassword/Caption}} class=<<tv-config-toolbar-class>>>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/unlocked-padlock}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/language/Buttons/Encryption/SetPassword/Caption}}/>
 </span>
-</$list>
+<%endif%>
 </$button>
 </$reveal>
diff --git a/core/ui/PageControls/export-page.tid b/core/ui/PageControls/export-page.tid
index fe036abf7..902f643e9 100644
--- a/core/ui/PageControls/export-page.tid
+++ b/core/ui/PageControls/export-page.tid
@@ -3,4 +3,4 @@ tags: $:/tags/PageControls
 caption: {{$:/core/images/export-button}} {{$:/language/Buttons/ExportPage/Caption}}
 description: {{$:/language/Buttons/ExportPage/Hint}}
 
-<$macrocall $name="exportButton" exportFilter="[!is[system]sort[title]]" lingoBase="$:/language/Buttons/ExportPage/"/>
\ No newline at end of file
+<$transclude $variable="exportButton" exportFilter="[!is[system]sort[title]]" lingoBase="$:/language/Buttons/ExportPage/"/>
\ No newline at end of file
diff --git a/core/ui/PageControls/fold-all.tid b/core/ui/PageControls/fold-all.tid
index 46c3165b8..dba6bb1b6 100644
--- a/core/ui/PageControls/fold-all.tid
+++ b/core/ui/PageControls/fold-all.tid
@@ -6,12 +6,12 @@ description: {{$:/language/Buttons/FoldAll/Hint}}
 \whitespace trim
 <$button tooltip={{$:/language/Buttons/FoldAll/Hint}} aria-label={{$:/language/Buttons/FoldAll/Caption}} class=<<tv-config-toolbar-class>>>
 <$action-sendmessage $message="tm-fold-all-tiddlers" $param=<<currentTiddler>> foldedStatePrefix="$:/state/folded/"/>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]" variable="listItem">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/fold-all-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/language/Buttons/FoldAll/Caption}}/>
 </span>
-</$list>
-</$button>
\ No newline at end of file
+<%endif%>
+</$button>
diff --git a/core/ui/PageControls/full-screen.tid b/core/ui/PageControls/full-screen.tid
index ada7d5a65..864ee5c26 100644
--- a/core/ui/PageControls/full-screen.tid
+++ b/core/ui/PageControls/full-screen.tid
@@ -5,12 +5,12 @@ description: {{$:/language/Buttons/FullScreen/Hint}}
 
 \whitespace trim
 <$button message="tm-full-screen" tooltip={{$:/language/Buttons/FullScreen/Hint}} aria-label={{$:/language/Buttons/FullScreen/Caption}} class=<<tv-config-toolbar-class>>>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/full-screen-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/language/Buttons/FullScreen/Caption}}/>
 </span>
-</$list>
-</$button>
\ No newline at end of file
+<%endif%>
+</$button>
diff --git a/core/ui/PageControls/home.tid b/core/ui/PageControls/home.tid
index f3a0b1787..6c1d5a789 100644
--- a/core/ui/PageControls/home.tid
+++ b/core/ui/PageControls/home.tid
@@ -5,12 +5,12 @@ description: {{$:/language/Buttons/Home/Hint}}
 
 \whitespace trim
 <$button message="tm-home" tooltip={{$:/language/Buttons/Home/Hint}} aria-label={{$:/language/Buttons/Home/Caption}} class=<<tv-config-toolbar-class>>>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/home-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/language/Buttons/Home/Caption}}/>
 </span>
-</$list>
-</$button>
\ No newline at end of file
+<%endif%>
+</$button>
diff --git a/core/ui/PageControls/import.tid b/core/ui/PageControls/import.tid
index 39ca51eb6..11474db22 100644
--- a/core/ui/PageControls/import.tid
+++ b/core/ui/PageControls/import.tid
@@ -6,14 +6,14 @@ description: {{$:/language/Buttons/Import/Hint}}
 \whitespace trim
 <div class="tc-file-input-wrapper">
 <$button tooltip={{$:/language/Buttons/Import/Hint}} aria-label={{$:/language/Buttons/Import/Caption}} class=<<tv-config-toolbar-class>>>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/import-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/language/Buttons/Import/Caption}}/>
 </span>
-</$list>
+<%endif%>
 </$button>
 <$browse tooltip={{$:/language/Buttons/Import/Hint}}/>
-</div>
\ No newline at end of file
+</div>
diff --git a/core/ui/PageControls/language.tid b/core/ui/PageControls/language.tid
index 623c71004..3315b5a23 100644
--- a/core/ui/PageControls/language.tid
+++ b/core/ui/PageControls/language.tid
@@ -4,21 +4,18 @@ caption: {{$:/core/images/globe}} {{$:/language/Buttons/Language/Caption}}
 description: {{$:/language/Buttons/Language/Hint}}
 
 \whitespace trim
-\define flag-title()
-$(languagePluginTitle)$/icon
-\end
 <span class="tc-popup-keep">
 <$button popup=<<qualify "$:/state/popup/language">> tooltip={{$:/language/Buttons/Language/Hint}} aria-label={{$:/language/Buttons/Language/Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
-<span class="tc-image-button">
-<$set name="languagePluginTitle" value={{$:/language}}>
-<$image source=<<flag-title>>/>
-</$set>
-</span>
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
+    <span class="tc-image-button">
+        <$set name="languagePluginTitle" value={{$:/language}}>
+            <$image source=`$(languagePluginTitle)$/icon`/>
+        </$set>
+    </span>
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/Language/Caption}}/></span>
-</$list>
+<%endif%>
 </$button>
 </span>
 <$reveal state=<<qualify "$:/state/popup/language">> type="popup" position="below" animate="yes">
diff --git a/core/ui/PageControls/layout.tid b/core/ui/PageControls/layout.tid
index 703bbcb1b..c9a0f596b 100644
--- a/core/ui/PageControls/layout.tid
+++ b/core/ui/PageControls/layout.tid
@@ -6,10 +6,10 @@ description: {{$:/language/LayoutSwitcher/Description}}
 \whitespace trim
 <$button tooltip={{$:/language/Buttons/LayoutSwitcher/Hint}} aria-label={{$:/language/Buttons/LayoutSwitcher/Caption}} class=<<tv-config-toolbar-class>>>
 <$action-sendmessage $message="tm-show-switcher" switch="layout"/>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/layout-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/LayoutSwitcher/Caption}}/></span>
-</$list>
+<%endif%>
 </$button>
diff --git a/core/ui/PageControls/manager.tid b/core/ui/PageControls/manager.tid
index d2144c574..3cc364f80 100644
--- a/core/ui/PageControls/manager.tid
+++ b/core/ui/PageControls/manager.tid
@@ -4,17 +4,16 @@ caption: {{$:/core/images/list}} {{$:/language/Buttons/Manager/Caption}}
 description: {{$:/language/Buttons/Manager/Hint}}
 
 \whitespace trim
-\define manager-button(class)
-\whitespace trim
-<$button to="$:/Manager" tooltip={{$:/language/Buttons/Manager/Hint}} aria-label={{$:/language/Buttons/Manager/Caption}} class="""$(tv-config-toolbar-class)$ $class$""">
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+\procedure manager-button(class)
+<$button to="$:/Manager" tooltip={{$:/language/Buttons/Manager/Hint}} aria-label={{$:/language/Buttons/Manager/Caption}} class=`$(tv-config-toolbar-class)$ $(class)$`>
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/list}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/language/Buttons/Manager/Caption}}/>
 </span>
-</$list>
+<%endif%>
 </$button>
 \end
 
diff --git a/core/ui/PageControls/more-page-actions.tid b/core/ui/PageControls/more-page-actions.tid
index 3acaef2b6..7453b9df7 100644
--- a/core/ui/PageControls/more-page-actions.tid
+++ b/core/ui/PageControls/more-page-actions.tid
@@ -12,33 +12,29 @@ description: {{$:/language/Buttons/More/Hint}}
 	class=<<tv-config-toolbar-class>>
 	selectedClass="tc-selected"
 >
-	<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+	<%if [<tv-config-toolbar-icons>match[yes]] %>
 		{{$:/core/images/down-arrow}}
-	</$list>
-	<$list filter="[<tv-config-toolbar-text>match[yes]]">
+	<%endif%>
+	<%if [<tv-config-toolbar-text>match[yes]] %>
 		<span class="tc-btn-text">
 			<$text text={{$:/language/Buttons/More/Caption}}/>
 		</span>
-	</$list>
+	<%endif%>
 </$button>
 <$reveal state=<<qualify "$:/state/popup/more">> type="popup" position="below" animate="yes">
 	<div class="tc-drop-down">
-		<$set name="tv-config-toolbar-icons" value="yes">
-			<$set name="tv-config-toolbar-text" value="yes">
-				<$set name="tv-config-toolbar-class" value="tc-btn-invisible">
-					<$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]] -[[$:/core/ui/Buttons/more-page-actions]]"
-						variable="listItem"
+		<$let tv-config-toolbar-icons="yes" tv-config-toolbar-text="yes" tv-config-toolbar-class="tc-btn-invisible">
+			<$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]] -[[$:/core/ui/Buttons/more-page-actions]]"
+				variable="listItem"
+			>
+				<$reveal type="match" state=<<config-title>> text="hide">
+					<$set name="tv-config-toolbar-class"
+						filter="[<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]]"
 					>
-						<$reveal type="match" state=<<config-title>> text="hide">
-							<$set name="tv-config-toolbar-class"
-								filter="[<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]]"
-							>
-								<$transclude tiddler=<<listItem>> mode="inline"/>
-							</$set>
-						</$reveal>
-					</$list>
-				</$set>
-			</$set>
-		</$set>
+						<$transclude tiddler=<<listItem>> mode="inline"/>
+					</$set>
+				</$reveal>
+			</$list>
+		</$let>
 	</div>
-</$reveal>
\ No newline at end of file
+</$reveal>
diff --git a/core/ui/PageControls/network-activity.tid b/core/ui/PageControls/network-activity.tid
index 763365f37..7be25b261 100644
--- a/core/ui/PageControls/network-activity.tid
+++ b/core/ui/PageControls/network-activity.tid
@@ -5,12 +5,12 @@ description: {{$:/language/Buttons/NetworkActivity/Hint}}
 
 \whitespace trim
 <$button message="tm-http-cancel-all-requests" tooltip={{$:/language/Buttons/NetworkActivity/Hint}} aria-label={{$:/language/Buttons/NetworkActivity/Caption}} class=<<tv-config-toolbar-class>>>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/network-activity}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/language/Buttons/NetworkActivity/Caption}}/>
 </span>
-</$list>
-</$button>
\ No newline at end of file
+<%endif%>
+</$button>
diff --git a/core/ui/PageControls/new-image.tid b/core/ui/PageControls/new-image.tid
index b37fba7c5..0cf954966 100644
--- a/core/ui/PageControls/new-image.tid
+++ b/core/ui/PageControls/new-image.tid
@@ -5,12 +5,12 @@ description: {{$:/language/Buttons/NewImage/Hint}}
 
 \whitespace trim
 <$button tooltip={{$:/language/Buttons/NewImage/Hint}} aria-label={{$:/language/Buttons/NewImage/Caption}} class=<<tv-config-toolbar-class>> actions={{$:/core/ui/Actions/new-image}}>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/new-image-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/language/Buttons/NewImage/Caption}}/>
 </span>
-</$list>
+<%endif%>
 </$button>
diff --git a/core/ui/PageControls/new-journal.tid b/core/ui/PageControls/new-journal.tid
index 8ae8ee78a..8330b8cb7 100644
--- a/core/ui/PageControls/new-journal.tid
+++ b/core/ui/PageControls/new-journal.tid
@@ -4,17 +4,16 @@ caption: {{$:/core/images/new-journal-button}} {{$:/language/Buttons/NewJournal/
 description: {{$:/language/Buttons/NewJournal/Hint}}
 
 \whitespace trim
-\define journalButton()
-\whitespace trim
+\procedure journalButton()
 <$button tooltip={{$:/language/Buttons/NewJournal/Hint}} aria-label={{$:/language/Buttons/NewJournal/Caption}} class=<<tv-config-toolbar-class>> actions={{$:/core/ui/Actions/new-journal}}>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/new-journal-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/language/Buttons/NewJournal/Caption}}/>
 </span>
-</$list>
+<%endif%>
 </$button>
 \end
 <<journalButton>>
diff --git a/core/ui/PageControls/newtiddler.tid b/core/ui/PageControls/newtiddler.tid
index cd2f56913..f6a6e6891 100644
--- a/core/ui/PageControls/newtiddler.tid
+++ b/core/ui/PageControls/newtiddler.tid
@@ -5,12 +5,12 @@ description: {{$:/language/Buttons/NewTiddler/Hint}}
 
 \whitespace trim
 <$button actions={{$:/core/ui/Actions/new-tiddler}} tooltip={{$:/language/Buttons/NewTiddler/Hint}} aria-label={{$:/language/Buttons/NewTiddler/Caption}} class=<<tv-config-toolbar-class>>>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/new-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/language/Buttons/NewTiddler/Caption}}/>
 </span>
-</$list>
+<%endif%>
 </$button>
diff --git a/core/ui/PageControls/palette.tid b/core/ui/PageControls/palette.tid
index 6fdbdb439..efa016d49 100644
--- a/core/ui/PageControls/palette.tid
+++ b/core/ui/PageControls/palette.tid
@@ -6,12 +6,12 @@ description: {{$:/language/Buttons/Palette/Hint}}
 \whitespace trim
 <span class="tc-popup-keep">
 <$button popup=<<qualify "$:/state/popup/palette">> tooltip={{$:/language/Buttons/Palette/Hint}} aria-label={{$:/language/Buttons/Palette/Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/palette}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/Palette/Caption}}/></span>
-</$list>
+<%endif%>
 </$button>
 </span>
 <$reveal state=<<qualify "$:/state/popup/palette">> type="popup" position="below" animate="yes">
diff --git a/core/ui/PageControls/print.tid b/core/ui/PageControls/print.tid
index ef664b6e3..994303d25 100644
--- a/core/ui/PageControls/print.tid
+++ b/core/ui/PageControls/print.tid
@@ -5,12 +5,12 @@ description: {{$:/language/Buttons/Print/Hint}}
 
 \whitespace trim
 <$button message="tm-print" tooltip={{$:/language/Buttons/Print/Hint}} aria-label={{$:/language/Buttons/Print/Caption}} class=<<tv-config-toolbar-class>>>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/print-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/language/Buttons/Print/Caption}}/>
 </span>
-</$list>
-</$button>
\ No newline at end of file
+<%endif%>
+</$button>
diff --git a/core/ui/PageControls/refresh.tid b/core/ui/PageControls/refresh.tid
index 38692f817..5a8773b77 100644
--- a/core/ui/PageControls/refresh.tid
+++ b/core/ui/PageControls/refresh.tid
@@ -5,12 +5,12 @@ description: {{$:/language/Buttons/Refresh/Hint}}
 
 \whitespace trim
 <$button message="tm-browser-refresh" tooltip={{$:/language/Buttons/Refresh/Hint}} aria-label={{$:/language/Buttons/Refresh/Caption}} class=<<tv-config-toolbar-class>>>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/refresh-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/language/Buttons/Refresh/Caption}}/>
 </span>
-</$list>
-</$button>
\ No newline at end of file
+<%endif%>
+</$button>
diff --git a/core/ui/PageControls/savewiki.tid b/core/ui/PageControls/savewiki.tid
index 60f8dc99f..7e6a18ccc 100644
--- a/core/ui/PageControls/savewiki.tid
+++ b/core/ui/PageControls/savewiki.tid
@@ -9,13 +9,13 @@ description: {{$:/language/Buttons/SaveWiki/Hint}}
 <$action-sendmessage $message="tm-save-wiki" $param={{$:/config/SaveWikiButton/Template}} filename=<<site-title>>/>
 </$wikify>
 <span class="tc-dirty-indicator">
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/save-button-dynamic}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/language/Buttons/SaveWiki/Caption}}/>
 </span>
-</$list>
+<%endif%>
 </span>
-</$button>
\ No newline at end of file
+</$button>
diff --git a/core/ui/PageControls/storyview.tid b/core/ui/PageControls/storyview.tid
index c4d0b7365..7738cfa97 100644
--- a/core/ui/PageControls/storyview.tid
+++ b/core/ui/PageControls/storyview.tid
@@ -4,19 +4,16 @@ caption: {{$:/core/images/storyview-classic}} {{$:/language/Buttons/StoryView/Ca
 description: {{$:/language/Buttons/StoryView/Hint}}
 
 \whitespace trim
-\define icon()
-$:/core/images/storyview-$(storyview)$
-\end
 <span class="tc-popup-keep">
 <$button popup=<<qualify "$:/state/popup/storyview">> tooltip={{$:/language/Buttons/StoryView/Hint}} aria-label={{$:/language/Buttons/StoryView/Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 <$set name="storyview" value={{$:/view}}>
-<$transclude tiddler=<<icon>>/>
+<$transclude tiddler=`$:/core/images/storyview-$(storyview)$`/>
 </$set>
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/StoryView/Caption}}/></span>
-</$list>
+<%endif%>
 </$button>
 </span>
 <$reveal state=<<qualify "$:/state/popup/storyview">> type="popup" position="below" animate="yes">
diff --git a/core/ui/PageControls/tag-button.tid b/core/ui/PageControls/tag-button.tid
index e2b5c9277..6c04804ce 100644
--- a/core/ui/PageControls/tag-button.tid
+++ b/core/ui/PageControls/tag-button.tid
@@ -4,17 +4,16 @@ caption: {{$:/core/images/tag-button}} {{$:/language/Buttons/TagManager/Caption}
 description: {{$:/language/Buttons/TagManager/Hint}}
 
 \whitespace trim
-\define control-panel-button(class)
-\whitespace trim
-<$button to="$:/TagManager" tooltip={{$:/language/Buttons/TagManager/Hint}} aria-label={{$:/language/Buttons/TagManager/Caption}} class="""$(tv-config-toolbar-class)$ $class$""">
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+\procedure control-panel-button(class)
+<$button to="$:/TagManager" tooltip={{$:/language/Buttons/TagManager/Hint}} aria-label={{$:/language/Buttons/TagManager/Caption}} class=`$(tv-config-toolbar-class)$ $(class)$`>
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/tag-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/language/Buttons/TagManager/Caption}}/>
 </span>
-</$list>
+<%endif%>
 </$button>
 \end
 
diff --git a/core/ui/PageControls/theme.tid b/core/ui/PageControls/theme.tid
index 2d8eadc7b..60e37a95e 100644
--- a/core/ui/PageControls/theme.tid
+++ b/core/ui/PageControls/theme.tid
@@ -6,12 +6,12 @@ description: {{$:/language/Buttons/Theme/Hint}}
 \whitespace trim
 <span class="tc-popup-keep">
 <$button popup=<<qualify "$:/state/popup/theme">> tooltip={{$:/language/Buttons/Theme/Hint}} aria-label={{$:/language/Buttons/Theme/Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/theme-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/Theme/Caption}}/></span>
-</$list>
+<%endif%>
 </$button>
 </span>
 <$reveal state=<<qualify "$:/state/popup/theme">> type="popup" position="below" animate="yes">
diff --git a/core/ui/PageControls/timestamp.tid b/core/ui/PageControls/timestamp.tid
index a54b3f2ca..0186d7c12 100644
--- a/core/ui/PageControls/timestamp.tid
+++ b/core/ui/PageControls/timestamp.tid
@@ -7,26 +7,26 @@ description: {{$:/language/Buttons/Timestamp/Hint}}
 <$reveal type="nomatch" state="$:/config/TimestampDisable" text="yes">
 <$button tooltip={{$:/language/Buttons/Timestamp/On/Hint}} aria-label={{$:/language/Buttons/Timestamp/On/Caption}} class=<<tv-config-toolbar-class>>>
 <$action-setfield $tiddler="$:/config/TimestampDisable" $value="yes"/>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/timestamp-on}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/language/Buttons/Timestamp/On/Caption}}/>
 </span>
-</$list>
+<%endif%>
 </$button>
 </$reveal>
 <$reveal type="match" state="$:/config/TimestampDisable" text="yes">
 <$button tooltip={{$:/language/Buttons/Timestamp/Off/Hint}} aria-label={{$:/language/Buttons/Timestamp/Off/Caption}} class=<<tv-config-toolbar-class>>>
 <$action-setfield $tiddler="$:/config/TimestampDisable" $value="no"/>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/timestamp-off}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/language/Buttons/Timestamp/Off/Caption}}/>
 </span>
-</$list>
+<%endif%>
 </$button>
 </$reveal>
diff --git a/core/ui/PageControls/unfold-all.tid b/core/ui/PageControls/unfold-all.tid
index 6e8357a3b..e0d26bc49 100644
--- a/core/ui/PageControls/unfold-all.tid
+++ b/core/ui/PageControls/unfold-all.tid
@@ -6,12 +6,12 @@ description: {{$:/language/Buttons/UnfoldAll/Hint}}
 \whitespace trim
 <$button tooltip={{$:/language/Buttons/UnfoldAll/Hint}} aria-label={{$:/language/Buttons/UnfoldAll/Caption}} class=<<tv-config-toolbar-class>>>
 <$action-sendmessage $message="tm-unfold-all-tiddlers" $param=<<currentTiddler>> foldedStatePrefix="$:/state/folded/"/>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]" variable="listItem">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/unfold-all-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/language/Buttons/UnfoldAll/Caption}}/>
 </span>
-</$list>
-</$button>
\ No newline at end of file
+<%endif%>
+</$button>
diff --git a/core/ui/SideBarSegments/search.tid b/core/ui/SideBarSegments/search.tid
index 938cedfd1..690210307 100644
--- a/core/ui/SideBarSegments/search.tid
+++ b/core/ui/SideBarSegments/search.tid
@@ -55,7 +55,7 @@ tags: $:/tags/SideBarSegment
 <$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>> 
+		class="tc-tiny-gap-right 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>
diff --git a/core/ui/TestCaseTemplate.tid b/core/ui/TestCaseTemplate.tid
index 8761abdd5..d6fccb956 100644
--- a/core/ui/TestCaseTemplate.tid
+++ b/core/ui/TestCaseTemplate.tid
@@ -13,6 +13,7 @@ title: $:/core/ui/TestCaseTemplate
 		testActions="Actions"
 		testHideIfPass=<<hideIfPass>>
 	>
+		<$data $filter={{!!import}}/>
 		<$data $compound-filter={{!!import-compound}}/>
 		<$data $compound-tiddler=<<currentTiddler>>/>
 		<%if [{!!description}!is[blank]] %><$data title="Description" text={{!!description}}/><%endif%>
diff --git a/core/ui/TestCases/DefaultTemplate.tid b/core/ui/TestCases/DefaultTemplate.tid
index 04623cbc6..2967a5157 100644
--- a/core/ui/TestCases/DefaultTemplate.tid
+++ b/core/ui/TestCases/DefaultTemplate.tid
@@ -2,91 +2,148 @@ title: $:/core/ui/testcases/DefaultTemplate
 code-body: yes
 
 \whitespace trim
+
+\function tf.state() "$:/state/testcase"
+
 \procedure linkcatcherActions()
 <%if [<navigateTo>has[title]] %>
-	<$qualify title=<<state>> name="qualifiedState">
-		<$action-setfield $tiddler=<<qualifiedState>> text=<<navigateTo>>/>
-	</$qualify>
+	<$action-setfield $tiddler=<<tf.state>> text=<<navigateTo>>/>
 <%endif%>
 \end
 
-<$let
-	state={{{ [<qualify "$:/state/testcase">] }}}
->
-	<div class="tc-test-case-wrapper">
-		<div class="tc-test-case-header">
-			<h2>
-				<$genesis $type={{{ [<linkTarget>!match[]then[$link]else[span]] }}} to=<<testcaseTiddler>>>
-					<%if [<testResult>!match[]] %>
-						<span class={{{ tc-test-case-result-icon [<testResult>!match[fail]then[tc-test-case-result-icon-pass]] [<testResult>match[fail]then[tc-test-case-result-icon-fail]] +[join[ ]] }}}>
-							<%if [<testResult>!match[fail]] %>
-								{{$:/core/images/done-button}}
-							<%else%>
-								{{$:/core/images/close-button}}
-							<%endif%>
-						</span>
+\procedure testcase-header()
+<div class="tc-test-case-header">
+	<h2>
+		<$genesis $type={{{ [<linkTarget>!match[]then[$link]else[span]] }}} to=<<testcaseTiddler>>>
+			<%if [<testResult>!match[]] %>
+				<span class={{{ tc-test-case-result-icon
+					[<testResult>!match[fail]then[tc-test-case-result-icon-pass]]
+					[<testResult>match[fail]then[tc-test-case-result-icon-fail]]
+					+[join[ ]] }}}
+				>
+					<%if [<testResult>!match[fail]] %>
+						{{$:/core/images/done-button}}
+					<%else%>
+						{{$:/core/images/close-button}}
 					<%endif%>
-					<$view tiddler="Description" mode="inline"/>
-				</$genesis>
-				<span class="tc-test-case-toolbar">
-					<$button popup=`$(state)$-more`
-						tooltip={{$:/language/Buttons/More/Hint}}
-						aria-label={{$:/language/Buttons/More/Caption}}
-						class="tc-btn-invisible"
-						selectedClass="tc-selected"
-					>
-						{{$:/core/images/down-arrow}}
-					</$button>
-					<$let 
-						tv-config-toolbar-icons="yes"
-						tv-config-toolbar-text="yes"
-						tv-config-toolbar-class="tc-btn-invisible"
-					>
-						<$reveal state=`$(state)$-more` type="popup" position="belowleft" animate="yes">
-							<div class="tc-drop-down">
-								<$list filter="[all[shadows+tiddlers]tag[$:/tags/TestCase/Actions]!has[draft.of]]"
-									variable="listItem"
-								>
-									<$transclude $tiddler=<<listItem>> $mode="inline"/>
-								</$list>
-							</div>
-						</$reveal>
-					</$let>
 				</span>
-			</h2>
+			<%endif%>
+			<$view tiddler="Description" mode="inline"/>
+		</$genesis>
+		<span class="tc-test-case-toolbar">
+			<<testcase-toolbar>>
+		</span>
+	</h2>
+</div>
+\end
+
+\procedure testcase-toolbar()
+<$button popup=`$(tf.state)$-more`
+	tooltip={{$:/language/Buttons/More/Hint}}
+	aria-label={{$:/language/Buttons/More/Caption}}
+	class="tc-btn-invisible"
+	selectedClass="tc-selected"
+>
+	{{$:/core/images/down-arrow}}
+</$button>
+<$let
+	tv-config-toolbar-icons="yes"
+	tv-config-toolbar-text="yes"
+	tv-config-toolbar-class="tc-btn-invisible"
+>
+	<$reveal state=`$(tf.state)$-more` type="popup" position="belowleft" animate="yes">
+		<div class="tc-drop-down">
+			<$list filter="[all[shadows+tiddlers]tag[$:/tags/TestCase/Actions]!has[draft.of]]"
+				variable="listItem"
+			>
+				<$transclude $tiddler=<<listItem>> $mode="inline"/>
+			</$list>
 		</div>
-		<%if [[Narrative]is[tiddler]] %>
-			<div class="tc-test-case-narrative">
-				<$transclude $tiddler="Narrative" $mode="block"/>
-			</div>
-		<%endif%>
-		<%if [<testResult>match[fail]] %>
-			<div class="tc-test-case-result-fail">
-				<div class="tc-test-case-result-fail-header">
-					TEST FAILED
-				</div>
-				<div class="tc-test-case-result-fail-body">
-					<$diff-text source=<<expectedHTML>> dest=<<outputHTML>>/>
-				</div>
-			</div>
-		<%endif%>
-		<div class="tc-test-case-panes">
-			<div class="tc-test-case-source">
-				<$macrocall $name="tabs" tabsList="[all[tiddlers]sort[]] -[prefix<state>] -Description -Narrative -Output Output +[putfirst[]] -[has[plugin-type]]" state=<<state>> default="Output" template="$:/core/ui/testcases/DefaultTemplate/SourceTabs"/>
-			</div>
-			<div class="tc-test-case-divider">
-			</div>
-			<div class="tc-test-case-output">
-				<%if [<displayFormat>!match[]else[wikitext]match[plaintext]] %>
-					<pre><$view tiddler="Output" format="plainwikified" mode="block"/></pre>
-				<%else%>
-					<$linkcatcher actions=<<linkcatcherActions>>>
-						<$tiddler tiddler="Output">
-							<$transclude $tiddler="Output" $mode="block"/>
-						</$tiddler>
-					</$linkcatcher>
-				<%endif%>
-			</div>
-		</div>
-	</div>
+	</$reveal>
 </$let>
+\end
+
+\procedure testcase-narrative()
+<div class="tc-test-case-narrative">
+	<$transclude $tiddler="Narrative" $mode="block"/>
+</div>
+\end
+
+\procedure testcase-fail()
+<div class="tc-test-case-result-fail">
+	<div class="tc-test-case-result-fail-header">
+		TEST FAILED
+	</div>
+	<div class="tc-test-case-result-fail-body">
+		<$diff-text source=<<expectedHTML>> dest=<<outputHTML>>/>
+	</div>
+</div>
+\end
+
+\procedure testcase-output-wikified()
+<$linkcatcher actions=<<linkcatcherActions>>>
+	<$tiddler tiddler="Output">
+		<$transclude $tiddler="Output" $mode="block"/>
+	</$tiddler>
+</$linkcatcher>
+\end
+
+\procedure testcase-output()
+<div class="tc-test-case-output">
+	<%if [<displayFormat>!match[]else[wikitext]match[plaintext]] %>
+		<pre><$view tiddler="Output" format="plainwikified" mode="block"/></pre>
+	<%else%>
+		<<testcase-output-wikified>>
+	<%endif%>
+</div>
+\end
+
+\procedure testcase-tabsList()
+[all[tiddlers]sort[]] Output +[putfirst[]]
+-Description
+-Narrative
+-[[$:/temp/testcase/draft-title]]
+-[has[plugin-type]]
+-[prefix<tf.state>]
+-[prefix[$:/state/popup/export]]
+-[prefix[$:/HistoryList]]
+-[prefix[$:/StoryList]]
+\end
+
+\procedure testcase-source()
+<div class="tc-test-case-source">
+	<$macrocall $name="tabs"
+		tabsList=<<testcase-tabsList>>
+		explicitState=<<tf.state>>
+		default="Output"
+		template="$:/core/ui/testcases/DefaultTemplate/SourceTabs"
+	/>
+</div>
+\end
+
+\procedure testcase-panes()
+<div class="tc-test-case-panes">
+	<<testcase-source>>
+	<div class="tc-test-case-divider"></div>
+	<<testcase-output>>
+</div>
+\end
+
+\procedure testcase-body()
+<div class="tc-test-case-wrapper">
+	<<testcase-header>>
+	<$let testcase-source-state = <<tf.state>>>
+		<$navigator story="$:/StoryList" history="$:/HistoryList">
+			<%if [[Narrative]is[tiddler]] %>
+				<<testcase-narrative>>
+			<%endif%>
+			<%if [<testResult>match[fail]] %>
+				<<testcase-fail>>
+			<%endif%>
+			<<testcase-panes>>
+		</$navigator>
+	</$let>
+</div>
+\end
+
+<<testcase-body>>
\ No newline at end of file
diff --git a/core/ui/TestCases/DefaultTemplateSourceTabs.tid b/core/ui/TestCases/DefaultTemplateSourceTabs.tid
index 862a7f57a..77532a3b7 100644
--- a/core/ui/TestCases/DefaultTemplateSourceTabs.tid
+++ b/core/ui/TestCases/DefaultTemplateSourceTabs.tid
@@ -1,6 +1,22 @@
 title: $:/core/ui/testcases/DefaultTemplate/SourceTabs
 
 \whitespace trim
+
+\procedure testcaseNewTitle() $:/temp/testcase/draft-title
+
+\procedure saveActions()
+<$action-setfield $tiddler=<<currentTab>> $field="draft.title" $value=<<newTitle>>/>
+<$action-sendmessage $message="tm-save-tiddler" $param=<<title>> />
+<$action-setfield $tiddler=<<testcase-source-state>> text=<<newTitle>>/>
+<$action-deletetiddler $tiddler=<<testcaseNewTitle>>/>
+\end
+
+\procedure saveButton(title, newTitle)
+<$button class="tc-btn-invisible tc-test-case-save-button tc-small-gap-left" actions=<<saveActions>> disabled={{{ [<testcaseNewTitle>!has[text]then[yes]] }}}>
+{{$:/core/images/done-button}}
+</$button>
+\end
+
 \procedure body()
 <$list filter="[<currentTab>fields[]] -text +[limit[1]]" variable="ignore">
 	<table class="tc-field-table">
@@ -11,7 +27,12 @@ title: $:/core/ui/testcases/DefaultTemplate/SourceTabs
 						<$text text=<<fieldName>>/>
 					</td>
 					<td>
-						<$view tiddler=<<currentTab>> field=<<fieldName>>/>
+						<%if [<fieldName>match[draft.title]]  %>
+							<$edit-text class="tc-edit-texteditor tc-max-width-80" tiddler=<<testcaseNewTitle>> focus="yes" tag="input"/>
+							<$macrocall $name="saveButton" newTitle={{{ [<testcaseNewTitle>get[text]] }}} title=<<currentTab>>/>
+						<%else%>
+							<$view tiddler=<<currentTab>> field=<<fieldName>>/>
+						<%endif%>
 					</td>
 				</tr>
 			</$list>
diff --git a/core/ui/TestCases/actions/Export.tid b/core/ui/TestCases/actions/Export.tid
index 0d5f976e5..79c6eb93a 100644
--- a/core/ui/TestCases/actions/Export.tid
+++ b/core/ui/TestCases/actions/Export.tid
@@ -1,4 +1,4 @@
 title: $:/core/ui/testcases/actions/Export
 tags: $:/tags/TestCase/Actions
 
-<$macrocall $name="exportButton" exportFilter="[all[tiddlers]sort[]] -[prefix[$:/state/]] -Description -Narrative -ExpectedResult -Output Output +[putfirst[]] -[has[plugin-type]]" lingoBase="$:/language/Buttons/ExportTiddlers/"/>
\ No newline at end of file
+<$macrocall $name="exportButton" exportFilter="[all[tiddlers]sort[]] -[prefix[$:/state/]] -Description -Narrative -ExpectedResult -[has[plugin-type]]" lingoBase="$:/language/Buttons/ExportTiddlers/"/>
\ No newline at end of file
diff --git a/core/ui/ViewTemplate/body.tid b/core/ui/ViewTemplate/body.tid
index 34e6aaa38..e4f03ec0e 100644
--- a/core/ui/ViewTemplate/body.tid
+++ b/core/ui/ViewTemplate/body.tid
@@ -3,7 +3,7 @@ tags: $:/tags/ViewTemplate
 
 \import [all[shadows+tiddlers]tag[$:/tags/Macro/View/Body]!is[draft]] [all[shadows+tiddlers]tag[$:/tags/Global/View/Body]!is[draft]]
 
-<$reveal tag="div" class="tc-tiddler-body" type="nomatch" stateTitle=<<folded-state>> text="hide" retain="yes" animate="yes">
+<$reveal tag="div" class="tc-tiddler-body tc-clearfix" 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/subtitle/default.tid b/core/ui/ViewTemplate/subtitle/default.tid
index 3885dc779..99042c95e 100644
--- a/core/ui/ViewTemplate/subtitle/default.tid
+++ b/core/ui/ViewTemplate/subtitle/default.tid
@@ -2,7 +2,7 @@ title: $:/core/ui/ViewTemplate/subtitle/default
 
 \whitespace trim
 <$reveal type="nomatch" stateTitle=<<folded-state>> text="hide" tag="div" retain="yes" animate="yes">
-<div class="tc-subtitle">
+<div class="tc-subtitle tc-clearfix">
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewTemplate/Subtitle]!has[draft.of]]" variable="subtitleTiddler">
 <$transclude tiddler=<<subtitleTiddler>> mode="inline"/><$list-join>&nbsp;</$list-join>
 </$list>
diff --git a/core/ui/ViewTemplate/title.tid b/core/ui/ViewTemplate/title.tid
index 225ea4351..b2cf1bd8e 100644
--- a/core/ui/ViewTemplate/title.tid
+++ b/core/ui/ViewTemplate/title.tid
@@ -4,7 +4,7 @@ tags: $:/tags/ViewTemplate
 \whitespace trim
 \define title-styles() fill:$(foregroundColor)$;
 
-<div class="tc-tiddler-title">
+<div class="tc-tiddler-title tc-clearfix">
 	<div class="tc-titlebar">
 		<span class="tc-tiddler-controls">
 			<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]] :filter[lookup[$:/config/ViewToolbarButtons/Visibility/]!match[hide]]"
diff --git a/core/ui/ViewToolbar/clone.tid b/core/ui/ViewToolbar/clone.tid
index 434418106..a4066fc00 100644
--- a/core/ui/ViewToolbar/clone.tid
+++ b/core/ui/ViewToolbar/clone.tid
@@ -4,13 +4,18 @@ caption: {{$:/core/images/clone-button}} {{$:/language/Buttons/Clone/Caption}}
 description: {{$:/language/Buttons/Clone/Hint}}
 
 \whitespace trim
-<$button message="tm-new-tiddler" param=<<currentTiddler>> tooltip={{$:/language/Buttons/Clone/Hint}} aria-label={{$:/language/Buttons/Clone/Caption}} class=<<tv-config-toolbar-class>>>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
-{{$:/core/images/clone-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
-<span class="tc-btn-text">
-<$text text={{$:/language/Buttons/Clone/Caption}}/>
-</span>
-</$list>
+<$button message="tm-new-tiddler"
+	param=<<currentTiddler>>
+	tooltip={{$:/language/Buttons/Clone/Hint}}
+	aria-label={{$:/language/Buttons/Clone/Hint}}
+	class=<<tv-config-toolbar-class>>
+>
+	<%if [<tv-config-toolbar-icons>match[yes]] %>
+		{{$:/core/images/clone-button}}
+	<%endif%>
+	<%if [<tv-config-toolbar-text>match[yes]] %>
+		<span class="tc-btn-text">
+			<$text text={{$:/language/Buttons/Clone/Caption}}/>
+		</span>
+	<%endif%>
 </$button>
\ No newline at end of file
diff --git a/core/ui/ViewToolbar/close-others.tid b/core/ui/ViewToolbar/close-others.tid
index 57fbf222c..19d996fda 100644
--- a/core/ui/ViewToolbar/close-others.tid
+++ b/core/ui/ViewToolbar/close-others.tid
@@ -5,12 +5,12 @@ description: {{$:/language/Buttons/CloseOthers/Hint}}
 
 \whitespace trim
 <$button message="tm-close-other-tiddlers" param=<<currentTiddler>> tooltip={{$:/language/Buttons/CloseOthers/Hint}} aria-label={{$:/language/Buttons/CloseOthers/Caption}} class=<<tv-config-toolbar-class>>>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/close-others-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/language/Buttons/CloseOthers/Caption}}/>
 </span>
-</$list>
+<%endif%>
 </$button>
\ No newline at end of file
diff --git a/core/ui/ViewToolbar/close.tid b/core/ui/ViewToolbar/close.tid
index bd1fbe0ee..fcc53cef0 100644
--- a/core/ui/ViewToolbar/close.tid
+++ b/core/ui/ViewToolbar/close.tid
@@ -4,13 +4,17 @@ caption: {{$:/core/images/close-button}} {{$:/language/Buttons/Close/Caption}}
 description: {{$:/language/Buttons/Close/Hint}}
 
 \whitespace trim
-<$button message="tm-close-tiddler" tooltip={{$:/language/Buttons/Close/Hint}} aria-label={{$:/language/Buttons/Close/Caption}} class=<<tv-config-toolbar-class>>>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
-{{$:/core/images/close-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
-<span class="tc-btn-text">
-<$text text={{$:/language/Buttons/Close/Caption}}/>
-</span>
-</$list>
+<$button message="tm-close-tiddler"
+	tooltip={{$:/language/Buttons/Close/Hint}}
+	aria-label={{$:/language/Buttons/Close/Caption}}
+	class=<<tv-config-toolbar-class>>
+>
+	<%if [<tv-config-toolbar-icons>match[yes]] %>
+		{{$:/core/images/close-button}}
+	<%endif%>
+	<%if [<tv-config-toolbar-text>match[yes]] %>
+		<span class="tc-btn-text">
+			<$text text={{$:/language/Buttons/Close/Caption}}/>
+		</span>
+	<%endif%>
 </$button>
\ No newline at end of file
diff --git a/core/ui/ViewToolbar/edit.tid b/core/ui/ViewToolbar/edit.tid
index f0ab31e4e..730fd6ed5 100644
--- a/core/ui/ViewToolbar/edit.tid
+++ b/core/ui/ViewToolbar/edit.tid
@@ -4,13 +4,17 @@ caption: {{$:/core/images/edit-button}} {{$:/language/Buttons/Edit/Caption}}
 description: {{$:/language/Buttons/Edit/Hint}}
 
 \whitespace trim
-<$button message="tm-edit-tiddler" tooltip={{$:/language/Buttons/Edit/Hint}} aria-label={{$:/language/Buttons/Edit/Caption}} class=<<tv-config-toolbar-class>>>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
-{{$:/core/images/edit-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
-<span class="tc-btn-text">
-<$text text={{$:/language/Buttons/Edit/Caption}}/>
-</span>
-</$list>
+<$button message="tm-edit-tiddler"
+	tooltip={{$:/language/Buttons/Edit/Hint}}
+	aria-label={{$:/language/Buttons/Edit/Hint}}
+	class=<<tv-config-toolbar-class>>
+>
+	<%if [<tv-config-toolbar-icons>match[yes]] %>
+		{{$:/core/images/edit-button}}
+	<%endif%>
+	<%if [<tv-config-toolbar-text>match[yes]] %>
+		<span class="tc-btn-text">
+		<$text text={{$:/language/Buttons/Edit/Caption}}/>
+	</span>
+	<%endif%>
 </$button>
\ No newline at end of file
diff --git a/core/ui/ViewToolbar/export-tiddler.tid b/core/ui/ViewToolbar/export-tiddler.tid
index 8c39de856..9bb3d8853 100644
--- a/core/ui/ViewToolbar/export-tiddler.tid
+++ b/core/ui/ViewToolbar/export-tiddler.tid
@@ -3,7 +3,4 @@ tags: $:/tags/ViewToolbar
 caption: {{$:/core/images/export-button}} {{$:/language/Buttons/ExportTiddler/Caption}}
 description: {{$:/language/Buttons/ExportTiddler/Hint}}
 
-\define makeExportFilter()
-[[$(currentTiddler)$]]
-\end
-<$macrocall $name="exportButton" exportFilter=<<makeExportFilter>> lingoBase="$:/language/Buttons/ExportTiddler/" baseFilename=<<currentTiddler>>/>
\ No newline at end of file
+<$transclude $variable="exportButton" exportFilter=`[[$(currentTiddler)$]]` lingoBase="$:/language/Buttons/ExportTiddler/" baseFilename=<<currentTiddler>>/>
\ No newline at end of file
diff --git a/core/ui/ViewToolbar/fold-others.tid b/core/ui/ViewToolbar/fold-others.tid
index 244977509..8734eaf33 100644
--- a/core/ui/ViewToolbar/fold-others.tid
+++ b/core/ui/ViewToolbar/fold-others.tid
@@ -6,12 +6,12 @@ description: {{$:/language/Buttons/FoldOthers/Hint}}
 \whitespace trim
 <$button tooltip={{$:/language/Buttons/FoldOthers/Hint}} aria-label={{$:/language/Buttons/FoldOthers/Caption}} class=<<tv-config-toolbar-class>>>
 <$action-sendmessage $message="tm-fold-other-tiddlers" $param=<<currentTiddler>> foldedStatePrefix="$:/state/folded/"/>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]" variable="listItem">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/fold-others-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/language/Buttons/FoldOthers/Caption}}/>
 </span>
-</$list>
+<%endif%>
 </$button>
\ No newline at end of file
diff --git a/core/ui/ViewToolbar/fold.tid b/core/ui/ViewToolbar/fold.tid
index fd3363688..3c99c6ad6 100644
--- a/core/ui/ViewToolbar/fold.tid
+++ b/core/ui/ViewToolbar/fold.tid
@@ -7,26 +7,26 @@ description: {{$:/language/Buttons/Fold/Hint}}
 <$reveal type="nomatch" stateTitle=<<folded-state>> text="hide" default="show">
 <$button tooltip={{$:/language/Buttons/Fold/Hint}} aria-label={{$:/language/Buttons/Fold/Caption}} class=<<tv-config-toolbar-class>>>
 <$action-sendmessage $message="tm-fold-tiddler" $param=<<currentTiddler>> foldedState=<<folded-state>>/>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]" variable="listItem">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/fold-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/language/Buttons/Fold/Caption}}/>
 </span>
-</$list>
+<%endif%>
 </$button>
 </$reveal>
 <$reveal type="match" stateTitle=<<folded-state>> text="hide" default="show">
 <$button tooltip={{$:/language/Buttons/Unfold/Hint}} aria-label={{$:/language/Buttons/Unfold/Caption}} class=<<tv-config-toolbar-class>>>
 <$action-sendmessage $message="tm-fold-tiddler" $param=<<currentTiddler>> foldedState=<<folded-state>>/>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]" variable="listItem">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/unfold-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/language/Buttons/Unfold/Caption}}/>
 </span>
-</$list>
+<%endif%>
 </$button>
 </$reveal>
diff --git a/core/ui/ViewToolbar/info.tid b/core/ui/ViewToolbar/info.tid
index 02fd9abd7..95245d909 100644
--- a/core/ui/ViewToolbar/info.tid
+++ b/core/ui/ViewToolbar/info.tid
@@ -4,31 +4,30 @@ caption: {{$:/core/images/info-button}} {{$:/language/Buttons/Info/Caption}}
 description: {{$:/language/Buttons/Info/Hint}}
 
 \whitespace trim
-\define button-content()
-\whitespace trim
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+\procedure button-content()
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/info-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/language/Buttons/Info/Caption}}/>
 </span>
-</$list>
+<%endif%>
 \end
 <$reveal state="$:/config/TiddlerInfo/Mode" type="match" text="popup">
 <$button popup=<<tiddlerInfoState>> tooltip={{$:/language/Buttons/Info/Hint}} aria-label={{$:/language/Buttons/Info/Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
-<$macrocall $name="button-content" mode="inline"/>
+<$transclude $variable="button-content" $mode="inline"/>
 </$button>
 </$reveal>
 <$reveal state="$:/config/TiddlerInfo/Mode" type="match" text="sticky">
 <$reveal state=<<tiddlerInfoState>> type="match" text="" default="">
 <$button set=<<tiddlerInfoState>> setTo="yes" tooltip={{$:/language/Buttons/Info/Hint}} aria-label={{$:/language/Buttons/Info/Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
-<$macrocall $name="button-content" mode="inline"/>
+<$transclude $variable="button-content" $mode="inline"/>
 </$button>
 </$reveal>
 <$reveal state=<<tiddlerInfoState>> type="nomatch" text="" default="">
 <$button set=<<tiddlerInfoState>> setTo="" tooltip={{$:/language/Buttons/Info/Hint}} aria-label={{$:/language/Buttons/Info/Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
-<$macrocall $name="button-content" mode="inline"/>
+<$transclude $variable="button-content" $mode="inline"/>
 </$button>
 </$reveal>
 </$reveal>
\ No newline at end of file
diff --git a/core/ui/ViewToolbar/more-tiddler-actions.tid b/core/ui/ViewToolbar/more-tiddler-actions.tid
index e7e75a79b..4528a4eee 100644
--- a/core/ui/ViewToolbar/more-tiddler-actions.tid
+++ b/core/ui/ViewToolbar/more-tiddler-actions.tid
@@ -4,7 +4,6 @@ caption: {{$:/core/images/down-arrow}} {{$:/language/Buttons/More/Caption}}
 description: {{$:/language/Buttons/More/Hint}}
 
 \whitespace trim
-\define config-title() $:/config/ViewToolbarButtons/Visibility/$(listItem)$
 
 <$button popup=<<qualify "$:/state/popup/more">>
 	tooltip={{$:/language/Buttons/More/Hint}}
@@ -12,33 +11,29 @@ description: {{$:/language/Buttons/More/Hint}}
 	class=<<tv-config-toolbar-class>>
 	selectedClass="tc-selected"
 >
-	<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+	<%if [<tv-config-toolbar-icons>match[yes]] %>
 		{{$:/core/images/down-arrow}}
-	</$list>
-	<$list filter="[<tv-config-toolbar-text>match[yes]]">
+	<%endif%>
+	<%if [<tv-config-toolbar-text>match[yes]] %>
 		<span class="tc-btn-text">
 			<$text text={{$:/language/Buttons/More/Caption}}/>
 		</span>
-	</$list>
+	<%endif%>
 </$button>
 <$reveal state=<<qualify "$:/state/popup/more">> type="popup" position="belowleft" animate="yes">
 	<div class="tc-drop-down">
-		<$set name="tv-config-toolbar-icons" value="yes">
-			<$set name="tv-config-toolbar-text" value="yes">
-				<$set name="tv-config-toolbar-class" value="tc-btn-invisible">
-					<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]] -[[$:/core/ui/Buttons/more-tiddler-actions]]"
-						variable="listItem"
+		<$let tv-config-toolbar-icons="yes" tv-config-toolbar-text="yes" tv-config-toolbar-class="tc-btn-invisible">
+			<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]] -[[$:/core/ui/Buttons/more-tiddler-actions]]"
+				variable="listItem"
+			>
+				<$reveal type="match" state=`$:/config/ViewToolbarButtons/Visibility/$(listItem)$` text="hide">
+					<$set name="tv-config-toolbar-class"
+						filter="[<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]]"
 					>
-						<$reveal type="match" state=<<config-title>> text="hide">
-							<$set name="tv-config-toolbar-class"
-								filter="[<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]]"
-							>
-								<$transclude tiddler=<<listItem>> mode="inline"/>
-							</$set>
-						</$reveal>
-					</$list>
-				</$set>
-			</$set>
-		</$set>
+						<$transclude tiddler=<<listItem>> mode="inline"/>
+					</$set>
+				</$reveal>
+			</$list>
+		</$let>
 	</div>
 </$reveal>
\ No newline at end of file
diff --git a/core/ui/ViewToolbar/new-here.tid b/core/ui/ViewToolbar/new-here.tid
index 31e8e4158..15afe2628 100644
--- a/core/ui/ViewToolbar/new-here.tid
+++ b/core/ui/ViewToolbar/new-here.tid
@@ -4,23 +4,21 @@ caption: {{$:/core/images/new-here-button}} {{$:/language/Buttons/NewHere/Captio
 description: {{$:/language/Buttons/NewHere/Hint}}
 
 \whitespace trim
-\define newHereActions()
-\whitespace trim
+\procedure newHereActions()
 <$set name="tags" filter="[<currentTiddler>] [enlist{$:/config/NewTiddler/Tags}]">
 <$action-sendmessage $message="tm-new-tiddler" tags=<<tags>>/>
 </$set>
 \end
-\define newHereButton()
-\whitespace trim
+\procedure newHereButton()
 <$button actions=<<newHereActions>> tooltip={{$:/language/Buttons/NewHere/Hint}} aria-label={{$:/language/Buttons/NewHere/Caption}} class=<<tv-config-toolbar-class>>>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/new-here-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/language/Buttons/NewHere/Caption}}/>
 </span>
-</$list>
+<%endif%>
 </$button>
 \end
 <<newHereButton>>
diff --git a/core/ui/ViewToolbar/new-journal-here.tid b/core/ui/ViewToolbar/new-journal-here.tid
index b64ba7ed7..2df7a2a4e 100644
--- a/core/ui/ViewToolbar/new-journal-here.tid
+++ b/core/ui/ViewToolbar/new-journal-here.tid
@@ -4,29 +4,21 @@ caption: {{$:/core/images/new-journal-button}} {{$:/language/Buttons/NewJournalH
 description: {{$:/language/Buttons/NewJournalHere/Hint}}
 
 \whitespace trim
-\define journalButtonTags()
-[[$(currentTiddlerTag)$]] $(journalTags)$
-\end
-\define journalButton()
-\whitespace trim
+\procedure journalButton()
 <$button tooltip={{$:/language/Buttons/NewJournalHere/Hint}} aria-label={{$:/language/Buttons/NewJournalHere/Caption}} class=<<tv-config-toolbar-class>>>
-<$wikify name="journalTitle" text="""<$macrocall $name="now" format=<<journalTitleTemplate>>/>""">
-<$action-sendmessage $message="tm-new-tiddler" title=<<journalTitle>> tags=<<journalButtonTags>>/>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<$wikify name="journalTitle" text="""<$transclude $variable="now" format=<<journalTitleTemplate>>/>""">
+<$action-sendmessage $message="tm-new-tiddler" title=<<journalTitle>> tags=`[[$(currentTiddlerTag)$]] $(journalTags)$`/>
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/new-journal-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/language/Buttons/NewJournalHere/Caption}}/>
 </span>
-</$list>
+<%endif%>
 </$wikify>
 </$button>
 \end
-<$set name="journalTitleTemplate" value={{$:/config/NewJournal/Title}}>
-<$set name="journalTags" value={{$:/config/NewJournal/Tags}}>
-<$set name="currentTiddlerTag" value=<<currentTiddler>>>
+<$let journalTitleTemplate={{$:/config/NewJournal/Title}} journalTags={{$:/config/NewJournal/Tags}} currentTiddlerTag=<<currentTiddler>>>
 <<journalButton>>
-</$set>
-</$set>
-</$set>
+</$let>
diff --git a/core/ui/ViewToolbar/open-window.tid b/core/ui/ViewToolbar/open-window.tid
index d8ef85c83..24e2efcca 100644
--- a/core/ui/ViewToolbar/open-window.tid
+++ b/core/ui/ViewToolbar/open-window.tid
@@ -5,12 +5,12 @@ description: {{$:/language/Buttons/OpenWindow/Hint}}
 
 \whitespace trim
 <$button message="tm-open-window" tooltip={{$:/language/Buttons/OpenWindow/Hint}} aria-label={{$:/language/Buttons/OpenWindow/Caption}} class=<<tv-config-toolbar-class>>>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/open-window}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/language/Buttons/OpenWindow/Caption}}/>
 </span>
-</$list>
+<%endif%>
 </$button>
\ No newline at end of file
diff --git a/core/ui/ViewToolbar/permalink.tid b/core/ui/ViewToolbar/permalink.tid
index 5d0677eed..4e9868b43 100644
--- a/core/ui/ViewToolbar/permalink.tid
+++ b/core/ui/ViewToolbar/permalink.tid
@@ -5,12 +5,12 @@ description: {{$:/language/Buttons/Permalink/Hint}}
 
 \whitespace trim
 <$button message="tm-permalink" tooltip={{$:/language/Buttons/Permalink/Hint}} aria-label={{$:/language/Buttons/Permalink/Caption}} class=<<tv-config-toolbar-class>>>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/permalink-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/language/Buttons/Permalink/Caption}}/>
 </span>
-</$list>
+<%endif%>
 </$button>
\ No newline at end of file
diff --git a/core/ui/ViewToolbar/permaview.tid b/core/ui/ViewToolbar/permaview.tid
index 4a655b970..1ab129eed 100644
--- a/core/ui/ViewToolbar/permaview.tid
+++ b/core/ui/ViewToolbar/permaview.tid
@@ -5,12 +5,12 @@ description: {{$:/language/Buttons/Permaview/Hint}}
 
 \whitespace trim
 <$button message="tm-permaview" tooltip={{$:/language/Buttons/Permaview/Hint}} aria-label={{$:/language/Buttons/Permaview/Caption}} class=<<tv-config-toolbar-class>>>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/permaview-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/language/Buttons/Permaview/Caption}}/>
 </span>
-</$list>
+<%endif%>
 </$button>
\ No newline at end of file
diff --git a/core/wiki/allfields.tid b/core/wiki/allfields.tid
index f148640d4..8f59a317f 100644
--- a/core/wiki/allfields.tid
+++ b/core/wiki/allfields.tid
@@ -1,13 +1,30 @@
 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
 \whitespace trim
+
+\procedure lingo-base() $:/language/Docs/Fields/
+
+\function tf.getLingoText() [<lingo-base>] [<title>] +[join[]get[text]]
+
+\procedure renderfield(title)
+<tr class="tc-view-field">
+	<td class="tc-view-field-name">
+		''<$text text=<<title>>/>'':
+	</td>
+	<td class="tc-view-field-value">
+		//<<tf.getLingoText>>//
+	</td>
+	<td class="tc-view-field-list">
+		<$macrocall $name="show-filter-count" filter=`[has[$(title)$]sort[]]`>>
+	</td>
+</tr>
+\end
+
 <table class="tc-view-field-table">
-<tbody>
-<$list filter="[fields[]sort[title]]" variable="listItem">
-<$macrocall $name="renderfield" title=<<listItem>>/>
-</$list>
-</tbody>
+	<tbody>
+		<!-- <<renderfieldHeader>> -->
+		<$list filter="[fields[]sort[title]]" variable="listItem">
+			<$macrocall $name="renderfield" title=<<listItem>>/>
+		</$list>
+	</tbody>
 </table>
diff --git a/core/wiki/macros/export.tid b/core/wiki/macros/export.tid
index 3d0d14760..42d42a48a 100644
--- a/core/wiki/macros/export.tid
+++ b/core/wiki/macros/export.tid
@@ -7,27 +7,44 @@ $baseFilename$$(extension)$
 
 \define exportButton(exportFilter:"[!is[system]sort[title]]",lingoBase,baseFilename:"tiddlers")
 \whitespace trim
-<$vars hint={{{ [<__lingoBase__>addsuffix[Hint]get[text]] }}} caption={{{  [<__lingoBase__>addsuffix[Caption]get[text]] }}}>
-<span class="tc-popup-keep"><$button popup=<<qualify "$:/state/popup/export">> tooltip=<<hint>> aria-label=<<caption>> class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
-{{$:/core/images/export-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
-<span class="tc-btn-text"><$text text=<<caption>>/></span>
-</$list>
-</$button></span></$vars><$reveal state=<<qualify "$:/state/popup/export">> type="popup" position="below" animate="yes">
-<div class="tc-drop-down">
-<$set name="count" value={{{ [subfilter<__exportFilter__>count[]] }}}>
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/Exporter]]">
-<$list filter="[<currentTiddler>has[condition]subfilter{!!condition}limit[1]] ~[<currentTiddler>!has[condition]then[true]]" variable="ignore">
-<$button class="tc-btn-invisible">
-<$action-sendmessage $message="tm-download-file" $param=<<currentTiddler>> exportFilter=<<__exportFilter__>> filename={{{ [<__baseFilename__>addsuffix{!!extension}] }}}/>
-<$action-deletetiddler $tiddler=<<qualify "$:/state/popup/export">>/>
-<$transclude field="description"/>
-</$button>
-</$list>
-</$list>
-</$set>
-</div>
+<$vars hint={{{ [<__lingoBase__>addsuffix[Hint]get[text]] }}}
+	caption={{{  [<__lingoBase__>addsuffix[Caption]get[text]] }}}
+>
+	<span class="tc-popup-keep">
+		<$button popup=<<qualify "$:/state/popup/export">>
+			tooltip=<<hint>>
+			aria-label=<<caption>>
+			class=<<tv-config-toolbar-class>>
+			selectedClass="tc-selected"
+		>
+			<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+				{{$:/core/images/export-button}}
+			</$list>
+			<$list filter="[<tv-config-toolbar-text>match[yes]]">
+				<span class="tc-btn-text"><$text text=<<caption>>/></span>
+			</$list>
+		</$button>
+	</span>
+</$vars>
+<$reveal state=<<qualify "$:/state/popup/export">> type="popup" position="below" animate="yes">
+	<div class="tc-drop-down">
+		<$set name="count" value={{{ [subfilter<__exportFilter__>count[]] }}}>
+			<$list filter="[all[shadows+tiddlers]tag[$:/tags/Exporter]]">
+				<$list filter="[<currentTiddler>has[condition]subfilter{!!condition}limit[1]] ~[<currentTiddler>!has[condition]then[true]]"
+					variable="ignore"
+				>
+					<$button class="tc-btn-invisible">
+						<$action-sendmessage $message="tm-download-file"
+							$param=<<currentTiddler>>
+							exportFilter=<<__exportFilter__>>
+							filename={{{ [<__baseFilename__>addsuffix{!!extension}] }}}
+						/>
+						<$action-deletetiddler $tiddler=<<qualify "$:/state/popup/export">>/>
+						<$transclude field="description"/>
+					</$button>
+				</$list>
+			</$list>
+		</$set>
+	</div>
 </$reveal>
 \end
diff --git a/core/wiki/macros/show-filter-count.tid b/core/wiki/macros/show-filter-count.tid
new file mode 100644
index 000000000..be06fcde1
--- /dev/null
+++ b/core/wiki/macros/show-filter-count.tid
@@ -0,0 +1,17 @@
+title: $:/core/macros/show-filter-count
+tags: $:/tags/Macro $:/tags/Global
+
+\whitespace trim
+
+\procedure show-filter-count(filter)
+<$button class="tc-btn-invisible">
+	<$action-setfield $tiddler="$:/temp/advancedsearch" $value=<<filter>>/>
+	<$action-setfield $tiddler="$:/temp/advancedsearch/input" $value=<<filter>>/>
+	<$action-setfield $tiddler="$:/temp/advancedsearch/refresh" text="yes"/>
+	<$action-setfield $tiddler="$:/state/tab--1498284803" $value="$:/core/ui/AdvancedSearch/Filter"/>
+	<$action-navigate $to="$:/AdvancedSearch"/>
+	<$action-sendmessage $message="tm-focus-selector" $param=".tc-advanced-search input"/>
+	<span class="tc-small-gap-right">''<$count filter=<<filter>>/>''</span>
+	{{$:/core/images/advanced-search-button}}
+</$button>
+\end
\ No newline at end of file
diff --git a/core/wiki/macros/tag-picker.tid b/core/wiki/macros/tag-picker.tid
index 8bd3caf4e..4186f4138 100644
--- a/core/wiki/macros/tag-picker.tid
+++ b/core/wiki/macros/tag-picker.tid
@@ -31,11 +31,11 @@ second-search-filter: [subfilter<tagListFilter>is[system]search:title<userInput>
 \procedure add-tag-actions()
 <$let tag=<<_tf.getTag>> >
 	<$action-listops $tiddler=<<saveTiddler>> $field=<<tagField>> $subfilter='+[toggle<tag>trim[]]'/>
-	<% if [<tag>] :intersection[<saveTiddler>get<tagField>enlist-input[]] %>
+	<%if [<tag>] :intersection[<saveTiddler>get<tagField>enlist-input[]] %>
 		<!-- tag has been removed - do nothing -->
-	<% else %>
+	<%else%>
 		<<actions>>
-	<% endif %>
+	<%endif%>
 	<<delete-tag-state-tiddlers>>
 	<$action-setfield $tiddler=<<refreshTitle>> text="yes"/>
 </$let>
@@ -46,11 +46,11 @@ second-search-filter: [subfilter<tagListFilter>is[system]search:title<userInput>
 The second ESC tries to close the "draft tiddler"
 -->
 \procedure clear-tags-actions-inner()
-<% if [<storeTitle>has[text]] ~[<newTagNameTiddler>has[text]] %>
+<%if [<storeTitle>has[text]] ~[<newTagNameTiddler>has[text]] %>
 	<<delete-tag-state-tiddlers>>
-<% else %>
+<%else%>
 		<<cancel-delete-tiddler-actions "cancel">>
-<% endif %>
+<%endif%>
 \end
 
 <!-- triggered by keyboard only -->
@@ -83,6 +83,9 @@ The second ESC tries to close the "draft tiddler"
 		emptyMessage="<div class='tc-search-results'>{{$:/language/Search/Search/TooShort}}</div>" variable="listItem"
 	>
 		<$list filter=<<filter>> variable="tag">
+			<$list-empty>
+				<span class="tc-small-gap-left">{{$:/language/EditTemplate/Tags/EmptyMessage}}</span>
+			</$list-empty>
 			<!-- The buttonClasses filter is used to define tc-tag-button-selected state -->
 			<!-- tf.get-tagpicker-focus-selector has to be resolved for $:/core/ui/TagPickerTagTemplate,
 				othwerwise qualify in tf.tagpicker-dropdown-id causes problems -->
@@ -125,13 +128,13 @@ The second ESC tries to close the "draft tiddler"
 		>
 			{{$:/core/images/down-arrow}}
 		</$button>
-		<% if [<storeTitle>has[text]] %>
+		<%if [<storeTitle>has[text]] %>
 			<$button actions=<<delete-tag-state-tiddlers>> 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}}
 			</$button>
-		<% endif %>
+		<%endif%>
 		<span class="tc-add-tag-button tc-small-gap-left">
 			<$let tag=<<_tf.getTag>>>
 				<$button set=<<newTagNameTiddler>> actions=<<add-button-actions>> >
@@ -141,13 +144,13 @@ The second ESC tries to close the "draft tiddler"
 		</span>
 	</div>
 	<div class="tc-block-dropdown-wrapper">
-		<% if [<tf.tagpicker-dropdown-id>has[text]] %>
+		<%if [<tf.tagpicker-dropdown-id>has[text]] %>
 			<div class="tc-block-dropdown tc-block-tags-dropdown">
 				<$macrocall $name="tag-picker-listTags" filter=<<nonSystemTagsFilter>> suffix="-primaryList" />
 				<hr>
 				<$macrocall $name="tag-picker-listTags" filter=<<systemTagsFilter>> suffix="-secondaryList" />
 			</div>
-		<% endif %>
+		<%endif%>
 	</div>
 </div>
 \end
diff --git a/core/wiki/macros/tag.tid b/core/wiki/macros/tag.tid
index eedbd0c4c..2c539b42e 100644
--- a/core/wiki/macros/tag.tid
+++ b/core/wiki/macros/tag.tid
@@ -7,7 +7,7 @@ fill:$(foregroundColor)$;
 color:$(foregroundColor)$;
 \end
 
-<!-- This has no whitespace trim to avoid modifying $actions$. Closing tags omitted for brevity. -->
+<!-- This has no whitespace trim to avoid modifying $actions$ -->
 \define tag-pill-inner(tag,icon,colour,fallbackTarget,colourA,colourB,element-tag,element-attributes,actions)
 \whitespace trim
 <$let
diff --git a/core/wiki/tags/ViewTemplateBodyFilter.tid b/core/wiki/tags/ViewTemplateBodyFilter.tid
index 0143c1f88..c7510cb09 100644
--- a/core/wiki/tags/ViewTemplateBodyFilter.tid
+++ b/core/wiki/tags/ViewTemplateBodyFilter.tid
@@ -1,2 +1,2 @@
 title: $:/tags/ViewTemplateBodyFilter
-list: $:/config/ViewTemplateBodyFilters/testcase $:/config/ViewTemplateBodyFilters/hide-body $:/config/ViewTemplateBodyFilters/code-body $:/config/ViewTemplateBodyFilters/stylesheet $:/config/ViewTemplateBodyFilters/core-ui-advanced-search $:/config/ViewTemplateBodyFilters/core-ui-tags $:/config/ViewTemplateBodyFilters/system $:/config/ViewTemplateBodyFilters/import $:/config/ViewTemplateBodyFilters/plugin $:/config/ViewTemplateBodyFilters/default
\ No newline at end of file
+list: $:/config/ViewTemplateBodyFilters/testcase $:/config/ViewTemplateBodyFilters/hide-body $:/config/ViewTemplateBodyFilters/code-body $:/config/ViewTemplateBodyFilters/stylesheet $:/config/ViewTemplateBodyFilters/core-ui-advanced-search $:/config/ViewTemplateBodyFilters/core-ui-tags $:/config/ViewTemplateBodyFilters/import $:/config/ViewTemplateBodyFilters/plugin $:/config/ViewTemplateBodyFilters/system $:/config/ViewTemplateBodyFilters/default
diff --git a/editions/dev/tiddlers/system/version-macros.tid b/editions/dev/tiddlers/system/version-macros.tid
index 0fb7dcf12..205ac37a3 100644
--- a/editions/dev/tiddlers/system/version-macros.tid
+++ b/editions/dev/tiddlers/system/version-macros.tid
@@ -9,6 +9,6 @@ type: text/vnd.tiddlywiki
 <$link to={{{ [<__version__>addprefix[Release ]] }}} class="doc-from-version">{{$:/core/images/warning}} New in: <$text text=<<__version__>>/></$link>
 \end
 
-\define .deprecated-since(version, superseded:"TODO-Link")
-<$link to="Deprecated - What does it mean" class="doc-deprecated-version tc-btn-invisible">{{$:/core/images/warning}} Deprecated since: <$text text=<<__version__>>/></$link> (see <$link to=<<__superseded__>>><$text text=<<__superseded__>>/></$link>)
+\define .deprecated-since(version, superseded:"")
+<$link to="Deprecated - What does it mean" class="doc-deprecated-version tc-btn-invisible">{{$:/core/images/warning}} Deprecated from v<$text text=<<__version__>>/></$link> <%if [<__superseded__>else[]!match[]] %>(see <$link to=<<__superseded__>>><$text text=<<__superseded__>>/></$link>)<%endif%>
 \end
diff --git a/editions/fr-FR/tiddlers/$__editions_tw5.com_version-macros.tid b/editions/fr-FR/tiddlers/$__editions_tw5.com_version-macros.tid
index 873ad42ed..dd36a0979 100644
--- a/editions/fr-FR/tiddlers/$__editions_tw5.com_version-macros.tid
+++ b/editions/fr-FR/tiddlers/$__editions_tw5.com_version-macros.tid
@@ -9,7 +9,7 @@ type: text/vnd.tiddlywiki
 \end
 
 \define .deprecated-since(version, superseded:"TODO-Link")
-<$button to="Deprecated - What does it mean" class="doc-deprecated-version tc-btn-invisible">{{$:/core/images/warning}} Obsolète depuis<<:>> $version$ </$button>. Utilisez [[$superseded$]] à la place
+<$button to="Deprecated - What does it mean" class="doc-deprecated-version tc-btn-invisible">{{$:/core/images/warning}} Obsolète depuis<<:>> $version$ </$button>. <%if [<__superseded__>else[]!match[]] %>Utilisez [[$superseded$]] à la place<%endif%>
 \end
 
 <pre><$view field="text"/></pre>
\ No newline at end of file
diff --git a/editions/full/tiddlywiki.info b/editions/full/tiddlywiki.info
index 130d61dfe..b12834645 100644
--- a/editions/full/tiddlywiki.info
+++ b/editions/full/tiddlywiki.info
@@ -57,7 +57,8 @@
 		"sl-SI",
 		"sv-SE",
 		"zh-Hans",
-		"zh-Hant"
+		"zh-Hant",
+		"zh-HK"
 	],
 	"themes": [
 		"tiddlywiki/centralised",
diff --git a/editions/pluginlibrary/tiddlers/GettingStarted.tid b/editions/pluginlibrary/tiddlers/GettingStarted.tid
index 53c35cf11..3ab0fe415 100644
--- a/editions/pluginlibrary/tiddlers/GettingStarted.tid
+++ b/editions/pluginlibrary/tiddlers/GettingStarted.tid
@@ -15,8 +15,8 @@ Import the configuration tiddler: $:/config/LocalPluginLibrary to your "test wik
 The following commands will create the library files and start a test server at http://localhost:8888
 
 ```
-cd /your/path/to/TiddlyWiki5/editions/pluginlibrary
-tiddlywiki --build test-server
+cd /your/path/to/TiddlyWiki5
+node ./tiddlywiki.js ./editions/pluginlibrary --build test-server
 ```
 
 !! Test the Library with a Single File Wiki
diff --git a/editions/pluginlibrary/tiddlywiki.info b/editions/pluginlibrary/tiddlywiki.info
index ba18ff0a2..cf6df6f8b 100644
--- a/editions/pluginlibrary/tiddlywiki.info
+++ b/editions/pluginlibrary/tiddlywiki.info
@@ -11,7 +11,7 @@
 	],
 	"build": {
 		"test-server": [
-			"--output", "./files/local/library/tmp",
+			"--output", "./editions/pluginlibrary/files/local/library/tmp",
 			"--build", "library",
 			"--listen", "port=8888"
 		],
diff --git a/editions/prerelease/tiddlers/Release 5.3.6.tid b/editions/prerelease/tiddlers/Release 5.3.6.tid
index b18d56483..1d2c9b8b8 100644
--- a/editions/prerelease/tiddlers/Release 5.3.6.tid	
+++ b/editions/prerelease/tiddlers/Release 5.3.6.tid	
@@ -1,6 +1,6 @@
 caption: 5.3.6
-created: 20240710120027897
-modified: 20240710120027897
+created: 20240830144941926
+modified: 20240830144941926
 tags: ReleaseNotes
 title: Release 5.3.6
 type: text/vnd.tiddlywiki
@@ -12,20 +12,40 @@ description: Under development
 
 ! Translation improvements
 
+<<.link-badge-added "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8531">> support for new language "Chinese (Hong Kong)"
+
 This release includes improvements to the following translations:
 
-* 
+* Chinese
 
 ! Plugin Improvements
 
 !! Geospatial Plugin
 
 * <<.link-badge-added "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8404">> support for custom wikitext popups to be attached to map features
+* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8437">> ordering of latitude and longitude in geospatial operators
+* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8484">> crash when geomap contains an empty geolayer widget
 
 !! Markdown Plugin
 
 * <<.link-badge-added "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8395">> strikethrough, superscript and subscript editor toolbar buttons
 * <<.link-badge-improved "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8402">> readability of Markdown links to other tiddlers
+* <<.link-badge-added "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8459">> image toolbar dropdown to editor toolbar
+* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8492">> colour for target footnote background
+* <<.link-badge-added "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8585">> settings tab
+* <<.link-badge-added "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8498">> support for the excision tool
+
+! TestCaseWidget and Related Improvements
+
+This release includes several fixes and improvements to the TestCaseWidget, its default template, and the related DataWidget and CompoundTiddlers format. These features were first introduced in [[Release 5.3.4]] and are undergoing continuous improvement as we work on integrating them more widely across the system.
+
+* <<.link-badge-added "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8447">> new `$compound-filter` attribute for the DataWidget that allows other compound tiddlers to be imported. There is also a companion ''import-compound'' field for the TestCaseWidget template
+* <<.link-badge-improved "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8514">> the TestCaseWidget default template to make it more modular
+* <<.link-badge-added "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8499">> support for an ''import'' field in TestCaseTiddlers, allowing additional tiddlers to be imported
+* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8416">> [[TestCaseWidget]] default template to allow wikitext within the test case narrative
+* <<.link-badge-added "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8449">> WikiText formatting buttons when editing CompoundTiddlers
+* <<.link-badge-added "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8450">> CompoundTiddlers type `text/vnd.tiddlywiki-multiple` to the editor type dropdown
+* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8409">> filesystem handling so that CompoundTiddlers are saved as .tid files
 
 ! Widget Improvements
 
@@ -37,11 +57,28 @@ This release includes improvements to the following translations:
 
 ! Usability Improvements
 
+* <<.link-badge-improved "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8530">> language descriptions by localising them
 * <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8407">> the contrast of plugin stability badges on hover
+* <<.link-badge-added "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8430">> a "copy to clipboard" button to the view template body template used for code tiddlers
+* <<.link-badge-added "github.com/TiddlyWiki/TiddlyWiki5/pull/8441">> support for social media cards to be added to TiddlyWiki
+* <<.link-badge-added "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8518">> type attribute to input fields in control panel, allowing virtual keyboards to switch to the proper one when editing settings
+* <<.link-badge-added "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8558">> empty message to tag picker, search dropdown and advanced search
+* <<.link-badge-added "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8157">> a search button to the control panel tiddler fields tab
+* <<.link-badge-improved "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8323">> (and <<.link-badge-here "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8324">>) the view and edit toolbars with more descriptive Aria labels
 
 ! Hackability Improvements
 
-* 
+* <<.link-badge-added "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8431">> support for the HTML entity `&NoBreak;` which can be useful for joining HTML elements without an unwanted linebreak
+* <<.link-badge-added "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8439">> a keyboard shortcut for opening the control panel (by default it is <kbd>ctrl</kbd>-<kbd>alt</kbd>-<kbd>C</kbd>)
+* <<.link-badge-added "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8182">> new [[Hidden Setting: Tag Pill Drag Filter]] that allows configuration of the tiddlers that are transferred when dragging a tag pill
+* <<.link-badge-added "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8384">> tests to ensure that the syntax elements `{% %}` and `{= =}` are reserved for external tooling, and will never be recognised by TiddlyWiki itself
+* <<.link-badge-added "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8462">> new cascades for the view template subtitle and tags
+* <<.link-badge-improved "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8500">> excision tool implementation to make the excision tiddler title translatable
+* <<.link-badge-improved "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8584">> editor toolbar buttons to use the new [[Conditional Shortcut Syntax]]
+* <<.link-badge-improved "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8579">> page control toolbar buttons to use the new [[Conditional Shortcut Syntax]]
+* <<.link-badge-improved "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8559">> [[WidgetMessage: tm-new-tiddler]] to allow tiddlers to be created with no tags field
+* <<.link-badge-added "https://github.com/TiddlyWiki/TiddlyWiki5/pull/7941">> ''startCount'' parameter to [[unusedtitle Macro]]
+* <<.link-badge-added "https://github.com/TiddlyWiki/TiddlyWiki5/pull/7944">> trimSelection parameter to [[WidgetMessage: tm-edit-text-operation]]
 
 ! Bug Fixes
 
@@ -49,28 +86,55 @@ This release includes improvements to the following translations:
 * <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8393">> crash when [[WidgetMessage: tm-copy-to-clipboard]] is passed an empty string
 * <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8399">> disengage "select all" when cancelling an import
 * <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8382">> [[transcludes Operator]] and [[backtranscludes Operator]] minor issue with transclusions made via a filtered attribute
-* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8416">> [[TestCaseWidget]] default template to allow wikitext within the test case narrative
+* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/discussions/8428">> scroll top position when animation duration is zero
+* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8476">> importing $:/build tiddler when upgrading to avoid overwriting it
+* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/commit/d9ac4a823fe0f91c615ed33fa890069f88cc8ab9">> crash with RenderCommand when filename filter returns empty result
+* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8355">> display of language plugins
+* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8540">> (and <<.link-badge-here "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8546">>) display of non-square plugin icons
+* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8517">> appearance of input elements other than type `text` and `search`
+* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/commit/38081b86c97a795420515156fcd52177574be516">> crash with filesystem adaptor if the wiki folder is missing
+* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8413">> unwrapped oveflowed code blocks not showing scroll bars when setting "Wrap long lines in code blocks" to "No" in "Theme tweaks"
+* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/7317">> (and <<.link-badge-here "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8552">>) search input box outline in Chrome-like browsers
+* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8578">> problem with rapid typing in the advanced search filter tab
+* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8535">> crash with EditionsCommand if an edition directory does not have a [[tiddlywiki.info file|tiddlywiki.info Files]]
+* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/commit/b8fb9e6b21319e790e9aa7453ca265b0ed4898db">> DataWidget to allow title fields to be overwritten
+* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/commit/fa423e508ff5012423a1904bb17c9d61848732ee">> "Put Saver" to correctly interpret HTTP response codes
+* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8547">> invalid accept header in "Put Saver" 
+* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8485">> duplicated search results in advanced search when more than one tiddlers are tagged with [[SystemTag: $:/tags/SearchResults]]
+* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/commit/7dfdbae812306875bac2445ca4ee505b406e3be1">> crash if the KeyboardWidget is used within a [[startup action|StartupActions]]
+* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8574">> suffix in the [[encodebase64 Operator]] and [[decodebase64 Operator]]
+* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8557">> overflow of floated elements
 
 ! Node.js Improvements
 
-* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8409">> filesystem handling so that [[Compound Tiddlers]] are saved as .tid files
+* <<.link-badge-fixed "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8339">> server crash when authenticating if newlines are contained in the site title
 
 ! Developer Improvements
 
-* 
+* <<.link-badge-improved "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8423">> the browser checks used in $:/boot/bootprefix.js
+* <<.link-badge-extended "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8494">> parse tree format to add `start`/`end` properties to table row and cell elements
+* <<.link-badge-improved "https://github.com/TiddlyWiki/TiddlyWiki5/pull/8265">> and simplified plugin library edition usage
 
 ! Acknowledgements
 
 [[@Jermolene|https://github.com/Jermolene]] would like to thank the contributors to this release who have generously given their time to help improve TiddlyWiki:
 
 <<.contributors """
+BramChen
 btheado
 flibbles
+hoelzro
 kookma
 Leilei332
+linonetwo
+michaeljmcd
 pmario
+PotOfCoffee2Go
 saqimtiaz
 simonbaird
 springerspandrel
+twMat
+valpackett
 webplusai
+wolfsprite
 """>>
diff --git a/editions/test/tiddlers/tests/data/conditionals/Basic.tid b/editions/test/tiddlers/tests/data/conditionals/Basic.tid
index ff2d2df4d..6e5046f56 100644
--- a/editions/test/tiddlers/tests/data/conditionals/Basic.tid
+++ b/editions/test/tiddlers/tests/data/conditionals/Basic.tid
@@ -5,7 +5,7 @@ tags: [[$:/tags/wiki-test-spec]]
 
 title: Text
 
-This is a <% if [<something>match[one]] %>Elephant<% endif %>, I think.
+This is a <%if [<something>match[one]] %>Elephant<%endif%>, I think.
 +
 title: Output
 
diff --git a/editions/test/tiddlers/tests/data/conditionals/BlockMode.tid b/editions/test/tiddlers/tests/data/conditionals/BlockMode.tid
index 45233baa4..c41b34563 100644
--- a/editions/test/tiddlers/tests/data/conditionals/BlockMode.tid
+++ b/editions/test/tiddlers/tests/data/conditionals/BlockMode.tid
@@ -6,23 +6,23 @@ tags: [[$:/tags/wiki-test-spec]]
 title: Output
 
 \procedure test(animal)
-<% if [<animal>match[Elephant]] %>
+<%if [<animal>match[Elephant]] %>
 
 ! It is an elephant
 
-<% else %>
+<%else%>
 
-<% if [<animal>match[Giraffe]] %>
+<%if [<animal>match[Giraffe]] %>
 
 ! It is a giraffe
 
-<% else %>
+<%else%>
 
 ! It is completely unknown
 
-<% endif %>
+<%endif%>
 
-<% endif %>
+<%endif%>
 
 \end
 
diff --git a/editions/test/tiddlers/tests/data/conditionals/Else.tid b/editions/test/tiddlers/tests/data/conditionals/Else.tid
index 7bc32b34e..ef42f198c 100644
--- a/editions/test/tiddlers/tests/data/conditionals/Else.tid
+++ b/editions/test/tiddlers/tests/data/conditionals/Else.tid
@@ -5,7 +5,7 @@ tags: [[$:/tags/wiki-test-spec]]
 
 title: Text
 
-This is a <% if [<something>match[one]] %>Elephant<% else %>Crocodile<% endif %>, I think.
+This is a <%if [<something>match[one]] %>Elephant<%else%>Crocodile<%endif%>, I think.
 +
 title: Output
 
diff --git a/editions/test/tiddlers/tests/data/conditionals/Elseif.tid b/editions/test/tiddlers/tests/data/conditionals/Elseif.tid
index d37f3380c..068ac31c9 100644
--- a/editions/test/tiddlers/tests/data/conditionals/Elseif.tid
+++ b/editions/test/tiddlers/tests/data/conditionals/Elseif.tid
@@ -5,7 +5,7 @@ tags: [[$:/tags/wiki-test-spec]]
 
 title: Text
 
-This is a <% if [<something>match[one]] %>Elephant<% elseif [<something>match[two]] %>Antelope<% else %>Crocodile<% endif %>, I think.
+This is a <%if [<something>match[one]] %>Elephant<%elseif [<something>match[two]] %>Antelope<%else%>Crocodile<%endif%>, I think.
 +
 title: Output
 
diff --git a/editions/test/tiddlers/tests/data/conditionals/MissingEndIf.tid b/editions/test/tiddlers/tests/data/conditionals/MissingEndIf.tid
index cacaf9869..ff01ca959 100644
--- a/editions/test/tiddlers/tests/data/conditionals/MissingEndIf.tid
+++ b/editions/test/tiddlers/tests/data/conditionals/MissingEndIf.tid
@@ -5,7 +5,7 @@ tags: [[$:/tags/wiki-test-spec]]
 
 title: Text
 
-This is a <% if [<something>match[one]] %>Elephant
+This is a <%if [<something>match[one]] %>Elephant
 +
 title: Output
 
diff --git a/editions/test/tiddlers/tests/data/conditionals/MultipleResults.tid b/editions/test/tiddlers/tests/data/conditionals/MultipleResults.tid
index baa966ed5..866c6d8f5 100644
--- a/editions/test/tiddlers/tests/data/conditionals/MultipleResults.tid
+++ b/editions/test/tiddlers/tests/data/conditionals/MultipleResults.tid
@@ -5,7 +5,7 @@ tags: [[$:/tags/wiki-test-spec]]
 
 title: Output
 
-This is a <% if 1 2 3 4 5 6 %>Elephant<% endif %>, I think.
+This is a <%if 1 2 3 4 5 6 %>Elephant<%endif%>, I think.
 +
 title: ExpectedResult
 
diff --git a/editions/test/tiddlers/tests/data/conditionals/Nested.tid b/editions/test/tiddlers/tests/data/conditionals/Nested.tid
index dffa791fc..e5ea9fc40 100644
--- a/editions/test/tiddlers/tests/data/conditionals/Nested.tid
+++ b/editions/test/tiddlers/tests/data/conditionals/Nested.tid
@@ -6,15 +6,15 @@ tags: [[$:/tags/wiki-test-spec]]
 title: Output
 
 \procedure test(animal)
-<% if [<animal>match[Elephant]] %>
+<%if [<animal>match[Elephant]] %>
 It is an elephant
-<% else %>
-<% if [<animal>match[Giraffe]] %>
+<%else%>
+<%if [<animal>match[Giraffe]] %>
 It is a giraffe
-<% else %>
+<%else%>
 It is completely unknown
-<% endif %>
-<% endif %>
+<%endif%>
+<%endif%>
 \end
 
 <<test "Giraffe">>
diff --git a/editions/test/tiddlers/tests/data/conditionals/NestedElseif.tid b/editions/test/tiddlers/tests/data/conditionals/NestedElseif.tid
index 6fba8cac8..bfc3e085c 100644
--- a/editions/test/tiddlers/tests/data/conditionals/NestedElseif.tid
+++ b/editions/test/tiddlers/tests/data/conditionals/NestedElseif.tid
@@ -7,20 +7,20 @@ title: Text
 
 \whitespace trim
 This is a&#32;
-	<% if [<something>match[one]] %>
-		<% if [<another>match[one]] %>
+	<%if [<something>match[one]] %>
+		<%if [<another>match[one]] %>
 			Indian
-		<% elseif [<another>match[two]] %>
+		<%elseif [<another>match[two]] %>
 			African
-		<% else %>
+		<%else%>
 			Unknown
-		<% endif %>
+		<%endif%>
 		&#32;Elephant
-	<% elseif [<something>match[two]] %>
+	<%elseif [<something>match[two]] %>
 		Antelope
-	<% else %>
+	<%else%>
 		Crocodile
-	<% endif %>
+	<%endif%>
 , I think.
 +
 title: Output
diff --git a/editions/test/tiddlers/tests/data/data-widget/ImportCustomTitle.tid b/editions/test/tiddlers/tests/data/data-widget/ImportCustomTitle.tid
new file mode 100644
index 000000000..34029ae32
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/data-widget/ImportCustomTitle.tid
@@ -0,0 +1,23 @@
+title: Data/ImportCustomTitle
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+description: Importing a payload tiddler and overwriting the title
+
+title: Description
+text: Importing a payload tiddler and overwriting the title
++
+title: Output
+
+\whitespace trim
+<$testcase template="$:/core/ui/testcases/RawJSONTemplate">
+<$data $tiddler="HelloThere" title="RealTitle"/>
+</$testcase>
++
+title: HelloThere
+tags: Definitions
+
+This is the tiddler HelloThere
++
+title: ExpectedResult
+
+<p><div><div>[{"title":"RealTitle","tags":"Definitions","text":"This is the tiddler HelloThere"}]</div></div></p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/macros/unusedtitle/basic-params.tid b/editions/test/tiddlers/tests/data/macros/unusedtitle/basic-params.tid
index 5e1ae482d..c0ec65ec0 100644
--- a/editions/test/tiddlers/tests/data/macros/unusedtitle/basic-params.tid
+++ b/editions/test/tiddlers/tests/data/macros/unusedtitle/basic-params.tid
@@ -14,7 +14,15 @@ title: Output
 
 <<unusedtitle baseName:"About" separator:"-">>
 
+<!-- v5.3.6 startCount -->
+
+<<unusedtitle startCount:"3">>
+
+<<unusedtitle startCount:"-1" baseName:"invalid start">>
+
+<<unusedtitle startCount:"aaa" baseName:"invalid count">>
+
 +
 title: ExpectedResult
 
-<p>New Tiddler</p><p>New Tiddler</p><p>anotherBase</p><p>About</p>
\ No newline at end of file
+<p>New Tiddler</p><p>New Tiddler</p><p>anotherBase</p><p>About</p><p>New Tiddler 3</p><p>invalid start</p><p>invalid count</p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/macros/unusedtitle/template-startCount.tid b/editions/test/tiddlers/tests/data/macros/unusedtitle/template-startCount.tid
new file mode 100644
index 000000000..83fc1686b
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/macros/unusedtitle/template-startCount.tid
@@ -0,0 +1,27 @@
+title: Macros/unusedtitle/template-startCount
+description: test <<unusedtitle>> with templates and startCount
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+<!-- test template basics -->
+
+<<unusedtitle template:"$basename$$separator$$count$xx" >>
+
+<<unusedtitle template:"$basename$$separator$$count$xx" startCount:"4" >>
+
+<<unusedtitle template:"$basename$$separator$$count:1$xx" startCount:"11">>
+
+<!-- test parameter edgecases -->
+
+<<unusedtitle template:"$basename$$separator$$count:2$xx" startCount:"" baseName:"emptyCount">>
+
+<<unusedtitle template:"$basename$$separator$$count$xx" startCount:"-1" separator:"" baseName:"invalid start" >>
+
+<<unusedtitle template:"$basename$$separator$$count$xx" startCount:"bbb" separator:"" baseName:"invalid count" >>
+
++
+title: ExpectedResult
+
+<p>New Tiddler 0xx</p><p>New Tiddler 4xx</p><p>New Tiddler 11xx</p><p>emptyCount 00xx</p><p>invalid start 0xx</p><p>invalid count 0xx</p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/macros/unusedtitle/template.tid b/editions/test/tiddlers/tests/data/macros/unusedtitle/template.tid
index 66bd0f763..183ad42da 100644
--- a/editions/test/tiddlers/tests/data/macros/unusedtitle/template.tid
+++ b/editions/test/tiddlers/tests/data/macros/unusedtitle/template.tid
@@ -25,4 +25,4 @@ title: Output
 +
 title: ExpectedResult
 
-<p>New Tiddler</p><p>count-missing</p><p>00-new</p><p>00-base</p><p>00-New Tiddler</p><p>00-asdf</p><p>00 asdf</p>
\ No newline at end of file
+<p>New Tiddler</p><p>count-missing0</p><p>00-new</p><p>00-base</p><p>00-New Tiddler</p><p>00-asdf</p><p>00 asdf</p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/create-a-new-tiddler-with-a-tag.tid b/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/create-a-new-tiddler-with-a-tag.tid
new file mode 100644
index 000000000..3f9204da8
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/create-a-new-tiddler-with-a-tag.tid
@@ -0,0 +1,38 @@
+title: Message/tm-new-tiddler/create-a-new-tiddler-with-a-tag
+description: tm-new-tiddler message will create a new draft tiddler with a tag
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+<pre>{{Draft of 'New Tiddler'||output-template}}</pre>
++
+title: Actions
+
+<$navigator story="$:/StoryList">
+
+<$action-sendmessage $message="tm-new-tiddler"
+	text="some text"
+	z-field="a"
+	tags="test [[with spaces]]"
+/>
+
+</$navigator>
+
++
+title: output-template
+
+<!-- This template is used for saving tiddlers in TiddlyWeb *.tid format -->
+<$fields exclude='text bag created modified' template='$name$: $value$
+'></$fields>
+<$view field="text" format="text" />
++
+title: ExpectedResult
+
+<p><pre>draft.of: New Tiddler
+draft.title: New Tiddler
+tags: test [[with spaces]]
+title: Draft of 'New Tiddler'
+z-field: a
+
+some text</pre></p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/default.tid b/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/default.tid
new file mode 100644
index 000000000..cba16f261
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/default.tid
@@ -0,0 +1,39 @@
+title: Message/tm-new-tiddler/default
+description: tm-new-tiddler message will create a new draft tiddler
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+<pre>{{Draft of 'New Tiddler'||output-template}}</pre>
++
+title: Actions
+
+<$navigator story="$:/StoryList">
+
+New in TW v5.3.6
+	Create a draft tiddler which should have __no__ tags field
+
+<$action-sendmessage $message="tm-new-tiddler"
+	text="some text"
+	z-field="a"
+/>
+
+</$navigator>
+
++
+title: output-template
+
+<!-- This template is used for saving tiddlers in TiddlyWeb *.tid format -->
+<$fields exclude='text bag created modified' template='$name$: $value$
+'></$fields>
+<$view field="text" format="text" />
++
+title: ExpectedResult
+
+<p><pre>draft.of: New Tiddler
+draft.title: New Tiddler
+title: Draft of 'New Tiddler'
+z-field: a
+
+some text</pre></p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/new-from-template-with-tag.tid b/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/new-from-template-with-tag.tid
new file mode 100644
index 000000000..aceeffdde
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/new-from-template-with-tag.tid
@@ -0,0 +1,44 @@
+title: Message/tm-new-tiddler/new-from-template-with-tag
+description: tm-new-tiddler create a draft from a template. Template has an empty tags field
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+<pre>{{	Draft of 'new-tiddler-template 1'||output-template}}</pre>
++
+title: Actions
+
+<$navigator story="$:/StoryList">
+
+<$action-sendmessage $message="tm-new-tiddler"
+	$param="new-tiddler-template"
+	text="some text"
+	z-field="a"
+/>
+
+</$navigator>
+
++
+title: new-tiddler-template
+asdf: asdf
+tags:
+
++
+title: output-template
+
+<!-- This template is used for saving tiddlers in TiddlyWeb *.tid format -->
+<$fields exclude='text bag created modified' template='$name$: $value$
+'></$fields>
+<$view field="text" format="text" />
++
+title: ExpectedResult
+
+<p><pre>asdf: asdf
+draft.of: new-tiddler-template 1
+draft.title: new-tiddler-template 1
+tags: 
+title: Draft of 'new-tiddler-template 1'
+z-field: a
+
+some text</pre></p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/new-from-template-without-tag.tid b/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/new-from-template-without-tag.tid
new file mode 100644
index 000000000..dfb815f09
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/new-from-template-without-tag.tid
@@ -0,0 +1,65 @@
+title: Message/tm-new-tiddler/new-from-template-without-tag
+description: tm-new-tiddler create 2 drafts from a template. Template has no tags field
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+<pre>{{	Draft of 'new-tiddler-template 1'||output-template}}</pre>
+<pre>{{	Draft of 'new-tiddler-template 2'||output-template}}</pre>
++
+title: Actions
+
+<$navigator story="$:/StoryList">
+
+New in TW v5.3.6
+	Create a new tiddler from a template, which has no tags field
+	So draft should also have __no__ tags field
+
+<$action-sendmessage $message="tm-new-tiddler"
+	$param="new-tiddler-template"
+	text="some text"
+	z-field="a"
+/>
+
+Create a new tiddler from a template, which has no tag field
+AND __add__ a tags field with the command below
+
+<$action-sendmessage $message="tm-new-tiddler"
+	$param="new-tiddler-template"
+	text="some text"
+	z-field="a"
+	tag=""
+/>
+
+</$navigator>
+
++
+title: new-tiddler-template
+asdf: asdf
+
++
+title: output-template
+
+<!-- This template is used for saving tiddlers in TiddlyWeb *.tid format -->
+<$fields exclude='text bag created modified' template='$name$: $value$
+'></$fields>
+<$view field="text" format="text" />
++
+title: ExpectedResult
+
+<p><pre>asdf: asdf
+draft.of: new-tiddler-template 1
+draft.title: new-tiddler-template 1
+title: Draft of 'new-tiddler-template 1'
+z-field: a
+
+some text</pre>
+<pre>asdf: asdf
+draft.of: new-tiddler-template 2
+draft.title: new-tiddler-template 2
+tag: 
+title: Draft of 'new-tiddler-template 2'
+z-field: a
+
+some text</pre></p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/new-with-tag.tid b/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/new-with-tag.tid
new file mode 100644
index 000000000..9b52e7de1
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/messages/tm-new-tiddler/new-with-tag.tid
@@ -0,0 +1,40 @@
+title: Message/tm-new-tiddler/new-with-tag
+description: tm-new-tiddler message creates a draft tiddler with an empty tag field
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+<pre>{{Draft of 'New Tiddler'||output-template}}</pre>
++
+title: Actions
+
+<$navigator story="$:/StoryList">
+
+Create a draft tiddler which __should have a tags field__
+
+<$action-sendmessage $message="tm-new-tiddler"
+	text="some text"
+	z-field="a"
+	tag=""
+/>
+
+</$navigator>
+
++
+title: output-template
+
+<!-- This template is used for saving tiddlers in TiddlyWeb *.tid format -->
+<$fields exclude='text bag created modified' template='$name$: $value$
+'></$fields>
+<$view field="text" format="text" />
++
+title: ExpectedResult
+
+<p><pre>draft.of: New Tiddler
+draft.title: New Tiddler
+tag: 
+title: Draft of 'New Tiddler'
+z-field: a
+
+some text</pre></p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/tabs-macro/expected-html-tabs-horizontal-all.tid b/editions/test/tiddlers/tests/data/tabs-macro/expected-html-tabs-horizontal-all.tid
deleted file mode 100644
index 61f8d4971..000000000
--- a/editions/test/tiddlers/tests/data/tabs-macro/expected-html-tabs-horizontal-all.tid
+++ /dev/null
@@ -1,5 +0,0 @@
-title: expected-html-tabs-horizontal-all
-type: text/html
-description: Horizontal tabs with all parameters active. This is the expected HTML output from a test in test-wikitext-tabs-macro.js
-
-<p><div class="tc-tab-set "><div class="tc-tab-buttons "><button class="" role="switch">t 1</button><button aria-checked="true" class=" tc-tab-selected" role="switch">t 2</button><button class="" role="switch">desc</button><button class="" role="switch">TabFour</button></div><div class="tc-tab-divider "></div><div class="tc-tab-content "><div class=" tc-reveal" hidden="true"></div><div class=" tc-reveal"><h2 class=""><a class="tc-tiddlylink tc-tiddlylink-resolves" href="#TabTwo">TabTwo</a></h2><p><p>Text tab 2</p></p></div><div class=" tc-reveal" hidden="true"></div><div class=" tc-reveal" hidden="true"></div></div></div></p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/tabs-macro/expected-html-tabs-horizontal.tid b/editions/test/tiddlers/tests/data/tabs-macro/expected-html-tabs-horizontal.tid
deleted file mode 100644
index 0d1f2a416..000000000
--- a/editions/test/tiddlers/tests/data/tabs-macro/expected-html-tabs-horizontal.tid
+++ /dev/null
@@ -1,5 +0,0 @@
-title: expected-html-tabs-horizontal
-type: text/html
-description: Horizontal tabs test - This is the expected HTML output from a test in test-wikitext-tabs-macro.js
-
-<p><div class="tc-tab-set "><div class="tc-tab-buttons "><button class="" role="switch">t 1</button><button aria-checked="true" class=" tc-tab-selected" role="switch">t 2</button><button class="" role="switch">t 3</button><button class="" role="switch">TabFour</button></div><div class="tc-tab-divider "></div><div class="tc-tab-content "><div class=" tc-reveal" hidden="true"></div><div class=" tc-reveal"><p>Text tab 2</p></div><div class=" tc-reveal" hidden="true"></div><div class=" tc-reveal" hidden="true"></div></div></div></p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/tabs-macro/expected-html-tabs-vertical.tid b/editions/test/tiddlers/tests/data/tabs-macro/expected-html-tabs-vertical.tid
deleted file mode 100644
index c45891073..000000000
--- a/editions/test/tiddlers/tests/data/tabs-macro/expected-html-tabs-vertical.tid
+++ /dev/null
@@ -1,5 +0,0 @@
-title: expected-html-tabs-vertical
-type: text/html
-description: Vertical tabs test -- This is the expected HTML output from the test in test-wikitext-tabs-macro.js
-
-<p><div class="tc-tab-set tc-vertical"><div class="tc-tab-buttons tc-vertical"><button class="" role="switch">t 1</button><button aria-checked="true" class=" tc-tab-selected" role="switch">t 2</button><button class="" role="switch">t 3</button><button class="" role="switch">TabFour</button></div><div class="tc-tab-divider tc-vertical"></div><div class="tc-tab-content tc-vertical"><div class=" tc-reveal" hidden="true"></div><div class=" tc-reveal"><p>Text tab 2</p></div><div class=" tc-reveal" hidden="true"></div><div class=" tc-reveal" hidden="true"></div></div></div></p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/tabs-macro/expected-test-tabs-horizontal-a.tid b/editions/test/tiddlers/tests/data/tabs-macro/expected-test-tabs-horizontal-a.tid
new file mode 100644
index 000000000..1cb356182
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/tabs-macro/expected-test-tabs-horizontal-a.tid
@@ -0,0 +1,5 @@
+title: expected-test-tabs-horizontal-a
+type: text/html
+description: Horizontal tabs test - This is the expected HTML output from a test in test-wikitext-tabs-macro.js
+
+<p><div class="tc-tab-set "><div class="tc-tab-buttons "><button class="" data-tab-title="TabOne" role="switch">t 1</button><button aria-checked="true" class=" tc-tab-selected" data-tab-title="TabTwo" role="switch">t 2</button><button class="" data-tab-title="TabThree" role="switch">t 3</button><button class="" data-tab-title="TabFour" role="switch">TabFour</button></div><div class="tc-tab-divider "></div><div class="tc-tab-content "><div class=" tc-reveal" hidden="true"></div><div class=" tc-reveal"><p>Text tab 2</p></div><div class=" tc-reveal" hidden="true"></div><div class=" tc-reveal" hidden="true"></div></div></div></p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/tabs-macro/expected-test-tabs-horizontal-all.tid b/editions/test/tiddlers/tests/data/tabs-macro/expected-test-tabs-horizontal-all.tid
new file mode 100644
index 000000000..418510172
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/tabs-macro/expected-test-tabs-horizontal-all.tid
@@ -0,0 +1,5 @@
+title: expected-test-tabs-horizontal-all
+type: text/html
+description: Horizontal tabs with all parameters active. This is the expected HTML output from a test in test-wikitext-tabs-macro.js
+
+<p><div class="tc-tab-set "><div class="tc-tab-buttons "><button class="" data-tab-title="TabOne" role="switch">t 1</button><button aria-checked="true" class=" tc-tab-selected" data-tab-title="TabTwo" role="switch">t 2</button><button class="" data-tab-title="TabThree" role="switch">desc</button><button class="" data-tab-title="TabFour" role="switch">TabFour</button></div><div class="tc-tab-divider "></div><div class="tc-tab-content "><div class=" tc-reveal" hidden="true"></div><div class=" tc-reveal"><h2 class="">TabTwo</h2><p><p>Text tab 2</p></p></div><div class=" tc-reveal" hidden="true"></div><div class=" tc-reveal" hidden="true"></div></div></div></p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/data/tabs-macro/expected-test-tabs-vertical.tid b/editions/test/tiddlers/tests/data/tabs-macro/expected-test-tabs-vertical.tid
new file mode 100644
index 000000000..3f1f344f9
--- /dev/null
+++ b/editions/test/tiddlers/tests/data/tabs-macro/expected-test-tabs-vertical.tid
@@ -0,0 +1,5 @@
+title: expected-test-tabs-vertical
+type: text/html
+description: Vertical tabs test -- This is the expected HTML output from the test in test-wikitext-tabs-macro.js
+
+<p><div class="tc-tab-set tc-vertical"><div class="tc-tab-buttons tc-vertical"><button class="" data-tab-title="TabOne" role="switch">t 1</button><button aria-checked="true" class=" tc-tab-selected" data-tab-title="TabTwo" role="switch">t 2</button><button class="" data-tab-title="TabThree" role="switch">t 3</button><button class="" data-tab-title="TabFour" role="switch">TabFour</button></div><div class="tc-tab-divider tc-vertical"></div><div class="tc-tab-content tc-vertical"><div class=" tc-reveal" hidden="true"></div><div class=" tc-reveal"><p>Text tab 2</p></div><div class=" tc-reveal" hidden="true"></div><div class=" tc-reveal" hidden="true"></div></div></div></p>
\ No newline at end of file
diff --git a/editions/test/tiddlers/tests/test-wikitext-tabs-macro.js b/editions/test/tiddlers/tests/test-wikitext-tabs-macro.js
index 39f061d11..973f6fe66 100644
--- a/editions/test/tiddlers/tests/test-wikitext-tabs-macro.js
+++ b/editions/test/tiddlers/tests/test-wikitext-tabs-macro.js
@@ -1,7 +1,7 @@
 /*\
 title: test-wikitext-tabs-macro.js
 type: application/javascript
-tags: [[$:/tags/test-spec-disabled]]
+tags: [[$:/tags/test-spec]]
 
 Tests the core tabs macro by comparing the HTML output with a stored template.
 Intended to permit future readability improvements.
@@ -17,70 +17,67 @@ Adding new functionality will probably change the "expected" html structure.
 
 describe("Tabs-macro HTML tests", function() {
 
-	var expected     = $tw.wiki.getTiddler("expected-html-tabs-horizontal"),
-		expectedAll  = $tw.wiki.getTiddler("expected-html-tabs-horizontal-all"),
-		expectedVert = $tw.wiki.getTiddler("expected-html-tabs-vertical"),
+// This code can be copy pasted into the browser console for easy testing
+
+	// the expected tiddlers can be found at ./data/tabs-macro/
+	var expected     = $tw.wiki.getTiddler("expected-test-tabs-horizontal-a"),
+		expectedAll  = $tw.wiki.getTiddler("expected-test-tabs-horizontal-all"),
+		expectedVert = $tw.wiki.getTiddler("expected-test-tabs-vertical"),
 		coreTabsTiddler = $tw.wiki.getTiddler("$:/core/macros/tabs");
 
-	// Create a wiki
-	var wiki = new $tw.Wiki();
+	// Create a wiki with test tiddlers
 
 	// Add a couple of tiddlers
-	wiki.addTiddler({title: "TabOne",   text: "Text tab 1", caption:"t 1"});
-	wiki.addTiddler({title: "TabTwo",   text: "Text tab 2", caption:"t 2"});
+	$tw.wiki.addTiddler(new $tw.Tiddler({title: "TabOne",   text: "Text tab 1", caption:"t 1"},$tw.wiki.getModificationFields()));
+	$tw.wiki.addTiddler(new $tw.Tiddler({title: "TabTwo",   text: "Text tab 2", caption:"t 2"},$tw.wiki.getModificationFields()));
 	// TabThree shows description used in button-template instead of caption
-	wiki.addTiddler({title: "TabThree", text: "Text tab 3", caption:"t 3", description:"desc"});
+	$tw.wiki.addTiddler(new $tw.Tiddler({title: "TabThree", text: "Text tab 3", caption:"t 3", description:"desc"},$tw.wiki.getModificationFields()));
 	// Tab Four has no caption field, so title will be used
-	wiki.addTiddler({title: "TabFour",  text: "Text tab 4"}); 
+	$tw.wiki.addTiddler(new $tw.Tiddler({title: "TabFour",  text: "Text tab 4"},$tw.wiki.getModificationFields()));
 
 	// Template tiddlers
-	wiki.addTiddler({	title: "body-template",
-						text: '!! <<currentTab>>\n\n<$transclude tiddler=<<currentTab>> mode="block"/>'});
-	wiki.addTiddler({	title: "button-template",
-						text: '<$transclude tiddler=<<currentTab>> field="description"><$transclude tiddler=<<currentTab>> field="caption"><$macrocall $name="currentTab" $type="text/plain" $output="text/plain"/></$transclude></$transclude>'});
+	$tw.wiki.addTiddler(new $tw.Tiddler({title: "body-template", "code-body":"yes",
+						text: '!! <<currentTab>>\n\n<$transclude tiddler=<<currentTab>> mode="block"/>'},$tw.wiki.getModificationFields()));
+	$tw.wiki.addTiddler(new $tw.Tiddler({title: "button-template", "code-body":"yes",
+						text: '<$transclude tiddler=<<currentTab>> field="description"><$transclude tiddler=<<currentTab>> field="caption"><$macrocall $name="currentTab" $type="text/plain" $output="text/plain"/></$transclude></$transclude>'},$tw.wiki.getModificationFields()));
 	// tabs macro cloned, to be used with \\import
-	wiki.addTiddler({title: "tabs-macro-definition",  text: coreTabsTiddler.fields.text});
+	$tw.wiki.addTiddler(new $tw.Tiddler({title: "tabs-macro-definition", "code-body":"yes", text: coreTabsTiddler.fields.text},$tw.wiki.getModificationFields()));
 
 	// horizontal tabs test uses `tabsList`, `default` and `state` -- unnamed params
-	wiki.addTiddler({title: "test-tabs-macro-horizontal",  text: '\\import [[tabs-macro-definition]]\n<<tabs "TabOne TabTwo TabThree TabFour" "TabTwo" "$:/state/test-tab-01">>'});
+	$tw.wiki.addTiddler(new $tw.Tiddler(
+		{title: "test-tabs-horizontal",  text: '\\import [[tabs-macro-definition]]\n<<tabs "TabOne TabTwo TabThree TabFour" "TabTwo" "$:/state/test-tab-01">>'},
+		$tw.wiki.getModificationFields())
+	);
 
 	// horizontal tabs test adds `template`, `buttonTemplate` and `explicitState` as named params
-	wiki.addTiddler({title: "test-tabs-macro-horizontal-all",  text: '\\import [[tabs-macro-definition]]\n<<tabs "TabOne TabTwo TabThree TabFour" "TabTwo" "$:/state/test-tab-01" template:"body-template" buttonTemplate:"button-template" explicitState:"$:/state/explicit">>'});
+	$tw.wiki.addTiddler(new $tw.Tiddler(
+		{title: "test-tabs-horizontal-all",  text: '\\import [[tabs-macro-definition]]\n<<tabs "TabOne TabTwo TabThree TabFour" "TabTwo" "$:/state/test-tab-01" template:"body-template" buttonTemplate:"button-template" explicitState:"$:/state/explicit">>'},
+		$tw.wiki.getModificationFields())
+	);
 
 	// vertical tabs test. Same params as test 1
-	wiki.addTiddler({title: "test-tabs-macro-vertical",  text: '\\import [[tabs-macro-definition]]\n<<tabs "TabOne TabTwo TabThree TabFour" "TabTwo" "$:/state/test-tab-02" "tc-vertical">>'});
+	$tw.wiki.addTiddler(new $tw.Tiddler(
+		{title: "test-tabs-vertical",  text: '\\import [[tabs-macro-definition]]\n<<tabs "TabOne TabTwo TabThree TabFour" "TabTwo" "$:/state/test-tab-02" "tc-vertical">>'},
+		$tw.wiki.getModificationFields())
+	);
+
+// End This code can be copy pasted into the browser console
 
 	/* -----------------
 	/ Run the tests
 	--------------------*/
 	// horizontal
-/*
-	xit("should render horizontal tabs v5.2.1", function() {
-		expect(wiki.renderTiddler("text/html","test-tabs-macro-horizontal")).toBe(expected.fields.text);
-	});
-
-	xit("should render horizontal tabs macro with all parameters modified V5.2.1", function() {
-		expect(wiki.renderTiddler("text/html","test-tabs-macro-horizontal-all")).toBe(expectedAll.fields.text);
-	});
-
-	// vertical
-	xit("should render tabs vertical tabs v5.2.1", function() {
-		expect(wiki.renderTiddler("text/html","test-tabs-macro-vertical")).toBe(expectedVert.fields.text);
-	});
-*/
-	// Future tests
-	// horizontal
 	it("should render 'horizontal' tabs from v5.2.2 and up with whitespace trim", function() {
-		expect(wiki.renderTiddler("text/html","test-tabs-macro-horizontal")).toBe(expected.fields.text.replace(/\n/g,""));
+		expect($tw.wiki.renderTiddler("text/html","test-tabs-horizontal")).toBe(expected.fields.text.replace(/\n/g,""));
 	});
 
 	it("should render all 'horizontal' tabs from v5.2.2 and up with whitespace trim", function() {
-		expect(wiki.renderTiddler("text/html","test-tabs-macro-horizontal-all")).toBe(expectedAll.fields.text.replace(/\n/g,""));
+		expect($tw.wiki.renderTiddler("text/html","test-tabs-horizontal-all")).toBe(expectedAll.fields.text.replace(/\n/g,""));
 	});
 
 	// vertical
 	it("should render 'vertical' tabs from v5.2.2 and up with whitespace trim", function() {
-		expect(wiki.renderTiddler("text/html","test-tabs-macro-vertical")).toBe(expectedVert.fields.text.replace(/\n/g,""));
+		expect($tw.wiki.renderTiddler("text/html","test-tabs-vertical")).toBe(expectedVert.fields.text.replace(/\n/g,""));
 	});
 });
 
diff --git a/editions/tw5.com/tiddlers/Core Classes.tid b/editions/tw5.com/tiddlers/Core Classes.tid
new file mode 100644
index 000000000..ea21246df
--- /dev/null
+++ b/editions/tw5.com/tiddlers/Core Classes.tid	
@@ -0,0 +1,16 @@
+created: 20240421142359127
+modified: 20240422090116239
+tags: Reference
+title: Core Classes
+
+~TiddlyWiki class definitions are ''prefixed'' with `tc-` and are mainly used in the "vanilla base" theme. The ''tc-'' prefix ''is reserved'' for ~TiddlyWiki, so it should not be used for user defined classes.
+
+Users, especially plugin developers, should use their own prefixes eg: mytc- or something similar. 
+
+The following info can also be found in the $:/ControlPanel ''-> Advanced -> Stylesheets'' tab
+
+All stylesheets used in this wiki are: <small>(shadow tiddlers are bold)</small>
+
+<<list-links filter:"[all[shadows+tiddlers]tag[$:/tags/Stylesheet]]">>
+
+Also see: [[Utility Classes]]
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/Core Functions.tid b/editions/tw5.com/tiddlers/Core Functions.tid
new file mode 100644
index 000000000..cf9e6b300
--- /dev/null
+++ b/editions/tw5.com/tiddlers/Core Functions.tid	
@@ -0,0 +1,8 @@
+created: 20240421144224104
+modified: 20240422090925417
+tags: Reference
+title: Core Functions
+
+<!-- TODO Placeholder - Can be improved once the new "dumpvariables" macro is finished -->
+
+Also see: [[Functions]]
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/Core Messages.tid b/editions/tw5.com/tiddlers/Core Messages.tid
new file mode 100644
index 000000000..597bc6643
--- /dev/null
+++ b/editions/tw5.com/tiddlers/Core Messages.tid	
@@ -0,0 +1,10 @@
+created: 20240421144407522
+modified: 20240422091247905
+tags: Reference
+title: Core Messages
+
+{{||Messages}}
+
+The following widget messages are implemented by the core:
+
+<<list-links filter:"[tag[Messages]]" class:"multi-columns">>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/Core Procedures.tid b/editions/tw5.com/tiddlers/Core Procedures.tid
new file mode 100644
index 000000000..ce2a01719
--- /dev/null
+++ b/editions/tw5.com/tiddlers/Core Procedures.tid	
@@ -0,0 +1,8 @@
+created: 20240422090331513
+modified: 20240422090918289
+tags: Reference
+title: Core Procedures
+
+<!-- TODO Placeholder - Can be improved once the new "dumpvariables" macro is finished -->
+
+Also see: [[Procedures]]
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/Core Widgets.tid b/editions/tw5.com/tiddlers/Core Widgets.tid
new file mode 100644
index 000000000..c38a3e0c0
--- /dev/null
+++ b/editions/tw5.com/tiddlers/Core Widgets.tid	
@@ -0,0 +1,10 @@
+created: 20240422083130158
+modified: 20240422083155753
+tags: Reference
+title: Core Widgets
+
+{{Widgets}}
+
+The following classes of widget are built into the core:
+
+<<list-links "[tag[Widgets]]" class:"multi-columns">>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/concepts/Macros.tid b/editions/tw5.com/tiddlers/concepts/Macros.tid
index 884551996..e71f80077 100644
--- a/editions/tw5.com/tiddlers/concepts/Macros.tid
+++ b/editions/tw5.com/tiddlers/concepts/Macros.tid
@@ -1,6 +1,6 @@
 created: 20140211171341271
-modified: 20230922094937115
-tags: Concepts Reference
+modified: 20240422084520179
+tags: Concepts [[Core Macros]]
 title: Macros
 type: text/vnd.tiddlywiki
 
diff --git a/editions/tw5.com/tiddlers/concepts/Messages.tid b/editions/tw5.com/tiddlers/concepts/Messages.tid
index 77c9df290..968a2509f 100644
--- a/editions/tw5.com/tiddlers/concepts/Messages.tid
+++ b/editions/tw5.com/tiddlers/concepts/Messages.tid
@@ -1,11 +1,8 @@
 created: 20140226083311937
-modified: 20211117042057208
-tags: Concepts Reference
+modified: 20240422091319082
+tags: Concepts [[Core Messages]]
 title: Messages
 type: text/vnd.tiddlywiki
 
-Widget ''messages'' are generated by  [[Widgets]] in response to user actions.  Messages have a <<.param name>>, an optional primary <<.param parameter>>, and one or more optional named parameters. These messages travel up the widget tree where they are handled by ancestor widgets or the core itself.
+Widget [[messages|Core Messages]] are generated by  [[Widgets]] in response to user actions.  Messages have a <<.param name>>, an optional primary <<.param parameter>>, and one or more optional named parameters. These messages travel up the widget tree where they are handled by ancestor widgets or the core itself.
 
-The following widget messages are implemented by the core:
-
-<<list-links "[tag[Messages]]">>
diff --git a/editions/tw5.com/tiddlers/concepts/Railroad Diagrams.tid b/editions/tw5.com/tiddlers/concepts/Railroad Diagrams.tid
index 04b83d6fb..5ffa0187b 100644
--- a/editions/tw5.com/tiddlers/concepts/Railroad Diagrams.tid	
+++ b/editions/tw5.com/tiddlers/concepts/Railroad Diagrams.tid	
@@ -15,4 +15,6 @@ In the example above, a comma appears between each occurrence of the `repeated`
 
 Characters in round boxes are literal, i.e. they denote themselves. A name in a rectangular box denotes a further railroad diagram.
 
+The TW [[Filter Syntax]] documentation makes extensive use of railroad diagrams.
+
 The railroad diagrams in ~TiddlyWiki's documentation are generated with the [[Railroad Plugin]].
diff --git a/editions/tw5.com/tiddlers/concepts/TestCaseTiddlers.tid b/editions/tw5.com/tiddlers/concepts/TestCaseTiddlers.tid
index fae4bab55..4d30dc75b 100644
--- a/editions/tw5.com/tiddlers/concepts/TestCaseTiddlers.tid
+++ b/editions/tw5.com/tiddlers/concepts/TestCaseTiddlers.tid
@@ -1,5 +1,5 @@
 created: 20240507221902644
-modified: 20240729083054531
+modified: 20240808020847667
 tags: Concepts
 title: TestCaseTiddlers
 type: text/vnd.tiddlywiki
@@ -14,8 +14,9 @@ Test case tiddlers have the following ''fields'':
 |<<.field type>> |Needs to be set to `text/vnd.tiddlywiki-multiple` |
 |<<.field tags>> |Test cases are tagged [[$:/tags/wiki-test-spec]]. Test cases that intentionally fail are tagged [[$:/tags/wiki-test-spec-failing]] |
 |<<.field description>> |Descriptive heading for the test, intended to make it easy to identify the test |
-|<<.field display-format>> |Optional, defaults to `wikitext`. Set to `plaintext` to cause the output to be rended as plain text |
-|<<.field import-compound>> |<<.from-version "5.3.6">> A filter string, that defines a list of compound tiddlers, that should be imported. See: <<.wlink DataWidget>> widget |
+|<<.field display-format>> |Optional, defaults to `wikitext`. Set to `plaintext` to cause the output to be rendered as plain text |
+|<<.field import>> |<<.from-version "5.3.6">> A filter string that defines a list of tiddlers to import |
+|<<.field import-compound>> |<<.from-version "5.3.6">> A filter string that defines a list of compound tiddlers to import. See: <<.wlink DataWidget>> widget |
 
 Test case tiddlers with the appropriate tag are shown in the $:/ControlPanel ''-> Advanced -> Test Cases ''
 
diff --git a/editions/tw5.com/tiddlers/customising/Alternative page layouts.tid b/editions/tw5.com/tiddlers/customising/Alternative page layouts.tid
index 071d00dbd..eb1afd2b7 100644
--- a/editions/tw5.com/tiddlers/customising/Alternative page layouts.tid	
+++ b/editions/tw5.com/tiddlers/customising/Alternative page layouts.tid	
@@ -1,5 +1,5 @@
 created: 20201123172925848
-modified: 20240627060629394
+modified: 20240801020629394
 tags: [[Customise TiddlyWiki]]
 title: Alternative page layouts
 type: text/vnd.tiddlywiki
@@ -23,9 +23,8 @@ This alternative page template can either be a tweaked and modified version of t
 tc-page-container tc-language-$(languageTitle)$ your-plugin-name-container
 \end
 \procedure redirected-navigate-actions()
-  <$action-setfield $tiddler="$:/layout" text="" $timestamp="no">
-    <$action-navigate $to=<<event-navigateTo>> $scroll="yes" />
-  </$action-setfield>
+  <$action-setfield $tiddler="$:/layout" text="" $timestamp="no" />
+  <$action-navigate $to=<<event-navigateTo>> $scroll="yes" />
 \end
 
 <$navigator story="$:/StoryList" history="$:/HistoryList" openLinkFromInsideRiver={{$:/config/Navigation/openLinkFromInsideRiver}} openLinkFromOutsideRiver={{$:/config/Navigation/openLinkFromOutsideRiver}} relinkOnRename={{$:/config/RelinkOnRename}}>
diff --git a/editions/tw5.com/tiddlers/definitions/JeremyRuston.tid b/editions/tw5.com/tiddlers/definitions/JeremyRuston.tid
index bf139ea1e..a63f3df68 100644
--- a/editions/tw5.com/tiddlers/definitions/JeremyRuston.tid
+++ b/editions/tw5.com/tiddlers/definitions/JeremyRuston.tid
@@ -15,6 +15,7 @@ I'm the original inventor of TiddlyWiki. You can hire me through [[Intertwingled
 
 Further information:
 
+* A recording of the [[keynote I gave at QCon London in April 2024|https://www.infoq.com/presentations/bbc-micro/]], and the [[discussion on talk.tiddlywiki.org|https://talk.tiddlywiki.org/t/recording-of-jeremys-keynote-at-qcon-london-april-2024/10505]]. The talk mixes some nostalgia about my teenage activities with the BBC Micro with thoughts on the development of the software industry and insights gained from working with TiddlyWiki
 * An [[interview with me in The Inquirer|http://www.theinquirer.net/inquirer/feature/2105529/bt-software-engineer-tells-telco-source]] by Wendy Grossman
 * A [[hilarious interview with me|https://www.youtube.com/watch?v=auyIhw8MTmQ]] from British television in 1983
 * Here's a video of a presentation I did in 2007 called [["How to Start an Open Source Project"|http://vimeo.com/856110]].
diff --git a/editions/tw5.com/tiddlers/definitions/Tiddlyhost.tid b/editions/tw5.com/tiddlers/definitions/Tiddlyhost.tid
index 8dee477da..3a9140237 100644
--- a/editions/tw5.com/tiddlers/definitions/Tiddlyhost.tid
+++ b/editions/tw5.com/tiddlers/definitions/Tiddlyhost.tid
@@ -1,12 +1,11 @@
-title: Tiddlyhost
-tags: Definitions
 created: 20230410105035569
 modified: 20230410105035569
+tags: Definitions
+title: Tiddlyhost
+type: text/vnd.tiddlywiki
 
 <span style="float:right;">[img width=140 [Tiddlyhost Logo]]</span>
 
 [[Tiddlyhost.com|https://tiddlyhost.com/]] is a hosting service for TiddlyWiki created by Simon Baird. Once you sign up and confirm your email you can create "sites", (i.e. ~TiddlyWikis), with support for online saving. Sites can be private or public, and you can optionally list them on the taggable and searchable [[Tiddlyhost Hub|https://tiddlyhost.com/hub]] where they'll be discoverable by others.
 
 Unlike [[TiddlySpot|Saving on TiddlySpot]], [[Tiddlyhost|https://tiddlyhost.com]] is secure, open source, and has proper support for TiddlyWiki5. It also allows uploading existing ~TiddlyWiki files, supports TiddlyWikiClassic, and lets you claim ownership of your ~TiddlySpot sites. For more information see the [[FAQ|https://github.com/simonbaird/tiddlyhost/wiki/FAQ]] and the [[About|https://tiddlyhost.com/about]] page.
-
-<div style="clear: both;"/>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/definitions/Xememex.tid b/editions/tw5.com/tiddlers/definitions/Xememex.tid
index e69c17e8b..8f3fc1dd6 100644
--- a/editions/tw5.com/tiddlers/definitions/Xememex.tid
+++ b/editions/tw5.com/tiddlers/definitions/Xememex.tid
@@ -1,7 +1,8 @@
-title: Xememex
-tags: Definitions
 created: 20230410105035569
 modified: 20230410105035569
+tags: Definitions
+title: Xememex
+type: text/vnd.tiddlywiki
 
 <span style="float:right;">[img width=340 [Xememex Logo]]</span>
 
@@ -10,5 +11,3 @@ Xememex is a multiuser TiddlyWiki from [[Intertwingled Innovations]]. It allows
 The largest customer implementation has hundreds of online wikis with thousands of users. See https://manuals.annafreud.org/
 
 Xememex is currently only available under commercial terms from Intertwingled Innovations. Contact [[Jeremy Ruston at Intertwingled Innovations|mailto:jeremy@intertwingledinnovations.com]] for more details.
-
-<div style="clear: both;"/>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/empty-tag-node-template.tid b/editions/tw5.com/tiddlers/empty-tag-node-template.tid
index 79905b77c..96c77e76b 100644
--- a/editions/tw5.com/tiddlers/empty-tag-node-template.tid
+++ b/editions/tw5.com/tiddlers/empty-tag-node-template.tid
@@ -5,8 +5,8 @@ tags: $:/tags/ViewTemplate
 title: $:/editions/tw5.com/empty-tag-node-template
 type: 
 
-<% if [<storyTiddler>!has[text]!has[tags]tagging[]] %>
+<%if [<storyTiddler>!has[text]!has[tags]tagging[]] %>
 The following tiddlers are tagged with <<tag>>:
 
 <<list-links filter:"[<storyTiddler>!has[text]!has[tags]tagging[]]" class:"multi-columns">>
-<% endif %>
\ No newline at end of file
+<%endif%>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/filters/compare Operator.tid b/editions/tw5.com/tiddlers/filters/compare Operator.tid
index debf09ead..b86e8c729 100644
--- a/editions/tw5.com/tiddlers/filters/compare Operator.tid	
+++ b/editions/tw5.com/tiddlers/filters/compare Operator.tid	
@@ -1,15 +1,15 @@
+caption: compare
 created: 20200412181551706
 modified: 20200412181551706
+op-input: a [[selection of titles|Title Selection]]
+op-neg-output: those input titles <<.em not>> matching the specified comparison
+op-output: those input titles matching the specified comparison
+op-parameter: the value to compare
+op-purpose: filter the input by comparing each item against the parameter
+op-suffix: the <<.op compare>> operator uses a rich suffix, see below for details
 tags: [[Filter Operators]] [[Mathematics Operators]] [[String Operators]] [[Negatable Operators]]
 title: compare Operator
 type: text/vnd.tiddlywiki
-caption: compare
-op-purpose: filter the input by comparing each item against the parameter
-op-input: a [[selection of titles|Title Selection]]
-op-suffix: the <<.op compare>> operator uses a rich suffix, see below for details
-op-parameter: the value to compare
-op-output: those input titles matching the specified comparison
-op-neg-output: those input titles <<.em not>> matching the specified comparison
 
 <<.from-version "5.1.22">>The <<.op compare>> filter allows numerical, string and date comparisons to be performed.
 
@@ -21,7 +21,7 @@ The <<.op compare>> operator uses an extended syntax to specify all the options:
 
 The ''type'' can be:
 
-* "number" - invalid numbers are interpreted as zero
+* "number" - (default) invalid numbers are interpreted as zero
 * "integer" - invalid integers are interpreted as zero
 * "string"
 * "date" - invalid dates are interpreted as 1st January 1970
@@ -43,7 +43,7 @@ For example:
 ```
 [[2]compare:number:eq[3]] returns nothing
 [[2]compare:number:lt[3]] returns "2"
-[[2]compare:number:eq[2]] returns "2"
+[[2]compare::eq[2]] returns "2"
 ```
 
 Note that several of the variants of the <<.op compare>> operator are synonyms for existing operators, and are provided in the interests of consistency. For example, `compare:string:eq[x]` is a synonym for `match[x]`.
diff --git a/editions/tw5.com/tiddlers/filters/decodebase64 Operator (Examples).tid b/editions/tw5.com/tiddlers/filters/decodebase64 Operator (Examples).tid
new file mode 100644
index 000000000..6a79011e3
--- /dev/null
+++ b/editions/tw5.com/tiddlers/filters/decodebase64 Operator (Examples).tid	
@@ -0,0 +1,10 @@
+created: 20240831025944330
+modified: 20240831041423075
+tags: [[decodebase64 Operator]] [[Operator Examples]]
+title: decodebase64 Operator (Examples)
+
+<<.operator-example 1 "[[dGVzdA==]decodebase64[]]">>
+
+<<.operator-example 2 "[[8J+Yjg==]decodebase64[]]">>
+
+<<.operator-example 3 "[[8J-Yjg==]decodebase64:urlsafe[]]">>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/filters/decodebase64 Operator.tid b/editions/tw5.com/tiddlers/filters/decodebase64 Operator.tid
index 0d3a61920..5421ddf8f 100644
--- a/editions/tw5.com/tiddlers/filters/decodebase64 Operator.tid	
+++ b/editions/tw5.com/tiddlers/filters/decodebase64 Operator.tid	
@@ -1,14 +1,16 @@
 caption: decodebase64
+created: 20240831034919913
+from-version: 5.2.6
+modified: 20240831034931703
 op-input: a [[selection of titles|Title Selection]]
 op-output: the input with base 64 decoding applied
-op-suffix: optional: `binary` to produce binary output, `urlsafe` for URL-safe input
 op-parameter: 
 op-parameter-name: 
-op-purpose: apply base 64 decoding to a string
+op-purpose: apply [[base 64|Base64]] decoding to a string
+op-suffix: optional: `binary` to produce binary output, `urlsafe` for URL-safe input
 tags: [[Filter Operators]] [[String Operators]]
 title: decodebase64 Operator
 type: text/vnd.tiddlywiki
-from-version: 5.2.6
 
 See Mozilla Developer Network for details of [[base 64 encoding|https://developer.mozilla.org/en-US/docs/Glossary/Base64]]. TiddlyWiki uses [[library code from @nijikokun|https://gist.github.com/Nijikokun/5192472]] to handle the conversion.
 
diff --git a/editions/tw5.com/tiddlers/filters/encodebase64 Operator (Examples).tid b/editions/tw5.com/tiddlers/filters/encodebase64 Operator (Examples).tid
new file mode 100644
index 000000000..c49aff77a
--- /dev/null
+++ b/editions/tw5.com/tiddlers/filters/encodebase64 Operator (Examples).tid	
@@ -0,0 +1,10 @@
+created: 20240831025156306
+modified: 20240831041537886
+tags: [[encodebase64 Operator]] [[Operator Examples]]
+title: encodebase64 Operator (Examples)
+
+<<.operator-example 1 "[[test]encodebase64[]]">>
+
+<<.operator-example 2 "[[😎]encodebase64[]]">>
+
+<<.operator-example 3 "[[😎]encodebase64:urlsafe[]]">>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/filters/encodebase64 Operator.tid b/editions/tw5.com/tiddlers/filters/encodebase64 Operator.tid
index a7943d726..918d656d2 100644
--- a/editions/tw5.com/tiddlers/filters/encodebase64 Operator.tid	
+++ b/editions/tw5.com/tiddlers/filters/encodebase64 Operator.tid	
@@ -1,14 +1,16 @@
 caption: encodebase64
+created: 20240831034955575
+from-version: 5.2.6
+modified: 20240831035003716
 op-input: a [[selection of titles|Title Selection]]
 op-output: the input with base 64 encoding applied
-op-suffix: optional: `binary` to treat input as binary data, `urlsafe` for URL-safe output
 op-parameter: 
 op-parameter-name: 
-op-purpose: apply base 64 encoding to a string
+op-purpose: apply [[base 64|Base64]] encoding to a string
+op-suffix: optional: `binary` to treat input as binary data, `urlsafe` for URL-safe output
 tags: [[Filter Operators]] [[String Operators]]
 title: encodebase64 Operator
 type: text/vnd.tiddlywiki
-from-version: 5.2.6
 
 See Mozilla Developer Network for details of [[base 64 encoding|https://developer.mozilla.org/en-US/docs/Glossary/Base64]]. TiddlyWiki uses [[library code from @nijikokun|https://gist.github.com/Nijikokun/5192472]] to handle the conversion.
 
diff --git a/editions/tw5.com/tiddlers/filters/examples/compare Operator (Examples).tid b/editions/tw5.com/tiddlers/filters/examples/compare Operator (Examples).tid
index f729dc5d2..76488503a 100644
--- a/editions/tw5.com/tiddlers/filters/examples/compare Operator (Examples).tid	
+++ b/editions/tw5.com/tiddlers/filters/examples/compare Operator (Examples).tid	
@@ -9,3 +9,4 @@ type: text/vnd.tiddlywiki
 <<.operator-example 3 "[list[Days of the Week]compare:string:gt[M]compare:string:lt[W]]">>
 <<.operator-example 4 "[[v5.1.23-prerelease]compare:version:gt[v5.1.22]]">>
 <<.operator-example 5 "[[1]compare:number:gt[2]then[yes]else[no]]">>
+<<.operator-example 6 "[[-2]compare::lt[-1]]">>
diff --git a/editions/tw5.com/tiddlers/filters/list.tid b/editions/tw5.com/tiddlers/filters/list.tid
index be3908b86..8df76103c 100644
--- a/editions/tw5.com/tiddlers/filters/list.tid
+++ b/editions/tw5.com/tiddlers/filters/list.tid
@@ -1,16 +1,16 @@
+caption: list
 created: 20140410103123179
-modified: 20211115092315020
+modified: 20240811083650364
+op-input: ignored
+op-neg-input: a [[selection of titles|Title Selection]]
+op-neg-output: those input titles that are <<.em not>> mentioned at <<.place R>>
+op-output: the titles stored as a [[title list|Title List]] at <<.place R>>
+op-parameter: a [[reference|TextReference]] to a [[field|TiddlerFields]] or [[index|DataTiddlers]] of a particular tiddler
+op-parameter-name: R
+op-purpose: select titles via a list field
 tags: [[Filter Operators]] [[Field Operators]] [[Selection Constructors]] [[Negatable Operators]]
 title: list Operator
 type: text/vnd.tiddlywiki
-caption: list
-op-purpose: select titles via a list field
-op-input: ignored
-op-neg-input: a [[selection of titles|Title Selection]]
-op-parameter: a [[reference|TextReference]] to a [[field|TiddlerFields]] or [[property|DataTiddlers]] of a particular tiddler
-op-parameter-name: R
-op-output: the titles stored as a [[title list|Title List]] at <<.place R>>
-op-neg-output: those input titles that are <<.em not>> mentioned at <<.place R>>
 
 <<.place R>> can reference either a field or a property. See [[TextReference]] for the syntax.
 
diff --git a/editions/tw5.com/tiddlers/functions/Functions.tid b/editions/tw5.com/tiddlers/functions/Functions.tid
index 028747a34..0911fdd6d 100644
--- a/editions/tw5.com/tiddlers/functions/Functions.tid
+++ b/editions/tw5.com/tiddlers/functions/Functions.tid
@@ -1,6 +1,6 @@
 created: 20221009124003601
-modified: 20240619211228560
-tags: Concepts Reference
+modified: 20240422084850412
+tags: Concepts [[Core Functions]]
 title: Functions
 type: text/vnd.tiddlywiki
 
diff --git a/editions/tw5.com/tiddlers/hellothere/HelloThere.tid b/editions/tw5.com/tiddlers/hellothere/HelloThere.tid
index 88125a043..4f59bdcbb 100644
--- a/editions/tw5.com/tiddlers/hellothere/HelloThere.tid
+++ b/editions/tw5.com/tiddlers/hellothere/HelloThere.tid
@@ -9,7 +9,7 @@ type: text/vnd.tiddlywiki
 
 Use it to keep your [[to-do list|TaskManagementExample]], to plan an [[essay or novel|"TiddlyWiki for Scholars" by Alberto Molina]], or to organise your wedding. Record every thought that crosses your brain, or build a flexible and responsive website.
 
-TiddlyWiki lets you choose where to keep your data, guaranteeing that in the decades to come you will [[still be able to use|Future Proof]] the notes you take today.
+~TiddlyWiki lets you choose where to keep your data, guaranteeing that in the decades to come you will [[still be able to use|Future Proof]] the notes you take today.
 
 !! ''Quick Start''
 
@@ -19,7 +19,7 @@ TiddlyWiki lets you choose where to keep your data, guaranteeing that in the dec
 </$list>
 </div>
 <div class="tc-cards tc-small">
-<$link to="中文社区 - Chinese Community" class="tc-btn-big-green tc-card">
+<$link to="中文社区 - Chinese Community" class="tc-btn-big-green tc-card" aria-label="Chinese Community">
 中文社区<br/>Chinese Community
 </$link>
 </div>
diff --git a/editions/tw5.com/tiddlers/hellothere/badges/ProductHunt-Link.tid b/editions/tw5.com/tiddlers/hellothere/badges/ProductHunt-Link.tid
index 3554c2d74..2dd0a2912 100644
--- a/editions/tw5.com/tiddlers/hellothere/badges/ProductHunt-Link.tid
+++ b/editions/tw5.com/tiddlers/hellothere/badges/ProductHunt-Link.tid
@@ -1,4 +1,4 @@
 title: Product Hunt Link
 tags: [[HelloThere Badge]]
 
-<a href="https://www.producthunt.com/posts/tiddlywiki-2?utm_source=badge-top-post-badge&utm_medium=badge&utm_souce=badge-tiddlywiki-2" alt="Product Hunt: Product of the Day" target="_blank" rel="noopener noreferrer">{{ProductHunt-Badge.svg}}</a>
\ No newline at end of file
+<a href="https://www.producthunt.com/posts/tiddlywiki-2?utm_source=badge-top-post-badge&utm_medium=badge&utm_souce=badge-tiddlywiki-2" aria-label="Product Hunt: Product of the Day" target="_blank" rel="noopener noreferrer">{{ProductHunt-Badge.svg}}</a>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting Content to be displayed for empty story.tid b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting Content to be displayed for empty story.tid
new file mode 100644
index 000000000..f3497d5be
--- /dev/null
+++ b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting Content to be displayed for empty story.tid	
@@ -0,0 +1,12 @@
+created: 20240811052854726
+modified: 20240811053649554
+tags: [[Hidden Settings]]
+title: Hidden Setting: Content to be displayed for empty story
+
+To display content when the story is empty, create $:/config/EmptyStoryMessage and enter the desired contents.
+
+The following would show the GettingStarted tiddler when all others are closed.
+
+```
+{{GettingStarted||$:/core/ui/ViewTemplate}}
+```
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting Default Tiddler Colour.tid b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting Default Tiddler Colour.tid
new file mode 100644
index 000000000..649fd7629
--- /dev/null
+++ b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting Default Tiddler Colour.tid	
@@ -0,0 +1,7 @@
+created: 20240907042443909
+modified: 20240907042629405
+tags: [[Hidden Settings]]
+title: Hidden Setting: Default Tiddler Colour
+type: text/vnd.tiddlywiki
+
+A default tiddler colour can be specified by creating a tiddler called $:/config/DefaultTiddlerColour containing the CSS color value.
diff --git a/editions/tw5.com/tiddlers/howtos/Using Stylesheets.tid b/editions/tw5.com/tiddlers/howtos/Using Stylesheets.tid
index 3d41d3f19..201c2b823 100644
--- a/editions/tw5.com/tiddlers/howtos/Using Stylesheets.tid	
+++ b/editions/tw5.com/tiddlers/howtos/Using Stylesheets.tid	
@@ -41,7 +41,7 @@ You can then use your own [[styles and classes in WikiText|Styles and Classes in
 
 Custom stylesheets are applied independently from theme stylesheets. Therefore, it is often necessary for the css rules in your custom stylesheet to be more specific than those of the theme you want to override. For example, `html body.tc-body` is more specific than `body.tc-body`. 
 
-<<.tip "''You should always start with the least specific value that works!''<br><br>">>
+<<.tip """You should always start with the least specific value that works!""">>
 
 ! Stylesheet Types
 
@@ -76,4 +76,4 @@ The ~TiddlyWiki core provides several [[global macros that are helpful in constr
 
 !! See Also
 
-* <<list-links "[tag[Using Stylesheets]]">>
+<<list-links "[tag[Using Stylesheets]]">>
diff --git a/editions/tw5.com/tiddlers/images/Blurry Lawn.jpg.meta b/editions/tw5.com/tiddlers/images/Blurry Lawn.jpg.meta
index 2dc802bee..49b003bd2 100644
--- a/editions/tw5.com/tiddlers/images/Blurry Lawn.jpg.meta	
+++ b/editions/tw5.com/tiddlers/images/Blurry Lawn.jpg.meta	
@@ -1,4 +1,5 @@
 title: Blurry Lawn.jpg
 type: image/jpeg
 tags: picture external-image
-source: https://www.flickr.com/photos/jermy/16386332964/in/photostream
\ No newline at end of file
+source: https://www.flickr.com/photos/jermy/16386332964/in/photostream
+alt-text: Blurry image with green grass with flowsers.
diff --git a/editions/tw5.com/tiddlers/images/Favicon template.svg.meta b/editions/tw5.com/tiddlers/images/Favicon template.svg.meta
index 8d6a1a197..9ad8a9f86 100644
--- a/editions/tw5.com/tiddlers/images/Favicon template.svg.meta	
+++ b/editions/tw5.com/tiddlers/images/Favicon template.svg.meta	
@@ -1,3 +1,4 @@
 title: Favicon template.svg
 tags: picture
-type: image/svg+xml
\ No newline at end of file
+type: image/svg+xml
+alt-text: Motovun Jack with blue background.
diff --git a/editions/tw5.com/tiddlers/images/Funding.png.meta b/editions/tw5.com/tiddlers/images/Funding.png.meta
index b9caa4a72..8d6225a60 100644
--- a/editions/tw5.com/tiddlers/images/Funding.png.meta
+++ b/editions/tw5.com/tiddlers/images/Funding.png.meta
@@ -1,3 +1,4 @@
 title: Funding.png
 type: image/png
 tags: picture
+alt-text: Hand over a debit-card.
diff --git a/editions/tw5.com/tiddlers/images/Grok TiddlyWiki.png.meta b/editions/tw5.com/tiddlers/images/Grok TiddlyWiki.png.meta
index a0595cc9f..da5e252a2 100644
--- a/editions/tw5.com/tiddlers/images/Grok TiddlyWiki.png.meta	
+++ b/editions/tw5.com/tiddlers/images/Grok TiddlyWiki.png.meta	
@@ -1,3 +1,4 @@
 title: Grok TiddlyWiki Banner
 type: image/png
 tags: picture
+alt-text: Grok TiddlyWiki page and siluette of Motovun Jack.
diff --git a/editions/tw5.com/tiddlers/images/Introduction Video Thumbnail.jpg.meta b/editions/tw5.com/tiddlers/images/Introduction Video Thumbnail.jpg.meta
index ee1c94cd4..9b2a023c4 100644
--- a/editions/tw5.com/tiddlers/images/Introduction Video Thumbnail.jpg.meta	
+++ b/editions/tw5.com/tiddlers/images/Introduction Video Thumbnail.jpg.meta	
@@ -1,3 +1,4 @@
 title: Introduction Video Thumbnail.jpg
 type: image/jpeg
 tags: picture
+alt-text: Screenshot with a headline: TiddlyWiki. Below are several tiddlers randomly stacked.
diff --git a/editions/tw5.com/tiddlers/images/Marketplace Banner.png.meta b/editions/tw5.com/tiddlers/images/Marketplace Banner.png.meta
index b693c99e3..14ccdbc0b 100644
--- a/editions/tw5.com/tiddlers/images/Marketplace Banner.png.meta	
+++ b/editions/tw5.com/tiddlers/images/Marketplace Banner.png.meta	
@@ -1,3 +1,4 @@
 title: TiddlyWiki Marketplace Banner
 type: image/jpeg
 tags: picture
+alt-text: Motovun Jack with a shopping cart. Blue floor, orange background.
diff --git a/editions/tw5.com/tiddlers/images/Motovun Jack.ascii.tid b/editions/tw5.com/tiddlers/images/Motovun Jack.ascii.tid
index 115cf2e60..db5a9dc28 100644
--- a/editions/tw5.com/tiddlers/images/Motovun Jack.ascii.tid	
+++ b/editions/tw5.com/tiddlers/images/Motovun Jack.ascii.tid	
@@ -1,5 +1,6 @@
 title: Motovun Jack.ascii
 tags: picture
+alt-text: Motovun Jack ASCII-art.
 
 \rules only html
 <pre style="font-size:10px; font-family: monospace; line-height:13px">
diff --git a/editions/tw5.com/tiddlers/images/Motovun Jack.jpg.meta b/editions/tw5.com/tiddlers/images/Motovun Jack.jpg.meta
index 43901f30f..ee2ddbe5b 100644
--- a/editions/tw5.com/tiddlers/images/Motovun Jack.jpg.meta	
+++ b/editions/tw5.com/tiddlers/images/Motovun Jack.jpg.meta	
@@ -2,3 +2,4 @@ title: Motovun Jack.jpg
 type: image/jpeg
 source: https://www.flickr.com/photos/jermy/6292279493/in/photostream
 tags: picture
+alt-text: Motovun Jack on a stone wall with treas and hills in the background.
diff --git a/editions/tw5.com/tiddlers/images/Motovun Jack.pdf.meta b/editions/tw5.com/tiddlers/images/Motovun Jack.pdf.meta
index 27cb054c9..0a64294e5 100644
--- a/editions/tw5.com/tiddlers/images/Motovun Jack.pdf.meta	
+++ b/editions/tw5.com/tiddlers/images/Motovun Jack.pdf.meta	
@@ -1,3 +1,4 @@
 title: Motovun Jack.pdf
 type: application/pdf
 tags: picture
+alt-text: PDF reader with Motovun Jack siluette on a white background page 1 of 1.
diff --git a/editions/tw5.com/tiddlers/images/New Release Banner.png.meta b/editions/tw5.com/tiddlers/images/New Release Banner.png.meta
index e5fc745fe..2da8dc356 100644
--- a/editions/tw5.com/tiddlers/images/New Release Banner.png.meta	
+++ b/editions/tw5.com/tiddlers/images/New Release Banner.png.meta	
@@ -1,3 +1,4 @@
 title: New Release Banner
 type: image/png
 tags: picture
+alt-text: Release banner, with a custom background and a release version in big letters.
diff --git a/editions/tw5.com/tiddlers/images/Newnham Horizon.jpg.meta b/editions/tw5.com/tiddlers/images/Newnham Horizon.jpg.meta
index 4e5fb7d8b..8202f6a04 100644
--- a/editions/tw5.com/tiddlers/images/Newnham Horizon.jpg.meta	
+++ b/editions/tw5.com/tiddlers/images/Newnham Horizon.jpg.meta	
@@ -2,3 +2,4 @@ title: Newnham Horizon.jpg
 type: image/jpeg
 tags: picture external-image
 source: https://www.flickr.com/photos/jermy/289999155/in/photostream
+alt-text: Newham Horizon. Green field, blue skey with some clouds on a sunny day.
diff --git a/editions/tw5.com/tiddlers/images/Open Collective Logo.tid b/editions/tw5.com/tiddlers/images/Open Collective Logo.tid
index 7dec4d62b..dbafad946 100644
--- a/editions/tw5.com/tiddlers/images/Open Collective Logo.tid	
+++ b/editions/tw5.com/tiddlers/images/Open Collective Logo.tid	
@@ -2,5 +2,6 @@ created: 20240621075644739
 modified: 20240621075647009
 tags: picture
 title: Open Collective Logo
+alt-text: Open Collective Logo
 
 <svg style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2" viewBox="0 0 28 28"><path d="M25.509 6.026A13.934 13.934 0 0 1 28 14c0 2.963-.92 5.71-2.491 7.974l-3.626-3.627A8.96 8.96 0 0 0 23 14a8.964 8.964 0 0 0-1.117-4.347l3.626-3.627Z"/><path d="m21.974 2.49-3.627 3.628a9 9 0 1 0 0 15.765l3.627 3.626A13.934 13.934 0 0 1 14 27.999C6.268 28 0 21.733 0 14 0 6.269 6.268 0 14 0c2.963 0 5.711.922 7.974 2.492Z"/></svg>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/images/PerlinLight.jpg.meta b/editions/tw5.com/tiddlers/images/PerlinLight.jpg.meta
index 3df28f9c5..aff5d2b80 100644
--- a/editions/tw5.com/tiddlers/images/PerlinLight.jpg.meta
+++ b/editions/tw5.com/tiddlers/images/PerlinLight.jpg.meta
@@ -1,2 +1,3 @@
 title: PerlinLight.jpg
 type: image/jpeg
+alt-text: Backgournd tile with light gray dots randomly scatterd.
diff --git a/editions/tw5.com/tiddlers/images/Reddit Logo.tid b/editions/tw5.com/tiddlers/images/Reddit Logo.tid
index f4153ebb0..660785858 100644
--- a/editions/tw5.com/tiddlers/images/Reddit Logo.tid	
+++ b/editions/tw5.com/tiddlers/images/Reddit Logo.tid	
@@ -1,4 +1,5 @@
 title: Reddit Logo
+alt-text: Reddit Logo
 
 \parameters (size:"22pt")
 <svg width=<<size>> height=<<size>> viewBox="0 0 20 20">
diff --git a/editions/tw5.com/tiddlers/images/TWEUM Thumbnail.jpg.meta b/editions/tw5.com/tiddlers/images/TWEUM Thumbnail.jpg.meta
index 8d35840cf..3ff7014fb 100644
--- a/editions/tw5.com/tiddlers/images/TWEUM Thumbnail.jpg.meta	
+++ b/editions/tw5.com/tiddlers/images/TWEUM Thumbnail.jpg.meta	
@@ -1,3 +1,4 @@
 title: TWEUM Thumbnail.jpg
 type: image/jpeg
 tags: picture
+alt-text: TW EU Meeting thumbnail. Skyline of Oxford on a sunny day with blue sky. Motovun Jack and a TiddlyWiki sceenshot in the back.
diff --git a/editions/tw5.com/tiddlers/images/Tiddler Fishes.svg.meta b/editions/tw5.com/tiddlers/images/Tiddler Fishes.svg.meta
index 257787b66..042c8a89d 100644
--- a/editions/tw5.com/tiddlers/images/Tiddler Fishes.svg.meta	
+++ b/editions/tw5.com/tiddlers/images/Tiddler Fishes.svg.meta	
@@ -1,3 +1,4 @@
 title: Tiddler Fishes.svg
 type: image/svg+xml
 tags: picture
+alt-text: 5 coloured sketched fish arranged in a cyrcle.
diff --git a/editions/tw5.com/tiddlers/images/Tiddler Poster.png.meta b/editions/tw5.com/tiddlers/images/Tiddler Poster.png.meta
index 2466871f0..221569974 100644
--- a/editions/tw5.com/tiddlers/images/Tiddler Poster.png.meta	
+++ b/editions/tw5.com/tiddlers/images/Tiddler Poster.png.meta	
@@ -2,3 +2,4 @@ title: Tiddler Poster.png
 type: image/png
 source: https://tiddlywiki.com/poster
 tags: picture
+alt-text: Poster with a headline: Your messy thoughts. Organized. Below is an abstract Stickleback fish and tiddlywiki.com URL.
diff --git a/editions/tw5.com/tiddlers/images/TiddlyFox Apocalypse.png.meta b/editions/tw5.com/tiddlers/images/TiddlyFox Apocalypse.png.meta
index 2c3e7bab3..50d42ef49 100644
--- a/editions/tw5.com/tiddlers/images/TiddlyFox Apocalypse.png.meta	
+++ b/editions/tw5.com/tiddlers/images/TiddlyFox Apocalypse.png.meta	
@@ -1,3 +1,4 @@
 title: TiddlyFox Apocalypse.png
 type: image/png
 tags: picture
+alt-text: Motovun Jack's head with a FireFox logo over the head and a date: Nov. 14th 2017 on the left.
diff --git a/editions/tw5.com/tiddlers/images/TiddlyWiki Classic.png.meta b/editions/tw5.com/tiddlers/images/TiddlyWiki Classic.png.meta
index 4296f5116..0142e4d67 100644
--- a/editions/tw5.com/tiddlers/images/TiddlyWiki Classic.png.meta	
+++ b/editions/tw5.com/tiddlers/images/TiddlyWiki Classic.png.meta	
@@ -1,3 +1,4 @@
 title: TiddlyWiki Classic.png
 type: image/png
 tags: picture
+alt-text: TiddlyWiki classic screenshto thumbnail.
diff --git a/editions/tw5.com/tiddlers/images/TiddlyWiki Newsletter Badge.png.meta b/editions/tw5.com/tiddlers/images/TiddlyWiki Newsletter Badge.png.meta
index b53a63b97..3eb2dbdde 100644
--- a/editions/tw5.com/tiddlers/images/TiddlyWiki Newsletter Badge.png.meta	
+++ b/editions/tw5.com/tiddlers/images/TiddlyWiki Newsletter Badge.png.meta	
@@ -1,3 +1,6 @@
-title: TiddlyWiki Newsletter Badge.png
-type: image/png
+alt-text: Motovun Jack reads a Newsletter.
+created: 20240630093143711
+modified: 20240630094906495
 tags: picture
+title: TiddlyWiki Newsletter Badge.png
+type: image/png
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/images/TiddlyWikiLinks.png.meta b/editions/tw5.com/tiddlers/images/TiddlyWikiLinks.png.meta
index 5ac185287..ebe0b79ba 100644
--- a/editions/tw5.com/tiddlers/images/TiddlyWikiLinks.png.meta
+++ b/editions/tw5.com/tiddlers/images/TiddlyWikiLinks.png.meta
@@ -1,3 +1,4 @@
 title: TiddlyWikiLinks
 type: image/png
 tags: picture
+alt-text: Motovun Jack body with "chain liks" around the neck.
diff --git a/editions/tw5.com/tiddlers/images/Tiddlyhost Logo.png.meta b/editions/tw5.com/tiddlers/images/Tiddlyhost Logo.png.meta
index c0f8f256a..7cae3e920 100644
--- a/editions/tw5.com/tiddlers/images/Tiddlyhost Logo.png.meta	
+++ b/editions/tw5.com/tiddlers/images/Tiddlyhost Logo.png.meta	
@@ -1,3 +1,4 @@
 title: Tiddlyhost Logo
 type: image/png
 tags: picture
+atl-text: TiddlyHost logo.
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/images/Xememex Logo.svg.meta b/editions/tw5.com/tiddlers/images/Xememex Logo.svg.meta
index 1eab02541..19726a249 100644
--- a/editions/tw5.com/tiddlers/images/Xememex Logo.svg.meta	
+++ b/editions/tw5.com/tiddlers/images/Xememex Logo.svg.meta	
@@ -1,2 +1,3 @@
 type: image/svg+xml
 title: Xememex Logo
+alt-text Xememex Logo
diff --git a/editions/tw5.com/tiddlers/images/favicon.png.meta b/editions/tw5.com/tiddlers/images/favicon.png.meta
index 76d0be1a8..45e69d9e7 100644
--- a/editions/tw5.com/tiddlers/images/favicon.png.meta
+++ b/editions/tw5.com/tiddlers/images/favicon.png.meta
@@ -1,2 +1,3 @@
 title: $:/favicon.ico
 type: image/png
+alt-text: Motovun Jack with blue background.
diff --git a/editions/tw5.com/tiddlers/images/green_favicon.png.meta b/editions/tw5.com/tiddlers/images/green_favicon.png.meta
index 1f2a3ecc0..9c605b1e4 100644
--- a/editions/tw5.com/tiddlers/images/green_favicon.png.meta
+++ b/editions/tw5.com/tiddlers/images/green_favicon.png.meta
@@ -1,2 +1,3 @@
 title: $:/green_favicon.ico
 type: image/png
+alt-text: Motovun Jack with green background.
diff --git a/editions/tw5.com/tiddlers/macros/CoreMacros.tid b/editions/tw5.com/tiddlers/macros/CoreMacros.tid
index 01879e3ac..2c46555f3 100644
--- a/editions/tw5.com/tiddlers/macros/CoreMacros.tid
+++ b/editions/tw5.com/tiddlers/macros/CoreMacros.tid
@@ -1,5 +1,6 @@
 created: 20150220180315000
-modified: 20150221222052000
+modified: 20240422084600212
+tags: Reference
 title: Core Macros
 type: text/vnd.tiddlywiki
 
diff --git a/editions/tw5.com/tiddlers/macros/UnusedTitleMacro.tid b/editions/tw5.com/tiddlers/macros/UnusedTitleMacro.tid
index e0cc00433..b39bb5eb1 100644
--- a/editions/tw5.com/tiddlers/macros/UnusedTitleMacro.tid
+++ b/editions/tw5.com/tiddlers/macros/UnusedTitleMacro.tid
@@ -1,6 +1,6 @@
 caption: unusedtitle
 created: 20210104143546885
-modified: 20210427184035684
+modified: 20240119224103283
 tags: Macros [[Core Macros]]
 title: unusedtitle Macro
 type: text/vnd.tiddlywiki
@@ -18,7 +18,10 @@ It uses the same method as the create new tiddler button, a number is appended t
 : <<.from-version "5.2.0">> An ''optional'' string specifying the separator between baseName and the unique number. eg: `separator:"-"`. Defaults to a space: `" "`. If you need an empty separator use the ''template''!
 
 ; template
-: <<.from-version "5.2.0">> A ''optional'' template string can be used to allow you maximum flexibility. If the template string is used, there will always be a counter value. 
+: <<.from-version "5.2.0">> An ''optional'' template string can be used to allow you maximum flexibility. If the template string is used, there will always be a counter value. 
+
+; startCount
+: <<.from-version "5.3.6">> An ''optional'' parameter, that sets the initial value for the new tiddler counter.
 
 !! Template String
 
diff --git a/editions/tw5.com/tiddlers/macros/examples/unusedtitle Macro (Examples 1).tid b/editions/tw5.com/tiddlers/macros/examples/unusedtitle Macro (Examples 1).tid
index 22ece3997..3853299bf 100644
--- a/editions/tw5.com/tiddlers/macros/examples/unusedtitle Macro (Examples 1).tid	
+++ b/editions/tw5.com/tiddlers/macros/examples/unusedtitle Macro (Examples 1).tid	
@@ -1,5 +1,5 @@
 created: 20210227212730299
-modified: 20211118025545823
+modified: 20240119151636562
 tags: [[Macro Examples]]
 title: unusedtitle Macro (Examples 1)
 type: text/vnd.tiddlywiki
@@ -16,6 +16,10 @@ type: text/vnd.tiddlywiki
 <$action-sendmessage $message="tm-new-tiddler" title=<<unusedtitle baseName:"new" template:"$count:2$-$basename$">> />
 \end
 
+\define testStartCount()
+<$action-createtiddler $basetitle=<<unusedtitle startCount:"10" baseName:"new" separator:"-" template:"$count:2$$separator$$basename$">>/>
+\end
+
 ```
 <<unusedtitle template:"$count:2$-new">>
 ```
@@ -43,6 +47,16 @@ New Tiddler
 Create Tiddler
 </$button>
 
+
+```
+<<unusedtitle startCount:"10" baseName:"new" separator:"-" template:"$count:2$$separator$$basename$">>
+```
+
+<$button actions=<<testStartCount>>>
+<$action-setfield $tiddler="$:/state/tab/sidebar--595412856" text="$:/core/ui/SideBar/Recent"/>
+Create Tiddler
+</$button>
+
 ---
 
 <details>
diff --git a/editions/tw5.com/tiddlers/macros/examples/unusedtitle.tid b/editions/tw5.com/tiddlers/macros/examples/unusedtitle.tid
index a86f0d16e..fc9ed29ed 100644
--- a/editions/tw5.com/tiddlers/macros/examples/unusedtitle.tid
+++ b/editions/tw5.com/tiddlers/macros/examples/unusedtitle.tid
@@ -1,5 +1,5 @@
 created: 20210104143940715
-modified: 20210228141241657
+modified: 20240119150720917
 tags: [[unusedtitle Macro]] [[Macro Examples]]
 title: unusedtitle Macro (Examples)
 type: text/vnd.tiddlywiki
@@ -9,7 +9,8 @@ type: text/vnd.tiddlywiki
 <$macrocall $name=".example" n="2" eg="""<<unusedtitle separator:"-">>"""/>
 <$macrocall $name=".example" n="3" eg="""<<unusedtitle baseName:"anotherBase">>"""/>
 <$macrocall $name=".example" n="4" eg="""<<unusedtitle baseName:"About" separator:"-">>"""/>
-<$macrocall $name=".example" n="5" eg="""<<unusedtitle template:"$count:2$-test">>"""/>
+<$macrocall $name=".example" n="5" eg="""<<unusedtitle baseName:"Count" startCount:"3">>"""/>
+<$macrocall $name=".example" n="6" eg="""<<unusedtitle template:"$count:2$-test">>"""/>
 
 ---
 
diff --git a/editions/tw5.com/tiddlers/macros/show-filter-count.tid b/editions/tw5.com/tiddlers/macros/show-filter-count.tid
new file mode 100644
index 000000000..7e026a590
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/show-filter-count.tid
@@ -0,0 +1,21 @@
+
+created: 20240804143842924
+modified: 20240804150223291
+tags: Macros [[Core Macros]]
+title: show-filter-count Macro
+type: text/vnd.tiddlywiki
+
+<<.from-version "5.3.6">> -- The <<.def show-filter-count>> [[macro|Macros]] creates an element, that shows a counter and a button to open the provided filter string in $:/AdvancedSearch
+
+!! Parameters
+
+; filter
+: Needs to be a valid [[filter run|Filters]]
+
+!! Examples
+
+<<wikitext-example-without-html src:"""<<show-filter-count filter:"[tag[HelloThere]]">> -- The number and the icon is click-able""">>
+
+<<wikitext-example-without-html src:"""<<show-filter-count filter:"[has[author]sort[]]">> -- The number and the icon is click-able""">>
+
+Also see: [[$:/core/ui/ControlPanel/TiddlerFields]]
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-edit-text-operation.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-edit-text-operation.tid
index 72cc90381..9aaca9bf3 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-edit-text-operation.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-edit-text-operation.tid	
@@ -1,6 +1,6 @@
 caption: tm-edit-text-operation
 created: 20160424211339792
-modified: 20230803045746596
+modified: 20240909083525060
 tags: Messages
 title: WidgetMessage: tm-edit-text-operation
 type: text/vnd.tiddlywiki
@@ -11,9 +11,9 @@ type: text/vnd.tiddlywiki
 Excises the currently selected text into a new tiddler and replaces it with a link, a macro or a transclude of the new tiddler. Parameters include:
 
 |!Name |!Description |
-|title |Title of the new tiddler the selected content is excised to|
-|type |Type of the replacement to be inserted: Can be one of <<.value "transclude">>, <<.value "link">> or <<.value "macro">>|
-|macro |In case //type=<<.value "macro">>//, specifies the name of the macro to be inserted. The title of the new tiddler is provided as the first parameter to the macro. Defaults to the [[translink macro|translink Macro]]|
+|title |Title of the new tiddler the selected content is excised to |
+|type |Type of the replacement to be inserted: Can be one of <<.value "transclude">>, <<.value "link">> or <<.value "macro">> |
+|macro |In case //type=<<.value "macro">>//, specifies the name of the macro to be inserted. The title of the new tiddler is provided as the first parameter to the macro. Defaults to the [[translink macro|translink Macro]] |
 |tagnew |If '<<.value "yes">>', will tag the new tiddler with the title of the tiddler currently being edited |
 
 </div>
@@ -25,7 +25,7 @@ Excises the currently selected text into a new tiddler and replaces it with a li
 Replaces ''all'' contents of the editor with the provided text.
 
 |!Name |!Description |
-|text |Text to be inserted|
+|text |Text to be inserted |
 
 </div>
 \end
@@ -36,7 +36,7 @@ Replaces ''all'' contents of the editor with the provided text.
 Replaces the current selection with the provided text.
 
 |!Name |!Description |
-|text |Text to be inserted|
+|text |Text to be inserted |
 
 </div>
 \end
@@ -47,8 +47,8 @@ Replaces the current selection with the provided text.
 Prefixes the currently selected line//(s)// with the provided character. If a line is already prefixed by the provided prefix, the prefix is removed instead.
 
 |!Name |!Description |
-|character |Prefix character|
-|count |Number of characters that make up the prefix|
+|character |Prefix character |
+|count |Number of characters that make up the prefix |
 
 ''Example'' Setting //character="<<.value "!">>"// and //count="<<.value "3">>"// would insert the prefix "<<.value "!!!" >>", which will resolve to a subheading when parsed as WikiText.
 
@@ -61,8 +61,8 @@ Prefixes the currently selected line//(s)// with the provided character. If a li
 Surrounds the selected //lines// with the provided <<.param "prefix">> and <<.param "suffix">>.
 
 |!Name |!Description |
-|prefix |String to be prefixed to the selected lines|
-|suffix |Suffix to be inserted after the selected lines|
+|prefix |String to be prefixed to the selected lines |
+|suffix |Suffix to be inserted after the selected lines |
 
 
 </div>
@@ -75,8 +75,9 @@ Surrounds the selected //lines// with the provided <<.param "prefix">> and <<.pa
 Surrounds the current //selection// with the provided <<.param "prefix">> and <<.param "suffix">>.
 
 |!Name |!Description |
-|prefix |String to be prefixed to the selection|
-|suffix |Suffix to be inserted after the selection|
+|prefix |String to be prefixed to the selection |
+|suffix |Suffix to be inserted after the selection |
+|trimSelection |<<.from-version 5.3.6>> Trim leading and trailing white-space from the selection and move it to the surrounding text. Possible values are: `yes`, `no` (default), `start` and `end` |
 
 </div>
 \end
@@ -138,11 +139,11 @@ At this point the following text operations have been implemented:
 |<<.def "wrap-selection">>|<<wrapSelectionDescription>> |
 |<<.def "save-selection">>|<<saveSelectionDescription>> |
 |<<.def "make-link">>|<<makeLinkDescription>> |
-|<<.def "insert-text">>|<<insertTextDescription>>|
+|<<.def "insert-text">>|<<insertTextDescription>> |
 |<<.def "focus-editor">>|<<.from-version 5.2.0>> <<focusEditorDescription>> |
 
 
-!Example
+! Example
 
 An example can be seen in [[$:/core/ui/EditorToolbar/bold]]:
 
@@ -152,6 +153,7 @@ An example can be seen in [[$:/core/ui/EditorToolbar/bold]]:
 	$param="wrap-selection"
 	prefix="''"
 	suffix="''"
+	trimSelection="yes"
 />
 ```
 
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-http-request Examples.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-http-request Examples.tid
index 53ea600ca..3df6bd6a9 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-http-request Examples.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-http-request Examples.tid	
@@ -1,5 +1,5 @@
 created: 20240609152203076
-modified: 20240614210714914
+modified: 20240901142049810
 tags: 
 title: WidgetMessage: tm-http-request Examples
 type: text/vnd.tiddlywiki
@@ -32,6 +32,7 @@ type: text/vnd.tiddlywiki
 	<$action-sendmessage
 		$message="tm-http-request"
 		url="https://httpbin.org/post"
+		header-content-type="application/json"
 		method="POST"
 		body='{"foo": "bar"}'
 		oncompletion=<<store-fetched-output>>
diff --git a/editions/tw5.com/tiddlers/plugins/Railroad Plugin.tid b/editions/tw5.com/tiddlers/plugins/Railroad Plugin.tid
index a08a7b8c3..03913a820 100644
--- a/editions/tw5.com/tiddlers/plugins/Railroad Plugin.tid	
+++ b/editions/tw5.com/tiddlers/plugins/Railroad Plugin.tid	
@@ -5,6 +5,12 @@ tags: OfficialPlugins [[Plugin Editions]]
 title: Railroad Plugin
 type: text/vnd.tiddlywiki
 
+!! Railroad Diagrams
+
+{{Railroad Diagrams}}
+
+!! Plugin
+
 {{$:/plugins/tiddlywiki/railroad/readme}}
 
-{{$:/plugins/tiddlywiki/railroad/syntax}}
\ No newline at end of file
+Learn more about the [[Railroad Plguin Syntax Description|$:/plugins/tiddlywiki/railroad/syntax]]
diff --git a/editions/tw5.com/tiddlers/procedures/Procedures.tid b/editions/tw5.com/tiddlers/procedures/Procedures.tid
index 321284f93..1643fac18 100644
--- a/editions/tw5.com/tiddlers/procedures/Procedures.tid
+++ b/editions/tw5.com/tiddlers/procedures/Procedures.tid
@@ -1,6 +1,6 @@
 created: 20221007124007426
-modified: 20240310173130052
-tags: Concepts Reference
+modified: 20240422090349758
+tags: Concepts [[Core Procedures]]
 title: Procedures
 type: text/vnd.tiddlywiki
 
diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.3.2.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.3.2.tid
index d99d537c1..56f54cbb0 100644
--- a/editions/tw5.com/tiddlers/releasenotes/Release 5.3.2.tid	
+++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.3.2.tid	
@@ -23,13 +23,13 @@ type: text/vnd.tiddlywiki
 These new token-based shortcuts allow a richer structure and expressivity than existing features such as widgets or pragmas. For example:
 
 ```
-<% if [<animal>match[Elephant]] %>
+<%if [<animal>match[Elephant]] %>
   It is an elephant
-<% elseif [<animal>match[Giraffe]] %>
+<%elseif [<animal>match[Giraffe]] %>
 	It is a giraffe
-<% else %>
+<%else%>
 	It is completely unknown
-<% endif %>
+<%endif%>
 ```
 
 Behind the scenes, the conditional shortcut syntax is rendered as the equivalent [[ListWidgets|ListWidget]].
diff --git a/editions/tw5.com/tiddlers/saving/Example config-tiddlyweb-host for IIS.txt.meta b/editions/tw5.com/tiddlers/saving/Example config-tiddlyweb-host for IIS.txt.meta
index 2e5142973..4c9dae0be 100644
--- a/editions/tw5.com/tiddlers/saving/Example config-tiddlyweb-host for IIS.txt.meta	
+++ b/editions/tw5.com/tiddlers/saving/Example config-tiddlyweb-host for IIS.txt.meta	
@@ -1,5 +1,5 @@
 title: Example config-tiddlyweb-host for IIS
 created: 20180328145039530
 modified: 20180328145234871
-tags: Saving
+tags: [[Installing TiddlyWiki on Microsoft Internet Information Server]]
 type: text/plain
diff --git a/editions/tw5.com/tiddlers/saving/Example package.json for IIS.txt.meta b/editions/tw5.com/tiddlers/saving/Example package.json for IIS.txt.meta
index 4d673d6d0..e40a98526 100644
--- a/editions/tw5.com/tiddlers/saving/Example package.json for IIS.txt.meta	
+++ b/editions/tw5.com/tiddlers/saving/Example package.json for IIS.txt.meta	
@@ -1,5 +1,5 @@
 created: 20180328145039530
 modified: 20180328145234871
-tags: Saving
+tags: [[Installing TiddlyWiki on Microsoft Internet Information Server]]
 title: Example package.json for IIS
 type: text/plain
diff --git a/editions/tw5.com/tiddlers/saving/Example tiddlywiki.info for IIS.txt.meta b/editions/tw5.com/tiddlers/saving/Example tiddlywiki.info for IIS.txt.meta
index 6fb2e36fc..dc5911c97 100644
--- a/editions/tw5.com/tiddlers/saving/Example tiddlywiki.info for IIS.txt.meta	
+++ b/editions/tw5.com/tiddlers/saving/Example tiddlywiki.info for IIS.txt.meta	
@@ -1,5 +1,5 @@
 created: 20180328151124878
 modified: 20180328151214616
-tags: Saving
+tags: [[Installing TiddlyWiki on Microsoft Internet Information Server]]
 title: Example tiddlywiki.info for IIS
 type: text/plain
diff --git a/editions/tw5.com/tiddlers/saving/Example web.config for IIS.txt.meta b/editions/tw5.com/tiddlers/saving/Example web.config for IIS.txt.meta
index 749fdcc68..2c8870758 100644
--- a/editions/tw5.com/tiddlers/saving/Example web.config for IIS.txt.meta	
+++ b/editions/tw5.com/tiddlers/saving/Example web.config for IIS.txt.meta	
@@ -1,5 +1,5 @@
 created: 20180328145259455
 modified: 20180701185215523
-tags: Saving
+tags: [[Installing TiddlyWiki on Microsoft Internet Information Server]]
 title: Example web.config for IIS
 type: text/plain
diff --git a/editions/tw5.com/tiddlers/saving/Saving on TidGi.tid b/editions/tw5.com/tiddlers/saving/Saving on TidGi.tid
index 8290254c6..26263ed69 100644
--- a/editions/tw5.com/tiddlers/saving/Saving on TidGi.tid	
+++ b/editions/tw5.com/tiddlers/saving/Saving on TidGi.tid	
@@ -1,4 +1,4 @@
-caption: TidGi Desktop
+caption: ~TidGi Desktop
 color: #FF8A65
 community-author: LinOnetwo
 created: 20220221080637764
diff --git a/editions/tw5.com/tiddlers/saving/Saving with FireFox.tid b/editions/tw5.com/tiddlers/saving/Saving with FireFox.tid
index b64f695c4..2a3b3bd19 100644
--- a/editions/tw5.com/tiddlers/saving/Saving with FireFox.tid	
+++ b/editions/tw5.com/tiddlers/saving/Saving with FireFox.tid	
@@ -1,4 +1,4 @@
-caption: Saving with FireFox
+caption: Saving with ~FireFox
 created: 20230803205140949
 modified: 20230803213246739
 tags: Saving Firefox
diff --git a/editions/tw5.com/tiddlers/saving/Saving with TiddlyPWA.tid b/editions/tw5.com/tiddlers/saving/Saving with TiddlyPWA.tid
new file mode 100644
index 000000000..c8555bdd0
--- /dev/null
+++ b/editions/tw5.com/tiddlers/saving/Saving with TiddlyPWA.tid	
@@ -0,0 +1,15 @@
+caption: ~TiddlyPWA
+color: #E056B4
+community-author: Val Packett
+created: 20240902162617154
+delivery: Progressive Web Application
+description: Save to Browser Storage
+method: save
+modified: 20240902162617154
+tags: Chrome Firefox Linux Mac Opera Safari Saving Windows iOS Edge
+title: TiddlyPWA - Save to Browser Storage
+type: text/vnd.tiddlywiki
+
+~TiddlyPWA turns TiddlyWiki 5 into an offline-first Progressive Web App with encrypted local persistent storage and efficient synchronization with a self-hosted server that can easily be hosted for free.
+
+https://tiddly.packett.cool/
diff --git a/editions/tw5.com/tiddlers/system/doc-macros.tid b/editions/tw5.com/tiddlers/system/doc-macros.tid
index d0574fe5f..199479fb8 100644
--- a/editions/tw5.com/tiddlers/system/doc-macros.tid
+++ b/editions/tw5.com/tiddlers/system/doc-macros.tid
@@ -119,7 +119,7 @@ type: text/vnd.tiddlywiki
 \procedure .infoBox(text:"", title, icon:"$:/core/images/info-button", class, iconSize:"1.4rem")
 \function _f.tipClass() [[doc-icon-block]] [<class>!is[blank]then<class>] +[join[ ]]
 <div class=<<_f.tipClass>>>
-	<%if [<title>!is[blank]] %><div>''<<title>>''</div><% endif %>
+	<%if [<title>!is[blank]] %><div>''<<title>>''</div><%endif%>
 	<div class="doc-block-icon"><$transclude $tiddler=<<icon>> size=<<iconSize>>/></div>
 	<<text>>
 </div>
diff --git a/editions/tw5.com/tiddlers/system/filter-run-template.tid b/editions/tw5.com/tiddlers/system/filter-run-template.tid
index 73b4a2510..c559d8bdd 100644
--- a/editions/tw5.com/tiddlers/system/filter-run-template.tid
+++ b/editions/tw5.com/tiddlers/system/filter-run-template.tid
@@ -9,18 +9,18 @@ type: text/vnd.tiddlywiki
 \whitespace trim
 
 \procedure .op-place()
-<% if [<op-name>!is[blank]] %>
+<%if [<op-name>!is[blank]] %>
 	<$macrocall $name=".place" _=<<op-name>> /><span class="tc-tiny-gap">=</span>
-<% endif %>
+<%endif%>
 \end
 
 \procedure .op-row()
-<% if [<op-body>!is[blank]] %>
+<%if [<op-body>!is[blank]] %>
 	<tr>
 		<th align="left"><<op-head>></th>
 		<td><<.op-place>><<op-body>></td>
 	</tr>
-<% endif %>
+<%endif%>
 \end
 
 <$list filter="[all[current]tag[Named Filter Run Prefix]]">
diff --git a/editions/tw5.com/tiddlers/system/operator-macros.tid b/editions/tw5.com/tiddlers/system/operator-macros.tid
index 2b19d56db..e2dce9e2d 100644
--- a/editions/tw5.com/tiddlers/system/operator-macros.tid
+++ b/editions/tw5.com/tiddlers/system/operator-macros.tid
@@ -16,9 +16,9 @@ title: $:/editions/tw5.com/operator-macros
 	<$list filter="[title<.state-prefix>addsuffix{!!title}addsuffix[/]addsuffix<n>]" variable=".state">
 		<$reveal state=<<.state>> type="nomatch" text="show">
 			<code><$text text=<<eg>>/></code>
-			<% if [<ie>!is[blank]] %>
+			<%if [<ie>!is[blank]] %>
 				<dd>&rarr;&nbsp;<<ie>></dd>
-			<% endif %>
+			<%endif%>
 			<dl>
 				<dd><$button actions=<<.operator-example-tryit-actions>>>Try it</$button></dd>
 			</dl>
diff --git a/editions/tw5.com/tiddlers/system/operator-template.tid b/editions/tw5.com/tiddlers/system/operator-template.tid
index f4f3e08ef..47096f79c 100644
--- a/editions/tw5.com/tiddlers/system/operator-template.tid
+++ b/editions/tw5.com/tiddlers/system/operator-template.tid
@@ -8,17 +8,17 @@ title: $:/editions/tw5.com/operator-template
 \whitespace trim
 
 \procedure .op-place()
-<% if [<op-name>!is[blank]] %>
+<%if [<op-name>!is[blank]] %>
 	<$macrocall $name=".place" _=<<op-name>> /><span class="tc-tiny-gap">=</span>
-<% endif %>
+<%endif%>
 \end
 
 \procedure .op-row()
-<% if [<op-body>!is[blank]] %>
+<%if [<op-body>!is[blank]] %>
 	<tr>
 		<th align="left"><<op-head>></th><td><<.op-place>><<op-body>></td>
 	</tr>
-<% endif %>
+<%endif%>
 \end
 
 <$list filter="[all[current]tag[Filter Operators]]">
diff --git a/editions/tw5.com/tiddlers/system/version-macros.tid b/editions/tw5.com/tiddlers/system/version-macros.tid
index 55ef03687..35e98cf71 100644
--- a/editions/tw5.com/tiddlers/system/version-macros.tid
+++ b/editions/tw5.com/tiddlers/system/version-macros.tid
@@ -19,20 +19,22 @@ type: text/vnd.tiddlywiki
 \end
 
 \procedure .from-version(version)
-<% if [<version>compare:version:gteq<tf.from-version-reference>] %>
+<%if [<version>compare:version:gteq<tf.from-version-reference>] %>
 	<<.from-version-template "doc-from-version doc-from-version-new" "New in v">>
-<% else %>
+<%else%>
 	<<.from-version-template "doc-from-version" "Introduced in v">>
-<% endif %>
+<%endif%>
 \end
 
-\procedure .deprecated-since(version, superseded:"TODO-Link")
+\procedure .deprecated-since(version, superseded:"")
 <$link to="Deprecated - What does it mean" class="doc-deprecated-version tc-btn-invisible">
 	{{$:/core/images/warning}}
-	<span class="tc-tiny-gap">Deprecated since:</span>
-	<$text text=<<version>>/>
+	<span class="tc-tiny-gap">Deprecated from </span>
+	v<$text text=<<version>>/>
 </$link>
-<span class="tc-tiny-gap-left">
-	(see <$link class="tc-tiny-gap-left" to=<<superseded>>><$text text=<<superseded>>/></$link>)
-</span>
+<%if [<superseded>else[]!match[]] %>
+	<span class="tc-tiny-gap-left">
+		(see <$link class="tc-tiny-gap-left" to=<<superseded>>><$text text=<<superseded>>/></$link>)
+	</span>
+<%endif%>
 \end
diff --git a/editions/tw5.com/tiddlers/system/wikitext-macros.tid b/editions/tw5.com/tiddlers/system/wikitext-macros.tid
index e4a898ad8..796f949a7 100644
--- a/editions/tw5.com/tiddlers/system/wikitext-macros.tid
+++ b/editions/tw5.com/tiddlers/system/wikitext-macros.tid
@@ -89,10 +89,13 @@ type: text/vnd.tiddlywiki
 \end
 
 \procedure flex-card(class,bordercolor:"",backgroundcolor:"",textcolor:"",imageField:"image",captionField:"caption",subtitle:"",descriptionField:"description",linkField:"link")
-<$link class={{{ [<class>addprefix[tc-card ]] }}} to={{{ [<currentTiddler>get<linkField>else<currentTiddler>] }}}>
+<$link class={{{ [<class>addprefix[tc-card ]] }}}
+	to={{{ [<currentTiddler>get<linkField>else<currentTiddler>] }}}
+	aria-label=<<currentTiddler>>
+>
 	<div class="tc-card-accent" style.borderTop={{{ [<bordercolor>!is[blank]addprefix[5px solid ]] }}} style.background={{!!background}} style.backgroundColor=<<backgroundcolor>> style.color=<<textcolor>> style.fill=<<textcolor>>>
 		<$list filter="[<currentTiddler>has[ribbon-text]]" variable="ignore">
-			<div class="tc-card-ribbon-wrapper">
+			<div class="tc-card-ribbon-wrapper" aria-hidden="true">
 				<div class="tc-card-ribbon" style.backgroundColor={{{ [<currentTiddler>get[ribbon-color]else[red]] }}}>
 					<div class="tc-card-ribbon-inner">
 						<$text text={{!!ribbon-text}}/>
@@ -102,7 +105,9 @@ type: text/vnd.tiddlywiki
 		</$list>
 		<$list filter="[<currentTiddler>has<imageField>]" variable="ignore">
 			<div class="tc-card-image">
-				<$image source={{{ [<currentTiddler>get<imageField>] }}}/>
+				<$image source={{{ [<currentTiddler>get<imageField>] }}}
+					alt={{{ [<currentTiddler>get<imageField>get[alt-text]else[Image.]] }}}
+				/>
 			</div>
 		</$list>
 		<div class="tc-card-title"><$transclude field=<<captionField>>><$view field="title"/></$transclude></div>
diff --git a/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_ControlPanel_SettingsTab.tid b/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_ControlPanel_SettingsTab.tid
new file mode 100644
index 000000000..2f08ea686
--- /dev/null
+++ b/editions/tw5.com/tiddlers/systemtags/SystemTag_ $__tags_ControlPanel_SettingsTab.tid	
@@ -0,0 +1,9 @@
+caption: $:/tags/ControlPanel/SettingsTab
+created: 20240813060717747
+description: marks elements to be placed under "Settings" tab in Control Panel
+modified: 20240813060843043
+tags: SystemTags
+title: SystemTag: $:/tags/ControlPanel/SettingsTab
+type: text/vnd.tiddlywiki
+
+The [[system tag|SystemTags]] `$:/tags/ControlPanel/SettingsTab` marks elements to be placed under "Settings" tab in [[$:/ControlPanel]]
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/testcases/DataWidget/ImportCustomTitle.tid b/editions/tw5.com/tiddlers/testcases/DataWidget/ImportCustomTitle.tid
new file mode 100644
index 000000000..5eb48cde4
--- /dev/null
+++ b/editions/tw5.com/tiddlers/testcases/DataWidget/ImportCustomTitle.tid
@@ -0,0 +1,29 @@
+title: TestCases/DataWidget/ImportCustomTitle
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+description: Importing a payload tiddler and overwriting the title
+display-format: plaintext
+
+title: Narrative
+
+Importing a payload tiddler and overwriting the title
++
+title: Output
+
+\whitespace trim
+<$data $tiddler="HelloThere" title="RealTitle"/>
++
+title: HelloThere
+tags: Definitions
+
+This is the tiddler HelloThere
++
+title: ExpectedResult
+
+<p>[
+    {
+        "title": "RealTitle",
+        "tags": "Definitions",
+        "text": "This is the tiddler HelloThere"
+    }
+]</p>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/testcases/HTML/BlockModeInHTMLTable.tid b/editions/tw5.com/tiddlers/testcases/HTML/BlockModeInHTMLTable.tid
new file mode 100644
index 000000000..f7050de7d
--- /dev/null
+++ b/editions/tw5.com/tiddlers/testcases/HTML/BlockModeInHTMLTable.tid
@@ -0,0 +1,30 @@
+created: 20240713164810184
+description: Block mode for table cells
+modified: 20240713164810184
+tags: $:/tags/wiki-test-spec
+title: TestCases/HTML/BlockModeInHTMLTable
+type: text/vnd.tiddlywiki-multiple
+
+title: Narrative
+
+Unlike the table wiki syntax, the less convenient `<table>`, `<tr>`, `<td>` html tags can use a blank line
+to get block mode punctuation regognised inside of table cells.
++
+title: Output
+
+<table>
+<tr><td>
+
+* list item one
+* list item two
+</td><td>
+
+|nested|table|
+</td></tr>
+</table>
++
+title: ExpectedResult
+
+<p><table>
+<tr><td><ul><li>list item one</li><li>list item two</li></ul></td><td><table><tbody><tr class="evenRow"><td>nested</td><td>table</td></tr></tbody></table></td></tr>
+</table></p>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/testcases/HTML/OpenTagBlankLine.tid b/editions/tw5.com/tiddlers/testcases/HTML/OpenTagBlankLine.tid
new file mode 100644
index 000000000..0c14b0527
--- /dev/null
+++ b/editions/tw5.com/tiddlers/testcases/HTML/OpenTagBlankLine.tid
@@ -0,0 +1,23 @@
+created: 20240622142425004
+description: Blank line after open tag
+modified: 20240622144230258
+tags: $:/tags/wiki-test-spec
+title: TestCases/HTML/OpenTagBlankLine
+type: text/vnd.tiddlywiki-multiple
+
+title: Narrative
+
+A blank line after an open html tag allows block mode punctuation to be recognised
++
+title: Output
+
+<div>
+
+* blank line after open tag allows
+* block mode punctuation (i.e. this list) to
+* be recognised
+</div>
++
+title: ExpectedResult
+
+<div><ul><li>blank line after open tag allows</li><li>block mode punctuation (i.e. this list) to</li><li>be recognised</li></ul></div>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/testcases/HTML/OpenTagBlankLineInBoldSyntax.tid b/editions/tw5.com/tiddlers/testcases/HTML/OpenTagBlankLineInBoldSyntax.tid
new file mode 100644
index 000000000..f6072bca4
--- /dev/null
+++ b/editions/tw5.com/tiddlers/testcases/HTML/OpenTagBlankLineInBoldSyntax.tid
@@ -0,0 +1,22 @@
+created: 20240622144038465
+description: Blank line after open tag in bold syntax
+modified: 20240622145114506
+tags: $:/tags/wiki-test-spec
+title: TestCases/HTML/OpenTagBlankLineInBoldSyntax
+type: text/vnd.tiddlywiki-multiple
+
+title: Narrative
+
+A blank line after an open html tag allows block mode punctuation to be recognised even when the html is embedded within inline punctuation (bold here).
++
+title: Output
+
+''<div>
+
+* list item one
+* list item two
+</div>''
++
+title: ExpectedResult
+
+<p><strong><div><ul><li>list item one</li><li>list item two</li></ul></div></strong></p>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/testcases/HTML/OpenTagBlankLineInTableSyntax.tid b/editions/tw5.com/tiddlers/testcases/HTML/OpenTagBlankLineInTableSyntax.tid
new file mode 100644
index 000000000..0835c47bc
--- /dev/null
+++ b/editions/tw5.com/tiddlers/testcases/HTML/OpenTagBlankLineInTableSyntax.tid
@@ -0,0 +1,22 @@
+created: 20240622144753311
+description: Blank line after open tag in table syntax
+modified: 20240622145056299
+tags: $:/tags/wiki-test-spec
+title: TestCases/HTML/OpenTagBlankLineInTableSyntax
+type: text/vnd.tiddlywiki-multiple
+
+title: Narrative
+
+A blank line after an open html tag cannot work when used inside table syntax since each row of a table must be all on one line
++
+title: Output
+
+|For a blank line after open tag|<div>
+
+* list is recognised
+* but the surrounding table row is not
+</div>|
++
+title: ExpectedResult
+
+<p>|For a blank line after open tag|<div><ul><li>list is recognised</li><li>but the surrounding table row is not</li></ul></div>|</p>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/testcases/HTML/OpenTagNoBlankLine.tid b/editions/tw5.com/tiddlers/testcases/HTML/OpenTagNoBlankLine.tid
new file mode 100644
index 000000000..e49fcabfb
--- /dev/null
+++ b/editions/tw5.com/tiddlers/testcases/HTML/OpenTagNoBlankLine.tid
@@ -0,0 +1,34 @@
+created: 20240622143533021
+description: No blank line after open tag
+modified: 20240622145145440
+tags: $:/tags/wiki-test-spec
+title: TestCases/HTML/OpenTagNoBlankLine
+type: text/vnd.tiddlywiki-multiple
+
+title: Narrative
+
+Block mode punctuation is not recognised when HTML open tag is not followed by a blank line
++
+title: Output
+
+<div>
+* Open tag without a blank line means
+* block mode punctuation (i.e. this list) will
+* NOT be recognised.
+
+Paragraphs are only recognised in block mode. Even with blank lines, new paragraphs are not recognised.
+
+This also is not a new paragraph.
+</div>
++
+title: ExpectedResult
+
+<p><div>
+* Open tag without a blank line means
+* block mode punctuation (i.e. this list) will
+* NOT be recognised.
+
+Paragraphs are only recognised in block mode. Even with blank lines, new paragraphs are not recognised.
+
+This also is not a new paragraph.
+</div></p>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/variables/Core Variables.tid b/editions/tw5.com/tiddlers/variables/Core Variables.tid
index ab19181eb..3b2fa070b 100644
--- a/editions/tw5.com/tiddlers/variables/Core Variables.tid	
+++ b/editions/tw5.com/tiddlers/variables/Core Variables.tid	
@@ -1,12 +1,13 @@
 created: 20150220161908000
-modified: 20150228134138000
+modified: 20240421144847774
+tags: Reference
 title: Core Variables
 type: text/vnd.tiddlywiki
 
 The following [[variables|Variables]] are built into ~TiddlyWiki's core:
 
-<<list-links "[tag[Core Variables]] -[tag[Configuration Variables]]">>
+<<list-links filter:"[tag[Core Variables]] -[tag[Configuration Variables]]" class:"multi-columns">>
 
 The core will also use various configuration variables and macros if you define them:
 
-<<list-links "[tag[Configuration Variables]]">>
+<<list-links filter:"[tag[Configuration Variables]]"  class:"multi-columns">>
diff --git a/editions/tw5.com/tiddlers/variables/Variables.tid b/editions/tw5.com/tiddlers/variables/Variables.tid
index 116f3c9a0..43387eb4f 100644
--- a/editions/tw5.com/tiddlers/variables/Variables.tid
+++ b/editions/tw5.com/tiddlers/variables/Variables.tid
@@ -1,6 +1,6 @@
 created: 20141002133113496
-modified: 20230422150445336
-tags: Concepts Reference WikiText
+modified: 20240422084347375
+tags: Concepts WikiText
 title: Variables
 type: text/vnd.tiddlywiki
 
diff --git a/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 1.tid b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 1.tid
index 57aee6673..ccc085e05 100644
--- a/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 1.tid	
+++ b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 1.tid	
@@ -1,26 +1,15 @@
 created: 20200131142401129
-modified: 20211113230406823
+modified: 20240602154417754
 tags: ActionCreateTiddlerWidget
 title: ActionCreateTiddlerWidget Example 1
 type: text/vnd.tiddlywiki
 
-\define testCreate()
-<$action-createtiddler />
-\end
-
-This example will create "New Tiddler", "New Tiddler 1", " New Tiddler 2" and so on
-
-```
-\define testCreate()
-<$action-createtiddler />
-\end
+<$testcase>
+<$data title=Description text="Default widget with no attributes"/>
+<$data title=Narrative text='The button in this example uses the $action-createtiddler widget to create "New Tiddler", "New Tiddler 1", " New Tiddler 2" and so on'/>
+<$data title=Output text="""\procedure testCreate() <$action-createtiddler />
 
 <$button actions=<<testCreate>> >
 Create Tiddler
-</$button>
-```
-
-<$button actions=<<testCreate>> >
-<$action-setfield $tiddler="$:/state/tab/sidebar--595412856" text="$:/core/ui/SideBar/Recent"/>
-Create Tiddler
-</$button> - Clicking this button, will also open the Right sidebar: Recent tab
+</$button>"""/>
+</$testcase>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 2.tid b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 2.tid
index 336972a16..a9d204e75 100644
--- a/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 2.tid	
+++ b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 2.tid	
@@ -1,28 +1,20 @@
 created: 20200131144828713
-modified: 20211113011036840
+modified: 20240602160133371
 tags: ActionCreateTiddlerWidget
 title: ActionCreateTiddlerWidget Example 2
 type: text/vnd.tiddlywiki
 
-\define testCreate()
-<$action-createtiddler $basetitle={{$:/language/DefaultNewTiddlerTitle}} $overwrite="yes"/>
-\end
+<$testcase>
+<$data title=Description text="Transcluded base title"/>
+<$data title=Narrative text="""The $action-createtiddler widget in this example uses the base title defined in [[$:/language/DefaultNewTiddlerTitle]].
 
-This example will use the base title defined in [[$:/language/DefaultNewTiddlerTitle]]. 
-
-It will overwrite the tiddler, if the button is clicked several times.
-
-```
-\define testCreate()
+It will overwrite the tiddler if the button is clicked several times."""/>
+<$data $tiddler="$:/language/DefaultNewTiddlerTitle"/>
+<$data title=Output text="""\procedure testCreate()
 <$action-createtiddler $basetitle={{$:/language/DefaultNewTiddlerTitle}} $overwrite="yes"/>
 \end
 
 <$button actions=<<testCreate>> >
 Create Tiddler
-</$button>
-```
-
-<$button actions=<<testCreate>> >
-<$action-setfield $tiddler="$:/state/tab/sidebar--595412856" text="$:/core/ui/SideBar/Recent"/>
-Create Tiddler
-</$button> - Clicking this button, will also open the Right sidebar: Recent tab
+</$button>"""/>
+</$testcase>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 3.tid b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 3.tid
index 2e137e330..a981bfe92 100644
--- a/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 3.tid	
+++ b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 3.tid	
@@ -1,28 +1,21 @@
 created: 20200131145355658
-modified: 20211113011111052
+modified: 20240602155233116
 tags: ActionCreateTiddlerWidget
 title: ActionCreateTiddlerWidget Example 3
 type: text/vnd.tiddlywiki
 
-\define testCreate()
-<$action-createtiddler $basetitle="base" $template="ActionCreateTiddlerWidget Template"/>
-\end
+<$testcase>
+<$data title=Description text="Template and custom base title"/>
+<$data title=Narrative text="""The $action-createtiddler widget in this example uses the basetitle attribute and template: [[ActionCreateTiddlerWidget Template]].
 
-This example will uses a base-title and a template: [[ActionCreateTiddlerWidget Template]]
-
-It will create: "base", "base 1", "base 2" and so on 
-
-```
-\define testCreate()
+Clicking the button will create: "base", "base 1", "base 2" and so on
+"""/>
+<$data $tiddler="ActionCreateTiddlerWidget Template"/>
+<$data title=Output text="""\procedure testCreate()
 <$action-createtiddler $basetitle="base" $template="ActionCreateTiddlerWidget Template"/>
 \end
 
 <$button actions=<<testCreate>> >
 Create Tiddler
-</$button>
-```
-
-<$button actions=<<testCreate>> >
-<$action-setfield $tiddler="$:/state/tab/sidebar--595412856" text="$:/core/ui/SideBar/Recent"/>
-Create Tiddler
-</$button> - Clicking this button will also open the Right sidebar: Recent tab
+</$button>"""/>
+</$testcase>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 4.tid b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 4.tid
index 1335893e5..b633f4359 100644
--- a/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 4.tid	
+++ b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 4.tid	
@@ -1,28 +1,21 @@
 created: 20200131150229551
-modified: 20211113011129601
+modified: 20240602154933113
 tags: ActionCreateTiddlerWidget
 title: ActionCreateTiddlerWidget Example 4
 type: text/vnd.tiddlywiki
 
-\define testCreate()
-<$action-createtiddler $basetitle="base" $template="ActionCreateTiddlerWidget Template" aa="new field aa" bb="new field bb" />
-\end
-
-This example uses a base-title "base" and a template: [[ActionCreateTiddlerWidget Template]].
+<$testcase>
+<$data title=Description text="Template with override fields and custom base title"/>
+<$data title=Narrative text="""The $action-createtiddler widget in this example uses the basetitle attribute and template: [[ActionCreateTiddlerWidget Template]].
 
 There will be new fields "aa" and "bb" which are added to the new tiddlers.
-
-```
-\define testCreate()
+"""/>
+<$data $tiddler="ActionCreateTiddlerWidget Template"/>
+<$data title=Output text="""\procedure testCreate()
 <$action-createtiddler $basetitle="base" $template="ActionCreateTiddlerWidget Template" aa="new field aa" bb="new field bb" />
 \end
 
 <$button actions=<<testCreate>> >
 Create Tiddler
-</$button>
-```
-
-<$button actions=<<testCreate>> >
-<$action-setfield $tiddler="$:/state/tab/sidebar--595412856" text="$:/core/ui/SideBar/Recent"/>
-Create Tiddler
-</$button> - Clicking this button will also open the Right sidebar: Recent tab
+</$button>"""/>
+</$testcase>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 5.tid b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 5.tid
index 03f719b8b..d0346d781 100644
--- a/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 5.tid	
+++ b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget Example 5.tid	
@@ -1,32 +1,20 @@
 created: 20200131144828713
-modified: 20230111220933412
+modified: 20240602155008453
 tags: ActionCreateTiddlerWidget
 title: ActionCreateTiddlerWidget Example 5
 type: text/vnd.tiddlywiki
 
-\define testCreate()
+<$testcase>
+<$data title=Description text="Child action widget uses the created tiddler title"/>
+<$data title=Narrative text="""The $action-createtiddler widget in this example uses the <<.var createTiddler-title>> variable to navigate to the created tiddler"""/>
+<$data $tiddler="ActionCreateTiddlerWidget Template"/>
+<$data title=Output text="""\procedure testCreate()
 <$action-createtiddler  $basetitle="base" $template="ActionCreateTiddlerWidget Template">
-	<$action-sendmessage $message="tm-edit-tiddler" $param=<<createTiddler-title>>/>
-</$action-createtiddler>
-\end
-
-This example will use the base title defined in [[ActionCreateTiddlerWidget Template]].
-
-It will create: "base", "base 1", "base 2" and so on, and navigate to this tiddler in draft mode.
-
-```
-\define testCreate()
-<$action-createtiddler $basetitle="base" $template="ActionCreateTiddlerWidget Template">
-	<$action-sendmessage $message="tm-edit-tiddler" $param=<<createTiddler-title>>/>
+	<$action-navigate $to=<<createTiddler-title>>/>
 </$action-createtiddler>
 \end
 
 <$button actions=<<testCreate>> >
 Create Tiddler
-</$button>
-```
-
-<$button actions=<<testCreate>> >
-<$action-setfield $tiddler="$:/state/tab/sidebar--595412856" text="$:/core/ui/SideBar/Recent"/>
-Create Tiddler
-</$button> - Clicking this button, will also open the Right sidebar: Recent tab
+</$button>"""/>
+</$testcase>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget.tid b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget.tid
index 632b71686..85cb8ade8 100644
--- a/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget.tid
@@ -1,6 +1,6 @@
 caption: action-createtiddler
 created: 20161020152745942
-modified: 20230115084716196
+modified: 20240602153213986
 tags: Widgets ActionWidgets
 title: ActionCreateTiddlerWidget
 type: text/vnd.tiddlywiki
@@ -37,37 +37,6 @@ The ''action-createtiddler'' widget is invisible.
 
 ! Examples
 
-<<<
-<$macrocall $name='wikitext-example-without-html' src={{ActionCreateTiddlerWidget Example}}/>
-<<<
-
----
-
-<<<
-<$transclude tiddler="ActionCreateTiddlerWidget Example 1" mode=block/>
-<<<
-
----
-
-<<<
-{{ActionCreateTiddlerWidget Example 2}}
-<<<
-
----
-
-<<<
-{{ActionCreateTiddlerWidget Example 3}}
-<<<
-
----
-
-<<<
-{{ActionCreateTiddlerWidget Example 4}}
-<<<
-
----
-
-<<<
-{{ActionCreateTiddlerWidget Example 5}}
-<<<
-
+<$list filter="[prefix[ActionCreateTiddlerWidget Example]]">
+<$transclude/>
+</$list>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget_Example.tid b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget_Example.tid
index 2a431ead9..728ed4576 100644
--- a/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget_Example.tid
+++ b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget_Example.tid
@@ -1,14 +1,24 @@
 created: 20161020153426686
-modified: 20211113011019510
+modified: 20240602160452171
 tags: ActionCreateTiddlerWidget
 title: ActionCreateTiddlerWidget Example
 type: text/vnd.tiddlywiki
 
+<$testcase>
+<$data title=Description text="Create a new page control button"/>
+<$data title=Narrative text="""Use the $action-createtiddler widget to create and open a new, non-functional page control button tiddler"""/>
+<$data title=Output text="""\procedure testCreate()
+<$action-createtiddler $basetitle="Homemade Button" tags="$:/tags/PageControls" text={{$:/state/new-button-caption}}>
+	<$action-navigate $to=<<createTiddler-title>>/>
+</$action-createtiddler>
+\end
+
+{{$:/core/ui/SideBarSegments/page-controls}}
+
 Caption for new button: <$edit-text tiddler="$:/state/new-button-caption" tag="input" default=""/>
 
-<$button>
-<$action-createtiddler $basetitle="Homemade Button" tags="$:/tags/PageControls" text={{$:/state/new-button-caption}}>
-<$action-navigate $to=<<createTiddler-title>>/>
-</$action-createtiddler>
-Create a new non-functional page control button and open the tiddler
-</$button>
\ No newline at end of file
+<$button actions=<<testCreate>> >
+Create Tiddler
+</$button>"""/>
+<$data title="$:/state/new-button-caption" text="button text "/>
+</$testcase>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/widgets/CodeblockWidget.tid b/editions/tw5.com/tiddlers/widgets/CodeblockWidget.tid
index acdab9ef9..e6e7bd166 100644
--- a/editions/tw5.com/tiddlers/widgets/CodeblockWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/CodeblockWidget.tid
@@ -1,6 +1,6 @@
 caption: codeblock
 created: 20151103160200000
-modified: 20160817175325205
+modified: 20240809074611002
 tags: Widgets
 title: CodeBlockWidget
 type: text/vnd.tiddlywiki
@@ -22,7 +22,7 @@ The content of the `<$codeblock>` widget is ignored.
 
 The `language` attribute accepts either:
 
-* a Highlight.js language code (see https://highlightjs.org/static/demo/ for a list)
+* a Highlight.js language code (see https://highlightjs.org/demo for a list)
 * a MIME type (eg, `text/html` or `image/svg+xml`)
 
 ! Examples
diff --git a/editions/tw5.com/tiddlers/widgets/Custom Widgets.tid b/editions/tw5.com/tiddlers/widgets/Custom Widgets.tid
index b8c48b2c3..847bdeed9 100644
--- a/editions/tw5.com/tiddlers/widgets/Custom Widgets.tid	
+++ b/editions/tw5.com/tiddlers/widgets/Custom Widgets.tid	
@@ -1,6 +1,6 @@
 created: 20221007144237585
-modified: 20230921180332436
-tags: Concepts Reference
+modified: 20240422084734129
+tags: Concepts
 title: Custom Widgets
 type: text/vnd.tiddlywiki
 
diff --git a/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid b/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid
index dcfd088fb..609cf36ff 100644
--- a/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid
@@ -75,7 +75,7 @@ eg="""<$edit-text tiddler=<<currentTiddler>> field="heading" size="25" focus="ye
 eg="""\procedure onInput()
   <%if [get[temp]match[$:/]] %>
 		<$action-confirm $message="Yes, this is how system tiddler names begin!"/>
-  <% endif %>
+  <%endif%>
 \end
 
 Type a new tiddler name, starting with the system prefix `$:/`: <$edit-text inputActions=<<onInput>> field="temp" class="tc-edit-texteditor"/>
diff --git a/editions/tw5.com/tiddlers/widgets/EditWidget.tid b/editions/tw5.com/tiddlers/widgets/EditWidget.tid
index 2b72aa8ec..6822d4d77 100644
--- a/editions/tw5.com/tiddlers/widgets/EditWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/EditWidget.tid
@@ -26,7 +26,7 @@ The content of the `<$edit>` widget is ignored.
 
 ! Examples
 
-!! Edit the contents (text field) of a tiddler titled <%if [<now YYYY-0MM-0DD>is[tiddler]] %> <$tiddler tiddler=<<now YYYY-0MM-0DD>> > <$link/></$tiddler> <%else %> with today’s date <% endif %>
+!! Edit the contents (text field) of a tiddler titled <%if [<now YYYY-0MM-0DD>is[tiddler]] %> <$tiddler tiddler=<<now YYYY-0MM-0DD>> > <$link/></$tiddler> <%else %> with today’s date <%endif%>
 
 <$macrocall $name=".example" n="1"
 eg="""<$edit tiddler=<<now YYYY-0MM-0DD>> class="tc-edit-texteditor"/>
diff --git a/editions/tw5.com/tiddlers/widgets/Widgets.tid b/editions/tw5.com/tiddlers/widgets/Widgets.tid
index 66793f47d..1b65189b4 100644
--- a/editions/tw5.com/tiddlers/widgets/Widgets.tid
+++ b/editions/tw5.com/tiddlers/widgets/Widgets.tid
@@ -1,6 +1,6 @@
 created: 20140908130500000
-modified: 20240326164134356
-tags: Concepts Reference
+modified: 20240422083334052
+tags: Concepts [[Core Widgets]]
 title: Widgets
 type: text/vnd.tiddlywiki
 
@@ -14,6 +14,4 @@ Each class of widget contributes a specific ability to the overall functionality
 
 The more specialised widgets use a general-purpose [[widget syntax|Widgets in WikiText]] as their only possible WikiText representation.
 
-The following classes of widget are built into the core:
 
-<<list-links "[tag[Widgets]]" class:"multi-columns">>
diff --git a/editions/tw5.com/tiddlers/wikitext/Conditional Shortcut Syntax.tid b/editions/tw5.com/tiddlers/wikitext/Conditional Shortcut Syntax.tid
index 8cef3acfb..48ff59757 100644
--- a/editions/tw5.com/tiddlers/wikitext/Conditional Shortcut Syntax.tid	
+++ b/editions/tw5.com/tiddlers/wikitext/Conditional Shortcut Syntax.tid	
@@ -11,40 +11,40 @@ Within an "if" or "elseif" clause, the variable `condition` contains the value o
 A simple example:
 
 <$macrocall $name='wikitext-example-without-html'
-src='<% if [{$:/info/url/protocol}match[file:]] %>
+src='<%if [{$:/info/url/protocol}match[file:]] %>
   Loaded from a file URI
-<% else %>
+<%else%>
   Not loaded from a file URI
-<% endif %>
+<%endif%>
 '/>
 
-One or more `<% elseif %>` clauses may be included before the `<% else %>` clause:
+One or more `<%elseif%>` clauses may be included before the `<%else%>` clause:
 
 <$macrocall $name='wikitext-example-without-html'
-src='<% if [{$:/info/url/protocol}match[file:]] %>
+src='<%if [{$:/info/url/protocol}match[file:]] %>
   Loaded from a file URI
-<% elseif [{$:/info/url/protocol}match[https:]] %>
+<%elseif [{$:/info/url/protocol}match[https:]] %>
   Loaded from an HTTPS URI
-<% elseif [{$:/info/url/protocol}match[http:]] %>
+<%elseif [{$:/info/url/protocol}match[http:]] %>
   Loaded from an HTTP URI
-<% else %>
+<%else%>
   Loaded from an unknown protocol
-<% endif %>
+<%endif%>
 '/>
 
 The conditional shortcut syntax can be nested:
 
 <$macrocall $name='wikitext-example-without-html'
 src='\procedure test(animal)
-<% if [<animal>match[Elephant]] %>
+<%if [<animal>match[Elephant]] %>
   It is an elephant
-<% else %>
-  <% if [<animal>match[Giraffe]] %>
+<%else%>
+  <%if [<animal>match[Giraffe]] %>
     It is a giraffe
-  <% else %>
+  <%else%>
     It is completely unknown
-  <% endif %>
-<% endif %>
+  <%endif%>
+<%endif%>
 \end
 
 <<test "Giraffe">>
@@ -56,7 +56,7 @@ src='\procedure test(animal)
 
 Notes:
 
-* Clauses are parsed in inline mode by default. Force block mode parsing by following the opening `<% if %>`, `<% elseif %>` or `<% else %>` with two line breaks
+* Clauses are parsed in inline mode by default. Force block mode parsing by following the opening `<%if %>`, `<%elseif%>` or `<%else%>` with two line breaks
 * Widgets and HTML elements must be within a single conditional clause; it is not possible to start an element in one conditional clause and end it in another
 * The conditional shortcut syntax cannot contain pragmas such as procedure definitions
 
diff --git a/editions/tw5.com/tiddlers/wikitext/Utility Classes.tid b/editions/tw5.com/tiddlers/wikitext/Utility Classes.tid
index 4a291e34b..b61246960 100644
--- a/editions/tw5.com/tiddlers/wikitext/Utility Classes.tid	
+++ b/editions/tw5.com/tiddlers/wikitext/Utility Classes.tid	
@@ -13,7 +13,7 @@ type: text/vnd.tiddlywiki
 |`tc-max-width-80`|Sets the width of a block-element to use 80% of the maximum container width. This setting is useful with the `tc-center` class |
 |`tc-edit-max-width `|Expands [[TextWidget]]s to use the maximum available width. See [[ControlPanel -> Info -> Basics|$:/core/ui/ControlPanel/Basics]]|
 |`tc-first-link-nowrap` |Ensures that any links in the first table column will never wrap to the next line |
-
+|`tc-clearfix`|<<.from-version "5.3.6">> This class can be used to prevent elements, that have a `class="tc-float-right"` from overflowing their container elements. tc-clearfix is already assigned to all major ViewTemplate and EditTemplate elements. So it only needs to be used where the default does not work out of the box.|
 !! Table Utility Classes
 
 |`tc-table-no-border` |Removes the borders of a table |
diff --git a/editions/tw5.com/tiddlers/wikitext/parser/WikiText parser mode_ HTML examples.tid b/editions/tw5.com/tiddlers/wikitext/parser/WikiText parser mode_ HTML examples.tid
index fc068e44e..8d5483108 100644
--- a/editions/tw5.com/tiddlers/wikitext/parser/WikiText parser mode_ HTML examples.tid	
+++ b/editions/tw5.com/tiddlers/wikitext/parser/WikiText parser mode_ HTML examples.tid	
@@ -1,38 +1,20 @@
 created: 20220122153235162
-modified: 20220122180508134
+modified: 20240713165558596
 tags: [[WikiText parser mode transitions]]
 title: WikiText parser mode: HTML examples
 type: text/vnd.tiddlywiki
 
-<<wikitext-example-without-html "<div>
-
-* blank line after open tag allows
-* block mode punctuation (i.e. this list) to
-* be recognised
-</div>
-">>
+<<testcase TestCases/HTML/OpenTagBlankLine>>
 
 ---
 
 The open tag blank line "trick" also works inside of punctuation only recognised in inline mode (such as [[Formatting in WikiText]]):
 
-<<wikitext-example-without-html "''<div>
-
-* list item one
-* list item two
-</div>''">>
+<<testcase TestCases/HTML/OpenTagBlankLineInBoldSyntax>>
 
 ---
 
-<<wikitext-example-without-html "<div>
-* Open tag without a blank line means
-* block mode punctuation (i.e. this list) will
-* NOT be recognised.
-
-Paragraphs are only recognised in block mode. Even with blank lines, new paragraphs are not recognised.
-
-This also is not a new paragraph.
-</div>">>
+<<testcase TestCases/HTML/OpenTagNoBlankLine>>
 
 ---
 
@@ -42,11 +24,7 @@ Adding a blank link after an open tag within a table cell causes the row to span
 
 <<wikitext-example-without-html "|table row|all on|one line|is recognised|">>
 
-<<wikitext-example-without-html "|For a blank line after open tag|<div>
-
-* list is recognised
-* but the surrounding table row is not
-</div>|">>
+<<testcase TestCases/HTML/OpenTagBlankLineInTableSyntax>>
 
 ---
 
@@ -58,15 +36,4 @@ Note that <<.wlink MacroCallWidget>> does not have a similar <<.attr mode>> attr
 
 ---
 
-The less convenient `<table>`, `<tr>`, `<td>` html tags can be used as a foolproof way to get [[block mode|Block Mode WikiText]] punctuation recognised inside of table cells.
-
-<<wikitext-example-without-html "<table>
-<tr><td>
-
-* list item one
-* list item two
-</td><td>
-
-|nested|table|
-</td></tr>
-</table>">>
\ No newline at end of file
+<<testcase TestCases/HTML/BlockModeInHTMLTable>>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlywiki.info b/editions/tw5.com/tiddlywiki.info
index 504abac5c..2f3ddade8 100644
--- a/editions/tw5.com/tiddlywiki.info
+++ b/editions/tw5.com/tiddlywiki.info
@@ -1,16 +1,13 @@
 {
 	"description": "Documentation from https://tiddlywiki.com",
 	"plugins": [
-		"tiddlywiki/nodewebkitsaver",
 		"tiddlywiki/browser-sniff",
 		"tiddlywiki/railroad",
-		"tiddlywiki/evernote",
 		"tiddlywiki/internals",
 		"tiddlywiki/menubar",
 		"tiddlywiki/confetti",
 		"tiddlywiki/dynannotate",
-		"tiddlywiki/tour",
-		"tiddlywiki/qrcode"
+		"tiddlywiki/tour"
 	],
 	"themes": [
 		"tiddlywiki/vanilla",
diff --git a/languages/ar-PS/plugin.info b/languages/ar-PS/plugin.info
index 7ffe34e88..b524a1c5a 100644
--- a/languages/ar-PS/plugin.info
+++ b/languages/ar-PS/plugin.info
@@ -2,7 +2,7 @@
     "title": "$:/languages/ar-PS",
     "name": "ar-PS",
     "plugin-type": "language",
-    "description": "Arabic (Palestine)",
+    "description": "العربية (فلسطين)",
     "author": "Kamal-Habash",
     "core-version": ">=5.1.23",
 	"text-direction": "rtl"
diff --git a/languages/ca-ES/plugin.info b/languages/ca-ES/plugin.info
index dd05d365a..0538a67f2 100644
--- a/languages/ca-ES/plugin.info
+++ b/languages/ca-ES/plugin.info
@@ -2,7 +2,7 @@
 	"title": "$:/languages/ca-ES",
 	"name": "ca-ES",
 	"plugin-type": "language",
-	"description": "Catalan (Spain)",
+	"description": "Català (Espanya)",
 	"author": "Paco Rivière",
 	"core-version": ">=5.0.0"
 }
\ No newline at end of file
diff --git a/languages/cs-CZ/plugin.info b/languages/cs-CZ/plugin.info
index 14f574556..9991bfb84 100644
--- a/languages/cs-CZ/plugin.info
+++ b/languages/cs-CZ/plugin.info
@@ -2,7 +2,7 @@
 	"title": "$:/languages/cs-CZ",
 	"name": "cs-CZ",
 	"plugin-type": "language",
-	"description": "Česky (Czech Republic)",
+	"description": "Čeština (Česká republika)",
 	"author": "Zdeněk Jašek",
 	"core-version": ">=5.0.0"
 }
\ No newline at end of file
diff --git a/languages/da-DK/plugin.info b/languages/da-DK/plugin.info
index 48a2b7c1e..a1f0a863c 100644
--- a/languages/da-DK/plugin.info
+++ b/languages/da-DK/plugin.info
@@ -2,7 +2,7 @@
 	"title": "$:/languages/da-DK",
 	"name": "da-DK",
 	"plugin-type": "language",
-	"description": "Danish (Denmark)",
+	"description": "Dansk (Danmark)",
 	"author": "Birthe C",
 	"core-version": ">=5.0.8"
 }
diff --git a/languages/el-GR/plugin.info b/languages/el-GR/plugin.info
index 89c3f5e56..726ba71cd 100644
--- a/languages/el-GR/plugin.info
+++ b/languages/el-GR/plugin.info
@@ -2,7 +2,7 @@
 	"title": "$:/languages/el-GR",
 	"name": "el-GR",
 	"plugin-type": "language",
-	"description": "Greek (Greece)",
+	"description": "Ελληνικά (Ελλάδα)",
 	"author": "Stratis Aravias@ΓΕΛ Σαμοθράκης",
 	"core-version": ">=5.0.0"
 }
\ No newline at end of file
diff --git a/languages/es-ES/plugin.info b/languages/es-ES/plugin.info
index b144f8fdf..7b982c127 100644
--- a/languages/es-ES/plugin.info
+++ b/languages/es-ES/plugin.info
@@ -2,7 +2,7 @@
 	"title": "$:/languages/es-ES",
 	"name": "es-ES",
 	"plugin-type": "language",
-	"description": "Castellano. (Spain)",
+	"description": "Castellano. (España)",
 	"author": "Pau DeLuca,Joe Bordes",
 	"core-version": ">=5.1.23"
 }
diff --git a/languages/fa-IR/plugin.info b/languages/fa-IR/plugin.info
index 0a433da5f..a5d5d0cad 100644
--- a/languages/fa-IR/plugin.info
+++ b/languages/fa-IR/plugin.info
@@ -2,7 +2,7 @@
 	"title": "$:/languages/fa-IR",
 	"name": "fa",
 	"plugin-type": "language",
-	"description": "Persian (Iran)",
+	"description": "فارسی (ایران)",
 	"author": "amirography",
 	"core-version": ">=5.0.0",
 	"text-direction": "rtl"
diff --git a/languages/he-IL/plugin.info b/languages/he-IL/plugin.info
index 61e6be6cd..214cd6c9d 100644
--- a/languages/he-IL/plugin.info
+++ b/languages/he-IL/plugin.info
@@ -2,7 +2,7 @@
 	"title": "$:/languages/he-IL",
 	"name": "he-IL",
 	"plugin-type": "language",
-	"description": "Hebrew (Israel)",
+	"description": "עברית (ישראל)",
 	"author": "DoronTzur",
 	"core-version": ">=5.0.0",
 	"text-direction": "rtl"
diff --git a/languages/hi-IN/plugin.info b/languages/hi-IN/plugin.info
index 68b1df604..d83425cf7 100644
--- a/languages/hi-IN/plugin.info
+++ b/languages/hi-IN/plugin.info
@@ -2,7 +2,7 @@
 	"title": "$:/languages/hi-IN",
 	"name": "hi-IN",
 	"plugin-type": "language",
-	"description": "Hindi (India)",
+	"description": "हिन्दी (भारत)",
 	"author": "Atul Grover",
 	"core-version": ">=5.0.8"
 }
diff --git a/languages/it-IT/plugin.info b/languages/it-IT/plugin.info
index 6a39281ba..f4b7a7384 100644
--- a/languages/it-IT/plugin.info
+++ b/languages/it-IT/plugin.info
@@ -2,7 +2,7 @@
 	"title": "$:/languages/it-IT",
 	"name": "it-IT",
 	"plugin-type": "language",
-	"description": "Italian (Italy)",
+	"description": "Italiano (Italia)",
 	"author": "MaurizioPollio",
 	"core-version": ">=5.0.8"
 }
diff --git a/languages/ja-JP/plugin.info b/languages/ja-JP/plugin.info
index 521d420cd..2a2854c17 100644
--- a/languages/ja-JP/plugin.info
+++ b/languages/ja-JP/plugin.info
@@ -2,7 +2,7 @@
 	"title": "$:/languages/ja-JP",
 	"name": "ja-JP",
 	"plugin-type": "language",
-	"description": "Japanese (Japan)",
+	"description": "日本語 (日本)",
 	"author": "Makoto Hirohashi, OGOSHI Masayuki, pekopeko1, dajya-ranger.com, BALLOON | FU-SEN (Keiichi Shiga)",
 	"core-version": ">=5.1.4"
 }
diff --git a/languages/ko-KR/plugin.info b/languages/ko-KR/plugin.info
index 28e153aaf..5b2a1549e 100644
--- a/languages/ko-KR/plugin.info
+++ b/languages/ko-KR/plugin.info
@@ -2,7 +2,7 @@
 	"title": "$:/languages/ko-KR",
 	"name": "ko-KR",
 	"plugin-type": "language",
-	"description": "Korean (Korea Republic)",
+	"description": "한국어 (대한민국)",
 	"author": "Myeongjin",
 	"core-version": ">=5.1.4"
 }
diff --git a/languages/mk-MK/plugin.info b/languages/mk-MK/plugin.info
index 1e96fe2e1..8c6481dd0 100644
--- a/languages/mk-MK/plugin.info
+++ b/languages/mk-MK/plugin.info
@@ -2,7 +2,7 @@
 	"title": "$:/languages/mk-MK",
 	"name": "mk-MK",
 	"plugin-type": "language",
-	"description": "Macedonian (North Macedonia)",
+	"description": "Македонски (Македонија)",
 	"author": "Nikola Dio Petkovski",
 	"core-version": ">=5.1.4"
 }
diff --git a/languages/nl-NL/plugin.info b/languages/nl-NL/plugin.info
index 98bed8d9d..328d2c5f8 100644
--- a/languages/nl-NL/plugin.info
+++ b/languages/nl-NL/plugin.info
@@ -2,7 +2,7 @@
 	"title": "$:/languages/nl-NL",
 	"name": "nl-NL",
 	"plugin-type": "language",
-	"description": "Dutch (The Netherlands)",
+	"description": "Nederlands (Nederland)",
 	"author": "gernert",
 	"core-version": ">=5.1.5"
 }
diff --git a/languages/pa-IN/plugin.info b/languages/pa-IN/plugin.info
index cf5f15dd2..0e23c51a8 100644
--- a/languages/pa-IN/plugin.info
+++ b/languages/pa-IN/plugin.info
@@ -2,7 +2,7 @@
 	"title": "$:/languages/pa-IN",
 	"name": "pa-IN",
 	"plugin-type": "language",
-	"description": "Punjabi (India)",
+	"description": "ਪੰਜਾਬੀ (ਭਾਰਤ)",
 	"author": "Atul Grover",
 	"core-version": ">=5.0.8"
 }
diff --git a/languages/pl-PL/plugin.info b/languages/pl-PL/plugin.info
index 823c3333d..8e9ae2649 100644
--- a/languages/pl-PL/plugin.info
+++ b/languages/pl-PL/plugin.info
@@ -2,7 +2,7 @@
 	"title": "$:/languages/pl-PL",
 	"name": "pl-PL",
 	"plugin-type": "language",
-	"description": "Polish (Poland)",
+	"description": "Polski (Polska)",
 	"author": "Maurycy Zarzycki (Evidently Cube)",
 	"core-version": ">=5.2.0"
 }
\ No newline at end of file
diff --git a/languages/pt-PT/plugin.info b/languages/pt-PT/plugin.info
index 972d0237c..87bb748c7 100644
--- a/languages/pt-PT/plugin.info
+++ b/languages/pt-PT/plugin.info
@@ -2,7 +2,7 @@
 	"title": "$:/languages/pt-PT",
 	"name": "pt-PT",
 	"plugin-type": "language",
-	"description": "Portuguese (Portugal)",
+	"description": "Português (Portugal)",
 	"author": "Duarte Farrajota Ramos",
 	"core-version": ">=5.0.8"
 }
diff --git a/languages/ru-RU/plugin.info b/languages/ru-RU/plugin.info
index 46bb50ab3..cfe3a7d15 100644
--- a/languages/ru-RU/plugin.info
+++ b/languages/ru-RU/plugin.info
@@ -2,7 +2,7 @@
 	"title": "$:/languages/ru-RU",
 	"name": "ru-RU",
 	"plugin-type": "language",
-	"description": "Russian (Russia)",
+	"description": "Русский (Россия)",
 	"author": "AndreyYankin aka andrey013, Глеб Прохожев <glebujka@gmail.com>",
 	"core-version": ">=5.0.0"
 }
diff --git a/languages/sk-SK/plugin.info b/languages/sk-SK/plugin.info
index 525d86122..03d8c375c 100644
--- a/languages/sk-SK/plugin.info
+++ b/languages/sk-SK/plugin.info
@@ -2,7 +2,7 @@
 	"title": "$:/languages/sk-SK",
 	"name": "sk-SK",
 	"plugin-type": "language",
-	"description": "Slovak (Slovakia)",
+	"description": "Slovenčina (Slovensko)",
 	"author": "Vlado Luknar",
 	"core-version": ">=5.0.0"
 }
\ No newline at end of file
diff --git a/languages/sl-SI/plugin.info b/languages/sl-SI/plugin.info
index c002c5abe..04036bae1 100644
--- a/languages/sl-SI/plugin.info
+++ b/languages/sl-SI/plugin.info
@@ -2,7 +2,7 @@
 	"title": "$:/languages/sl-SI",
 	"name": "sl-SI",
 	"plugin-type": "language",
-	"description": "Solvenian (Slovenia)",
+	"description": "Slovenščina (Slovenija)",
 	"author": "Tomaž Ficko",
 	"core-version": ">=5.0.0"
 }
\ No newline at end of file
diff --git a/languages/sv-SE/plugin.info b/languages/sv-SE/plugin.info
index cec1b2a52..d278a54b6 100755
--- a/languages/sv-SE/plugin.info
+++ b/languages/sv-SE/plugin.info
@@ -2,7 +2,7 @@
     "title": "$:/languages/sv-SE",
     "name": "sv-SE",
     "plugin-type": "language",
-    "description": "Swedish (Sweden)",
+    "description": "Svenska (Sverige)",
     "author": "SuperDOS",
     "core-version": ">=5.1.0"
 }
\ No newline at end of file
diff --git a/languages/zh-CN/plugin.info b/languages/zh-CN/plugin.info
index aff7a8c6c..cbd8e3588 100644
--- a/languages/zh-CN/plugin.info
+++ b/languages/zh-CN/plugin.info
@@ -2,7 +2,7 @@
 	"title": "$:/languages/zh-CN",
 	"name": "zh-CN",
 	"plugin-type": "language",
-	"description": "Chinese (China)",
+	"description": "简体中文 (中国)",
 	"author": "BramChen",
 	"core-version": ">=5.0.8",
 	"dependents": ["$:/languages/zh-Hans"],
diff --git a/languages/zh-HK/Buttons.multids b/languages/zh-HK/Buttons.multids
new file mode 100644
index 000000000..4ec7a7628
--- /dev/null
+++ b/languages/zh-HK/Buttons.multids
@@ -0,0 +1,17 @@
+title: $:/language/Buttons/
+
+ControlPanel/Hint: 開啓控制台
+FoldOthers/Hint: 收合其他已開啓條目的內容
+FoldAll/Hint: 收合所有已開啓條目的內容
+UnfoldAll/Hint: 展開所有已開啓條目的內容
+Help/Caption: 説明
+Help/Hint: 顯示説明中心
+Home/Hint: 開啓首頁條目
+LayoutSwitcher/Hint: 開啓版面切換器
+Manager/Hint: 開啓條目管理器
+OpenControlPanel/Hint: 開啓控制台
+OpenWindow/Caption: 開啓於新視窗
+OpenWindow/Hint: 在新視窗中開啓條目
+Permaview/Hint: 設定瀏覽器網址列為直接連結到當前所有已開啓條目
+Timestamp/On/Caption: 時間戳記開啓
+Stamp/New/Text: 片段的文字。（記得在 `caption` 欄位中新增一個説明性的標題）。
diff --git a/languages/zh-HK/ControlPanel.multids b/languages/zh-HK/ControlPanel.multids
new file mode 100644
index 000000000..44e43bcac
--- /dev/null
+++ b/languages/zh-HK/ControlPanel.multids
@@ -0,0 +1,31 @@
+title: $:/language/ControlPanel/
+
+Basics/DefaultTiddlers/BottomHint: 標題含空白時請使用 &#91;&#91;雙中括弧&#93;&#93;，或者您可用 {{保留開啓中的條目順序||$:/snippets/retain-story-ordering-button}}
+Basics/DefaultTiddlers/TopHint: 預設開啓的條目
+KeyboardShortcuts/Platform/All: 所有平台
+KeyboardShortcuts/Platform/Mac: 僅 Macintosh 平台
+KeyboardShortcuts/Platform/NonMac: 僅非 Macintosh 平台
+KeyboardShortcuts/Platform/Linux: 僅 Linux 平台
+KeyboardShortcuts/Platform/NonLinux: 僅非 Linux 平台
+KeyboardShortcuts/Platform/Windows: 僅 Windows 平台
+KeyboardShortcuts/Platform/NonWindows: 僅非 Windows 平台
+Plugins/Enable/Caption: 啓用
+Plugins/Enable/Hint: 重新載入頁面時啓用此插件
+Plugins/OpenPluginLibrary: 開啓插件程式庫
+Parsing/Hint: 在此您可以全域停用或啓用維基解析規則。要使更改生效，請儲存並重新載入您的維基。停用某些解析規則，會妨礙 <$text text="TiddlyWiki"/>  正常運作。可使用[[安全模式|https://tiddlywiki.com/#SafeMode]]恢復正常操作。
+Saving/DownloadSaver/AutoSave/Hint: 啓用下載儲存模組的自動儲存
+Saving/GitService/GitHub/Password: 密碼、OAUTH 權杖，或個人存取權杖 (詳見 [[GitHub 説明頁面|https://help.github.com/en/articles/creating-a-personal-access-token-for-the-command-line]])
+Saving/GitService/GitLab/Password: 個人存取權杖的 API (詳見 [[GitLab 説明頁面|https://docs.gitlab.com/ee/user/profile/personal_access_tokens.html]])
+Settings/CamelCase/Caption: 駝峯式維基鏈接
+Settings/CamelCase/Hint: 您可以全域停用駝峯式短語自動鏈接。須儲存後重新載入，方才生效。
+Settings/CamelCase/Description: 啓用自動駝峯式鏈接
+Settings/EditorToolbar/Hint: 啓用或停用編輯器工具列︰
+Settings/InfoPanelMode/Sticky/Description: 條目資訊面板保持開啓狀態，直到明確關閉
+Settings/LinkToBehaviour/Caption: 條目開啓行為
+Settings/LinkToBehaviour/OpenAbove: 開啓於當前條目之上
+Settings/LinkToBehaviour/OpenBelow: 開啓於當前條目之下
+Settings/LinkToBehaviour/OpenAtTop: 開啓於故事河的頂端
+Settings/LinkToBehaviour/OpenAtBottom: 開啓於故事河的底部
+Settings/MissingLinks/Description: 啓用鏈接到佚失條目
+Settings/NavigationAddressBar/Permaview/Description: 包括目標條目和當前已開啓的條目序列
+Settings/PerformanceInstrumentation/Description: 啓用效能檢測
\ No newline at end of file
diff --git a/languages/zh-HK/Docs/ModuleTypes.multids b/languages/zh-HK/Docs/ModuleTypes.multids
new file mode 100644
index 000000000..c7915f3aa
--- /dev/null
+++ b/languages/zh-HK/Docs/ModuleTypes.multids
@@ -0,0 +1,3 @@
+title: $:/language/Docs/ModuleTypes/
+
+startup: 啓動時期的功能函數。
diff --git a/languages/zh-HK/Fields.multids b/languages/zh-HK/Fields.multids
new file mode 100644
index 000000000..002a625a5
--- /dev/null
+++ b/languages/zh-HK/Fields.multids
@@ -0,0 +1,5 @@
+title: $:/language/Docs/Fields/
+
+class: 渲染條目時，套用到條目的 CSS 類別 - 請參閲[[依自訂類別的自訂樣式|Custom styles by user-class]]。也適用於[[互動視窗|Modals]]
+description: 插件的説明、描述
+toc-link: 若設定為 ''no''，則抑制目錄樹中的條目鏈接。
\ No newline at end of file
diff --git a/languages/zh-HK/GettingStarted.tid b/languages/zh-HK/GettingStarted.tid
new file mode 100644
index 000000000..1988e17de
--- /dev/null
+++ b/languages/zh-HK/GettingStarted.tid
@@ -0,0 +1,18 @@
+title: GettingStarted
+
+\define lingo-base() $:/language/ControlPanel/Basics/
+歡迎使用 ~TiddlyWiki 及參與 ~TiddlyWiki 社羣
+
+開始將重要資訊存放於 ~TiddlyWiki 之前，確認您可以可靠地儲存變更是很重要的。詳細資訊請參閲 https://tiddlywiki.com/#GettingStarted
+
+!! 設定此 ~TiddlyWiki
+
+<div class="tc-control-panel">
+
+|tc-table-no-border tc-first-col-min-width tc-first-link-nowrap|k
+| <$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link>|<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
+| <$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link>|<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
+|^ <$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link><br><<lingo DefaultTiddlers/TopHint>>|<$edit tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+</div>
+
+請參閲[[控制枱|$:/ControlPanel]]查看更多選項。
\ No newline at end of file
diff --git a/languages/zh-HK/Help/listen.tid b/languages/zh-HK/Help/listen.tid
new file mode 100644
index 000000000..f3ad22e92
--- /dev/null
+++ b/languages/zh-HK/Help/listen.tid
@@ -0,0 +1,35 @@
+title: $:/language/Help/listen
+description: 為 TiddlyWiki 提供一個 HTTP 伺服器介面
+
+通過 HTTP 提供一個維基服務。
+
+listen 命令使用[[命名的命令參數|NamedCommandParameters]]：
+
+```
+--listen [<name>=<value>]...
+```
+
+所有參數都是可選的, 具有安全的預設值, 可以按任意順序指定。認可的參數有:
+
+* ''host'' - 可選的主機名稱， (預設為 "127.0.0.1" 或名為 "localhost")
+* ''path-prefix'' - 可選的路徑前綴
+* ''port'' - 偵聽的埠號；非數值會被解譯為一個系統環境變數，從其中提取埠號 (預設為 "8080")
+* ''credentials'' - 憑證 CSV 檔案的路徑名（相對於維基資料夾）
+* ''anon-username'' - 匿名使用者的編輯署名
+* ''username'' - 可選的基本驗證使用者名稱
+* ''password'' - 可選的基本驗證密碼
+* ''authenticated-user-header'' - 可選的 HTTP 請求功能參數名稱，用於受信任身份驗證
+* ''readers'' - 允許讀取此維基，以逗號分隔的使用者名稱的清單
+* ''writers'' - 允許寫入此維基，以逗號分隔的使用者名稱的清單
+* ''csrf-disable'' - 設定為 "yes" 以停用 CSRF 檢查 (預設為 "no")
+* ''sse-enabled'' - 設定為 "yes" 以啟用伺服器傳送的事件 (預設為 "no")
+* ''root-tiddler'' - 服務的基本條目 (預設為 "$:/core/save/all")
+* ''root-render-type'' - 呈現的基本條目的內容類型 (預設為 "text/plain")
+* ''root-serve-type'' - 服務的基本條目的內容類型 (預設為 "text/html")
+* ''tls-cert'' - TLS 證書檔案的路徑名（相對於維基資料夾）
+* ''tls-key'' - TLS 密鑰檔案的路徑名（相對於維基資料夾）
+* ''debug-level'' - 可選的偵錯層級；設定為 "debug" 來檢視請求的詳細資訊；(預設為 "none")
+* ''gzip'' - 設為 "yes" 以啟用某些 http 端點的 gzip 壓縮 (預設為 "no")
+* ''use-browser-cache'' - 設定為 "yes" ，允許瀏覽器快取回應，以節省頻寬（預設值為 "no"）
+
+有關向整個本地網路開啟實例的資訊，以及可能的安全問題，請參閲 TiddlyWiki.com 的 WebServer 條目。
diff --git a/languages/zh-HK/Help/notfound.tid b/languages/zh-HK/Help/notfound.tid
new file mode 100644
index 000000000..52bf9bd25
--- /dev/null
+++ b/languages/zh-HK/Help/notfound.tid
@@ -0,0 +1,3 @@
+title: $:/language/Help/notfound
+
+無此項目説明
\ No newline at end of file
diff --git a/languages/zh-HK/Help/password.tid b/languages/zh-HK/Help/password.tid
new file mode 100644
index 000000000..1560ef72c
--- /dev/null
+++ b/languages/zh-HK/Help/password.tid
@@ -0,0 +1,10 @@
+title: $:/language/Help/password
+description: 設定用以加密的密碼
+
+設定用以加密的密碼
+
+```
+--password <password>
+```
+
+''請注意''：這不是用於提供 TiddlyWiki 具有密碼保護功能。相反地，請看 [[ServerCommand]] 的密碼選項説明。
diff --git a/languages/zh-HK/Help/render.tid b/languages/zh-HK/Help/render.tid
new file mode 100644
index 000000000..bcc924113
--- /dev/null
+++ b/languages/zh-HK/Help/render.tid
@@ -0,0 +1,34 @@
+title: $:/language/Help/render
+description: 呈現個別條目到檔案
+
+呈現由篩選器標識的個別條目，並將結果儲存到指定的檔案。
+
+可選擇性地指定範本條目名稱。在此情況下，不是直接呈現每個條目，而是使用設為正在呈現的條目名稱的 "currentTiddler" 變數，來呈現範本條目。
+
+也可以選擇性地指定附加變數的名稱和值。
+
+```
+--render <tiddler-filter> [<filename-filter>] [<render-type>] [<template>] [ [<name>] [<value>] ]*
+```
+
+* ''tiddler-filter'': 標識要呈現的條目的篩選器
+* ''filename-filter'': 可選的篩選器，轉換條目名稱至路徑名。如果省略，預設為 `[is[tiddler]addsuffix[.html]]`，其使用未改變的條目名稱為檔名
+* ''template'': 可選的範本，用於呈現每個條目
+* ''render-type'': 可選的呈現類型：`text/html` (預設值) 會傳回完整的 HTML 文字，而 `text/plain` 只會傳迴文字內容 (即其忽略 HTML 標記與其他不可印出的資料)
+* ''name'': 可選的變數名稱
+* ''value'': 可選的變數值
+
+預設情況下，檔名被解析為相對於發行版資料夾的 `output` 子資料夾。`--output` 命令可用於將輸出指到一個不同的資料夾。
+
+附註：
+
+* 輸出資料夾不清除任何現有的檔案
+* 檔名的路徑中，任何不存在的資料夾，將自動建立。
+* 當正呈現的條目名稱中帶有空格，請注意同時使用命令列介面所要求的引號，與 TiddlyWiki 的雙重方括號：`--render "[[Motovun Jack.jpg]]"`
+* 所選的項目被設定為當前正在呈現的條目名稱，以此評估檔名篩選器，允條目名稱用作基礎計算的檔名。例如，`[encodeuricomponent[]addprefix[static/]]` 為每個條目名稱套用 URI 編碼，然後增加首碼 `static/`
+* `--render` 命令是已棄用的 `--rendertiddler` 和 `--rendertiddlers` 的一個更靈活的替代命令。
+
+範例：
+
+* `--render "[!is[system]]" "[encodeuricomponent[]addprefix[tiddlers/]addsuffix[.html]]"` -- 呈現所有非系統條目為 "tiddlers" 子資料夾中的檔案，檔名為 URL 編碼的條目名稱和副檔名 HTML
+* `--render '.' 'tiddlers.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[tag[HelloThere]]'` -- 將標籤為 "HelloThere" 的條目渲染到名為 "tiddlers.json" 的 JSON 檔案
\ No newline at end of file
diff --git a/languages/zh-HK/Help/savetiddlers.tid b/languages/zh-HK/Help/savetiddlers.tid
new file mode 100644
index 000000000..57231bee6
--- /dev/null
+++ b/languages/zh-HK/Help/savetiddlers.tid
@@ -0,0 +1,16 @@
+title: $:/language/Help/savetiddlers
+description: 將一羣條目的原始內容儲存到一個資料夾
+
+(請注意：`--savetiddlers` 命令已被棄用，而支援新的、更靈活得 `--save` 命令)
+
+儲存一羣條目的原始文字或二進位格式到指定的資料夾。
+
+```
+--savetiddlers <filter> <pathname> [noclean]
+```
+
+預設情況下，路徑名被解析為相對於發行版資料夾的 `output` 子資料夾。 `--output` 命令可以用於將輸出指定到一個不同的資料夾。
+
+儲存指定的檔案之前，會先清除輸出目錄的現有檔案。可藉由指定 ''noclean'' 旗標，停用該刪除動作。
+
+自動建立在路徑中任何缺少的資料夾。
diff --git a/languages/zh-HK/Help/server.tid b/languages/zh-HK/Help/server.tid
new file mode 100644
index 000000000..d42d7fd59
--- /dev/null
+++ b/languages/zh-HK/Help/server.tid
@@ -0,0 +1,44 @@
+title: $:/language/Help/server
+description: （已棄用：請參閲 'listen' 命令）提供一個 HTTP 伺服器介面到 TiddlyWiki
+
+在伺服器中內建 TiddlyWiki5 是非常簡單。雖與 TiddlyWeb 相容，但不支援許多健全網際網路面向的使用方式所需的功能。
+
+提供呈現一個指定條目，也可將個別條目編碼成 JSON，且支援基本的 HTTP 操作 `GET`、`PUT` 及 `DELETE`.
+
+```
+--server <port> <root-tiddler> <root-render-type> <root-serve-type> <username> <password> <host> <path-prefix> <debug-level>
+```
+
+參數説明：
+
+* ''port'' - 要偵聽的埠號；非數值會被解譯為一個系統環境變數，從其中提取埠號 (預設為 "8080")
+* ''root-tiddler'' - 服務的基本條目 (預設為 "$:/core/save/all")
+* ''root-render-type'' - 呈現的基本條目的內容類型 (預設為 "text/plain")
+* ''root-serve-type'' - 服務的基本條目的內容類型 (預設為 "text/html")
+* ''username'' - 預設的編輯者署名
+* ''password'' - 可選的基本驗證密碼
+* ''host'' - 可選的主機名稱， (預設為 "127.0.0.1" 或名為 "localhost")
+* ''path-prefix'' - 可選的的路徑前綴
+* ''debug-level'' - 可選的偵錯層級；設定為 "debug" 來檢視請求的詳細資訊；(預設為 "none")
+
+若指定密碼參數，瀏覽器將提示使用者輸入帳號與密碼。注意，密碼係以明碼方式傳遞，應只在受信任的網路或 HTTPS 上使用。
+
+例如：
+
+```
+--server 8080 $:/core/save/all text/plain text/html MyUserName passw0rd
+```
+
+若您需要設定主機名稱或路徑前綴，而不要求輸入密碼，則可以指定空字串的使用者名和密碼。
+
+```
+--server 8080 $:/core/save/all text/plain text/html "" "" 192.168.0.245
+```
+
+使用這樣的位址，會將您的系統暴露給本地網路。有關向整個本地網路開啟實例的資訊，以及可能的安全問題，請參閲 TiddlyWiki.com 的 WebServer 條目。
+
+同時執行多個 TiddlyWiki 伺服器，須分別指定不同的埠號。使用環境變數，有助於將埠號傳遞給 Node.js 進程。本示例引用一個名為 "MY_PORT_NUMBER" 的環境變數:
+
+```
+--server MY_PORT_NUMBER $:/core/save/all text/plain text/html MyUserName passw0rd
+```
\ No newline at end of file
diff --git a/languages/zh-HK/Help/setfield.tid b/languages/zh-HK/Help/setfield.tid
new file mode 100644
index 000000000..8526688d7
--- /dev/null
+++ b/languages/zh-HK/Help/setfield.tid
@@ -0,0 +1,17 @@
+title: $:/language/Help/setfield
+description: 準備用於外部條目
+
+//請注意此命令是試驗性的，且可能會更改或在最終定稿前被替換//
+
+設定一羣條目的指定欄位到 wikifying 範本條目的結果，其中的 `currentTiddler` 變數設定為各該條目。
+
+```
+--setfield <filter> <fieldname> <templatetitle> <rendertype>
+```
+
+參數説明：
+
+* ''filter'' - 受影響的辨識條目的篩選條件
+* ''fieldname'' - 要修改的欄位（預設為 "text"）
+* ''templatetitle'' - 該條目 wikify 到指定欄位。若為空白或丟失，則刪除指定的欄位
+* ''rendertype'' - 要呈現的文本類型（預設為 "text/plain"; "text/html" 可以用於包含 HTML 標記)）
diff --git a/languages/zh-HK/Misc.multids b/languages/zh-HK/Misc.multids
new file mode 100644
index 000000000..7bed3c70e
--- /dev/null
+++ b/languages/zh-HK/Misc.multids
@@ -0,0 +1,5 @@
+title: $:/language/
+
+InternalJavaScriptError/Hint: 喔，真是令人尷尬。建議刷新您的瀏覽器，重新啓動 TiddlyWiki
+LayoutSwitcher/Description: 開啓版面切換器
+Shortcuts/Input/AdvancedSearch/Hint: 從側邊欄搜尋欄位內開啓[[進階搜尋|$:/AdvancedSearch]]面板
diff --git a/languages/zh-HK/SideBar.multids b/languages/zh-HK/SideBar.multids
new file mode 100644
index 000000000..450d9cb87
--- /dev/null
+++ b/languages/zh-HK/SideBar.multids
@@ -0,0 +1,3 @@
+title: $:/language/SideBar/
+
+Open/Caption: 開啓
diff --git a/languages/zh-HK/Snippets/ProcedureDefinition.tid b/languages/zh-HK/Snippets/ProcedureDefinition.tid
new file mode 100644
index 000000000..94e8a6b3c
--- /dev/null
+++ b/languages/zh-HK/Snippets/ProcedureDefinition.tid
@@ -0,0 +1,7 @@
+title: $:/language/Snippets/ProcedureDefinition
+tags: $:/tags/TextEditor/Snippet
+caption: 程序定義
+
+\procedure procName(param1:"預設值",param2)
+這裏就是您的文字了。
+\end
diff --git a/languages/zh-HK/ThemeTweaks.multids b/languages/zh-HK/ThemeTweaks.multids
new file mode 100644
index 000000000..aa26be97a
--- /dev/null
+++ b/languages/zh-HK/ThemeTweaks.multids
@@ -0,0 +1,3 @@
+title: $:/language/ThemeTweaks/
+
+Options/StickyTitles/Hint: 使條目名稱"黏着"於瀏覽器視窗的頂端
diff --git a/languages/zh-HK/plugin.info b/languages/zh-HK/plugin.info
index ab9b8b39b..1849f7ea9 100644
--- a/languages/zh-HK/plugin.info
+++ b/languages/zh-HK/plugin.info
@@ -2,7 +2,7 @@
 	"title": "$:/languages/zh-HK",
 	"name": "zh-HK",
 	"plugin-type": "language",
-	"description": "Chinese (Hong Kong)",
+	"description": "繁體中文 (香港)",
 	"author": "BramChen",
 	"core-version": ">=5.0.8",
 	"dependents": ["$:/languages/zh-Hant"],
diff --git a/languages/zh-Hans/Buttons.multids b/languages/zh-Hans/Buttons.multids
index 87be34a82..ad7e4ad3b 100644
--- a/languages/zh-Hans/Buttons.multids
+++ b/languages/zh-Hans/Buttons.multids
@@ -133,6 +133,7 @@ Excise/Caption/Replace/Link: 链接
 Excise/Caption/Replace/Transclusion: 嵌入
 Excise/Caption/Tag: 将新条目的标签设为此条目的名称
 Excise/Caption/TiddlerExists: 提醒：条目已经存在
+Excise/DefaultTitle: 新的剪切
 Excise/Hint: 剪切所选文本到一个新条目
 Heading1/Caption: 标题 1
 Heading1/Hint: 套用标题级别 1 的格式于包含所选文本的列
diff --git a/languages/zh-Hans/ControlPanel.multids b/languages/zh-Hans/ControlPanel.multids
index 33bc5e9ce..53d244b3f 100644
--- a/languages/zh-Hans/ControlPanel.multids
+++ b/languages/zh-Hans/ControlPanel.multids
@@ -199,6 +199,12 @@ Settings/TitleLinks/Caption: 条目标题
 Settings/TitleLinks/Hint: 可选地显示条目标题为链接
 Settings/TitleLinks/No/Description: 不显示条目标题为链接
 Settings/TitleLinks/Yes/Description: 显示条目标题为链接
+SocialCard/Caption: 社交媒体卡
+SocialCard/Domain/Prompt: 显示链接的网域名称（例如 ''tiddlywiki.com''）
+SocialCard/Hint: 社交和消息服务使用此信息来显示在线托管时指向此 TiddlyWiki 的链接的预览卡
+SocialCard/PreviewUrl/Prompt: 用于预览此 TiddlyWiki 图像的完整网址
+SocialCard/PreviewUrl/Preview: 预览图像：
+SocialCard/Url/Prompt: 此 TiddlyWiki 的完整网址
 StoryTiddler/Caption: 故事条目
 StoryTiddler/Hint: 此规则级联用于动态选择模板，以便在故事河中显示条目。
 StoryView/Caption: 视图模式
diff --git a/languages/zh-Hans/plugin.info b/languages/zh-Hans/plugin.info
index 37532db38..4c66c6186 100644
--- a/languages/zh-Hans/plugin.info
+++ b/languages/zh-Hans/plugin.info
@@ -2,7 +2,7 @@
 	"title": "$:/languages/zh-Hans",
 	"name": "zh-Hans",
 	"plugin-type": "language",
-	"description": "Chinese (Simplified)",
+	"description": "简体中文",
 	"author": "BramChen",
 	"core-version": ">=5.0.8",
 	"plugin-priority": 100
diff --git a/languages/zh-Hant/Buttons.multids b/languages/zh-Hant/Buttons.multids
index c17974998..1a4c69de1 100644
--- a/languages/zh-Hant/Buttons.multids
+++ b/languages/zh-Hant/Buttons.multids
@@ -133,6 +133,7 @@ Excise/Caption/Replace/Link: 鏈接
 Excise/Caption/Replace/Transclusion: 嵌入
 Excise/Caption/Tag: 將新條目的標籤設為此條目的名稱
 Excise/Caption/TiddlerExists: 警示：條目已經存在
+Excise/DefaultTitle: 新的剪切
 Excise/Hint: 剪切所選文字到一個新條目
 Heading1/Caption: 標題 1
 Heading1/Hint: 套用標題級別 1 的格式於包含所選文字的列
diff --git a/languages/zh-Hant/ControlPanel.multids b/languages/zh-Hant/ControlPanel.multids
index 853ca98d5..37e4a9e81 100644
--- a/languages/zh-Hant/ControlPanel.multids
+++ b/languages/zh-Hant/ControlPanel.multids
@@ -199,6 +199,12 @@ Settings/TitleLinks/Caption: 條目標題
 Settings/TitleLinks/Hint: 可選地顯示條目標題為鏈接
 Settings/TitleLinks/No/Description: 不顯示條目標題為鏈接
 Settings/TitleLinks/Yes/Description: 顯示條目標題為鏈接
+SocialCard/Caption: 社交媒體卡
+SocialCard/Domain/Prompt: 顯示連結的網域名稱（例如 ''tiddlywiki.com''）
+SocialCard/Hint: 社交和訊息服務使用此資訊來顯示線上託管時指向此 TiddlyWiki 的連結的預覽卡
+SocialCard/PreviewUrl/Prompt: 用於預覽此 TiddlyWiki 圖像的完整網址
+SocialCard/PreviewUrl/Preview: 預覽圖像：
+SocialCard/Url/Prompt: 此 TiddlyWiki 的完整網址
 StoryTiddler/Caption: 故事條目
 StoryTiddler/Hint: 此規則級聯用於動態選擇範本，以便在故事河中顯示條目。
 StoryView/Caption: 檢視模式
diff --git a/languages/zh-Hant/plugin.info b/languages/zh-Hant/plugin.info
index 596c5edfb..e97653732 100644
--- a/languages/zh-Hant/plugin.info
+++ b/languages/zh-Hant/plugin.info
@@ -2,7 +2,7 @@
 	"title": "$:/languages/zh-Hant",
 	"name": "zh-Hant",
 	"plugin-type": "language",
-	"description": "Chinese (Traditional)",
+	"description": "繁體中文",
 	"author": "BramChen",
 	"core-version": ">=5.0.8",
 	"plugin-priority": 100
diff --git a/languages/zh-TW/plugin.info b/languages/zh-TW/plugin.info
index d342f9a76..206561816 100644
--- a/languages/zh-TW/plugin.info
+++ b/languages/zh-TW/plugin.info
@@ -2,7 +2,7 @@
 	"title": "$:/languages/zh-TW",
 	"name": "zh-TW",
 	"plugin-type": "language",
-	"description": "Chinese (Taiwan)",
+	"description": "繁體中文 (台灣)",
 	"author": "BramChen",
 	"core-version": ">=5.0.8",
 	"dependents": ["$:/languages/zh-Hant"],
diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md
index c05d5906f..ecabb96fd 100644
--- a/licenses/cla-individual.md
+++ b/licenses/cla-individual.md
@@ -585,3 +585,7 @@ Michael McDermott, @michaeljmcd, 2024-07-09
 @webplusai, 2024/07/23
 
 Val Packett, @valpackett, 2024/07/26
+
+@wolfsprite, 2024/08/09
+
+@JDIGIO0213, 2024/08/29
diff --git a/plugins/tiddlywiki/blog/templates/tiddler.tid b/plugins/tiddlywiki/blog/templates/tiddler.tid
index 32e625861..074e89c22 100644
--- a/plugins/tiddlywiki/blog/templates/tiddler.tid
+++ b/plugins/tiddlywiki/blog/templates/tiddler.tid
@@ -1,8 +1,8 @@
 title: $:/plugins/tiddlywiki/blog/templates/tiddler
 
-<div class="tc-tiddler-frame tc-tiddler-view-frame">
+<div class="tc-tiddler-frame tc-tiddler-view-frame tc-clearfix">
 
-<div class="tc-tiddler-title">
+<div class="tc-tiddler-title tc-clearfix">
 
 <div class="tc-titlebar">
 
diff --git a/plugins/tiddlywiki/browser-storage/startup.js b/plugins/tiddlywiki/browser-storage/startup.js
index 552de93d2..e06d7bf48 100644
--- a/plugins/tiddlywiki/browser-storage/startup.js
+++ b/plugins/tiddlywiki/browser-storage/startup.js
@@ -26,11 +26,11 @@ var BrowserStorageUtil = require("$:/plugins/tiddlywiki/browser-storage/util.js"
 
 exports.startup = function() {
 	var self = this;
-	
-        // If not exists, add ENABLED tiddler with default value "yes"
-        if(!$tw.wiki.getTiddler(ENABLED_TITLE)) {
-                $tw.wiki.addTiddler({title: ENABLED_TITLE, text: "yes"});
-        }
+
+	// If not exists, add ENABLED tiddler with default value "yes"
+	if(!$tw.wiki.getTiddler(ENABLED_TITLE)) {
+		$tw.wiki.addTiddler({title: ENABLED_TITLE, text: "yes"});
+	}
 	// Compute our prefix for local storage keys
 	var prefix = "tw5#" + window.location.pathname + "#";
 	// Make a logger
@@ -68,11 +68,11 @@ exports.startup = function() {
 		persistPermissionRequested = false,
 		requestPersistenceOnFirstSave = function() {
 			$tw.hooks.addHook("th-saving-tiddler", function(tiddler) {
-				if (!persistPermissionRequested) {
+				if(!persistPermissionRequested) {
 					var filteredChanges = filterFn.call($tw.wiki, function(iterator) {
 						iterator(tiddler,tiddler.getFieldString("title"));
 					});
-					if (filteredChanges.length > 0) {
+					if(filteredChanges.length > 0) {
 						// The tiddler will be saved to local storage, so request persistence
 						requestPersistence();
 						persistPermissionRequested = true;
@@ -84,9 +84,9 @@ exports.startup = function() {
 	// Request the browser to never evict the localstorage. Some browsers such as firefox
 	// will prompt the user. To make the decision easier for the user only prompt them
 	// when they click the save button on a tiddler which will be stored to localstorage.
-	if (navigator.storage && navigator.storage.persist) {
+	if(navigator.storage && navigator.storage.persist) {
 		navigator.storage.persisted().then(function(isPersisted) {
-			if (!isPersisted) {
+			if(!isPersisted) {
 				setPersistedState("not requested yet");
 				requestPersistenceOnFirstSave();
 			} else {
diff --git a/plugins/tiddlywiki/browser-storage/util.js b/plugins/tiddlywiki/browser-storage/util.js
index 7474a367c..0f55ada7d 100644
--- a/plugins/tiddlywiki/browser-storage/util.js
+++ b/plugins/tiddlywiki/browser-storage/util.js
@@ -53,7 +53,7 @@ BrowserStorageUtil.prototype.saveTiddlerToLocalStorage = function(title) {
     // Get the tiddler
     var tiddler = $tw.wiki.getTiddler(title);
     if(tiddler) {
-        if (this.wiki.tiddlerExists(title)) {
+        if(this.wiki.tiddlerExists(title)) {
             // This is not a shadow tiddler
             console.log("browser-storage: Saving",title);
             // Get the JSON of the tiddler
diff --git a/plugins/tiddlywiki/codemirror/settings/cursorBlinkRate.tid b/plugins/tiddlywiki/codemirror/settings/cursorBlinkRate.tid
index ba540ea4c..59cf44fcb 100644
--- a/plugins/tiddlywiki/codemirror/settings/cursorBlinkRate.tid
+++ b/plugins/tiddlywiki/codemirror/settings/cursorBlinkRate.tid
@@ -4,4 +4,4 @@ caption: {{$:/language/codemirror/cursorBlinkRate/hint}}
 
 \define lingo-base() $:/language/codemirror/cursorBlinkRate/
 
-|<$link to="$:/config/codemirror/cursorBlinkRate"><<lingo hint>></$link> |<$edit-text tiddler="$:/config/codemirror/cursorBlinkRate" default="" placeholder="cursorBlinkRate" tag="input"/> |
+|<$link to="$:/config/codemirror/cursorBlinkRate"><<lingo hint>></$link> |<$edit-text tiddler="$:/config/codemirror/cursorBlinkRate" default="" placeholder="cursorBlinkRate" tag="input" type="number"/> |
diff --git a/plugins/tiddlywiki/codemirror/settings/indentUnit.tid b/plugins/tiddlywiki/codemirror/settings/indentUnit.tid
index b463f3e78..36518d938 100644
--- a/plugins/tiddlywiki/codemirror/settings/indentUnit.tid
+++ b/plugins/tiddlywiki/codemirror/settings/indentUnit.tid
@@ -4,4 +4,4 @@ caption: {{$:/language/codemirror/indentUnit/hint}}
 
 \define lingo-base() $:/language/codemirror/indentUnit/
 
-|<$link to="$:/config/codemirror/indentUnit"><<lingo hint>></$link> |<$edit-text tiddler="$:/config/codemirror/indentUnit" default="" placeholder="indentUnit" tag="input"/> |
+|<$link to="$:/config/codemirror/indentUnit"><<lingo hint>></$link> |<$edit-text tiddler="$:/config/codemirror/indentUnit" default="" placeholder="indentUnit" tag="input" type="number"/> |
diff --git a/plugins/tiddlywiki/codemirror/settings/tabSize.tid b/plugins/tiddlywiki/codemirror/settings/tabSize.tid
index 1ca932b19..76092465f 100644
--- a/plugins/tiddlywiki/codemirror/settings/tabSize.tid
+++ b/plugins/tiddlywiki/codemirror/settings/tabSize.tid
@@ -4,4 +4,4 @@ caption: {{$:/language/codemirror/tabSize/hint}}
 
 \define lingo-base() $:/language/codemirror/tabSize/
 
-|<$link to="$:/config/codemirror/tabSize"><<lingo hint>></$link> |<$edit-text tiddler="$:/config/codemirror/tabSize" default="" placeholder="tabSize" tag="input"/> |
+|<$link to="$:/config/codemirror/tabSize"><<lingo hint>></$link> |<$edit-text tiddler="$:/config/codemirror/tabSize" default="" placeholder="tabSize" tag="input" type="number"/> |
diff --git a/plugins/tiddlywiki/d3/barwidget.js b/plugins/tiddlywiki/d3/barwidget.js
index 18ada16c9..08b71cff2 100644
--- a/plugins/tiddlywiki/d3/barwidget.js
+++ b/plugins/tiddlywiki/d3/barwidget.js
@@ -122,7 +122,7 @@ BarWidget.prototype.createChart = function(parent,nextSibling) {
 	return {
 		domNode: svgElement[0][0],
 		updateChart: function() {
-			if (self.barGrouped !== "no") {
+			if(self.barGrouped !== "no") {
 				transitionGrouped();
 			} else {
 				transitionStacked();
@@ -160,14 +160,14 @@ BarWidget.prototype.createChart = function(parent,nextSibling) {
 			var x = 1 / (0.1 + Math.random()),
 				y = 2 * Math.random() - 0.5,
 				z = 10 / (0.1 + Math.random());
-			for (var i = 0; i < n; i++) {
+			for(var i = 0; i < n; i++) {
 			var w = (i / n - y) * z;
 			a[i] += x * Math.exp(-w * w);
 			}
 		}
 		var a = [], i;
-		for (i = 0; i < n; ++i) a[i] = o + o * Math.random();
-		for (i = 0; i < 5; ++i) bump(a);
+		for(i = 0; i < n; ++i) a[i] = o + o * Math.random();
+		for(i = 0; i < 5; ++i) bump(a);
 		return a.map(function(d, i) { return {x: i, y: Math.max(0, d)}; });
 	}
 };
diff --git a/plugins/tiddlywiki/filesystem/filesystemadaptor.js b/plugins/tiddlywiki/filesystem/filesystemadaptor.js
index 1779855df..451928101 100644
--- a/plugins/tiddlywiki/filesystem/filesystemadaptor.js
+++ b/plugins/tiddlywiki/filesystem/filesystemadaptor.js
@@ -22,7 +22,9 @@ function FileSystemAdaptor(options) {
 	this.boot = options.boot || $tw.boot;
 	this.logger = new $tw.utils.Logger("filesystem",{colour: "blue"});
 	// Create the <wiki>/tiddlers folder if it doesn't exist
-	$tw.utils.createDirectory(this.boot.wikiTiddlersPath);
+	if(this.boot.wikiTiddlersPath) {
+		$tw.utils.createDirectory(this.boot.wikiTiddlersPath);
+	}
 }
 
 FileSystemAdaptor.prototype.name = "filesystem";
@@ -52,6 +54,10 @@ The type is found by looking up the extension in $tw.config.fileExtensionInfo (e
 It is the responsibility of the filesystem adaptor to update this.boot.files for new files that are created.
 */
 FileSystemAdaptor.prototype.getTiddlerFileInfo = function(tiddler,callback) {
+	// Error if we don't have a this.boot.wikiTiddlersPath
+	if(!this.boot.wikiTiddlersPath) {
+		return callback("filesystemadaptor requires a valid wiki folder");
+	}
 	// Always generate a fileInfo object when this fuction is called
 	var title = tiddler.fields.title, newInfo, pathFilters, extFilters,
 		fileInfo = this.boot.files[title];
@@ -84,7 +90,7 @@ FileSystemAdaptor.prototype.saveTiddler = function(tiddler,callback,options) {
 		}
 		$tw.utils.saveTiddlerToFile(tiddler,fileInfo,function(err,fileInfo) {
 			if(err) {
-				if ((err.code == "EPERM" || err.code == "EACCES") && err.syscall == "open") {
+				if((err.code == "EPERM" || err.code == "EACCES") && err.syscall == "open") {
 					fileInfo = fileInfo || self.boot.files[tiddler.fields.title];
 					fileInfo.writeError = true;
 					self.boot.files[tiddler.fields.title] = fileInfo;
@@ -131,7 +137,7 @@ FileSystemAdaptor.prototype.deleteTiddler = function(title,callback,options) {
 	if(fileInfo) {
 		$tw.utils.deleteTiddlerFile(fileInfo,function(err,fileInfo) {
 			if(err) {
-				if ((err.code == "EPERM" || err.code == "EACCES") && err.syscall == "unlink") {
+				if((err.code == "EPERM" || err.code == "EACCES") && err.syscall == "unlink") {
 					// Error deleting the file on disk, should fail gracefully
 					$tw.syncer.displayError("Server desynchronized. Error deleting file for deleted tiddler \"" + title + "\"",err);
 					return callback(null,fileInfo);
diff --git a/plugins/tiddlywiki/geospatial/tests/widgets/geomap-empty-layer.tid b/plugins/tiddlywiki/geospatial/tests/widgets/geomap-empty-layer.tid
new file mode 100644
index 000000000..1a8cdb686
--- /dev/null
+++ b/plugins/tiddlywiki/geospatial/tests/widgets/geomap-empty-layer.tid
@@ -0,0 +1,19 @@
+title: $:/plugins/tiddlywiki/geospatial/tests/widgets/geomap-empty-layer
+description: Map using geolayer without json and lat/long attributes
+import: $:/plugins/tiddlywiki/geospatial
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Narrative
+
+Verify exception reported in [[8452|https://github.com/TiddlyWiki/TiddlyWiki5/issues/8452]] is not thrown when the geolayer widget has no attributes
++
+title: Output
+
+<$geomap startPosition="bounds">
+<$geolayer/>
+</$geomap>
++
+title: ExpectedResult
+
+<p><div style="width:100%;height:600px;"></div></p>
\ No newline at end of file
diff --git a/plugins/tiddlywiki/geospatial/widgets/geomap.js b/plugins/tiddlywiki/geospatial/widgets/geomap.js
index 9d9dfccd6..ba2957db2 100644
--- a/plugins/tiddlywiki/geospatial/widgets/geomap.js
+++ b/plugins/tiddlywiki/geospatial/widgets/geomap.js
@@ -262,10 +262,12 @@ GeomapWidget.prototype.refreshMap = function() {
 				var bounds = null;
 				$tw.utils.each(this.renderedLayers,function(layer) {
 					var featureBounds = layer.layer.getBounds();
-					if(bounds) {
-						bounds.extend(featureBounds);
-					} else {
-						bounds = featureBounds;
+					if(featureBounds.isValid()) {
+						if(bounds) {
+							bounds.extend(featureBounds);
+						} else {
+							bounds = featureBounds;
+						}
 					}
 				});
 				if(bounds) {
diff --git a/plugins/tiddlywiki/github-fork-ribbon/usage.tid b/plugins/tiddlywiki/github-fork-ribbon/usage.tid
index 2c1388da0..c91566b69 100644
--- a/plugins/tiddlywiki/github-fork-ribbon/usage.tid
+++ b/plugins/tiddlywiki/github-fork-ribbon/usage.tid
@@ -6,11 +6,11 @@ title: $:/plugins/tiddlywiki/github-fork-ribbon/usage
 \end
 
 \procedure ribbonCreateActions()
-<% if [[$:/github-ribbon]!is[tiddler]] %>
+<%if [[$:/github-ribbon]!is[tiddler]] %>
 	<$action-setfield $tiddler="$:/github-ribbon" $field="text" $value=<<ribbonCode>>
 		tags="$:/tags/PageTemplate" 
 		code-body="yes" />
-<% endif %>
+<%endif%>
 <$action-navigate $to="$:/github-ribbon" />
 \end
 
@@ -18,9 +18,9 @@ title: $:/plugins/tiddlywiki/github-fork-ribbon/usage
 <$button actions=<<ribbonCreateActions>> >
 <%if [[$:/github-ribbon]!is[tiddler]] %>
 Create
-<% else %>
+<%else%>
 Show
-<% endif %> ~$:/github-ribbon
+<%endif%> ~$:/github-ribbon
 </$button>
 \end
 
diff --git a/plugins/tiddlywiki/help/help.tid b/plugins/tiddlywiki/help/help.tid
index eca5ffaa7..f29d9dbdf 100644
--- a/plugins/tiddlywiki/help/help.tid
+++ b/plugins/tiddlywiki/help/help.tid
@@ -8,22 +8,22 @@ description: {{$:/language/Buttons/Help/Hint}}
 \whitespace trim
 <$list filter="[[$:/config/ShowHelp]get[text]] +[else[no]match[yes]]" variable="ignore">
 <$button set="$:/config/ShowHelp" setTo="no" tooltip={{$:/language/Buttons/Help/Hint}} aria-label={{$:/language/Buttons/Help/Caption}} class="""$(tv-config-toolbar-class)$ tc-selected""">
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/help}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/Help/Caption}}/></span>
-</$list>
+<%endif%>
 </$button>
 </$list>
 <$list filter="[[$:/config/ShowHelp]get[text]] +[else[no]!match[yes]]" variable="ignore">
 <$button set="$:/config/ShowHelp" setTo="yes" tooltip={{$:/language/Buttons/Help/Hint}} aria-label={{$:/language/Buttons/Help/Caption}} class=<<tv-config-toolbar-class>>>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/core/images/help}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/Help/Caption}}/></span>
-</$list>
+<%endif%>
 </$button>
 </$list>
 \end
diff --git a/plugins/tiddlywiki/katex/wrapper.js b/plugins/tiddlywiki/katex/wrapper.js
index ceda68c84..1b41655ca 100644
--- a/plugins/tiddlywiki/katex/wrapper.js
+++ b/plugins/tiddlywiki/katex/wrapper.js
@@ -21,7 +21,7 @@ katex.updateMacros = function() {
 	var tiddlers = $tw.wiki.getTiddlersWithTag("$:/tags/KaTeX/Macro"),
 		regex = /#\d/g, // Remove the arguments like #1#2
 		tid, macro, cmd;
-	for (var i=0; i < tiddlers.length; i++) {
+	for(var i=0; i < tiddlers.length; i++) {
 		tid = $tw.wiki.getTiddler(tiddlers[i]);
 		try {
 			macro = tid.fields["caption"];
diff --git a/plugins/tiddlywiki/markdown-legacy/new-markdown.tid b/plugins/tiddlywiki/markdown-legacy/new-markdown.tid
index 507c265a5..8d8f587d8 100755
--- a/plugins/tiddlywiki/markdown-legacy/new-markdown.tid
+++ b/plugins/tiddlywiki/markdown-legacy/new-markdown.tid
@@ -7,10 +7,10 @@ list-after: $:/core/ui/Buttons/new-tiddler
 \whitespace trim
 <$button tooltip={{$:/language/Buttons/NewMarkdown/Hint}} aria-label={{$:/language/Buttons/NewMarkdown/Caption}} class=<<tv-config-toolbar-class>>>
 <$action-sendmessage $message="tm-new-tiddler" type="text/markdown"/>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/plugins/tiddlywiki/markdown-legacy/images/new-markdown-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/NewMarkdown/Caption}}/></span>
-</$list>
+<%endif%>
 </$button>
diff --git a/plugins/tiddlywiki/markdown/config.tid b/plugins/tiddlywiki/markdown/config.tid
index c3fb14c0d..1438d3fa6 100755
--- a/plugins/tiddlywiki/markdown/config.tid
+++ b/plugins/tiddlywiki/markdown/config.tid
@@ -2,16 +2,6 @@ title: $:/plugins/tiddlywiki/markdown/config
 
 ! Plugin Configuration
 
-|!Config |!Default |!Description |
-|[[breaks|$:/config/markdown/breaks]]|`false`|markdown-it library config: Convert '\n' in paragraphs into `<br>` |
-|[[linkify|$:/config/markdown/linkify]]|`false`|markdown-it library config: Autoconvert URL-like text to links |
-|[[renderWikiText|$:/config/markdown/renderWikiText]]|`true`|After Markdown is parsed, should any text elements be handed off to the ~WikiText parser for further processing? |
-|[[renderWikiTextPragma|$:/config/markdown/renderWikiTextPragma]]|<code><$view tiddler="$:/plugins/tiddlywiki/markdown" subtiddler="$:/config/markdown/renderWikiTextPragma" mode="inline"/></code>|When handing off to the ~WikiText parser, what parser rules should it follow? |
-|[[typographer|$:/config/markdown/typographer]]|`false`|markdown-it library config: Enable some language-neutral replacement + quotes beautification |
-|[[quotes|$:/config/markdown/quotes]]|`“”‘’`|markdown-it library config: Double + single quotes replacement pairs, when `typographer` is enabled |
-
-''IMPORTANT:'' You must reload your wiki for changes to take effect.
-
 <h2 style="margin-top:1.5em">~WikiText Pragma</h2>
 
 The value of [[renderWikiTextPragma|$:/config/markdown/renderWikiTextPragma]] has been carefully tuned to properly integrate markdown with ~TiddlyWiki. Changing this setting may produce unexpected results, but the inclusion of the following parser rules should be fine:
diff --git a/plugins/tiddlywiki/markdown/markdown-it-katex.js b/plugins/tiddlywiki/markdown/markdown-it-katex.js
index 4bbd5c655..dc70f829a 100644
--- a/plugins/tiddlywiki/markdown/markdown-it-katex.js
+++ b/plugins/tiddlywiki/markdown/markdown-it-katex.js
@@ -31,17 +31,17 @@ function isValidDelim(state, pos) {
 
     // Check non-whitespace conditions for opening and closing, and
     // check that closing delimeter isn't followed by a number
-    if (prevChar === 0x20/* " "  */ || prevChar === 0x09/* \t */ ||
+    if(prevChar === 0x20/* " "  */ || prevChar === 0x09/* \t */ ||
         prevChar === 0x0d/* "\r" */ || prevChar === 0x0a/* \n */ ||
         (nextChar >= 0x30/* "0"  */ && nextChar <=  0x39/* "9" */)) {
         can_close = false;
     }
-    if (nextChar === 0x20/* " "  */ || nextChar === 0x09/* \t */ ||
+    if(nextChar === 0x20/* " "  */ || nextChar === 0x09/* \t */ ||
         nextChar === 0x0d/* "\r" */ || nextChar === 0x0a/* \ns */) {
         can_open = false;
     }
 
-    if (state.src.substring(pos,pos+3) === "$:/") {
+    if(state.src.substring(pos,pos+3) === "$:/") {
         can_open = false;
         can_close = false;
     }
@@ -55,11 +55,11 @@ function isValidDelim(state, pos) {
 function math_inline(state, silent) {
     var start, match, token, res, pos, esc_count;
 
-    if (state.src[state.pos] !== "$") { return false; }
+    if(state.src[state.pos] !== "$") { return false; }
 
     res = isValidDelim(state, state.pos);
-    if (!res.can_open) {
-        if (!silent) { state.pending += "$"; }
+    if(!res.can_open) {
+        if(!silent) { state.pending += "$"; }
         state.pos += 1;
         return true;
     }
@@ -70,40 +70,40 @@ function math_inline(state, silent) {
     // we have found an opening delimieter already.
     start = state.pos + 1;
     match = start;
-    while ( (match = state.src.indexOf("$", match)) !== -1) {
+    while( (match = state.src.indexOf("$", match)) !== -1) {
         // Found potential $, look for escapes, pos will point to
         // first non escape when complete
         pos = match - 1;
-        while (state.src[pos] === "\\") { pos -= 1; }
+        while(state.src[pos] === "\\") { pos -= 1; }
 
         // Even number of escapes, potential closing delimiter found
-        if ( ((match - pos) % 2) == 1 ) { break; }
+        if( ((match - pos) % 2) == 1 ) { break; }
         match += 1;
     }
 
     // No closing delimter found.  Consume $ and continue.
-    if (match === -1) {
-        if (!silent) { state.pending += "$"; }
+    if(match === -1) {
+        if(!silent) { state.pending += "$"; }
         state.pos = start;
         return true;
     }
 
     // Check if we have empty content, ie: $$.  Do not parse.
-    if (match - start === 0) {
-        if (!silent) { state.pending += "$$"; }
+    if(match - start === 0) {
+        if(!silent) { state.pending += "$$"; }
         state.pos = start + 1;
         return true;
     }
 
     // Check for valid closing delimiter
     res = isValidDelim(state, match);
-    if (!res.can_close) {
-        if (!silent) { state.pending += "$"; }
+    if(!res.can_close) {
+        if(!silent) { state.pending += "$"; }
         state.pos = start;
         return true;
     }
 
-    if (!silent) {
+    if(!silent) {
         token         = state.push('math_inline', '$latex', 0);
         token.markup  = "$";
         token.content = state.src.slice(start, match);
@@ -126,32 +126,32 @@ function math_inline_block(state, silent) {
     // we have found an opening delimieter already.
     start = state.pos + 2;
     match = start;
-    while ( (match = state.src.indexOf("$$", match)) !== -1) {
+    while( (match = state.src.indexOf("$$", match)) !== -1) {
         // Found potential $$, look for escapes, pos will point to
         // first non escape when complete
         pos = match - 1;
-        while (state.src[pos] === "\\") { pos -= 1; }
+        while(state.src[pos] === "\\") { pos -= 1; }
 
         // Even number of escapes, potential closing delimiter found
-        if ( ((match - pos) % 2) == 1 ) { break; }
+        if( ((match - pos) % 2) == 1 ) { break; }
         match += 2;
     }
 
     // No closing delimter found.  Consume $$ and continue.
-    if (match === -1) {
-        if (!silent) { state.pending += "$$"; }
+    if(match === -1) {
+        if(!silent) { state.pending += "$$"; }
         state.pos = start;
         return true;
     }
 
     // Check if we have empty content, ie: $$$$.  Do not parse.
-    if (match - start === 0) {
-        if (!silent) { state.pending += "$$$$"; }
+    if(match - start === 0) {
+        if(!silent) { state.pending += "$$$$"; }
         state.pos = start + 2;
         return true;
     }
 
-    if (!silent) {
+    if(!silent) {
         token         = state.push('math_inline_block', '$latex', 0);
         token.block   = true;
         token.markup  = "$$";
diff --git a/plugins/tiddlywiki/markdown/new-markdown.tid b/plugins/tiddlywiki/markdown/new-markdown.tid
index 192543d77..404046360 100755
--- a/plugins/tiddlywiki/markdown/new-markdown.tid
+++ b/plugins/tiddlywiki/markdown/new-markdown.tid
@@ -7,10 +7,10 @@ list-after: $:/core/ui/Buttons/new-tiddler
 \whitespace trim
 <$button tooltip={{$:/language/Buttons/NewMarkdown/Hint}} aria-label={{$:/language/Buttons/NewMarkdown/Caption}} class=<<tv-config-toolbar-class>>>
 <$action-sendmessage $message="tm-new-tiddler" type="text/markdown"/>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/plugins/tiddlywiki/markdown/images/new-markdown-button}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text"><$text text={{$:/language/Buttons/NewMarkdown/Caption}}/></span>
-</$list>
+<%endif%>
 </$button>
diff --git a/plugins/tiddlywiki/markdown/plugin.info b/plugins/tiddlywiki/markdown/plugin.info
index cf5ecea3a..1288ad068 100755
--- a/plugins/tiddlywiki/markdown/plugin.info
+++ b/plugins/tiddlywiki/markdown/plugin.info
@@ -2,6 +2,6 @@
 	"title": "$:/plugins/tiddlywiki/markdown",
 	"name": "Markdown",
 	"description": "Markdown parser based on markdown-it",
-	"list": "readme config syntax license",
+	"list": "readme config settings syntax license",
 	"stability": "STABILITY_2_STABLE"
 }
diff --git a/plugins/tiddlywiki/markdown/settings.tid b/plugins/tiddlywiki/markdown/settings.tid
new file mode 100644
index 000000000..54207fa10
--- /dev/null
+++ b/plugins/tiddlywiki/markdown/settings.tid
@@ -0,0 +1,19 @@
+title: $:/plugins/tiddlywiki/markdown/settings
+tags: $:/tags/ControlPanel/SettingsTab
+caption: Markdown
+
+These settings let you customise the behaviour of Markdown. See [[plugin|$:/plugins/tiddlywiki/markdown]] readme and config tab for more information.
+
+''IMPORTANT:'' You must reload your wiki for changes to take effect.
+
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Settings/Markdown]]">
+
+<div class="tc-control-panel-setting" data-setting-title=<<currentTiddler>> >
+
+!!.tc-control-panel-accent <$link><$transclude field="caption"/></$link>
+
+<$transclude/>
+
+</div>
+
+</$list>
\ No newline at end of file
diff --git a/plugins/tiddlywiki/markdown/settings/breaks.tid b/plugins/tiddlywiki/markdown/settings/breaks.tid
new file mode 100644
index 000000000..95ebc47a8
--- /dev/null
+++ b/plugins/tiddlywiki/markdown/settings/breaks.tid
@@ -0,0 +1,9 @@
+title: $:/plugins/tiddlywiki/markdown/settings/breaks
+tags: $:/tags/ControlPanel/Settings/Markdown
+caption: Breaks
+
+markdown-it library config: Convert `\n` in paragraphs into `<br>`
+
+<$checkbox tiddler="$:/config/markdown/breaks" field="text" checked="true" unchecked="false">
+    [[Breaks|$:/config/markdown/breaks]]
+</$checkbox>
\ No newline at end of file
diff --git a/plugins/tiddlywiki/markdown/settings/linkify.tid b/plugins/tiddlywiki/markdown/settings/linkify.tid
new file mode 100644
index 000000000..c43928ccf
--- /dev/null
+++ b/plugins/tiddlywiki/markdown/settings/linkify.tid
@@ -0,0 +1,9 @@
+title: $:/plugins/tiddlywiki/markdown/settings/linkify
+tags: $:/tags/ControlPanel/Settings/Markdown
+caption: Linkify
+
+markdown-it library config: Autoconvert URL-like text to links
+
+<$checkbox tiddler="$:/config/markdown/linkify" field="text" checked="true" unchecked="false">
+    [[Linkify|$:/config/markdown/linkify]]
+</$checkbox>
\ No newline at end of file
diff --git a/plugins/tiddlywiki/markdown/settings/quotes.tid b/plugins/tiddlywiki/markdown/settings/quotes.tid
new file mode 100644
index 000000000..b4247ede6
--- /dev/null
+++ b/plugins/tiddlywiki/markdown/settings/quotes.tid
@@ -0,0 +1,8 @@
+title: $:/plugins/tiddlywiki/markdown/settings/quotes
+tags: $:/tags/ControlPanel/Settings/Markdown
+caption: Quotes replacement
+list-after: $:/plugins/tiddlywiki/markdown/settings/typographer
+
+markdown-it library config: Double + single quotes replacement pairs, when [[typographer|$:/config/markdown/typographer]] is enabled.
+
+|[[Quotes replacement|$:/config/markdown/quotes]]|<$edit-text tiddler="$:/config/markdown/quotes" tag="input"/> |
\ No newline at end of file
diff --git a/plugins/tiddlywiki/markdown/settings/renderWikiText.tid b/plugins/tiddlywiki/markdown/settings/renderWikiText.tid
new file mode 100644
index 000000000..9b2073c10
--- /dev/null
+++ b/plugins/tiddlywiki/markdown/settings/renderWikiText.tid
@@ -0,0 +1,9 @@
+title: $:/plugins/tiddlywiki/markdown/settings/renderWikiText
+tags: $:/tags/ControlPanel/Settings/Markdown
+caption: Enable WikiText
+
+After Markdown is parsed, should any text elements be handed off to the ~WikiText parser for further processing?
+
+<$checkbox tiddler="$:/config/markdown/renderWikiText" field="text" checked="true" unchecked="false">
+    [[Enable WikiText|$:/config/markdown/renderWikiText]]
+</$checkbox>
\ No newline at end of file
diff --git a/plugins/tiddlywiki/markdown/settings/renderWikiTextPragma.tid b/plugins/tiddlywiki/markdown/settings/renderWikiTextPragma.tid
new file mode 100644
index 000000000..12b4ceefb
--- /dev/null
+++ b/plugins/tiddlywiki/markdown/settings/renderWikiTextPragma.tid
@@ -0,0 +1,7 @@
+title: $:/plugins/tiddlywiki/markdown/settings/renderWikiTextPragma
+tags: $:/tags/ControlPanel/Settings/Markdown
+caption: Enabled WikiText parser rules
+
+When handing off to the ~WikiText parser, what parser rules should it follow?
+
+|[[Enabled WikiText parser rules|$:/config/markdown/renderWikiTextPragma]]|<$edit tiddler="$:/config/markdown/renderWikiTextPragma" class="tc-edit-texteditor" autoHeight="yes"/> |
\ No newline at end of file
diff --git a/plugins/tiddlywiki/markdown/settings/typographer.tid b/plugins/tiddlywiki/markdown/settings/typographer.tid
new file mode 100644
index 000000000..5b9153dae
--- /dev/null
+++ b/plugins/tiddlywiki/markdown/settings/typographer.tid
@@ -0,0 +1,9 @@
+title: $:/plugins/tiddlywiki/markdown/settings/typographer
+tags: $:/tags/ControlPanel/Settings/Markdown
+caption: Typographer
+
+markdown-it library config: Enable some language-neutral replacement + quotes beautification
+
+<$checkbox tiddler="$:/config/markdown/typographer" field="text" checked="true" unchecked="false">
+    [[Typographer|$:/config/markdown/typographer]]
+</$checkbox>
\ No newline at end of file
diff --git a/plugins/tiddlywiki/markdown/wrapper.js b/plugins/tiddlywiki/markdown/wrapper.js
index 98c5c2ae3..708b932e3 100755
--- a/plugins/tiddlywiki/markdown/wrapper.js
+++ b/plugins/tiddlywiki/markdown/wrapper.js
@@ -234,12 +234,12 @@ function MarkdownParser(type,text,options) {
 			rules: { pragma: {}, block: this.blockRuleClasses, inline: this.inlineRuleClasses }
 		});
 	}
-	catch (err) {
+	catch(err) {
 		wikiParser = $tw.wiki.parseText("text/vnd.tiddlywiki",
 			"<strong>Error encountered while parsing the tiddler:</strong><p>" + err.message + "</p>",
 			{parseAsInline: false, wiki: options.wiki});
 	}
-	finally {
+	finally{
 		$tw.utils.parseStringLiteral = origParseStringLiteral;
 	}
 	if(wikiParser.tree.length > 0) {
diff --git a/plugins/tiddlywiki/qrcode/ViewToolbarButton/Button.tid b/plugins/tiddlywiki/qrcode/ViewToolbarButton/Button.tid
index 2a6335545..7ac85af19 100644
--- a/plugins/tiddlywiki/qrcode/ViewToolbarButton/Button.tid
+++ b/plugins/tiddlywiki/qrcode/ViewToolbarButton/Button.tid
@@ -8,50 +8,28 @@ description: Generate QR code for this tiddler
 \whitespace trim
 <span class="tc-popup-keep">
 <$button popup=<<qualify "$:/state/popup/qrcode">> tooltip={{$:/plugins/tiddlywiki/qrcode/ViewToolbarButton!!description}} aria-label={{$:/plugins/tiddlywiki/qrcode/ViewToolbarButton!!short-caption}} class=<<tv-config-toolbar-class>> class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/plugins/tiddlywiki/qrcode/icon}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">
 <$text text={{$:/plugins/tiddlywiki/qrcode/ViewToolbarButton!!short-caption}}/>
 </span>
-</$list>
+<%endif%>
 </$button>
 </span>
 <$reveal state=<<qualify "$:/state/popup/qrcode">> type="popup" position="below" animate="yes">
+    <div class="tc-drop-down">
 
-<div class="tc-drop-down">
-
-{{$:/plugins/tiddlywiki/qrcode/ViewToolbarButton||description}}
-
-<$set name="tv-config-toolbar-icons" value="yes">
-
-<$set name="tv-config-toolbar-text" value="yes">
-
-<$set name="tv-config-toolbar-class" value="tc-btn-invisible">
-
-<$set name="targetTiddler" value=<<currentTiddler>>>
-
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbarButton/QRcode]!has[draft.of]]">
-
-<$button popup=<<qualify "$:/state/popup/qrcode/type">> class="tc-btn-invisible" selectedClass="tc-selected">
-
-<$action-sendmessage $message="tm-modal" $param=<<currentTiddler>> currentTiddler=<<targetTiddler>>/>
-
-<$transclude field="caption" mode="inline"/>
-
-</$button>
-
-</$list>
-
-</$set>
-
-</$set>
-
-</$set>
-
-</$set>
-
-</div>
+    {{$:/plugins/tiddlywiki/qrcode/ViewToolbarButton||description}}
 
+        <$let tv-config-toolbar-icons="yes" tv-config-toolbar-text="yes" tv-config-toolbar-class="tc-btn-invisible" targetTiddler=<<currentTiddler>>>
+            <$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbarButton/QRcode]!has[draft.of]]">
+                <$button popup=<<qualify "$:/state/popup/qrcode/type">> class="tc-btn-invisible" selectedClass="tc-selected">
+                    <$action-sendmessage $message="tm-modal" $param=<<currentTiddler>> currentTiddler=<<targetTiddler>>/>
+                    <$transclude field="caption" mode="inline"/>
+                </$button>
+            </$list>
+        </$let>
+    </div>
 </$reveal>
diff --git a/plugins/tiddlywiki/qrcode/makeqr.js b/plugins/tiddlywiki/qrcode/makeqr.js
index 2a4e37273..0328a8468 100644
--- a/plugins/tiddlywiki/qrcode/makeqr.js
+++ b/plugins/tiddlywiki/qrcode/makeqr.js
@@ -37,7 +37,7 @@ exports.run = function(text,size,errorCorrectLevel,fallback) {
 	var result;
 	try {
 		result = generateQrCode(text,{size: size, errorCorrectLevel: errorCorrectLevel});
-	} catch (ex) {
+	} catch(ex) {
 		console.log("makeqr error: " + ex);
 		result = fallback || ("data:image/svg+xml," + encodeURI(QRCODE_GENERATION_ERROR_PREFIX + ex + QRCODE_GENERATION_ERROR_SUFFIX));
 	}
@@ -54,7 +54,7 @@ function generateQrCode(text,options) {
 		qr = qrcode(typeNumber,errorCorrectLevel);
 		qr.addData(text);
 		qr.make();
-	} catch (e) {
+	} catch(e) {
 		if(typeNumber >= 40) {
 			throw new Error("Text too long to encode");
 		} else {
diff --git a/plugins/tiddlywiki/railroad/parser.js b/plugins/tiddlywiki/railroad/parser.js
index 013d898d7..02256524d 100644
--- a/plugins/tiddlywiki/railroad/parser.js
+++ b/plugins/tiddlywiki/railroad/parser.js
@@ -377,7 +377,7 @@ Parser.prototype.tokenise = function(source) {
 		// Skip whitespace
 		pos = $tw.utils.skipWhiteSpace(source,pos);
 		// Avoid falling off the end of the string
-		if (pos >= source.length) {
+		if(pos >= source.length) {
 			break;
 		}
 		// Examine the next character
diff --git a/plugins/tiddlywiki/text-slicer/modules/slicer.js b/plugins/tiddlywiki/text-slicer/modules/slicer.js
index c3e3328e4..2fc2238bb 100644
--- a/plugins/tiddlywiki/text-slicer/modules/slicer.js
+++ b/plugins/tiddlywiki/text-slicer/modules/slicer.js
@@ -365,7 +365,7 @@ Slicer.prototype.onCloseTag = function(name) {
 	// Render the tag
 	if(actions.isAnchor) {
 		this.onCloseAnchor(e);
-	} else if (!actions.dontRenderTag && !selfClosing) {
+	} else if(!actions.dontRenderTag && !selfClosing) {
 		var markupInfo = actions.markup && actions.markup[this.outputMode];
 		if(markupInfo) {
 			this.addTextToCurrentChunk(markupInfo.suffix);
diff --git a/plugins/tiddlywiki/text-slicer/ui/slice-toolbar-button.tid b/plugins/tiddlywiki/text-slicer/ui/slice-toolbar-button.tid
index ef53223d2..0a9b41414 100644
--- a/plugins/tiddlywiki/text-slicer/ui/slice-toolbar-button.tid
+++ b/plugins/tiddlywiki/text-slicer/ui/slice-toolbar-button.tid
@@ -6,18 +6,18 @@ description: Slice this text tiddler by headings and lists
 
 \whitespace trim
 
-\define hint()
+\procedure hint()
 Slice this text tiddler into chunks
 \end
 
 <$list filter="[<currentTiddler>!is[image]!is[binary]]" variable="ignore">
 <$button tooltip=<<hint>> aria-label=<<hint>> class=<<tv-config-toolbar-class>>>
 <$action-sendmessage $message="tm-modal" $param="$:/plugins/tiddlywiki/text-slicer/ui/slice-modal" currentTiddler=<<currentTiddler>>/>
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/plugins/tiddlywiki/text-slicer/images/text-slicer-icon}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text">Slice tiddler</span>
-</$list>
+<%endif%>
 </$button>
 </$list>
diff --git a/plugins/tiddlywiki/tiddlyweb/save-wiki-button.tid b/plugins/tiddlywiki/tiddlyweb/save-wiki-button.tid
index ed4c042c7..63ddfc19e 100644
--- a/plugins/tiddlywiki/tiddlyweb/save-wiki-button.tid
+++ b/plugins/tiddlywiki/tiddlyweb/save-wiki-button.tid
@@ -9,12 +9,12 @@ $:/config/PageControlButtons/Visibility/$(listItem)$
 \end
 <$button popup=<<qualify "$:/state/popup/save-wiki">> tooltip="Status of synchronisation with server" aria-label="Server status" class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
 <span class="tc-dirty-indicator">
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+<%if [<tv-config-toolbar-icons>match[yes]] %>
 {{$:/plugins/tiddlywiki/tiddlyweb/icon/cloud}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
+<%endif%>
+<%if [<tv-config-toolbar-text>match[yes]] %>
 <span class="tc-btn-text"><$text text="Server status"/></span>
-</$list>
+<%endif%>
 </span>
 </$button>
 <$reveal state=<<qualify "$:/state/popup/save-wiki">> type="popup" position="belowleft" animate="yes">
diff --git a/plugins/tiddlywiki/tiddlyweb/tiddlywebadaptor.js b/plugins/tiddlywiki/tiddlyweb/tiddlywebadaptor.js
index 15fbaa4fd..b91ea3560 100644
--- a/plugins/tiddlywiki/tiddlyweb/tiddlywebadaptor.js
+++ b/plugins/tiddlywiki/tiddlyweb/tiddlywebadaptor.js
@@ -84,7 +84,7 @@ TiddlyWebAdaptor.prototype.getStatus = function(callback) {
 			var json = null;
 			try {
 				json = JSON.parse(data);
-			} catch (e) {
+			} catch(e) {
 			}
 			if(json) {
 				self.logger.log("Status:",data);
@@ -164,7 +164,7 @@ TiddlyWebAdaptor.prototype.getCsrfToken = function() {
 	var regex = /^(?:.*; )?csrf_token=([^(;|$)]*)(?:;|$)/,
 		match = regex.exec(document.cookie),
 		csrf = null;
-	if (match && (match.length === 2)) {
+	if(match && (match.length === 2)) {
 		csrf = match[1];
 	}
 	return csrf;
diff --git a/plugins/tiddlywiki/tour/simplified-tiddler-with-tags.tid b/plugins/tiddlywiki/tour/simplified-tiddler-with-tags.tid
index 9adf981e1..c2c14a7b0 100644
--- a/plugins/tiddlywiki/tour/simplified-tiddler-with-tags.tid
+++ b/plugins/tiddlywiki/tour/simplified-tiddler-with-tags.tid
@@ -81,8 +81,8 @@ color:$(foregroundColor)$;
 \end
 
 <$let storyTiddler=<<currentTiddler>>>
-	<div class="tc-tiddler-frame tc-tiddler-view-frame tc-tiddler-exists tc-tiddler-shadow " role="article">
-		<div class="tc-tiddler-title">
+	<div class="tc-tiddler-frame tc-tiddler-view-frame tc-tiddler-exists tc-tiddler-shadow tc-clearfix" role="article">
+		<div class="tc-tiddler-title tc-clearfix">
 			<div class="tc-titlebar">
 				<span class="tc-tiddler-controls">
 					<$list filter="[<tour-simplified-tiddler-close-button>match[yes]]" variable="ignore">
@@ -94,12 +94,12 @@ color:$(foregroundColor)$;
 				</span>
 			</div>
 		</div>
-		<div class="tc-tags-wrapper">
+		<div class="tc-tags-wrapper tc-clearfix">
 			<$list filter="[all[current]tags[]sort[title]]" storyview="pop">
 				<<simplified-tag "$:/plugins/tiddlywiki/tour/introduction-to-tiddlywiki/tiddlers/">>
 			</$list>
 		</div>
-		<div class="tc-tiddler-body">
+		<div class="tc-tiddler-body tc-clearfix">
 			<$transclude field="text" mode="block"/>
 		</div>
 	</div>
diff --git a/plugins/tiddlywiki/tour/simplified-tiddler.tid b/plugins/tiddlywiki/tour/simplified-tiddler.tid
index 22a146b9a..302903bee 100644
--- a/plugins/tiddlywiki/tour/simplified-tiddler.tid
+++ b/plugins/tiddlywiki/tour/simplified-tiddler.tid
@@ -3,7 +3,7 @@ title: $:/plugins/tiddlywiki/tour/simplified-tiddler
 \whitespace trim
 <$let storyTiddler=<<currentTiddler>>>
 	<div class="tc-tiddler-frame tc-tiddler-view-frame tc-tiddler-exists tc-tiddler-shadow " role="article">
-		<div class="tc-tiddler-title">
+		<div class="tc-tiddler-title tc-clearfix">
 			<div class="tc-titlebar">
 				<span class="tc-tiddler-controls">
 					<$list filter="[<tour-simplified-tiddler-close-button>match[yes]]" variable="ignore">
@@ -15,7 +15,7 @@ title: $:/plugins/tiddlywiki/tour/simplified-tiddler
 				</span>
 			</div>
 		</div>
-		<div class="tc-tiddler-body">
+		<div class="tc-tiddler-body tc-clearfix">
 			<$transclude field="text" mode="block"/>
 		</div>
 	</div>
diff --git a/plugins/tiddlywiki/tw2parser/entry.js b/plugins/tiddlywiki/tw2parser/entry.js
index f97cf4cdc..073221b8b 100644
--- a/plugins/tiddlywiki/tw2parser/entry.js
+++ b/plugins/tiddlywiki/tw2parser/entry.js
@@ -21,7 +21,7 @@ exports.params = [
 Run the macro
 */
 exports.run = function(key,map) {
-	try{
+	try {
 		return  JSON.parse(map)[key];
 	} catch(e) {
 		return "";
diff --git a/plugins/tiddlywiki/tw2parser/wikitextparser.js b/plugins/tiddlywiki/tw2parser/wikitextparser.js
index 947519bb9..fec58f3bd 100644
--- a/plugins/tiddlywiki/tw2parser/wikitextparser.js
+++ b/plugins/tiddlywiki/tw2parser/wikitextparser.js
@@ -70,7 +70,7 @@ var WikiTextParser = function(type,text,options) {
 	var root = JSON.parse(JSON.stringify(parser.tree));
 	// macros are defined in a linear tree; walk down the tree and append the source's parsed content 
 	var baseroot = root;
-	while (root[0] && root[0].children && root[0].children.length !== 0 ){ 
+	while(root[0] && root[0].children && root[0].children.length !== 0 ){ 
 		root = root[0].children;
 	}
 	root[0].children[0] = this.tree[0];
diff --git a/plugins/tiddlywiki/tw2parser/wikitextrules.js b/plugins/tiddlywiki/tw2parser/wikitextrules.js
index d7f809723..068bb9757 100755
--- a/plugins/tiddlywiki/tw2parser/wikitextrules.js
+++ b/plugins/tiddlywiki/tw2parser/wikitextrules.js
@@ -249,7 +249,7 @@ var rules = [
 				}
 				applyCssHelper(cell,styles);
 				w.subWikifyTerm(cell.children,this.cellTermRegExp);
-				if (!cell.attributes) cell.attributes ={};
+				if(!cell.attributes) cell.attributes ={};
 				if(w.matchText.substr(w.matchText.length-2,1) == " ") // spaceRight
 					$tw.utils.addAttributeToParseTreeNode(cell,"align",spaceLeft ? "center" : "left");
 				else if(spaceLeft)
@@ -370,9 +370,9 @@ var rules = [
 					var f = stack[stack.length-1];
 					e = {type:"element",tag:this.element,children: []};
 					stack.push(e);
-					if (t ===0){
+					if(t ===0){
 						w.output.push(e);
-					}else {
+					} else {
 						f.children.push(e);
 						
 					}
@@ -458,7 +458,7 @@ var rules = [
 			w.source = oldSource;
 			w.nextMatch = oldNextMatch;
 			w.children = oldChildren;
-			for (var i=0; i<parser.tree.length; i++) {
+			for(var i=0; i<parser.tree.length; i++) {
 				w.output.push(parser.tree[i]);
 			}
 			w.nextMatch = this.lookaheadRegExp.lastIndex;
@@ -488,12 +488,12 @@ var rules = [
 		if(lookaheadMatch && lookaheadMatch.index == w.matchStart) {
 			name = lookaheadMatch[1] || lookaheadMatch[2];
 			var params = lookaheadMatch[3], nameold =name;
-			if (name) {
-				if (!!macroadapter.paramadapter[name]) {
+			if(name) {
+				if(!!macroadapter.paramadapter[name]) {
 					params=macroadapter.paramadapter[name](params);
 					//alert("going out as "+params);
 				}
-				if (!!macroadapter.namedapter[name]) {
+				if(!!macroadapter.namedapter[name]) {
 					name=macroadapter.namedapter[name];
 				}
 				w.nextMatch = this.lookaheadRegExp.lastIndex;
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index f9a2a86fc..65c1a5fe3 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -71,10 +71,20 @@ $else$
 
 {{$:/themes/tiddlywiki/vanilla/reset}}
 
-*, input[type="search"] {
-	box-sizing: border-box;
-	-moz-box-sizing: border-box;
-	-webkit-box-sizing: border-box;
+input[type="search"] {
+	outline-offset: initial;
+}
+
+button:focus-visible, input:focus-visible, textarea:focus-visible, select:focus-visible {
+	outline: 2px solid <<colour primary>>;
+	outline-offset: -2px;
+	border-radius: 0.25em;
+}
+
+button:-moz-focusring, input:-moz-focusring, textarea:-moz-focusring, select:-moz-focusring {
+	outline: 2px solid <<colour primary>>;
+	outline-offset: -2px;
+	border-radius: 0.25em;
 }
 
 /*
@@ -157,7 +167,7 @@ code {
 	color: <<colour code-foreground>>;
 	background-color: <<colour code-background>>;
 	border: 1px solid <<colour code-border>>;
-	white-space: {{$:/themes/tiddlywiki/vanilla/options/codewrapping}};
+	white-space: pre-wrap;
 	padding: 0 3px 2px;
 	border-radius: 3px;
 	font-family: {{$:/themes/tiddlywiki/vanilla/settings/codefontfamily}};
@@ -224,6 +234,11 @@ dl dt {
 textarea,
 input[type=text],
 input[type=search],
+input[type=number],
+input[type=password],
+input[type=email],
+input[type=tel],
+input[type=url],
 input[type=""],
 input:not([type]) {
 	color: <<colour foreground>>;
@@ -288,10 +303,13 @@ form.tc-form-inline {
 Markdown likes putting code elements inside pre elements
 */
 pre > code {
-	padding: 0;
+	display: block;
+	padding: 0.5em;
 	border: none;
+	white-space: {{$:/themes/tiddlywiki/vanilla/options/codewrapping}};
 	background-color: inherit;
 	color: inherit;
+	overflow-x: auto;
 }
 
 /*
@@ -702,7 +720,7 @@ html body.tc-body .tc-btn-rounded:hover svg {
 }
 
 button svg.tc-image-button, button .tc-image-button img {
-	height: 1em;
+	height: auto;
 	width: 1em;
 }
 
@@ -1332,10 +1350,6 @@ canvas.tc-edit-bitmapeditor  {
 	display: block;
 }
 
-.tc-tiddler-body {
-	clear: both;
-}
-
 .tc-single-tiddler-window .tc-tiddler-body,
 .tc-tiddler-frame .tc-tiddler-body {
 	font-size: {{$:/themes/tiddlywiki/vanilla/metrics/bodyfontsize}};
@@ -2662,7 +2676,7 @@ a.tc-tiddlylink.tc-plugin-info:hover > .tc-plugin-info-chunk .tc-plugin-info-sta
 
 .tc-plugin-info-chunk.tc-plugin-info-icon img, .tc-plugin-info-chunk.tc-plugin-info-icon svg {
 	width: 2em;
-	height: 2em;
+	height: auto;
 }
 
 .tc-plugin-info-dropdown {
@@ -2755,6 +2769,16 @@ a.tc-tiddlylink.tc-plugin-info:hover > .tc-plugin-info-chunk .tc-plugin-info-sta
 	float: right;
 }
 
+/* Float tc-clearfix. Needs to be used by elements that allow float:right in their content.
+** So the floating element does not overflow
+*/
+
+.tc-clearfix:after {
+	content: "";
+	clear: both;
+	display: table;
+}
+
 /*
 ** Chooser
 */
@@ -2814,7 +2838,7 @@ a.tc-tiddlylink.tc-plugin-info:hover > .tc-plugin-info-chunk .tc-plugin-info-sta
 }
 
 .tc-language-chooser .tc-image-button img {
-	width: 2em;
+	width: auto;
 	vertical-align: -0.15em;
 }
 
@@ -3506,3 +3530,4 @@ span.tc-translink > a:first-child {
 .tc-tiny-v-gap-bottom {
 	margin-bottom: 3px;
 }
+