Initial Commit

2026-01-23 19:34:39 +00:00 · 2023-09-15 12:10:55 +01:00
848 changed files with 2843 additions and 14001 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,7 +5,7 @@ on:
      - master
      - tiddlywiki-com
 env:
-  NODE_VERSION: "18"
+  NODE_VERSION: "12"
 jobs:
  test:
    runs-on: ubuntu-latest
@@ -14,13 +14,7 @@ jobs:
      - uses: actions/setup-node@v1
        with:
          node-version: "${{ env.NODE_VERSION }}"
-      - run: "./bin/ci-test.sh"
-      - uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: playwright-report
-          path: playwright-report/
-          retention-days: 30
+      - run: "./bin/test.sh"
  build-prerelease:
    runs-on: ubuntu-latest
    if: github.ref == 'refs/heads/master'
@@ -60,7 +54,6 @@ jobs:
      TW5_BUILD_TIDDLYWIKI: "./node_modules/tiddlywiki/tiddlywiki.js"
      TW5_BUILD_MAIN_EDITION: "./editions/tw5.com"
      TW5_BUILD_OUTPUT: "./output"
-      TW5_BUILD_ARCHIVE: "./output"
    steps:
      - uses: actions/checkout@v2
      - uses: actions/setup-node@v1
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,4 @@
 tmp/
 output/
 node_modules/
-/test-results/
-/playwright-report/
-/playwright/.cache/
-$__StoryList.tid
+
--- a/bin/build-site.sh
+++ b/bin/build-site.sh
@@ -5,7 +5,7 @@
 # Default to the current version number for building the plugin library

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

 echo "Using TW5_BUILD_VERSION as [$TW5_BUILD_VERSION]"
@@ -84,27 +84,10 @@ echo -e -n "title: $:/build\ncommit: $TW5_BUILD_COMMIT\n\n$TW5_BUILD_DETAILS\n"

 ######################################################
 #
-# Core distributions
+# Core distribution
 #
 ######################################################

-# Conditionally build archive if $TW5_BUILD_ARCHIVE variable is set, otherwise do nothing
-#
-# /archive/Empty-TiddlyWiki-<version>.html	Empty archived version
-# /archive/TiddlyWiki-<version>.html		Full archived version
-
-if [ -n "$TW5_BUILD_ARCHIVE" ]; then
-
-node $TW5_BUILD_TIDDLYWIKI \
-	$TW5_BUILD_MAIN_EDITION \
-	--verbose \
-	--version \
-	--load $TW5_BUILD_OUTPUT/build.tid \
-	--output $TW5_BUILD_ARCHIVE \
-	--build archive \
-	|| exit 1
-fi
-
 # /index.html			Main site
 # /favicon.ico			Favicon for main site
 # /static.html			Static rendering of default tiddlers
@@ -112,7 +95,6 @@ fi
 # /static/*				Static single tiddlers
 # /static/static.css	Static stylesheet
 # /static/favicon.ico	Favicon for static pages
-
 node $TW5_BUILD_TIDDLYWIKI \
 	$TW5_BUILD_MAIN_EDITION \
 	--verbose \
@@ -156,28 +138,6 @@ node $TW5_BUILD_TIDDLYWIKI \
 	--build index favicon static \
 	|| exit 1

-# /tour.html			tour edition
-node $TW5_BUILD_TIDDLYWIKI \
-	./editions/tour \
-	--verbose \
-	--output $TW5_BUILD_OUTPUT \
-	--rendertiddler $:/core/save/all tour.html text/plain \
-	|| exit 1
-
-# /dev/index.html			Developer docs
-# /dev/favicon.ico			Favicon for dev site
-# /dev/static.html			Static rendering of default tiddlers
-# /dev/alltiddlers.html		Static rendering of all tiddlers
-# /dev/static/*				Static single tiddlers
-# /dev/static/static.css	Static stylesheet
-node $TW5_BUILD_TIDDLYWIKI \
-	./editions/dev \
-	--verbose \
-	--load $TW5_BUILD_OUTPUT/build.tid \
-	--output $TW5_BUILD_OUTPUT/dev \
-	--build index favicon static \
-	|| exit 1
-
 # /share.html				Custom edition for sharing via the URL
 node $TW5_BUILD_TIDDLYWIKI \
 	./editions/share \
--- a/bin/ci-test.sh
+++ b/bin/ci-test.sh
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# test TiddlyWiki5 for tiddlywiki.com
-
-node ./tiddlywiki.js \
-	./editions/test \
-	--verbose \
-	--version \
-	--rendertiddler $:/core/save/all test.html text/plain \
-	--test \
-	|| exit 1
-
-npm install playwright @playwright/test
-npx playwright install chromium firefox --with-deps
-
-npx playwright test
--- a/boot/boot.js
+++ b/boot/boot.js
@@ -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();
@@ -812,7 +786,6 @@ $tw.utils.Crypto = function() {
 			}
 			return outputText;
 		};
-	$tw.sjcl = sjcl;
 	this.setPassword = function(newPassword) {
 		currentPassword = newPassword;
 		this.updateCryptoStateTiddler();
@@ -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);
@@ -2465,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");
@@ -2480,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");
@@ -2706,18 +2674,6 @@ $tw.hooks.addHook = function(hookName,definition) {
 	}
 };

-/*
-Delete hooks from the hashmap
-*/
-$tw.hooks.removeHook = function(hookName,definition) {
-	if($tw.utils.hop($tw.hooks.names,hookName)) {
-		var p = $tw.hooks.names[hookName].indexOf(definition);
-		if(p !== -1) {
-			$tw.hooks.names[hookName].splice(p, 1);
-		}
-	}
-};
-
 /*
 Invoke the hook by key
 */
--- a/core/copyright.tid
+++ b/core/copyright.tid
@@ -4,7 +4,7 @@ type: text/plain
 TiddlyWiki created by Jeremy Ruston, (jeremy [at] jermolene [dot] com)

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

 Redistribution and use in source and binary forms, with or without
--- a/core/images/default-layout.tid
+++ b/core/images/default-layout.tid
@@ -1,7 +0,0 @@
-title: $:/core/images/default-layout
-tags: $:/tags/Image
-
-\parameters (size:"22pt")
-<svg width=<<size>> height=<<size>> class="tc-image-default-layout tc-image-button" viewBox="0 0 128 128">
-    <path d="M71.93 72A8.07 8.07 0 0 1 80 80.07v7.86A8.071 8.071 0 0 1 71.93 96H8.07A8.067 8.067 0 0 1 0 87.93v-7.86A8.072 8.072 0 0 1 8.07 72h63.86Zm0 32a8.07 8.07 0 0 1 8.07 8.07v7.86a8.071 8.071 0 0 1-8.07 8.07H8.07A8.067 8.067 0 0 1 0 119.93v-7.86A8.072 8.072 0 0 1 8.07 104h63.86Zm0-104A8.068 8.068 0 0 1 80 8.07v47.86A8.073 8.073 0 0 1 71.93 64H8.07A8.07 8.07 0 0 1 0 55.93V8.07A8.072 8.072 0 0 1 8.07 0h63.86Zm48 0c2.14 0 4.193.85 5.706 2.364A8.067 8.067 0 0 1 128 8.07v111.86c0 2.14-.85 4.193-2.364 5.706A8.067 8.067 0 0 1 119.93 128H96.07c-2.14 0-4.193-.85-5.706-2.364A8.067 8.067 0 0 1 88 119.93V8.07c0-2.14.85-4.193 2.364-5.706A8.067 8.067 0 0 1 96.07 0h23.86ZM116 24h-16a3.995 3.995 0 0 0-2.828 1.172 3.995 3.995 0 0 0 0 5.656A3.995 3.995 0 0 0 100 32h16a3.995 3.995 0 0 0 2.828-1.172 3.995 3.995 0 0 0 0-5.656A3.995 3.995 0 0 0 116 24Z"/>
-</svg>
--- a/core/language/en-GB/Buttons.multids
+++ b/core/language/en-GB/Buttons.multids
@@ -28,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/Exporters.multids
+++ b/core/language/en-GB/Exporters.multids
@@ -3,4 +3,4 @@ title: $:/language/Exporters/
 StaticRiver: Static HTML
 JsonFile: JSON file
 CsvFile: CSV file
-TidFile: TID text file
+TidFile: ".tid" file
--- a/core/language/en-GB/Fields.multids
+++ b/core/language/en-GB/Fields.multids
@@ -4,7 +4,6 @@ _canonical_uri: The full URI of an external image tiddler
 author: Name of the author of a plugin
 bag: The name of the bag from which a tiddler came
 caption: The text to be displayed on a tab or button
-class: The CSS class applied to a tiddler when rendering it - see [[Custom styles by user-class]].  Also used for [[Modals]]
 code-body: The view template will display the tiddler as code if set to ''yes''
 color: The CSS color value associated with a tiddler
 component: The name of the component responsible for an [[alert tiddler|AlertMechanism]]
--- a/core/language/en-GB/Help/commands.tid
+++ b/core/language/en-GB/Help/commands.tid
@@ -10,7 +10,7 @@ Sequentially run the command tokens returned from a filter
 Examples

 ```
--commands "[enlist:raw{$:/build-commands-as-text}]"
+--commands "[enlist{$:/build-commands-as-text}]"
 ```

 ```
--- a/core/language/en-GB/Help/savewikifolder.tid
+++ b/core/language/en-GB/Help/savewikifolder.tid
@@ -19,7 +19,7 @@ The following options are supported:
 ** ''yes'' will "explode" plugins into separate tiddler files and save them to the plugin directory within the wiki folder
 ** ''no'' will suppress exploding plugins into their constituent tiddler files. It will save the plugin as a single JSON tiddler in the tiddlers folder

-Note that both ''explodePlugins'' options will produce wiki folders that build the exact same original wiki. The difference lies in how plugins are represented in the wiki folder.
+Note that both ''explodePlugins'' options will produce wiki folders that build the same exact same original wiki. The difference lies in how plugins are represented in the wiki folder.

 A common usage is to convert a TiddlyWiki HTML file into a wiki folder:

@@ -31,4 +31,4 @@ Save the plugin to the tiddlers directory of the target wiki folder:

 ```
 tiddlywiki --load ./mywiki.html --savewikifolder ./mywikifolder explodePlugins=no
