Merge branch 'master' into tag-indexer-perf-7455

2024-03-23 00:26:03 +01:00 · 2024-03-23 00:26:03 +01:00 · d99b4b11f3
parent 3c51440abc 31ec1bdd50
commit d99b4b11f3
490 changed files with 8070 additions and 1865 deletions
--- a/.gitignore
+++ b/.gitignore
@ -8,3 +8,4 @@ node_modules/
 /test-results/
 /playwright-report/
 /playwright/.cache/
+$__StoryList.tid
--- a/bin/build-site.sh
+++ b/bin/build-site.sh
@ -5,7 +5,7 @@
 # Default to the current version number for building the plugin library

 if [  -z "$TW5_BUILD_VERSION" ]; then
-    TW5_BUILD_VERSION=v5.3.2
+    TW5_BUILD_VERSION=v5.3.3
 fi

 echo "Using TW5_BUILD_VERSION as [$TW5_BUILD_VERSION]"
@ -156,6 +156,28 @@ node $TW5_BUILD_TIDDLYWIKI \
 	--build index favicon static \
 	|| exit 1

+# /tour.html			tour edition
+node $TW5_BUILD_TIDDLYWIKI \
+	./editions/tour \
+	--verbose \
+	--output $TW5_BUILD_OUTPUT \
+	--rendertiddler $:/core/save/all tour.html text/plain \
+	|| exit 1
+
+# /dev/index.html			Developer docs
+# /dev/favicon.ico			Favicon for dev site
+# /dev/static.html			Static rendering of default tiddlers
+# /dev/alltiddlers.html		Static rendering of all tiddlers
+# /dev/static/*				Static single tiddlers
+# /dev/static/static.css	Static stylesheet
+node $TW5_BUILD_TIDDLYWIKI \
+	./editions/dev \
+	--verbose \
+	--load $TW5_BUILD_OUTPUT/build.tid \
+	--output $TW5_BUILD_OUTPUT/dev \
+	--build index favicon static \
+	|| exit 1
+
 # /share.html				Custom edition for sharing via the URL
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/share \
--- a/boot/boot.js
+++ b/boot/boot.js
@ -177,6 +177,7 @@ document: defaults to current document
 eventListeners: array of event listeners (this option won't work until $tw.utils.addEventListeners() has been loaded)
 */
 $tw.utils.domMaker = function(tag,options) {
+	var options = options || {};
 	var doc = options.document || document;
 	var element = doc.createElementNS(options.namespace || "http://www.w3.org/1999/xhtml",tag);
 	if(options["class"]) {
@ -218,9 +219,34 @@ $tw.utils.error = function(err) {
 			heading = dm("h1",{text: errHeading}),
 			prompt = dm("div",{text: promptMsg, "class": "tc-error-prompt"}),
 			message = dm("div",{text: err, "class":"tc-error-message"}),
-			button = dm("div",{children: [dm("button",{text: ( $tw.language == undefined ? "close" : $tw.language.getString("Buttons/Close/Caption") )})], "class": "tc-error-prompt"}),
-			form = dm("form",{children: [heading,prompt,message,button], "class": "tc-error-form"});
+			closeButton = dm("div",{children: [dm("button",{text: ( $tw.language == undefined ? "close" : $tw.language.getString("Buttons/Close/Caption") )})], "class": "tc-error-prompt"}),
+			downloadButton = dm("div",{children: [dm("button",{text: ( $tw.language == undefined ? "download tiddlers" : $tw.language.getString("Buttons/EmergencyDownload/Caption") )})], "class": "tc-error-prompt"}),
+			form = dm("form",{children: [heading,prompt,downloadButton,message,closeButton], "class": "tc-error-form"});
 		document.body.insertBefore(form,document.body.firstChild);
+		downloadButton.addEventListener("click",function(event) {
+			if($tw && $tw.wiki) {
+				var tiddlers = [];
+				$tw.wiki.each(function(tiddler,title) {
+					tiddlers.push(tiddler.fields);
+				});
+				var link = dm("a"),
+					text = JSON.stringify(tiddlers);
+				if(Blob !== undefined) {
+					var blob = new Blob([text], {type: "text/html"});
+					link.setAttribute("href", URL.createObjectURL(blob));
+				} else {
+					link.setAttribute("href","data:text/html," + encodeURIComponent(text));
+				}
+				link.setAttribute("download","emergency-tiddlers-" + (new Date()) + ".json");
+				document.body.appendChild(link);
+				link.click();
+				document.body.removeChild(link);
+			} else {
+				alert("Emergency tiddler download is not available");
+			}
+			event.preventDefault();
+			return false;
+		},true);
 		form.addEventListener("submit",function(event) {
 			document.body.removeChild(form);
 			event.preventDefault();
@ -786,6 +812,7 @@ $tw.utils.Crypto = function() {
 			}
 			return outputText;
 		};
+	$tw.sjcl = sjcl;
 	this.setPassword = function(newPassword) {
 		currentPassword = newPassword;
 		this.updateCryptoStateTiddler();
@ -1967,10 +1994,10 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
 					var value = tiddler[name];
 					switch(fieldInfo.source) {
 						case "subdirectories":
-							value = path.relative(rootPath, filename).split('/').slice(0, -1);
+							value = path.relative(rootPath, filename).split(path.sep).slice(0, -1);
 							break;
 						case "filepath":
-							value = path.relative(rootPath, filename);
+							value = path.relative(rootPath, filename).split(path.sep).join('/');
 							break;
 						case "filename":
 							value = path.basename(filename);
@ -2438,6 +2465,7 @@ $tw.boot.initStartup = function(options) {
 	$tw.utils.registerFileType("image/svg+xml","utf8",".svg",{flags:["image"]});
 	$tw.utils.registerFileType("image/vnd.microsoft.icon","base64",".ico",{flags:["image"]});
 	$tw.utils.registerFileType("image/x-icon","base64",".ico",{flags:["image"]});
+	$tw.utils.registerFileType("application/wasm","base64",".wasm");
 	$tw.utils.registerFileType("application/font-woff","base64",".woff");
 	$tw.utils.registerFileType("application/x-font-ttf","base64",".woff");
 	$tw.utils.registerFileType("application/font-woff2","base64",".woff2");
@ -2452,8 +2480,12 @@ $tw.boot.initStartup = function(options) {
 	$tw.utils.registerFileType("text/x-markdown","utf8",[".md",".markdown"]);
 	$tw.utils.registerFileType("application/enex+xml","utf8",".enex");
 	$tw.utils.registerFileType("application/vnd.openxmlformats-officedocument.wordprocessingml.document","base64",".docx");
+	$tw.utils.registerFileType("application/msword","base64",".doc");
 	$tw.utils.registerFileType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet","base64",".xlsx");
+	$tw.utils.registerFileType("application/excel","base64",".xls");
+	$tw.utils.registerFileType("application/vnd.ms-excel","base64",".xls");
 	$tw.utils.registerFileType("application/vnd.openxmlformats-officedocument.presentationml.presentation","base64",".pptx");
+	$tw.utils.registerFileType("application/mspowerpoint","base64",".ppt");
 	$tw.utils.registerFileType("text/x-bibtex","utf8",".bib",{deserializerType:"application/x-bibtex"});
 	$tw.utils.registerFileType("application/x-bibtex","utf8",".bib");
 	$tw.utils.registerFileType("application/epub+zip","base64",".epub");
--- a/core/copyright.tid
+++ b/core/copyright.tid
@ -4,7 +4,7 @@ type: text/plain
 TiddlyWiki created by Jeremy Ruston, (jeremy [at] jermolene [dot] com)

 Copyright (c) 2004-2007, Jeremy Ruston
-Copyright (c) 2007-2023, UnaMesa Association
+Copyright (c) 2007-2024, UnaMesa Association
 All rights reserved.

 Redistribution and use in source and binary forms, with or without
--- a/core/images/default-layout.tid
+++ b/core/images/default-layout.tid
@ -0,0 +1,7 @@
+title: $:/core/images/default-layout
+tags: $:/tags/Image
+
+\parameters (size:"22pt")
+<svg width=<<size>> height=<<size>> class="tc-image-default-layout tc-image-button" viewBox="0 0 128 128">
+    <path d="M71.93 72A8.07 8.07 0 0 1 80 80.07v7.86A8.071 8.071 0 0 1 71.93 96H8.07A8.067 8.067 0 0 1 0 87.93v-7.86A8.072 8.072 0 0 1 8.07 72h63.86Zm0 32a8.07 8.07 0 0 1 8.07 8.07v7.86a8.071 8.071 0 0 1-8.07 8.07H8.07A8.067 8.067 0 0 1 0 119.93v-7.86A8.072 8.072 0 0 1 8.07 104h63.86Zm0-104A8.068 8.068 0 0 1 80 8.07v47.86A8.073 8.073 0 0 1 71.93 64H8.07A8.07 8.07 0 0 1 0 55.93V8.07A8.072 8.072 0 0 1 8.07 0h63.86Zm48 0c2.14 0 4.193.85 5.706 2.364A8.067 8.067 0 0 1 128 8.07v111.86c0 2.14-.85 4.193-2.364 5.706A8.067 8.067 0 0 1 119.93 128H96.07c-2.14 0-4.193-.85-5.706-2.364A8.067 8.067 0 0 1 88 119.93V8.07c0-2.14.85-4.193 2.364-5.706A8.067 8.067 0 0 1 96.07 0h23.86ZM116 24h-16a3.995 3.995 0 0 0-2.828 1.172 3.995 3.995 0 0 0 0 5.656A3.995 3.995 0 0 0 100 32h16a3.995 3.995 0 0 0 2.828-1.172 3.995 3.995 0 0 0 0-5.656A3.995 3.995 0 0 0 116 24Z"/>
+</svg>
--- a/core/language/en-GB/Buttons.multids
+++ b/core/language/en-GB/Buttons.multids
@ -28,6 +28,7 @@ Encryption/ClearPassword/Caption: clear password
 Encryption/ClearPassword/Hint: Clear the password and save this wiki without encryption
 Encryption/SetPassword/Caption: set password
 Encryption/SetPassword/Hint: Set a password for saving this wiki with encryption
+EmergencyDownload/Caption: download tiddlers as json
 ExportPage/Caption: export all
 ExportPage/Hint: Export all tiddlers
 ExportTiddler/Caption: export tiddler
--- a/core/language/en-GB/Docs/ModuleTypes.multids
+++ b/core/language/en-GB/Docs/ModuleTypes.multids
@ -9,7 +9,7 @@ config: Data to be inserted into `$tw.config`.
 filteroperator: Individual filter operator methods.
 global: Global data to be inserted into `$tw`.
 info: Publishes system information via the [[$:/temp/info-plugin]] pseudo-plugin.
-isfilteroperator: Operands for the ''is'' filter operator.
+isfilteroperator: Parameters for the ''is'' filter operator.
 library: Generic module type for general purpose JavaScript modules.
 macro: JavaScript macro definitions.
 parser: Parsers for different content types.
--- a/core/language/en-GB/Fields.multids
+++ b/core/language/en-GB/Fields.multids
@ -4,6 +4,7 @@ _canonical_uri: The full URI of an external image tiddler
 author: Name of the author of a plugin
 bag: The name of the bag from which a tiddler came
 caption: The text to be displayed on a tab or button
+class: The CSS class applied to a tiddler when rendering it - see [[Custom styles by user-class]].  Also used for [[Modals]]
 code-body: The view template will display the tiddler as code if set to ''yes''
 color: The CSS color value associated with a tiddler
 component: The name of the component responsible for an [[alert tiddler|AlertMechanism]]
--- a/core/language/en-GB/Misc.multids
+++ b/core/language/en-GB/Misc.multids
@ -30,7 +30,7 @@ Error/DeserializeOperator/UnknownDeserializer: Filter Error: Unknown deserialize
 Error/Filter: Filter error
 Error/FilterSyntax: Syntax error in filter expression
 Error/FilterRunPrefix: Filter Error: Unknown prefix for filter run
-Error/IsFilterOperator: Filter Error: Unknown operand for the 'is' filter operator
+Error/IsFilterOperator: Filter Error: Unknown parameter for the 'is' filter operator
 Error/FormatFilterOperator: Filter Error: Unknown suffix for the 'format' filter operator
 Error/LoadingPluginLibrary: Error loading plugin library
 Error/NetworkErrorAlert: `<h2>''Network Error''</h2>It looks like the connection to the server has been lost. This may indicate a problem with your network connection. Please attempt to restore network connectivity before continuing.<br><br>''Any unsaved changes will be automatically synchronised when connectivity is restored''.`
--- a/core/modules/commands/listen.js
+++ b/core/modules/commands/listen.js
@ -18,7 +18,7 @@ exports.info = {
 	name: "listen",
 	synchronous: true,
 	namedParameterMode: true,
-	mandatoryParameters: [],
+	mandatoryParameters: []
 };

 var Command = function(params,commander,callback) {
--- a/core/modules/commands/savetiddlers.js
+++ b/core/modules/commands/savetiddlers.js
@ -46,7 +46,7 @@ Command.prototype.execute = function() {
 			type = tiddler.fields.type || "text/vnd.tiddlywiki",
 			contentTypeInfo = $tw.config.contentTypeInfo[type] || {encoding: "utf8"},
 			filename = path.resolve(pathname,$tw.utils.encodeURIComponentExtended(title));
-		fs.writeFileSync(filename,tiddler.fields.text,contentTypeInfo.encoding);
+		fs.writeFileSync(filename,tiddler.fields.text || "",contentTypeInfo.encoding);
 	});
 	return null;
 };
--- a/core/modules/filters/backtranscludes.js
+++ b/core/modules/filters/backtranscludes.js
@ -0,0 +1,26 @@
+/*\
+title: $:/core/modules/filters/backtranscludes.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operator for returning all the backtranscludes from a tiddler
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Export our filter function
+*/
+exports.backtranscludes = function(source,operator,options) {
+	var results = [];
+	source(function(tiddler,title) {
+		$tw.utils.pushTop(results,options.wiki.getTiddlerBacktranscludes(title));
+	});
+	return results;
+};
+
+})();
--- a/core/modules/filters/crypto.js
+++ b/core/modules/filters/crypto.js
@ -14,12 +14,9 @@ Filter operators for cryptography, using the Stanford JavaScript library

 exports.sha256 = function(source,operator,options) {
 	var results = [],
-		length = parseInt(operator.operand,10) || 20,
-		sha256 = function(text) {
-			return sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(text)).substr(0,length);
-		};
+		length = parseInt(operator.operand,10) || 20;
 	source(function(tiddler,title) {
-		results.push(sha256(title));
+		results.push($tw.utils.sha256(title,{length: length}));
 	});
 	return results;
 };
--- a/core/modules/filters/json-ops.js
+++ b/core/modules/filters/json-ops.js
@ -273,7 +273,10 @@ function setDataItem(data,indexes,value) {
 		lastIndex = $tw.utils.parseInt(lastIndex);
 		if(lastIndex < 0) { lastIndex = lastIndex + current.length };
 	}
-	current[lastIndex] = value;
+	// Only set indexes on objects and arrays
+	if(typeof current === "object") {
+		current[lastIndex] = value;
+	}
 	return data;
 }

--- a/core/modules/filters/transcludes.js
+++ b/core/modules/filters/transcludes.js
@ -0,0 +1,26 @@
+/*\
+title: $:/core/modules/filters/transcludes.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operator for returning all the transcludes from a tiddler
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Export our filter function
+*/
+exports.transcludes = function(source,operator,options) {
+	var results = new $tw.utils.LinkedList();
+	source(function(tiddler,title) {
+		results.pushTop(options.wiki.getTiddlerTranscludes(title));
+	});
+	return results.toArray();
+};
+
+})();
--- a/core/modules/indexers/back-indexer.js
+++ b/core/modules/indexers/back-indexer.js
@ -0,0 +1,119 @@
+/*\
+title: $:/core/modules/indexers/back-indexer.js
+type: application/javascript
+module-type: indexer
+
+By parsing the tiddler text, indexes the tiddlers' back links, back transclusions, block level back links.
+
+\*/
+function BackIndexer(wiki) {
+	this.wiki = wiki;
+}
+
+BackIndexer.prototype.init = function() {
+	this.subIndexers = {
+		link: new BackSubIndexer(this,"extractLinks"),
+		transclude: new BackSubIndexer(this,"extractTranscludes"),
+	};
+};
+
+BackIndexer.prototype.rebuild = function() {
+	$tw.utils.each(this.subIndexers,function(subIndexer) {
+		subIndexer.rebuild();
+	});
+};
+
+BackIndexer.prototype.update = function(updateDescriptor) {
+	$tw.utils.each(this.subIndexers,function(subIndexer) {
+		subIndexer.update(updateDescriptor);
+	});
+};
+function BackSubIndexer(indexer,extractor) {
+	this.wiki = indexer.wiki;
+	this.indexer = indexer;
+	this.extractor = extractor;
+	/**
+	 * {
+	 *   [target title, e.g. tiddler title being linked to]:
+	 *     {
+	 * 		   [source title, e.g. tiddler title that has link syntax in its text]: true
+	 * 	   }
+	 * }
+	 */
+	this.index = null;
+}
+
+BackSubIndexer.prototype.init = function() {
+	// lazy init until first lookup
+	this.index = null;
+}
+
+BackSubIndexer.prototype._init = function() {
+	this.index = Object.create(null);
+	var self = this;
+	this.wiki.forEachTiddler(function(sourceTitle,tiddler) {
+		var newTargets = self._getTarget(tiddler);
+		$tw.utils.each(newTargets, function(target) {
+			if(!self.index[target]) {
+				self.index[target] = Object.create(null);
+			}
+			self.index[target][sourceTitle] = true;
+		});
+	});
+}
+
+BackSubIndexer.prototype.rebuild = function() {
+	this.index = null;
+}
+
+/*
+* Get things that is being referenced in the text, e.g. tiddler names in the link syntax.
+*/
+BackSubIndexer.prototype._getTarget = function(tiddler) {
+	var parser = this.wiki.parseText(tiddler.fields.type, tiddler.fields.text, {});
+	if(parser) {
+		return this.wiki[this.extractor](parser.tree);
+	}
+	return [];
+}
+
+BackSubIndexer.prototype.update = function(updateDescriptor) {
+	// lazy init/update until first lookup
+	if(!this.index) {
+		return;
+	}
+	var newTargets = [],
+	    oldTargets = [],
+	    self = this;
+	if(updateDescriptor.old.exists) {
+		oldTargets = this._getTarget(updateDescriptor.old.tiddler);
+	}
+	if(updateDescriptor.new.exists) {
+		newTargets = this._getTarget(updateDescriptor.new.tiddler);
+	}
+
+	$tw.utils.each(oldTargets,function(target) {
+		if(self.index[target]) {
+			delete self.index[target][updateDescriptor.old.tiddler.fields.title];
+		}
+	});
+	$tw.utils.each(newTargets,function(target) {
+		if(!self.index[target]) {
+			self.index[target] = Object.create(null);
+		}
+		self.index[target][updateDescriptor.new.tiddler.fields.title] = true;
+	});
+}
+
+BackSubIndexer.prototype.lookup = function(title) {
+	if(!this.index) {
+		this._init();
+	}
+	if(this.index[title]) {
+		return Object.keys(this.index[title]);
+	} else {
+		return [];
+	}
+}
+
+exports.BackIndexer = BackIndexer;
--- a/core/modules/indexers/backlinks-index.js
+++ b/core/modules/indexers/backlinks-index.js
@ -1,86 +0,0 @@
-/*\
-title: $:/core/modules/indexers/backlinks-indexer.js
-type: application/javascript
-module-type: indexer
-
-Indexes the tiddlers' backlinks
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global modules: false */
-"use strict";
-
-
-function BacklinksIndexer(wiki) {
-	this.wiki = wiki;
-}
-
-BacklinksIndexer.prototype.init = function() {
-	this.index = null;
-}
-
-BacklinksIndexer.prototype.rebuild = function() {
-	this.index = null;
-}
-
-BacklinksIndexer.prototype._getLinks = function(tiddler) {
-	var parser =  this.wiki.parseText(tiddler.fields.type, tiddler.fields.text, {});
-	if(parser) {
-		return this.wiki.extractLinks(parser.tree);
-	}
-	return [];
-}
-
-BacklinksIndexer.prototype.update = function(updateDescriptor) {
-	if(!this.index) {
-		return;
-	}
-	var newLinks = [],
-	    oldLinks = [],
-	    self = this;
-	if(updateDescriptor.old.exists) {
-		oldLinks = this._getLinks(updateDescriptor.old.tiddler);
-	}
-	if(updateDescriptor.new.exists) {
-		newLinks = this._getLinks(updateDescriptor.new.tiddler);
-	}
-
-	$tw.utils.each(oldLinks,function(link) {
-		if(self.index[link]) {
-			delete self.index[link][updateDescriptor.old.tiddler.fields.title];
-		}
-	});
-	$tw.utils.each(newLinks,function(link) {
-		if(!self.index[link]) {
-			self.index[link] = Object.create(null);
-		}
-		self.index[link][updateDescriptor.new.tiddler.fields.title] = true;
-	});
-}
-
-BacklinksIndexer.prototype.lookup = function(title) {
-	if(!this.index) {
-		this.index = Object.create(null);
-		var self = this;
-		this.wiki.forEachTiddler(function(title,tiddler) {
-			var links = self._getLinks(tiddler);
-			$tw.utils.each(links, function(link) {
-				if(!self.index[link]) {
-					self.index[link] = Object.create(null);
-				}
-				self.index[link][title] = true;
-			});
-		});
-	}
-	if(this.index[title]) {
-		return Object.keys(this.index[title]);
-	} else {
-		return [];
-	}
-}
-
-exports.BacklinksIndexer = BacklinksIndexer;
-
-})();
--- a/core/modules/macros/csvtiddlers.js
+++ b/core/modules/macros/csvtiddlers.js
@ -35,9 +35,11 @@ exports.run = function(filter,format) {
 	// Collect all the fields
 	for(t=0;t<tiddlers.length; t++) {
 		tiddler = this.wiki.getTiddler(tiddlers[t]);
-		for(f in tiddler.fields) {
-			if(fields.indexOf(f) === -1) {
-				fields.push(f);
+		if(tiddler) {
+			for(f in tiddler.fields) {
+				if(fields.indexOf(f) === -1) {
+					fields.push(f);
+				}
 			}
 		}
 	}
@ -60,8 +62,10 @@ exports.run = function(filter,format) {
 	for(var t=0;t<tiddlers.length; t++) {
 		row = [];
 		tiddler = this.wiki.getTiddler(tiddlers[t]);
-			for(f=0; f<fields.length; f++) {
-				row.push(quoteAndEscape(tiddler ? tiddler.getFieldString(fields[f]) || "" : ""));
+			if(tiddler) {
+				for(f=0; f<fields.length; f++) {
+					row.push(quoteAndEscape(tiddler ? tiddler.getFieldString(fields[f]) || "" : ""));
+				}	
 			}
 		output.push(row.join(","));
 	}
--- a/core/modules/parsers/wikiparser/rules/fnprocdef.js
+++ b/core/modules/parsers/wikiparser/rules/fnprocdef.js
@ -49,11 +49,11 @@ exports.parse = function() {
 	if(this.match[3]) {
 		params = $tw.utils.parseParameterDefinition(this.match[4]);
 	}
-	// Is this a multiline definition?
+	// Is the remainder of the line blank after the parameter close paren?
 	var reEnd;
 	if(this.match[5]) {
-		// If so, the end of the body is marked with \end
-		reEnd = new RegExp("(\\r?\\n[^\\S\\n\\r]*\\\\end[^\\S\\n\\r]*(?:" + $tw.utils.escapeRegExp(this.match[2]) + ")?(?:$|\\r?\\n))","mg");
+		// If so, it is a multiline definition and the end of the body is marked with \end
+		reEnd = new RegExp("((:?^|\\r?\\n)[^\\S\\n\\r]*\\\\end[^\\S\\n\\r]*(?:" + $tw.utils.escapeRegExp(this.match[2]) + ")?(?:$|\\r?\\n))","mg");
 	} else {
 		// Otherwise, the end of the definition is marked by the end of the line
 		reEnd = /($|\r?\n)/mg;
--- a/core/modules/parsers/wikiparser/rules/macrodef.js
+++ b/core/modules/parsers/wikiparser/rules/macrodef.js
@ -54,11 +54,11 @@ exports.parse = function() {
 			paramMatch = reParam.exec(paramString);
 		}
 	}
-	// Is this a multiline definition?
+	// Is the remainder of the \define line blank after the parameter close paren?
 	var reEnd;
 	if(this.match[3]) {
-		// If so, the end of the body is marked with \end
-		reEnd = new RegExp("(\\r?\\n[^\\S\\n\\r]*\\\\end[^\\S\\n\\r]*(?:" + $tw.utils.escapeRegExp(this.match[1]) + ")?(?:$|\\r?\\n))","mg");
+		// If so, it is a multiline definition and the end of the body is marked with \end
+		reEnd = new RegExp("((?:^|\\r?\\n)[^\\S\\n\\r]*\\\\end[^\\S\\n\\r]*(?:" + $tw.utils.escapeRegExp(this.match[1]) + ")?(?:$|\\r?\\n))","mg");
 	} else {
 		// Otherwise, the end of the definition is marked by the end of the line
 		reEnd = /($|\r?\n)/mg;
--- a/core/modules/parsers/wikiparser/rules/transcludeblock.js
+++ b/core/modules/parsers/wikiparser/rules/transcludeblock.js
@ -81,9 +81,6 @@ exports.parse = function() {
 			}
 			return [tiddlerNode];
 		} else {
-			// No template or text reference is provided, so we'll use a blank target. Otherwise we'll generate
-			// a transclude widget that transcludes the current tiddler, often leading to recursion errors
-			transcludeNode.attributes["$tiddler"] = {name: "$tiddler", type: "string", value: ""};
 			return [transcludeNode];
 		}
 	}
--- a/core/modules/parsers/wikiparser/rules/transcludeinline.js
+++ b/core/modules/parsers/wikiparser/rules/transcludeinline.js
@ -79,9 +79,6 @@ exports.parse = function() {
 			}
 			return [tiddlerNode];
 		} else {
-			// No template or text reference is provided, so we'll use a blank target. Otherwise we'll generate
-			// a transclude widget that transcludes the current tiddler, often leading to recursion errors
-			transcludeNode.attributes["$tiddler"] = {name: "$tiddler", type: "string", value: ""};
 			return [transcludeNode];
 		}
 	}
--- a/core/modules/parsers/wikiparser/wikiparser.js
+++ b/core/modules/parsers/wikiparser/wikiparser.js
@ -216,6 +216,8 @@ WikiParser.prototype.parsePragmas = function() {
 			subTree[0].children = [];
 			currentTreeBranch = subTree[0].children;
 		}
+		// Skip whitespace after the pragma
+		this.skipWhitespace();
 	}
 	return currentTreeBranch;
 };
--- a/core/modules/syncer.js
+++ b/core/modules/syncer.js
@ -189,7 +189,6 @@ Syncer.prototype.readTiddlerInfo = function() {
 	// Record information for known tiddlers
 	var self = this,
 		tiddlers = this.getSyncedTiddlers();
-	this.logger.log("Initialising tiddlerInfo for " + tiddlers.length + " tiddlers");
 	$tw.utils.each(tiddlers,function(title) {
 		var tiddler = self.wiki.getTiddler(title);
 		if(tiddler) {
@ -236,7 +235,6 @@ Syncer.prototype.isDirty = function() {
 		return false;
 	}
 	var dirtyStatus = checkIsDirty();
-	this.logger.log("Dirty status was " + dirtyStatus);
 	return dirtyStatus;
 };

@ -266,7 +264,6 @@ Syncer.prototype.storeTiddler = function(tiddlerFields) {
 		adaptorInfo: this.syncadaptor.getTiddlerInfo(tiddler),
 		changeCount: this.wiki.getChangeCount(tiddlerFields.title)
 	};
-	this.logger.log("Updating tiddler info in syncer.storeTiddler for " + tiddlerFields.title + " " + JSON.stringify(this.tiddlerInfo[tiddlerFields.title]));
 };

 Syncer.prototype.getStatus = function(callback) {
@ -302,10 +299,16 @@ Syncer.prototype.getStatus = function(callback) {
 Synchronise from the server by reading the skinny tiddler list and queuing up loads for any tiddlers that we don't already have up to date
 */
 Syncer.prototype.syncFromServer = function() {
-	this.forceSyncFromServer = true;
-	this.processTaskQueue();
+	if(this.canSyncFromServer()) {
+		this.forceSyncFromServer = true;
+		this.processTaskQueue();	
+	}
 };

+Syncer.prototype.canSyncFromServer = function() {
+	return !!this.syncadaptor.getUpdatedTiddlers || !!this.syncadaptor.getSkinnyTiddlers;
+}
+
 /*
 Force load a tiddler from the server
 */
@ -425,7 +428,6 @@ Syncer.prototype.processTaskQueue = function() {
 	if((!this.syncadaptor.isReady || this.syncadaptor.isReady()) && this.numTasksInProgress === 0) {
 		// Choose the next task to perform
 		var task = this.chooseNextTask();
-		self.logger.log("Chosen next task " + task);
 		// Perform the task if we had one
 		if(typeof task === "object" && task !== null) {
 			this.numTasksInProgress += 1;
@ -447,7 +449,7 @@ Syncer.prototype.processTaskQueue = function() {
 			// And trigger a timeout if there is a pending task
 			if(task === true) {
 				this.triggerTimeout(this.taskTimerInterval);
-			} else {
+			} else if(this.canSyncFromServer()) {
 				this.triggerTimeout(this.pollTimerInterval);
 			}
 		}
@ -551,14 +553,12 @@ SaveTiddlerTask.prototype.run = function(callback) {
 				revision: revision,
 				timestampLastSaved: new Date()
 			};
-			self.syncer.logger.log("Updating tiddler info in SaveTiddlerTask.run for " + self.title + " " + JSON.stringify(self.syncer.tiddlerInfo[self.title]));
 			// Invoke the callback
 			callback(null);
 		},{
 			tiddlerInfo: self.syncer.tiddlerInfo[self.title]
 		});
 	} else {
-		this.syncer.logger.log(" Not Dispatching 'save' task:",this.title,"tiddler does not exist");
 		$tw.utils.nextTick(callback(null));
 	}
 };
@ -582,7 +582,6 @@ DeleteTiddlerTask.prototype.run = function(callback) {
 			return callback(err);
 		}
 		// Remove the info stored about this tiddler
-		self.syncer.logger.log("Deleting tiddler info in DeleteTiddlerTask.run for " + self.title);
 		delete self.syncer.tiddlerInfo[self.title];
 		// Invoke the callback
 		callback(null);
@ -636,8 +635,7 @@ SyncFromServerTask.prototype.run = function(callback) {
 		callback(null);
 	};
 	if(this.syncer.syncadaptor.getUpdatedTiddlers) {
-		self.syncer.logger.log("Retrieving updated tiddler list");
-		this.syncer.syncadaptor.getUpdatedTiddlers(self,function(err,updates) {
+		this.syncer.syncadaptor.getUpdatedTiddlers(self.syncer,function(err,updates) {
 			if(err) {
 				self.syncer.displayError($tw.language.getString("Error/RetrievingSkinny"),err);
 				return callback(err);
@ -657,9 +655,7 @@ SyncFromServerTask.prototype.run = function(callback) {
 			return successCallback();
 		});
 	} else if(this.syncer.syncadaptor.getSkinnyTiddlers) {
-		this.syncer.logger.log("Retrieving skinny tiddler list");
 		this.syncer.syncadaptor.getSkinnyTiddlers(function(err,tiddlers) {
-			self.syncer.logger.log("Retrieved skinny tiddler list");
 			// Check for errors
 			if(err) {
 				self.syncer.displayError($tw.language.getString("Error/RetrievingSkinny"),err);
--- a/core/modules/utils/dom/http.js
+++ b/core/modules/utils/dom/http.js
@ -289,7 +289,7 @@ exports.httpRequest = function(options) {
 				return;
 			}
 		// Something went wrong
-		options.callback($tw.language.getString("Error/XMLHttpRequest") + ": " + this.status,null,this);
+		options.callback($tw.language.getString("Error/XMLHttpRequest") + ": " + this.status,this[returnProp],this);
 		}
 	};
 	// Handle progress
--- a/core/modules/utils/utils.js
+++ b/core/modules/utils/utils.js
@ -819,6 +819,15 @@ exports.hashString = function(str) {
 	},0);
 };

+/*
+Cryptographic hash function as used by sha256 filter operator
+options.length .. number of characters returned defaults to 64
+*/
+exports.sha256 = function(str, options) {
+	options = options || {}
+	return sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(str)).substr(0,options.length || 64);
+}
+
 /*
 Base64 utility functions that work in either browser or Node.js
 */
@ -922,7 +931,7 @@ IE does not have sign function
 */
 exports.sign = Math.sign || function(x) {
 	x = +x; // convert to a number
-	if (x === 0 || isNaN(x)) {
+	if(x === 0 || isNaN(x)) {
 		return x;
 	}
 	return x > 0 ? 1 : -1;
@ -935,7 +944,7 @@ exports.strEndsWith = function(str,ending,position) {
 	if(str.endsWith) {
 		return str.endsWith(ending,position);
 	} else {
-		if (typeof position !== 'number' || !isFinite(position) || Math.floor(position) !== position || position > str.length) {
+		if(typeof position !== 'number' || !isFinite(position) || Math.floor(position) !== position || position > str.length) {
 			position = str.length;
 		}
 		position -= ending.length;
--- a/core/modules/widgets/draggable.js
+++ b/core/modules/widgets/draggable.js
@ -119,7 +119,7 @@ DraggableWidget.prototype.refresh = function(changedTiddlers) {
 		return true;
 	} else {
 		if(changedAttributes["class"]) {
-			this.assignDomNodeClasses();
+			this.updateDomNodeClasses();
 		}
 		this.assignAttributes(this.domNodes[0],{
 			changedAttributes: changedAttributes,
@ -132,4 +132,4 @@ DraggableWidget.prototype.refresh = function(changedTiddlers) {

 exports.draggable = DraggableWidget;

-})();
+})();
--- a/core/modules/widgets/edit.js
+++ b/core/modules/widgets/edit.js
@ -90,7 +90,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 EditWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
 	// Refresh if an attribute has changed, or the type associated with the target tiddler has changed
-	if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes.tabindex || changedAttributes.cancelPopups || changedAttributes.inputActions || changedAttributes.refreshTitle || changedAttributes.autocomplete || (changedTiddlers[this.editTitle] && this.getEditorType() !== this.editorType)) {
+	if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes.tabindex || changedAttributes.cancelPopups || changedAttributes.inputActions || changedAttributes.refreshTitle || changedAttributes.autocomplete || (this.getEditorType() !== this.editorType)) {
 		this.refreshSelf();
 		return true;
 	} else {
--- a/core/modules/widgets/importvariables.js
+++ b/core/modules/widgets/importvariables.js
@ -49,7 +49,7 @@ ImportVariablesWidget.prototype.execute = function(tiddlerList) {
 	this.tiddlerList = tiddlerList || this.wiki.filterTiddlers(this.filter,this);
 	// Accumulate the <$set> widgets from each tiddler
 	$tw.utils.each(this.tiddlerList,function(title) {
-		var parser = widgetPointer.wiki.parseTiddler(title,{parseAsInline:true, configTrimWhiteSpace:true});
+		var parser = widgetPointer.wiki.parseTiddler(title,{parseAsInline:true, configTrimWhiteSpace:false});
 		if(parser) {
 			var parseTreeNode = parser.tree[0];
 			while(parseTreeNode && ["setvariable","set","parameters"].indexOf(parseTreeNode.type) !== -1) {
--- a/core/modules/widgets/link.js
+++ b/core/modules/widgets/link.js
@ -217,7 +217,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 */
 LinkWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
-	if($tw.utils.count(changedAttributes) > 0) {
+	if($tw.utils.count(changedAttributes) > 0 || changedTiddlers[this.to]) {
 		this.refreshSelf();
 		return true;
 	}
--- a/core/modules/widgets/list.js
+++ b/core/modules/widgets/list.js
@ -109,6 +109,7 @@ ListWidget.prototype.findExplicitTemplates = function() {
 	this.explicitJoinTemplate = null;
 	this.hasTemplateInBody = false;
 	var searchChildren = function(childNodes) {
+		var foundInlineTemplate = false;
 		$tw.utils.each(childNodes,function(node) {
 			if(node.type === "list-template") {
 				self.explicitListTemplate = node.children;
@ -118,12 +119,14 @@ ListWidget.prototype.findExplicitTemplates = function() {
 				self.explicitJoinTemplate = node.children;
 			} else if(node.type === "element" && node.tag === "p") {
 				searchChildren(node.children);
+				foundInlineTemplate = true;
 			} else {
-				self.hasTemplateInBody = true;
+				foundInlineTemplate = true;
 			}
 		});
+		return foundInlineTemplate;
 	};
-	searchChildren(this.parseTreeNode.children);
+	this.hasTemplateInBody = searchChildren(this.parseTreeNode.children);
 }

 ListWidget.prototype.getTiddlerList = function() {
--- a/core/modules/widgets/scrollable.js
+++ b/core/modules/widgets/scrollable.js
@ -12,6 +12,8 @@ Scrollable widget
 /*global $tw: false */
 "use strict";

+var DEBOUNCE_INTERVAL = 100; // Delay after last scroll event before updating the bound tiddler
+
 var Widget = require("$:/core/modules/widgets/widget.js").widget;

 var ScrollableWidget = function(parseTreeNode,options) {
@ -174,22 +176,29 @@ ScrollableWidget.prototype.render = function(parent,nextSibling) {
 	// If the scroll position is bound to a tiddler
 	if(this.scrollableBind) {
 		// After a delay for rendering, scroll to the bound position
-		setTimeout(this.updateScrollPositionFromBoundTiddler.bind(this),50);
-		// Save scroll position on DOM scroll event
-		this.outerDomNode.addEventListener("scroll",function(event) {
-			var existingTiddler = self.wiki.getTiddler(self.scrollableBind),
-				newTiddlerFields = {
-					title: self.scrollableBind,
-					"scroll-left": self.outerDomNode.scrollLeft.toString(),
-					"scroll-top": self.outerDomNode.scrollTop.toString()
-				};
-			if(!existingTiddler || (existingTiddler.fields["scroll-left"] !== newTiddlerFields["scroll-left"] || existingTiddler.fields["scroll-top"] !== newTiddlerFields["scroll-top"])) {
-				self.wiki.addTiddler(new $tw.Tiddler(existingTiddler,newTiddlerFields));
-			}
-		});
+		this.updateScrollPositionFromBoundTiddler();
+		// Set up event listener
+		this.currentListener = this.listenerFunction.bind(this);
+		this.outerDomNode.addEventListener("scroll", this.currentListener);
 	}
 };

+ScrollableWidget.prototype.listenerFunction = function(event) {
+	self = this;
+	clearTimeout(this.timeout);
+	this.timeout = setTimeout(function() {
+		var existingTiddler = self.wiki.getTiddler(self.scrollableBind),
+			newTiddlerFields = {
+				title: self.scrollableBind,
+				"scroll-left": self.outerDomNode.scrollLeft.toString(),
+				"scroll-top": self.outerDomNode.scrollTop.toString()
+			};
+		if(!existingTiddler || (existingTiddler.fields["title"] !== newTiddlerFields["title"]) || (existingTiddler.fields["scroll-left"] !== newTiddlerFields["scroll-left"] || existingTiddler.fields["scroll-top"] !== newTiddlerFields["scroll-top"])) {
+			self.wiki.addTiddler(new $tw.Tiddler(existingTiddler,newTiddlerFields));
+		}
+	}, DEBOUNCE_INTERVAL);
+}
+
 ScrollableWidget.prototype.updateScrollPositionFromBoundTiddler = function() {
 	// Bail if we're running on the fakedom
 	if(!this.outerDomNode.scrollTo) {
@ -234,10 +243,22 @@ ScrollableWidget.prototype.refresh = function(changedTiddlers) {
 		this.refreshSelf();
 		return true;
 	}
-	if(changedAttributes.bind || changedTiddlers[this.getAttribute("bind")]) {
+	// If the bound tiddler has changed, update the eventListener and update scroll position
+	if(changedAttributes["bind"]) {
+		if(this.currentListener) {
+			this.outerDomNode.removeEventListener("scroll", this.currentListener, false);
+		}
+		this.scrollableBind = this.getAttribute("bind");
+		this.currentListener = this.listenerFunction.bind(this);
+		this.outerDomNode.addEventListener("scroll", this.currentListener);
+	}
+	// Refresh children
+	var result = this.refreshChildren(changedTiddlers);
+	// If the bound tiddler has changed, update scroll position
+	if(changedAttributes["bind"] || changedTiddlers[this.getAttribute("bind")]) {
 		this.updateScrollPositionFromBoundTiddler();
 	}
-	return this.refreshChildren(changedTiddlers);
+	return result;
 };

 exports.scrollable = ScrollableWidget;
--- a/core/modules/widgets/select.js
+++ b/core/modules/widgets/select.js
@ -43,7 +43,7 @@ SelectWidget.prototype.render = function(parent,nextSibling) {
 	//Create element
 	var domNode = this.document.createElement("select");
 	if(this.selectClass) {
-		domNode.classname = this.selectClass;
+		domNode.className = this.selectClass;
 	}
 	// Assign data- attributes
 	this.assignAttributes(domNode,{
@ -62,8 +62,8 @@ SelectWidget.prototype.render = function(parent,nextSibling) {
 	if(this.selectTooltip) {
 		domNode.setAttribute("title",this.selectTooltip);
 	}
-	this.renderChildren(domNode,nextSibling);
 	this.parentDomNode.insertBefore(domNode,nextSibling);
+	this.renderChildren(domNode,null);
 	this.domNodes.push(domNode);
 	this.setSelectValue();
 	if(this.selectFocus == "yes") {
--- a/core/modules/widgets/widget.js
+++ b/core/modules/widgets/widget.js
@ -153,7 +153,7 @@ Widget.prototype.getVariableInfo = function(name,options) {
 		} else if(variable.isFunctionDefinition) {
 			// Function evaluations
 			params = self.resolveVariableParameters(variable.params,actualParams);
-			var variables = Object.create(null);
+			var variables = options.variables || Object.create(null);
 			// Apply default parameter values
 			$tw.utils.each(variable.params,function(param,index) {
 				if(param["default"]) {
--- a/core/modules/wiki.js
+++ b/core/modules/wiki.js
@ -534,8 +534,8 @@ Return an array of tiddler titles that link to the specified tiddler
 */
 exports.getTiddlerBacklinks = function(targetTitle) {
 	var self = this,
-		backlinksIndexer = this.getIndexer("BacklinksIndexer"),
-		backlinks = backlinksIndexer && backlinksIndexer.lookup(targetTitle);
+		backIndexer = this.getIndexer("BackIndexer"),
+		backlinks = backIndexer && backIndexer.subIndexers.link.lookup(targetTitle);

 	if(!backlinks) {
 		backlinks = [];
@ -549,6 +549,68 @@ exports.getTiddlerBacklinks = function(targetTitle) {
 	return backlinks;
 };

+
+/*
+Return an array of tiddler titles that are directly transcluded within the given parse tree
+ */
+exports.extractTranscludes = function(parseTreeRoot) {
+	// Count up the transcludes
+	var transcludes = [],
+		checkParseTree = function(parseTree, parentNode) {
+			for(var t=0; t<parseTree.length; t++) {
+				var parseTreeNode = parseTree[t];
+				if(parseTreeNode.type === "transclude" && parseTreeNode.attributes.$tiddler && parseTreeNode.attributes.$tiddler.type === "string") {
+					var value;
+					// if it is Transclusion with Templates like `{{Index||$:/core/ui/TagTemplate}}`, the `$tiddler` will point to the template. We need to find the actual target tiddler from parent node
+					if(parentNode && parentNode.type === "tiddler" && parentNode.attributes.tiddler && parentNode.attributes.tiddler.type === "string") {
+						value = parentNode.attributes.tiddler.value;
+					} else {
+						value = parseTreeNode.attributes.$tiddler.value;
+					}
+					if(transcludes.indexOf(value) === -1) {
+						transcludes.push(value);
+					}
+				}
+				if(parseTreeNode.children) {
+					checkParseTree(parseTreeNode.children, parseTreeNode);
+				}
+			}
+		};
+	checkParseTree(parseTreeRoot);
+	return transcludes;
+};
+
+
+/*
+Return an array of tiddler titles that are transcluded from the specified tiddler
+*/
+exports.getTiddlerTranscludes = function(title) {
+	var self = this;
+	// We'll cache the transcludes so they only get computed if the tiddler changes
+	return this.getCacheForTiddler(title,"transcludes",function() {
+		// Parse the tiddler
+		var parser = self.parseTiddler(title);
+		if(parser) {
+			return self.extractTranscludes(parser.tree);
+		}
+		return [];
+	});
+};
+
+/*
+Return an array of tiddler titles that transclude to the specified tiddler
+*/
+exports.getTiddlerBacktranscludes = function(targetTitle) {
+	var self = this,
+		backIndexer = this.getIndexer("BackIndexer"),
+		backtranscludes = backIndexer && backIndexer.subIndexers.transclude.lookup(targetTitle);
+
+	if(!backtranscludes) {
+		backtranscludes = [];
+	}
+	return backtranscludes;
+};
+
 /*
 Return a hashmap of tiddler titles that are referenced but not defined. Each value is the number of times the missing tiddler is referenced
 */
--- a/core/templates/html-json-skinny-tiddler.tid
+++ b/core/templates/html-json-skinny-tiddler.tid
@ -1,3 +1,3 @@
 title: $:/core/templates/html-json-skinny-tiddler

-<$jsontiddler tiddler=<<currentTiddler>> exclude="text" escapeUnsafeScriptChars="yes"/>
+<$text text=<<join>>/><$jsontiddler tiddler=<<currentTiddler>> exclude="text" escapeUnsafeScriptChars="yes"/>
--- a/core/templates/store.area.template.html.tid
+++ b/core/templates/store.area.template.html.tid
@ -9,9 +9,7 @@ title: $:/core/templates/store.area.template.html
            <$let newline={{{ [charcode[10]] }}} join=`,$(newline)$`>
                <$text text=<<newline>>/>
                <$list filter=<<saveTiddlerFilter>> join=<<join>> template="$:/core/templates/html-json-tiddler"/>
-                <$vars numTiddlers={{{ [subfilter<saveTiddlerFilter>count[]] }}}>
-                    <$list filter={{{ [<skinnySaveTiddlerFilter>] }}} join=<<join>> template="$:/core/templates/html-json-skinny-tiddler"/>
-                </$vars>
+                <$list filter="[subfilter<skinnySaveTiddlerFilter>]"  template="$:/core/templates/html-json-skinny-tiddler"/>
                <$text text=<<newline>>/>
            </$let>
        `]</script>`
@ -22,8 +20,8 @@ title: $:/core/templates/store.area.template.html
        <!-- Old-style DIV/PRE-based store area -->
        <$reveal type="nomatch" state="$:/isEncrypted" text="yes">
            `<div id="storeArea" style="display:none;">`
-                <$list filter=<<saveTiddlerFilter>> template="$:/core/templates/html-div-tiddler"/>
-                <$list filter={{{ [<skinnySaveTiddlerFilter>] }}} template="$:/core/templates/html-div-skinny-tiddler"/>
+                <$list filter={{{ [<saveTiddlerFilter>] }}} template="$:/core/templates/html-div-tiddler"/>
+                <$list filter="[subfilter<skinnySaveTiddlerFilter>]" template="$:/core/templates/html-div-skinny-tiddler"/>
            `</div>`
        </$reveal>
    </$list>
--- a/core/ui/AdvancedSearch/Filter.tid
+++ b/core/ui/AdvancedSearch/Filter.tid
@ -40,10 +40,8 @@ caption: {{$:/language/Search/Filter/Caption}}
 		<$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">>>
@ -65,11 +63,10 @@ caption: {{$:/language/Search/Filter/Caption}}
 &#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">
-<<lingo Filter/Matches>>
+<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"/>
--- a/core/ui/AdvancedSearch/Standard.tid
+++ b/core/ui/AdvancedSearch/Standard.tid
@ -54,17 +54,18 @@ caption: {{$:/language/Search/Standard/Caption}}
 	variable="listItem">
 <$vars
 	userInput={{{ [[$:/temp/advancedsearch]get[text]] }}}
-	configTiddler={{{ [[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}] }}}
+	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]]"
-	emptyMessage="<$list filter='[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]'><$transclude/></$list>">
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]butfirst[]limit[1]]">
 <$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>
--- a/core/ui/ControlPanel/Saving/DownloadSaver.tid
+++ b/core/ui/ControlPanel/Saving/DownloadSaver.tid
@ -2,10 +2,19 @@ title: $:/core/ui/ControlPanel/Saving/DownloadSaver
 tags: $:/tags/ControlPanel/Saving
 caption: {{$:/language/ControlPanel/Saving/DownloadSaver/Caption}}

+\whitespace trim
 \define lingo-base() $:/language/ControlPanel/Saving/DownloadSaver/

+<div class="tc-control-panel-saving" data-setting-title=<<currentTab>>>
+
 <<lingo Hint>>

-!! <$link to="$:/config/DownloadSaver/AutoSave"><<lingo AutoSave/Hint>></$link>
+!!.tc-control-panel-accent <$link to="$:/config/DownloadSaver/AutoSave"><<lingo AutoSave/Hint>></$link>

-<$checkbox tiddler="$:/config/DownloadSaver/AutoSave" field="text" checked="yes" unchecked="no" default="no"> <<lingo AutoSave/Description>> </$checkbox>
+<$checkbox tiddler="$:/config/DownloadSaver/AutoSave"
+	field="text" checked="yes" unchecked="no" default="no"
+	class="tc-control-panel-item"
+>
+	<span class="tc-tiny-gap-left"><<lingo AutoSave/Description>></span>
+</$checkbox>
+</div>
--- a/core/ui/ControlPanel/Saving/General.tid
+++ b/core/ui/ControlPanel/Saving/General.tid
@ -3,14 +3,22 @@ tags: $:/tags/ControlPanel/Saving
 caption: {{$:/language/ControlPanel/Saving/General/Caption}}
 list-before:

+\whitespace trim
 \define lingo-base() $:/language/ControlPanel/Settings/

+<div class="tc-control-panel-saving" data-setting-title=<<currentTab>>>
+
 {{$:/language/ControlPanel/Saving/General/Hint}}

-!! <$link to="$:/config/AutoSave"><<lingo AutoSave/Caption>></$link>
+!!.tc-control-panel-accent <$link to="$:/config/AutoSave"><<lingo AutoSave/Caption>></$link>

 <<lingo AutoSave/Hint>>

-<$radio tiddler="$:/config/AutoSave" value="yes"> <<lingo AutoSave/Enabled/Description>> </$radio>
+<$radio tiddler="$:/config/AutoSave" value="yes">
+	<span class="tc-tiny-gap-left"><<lingo AutoSave/Enabled/Description>></span>
+</$radio>

-<$radio tiddler="$:/config/AutoSave" value="no"> <<lingo AutoSave/Disabled/Description>> </$radio>
+<$radio tiddler="$:/config/AutoSave" value="no">
+	<span class="tc-tiny-gap-left"><<lingo AutoSave/Disabled/Description>></span>
+</$radio>
+</div>
--- a/core/ui/ControlPanel/Settings/CamelCase.tid
+++ b/core/ui/ControlPanel/Settings/CamelCase.tid
@ -2,7 +2,16 @@ title: $:/core/ui/ControlPanel/Settings/CamelCase
 tags: $:/tags/ControlPanel/Settings
 caption: {{$:/language/ControlPanel/Settings/CamelCase/Caption}}

+\whitespace trim
 \define lingo-base() $:/language/ControlPanel/Settings/CamelCase/
+
 <<lingo Hint>>

-<$checkbox tiddler="$:/config/WikiParserRules/Inline/wikilink" field="text" checked="enable" unchecked="disable" default="enable"> <$link to="$:/config/WikiParserRules/Inline/wikilink"><<lingo Description>></$link> </$checkbox>
+<$checkbox tiddler="$:/config/WikiParserRules/Inline/wikilink"
+	field="text" checked="enable" unchecked="disable" default="enable"
+	class="tc-control-panel-item"
+>
+	<$link to="$:/config/WikiParserRules/Inline/wikilink" class="tc-tiny-gap-left">
+		<<lingo Description>>
+	</$link>
+</$checkbox>
--- a/core/ui/ControlPanel/Settings/DefaultMoreSidebarTab.tid
+++ b/core/ui/ControlPanel/Settings/DefaultMoreSidebarTab.tid
@ -2,13 +2,18 @@ caption: {{$:/language/ControlPanel/Settings/DefaultMoreSidebarTab/Caption}}
 tags: $:/tags/ControlPanel/Settings
 title: $:/core/ui/ControlPanel/Settings/DefaultMoreSidebarTab

-\define lingo-base() $:/language/ControlPanel/Settings/DefaultMoreSidebarTab/
 \whitespace trim
+\define lingo-base() $:/language/ControlPanel/Settings/DefaultMoreSidebarTab/

-<$link to="$:/config/DefaultMoreSidebarTab"><<lingo Hint>></$link>
+<$link to="$:/config/DefaultMoreSidebarTab" class="tc-control-panel-item">
+	<<lingo Hint>>
+</$link>

-<$select tiddler="$:/config/DefaultMoreSidebarTab">
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/MoreSideBar]!has[draft.of]]">
-<option value=<<currentTiddler>>><$transclude field="caption"><$text text=<<currentTiddler>>/></$transclude></option>
-</$list>
+<$select tiddler="$:/config/DefaultMoreSidebarTab" class="tc-select">
+	<$list filter="[all[shadows+tiddlers]tag[$:/tags/MoreSideBar]!has[draft.of]]">
+		<option value=<<currentTiddler>>><$transclude field="caption">
+			<$text text=<<currentTiddler>>/>
+			</$transclude>
+		</option>
+	</$list>
 </$select>
--- a/core/ui/ControlPanel/Settings/DefaultSidebarTab.tid
+++ b/core/ui/ControlPanel/Settings/DefaultSidebarTab.tid
@ -5,10 +5,16 @@ title: $:/core/ui/ControlPanel/Settings/DefaultSidebarTab
 \define lingo-base() $:/language/ControlPanel/Settings/DefaultSidebarTab/
 \whitespace trim

-<$link to="$:/config/DefaultSidebarTab"><<lingo Hint>></$link>
+<$link to="$:/config/DefaultSidebarTab" class="tc-control-panel-item">
+	<<lingo Hint>>
+</$link>

-<$select tiddler="$:/config/DefaultSidebarTab">
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/SideBar]!has[draft.of]]">
-<option value=<<currentTiddler>>><$transclude field="caption"><$text text=<<currentTiddler>>/></$transclude></option>
-</$list>
+<$select tiddler="$:/config/DefaultSidebarTab" class="tc-select">
+	<$list filter="[all[shadows+tiddlers]tag[$:/tags/SideBar]!has[draft.of]]">
+		<option value=<<currentTiddler>>>
+			<$transclude field="caption">
+				<$text text=<<currentTiddler>>/>
+			</$transclude>
+		</option>
+	</$list>
 </$select>
--- a/core/ui/ControlPanel/Settings/EditorToolbar.tid
+++ b/core/ui/ControlPanel/Settings/EditorToolbar.tid
@ -2,8 +2,15 @@ title: $:/core/ui/ControlPanel/Settings/EditorToolbar
 tags: $:/tags/ControlPanel/Settings
 caption: {{$:/language/ControlPanel/Settings/EditorToolbar/Caption}}

+\whitespace trim
 \define lingo-base() $:/language/ControlPanel/Settings/EditorToolbar/
 <<lingo Hint>>

-<$checkbox tiddler="$:/config/TextEditor/EnableToolbar" field="text" checked="yes" unchecked="no" default="yes"> <$link to="$:/config/TextEditor/EnableToolbar"><<lingo Description>></$link> </$checkbox>
-
+<$checkbox tiddler="$:/config/TextEditor/EnableToolbar"
+	field="text" checked="yes" unchecked="no" default="yes"
+	class="tc-control-panel-item"
+>
+	<$link to="$:/config/TextEditor/EnableToolbar" class="tc-tiny-gap-left">
+		<<lingo Description>>
+	</$link>
+</$checkbox>
--- a/core/ui/ControlPanel/Settings/InfoPanelMode.tid
+++ b/core/ui/ControlPanel/Settings/InfoPanelMode.tid
@ -2,9 +2,17 @@ title: $:/core/ui/ControlPanel/Settings/InfoPanelMode
 tags: $:/tags/ControlPanel/Settings
 caption: {{$:/language/ControlPanel/Settings/InfoPanelMode/Caption}}

+\whitespace trim
 \define lingo-base() $:/language/ControlPanel/Settings/InfoPanelMode/
-<$link to="$:/config/TiddlerInfo/Mode"><<lingo Hint>></$link>

-<$radio tiddler="$:/config/TiddlerInfo/Mode" value="popup"> <<lingo Popup/Description>> </$radio>
+<$link to="$:/config/TiddlerInfo/Mode" class="tc-control-panel-item">
+	<<lingo Hint>>
+</$link>

-<$radio tiddler="$:/config/TiddlerInfo/Mode" value="sticky"> <<lingo Sticky/Description>> </$radio>
+<$radio tiddler="$:/config/TiddlerInfo/Mode" value="popup">
+	<span class="tc-tiny-gap-left"><<lingo Popup/Description>></span>
+</$radio>
+
+<$radio tiddler="$:/config/TiddlerInfo/Mode" value="sticky">
+	<span class="tc-tiny-gap-left"><<lingo Sticky/Description>></span>
+</$radio>
--- a/core/ui/ControlPanel/Settings/LinkToBehaviour.tid
+++ b/core/ui/ControlPanel/Settings/LinkToBehaviour.tid
@ -2,21 +2,25 @@ title: $:/core/ui/ControlPanel/Settings/LinkToBehaviour
 tags: $:/tags/ControlPanel/Settings
 caption: {{$:/language/ControlPanel/Settings/LinkToBehaviour/Caption}}

-\define lingo-base() $:/language/ControlPanel/Settings/LinkToBehaviour/
 \whitespace trim
+\define lingo-base() $:/language/ControlPanel/Settings/LinkToBehaviour/

-<$link to="$:/config/Navigation/openLinkFromInsideRiver"><<lingo "InsideRiver/Hint">></$link>
+<$link to="$:/config/Navigation/openLinkFromInsideRiver" class="tc-control-panel-item">
+	<<lingo "InsideRiver/Hint">>
+</$link>

-<$select tiddler="$:/config/Navigation/openLinkFromInsideRiver">
-  <option value="above"><<lingo "OpenAbove">></option>
-  <option value="below"><<lingo "OpenBelow">></option>
-  <option value="top"><<lingo "OpenAtTop">></option>
-  <option value="bottom"><<lingo "OpenAtBottom">></option>
+<$select tiddler="$:/config/Navigation/openLinkFromInsideRiver" class="tc-select">
+	<option value="above"><<lingo "OpenAbove">></option>
+	<option value="below"><<lingo "OpenBelow">></option>
+	<option value="top"><<lingo "OpenAtTop">></option>
+	<option value="bottom"><<lingo "OpenAtBottom">></option>
 </$select>

-<$link to="$:/config/Navigation/openLinkFromOutsideRiver"><<lingo "OutsideRiver/Hint">></$link>
+<$link to="$:/config/Navigation/openLinkFromOutsideRiver" class="tc-control-panel-item">
+	<<lingo "OutsideRiver/Hint">>
+</$link>

-<$select tiddler="$:/config/Navigation/openLinkFromOutsideRiver">
-  <option value="top"><<lingo "OpenAtTop">></option>
-  <option value="bottom"><<lingo "OpenAtBottom">></option>
+<$select tiddler="$:/config/Navigation/openLinkFromOutsideRiver" class="tc-select">
+	<option value="top"><<lingo "OpenAtTop">></option>
+	<option value="bottom"><<lingo "OpenAtBottom">></option>
 </$select>
--- a/core/ui/ControlPanel/Settings/MissingLinks.tid
+++ b/core/ui/ControlPanel/Settings/MissingLinks.tid
@ -2,8 +2,12 @@ title: $:/core/ui/ControlPanel/Settings/MissingLinks
 tags: $:/tags/ControlPanel/Settings
 caption: {{$:/language/ControlPanel/Settings/MissingLinks/Caption}}

+\whitespace trim
 \define lingo-base() $:/language/ControlPanel/Settings/MissingLinks/
 <<lingo Hint>>

-<$checkbox tiddler="$:/config/MissingLinks" field="text" checked="yes" unchecked="no" default="yes"> <$link to="$:/config/MissingLinks"><<lingo Description>></$link> </$checkbox>
-
+<$checkbox tiddler="$:/config/MissingLinks" field="text" checked="yes" unchecked="no" default="yes">
+	<$link to="$:/config/MissingLinks" class="tc-control-panel-item">
+		<span class="tc-tiny-gap-left"><<lingo Description>></span>
+	</$link>
+</$checkbox>
--- a/core/ui/ControlPanel/Settings/NavigationAddressBar.tid
+++ b/core/ui/ControlPanel/Settings/NavigationAddressBar.tid
@ -2,12 +2,21 @@ title: $:/core/ui/ControlPanel/Settings/NavigationAddressBar
 tags: $:/tags/ControlPanel/Settings
 caption: {{$:/language/ControlPanel/Settings/NavigationAddressBar/Caption}}

+\whitespace trim
 \define lingo-base() $:/language/ControlPanel/Settings/NavigationAddressBar/

-<$link to="$:/config/Navigation/UpdateAddressBar"><<lingo Hint>></$link>
+<$link to="$:/config/Navigation/UpdateAddressBar" class="tc-control-panel-item">
+	<<lingo Hint>>
+</$link>

-<$radio tiddler="$:/config/Navigation/UpdateAddressBar" value="permaview"> <<lingo Permaview/Description>> </$radio>
+<$radio tiddler="$:/config/Navigation/UpdateAddressBar" value="permaview">
+	<span class="tc-tiny-gap-left"><<lingo Permaview/Description>></span>
+</$radio>

-<$radio tiddler="$:/config/Navigation/UpdateAddressBar" value="permalink"> <<lingo Permalink/Description>> </$radio>
+<$radio tiddler="$:/config/Navigation/UpdateAddressBar" value="permalink">
+	<span class="tc-tiny-gap-left"><<lingo Permalink/Description>></span>
+</$radio>

-<$radio tiddler="$:/config/Navigation/UpdateAddressBar" value="no"> <<lingo No/Description>> </$radio>
+<$radio tiddler="$:/config/Navigation/UpdateAddressBar" value="no">
+	<span class="tc-tiny-gap-left"><<lingo No/Description>></span>
+</$radio>
--- a/core/ui/ControlPanel/Settings/NavigationHistory.tid
+++ b/core/ui/ControlPanel/Settings/NavigationHistory.tid
@ -2,9 +2,17 @@ title: $:/core/ui/ControlPanel/Settings/NavigationHistory
 tags: $:/tags/ControlPanel/Settings
 caption: {{$:/language/ControlPanel/Settings/NavigationHistory/Caption}}

+\whitespace trim
 \define lingo-base() $:/language/ControlPanel/Settings/NavigationHistory/
-<$link to="$:/config/Navigation/UpdateHistory"><<lingo Hint>></$link>

-<$radio tiddler="$:/config/Navigation/UpdateHistory" value="yes"> <<lingo Yes/Description>> </$radio>
+<$link to="$:/config/Navigation/UpdateHistory" class="tc-control-panel-item">
+	<<lingo Hint>>
+</$link>

-<$radio tiddler="$:/config/Navigation/UpdateHistory" value="no"> <<lingo No/Description>> </$radio>
+<$radio tiddler="$:/config/Navigation/UpdateHistory" value="yes">
+	<span class="tc-tiny-gap-left"><<lingo Yes/Description>></span>
+</$radio>
+
+<$radio tiddler="$:/config/Navigation/UpdateHistory" value="no">
+	<span class="tc-tiny-gap-left"><<lingo No/Description>></span>
+</$radio>
--- a/core/ui/ControlPanel/Settings/NavigationPermalinkviewMode.tid
+++ b/core/ui/ControlPanel/Settings/NavigationPermalinkviewMode.tid
@ -2,9 +2,24 @@ title: $:/core/ui/ControlPanel/Settings/NavigationPermalinkviewMode
 tags: $:/tags/ControlPanel/Settings
 caption: {{$:/language/ControlPanel/Settings/NavigationPermalinkviewMode/Caption}}

+\whitespace trim
 \define lingo-base() $:/language/ControlPanel/Settings/NavigationPermalinkviewMode/
 <<lingo Hint>>

-<$checkbox tiddler="$:/config/Navigation/Permalinkview/CopyToClipboard" field="text" checked="yes" unchecked="no" default="yes"> <$link to="$:/config/Navigation/Permalinkview/CopyToClipboard"><<lingo CopyToClipboard/Description>></$link> </$checkbox>
+<$checkbox tiddler="$:/config/Navigation/Permalinkview/CopyToClipboard"
+	field="text" checked="yes" unchecked="no" default="yes"
+	class="tc-control-panel-item"
+>
+	<$link to="$:/config/Navigation/Permalinkview/CopyToClipboard" class="tc-tiny-gap-left">
+		<<lingo CopyToClipboard/Description>>
+	</$link>
+</$checkbox>

-<$checkbox tiddler="$:/config/Navigation/Permalinkview/UpdateAddressBar" field="text" checked="yes" unchecked="no" default="yes"> <$link to="$:/config/Navigation/Permalinkview/UpdateAddressBar"><<lingo UpdateAddressBar/Description>></$link> </$checkbox>
+<$checkbox tiddler="$:/config/Navigation/Permalinkview/UpdateAddressBar"
+	field="text" checked="yes" unchecked="no" default="yes"
+	class="tc-control-panel-item"
+>
+	<$link to="$:/config/Navigation/Permalinkview/UpdateAddressBar" class="tc-tiny-gap-left">
+		<<lingo UpdateAddressBar/Description>>
+	</$link>
+</$checkbox>
--- a/core/ui/ControlPanel/Settings/PerformanceInstrumentation.tid
+++ b/core/ui/ControlPanel/Settings/PerformanceInstrumentation.tid
@ -2,7 +2,15 @@ title: $:/core/ui/ControlPanel/Settings/PerformanceInstrumentation
 tags: $:/tags/ControlPanel/Settings
 caption: {{$:/language/ControlPanel/Settings/PerformanceInstrumentation/Caption}}

+\whitespace trim
 \define lingo-base() $:/language/ControlPanel/Settings/PerformanceInstrumentation/
 <<lingo Hint>>

-<$checkbox tiddler="$:/config/Performance/Instrumentation" field="text" checked="yes" unchecked="no" default="no"> <$link to="$:/config/Performance/Instrumentation"><<lingo Description>></$link> </$checkbox>
+<$checkbox tiddler="$:/config/Performance/Instrumentation"
+	field="text" checked="yes" unchecked="no" default="no"
+	class="tc-control-panel-item"
+>
+	<$link to="$:/config/Performance/Instrumentation" class="tc-tiny-gap-left">
+		<<lingo Description>>
+	</$link>
+</$checkbox>
--- a/core/ui/ControlPanel/Settings/TitleLinks.tid
+++ b/core/ui/ControlPanel/Settings/TitleLinks.tid
@ -2,9 +2,17 @@ title: $:/core/ui/ControlPanel/Settings/TitleLinks
 tags: $:/tags/ControlPanel/Settings
 caption: {{$:/language/ControlPanel/Settings/TitleLinks/Caption}}

+\whitespace trim
 \define lingo-base() $:/language/ControlPanel/Settings/TitleLinks/
-<$link to="$:/config/Tiddlers/TitleLinks"><<lingo Hint>></$link>

-<$radio tiddler="$:/config/Tiddlers/TitleLinks" value="yes"> <<lingo Yes/Description>> </$radio>
+<$link to="$:/config/Tiddlers/TitleLinks" class="tc-control-panel-item">
+	<<lingo Hint>>
+</$link>

-<$radio tiddler="$:/config/Tiddlers/TitleLinks" value="no"> <<lingo No/Description>> </$radio>
+<$radio tiddler="$:/config/Tiddlers/TitleLinks" value="yes">
+	<span class="tc-tiny-gap-left"><<lingo Yes/Description>></span>
+</$radio>
+
+<$radio tiddler="$:/config/Tiddlers/TitleLinks" value="no">
+	<span class="tc-tiny-gap-left"><<lingo No/Description>></span>
+</$radio>
--- a/core/ui/ControlPanel/Settings/ToolbarButtonStyle.tid
+++ b/core/ui/ControlPanel/Settings/ToolbarButtonStyle.tid
@ -2,12 +2,15 @@ title: $:/core/ui/ControlPanel/Settings/ToolbarButtonStyle
 tags: $:/tags/ControlPanel/Settings
 caption: {{$:/language/ControlPanel/Settings/ToolbarButtonStyle/Caption}}

-\define lingo-base() $:/language/ControlPanel/Settings/ToolbarButtonStyle/
 \whitespace trim
-<$link to="$:/config/Toolbar/ButtonClass"><<lingo "Hint">></$link>
+\define lingo-base() $:/language/ControlPanel/Settings/ToolbarButtonStyle/

-<$select tiddler="$:/config/Toolbar/ButtonClass">
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/ToolbarButtonStyle]]">
-<option value={{!!text}}>{{!!caption}}</option>
-</$list>
+<$link to="$:/config/Toolbar/ButtonClass" class="tc-control-panel-item">
+	<<lingo "Hint">>
+</$link>
+
+<$select tiddler="$:/config/Toolbar/ButtonClass" class="tc-select">
+	<$list filter="[all[shadows+tiddlers]tag[$:/tags/ToolbarButtonStyle]]">
+		<option value={{!!text}}>{{!!caption}}</option>
+	</$list>
 </$select>
--- a/core/ui/ControlPanel/Settings/ToolbarButtons.tid
+++ b/core/ui/ControlPanel/Settings/ToolbarButtons.tid
@ -2,9 +2,24 @@ title: $:/core/ui/ControlPanel/Settings/ToolbarButtons
 tags: $:/tags/ControlPanel/Settings
 caption: {{$:/language/ControlPanel/Settings/ToolbarButtons/Caption}}

+\whitespace trim
 \define lingo-base() $:/language/ControlPanel/Settings/ToolbarButtons/
 <<lingo Hint>>

-<$checkbox tiddler="$:/config/Toolbar/Icons" field="text" checked="yes" unchecked="no" default="yes"> <$link to="$:/config/Toolbar/Icons"><<lingo Icons/Description>></$link> </$checkbox>
+<$checkbox tiddler="$:/config/Toolbar/Icons"
+	field="text" checked="yes" unchecked="no" default="yes"
+	class="tc-control-panel-item"
+>
+	<$link to="$:/config/Toolbar/Icons" class="tc-tiny-gap-left">
+		<<lingo Icons/Description>>
+	</$link>
+</$checkbox>

-<$checkbox tiddler="$:/config/Toolbar/Text" field="text" checked="yes" unchecked="no" default="no"> <$link to="$:/config/Toolbar/Text"><<lingo Text/Description>></$link> </$checkbox>
+<$checkbox tiddler="$:/config/Toolbar/Text"
+	field="text" checked="yes" unchecked="no" default="no"
+	class="tc-control-panel-item"
+>
+	<$link to="$:/config/Toolbar/Text" class="tc-tiny-gap-left">
+		<<lingo Text/Description>>
+	</$link>
+</$checkbox>
--- a/core/ui/ControlPanel/TiddlyWiki.tid
+++ b/core/ui/ControlPanel/TiddlyWiki.tid
@ -9,9 +9,9 @@ list-before:

 <$list filter="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Settings]]">

-<div style="border-top:1px solid #eee;">
+<div class="tc-control-panel-setting" data-setting-title=<<currentTiddler>> style="border-top:1px solid #eee;">

-!! <$link><$transclude field="caption"/></$link>
+!!.tc-control-panel-accent <$link><$transclude field="caption"/></$link>

 <$transclude/>

--- a/core/ui/EditTemplate/body/default.tid
+++ b/core/ui/EditTemplate/body/default.tid
@ -1,7 +1,7 @@
 title: $:/core/ui/EditTemplate/body/default

 \function edit-preview-state()
-[{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[<qualify "$:/state/showeditpreview">] +[get[text]] :else[[no]]
+[{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[<qualified-preview-state>] +[get[text]] :else[[no]]
 \end

 \define config-visibility-title()
@ -14,15 +14,17 @@ $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$

 \whitespace trim
 <$let
+	qualified-preview-state=<<qualify "$:/state/showeditpreview">>
+	editPreviewStateTiddler={{{ [{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[<qualified-preview-state>] }}}
 	importTitle=<<qualify $:/ImportImage>>
 	importState=<<qualify $:/state/ImportImage>> >
 <$dropzone importTitle=<<importTitle>> autoOpenOnImport="no" contentTypesFilter={{$:/config/Editor/ImportContentTypesFilter}} class="tc-dropzone-editor" enable={{{ [{$:/config/DragAndDrop/Enable}match[no]] :else[subfilter{$:/config/Editor/EnableImportFilter}then[yes]else[no]] }}} filesOnly="yes" actions=<<importFileActions>> >
 <div>
-<div class={{{ [function[edit-preview-state]match[yes]then[tc-tiddler-preview]else[tc-tiddler-preview-hidden]] [[tc-tiddler-editor]] +[join[ ]] }}}>
+<div class={{{ [<edit-preview-state>match[yes]then[tc-tiddler-preview]else[tc-tiddler-preview-hidden]] [[tc-tiddler-editor]] +[join[ ]] }}}>

 <$transclude tiddler="$:/core/ui/EditTemplate/body/editor" mode="inline"/>

-<$list filter="[function[edit-preview-state]match[yes]]" variable="ignore">
+<$list filter="[<editPreviewStateTiddler>get[text]match[yes]]" variable="ignore">

 <div class="tc-tiddler-preview-preview" data-tiddler-title={{!!draft.title}} data-tags={{!!tags}}>

--- a/core/ui/EditTemplate/controls.tid
+++ b/core/ui/EditTemplate/controls.tid
@ -1,12 +1,18 @@
 title: $:/core/ui/EditTemplate/controls
 tags: $:/tags/EditTemplate

-\define config-title()
-$:/config/EditToolbarButtons/Visibility/$(listItem)$
-\end
+\define config-title() $:/config/EditToolbarButtons/Visibility/$(listItem)$
 \whitespace trim
 <div class="tc-tiddler-title tc-tiddler-edit-title">
-<$view field="title"/>
-<span class="tc-tiddler-controls tc-titlebar"><$list filter="[all[shadows+tiddlers]tag[$:/tags/EditToolbar]!has[draft.of]]" variable="listItem"><$let tv-config-toolbar-class={{{ [enlist<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]] +[join[ ]]}}}><$reveal type="nomatch" state=<<config-title>> text="hide"><$transclude tiddler=<<listItem>>/></$reveal></$let></$list></span>
-<div style="clear: both;"></div>
+	<$view field="title"/>
+	<span class="tc-tiddler-controls tc-titlebar">
+		<$list filter="[all[shadows+tiddlers]tag[$:/tags/EditToolbar]!has[draft.of]]" variable="listItem">
+			<$let tv-config-toolbar-class={{{ [enlist<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]] +[join[ ]] }}}>
+				<$reveal type="nomatch" state=<<config-title>> text="hide">
+					<$transclude $tiddler=<<listItem>>/>
+				</$reveal>
+			</$let>
+		</$list>
+	</span>
+	<div style="clear: both;"></div>
 </div>
--- a/core/ui/EditTemplate/tags.tid
+++ b/core/ui/EditTemplate/tags.tid
@ -3,39 +3,63 @@ tags: $:/tags/EditTemplate

 \whitespace trim

-\define lingo-base() $:/language/EditTemplate/
+\procedure lingo-base() $:/language/EditTemplate/

-\define tag-styles()
-background-color:$(backgroundColor)$;
-fill:$(foregroundColor)$;
-color:$(foregroundColor)$;
+\procedure tag-body-inner(colour,fallbackTarget,colourA,colourB,icon,tagField:"tags")
+<$wikify name="foregroundColor"
+	text="""<$macrocall $name="contrastcolour"
+		target=<<colour>>
+		fallbackTarget=<<fallbackTarget>>
+		colourA=<<colourA>>
+		colourB=<<colourB>>/>
+	"""
+>
+	<$let backgroundColor=<<colour>> >
+		<span class="tc-tag-label tc-tag-list-item tc-small-gap-right"
+			data-tag-title=<<currentTiddler>>
+			style.color=<<foregroundColor>>
+			style.fill=<<foregroundColor>>
+			style.background-color=<<backgroundColor>>
+		>
+			<$transclude tiddler=<<icon>>/>
+			<$view field="title" format="text"/>
+			<$button class="tc-btn-invisible tc-remove-tag-button"
+				style.fill=<<foregroundColor>>
+			>
+				<$action-listops $tiddler=<<saveTiddler>> $field=<<tagField>> $subfilter="-[{!!title}]"/>
+				{{$:/core/images/close-button}}
+			</$button>
+		</span>
+	</$let>
+</$wikify>
 \end

-\define tag-body-inner(colour,fallbackTarget,colourA,colourB,icon,tagField:"tags")
-\whitespace trim
-<$vars foregroundColor=<<contrastcolour target:"""$colour$""" fallbackTarget:"""$fallbackTarget$""" colourA:"""$colourA$""" colourB:"""$colourB$""">> backgroundColor="""$colour$""">
-<span style=<<tag-styles>> class="tc-tag-label tc-tag-list-item tc-small-gap-right" data-tag-title=<<currentTiddler>>>
-<$transclude tiddler="""$icon$"""/><$view field="title" format="text"/>
-<$button class="tc-btn-invisible tc-remove-tag-button" style=<<tag-styles>>><$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter="-[{!!title}]"/>{{$:/core/images/close-button}}</$button>
-</span>
-</$vars>
+\procedure tag-body(colour,palette,icon,tagField:"tags")
+<$macrocall $name="tag-body-inner"
+	colour=`$(colour)$`
+	colourA={{{ [<palette>getindex[foreground]] }}}
+	colourB={{{ [<palette>getindex[background]] }}}
+	fallbackTarget={{{ [<palette>getindex[tag-background]] }}}
+	icon=<<icon>>
+	tagField=<<tagField>>
+/>
 \end

-\define tag-body(colour,palette,icon,tagField:"tags")
-<$macrocall $name="tag-body-inner" colour="""$colour$""" fallbackTarget={{$palette$##tag-background}} colourA={{$palette$##foreground}} colourB={{$palette$##background}} icon="""$icon$""" tagField=<<__tagField__>>/>
-\end
-
-\define edit-tags-template(tagField:"tags")
-\whitespace trim
+\procedure edit-tags-template(tagField:"tags")
 <div class="tc-edit-tags">
-<$list filter="[list[!!$tagField$]sort[title]]" storyview="pop">
-<$macrocall $name="tag-body" colour={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}} palette={{$:/palette}} icon={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] }}} tagField=<<__tagField__>>/>
-</$list>
-<$vars tabIndex={{$:/config/EditTabIndex}} cancelPopups="yes">
-<$macrocall $name="tag-picker" tagField=<<__tagField__>>/>
-</$vars>
+	<$list filter="[<currentTiddler>get<tagField>enlist-input[]sort[title]]" storyview="pop">
+		<$macrocall $name="tag-body"
+			colour={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}}
+			palette={{$:/palette}}
+			icon={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] }}}
+			tagField=<<tagField>>
+		/>
+	</$list>
+	<$let tabIndex={{$:/config/EditTabIndex}} cancelPopups="yes">
+		<$macrocall $name="tag-picker" tagField=<<tagField>>/>
+	</$let>
 </div>
 \end
-<$set name="saveTiddler" value=<<currentTiddler>>>
-<$macrocall $name="edit-tags-template" tagField=<<tagField>>/>
-</$set>
+<$let saveTiddler=<<currentTiddler>>>
+	<$macrocall $name="edit-tags-template" tagField=<<tagField>>/>
+</$let>
--- a/core/ui/EditorToolbar/preview.tid
+++ b/core/ui/EditorToolbar/preview.tid
@ -9,17 +9,8 @@ button-classes: tc-text-editor-toolbar-item-start-group
 shortcuts: ((preview))

 \whitespace trim
-<$let
-	edit-preview-state={{{ [{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[<qualify "$:/state/showeditpreview">] }}}
->
-<$reveal state=<<edit-preview-state>> type="match" text="yes" tag="span">
-{{$:/core/images/preview-open}}
-<$action-setfield $tiddler=<<edit-preview-state>> $value="no"/>
+<span>
+	<$transclude $tiddler={{{ [<edit-preview-state>match[yes]then[$:/core/images/preview-open]else[$:/core/images/preview-closed]] }}} />
+</span>
+<$action-setfield $tiddler=<<editPreviewStateTiddler>> $value={{{ [<editPreviewStateTiddler>get[text]toggle[yes],[no]] }}} />
 <$action-sendmessage $message="tm-edit-text-operation" $param="focus-editor"/>
-</$reveal>
-<$reveal state=<<edit-preview-state>> type="nomatch" text="yes" tag="span">
-{{$:/core/images/preview-closed}}
-<$action-setfield $tiddler=<<edit-preview-state>> $value="yes"/>
-<$action-sendmessage $message="tm-edit-text-operation" $param="focus-editor"/>
-</$reveal>
-</$let>
--- a/core/ui/PageControls.tid
+++ b/core/ui/PageControls.tid
@ -1,17 +1,16 @@
 title: $:/core/ui/PageTemplate/pagecontrols

 \whitespace trim
-\define config-title()
-$:/config/PageControlButtons/Visibility/$(listItem)$
-\end
+\define config-title() $:/config/PageControlButtons/Visibility/$(listItem)$
+
 <div class="tc-page-controls">
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem">
-<$set name="hidden" value=<<config-title>>>
-<$list filter="[<hidden>!text[hide]]" storyview="pop" variable="ignore">
-<$set name="tv-config-toolbar-class" filter="[<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]]">
-<$transclude tiddler=<<listItem>> mode="inline"/>
-</$set>
-</$list>
-</$set>
-</$list>
+	<$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem">
+		<$set name="hidden" value=<<config-title>>>
+			<$list filter="[<hidden>!text[hide]]" storyview="pop" variable="ignore">
+				<$set name="tv-config-toolbar-class" filter="[<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]]">
+					<$transclude tiddler=<<listItem>> mode="inline"/>
+				</$set>
+			</$list>
+		</$set>
+	</$list>
 </div>
--- a/core/ui/PageControls/more-page-actions.tid
+++ b/core/ui/PageControls/more-page-actions.tid
@ -4,48 +4,41 @@ caption: {{$:/core/images/down-arrow}} {{$:/language/Buttons/More/Caption}}
 description: {{$:/language/Buttons/More/Hint}}

 \whitespace trim
-\define config-title()
-$:/config/PageControlButtons/Visibility/$(listItem)$
-\end
-<$button popup=<<qualify "$:/state/popup/more">> tooltip={{$:/language/Buttons/More/Hint}} aria-label={{$:/language/Buttons/More/Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
-{{$:/core/images/down-arrow}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
-<span class="tc-btn-text">
-<$text text={{$:/language/Buttons/More/Caption}}/>
-</span>
-</$list>
-</$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">
-
-<$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>
-
-</div>
+\define config-title() $:/config/PageControlButtons/Visibility/$(listItem)$

+<$button popup=<<qualify "$:/state/popup/more">>
+	tooltip={{$:/language/Buttons/More/Hint}}
+	aria-label={{$:/language/Buttons/More/Caption}}
+	class=<<tv-config-toolbar-class>>
+	selectedClass="tc-selected"
+>
+	<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+		{{$:/core/images/down-arrow}}
+	</$list>
+	<$list filter="[<tv-config-toolbar-text>match[yes]]">
+		<span class="tc-btn-text">
+			<$text text={{$:/language/Buttons/More/Caption}}/>
+		</span>
+	</$list>
+</$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"
+					>
+						<$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>
+	</div>
 </$reveal>
--- a/core/ui/PageTemplate.tid
+++ b/core/ui/PageTemplate.tid
@ -1,7 +1,7 @@
 title: $:/core/ui/PageTemplate
 name: {{$:/language/PageTemplate/Name}}
 description: {{$:/language/PageTemplate/Description}}
-icon: $:/core/images/layout-button
+icon: $:/core/images/default-layout
 code-body: yes

 \whitespace trim
--- a/core/ui/ViewTemplate/title.tid
+++ b/core/ui/ViewTemplate/title.tid
@ -2,31 +2,38 @@ title: $:/core/ui/ViewTemplate/title
 tags: $:/tags/ViewTemplate

 \whitespace trim
-\define title-styles()
-fill:$(foregroundColor)$;
-\end
+\define title-styles() fill:$(foregroundColor)$;
+
 <div class="tc-tiddler-title">
-<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]]" storyview="pop" variable="listItem"><$set name="tv-config-toolbar-class" filter="[<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]]"><$transclude tiddler=<<listItem>>/></$set></$list>
-</span>
-<$set name="tv-wikilinks" value={{$:/config/Tiddlers/TitleLinks}}>
-<$link>
-<$list filter="[<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] +[!is[blank]]" variable="ignore">
-<$let foregroundColor={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}}>
-<span class="tc-tiddler-title-icon" style=<<title-styles>>>
-{{||$:/core/ui/TiddlerIcon}}
-</span>
-</$let>
-</$list>
-<$transclude tiddler={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/ViewTemplateTitleFilter]!is[draft]get[text]] :and[!is[blank]else[$:/core/ui/ViewTemplate/title/default]] }}} />
-</$link>
-</$set>
-</div>
-
-<$reveal type="nomatch" text="" default="" state=<<tiddlerInfoState>> class="tc-tiddler-info tc-popup-handle" animate="yes" retain="yes">
-
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/TiddlerInfoSegment]!has[draft.of]] [[$:/core/ui/TiddlerInfo]]" variable="listItem"><$transclude tiddler=<<listItem>> mode="block"/></$list>
-
-</$reveal>
+	<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]]"
+				storyview="pop"
+				variable="listItem"
+			>
+				<$set name="tv-config-toolbar-class" filter="[<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]]">
+					<$transclude tiddler=<<listItem>>/>
+				</$set>
+			</$list>
+		</span>
+		<$set name="tv-wikilinks" value={{$:/config/Tiddlers/TitleLinks}}>
+			<$link>
+				<$list filter="[<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] +[!is[blank]]"
+					variable="ignore"
+				>
+					<$let foregroundColor={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}}>
+						<span class="tc-tiddler-title-icon" style=<<title-styles>>>
+							{{||$:/core/ui/TiddlerIcon}}
+						</span>
+					</$let>
+				</$list>
+				<$transclude tiddler={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/ViewTemplateTitleFilter]!is[draft]get[text]] :and[!is[blank]else[$:/core/ui/ViewTemplate/title/default]] }}} />
+			</$link>
+		</$set>
+	</div>
+	<$reveal tag="div" type="nomatch" text="" default="" state=<<tiddlerInfoState>> class="tc-tiddler-info tc-popup-handle" animate="yes" retain="yes">
+		<$list filter="[all[shadows+tiddlers]tag[$:/tags/TiddlerInfoSegment]!has[draft.of]] [[$:/core/ui/TiddlerInfo]]" variable="listItem">
+			<$transclude tiddler=<<listItem>> mode="block"/>
+		</$list>
+	</$reveal>
 </div>
--- a/core/ui/ViewToolbar/more-tiddler-actions.tid
+++ b/core/ui/ViewToolbar/more-tiddler-actions.tid
@ -4,49 +4,41 @@ caption: {{$:/core/images/down-arrow}} {{$:/language/Buttons/More/Caption}}
 description: {{$:/language/Buttons/More/Hint}}

 \whitespace trim
-\define config-title()
-$:/config/ViewToolbarButtons/Visibility/$(listItem)$
-\end
-<$button popup=<<qualify "$:/state/popup/more">> tooltip={{$:/language/Buttons/More/Hint}} aria-label={{$:/language/Buttons/More/Caption}} class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
-<$list filter="[<tv-config-toolbar-icons>match[yes]]">
-{{$:/core/images/down-arrow}}
-</$list>
-<$list filter="[<tv-config-toolbar-text>match[yes]]">
-<span class="tc-btn-text">
-<$text text={{$:/language/Buttons/More/Caption}}/>
-</span>
-</$list>
+\define config-title() $:/config/ViewToolbarButtons/Visibility/$(listItem)$
+
+<$button popup=<<qualify "$:/state/popup/more">>
+	tooltip={{$:/language/Buttons/More/Hint}}
+	aria-label={{$:/language/Buttons/More/Caption}}
+	class=<<tv-config-toolbar-class>>
+	selectedClass="tc-selected"
+>
+	<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+		{{$:/core/images/down-arrow}}
+	</$list>
+	<$list filter="[<tv-config-toolbar-text>match[yes]]">
+		<span class="tc-btn-text">
+			<$text text={{$:/language/Buttons/More/Caption}}/>
+		</span>
+	</$list>
 </$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">
-
-<$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>
-
-</div>
-
+	<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"
+					>
+						<$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>
+	</div>
 </$reveal>
--- a/core/wiki/config/OfficialPluginLibrary.tid
+++ b/core/wiki/config/OfficialPluginLibrary.tid
@ -1,6 +1,6 @@
 title: $:/config/OfficialPluginLibrary
 tags: $:/tags/PluginLibrary
-url: https://tiddlywiki.com/library/v5.3.2/index.html
+url: https://tiddlywiki.com/library/v5.3.3/index.html
 caption: {{$:/language/OfficialPluginLibrary}}

 {{$:/language/OfficialPluginLibrary/Hint}}
--- a/core/wiki/macros/CSS.tid
+++ b/core/wiki/macros/CSS.tid
@ -1,76 +1,69 @@
 title: $:/core/macros/CSS
-tags: $:/tags/Macro
+tags: $:/tags/Macro $:/tags/Global

-\define colour(name)
-<$transclude tiddler={{$:/palette}} index="$name$"><$transclude tiddler="$:/palettes/Vanilla" index="$name$"><$transclude tiddler="$:/config/DefaultColourMappings/$name$"/></$transclude></$transclude>
+\procedure colour(name)
+\whitespace trim
+<$transclude $tiddler={{$:/palette}} $index=`$(name)$`>
+	<$transclude $tiddler="$:/palettes/Vanilla" $index=`$(name)$`>
+		<$transclude $tiddler=`$:/config/DefaultColourMappings/$(name)$`/>
+	</$transclude>
+</$transclude>
 \end

-\define color(name)
-<<colour $name$>>
+\procedure color(name)
+<$macrocall $name=colour name=`$(name)$`/>
 \end

-\define box-shadow(shadow)
-``
-  -webkit-box-shadow: $shadow$;
-     -moz-box-shadow: $shadow$;
-          box-shadow: $shadow$;
-``
+\function box-shadow(shadow)
+[[ -webkit-box-shadow: $(shadow)$;
+	-moz-box-shadow: $(shadow)$;
+	box-shadow: $(shadow)$;]substitute[]]
 \end

-\define filter(filter)
-``
-  -webkit-filter: $filter$;
-     -moz-filter: $filter$;
-          filter: $filter$;
-``
+\function filter(filter)
+[[ -webkit-filter: $(filter)$;
+	-moz-filter: $(filter)$;
+	filter: $(filter)$;]substitute[]]
 \end

-\define transition(transition)
-``
-  -webkit-transition: $transition$;
-     -moz-transition: $transition$;
-          transition: $transition$;
-``
+\function transition(transition)
+[[ -webkit-transition: $(transition)$;
+	-moz-transition: $(transition)$;
+	transition: $(transition)$;]substitute[]]
 \end

-\define transform-origin(origin)
-``
-  -webkit-transform-origin: $origin$;
-     -moz-transform-origin: $origin$;
-          transform-origin: $origin$;
-``
+\function transform-origin(origin)
+[[ -webkit-transform-origin: $(origin)$;
+	-moz-transform-origin: $(origin)$;
+	transform-origin: $(origin)$;]substitute[]]
 \end

-\define background-linear-gradient(gradient)
-``
-background-image: linear-gradient($gradient$);
-background-image: -o-linear-gradient($gradient$);
-background-image: -moz-linear-gradient($gradient$);
-background-image: -webkit-linear-gradient($gradient$);
-background-image: -ms-linear-gradient($gradient$);
-``
+\function background-linear-gradient(gradient)
+[[	background-image: linear-gradient($(gradient)$);
+	background-image: -o-linear-gradient($(gradient)$);
+	background-image: -moz-linear-gradient($(gradient)$);
+	background-image: -webkit-linear-gradient($(gradient)$);
+	background-image: -ms-linear-gradient($(gradient)$);]substitute[]]
 \end

-\define column-count(columns)
-``
-moz-column-count: $columns$;
-webkit-column-count: $columns$;
-column-count: $columns$;
-``
+\function column-count(columns)
+[[-moz-column-count: $(columns)$;
+	-webkit-column-count: $(columns)$;
+	column-count: $(columns)$;]substitute[]]
 \end

-\define datauri(title)
-<$macrocall $name="makedatauri" type={{$title$!!type}} text={{$title$}} _canonical_uri={{$title$!!_canonical_uri}}/>
+\procedure datauri(title)
+<$macrocall $name="makedatauri" type={{{ [<title>get[type]] }}} text={{{ [<title>get[text]] }}} _canonical_uri={{{ [<title>get[_canonical_uri]] }}}/>
 \end

-\define if-sidebar(text)
-<$reveal state="$:/state/sidebar" type="match" text="yes" default="yes">$text$</$reveal>
+\procedure if-sidebar(text)
+<$reveal state="$:/state/sidebar" type="match" text="yes" default="yes"><<text>></$reveal>
 \end

-\define if-no-sidebar(text)
-<$reveal state="$:/state/sidebar" type="nomatch" text="yes" default="yes">$text$</$reveal>
+\procedure if-no-sidebar(text)
+<$reveal state="$:/state/sidebar" type="nomatch" text="yes" default="yes"><<text>></$reveal>
 \end

-\define if-background-attachment(text)
-<$reveal state="$:/themes/tiddlywiki/vanilla/settings/backgroundimage" type="nomatch" text="">$text$</$reveal>
+\procedure if-background-attachment(text)
+<$reveal state="$:/themes/tiddlywiki/vanilla/settings/backgroundimage" type="nomatch" text=""><<text>></$reveal>
 \end
--- a/core/wiki/macros/copy-to-clipboard.tid
+++ b/core/wiki/macros/copy-to-clipboard.tid
@ -1,20 +1,26 @@
 title: $:/core/macros/copy-to-clipboard
-tags: $:/tags/Macro
+tags: $:/tags/Macro $:/tags/Global

-\define copy-to-clipboard(src,class:"tc-btn-invisible",style)
 \whitespace trim
-<$button class=<<__class__>> style=<<__style__>> message="tm-copy-to-clipboard" param=<<__src__>> tooltip={{$:/language/Buttons/CopyToClipboard/Hint}}>
-{{$:/core/images/copy-clipboard}}
-&#32;
-<$text text={{$:/language/Buttons/CopyToClipboard/Caption}}/>
+
+\procedure copy-to-clipboard(src,class:"tc-btn-invisible",style)
+<$button message="tm-copy-to-clipboard"
+	param=<<src>>
+	class=<<class>>
+	style=<<style>>
+	tooltip={{$:/language/Buttons/CopyToClipboard/Hint}}
+>
+	{{$:/core/images/copy-clipboard}}
+	<span class="tc-tiny-gap-left">
+		<$text text={{$:/language/Buttons/CopyToClipboard/Caption}}/>
+	</span>
 </$button>
 \end

-\define copy-to-clipboard-above-right(src,class:"tc-btn-invisible",style)
-\whitespace trim
+\procedure copy-to-clipboard-above-right(src,class:"tc-btn-invisible",style)
 <div style="position: relative;">
-<div style="position: absolute; bottom: 0; right: 0;">
-<$macrocall $name="copy-to-clipboard" src=<<__src__>> class=<<__class__>> style=<<__style__>>/>
-</div>
+	<div style="position: absolute; bottom: 0; right: 0;">
+		<$macrocall $name="copy-to-clipboard" src=<<src>> class=<<class>> style=<<style>>/>
+	</div>
 </div>
 \end
--- a/core/wiki/macros/diff.tid
+++ b/core/wiki/macros/diff.tid
@ -1,37 +1,37 @@
 title: $:/core/macros/diff
-tags: $:/tags/Macro
+tags: $:/tags/Macro $:/tags/Global

-\define compareTiddlerText(sourceTiddlerTitle,sourceSubTiddlerTitle,destTiddlerTitle,destSubTiddlerTitle)
 \whitespace trim
-<$set name="source" tiddler=<<__sourceTiddlerTitle__>> subtiddler=<<__sourceSubTiddlerTitle__>>>
-<$set name="dest" tiddler=<<__destTiddlerTitle__>> subtiddler=<<__destSubTiddlerTitle__>>>
-<$diff-text source=<<source>> dest=<<dest>>/>
-</$set>
+
+\procedure compareTiddlerText(sourceTiddlerTitle,sourceSubTiddlerTitle,destTiddlerTitle,destSubTiddlerTitle)
+<$set name="source" tiddler=<<sourceTiddlerTitle>> subtiddler=<<sourceSubTiddlerTitle>>>
+	<$set name="dest" tiddler=<<destTiddlerTitle>> subtiddler=<<destSubTiddlerTitle>>>
+		<$diff-text source=<<source>> dest=<<dest>>/>
+	</$set>
 </$set>
 \end

-\define compareTiddlers(sourceTiddlerTitle,sourceSubTiddlerTitle,destTiddlerTitle,destSubTiddlerTitle,exclude)
-\whitespace trim
+\procedure compareTiddlers(sourceTiddlerTitle,sourceSubTiddlerTitle,destTiddlerTitle,destSubTiddlerTitle,exclude)
 <table class="tc-diff-tiddlers">
-<tbody>
-<$set name="sourceFields" filter="[<__sourceTiddlerTitle__>fields[]sort[]]">
-<$set name="destFields" filter="[<__destSubTiddlerTitle__>subtiddlerfields<__destTiddlerTitle__>sort[]]">
-<$list filter="[enlist<sourceFields>] [enlist<destFields>] -[enlist<__exclude__>] +[sort[]]" variable="fieldName">
-<tr>
-<th>
-<$text text=<<fieldName>>/>
-</th>
-<td>
-<$set name="source" tiddler=<<__sourceTiddlerTitle__>> subtiddler=<<__sourceSubTiddlerTitle__>> field=<<fieldName>>>
-<$set name="dest" tiddler=<<__destTiddlerTitle__>> subtiddler=<<__destSubTiddlerTitle__>> field=<<fieldName>>>
-<$diff-text source=<<source>> dest=<<dest>>>&#32;</$diff-text>
-</$set>
-</$set>
-</td>
-</tr>
-</$list>
-</$set>
-</$set>
-</tbody>
+	<tbody>
+		<$set name="sourceFields" filter="[<sourceTiddlerTitle>fields[]sort[]]">
+			<$set name="destFields" filter="[<destSubTiddlerTitle>subtiddlerfields<destTiddlerTitle>sort[]]">
+			<$list filter="[enlist<sourceFields>] [enlist<destFields>] -[enlist<exclude>] +[sort[]]" variable="fieldName">
+				<tr>
+					<th>
+						<$text text=<<fieldName>>/>
+					</th>
+					<td>
+						<$set name="source" tiddler=<<sourceTiddlerTitle>> subtiddler=<<sourceSubTiddlerTitle>> field=<<fieldName>>>
+							<$set name="dest" tiddler=<<destTiddlerTitle>> subtiddler=<<destSubTiddlerTitle>> field=<<fieldName>>>
+								<$diff-text source=<<source>> dest=<<dest>>>&#32;</$diff-text>
+							</$set>
+						</$set>
+					</td>
+				</tr>
+			</$list>
+			</$set>
+		</$set>
+	</tbody>
 </table>
 \end
--- a/core/wiki/macros/tag-picker.tid
+++ b/core/wiki/macros/tag-picker.tid
@ -1,32 +1,33 @@
 title: $:/core/macros/tag-picker
-tags: $:/tags/Macro
+tags: $:/tags/Macro $:/tags/Global
 first-search-filter: [tags[]!is[system]search:title<userInput>sort[]]
 second-search-filter: [tags[]is[system]search:title<userInput>sort[]]

-\define get-tagpicker-focus-selector() [data-tiddler-title="$(currentTiddlerCSSEscaped)$"] .tc-add-tag-name input
+\procedure get-tagpicker-focus-selector()
+\function currentTiddlerCSSEscaped() [<saveTiddler>escapecss[]]
+[data-tiddler-title=`$(currentTiddlerCSSEscaped)$`] .tc-add-tag-name input
+\end

-\define delete-tag-state-tiddlers() <$action-deletetiddler $filter="[<newTagNameTiddler>] [<storeTitle>] [<tagSelectionState>]"/>
+\procedure delete-tag-state-tiddlers() <$action-deletetiddler $filter="[<newTagNameTiddler>] [<storeTitle>] [<tagSelectionState>]"/>

-\define add-tag-actions(actions,tagField:"tags")
+\procedure add-tag-actions()
 \whitespace trim
-<$set name="tag" value={{{ [<__tiddler__>get[text]] }}}>
-	<$list
-		filter="[<saveTiddler>!contains:$tagField$<tag>!match[]]"
-		variable="ignore"
-		emptyMessage="<$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter='-[<tag>]'/>"
-	>
-		<$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter="[<tag>trim[]]"/>
-		<$transclude $variable="__actions__"/>
-	</$list>
-</$set>
+<$let tag=<<tag>>>
+<$action-listops $tiddler=<<saveTiddler>> $field=<<tagField>> $subfilter='+[toggle<tag>trim[]]'/>
+<$list
+	filter="[<tag>] :intersection[<saveTiddler>get<tagField>enlist-input[]]"
+	variable="ignore"
+	emptyMessage="<<actions>>"
+/>
+</$let>
 <<delete-tag-state-tiddlers>>
 <$action-setfield $tiddler=<<refreshTitle>> text="yes"/>
 \end

-\define clear-tags-actions-inner()
+\procedure clear-tags-actions-inner()
 \whitespace trim
 <$list
-	filter="[<storeTitle>has[text]] [<newTagNameTiddler>has[text]]"
+	filter="[<storeTitle>has[text]] ~[<newTagNameTiddler>has[text]]"
 	variable="ignore"
 	emptyMessage="<<cancel-delete-tiddler-actions 'cancel'>>"
 >
@ -34,144 +35,133 @@ second-search-filter: [tags[]is[system]search:title<userInput>sort[]]
 </$list>
 \end

-\define clear-tags-actions()
+\procedure clear-tags-actions()
 \whitespace trim
-<$set name="userInput" value={{{ [<storeTitle>get[text]] }}}>
-	<$list filter="[<newTagNameTiddler>get[text]!match<userInput>]" emptyMessage="<<clear-tags-actions-inner>>">
-		<$action-setfield $tiddler=<<newTagNameTiddler>> text=<<userInput>>/><$action-setfield $tiddler=<<refreshTitle>> text="yes"/>
+<$let userInput=<<userInput>>>
+	<$list
+		filter="[<newTagNameTiddler>get[text]!match<userInput>]"
+		emptyMessage="<<clear-tags-actions-inner>>"
+	>
+		<$action-setfield $tiddler=<<newTagNameTiddler>> text=<<userInput>>/>
+		<$action-setfield $tiddler=<<refreshTitle>> text="yes"/>
 	</$list>
-</$set>
+</$let>
 \end

-\define tag-picker-inner(actions,tagField:"tags")
+\procedure add-button-actions()
+<$action-listops $tiddler=<<saveTiddler>> $field=<<tagField>> $subfilter="[<tag>trim[]]"/>
+<<actions>>
+<<delete-tag-state-tiddlers>>
+<$action-sendmessage $message="tm-focus-selector" $param=<<get-tagpicker-focus-selector>>/>
+\end
+
+\procedure list-tags(filter, suffix)
 \whitespace trim
-<$vars
+<$list
+	filter="[<userInput>minlength{$:/config/Tags/MinLength}limit[1]]"
+	emptyMessage="<div class='tc-search-results'>{{$:/language/Search/Search/TooShort}}</div>" variable="listItem"
+>
+	<$list filter=<<filter>> variable="tag">
+		<$let
+			button-classes=`tc-btn-invisible ${ [<tag>addsuffix<suffix>] -[<tagSelectionState>get[text]] :then[[]] ~tc-tag-button-selected }$`
+			currentTiddler=<<tag>>
+		>
+			{{||$:/core/ui/TagPickerTagTemplate}}
+		</$let>
+	</$list>
+</$list>
+\end
+
+\procedure tag-picker-inner()
+\whitespace trim
+<$let
 	newTagNameInputTiddlerQualified=<<qualify "$:/temp/NewTagName/input">>
 	newTagNameSelectionTiddlerQualified=<<qualify "$:/temp/NewTagName/selected-item">>
-	fallbackTarget={{$(palette)$##tag-background}}
-	colourA={{$(palette)$##foreground}}
-	colourB={{$(palette)$##background}}
+	fallbackTarget={{{ [<palette>getindex[tag-background]] }}}
+	colourA={{{ [<palette>getindex[foreground]] }}}
+	colourB={{{ [<palette>getindex[background]] }}}
+
+	storeTitle={{{ [<newTagNameInputTiddler>!match[]] ~[<newTagNameInputTiddlerQualified>] }}}
+	tagSelectionState={{{ [<newTagNameSelectionTiddler>!match[]] ~[<newTagNameSelectionTiddlerQualified>] }}}
+	tagAutoComplete=<<qualify "$:/state/popup/tags-auto-complete">>
+
+	refreshTitle=<<qualify "$:/temp/NewTagName/refresh">> 
+	nonSystemTagsFilter="[tags[]!is[system]search:title<userInput>sort[]]"
+	systemTagsFilter="[tags[]is[system]search:title<userInput>sort[]]"
 >
-	<$vars
-		storeTitle={{{ [<newTagNameInputTiddler>!match[]] ~[<newTagNameInputTiddlerQualified>] }}}
-		tagSelectionState={{{ [<newTagNameSelectionTiddler>!match[]] ~[<newTagNameSelectionTiddlerQualified>] }}}
-	>
-		<$vars
-			refreshTitle=<<qualify "$:/temp/NewTagName/refresh">> 
-			nonSystemTagsFilter="[tags[]!is[system]search:title<userInput>sort[]]"
-			systemTagsFilter="[tags[]is[system]search:title<userInput>sort[]]"
-		>
-			<div class="tc-edit-add-tag">
-				<div>
-					<span class="tc-add-tag-name tc-small-gap-right">
-						<$macrocall
-							$name="keyboard-driven-input"
-							tiddler=<<newTagNameTiddler>>
-							storeTitle=<<storeTitle>>
-							refreshTitle=<<refreshTitle>>
-							selectionStateTitle=<<tagSelectionState>>
-							inputAcceptActions="<$macrocall $name='add-tag-actions' actions=<<__actions__>> tagField=<<__tagField__>>/>"
-							inputCancelActions=<<clear-tags-actions>>
-							tag="input"
-							placeholder={{$:/language/EditTemplate/Tags/Add/Placeholder}}
-							focusPopup=<<qualify "$:/state/popup/tags-auto-complete">>
-							class="tc-edit-texteditor tc-popup-handle"
-							tabindex=<<tabIndex>>
-							focus={{{ [{$:/config/AutoFocus}match[tags]then[true]] ~[[false]] }}}
-							filterMinLength={{$:/config/Tags/MinLength}}
-							cancelPopups=<<cancelPopups>>
-							configTiddlerFilter="[[$:/core/macros/tag-picker]]"
-						/>
-					</span>
-					<$button popup=<<qualify "$:/state/popup/tags-auto-complete">> 
-						class="tc-btn-invisible tc-btn-dropdown"
-						tooltip={{$:/language/EditTemplate/Tags/Dropdown/Hint}}
-						aria-label={{$:/language/EditTemplate/Tags/Dropdown/Caption}}
+	<div class="tc-edit-add-tag">
+		<div>
+			<span class="tc-add-tag-name tc-small-gap-right">
+				<$transclude
+					$variable="keyboard-driven-input"
+					tiddler=<<newTagNameTiddler>>
+					storeTitle=<<storeTitle>>
+					refreshTitle=<<refreshTitle>>
+					selectionStateTitle=<<tagSelectionState>>
+					inputAcceptActions=<<add-tag-actions>>
+					inputCancelActions=<<clear-tags-actions>>
+					tag="input"
+					placeholder={{$:/language/EditTemplate/Tags/Add/Placeholder}}
+					focusPopup=<<tagAutoComplete>>
+					class="tc-edit-texteditor tc-popup-handle"
+					tabindex=<<tabIndex>>
+					focus={{{ [{$:/config/AutoFocus}match[tags]then[true]] ~[[false]] }}}
+					filterMinLength={{$:/config/Tags/MinLength}}
+					cancelPopups=<<cancelPopups>>
+					configTiddlerFilter="[[$:/core/macros/tag-picker]]"
+				/>
+			</span>
+			<$button popup=<<tagAutoComplete>> 
+				class="tc-btn-invisible tc-btn-dropdown"
+				tooltip={{$:/language/EditTemplate/Tags/Dropdown/Hint}}
+				aria-label={{$:/language/EditTemplate/Tags/Dropdown/Caption}}
+			>
+				{{$:/core/images/down-arrow}}
+			</$button>
+			<$reveal state=<<storeTitle>> type="nomatch" text="">
+				<$button 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>
+			</$reveal>
+			<span class="tc-add-tag-button tc-small-gap-left">
+				<$let tag=<<tag>>>
+					<$button set=<<newTagNameTiddler>> setTo=""
+						actions=<<add-button-actions>>
 					>
-						{{$:/core/images/down-arrow}}
+						{{$:/language/EditTemplate/Tags/Add/Button}}
 					</$button>
-					<$reveal state=<<storeTitle>> type="nomatch" text="">
-						<$button class="tc-btn-invisible tc-small-gap tc-btn-dropdown"
-							tooltip={{$:/language/EditTemplate/Tags/ClearInput/Hint}}
-							aria-label={{$:/language/EditTemplate/Tags/ClearInput/Caption}}
-						>
-							{{$:/core/images/close-button}}<<delete-tag-state-tiddlers>>
-						</$button>
-					</$reveal>
-					<span class="tc-add-tag-button tc-small-gap-left">
-						<$set name="tag" value={{{ [<newTagNameTiddler>get[text]] }}}>
-							<$button set=<<newTagNameTiddler>> setTo="" class="">
-								<$action-listops $tiddler=<<saveTiddler>> $field=<<__tagField__>> $subfilter="[<tag>trim[]]"/>
-								<$transclude $variable="__actions__"/>
-								<$set name="currentTiddlerCSSEscaped" value={{{ [<saveTiddler>escapecss[]] }}}>
-									<<delete-tag-state-tiddlers>><$action-sendmessage $message="tm-focus-selector" $param=<<get-tagpicker-focus-selector>>/>
-								</$set>
-								{{$:/language/EditTemplate/Tags/Add/Button}}
-							</$button>
-						</$set>
-					</span>
+				</$let>
+			</span>
+		</div>
+		<div class="tc-block-dropdown-wrapper">
+			<$reveal state=<<tagAutoComplete>> type="nomatch" text="">
+				<div class="tc-block-dropdown tc-block-tags-dropdown">
+					<$let userInput=<<userInput>>>
+						<$transclude $variable="list-tags" filter=<<nonSystemTagsFilter>> suffix="-primaryList" />
+						<hr>
+						<$transclude $variable="list-tags" filter=<<systemTagsFilter>> suffix="-secondaryList" />
+					</$let>
 				</div>
-				<div class="tc-block-dropdown-wrapper">
-					<$reveal state=<<qualify "$:/state/popup/tags-auto-complete">> type="nomatch" text="" default="">
-						<div class="tc-block-dropdown tc-block-tags-dropdown">
-							<$set name="userInput" value={{{ [<storeTitle>get[text]] }}}>
-								<$list
-									filter="[<userInput>minlength{$:/config/Tags/MinLength}limit[1]]"
-									emptyMessage="<div class='tc-search-results'
-								>
-									{{$:/language/Search/Search/TooShort}}</div>" variable="listItem">
-									<$list filter=<<nonSystemTagsFilter>> variable="tag">
-										<$list
-											filter="[<tag>addsuffix[-primaryList]] -[<tagSelectionState>get[text]]" 
-											emptyMessage="<$vars button-classes='tc-btn-invisible tc-tag-button-selected' actions=<<__actions__>> tagField=<<__tagField__>> currentTiddler=<<tag>>>{{||$:/core/ui/TagPickerTagTemplate}}</$vars>"
-										>
-											<$vars button-classes="tc-btn-invisible"
-												actions=<<__actions__>> 
-												tagField=<<__tagField__>>
-												currentTiddler=<<tag>>
-											>
-												{{||$:/core/ui/TagPickerTagTemplate}}
-											</$vars>
-										</$list>
-									</$list>
-								</$list>
-								<hr>
-								<$list filter="[<userInput>minlength{$:/config/Tags/MinLength}limit[1]]" emptyMessage="<div class='tc-search-results'>
-									{{$:/language/Search/Search/TooShort}}</div>" variable="listItem">
-									<$list filter=<<systemTagsFilter>> variable="tag">
-										<$list filter="[<tag>addsuffix[-secondaryList]] -[<tagSelectionState>get[text]]"
-											emptyMessage="<$vars button-classes='tc-btn-invisible tc-tag-button-selected' actions=<<__actions__>> tagField=<<__tagField__>> currentTiddler=<<tag>>>{{||$:/core/ui/TagPickerTagTemplate}}</$vars>"
-										>
-											<$vars button-classes="tc-btn-invisible"
-												actions=<<__actions__>>
-												tagField=<<__tagField__>>
-												currentTiddler=<<tag>>
-											>
-												{{||$:/core/ui/TagPickerTagTemplate}}
-											</$vars>
-										</$list>
-									</$list>
-								</$list>
-							</$set>
-						</div>
-					</$reveal>
-				</div>
-			</div>
-		</$vars>
-	</$vars>
-</$vars>
+			</$reveal>
+		</div>
+	</div>
+</$let>
 \end

-\define tag-picker(actions,tagField:"tags")
+\procedure tag-picker(actions, tagField:"tags")
+\function userInput() [<storeTitle>get[text]]
+\function tag() [<newTagNameTiddler>get[text]]
 \whitespace trim
-<$vars saveTiddler=<<currentTiddler>> palette={{$:/palette}}>
-	<$list
-		filter="[<newTagNameTiddler>match[]]"
-		emptyMessage="<$macrocall $name='tag-picker-inner' actions=<<__actions__>> tagField=<<__tagField__>>/>"
-	>
-		<$set name="newTagNameTiddler" value=<<qualify "$:/temp/NewTagName">>>
-			<$macrocall $name="tag-picker-inner" actions=<<__actions__>> tagField=<<__tagField__>>/>
-		</$set>
-	</$list>
-</$vars>
+<$let
+	saveTiddler=<<currentTiddler>>
+	palette={{$:/palette}}
+	qualified=<<qualify "$:/temp/NewTagName">>
+	newTagNameTiddler={{{ [<newTagNameTiddler>!match[]] ~[<qualified>] }}}
+>
+	<$transclude $variable="tag-picker-inner" />
+</$let>
 \end
--- a/editions/de-AT/tiddlers/HelloThere.tid
+++ b/editions/de-AT/tiddlers/HelloThere.tid
@ -21,8 +21,8 @@ Willkommen bei ''~TiddlyWiki'', dem einzigartigen [[nicht-linearen|Philosophy vo
 Anders, als bei herkömmlichen Online-Diensten, lässt Ihnen ~TiddlyWiki die Freiheit, wo sie ihre Daten speichern. Da ~TiddlyWiki alle Daten als simplen Text speichert, sind Notizen, die Sie heute machen, garantiert in Jahrzehnten noch einfach lesbar. 

 <div style="font-size:0.7em;text-align:center;margin-top:3em;margin-bottom:3em;">
-<a href="http://groups.google.com/group/TiddlyWiki" class="tc-btn-big-green" style="background-color:#FF8C19;" target="_blank">
-{{$:/core/images/mail}} ~TiddlyWiki Mailing List
+<a href="https://talk.tiddlywiki.org/" class="tc-btn-big-green" style="background-color:#FF8C19;" target="_blank">
+{{$:/core/images/help}} ~TiddlyWiki Forum
 </a>
 <a href="https://twitter.com/TiddlyWiki" class="tc-btn-big-green" style="background-color:#5E9FCA;" target="_blank">
 {{$:/core/images/twitter}} @~TiddlyWiki on Twitter
--- a/editions/de-AT/tiddlers/community/Fur_Entwickler.tid
+++ b/editions/de-AT/tiddlers/community/Fur_Entwickler.tid
@ -7,5 +7,5 @@ type: text/vnd.tiddlywiki
 Es gibt mehrere Ressourcen für Entwickler, um mehr über das TiddlyWiki Projekt zu erfahren, zu diskutieren und vor allem mitzuhelfen. 

 * [[tiddlywiki.com/dev|https://tiddlywiki.com/dev]] Offizielle Entwickler Doku.
-* [[TiddlyWikiDev group|http://groups.google.com/group/TiddlyWikiDev]] Google Diskussionsforum für Entwickler.
+* [[TiddlyWikiDev group|https://talk.tiddlywiki.org/c/devs/]] Diskussionsforum für Entwickler.
 * https://github.com/Jermolene/TiddlyWiki5 .. Github Repository. 
--- a/editions/dev/tiddlers/HelloThere.tid
+++ b/editions/dev/tiddlers/HelloThere.tid
@ -16,6 +16,7 @@ Welcome to the developer documentation for TiddlyWiki (https://tiddlywiki.com/).
 ** [[Adding Babel Polyfill to TiddlyWiki]]
 ** [[TiddlyWiki Drag and Drop Interoperability]]
 ** [[Javascript Widget Tutorial]]
+** [[Using TiddlyWiki as a library in another Node.js application]]
 * The original developer documentation from https://tiddlywiki.com:
 ** [[TiddlyWiki for Developers]]
 ** [[TiddlyWiki Coding Style Guidelines]]
--- a/editions/dev/tiddlers/javascript-widget-tutorial/Javascript
+++ b/editions/dev/tiddlers/javascript-widget-tutorial/Javascript
@ -1,5 +1,5 @@
 created: 20190202035524804
-modified: 20221029161501848
+modified: 20240302110658300
 tags: 
 title: Javascript Widget Tutorial
 type: text/vnd.tiddlywiki
@ -9,21 +9,23 @@ This tutorial provides step-by-step, interactive examples of how to write code f

 Intended audience:

-# Those who know tiddlywiki well and know programming and javascript and want to write their own widget. I don't make any effort to explain javascript here. For that you will need other resources.
+# Those who know tiddlywiki well and know programming and javascript and want to write their own widget.
 # Those who know tiddlywiki well and don't know javascript, but want to understand more about how tiddlywiki works. You should be able to skim through and interact with the demos and learn something.

-!The tutorial
-*[[Undefined widget tutorial]]
-*[[Do nothing widget tutorial]]
-*[[Hello World widget tutorial]]
-*[[Widget refresh tutorial part I]]
-*[[Widget refresh tutorial part II]]
-*[[Widget refresh tutorial part III]]
-*[[Widget attributes tutorial part I]]
-*[[Widget attributes tutorial part II]]
-*[[Child widgets tutorial]]
+We don't make any effort to explain javascript here. For that you will need other resources, like [[MDN|https://developer.mozilla.org/en-US/docs/Web/JavaScript]].

-! Notes
+!! The tutorial
+* [[Undefined widget tutorial]]
+* [[Do nothing widget tutorial]]
+* [[Hello World widget tutorial]]
+* [[Widget refresh tutorial part I]]
+* [[Widget refresh tutorial part II]]
+* [[Widget refresh tutorial part III]]
+* [[Widget attributes tutorial part I]]
+* [[Widget attributes tutorial part II]]
+* [[Child widgets tutorial]]
+
+!! Notes

 tiddlywiki doesn't support dynamically reloading javascript. If you change a javascript tiddler, then you need to save and reload  the wiki before the changes will take affect.

@ -31,7 +33,11 @@ To avoid the need for such reloads, the excellent [[innerwiki plugin|https://tid

 Without the need for reloads, a tiddlywiki instance with the [[innerwiki plugin|https://tiddlywiki.com/prerelease/plugins/tiddlywiki/innerwiki/]] installed works great as a playground for interacting with tiddlywiki javascript.

-! Other documentation on writing TW widgets
+!! Other documentation on writing TW widgets

-*WidgetModules
-*[[Widgets]]
+* WidgetModules
+* [[Widgets]]
+
+!! Full API doc
+
+[[Github Pages of TW5-Typed|https://tiddly-gittly.github.io/TW5-Typed/api/classes/modules_widgets.widget]]
--- a/editions/dev/tiddlers/new/Using
+++ b/editions/dev/tiddlers/new/Using
@ -1,5 +1,5 @@
-modified: 20160305222940000
 created: 20160111034749658
+modified: 20240302110735646
 title: Using ES2016 for Writing Plugins
 type: text/vnd.tiddlywiki

@ -7,7 +7,15 @@ With the advent of ES2015 (also known as ES6) and the availability of [[Babel.js

 Please understand how the PluginMechanism works since this is all about writing a plugin using Babel to compile the output that will be included in the final TiddlyWiki (for example [[TiddlyWiki on Node.js]]).

-!! Installing and Configuring Babel
+!! Use a framework
+
+It is recommended to use develop toolkit managed by community. For example, 
+
+# [[Modern.TiddlyDev|https://tiddly-gittly.github.io/Modern.TiddlyDev/]]
+
+They are known as "~JavaScript Meta-Framework". With them, you can start developing in a few minutes, without hours of configuration and debugging the build steps.
+
+!! Installing and Configuring Babel by yourself

 You can install Babel using

@ -33,7 +41,9 @@ Inside your plugin project edit the file `.babelrc` and enter the following:

 <<.tip "I found it easier to manage my plugins as if they were ''npm'' modules complete with a `package.json` that compiles the output via `npm run build`. See [[npm-scripts documentation|https://docs.npmjs.com/misc/scripts]] for details.">>

-!! Compiling the Output
+Another benefit of using such a "Meta-Framework" is that you can easily maintain your configuration, you will find it difficult to upgrade those config files after several months.
+
+!!! Compiling the Output

 Pick a folder to store the ES2015 JavaScript and a folder to output the TiddlyWiki ready JavaScript. In this example I will use `src` and `lib` respectively. With Babel installed and working I can compile all the JavaScript in the `src` folder to the `lib` folder by running this command:

@ -43,7 +53,7 @@ $ babel src -d lib

 <<.warning "Babel will //not// copy over non-JavaScript files. It is up to the developer to include all the supporting files themselves. Babel only converts the ~JavaScript files (ending in `.js`) from the `src` folder to the `lib` folder.">>

-!! Imports and Exports
+!!! Imports and Exports

 In a plugin written pre-ES2015 one would `require` a module through TiddlyWiki like so:

@ -71,7 +81,7 @@ export { MyWidget as mywidget };

 It is important to understand that in ES2016 the ''default'' export is not supported in TiddlyWiki. This is mostly because the core code expects specific properties to be attached to the `exports` variable. Bable's `export` conversion plays well with this //except// with the default export.

-!! Classes
+!!! Classes

 In the example of a widget ES2016 plays well with class inheritance. To contrast the typical Widget definition would look something like this:

@ -104,7 +114,7 @@ class NameWidget extends Widget {
 }
 ```

-!!! Non Class Modules
+!!!! Non Class Modules

 For non class modules you can use the `export` keyword. Here is a simple [[Startup Module|ModuleType]]:

@ -122,11 +132,11 @@ export const params = {};
 export function run() {…}
 ```

-!! Polyfills
+!!! Polyfills

 ES2015 comes with some features that are part of the JavaScript core objects. These are not supported by all browsers. To use these features in [[most browsers|BrowserCompatibility]] you will need a <<.def "polyfill">>. Babel has a polyfill package that you can include. See [[Adding Babel Polyfill to TiddlyWiki]] for how to accomplish this.

-!! Example
+!!! Example

 Here is an example ES2015 plugin/widget that will show the time and update it:

--- a/editions/dev/tiddlers/new/Using
+++ b/editions/dev/tiddlers/new/Using
@ -0,0 +1,5 @@
+title: Using TiddlyWiki as a library in another Node.js application
+
+Node.js applications can include TiddlyWiki as a library so that they can use wikitext rendering.
+
+See the demo at https://github.com/Jermolene/TiddlyWiki5DemoApp
--- a/editions/dev/tiddlers/system/$__themes_tiddlywiki_vanilla_options_sidebarlayout.tid
+++ b/editions/dev/tiddlers/system/$__themes_tiddlywiki_vanilla_options_sidebarlayout.tid
@ -0,0 +1,6 @@
+created: 20240311150859344
+modified: 20240311150859344
+title: $:/themes/tiddlywiki/vanilla/options/sidebarlayout
+type: text/vnd.tiddlywiki
+
+fluid-fixed
--- a/editions/es-ES/tiddlers/$__StoryList.tid
+++ b/editions/es-ES/tiddlers/$__StoryList.tid
@ -1,6 +0,0 @@
-created: 20160511060801385
-list: Reference JSONTiddlers
-modified: 20160511060801385
-title: $:/StoryList
-type: text/vnd.tiddlywiki
-
--- a/editions/es-ES/tiddlers/Forums.tid
+++ b/editions/es-ES/tiddlers/Forums.tid
@ -12,7 +12,9 @@ Son listas de correo en las que hablamos de ~TiddlyWiki: pedimos ayuda, anunciam

 Puedes participar a través de la página web asociada, o suscribirte via mail.

-!!Usuarios
+!! Usuarios
+
+[[Foro oficial de TiddlyWiki| https://talk.tiddlywiki.org/]]

 [[Grupo principal de TiddlyWiki| http://groups.google.com/group/TiddlyWiki]]

@ -25,10 +27,7 @@ o síguenos [[en Twitter|http://twitter.com/TiddlyWiki]] si quieres recibir las

 !! Desarrolladores

-[[Grupo de desarrollo de TiddlyWiki|http://groups.google.com/group/TiddlyWikiDev]]
-
->No necesitas tener cuenta en Google para acceder al grupo. Suscríbete igualmente enviando un mail a:
-*mailto:tiddlywikidev+subscribe@googlegroups.com.
+[[Foro de desarrollo de TiddlyWiki|https://talk.tiddlywiki.org/c/devs]]

 Accede a nuestra [[página de desarrollo|https://github.com/Jermolene/TiddlyWiki5]] en GitHub y haz tu contribución.

--- a/editions/es-ES/tiddlers/HelloThere.tid
+++ b/editions/es-ES/tiddlers/HelloThere.tid
@ -20,8 +20,8 @@ BIenvenido a TiddlyWiki, un bloc de notas [[no lineal|Philosophy of Tiddlers]]
 Al revés que los servicios online convencionales, TiddlyWiki te deja escoger dónde quieres guardar tus datos, garantizándote que, por más que pase el tiempo, podrás seguir usando en el futuro las notas que tomes hoy.

 <div style="font-size:0.7em;text-align:center;margin-top:3em;margin-bottom:3em;">
-<a href="http://groups.google.com/group/TiddlyWiki" class="tc-btn-big-green" style="background-color:#FF8C19;" target="_blank" rel="noopener noreferrer">
-{{$:/core/images/mail}} ~TiddlyWiki en Google Groups
+<a href="https://talk.tiddlywiki.org/" class="tc-btn-big-green" style="background-color:#FF8C19;" target="_blank" rel="noopener noreferrer">
+{{$:/core/images/mail}} Foro oficial de ~TiddlyWiki
 </a>
 <a href="https://www.youtube.com/c/JeremyRuston" class="tc-btn-big-green" style="background-color:#e52d27;" target="_blank" rel="noopener noreferrer">
 {{$:/core/images/video}} ~TiddlyWiki en ~YouTube
--- a/editions/es-ES/tiddlers/Typography.tid
+++ b/editions/es-ES/tiddlers/Typography.tid
@ -8,7 +8,7 @@ type: text/vnd.tiddlywiki

 Se recomienda el uso de las [[macros de documentación|Documentation Macros]] para facilitar las futuras tareas de mantenimiento del texto frente a nuevos cambios y actualizaciones. 

-Se recomienda precaución en el uso arbitrario de estilos directos de formato (''negrita'', //cursiva// ...etc). Si se puede usar una macro, conviene usarla. Si no existe la macro adecuada, se puede crear o, si no se sabe cómo, pedir su creación en el [[Grupo de Google|http://groups.google.com/group/TiddlyWiki]].
+Se recomienda precaución en el uso arbitrario de estilos directos de formato (''negrita'', //cursiva// ...etc). Si se puede usar una macro, conviene usarla. Si no existe la macro adecuada, se puede crear o, si no se sabe cómo, pedir su creación en el [[Foro de TiddlyWiki|https://talk.tiddlywiki.org/]].

 Por el mismo motivo, se aconseja el uso de acentos graves <code>&#96;...&#96;</code> para transcribir fragmentos de código y ~WikiText, pero no para nombres de cosas tales como campos, operadores, variables o widgets. Estas tienen su macro correspondiente.

--- a/editions/full/tiddlywiki.info
+++ b/editions/full/tiddlywiki.info
@ -47,6 +47,7 @@
 		"it-IT",
 		"ja-JP",
 		"ko-KR",
+		"mk-MK",
 		"nl-NL",
 		"pa-IN",
 		"pt-PT",
--- a/editions/introduction/tiddlers/slides/CecilyMap.tid
+++ b/editions/introduction/tiddlers/slides/CecilyMap.tid
@ -4,17 +4,17 @@ type: application/json
 {
 	"newTiddlerPosition": {"x": 360,"y": 100},
 	"positions": {
-		" ":				{"x":  30,"y": 17,"w": 140,"h": 140, "r": -2},
-		"Tiddlers":			{"x":  60,"y": 15,"w": 140,"h": 140, "r": 10},
-		"Links":			{"x":  90,"y": 13,"w": 140,"h": 140, "r": -7},
-		"Formatting":		{"x": 120,"y": 18,"w": 140,"h": 140, "r": 5},
-		"Images":			{"x": 150,"y": 12,"w": 140,"h": 140, "r": -11},
-		"Audio":			{"x": 180,"y": 14,"w": 140,"h": 140, "r": 16},
-		"Tags":				{"x": 210,"y": 15,"w": 140,"h": 140, "r": 20},
-		"Transclusion":		{"x": 240,"y": 16,"w": 140,"h": 140, "r": -4},
-		"Lists":			{"x": 275,"y": 13,"w": 140,"h": 140, "r": 6},
-		"Customisation":	{"x": 310,"y": 19,"w": 140,"h": 140, "r": -5},
-		"Plugins":			{"x": 350,"y": 12,"w": 140,"h": 140, "r": 10},
-		"Translations":		{"x": 390,"y": 15,"w": 140,"h": 140, "r": 8}
+		" ":				{"x":  30,"y": 17,"w": 120,"h": 120, "r": -2},
+		"Tiddlers":			{"x":  60,"y": 15,"w": 120,"h": 120, "r": 10},
+		"Links":			{"x":  90,"y": 13,"w": 120,"h": 120, "r": -7},
+		"Formatting":		{"x": 120,"y": 18,"w": 120,"h": 120, "r": 5},
+		"Images":			{"x": 150,"y": 12,"w": 120,"h": 120, "r": -11},
+		"Audio":			{"x": 180,"y": 14,"w": 120,"h": 120, "r": 16},
+		"Tags":				{"x": 210,"y": 15,"w": 120,"h": 120, "r": 20},
+		"Transclusion":		{"x": 240,"y": 16,"w": 120,"h": 120, "r": -4},
+		"Lists":			{"x": 275,"y": 13,"w": 120,"h": 120, "r": 6},
+		"Customisation":	{"x": 310,"y": 19,"w": 120,"h": 120, "r": -5},
+		"Plugins":			{"x": 350,"y": 12,"w": 120,"h": 120, "r": 10},
+		"Translations":		{"x": 390,"y": 15,"w": 120,"h": 120, "r": 8}
 	}
 }
--- a/editions/introduction/tiddlers/slides/blank.json
+++ b/editions/introduction/tiddlers/slides/blank.json
@ -1,3 +1,3 @@
 [
-{"title": " ", "text": "TiddlyWiki"}
+{"title": " ", "text": "[[TiddlyWiki]]"}
 ]
--- a/editions/prerelease/tiddlers/Release
+++ b/editions/prerelease/tiddlers/Release
@ -0,0 +1,61 @@
+caption: 5.3.4
+created: 20231223102229103
+modified: 20231223102229103
+tags: ReleaseNotes
+title: Release 5.3.4
+type: text/vnd.tiddlywiki
+description: Under development
+
+//[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.3.3...master]]//
+
+! Major Improvements
+
+
+! Translation improvements
+
+Improvements to the following translations:
+
+* 
+
+! Plugin Improvements
+
+* 
+
+! Widget Improvements
+
+* 
+
+! Usability Improvements
+
+* 
+
+! Hackability Improvements
+
+* 
+
+! Bug Fixes
+
+* 
+
+! Node.js Improvements
+
+* 
+
+! Performance Improvements
+
+* 
+
+! Developer Improvements
+
+* 
+
+! Infrastructure Improvements
+
+* 
+
+! 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 """
+""">>
--- a/editions/prerelease/tiddlers/system/PrereleaseOfficialPluginLibrary.tid
+++ b/editions/prerelease/tiddlers/system/PrereleaseOfficialPluginLibrary.tid
@ -1,6 +1,6 @@
 title: $:/config/OfficialPluginLibrary
 tags: $:/tags/PluginLibrary
-url: https://tiddlywiki.com/prerelease/library/v5.3.2/index.html
+url: https://tiddlywiki.com/prerelease/library/v5.3.3/index.html
 caption: {{$:/language/OfficialPluginLibrary}} (Prerelease)

 The prerelease version of the official ~TiddlyWiki plugin library at tiddlywiki.com. Plugins, themes and language packs are maintained by the core team.
--- a/editions/prerelease/tiddlers/system/configPerformanceInstrumentation.tid
+++ b/editions/prerelease/tiddlers/system/configPerformanceInstrumentation.tid
@ -0,0 +1,2 @@
+title: $:/config/Performance/Instrumentation
+text: yes
--- a/editions/prerelease/tiddlywiki.info
+++ b/editions/prerelease/tiddlywiki.info
@ -14,7 +14,10 @@
 		"tiddlywiki/dynannotate",
 		"tiddlywiki/codemirror",
 		"tiddlywiki/menubar",
-		"tiddlywiki/jszip"
+		"tiddlywiki/jszip",
+		"tiddlywiki/confetti",
+		"tiddlywiki/dynannotate",
+		"tiddlywiki/tour"
 	],
 	"themes": [
 		"tiddlywiki/vanilla",
--- a/editions/test/tiddlers/tests/data/functions/FunctionFilterrunVariables.tid
+++ b/editions/test/tiddlers/tests/data/functions/FunctionFilterrunVariables.tid
@ -0,0 +1,24 @@
+title: Functions/FunctionFilterrunVariables
+description: Functions in filter runs that set variables
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Idiosyncrasy
+caption: Idiosyncrasy Caption Field
+
+
+title: Output
+
+\whitespace trim
+\procedure demo-subfilter() [<currentTiddler>]
+\function .demo-function() [<currentTiddler>]
+
+<$let currentTiddler="Idiosyncrasy">
+<$text text={{{ [<currentTiddler>get[caption]!is[blank]else<currentTiddler>] :map[subfilter<demo-subfilter>] }}}/>,
+<$text text={{{ [<currentTiddler>get[caption]!is[blank]else<currentTiddler>] :map[.demo-function[]] }}}/>
+</$let>
+
+
+title: ExpectedResult
+
+<p>Idiosyncrasy Caption Field,Idiosyncrasy Caption Field</p>
--- a/editions/test/tiddlers/tests/data/functions/FunctionFilterrunVariables2.tid
+++ b/editions/test/tiddlers/tests/data/functions/FunctionFilterrunVariables2.tid
@ -0,0 +1,20 @@
+title: Functions/FunctionFilterrunVariables2
+description: Functions in filter runs that set variables
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Apple
+cost: 5
+
+
+title: Output
+
+\whitespace trim
+\function .doublecost() [<currentTiddler>get[cost]multiply[2]]
+
+<$text text={{{ [[Apple]] :map[.doublecost[]] }}}/>
+
+
+title: ExpectedResult
+
+10
--- a/editions/test/tiddlers/tests/data/importvariables/WithSetWidgets2.tid
+++ b/editions/test/tiddlers/tests/data/importvariables/WithSetWidgets2.tid
@ -12,6 +12,7 @@ title: Output
 +
 title: Definitions

+\whitespace trim
 <$set name="one" value="elephant">
 <$set name="two" value="giraffe">
 </$set>
--- a/editions/test/tiddlers/tests/data/importvariables/WithSetWidgetsAndMacros.tid
+++ b/editions/test/tiddlers/tests/data/importvariables/WithSetWidgetsAndMacros.tid
@ -14,6 +14,7 @@ title: Output
 +
 title: Definitions

+\whitespace trim
 \define name() Bugs Bunny
 \procedure address()
 Bunny Hill
--- a/editions/test/tiddlers/tests/data/list-widget/WithEmptyParagraphTemplate.tid
+++ b/editions/test/tiddlers/tests/data/list-widget/WithEmptyParagraphTemplate.tid
@ -0,0 +1,13 @@
+title: ListWidget/WithEmptyParagraphTemplate
+description: List widget with an empty paragraph as inline template
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+
+title: Output
+
+<$list filter="1"><p/></$list>
+
+title: ExpectedResult
+
+<p><p></p></p>
--- a/editions/test/tiddlers/tests/data/macros/EndInBody.tid
+++ b/editions/test/tiddlers/tests/data/macros/EndInBody.tid
@ -0,0 +1,16 @@
+title: Macros/EndInBody
+description: \end line starting with non-whitespace is part of macro body
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+\define hello()
+ hello \end
+\end
+
+Out: <<hello>>
+
+title: ExpectedResult
+
+<p>Out:  hello \end</p>
--- a/editions/test/tiddlers/tests/data/macros/IndentedEnd.tid
+++ b/editions/test/tiddlers/tests/data/macros/IndentedEnd.tid
@ -0,0 +1,16 @@
+title: Macros/IndentedEnd
+description: \end line starting with whitespace ends a macro body
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+\define hello()
+ hello \end
+  \end
+
+Out: <<hello>>
+
+title: ExpectedResult
+
+<p>Out:  hello \end</p>
--- a/editions/test/tiddlers/tests/data/macros/MismatchedNamedEnd.tid
+++ b/editions/test/tiddlers/tests/data/macros/MismatchedNamedEnd.tid
@ -0,0 +1,16 @@
+title: Macros/MismatchedNamedEnd
+description: Mismatched named end is part of the body
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+\define hello()
+ \end goodbye
+\end
+
+Out: <<hello>>
+
+title: ExpectedResult
+
+<p>Out:  \end goodbye</p>
--- a/editions/test/tiddlers/tests/data/macros/WhitespaceOnlyWithEnd.tid
+++ b/editions/test/tiddlers/tests/data/macros/WhitespaceOnlyWithEnd.tid
@ -0,0 +1,18 @@
+title: Macros/WhitespaceOnlyWithEnd
+description: The /end should be detected when macro definition contains only whitespace
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+\define max()
+\end
+Nothing
+\end
+
+Out: <<max>>
+
+title: ExpectedResult
+
+<p>Nothing
+\end</p><p>Out: </p>
--- a/editions/test/tiddlers/tests/data/macros/WhitespaceOnlyWithEnd2.tid
+++ b/editions/test/tiddlers/tests/data/macros/WhitespaceOnlyWithEnd2.tid
@ -0,0 +1,15 @@
+title: Macros/WhitespaceOnlyWithEnd2
+description: Line with \end can start with whitespace
+type: text/vnd.tiddlywiki-multiple
+tags: [[$:/tags/wiki-test-spec]]
+
+title: Output
+
+\define empty()
+ \end
+
+Out: <<empty>>
+
+title: ExpectedResult
+
+<p>Out: </p>
--- a/editions/test/tiddlers/tests/data/macros/nested-macros/NestedMacros-indented.tid
+++ b/editions/test/tiddlers/tests/data/macros/nested-macros/NestedMacros-indented.tid
--- a/editions/test/tiddlers/tests/data/macros/nested-macros/NestedMacros-indented2.tid
+++ b/editions/test/tiddlers/tests/data/macros/nested-macros/NestedMacros-indented2.tid
--- a/Show More
+++ b/Show More