Merge branch 'master' into confetti-plugin

WIP
Extends the tour plugin with a condition field (#7861 )
2026-01-22 19:04:38 +00:00 · 2024-01-25 12:52:27 +00:00 · 2024-01-25 12:52:17 +00:00 · 2023-12-06 11:13:48 +00:00 · 2023-10-24 12:52:24 +01:00 · 2023-10-19 08:59:07 +01:00
651 changed files with 3928 additions and 30155 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,3 @@ node_modules/
 /test-results/
 /playwright-report/
 /playwright/.cache/
-$__StoryList.tid
--- a/bin/build-site.sh
+++ b/bin/build-site.sh
@@ -393,17 +393,6 @@ node $TW5_BUILD_TIDDLYWIKI \
 	--rendertiddler $:/core/save/empty plugins/tiddlywiki/highlight/empty.html text/plain \
 	|| exit 1

-# /plugins/tiddlywiki/geospatial/index.html		Demo wiki with geospatial plugin
-# /plugins/tiddlywiki/geospatial/empty.html		Empty wiki with geospatial plugin
-node $TW5_BUILD_TIDDLYWIKI \
-	./editions/geospatialdemo \
-	--verbose \
-	--load $TW5_BUILD_OUTPUT/build.tid \
-	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all plugins/tiddlywiki/geospatial/index.html text/plain \
-	--rendertiddler $:/core/save/empty plugins/tiddlywiki/geospatial/empty.html text/plain \
-	|| exit 1
-
 ######################################################
 #
 # Language editions
--- a/boot/boot.js
+++ b/boot/boot.js
@@ -142,15 +142,15 @@ $tw.utils.each = function(object,callback) {
 	var next,f,length;
 	if(object) {
 		if(Object.prototype.toString.call(object) == "[object Array]") {
-			for(f=0, length=object.length; f<length; f++) {
+			for (f=0, length=object.length; f<length; f++) {
 				next = callback(object[f],f,object);
 				if(next === false) {
 					break;
 				}
-			}
+		    }
 		} else {
 			var keys = Object.keys(object);
-			for(f=0, length=keys.length; f<length; f++) {
+			for (f=0, length=keys.length; f<length; f++) {
 				var key = keys[f];
 				next = callback(object[key],key,object);
 				if(next === false) {
@@ -177,7 +177,6 @@ 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"]) {
@@ -219,34 +218,9 @@ $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"}),
-			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"});
+			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"});
 		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();
@@ -275,7 +249,7 @@ Extend an object with the properties from a list of source objects
 $tw.utils.extend = function(object /*, sourceObjectList */) {
 	$tw.utils.each(Array.prototype.slice.call(arguments,1),function(source) {
 		if(source) {
-			for(var p in source) {
+			for (var p in source) {
 				object[p] = source[p];
 			}
 		}
@@ -289,7 +263,7 @@ Fill in any null or undefined properties of an object with the properties from a
 $tw.utils.deepDefaults = function(object /*, sourceObjectList */) {
 	$tw.utils.each(Array.prototype.slice.call(arguments,1),function(source) {
 		if(source) {
-			for(var p in source) {
+			for (var p in source) {
 				if(object[p] === null || object[p] === undefined) {
 					object[p] = source[p];
 				}
@@ -812,7 +786,6 @@ $tw.utils.Crypto = function() {
 			}
 			return outputText;
 		};
-	$tw.sjcl = sjcl;
 	this.setPassword = function(newPassword) {
 		currentPassword = newPassword;
 		this.updateCryptoStateTiddler();
@@ -893,8 +866,8 @@ $tw.modules.execute = function(moduleName,moduleRoot) {
 	} else {
 		/*
 		CommonJS optional require.main property:
-			In a browser we offer a fake main module which points back to the boot function
-			(Theoretically, this may allow TW to eventually load itself as a module in the browser)
+		 In a browser we offer a fake main module which points back to the boot function
+		 (Theoretically, this may allow TW to eventually load itself as a module in the browser)
 		*/
 		Object.defineProperty(sandbox.require, "main", {
 			value: (typeof(require) !== "undefined") ? require.main : {TiddlyWiki: _boot},
@@ -936,9 +909,9 @@ $tw.modules.execute = function(moduleName,moduleRoot) {
 				moduleInfo.exports = moduleInfo.definition;
 			}
 		} catch(e) {
-			if(e instanceof SyntaxError) {
+			if (e instanceof SyntaxError) {
 				var line = e.lineNumber || e.line; // Firefox || Safari
-				if(typeof(line) != "undefined" && line !== null) {
+				if (typeof(line) != "undefined" && line !== null) {
 					$tw.utils.error("Syntax error in boot module " + name + ":" + line + ":\n" + e.stack);
 				} else if(!$tw.browser) {
 					// this is the only way to get node.js to display the line at which the syntax error appeared,
@@ -1533,7 +1506,7 @@ Define all modules stored in ordinary tiddlers
 $tw.Wiki.prototype.defineTiddlerModules = function() {
 	this.each(function(tiddler,title) {
 		if(tiddler.hasField("module-type")) {
-			switch(tiddler.fields.type) {
+			switch (tiddler.fields.type) {
 				case "application/javascript":
 					// We only define modules that haven't already been defined, because in the browser modules in system tiddlers are defined in inline script
 					if(!$tw.utils.hop($tw.modules.titles,tiddler.fields.title)) {
@@ -1994,10 +1967,10 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
 					var value = tiddler[name];
 					switch(fieldInfo.source) {
 						case "subdirectories":
-							value = path.relative(rootPath, filename).split(path.sep).slice(0, -1);
+							value = path.relative(rootPath, filename).split('/').slice(0, -1);
 							break;
 						case "filepath":
-							value = path.relative(rootPath, filename).split(path.sep).join('/');
+							value = path.relative(rootPath, filename);
 							break;
 						case "filename":
 							value = path.basename(filename);
@@ -2043,7 +2016,7 @@ $tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
 		arrayOfFiles = arrayOfFiles || [];
 		var files = fs.readdirSync(dirPath);
 		files.forEach(function(file) {
-			if(recurse && fs.statSync(dirPath + path.sep + file).isDirectory()) {
+			if (recurse && fs.statSync(dirPath + path.sep + file).isDirectory()) {
 				arrayOfFiles = getAllFiles(dirPath + path.sep + file, recurse, arrayOfFiles);
 			} else if(fs.statSync(dirPath + path.sep + file).isFile()){
 				arrayOfFiles.push(path.join(dirPath, path.sep, file));
@@ -2188,16 +2161,13 @@ Returns an array of search paths
 */
 $tw.getLibraryItemSearchPaths = function(libraryPath,envVar) {
 	var pluginPaths = [path.resolve($tw.boot.corePath,libraryPath)],
-		env;
-	if(envVar) {
 		env = process.env[envVar];
-		if(env) {
-			env.split(path.delimiter).map(function(item) {
-				if(item) {
-					pluginPaths.push(item);
-				}
-			});
-		}
+	if(env) {
+		env.split(path.delimiter).map(function(item) {
+			if(item) {
+				pluginPaths.push(item);
+			}
+		});
 	}
 	return pluginPaths;
 };
@@ -2283,7 +2253,7 @@ $tw.loadWikiTiddlers = function(wikiPath,options) {
 		}
 		$tw.wiki.addTiddlers(tiddlerFile.tiddlers);
 	});
-	if($tw.boot.wikiPath == wikiPath) {
+	if ($tw.boot.wikiPath == wikiPath) {
 		// Save the original tiddler file locations if requested
 		var output = {}, relativePath, fileInfo;
 		for(var title in $tw.boot.files) {
@@ -2468,7 +2438,6 @@ $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");
@@ -2483,12 +2452,8 @@ $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");
@@ -2637,14 +2602,14 @@ $tw.boot.doesTaskMatchPlatform = function(taskModule) {
 	var platforms = taskModule.platforms;
 	if(platforms) {
 		for(var t=0; t<platforms.length; t++) {
-			switch(platforms[t]) {
+			switch (platforms[t]) {
 				case "browser":
-					if($tw.browser) {
+					if ($tw.browser) {
 						return true;
 					}
 					break;
 				case "node":
-					if($tw.node) {
+					if ($tw.node) {
 						return true;
 					}
 					break;
@@ -2727,7 +2692,7 @@ Invoke the hook by key
 $tw.hooks.invokeHook = function(hookName /*, value,... */) {
 	var args = Array.prototype.slice.call(arguments,1);
 	if($tw.utils.hop($tw.hooks.names,hookName)) {
-		for(var i = 0; i < $tw.hooks.names[hookName].length; i++) {
+		for (var i = 0; i < $tw.hooks.names[hookName].length; i++) {
 			args[0] = $tw.hooks.names[hookName][i].apply(null,args);
 		}
 	}
--- a/boot/sjcl.js.meta
+++ b/boot/sjcl.js.meta
@@ -0,0 +1,3 @@
+title: $:/library/sjcl.js
+type: application/javascript
+library: yes
--- a/boot/tiddlywiki.files
+++ b/boot/tiddlywiki.files
@@ -1,32 +0,0 @@
-{
-	"tiddlers": [
-		{
-			"file": "sjcl.js",
-			"fields": {
-				"title": "$:/library/sjcl.js",
-				"type": "application/javascript",
-				"library": "yes"
-			},
-			"prefix": "(function(define) {\n",
-			"suffix": "\n})(function (_,defined){window.sjcl = defined()})\n"
-		},
-		{
-			"file": "boot.js",
-			"fields": {
-				"title": "$:/boot/boot.js",
-				"type": "application/javascript"
-			}
-		},
-		{
-			"file": "bootprefix.js",
-			"fields": {
-				"title": "$:/boot/bootprefix.js",
-				"type": "application/javascript"
-			}
-		},
-		{
-			"file": "boot.css.tid",
-			"isTiddlerFile": true
-		}
-	]
-}
--- a/core/images/standard-layout.tid
+++ b/core/images/standard-layout.tid
@@ -1,7 +0,0 @@
-title: $:/core/images/standard-layout
-tags: $:/tags/Image
-
-\parameters (size:"22pt")
-<svg width=<<size>> height=<<size>> class="tc-image-standard-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,7 +28,6 @@ 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/ControlPanel.multids
+++ b/core/language/en-GB/ControlPanel.multids
@@ -206,12 +206,6 @@ Stylesheets/Caption: Stylesheets
 Stylesheets/Expand/Caption: Expand All
 Stylesheets/Hint: This is the rendered CSS of the current stylesheet tiddlers tagged with <<tag "$:/tags/Stylesheet">>
 Stylesheets/Restore/Caption: Restore
-TestCases/Caption: Test Cases
-TestCases/Hint: Test cases are self contained examples for testing and learning
-TestCases/All/Caption: All Test Cases
-TestCases/All/Hint: All Test Cases
-TestCases/Failed/Caption: Failed Test Cases
-TestCases/Failed/Hint: Only Failed Test Cases
 Theme/Caption: Theme
 Theme/Prompt: Current theme:
 TiddlerFields/Caption: Tiddler Fields
--- 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: Parameters for the ''is'' filter operator.
+isfilteroperator: Operands 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/Docs/PaletteColours.multids
+++ b/core/language/en-GB/Docs/PaletteColours.multids
@@ -65,9 +65,6 @@ sidebar-tab-foreground-selected: Sidebar tab foreground for selected tabs
 sidebar-tab-foreground: Sidebar tab foreground
 sidebar-tiddler-link-foreground-hover: Sidebar tiddler link foreground hover
 sidebar-tiddler-link-foreground: Sidebar tiddler link foreground
-testcase-accent-level-1: Test case accent colour with no nesting
-testcase-accent-level-2: Test case accent colour with 2nd level nesting
-testcase-accent-level-3: Test case accent colour with 3rd level nesting or higher
 site-title-foreground: Site title foreground
 static-alert-foreground: Static alert foreground
 tab-background-selected: Tab background for selected tabs
--- a/core/language/en-GB/Fields.multids
+++ b/core/language/en-GB/Fields.multids
@@ -30,7 +30,6 @@ name: The human readable name associated with a plugin tiddler
 parent-plugin: For a plugin, specifies which plugin of which it is a sub-plugin
 plugin-priority: A numerical value indicating the priority of a plugin tiddler
 plugin-type: The type of plugin in a plugin tiddler
-stability: The development status of a plugin: deprecated, experimental, stable, or legacy
 revision: The revision of the tiddler held at the server
 released: Date of a TiddlyWiki release
 source: The source URL associated with a tiddler
--- 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 parameter for the 'is' filter operator
+Error/IsFilterOperator: Filter Error: Unknown operand 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''.`
@@ -70,7 +70,7 @@ No: No
 OfficialPluginLibrary: Official ~TiddlyWiki Plugin Library
 OfficialPluginLibrary/Hint: The official ~TiddlyWiki plugin library at tiddlywiki.com. Plugins, themes and language packs are maintained by the core team.
 PageTemplate/Description: the default ~TiddlyWiki layout
-PageTemplate/Name: Standard Layout
+PageTemplate/Name: Default ~PageTemplate
 PluginReloadWarning: Please save {{$:/core/ui/Buttons/save-wiki}} and reload {{$:/core/ui/Buttons/refresh}} to allow changes to ~JavaScript plugins to take effect
 RecentChanges/DateFormat: DDth MMM YYYY
 Shortcuts/Input/AdvancedSearch/Hint: Open the ~AdvancedSearch panel from within the sidebar search field
--- a/core/modules/commands/fetch.js
+++ b/core/modules/commands/fetch.js
@@ -120,7 +120,7 @@ Command.prototype.fetchFile = function(url,options,callback,redirectCount) {
 	        }
 	   	});
 	   	response.on("error",function(e) {
-			self.commander.log("Error on GET request: " + e);
+			console.log("Error on GET request: " + e);
 			callback(e);
 	   	});
 	});
--- 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/makelibrary.js
+++ b/core/modules/commands/makelibrary.js
@@ -27,8 +27,33 @@ var Command = function(params,commander,callback) {

 Command.prototype.execute = function() {
 	var wiki = this.commander.wiki,
+		fs = require("fs"),
+		path = require("path"),
 		upgradeLibraryTitle = this.params[0] || UPGRADE_LIBRARY_TITLE,
-		tiddlers = $tw.utils.getAllPlugins();
+		tiddlers = {};
+	// Collect up the library plugins
+	var collectPlugins = function(folder) {
+			var pluginFolders = $tw.utils.getSubdirectories(folder) || [];
+			for(var p=0; p<pluginFolders.length; p++) {
+				if(!$tw.boot.excludeRegExp.test(pluginFolders[p])) {
+					pluginFields = $tw.loadPluginFolder(path.resolve(folder,"./" + pluginFolders[p]));
+					if(pluginFields && pluginFields.title) {
+						tiddlers[pluginFields.title] = pluginFields;
+					}
+				}
+			}
+		},
+		collectPublisherPlugins = function(folder) {
+			var publisherFolders = $tw.utils.getSubdirectories(folder) || [];
+			for(var t=0; t<publisherFolders.length; t++) {
+				if(!$tw.boot.excludeRegExp.test(publisherFolders[t])) {
+					collectPlugins(path.resolve(folder,"./" + publisherFolders[t]));
+				}
+			}
+		};
+	$tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.pluginsPath,$tw.config.pluginsEnvVar),collectPublisherPlugins);
+	$tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.themesPath,$tw.config.themesEnvVar),collectPublisherPlugins);
+	$tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.languagesPath,$tw.config.languagesEnvVar),collectPlugins);
 	// Save the upgrade library tiddler
 	var pluginFields = {
 		title: upgradeLibraryTitle,
--- a/core/modules/commands/render.js
+++ b/core/modules/commands/render.js
@@ -47,7 +47,7 @@ Render individual tiddlers and save the results to the specified files
 		$tw.utils.each(tiddlers,function(title) {
 			var filepath = path.resolve(self.commander.outputPath,wiki.filterTiddlers(filenameFilter,$tw.rootWidget,wiki.makeTiddlerIterator([title]))[0]);
 			if(self.commander.verbose) {
-				self.commander.log("Rendering \"" + title + "\" to \"" + filepath + "\"");
+				console.log("Rendering \"" + title + "\" to \"" + filepath + "\"");
 			}
 			var parser = wiki.parseTiddler(template || title),
 				widgetNode = wiki.makeWidget(parser,{variables: $tw.utils.extend({},variables,{currentTiddler: title,storyTiddler: title})}),
@@ -63,4 +63,4 @@ Render individual tiddlers and save the results to the specified files
 	exports.Command = Command;
 	
 	})();
-	
+	
--- a/core/modules/commands/save.js
+++ b/core/modules/commands/save.js
@@ -43,12 +43,10 @@ Saves individual tiddlers in their raw text or binary format to the specified fi
 						directory: path.resolve(self.commander.outputPath),
 						pathFilters: [filenameFilter],
 						wiki: wiki,
-						fileInfo: {
-							overwrite: true
-						}
+						fileInfo: {}
 					});
 					if(self.commander.verbose) {
-						self.commander.log("Saving \"" + title + "\" to \"" + filepath + "\"");
+						console.log("Saving \"" + title + "\" to \"" + fileInfo.filepath + "\"");
 					}
 					try {
 						$tw.utils.saveTiddlerToFileSync(tiddler,fileInfo);
--- a/core/modules/commands/savewikifolder.js
+++ b/core/modules/commands/savewikifolder.js
@@ -176,10 +176,7 @@ WikiFolderMaker.prototype.saveCustomPlugin = function(pluginTiddler) {
 	this.saveJSONFile(directory + path.sep + "plugin.info",pluginInfo);
 	self.log("Writing " + directory + path.sep + "plugin.info: " + JSON.stringify(pluginInfo,null,$tw.config.preferences.jsonSpaces));
 	var pluginTiddlers = $tw.utils.parseJSONSafe(pluginTiddler.fields.text).tiddlers; // A hashmap of tiddlers in the plugin
-	$tw.utils.each(pluginTiddlers,function(tiddler,title) {
-		if(!tiddler.title) {
-			tiddler.title = title;
-		 }
+	$tw.utils.each(pluginTiddlers,function(tiddler) {
 		self.saveTiddler(directory,new $tw.Tiddler(tiddler));
 	});
 };
--- a/core/modules/filters/backtranscludes.js
+++ b/core/modules/filters/backtranscludes.js
@@ -1,26 +0,0 @@
-/*\
-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,9 +14,12 @@ Filter operators for cryptography, using the Stanford JavaScript library

 exports.sha256 = function(source,operator,options) {
 	var results = [],
-		length = parseInt(operator.operand,10) || 20;
+		length = parseInt(operator.operand,10) || 20,
+		sha256 = function(text) {
+			return sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(text)).substr(0,length);
+		};
 	source(function(tiddler,title) {
-		results.push($tw.utils.sha256(title,{length: length}));
+		results.push(sha256(title));
 	});
 	return results;
 };
--- a/core/modules/filters/transcludes.js
+++ b/core/modules/filters/transcludes.js
@@ -1,26 +0,0 @@
-/*\
-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/filters/x-listops.js
+++ b/core/modules/filters/x-listops.js
@@ -202,7 +202,7 @@ Extended filter operators to manipulate the current list.
 		}
 		if(resultsIndex !== -1) {
 			i = i + step;
-			nextOperandIndex = (i < opLength ? i : i % opLength);
+			nextOperandIndex = (i < opLength ? i : i - opLength);
 			if(operands.length > 1) {
 				results.splice(resultsIndex,1,operands[nextOperandIndex]);
 			} else {
--- a/core/modules/indexers/back-indexer.js
+++ b/core/modules/indexers/back-indexer.js
@@ -1,122 +0,0 @@
-/*\
-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) {
-	if(this.wiki.isBinaryTiddler(tiddler.fields.text)) {
-		return [];
-	}
-	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
@@ -0,0 +1,86 @@
+/*\
+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,11 +35,9 @@ exports.run = function(filter,format) {
 	// Collect all the fields
 	for(t=0;t<tiddlers.length; t++) {
 		tiddler = this.wiki.getTiddler(tiddlers[t]);
-		if(tiddler) {
-			for(f in tiddler.fields) {
-				if(fields.indexOf(f) === -1) {
-					fields.push(f);
-				}
+		for(f in tiddler.fields) {
+			if(fields.indexOf(f) === -1) {
+				fields.push(f);
 			}
 		}
 	}
@@ -62,10 +60,8 @@ exports.run = function(filter,format) {
 	for(var t=0;t<tiddlers.length; t++) {
 		row = [];
 		tiddler = this.wiki.getTiddler(tiddlers[t]);
-			if(tiddler) {
-				for(f=0; f<fields.length; f++) {
-					row.push(quoteAndEscape(tiddler ? tiddler.getFieldString(fields[f]) || "" : ""));
-				}	
+			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/quoteblock.js
+++ b/core/modules/parsers/wikiparser/rules/quoteblock.js
@@ -3,7 +3,30 @@ title: $:/core/modules/parsers/wikiparser/rules/quoteblock.js
 type: application/javascript
 module-type: wikirule

-Wiki text rule for quote blocks.
+Wiki text rule for quote blocks. For example:
+
+```
+	<<<.optionalClass(es) optional cited from
+	a quote
+	<<<
+	
+	<<<.optionalClass(es)
+	a quote
+	<<< optional cited from
+```
+
+Quotes can be quoted by putting more <s
+
+```
+	<<<
+	Quote Level 1
+	
+	<<<<
+	QuoteLevel 2
+	<<<<
+	
+	<<<
+```

 \*/
 (function(){
@@ -24,15 +47,16 @@ exports.init = function(parser) {
 exports.parse = function() {
 	var classes = ["tc-quote"];
 	// Get all the details of the match
-	var reEndString = "^\\s*" + this.match[1] + "(?!<)";
+	var reEndString = "^" + this.match[1] + "(?!<)";
 	// Move past the <s
 	this.parser.pos = this.matchRegExp.lastIndex;
+	
 	// Parse any classes, whitespace and then the optional cite itself
 	classes.push.apply(classes, this.parser.parseClasses());
 	this.parser.skipWhitespace({treatNewlinesAsNonWhitespace: true});
 	var cite = this.parser.parseInlineRun(/(\r?\n)/mg);
 	// before handling the cite, parse the body of the quote
-	var tree = this.parser.parseBlocks(reEndString);
+	var tree= this.parser.parseBlocks(reEndString);
 	// If we got a cite, put it before the text
 	if(cite.length > 0) {
 		tree.unshift({
--- a/core/modules/server/server.js
+++ b/core/modules/server/server.js
@@ -33,13 +33,7 @@ function Server(options) {
 	this.routes = options.routes || [];
 	this.authenticators = options.authenticators || [];
 	this.wiki = options.wiki;
-	this.logger = new $tw.utils.Logger("server",{colour: "cyan"});
-	this.logger.setPrefix(":" + process.pid + "-" + (Number(new Date()) - 1095776640000));
 	this.boot = options.boot || $tw.boot;
-	// Name the server and init the boot state
-	this.servername = $tw.utils.transliterateToSafeASCII(this.get("server-name") || this.wiki.getTiddlerText("$:/SiteTitle") || "TiddlyWiki5");
-	this.boot.origin = this.get("origin")? this.get("origin"): this.protocol+"://"+this.get("host")+":"+this.get("port");
-	this.boot.pathPrefix = this.get("path-prefix") || "";
 	// Initialise the variables
 	this.variables = $tw.utils.extend({},this.defaultVariables);
 	if(options.variables) {
@@ -98,6 +92,10 @@ function Server(options) {
 		this.protocol = "https";
 	}
 	this.transport = require(this.protocol);
+	// Name the server and init the boot state
+	this.servername = $tw.utils.transliterateToSafeASCII(this.get("server-name") || this.wiki.getTiddlerText("$:/SiteTitle") || "TiddlyWiki5");
+	this.boot.origin = this.get("origin")? this.get("origin"): this.protocol+"://"+this.get("host")+":"+this.get("port");
+	this.boot.pathPrefix = this.get("path-prefix") || "";
 }

 /*
@@ -142,11 +140,6 @@ function sendResponse(request,response,statusCode,headers,data,encoding) {
 				return;
 			}
 		}
-	} else {
-		// RFC 7231, 6.1. Overview of Status Codes:
-		// Browser clients may cache 200, 203, 204, 206, 300, 301, 
-		// 404, 405, 410, 414, and 501 unless given explicit cache controls
-		headers["Cache-Control"] = headers["Cache-Control"] || "no-store";
 	}
 	/*
 	If the gzip=yes is set, check if the user agent permits compression. If so,
@@ -289,9 +282,9 @@ Server.prototype.requestHandler = function(request,response,options) {
 	var route = self.findMatchingRoute(request,state);
 	// Optionally output debug info
 	if(self.get("debug-level") !== "none") {
-		self.logger.log("Request path:",JSON.stringify(state.urlInfo.href));
-		self.logger.log("Request headers:",JSON.stringify(request.headers));
-		self.logger.log("authenticatedUsername:",state.authenticatedUsername);
+		console.log("Request path:",JSON.stringify(state.urlInfo));
+		console.log("Request headers:",JSON.stringify(request.headers));
+		console.log("authenticatedUsername:",state.authenticatedUsername);
 	}
 	// Return a 404 if we didn't find a route
 	if(!route) {
--- a/core/modules/startup/render.js
+++ b/core/modules/startup/render.js
@@ -29,11 +29,7 @@ var THROTTLE_REFRESH_TIMEOUT = 400;

 exports.startup = function() {
 	// Set up the title
-	$tw.titleWidgetNode = $tw.wiki.makeTranscludeWidget(PAGE_TITLE_TITLE, {
-		document: $tw.fakeDocument,
-		parseAsInline: true,
-		importPageMacros: true,
-	});
+	$tw.titleWidgetNode = $tw.wiki.makeTranscludeWidget(PAGE_TITLE_TITLE,{document: $tw.fakeDocument, parseAsInline: true});
 	$tw.titleContainer = $tw.fakeDocument.createElement("div");
 	$tw.titleWidgetNode.render($tw.titleContainer,null);
 	document.title = $tw.titleContainer.textContent;
@@ -85,8 +81,6 @@ exports.startup = function() {
 		deferredChanges = Object.create(null);
 		$tw.hooks.invokeHook("th-page-refreshed");
 	}
-	var throttledRefresh = $tw.perf.report("throttledRefresh",refresh);
-
 	// Add the change event handler
 	$tw.wiki.addEventListener("change",$tw.perf.report("mainRefresh",function(changes) {
 		// Check if only tiddlers that are throttled have changed
@@ -107,7 +101,7 @@ exports.startup = function() {
 			if(isNaN(timeout)) {
 				timeout = THROTTLE_REFRESH_TIMEOUT;
 			}
-			timerId = setTimeout(throttledRefresh,timeout);
+			timerId = setTimeout(refresh,timeout);
 			$tw.utils.extend(deferredChanges,changes);
 		} else {
 			$tw.utils.extend(deferredChanges,changes);
--- a/core/modules/startup/rootwidget.js
+++ b/core/modules/startup/rootwidget.js
@@ -39,7 +39,6 @@ exports.startup = function() {
 			method: params.method,
 			body: params.body,
 			binary: params.binary,
-			useDefaultHeaders: params.useDefaultHeaders,
 			oncompletion: params.oncompletion,
 			onprogress: params.onprogress,
 			bindStatus: params["bind-status"],
@@ -48,11 +47,7 @@ exports.startup = function() {
 			headers: getPropertiesWithPrefix(params,"header-"),
 			passwordHeaders: getPropertiesWithPrefix(params,"password-header-"),
 			queryStrings: getPropertiesWithPrefix(params,"query-"),
-			passwordQueryStrings: getPropertiesWithPrefix(params,"password-query-"),
-			basicAuthUsername: params["basic-auth-username"],
-			basicAuthUsernameFromStore: params["basic-auth-username-from-store"],
-			basicAuthPassword: params["basic-auth-password"],
-			basicAuthPasswordFromStore: params["basic-auth-password-from-store"]
+			passwordQueryStrings: getPropertiesWithPrefix(params,"password-query-")
 		});
 	});
 	$tw.rootWidget.addEventListener("tm-http-cancel-all-requests",function(event) {
@@ -73,10 +68,7 @@ exports.startup = function() {
 	});
 	// Install the copy-to-clipboard  mechanism
 	$tw.rootWidget.addEventListener("tm-copy-to-clipboard",function(event) {
-		$tw.utils.copyToClipboard(event.param,{
-			successNotification: event.paramObject && event.paramObject.successNotification,
-			failureNotification: event.paramObject && event.paramObject.failureNotification
-		});
+		$tw.utils.copyToClipboard(event.param);
 	});
 	// Install the tm-focus-selector message
 	$tw.rootWidget.addEventListener("tm-focus-selector",function(event) {
--- a/core/modules/startup/story.js
+++ b/core/modules/startup/story.js
@@ -93,9 +93,7 @@ exports.startup = function() {
 				updateAddressBar: $tw.wiki.getTiddlerText(CONFIG_PERMALINKVIEW_UPDATE_ADDRESS_BAR,"yes").trim() === "yes" ? "permalink" : "none",
 				updateHistory: $tw.wiki.getTiddlerText(CONFIG_UPDATE_HISTORY,"no").trim(),
 				targetTiddler: event.param || event.tiddlerTitle,
-				copyToClipboard: $tw.wiki.getTiddlerText(CONFIG_PERMALINKVIEW_COPY_TO_CLIPBOARD,"yes").trim() === "yes" ? "permalink" : "none",
-				successNotification: event.paramObject && event.paramObject.successNotification,
-				failureNotification: event.paramObject && event.paramObject.failureNotification
+				copyToClipboard: $tw.wiki.getTiddlerText(CONFIG_PERMALINKVIEW_COPY_TO_CLIPBOARD,"yes").trim() === "yes" ? "permalink" : "none"
 			});
 		});
 		// Listen for the tm-permaview message
@@ -104,9 +102,7 @@ exports.startup = function() {
 				updateAddressBar: $tw.wiki.getTiddlerText(CONFIG_PERMALINKVIEW_UPDATE_ADDRESS_BAR,"yes").trim() === "yes" ? "permaview" : "none",
 				updateHistory: $tw.wiki.getTiddlerText(CONFIG_UPDATE_HISTORY,"no").trim(),
 				targetTiddler: event.param || event.tiddlerTitle,
-				copyToClipboard: $tw.wiki.getTiddlerText(CONFIG_PERMALINKVIEW_COPY_TO_CLIPBOARD,"yes").trim() === "yes" ? "permaview" : "none",
-				successNotification: event.paramObject && event.paramObject.successNotification,
-				failureNotification: event.paramObject && event.paramObject.failureNotification
+				copyToClipboard: $tw.wiki.getTiddlerText(CONFIG_PERMALINKVIEW_COPY_TO_CLIPBOARD,"yes").trim() === "yes" ? "permaview" : "none"
 			});
 		});
 	}
@@ -181,8 +177,6 @@ options.updateAddressBar: "permalink", "permaview" or "no" (defaults to "permavi
 options.updateHistory: "yes" or "no" (defaults to "no")
 options.copyToClipboard: "permalink", "permaview" or "no" (defaults to "no")
 options.targetTiddler: optional title of target tiddler for permalink
-options.successNotification: optional title of tiddler to use as the notification in case of success
-options.failureNotification: optional title of tiddler to use as the notification in case of failure
 */
 function updateLocationHash(options) {
 	// Get the story and the history stack
@@ -211,18 +205,14 @@ function updateLocationHash(options) {
 			break;
 	}
 	// Copy URL to the clipboard
-	var url = "";
 	switch(options.copyToClipboard) {
 		case "permalink":
-			url = $tw.utils.getLocationPath() + "#" + encodeURIComponent(targetTiddler);
+			$tw.utils.copyToClipboard($tw.utils.getLocationPath() + "#" + encodeURIComponent(targetTiddler));
 			break;
 		case "permaview":
-			url = $tw.utils.getLocationPath() + "#" + encodeURIComponent(targetTiddler) + ":" + encodeURIComponent($tw.utils.stringifyList(storyList));
+			$tw.utils.copyToClipboard($tw.utils.getLocationPath() + "#" + encodeURIComponent(targetTiddler) + ":" + encodeURIComponent($tw.utils.stringifyList(storyList)));
 			break;
 	}
-	if(url) {
-		$tw.utils.copyToClipboard(url,{successNotification: options.successNotification, failureNotification: options.failureNotification});
-	}
 	// Only change the location hash if we must, thus avoiding unnecessary onhashchange events
 	if($tw.utils.getLocationHash() !== $tw.locationHash) {
 		if(options.updateHistory === "yes") {
--- a/core/modules/startup/windows.js
+++ b/core/modules/startup/windows.js
@@ -56,7 +56,7 @@ exports.startup = function() {
 			return;
 		}
 		// Initialise the document
-		srcDocument.write("<!DOCTYPE html><head></head><body class='tc-body tc-single-tiddler-window'></body></html>");
+		srcDocument.write("<html><head></head><body class='tc-body tc-single-tiddler-window'></body></html>");
 		srcDocument.close();
 		srcDocument.title = windowTitle;
 		srcWindow.addEventListener("beforeunload",function(event) {
--- a/core/modules/utils/dom/dom.js
+++ b/core/modules/utils/dom/dom.js
@@ -292,9 +292,7 @@ exports.copyToClipboard = function(text,options) {
 	} catch (err) {
 	}
 	if(!options.doNotNotify) {
-		var successNotification = options.successNotification || "$:/language/Notifications/CopiedToClipboard/Succeeded",
-			failureNotification = options.failureNotification || "$:/language/Notifications/CopiedToClipboard/Failed"
-		$tw.notifier.display(succeeded ? successNotification : failureNotification);
+		$tw.notifier.display(succeeded ? "$:/language/Notifications/CopiedToClipboard/Succeeded" : "$:/language/Notifications/CopiedToClipboard/Failed");
 	}
 	document.body.removeChild(textArea);
 };
--- a/core/modules/utils/dom/http.js
+++ b/core/modules/utils/dom/http.js
@@ -69,7 +69,7 @@ HttpClient.prototype.cancelAllHttpRequests = function() {
 		for(var t=this.requests.length - 1; t--; t>=0) {
 			var requestInfo = this.requests[t];
 			requestInfo.request.cancel();
-		}
+		}	
 	}
 	this.requests = [];
 	this.updateRequestTracker();
@@ -100,10 +100,6 @@ headers: hashmap of header name to header value to be sent with the request
 passwordHeaders: hashmap of header name to password store name to be sent with the request
 queryStrings: hashmap of query string parameter name to parameter value to be sent with the request
 passwordQueryStrings: hashmap of query string parameter name to password store name to be sent with the request
-basicAuthUsername: plain username for basic authentication
-basicAuthUsernameFromStore: name of password store entry containing username
-basicAuthPassword: plain password for basic authentication
-basicAuthPasswordFromStore: name of password store entry containing password
 */
 function HttpClientRequest(options) {
 	var self = this;
@@ -116,7 +112,6 @@ function HttpClientRequest(options) {
 	this.method = options.method || "GET";
 	this.body = options.body || "";
 	this.binary = options.binary || "";
-	this.useDefaultHeaders = options.useDefaultHeaders !== "false" ? true : false,
 	this.variables = options.variables;
 	var url = options.url;
 	$tw.utils.each(options.queryStrings,function(value,name) {
@@ -133,11 +128,6 @@ function HttpClientRequest(options) {
 	$tw.utils.each(options.passwordHeaders,function(value,name) {
 		self.requestHeaders[name] = $tw.utils.getPassword(value) || "";
 	});
-	this.basicAuthUsername = options.basicAuthUsername || (options.basicAuthUsernameFromStore && $tw.utils.getPassword(options.basicAuthUsernameFromStore)) || "";
-	this.basicAuthPassword = options.basicAuthPassword || (options.basicAuthPasswordFromStore && $tw.utils.getPassword(options.basicAuthPasswordFromStore)) || "";
-	if(this.basicAuthUsername && this.basicAuthPassword) {
-		this.requestHeaders.Authorization = "Basic " + $tw.utils.base64Encode(this.basicAuthUsername + ":" + this.basicAuthPassword);
-	}
 }

 HttpClientRequest.prototype.send = function(callback) {
@@ -166,7 +156,6 @@ HttpClientRequest.prototype.send = function(callback) {
 		this.xhr = $tw.utils.httpRequest({
 			url: this.url,
 			type: this.method,
-			useDefaultHeaders: this.useDefaultHeaders,
 			headers: this.requestHeaders,
 			data: this.body,
 			returnProp: this.binary === "" ? "responseText" : "response",
@@ -242,8 +231,7 @@ Make an HTTP request. Options are:
 exports.httpRequest = function(options) {
 	var type = options.type || "GET",
 		url = options.url,
-		useDefaultHeaders = options.useDefaultHeaders !== false ? true : false,
-		headers = options.headers || (useDefaultHeaders ? {accept: "application/json"} : {}),
+		headers = options.headers || {accept: "application/json"},
 		hasHeader = function(targetHeader) {
 			targetHeader = targetHeader.toLowerCase();
 			var result = false;
@@ -269,7 +257,7 @@ exports.httpRequest = function(options) {
 			if(hasHeader("Content-Type") && ["application/x-www-form-urlencoded","multipart/form-data","text/plain"].indexOf(getHeader["Content-Type"]) === -1) {
 				return false;
 			}
-			return true;
+			return true;	
 		},
 		returnProp = options.returnProp || "responseText",
 		request = new XMLHttpRequest(),
@@ -295,13 +283,13 @@ exports.httpRequest = function(options) {
 	// Set up the state change handler
 	request.onreadystatechange = function() {
 		if(this.readyState === 4) {
-			if(this.status >= 200 && this.status < 300) {
+			if(this.status === 200 || this.status === 201 || this.status === 204) {
 				// Success!
 				options.callback(null,this[returnProp],this);
 				return;
 			}
 		// Something went wrong
-		options.callback($tw.language.getString("Error/XMLHttpRequest") + ": " + this.status,this[returnProp],this);
+		options.callback($tw.language.getString("Error/XMLHttpRequest") + ": " + this.status,null,this);
 		}
 	};
 	// Handle progress
@@ -319,10 +307,10 @@ exports.httpRequest = function(options) {
 			request.setRequestHeader(headerTitle,header);
 		});
 	}
-	if(data && !hasHeader("Content-Type") && useDefaultHeaders) {
+	if(data && !hasHeader("Content-Type")) {
 		request.setRequestHeader("Content-Type","application/x-www-form-urlencoded; charset=UTF-8");
 	}
-	if(!hasHeader("X-Requested-With") && !isSimpleRequest(type,headers) && useDefaultHeaders) {
+	if(!hasHeader("X-Requested-With") && !isSimpleRequest(type,headers)) {
 		request.setRequestHeader("X-Requested-With","TiddlyWiki");
 	}
 	// Send data
--- a/core/modules/utils/errors.js
+++ b/core/modules/utils/errors.js
@@ -1,23 +0,0 @@
-/*\
-title: $:/core/modules/utils/errors.js
-type: application/javascript
-module-type: utils
-
-Custom errors for TiddlyWiki.
-
-\*/
-(function(){
-
-function TranscludeRecursionError() {
-	Error.apply(this,arguments);
-	this.signatures = Object.create(null);
-};
-
-/* Maximum permitted depth of the widget tree for recursion detection */
-TranscludeRecursionError.MAX_WIDGET_TREE_DEPTH = 1000;
-
-TranscludeRecursionError.prototype = Object.create(Error);
-
-exports.TranscludeRecursionError = TranscludeRecursionError;
-
-})();
--- a/core/modules/utils/fakedom.js
+++ b/core/modules/utils/fakedom.js
@@ -42,7 +42,7 @@ var TW_TextNode = function(text) {
 	this.textContent = text + "";
 };

-Object.setPrototypeOf(TW_TextNode.prototype,TW_Node.prototype);
+Object.setPrototypeOf(TW_TextNode,TW_Node.prototype);

 Object.defineProperty(TW_TextNode.prototype, "nodeType", {
 	get: function() {
@@ -67,7 +67,7 @@ var TW_Element = function(tag,namespace) {
 	this.namespaceURI = namespace || "http://www.w3.org/1999/xhtml";
 };

-Object.setPrototypeOf(TW_Element.prototype,TW_Node.prototype);
+Object.setPrototypeOf(TW_Element,TW_Node.prototype);

 Object.defineProperty(TW_Element.prototype, "style", {
 	get: function() {
--- a/core/modules/utils/filesystem.js
+++ b/core/modules/utils/filesystem.js
@@ -316,13 +316,11 @@ Options include:
 	pathFilters: optional array of filters to be used to generate the base path
 	wiki: optional wiki for evaluating the pathFilters
 	fileInfo: an existing fileInfo object to check against
-	fileInfo.overwrite: if true, turns off filename clash numbers (defaults to false)
 */
 exports.generateTiddlerFilepath = function(title,options) {
 	var directory = options.directory || "",
 		extension = options.extension || "",
 		originalpath = (options.fileInfo && options.fileInfo.originalpath) ? options.fileInfo.originalpath : "",
-		overwrite = options.fileInfo && options.fileInfo.overwrite || false,
 		filepath;
 	// Check if any of the pathFilters applies
 	if(options.pathFilters && options.wiki) {
@@ -383,20 +381,19 @@ exports.generateTiddlerFilepath = function(title,options) {
 			filepath += char.charCodeAt(0).toString();
 		});
 	}
-	// Add a uniquifier if the file already exists (default)
-	var fullPath = path.resolve(directory, filepath + extension);
-	if (!overwrite) {
-		var oldPath = (options.fileInfo) ? options.fileInfo.filepath : undefined,
+	// Add a uniquifier if the file already exists
+	var fullPath, oldPath = (options.fileInfo) ? options.fileInfo.filepath : undefined,
 		count = 0;
-		do {
-			fullPath = path.resolve(directory,filepath + (count ? "_" + count : "") + extension);
-			if(oldPath && oldPath == fullPath) break;
-			count++;
-		} while(fs.existsSync(fullPath));
-	}
+	do {
+		fullPath = path.resolve(directory,filepath + (count ? "_" + count : "") + extension);
+		if(oldPath && oldPath == fullPath) {
+			break;
+		}
+		count++;
+	} while(fs.existsSync(fullPath));
 	// If the last write failed with an error, or if path does not start with:
 	//	the resolved options.directory, the resolved wikiPath directory, the wikiTiddlersPath directory, 
-	//	or the 'originalpath' directory, then $tw.utils.encodeURIComponentExtended() and resolve to options.directory.
+	//	or the 'originalpath' directory, then $tw.utils.encodeURIComponentExtended() and resolve to tiddler directory.
 	var writePath = $tw.hooks.invokeHook("th-make-tiddler-path",fullPath,fullPath),
 		encode = (options.fileInfo || {writeError: false}).writeError == true;
 	if(!encode) {
--- a/core/modules/utils/logger.js
+++ b/core/modules/utils/logger.js
@@ -21,7 +21,6 @@ function Logger(componentName,options) {
 	options = options || {};
 	this.componentName = componentName || "";
 	this.colour = options.colour || "white";
-	this.prefix = options.prefix || "";
 	this.enable = "enable" in options ? options.enable : true;
 	this.save = "save" in options ? options.save : true;
 	this.saveLimit = options.saveLimit || 100 * 1024;
@@ -34,20 +33,6 @@ Logger.prototype.setSaveBuffer = function(logger) {
 	this.saveBufferLogger = logger;
 };

-/*
-Change the output colour
-*/
-Logger.prototype.setColour = function(colour) {
-	this.colour = colour || "white";
-};
-
-/*
-Change the prefix
-*/
-Logger.prototype.setPrefix = function(prefix) {
-	this.prefix = prefix || "";
-};
-
 /*
 Log a message
 */
--- a/core/modules/utils/repository.js
+++ b/core/modules/utils/repository.js
@@ -1,52 +0,0 @@
-/*\
-title: $:/core/modules/utils/repository.js
-type: application/javascript
-module-type: utils
-
-Utilities for working with the TiddlyWiki repository file structure
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-/*
-Get an object containing all the plugins as a hashmap by title of the JSON representation of the plugin
-Options:
-
-ignoreEnvironmentVariables: defaults to false
-*/
-exports.getAllPlugins = function(options) {
-	options = options || {};
-	var fs = require("fs"),
-		path = require("path"),
-		tiddlers = {};
-	// Collect up the library plugins
-	var collectPlugins = function(folder) {
-			var pluginFolders = $tw.utils.getSubdirectories(folder) || [];
-			for(var p=0; p<pluginFolders.length; p++) {
-				if(!$tw.boot.excludeRegExp.test(pluginFolders[p])) {
-					var pluginFields = $tw.loadPluginFolder(path.resolve(folder,"./" + pluginFolders[p]));
-					if(pluginFields && pluginFields.title) {
-						tiddlers[pluginFields.title] = pluginFields;
-					}
-				}
-			}
-		},
-		collectPublisherPlugins = function(folder) {
-			var publisherFolders = $tw.utils.getSubdirectories(folder) || [];
-			for(var t=0; t<publisherFolders.length; t++) {
-				if(!$tw.boot.excludeRegExp.test(publisherFolders[t])) {
-					collectPlugins(path.resolve(folder,"./" + publisherFolders[t]));
-				}
-			}
-		};
-	$tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.pluginsPath,options.ignoreEnvironmentVariables ? undefined : $tw.config.pluginsEnvVar),collectPublisherPlugins);
-	$tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.themesPath,options.ignoreEnvironmentVariables ? undefined : $tw.config.themesEnvVar),collectPublisherPlugins);
-	$tw.utils.each($tw.getLibraryItemSearchPaths($tw.config.languagesPath,options.ignoreEnvironmentVariables ? undefined : $tw.config.languagesEnvVar),collectPlugins);
-	return tiddlers;
-};
-
-})();
--- a/core/modules/utils/utils.js
+++ b/core/modules/utils/utils.js
@@ -819,15 +819,6 @@ 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 $tw.sjcl.codec.hex.fromBits($tw.sjcl.hash.sha256.hash(str)).substr(0,options.length || 64);
-}
-
 /*
 Base64 utility functions that work in either browser or Node.js
 */
@@ -931,7 +922,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;
@@ -944,7 +935,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/action-deletefield.js
+++ b/core/modules/widgets/action-deletefield.js
@@ -37,7 +37,6 @@ Compute the internal state of the widget
 DeleteFieldWidget.prototype.execute = function() {
 	this.actionTiddler = this.getAttribute("$tiddler",this.getVariable("currentTiddler"));
 	this.actionField = this.getAttribute("$field",null);
-	this.actionTimestamp = this.getAttribute("$timestamp","yes") === "yes";
 };

 /*
@@ -70,15 +69,11 @@ DeleteFieldWidget.prototype.invokeAction = function(triggeringWidget,event) {
 		$tw.utils.each(this.attributes,function(attribute,name) {
 			if(name.charAt(0) !== "$" && name !== "title") {
 				removeFields[name] = undefined;
-				if(name in tiddler.fields) {
-					hasChanged = true;
-				}
+				hasChanged = true;
 			}
 		});
 		if(hasChanged) {
-			var creationFields = this.actionTimestamp ? this.wiki.getCreationFields() : {};
-			var modificationFields = this.actionTimestamp ? this.wiki.getModificationFields() : {};
-			this.wiki.addTiddler(new $tw.Tiddler(creationFields,tiddler,removeFields,modificationFields));
+			this.wiki.addTiddler(new $tw.Tiddler(this.wiki.getCreationFields(),tiddler,removeFields,this.wiki.getModificationFields()));
 		}
 	}
 	return true; // Action was invoked
--- a/core/modules/widgets/data.js
+++ b/core/modules/widgets/data.js
@@ -1,182 +0,0 @@
-/*\
-title: $:/core/modules/widgets/data.js
-type: application/javascript
-module-type: widget
-
-Widget to dynamically represent one or more tiddlers
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-var Widget = require("$:/core/modules/widgets/widget.js").widget;
-
-var DataWidget = function(parseTreeNode,options) {
-	this.dataWidgetTag = parseTreeNode.type;
-	this.initialise(parseTreeNode,options);
-};
-
-/*
-Inherit from the base widget class
-*/
-DataWidget.prototype = new Widget();
-
-/*
-Render this widget into the DOM
-*/
-DataWidget.prototype.render = function(parent,nextSibling) {
-	this.parentDomNode = parent;
-	this.computeAttributes();
-	this.execute();
-	this.dataPayload = this.computeDataTiddlerValues(); // Array of $tw.Tiddler objects
-	this.domNode = this.document.createTextNode(this.readDataTiddlerValuesAsJson());
-	parent.insertBefore(this.domNode,nextSibling);
-	this.domNodes.push(this.domNode);
-};
-
-/*
-Compute the internal state of the widget
-*/
-DataWidget.prototype.execute = function() {
-	// Nothing to do here
-};
-
-/*
-Read the tiddler value(s) from a data widget as an array of tiddler field objects (not $tw.Tiddler objects)
-*/
-DataWidget.prototype.readDataTiddlerValues = function() {
-	var results = [];
-	$tw.utils.each(this.dataPayload,function(tiddler,index) {
-		results.push(tiddler.getFieldStrings());
-	});
-	return results;
-};
-
-/*
-Read the tiddler value(s) from a data widget as an array of tiddler field objects (not $tw.Tiddler objects)
-*/
-DataWidget.prototype.readDataTiddlerValuesAsJson = function() {
-	return JSON.stringify(this.readDataTiddlerValues(),null,4);
-};
-
-/*
-Compute list of tiddlers from a data widget
-*/
-DataWidget.prototype.computeDataTiddlerValues = function() {
-	var self = this;
-	// Read any attributes not prefixed with $
-	var item = Object.create(null);
-	$tw.utils.each(this.attributes,function(value,name) {
-		if(name.charAt(0) !== "$") {
-			item[name] = value;	
-		}
-	});
-	// Deal with $tiddler, $filter or $compound-tiddler attributes
-	var tiddlers = [],title;
-	if(this.hasAttribute("$tiddler")) {
-		title = this.getAttribute("$tiddler");
-		if(title) {
-			var tiddler = this.wiki.getTiddler(title);
-			if(tiddler) {
-				tiddlers.push(tiddler);
-			}
-		}
-	}
-	if(this.hasAttribute("$filter")) {
-		var filter = this.getAttribute("$filter");
-		if(filter) {
-			var titles = this.wiki.filterTiddlers(filter);
-			$tw.utils.each(titles,function(title) {
-				var tiddler = self.wiki.getTiddler(title);
-				tiddlers.push(tiddler);
-			});
-		}
-	}
-	if(this.hasAttribute("$compound-tiddler")) {
-		title = this.getAttribute("$compound-tiddler");
-		if(title) {
-			tiddlers.push.apply(tiddlers,this.extractCompoundTiddler(title));
-		}
-	}
-	// Return the literal item if none of the special attributes were used
-	if(!this.hasAttribute("$tiddler") && !this.hasAttribute("$filter") && !this.hasAttribute("$compound-tiddler")) {
-		if(Object.keys(item).length > 0 && !!item.title) {
-			return [new $tw.Tiddler(item)];
-		} else {
-			return [];
-		}
-	} else {
-		// Apply the item fields to each of the tiddlers
-		delete item.title; // Do not overwrite the title
-		if(Object.keys(item).length > 0) {
-			$tw.utils.each(tiddlers,function(tiddler,index) {
-				tiddlers[index] = new $tw.Tiddler(tiddler,item);
-			});
-		}
-		return tiddlers;
-	}
-};
-
-/*
-Helper to extract tiddlers from text/vnd.tiddlywiki-multiple tiddlers
-*/
-DataWidget.prototype.extractCompoundTiddler = function(title) {
-	var tiddler = this.wiki.getTiddler(title);
-	if(tiddler && tiddler.fields.type === "text/vnd.tiddlywiki-multiple") {
-		var text = tiddler.fields.text || "",
-			rawTiddlers = text.split(/\r?\n\+\r?\n/),
-			tiddlers = [];
-		$tw.utils.each(rawTiddlers,function(rawTiddler) {
-			var fields = Object.create(null),
-				split = rawTiddler.split(/\r?\n\r?\n/mg);
-			if(split.length >= 1) {
-				fields = $tw.utils.parseFields(split[0],fields);
-			}
-			if(split.length >= 2) {
-				fields.text = split.slice(1).join("\n\n");
-			}
-			tiddlers.push(new $tw.Tiddler(fields));
-		});
-		return tiddlers;
-	} else {
-		return [];
-	}
-};
-
-/*
-Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
-*/
-DataWidget.prototype.refresh = function(changedTiddlers) {
-	var changedAttributes = this.computeAttributes();
-	var newPayload = this.computeDataTiddlerValues();
-	if(hasPayloadChanged(this.dataPayload,newPayload)) {
-		this.dataPayload = newPayload;
-		this.domNode.textContent = this.readDataTiddlerValuesAsJson();
-		return true;
-	} else {
-		return false;
-	}
-};
-
-/*
-Compare two arrays of tiddlers and return true if they are different
-*/
-function hasPayloadChanged(a,b) {
-	if(a.length === b.length) {
-		for(var t=0; t<a.length; t++) {
-			if(!(a[t].isEqual(b[t]))) {
-				return true;
-			}
-		}
-		return false;
-	} else {
-		return true;
-	}
-}
-
-exports.data = DataWidget;
-
-})();
--- 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.updateDomNodeClasses();
+			this.assignDomNodeClasses();
 		}
 		this.assignAttributes(this.domNodes[0],{
 			changedAttributes: changedAttributes,
@@ -132,4 +132,4 @@ DraggableWidget.prototype.refresh = function(changedTiddlers) {

 exports.draggable = DraggableWidget;

-})();
+})();
--- 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:false});
+		var parser = widgetPointer.wiki.parseTiddler(title,{parseAsInline:true, configTrimWhiteSpace:true});
 		if(parser) {
 			var parseTreeNode = parser.tree[0];
 			while(parseTreeNode && ["setvariable","set","parameters"].indexOf(parseTreeNode.type) !== -1) {
--- a/core/modules/widgets/parameters.js
+++ b/core/modules/widgets/parameters.js
@@ -74,18 +74,6 @@ ParametersWidget.prototype.execute = function() {
 				self.setVariable(variableName,getValue(name));
 			}
 		});
-	} else {
-		// There is no parent transclude. i.e. direct rendering.
-		// We use default values only.
-		$tw.utils.each($tw.utils.getOrderedAttributesFromParseTreeNode(self.parseTreeNode),function(attr,index) {
-			var name = attr.name;
-			// If the attribute name starts with $$ then reduce to a single dollar
-			if(name.substr(0,2) === "$$") {
-				name = name.substr(1);
-			}
-			var value = self.getAttribute(attr.name,"");
-			self.setVariable(name,value);
-		});
 	}
 	// Construct the child widgets
 	this.makeChildWidgets();
--- a/core/modules/widgets/testcase.js
+++ b/core/modules/widgets/testcase.js
@@ -1,165 +0,0 @@
-/*\
-title: $:/core/modules/widgets/testcase.js
-type: application/javascript
-module-type: widget
-
-Widget to display a test case
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-var Widget = require("$:/core/modules/widgets/widget.js").widget;
-
-var TestCaseWidget = function(parseTreeNode,options) {
-	this.initialise(parseTreeNode,options);
-};
-
-/*
-Inherit from the base widget class
-*/
-TestCaseWidget.prototype = new Widget();
-
-/*
-Render this widget into the DOM
-*/
-TestCaseWidget.prototype.render = function(parent,nextSibling) {
-	var self = this;
-	this.parentDomNode = parent;
-	this.computeAttributes();
-	this.execute();
-	// Create container DOM node
-	var domNode = this.document.createElement("div");
-	this.domNodes.push(domNode);
-	parent.insertBefore(domNode,nextSibling);
-	// Render the children into a hidden DOM node
-	var parser = {
-		tree: [{
-			type: "widget",
-			attributes: {},
-			orderedAttributes: [],
-			children: this.parseTreeNode.children || []
-		}]
-	};
-	this.contentRoot = this.wiki.makeWidget(parser,{
-		document: $tw.fakeDocument,
-		parentWidget: this
-	});
-	this.contentContainer = $tw.fakeDocument.createElement("div");
-	this.contentRoot.render(this.contentContainer,null);
-	// Create a wiki
-	this.testcaseWiki = new $tw.Wiki();
-	// Always load the core plugin
-	var loadTiddler = function(title) {
-		var tiddler = self.wiki.getTiddler(title);
-		if(tiddler) {
-			self.testcaseWiki.addTiddler(tiddler);
-		}
-	}
-	loadTiddler("$:/core");
-	loadTiddler("$:/plugins/tiddlywiki/codemirror");
-	// Load tiddlers from child data widgets
-	var tiddlers = [];
-	this.findChildrenDataWidgets(this.contentRoot.children,"data",function(widget) {
-		Array.prototype.push.apply(tiddlers,widget.readDataTiddlerValues());
-	});
-	var jsonPayload = JSON.stringify(tiddlers);
-	this.testcaseWiki.addTiddlers(tiddlers);
-	// Unpack plugin tiddlers
-	this.testcaseWiki.readPluginInfo();
-	this.testcaseWiki.registerPluginTiddlers("plugin");
-	this.testcaseWiki.unpackPluginTiddlers();
-	this.testcaseWiki.addIndexersToWiki();
-	// Generate a `transclusion` variable that depends on the values of the payload tiddlers so that the template can easily make unique state tiddlers
-	this.setVariable("transclusion",$tw.utils.hashString(jsonPayload));
-	// Generate a `payloadTiddlers` variable that contains the payload in JSON format
-	this.setVariable("payloadTiddlers",jsonPayload);
-	// Only run the tests if the testcase output and expected results were specified, and those tiddlers actually exist in the wiki
-	var shouldRunTests = false;
-	if(this.testcaseTestOutput && this.testcaseWiki.tiddlerExists(this.testcaseTestOutput) && this.testcaseTestExpectedResult && this.testcaseWiki.tiddlerExists(this.testcaseTestExpectedResult)) {
-		shouldRunTests = true;
-	}
-	// Render the test rendering if required
-	if(shouldRunTests) {
-		var testcaseOutputContainer = $tw.fakeDocument.createElement("div");
-		var testcaseOutputWidget = this.testcaseWiki.makeTranscludeWidget(this.testcaseTestOutput,{
-			document: $tw.fakeDocument,
-			parseAsInline: false,
-			parentWidget: this,
-			variables: {
-				currentTiddler: this.testcaseTestOutput
-			}
-		});
-		testcaseOutputWidget.render(testcaseOutputContainer);
-	}
-	// Clear changes queue
-	this.testcaseWiki.clearTiddlerEventQueue();
-	// Run the actions if provided
-	if(this.testcaseWiki.tiddlerExists(this.testcaseTestActions)) {
-		testcaseOutputWidget.invokeActionString(this.testcaseWiki.getTiddlerText(this.testcaseTestActions));
-		testcaseOutputWidget.refresh(this.testcaseWiki.changedTiddlers,testcaseOutputContainer);
-	}
-	// Set up the test result variables
-	var testResult = "",
-		outputHTML = "",
-		expectedHTML = "";
-	if(shouldRunTests) {
-		outputHTML = testcaseOutputContainer.children[0].innerHTML;
-		expectedHTML = this.testcaseWiki.getTiddlerText(this.testcaseTestExpectedResult);
-		if(outputHTML === expectedHTML) {
-			testResult = "pass";
-		} else {
-			testResult = "fail";
-		}
-		this.setVariable("outputHTML",outputHTML);
-		this.setVariable("expectedHTML",expectedHTML);
-		this.setVariable("testResult",testResult);
-		this.setVariable("currentTiddler",this.testcaseTestOutput);
-	}
-	// Don't display anything if testHideIfPass is "yes" and the tests have passed
-	if(this.testcaseHideIfPass === "yes" && testResult !== "fail") {
-		return;
-	}
-	// Render the page root template of the subwiki
-	var rootWidget = this.testcaseWiki.makeTranscludeWidget(this.testcaseTemplate,{
-		document: this.document,
-		parseAsInline: false,
-		parentWidget: this
-	});
-	rootWidget.render(domNode);
-	// Trap changes in the wiki and refresh the rendering
-	this.testcaseWiki.addEventListener("change",function(changes) {
-		rootWidget.refresh(changes,domNode);
-	});
-};
-
-/*
-Compute the internal state of the widget
-*/
-TestCaseWidget.prototype.execute = function() {
-	this.testcaseTemplate = this.getAttribute("template","$:/core/ui/testcases/DefaultTemplate");
-	this.testcaseTestOutput = this.getAttribute("testOutput");
-	this.testcaseTestActions = this.getAttribute("testActions");
-	this.testcaseTestExpectedResult = this.getAttribute("testExpectedResult");
-	this.testcaseHideIfPass = this.getAttribute("testHideIfPass");
-};
-
-/*
-Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
-*/
-TestCaseWidget.prototype.refresh = function(changedTiddlers) {
-	var changedAttributes = this.computeAttributes();
-	if($tw.utils.count(changedAttributes) > 0) {
-		this.refreshSelf();
-		return true;
-	} else {
-		return this.contentRoot.refresh(changedTiddlers);
-	}
-};
-
-exports["testcase"] = TestCaseWidget;
-
-})();
--- a/core/modules/widgets/transclude.js
+++ b/core/modules/widgets/transclude.js
@@ -30,30 +30,7 @@ TranscludeWidget.prototype.render = function(parent,nextSibling) {
 	this.parentDomNode = parent;
 	this.computeAttributes();
 	this.execute();
-	try {
-		this.renderChildren(parent,nextSibling);
-	} catch(error) {
-		if(error instanceof $tw.utils.TranscludeRecursionError) {
-			// We were infinite looping.
-			// We need to try and abort as much of the loop as we can, so we will keep "throwing" upward until we find a transclusion that has a different signature.
-			// Hopefully that will land us just outside where the loop began. That's where we want to issue an error.
-			// Rendering widgets beneath this point may result in a freezing browser if they explode exponentially.
-			var transcludeSignature = this.getVariable("transclusion");
-			if(this.getAncestorCount() > $tw.utils.TranscludeRecursionError.MAX_WIDGET_TREE_DEPTH - 50) {
-				// For the first fifty transcludes we climb up, we simply collect signatures.
-				// We're assuming that those first 50 will likely include all transcludes involved in the loop.
-				error.signatures[transcludeSignature] = true;
-			} else if(!error.signatures[transcludeSignature]) {
-				// Now that we're past the first 50, let's look for the first signature that wasn't in the loop. That'll be where we print the error and resume rendering.
-				this.children = [this.makeChildWidget({type: "error", attributes: {
-					"$message": {type: "string", value: $tw.language.getString("Error/RecursiveTransclusion")}
-				}})];
-				this.renderChildren(parent,nextSibling);
-				return;
-			}
-		}
-		throw error;
-	}
+	this.renderChildren(parent,nextSibling);
 };

 /*
--- a/core/modules/widgets/widget.js
+++ b/core/modules/widgets/widget.js
@@ -12,6 +12,9 @@ Widget base class
 /*global $tw: false */
 "use strict";

+/* Maximum permitted depth of the widget tree for recursion detection */
+var MAX_WIDGET_TREE_DEPTH = 1000;
+
 /*
 Create a widget object for a parse tree node
 	parseTreeNode: reference to the parse tree node to be rendered
@@ -163,8 +166,6 @@ Widget.prototype.getVariableInfo = function(name,options) {
 			});
 			resultList = this.wiki.filterTiddlers(value,this.makeFakeWidgetWithVariables(variables),options.source);
 			value = resultList[0] || "";
-		} else {
-			params = variable.params;
 		}
 		return {
 			text: value,
@@ -316,8 +317,7 @@ Widget.prototype.getStateQualifier = function(name) {
 Make a fake widget with specified variables, suitable for variable lookup in filters
 */
 Widget.prototype.makeFakeWidgetWithVariables = function(variables) {
-	var self = this,
-		variables = variables || {};
+	var self = this;
 	return {
 		getVariable: function(name,opts) {
 			if($tw.utils.hop(variables,name)) {
@@ -335,7 +335,7 @@ Widget.prototype.makeFakeWidgetWithVariables = function(variables) {
 				};
 			} else {
 				opts = opts || {};
-				opts.variables = $tw.utils.extend(variables,opts.variables);
+				opts.variables = variables;
 				return self.getVariableInfo(name,opts);
 			};
 		},
@@ -494,8 +494,10 @@ Widget.prototype.makeChildWidgets = function(parseTreeNodes,options) {
 	this.children = [];
 	var self = this;
 	// Check for too much recursion
-	if(this.getAncestorCount() > $tw.utils.TranscludeRecursionError.MAX_WIDGET_TREE_DEPTH) {
-		throw new $tw.utils.TranscludeRecursionError();
+	if(this.getAncestorCount() > MAX_WIDGET_TREE_DEPTH) {
+		this.children.push(this.makeChildWidget({type: "error", attributes: {
+			"$message": {type: "string", value: $tw.language.getString("Error/RecursiveTransclusion")}
+		}}));
 	} else {
 		// Create set variable widgets for each variable
 		$tw.utils.each(options.variables,function(value,name) {
@@ -811,21 +813,6 @@ Widget.prototype.allowActionPropagation = function() {
 	return true;
 };

-/*
-Find child <$data> widgets recursively. The tag name allows aliased versions of the widget to be found too
-*/
-Widget.prototype.findChildrenDataWidgets = function(children,tag,callback) {
-	var self = this;
-	$tw.utils.each(children,function(child) {
-		if(child.dataWidgetTag === tag) {
-			callback(child);
-		}
-		if(child.children) {
-			self.findChildrenDataWidgets(child.children,tag,callback);
-		}
-	});
-};
-
 /*
 Evaluate a variable with parameters. This is a static convenience method that attempts to evaluate a variable as a function, returning an array of strings
 */
--- 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,
-		backIndexer = this.getIndexer("BackIndexer"),
-		backlinks = backIndexer && backIndexer.subIndexers.link.lookup(targetTitle);
+		backlinksIndexer = this.getIndexer("BacklinksIndexer"),
+		backlinks = backlinksIndexer && backlinksIndexer.lookup(targetTitle);

 	if(!backlinks) {
 		backlinks = [];
@@ -549,68 +549,6 @@ 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/palettes/Vanilla.tid
+++ b/core/palettes/Vanilla.tid
@@ -95,9 +95,6 @@ table-footer-background: #a8a8a8
 table-header-background: #f0f0f0
 tag-background: #ec6
 tag-foreground: #ffffff
-testcase-accent-level-1: #84C5E6
-testcase-accent-level-2: #E3B740
-testcase-accent-level-3: #5FD564
 tiddler-background: <<colour background>>
 tiddler-border: <<colour background>>
 tiddler-controls-foreground-hover: #888888
--- a/core/plugin.info
+++ b/core/plugin.info
@@ -5,6 +5,5 @@
 	"author": "JeremyRuston",
 	"core-version": ">=5.0.0",
 	"plugin-priority": "0",
-	"list": "readme",
-	"stability": "STABILITY_2_STABLE"
+	"list": "readme"
 }
--- a/core/templates/external-js/save-all-external-js.tid
+++ b/core/templates/external-js/save-all-external-js.tid
@@ -3,7 +3,7 @@ title: $:/core/save/all-external-js
 \whitespace trim
 \import [subfilter{$:/core/config/GlobalImportFilter}]
 \define saveTiddlerFilter()
-[is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/core]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$
+[is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/core]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$
 \end

 <!-- Important: core library is provided by serving URI encoded $:/core/templates/tiddlywiki5.js -->
--- a/core/templates/external-js/save-offline-external-js.tid
+++ b/core/templates/external-js/save-offline-external-js.tid
@@ -3,7 +3,7 @@ title: $:/core/save/offline-external-js
 \whitespace trim
 \import [subfilter{$:/core/config/GlobalImportFilter}]
 \define saveTiddlerFilter()
-[is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/core]] -[[$:/plugins/tiddlywiki/filesystem]] -[[$:/plugins/tiddlywiki/tiddlyweb]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$
+[is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/core]] -[[$:/plugins/tiddlywiki/filesystem]] -[[$:/plugins/tiddlywiki/tiddlyweb]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$
 \end
 \define defaultCoreURL() tiddlywikicore-$(version)$.js
 <$let coreURL={{{ [[coreURL]is[variable]then<coreURL>else<defaultCoreURL>] }}}>
--- a/core/templates/save-all.tid
+++ b/core/templates/save-all.tid
@@ -2,6 +2,6 @@ title: $:/core/save/all

 \import [subfilter{$:/core/config/GlobalImportFilter}]
 \define saveTiddlerFilter()
-[is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$
+[is[tiddler]] -[prefix[$:/state/popup/]] -[prefix[$:/temp/]] -[prefix[$:/HistoryList]] -[status[pending]plugin-type[import]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]] $(publishFilter)$
 \end
 {{$:/core/templates/tiddlywiki5.html}}
--- a/core/templates/save-empty.tid
+++ b/core/templates/save-empty.tid
@@ -1,6 +1,6 @@
 title: $:/core/save/empty

 \define saveTiddlerFilter()
-[is[system]] -[prefix[$:/state/popup/]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
+[is[system]] -[prefix[$:/state/popup/]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
 \end
 {{$:/core/templates/tiddlywiki5.html}}
--- a/core/templates/save-lazy-all.tid
+++ b/core/templates/save-lazy-all.tid
@@ -1,7 +1,7 @@
 title: $:/core/save/lazy-all

 \define saveTiddlerFilter()
-[is[system]] -[prefix[$:/state/popup/]] -[[$:/HistoryList]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] [is[tiddler]type[application/javascript]] +[sort[title]]
+[is[system]] -[prefix[$:/state/popup/]] -[[$:/HistoryList]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] [is[tiddler]type[application/javascript]] +[sort[title]]
 \end
 \define skinnySaveTiddlerFilter()
 [!is[system]] -[type[application/javascript]]
--- a/core/templates/save-lazy-images.tid
+++ b/core/templates/save-lazy-images.tid
@@ -1,7 +1,7 @@
 title: $:/core/save/lazy-images

 \define saveTiddlerFilter()
-[is[tiddler]] -[prefix[$:/state/popup/]] -[[$:/HistoryList]] -[[$:/boot/boot.css]] -[is[system]type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[!is[system]is[image]] +[sort[title]] 
+[is[tiddler]] -[prefix[$:/state/popup/]] -[[$:/HistoryList]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[!is[system]is[image]] +[sort[title]] 
 \end
 \define skinnySaveTiddlerFilter()
 [!is[system]is[image]]
--- a/core/ui/AdvancedSearch/Filter.tid
+++ b/core/ui/AdvancedSearch/Filter.tid
@@ -40,8 +40,10 @@ 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">>>
@@ -63,10 +65,11 @@ 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">
-<p><<lingo Filter/Matches>></p>
+<<lingo Filter/Matches>>
 <$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,18 +54,17 @@ caption: {{$:/language/Search/Standard/Caption}}
 	variable="listItem">
 <$vars
 	userInput={{{ [[$:/temp/advancedsearch]get[text]] }}}
-	configTiddler={{{ [[$:/state/advancedsearch/standard/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}] }}}
+	configTiddler={{{ [[$:/state/search/currentTab]!is[missing]get[text]] ~[{$:/config/SearchResults/Default}] }}}
 	searchListState="$:/temp/advancedsearch/selected-item">
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]butfirst[]limit[1]]">
+<$list
+	filter="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]butfirst[]limit[1]]"
+	emptyMessage="<$list filter='[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]'><$transclude/></$list>">
 <$macrocall $name="tabs"
 	tabsList="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]"
 	default={{$:/config/SearchResults/Default}}
 	actions="<$action-setfield $tiddler='$:/state/advancedsearch/standard/currentTab' text=<<currentTab>>/>"
 	explicitState="$:/state/tab/search-results/advancedsearch" />
 </$list>
-<$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/Components/plugin-info.tid
+++ b/core/ui/Components/plugin-info.tid
@@ -45,17 +45,7 @@ $:/config/Plugins/Disabled/$(currentTiddler)$
 		<$view field="title"/>
 	</h2>
 	<h2>
-		<div>
-			<%if [<currentTiddler>get[stability]match[STABILITY_0_DEPRECATED]] %>
-				<span class="tc-plugin-info-stability tc-plugin-info-stability-deprecated">DEPRECATED</span>
-			<%elseif [<currentTiddler>get[stability]match[STABILITY_1_EXPERIMENTAL]] %>
-				<span class="tc-plugin-info-stability tc-plugin-info-stability-experimental">EXPERIMENTAL</span>
-			<%elseif [<currentTiddler>get[stability]match[STABILITY_2_STABLE]] %>
-				<span class="tc-plugin-info-stability tc-plugin-info-stability-stable">STABLE</span>
-			<%elseif [<currentTiddler>get[stability]match[STABILITY_3_LEGACY]] %>
-				<span class="tc-plugin-info-stability tc-plugin-info-stability-legacy">LEGACY</span>
-			<%endif%>
-			<em><$view field="version"/></em></div>
+		<div><em><$view field="version"/></em></div>
 	</h2>
 </div>
 \end
--- a/core/ui/ControlPanel/Modals/AddPlugins.tid
+++ b/core/ui/ControlPanel/Modals/AddPlugins.tid
@@ -70,20 +70,9 @@ $:/state/add-plugin-info/$(connectionTiddler)$/$(assetInfo)$
 <div class="tc-plugin-info-chunk tc-plugin-info-description">
 <h1><strong><$text text={{{ [<assetInfo>get[name]] ~[<assetInfo>get[original-title]split[/]last[1]] }}}/></strong>:
 &#32;
-<$view tiddler=<<assetInfo>> field="description"/>
-</h1>
+<$view tiddler=<<assetInfo>> field="description"/></h1>
 <h2><$view tiddler=<<assetInfo>> field="original-title"/></h2>
-<div>
-<%if [<assetInfo>get[stability]match[STABILITY_0_DEPRECATED]] %>
-	<span class="tc-plugin-info-stability tc-plugin-info-stability-deprecated">DEPRECATED</span>
-<%elseif [<assetInfo>get[stability]match[STABILITY_1_EXPERIMENTAL]] %>
-	<span class="tc-plugin-info-stability tc-plugin-info-stability-experimental">EXPERIMENTAL</span>
-<%elseif [<assetInfo>get[stability]match[STABILITY_2_STABLE]] %>
-	<span class="tc-plugin-info-stability tc-plugin-info-stability-stable">STABLE</span>
-<%elseif [<assetInfo>get[stability]match[STABILITY_3_LEGACY]] %>
-	<span class="tc-plugin-info-stability tc-plugin-info-stability-legacy">LEGACY</span>
-<%endif%>
-<em><$view tiddler=<<assetInfo>> field="version"/></em></div>
+<div><em><$view tiddler=<<assetInfo>> field="version"/></em></div>
 <$list filter="[<assetInfo>get[original-title]get[version]]" variable="installedVersion"><div><em>{{$:/language/ControlPanel/Plugins/AlreadyInstalled/Hint}}</em></div></$list>
 </div>
 <div class="tc-plugin-info-chunk tc-plugin-info-buttons">
--- a/core/ui/ControlPanel/Saving/DownloadSaver.tid
+++ b/core/ui/ControlPanel/Saving/DownloadSaver.tid
@@ -2,19 +2,10 @@ 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>>

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

-<$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>
+<$checkbox tiddler="$:/config/DownloadSaver/AutoSave" field="text" checked="yes" unchecked="no" default="no"> <<lingo AutoSave/Description>> </$checkbox>
--- a/core/ui/ControlPanel/Saving/General.tid
+++ b/core/ui/ControlPanel/Saving/General.tid
@@ -3,22 +3,14 @@ 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}}

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

 <<lingo AutoSave/Hint>>

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

-<$radio tiddler="$:/config/AutoSave" value="no">
-	<span class="tc-tiny-gap-left"><<lingo AutoSave/Disabled/Description>></span>
-</$radio>
-</div>
+<$radio tiddler="$:/config/AutoSave" value="no"> <<lingo AutoSave/Disabled/Description>> </$radio>
--- a/core/ui/ControlPanel/Settings/CamelCase.tid
+++ b/core/ui/ControlPanel/Settings/CamelCase.tid
@@ -2,16 +2,7 @@ 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"
-	class="tc-control-panel-item"
->
-	<$link to="$:/config/WikiParserRules/Inline/wikilink" class="tc-tiny-gap-left">
-		<<lingo Description>>
-	</$link>
-</$checkbox>
+<$checkbox tiddler="$:/config/WikiParserRules/Inline/wikilink" field="text" checked="enable" unchecked="disable" default="enable"> <$link to="$:/config/WikiParserRules/Inline/wikilink"><<lingo Description>></$link> </$checkbox>
--- a/core/ui/ControlPanel/Settings/DefaultMoreSidebarTab.tid
+++ b/core/ui/ControlPanel/Settings/DefaultMoreSidebarTab.tid
@@ -2,18 +2,13 @@ caption: {{$:/language/ControlPanel/Settings/DefaultMoreSidebarTab/Caption}}
 tags: $:/tags/ControlPanel/Settings
 title: $:/core/ui/ControlPanel/Settings/DefaultMoreSidebarTab

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

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

-<$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 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>
--- a/core/ui/ControlPanel/Settings/DefaultSidebarTab.tid
+++ b/core/ui/ControlPanel/Settings/DefaultSidebarTab.tid
@@ -5,16 +5,10 @@ title: $:/core/ui/ControlPanel/Settings/DefaultSidebarTab
 \define lingo-base() $:/language/ControlPanel/Settings/DefaultSidebarTab/
 \whitespace trim

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

-<$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 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>
--- a/core/ui/ControlPanel/Settings/EditorToolbar.tid
+++ b/core/ui/ControlPanel/Settings/EditorToolbar.tid
@@ -2,15 +2,8 @@ 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"
-	class="tc-control-panel-item"
->
-	<$link to="$:/config/TextEditor/EnableToolbar" class="tc-tiny-gap-left">
-		<<lingo Description>>
-	</$link>
-</$checkbox>
+<$checkbox tiddler="$:/config/TextEditor/EnableToolbar" field="text" checked="yes" unchecked="no" default="yes"> <$link to="$:/config/TextEditor/EnableToolbar"><<lingo Description>></$link> </$checkbox>
+
--- a/core/ui/ControlPanel/Settings/InfoPanelMode.tid
+++ b/core/ui/ControlPanel/Settings/InfoPanelMode.tid
@@ -2,17 +2,9 @@ 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>

-<$link to="$:/config/TiddlerInfo/Mode" class="tc-control-panel-item">
-	<<lingo Hint>>
-</$link>
+<$radio tiddler="$:/config/TiddlerInfo/Mode" value="popup"> <<lingo Popup/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>
+<$radio tiddler="$:/config/TiddlerInfo/Mode" value="sticky"> <<lingo Sticky/Description>> </$radio>
--- a/core/ui/ControlPanel/Settings/LinkToBehaviour.tid
+++ b/core/ui/ControlPanel/Settings/LinkToBehaviour.tid
@@ -2,25 +2,21 @@ title: $:/core/ui/ControlPanel/Settings/LinkToBehaviour
 tags: $:/tags/ControlPanel/Settings
 caption: {{$:/language/ControlPanel/Settings/LinkToBehaviour/Caption}}

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

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

-<$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 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>

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

-<$select tiddler="$:/config/Navigation/openLinkFromOutsideRiver" class="tc-select">
-	<option value="top"><<lingo "OpenAtTop">></option>
-	<option value="bottom"><<lingo "OpenAtBottom">></option>
+<$select tiddler="$:/config/Navigation/openLinkFromOutsideRiver">
+  <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,12 +2,8 @@ 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" class="tc-control-panel-item">
-		<span class="tc-tiny-gap-left"><<lingo Description>></span>
-	</$link>
-</$checkbox>
+<$checkbox tiddler="$:/config/MissingLinks" field="text" checked="yes" unchecked="no" default="yes"> <$link to="$:/config/MissingLinks"><<lingo Description>></$link> </$checkbox>
+
--- a/core/ui/ControlPanel/Settings/NavigationAddressBar.tid
+++ b/core/ui/ControlPanel/Settings/NavigationAddressBar.tid
@@ -2,21 +2,12 @@ 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" class="tc-control-panel-item">
-	<<lingo Hint>>
-</$link>
+<$link to="$:/config/Navigation/UpdateAddressBar"><<lingo Hint>></$link>

-<$radio tiddler="$:/config/Navigation/UpdateAddressBar" value="permaview">
-	<span class="tc-tiny-gap-left"><<lingo Permaview/Description>></span>
-</$radio>
+<$radio tiddler="$:/config/Navigation/UpdateAddressBar" value="permaview"> <<lingo Permaview/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="permalink"> <<lingo Permalink/Description>> </$radio>

-<$radio tiddler="$:/config/Navigation/UpdateAddressBar" value="no">
-	<span class="tc-tiny-gap-left"><<lingo No/Description>></span>
-</$radio>
+<$radio tiddler="$:/config/Navigation/UpdateAddressBar" value="no"> <<lingo No/Description>> </$radio>
--- a/core/ui/ControlPanel/Settings/NavigationHistory.tid
+++ b/core/ui/ControlPanel/Settings/NavigationHistory.tid
@@ -2,17 +2,9 @@ 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>

-<$link to="$:/config/Navigation/UpdateHistory" class="tc-control-panel-item">
-	<<lingo Hint>>
-</$link>
+<$radio tiddler="$:/config/Navigation/UpdateHistory" value="yes"> <<lingo Yes/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>
+<$radio tiddler="$:/config/Navigation/UpdateHistory" value="no"> <<lingo No/Description>> </$radio>
--- a/core/ui/ControlPanel/Settings/NavigationPermalinkviewMode.tid
+++ b/core/ui/ControlPanel/Settings/NavigationPermalinkviewMode.tid
@@ -2,24 +2,9 @@ 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"
-	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/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/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>
+<$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>
--- a/core/ui/ControlPanel/Settings/PerformanceInstrumentation.tid
+++ b/core/ui/ControlPanel/Settings/PerformanceInstrumentation.tid
@@ -2,15 +2,7 @@ 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"
-	class="tc-control-panel-item"
->
-	<$link to="$:/config/Performance/Instrumentation" class="tc-tiny-gap-left">
-		<<lingo Description>>
-	</$link>
-</$checkbox>
+<$checkbox tiddler="$:/config/Performance/Instrumentation" field="text" checked="yes" unchecked="no" default="no"> <$link to="$:/config/Performance/Instrumentation"><<lingo Description>></$link> </$checkbox>
--- a/core/ui/ControlPanel/Settings/TitleLinks.tid
+++ b/core/ui/ControlPanel/Settings/TitleLinks.tid
@@ -2,17 +2,9 @@ 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>

-<$link to="$:/config/Tiddlers/TitleLinks" class="tc-control-panel-item">
-	<<lingo Hint>>
-</$link>
+<$radio tiddler="$:/config/Tiddlers/TitleLinks" value="yes"> <<lingo Yes/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>
+<$radio tiddler="$:/config/Tiddlers/TitleLinks" value="no"> <<lingo No/Description>> </$radio>
--- a/core/ui/ControlPanel/Settings/ToolbarButtonStyle.tid
+++ b/core/ui/ControlPanel/Settings/ToolbarButtonStyle.tid
@@ -2,15 +2,12 @@ title: $:/core/ui/ControlPanel/Settings/ToolbarButtonStyle
 tags: $:/tags/ControlPanel/Settings
 caption: {{$:/language/ControlPanel/Settings/ToolbarButtonStyle/Caption}}

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

-<$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 tiddler="$:/config/Toolbar/ButtonClass">
+<$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,24 +2,9 @@ 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"
-	class="tc-control-panel-item"
->
-	<$link to="$:/config/Toolbar/Icons" class="tc-tiny-gap-left">
-		<<lingo Icons/Description>>
-	</$link>
-</$checkbox>
+<$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/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>
+<$checkbox tiddler="$:/config/Toolbar/Text" field="text" checked="yes" unchecked="no" default="no"> <$link to="$:/config/Toolbar/Text"><<lingo Text/Description>></$link> </$checkbox>
--- a/core/ui/ControlPanel/TestCases.tid
+++ b/core/ui/ControlPanel/TestCases.tid
@@ -1,10 +0,0 @@
-title: $:/core/ui/ControlPanel/TestCases
-tags: $:/tags/ControlPanel/Advanced
-caption: {{$:/language/ControlPanel/TestCases/Caption}}
-
-\whitespace trim
-{{$:/language/ControlPanel/TestCases/Hint}}
-
-<div class="tc-control-panel">
-<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/TestCases]!has[draft.of]]" default="$:/core/ui/ControlPanel/TestCases/All"/>
-</div>
--- a/core/ui/ControlPanel/TestCasesAll.tid
+++ b/core/ui/ControlPanel/TestCasesAll.tid
@@ -1,24 +0,0 @@
-title: $:/core/ui/ControlPanel/TestCases/All
-tags: $:/tags/ControlPanel/TestCases
-caption: {{$:/language/ControlPanel/TestCases/All/Caption}}
-
-\define lingo-base() $:/language/ControlPanel/
-<<lingo TestCases/All/Hint>>
-
-<$list filter="[all[tiddlers+shadows]tag[$:/tags/wiki-test-spec]type[text/vnd.tiddlywiki-multiple]] [all[tiddlers+shadows]tag[$:/tags/wiki-test-spec-failing]type[text/vnd.tiddlywiki-multiple]]">
-
-<h2>
-
-<$link>
-
-<$text text=<<currentTiddler>>/>
-
-</$link>
-
-</h2>
-
-<$transclude
-	$tiddler="$:/core/ui/TestCaseTemplate"
-/>
-
-</$list>
--- a/core/ui/ControlPanel/TestCasesFailed.tid
+++ b/core/ui/ControlPanel/TestCasesFailed.tid
@@ -1,15 +0,0 @@
-title: $:/core/ui/ControlPanel/TestCases/Failed
-tags: $:/tags/ControlPanel/TestCases
-caption: {{$:/language/ControlPanel/TestCases/Failed/Caption}}
-
-\define lingo-base() $:/language/ControlPanel/
-<<lingo TestCases/Failed/Hint>>
-
-<$list filter="[all[tiddlers+shadows]tag[$:/tags/wiki-test-spec]type[text/vnd.tiddlywiki-multiple]] [all[tiddlers+shadows]tag[$:/tags/wiki-test-spec-failing]type[text/vnd.tiddlywiki-multiple]]">
-
-<$transclude
-	$tiddler="$:/core/ui/TestCaseTemplate"
-	hideIfPass="yes"
-/>
-
-</$list>
--- 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 class="tc-control-panel-setting" data-setting-title=<<currentTiddler>> style="border-top:1px solid #eee;">
+<div style="border-top:1px solid #eee;">

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

 <$transclude/>

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

-\function edit-preview-state()
-[{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[<qualified-preview-state>] +[get[text]] :else[[no]]
-\end
-
 \define config-visibility-title()
 $:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$
 \end
@@ -14,13 +10,12 @@ $:/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>] }}}
+	editPreviewStateTiddler={{{ [{$:/config/ShowEditPreview/PerTiddler}!match[yes]then[$:/state/showeditpreview]] :else[<qualify "$:/state/showeditpreview">] }}}
 	importTitle=<<qualify $:/ImportImage>>
 	importState=<<qualify $:/state/ImportImage>> >
 <$dropzone importTitle=<<importTitle>> autoOpenOnImport="no" contentTypesFilter={{$:/config/Editor/ImportContentTypesFilter}} class="tc-dropzone-editor" enable={{{ [{$:/config/DragAndDrop/Enable}match[no]] :else[subfilter{$:/config/Editor/EnableImportFilter}then[yes]else[no]] }}} filesOnly="yes" actions=<<importFileActions>> >
 <div>
-<div class={{{ [<edit-preview-state>match[yes]then[tc-tiddler-preview]else[tc-tiddler-preview-hidden]] [[tc-tiddler-editor]] +[join[ ]] }}}>
+<div class={{{ [<editPreviewStateTiddler>get[text]match[yes]then[tc-tiddler-preview]else[tc-tiddler-preview-hidden]] [[tc-tiddler-editor]] +[join[ ]] }}}>

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

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

-\define config-title() $:/config/EditToolbarButtons/Visibility/$(listItem)$
+\define config-title()
+$:/config/EditToolbarButtons/Visibility/$(listItem)$
+\end
 \whitespace trim
 <div class="tc-tiddler-title tc-tiddler-edit-title">
-	<$view field="title"/>
-	<span class="tc-tiddler-controls tc-titlebar">
-		<$list filter="[all[shadows+tiddlers]tag[$:/tags/EditToolbar]!has[draft.of]]" variable="listItem">
-			<$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,63 +3,39 @@ tags: $:/tags/EditTemplate

 \whitespace trim

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

-\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>
+\define tag-styles()
+background-color:$(backgroundColor)$;
+fill:$(foregroundColor)$;
+color:$(foregroundColor)$;
 \end

-\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>>
-/>
+\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>
 \end

-\procedure edit-tags-template(tagField:"tags")
+\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
 <div class="tc-edit-tags">
-	<$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>
+<$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>
 </div>
 \end
-<$let saveTiddler=<<currentTiddler>>>
-	<$macrocall $name="edit-tags-template" tagField=<<tagField>>/>
-</$let>
+<$set name="saveTiddler" value=<<currentTiddler>>>
+<$macrocall $name="edit-tags-template" tagField=<<tagField>>/>
+</$set>
--- a/core/ui/EditorToolbar/preview.tid
+++ b/core/ui/EditorToolbar/preview.tid
@@ -10,7 +10,7 @@ shortcuts: ((preview))

 \whitespace trim
 <span>
-	<$transclude $tiddler={{{ [<edit-preview-state>match[yes]then[$:/core/images/preview-open]else[$:/core/images/preview-closed]] }}} />
+	<$transclude $tiddler={{{ [<editPreviewStateTiddler>get[text]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"/>
+<$action-sendmessage $message="tm-edit-text-operation" $param="focus-editor"/>
--- a/core/ui/KeyboardShortcuts/refresh.tid
+++ b/core/ui/KeyboardShortcuts/refresh.tid
@@ -1,5 +0,0 @@
-title: $:/core/ui/KeyboardShortcuts/refresh
-tags: $:/tags/KeyboardShortcut
-key: ((refresh))
-
-<$action-sendmessage $message="tm-browser-refresh"/>
--- a/core/ui/PageControls.tid
+++ b/core/ui/PageControls.tid
@@ -1,14 +1,17 @@
 title: $:/core/ui/PageTemplate/pagecontrols

 \whitespace trim
-\function config-title() [[$:/config/PageControlButtons/Visibility/$(listItem)$]substitute[]]
-
+\define config-title()
+$:/config/PageControlButtons/Visibility/$(listItem)$
+\end
 <div class="tc-page-controls">
-	<$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem">
-		<$list filter="[<config-title>!text[hide]]" storyview="pop" variable="ignore">
-			<$let tv-config-toolbar-class={{{ [enlist<tv-config-toolbar-class>] [<listItem>encodeuricomponent[]addprefix[tc-btn-]] +[join[ ]] }}}>
-				<$transclude $tiddler=<<listItem>> $mode="inline"/>
-			</$let>
-		</$list>
-	</$list>
-</div>
+<$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,41 +4,48 @@ caption: {{$:/core/images/down-arrow}} {{$:/language/Buttons/More/Caption}}
 description: {{$:/language/Buttons/More/Hint}}

 \whitespace trim
-\define config-title() $:/config/PageControlButtons/Visibility/$(listItem)$
+\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>

-<$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/StandardLayout.tid
+++ b/core/ui/StandardLayout.tid
@@ -1,7 +1,7 @@
 title: $:/core/ui/PageTemplate
 name: {{$:/language/PageTemplate/Name}}
 description: {{$:/language/PageTemplate/Description}}
-icon: $:/core/images/standard-layout
+icon: $:/core/images/layout-button
 code-body: yes

 \whitespace trim
--- a/core/ui/TestCaseTemplate.tid
+++ b/core/ui/TestCaseTemplate.tid
@@ -1,19 +0,0 @@
-title: $:/core/ui/TestCaseTemplate
-
-\parameters (hideIfPass:"no")
-\whitespace trim
-<$let
-	linkTarget="yes"
-	displayFormat={{!!display-format}}
-	testcaseTiddler=<<currentTiddler>>
->
-	<$testcase
-		testOutput="Output"
-		testExpectedResult="ExpectedResult"
-		testActions="Actions"
-		testHideIfPass=<<hideIfPass>>
-	>
-		<$data $compound-tiddler=<<currentTiddler>>/>
-		<$data title="Description" text={{!!description}}/>
-	</$testcase>
-</$let>
--- a/core/ui/TestCases/DefaultTemplate.tid
+++ b/core/ui/TestCases/DefaultTemplate.tid
@@ -1,66 +0,0 @@
-title: $:/core/ui/testcases/DefaultTemplate
-
-\whitespace trim
-\procedure linkcatcherActions()
-<%if [<navigateTo>has[title]] %>
-	<$qualify title=<<state>> name="qualifiedState">
-		<$action-setfield $tiddler=<<qualifiedState>> text=<<navigateTo>>/>
-	</$qualify>
-<%endif%>
-\end
-
-<$let
-	state={{{ [<qualify "$:/state/testcase">] }}}
->
-	<div class="tc-test-case-wrapper">
-		<div class="tc-test-case-header">
-			<h2>
-				<$genesis $type={{{ [<linkTarget>!match[]then[$link]else[div]] }}} to=<<testcaseTiddler>>>
-					<%if [<testResult>!match[]] %>
-						<span class={{{ tc-test-case-result-icon [<testResult>!match[fail]then[tc-test-case-result-icon-pass]] [<testResult>match[fail]then[tc-test-case-result-icon-fail]] +[join[ ]] }}}>
-							<%if [<testResult>!match[fail]] %>
-								{{$:/core/images/done-button}}
-							<%else%>
-								{{$:/core/images/close-button}}
-							<%endif%>
-						</span>
-					<%endif%>
-					<$view tiddler="Description" mode="inline"/>
-				</$genesis>
-			</h2>
-		</div>
-		<%if [[Narrative]is[tiddler]] %>
-			<div class="tc-test-case-narrative">
-				<$transclude $tiddler="Narrative" mode="block"/>
-			</div>
-		<%endif%>
-		<%if [<testResult>match[fail]] %>
-			<div class="tc-test-case-result-fail">
-				<div class="tc-test-case-result-fail-header">
-					TEST FAILED
-				</div>
-				<div class="tc-test-case-result-fail-body">
-					<$diff-text source=<<expectedHTML>> dest=<<outputHTML>>/>
-				</div>
-			</div>
-		<%endif%>
-		<div class="tc-test-case-panes">
-			<div class="tc-test-case-source">
-				<$macrocall $name="tabs" tabsList="[all[tiddlers]sort[]] -[prefix<state>] -Description -Narrative -ExpectedResult -Output Output +[putfirst[]] -[has[plugin-type]]" state=<<state>> default="Output" template="$:/core/ui/testcases/DefaultTemplate/SourceTabs"/>
-			</div>
-			<div class="tc-test-case-divider">
-			</div>
-			<div class="tc-test-case-output">
-				<%if [<displayFormat>!match[]else[wikitext]match[plaintext]] %>
-					<pre><$view tiddler="Output" format="plainwikified" mode="block"/></pre>
-				<%else%>
-					<$linkcatcher actions=<<linkcatcherActions>>>
-						<$tiddler tiddler="Output">
-							<$transclude $tiddler="Output" $mode="block"/>
-						</$tiddler>
-					</$linkcatcher>
-				<%endif%>
-			</div>
-		</div>
-	</div>
-</$let>
--- a/core/ui/TestCases/DefaultTemplateSourceTabs.tid
+++ b/core/ui/TestCases/DefaultTemplateSourceTabs.tid
@@ -1,24 +0,0 @@
-title: $:/core/ui/testcases/DefaultTemplate/SourceTabs
-
-\whitespace trim
-\procedure body()
-<$list filter="[<currentTab>fields[]] -text +[limit[1]]" variable="ignore">
-	<table class="tc-field-table">
-		<tbody>
-			<$list filter="[<currentTab>fields[]sort[]] -text -title title +[putfirst[]]" variable="fieldName">
-				<tr>
-					<td>
-						<$text text=<<fieldName>>/>
-					</td>
-					<td>
-						<$view tiddler=<<currentTab>> field=<<fieldName>>/>
-					</td>
-				</tr>
-			</$list>
-		</tbody>
-	</table>
-</$list>
-<$edit class="tc-edit-texteditor" tiddler=<<currentTab>>/>
-\end
-
-<$transclude $variable="body" $mode="inline"/>
--- a/core/ui/TestCases/RawJSONTemplate.tid
+++ b/core/ui/TestCases/RawJSONTemplate.tid
@@ -1,4 +0,0 @@
-title: $:/core/ui/testcases/RawJSONTemplate
-
-\whitespace trim
-<$text text=<<payloadTiddlers>>/>
--- a/core/ui/ViewTemplate/title.tid
+++ b/core/ui/ViewTemplate/title.tid
@@ -2,38 +2,31 @@ title: $:/core/ui/ViewTemplate/title
 tags: $:/tags/ViewTemplate

 \whitespace trim
-\define title-styles() fill:$(foregroundColor)$;
-
+\define title-styles()
+fill:$(foregroundColor)$;
+\end
 <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 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 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>
--- a/core/ui/ViewToolbar/more-tiddler-actions.tid
+++ b/core/ui/ViewToolbar/more-tiddler-actions.tid
@@ -4,41 +4,49 @@ caption: {{$:/core/images/down-arrow}} {{$:/language/Buttons/More/Caption}}
 description: {{$:/language/Buttons/More/Hint}}

 \whitespace trim
-\define config-title() $:/config/ViewToolbarButtons/Visibility/$(listItem)$
-
-<$button popup=<<qualify "$:/state/popup/more">>
-	tooltip={{$:/language/Buttons/More/Hint}}
-	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)$
+\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="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.4/index.html
+url: https://tiddlywiki.com/library/v5.3.3/index.html
 caption: {{$:/language/OfficialPluginLibrary}}

 {{$:/language/OfficialPluginLibrary/Hint}}
--- a/core/wiki/config/ShortcutInfo.multids
+++ b/core/wiki/config/ShortcutInfo.multids
@@ -35,7 +35,6 @@ new-tiddler: {{$:/language/Buttons/NewTiddler/Hint}}
 picture: {{$:/language/Buttons/Picture/Hint}}
 preview: {{$:/language/Buttons/Preview/Hint}}
 quote: {{$:/language/Buttons/Quote/Hint}}
-refresh: {{$:/language/Buttons/Refresh/Hint}}
 save-tiddler: {{$:/language/Buttons/Save/Hint}}
 save-wiki: {{$:/language/Buttons/SaveWiki/Hint}}
 sidebar-search: {{$:/language/Buttons/SidebarSearch/Hint}}
--- a/core/wiki/config/ViewTemplateBodyFilters.multids
+++ b/core/wiki/config/ViewTemplateBodyFilters.multids
@@ -1,7 +1,6 @@
 title: $:/config/ViewTemplateBodyFilters/
 tags: $:/tags/ViewTemplateBodyFilter

-testcase: [tag[$:/tags/wiki-test-spec]type[text/vnd.tiddlywiki-multiple]then[$:/core/ui/TestCaseTemplate]] [tag[$:/tags/wiki-test-spec-failing]type[text/vnd.tiddlywiki-multiple]then[$:/core/ui/TestCaseTemplate]]
 stylesheet: [tag[$:/tags/Stylesheet]then[$:/core/ui/ViewTemplate/body/rendered-plain-text]]
 core-ui-tags: [tag[$:/tags/PageTemplate]] [tag[$:/tags/EditTemplate]] [tag[$:/tags/ViewTemplate]] [tag[$:/tags/KeyboardShortcut]] [tag[$:/tags/ImportPreview]] [tag[$:/tags/EditPreview]][tag[$:/tags/EditorToolbar]] [tag[$:/tags/Actions]] :then[[$:/core/ui/ViewTemplate/body/code]]
 system: [prefix[$:/boot/]] [prefix[$:/config/]] [prefix[$:/core/macros]] [prefix[$:/core/save/]] [prefix[$:/core/templates/]]  [prefix[$:/info/]] [prefix[$:/language/]] [prefix[$:/languages/]] [prefix[$:/snippets/]] [prefix[$:/state/]] [prefix[$:/status/]] [prefix[$:/info/]] [prefix[$:/temp/]] +[!is[image]limit[1]then[$:/core/ui/ViewTemplate/body/code]]
--- a/core/wiki/config/shortcuts/shortcuts-mac.multids
+++ b/core/wiki/config/shortcuts/shortcuts-mac.multids
@@ -6,5 +6,4 @@ underline: meta-U
 new-image: ctrl-I
 new-journal: ctrl-J
 new-tiddler: ctrl-N
-refresh: meta-R
 save-wiki: meta-S
--- a/core/wiki/config/shortcuts/shortcuts-not-mac.multids
+++ b/core/wiki/config/shortcuts/shortcuts-not-mac.multids
@@ -6,4 +6,3 @@ underline: ctrl-U
 new-image: alt-I
 new-journal: alt-J
 new-tiddler: alt-N
-refresh: ctrl-R
--- a/core/wiki/macros/CSS.tid
+++ b/core/wiki/macros/CSS.tid
@@ -1,69 +1,76 @@
 title: $:/core/macros/CSS
-tags: $:/tags/Macro $:/tags/Global
+tags: $:/tags/Macro

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

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

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

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

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

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

-\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[]]
+\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$);
+``
 \end

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

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

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

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

-\procedure if-background-attachment(text)
-<$reveal state="$:/themes/tiddlywiki/vanilla/settings/backgroundimage" type="nomatch" text=""><<text>></$reveal>
+\define if-background-attachment(text)
+<$reveal state="$:/themes/tiddlywiki/vanilla/settings/backgroundimage" type="nomatch" text="">$text$</$reveal>
 \end
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jeremy Ruston	535581cf81	Merge branch 'master' into confetti-plugin	2024-01-25 12:52:27 +00:00
Jeremy Ruston	0710054e64	WIP	2024-01-25 12:52:17 +00:00
Saq Imtiaz	a7d469ae99	Extends the tour plugin with a condition field (#7861 ) * feat: support condition field to determine whether a step should be shown * feat: add support for overriding the hint text using the field 'hint' from the step tiddler * fix: roll back tour display procedure for now until an override mechanism has been discussed * fix: renamed advance-criterion field and associated variables to step-success-filter * fix: renamed hint field to hint-text and selector to hint-selector * refactor: to create function to get all tour tiddlers filtered by their condition field * refactor: rename globals tiddlers to variables and avoid making any of the tour procedures global * fix: also rename globals.tid file to variables.tid * docs: cover all tour steps tiddler fields * fix: improve spacing in Tour HUD	2023-12-06 11:13:48 +00:00
Jeremy Ruston	547582c1e7	Tour wording tweaks	2023-10-24 12:52:24 +01:00
Jeremy Ruston	e40b83f141	More custom colours	2023-10-19 08:59:07 +01:00
Jeremy Ruston	518c23d06d	Use custom palette colours Makes it easier for people to use their own colour scheme for the tour	2023-10-17 16:47:27 +01:00
Jeremy Ruston	a2f4e71080	Simplify styling of tour overlay	2023-10-17 16:00:55 +01:00
Jeremy Ruston	10fad328dd	Merge branch 'master' into confetti-plugin	2023-10-17 11:56:06 +01:00
Jeremy Ruston	d7a58a01b9	Merge branch 'master' into confetti-plugin	2023-10-16 18:32:50 +01:00
Jeremy Ruston	b8fdb320dc	Merge branch 'master' into confetti-plugin	2023-10-16 14:31:13 +01:00
Jeremy Ruston	fd5c073654	Fix typos Thanks @pmario	2023-10-16 11:30:18 +01:00
Jeremy Ruston	343839b4d4	Wording and ordering tweaks	2023-10-15 17:36:30 +01:00
Jeremy Ruston	94e27ccc48	Adopt new conditional shortcut syntax	2023-10-15 13:06:59 +01:00
Jeremy Ruston	80c52d071e	Merge branch 'master' into confetti-plugin	2023-10-14 09:54:53 +01:00
Jeremy Ruston	cd2b375d80	Improve styling of task call-to-action and nav buttons	2023-10-13 10:18:01 +01:00
Jeremy Ruston	9eac359a5d	Improve wording	2023-10-13 09:06:35 +01:00
Jeremy Ruston	9b6570f420	Introduce step about tags	2023-10-12 18:10:12 +01:00
Jeremy Ruston	906cb8f92b	Fix initialisation when jumping to a tour step	2023-10-05 14:10:00 +01:00
Jeremy Ruston	6f46775e94	Use the tour step caption as the heading	2023-10-05 13:50:02 +01:00
Jeremy Ruston	aa3f931721	Expose custom tour settings	2023-10-05 13:40:33 +01:00
Jeremy Ruston	0213f1ab8f	Add a button to launch tour steps directly, and give them captions	2023-10-05 13:12:19 +01:00
Jeremy Ruston	1351109119	Tweak styling of tour chooser dropdown	2023-10-03 18:41:09 +01:00
Jeremy Ruston	3254684dd6	Update docs	2023-10-03 18:40:48 +01:00
Jeremy Ruston	29575d01bf	Avoid having to embed confetti in the final step	2023-10-03 18:22:57 +01:00
Jeremy Ruston	b1eece2a93	Add a settings pane giving a birds eye view of a tour	2023-10-03 16:23:30 +01:00
Jeremy Ruston	1c6fba6108	Merge branch 'master' into confetti-plugin	2023-10-03 10:04:09 +01:00
Jeremy Ruston	c3167d5368	Clarify docs	2023-09-29 09:48:43 +01:00
Jeremy Ruston	184e30afb8	Finish allowing the name "TiddlyWiki" to be customised Some of the code was in the previous commit. Next we'll wire up the user interface	2023-09-27 14:28:35 +01:00
Jeremy Ruston	44d322868f	Clean up tiddler titles within the introduction tour	2023-09-27 14:22:44 +01:00
Jeremy Ruston	455a51f671	Merge branch 'master' into confetti-plugin	2023-09-27 14:09:00 +01:00
Jeremy Ruston	5ea2243fd9	Fix gap between navigation buttons	2023-09-22 14:53:51 +01:00
Jeremy Ruston	5a4470e6ed	Remove obsolete state tiddler Not needed because now we initialise it in startup actions	2023-09-22 14:53:39 +01:00
Jeremy Ruston	d460f9f066	Simplify tour step format	2023-09-22 10:55:39 +01:00
Jeremy Ruston	ef5b3a8840	Use whitespace trim Note that the setting is inherited by procedure and widget definitions	2023-09-21 11:31:23 +01:00
Jeremy Ruston	4ef8ce3caa	Ensure that the current tour isn't listed as an option in the final step	2023-09-21 10:24:34 +01:00
Jeremy Ruston	6088fd7d95	Add tour chooser	2023-09-21 09:59:28 +01:00
Jeremy Ruston	c7cac0f7ea	Remove old debugging code	2023-09-20 15:27:53 +01:00
Jeremy Ruston	7b1701583f	Add "using tags" as a separate tour	2023-09-20 15:27:39 +01:00
Jeremy Ruston	804e253f93	Remove obsolete text	2023-09-20 15:27:21 +01:00
Jeremy Ruston	7c619da913	Merge branch 'master' into confetti-plugin	2023-09-20 12:59:39 +01:00
Jeremy Ruston	4e938fad00	Merge branch 'master' into confetti-plugin	2023-09-11 18:57:02 +01:00
Jeremy Ruston	943dcd7567	Fix build process We build a separate tour.html wiki, but can include the tour in other wikis too	2023-09-11 09:26:58 +01:00
Jeremy Ruston	783a5be00e	Better labelling for the main preview	2023-09-11 09:14:42 +01:00
Jeremy Ruston	4792d241c4	Tour should autostart in the tour edition, but not in the main wiki	2023-09-10 18:27:01 +01:00
Jeremy Ruston	06af391773	Tours should have a $:/tags/Tour tag	2023-09-10 17:23:48 +01:00
Jeremy Ruston	0656580439	Simplify styles for top bar	2023-09-10 17:23:31 +01:00
Jeremy Ruston	a4d74be3d8	Update docs	2023-09-10 17:23:18 +01:00
Jeremy Ruston	701a038559	Remove wikification from welcome tour step	2023-09-10 17:23:05 +01:00
Jeremy Ruston	dd9b4dc787	Refactor to allow multiple tours to be loaded at once	2023-09-10 15:23:05 +01:00
Jeremy Ruston	4f026e45a8	Add a tour logo	2023-09-10 12:29:11 +01:00
Jeremy Ruston	d2fbbc408a	Change "startup-actions" field to "enter-actions" to avoid confusion	2023-09-10 11:34:34 +01:00
Jeremy Ruston	c9d8806682	Refactor to use global procedures to control the tour	2023-09-10 11:28:23 +01:00
Jeremy Ruston	d28cf74115	Add page control button to start tour Also make the tour controls visible in full screen mode	2023-09-10 11:00:55 +01:00
Jeremy Ruston	d332baabe7	Merge branch 'master' into confetti-plugin	2023-09-09 16:10:42 +01:00
Jeremy Ruston	d29ed6a5de	Merge branch 'master' into confetti-plugin	2023-08-30 09:48:15 +01:00
Jeremy Ruston	0c5c673ddc	Merge branch 'master' into confetti-plugin	2023-08-21 22:46:56 +01:00
Jeremy Ruston	1721203a69	Missing tag	2023-07-20 15:55:21 +01:00
Jeremy Ruston	3d0a015ae5	Populate tour edition with solar system data From Simple English Wikipedia	2023-07-20 13:15:55 +01:00
Jeremy Ruston	080ca5ed31	Fix typo in build script	2023-07-20 09:51:11 +01:00
Jeremy Ruston	abcd2f110f	Build the tour edition in the preview	2023-07-20 09:38:44 +01:00
Jeremy Ruston	cf9864ebe3	Remove Anna Freud references from welcome tiddler	2023-07-20 09:38:33 +01:00
Jeremy Ruston	1aef8405bd	Add full screen section of tour and tour edition	2023-07-20 08:45:44 +01:00
Jeremy Ruston	d419161686	Merge branch 'master' into confetti-plugin	2023-07-20 08:45:33 +01:00
jeremy@jermolene.com	9d2bab0ae3	Merge branch 'master' into confetti-plugin	2023-06-01 15:30:31 +01:00
jeremy@jermolene.com	40fd941394	Merge branch 'master' into confetti-plugin	2023-06-01 15:22:57 +01:00
jeremy@jermolene.com	8fd4da607d	Mark dependents of the tour plugin	2023-05-29 14:44:22 +01:00
jeremy@jermolene.com	62d0c197eb	Tweaks to tour buttons	2023-05-10 10:14:26 +01:00
jeremy@jermolene.com	1c3dd6b39b	Don't link TiddlyWiki in the tour panel	2023-05-10 10:14:15 +01:00
jeremy@jermolene.com	36041cf38b	Clarify wording of confetti demo	2023-05-10 10:13:45 +01:00
jeremy@jermolene.com	87c2fb390a	Include confetti plugin in prerelease	2023-05-10 10:13:36 +01:00
jeremy@jermolene.com	f9cf5764ff	Merge branch 'master' into confetti-plugin	2023-05-10 10:12:56 +01:00
jeremy@jermolene.com	55a52c9d8d	Merge branch 'master' into confetti-plugin	2023-05-04 09:45:37 +01:00
jeremy@jermolene.com	0c67269a20	Merge branch 'master' into confetti-plugin	2023-04-12 13:33:11 +01:00
jeremy@jermolene.com	74258d66b8	Adjust hint selectors for create tiddler tour step	2023-04-12 13:33:08 +01:00
jeremy@jermolene.com	5fe542a05b	Use new element spotlight to provide hints	2023-02-01 21:14:29 +00:00
jeremy@jermolene.com	0bc6decefb	Merge branch 'master' into confetti-plugin	2023-02-01 19:06:10 +00:00
jeremy@jermolene.com	8169e43087	More and bigger confetti by default	2023-02-01 17:12:28 +00:00
jeremy@jermolene.com	1d32ef44e5	Add element spotlight to dynannotate plugin Useful for highlighting on screen elements for the user	2023-02-01 17:12:06 +00:00
jeremy@jermolene.com	75af83174b	Merge branch 'master' into confetti-plugin	2023-01-24 12:40:52 +00:00
jeremy@jermolene.com	f4f37460b8	Add tour plugin	2023-01-16 19:56:39 +00:00
jeremy@jermolene.com	5b9f464f26	Add confetti widget	2023-01-16 19:45:05 +00:00
jeremy@jermolene.com	9676706052	Add support for delay parameter	2023-01-16 11:05:10 +00:00
jeremy@jermolene.com	c977baebca	Typo	2023-01-15 21:59:07 +00:00
jeremy@jermolene.com	8a1ec1d055	First commit	2023-01-15 21:41:54 +00:00