-```
+```
--- 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''.`
--- a/core/language/en-GB/Types/image_svg_xml.tid
+++ b/core/language/en-GB/Types/image_svg_xml.tid
@@ -1,5 +1,5 @@
 title: $:/language/Docs/Types/image/svg+xml
-description: SVG image
+description: Structured Vector Graphics image
 name: image/svg+xml
 group: Image
 group-sort: 1
--- a/core/language/en-GB/Types/image_x-icon.tid
+++ b/core/language/en-GB/Types/image_x-icon.tid
@@ -1,5 +1,5 @@
 title: $:/language/Docs/Types/image/x-icon
-description: ICO icon
+description: ICO format icon file
 name: image/x-icon
 group: Image
 group-sort: 1
--- 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/save.js
+++ b/core/modules/commands/save.js
@@ -43,9 +43,7 @@ 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) {
 						console.log("Saving \"" + title + "\" to \"" + fileInfo.filepath + "\"");
--- a/core/modules/commands/savetiddlers.js
+++ b/core/modules/commands/savetiddlers.js
@@ -46,7 +46,7 @@ Command.prototype.execute = function() {
 			type = tiddler.fields.type || "text/vnd.tiddlywiki",
 			contentTypeInfo = $tw.config.contentTypeInfo[type] || {encoding: "utf8"},
 			filename = path.resolve(pathname,$tw.utils.encodeURIComponentExtended(title));
-		fs.writeFileSync(filename,tiddler.fields.text || "",contentTypeInfo.encoding);
+		fs.writeFileSync(filename,tiddler.fields.text,contentTypeInfo.encoding);
 	});
 	return null;
 };
--- a/core/modules/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/all.js
+++ b/core/modules/filters/all.js
@@ -28,8 +28,12 @@ function getAllFilterOperators() {
 Export our filter function
 */
 exports.all = function(source,operator,options) {
+	// Get our suboperators
+	var allFilterOperators = getAllFilterOperators();
+	// Cycle through the suboperators accumulating their results
+	var results = new $tw.utils.LinkedList(),
+		subops = operator.operand.split("+");
 	// Check for common optimisations
-	var subops = operator.operand.split("+");
 	if(subops.length === 1 && subops[0] === "") {
 		return source;
 	} else if(subops.length === 1 && subops[0] === "tiddlers") {
@@ -42,10 +46,6 @@ exports.all = function(source,operator,options) {
 		return options.wiki.eachShadowPlusTiddlers;
 	}
 	// Do it the hard way
-	// Get our suboperators
-	var allFilterOperators = getAllFilterOperators();
-	// Cycle through the suboperators accumulating their results
-	var results = new $tw.utils.LinkedList();
 	for(var t=0; t<subops.length; t++) {
 		var subop = allFilterOperators[subops[t]];
 		if(subop) {
--- 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/encodings.js
+++ b/core/modules/filters/encodings.js
@@ -18,20 +18,16 @@ Export our filter functions

 exports.decodebase64 = function(source,operator,options) {
 	var results = [];
-	var binary = operator.suffixes && operator.suffixes.indexOf("binary") !== -1;
-	var urlsafe = operator.suffixes && operator.suffixes.indexOf("urlsafe") !== -1;
 	source(function(tiddler,title) {
-		results.push($tw.utils.base64Decode(title,binary,urlsafe));
+		results.push($tw.utils.base64Decode(title));
 	});
 	return results;
 };

 exports.encodebase64 = function(source,operator,options) {
 	var results = [];
-	var binary = operator.suffixes && operator.suffixes.indexOf("binary") !== -1;
-	var urlsafe = operator.suffixes && operator.suffixes.indexOf("urlsafe") !== -1;
 	source(function(tiddler,title) {
-		results.push($tw.utils.base64Encode(title,binary,urlsafe));
+		results.push($tw.utils.base64Encode(title));
 	});
 	return results;
 };
--- a/core/modules/filters/json-ops.js
+++ b/core/modules/filters/json-ops.js
@@ -213,18 +213,6 @@ function getDataItemType(data,indexes) {
 	}
 }

-function getItemAtIndex(item,index) {
-	if($tw.utils.hop(item,index)) {
-		return item[index];
-	} else if($tw.utils.isArray(item)) {
-		index = $tw.utils.parseInt(index);
-		if(index < 0) { index = index + item.length };
-		return item[index]; // Will be undefined if index was out-of-bounds
-	} else {
-		return undefined;
-	}
-}
-
 /*
 Given a JSON data structure and an array of index strings, return the value at the end of the index chain, or "undefined" if any of the index strings are invalid
 */
@@ -237,7 +225,7 @@ function getDataItem(data,indexes) {
 	for(var i=0; i<indexes.length; i++) {
 		if(item !== undefined) {
 			if(item !== null && ["number","string","boolean"].indexOf(typeof item) === -1) {
-				item = getItemAtIndex(item,indexes[i]);
+				item = item[indexes[i]];
 			} else {
 				item = undefined;
 			}
@@ -261,22 +249,17 @@ function setDataItem(data,indexes,value) {
 	// Traverse the JSON data structure using the index chain
 	var current = data;
 	for(var i = 0; i < indexes.length - 1; i++) {
-		current = getItemAtIndex(current,indexes[i]);
-		if(current === undefined) {
+		var index = indexes[i];
+		if($tw.utils.hop(current,index)) {
+			current = current[index];
+		} else {
 			// Return the original JSON data structure if any of the index strings are invalid
 			return data;
 		}
 	}
 	// Add the value to the end of the index chain
 	var lastIndex = indexes[indexes.length - 1];
-	if($tw.utils.isArray(current)) {
-		lastIndex = $tw.utils.parseInt(lastIndex);
-		if(lastIndex < 0) { lastIndex = lastIndex + current.length };
-	}
-	// Only set indexes on objects and arrays
-	if(typeof current === "object") {
-		current[lastIndex] = value;
-	}
+	current[lastIndex] = value;
 	return data;
 }

--- a/core/modules/filters/listops.js
+++ b/core/modules/filters/listops.js
@@ -58,7 +58,6 @@ Last entry/entries in list
 exports.last = function(source,operator,options) {
 	var count = $tw.utils.getInt(operator.operand,1),
 		results = [];
-	if(count === 0) return results;
 	source(function(tiddler,title) {
 		results.push(title);
 	});
--- 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,119 +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) {
-	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/textparser.js
+++ b/core/modules/parsers/textparser.js
@@ -14,12 +14,10 @@ The plain text parser processes blocks of source text into a degenerate parse tr

 var TextParser = function(type,text,options) {
 	this.tree = [{
-		type: "genesis",
+		type: "codeblock",
 		attributes: {
-			$type: {name: "$type", type: "string", value: "$codeblock"},
-			code: {name: "code", type: "string", value: text},
-			language: {name: "language", type: "string", value: type},
-			$remappable: {name: "$remappable", type:"string", value: "no"}
+			code: {type: "string", value: text},
+			language: {type: "string", value: type}
 		}
 	}];
 	this.source = text;
@@ -34,3 +32,4 @@ exports["text/css"] = TextParser;
 exports["application/x-tiddler-dictionary"] = TextParser;

 })();
+
--- a/core/modules/parsers/wikiparser/rules/conditional.js
+++ b/core/modules/parsers/wikiparser/rules/conditional.js
@@ -1,120 +0,0 @@
-/*\
-title: $:/core/modules/parsers/wikiparser/rules/conditional.js
-type: application/javascript
-module-type: wikirule
-
-Conditional shortcut syntax
-
-```
-This is a <% if [{something}] %>Elephant<% elseif [{else}] %>Pelican<% else %>Crocodile<% endif %>
-```
-
-\*/
-(function(){
-
-/*jslint node: true, browser: true */
-/*global $tw: false */
-"use strict";
-
-exports.name = "conditional";
-exports.types = {inline: true, block: true};
-
-exports.init = function(parser) {
-	this.parser = parser;
-	// Regexp to match
-	this.matchRegExp = /\<\%\s*if\s+/mg;
-	this.terminateIfRegExp = /\%\>/mg;
-};
-
-exports.findNextMatch = function(startPos) {
-	// Look for the next <% if shortcut
-	this.matchRegExp.lastIndex = startPos;
-	this.match = this.matchRegExp.exec(this.parser.source);
-	// If not found then return no match
-	if(!this.match) {
-		return undefined;
-	}
-	// Check for the next %>
-	this.terminateIfRegExp.lastIndex = this.match.index;
-	this.terminateIfMatch = this.terminateIfRegExp.exec(this.parser.source);
-	// If not found then return no match
-	if(!this.terminateIfMatch) {
-		return undefined;
-	}
-	// Return the position at which the construction was found
-	return this.match.index;
-};
-
-/*
-Parse the most recent match
-*/
-exports.parse = function() {
-	// Get the filter condition
-	var filterCondition = this.parser.source.substring(this.match.index + this.match[0].length,this.terminateIfMatch.index);
-	// Advance the parser position to past the %>
-	this.parser.pos = this.terminateIfMatch.index + this.terminateIfMatch[0].length;
-	// Parse the if clause
-	return this.parseIfClause(filterCondition);
-};
-
-exports.parseIfClause = function(filterCondition) {
-	// Create the list widget
-	var listWidget = {
-		type: "list",
-		tag: "$list",
-		isBlock: this.is.block,
-		children: [
-			{
-				type: "list-template",
-				tag: "$list-template"
-			},
-			{
-				type: "list-empty",
-				tag: "$list-empty"
-			}
-		]
-	};
-	$tw.utils.addAttributeToParseTreeNode(listWidget,"filter",filterCondition);
-	$tw.utils.addAttributeToParseTreeNode(listWidget,"variable","condition");
-	$tw.utils.addAttributeToParseTreeNode(listWidget,"limit","1");
-	// Check for an immediately following double linebreak
-	var hasLineBreak = !!$tw.utils.parseTokenRegExp(this.parser.source,this.parser.pos,/([^\S\n\r]*\r?\n(?:[^\S\n\r]*\r?\n|$))/g);
-	// Parse the body looking for else or endif
-	var reEndString = "\\<\\%\\s*(endif)\\s*\\%\\>|\\<\\%\\s*(else)\\s*\\%\\>|\\<\\%\\s*(elseif)\\s+([\\s\\S]+?)\\%\\>",
-		ex;
-	if(hasLineBreak) {
-		ex = this.parser.parseBlocksTerminatedExtended(reEndString);
-	} else {
-		var reEnd = new RegExp(reEndString,"mg");
-		ex = this.parser.parseInlineRunTerminatedExtended(reEnd,{eatTerminator: true});
-	}
-	// Put the body into the list template
-	listWidget.children[0].children = ex.tree;
-	// Check for an else or elseif
-	if(ex.match) {
-		if(ex.match[1] === "endif") {
-			// Nothing to do if we just found an endif
-		} else if(ex.match[2] === "else") {
-			// Check for an immediately following double linebreak
-			hasLineBreak = !!$tw.utils.parseTokenRegExp(this.parser.source,this.parser.pos,/([^\S\n\r]*\r?\n(?:[^\S\n\r]*\r?\n|$))/g);
-			// If we found an else then we need to parse the body looking for the endif
-			var reEndString = "\\<\\%\\s*(endif)\\s*\\%\\>",
-			ex;
-			if(hasLineBreak) {
-				ex = this.parser.parseBlocksTerminatedExtended(reEndString);
-			} else {
-				var reEnd = new RegExp(reEndString,"mg");
-				ex = this.parser.parseInlineRunTerminatedExtended(reEnd,{eatTerminator: true});
-			}
-			// Put the parsed content inside the list empty template
-			listWidget.children[1].children = ex.tree;
-		} else if(ex.match[3] === "elseif") {
-			// Parse the elseif clause by reusing this parser, passing the new filter condition
-			listWidget.children[1].children = this.parseIfClause(ex.match[4]);
-		}
-	}
-	// Return the parse tree node
-	return [listWidget];
-};
-
-})();
--- a/core/modules/parsers/wikiparser/rules/fnprocdef.js
+++ b/core/modules/parsers/wikiparser/rules/fnprocdef.js
@@ -49,11 +49,11 @@ exports.parse = function() {
 	if(this.match[3]) {
 		params = $tw.utils.parseParameterDefinition(this.match[4]);
 	}
-	// Is the remainder of the line blank after the parameter close paren?
+	// Is this a multiline definition?
 	var reEnd;
 	if(this.match[5]) {
-		// If so, it is a multiline definition and the end of the body is marked with \end
-		reEnd = new RegExp("((:?^|\\r?\\n)[^\\S\\n\\r]*\\\\end[^\\S\\n\\r]*(?:" + $tw.utils.escapeRegExp(this.match[2]) + ")?(?:$|\\r?\\n))","mg");
+		// If so, the end of the body is marked with \end
+		reEnd = new RegExp("(\\r?\\n[^\\S\\n\\r]*\\\\end[^\\S\\n\\r]*(?:" + $tw.utils.escapeRegExp(this.match[2]) + ")?(?:$|\\r?\\n))","mg");
 	} else {
 		// Otherwise, the end of the definition is marked by the end of the line
 		reEnd = /($|\r?\n)/mg;
--- a/core/modules/parsers/wikiparser/rules/macrodef.js
+++ b/core/modules/parsers/wikiparser/rules/macrodef.js
@@ -54,11 +54,11 @@ exports.parse = function() {
 			paramMatch = reParam.exec(paramString);
 		}
 	}
-	// Is the remainder of the \define line blank after the parameter close paren?
+	// Is this a multiline definition?
 	var reEnd;
 	if(this.match[3]) {
-		// If so, it is a multiline definition and the end of the body is marked with \end
-		reEnd = new RegExp("((?:^|\\r?\\n)[^\\S\\n\\r]*\\\\end[^\\S\\n\\r]*(?:" + $tw.utils.escapeRegExp(this.match[1]) + ")?(?:$|\\r?\\n))","mg");
+		// If so, the end of the body is marked with \end
+		reEnd = new RegExp("(\\r?\\n[^\\S\\n\\r]*\\\\end[^\\S\\n\\r]*(?:" + $tw.utils.escapeRegExp(this.match[1]) + ")?(?:$|\\r?\\n))","mg");
 	} else {
 		// Otherwise, the end of the definition is marked by the end of the line
 		reEnd = /($|\r?\n)/mg;
--- a/core/modules/parsers/wikiparser/rules/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/parsers/wikiparser/wikiparser.js
+++ b/core/modules/parsers/wikiparser/wikiparser.js
@@ -194,7 +194,6 @@ Parse any pragmas at the beginning of a block of parse text
 WikiParser.prototype.parsePragmas = function() {
 	var currentTreeBranch = this.tree;
 	while(true) {
-		var savedPos = this.pos;
 		// Skip whitespace
 		this.skipWhitespace();
 		// Check for the end of the text
@@ -205,7 +204,6 @@ WikiParser.prototype.parsePragmas = function() {
 		var nextMatch = this.findNextMatch(this.pragmaRules,this.pos);
 		// If not, just exit
 		if(!nextMatch || nextMatch.matchIndex !== this.pos) {
-			this.pos = savedPos;
 			break;
 		}
 		// Process the pragma rule
@@ -216,8 +214,6 @@ WikiParser.prototype.parsePragmas = function() {
 			subTree[0].children = [];
 			currentTreeBranch = subTree[0].children;
 		}
-		// Skip whitespace after the pragma
-		this.skipWhitespace();
 	}
 	return currentTreeBranch;
 };
@@ -227,7 +223,7 @@ Parse a block from the current position
 	terminatorRegExpString: optional regular expression string that identifies the end of plain paragraphs. Must not include capturing parenthesis
 */
 WikiParser.prototype.parseBlock = function(terminatorRegExpString) {
-	var terminatorRegExp = terminatorRegExpString ? new RegExp(terminatorRegExpString + "|\\r?\\n\\r?\\n","mg") : /(\r?\n\r?\n)/mg;
+	var terminatorRegExp = terminatorRegExpString ? new RegExp("(" + terminatorRegExpString + "|\\r?\\n\\r?\\n)","mg") : /(\r?\n\r?\n)/mg;
 	this.skipWhitespace();
 	if(this.pos >= this.sourceLength) {
 		return [];
@@ -267,22 +263,12 @@ WikiParser.prototype.parseBlocksUnterminated = function() {
 	return tree;
 };

-/*
-Parse blocks of text until a terminating regexp is encountered. Wrapper for parseBlocksTerminatedExtended that just returns the parse tree
-*/
-WikiParser.prototype.parseBlocksTerminated = function(terminatorRegExpString) {
-	var ex = this.parseBlocksTerminatedExtended(terminatorRegExpString);
-	return ex.tree;
-};
-
 /*
 Parse blocks of text until a terminating regexp is encountered
 */
-WikiParser.prototype.parseBlocksTerminatedExtended = function(terminatorRegExpString) {
-	var terminatorRegExp = new RegExp(terminatorRegExpString,"mg"),
-		result = {
-			tree: []
-		};
+WikiParser.prototype.parseBlocksTerminated = function(terminatorRegExpString) {
+	var terminatorRegExp = new RegExp("(" + terminatorRegExpString + ")","mg"),
+		tree = [];
 	// Skip any whitespace
 	this.skipWhitespace();
 	//  Check if we've got the end marker
@@ -291,7 +277,7 @@ WikiParser.prototype.parseBlocksTerminatedExtended = function(terminatorRegExpSt
 	// Parse the text into blocks
 	while(this.pos < this.sourceLength && !(match && match.index === this.pos)) {
 		var blocks = this.parseBlock(terminatorRegExpString);
-		result.tree.push.apply(result.tree,blocks);
+		tree.push.apply(tree,blocks);
 		// Skip any whitespace
 		this.skipWhitespace();
 		//  Check if we've got the end marker
@@ -300,9 +286,8 @@ WikiParser.prototype.parseBlocksTerminatedExtended = function(terminatorRegExpSt
 	}
 	if(match && match.index === this.pos) {
 		this.pos = match.index + match[0].length;
-		result.match = match;
 	}
-	return result;
+	return tree;
 };

 /*
@@ -345,11 +330,6 @@ WikiParser.prototype.parseInlineRunUnterminated = function(options) {
 };

 WikiParser.prototype.parseInlineRunTerminated = function(terminatorRegExp,options) {
-	var ex = this.parseInlineRunTerminatedExtended(terminatorRegExp,options);
-	return ex.tree;
-};
-
-WikiParser.prototype.parseInlineRunTerminatedExtended = function(terminatorRegExp,options) {
 	options = options || {};
 	var tree = [];
 	// Find the next occurrence of the terminator
@@ -369,10 +349,7 @@ WikiParser.prototype.parseInlineRunTerminatedExtended = function(terminatorRegEx
 				if(options.eatTerminator) {
 					this.pos += terminatorMatch[0].length;
 				}
-				return {
-					match: terminatorMatch,
-					tree: tree
-				};
+				return tree;
 			}
 		}
 		// Process any inline rule, along with the text preceding it
@@ -396,9 +373,7 @@ WikiParser.prototype.parseInlineRunTerminatedExtended = function(terminatorRegEx
 		this.pushTextWidget(tree,this.source.substr(this.pos),this.pos,this.sourceLength);
 	}
 	this.pos = this.sourceLength;
-	return {
-		tree: tree
-	};
+	return tree;
 };

 /*
--- a/core/modules/savers/github.js
+++ b/core/modules/savers/github.js
@@ -31,7 +31,7 @@ GitHubSaver.prototype.save = function(text,method,callback) {
 		headers = {
 			"Accept": "application/vnd.github.v3+json",
 			"Content-Type": "application/json;charset=UTF-8",
-			"Authorization": "Basic " + $tw.utils.base64Encode(username + ":" + password),
+			"Authorization": "Basic " + window.btoa(username + ":" + password),
 			"If-None-Match": ""
 		};
 	// Bail if we don't have everything we need
--- a/core/modules/server/server.js
+++ b/core/modules/server/server.js
@@ -140,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,
--- a/core/modules/startup/render.js
+++ b/core/modules/startup/render.js
@@ -81,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
@@ -103,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/windows.js
+++ b/core/modules/startup/windows.js
@@ -40,7 +40,7 @@ exports.startup = function() {
 			variables = $tw.utils.extend({},paramObject,{currentTiddler: title, "tv-window-id": windowID});
 		// Open the window
 		var srcWindow,
-			srcDocument;
+		    srcDocument;
 		// In case that popup blockers deny opening a new window
 		try {
 			srcWindow = window.open("","external-" + windowID,"scrollbars,width=" + width + ",height=" + height + (top ? ",top=" + top : "" ) + (left ? ",left=" + left : "" )),
@@ -52,11 +52,10 @@ exports.startup = function() {
 		$tw.windows[windowID] = srcWindow;
 		// Check for reopening the same window
 		if(srcWindow.haveInitialisedWindow) {
-			srcWindow.focus();
 			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/syncer.js
+++ b/core/modules/syncer.js
@@ -24,7 +24,7 @@ Syncer.prototype.titleSyncPollingInterval = "$:/config/SyncPollingInterval";
 Syncer.prototype.titleSyncDisableLazyLoading = "$:/config/SyncDisableLazyLoading";
 Syncer.prototype.titleSavedNotification = "$:/language/Notifications/Save/Done";
 Syncer.prototype.titleSyncThrottleInterval = "$:/config/SyncThrottleInterval";
-Syncer.prototype.taskTimerInterval = 0.25 * 1000; // Interval for sync timer
+Syncer.prototype.taskTimerInterval = 1 * 1000; // Interval for sync timer
 Syncer.prototype.throttleInterval = 1 * 1000; // Defer saving tiddlers if they've changed in the last 1s...
 Syncer.prototype.errorRetryInterval = 5 * 1000; // Interval to retry after an error
 Syncer.prototype.fallbackInterval = 10 * 1000; // Unless the task is older than 10s
@@ -74,11 +74,9 @@ function Syncer(options) {
 	this.titlesHaveBeenLazyLoaded = {}; // Hashmap of titles of tiddlers that have already been lazily loaded from the server
 	// Timers
 	this.taskTimerId = null; // Timer for task dispatch
+	this.pollTimerId = null; // Timer for polling server
 	// Number of outstanding requests
 	this.numTasksInProgress = 0;
-	// True when we want to force an immediate sync from the server
-	this.forceSyncFromServer = false;
-	this.timestampLastSyncFromServer = new Date();
 	// Listen out for changes to tiddlers
 	this.wiki.addEventListener("change",function(changes) {
 		// Filter the changes to just include ones that are being synced
@@ -205,37 +203,33 @@ Syncer.prototype.readTiddlerInfo = function() {
 Checks whether the wiki is dirty (ie the window shouldn't be closed)
 */
 Syncer.prototype.isDirty = function() {
-	var self = this;
-	function checkIsDirty() {
-		// Check tiddlers that are in the store and included in the filter function
-		var titles = self.getSyncedTiddlers();
-		for(var index=0; index<titles.length; index++) {
-			var title = titles[index],
-				tiddlerInfo = self.tiddlerInfo[title];
-			if(self.wiki.tiddlerExists(title)) {
-				if(tiddlerInfo) {
-					// If the tiddler is known on the server and has been modified locally then it needs to be saved to the server
-					if(self.wiki.getChangeCount(title) > tiddlerInfo.changeCount) {
-						return true;
-					}
-				} else {
-					// If the tiddler isn't known on the server then it needs to be saved to the server
+	this.logger.log("Checking dirty status");
+	// Check tiddlers that are in the store and included in the filter function
+	var titles = this.getSyncedTiddlers();
+	for(var index=0; index<titles.length; index++) {
+		var title = titles[index],
+			tiddlerInfo = this.tiddlerInfo[title];
+		if(this.wiki.tiddlerExists(title)) {
+			if(tiddlerInfo) {
+				// If the tiddler is known on the server and has been modified locally then it needs to be saved to the server
+				if(this.wiki.getChangeCount(title) > tiddlerInfo.changeCount) {
 					return true;
 				}
-			}
-		}
-		// Check tiddlers that are known from the server but not currently in the store
-		titles = Object.keys(self.tiddlerInfo);
-		for(index=0; index<titles.length; index++) {
-			if(!self.wiki.tiddlerExists(titles[index])) {
-				// There must be a pending delete
+			} else {
+				// If the tiddler isn't known on the server then it needs to be saved to the server
 				return true;
 			}
 		}
-		return false;
 	}
-	var dirtyStatus = checkIsDirty();
-	return dirtyStatus;
+	// Check tiddlers that are known from the server but not currently in the store
+	titles = Object.keys(this.tiddlerInfo);
+	for(index=0; index<titles.length; index++) {
+		if(!this.wiki.tiddlerExists(titles[index])) {
+			// There must be a pending delete
+			return true;
+		}
+	}
+	return false;
 };

 /*
@@ -299,16 +293,92 @@ Syncer.prototype.getStatus = function(callback) {
 Synchronise from the server by reading the skinny tiddler list and queuing up loads for any tiddlers that we don't already have up to date
 */
 Syncer.prototype.syncFromServer = function() {
-	if(this.canSyncFromServer()) {
-		this.forceSyncFromServer = true;
-		this.processTaskQueue();	
+	var self = this,
+		cancelNextSync = function() {
+			if(self.pollTimerId) {
+				clearTimeout(self.pollTimerId);
+				self.pollTimerId = null;
+			}
+		},
+		triggerNextSync = function() {
+			self.pollTimerId = setTimeout(function() {
+				self.pollTimerId = null;
+				self.syncFromServer.call(self);
+			},self.pollTimerInterval);
+		},
+		syncSystemFromServer = (self.wiki.getTiddlerText("$:/config/SyncSystemTiddlersFromServer") === "yes" ? true : false);
+	if(this.syncadaptor && this.syncadaptor.getUpdatedTiddlers) {
+		this.logger.log("Retrieving updated tiddler list");
+		cancelNextSync();
+		this.syncadaptor.getUpdatedTiddlers(self,function(err,updates) {
+			triggerNextSync();
+			if(err) {
+				self.displayError($tw.language.getString("Error/RetrievingSkinny"),err);
+				return;
+			}
+			if(updates) {
+				$tw.utils.each(updates.modifications,function(title) {
+					self.titlesToBeLoaded[title] = true;
+				});
+				$tw.utils.each(updates.deletions,function(title) {
+					if(syncSystemFromServer || !self.wiki.isSystemTiddler(title)) {
+						delete self.tiddlerInfo[title];
+						self.logger.log("Deleting tiddler missing from server:",title);
+						self.wiki.deleteTiddler(title);
+					}
+				});
+				if(updates.modifications.length > 0 || updates.deletions.length > 0) {
+					self.processTaskQueue();
+				}				
+			}
+		});
+	} else if(this.syncadaptor && this.syncadaptor.getSkinnyTiddlers) {
+		this.logger.log("Retrieving skinny tiddler list");
+		cancelNextSync();
+		this.syncadaptor.getSkinnyTiddlers(function(err,tiddlers) {
+			triggerNextSync();
+			// Check for errors
+			if(err) {
+				self.displayError($tw.language.getString("Error/RetrievingSkinny"),err);
+				return;
+			}
+			// Keep track of which tiddlers we already know about have been reported this time
+			var previousTitles = Object.keys(self.tiddlerInfo);
+			// Process each incoming tiddler
+			for(var t=0; t<tiddlers.length; t++) {
+				// Get the incoming tiddler fields, and the existing tiddler
+				var tiddlerFields = tiddlers[t],
+					incomingRevision = tiddlerFields.revision + "",
+					tiddler = self.wiki.tiddlerExists(tiddlerFields.title) && self.wiki.getTiddler(tiddlerFields.title),
+					tiddlerInfo = self.tiddlerInfo[tiddlerFields.title],
+					currRevision = tiddlerInfo ? tiddlerInfo.revision : null,
+					indexInPreviousTitles = previousTitles.indexOf(tiddlerFields.title);
+				if(indexInPreviousTitles !== -1) {
+					previousTitles.splice(indexInPreviousTitles,1);
+				}
+				// Ignore the incoming tiddler if it's the same as the revision we've already got
+				if(currRevision !== incomingRevision) {
+					// Only load the skinny version if we don't already have a fat version of the tiddler
+					if(!tiddler || tiddler.fields.text === undefined) {
+						self.storeTiddler(tiddlerFields);
+					}
+					// Do a full load of this tiddler
+					self.titlesToBeLoaded[tiddlerFields.title] = true;
+				}
+			}
+			// Delete any tiddlers that were previously reported but missing this time
+			$tw.utils.each(previousTitles,function(title) {
+				if(syncSystemFromServer || !self.wiki.isSystemTiddler(title)) {
+					delete self.tiddlerInfo[title];
+					self.logger.log("Deleting tiddler missing from server:",title);
+					self.wiki.deleteTiddler(title);
+				}
+			});
+			self.processTaskQueue();
+		});
 	}
 };

-Syncer.prototype.canSyncFromServer = function() {
-	return !!this.syncadaptor.getUpdatedTiddlers || !!this.syncadaptor.getSkinnyTiddlers;
-}
-
 /*
 Force load a tiddler from the server
 */
@@ -440,7 +510,7 @@ Syncer.prototype.processTaskQueue = function() {
 				} else {
 					self.updateDirtyStatus();
 					// Process the next task
-					self.processTaskQueue.call(self);
+					self.processTaskQueue.call(self);					
 				}
 			});
 		} else {
@@ -448,39 +518,31 @@ Syncer.prototype.processTaskQueue = function() {
 			this.updateDirtyStatus();
 			// And trigger a timeout if there is a pending task
 			if(task === true) {
-				this.triggerTimeout(this.taskTimerInterval);
-			} else if(this.canSyncFromServer()) {
-				this.triggerTimeout(this.pollTimerInterval);
+				this.triggerTimeout();				
 			}
 		}
 	} else {
-		this.updateDirtyStatus();
-		this.triggerTimeout(this.taskTimerInterval);
+		this.updateDirtyStatus();		
 	}
 };

 Syncer.prototype.triggerTimeout = function(interval) {
 	var self = this;
-	if(this.taskTimerId) {
-		clearTimeout(this.taskTimerId);
+	if(!this.taskTimerId) {
+		this.taskTimerId = setTimeout(function() {
+			self.taskTimerId = null;
+			self.processTaskQueue.call(self);
+		},interval || self.taskTimerInterval);
 	}
-	this.taskTimerId = setTimeout(function() {
-		self.taskTimerId = null;
-		self.processTaskQueue.call(self);
-	},interval || self.taskTimerInterval);
 };

 /*
-Choose the next sync task. We prioritise saves to the server, then getting updates from the server, then deletes to the server, then loads from the server
+Choose the next sync task. We prioritise saves, then deletes, then loads from the server

-Returns either:
-* a task object
-* the boolean true if there are pending sync tasks that aren't yet due
-* null if there's no pending sync tasks (just the next poll)
+Returns either a task object, null if there's no upcoming tasks, or the boolean true if there are pending tasks that aren't yet due
 */
 Syncer.prototype.chooseNextTask = function() {
-	var now = new Date(),
-		thresholdLastSaved = now - this.throttleInterval,
+	var thresholdLastSaved = (new Date()) - this.throttleInterval,
 		havePending = null;
 	// First we look for tiddlers that have been modified locally and need saving back to the server
 	var titles = this.getSyncedTiddlers();
@@ -494,18 +556,14 @@ Syncer.prototype.chooseNextTask = function() {
 				isReadyToSave = !tiddlerInfo || !tiddlerInfo.timestampLastSaved || tiddlerInfo.timestampLastSaved < thresholdLastSaved;
 			if(hasChanged) {
 				if(isReadyToSave) {
-					return new SaveTiddlerTask(this,title);
+					return new SaveTiddlerTask(this,title); 					
 				} else {
 					havePending = true;
 				}
 			}
 		}
 	}
-	// Second we check for an outstanding sync from server
-	if(this.forceSyncFromServer || (this.timestampLastSyncFromServer && (now.valueOf() >= (this.timestampLastSyncFromServer.valueOf() + this.pollTimerInterval)))) {
-		return new SyncFromServerTask(this);
-	}
-	// Third, we check tiddlers that are known from the server but not currently in the store, and so need deleting on the server
+	// Second, we check tiddlers that are known from the server but not currently in the store, and so need deleting on the server
 	titles = Object.keys(this.tiddlerInfo);
 	for(index=0; index<titles.length; index++) {
 		title = titles[index];
@@ -515,13 +573,13 @@ Syncer.prototype.chooseNextTask = function() {
 			return new DeleteTiddlerTask(this,title);
 		}
 	}
-	// Finally, check for tiddlers that need loading
+	// Check for tiddlers that need loading
 	title = Object.keys(this.titlesToBeLoaded)[0];
 	if(title) {
 		delete this.titlesToBeLoaded[title];
 		return new LoadTiddlerTask(this,title);
 	}
-	// No tasks are ready now, but might be in the future
+	// No tasks are ready
 	return havePending;
 };

@@ -531,10 +589,6 @@ function SaveTiddlerTask(syncer,title) {
 	this.type = "save";
 }

-SaveTiddlerTask.prototype.toString = function() {
-	return "SAVE " + this.title;
-}
-
 SaveTiddlerTask.prototype.run = function(callback) {
 	var self = this,
 		changeCount = this.syncer.wiki.getChangeCount(this.title),
@@ -559,6 +613,7 @@ SaveTiddlerTask.prototype.run = function(callback) {
 			tiddlerInfo: self.syncer.tiddlerInfo[self.title]
 		});
 	} else {
+		this.syncer.logger.log(" Not Dispatching 'save' task:",this.title,"tiddler does not exist");
 		$tw.utils.nextTick(callback(null));
 	}
 };
@@ -569,10 +624,6 @@ function DeleteTiddlerTask(syncer,title) {
 	this.type = "delete";
 }

-DeleteTiddlerTask.prototype.toString = function() {
-	return "DELETE " + this.title;
-}
-
 DeleteTiddlerTask.prototype.run = function(callback) {
 	var self = this;
 	this.syncer.logger.log("Dispatching 'delete' task:",this.title);
@@ -596,10 +647,6 @@ function LoadTiddlerTask(syncer,title) {
 	this.type = "load";
 }

-LoadTiddlerTask.prototype.toString = function() {
-	return "LOAD " + this.title;
-}
-
 LoadTiddlerTask.prototype.run = function(callback) {
 	var self = this;
 	this.syncer.logger.log("Dispatching 'load' task:",this.title);
@@ -617,91 +664,6 @@ LoadTiddlerTask.prototype.run = function(callback) {
 	});
 };

-function SyncFromServerTask(syncer) {
-	this.syncer = syncer;
-	this.type = "syncfromserver";
-}
-
-SyncFromServerTask.prototype.toString = function() {
-	return "SYNCFROMSERVER";
-}
-
-SyncFromServerTask.prototype.run = function(callback) {
-	var self = this;
-	var syncSystemFromServer = (self.syncer.wiki.getTiddlerText("$:/config/SyncSystemTiddlersFromServer") === "yes" ? true : false);
-	var successCallback = function() {
-		self.syncer.forceSyncFromServer = false;
-		self.syncer.timestampLastSyncFromServer = new Date();
-		callback(null);
-	};
-	if(this.syncer.syncadaptor.getUpdatedTiddlers) {
-		this.syncer.syncadaptor.getUpdatedTiddlers(self.syncer,function(err,updates) {
-			if(err) {
-				self.syncer.displayError($tw.language.getString("Error/RetrievingSkinny"),err);
-				return callback(err);
-			}
-			if(updates) {
-				$tw.utils.each(updates.modifications,function(title) {
-					self.syncer.titlesToBeLoaded[title] = true;
-				});
-				$tw.utils.each(updates.deletions,function(title) {
-					if(syncSystemFromServer || !self.syncer.wiki.isSystemTiddler(title)) {
-						delete self.syncer.tiddlerInfo[title];
-						self.syncer.logger.log("Deleting tiddler missing from server:",title);
-						self.syncer.wiki.deleteTiddler(title);
-					}
-				});
-			}
-			return successCallback();
-		});
-	} else if(this.syncer.syncadaptor.getSkinnyTiddlers) {
-		this.syncer.syncadaptor.getSkinnyTiddlers(function(err,tiddlers) {
-			// Check for errors
-			if(err) {
-				self.syncer.displayError($tw.language.getString("Error/RetrievingSkinny"),err);
-				return callback(err);
-			}
-			// Keep track of which tiddlers we already know about have been reported this time
-			var previousTitles = Object.keys(self.syncer.tiddlerInfo);
-			// Process each incoming tiddler
-			for(var t=0; t<tiddlers.length; t++) {
-				// Get the incoming tiddler fields, and the existing tiddler
-				var tiddlerFields = tiddlers[t],
-					incomingRevision = tiddlerFields.revision + "",
-					tiddler = self.syncer.wiki.tiddlerExists(tiddlerFields.title) && self.syncer.wiki.getTiddler(tiddlerFields.title),
-					tiddlerInfo = self.syncer.tiddlerInfo[tiddlerFields.title],
-					currRevision = tiddlerInfo ? tiddlerInfo.revision : null,
-					indexInPreviousTitles = previousTitles.indexOf(tiddlerFields.title);
-				if(indexInPreviousTitles !== -1) {
-					previousTitles.splice(indexInPreviousTitles,1);
-				}
-				// Ignore the incoming tiddler if it's the same as the revision we've already got
-				if(currRevision !== incomingRevision) {
-					// Only load the skinny version if we don't already have a fat version of the tiddler
-					if(!tiddler || tiddler.fields.text === undefined) {
-						self.syncer.storeTiddler(tiddlerFields);
-					}
-					// Do a full load of this tiddler
-					self.syncer.titlesToBeLoaded[tiddlerFields.title] = true;
-				}
-			}
-			// Delete any tiddlers that were previously reported but missing this time
-			$tw.utils.each(previousTitles,function(title) {
-				if(syncSystemFromServer || !self.syncer.wiki.isSystemTiddler(title)) {
-					delete self.syncer.tiddlerInfo[title];
-					self.syncer.logger.log("Deleting tiddler missing from server:",title);
-					self.syncer.wiki.deleteTiddler(title);
-				}
-			});
-			self.syncer.forceSyncFromServer = false;
-			self.syncer.timestampLastSyncFromServer = new Date();
-			return successCallback();
-		});
-	} else {
-		return successCallback();
-	}
-};
-
 exports.Syncer = Syncer;

 })();
--- a/core/modules/utils/dom/dom.js
+++ b/core/modules/utils/dom/dom.js
@@ -313,7 +313,7 @@ exports.collectDOMVariables = function(selectedNode,domNode,event) {
 			variables["dom-" + attribute.name] = attribute.value.toString();
 		});
 		
-		if("offsetLeft" in selectedNode) {
+		if(selectedNode.offsetLeft) {
 			// Add variables with a (relative and absolute) popup coordinate string for the selected node
 			var nodeRect = {
 				left: selectedNode.offsetLeft,
@@ -338,12 +338,12 @@ exports.collectDOMVariables = function(selectedNode,domNode,event) {
 		}
 	}
 	
-	if(domNode && ("offsetWidth" in domNode)) {
+	if(domNode && domNode.offsetWidth) {
 		variables["tv-widgetnode-width"] = domNode.offsetWidth.toString();
 		variables["tv-widgetnode-height"] = domNode.offsetHeight.toString();
 	}

-	if(event && ("clientX" in event) && ("clientY" in event)) {
+	if(event && event.clientX && event.clientY) {
 		if(selectedNode) {
 			// Add variables for event X and Y position relative to selected node
 			selectedNodeRect = selectedNode.getBoundingClientRect();
--- a/core/modules/utils/dom/http.js
+++ b/core/modules/utils/dom/http.js
@@ -187,7 +187,7 @@ HttpClientRequest.prototype.send = function(callback) {
 					for (var i=0; i<len; i++) {
 						binary += String.fromCharCode(bytes[i]);
 					}
-					resultVariables.data = $tw.utils.base64Encode(binary,true);
+					resultVariables.data = window.btoa(binary);
 				}
 				self.wiki.addTiddler(new $tw.Tiddler(self.wiki.getTiddler(requestTrackerTitle),{
 					status: completionCode,
@@ -283,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
--- a/core/modules/utils/fakedom.js
+++ b/core/modules/utils/fakedom.js
@@ -104,11 +104,7 @@ TW_Element.prototype.setAttribute = function(name,value) {
 	if(this.isRaw) {
 		throw "Cannot setAttribute on a raw TW_Element";
 	}
-	if(name === "style") {
-		this.style = value;
-	} else {
-		this.attributes[name] = value + "";
-	}
+	this.attributes[name] = value + "";
 };

 TW_Element.prototype.setAttributeNS = function(namespace,name,value) {
--- 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/utils.js
+++ b/core/modules/utils/utils.js
@@ -819,50 +819,18 @@ exports.hashString = function(str) {
 	},0);
 };

-/*
-Cryptographic hash function as used by sha256 filter operator
-options.length .. number of characters returned defaults to 64
-*/
-exports.sha256 = function(str, options) {
-	options = options || {}
-	return sjcl.codec.hex.fromBits(sjcl.hash.sha256.hash(str)).substr(0,options.length || 64);
-}
-
-/*
-Base64 utility functions that work in either browser or Node.js
-*/
-if(typeof window !== 'undefined') {
-	exports.btoa = function(binstr) { return window.btoa(binstr); }
-	exports.atob = function(b64) { return window.atob(b64); }
-} else {
-	exports.btoa = function(binstr) {
-		return Buffer.from(binstr, 'binary').toString('base64');
-	}
-	exports.atob = function(b64) {
-		return Buffer.from(b64, 'base64').toString('binary');
-	}
-}
-
 /*
 Decode a base64 string
 */
-exports.base64Decode = function(string64,binary,urlsafe) {
-	var encoded = urlsafe ? string64.replace(/_/g,'/').replace(/-/g,'+') : string64;
-	if(binary) return exports.atob(encoded)
-	else return base64utf8.base64.decode.call(base64utf8,encoded);
+exports.base64Decode = function(string64) {
+	return base64utf8.base64.decode.call(base64utf8,string64);
 };

 /*
 Encode a string to base64
 */
-exports.base64Encode = function(string64,binary,urlsafe) {
-	var encoded;
-	if(binary) encoded = exports.btoa(string64);
-	else encoded = base64utf8.base64.encode.call(base64utf8,string64);
-	if(urlsafe) {
-		encoded = encoded.replace(/\+/g,'-').replace(/\//g,'_');
-	}
-	return encoded;
+exports.base64Encode = function(string64) {
+	return base64utf8.base64.encode.call(base64utf8,string64);
 };

 /*
@@ -931,7 +899,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 +912,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/browse.js
+++ b/core/modules/widgets/browse.js
@@ -70,11 +70,6 @@ BrowseWidget.prototype.render = function(parent,nextSibling) {
 		}
 		return false;
 	},false);
-	// Assign data- attributes
-	this.assignAttributes(domNode,{
-		sourcePrefix: "data-",
-		destPrefix: "data-"
-	});
 	// Insert element
 	parent.insertBefore(domNode,nextSibling);
 	this.renderChildren(domNode,null);
@@ -100,11 +95,6 @@ BrowseWidget.prototype.execute = function() {
 Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
 */
 BrowseWidget.prototype.refresh = function(changedTiddlers) {
-	var changedAttributes = this.computeAttributes();
-	if($tw.utils.count(changedAttributes) > 0) {
-		this.refreshSelf();
-		return true;	
-	}
 	return false;
 };

--- a/core/modules/widgets/button.js
+++ b/core/modules/widgets/button.js
@@ -59,11 +59,6 @@ ButtonWidget.prototype.render = function(parent,nextSibling) {
 		$tw.utils.pushTop(classes,"tc-popup-handle");
 	}
 	domNode.className = classes.join(" ");
-	// Assign data- attributes
-	this.assignAttributes(domNode,{
-		sourcePrefix: "data-",
-		destPrefix: "data-"
-	});
 	// Assign other attributes
 	if(this.style) {
 		domNode.setAttribute("style",this.style);
@@ -255,7 +250,7 @@ ButtonWidget.prototype.updateDomNodeClasses = function() {
 	//Add new classes from updated class attribute.
 	$tw.utils.pushTop(domNodeClasses,newClasses);
 	this.domNode.className = domNodeClasses.join(" ");
-};
+}

 /*
 Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
@@ -265,15 +260,8 @@ ButtonWidget.prototype.refresh = function(changedTiddlers) {
 	if(changedAttributes.actions || changedAttributes.to || changedAttributes.message || changedAttributes.param || changedAttributes.set || changedAttributes.setTo || changedAttributes.popup || changedAttributes.hover || changedAttributes.selectedClass || changedAttributes.style || changedAttributes.dragFilter || changedAttributes.dragTiddler || (this.set && changedTiddlers[this.set]) || (this.popup && changedTiddlers[this.popup]) || (this.popupTitle && changedTiddlers[this.popupTitle]) || changedAttributes.popupAbsCoords || changedAttributes.setTitle || changedAttributes.setField || changedAttributes.setIndex || changedAttributes.popupTitle || changedAttributes.disabled || changedAttributes["default"]) {
 		this.refreshSelf();
 		return true;
-	} else {
-		if(changedAttributes["class"]) {
-			this.updateDomNodeClasses();
-		}
-		this.assignAttributes(this.domNodes[0],{
-			changedAttributes: changedAttributes,
-			sourcePrefix: "data-",
-			destPrefix: "data-"
-		});
+	} else if(changedAttributes["class"]) {
+		this.updateDomNodeClasses();
 	}
 	return this.refreshChildren(changedTiddlers);
 };
--- a/core/modules/widgets/checkbox.js
+++ b/core/modules/widgets/checkbox.js
@@ -53,11 +53,6 @@ CheckboxWidget.prototype.render = function(parent,nextSibling) {
 	this.labelDomNode.appendChild(this.inputDomNode);
 	this.spanDomNode = this.document.createElement("span");
 	this.labelDomNode.appendChild(this.spanDomNode);
-	// Assign data- attributes
-	this.assignAttributes(this.inputDomNode,{
-		sourcePrefix: "data-",
-		destPrefix: "data-"
-	});
 	// Add a click event handler
 	$tw.utils.addEventListeners(this.inputDomNode,[
 		{name: "change", handlerObject: this, handlerMethod: "handleChangeEvent"}
@@ -330,11 +325,6 @@ CheckboxWidget.prototype.refresh = function(changedTiddlers) {
 				$tw.utils.removeClass(this.labelDomNode,"tc-checkbox-checked");
 			}
 		}
-		this.assignAttributes(this.inputDomNode,{
-			changedAttributes: changedAttributes,
-			sourcePrefix: "data-",
-			destPrefix: "data-"
-		});
 		return this.refreshChildren(changedTiddlers) || refreshed;
 	}
 };
@@ -342,4 +332,3 @@ CheckboxWidget.prototype.refresh = function(changedTiddlers) {
 exports.checkbox = CheckboxWidget;

 })();
-	
--- a/core/modules/widgets/data.js
+++ b/core/modules/widgets/data.js
@@ -1,145 +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();
-	var jsonPayload = JSON.stringify(this.readDataTiddlerValues(),null,4);
-	var textNode = this.document.createTextNode(jsonPayload);
-	parent.insertBefore(textNode,nextSibling);
-	this.domNodes.push(textNode);
-};
-
-/*
-Compute the internal state of the widget
-*/
-DataWidget.prototype.execute = function() {
-	// Construct the child widgets
-	this.makeChildWidgets();
-};
-
-/*
-Read the tiddler value(s) from a data widget – must be called after the .render() method
-*/
-DataWidget.prototype.readDataTiddlerValues = function() {
-	var self = this;
-	// Start with a blank object
-	var item = Object.create(null);
-	// Read any attributes not prefixed with $
-	$tw.utils.each(this.attributes,function(value,name) {
-		if(name.charAt(0) !== "$") {
-			item[name] = value;	
-		}
-	});
-	item = new $tw.Tiddler(item);
-	// 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));
-		}
-	}
-	// Convert the literal item to field strings
-	item = item.getFieldStrings();
-	if(tiddlers.length === 0) {
-		if(Object.keys(item).length > 0 && !!item.title) {
-			return [item];
-		} else {
-			return [];
-		}
-	} else {
-		var results = [];
-		$tw.utils.each(tiddlers,function(tiddler,index) {
-			var fields = tiddler.getFieldStrings();
-			results.push($tw.utils.extend({},fields,item));
-		});
-		return results;	
-	}
-};
-
-/*
-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) {
-	// It would be expensive to calculate whether the changedTiddlers impact the filter
-	// identified by the $filter attribute so we just refresh ourselves unconditionally
-	this.refreshSelf();
-	return true;
-};
-
-exports.data = DataWidget;
-
-})();
--- a/core/modules/widgets/draggable.js
+++ b/core/modules/widgets/draggable.js
@@ -52,11 +52,6 @@ DraggableWidget.prototype.render = function(parent,nextSibling) {
 		classes.push("tc-draggable");
 	}
 	domNode.setAttribute("class",classes.join(" "));
-	// Assign data- attributes and style. attributes
-	this.assignAttributes(domNode,{
-		sourcePrefix: "data-",
-		destPrefix: "data-"
-	});
 	// Insert the node into the DOM and render any children
 	parent.insertBefore(domNode,nextSibling);
 	this.renderChildren(domNode,null);
@@ -113,23 +108,17 @@ DraggableWidget.prototype.updateDomNodeClasses = function() {
 Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
 */
 DraggableWidget.prototype.refresh = function(changedTiddlers) {
-	var changedAttributes = this.computeAttributes();
-	if(changedAttributes.tag || changedAttributes.selector || changedAttributes.dragimagetype || changedAttributes.enable || changedAttributes.startactions || changedAttributes.endactions) {
+	var changedAttributes = this.computeAttributes(),
+		changedAttributesCount = $tw.utils.count(changedAttributes);
+	if(changedAttributesCount === 1 && changedAttributes["class"]) {
+		this.updateDomNodeClasses();
+	} else if(changedAttributesCount > 0) {
 		this.refreshSelf();
 		return true;
-	} else {
-		if(changedAttributes["class"]) {
-			this.updateDomNodeClasses();
-		}
-		this.assignAttributes(this.domNodes[0],{
-			changedAttributes: changedAttributes,
-			sourcePrefix: "data-",
-			destPrefix: "data-"
-		});
 	}
 	return this.refreshChildren(changedTiddlers);
 };

 exports.draggable = DraggableWidget;

-})();
+})();
--- a/core/modules/widgets/droppable.js
+++ b/core/modules/widgets/droppable.js
@@ -42,11 +42,6 @@ DroppableWidget.prototype.render = function(parent,nextSibling) {
 	domNode = this.document.createElement(tag);
 	this.domNode = domNode;
 	this.assignDomNodeClasses();
-	// Assign data- attributes and style. attributes
-	this.assignAttributes(domNode,{
-		sourcePrefix: "data-",
-		destPrefix: "data-"
-	});
 	// Add event handlers
 	if(this.droppableEnable) {
 		$tw.utils.addEventListeners(domNode,[
@@ -171,15 +166,8 @@ DroppableWidget.prototype.refresh = function(changedTiddlers) {
 	if(changedAttributes.tag || changedAttributes.enable || changedAttributes.disabledClass || changedAttributes.actions || changedAttributes.effect) {
 		this.refreshSelf();
 		return true;
-	} else {
-		if(changedAttributes["class"]) {
-			this.assignDomNodeClasses();
-		}
-		this.assignAttributes(this.domNodes[0],{
-			changedAttributes: changedAttributes,
-			sourcePrefix: "data-",
-			destPrefix: "data-"
-		});
+	} else if(changedAttributes["class"]) {
+		this.assignDomNodeClasses();
 	}
 	return this.refreshChildren(changedTiddlers);
 };
--- a/core/modules/widgets/edit.js
+++ b/core/modules/widgets/edit.js
@@ -90,7 +90,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 EditWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
 	// Refresh if an attribute has changed, or the type associated with the target tiddler has changed
-	if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes.tabindex || changedAttributes.cancelPopups || changedAttributes.inputActions || changedAttributes.refreshTitle || changedAttributes.autocomplete || (this.getEditorType() !== this.editorType)) {
+	if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes.tabindex || changedAttributes.cancelPopups || changedAttributes.inputActions || changedAttributes.refreshTitle || changedAttributes.autocomplete || (changedTiddlers[this.editTitle] && this.getEditorType() !== this.editorType)) {
 		this.refreshSelf();
 		return true;
 	} else {
--- a/core/modules/widgets/image.js
+++ b/core/modules/widgets/image.js
@@ -58,25 +58,24 @@ ImageWidget.prototype.render = function(parent,nextSibling) {
 		if(this.wiki.isImageTiddler(this.imageSource)) {
 			var type = tiddler.fields.type,
 				text = tiddler.fields.text,
-				_canonical_uri = tiddler.fields._canonical_uri,
-				typeInfo = $tw.config.contentTypeInfo[type] || {},
-				deserializerType = typeInfo.deserializerType || type;
+				_canonical_uri = tiddler.fields._canonical_uri;
 			// If the tiddler has body text then it doesn't need to be lazily loaded
 			if(text) {
-				// Render the appropriate element for the image type by looking up the encoding in the content type info
-				var encoding = typeInfo.encoding || "utf8";
-				if (encoding === "base64") {
-					// .pdf .png .jpg etc.
-					src = "data:" + deserializerType + ";base64," + text;
-					if (deserializerType === "application/pdf") {
+				// Render the appropriate element for the image type
+				switch(type) {
+					case "application/pdf":
 						tag = "embed";
-					}
-				} else {
-					// .svg .tid .xml etc.
-					src = "data:" + deserializerType + "," + encodeURIComponent(text);
+						src = "data:application/pdf;base64," + text;
+						break;
+					case "image/svg+xml":
+						src = "data:image/svg+xml," + encodeURIComponent(text);
+						break;
+					default:
+						src = "data:" + type + ";base64," + text;
+						break;
 				}
 			} else if(_canonical_uri) {
-				switch(deserializerType) {
+				switch(type) {
 					case "application/pdf":
 						tag = "embed";
 						src = _canonical_uri;
@@ -100,9 +99,6 @@ ImageWidget.prototype.render = function(parent,nextSibling) {
 	if(this.imageClass) {
 		domNode.setAttribute("class",this.imageClass);
 	}
-	if(this.imageUsemap) {
-	    	domNode.setAttribute("usemap",this.imageUsemap);
-	}
 	if(this.imageWidth) {
 		domNode.setAttribute("width",this.imageWidth);
 	}
@@ -142,7 +138,6 @@ ImageWidget.prototype.execute = function() {
 	this.imageWidth = this.getAttribute("width");
 	this.imageHeight = this.getAttribute("height");
 	this.imageClass = this.getAttribute("class");
-    	this.imageUsemap = this.getAttribute("usemap");
 	this.imageTooltip = this.getAttribute("tooltip");
 	this.imageAlt = this.getAttribute("alt");
 	this.lazyLoading = this.getAttribute("loading");
@@ -153,7 +148,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 */
 ImageWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
-	if(changedAttributes.source || changedAttributes.width || changedAttributes.height || changedAttributes["class"] || changedAttributes.usemap || changedAttributes.tooltip || changedTiddlers[this.imageSource]) {
+	if(changedAttributes.source || changedAttributes.width || changedAttributes.height || changedAttributes["class"] || changedAttributes.tooltip || changedTiddlers[this.imageSource]) {
 		this.refreshSelf();
 		return true;
 	} else {
--- a/core/modules/widgets/importvariables.js
+++ b/core/modules/widgets/importvariables.js
@@ -49,7 +49,7 @@ ImportVariablesWidget.prototype.execute = function(tiddlerList) {
 	this.tiddlerList = tiddlerList || this.wiki.filterTiddlers(this.filter,this);
 	// Accumulate the <$set> widgets from each tiddler
 	$tw.utils.each(this.tiddlerList,function(title) {
-		var parser = widgetPointer.wiki.parseTiddler(title,{parseAsInline:true, configTrimWhiteSpace: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/link.js
+++ b/core/modules/widgets/link.js
@@ -43,11 +43,6 @@ LinkWidget.prototype.render = function(parent,nextSibling) {
 	} else {
 		// Just insert the link text
 		var domNode = this.document.createElement("span");
-		// Assign data- attributes
-		this.assignAttributes(domNode,{
-			sourcePrefix: "data-",
-			destPrefix: "data-"
-		});
 		parent.insertBefore(domNode,nextSibling);
 		this.renderChildren(domNode,null);
 		this.domNodes.push(domNode);
@@ -143,11 +138,6 @@ LinkWidget.prototype.renderLink = function(parent,nextSibling) {
 			widget: this
 		});
 	}
-	// Assign data- attributes
-	this.assignAttributes(domNode,{
-		sourcePrefix: "data-",
-		destPrefix: "data-"
-	});
 	// Insert the link into the DOM and render any children
 	parent.insertBefore(domNode,nextSibling);
 	this.renderChildren(domNode,null);
@@ -217,7 +207,8 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 */
 LinkWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
-	if($tw.utils.count(changedAttributes) > 0 || changedTiddlers[this.to]) {
+	if(changedAttributes.to || changedTiddlers[this.to] || changedAttributes["aria-label"] || changedAttributes.tooltip ||
+		changedAttributes["class"] || changedAttributes.tabindex || changedAttributes.draggable || changedAttributes.tag) {
 		this.refreshSelf();
 		return true;
 	}
@@ -227,4 +218,3 @@ LinkWidget.prototype.refresh = function(changedTiddlers) {
 exports.link = LinkWidget;

 })();
-	
--- a/core/modules/widgets/list.js
+++ b/core/modules/widgets/list.js
@@ -28,18 +28,6 @@ Inherit from the base widget class
 */
 ListWidget.prototype = new Widget();

-ListWidget.prototype.initialise = function(parseTreeNode,options) {
-	// Bail if parseTreeNode is undefined, meaning that the ListWidget constructor was called without any arguments so that it can be subclassed
-	if(parseTreeNode === undefined) {
-		return;
-	}
-	// First call parent constructor to set everything else up
-	Widget.prototype.initialise.call(this,parseTreeNode,options);
-	// Now look for <$list-template> and <$list-empty> widgets as immediate child widgets
-	// This is safe to do during initialization because parse trees never change after creation
-	this.findExplicitTemplates();
-}
-
 /*
 Render this widget into the DOM
 */
@@ -50,8 +38,8 @@ ListWidget.prototype.render = function(parent,nextSibling) {
 		$tw.modules.applyMethods("storyview",this.storyViews);
 	}
 	this.parentDomNode = parent;
-	var changedAttributes = this.computeAttributes();
-	this.execute(changedAttributes);
+	this.computeAttributes();
+	this.execute();
 	this.renderChildren(parent,nextSibling);
 	// Construct the storyview
 	var StoryView = this.storyViews[this.storyViewName];
@@ -71,8 +59,7 @@ ListWidget.prototype.render = function(parent,nextSibling) {
 /*
 Compute the internal state of the widget
 */
-ListWidget.prototype.execute = function(changedAttributes) {
-	var self = this;
+ListWidget.prototype.execute = function() {
 	// Get our attributes
 	this.template = this.getAttribute("template");
 	this.editTemplate = this.getAttribute("editTemplate");
@@ -80,10 +67,6 @@ ListWidget.prototype.execute = function(changedAttributes) {
 	this.counterName = this.getAttribute("counter");
 	this.storyViewName = this.getAttribute("storyview");
 	this.historyTitle = this.getAttribute("history");
-	// Create join template only if needed
-	if(this.join === undefined || (changedAttributes && changedAttributes.join)) {
-		this.join = this.makeJoinTemplate();
-	}
 	// Compose the list elements
 	this.list = this.getTiddlerList();
 	var members = [],
@@ -102,57 +85,18 @@ ListWidget.prototype.execute = function(changedAttributes) {
 	this.history = [];
 };

-ListWidget.prototype.findExplicitTemplates = function() {
-	var self = this;
-	this.explicitListTemplate = null;
-	this.explicitEmptyTemplate = null;
-	this.explicitJoinTemplate = null;
-	this.hasTemplateInBody = false;
-	var searchChildren = function(childNodes) {
-		var foundInlineTemplate = false;
-		$tw.utils.each(childNodes,function(node) {
-			if(node.type === "list-template") {
-				self.explicitListTemplate = node.children;
-			} else if(node.type === "list-empty") {
-				self.explicitEmptyTemplate = node.children;
-			} else if(node.type === "list-join") {
-				self.explicitJoinTemplate = node.children;
-			} else if(node.type === "element" && node.tag === "p") {
-				searchChildren(node.children);
-				foundInlineTemplate = true;
-			} else {
-				foundInlineTemplate = true;
-			}
-		});
-		return foundInlineTemplate;
-	};
-	this.hasTemplateInBody = searchChildren(this.parseTreeNode.children);
-}
-
 ListWidget.prototype.getTiddlerList = function() {
-	var limit = $tw.utils.getInt(this.getAttribute("limit",""),undefined);
 	var defaultFilter = "[!is[system]sort[title]]";
-	var results = this.wiki.filterTiddlers(this.getAttribute("filter",defaultFilter),this);
-	if(limit !== undefined) {
-		if(limit >= 0) {
-			results = results.slice(0,limit);
-		} else {
-			results = results.slice(limit);
-		}
-	}
-	return results;
+	return this.wiki.filterTiddlers(this.getAttribute("filter",defaultFilter),this);
 };

 ListWidget.prototype.getEmptyMessage = function() {
 	var parser,
-		emptyMessage = this.getAttribute("emptyMessage");
-	// If emptyMessage attribute is not present or empty then look for an explicit empty template
-	if(!emptyMessage) {
-		if(this.explicitEmptyTemplate) {
-			return this.explicitEmptyTemplate;
-		} else {
-			return [];
-		}
+		emptyMessage = this.getAttribute("emptyMessage","");
+	// this.wiki.parseText() calls 
+	// new Parser(..), which should only be done, if needed, because it's heavy!
+	if (emptyMessage === "") {
+		return [];
 	}
 	parser = this.wiki.parseText("text/vnd.tiddlywiki",emptyMessage,{parseAsInline: true});
 	if(parser) {
@@ -162,24 +106,6 @@ ListWidget.prototype.getEmptyMessage = function() {
 	}
 };

-/*
-Compose the template for a join between list items
-*/
-ListWidget.prototype.makeJoinTemplate = function() {
-	var parser,
-		join = this.getAttribute("join","");
-	if(join) {
-		parser = this.wiki.parseText("text/vnd.tiddlywiki",join,{parseAsInline:true})
-		if(parser) {
-			return parser.tree;
-		} else {
-			return [];
-		}
-	} else {
-		return this.explicitJoinTemplate; // May be null, and that's fine
-	}
-};
-
 /*
 Compose the template for a list item
 */
@@ -188,7 +114,6 @@ ListWidget.prototype.makeItemTemplate = function(title,index) {
 	var tiddler = this.wiki.getTiddler(title),
 		isDraft = tiddler && tiddler.hasField("draft.of"),
 		template = this.template,
-		join = this.join,
 		templateTree;
 	if(isDraft && this.editTemplate) {
 		template = this.editTemplate;
@@ -197,29 +122,22 @@ ListWidget.prototype.makeItemTemplate = function(title,index) {
 	if(template) {
 		templateTree = [{type: "transclude", attributes: {tiddler: {type: "string", value: template}}}];
 	} else {
-		// Check for child nodes of the list widget
 		if(this.parseTreeNode.children && this.parseTreeNode.children.length > 0) {
-			// Check for a <$list-item> widget
-			if(this.explicitListTemplate) {
-				templateTree = this.explicitListTemplate;
-			} else if(this.hasTemplateInBody) {
-				templateTree = this.parseTreeNode.children;
-			}
-		}
-		if(!templateTree || templateTree.length === 0) {
+			templateTree = this.parseTreeNode.children;
+		} else {
 			// Default template is a link to the title
 			templateTree = [{type: "element", tag: this.parseTreeNode.isBlock ? "div" : "span", children: [{type: "link", attributes: {to: {type: "string", value: title}}, children: [
-				{type: "text", text: title}
+					{type: "text", text: title}
 			]}]}];
 		}
 	}
 	// Return the list item
-	var parseTreeNode = {type: "listitem", itemTitle: title, variableName: this.variableName, children: templateTree, join: join};
-	parseTreeNode.isLast = index === this.list.length - 1;
+	var parseTreeNode = {type: "listitem", itemTitle: title, variableName: this.variableName, children: templateTree};
 	if(this.counterName) {
 		parseTreeNode.counter = (index + 1).toString();
 		parseTreeNode.counterName = this.counterName;
 		parseTreeNode.isFirst = index === 0;
+		parseTreeNode.isLast = index === this.list.length - 1;
 	}
 	return parseTreeNode;
 };
@@ -235,7 +153,7 @@ ListWidget.prototype.refresh = function(changedTiddlers) {
 		this.storyview.refreshStart(changedTiddlers,changedAttributes);
 	}
 	// Completely refresh if any of our attributes have changed
-	if(changedAttributes.filter || changedAttributes.variable || changedAttributes.counter || changedAttributes.template || changedAttributes.editTemplate || changedAttributes.join || changedAttributes.emptyMessage || changedAttributes.storyview || changedAttributes.history) {
+	if(changedAttributes.filter || changedAttributes.variable || changedAttributes.counter || changedAttributes.template || changedAttributes.editTemplate || changedAttributes.emptyMessage || changedAttributes.storyview || changedAttributes.history) {
 		this.refreshSelf();
 		result = true;
 	} else {
@@ -307,8 +225,6 @@ ListWidget.prototype.handleListChanges = function(changedTiddlers) {
 		// If we are providing an counter variable then we must refresh the items, otherwise we can rearrange them
 		var hasRefreshed = false,t;
 		if(this.counterName) {
-			var mustRefreshOldLast = false;
-			var oldLength = this.children.length;
 			// Cycle through the list and remove and re-insert the first item that has changed, and all the remaining items
 			for(t=0; t<this.list.length; t++) {
 				if(hasRefreshed || !this.children[t] || this.children[t].parseTreeNode.itemTitle !== this.list[t]) {
@@ -316,9 +232,6 @@ ListWidget.prototype.handleListChanges = function(changedTiddlers) {
 						this.removeListItem(t);
 					}
 					this.insertListItem(t,this.list[t]);
-					if(!hasRefreshed && t === oldLength) {
-						mustRefreshOldLast = true;
-					}
 					hasRefreshed = true;
 				} else {
 					// Refresh the item we're reusing
@@ -326,12 +239,6 @@ ListWidget.prototype.handleListChanges = function(changedTiddlers) {
 					hasRefreshed = hasRefreshed || refreshed;
 				}
 			}
-			// If items were inserted then we must recreate the item that used to be at the last position as it is no longer last
-			if(mustRefreshOldLast && oldLength > 0) {
-				var oldLastIdx = oldLength-1;
-				this.removeListItem(oldLastIdx);
-				this.insertListItem(oldLastIdx,this.list[oldLastIdx]);
-			}
 			// If there are items to remove and we have not refreshed then recreate the item that will now be at the last position
 			if(!hasRefreshed && this.children.length > this.list.length) {
 				this.removeListItem(this.list.length-1);
@@ -339,29 +246,10 @@ ListWidget.prototype.handleListChanges = function(changedTiddlers) {
 			}
 		} else {
 			// Cycle through the list, inserting and removing list items as needed
-			var mustRecreateLastItem = false;
-			if(this.join && this.join.length) {
-				if(this.children.length !== this.list.length) {
-						mustRecreateLastItem = true;
-				} else if(prevList[prevList.length-1] !== this.list[this.list.length-1]) {
-						mustRecreateLastItem = true;
-				}
-			}
-			var isLast = false, wasLast = false;
 			for(t=0; t<this.list.length; t++) {
-				isLast = t === this.list.length-1;
 				var index = this.findListItem(t,this.list[t]);
-				wasLast = index === this.children.length-1;
-				if(wasLast && (index !== t || this.children.length !== this.list.length)) {
-					mustRecreateLastItem = !!(this.join && this.join.length);
-				}
 				if(index === undefined) {
 					// The list item must be inserted
-					if(isLast && mustRecreateLastItem && t>0) {
-						// First re-create previosly-last item that will no longer be last
-						this.removeListItem(t-1);
-						this.insertListItem(t-1,this.list[t-1]);
-					}
 					this.insertListItem(t,this.list[t]);
 					hasRefreshed = true;
 				} else {
@@ -370,15 +258,9 @@ ListWidget.prototype.handleListChanges = function(changedTiddlers) {
 						this.removeListItem(n);
 						hasRefreshed = true;
 					}
-					// Refresh the item we're reusing, or recreate if necessary
-					if(mustRecreateLastItem && (isLast || wasLast)) {
-						this.removeListItem(t);
-						this.insertListItem(t,this.list[t]);
-						hasRefreshed = true;
-					} else {
-						var refreshed = this.children[t].refresh(changedTiddlers);
-						hasRefreshed = hasRefreshed || refreshed;
-					}
+					// Refresh the item we're reusing
+					var refreshed = this.children[t].refresh(changedTiddlers);
+					hasRefreshed = hasRefreshed || refreshed;
 				}
 			}
 		}
@@ -468,17 +350,8 @@ ListItemWidget.prototype.execute = function() {
 		this.setVariable(this.parseTreeNode.counterName + "-first",this.parseTreeNode.isFirst ? "yes" : "no");
 		this.setVariable(this.parseTreeNode.counterName + "-last",this.parseTreeNode.isLast ? "yes" : "no");
 	}
-	// Add join if needed
-	var children = this.parseTreeNode.children,
-		join = this.parseTreeNode.join;
-	if(join && join.length && !this.parseTreeNode.isLast) {
-		children = children.slice(0);
-		$tw.utils.each(join,function(joinNode) {
-			children.push(joinNode);
-		})
-	}
 	// Construct the child widgets
-	this.makeChildWidgets(children);
+	this.makeChildWidgets();
 };

 /*
@@ -490,37 +363,4 @@ ListItemWidget.prototype.refresh = function(changedTiddlers) {

 exports.listitem = ListItemWidget;

-/*
-Make <$list-template> and <$list-empty> widgets that do nothing
-*/
-var ListTemplateWidget = function(parseTreeNode,options) {
-	// Main initialisation inherited from widget.js
-	this.initialise(parseTreeNode,options);
-};
-ListTemplateWidget.prototype = new Widget();
-ListTemplateWidget.prototype.render = function() {}
-ListTemplateWidget.prototype.refresh = function() { return false; }
-
-exports["list-template"] = ListTemplateWidget;
-
-var ListEmptyWidget = function(parseTreeNode,options) {
-	// Main initialisation inherited from widget.js
-	this.initialise(parseTreeNode,options);
-};
-ListEmptyWidget.prototype = new Widget();
-ListEmptyWidget.prototype.render = function() {}
-ListEmptyWidget.prototype.refresh = function() { return false; }
-
-exports["list-empty"] = ListEmptyWidget;
-
-var ListJoinWidget = function(parseTreeNode,options) {
-	// Main initialisation inherited from widget.js
-	this.initialise(parseTreeNode,options);
-};
-ListJoinWidget.prototype = new Widget();
-ListJoinWidget.prototype.render = function() {}
-ListJoinWidget.prototype.refresh = function() { return false; }
-
-exports["list-join"] = ListJoinWidget;
-
 })();
--- a/core/modules/widgets/radio.js
+++ b/core/modules/widgets/radio.js
@@ -40,10 +40,6 @@ RadioWidget.prototype.render = function(parent,nextSibling) {
 	);
 	this.inputDomNode = this.document.createElement("input");
 	this.inputDomNode.setAttribute("type","radio");
-	this.assignAttributes(this.inputDomNode,{
-		sourcePrefix: "data-",
-		destPrefix: "data-"
-	});
 	if(isChecked) {
 		this.inputDomNode.checked = true;
 	}
--- a/core/modules/widgets/range.js
+++ b/core/modules/widgets/range.js
@@ -50,10 +50,6 @@ RangeWidget.prototype.render = function(parent,nextSibling) {
 		this.inputDomNode.setAttribute("disabled",true);
 	}
 	this.inputDomNode.value = this.getValue();
-	this.assignAttributes(this.inputDomNode,{
-		sourcePrefix: "data-",
-		destPrefix: "data-"
-	});
 	// Add a click event handler
 	$tw.utils.addEventListeners(this.inputDomNode,[
 		{name:"mousedown", handlerObject:this, handlerMethod:"handleMouseDownEvent"},
--- a/core/modules/widgets/scrollable.js
+++ b/core/modules/widgets/scrollable.js
@@ -12,8 +12,6 @@ Scrollable widget
 /*global $tw: false */
 "use strict";

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

 var ScrollableWidget = function(parseTreeNode,options) {
@@ -173,53 +171,6 @@ ScrollableWidget.prototype.render = function(parent,nextSibling) {
 	parent.insertBefore(this.outerDomNode,nextSibling);
 	this.renderChildren(this.innerDomNode,null);
 	this.domNodes.push(this.outerDomNode);
-	// If the scroll position is bound to a tiddler
-	if(this.scrollableBind) {
-		// After a delay for rendering, scroll to the bound position
-		this.updateScrollPositionFromBoundTiddler();
-		// Set up event listener
-		this.currentListener = this.listenerFunction.bind(this);
-		this.outerDomNode.addEventListener("scroll", this.currentListener);
-	}
-};
-
-ScrollableWidget.prototype.listenerFunction = function(event) {
-	self = this;
-	clearTimeout(this.timeout);
-	this.timeout = setTimeout(function() {
-		var existingTiddler = self.wiki.getTiddler(self.scrollableBind),
-			newTiddlerFields = {
-				title: self.scrollableBind,
-				"scroll-left": self.outerDomNode.scrollLeft.toString(),
-				"scroll-top": self.outerDomNode.scrollTop.toString()
-			};
-		if(!existingTiddler || (existingTiddler.fields["title"] !== newTiddlerFields["title"]) || (existingTiddler.fields["scroll-left"] !== newTiddlerFields["scroll-left"] || existingTiddler.fields["scroll-top"] !== newTiddlerFields["scroll-top"])) {
-			self.wiki.addTiddler(new $tw.Tiddler(existingTiddler,newTiddlerFields));
-		}
-	}, DEBOUNCE_INTERVAL);
-}
-
-ScrollableWidget.prototype.updateScrollPositionFromBoundTiddler = function() {
-	// Bail if we're running on the fakedom
-	if(!this.outerDomNode.scrollTo) {
-		return;
-	}
-	var tiddler = this.wiki.getTiddler(this.scrollableBind);
-	if(tiddler) {
-		var scrollLeftTo = this.outerDomNode.scrollLeft;
-		if(parseFloat(tiddler.fields["scroll-left"]).toString() === tiddler.fields["scroll-left"]) {
-			scrollLeftTo = parseFloat(tiddler.fields["scroll-left"]);
-		}
-		var scrollTopTo = this.outerDomNode.scrollTop;
-		if(parseFloat(tiddler.fields["scroll-top"]).toString() === tiddler.fields["scroll-top"]) {
-			scrollTopTo = parseFloat(tiddler.fields["scroll-top"]);
-		}
-		this.outerDomNode.scrollTo({
-			top: scrollTopTo,
-			left: scrollLeftTo,
-			behavior: "instant"
-		})
-	}
 };

 /*
@@ -227,7 +178,6 @@ Compute the internal state of the widget
 */
 ScrollableWidget.prototype.execute = function() {
 	// Get attributes
-	this.scrollableBind = this.getAttribute("bind");
 	this.fallthrough = this.getAttribute("fallthrough","yes");
 	this["class"] = this.getAttribute("class");
 	// Make child widgets
@@ -243,22 +193,7 @@ ScrollableWidget.prototype.refresh = function(changedTiddlers) {
 		this.refreshSelf();
 		return true;
 	}
-	// If the bound tiddler has changed, update the eventListener and update scroll position
-	if(changedAttributes["bind"]) {
-		if(this.currentListener) {
-			this.outerDomNode.removeEventListener("scroll", this.currentListener, false);
-		}
-		this.scrollableBind = this.getAttribute("bind");
-		this.currentListener = this.listenerFunction.bind(this);
-		this.outerDomNode.addEventListener("scroll", this.currentListener);
-	}
-	// Refresh children
-	var result = this.refreshChildren(changedTiddlers);
-	// If the bound tiddler has changed, update scroll position
-	if(changedAttributes["bind"] || changedTiddlers[this.getAttribute("bind")]) {
-		this.updateScrollPositionFromBoundTiddler();
-	}
-	return result;
+	return this.refreshChildren(changedTiddlers);
 };

 exports.scrollable = ScrollableWidget;
--- a/core/modules/widgets/select.js
+++ b/core/modules/widgets/select.js
@@ -40,31 +40,7 @@ SelectWidget.prototype.render = function(parent,nextSibling) {
 	this.parentDomNode = parent;
 	this.computeAttributes();
 	this.execute();
-	//Create element
-	var domNode = this.document.createElement("select");
-	if(this.selectClass) {
-		domNode.className = this.selectClass;
-	}
-	// Assign data- attributes
-	this.assignAttributes(domNode,{
-		sourcePrefix: "data-",
-		destPrefix: "data-"
-	});
-	if(this.selectMultiple) {
-		domNode.setAttribute("multiple","multiple");
-	}
-	if(this.selectSize) {
-		domNode.setAttribute("size",this.selectSize);
-	}
-	if(this.selectTabindex) {
-		domNode.setAttribute("tabindex",this.selectTabindex);
-	}
-	if(this.selectTooltip) {
-		domNode.setAttribute("title",this.selectTooltip);
-	}
-	this.parentDomNode.insertBefore(domNode,nextSibling);
-	this.renderChildren(domNode,null);
-	this.domNodes.push(domNode);
+	this.renderChildren(parent,nextSibling);
 	this.setSelectValue();
 	if(this.selectFocus == "yes") {
 		this.getSelectDomNode().focus();
@@ -137,7 +113,7 @@ SelectWidget.prototype.setSelectValue = function() {
 Get the DOM node of the select element
 */
 SelectWidget.prototype.getSelectDomNode = function() {
-	return this.domNodes[0];
+	return this.children[0].domNodes[0];
 };

 // Return an array of the selected opion values
@@ -173,7 +149,27 @@ SelectWidget.prototype.execute = function() {
 	this.selectTooltip = this.getAttribute("tooltip");
 	this.selectFocus = this.getAttribute("focus");
 	// Make the child widgets
-	this.makeChildWidgets();
+	var selectNode = {
+		type: "element",
+		tag: "select",
+		children: this.parseTreeNode.children
+	};
+	if(this.selectClass) {
+		$tw.utils.addAttributeToParseTreeNode(selectNode,"class",this.selectClass);
+	}
+	if(this.selectMultiple) {
+		$tw.utils.addAttributeToParseTreeNode(selectNode,"multiple","multiple");
+	}
+	if(this.selectSize) {
+		$tw.utils.addAttributeToParseTreeNode(selectNode,"size",this.selectSize);
+	}
+	if(this.selectTabindex) {
+		$tw.utils.addAttributeToParseTreeNode(selectNode,"tabindex",this.selectTabindex);
+	}
+	if(this.selectTooltip) {
+		$tw.utils.addAttributeToParseTreeNode(selectNode,"title",this.selectTooltip);
+	}
+	this.makeChildWidgets([selectNode]);
 };

 /*
@@ -182,21 +178,17 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 SelectWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
 	// If we're using a different tiddler/field/index then completely refresh ourselves
-	if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes.tooltip || changedAttributes.tabindex) {
+	if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes.tooltip) {
 		this.refreshSelf();
 		return true;
+	// If the target tiddler value has changed, just update setting and refresh the children
 	} else {
 		if(changedAttributes.class) {
 			this.selectClass = this.getAttribute("class");
 			this.getSelectDomNode().setAttribute("class",this.selectClass); 
 		}
-		this.assignAttributes(this.getSelectDomNode(),{
-			changedAttributes: changedAttributes,
-			sourcePrefix: "data-",
-			destPrefix: "data-"
-		});
+		
 		var childrenRefreshed = this.refreshChildren(changedTiddlers);
-		// If the target tiddler value has changed, just update setting and refresh the children
 		if(changedTiddlers[this.selectTitle] || childrenRefreshed) {
 			this.setSelectValue();
 		} 
--- a/core/modules/widgets/testcase.js
+++ b/core/modules/widgets/testcase.js
@@ -1,160 +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);
-	// Render the test rendering if required
-	if(this.testcaseTestOutput && this.testcaseTestExpectedResult) {
-		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(this.testcaseTestOutput && this.testcaseTestExpectedResult) {
-		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 === "pass") {
-		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
@@ -109,7 +109,6 @@ TranscludeWidget.prototype.collectAttributes = function() {
 		this.recursionMarker = this.getAttribute("recursionMarker","yes");
 	} else {
 		this.transcludeVariable = this.getAttribute("$variable");
-		this.transcludeVariableIsFunction = false;
 		this.transcludeType = this.getAttribute("$type");
 		this.transcludeOutput = this.getAttribute("$output","text/html");
 		this.transcludeTitle = this.getAttribute("$tiddler",this.getVariable("currentTiddler"));
@@ -185,9 +184,7 @@ TranscludeWidget.prototype.getTransclusionTarget = function() {
 		if(this.transcludeVariable) {
 			// Transcluding a variable
 			var variableInfo = this.getVariableInfo(this.transcludeVariable,{params: this.getOrderedTransclusionParameters()});
-			this.transcludeVariableIsFunction = variableInfo.srcVariable && variableInfo.srcVariable.isFunctionDefinition;
 			text = variableInfo.text;
-			this.transcludeFunctionResult = text;
 			return {
 				text: variableInfo.text,
 				type: this.transcludeType
@@ -222,24 +219,21 @@ TranscludeWidget.prototype.parseTransclusionTarget = function(parseAsInline) {
 			// Transcluding a variable
 			var variableInfo = this.getVariableInfo(this.transcludeVariable,{params: this.getOrderedTransclusionParameters()}),
 				srcVariable = variableInfo && variableInfo.srcVariable;
-			if(srcVariable && srcVariable.isFunctionDefinition) {
-				this.transcludeVariableIsFunction = true;
-				this.transcludeFunctionResult = (variableInfo.resultList ? variableInfo.resultList[0] : variableInfo.text) || "";
-			}
 			if(variableInfo.text) {
 				if(srcVariable && srcVariable.isFunctionDefinition) {
+					var result = (variableInfo.resultList ? variableInfo.resultList[0] : variableInfo.text) || "";
 					parser = {
 						tree: [{
 							type: "text",
-							text: this.transcludeFunctionResult
+							text: result
 						}],
-						source: this.transcludeFunctionResult,
+						source: result,
 						type: "text/vnd.tiddlywiki"
 					};
 					if(parseAsInline) {
 						parser.tree[0] = {
 							type: "text",
-							text: this.transcludeFunctionResult
+							text: result
 						};
 					} else {
 						parser.tree[0] = {
@@ -247,7 +241,7 @@ TranscludeWidget.prototype.parseTransclusionTarget = function(parseAsInline) {
 							tag: "p",
 							children: [{
 								type: "text",
-								text: this.transcludeFunctionResult
+								text: result
 							}]
 						}
 					}
@@ -436,19 +430,12 @@ TranscludeWidget.prototype.parserNeedsRefresh = function() {
 	return (this.sourceText === undefined || parserInfo.sourceText !== this.sourceText || parserInfo.parserType !== this.parserType)
 };

-TranscludeWidget.prototype.functionNeedsRefresh = function() {
-	var oldResult = this.transcludeFunctionResult;
-	var variableInfo = this.getVariableInfo(this.transcludeVariable,{params: this.getOrderedTransclusionParameters()});
-	var newResult = (variableInfo.resultList ? variableInfo.resultList[0] : variableInfo.text) || "";
-	return oldResult !== newResult;
-}
-
 /*
 Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
 */
 TranscludeWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
-	if(($tw.utils.count(changedAttributes) > 0) || (this.transcludeVariableIsFunction && this.functionNeedsRefresh()) || (!this.transcludeVariable && changedTiddlers[this.transcludeTitle] && this.parserNeedsRefresh())) {
+	if(($tw.utils.count(changedAttributes) > 0) || (!this.transcludeVariable && changedTiddlers[this.transcludeTitle] && this.parserNeedsRefresh())) {
 		this.refreshSelf();
 		return true;
 	} else {
--- a/core/modules/widgets/widget.js
+++ b/core/modules/widgets/widget.js
@@ -153,7 +153,7 @@ Widget.prototype.getVariableInfo = function(name,options) {
 		} else if(variable.isFunctionDefinition) {
 			// Function evaluations
 			params = self.resolveVariableParameters(variable.params,actualParams);
-			var variables = options.variables || Object.create(null);
+			var variables = Object.create(null);
 			// Apply default parameter values
 			$tw.utils.each(variable.params,function(param,index) {
 				if(param["default"]) {
@@ -413,34 +413,16 @@ Widget.prototype.getAttribute = function(name,defaultText) {
 };

 /*
-Assign the common attributes of the widget to a domNode
+Assign the computed attributes of the widget to a domNode
 options include:
-sourcePrefix: prefix of attributes that are to be directly assigned (defaults to the empty string meaning all attributes)
-destPrefix: prefix to be applied to attribute names that are to be directly assigned (defaults to the emtpy string which means no prefix is added)
-changedAttributes: hashmap by attribute name of attributes to process (if missing, process all attributes)
-excludeEventAttributes: ignores attributes whose name would begin with "on"
+excludeEventAttributes: ignores attributes whose name begins with "on"
 */
 Widget.prototype.assignAttributes = function(domNode,options) {
 	options = options || {};
-	var self = this,
-		changedAttributes = options.changedAttributes || this.attributes,
-		sourcePrefix = options.sourcePrefix || "",
-		destPrefix = options.destPrefix || "",
-		EVENT_ATTRIBUTE_PREFIX = "on";
+	var self = this;
 	var assignAttribute = function(name,value) {
-		// Process any style attributes before considering sourcePrefix and destPrefix
-		if(name.substr(0,6) === "style." && name.length > 6) {
-			domNode.style[$tw.utils.unHyphenateCss(name.substr(6))] = value;
-			return;
-		}
-		// Check if the sourcePrefix is a match
-		if(name.substr(0,sourcePrefix.length) === sourcePrefix) {
-			name = destPrefix + name.substr(sourcePrefix.length);
-		} else {
-			value = undefined;
-		}
 		// Check for excluded attribute names
-		if(options.excludeEventAttributes && name.substr(0,2).toLowerCase() === EVENT_ATTRIBUTE_PREFIX) {
+		if(options.excludeEventAttributes && name.substr(0,2) === "on") {
 			value = undefined;
 		}
 		if(value !== undefined) {
@@ -450,24 +432,26 @@ Widget.prototype.assignAttributes = function(domNode,options) {
 				namespace = "http://www.w3.org/1999/xlink";
 				name = name.substr(6);
 			}
-			// Setting certain attributes can cause a DOM error (eg xmlns on the svg element)
-			try {
-				domNode.setAttributeNS(namespace,name,value);
-			} catch(e) {
+			// Handle styles
+			if(name.substr(0,6) === "style." && name.length > 6) {
+				domNode.style[$tw.utils.unHyphenateCss(name.substr(6))] = value;
+			} else {
+				// Setting certain attributes can cause a DOM error (eg xmlns on the svg element)
+				try {
+					domNode.setAttributeNS(namespace,name,value);
+				} catch(e) {
+				}
 			}
 		}
-	};
-	// If the parse tree node has the orderedAttributes property then use that order
+	}
+	// Not all parse tree nodes have the orderedAttributes property
 	if(this.parseTreeNode.orderedAttributes) {
 		$tw.utils.each(this.parseTreeNode.orderedAttributes,function(attribute,index) {
-			if(attribute.name in changedAttributes) {
-				assignAttribute(attribute.name,self.getAttribute(attribute.name));
-			}
-		});
-	// Otherwise update each changed attribute irrespective of order
+			assignAttribute(attribute.name,self.attributes[attribute.name]);
+		});	
 	} else {
-		$tw.utils.each(changedAttributes,function(value,name) {
-			assignAttribute(name,self.getAttribute(name));
+		$tw.utils.each(Object.keys(self.attributes).sort(),function(name) {
+			assignAttribute(name,self.attributes[name]);
 		});	
 	}
 };
@@ -813,21 +797,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
 */
@@ -1349,7 +1287,7 @@ exports.search = function(text,options) {
 			console.log("Regexp error parsing /(" + text + ")/" + flags + ": ",e);
 		}
 	} else if(options.some) {
-		terms = text.trim().split(/[^\S\xA0]+/);
+		terms = text.trim().split(/ +/);
 		if(terms.length === 1 && terms[0] === "") {
 			searchTermsRegExps = null;
 		} else {
@@ -1360,7 +1298,7 @@ exports.search = function(text,options) {
 			searchTermsRegExps.push(new RegExp("(" + regExpStr + ")",flags));
 		}
 	} else { // default: words
-		terms = text.split(/[^\S\xA0]+/);
+		terms = text.split(/ +/);
 		if(terms.length === 1 && terms[0] === "") {
 			searchTermsRegExps = null;
 		} else {
--- 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/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/html-json-skinny-tiddler.tid
+++ b/core/templates/html-json-skinny-tiddler.tid
@@ -1,3 +1,4 @@
 title: $:/core/templates/html-json-skinny-tiddler

-<$text text=<<join>>/><$jsontiddler tiddler=<<currentTiddler>> exclude="text" escapeUnsafeScriptChars="yes"/>
+<$list filter="[<numTiddlers>compare:number:gteq[1]] ~[<counter>!match[1]]">`,`<$text text=<<newline>>/></$list>
+<$jsontiddler tiddler=<<currentTiddler>> exclude="text" escapeUnsafeScriptChars="yes"/>
--- a/core/templates/html-json-tiddler.tid
+++ b/core/templates/html-json-tiddler.tid
@@ -1,3 +1,3 @@
 title: $:/core/templates/html-json-tiddler

-<$jsontiddler tiddler=<<currentTiddler>> escapeUnsafeScriptChars="yes"/>
+<$list filter="[<counter>!match[1]]">`,`<$text text=<<newline>>/></$list><$jsontiddler tiddler=<<currentTiddler>> escapeUnsafeScriptChars="yes"/>
--- 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/templates/store.area.template.html.tid
+++ b/core/templates/store.area.template.html.tid
@@ -6,12 +6,14 @@ title: $:/core/templates/store.area.template.html
    <$list filter="[[storeAreaFormat]is[variable]getvariable[]else[json]match[json]]">
        <!-- New-style JSON store area, with an old-style store area for compatibility with v5.1.x tooling -->
        `<script class="tiddlywiki-tiddler-store" type="application/json">[`
-            <$let newline={{{ [charcode[10]] }}} join=`,$(newline)$`>
+            <$vars newline={{{ [charcode[10]] }}}>
                <$text text=<<newline>>/>
-                <$list filter=<<saveTiddlerFilter>> join=<<join>> template="$:/core/templates/html-json-tiddler"/>
-                <$list filter="[subfilter<skinnySaveTiddlerFilter>]"  template="$:/core/templates/html-json-skinny-tiddler"/>
+                <$list filter=<<saveTiddlerFilter>> counter="counter" template="$:/core/templates/html-json-tiddler"/>
+                <$vars numTiddlers={{{ [subfilter<saveTiddlerFilter>count[]] }}}>
+                    <$list filter={{{ [<skinnySaveTiddlerFilter>] }}} counter="counter" template="$:/core/templates/html-json-skinny-tiddler"/>
+                </$vars>
                <$text text=<<newline>>/>
-            </$let>
+            </$vars>
        `]</script>`
        `<div id="storeArea" style="display:none;">`
        `</div>`
@@ -20,8 +22,8 @@ title: $:/core/templates/store.area.template.html
        <!-- Old-style DIV/PRE-based store area -->
        <$reveal type="nomatch" state="$:/isEncrypted" text="yes">
            `<div id="storeArea" style="display:none;">`
-                <$list filter={{{ [<saveTiddlerFilter>] }}} template="$:/core/templates/html-div-tiddler"/>
-                <$list filter="[subfilter<skinnySaveTiddlerFilter>]" template="$:/core/templates/html-div-skinny-tiddler"/>
+                <$list filter=<<saveTiddlerFilter>> template="$:/core/templates/html-div-tiddler"/>
+                <$list filter={{{ [<skinnySaveTiddlerFilter>] }}} template="$:/core/templates/html-div-skinny-tiddler"/>
            `</div>`
        </$reveal>
    </$list>
--- 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/ControlPanel/Basics.tid
+++ b/core/ui/ControlPanel/Basics.tid
@@ -26,10 +26,10 @@ caption: {{$:/language/ControlPanel/Basics/Caption}}
 |<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
 |<$link to="$:/status/UserName"><<lingo Username/Prompt>></$link> |<$edit-text tiddler="$:/status/UserName" default="" tag="input"/> |
 |<$link to="$:/config/AnimationDuration"><<lingo AnimDuration/Prompt>></$link> |<$edit-text tiddler="$:/config/AnimationDuration" default="" tag="input"/> |
-|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit class="tc-edit-texteditor" tiddler="$:/DefaultTiddlers" autoHeight="yes"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit class="tc-edit-texteditor" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
 |<$link to="$:/language/DefaultNewTiddlerTitle"><<lingo NewTiddler/Title/Prompt>></$link> |<$edit-text tiddler="$:/language/DefaultNewTiddlerTitle" default="" tag="input"/> |
 |<$link to="$:/config/NewJournal/Title"><<lingo NewJournal/Title/Prompt>></$link> |<$edit-text tiddler="$:/config/NewJournal/Title" default="" tag="input"/> |
-|<$link to="$:/config/NewJournal/Text"><<lingo NewJournal/Text/Prompt>></$link> |<$edit tiddler="$:/config/NewJournal/Text" class="tc-edit-texteditor" default="" autoHeight="yes"/> |
+|<$link to="$:/config/NewJournal/Text"><<lingo NewJournal/Text/Prompt>></$link> |<$edit tiddler="$:/config/NewJournal/Text" class="tc-edit-texteditor" default=""/> |
 |<$link to="$:/config/NewTiddler/Tags"><<lingo NewTiddler/Tags/Prompt>></$link> |<$vars currentTiddler="$:/config/NewTiddler/Tags" tagField="text">{{||$:/core/ui/EditTemplate/tags}}<$list filter="[<currentTiddler>tags[]] +[limit[1]]" variable="ignore"><$button tooltip={{$:/language/ControlPanel/Basics/RemoveTags/Hint}}><<lingo RemoveTags>><$action-listops $tiddler=<<currentTiddler>> $field="text" $subfilter={{{ [<currentTiddler>get[tags]] }}}/><$action-setfield $tiddler=<<currentTiddler>> tags=""/></$button></$list></$vars> |
 |<$link to="$:/config/NewJournal/Tags"><<lingo NewJournal/Tags/Prompt>></$link> |<$vars currentTiddler="$:/config/NewJournal/Tags" tagField="text">{{||$:/core/ui/EditTemplate/tags}}<$list filter="[<currentTiddler>tags[]] +[limit[1]]" variable="ignore"><$button tooltip={{$:/language/ControlPanel/Basics/RemoveTags/Hint}}><<lingo RemoveTags>><$action-listops $tiddler=<<currentTiddler>> $field="text" $subfilter={{{ [<currentTiddler>get[tags]] }}}/><$action-setfield $tiddler=<<currentTiddler>> tags=""/></$button></$list></$vars> |
 |<$link to="$:/config/AutoFocus"><<lingo AutoFocus/Prompt>></$link> |{{$:/snippets/minifocusswitcher}} |
--- 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/Show More
+++ b/Show More