diff --git a/bin/lazy.sh b/bin/lazy.sh
index eb0603701..372799288 100755
--- a/bin/lazy.sh
+++ b/bin/lazy.sh
@@ -5,7 +5,7 @@
 # Optional parameter is the username for signing edits
 
 node ./tiddlywiki.js \
-	editions/server \
+	editions/tw5.com-server \
 	--verbose \
 	--server 8080 $:/core/save/lazy-images text/plain text/html $1 $2\
 	|| exit 1
diff --git a/bin/readme.md b/bin/readme.md
index c611d2b7b..28064f02d 100644
--- a/bin/readme.md
+++ b/bin/readme.md
@@ -1,3 +1,3 @@
-<h1 class="">Script Files</h1><p>The <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki5.html">TiddlyWiki5</a> repository contains several scripts in the <code>bin</code> folder that you can use to automate common tasks, or as a useful starting point for your own scripts. See <a class="tc-tiddlylink tc-tiddlylink-missing" href="http://tiddlywiki.com/static/Scripts%2520for%2520building%2520tiddlywiki.com.html">Scripts for building tiddlywiki.com</a> for details of the scripts used to build and release <a class="tc-tiddlylink-external" href="http://tiddlywiki.com/" target="_blank">http://tiddlywiki.com/</a>.</p><p>All the scripts expect to be run from the root folder of the repository.</p><h2 class=""><code>serve</code>: serves tw5.com</h2><pre><code>./bin/serve.sh -h
+<h1 class="">Script Files</h1><p>The <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki5.html">TiddlyWiki5</a> repository contains several scripts in the <code>bin</code> folder that you can use to automate common tasks, or as a useful starting point for your own scripts. See <a class="tc-tiddlylink tc-tiddlylink-missing" href="http://tiddlywiki.com/static/Scripts%2520for%2520building%2520tiddlywiki.com.html">Scripts for building tiddlywiki.com</a> for details of the scripts used to build and release <a class="tc-tiddlylink-external" href="http://tiddlywiki.com/" rel="noopener noreferrer" target="_blank">http://tiddlywiki.com/</a>.</p><p>All the scripts expect to be run from the root folder of the repository.</p><h2 class=""><code>serve</code>: serves tw5.com</h2><pre><code>./bin/serve.sh -h
 ./bin/serve.sh [edition dir] [username] [password] [host] [port]</code></pre><p>Or:</p><pre><code>./bin/serve.cmd -h
 ./bin/serve.cmd [edition dir] [username] [password] [host] [port]</code></pre><p>This script starts <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki5.html">TiddlyWiki5</a> running as an HTTP server, defaulting to the content from the <code>tw5.com-server</code> edition. By default, the Node.js serves on port 8080. If the optional <code>username</code> parameter is provided, it is used for signing edits. If the <code>password</code> is provided then HTTP basic authentication is used. Run the script with the <code>-h</code> parameter to see online help.</p><p>To experiment with this configuration, run the script and then visit <code>http://127.0.0.1:8080</code> in a browser.</p><p>Changes made in the browser propagate to the server over HTTP (use the browser developer console to see these requests). The server then syncs changes to the file system (and logs each change to the screen).</p><h2 class=""><code>test</code>: build and run tests</h2><p>This script runs the <code>test</code> edition of <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> on the server to perform the server-side tests and to build <code>test.html</code> for running the tests in the browser.</p><h2 class=""><code>lazy</code>: serves tw5.com with lazily loaded images</h2><pre><code>./bin/lazy.sh &lt;username&gt; [&lt;password&gt;]</code></pre><p>Or:</p><pre><code>./bin/lazy.cmd &lt;username&gt; [&lt;password&gt;]</code></pre><p>This script serves the <code>tw5.com-server</code> edition content with <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/LazyLoading.html">LazyLoading</a> applied to images.</p><h2 class=""><code>2bld</code>: builds <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> 2.6.5</h2><p>This script builds <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> 2.6.5 from the original source and then displays the differences between them (<code>diff</code> is used for *nix, <code>fc</code> for Windows).</p>
\ No newline at end of file
diff --git a/boot/boot.js b/boot/boot.js
index 9d47c9ba8..e5f6c775e 100644
--- a/boot/boot.js
+++ b/boot/boot.js
@@ -136,7 +136,7 @@ $tw.utils.error = function(err) {
 			heading = dm("h1",{text: errHeading}),
 			prompt = dm("div",{text: promptMsg, "class": "tc-error-prompt"}),
 			message = dm("div",{text: err}),
-			button = dm("button",{text: "close"}),
+			button = dm("button",{text: ( $tw.language == undefined ? "close" : $tw.language.getString("Buttons/Close/Caption") )}),
 			form = dm("form",{children: [heading,prompt,message,button], "class": "tc-error-form"});
 		document.body.insertBefore(form,document.body.firstChild);
 		form.addEventListener("submit",function(event) {
@@ -251,15 +251,20 @@ $tw.utils.parseDate = function(value) {
 
 // Stringify an array of tiddler titles into a list string
 $tw.utils.stringifyList = function(value) {
-	var result = [];
-	for(var t=0; t<value.length; t++) {
-		if(value[t].indexOf(" ") !== -1) {
-			result.push("[[" + value[t] + "]]");
-		} else {
-			result.push(value[t]);
+	if($tw.utils.isArray(value)) {
+		var result = [];
+		for(var t=0; t<value.length; t++) {
+			var entry = value[t] || "";
+			if(entry.indexOf(" ") !== -1) {
+				result.push("[[" + entry + "]]");
+			} else {
+				result.push(entry);
+			}
 		}
+		return result.join(" ");
+	} else {
+		return value || "";
 	}
-	return result.join(" ");
 };
 
 // Parse a string array from a bracketted list. For example "OneTiddler [[Another Tiddler]] LastOne"
@@ -514,6 +519,9 @@ $tw.utils.PasswordPrompt.prototype.createPrompt = function(options) {
 	if(options.canCancel) {
 		children.push(dm("button",{
 			text: $tw.language.getString("Encryption/Cancel"),
+			attributes: {
+				type: "button"
+			},
 			eventListeners: [{
 					name: "click",
 					handlerFunction: function(event) {
@@ -648,7 +656,7 @@ $tw.modules.execute = function(moduleName,moduleRoot) {
 			clearInterval: clearInterval,
 			setTimeout: setTimeout,
 			clearTimeout: clearTimeout,
-			Buffer: $tw.browser ? {} : Buffer,
+			Buffer: $tw.browser ? undefined : Buffer,
 			$tw: $tw,
 			require: function(title) {
 				return $tw.modules.execute(title, name);
@@ -712,7 +720,24 @@ $tw.modules.execute = function(moduleName,moduleRoot) {
 				moduleInfo.exports = moduleInfo.definition;
 			}
 		} catch(e) {
-			$tw.utils.error("Error executing boot module " + name + ":\n" + e.stack);
+			if (e instanceof SyntaxError) {
+				var line = e.lineNumber || e.line; // Firefox || Safari
+				if (typeof(line) != "undefined" && line !== null) {
+					$tw.utils.error("Syntax error in boot module " + name + ":" + line + ":\n" + e.stack);
+				} else if(!$tw.browser) {
+					// this is the only way to get node.js to display the line at which the syntax error appeared,
+					// and $tw.utils.error would exit anyway
+					// cf. https://bugs.chromium.org/p/v8/issues/detail?id=2589
+					throw e;
+				} else {
+					// Opera: line number is included in e.message
+					// Chrome/IE: there's currently no way to get the line number
+					$tw.utils.error("Syntax error in boot module " + name + ": " + e.message + "\n" + e.stack);
+				}
+			} else {
+				// line number should be included in e.stack for runtime errors
+				$tw.utils.error("Error executing boot module " + name + ": " + JSON.stringify(e) + "\n\n" + e.stack);
+			}
 		}
 	}
 	// Return the exports of the module
@@ -812,6 +837,7 @@ $tw.Tiddler = function(/* [fields,] fields */) {
 	}
 	// Freeze the tiddler against modification
 	Object.freeze(this.fields);
+	Object.freeze(this);
 };
 
 $tw.Tiddler.prototype.hasField = function(field) {
@@ -884,7 +910,7 @@ $tw.Wiki = function(options) {
 	// Delete a tiddler
 	this.deleteTiddler = function(title) {
 // Uncomment the following line for detailed logs of all tiddler deletions
-// console.log("Deleting",title,tiddler)
+// console.log("Deleting",title)
 		if($tw.utils.hop(tiddlers,title)) {
 			delete tiddlers[title];
 			this.clearCache(title);
@@ -895,12 +921,13 @@ $tw.Wiki = function(options) {
 
 	// Get a tiddler from the store
 	this.getTiddler = function(title) {
-		var t = tiddlers[title];
-		if(t instanceof $tw.Tiddler) {
-			return t;
-		} else if(title !== undefined && Object.prototype.hasOwnProperty.call(shadowTiddlers,title)) {
-			return shadowTiddlers[title].tiddler;
-		} else {
+		if(title) {
+			var t = tiddlers[title];
+			if(t instanceof $tw.Tiddler) {
+				return t;
+			} else if(title !== undefined && Object.prototype.hasOwnProperty.call(shadowTiddlers,title)) {
+				return shadowTiddlers[title].tiddler;
+			}
 			return undefined;
 		}
 	};
@@ -1242,15 +1269,15 @@ $tw.modules.define("$:/boot/tiddlerdeserializer/tids","tiddlerdeserializer",{
 			for(var t=0; t<lines.length; t++) {
 				var line = lines[t];
 				if(line.charAt(0) !== "#") {
-					var colonPos= line.indexOf(": ");
+					var colonPos= line.indexOf(":");
 					if(colonPos !== -1) {
 						var tiddler = $tw.utils.extend(Object.create(null),fields);
-						tiddler.title = (tiddler.title || "") + line.substr(0,colonPos);
+						tiddler.title = (tiddler.title || "") + line.substr(0,colonPos).trim();
 						if(titles.indexOf(tiddler.title) !== -1) {
 							console.log("Warning: .multids file contains multiple definitions for " + tiddler.title);
 						}
 						titles.push(tiddler.title);
-						tiddler.text = line.substr(colonPos + 2);
+						tiddler.text = line.substr(colonPos + 2).trim();
 						tiddlers.push(tiddler);
 					}
 				}
@@ -1429,17 +1456,26 @@ $tw.loadTiddlersFromFile = function(filepath,fields) {
 		typeInfo = type ? $tw.config.contentTypeInfo[type] : null,
 		data = fs.readFileSync(filepath,typeInfo ? typeInfo.encoding : "utf8"),
 		tiddlers = $tw.wiki.deserializeTiddlers(ext,data,fields),
-		metafile = filepath + ".meta",
 		metadata;
-	if(ext !== ".json" && tiddlers.length === 1 && fs.existsSync(metafile)) {
-		metadata = fs.readFileSync(metafile,"utf8");
-		if(metadata) {
-			tiddlers = [$tw.utils.parseFields(metadata,tiddlers[0])];
-		}
+	if(ext !== ".json" && tiddlers.length === 1) {
+		metadata = $tw.loadMetadataForFile(filepath);
+		tiddlers = [$tw.utils.extend({},metadata,tiddlers[0])];
 	}
 	return {filepath: filepath, type: type, tiddlers: tiddlers, hasMetaFile: !!metadata};
 };
 
+/*
+Load the metadata fields in the .meta file corresponding to a particular file
+*/
+$tw.loadMetadataForFile = function(filepath) {
+	var metafilename = filepath + ".meta";
+	if(fs.existsSync(metafilename)) {
+		return $tw.utils.parseFields(fs.readFileSync(metafilename,"utf8") || "");
+	} else {
+		return null;
+	}
+};
+
 /*
 A default set of files for TiddlyWiki to ignore during load.
 This matches what NPM ignores, and adds "*.meta" to ignore tiddler
@@ -1459,44 +1495,7 @@ $tw.loadTiddlersFromPath = function(filepath,excludeRegExp) {
 			var files = fs.readdirSync(filepath);
 			// Look for a tiddlywiki.files file
 			if(files.indexOf("tiddlywiki.files") !== -1) {
-				// If so, process the files it describes
-				var filesInfo = JSON.parse(fs.readFileSync(filepath + path.sep + "tiddlywiki.files","utf8"));
-				// First the tiddlers
-				$tw.utils.each(filesInfo.tiddlers,function(tidInfo) {
-					var type = tidInfo.fields.type || "text/plain",
-						typeInfo = $tw.config.contentTypeInfo[type],
-						pathname = path.resolve(filepath,tidInfo.file),
-						text = fs.readFileSync(pathname,typeInfo ? typeInfo.encoding : "utf8");
-					if(tidInfo.isTiddlerFile) {
-						var fileTiddlers = $tw.wiki.deserializeTiddlers(path.extname(pathname),text) || [];
-						$tw.utils.each(fileTiddlers,function(tiddler) {
-							$tw.utils.extend(tiddler,tidInfo.fields);
-							if(tidInfo.prefix) {
-								tiddler.text = tidInfo.prefix + tiddler.text;
-							}
-							if(tidInfo.suffix) {
-								tiddler.text = tiddler.text + tidInfo.suffix;
-							}
-						});
-						tiddlers.push({tiddlers: fileTiddlers});
-					} else {
-						if(tidInfo.prefix) {
-							text = tidInfo.prefix + text;
-						}
-						if(tidInfo.suffix) {
-							text = text + tidInfo.suffix;
-						}
-						tidInfo.fields.text = text;
-						tiddlers.push({tiddlers: [tidInfo.fields]});
-					}
-				});
-				// Then any recursive directories
-				$tw.utils.each(filesInfo.directories,function(dirPath) {
-					var pathname = path.resolve(filepath,dirPath);
-					if(fs.existsSync(pathname) && fs.statSync(pathname).isDirectory()) {
-						tiddlers.push.apply(tiddlers,$tw.loadTiddlersFromPath(pathname,excludeRegExp));
-					}
-				});
+				Array.prototype.push.apply(tiddlers,$tw.loadTiddlersFromSpecification(filepath,excludeRegExp));
 			} else {
 				// If not, read all the files in the directory
 				$tw.utils.each(files,function(file) {
@@ -1512,6 +1511,100 @@ $tw.loadTiddlersFromPath = function(filepath,excludeRegExp) {
 	return tiddlers;
 };
 
+/*
+Load all the tiddlers defined by a `tiddlywiki.files` specification file
+filepath: pathname of the directory containing the specification file
+*/
+$tw.loadTiddlersFromSpecification = function(filepath,excludeRegExp) {
+	var tiddlers = [];
+	// Read the specification
+	var filesInfo = JSON.parse(fs.readFileSync(filepath + path.sep + "tiddlywiki.files","utf8"));
+	// Helper to process a file
+	var processFile = function(filename,isTiddlerFile,fields) {
+		var extInfo = $tw.config.fileExtensionInfo[path.extname(filename)],
+			type = (extInfo || {}).type || fields.type || "text/plain",
+			typeInfo = $tw.config.contentTypeInfo[type] || {},
+			pathname = path.resolve(filepath,filename),
+			text = fs.readFileSync(pathname,typeInfo.encoding || "utf8"),
+			metadata = $tw.loadMetadataForFile(pathname) || {},
+			fileTiddlers;
+		if(isTiddlerFile) {
+			fileTiddlers = $tw.wiki.deserializeTiddlers(path.extname(pathname),text,metadata) || [];
+		} else {
+			fileTiddlers =  [$tw.utils.extend({text: text},metadata)];
+		}
+		var combinedFields = $tw.utils.extend({},fields,metadata);
+		$tw.utils.each(fileTiddlers,function(tiddler) {
+			$tw.utils.each(combinedFields,function(fieldInfo,name) {
+				if(typeof fieldInfo === "string" || $tw.utils.isArray(fieldInfo)) {
+					tiddler[name] = fieldInfo;
+				} else {
+					var value = tiddler[name];
+					switch(fieldInfo.source) {
+						case "filename":
+							value = path.basename(filename);
+							break;
+						case "basename":
+							value = path.basename(filename,path.extname(filename));
+							break;
+						case "extname":
+							value = path.extname(filename);
+							break;
+						case "created":
+							value = new Date(fs.statSync(pathname).birthtime);
+							break;
+						case "modified":
+							value = new Date(fs.statSync(pathname).mtime);
+							break;
+					}
+					if(fieldInfo.prefix) {
+						value = fieldInfo.prefix + value;
+					}
+					if(fieldInfo.suffix) {
+						value = value + fieldInfo.suffix;
+					}
+					tiddler[name] = value;
+				}
+			});
+		});
+		tiddlers.push({tiddlers: fileTiddlers});
+	};
+	// Process the listed tiddlers
+	$tw.utils.each(filesInfo.tiddlers,function(tidInfo) {
+		if(tidInfo.prefix && tidInfo.suffix) {
+			tidInfo.fields.text = {prefix: tidInfo.prefix,suffix: tidInfo.suffix};
+		} else if(tidInfo.prefix) {
+			tidInfo.fields.text = {prefix: tidInfo.prefix};
+		} else if(tidInfo.suffix) {
+			tidInfo.fields.text = {suffix: tidInfo.suffix};
+		}
+		processFile(tidInfo.file,tidInfo.isTiddlerFile,tidInfo.fields);
+	});
+	// Process any listed directories
+	$tw.utils.each(filesInfo.directories,function(dirSpec) {
+		// Read literal directories directly
+		if(typeof dirSpec === "string") {
+			var pathname = path.resolve(filepath,dirSpec);
+			if(fs.existsSync(pathname) && fs.statSync(pathname).isDirectory()) {
+				tiddlers.push.apply(tiddlers,$tw.loadTiddlersFromPath(pathname,excludeRegExp));
+			}
+		} else {
+			// Process directory specifier
+			var dirPath = path.resolve(filepath,dirSpec.path),
+				files = fs.readdirSync(dirPath),
+				fileRegExp = new RegExp(dirSpec.filesRegExp || "^.*$"),
+				metaRegExp = /^.*\.meta$/;
+			for(var t=0; t<files.length; t++) {
+				var filename = files[t];
+				if(filename !== "tiddlywiki.files" && !metaRegExp.test(filename) && fileRegExp.test(filename)) {
+					processFile(dirPath + path.sep + filename,dirSpec.isTiddlerFile,dirSpec.fields);
+				}
+			}
+		}
+	});
+	return tiddlers;
+};
+
 /*
 Load the tiddlers from a plugin folder, and package them up into a proper JSON plugin tiddler
 */
@@ -1835,6 +1928,9 @@ $tw.boot.startup = function(options) {
 	$tw.utils.registerFileType("audio/mp3","base64",".mp3");
 	$tw.utils.registerFileType("audio/mp4","base64",[".mp4",".m4a"]);
 	$tw.utils.registerFileType("text/x-markdown","utf8",[".md",".markdown"]);
+	$tw.utils.registerFileType("application/enex+xml","utf8",".enex");
+	$tw.utils.registerFileType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet","base64",".xlsx");
+	$tw.utils.registerFileType("application/x-bibtex","utf8",".bib");
 	// Create the wiki store for the app
 	$tw.wiki = new $tw.Wiki();
 	// Install built in tiddler fields modules
diff --git a/contributing.md b/contributing.md
index 995b8fa44..e307ea6da 100644
--- a/contributing.md
+++ b/contributing.md
@@ -1,4 +1,4 @@
-<h1 class="">Contributing to <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki5.html">TiddlyWiki5</a></h1><p>We welcome contributions to the code and documentation of <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> in several ways:</p><ul><li><a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/ReportingBugs.html">ReportingBugs</a></li><li>Helping to <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/Improving%2520TiddlyWiki%2520Documentation.html">improve our documentation</a></li><li>Contributing to the code via <a class="tc-tiddlylink-external" href="https://github.com/Jermolene/TiddlyWiki5" target="_blank">GitHub</a><ul><li>See <a class="tc-tiddlylink-external" href="http://tiddlywiki.com/dev" target="_blank">http://tiddlywiki.com/dev</a> for more details</li></ul></li></ul><p>There are other ways to <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/HelpingTiddlyWiki.html">help TiddlyWiki</a> too.</p><h1 class="">Contributor License Agreement</h1><p>Like other <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/OpenSource.html">OpenSource</a> projects, <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki5.html">TiddlyWiki5</a> needs a signed contributor license agreement from individual contributors. This is a legal agreement that allows contributors  to assert that they own the copyright of their contribution, and that they agree to license it to the <a class="tc-tiddlylink tc-tiddlylink-missing" href="http://tiddlywiki.com/static/UnaMesa.html">UnaMesa</a> Association (the legal entity that owns <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> on behalf of the community).</p><ul><li>For individuals use: <a class="tc-tiddlylink-external" href="https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-individual.md" target="_blank">licenses/CLA-individual</a></li><li>For entities use: <a class="tc-tiddlylink-external" href="https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-entity.md" target="_blank">licenses/CLA-entity</a></li></ul><h1 class="">How to sign the CLA</h1><p>Create a <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/GitHub.html">GitHub</a> pull request to add your name to <code>cla-individual.md</code> or <code>cla-entity.md</code>, with the date in the format (YYYY/MM/DD).</p><p><strong>step by step</strong></p><ol><li>Navigate to <a class="tc-tiddlylink-external" href="https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-individual.md" target="_blank">licenses/CLA-individual</a> or <a class="tc-tiddlylink-external" href="https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-entity.md" target="_blank">licenses/CLA-entity</a> according to whether you are signing as an individual or representative of an organisation</li><li>Click the edit button at the top-right corner (clicking this button will fork the project so you can edit the file)</li><li>Add your name at the bottom<ul><li>eg: <code>Jeremy Ruston, @Jermolene, 2011/11/22</code></li></ul></li><li>Below the edit box for the CLA text you should see a box labelled <strong>Propose file change</strong></li><li>Enter a brief title to explain the change (eg, &quot;Signing the CLA&quot;)</li><li>Click the green button labelled <strong>Propose file change</strong></li><li>On the following screen, click the green button labelled <strong>Create pull request</strong></li></ol><hr><p><em>The CLA documents used for this project were created using <a class="tc-tiddlylink-external" href="http://www.harmonyagreements.org" target="_blank">Harmony Project Templates</a>. &quot;HA-CLA-I-LIST Version 1.0&quot; for &quot;CLA-individual&quot; and &quot;HA-CLA-E-LIST Version 1.0&quot; for &quot;CLA-entity&quot;.</em></p><p>Remarks
+<h1 class="">Contributing to <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki5.html">TiddlyWiki5</a></h1><p>We welcome contributions to the code and documentation of <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> in several ways:</p><ul><li><a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/ReportingBugs.html">ReportingBugs</a></li><li>Helping to <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/Improving%2520TiddlyWiki%2520Documentation.html">improve our documentation</a></li><li>Contributing to the code via <a class="tc-tiddlylink-external" href="https://github.com/Jermolene/TiddlyWiki5" rel="noopener noreferrer" target="_blank">GitHub</a><ul><li>See <a class="tc-tiddlylink-external" href="http://tiddlywiki.com/dev" rel="noopener noreferrer" target="_blank">http://tiddlywiki.com/dev</a> for more details</li></ul></li></ul><p>There are other ways to <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/HelpingTiddlyWiki.html">help TiddlyWiki</a> too.</p><h1 class="">Contributor License Agreement</h1><p>Like other <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/OpenSource.html">OpenSource</a> projects, <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki5.html">TiddlyWiki5</a> needs a signed contributor license agreement from individual contributors. This is a legal agreement that allows contributors to assert that they own the copyright of their contribution, and that they agree to license it to the <a class="tc-tiddlylink tc-tiddlylink-missing" href="http://tiddlywiki.com/static/UnaMesa.html">UnaMesa</a> Association (the legal entity that owns <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> on behalf of the community).</p><ul><li>For individuals use: <a class="tc-tiddlylink-external" href="https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-individual.md" rel="noopener noreferrer" target="_blank">licenses/CLA-individual</a></li><li>For entities use: <a class="tc-tiddlylink-external" href="https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-entity.md" rel="noopener noreferrer" target="_blank">licenses/CLA-entity</a></li></ul><h1 class="">How to sign the CLA</h1><p>Create a <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/GitHub.html">GitHub</a> pull request to add your name to <code>cla-individual.md</code> or <code>cla-entity.md</code>, with the date in the format (YYYY/MM/DD).</p><p><strong>step by step</strong></p><ol><li>Navigate to <a class="tc-tiddlylink-external" href="https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-individual.md" rel="noopener noreferrer" target="_blank">licenses/CLA-individual</a> or <a class="tc-tiddlylink-external" href="https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-entity.md" rel="noopener noreferrer" target="_blank">licenses/CLA-entity</a> according to whether you are signing as an individual or representative of an organisation</li><li>Click the &quot;edit&quot; button at the top-right corner (clicking this button will fork the project so you can edit the file)</li><li>Add your name at the bottom<ul><li>eg: <code>Jeremy Ruston, @Jermolene, 2011/11/22</code></li></ul></li><li>Below the edit box for the CLA text you should see a box labelled <strong>Propose file change</strong></li><li>Enter a brief title to explain the change (eg, &quot;Signing the CLA&quot;)</li><li>Click the green button labelled <strong>Propose file change</strong></li><li>On the following screen, click the green button labelled <strong>Create pull request</strong></li></ol><hr><p><em>The CLA documents used for this project were created using <a class="tc-tiddlylink-external" href="http://www.harmonyagreements.org" rel="noopener noreferrer" target="_blank">Harmony Project Templates</a>. &quot;HA-CLA-I-LIST Version 1.0&quot; for &quot;CLA-individual&quot; and &quot;HA-CLA-E-LIST Version 1.0&quot; for &quot;CLA-entity&quot;.</em></p><p>Remarks
 ----—</p><ul><li><ul><li>When not owning the copyright in the entire work of authorship**</li></ul></li></ul><p>In this case, please clearly state so, since otherwise we assume that you are the legal copyright holder of the contributed work! Please provide links and additional information that clarify under which license the rest of the code is distributed.
 </p><p><em>This file was automatically generated by <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki5.html">TiddlyWiki5</a></em>
 </p>
\ No newline at end of file
diff --git a/core/images/advanced-search-button.tid b/core/images/advanced-search-button.tid
old mode 100644
new mode 100755
diff --git a/core/images/auto-height.tid b/core/images/auto-height.tid
new file mode 100755
index 000000000..e65b9c5b6
--- /dev/null
+++ b/core/images/auto-height.tid
@@ -0,0 +1,6 @@
+title: $:/core/images/auto-height
+tags: $:/tags/Image
+
+<svg class="tc-image-auto-height tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <path d="M67.9867828,114.356363 L67.9579626,99.8785426 C67.9550688,98.4248183 67.1636987,97.087107 65.8909901,96.3845863 L49.9251455,87.5716209 L47.992126,95.0735397 L79.8995411,95.0735397 C84.1215894,95.0735397 85.4638131,89.3810359 81.686497,87.4948823 L49.7971476,71.5713518 L48.0101917,79.1500092 L79.992126,79.1500092 C84.2093753,79.1500092 85.5558421,73.4676733 81.7869993,71.5753162 L49.805065,55.517008 L48.0101916,63.0917009 L79.9921259,63.0917015 C84.2035118,63.0917016 85.5551434,57.4217887 81.7966702,55.5218807 L65.7625147,47.4166161 L67.9579705,50.9864368 L67.9579705,35.6148245 L77.1715737,44.8284272 C78.7336709,46.3905243 81.2663308,46.3905243 82.8284279,44.8284271 C84.390525,43.2663299 84.390525,40.7336699 82.8284278,39.1715728 L66.8284271,23.1715728 C65.2663299,21.6094757 62.73367,21.6094757 61.1715729,23.1715729 L45.1715729,39.1715729 C43.6094757,40.73367 43.6094757,43.26633 45.1715729,44.8284271 C46.73367,46.3905243 49.26633,46.3905243 50.8284271,44.8284271 L59.9579705,35.6988837 L59.9579705,50.9864368 C59.9579705,52.495201 60.806922,53.8755997 62.1534263,54.5562576 L78.1875818,62.6615223 L79.9921261,55.0917015 L48.0101917,55.0917009 C43.7929424,55.0917008 42.4464755,60.7740368 46.2153183,62.6663939 L78.1972526,78.7247021 L79.992126,71.1500092 L48.0101917,71.1500092 C43.7881433,71.1500092 42.4459197,76.842513 46.2232358,78.7286665 L78.1125852,94.6521971 L79.8995411,87.0735397 L47.992126,87.0735397 C43.8588276,87.0735397 42.4404876,92.5780219 46.0591064,94.5754586 L62.024951,103.388424 L59.9579785,99.8944677 L59.9867142,114.32986 L50.8284271,105.171573 C49.26633,103.609476 46.73367,103.609476 45.1715729,105.171573 C43.6094757,106.73367 43.6094757,109.26633 45.1715729,110.828427 L61.1715729,126.828427 C62.73367,128.390524 65.2663299,128.390524 66.8284271,126.828427 L82.8284278,110.828427 C84.390525,109.26633 84.390525,106.73367 82.8284279,105.171573 C81.2663308,103.609476 78.7336709,103.609476 77.1715737,105.171573 L67.9867828,114.356363 L67.9867828,114.356363 Z M16,20 L112,20 C114.209139,20 116,18.209139 116,16 C116,13.790861 114.209139,12 112,12 L16,12 C13.790861,12 12,13.790861 12,16 C12,18.209139 13.790861,20 16,20 L16,20 Z"></path>
+</svg>
\ No newline at end of file
diff --git a/core/images/blank.tid b/core/images/blank.tid
old mode 100644
new mode 100755
diff --git a/core/images/bold.tid b/core/images/bold.tid
new file mode 100755
index 000000000..0e5d9d8d6
--- /dev/null
+++ b/core/images/bold.tid
@@ -0,0 +1,8 @@
+title: $:/core/images/bold
+tags: $:/tags/Image
+
+<svg class="tc-image-bold tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <path d="M41.1456583,51.8095238 L41.1456583,21.8711485 L67.4985994,21.8711485 C70.0084159,21.8711485 72.4285598,22.0802967 74.7591036,22.4985994 C77.0896475,22.9169022 79.1512515,23.6638602 80.9439776,24.7394958 C82.7367036,25.8151314 84.170863,27.3090474 85.2464986,29.2212885 C86.3221342,31.1335296 86.859944,33.5835518 86.859944,36.5714286 C86.859944,41.9496067 85.2465147,45.8337882 82.0196078,48.2240896 C78.792701,50.614391 74.6694929,51.8095238 69.6498599,51.8095238 L41.1456583,51.8095238 Z M13,0 L13,128 L75.0280112,128 C80.7647346,128 86.3519803,127.28292 91.789916,125.848739 C97.2278517,124.414559 102.068139,122.203563 106.310924,119.215686 C110.553709,116.22781 113.929959,112.373506 116.439776,107.652661 C118.949592,102.931816 120.204482,97.3445701 120.204482,90.8907563 C120.204482,82.8832466 118.262391,76.0411115 114.378151,70.3641457 C110.493911,64.6871798 104.607883,60.7133634 96.719888,58.442577 C102.456611,55.6937304 106.788968,52.1680887 109.717087,47.8655462 C112.645206,43.5630037 114.109244,38.1849062 114.109244,31.7310924 C114.109244,25.7553389 113.123259,20.7357813 111.151261,16.6722689 C109.179262,12.6087565 106.400578,9.35201972 102.815126,6.90196078 C99.2296739,4.45190185 94.927196,2.68908101 89.907563,1.61344538 C84.8879301,0.537809748 79.3305627,0 73.2352941,0 L13,0 Z M41.1456583,106.128852 L41.1456583,70.9915966 L71.8011204,70.9915966 C77.896389,70.9915966 82.7964334,72.3958776 86.5014006,75.2044818 C90.2063677,78.0130859 92.0588235,82.7039821 92.0588235,89.2773109 C92.0588235,92.6237329 91.4911355,95.3725383 90.3557423,97.5238095 C89.2203491,99.6750808 87.6965548,101.378145 85.7843137,102.633053 C83.8720726,103.887961 81.661077,104.784311 79.1512605,105.322129 C76.641444,105.859947 74.0121519,106.128852 71.2633053,106.128852 L41.1456583,106.128852 Z"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/core/images/cancel-button.tid b/core/images/cancel-button.tid
old mode 100644
new mode 100755
diff --git a/core/images/chevron-down.tid b/core/images/chevron-down.tid
old mode 100644
new mode 100755
diff --git a/core/images/chevron-left.tid b/core/images/chevron-left.tid
old mode 100644
new mode 100755
diff --git a/core/images/chevron-right.tid b/core/images/chevron-right.tid
old mode 100644
new mode 100755
diff --git a/core/images/chevron-up.tid b/core/images/chevron-up.tid
old mode 100644
new mode 100755
diff --git a/core/images/clone-button.tid b/core/images/clone-button.tid
old mode 100644
new mode 100755
diff --git a/core/images/close-all-button.tid b/core/images/close-all-button.tid
old mode 100644
new mode 100755
diff --git a/core/images/close-button.tid b/core/images/close-button.tid
old mode 100644
new mode 100755
diff --git a/core/images/close-others-button.tid b/core/images/close-others-button.tid
old mode 100644
new mode 100755
diff --git a/core/images/copy-clipboard.tid b/core/images/copy-clipboard.tid
new file mode 100644
index 000000000..583808bd4
--- /dev/null
+++ b/core/images/copy-clipboard.tid
@@ -0,0 +1,15 @@
+title: $:/core/images/copy-clipboard
+tags: $:/tags/Image
+
+<svg class="tc-image-copy-clipboard tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+	<g fill-rule="evenodd">
+		<rect x="40" y="40" width="33" height="8" rx="4"></rect>
+		<rect x="40" y="82" width="17" height="8" rx="4"></rect>
+		<rect x="40" y="54" width="17" height="8" rx="4"></rect>
+		<rect x="40" y="96" width="33" height="8" rx="4"></rect>
+		<rect x="40" y="68" width="12" height="8" rx="4"></rect>
+		<path d="M40,16 L23.9992458,16 C19.5813843,16 16,19.5907123 16,24 C16,24.0016363 16.0000005,24.0032725 16.0000015,24.0049086 C16.0000005,24.0065441 16,24.0081803 16,24.0098166 L16,119.990183 C16,119.99182 16.0000005,119.993456 16.0000015,119.995092 C16.0000005,119.996727 16,119.998364 16,120 C16,124.409288 19.5813843,128 23.9992458,128 L104.000754,128 C106.205061,128 108.203844,127.105595 109.652065,125.659342 C111.102424,124.21251 112,122.214511 112,120.007595 L112,103.992405 C112,99.5776607 108.418278,96 104,96 C99.5907123,96 96,99.5783218 96,103.992405 L96,112 L32,112 L32,32 L96,32 L96,40.0075946 C96,44.4223393 99.581722,48 104,48 C108.409288,48 112,44.4216782 112,40.0075946 L112,23.9924054 C112,21.7851587 111.104671,19.7871591 109.657101,18.3409203 C108.203844,16.8944047 106.205061,16 104.000754,16 L88,16 C88,11.5907123 84.4151006,8 79.9929031,8 L48.0070969,8 C43.5881712,8 40,11.581722 40,16 Z M44,14.9958262 C44,12.7889923 45.7964248,11 48.0000255,11 L79.9999745,11 C82.2091276,11 84,12.7965212 84,14.9958262 L84,19.0041738 C84,21.2110077 82.2035752,23 79.9999745,23 L48.0000255,23 C45.7908724,23 44,21.2034788 44,19.0041738 L44,14.9958262 Z"></path>
+		<rect x="62" y="64" width="66" height="16" rx="8"></rect>
+		<path d="M60.6568542,85.6568542 L76.6568542,69.6568543 L65.3431458,69.6568542 L81.3431458,85.6568542 C84.4673401,88.7810486 89.5326599,88.7810486 92.6568542,85.6568542 C95.7810486,82.5326599 95.7810486,77.4673401 92.6568542,74.3431458 L76.6568542,58.3431458 C73.5326599,55.2189514 68.4673401,55.2189514 65.3431458,58.3431457 L49.3431458,74.3431457 C46.2189514,77.4673401 46.2189514,82.5326599 49.3431457,85.6568542 C52.4673401,88.7810486 57.5326599,88.7810486 60.6568542,85.6568542 L60.6568542,85.6568542 Z" transform="translate(71.000000, 72.000000) rotate(-90.000000) translate(-71.000000, -72.000000) "></path>
+	</g>
+</svg>
\ No newline at end of file
diff --git a/core/images/delete-button.tid b/core/images/delete-button.tid
old mode 100644
new mode 100755
diff --git a/core/images/done-button.tid b/core/images/done-button.tid
old mode 100644
new mode 100755
diff --git a/core/images/down-arrow.tid b/core/images/down-arrow.tid
old mode 100644
new mode 100755
diff --git a/core/images/download-button.tid b/core/images/download-button.tid
old mode 100644
new mode 100755
diff --git a/core/images/edit-button.tid b/core/images/edit-button.tid
old mode 100644
new mode 100755
diff --git a/core/images/erase.tid b/core/images/erase.tid
new file mode 100755
index 000000000..ba18f5bd0
--- /dev/null
+++ b/core/images/erase.tid
@@ -0,0 +1,8 @@
+title: $:/core/images/erase
+tags: $:/tags/Image
+
+<svg class="tc-image-erase tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <path d="M60.0870401,127.996166 L123.102318,64.980888 C129.636723,58.4464827 129.629513,47.8655877 123.098967,41.3350425 L99.4657866,17.7018617 C92.927448,11.1635231 82.3486358,11.1698163 75.8199411,17.698511 L4.89768189,88.6207702 C-1.63672343,95.1551755 -1.6295126,105.736071 4.90103262,112.266616 L20.6305829,127.996166 L60.0870401,127.996166 Z M25.1375576,120.682546 L10.812569,106.357558 C7.5455063,103.090495 7.54523836,97.793808 10.8048093,94.5342371 L46.2691086,59.0699377 L81.7308914,94.5317205 L55.5800654,120.682546 L25.1375576,120.682546 Z"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/core/images/excise.tid b/core/images/excise.tid
new file mode 100755
index 000000000..2360cb5a7
--- /dev/null
+++ b/core/images/excise.tid
@@ -0,0 +1,8 @@
+title: $:/core/images/excise
+tags: $:/tags/Image
+
+<svg class="tc-image-excise tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <path d="M56,107.313709 L53.6568542,109.656854 C50.5326599,112.781049 45.4673401,112.781049 42.3431457,109.656854 C39.2189514,106.53266 39.2189514,101.46734 42.3431458,98.3431457 L58.3431458,82.3431457 C61.4673401,79.2189514 66.5326599,79.2189514 69.6568542,82.3431458 L85.6568542,98.3431458 C88.7810486,101.46734 88.7810486,106.53266 85.6568542,109.656854 C82.5326599,112.781049 77.4673401,112.781049 74.3431458,109.656854 L72,107.313708 L72,121.597798 C72,125.133636 68.418278,128 64,128 C59.581722,128 56,125.133636 56,121.597798 L56,107.313709 Z M0,40.0070969 C0,35.5848994 3.59071231,32 8,32 C12.418278,32 16,35.5881712 16,40.0070969 L16,71.9929031 C16,76.4151006 12.4092877,80 8,80 C3.581722,80 0,76.4118288 0,71.9929031 L0,40.0070969 Z M32,40.0070969 C32,35.5848994 35.5907123,32 40,32 C44.418278,32 48,35.5881712 48,40.0070969 L48,71.9929031 C48,76.4151006 44.4092877,80 40,80 C35.581722,80 32,76.4118288 32,71.9929031 L32,40.0070969 Z M80,40.0070969 C80,35.5848994 83.5907123,32 88,32 C92.418278,32 96,35.5881712 96,40.0070969 L96,71.9929031 C96,76.4151006 92.4092877,80 88,80 C83.581722,80 80,76.4118288 80,71.9929031 L80,40.0070969 Z M56,8.00709688 C56,3.58489938 59.5907123,0 64,0 C68.418278,0 72,3.58817117 72,8.00709688 L72,39.9929031 C72,44.4151006 68.4092877,48 64,48 C59.581722,48 56,44.4118288 56,39.9929031 L56,8.00709688 Z M112,40.0070969 C112,35.5848994 115.590712,32 120,32 C124.418278,32 128,35.5881712 128,40.0070969 L128,71.9929031 C128,76.4151006 124.409288,80 120,80 C115.581722,80 112,76.4118288 112,71.9929031 L112,40.0070969 Z"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/core/images/export-button.tid b/core/images/export-button.tid
old mode 100644
new mode 100755
diff --git a/core/images/file.tid b/core/images/file.tid
old mode 100644
new mode 100755
index bc91d4208..d66b19e50
--- a/core/images/file.tid
+++ b/core/images/file.tid
@@ -4,11 +4,11 @@ tags: $:/tags/Image
 <svg class="tc-image-file tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
     <g fill-rule="nonzero">
         <path d="M111.96811,30.5 L112,30.5 L112,119.999079 C112,124.417866 108.419113,128 104.000754,128 L23.9992458,128 C19.5813843,128 16,124.417687 16,119.999079 L16,8.00092105 C16,3.58213437 19.5808867,0 23.9992458,0 L81,0 L81,0.0201838424 C83.1589869,-0.071534047 85.3482153,0.707077645 86.9982489,2.35711116 L109.625176,24.9840387 C111.151676,26.510538 111.932942,28.4998414 111.96811,30.5 L111.96811,30.5 Z M81,8 L24,8 L24,120 L104,120 L104,30.5 L89.0003461,30.5 C84.5818769,30.5 81,26.9216269 81,22.4996539 L81,8 Z"></path>
-        <rect x="32" y="36" width="64" height="8" rx="8"></rect>
-        <rect x="32" y="52" width="64" height="8" rx="8"></rect>
-        <rect x="32" y="68" width="64" height="8" rx="8"></rect>
-        <rect x="32" y="84" width="64" height="8" rx="8"></rect>
-        <rect x="32" y="100" width="64" height="8" rx="8"></rect>
-        <rect x="32" y="20" width="40" height="8" rx="8"></rect>
+        <rect x="32" y="36" width="64" height="8" rx="4"></rect>
+        <rect x="32" y="52" width="64" height="8" rx="4"></rect>
+        <rect x="32" y="68" width="64" height="8" rx="4"></rect>
+        <rect x="32" y="84" width="64" height="8" rx="4"></rect>
+        <rect x="32" y="100" width="64" height="8" rx="4"></rect>
+        <rect x="32" y="20" width="40" height="8" rx="4"></rect>
     </g>
 </svg>
\ No newline at end of file
diff --git a/core/images/fixed-height.tid b/core/images/fixed-height.tid
new file mode 100755
index 000000000..3b53256ab
--- /dev/null
+++ b/core/images/fixed-height.tid
@@ -0,0 +1,8 @@
+title: $:/core/images/fixed-height
+tags: $:/tags/Image
+
+<svg class="tc-image-fixed-height tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <path d="M60,35.6568542 L50.8284271,44.8284271 C49.26633,46.3905243 46.73367,46.3905243 45.1715729,44.8284271 C43.6094757,43.26633 43.6094757,40.73367 45.1715729,39.1715729 L61.1715729,23.1715729 C62.73367,21.6094757 65.2663299,21.6094757 66.8284271,23.1715728 L82.8284278,39.1715728 C84.390525,40.7336699 84.390525,43.2663299 82.8284279,44.8284271 C81.2663308,46.3905243 78.7336709,46.3905243 77.1715737,44.8284272 L68,35.6568539 L68,93.3431461 L77.1715737,84.1715728 C78.7336709,82.6094757 81.2663308,82.6094757 82.8284279,84.1715729 C84.390525,85.7336701 84.390525,88.2663301 82.8284278,89.8284272 L66.8284271,105.828427 C65.2663299,107.390524 62.73367,107.390524 61.1715729,105.828427 L45.1715729,89.8284271 C43.6094757,88.26633 43.6094757,85.73367 45.1715729,84.1715729 C46.73367,82.6094757 49.26633,82.6094757 50.8284271,84.1715729 L60,93.3431458 L60,35.6568542 L60,35.6568542 Z M16,116 L112,116 C114.209139,116 116,114.209139 116,112 C116,109.790861 114.209139,108 112,108 L16,108 C13.790861,108 12,109.790861 12,112 C12,114.209139 13.790861,116 16,116 L16,116 Z M16,20 L112,20 C114.209139,20 116,18.209139 116,16 C116,13.790861 114.209139,12 112,12 L16,12 C13.790861,12 12,13.790861 12,16 C12,18.209139 13.790861,20 16,20 L16,20 Z"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/core/images/fold-all-button.tid b/core/images/fold-all-button.tid
old mode 100644
new mode 100755
diff --git a/core/images/fold-button.tid b/core/images/fold-button.tid
old mode 100644
new mode 100755
diff --git a/core/images/fold-others-button.tid b/core/images/fold-others-button.tid
old mode 100644
new mode 100755
diff --git a/core/images/folder.tid b/core/images/folder.tid
old mode 100644
new mode 100755
diff --git a/core/images/full-screen-button.tid b/core/images/full-screen-button.tid
old mode 100644
new mode 100755
diff --git a/core/images/github.tid b/core/images/github.tid
old mode 100644
new mode 100755
diff --git a/core/images/globe.tid b/core/images/globe.tid
old mode 100644
new mode 100755
diff --git a/core/images/heading-1.tid b/core/images/heading-1.tid
new file mode 100755
index 000000000..94d57dee9
--- /dev/null
+++ b/core/images/heading-1.tid
@@ -0,0 +1,8 @@
+title: $:/core/images/heading-1
+tags: $:/tags/Image
+
+<svg class="tc-image-heading-1 tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <path d="M14,30 L27.25,30 L27.25,60.104 L61.7,60.104 L61.7,30 L74.95,30 L74.95,105.684 L61.7,105.684 L61.7,71.552 L27.25,71.552 L27.25,105.684 L14,105.684 L14,30 Z M84.3350766,43.78 C86.8790893,43.78 89.3523979,43.5680021 91.7550766,43.144 C94.1577553,42.7199979 96.3307336,42.0133383 98.2740766,41.024 C100.21742,40.0346617 101.87807,38.7626744 103.256077,37.208 C104.634084,35.6533256 105.535075,33.7453446 105.959077,31.484 L115.817077,31.484 L115.817077,105.684 L102.567077,105.684 L102.567077,53.32 L84.3350766,53.32 L84.3350766,43.78 Z"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/core/images/heading-2.tid b/core/images/heading-2.tid
new file mode 100755
index 000000000..65b2e3750
--- /dev/null
+++ b/core/images/heading-2.tid
@@ -0,0 +1,8 @@
+title: $:/core/images/heading-2
+tags: $:/tags/Image
+
+<svg class="tc-image-heading-2 tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <path d="M6,30 L19.25,30 L19.25,60.104 L53.7,60.104 L53.7,30 L66.95,30 L66.95,105.684 L53.7,105.684 L53.7,71.552 L19.25,71.552 L19.25,105.684 L6,105.684 L6,30 Z M125.519077,105.684 L74.8510766,105.684 C74.9217436,99.5359693 76.4057288,94.1653563 79.3030766,89.572 C82.2004244,84.9786437 86.1577182,80.986017 91.1750766,77.594 C93.5777553,75.8273245 96.0863969,74.113675 98.7010766,72.453 C101.315756,70.792325 103.718399,69.0080095 105.909077,67.1 C108.099754,65.1919905 109.901736,63.1250111 111.315077,60.899 C112.728417,58.6729889 113.47041,56.1113478 113.541077,53.214 C113.541077,51.8713266 113.382078,50.4403409 113.064077,48.921 C112.746075,47.4016591 112.127748,45.9883399 111.209077,44.681 C110.290405,43.3736601 109.018418,42.2783377 107.393077,41.395 C105.767735,40.5116622 103.647756,40.07 101.033077,40.07 C98.6303979,40.07 96.6340846,40.5469952 95.0440766,41.501 C93.4540687,42.4550048 92.1820814,43.762325 91.2280766,45.423 C90.2740719,47.083675 89.5674123,49.0446554 89.1080766,51.306 C88.648741,53.5673446 88.3837436,56.0053203 88.3130766,58.62 L76.2290766,58.62 C76.2290766,54.5213128 76.7767378,50.7230175 77.8720766,47.225 C78.9674154,43.7269825 80.610399,40.7060127 82.8010766,38.162 C84.9917542,35.6179873 87.6593942,33.6216739 90.8040766,32.173 C93.948759,30.7243261 97.6057224,30 101.775077,30 C106.297766,30 110.078395,30.7419926 113.117077,32.226 C116.155758,33.7100074 118.611401,35.5826554 120.484077,37.844 C122.356753,40.1053446 123.681739,42.5609868 124.459077,45.211 C125.236414,47.8610133 125.625077,50.3873213 125.625077,52.79 C125.625077,55.7580148 125.165748,58.4433213 124.247077,60.846 C123.328405,63.2486787 122.091751,65.4569899 120.537077,67.471 C118.982402,69.4850101 117.215753,71.3399915 115.237077,73.036 C113.2584,74.7320085 111.209087,76.3219926 109.089077,77.806 C106.969066,79.2900074 104.849087,80.7033266 102.729077,82.046 C100.609066,83.3886734 98.6480856,84.7313266 96.8460766,86.074 C95.0440676,87.4166734 93.47175,88.8123261 92.1290766,90.261 C90.7864032,91.7096739 89.8677458,93.2466585 89.3730766,94.872 L125.519077,94.872 L125.519077,105.684 Z"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/core/images/heading-3.tid b/core/images/heading-3.tid
new file mode 100755
index 000000000..6899440a7
--- /dev/null
+++ b/core/images/heading-3.tid
@@ -0,0 +1,8 @@
+title: $:/core/images/heading-3
+tags: $:/tags/Image
+
+<svg class="tc-image-heading-3 tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <path d="M6,30 L19.25,30 L19.25,60.104 L53.7,60.104 L53.7,30 L66.95,30 L66.95,105.684 L53.7,105.684 L53.7,71.552 L19.25,71.552 L19.25,105.684 L6,105.684 L6,30 Z M94.8850766,62.224 C96.8637532,62.294667 98.8424001,62.1533351 100.821077,61.8 C102.799753,61.4466649 104.566402,60.8283378 106.121077,59.945 C107.675751,59.0616623 108.930072,57.8426744 109.884077,56.288 C110.838081,54.7333256 111.315077,52.8253446 111.315077,50.564 C111.315077,47.3839841 110.237421,44.8400095 108.082077,42.932 C105.926733,41.0239905 103.153094,40.07 99.7610766,40.07 C97.641066,40.07 95.8037511,40.4939958 94.2490766,41.342 C92.6944022,42.1900042 91.4047484,43.3383261 90.3800766,44.787 C89.3554048,46.2356739 88.5957458,47.860991 88.1010766,49.663 C87.6064075,51.465009 87.3944096,53.3199905 87.4650766,55.228 L75.3810766,55.228 C75.5224107,51.623982 76.1937373,48.2850154 77.3950766,45.211 C78.596416,42.1369846 80.2393995,39.4693446 82.3240766,37.208 C84.4087537,34.9466554 86.9350618,33.1800064 89.9030766,31.908 C92.8710915,30.6359936 96.2277246,30 99.9730766,30 C102.870424,30 105.714729,30.4239958 108.506077,31.272 C111.297424,32.1200042 113.806065,33.3566585 116.032077,34.982 C118.258088,36.6073415 120.042403,38.6743208 121.385077,41.183 C122.72775,43.6916792 123.399077,46.5713171 123.399077,49.822 C123.399077,53.5673521 122.551085,56.8356527 120.855077,59.627 C119.159068,62.4183473 116.509095,64.4499936 112.905077,65.722 L112.905077,65.934 C117.145098,66.7820042 120.448731,68.8843166 122.816077,72.241 C125.183422,75.5976835 126.367077,79.6786426 126.367077,84.484 C126.367077,88.017351 125.660417,91.1796527 124.247077,93.971 C122.833736,96.7623473 120.925755,99.129657 118.523077,101.073 C116.120398,103.016343 113.329093,104.517995 110.149077,105.578 C106.969061,106.638005 103.612428,107.168 100.079077,107.168 C95.7683884,107.168 92.005426,106.549673 88.7900766,105.313 C85.5747272,104.076327 82.8894207,102.327345 80.7340766,100.066 C78.5787325,97.8046554 76.9357489,95.0840159 75.8050766,91.904 C74.6744043,88.7239841 74.0737436,85.1906861 74.0030766,81.304 L86.0870766,81.304 C85.9457426,85.8266893 87.0587315,89.5896517 89.4260766,92.593 C91.7934218,95.5963483 95.3443863,97.098 100.079077,97.098 C104.107097,97.098 107.481396,95.9496782 110.202077,93.653 C112.922757,91.3563219 114.283077,88.0880212 114.283077,83.848 C114.283077,80.9506522 113.717749,78.6540085 112.587077,76.958 C111.456404,75.2619915 109.972419,73.9723378 108.135077,73.089 C106.297734,72.2056623 104.230755,71.6580011 101.934077,71.446 C99.6373985,71.2339989 97.2877553,71.163333 94.8850766,71.234 L94.8850766,62.224 Z"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/core/images/heading-4.tid b/core/images/heading-4.tid
new file mode 100755
index 000000000..c30a44692
--- /dev/null
+++ b/core/images/heading-4.tid
@@ -0,0 +1,8 @@
+title: $:/core/images/heading-4
+tags: $:/tags/Image
+
+<svg class="tc-image-heading-4 tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <path d="M8,30 L21.25,30 L21.25,60.104 L55.7,60.104 L55.7,30 L68.95,30 L68.95,105.684 L55.7,105.684 L55.7,71.552 L21.25,71.552 L21.25,105.684 L8,105.684 L8,30 Z M84.5890766,78.548 L107.061077,78.548 L107.061077,45.9 L106.849077,45.9 L84.5890766,78.548 Z M128.049077,88.088 L118.509077,88.088 L118.509077,105.684 L107.061077,105.684 L107.061077,88.088 L75.2610766,88.088 L75.2610766,76.11 L107.061077,31.484 L118.509077,31.484 L118.509077,78.548 L128.049077,78.548 L128.049077,88.088 Z"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/core/images/heading-5.tid b/core/images/heading-5.tid
new file mode 100755
index 000000000..8e0a7fdc8
--- /dev/null
+++ b/core/images/heading-5.tid
@@ -0,0 +1,8 @@
+title: $:/core/images/heading-5
+tags: $:/tags/Image
+
+<svg class="tc-image-heading-5 tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <path d="M6,30 L19.25,30 L19.25,60.104 L53.7,60.104 L53.7,30 L66.95,30 L66.95,105.684 L53.7,105.684 L53.7,71.552 L19.25,71.552 L19.25,105.684 L6,105.684 L6,30 Z M83.7550766,31.484 L122.127077,31.484 L122.127077,42.296 L92.7650766,42.296 L88.9490766,61.164 L89.1610766,61.376 C90.7864181,59.5386575 92.8533974,58.1430048 95.3620766,57.189 C97.8707558,56.2349952 100.361731,55.758 102.835077,55.758 C106.509762,55.758 109.795729,56.3763272 112.693077,57.613 C115.590424,58.8496729 118.0284,60.5809889 120.007077,62.807 C121.985753,65.0330111 123.487405,67.6653181 124.512077,70.704 C125.536748,73.7426819 126.049077,77.028649 126.049077,80.562 C126.049077,83.5300148 125.572081,86.5863176 124.618077,89.731 C123.664072,92.8756824 122.144754,95.7376538 120.060077,98.317 C117.9754,100.896346 115.30776,103.016325 112.057077,104.677 C108.806394,106.337675 104.919766,107.168 100.397077,107.168 C96.7930586,107.168 93.454092,106.691005 90.3800766,105.737 C87.3060613,104.782995 84.6030883,103.35201 82.2710766,101.444 C79.939065,99.5359905 78.0840835,97.1863473 76.7060766,94.395 C75.3280697,91.6036527 74.5684107,88.3353521 74.4270766,84.59 L86.5110766,84.59 C86.8644117,88.6180201 88.2423979,91.7096559 90.6450766,93.865 C93.0477553,96.0203441 96.2277235,97.098 100.185077,97.098 C102.729089,97.098 104.884401,96.6740042 106.651077,95.826 C108.417752,94.9779958 109.848738,93.8120074 110.944077,92.328 C112.039415,90.8439926 112.816741,89.1126766 113.276077,87.134 C113.735412,85.1553234 113.965077,83.0353446 113.965077,80.774 C113.965077,78.7246564 113.682413,76.763676 113.117077,74.891 C112.55174,73.018324 111.703749,71.3753404 110.573077,69.962 C109.442404,68.5486596 107.976086,67.4180042 106.174077,66.57 C104.372068,65.7219958 102.269755,65.298 99.8670766,65.298 C97.3230639,65.298 94.9380878,65.7749952 92.7120766,66.729 C90.4860655,67.6830048 88.8784149,69.4673203 87.8890766,72.082 L75.8050766,72.082 L83.7550766,31.484 Z"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/core/images/heading-6.tid b/core/images/heading-6.tid
new file mode 100755
index 000000000..93f7bcfd7
--- /dev/null
+++ b/core/images/heading-6.tid
@@ -0,0 +1,8 @@
+title: $:/core/images/heading-6
+tags: $:/tags/Image
+
+<svg class="tc-image-heading-6 tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <path d="M6,30 L19.25,30 L19.25,60.104 L53.7,60.104 L53.7,30 L66.95,30 L66.95,105.684 L53.7,105.684 L53.7,71.552 L19.25,71.552 L19.25,105.684 L6,105.684 L6,30 Z M112.587077,50.246 C112.304409,47.2073181 111.226753,44.751676 109.354077,42.879 C107.481401,41.006324 104.955093,40.07 101.775077,40.07 C99.584399,40.07 97.6940846,40.4763293 96.1040766,41.289 C94.5140687,42.1016707 93.1714154,43.1793266 92.0760766,44.522 C90.9807378,45.8646734 90.0974133,47.401658 89.4260766,49.133 C88.7547399,50.864342 88.2070787,52.6839905 87.7830766,54.592 C87.3590745,56.5000095 87.0587442,58.390324 86.8820766,60.263 C86.7054091,62.135676 86.5464107,63.8846585 86.4050766,65.51 L86.6170766,65.722 C88.2424181,62.7539852 90.4860623,60.5456739 93.3480766,59.097 C96.2100909,57.6483261 99.3017267,56.924 102.623077,56.924 C106.297762,56.924 109.583729,57.5599936 112.481077,58.832 C115.378424,60.1040064 117.834067,61.8529889 119.848077,64.079 C121.862087,66.3050111 123.399071,68.9373181 124.459077,71.976 C125.519082,75.0146819 126.049077,78.300649 126.049077,81.834 C126.049077,85.438018 125.466082,88.7769846 124.300077,91.851 C123.134071,94.9250154 121.455754,97.6103219 119.265077,99.907 C117.074399,102.203678 114.459758,103.987994 111.421077,105.26 C108.382395,106.532006 105.025762,107.168 101.351077,107.168 C95.9097161,107.168 91.4400941,106.16101 87.9420766,104.147 C84.4440591,102.13299 81.6880867,99.3770175 79.6740766,95.879 C77.6600666,92.3809825 76.2644138,88.2823568 75.4870766,83.583 C74.7097394,78.8836432 74.3210766,73.8133605 74.3210766,68.372 C74.3210766,63.9199777 74.7980719,59.4326893 75.7520766,54.91 C76.7060814,50.3873107 78.278399,46.2710186 80.4690766,42.561 C82.6597542,38.8509815 85.5393921,35.8300117 89.1080766,33.498 C92.6767611,31.1659883 97.0757171,30 102.305077,30 C105.273091,30 108.064397,30.4946617 110.679077,31.484 C113.293756,32.4733383 115.608067,33.8513245 117.622077,35.618 C119.636087,37.3846755 121.27907,39.5046543 122.551077,41.978 C123.823083,44.4513457 124.529743,47.2073181 124.671077,50.246 L112.587077,50.246 Z M100.927077,97.098 C103.117754,97.098 105.025735,96.6563378 106.651077,95.773 C108.276418,94.8896623 109.636738,93.7413404 110.732077,92.328 C111.827415,90.9146596 112.640074,89.271676 113.170077,87.399 C113.700079,85.526324 113.965077,83.6006766 113.965077,81.622 C113.965077,79.6433234 113.700079,77.7353425 113.170077,75.898 C112.640074,74.0606575 111.827415,72.4530069 110.732077,71.075 C109.636738,69.6969931 108.276418,68.5840042 106.651077,67.736 C105.025735,66.8879958 103.117754,66.464 100.927077,66.464 C98.736399,66.464 96.8107516,66.8703293 95.1500766,67.683 C93.4894017,68.4956707 92.0937489,69.5909931 90.9630766,70.969 C89.8324043,72.3470069 88.9844128,73.9546575 88.4190766,75.792 C87.8537405,77.6293425 87.5710766,79.5726564 87.5710766,81.622 C87.5710766,83.6713436 87.8537405,85.6146575 88.4190766,87.452 C88.9844128,89.2893425 89.8324043,90.9323261 90.9630766,92.381 C92.0937489,93.8296739 93.4894017,94.9779958 95.1500766,95.826 C96.8107516,96.6740042 98.736399,97.098 100.927077,97.098 L100.927077,97.098 Z"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/core/images/help.tid b/core/images/help.tid
old mode 100644
new mode 100755
diff --git a/core/images/home-button.tid b/core/images/home-button.tid
old mode 100644
new mode 100755
diff --git a/core/images/import-button.tid b/core/images/import-button.tid
old mode 100644
new mode 100755
diff --git a/core/images/info-button.tid b/core/images/info-button.tid
old mode 100644
new mode 100755
index 2d9c2cb5c..263fe9056
--- a/core/images/info-button.tid
+++ b/core/images/info-button.tid
@@ -9,5 +9,4 @@ tags: $:/tags/Image
             <rect x="56" y="48" width="16" height="56" rx="8"></rect>
         </g>
     </g>
-    </g>
 </svg>
\ No newline at end of file
diff --git a/core/images/italic.tid b/core/images/italic.tid
new file mode 100755
index 000000000..f7c46b55c
--- /dev/null
+++ b/core/images/italic.tid
@@ -0,0 +1,8 @@
+title: $:/core/images/italic
+tags: $:/tags/Image
+
+<svg class="tc-image-italic tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+         <polygon points="66.7114846 0 89.1204482 0 62.4089636 128 40 128"></polygon>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/core/images/left-arrow.tid b/core/images/left-arrow.tid
old mode 100644
new mode 100755
diff --git a/core/images/line-width.tid b/core/images/line-width.tid
new file mode 100755
index 000000000..1e8854c4e
--- /dev/null
+++ b/core/images/line-width.tid
@@ -0,0 +1,9 @@
+title: $:/core/images/line-width
+tags: $:/tags/Image
+
+<svg class="tc-image-line-width tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <path d="M128,-97 L112.992786,-97 C112.452362,-97 112,-96.5522847 112,-96 C112,-95.4438648 112.444486,-95 112.992786,-95 L128,-95 L128,-97 Z M128,-78.6794919 L111.216185,-88.3696322 C110.748163,-88.6398444 110.132549,-88.4782926 109.856406,-88 C109.578339,-87.5183728 109.741342,-86.9117318 110.216185,-86.6375814 L128,-76.3700908 L128,-78.6794919 Z M78.6794919,-128 L88.3696322,-111.216185 C88.6437826,-110.741342 88.4816272,-110.134474 88,-109.856406 C87.5217074,-109.580264 86.9077936,-109.748163 86.6375814,-110.216185 L76.3700908,-128 L78.6794919,-128 Z M97,-128 L97,-112.992786 C97,-112.444486 96.5561352,-112 96,-112 C95.4477153,-112 95,-112.452362 95,-112.992786 L95,-128 L97,-128 Z M115.629909,-128 L105.362419,-110.216185 C105.088268,-109.741342 104.481627,-109.578339 104,-109.856406 C103.521707,-110.132549 103.360156,-110.748163 103.630368,-111.216185 L113.320508,-128 L115.629909,-128 Z M128,-113.320508 L111.216185,-103.630368 C110.741342,-103.356217 110.134474,-103.518373 109.856406,-104 C109.580264,-104.478293 109.748163,-105.092206 110.216185,-105.362419 L128,-115.629909 L128,-113.320508 Z M48,-96 C48,-96.5522847 48.4523621,-97 48.9927864,-97 L79.0072136,-97 C79.5555144,-97 80,-96.5561352 80,-96 C80,-95.4477153 79.5476379,-95 79.0072136,-95 L48.9927864,-95 C48.4444856,-95 48,-95.4438648 48,-96 Z M54.4307806,-120 C54.706923,-120.478293 55.3225377,-120.639844 55.7905589,-120.369632 L81.7838153,-105.362419 C82.2586577,-105.088268 82.4216611,-104.481627 82.1435935,-104 C81.8674512,-103.521707 81.2518365,-103.360156 80.7838153,-103.630368 L54.7905589,-118.637581 C54.3157165,-118.911732 54.152713,-119.518373 54.4307806,-120 Z M104,-82.1435935 C104.478293,-82.4197359 105.092206,-82.2518365 105.362419,-81.7838153 L120.369632,-55.7905589 C120.643783,-55.3157165 120.481627,-54.7088482 120,-54.4307806 C119.521707,-54.1546382 118.907794,-54.3225377 118.637581,-54.7905589 L103.630368,-80.7838153 C103.356217,-81.2586577 103.518373,-81.865526 104,-82.1435935 Z M96,-80 C96.5522847,-80 97,-79.5476379 97,-79.0072136 L97,-48.9927864 C97,-48.4444856 96.5561352,-48 96,-48 C95.4477153,-48 95,-48.4523621 95,-48.9927864 L95,-79.0072136 C95,-79.5555144 95.4438648,-80 96,-80 Z M88,-82.1435935 C88.4782926,-81.8674512 88.6398444,-81.2518365 88.3696322,-80.7838153 L73.3624186,-54.7905589 C73.0882682,-54.3157165 72.4816272,-54.152713 72,-54.4307806 C71.5217074,-54.706923 71.3601556,-55.3225377 71.6303678,-55.7905589 L86.6375814,-81.7838153 C86.9117318,-82.2586577 87.5183728,-82.4216611 88,-82.1435935 Z M82.1435935,-88 C82.4197359,-87.5217074 82.2518365,-86.9077936 81.7838153,-86.6375814 L55.7905589,-71.6303678 C55.3157165,-71.3562174 54.7088482,-71.5183728 54.4307806,-72 C54.1546382,-72.4782926 54.3225377,-73.0922064 54.7905589,-73.3624186 L80.7838153,-88.3696322 C81.2586577,-88.6437826 81.865526,-88.4816272 82.1435935,-88 Z M1.30626177e-08,-41.9868843 L15.0170091,-57.9923909 L20.7983821,-52.9749272 L44.7207091,-81.2095939 L73.4260467,-42.1002685 L85.984793,-56.6159488 L104.48741,-34.0310661 L127.969109,-47.4978019 L127.969109,7.99473128e-07 L1.30626177e-08,7.99473128e-07 L1.30626177e-08,-41.9868843 Z M96,-84 C102.627417,-84 108,-89.372583 108,-96 C108,-102.627417 102.627417,-108 96,-108 C89.372583,-108 84,-102.627417 84,-96 C84,-89.372583 89.372583,-84 96,-84 Z"></path>
+        <path d="M16,18 L112,18 C113.104569,18 114,17.1045695 114,16 C114,14.8954305 113.104569,14 112,14 L16,14 C14.8954305,14 14,14.8954305 14,16 C14,17.1045695 14.8954305,18 16,18 L16,18 Z M16,35 L112,35 C114.209139,35 116,33.209139 116,31 C116,28.790861 114.209139,27 112,27 L16,27 C13.790861,27 12,28.790861 12,31 C12,33.209139 13.790861,35 16,35 L16,35 Z M16,56 L112,56 C115.313708,56 118,53.3137085 118,50 C118,46.6862915 115.313708,44 112,44 L16,44 C12.6862915,44 10,46.6862915 10,50 C10,53.3137085 12.6862915,56 16,56 L16,56 Z M16,85 L112,85 C117.522847,85 122,80.5228475 122,75 C122,69.4771525 117.522847,65 112,65 L16,65 C10.4771525,65 6,69.4771525 6,75 C6,80.5228475 10.4771525,85 16,85 L16,85 Z M16,128 L112,128 C120.836556,128 128,120.836556 128,112 C128,103.163444 120.836556,96 112,96 L16,96 C7.163444,96 0,103.163444 0,112 C0,120.836556 7.163444,128 16,128 L16,128 Z"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/core/images/link.tid b/core/images/link.tid
new file mode 100644
index 000000000..1e094a9b0
--- /dev/null
+++ b/core/images/link.tid
@@ -0,0 +1,9 @@
+title: $:/core/images/link
+tags: $:/tags/Image
+
+<svg class="tc-image-link tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <path d="M128.719999,57.568543 C130.219553,53.8628171 131.045202,49.8121445 131.045202,45.5685425 C131.045202,27.8915447 116.718329,13.5685425 99.0452364,13.5685425 L67.0451674,13.5685425 C49.3655063,13.5685425 35.0452019,27.8954305 35.0452019,45.5685425 C35.0452019,63.2455403 49.3720745,77.5685425 67.0451674,77.5685425 L99.0452364,77.5685425 C100.406772,77.5685425 101.748384,77.4835732 103.065066,77.3186499 C96.4792444,73.7895096 91.1190212,68.272192 87.7873041,61.5685425 L67.0506214,61.5685425 C58.2110723,61.5685425 51.0452019,54.4070414 51.0452019,45.5685425 C51.0452019,36.7319865 58.2005234,29.5685425 67.0506214,29.5685425 L99.0397824,29.5685425 C107.879331,29.5685425 115.045202,36.7300436 115.045202,45.5685425 C115.045202,48.9465282 113.99957,52.0800164 112.21335,54.6623005 C114.314383,56.4735917 117.050039,57.5685425 120.041423,57.5685425 L128.720003,57.5685425 Z" transform="translate(83.045202, 45.568542) rotate(-225.000000) translate(-83.045202, -45.568542)"></path>
+        <path d="M-0.106255113,71.0452019 C-1.60580855,74.7509276 -2.43145751,78.8016001 -2.43145751,83.0452019 C-2.43145751,100.7222 11.8954151,115.045202 29.568508,115.045202 L61.568577,115.045202 C79.2482381,115.045202 93.5685425,100.718314 93.5685425,83.0452019 C93.5685425,65.3682041 79.2416699,51.0452019 61.568577,51.0452019 L29.568508,51.0452019 C28.206973,51.0452019 26.8653616,51.1301711 25.5486799,51.2950943 C32.1345,54.8242347 37.4947231,60.3415524 40.8264403,67.0452019 L61.563123,67.0452019 C70.4026721,67.0452019 77.5685425,74.206703 77.5685425,83.0452019 C77.5685425,91.8817579 70.413221,99.0452019 61.563123,99.0452019 L29.573962,99.0452019 C20.7344129,99.0452019 13.5685425,91.8837008 13.5685425,83.0452019 C13.5685425,79.6672162 14.6141741,76.533728 16.4003949,73.9514439 C14.2993609,72.1401527 11.5637054,71.0452019 8.5723215,71.0452019 L-0.106255113,71.0452019 Z" transform="translate(45.568542, 83.045202) rotate(-225.000000) translate(-45.568542, -83.045202)"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/core/images/list-bullet.tid b/core/images/list-bullet.tid
new file mode 100755
index 000000000..7951ad229
--- /dev/null
+++ b/core/images/list-bullet.tid
@@ -0,0 +1,8 @@
+title: $:/core/images/list-bullet
+tags: $:/tags/Image
+
+<svg class="tc-image-list-bullet tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <path d="M11.6363636,40.2727273 C18.0629498,40.2727273 23.2727273,35.0629498 23.2727273,28.6363636 C23.2727273,22.2097775 18.0629498,17 11.6363636,17 C5.20977746,17 0,22.2097775 0,28.6363636 C0,35.0629498 5.20977746,40.2727273 11.6363636,40.2727273 Z M11.6363636,75.1818182 C18.0629498,75.1818182 23.2727273,69.9720407 23.2727273,63.5454545 C23.2727273,57.1188684 18.0629498,51.9090909 11.6363636,51.9090909 C5.20977746,51.9090909 0,57.1188684 0,63.5454545 C0,69.9720407 5.20977746,75.1818182 11.6363636,75.1818182 Z M11.6363636,110.090909 C18.0629498,110.090909 23.2727273,104.881132 23.2727273,98.4545455 C23.2727273,92.0279593 18.0629498,86.8181818 11.6363636,86.8181818 C5.20977746,86.8181818 0,92.0279593 0,98.4545455 C0,104.881132 5.20977746,110.090909 11.6363636,110.090909 Z M34.9090909,22.8181818 L128,22.8181818 L128,34.4545455 L34.9090909,34.4545455 L34.9090909,22.8181818 Z M34.9090909,57.7272727 L128,57.7272727 L128,69.3636364 L34.9090909,69.3636364 L34.9090909,57.7272727 Z M34.9090909,92.6363636 L128,92.6363636 L128,104.272727 L34.9090909,104.272727 L34.9090909,92.6363636 Z"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/core/images/list-number.tid b/core/images/list-number.tid
new file mode 100755
index 000000000..768f16d25
--- /dev/null
+++ b/core/images/list-number.tid
@@ -0,0 +1,8 @@
+title: $:/core/images/list-number
+tags: $:/tags/Image
+
+<svg class="tc-image-list-number tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <path d="M33.8390805,22.3563218 L128,22.3563218 L128,34.1264368 L33.8390805,34.1264368 L33.8390805,22.3563218 Z M33.8390805,57.6666667 L128,57.6666667 L128,69.4367816 L33.8390805,69.4367816 L33.8390805,57.6666667 Z M33.8390805,92.9770115 L128,92.9770115 L128,104.747126 L33.8390805,104.747126 L33.8390805,92.9770115 Z M0.379509711,42.6307008 L0.379509711,40.4082314 L1.37821948,40.4082314 C2.20382368,40.4082314 2.82301754,40.268077 3.23581964,39.9877642 C3.64862174,39.7074513 3.85501969,39.0400498 3.85501969,37.9855395 L3.85501969,22.7686318 C3.85501969,21.3270228 3.66193774,20.4327047 3.27576803,20.0856507 C2.88959832,19.7385967 1.79768657,19.5650723 0,19.5650723 L0,17.4226919 C3.50215975,17.2758613 6.25191314,16.4683055 8.24934266,15 L10.3666074,15 L10.3666074,37.865406 C10.3666074,38.786434 10.5164123,39.4404875 10.8160268,39.8275862 C11.1156412,40.2146849 11.764796,40.4082314 12.7635108,40.4082314 L13.7622206,40.4082314 L13.7622206,42.6307008 L0.379509711,42.6307008 Z M0.0798967812,77.9873934 L0.0798967812,76.0852799 C7.27064304,69.5312983 10.8659622,63.5046623 10.8659622,58.005191 C10.8659622,56.4434479 10.5397203,55.195407 9.88722667,54.2610308 C9.23473303,53.3266546 8.36253522,52.8594735 7.27060709,52.8594735 C6.3784219,52.8594735 5.61608107,53.1764892 4.98356173,53.8105302 C4.35104238,54.4445712 4.03478745,55.1753759 4.03478745,56.0029663 C4.03478745,56.9773871 4.28113339,57.8316611 4.77383268,58.5658139 C4.88036225,58.7259926 4.93362624,58.8461249 4.93362624,58.9262143 C4.93362624,59.0730449 4.77383427,59.2065252 4.45424555,59.3266593 C4.2411864,59.4067486 3.70188852,59.6336652 2.83633573,60.0074156 C1.99741533,60.3811661 1.47809145,60.5680386 1.2783485,60.5680386 C1.03865696,60.5680386 0.765679018,60.1976307 0.459406492,59.4568039 C0.153133966,58.715977 0,57.9184322 0,57.0641453 C0,55.1153036 0.848894811,53.5202138 2.5467099,52.2788283 C4.24452499,51.0374428 6.34512352,50.4167594 8.84856852,50.4167594 C11.3120649,50.4167594 13.3793735,51.0874979 15.0505562,52.4289952 C16.7217389,53.7704924 17.5573177,55.5224215 17.5573177,57.684835 C17.5573177,58.9662652 17.2743527,60.2076321 16.7084144,61.4089729 C16.142476,62.6103138 14.7875733,64.4623531 12.6436656,66.9651465 C10.4997579,69.4679398 8.40914641,71.7804862 6.3717683,73.902855 L17.8169822,73.902855 L16.7982982,79.6292176 L14.6810335,79.6292176 C14.7609307,79.3489048 14.8008787,79.0952922 14.8008787,78.8683723 C14.8008787,78.4812736 14.7010087,78.237672 14.5012658,78.1375603 C14.3015228,78.0374485 13.9020429,77.9873934 13.3028141,77.9873934 L0.0798967812,77.9873934 Z M12.2042333,97.1935484 C13.9486551,97.2335931 15.4400468,97.8309175 16.6784531,98.9855395 C17.9168594,100.140162 18.5360532,101.75861 18.5360532,103.840934 C18.5360532,106.830938 17.4041935,109.233584 15.14044,111.048943 C12.8766866,112.864303 10.1402492,113.771969 6.93104577,113.771969 C4.92030005,113.771969 3.26245842,113.388213 1.95747114,112.62069 C0.652483855,111.853166 0,110.848727 0,109.607341 C0,108.833144 0.26964894,108.209124 0.808954909,107.735261 C1.34826088,107.261399 1.93749375,107.024472 2.57667119,107.024472 C3.21584864,107.024472 3.73850152,107.224692 4.14464552,107.625139 C4.55078953,108.025586 4.92696644,108.67964 5.27318756,109.587319 C5.73925445,110.855401 6.51158227,111.489433 7.59019421,111.489433 C8.85523291,111.489433 9.87723568,111.012241 10.6562332,110.057842 C11.4352307,109.103444 11.8247236,107.371536 11.8247236,104.862069 C11.8247236,103.153495 11.7048796,101.838714 11.4651881,100.917686 C11.2254966,99.9966584 10.6728827,99.5361513 9.80732989,99.5361513 C9.22141723,99.5361513 8.62219737,99.843156 8.00965231,100.457175 C7.51695303,100.951059 7.07752513,101.197998 6.69135542,101.197998 C6.3584505,101.197998 6.08880156,101.051169 5.88240051,100.757508 C5.67599946,100.463847 5.57280049,100.183539 5.57280049,99.916574 C5.57280049,99.5962164 5.67599946,99.3225818 5.88240051,99.0956618 C6.08880156,98.8687419 6.57150646,98.5016711 7.33052967,97.9944383 C10.2068282,96.0722929 11.6449559,93.9766521 11.6449559,91.7074527 C11.6449559,90.5194601 11.3386879,89.615131 10.7261429,88.9944383 C10.1135978,88.3737455 9.37455999,88.0634038 8.5090072,88.0634038 C7.71003539,88.0634038 6.98431355,88.3270274 6.33181991,88.8542825 C5.67932627,89.3815377 5.35308434,90.0122321 5.35308434,90.7463849 C5.35308434,91.3871 5.60608828,91.9810874 6.11210376,92.5283648 C6.28521432,92.7285883 6.3717683,92.8954387 6.3717683,93.028921 C6.3717683,93.1490551 5.80250943,93.4560598 4.6639746,93.9499444 C3.52543978,94.4438289 2.80970494,94.6907675 2.51674861,94.6907675 C2.10394651,94.6907675 1.76771758,94.3570667 1.50805174,93.6896552 C1.24838591,93.0222436 1.11855494,92.4082342 1.11855494,91.8476085 C1.11855494,90.0989901 2.04734573,88.6240327 3.90495518,87.4226919 C5.76256463,86.2213511 7.86982116,85.6206897 10.226788,85.6206897 C12.2907985,85.6206897 14.0784711,86.0678487 15.5898594,86.9621802 C17.1012478,87.8565117 17.8569306,89.0778566 17.8569306,90.6262514 C17.8569306,91.987771 17.2876717,93.2491599 16.1491369,94.4104561 C15.0106021,95.5717522 13.6956474,96.4994404 12.2042333,97.1935484 Z"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/core/images/locked-padlock.tid b/core/images/locked-padlock.tid
old mode 100644
new mode 100755
diff --git a/core/images/mail.tid b/core/images/mail.tid
old mode 100644
new mode 100755
diff --git a/core/images/menu-button.tid b/core/images/menu-button.tid
old mode 100644
new mode 100755
diff --git a/core/images/mono-block.tid b/core/images/mono-block.tid
new file mode 100755
index 000000000..1675e3854
--- /dev/null
+++ b/core/images/mono-block.tid
@@ -0,0 +1,8 @@
+title: $:/core/images/mono-block
+tags: $:/tags/Image
+
+<svg class="tc-image-mono-block tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <path d="M23.9653488,32.9670593 L24.3217888,32.9670593 C25.0766067,32.9670593 25.6497006,33.1592554 26.0410876,33.5436534 C26.4324747,33.9280514 26.6281653,34.4906619 26.6281653,35.2315017 C26.6281653,36.0562101 26.4219913,36.6502709 26.009637,37.0137017 C25.5972828,37.3771326 24.9158602,37.5588453 23.9653488,37.5588453 L17.6542639,37.5588453 C16.6897744,37.5588453 16.0048573,37.380627 15.5994921,37.0241852 C15.1941269,36.6677435 14.9914474,36.0701882 14.9914474,35.2315017 C14.9914474,34.4207713 15.1941269,33.8406885 15.5994921,33.4912358 C16.0048573,33.141783 16.6897744,32.9670593 17.6542639,32.9670593 L18.388111,32.9670593 L17.5284616,30.5139133 L8.47069195,30.5139133 L7.5691084,32.9670593 L8.30295547,32.9670593 C9.25346691,32.9670593 9.93488953,33.1452775 10.3472438,33.5017193 C10.759598,33.8581611 10.965772,34.4347494 10.965772,35.2315017 C10.965772,36.0562101 10.759598,36.6502709 10.3472438,37.0137017 C9.93488953,37.3771326 9.25346691,37.5588453 8.30295547,37.5588453 L2.89345418,37.5588453 C1.92896463,37.5588453 1.24404754,37.3771326 0.838682371,37.0137017 C0.433317198,36.6502709 0.230637652,36.0562101 0.230637652,35.2315017 C0.230637652,34.4906619 0.426328248,33.9280514 0.817715312,33.5436534 C1.20910238,33.1592554 1.78219626,32.9670593 2.53701417,32.9670593 L2.89345418,32.9670593 L8.51262607,17.3256331 L6.83526132,17.3256331 C5.88474988,17.3256331 5.20332727,17.1439204 4.79097304,16.7804895 C4.37861882,16.4170587 4.1724448,15.8299869 4.1724448,15.0192565 C4.1724448,14.1945481 4.37861882,13.6004873 4.79097304,13.2370565 C5.20332727,12.8736257 5.88474988,12.691913 6.83526132,12.691913 L14.6979086,12.691913 C15.9419603,12.691913 16.815579,13.3628521 17.318791,14.7047506 L17.318791,14.7676518 L23.9653488,32.9670593 Z M12.9786097,17.3256331 L9.9383861,26.1737321 L16.0188333,26.1737321 L12.9786097,17.3256331 Z M35.3809383,26.6979086 L35.3809383,33.0928616 L38.5259972,33.0928616 C40.7485166,33.0928616 42.3140414,32.8482484 43.2226185,32.3590146 C44.1311956,31.8697807 44.5854773,31.0520736 44.5854773,29.9058686 C44.5854773,28.7456855 44.1521624,27.9209895 43.2855197,27.4317556 C42.4188769,26.9425218 40.9022748,26.6979086 38.7356678,26.6979086 L35.3809383,26.6979086 Z M46.0741385,24.370565 C47.5977525,24.9296893 48.7159844,25.6949794 49.428868,26.666458 C50.1417516,27.6379366 50.498188,28.8784752 50.498188,30.388111 C50.498188,31.6601189 50.1906743,32.8202846 49.5756374,33.8686428 C48.9606006,34.917001 48.0799929,35.7766419 46.933788,36.4475911 C46.2628387,36.8389782 45.5115266,37.1220307 44.6798291,37.296757 C43.8481316,37.4714834 42.6704935,37.5588453 41.1468796,37.5588453 L39.3856466,37.5588453 L30.2020747,37.5588453 C29.2795194,37.5588453 28.6190637,37.3771326 28.2206876,37.0137017 C27.8223114,36.6502709 27.6231264,36.0562101 27.6231264,35.2315017 C27.6231264,34.4906619 27.811828,33.9280514 28.189237,33.5436534 C28.5666459,33.1592554 29.118773,32.9670593 29.8456347,32.9670593 L30.2020747,32.9670593 L30.2020747,17.3256331 L29.8456347,17.3256331 C29.118773,17.3256331 28.5666459,17.1299425 28.189237,16.7385554 C27.811828,16.3471683 27.6231264,15.7740744 27.6231264,15.0192565 C27.6231264,14.2085262 27.8258059,13.6179599 28.2311711,13.24754 C28.6365363,12.8771201 29.2934976,12.691913 30.2020747,12.691913 L39.8469219,12.691913 C42.796303,12.691913 45.0362615,13.2650068 46.5668644,14.4112118 C48.0974674,15.5574168 48.8627574,17.2347648 48.8627574,19.443306 C48.8627574,20.5335986 48.6286276,21.4945792 48.1603609,22.3262767 C47.6920943,23.1579742 46.9966938,23.8393968 46.0741385,24.370565 L46.0741385,24.370565 Z M35.3809383,17.1998307 L35.3809383,22.4835296 L38.2114913,22.4835296 C39.9307988,22.4835296 41.1433816,22.2808501 41.8492761,21.8754849 C42.5551706,21.4701197 42.9081126,20.7852027 42.9081126,19.8207131 C42.9081126,18.912136 42.5901154,18.2481858 41.9541114,17.8288425 C41.3181074,17.4094992 40.2872373,17.1998307 38.8614701,17.1998307 L35.3809383,17.1998307 Z M71.244119,13.3838259 C71.5236812,12.880614 71.8102281,12.5241775 72.1037684,12.3145059 C72.3973087,12.1048342 72.7677231,12 73.2150226,12 C73.8999499,12 74.3856819,12.1817127 74.6722332,12.5451435 C74.9587844,12.9085744 75.1020579,13.5305909 75.1020579,14.4112118 L75.143992,19.8626472 C75.143992,20.8271368 74.9867406,21.4771091 74.6722332,21.8125837 C74.3577257,22.1480584 73.7881263,22.3157932 72.9634178,22.3157932 C72.3763372,22.3157932 71.92555,22.1760142 71.6110425,21.896452 C71.2965351,21.6168898 71.0274605,21.0997075 70.8038107,20.3448896 C70.4403799,19.0169692 69.8602971,18.0629775 69.0635448,17.482886 C68.2667926,16.9027945 67.1625385,16.612753 65.7507494,16.612753 C63.5981206,16.612753 61.9487284,17.3396038 60.8025235,18.7933272 C59.6563185,20.2470506 59.0832246,22.3507245 59.0832246,25.104412 C59.0832246,27.8441215 59.6633074,29.9477954 60.8234905,31.4154969 C61.9836736,32.8831984 63.6400547,33.6170381 65.7926836,33.6170381 C67.2603851,33.6170381 68.878327,33.1278116 70.6465578,32.149344 C72.4147886,31.1708763 73.5295261,30.6816498 73.9908037,30.6816498 C74.53595,30.6816498 74.9937262,30.9122852 75.3641461,31.3735628 C75.734566,31.8348404 75.9197732,32.4079343 75.9197732,33.0928616 C75.9197732,34.3229353 74.836486,35.4831009 72.669879,36.5733935 C70.5032721,37.663686 68.0641285,38.2088241 65.3523753,38.2088241 C61.6901107,38.2088241 58.7267959,36.9997358 56.4623422,34.5815228 C54.1978885,32.1633099 53.0656786,29.0043046 53.0656786,25.104412 C53.0656786,21.3443006 54.2118664,18.22024 56.5042763,15.7321366 C58.7966863,13.2440331 61.7040894,12 65.226573,12 C66.2190187,12 67.1974717,12.1118232 68.1619613,12.3354729 C69.1264508,12.5591227 70.1538264,12.9085702 71.244119,13.3838259 L71.244119,13.3838259 Z M81.4645862,32.9670593 L81.4645862,17.3256331 L81.1081461,17.3256331 C80.3533282,17.3256331 79.7802344,17.1299425 79.3888473,16.7385554 C78.9974602,16.3471683 78.8017696,15.7740744 78.8017696,15.0192565 C78.8017696,14.2085262 79.0114381,13.6179599 79.4307814,13.24754 C79.8501247,12.8771201 80.5280528,12.691913 81.4645862,12.691913 L85.4063933,12.691913 L86.6434498,12.691913 C89.5648747,12.691913 91.7034933,12.8177141 93.0593699,13.06932 C94.4152465,13.320926 95.5684233,13.740263 96.5189347,14.3273436 C98.210286,15.3337675 99.5067362,16.7699967 100.408324,18.6360743 C101.309912,20.5021519 101.7607,22.6582429 101.7607,25.104412 C101.7607,27.6903623 101.247012,29.9512876 100.219621,31.8872557 C99.1922296,33.8232239 97.7350336,35.2874089 95.8479888,36.2798546 C94.9953241,36.7271541 93.9959043,37.0521403 92.8496993,37.2548229 C91.7034944,37.4575055 89.9981906,37.5588453 87.7337369,37.5588453 L85.4063933,37.5588453 L81.4645862,37.5588453 C80.5000966,37.5588453 79.8151795,37.380627 79.4098143,37.0241852 C79.0044492,36.6677435 78.8017696,36.0701882 78.8017696,35.2315017 C78.8017696,34.4906619 78.9974602,33.9280514 79.3888473,33.5436534 C79.7802344,33.1592554 80.3533282,32.9670593 81.1081461,32.9670593 L81.4645862,32.9670593 Z M86.8740874,17.2417648 L86.8740874,32.9670593 L88.0692098,32.9670593 C90.7110725,32.9670593 92.6609895,32.3205814 93.9190194,31.0276063 C95.1770492,29.7346312 95.8060547,27.7462749 95.8060547,25.0624779 C95.8060547,22.4206153 95.1665658,20.4497314 93.8875688,19.1497672 C92.6085718,17.849803 90.6831161,17.1998307 88.1111439,17.1998307 C87.7756693,17.1998307 87.5205727,17.2033252 87.3458463,17.2103142 C87.1711199,17.2173033 87.0138685,17.2277867 86.8740874,17.2417648 L86.8740874,17.2417648 Z M121.94052,17.1159625 L112.190837,17.1159625 L112.190837,22.4835296 L115.88104,22.4835296 L115.88104,22.2319249 C115.88104,21.4351727 116.055763,20.841112 116.405216,20.4497249 C116.754669,20.0583378 117.285829,19.8626472 117.998713,19.8626472 C118.627728,19.8626472 119.141415,20.0408655 119.539792,20.3973072 C119.938168,20.753749 120.137353,21.2045363 120.137353,21.7496826 C120.137353,21.7776388 120.144342,21.8684951 120.15832,22.0222543 C120.172298,22.1760135 120.179287,22.3297704 120.179287,22.4835296 L120.179287,26.8237109 C120.179287,27.7602442 120.011552,28.4311834 119.676077,28.8365486 C119.340603,29.2419138 118.795465,29.4445933 118.040647,29.4445933 C117.327763,29.4445933 116.789614,29.2558917 116.426183,28.8784827 C116.062752,28.5010738 115.88104,27.9419578 115.88104,27.201118 L115.88104,26.8237109 L112.190837,26.8237109 L112.190837,33.0928616 L121.94052,33.0928616 L121.94052,30.5977816 C121.94052,29.6612482 122.118738,28.9903091 122.47518,28.5849439 C122.831622,28.1795787 123.415199,27.9768992 124.225929,27.9768992 C125.022682,27.9768992 125.592281,28.1760842 125.934745,28.5744604 C126.277208,28.9728365 126.448438,29.6472701 126.448438,30.5977816 L126.448438,35.6718099 C126.448438,36.4266278 126.30167,36.9298322 126.008129,37.1814382 C125.714589,37.4330442 125.134506,37.5588453 124.267863,37.5588453 L107.095842,37.5588453 C106.173287,37.5588453 105.512831,37.3771326 105.114455,37.0137017 C104.716079,36.6502709 104.516894,36.0562101 104.516894,35.2315017 C104.516894,34.4906619 104.705595,33.9280514 105.083004,33.5436534 C105.460413,33.1592554 106.01254,32.9670593 106.739402,32.9670593 L107.095842,32.9670593 L107.095842,17.3256331 L106.739402,17.3256331 C106.026518,17.3256331 105.477886,17.126448 105.093488,16.7280719 C104.70909,16.3296957 104.516894,15.7600963 104.516894,15.0192565 C104.516894,14.2085262 104.719573,13.6179599 105.124938,13.24754 C105.530304,12.8771201 106.187265,12.691913 107.095842,12.691913 L124.267863,12.691913 C125.120528,12.691913 125.697116,12.8212085 125.997646,13.0798036 C126.298175,13.3383986 126.448438,13.8520864 126.448438,14.6208824 L126.448438,19.3175037 C126.448438,20.2680151 126.273714,20.9494377 125.924261,21.361792 C125.574808,21.7741462 125.008703,21.9803202 124.225929,21.9803202 C123.415199,21.9803202 122.831622,21.7706517 122.47518,21.3513084 C122.118738,20.9319652 121.94052,20.254037 121.94052,19.3175037 L121.94052,17.1159625 Z M19.7719369,47.6405477 C20.037521,47.1373358 20.3205734,46.7808993 20.6211028,46.5712277 C20.9216322,46.361556 21.295541,46.2567218 21.7428405,46.2567218 C22.4277678,46.2567218 22.9134998,46.4384345 23.2000511,46.8018653 C23.4866023,47.1652962 23.6298758,47.7873127 23.6298758,48.6679336 L23.6718099,54.119369 C23.6718099,55.0838586 23.5145586,55.7338309 23.2000511,56.0693055 C22.8855436,56.4047802 22.3089553,56.572515 21.4702687,56.572515 C20.8831881,56.572515 20.4254119,56.4292415 20.0969263,56.1426902 C19.7684407,55.856139 19.4993662,55.3424512 19.2896945,54.6016114 C18.9122856,53.2597129 18.3322027,52.3022267 17.5494286,51.7291243 C16.7666545,51.1560218 15.6693894,50.8694748 14.2576003,50.8694748 C12.1049715,50.8694748 10.4590738,51.5963256 9.31985785,53.050049 C8.18064193,54.5037724 7.61104252,56.6074463 7.61104252,59.3611338 C7.61104252,62.1148214 8.20859773,64.2429566 9.40372609,65.7456034 C10.5988544,67.2482501 12.2936748,67.9995623 14.488238,67.9995623 C14.9914499,67.9995623 15.5645438,67.9401562 16.2075368,67.8213423 C16.8505299,67.7025283 17.6053364,67.5173212 18.4719792,67.2657152 L18.4719792,63.9529198 L16.1027015,63.9529198 C15.1521901,63.9529198 14.4777564,63.7781961 14.0793803,63.4287433 C13.6810042,63.0792906 13.4818191,62.4992078 13.4818191,61.6884774 C13.4818191,60.8497908 13.6810042,60.2522356 14.0793803,59.8957938 C14.4777564,59.5393521 15.1521901,59.3611338 16.1027015,59.3611338 L23.6718099,59.3611338 C24.6502776,59.3611338 25.3386891,59.5358576 25.7370653,59.8853103 C26.1354414,60.2347631 26.3346265,60.8218348 26.3346265,61.6465433 C26.3346265,62.3873831 26.1354414,62.9569825 25.7370653,63.3553586 C25.3386891,63.7537347 24.7621008,63.9529198 24.0072829,63.9529198 L23.6718099,63.9529198 L23.6718099,68.9430799 L23.6718099,69.1946846 C23.6718099,69.6419841 23.6228873,69.9529924 23.5250405,70.1277188 C23.4271937,70.3024451 23.2315031,70.4806634 22.9379628,70.6623788 C22.1412106,71.1376345 20.8762107,71.5569715 19.1429251,71.9204023 C17.4096396,72.2838332 15.6554131,72.4655459 13.8801932,72.4655459 C10.2179286,72.4655459 7.25461383,71.2564576 4.99016011,68.8382446 C2.72570638,66.4200317 1.59349651,63.2610264 1.59349651,59.3611338 C1.59349651,55.6010224 2.73968428,52.4769618 5.03209423,49.9888583 C7.32450417,47.5007549 10.2319073,46.2567218 13.7543909,46.2567218 C14.7328585,46.2567218 15.7078171,46.368545 16.6792957,46.5921947 C17.6507743,46.8158445 18.6816444,47.165292 19.7719369,47.6405477 L19.7719369,47.6405477 Z M35.611576,51.5823548 L35.611576,56.4047785 L42.4678043,56.4047785 L42.4678043,51.5823548 L42.1323314,51.5823548 C41.3775135,51.5823548 40.8009251,51.3866642 40.402549,50.9952772 C40.0041729,50.6038901 39.8049878,50.0307962 39.8049878,49.2759783 C39.8049878,48.4512699 40.0111618,47.8572091 40.4235161,47.4937783 C40.8358703,47.1303474 41.5172929,46.9486347 42.4678043,46.9486347 L47.8773056,46.9486347 C48.8278171,46.9486347 49.5022507,47.1303474 49.9006269,47.4937783 C50.299003,47.8572091 50.498188,48.4512699 50.498188,49.2759783 C50.498188,50.0307962 50.3059919,50.6038901 49.9215939,50.9952772 C49.5371959,51.3866642 48.9745854,51.5823548 48.2337456,51.5823548 L47.8773056,51.5823548 L47.8773056,67.2237811 L48.2337456,67.2237811 C48.9885636,67.2237811 49.5616574,67.4159772 49.9530445,67.8003752 C50.3444316,68.1847732 50.5401222,68.7473837 50.5401222,69.4882235 C50.5401222,70.3129319 50.3374426,70.9069927 49.9320774,71.2704235 C49.5267123,71.6338543 48.8417952,71.815567 47.8773056,71.815567 L42.4678043,71.815567 C41.5033148,71.815567 40.8183977,71.6373488 40.4130325,71.280907 C40.0076674,70.9244652 39.8049878,70.32691 39.8049878,69.4882235 C39.8049878,68.7473837 40.0041729,68.1847732 40.402549,67.8003752 C40.8009251,67.4159772 41.3775135,67.2237811 42.1323314,67.2237811 L42.4678043,67.2237811 L42.4678043,61.0384986 L35.611576,61.0384986 L35.611576,67.2237811 L35.9470489,67.2237811 C36.7018668,67.2237811 37.2784552,67.4159772 37.6768313,67.8003752 C38.0752074,68.1847732 38.2743925,68.7473837 38.2743925,69.4882235 C38.2743925,70.3129319 38.0682185,70.9069927 37.6558642,71.2704235 C37.24351,71.6338543 36.5620874,71.815567 35.611576,71.815567 L30.2020747,71.815567 C29.2375851,71.815567 28.552668,71.6373488 28.1473029,71.280907 C27.7419377,70.9244652 27.5392581,70.32691 27.5392581,69.4882235 C27.5392581,68.7473837 27.7349487,68.1847732 28.1263358,67.8003752 C28.5177229,67.4159772 29.0908168,67.2237811 29.8456347,67.2237811 L30.2020747,67.2237811 L30.2020747,51.5823548 L29.8456347,51.5823548 C29.1047949,51.5823548 28.5421844,51.3866642 28.1577864,50.9952772 C27.7733884,50.6038901 27.5811923,50.0307962 27.5811923,49.2759783 C27.5811923,48.4512699 27.7803773,47.8572091 28.1787534,47.4937783 C28.5771296,47.1303474 29.2515632,46.9486347 30.2020747,46.9486347 L35.611576,46.9486347 C36.5481093,46.9486347 37.2260374,47.1303474 37.6453807,47.4937783 C38.064724,47.8572091 38.2743925,48.4512699 38.2743925,49.2759783 C38.2743925,50.0307962 38.0752074,50.6038901 37.6768313,50.9952772 C37.2784552,51.3866642 36.7018668,51.5823548 35.9470489,51.5823548 L35.611576,51.5823548 Z M67.365213,51.5823548 L67.365213,67.2237811 L70.887679,67.2237811 C71.8381904,67.2237811 72.519613,67.4019993 72.9319673,67.7584411 C73.3443215,68.1148829 73.5504955,68.6914712 73.5504955,69.4882235 C73.5504955,70.2989538 73.340827,70.8895201 72.9214837,71.25994 C72.5021404,71.6303599 71.8242123,71.815567 70.887679,71.815567 L58.4332458,71.815567 C57.4827343,71.815567 56.8013117,71.6338543 56.3889575,71.2704235 C55.9766033,70.9069927 55.7704292,70.3129319 55.7704292,69.4882235 C55.7704292,68.6774931 55.9731088,68.0974103 56.378474,67.7479575 C56.7838391,67.3985048 57.4687562,67.2237811 58.4332458,67.2237811 L61.9557117,67.2237811 L61.9557117,51.5823548 L58.4332458,51.5823548 C57.4827343,51.5823548 56.8013117,51.4006421 56.3889575,51.0372113 C55.9766033,50.6737805 55.7704292,50.0867087 55.7704292,49.2759783 C55.7704292,48.4512699 55.9731088,47.8641981 56.378474,47.5147453 C56.7838391,47.1652926 57.4687562,46.9905689 58.4332458,46.9905689 L70.887679,46.9905689 C71.8801247,46.9905689 72.5720308,47.1652926 72.9634178,47.5147453 C73.3548049,47.8641981 73.5504955,48.4512699 73.5504955,49.2759783 C73.5504955,50.0867087 73.347816,50.6737805 72.9424508,51.0372113 C72.5370856,51.4006421 71.8521685,51.5823548 70.887679,51.5823548 L67.365213,51.5823548 Z M97.8608265,51.5823548 L97.8608265,63.1771386 L97.8608265,63.5755127 C97.8608265,65.4485794 97.7385199,66.8044357 97.493903,67.6431222 C97.2492861,68.4818088 96.8404325,69.2296264 96.26733,69.8865976 C95.5264902,70.7392623 94.4991146,71.3822457 93.1851723,71.815567 C91.87123,72.2488884 90.2917273,72.4655459 88.4466169,72.4655459 C87.1466527,72.4655459 85.8921362,72.3397448 84.6830298,72.0881388 C83.4739233,71.8365328 82.3102631,71.4591296 81.1920144,70.9559176 C80.5769776,70.6763554 80.175113,70.31293 79.9864085,69.8656305 C79.797704,69.418331 79.7033532,68.6914802 79.7033532,67.6850564 L79.7033532,63.3658422 C79.7033532,62.1637247 79.8780769,61.3250508 80.2275297,60.849795 C80.5769824,60.3745393 81.185021,60.136915 82.0516638,60.136915 C83.2957156,60.136915 83.9806326,61.0524675 84.1064356,62.8835998 C84.1204137,63.2050963 84.1413806,63.4497096 84.1693368,63.6174469 C84.3370741,65.2389076 84.7144774,66.3466561 85.301558,66.9407258 C85.8886386,67.5347954 86.8251579,67.8318258 88.1111439,67.8318258 C89.7046484,67.8318258 90.8263749,67.4089943 91.476357,66.5633187 C92.126339,65.7176431 92.4513252,64.1765796 92.4513252,61.9400821 L92.4513252,51.5823548 L88.9288593,51.5823548 C87.9783478,51.5823548 87.2969252,51.4006421 86.884571,51.0372113 C86.4722168,50.6737805 86.2660427,50.0867087 86.2660427,49.2759783 C86.2660427,48.4512699 86.4652278,47.8641981 86.8636039,47.5147453 C87.26198,47.1652926 87.9503916,46.9905689 88.9288593,46.9905689 L99.6220595,46.9905689 C100.600527,46.9905689 101.288939,47.1652926 101.687315,47.5147453 C102.085691,47.8641981 102.284876,48.4512699 102.284876,49.2759783 C102.284876,50.0867087 102.078702,50.6737805 101.666348,51.0372113 C101.253994,51.4006421 100.572571,51.5823548 99.6220595,51.5823548 L97.8608265,51.5823548 Z M112.505343,51.5823548 L112.505343,57.9353738 L118.984165,51.4565525 C118.257303,51.3726838 117.747109,51.1665098 117.453569,50.8380242 C117.160029,50.5095387 117.013261,49.9888619 117.013261,49.2759783 C117.013261,48.4512699 117.212446,47.8572091 117.610822,47.4937783 C118.009198,47.1303474 118.683632,46.9486347 119.634143,46.9486347 L124.771073,46.9486347 C125.721584,46.9486347 126.396018,47.1303474 126.794394,47.4937783 C127.19277,47.8572091 127.391955,48.4512699 127.391955,49.2759783 C127.391955,50.0447743 127.19277,50.6213627 126.794394,51.0057607 C126.396018,51.3901587 125.812441,51.5823548 125.043645,51.5823548 L124.561402,51.5823548 L118.459988,57.641835 C119.592215,58.4805215 120.626579,59.5812811 121.563113,60.9441468 C122.499646,62.3070125 123.596911,64.400203 124.854941,67.2237811 L125.127513,67.2237811 L125.546854,67.2237811 C126.371563,67.2237811 126.98659,67.4124827 127.391955,67.7898917 C127.79732,68.1673006 128,68.7334056 128,69.4882235 C128,70.3129319 127.793826,70.9069927 127.381472,71.2704235 C126.969118,71.6338543 126.287695,71.815567 125.337183,71.815567 L122.758235,71.815567 C121.626008,71.815567 120.710456,71.0537715 120.01155,69.5301576 C119.885747,69.2505954 119.787902,69.026949 119.718012,68.8592117 C118.795456,66.9022764 117.949793,65.3926632 117.180997,64.3303269 C116.412201,63.2679906 115.510627,62.2965265 114.476247,61.4159056 L112.505343,63.302941 L112.505343,67.2237811 L112.840816,67.2237811 C113.595634,67.2237811 114.172222,67.4159772 114.570599,67.8003752 C114.968975,68.1847732 115.16816,68.7473837 115.16816,69.4882235 C115.16816,70.3129319 114.961986,70.9069927 114.549631,71.2704235 C114.137277,71.6338543 113.455855,71.815567 112.505343,71.815567 L107.095842,71.815567 C106.131352,71.815567 105.446435,71.6373488 105.04107,71.280907 C104.635705,70.9244652 104.433025,70.32691 104.433025,69.4882235 C104.433025,68.7473837 104.628716,68.1847732 105.020103,67.8003752 C105.41149,67.4159772 105.984584,67.2237811 106.739402,67.2237811 L107.095842,67.2237811 L107.095842,51.5823548 L106.739402,51.5823548 C105.998562,51.5823548 105.435952,51.3866642 105.051554,50.9952772 C104.667156,50.6038901 104.474959,50.0307962 104.474959,49.2759783 C104.474959,48.4512699 104.674145,47.8572091 105.072521,47.4937783 C105.470897,47.1303474 106.14533,46.9486347 107.095842,46.9486347 L112.505343,46.9486347 C113.441877,46.9486347 114.119805,47.1303474 114.539148,47.4937783 C114.958491,47.8572091 115.16816,48.4512699 115.16816,49.2759783 C115.16816,50.0307962 114.968975,50.6038901 114.570599,50.9952772 C114.172222,51.3866642 113.595634,51.5823548 112.840816,51.5823548 L112.505343,51.5823548 Z M13.439885,96.325622 L17.4445933,84.4372993 C17.6961993,83.6545252 18.0456468,83.0849258 18.4929463,82.728484 C18.9402458,82.3720422 19.5343065,82.193824 20.2751463,82.193824 L23.5460076,82.193824 C24.496519,82.193824 25.1779416,82.3755367 25.5902958,82.7389675 C26.0026501,83.1023984 26.2088241,83.6964591 26.2088241,84.5211676 C26.2088241,85.2759855 26.009639,85.8490794 25.6112629,86.2404664 C25.2128868,86.6318535 24.6362984,86.8275441 23.8814805,86.8275441 L23.5460076,86.8275441 L24.1330852,102.46897 L24.4895252,102.46897 C25.2443431,102.46897 25.8104481,102.661166 26.187857,103.045564 C26.565266,103.429962 26.7539676,103.992573 26.7539676,104.733413 C26.7539676,105.558121 26.5547826,106.152182 26.1564064,106.515613 C25.7580303,106.879044 25.0835967,107.060756 24.1330852,107.060756 L19.4154969,107.060756 C18.4649855,107.060756 17.7905518,106.882538 17.3921757,106.526096 C16.9937996,106.169654 16.7946145,105.572099 16.7946145,104.733413 C16.7946145,103.992573 16.9868106,103.429962 17.3712086,103.045564 C17.7556066,102.661166 18.325206,102.46897 19.0800239,102.46897 L19.4154969,102.46897 L19.1219581,89.6790642 L16.0607674,99.1981091 C15.8371177,99.9109927 15.5191204,100.42468 15.1067662,100.739188 C14.694412,101.053695 14.1248126,101.210947 13.3979509,101.210947 C12.6710892,101.210947 12.0945008,101.053695 11.6681685,100.739188 C11.2418362,100.42468 10.91685,99.9109927 10.6932002,99.1981091 L7.65297664,89.6790642 L7.35943781,102.46897 L7.69491075,102.46897 C8.44972866,102.46897 9.01932808,102.661166 9.40372609,103.045564 C9.78812409,103.429962 9.98032022,103.992573 9.98032022,104.733413 C9.98032022,105.558121 9.77764067,106.152182 9.3722755,106.515613 C8.96691032,106.879044 8.29597114,107.060756 7.35943781,107.060756 L2.62088241,107.060756 C1.68434908,107.060756 1.01340989,106.879044 0.608044719,106.515613 C0.202679546,106.152182 0,105.558121 0,104.733413 C0,103.992573 0.192196121,103.429962 0.57659413,103.045564 C0.960992139,102.661166 1.53059155,102.46897 2.28540946,102.46897 L2.62088241,102.46897 L3.22892713,86.8275441 L2.89345418,86.8275441 C2.13863627,86.8275441 1.56204791,86.6318535 1.16367179,86.2404664 C0.765295672,85.8490794 0.5661106,85.2759855 0.5661106,84.5211676 C0.5661106,83.6964591 0.772284622,83.1023984 1.18463885,82.7389675 C1.59699308,82.3755367 2.27841569,82.193824 3.22892713,82.193824 L6.49978838,82.193824 C7.22665007,82.193824 7.81022738,82.3685477 8.25053783,82.7180005 C8.69084827,83.0674532 9.05077919,83.6405471 9.33034138,84.4372993 L13.439885,96.325622 Z M43.8935644,98.3803938 L43.8935644,86.8275441 L42.7403761,86.8275441 C41.8178209,86.8275441 41.1573651,86.6458314 40.758989,86.2824006 C40.3606129,85.9189697 40.1614278,85.3318979 40.1614278,84.5211676 C40.1614278,83.7104372 40.3606129,83.119871 40.758989,82.7494511 C41.1573651,82.3790312 41.8178209,82.193824 42.7403761,82.193824 L48.6950209,82.193824 C49.6035981,82.193824 50.2605593,82.3790312 50.6659245,82.7494511 C51.0712897,83.119871 51.2739692,83.7104372 51.2739692,84.5211676 C51.2739692,85.2620074 51.0817731,85.8316068 50.6973751,86.2299829 C50.3129771,86.628359 49.7643445,86.8275441 49.051461,86.8275441 L48.6950209,86.8275441 L48.6950209,105.865634 C48.6950209,106.522605 48.6251315,106.934953 48.4853504,107.10269 C48.3455693,107.270428 48.0310665,107.354295 47.5418327,107.354295 L45.4451268,107.354295 C44.7741775,107.354295 44.3024234,107.284406 44.0298503,107.144625 C43.7572771,107.004843 43.5231473,106.76023 43.3274538,106.410777 L34.6051571,91.0838571 L34.6051571,102.46897 L35.8212466,102.46897 C36.7298237,102.46897 37.379796,102.643694 37.7711831,102.993147 C38.1625701,103.3426 38.3582607,103.922682 38.3582607,104.733413 C38.3582607,105.558121 38.1590757,106.152182 37.7606995,106.515613 C37.3623234,106.879044 36.7158456,107.060756 35.8212466,107.060756 L29.8037005,107.060756 C28.8951234,107.060756 28.2381621,106.879044 27.832797,106.515613 C27.4274318,106.152182 27.2247522,105.558121 27.2247522,104.733413 C27.2247522,103.992573 27.4134539,103.429962 27.7908629,103.045564 C28.1682718,102.661166 28.7273878,102.46897 29.4682276,102.46897 L29.8037005,102.46897 L29.8037005,86.8275441 L29.4682276,86.8275441 C28.755344,86.8275441 28.203217,86.628359 27.8118299,86.2299829 C27.4204428,85.8316068 27.2247522,85.2620074 27.2247522,84.5211676 C27.2247522,83.7104372 27.4309263,83.119871 27.8432805,82.7494511 C28.2556347,82.3790312 28.9091015,82.193824 29.8037005,82.193824 L33.2422983,82.193824 C34.0670067,82.193824 34.6261227,82.3021527 34.919663,82.5188134 C35.2132033,82.7354741 35.5416839,83.1722835 35.9051148,83.8292546 L43.8935644,98.3803938 Z M64.6604624,86.3662688 C62.8572863,86.3662688 61.4420239,87.0931196 60.4146329,88.546843 C59.3872418,90.0005663 58.873554,92.0203728 58.873554,94.6063231 C58.873554,97.1922733 59.3907363,99.2190688 60.4251164,100.68677 C61.4594965,102.154472 62.8712644,102.888312 64.6604624,102.888312 C66.4636385,102.888312 67.8823953,102.157966 68.9167754,100.697254 C69.9511555,99.2365414 70.4683378,97.2062514 70.4683378,94.6063231 C70.4683378,92.0203728 69.95465,90.0005663 68.9272589,88.546843 C67.8998679,87.0931196 66.4776166,86.3662688 64.6604624,86.3662688 L64.6604624,86.3662688 Z M64.6604624,81.501911 C68.0990773,81.501911 70.929602,82.7319662 73.1521214,85.1921135 C75.3746408,87.6522607 76.4858838,90.7902992 76.4858838,94.6063231 C76.4858838,98.4503032 75.3816297,101.595331 73.1730884,104.0415 C70.9645471,106.487669 68.1270335,107.710735 64.6604624,107.710735 C61.2358256,107.710735 58.4053009,106.477185 56.1688034,104.010049 C53.9323059,101.542913 52.8140739,98.4083688 52.8140739,94.6063231 C52.8140739,90.7763211 53.9218224,87.6347881 56.1373528,85.1816299 C58.3528831,82.7284717 61.1938912,81.501911 64.6604624,81.501911 L64.6604624,81.501911 Z M87.4611651,98.1707232 L87.4611651,102.46897 L89.6207722,102.46897 C90.5293493,102.46897 91.1758272,102.643694 91.5602252,102.993147 C91.9446232,103.3426 92.1368193,103.922682 92.1368193,104.733413 C92.1368193,105.558121 91.9411287,106.152182 91.5497417,106.515613 C91.1583546,106.879044 90.5153712,107.060756 89.6207722,107.060756 L82.3661697,107.060756 C81.4436145,107.060756 80.7831587,106.879044 80.3847826,106.515613 C79.9864065,106.152182 79.7872214,105.558121 79.7872214,104.733413 C79.7872214,103.992573 79.9759231,103.429962 80.353332,103.045564 C80.730741,102.661166 81.282868,102.46897 82.0097297,102.46897 L82.3661697,102.46897 L82.3661697,86.8275441 L82.0097297,86.8275441 C81.2968461,86.8275441 80.7482136,86.628359 80.3638155,86.2299829 C79.9794175,85.8316068 79.7872214,85.2620074 79.7872214,84.5211676 C79.7872214,83.7104372 79.989901,83.119871 80.3952661,82.7494511 C80.8006313,82.3790312 81.4575926,82.193824 82.3661697,82.193824 L91.0255652,82.193824 C94.450202,82.193824 97.0396079,82.8507853 98.7938606,84.1647276 C100.548113,85.4786699 101.425227,87.414609 101.425227,89.972603 C101.425227,92.6703781 100.551608,94.7111515 98.8043442,96.0949843 C97.0570805,97.4788171 94.4641801,98.1707232 91.0255652,98.1707232 L87.4611651,98.1707232 Z M87.4611651,86.8275441 L87.4611651,93.4531348 L90.4384875,93.4531348 C92.0879044,93.4531348 93.328443,93.1735768 94.1601405,92.6144525 C94.9918381,92.0553281 95.4076806,91.2166541 95.4076806,90.0984053 C95.4076806,89.0500471 94.9778602,88.2428234 94.1182064,87.67671 C93.2585527,87.1105966 92.031992,86.8275441 90.4384875,86.8275441 L87.4611651,86.8275441 Z M114.727851,107.396229 L113.092421,109.03166 C113.69348,108.835966 114.284046,108.689198 114.864137,108.591352 C115.444229,108.493505 116.013828,108.444582 116.572953,108.444582 C117.677223,108.444582 118.840883,108.608823 120.063968,108.937308 C121.287053,109.265794 122.031376,109.430034 122.29696,109.430034 C122.744259,109.430034 123.327837,109.279772 124.047709,108.979242 C124.767582,108.678713 125.253314,108.52845 125.50492,108.52845 C126.02211,108.52845 126.45193,108.727636 126.794394,109.126012 C127.136858,109.524388 127.308087,110.024098 127.308087,110.625156 C127.308087,111.421909 126.836333,112.099837 125.892811,112.658961 C124.949288,113.218086 123.792617,113.497643 122.422762,113.497643 C121.486229,113.497643 120.28413,113.277492 118.816428,112.837181 C117.348727,112.396871 116.286406,112.176719 115.629435,112.176719 C114.636989,112.176719 113.518757,112.449288 112.274706,112.994434 C111.030654,113.53958 110.261869,113.812149 109.968329,113.812149 C109.36727,113.812149 108.857077,113.612964 108.437734,113.214588 C108.01839,112.816212 107.808722,112.337469 107.808722,111.778345 C107.808722,111.386958 107.941512,110.971115 108.207096,110.530805 C108.47268,110.090494 108.94094,109.520895 109.611889,108.821989 L111.729562,106.683349 C109.395218,105.830685 107.536157,104.29661 106.152324,102.08108 C104.768491,99.8655494 104.076585,97.3180772 104.076585,94.4385866 C104.076585,90.6365409 105.180839,87.5299526 107.389381,85.1187288 C109.597922,82.7075049 112.442425,81.501911 115.922974,81.501911 C119.389545,81.501911 122.227059,82.7109994 124.4356,85.1292123 C126.644141,87.5474252 127.748395,90.650519 127.748395,94.4385866 C127.748395,98.2126762 126.65113,101.322759 124.456567,103.768928 C122.262004,106.215097 119.480402,107.438163 116.111677,107.438163 C115.888028,107.438163 115.660887,107.434669 115.430248,107.42768 C115.199609,107.420691 114.965479,107.410207 114.727851,107.396229 L114.727851,107.396229 Z M115.922974,86.3662688 C114.119798,86.3662688 112.704535,87.0931196 111.677144,88.546843 C110.649753,90.0005663 110.136065,92.0203728 110.136065,94.6063231 C110.136065,97.1922733 110.653248,99.2190688 111.687628,100.68677 C112.722008,102.154472 114.133776,102.888312 115.922974,102.888312 C117.72615,102.888312 119.144907,102.157966 120.179287,100.697254 C121.213667,99.2365414 121.730849,97.2062514 121.730849,94.6063231 C121.730849,92.0203728 121.217161,90.0005663 120.18977,88.546843 C119.162379,87.0931196 117.740128,86.3662688 115.922974,86.3662688 L115.922974,86.3662688 Z"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/core/images/mono-line.tid b/core/images/mono-line.tid
new file mode 100755
index 000000000..81d0faf3f
--- /dev/null
+++ b/core/images/mono-line.tid
@@ -0,0 +1,8 @@
+title: $:/core/images/mono-line
+tags: $:/tags/Image
+
+<svg class="tc-image-mono-line tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <path d="M60.4374591,84.522627 L61.3450888,84.522627 C63.2671377,84.522627 64.7264493,85.0120303 65.7230673,85.9908515 C66.7196852,86.9696727 67.2179868,88.4022896 67.2179868,90.288745 C67.2179868,92.3887615 66.6929905,93.9014625 65.6429823,94.8268935 C64.5929741,95.7523244 62.857817,96.215033 60.4374591,96.215033 L44.3670747,96.215033 C41.9111232,96.215033 40.1670679,95.7612227 39.1348565,94.8535884 C38.102645,93.9459542 37.586547,92.424355 37.586547,90.288745 C37.586547,88.2243221 38.102645,86.747214 39.1348565,85.8573766 C40.1670679,84.9675391 41.9111232,84.522627 44.3670747,84.522627 L46.235724,84.522627 L44.0467348,78.2759992 L20.9822627,78.2759992 L18.6864935,84.522627 L20.5551429,84.522627 C22.9755008,84.522627 24.7106579,84.9764373 25.7606661,85.8840716 C26.8106743,86.7917058 27.3356705,88.2599156 27.3356705,90.288745 C27.3356705,92.3887615 26.8106743,93.9014625 25.7606661,94.8268935 C24.7106579,95.7523244 22.9755008,96.215033 20.5551429,96.215033 L6.78052766,96.215033 C4.32457622,96.215033 2.58052094,95.7523244 1.54830946,94.8268935 C0.516097994,93.9014625 0,92.3887615 0,90.288745 C0,88.4022896 0.498301511,86.9696727 1.49491948,85.9908515 C2.49153745,85.0120303 3.95084902,84.522627 5.87289797,84.522627 L6.78052766,84.522627 L21.0890427,44.6937008 L16.8178442,44.6937008 C14.3974863,44.6937008 12.6623292,44.2309922 11.612321,43.3055613 C10.5623128,42.3801303 10.0373165,40.8852258 10.0373165,38.8208028 C10.0373165,36.7207864 10.5623128,35.2080854 11.612321,34.2826544 C12.6623292,33.3572234 14.3974863,32.8945149 16.8178442,32.8945149 L36.8390873,32.8945149 C40.0069087,32.8945149 42.231469,34.6029772 43.512835,38.0199531 L43.512835,38.180123 L60.4374591,84.522627 Z M32.4611088,44.6937008 L24.7195615,67.224273 L40.2026561,67.224273 L32.4611088,44.6937008 Z M89.5058233,68.5590225 L89.5058233,84.8429669 L97.5143205,84.8429669 C103.173687,84.8429669 107.160099,84.22009 109.473676,82.9743176 C111.787254,81.7285451 112.944025,79.6463566 112.944025,76.7276897 C112.944025,73.7734293 111.840643,71.6734444 109.633846,70.4276719 C107.427049,69.1818994 103.565213,68.5590225 98.0482204,68.5590225 L89.5058233,68.5590225 Z M116.734714,62.6327346 C120.614405,64.0564746 123.461842,66.0051894 125.277111,68.4789376 C127.092379,70.9526857 128,74.1115614 128,77.9556593 C128,81.1946677 127.216955,84.1488838 125.650841,86.8183962 C124.084727,89.4879087 121.84237,91.676876 118.923703,93.385364 C117.215215,94.3819819 115.302093,95.1027395 113.18428,95.5476582 C111.066467,95.9925769 108.06776,96.215033 104.188068,96.215033 L99.7033098,96.215033 L76.3184979,96.215033 C73.9693269,96.215033 72.2875593,95.7523244 71.2731446,94.8268935 C70.2587299,93.9014625 69.7515301,92.3887615 69.7515301,90.288745 C69.7515301,88.4022896 70.2320352,86.9696727 71.1930596,85.9908515 C72.1540841,85.0120303 73.5600062,84.522627 75.4108682,84.522627 L76.3184979,84.522627 L76.3184979,44.6937008 L75.4108682,44.6937008 C73.5600062,44.6937008 72.1540841,44.1953993 71.1930596,43.1987813 C70.2320352,42.2021633 69.7515301,40.7428518 69.7515301,38.8208028 C69.7515301,36.7563799 70.2676281,35.2525771 71.2998396,34.3093494 C72.3320511,33.3661217 74.0049204,32.8945149 76.3184979,32.8945149 L100.877889,32.8945149 C108.388118,32.8945149 114.09189,34.3538264 117.989378,37.2724934 C121.886867,40.1911603 123.835581,44.4623161 123.835581,50.0860889 C123.835581,52.8623819 123.239399,55.3093982 122.047017,57.4272114 C120.854635,59.5450246 119.083885,61.2801816 116.734714,62.6327346 L116.734714,62.6327346 Z M89.5058233,44.3733609 L89.5058233,57.8276363 L96.7134708,57.8276363 C101.091471,57.8276363 104.179161,57.3115383 105.976633,56.2793268 C107.774104,55.2471153 108.672827,53.50306 108.672827,51.0471086 C108.672827,48.7335312 107.863087,47.0428653 106.243583,45.9750604 C104.624078,44.9072554 101.999097,44.3733609 98.3685602,44.3733609 L89.5058233,44.3733609 Z"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/core/images/new-button.tid b/core/images/new-button.tid
old mode 100644
new mode 100755
diff --git a/core/images/new-here-button.tid b/core/images/new-here-button.tid
old mode 100644
new mode 100755
diff --git a/core/images/new-image-button.tid b/core/images/new-image-button.tid
new file mode 100755
index 000000000..5109bf98d
--- /dev/null
+++ b/core/images/new-image-button.tid
@@ -0,0 +1,8 @@
+title: $:/core/images/new-image-button
+tags: $:/tags/Image
+
+<svg class="tc-image-new-image-button tc-image-button" viewBox="0 0 128 128" width="22pt" height="22pt">
+    <g fill-rule="evenodd">
+        <path d="M81.3619177,73.6270062 L97.1875317,46.2162388 C97.91364,44.9585822 97.4824378,43.3533085 96.2260476,42.6279312 L46.2162388,13.7547547 C44.9585822,13.0286463 43.3533085,13.4598485 42.6279312,14.7162388 L30.0575956,36.4886988 L40.0978909,31.2276186 C43.1404959,29.6333041 46.8692155,31.3421319 47.6479264,34.6877101 L51.2545483,52.3903732 L61.1353556,53.2399953 C63.2899974,53.4346096 65.1046382,54.9309951 65.706105,57.0091178 C65.7395572,57.1246982 65.8069154,57.3539875 65.9047035,57.6813669 C66.0696435,58.2335608 66.2581528,58.852952 66.4667073,59.5238092 C67.0618822,61.4383079 67.6960725,63.3742727 68.3393254,65.2021174 C68.5462918,65.7902259 68.7511789,66.3583016 68.953259,66.9034738 C69.5777086,68.5881157 70.1617856,70.0172008 70.6783305,71.110045 C70.9334784,71.6498566 71.1627732,72.0871602 71.4035746,72.5373068 C71.6178999,72.7492946 71.9508843,72.9623307 72.4151452,73.1586945 C73.5561502,73.6412938 75.1990755,73.899146 77.0720271,73.9171651 C77.9355886,73.9254732 78.7819239,73.8832103 79.5638842,73.8072782 C80.0123946,73.7637257 80.3172916,73.7224469 80.4352582,73.7027375 C80.7503629,73.6500912 81.0598053,73.6256267 81.3619177,73.6270062 L81.3619177,73.6270062 L81.3619177,73.6270062 L81.3619177,73.6270062 Z M37.4707881,2.64867269 C38.9217993,0.135447653 42.1388058,-0.723707984 44.6486727,0.725364314 L108.293614,37.4707881 C110.806839,38.9217993 111.665994,42.1388058 110.216922,44.6486727 L73.4714982,108.293614 C72.0204871,110.806839 68.8034805,111.665994 66.2936136,110.216922 L2.64867269,73.4714982 C0.135447653,72.0204871 -0.723707984,68.8034805 0.725364314,66.2936136 L37.4707881,2.64867269 L37.4707881,2.64867269 L37.4707881,2.64867269 L37.4707881,2.64867269 Z M80.3080975,53.1397764 C82.8191338,54.5895239 86.0299834,53.7291793 87.4797308,51.218143 C88.9294783,48.7071068 88.0691338,45.4962571 85.5580975,44.0465097 C83.0470612,42.5967622 79.8362116,43.4571068 78.3864641,45.968143 C76.9367166,48.4791793 77.7970612,51.6900289 80.3080975,53.1397764 L80.3080975,53.1397764 L80.3080975,53.1397764 L80.3080975,53.1397764 Z M96,112 L88.0070969,112 C83.5881712,112 80,108.418278 80,104 C80,99.5907123 83.5848994,96 88.0070969,96 L96,96 L96,88.0070969 C96,83.5881712 99.581722,80 104,80 C108.409288,80 112,83.5848994 112,88.0070969 L112,96 L119.992903,96 C124.411829,96 128,99.581722 128,104 C128,108.409288 124.415101,112 119.992903,112 L112,112 L112,119.992903 C112,124.411829 108.418278,128 104,128 C99.5907123,128 96,124.415101 96,119.992903 L96,112 L96,112 Z M33.3471097,51.7910932 C40.7754579,59.7394511 42.3564368,62.4818351 40.7958321,65.1848818 C39.2352273,67.8879286 26.9581062,62.8571718 24.7019652,66.7649227 C22.4458242,70.6726735 23.7947046,70.0228006 22.2648667,72.6725575 L41.9944593,84.0634431 C41.9944593,84.0634431 36.3904568,75.8079231 37.7602356,73.4353966 C40.2754811,69.0788636 46.5298923,72.1787882 48.1248275,69.4162793 C50.538989,65.234829 43.0222016,59.7770885 33.3471097,51.7910932 L33.3471097,51.7910932 Z"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/core/images/new-journal-button.tid b/core/images/new-journal-button.tid
old mode 100644
new mode 100755
diff --git a/core/images/opacity.tid b/core/images/opacity.tid
new file mode 100755
index 000000000..e9bb732e1
--- /dev/null
+++ b/core/images/opacity.tid
@@ -0,0 +1,10 @@
+title: $:/core/images/opacity
+tags: $:/tags/Image
+
+<svg class="tc-image-opacity tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <path d="M102.361773,65 C101.833691,67.051742 101.183534,69.0544767 100.419508,71 L82.5835324,71 C83.7602504,69.1098924 84.7666304,67.1027366 85.581205,65 L102.361773,65 Z M102.834311,63 C103.256674,61.0388326 103.568427,59.0365486 103.762717,57 L87.6555706,57 C87.3692052,59.0609452 86.9083652,61.0660782 86.2884493,63 L102.834311,63 Z M99.5852583,73 C98.6682925,75.0747721 97.6196148,77.0783056 96.4498253,79 L75.8124196,79 C77.8387053,77.2115633 79.6621163,75.1985844 81.2437158,73 L99.5852583,73 Z M95.1689122,81 C93.7449202,83.1155572 92.1695234,85.1207336 90.458251,87 L60.4614747,87 C65.1836162,85.86248 69.5430327,83.794147 73.3347255,81 L95.1689122,81 Z M87.6555706,47 L103.762717,47 C101.246684,20.6269305 79.0321807,0 52,0 C23.281193,0 0,23.281193 0,52 C0,77.2277755 17.9651296,98.2595701 41.8000051,103 L62.1999949,103 C67.8794003,101.870444 73.2255333,99.8158975 78.074754,97 L39,97 L39,95 L81.2493857,95 C83.8589242,93.2215015 86.2981855,91.2116653 88.5376609,89 L39,89 L39,87 L43.5385253,87 C27.7389671,83.1940333 16,68.967908 16,52 C16,32.117749 32.117749,16 52,16 C70.1856127,16 85.2217929,29.4843233 87.6555706,47 Z M87.8767787,49 L103.914907,49 C103.971379,49.9928025 104,50.9930589 104,52 C104,53.0069411 103.971379,54.0071975 103.914907,55 L87.8767787,55 C87.958386,54.0107999 88,53.0102597 88,52 C88,50.9897403 87.958386,49.9892001 87.8767787,49 Z"></path>
+        <path d="M76,128 C104.718807,128 128,104.718807 128,76 C128,47.281193 104.718807,24 76,24 C47.281193,24 24,47.281193 24,76 C24,104.718807 47.281193,128 76,128 L76,128 Z M76,112 C95.882251,112 112,95.882251 112,76 C112,56.117749 95.882251,40 76,40 C56.117749,40 40,56.117749 40,76 C40,95.882251 56.117749,112 76,112 L76,112 Z"></path>
+        <path d="M37,58 L90,58 L90,62 L37,62 L37,58 L37,58 Z M40,50 L93,50 L93,54 L40,54 L40,50 L40,50 Z M40,42 L93,42 L93,46 L40,46 L40,42 L40,42 Z M32,66 L85,66 L85,70 L32,70 L32,66 L32,66 Z M30,74 L83,74 L83,78 L30,78 L30,74 L30,74 Z M27,82 L80,82 L80,86 L27,86 L27,82 L27,82 Z"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/core/images/open-window.tid b/core/images/open-window.tid
old mode 100644
new mode 100755
diff --git a/core/images/options-button.tid b/core/images/options-button.tid
old mode 100644
new mode 100755
diff --git a/core/images/paint.tid b/core/images/paint.tid
new file mode 100755
index 000000000..c6dcab834
--- /dev/null
+++ b/core/images/paint.tid
@@ -0,0 +1,8 @@
+title: $:/core/images/paint
+tags: $:/tags/Image
+
+<svg class="tc-image-paint tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <path d="M83.5265806,76.1907935 C90.430962,69.2864121 91.8921169,59.0000433 87.9100453,50.6642209 L125.812763,12.7615036 C128.732035,9.84223095 128.72611,5.10322984 125.812796,2.18991592 C122.893542,-0.729338085 118.161775,-0.730617045 115.241209,2.18994966 L77.3384914,40.092667 C69.002669,36.1105954 58.7163002,37.5717503 51.8119188,44.4761317 L83.5265806,76.1907935 L83.5265806,76.1907935 L83.5265806,76.1907935 L83.5265806,76.1907935 Z M80.8836921,78.8336819 L49.1690303,47.1190201 C49.1690303,47.1190201 8.50573364,81.242543 0,80.2820711 C0,80.2820711 3.78222974,85.8744423 6.82737483,88.320684 C20.8514801,82.630792 44.1526049,63.720771 44.1526049,63.720771 L44.8144806,64.3803375 C44.8144806,64.3803375 19.450356,90.2231043 9.18040433,92.0477601 C10.4017154,93.4877138 13.5343883,96.1014812 15.4269991,97.8235871 C20.8439164,96.3356979 50.1595367,69.253789 50.1595367,69.253789 L50.8214124,69.9133555 L18.4136144,100.936036 L23.6993903,106.221812 L56.1060358,75.2002881 L56.7679115,75.8598546 C56.7679115,75.8598546 28.9040131,106.396168 28.0841366,108.291555 C28.0841366,108.291555 34.1159238,115.144621 35.6529617,116.115796 C36.3545333,113.280171 63.5365402,82.6307925 63.5365402,82.6307925 L64.1984159,83.290359 C64.1984159,83.290359 43.6013016,107.04575 39.2343772,120.022559 C42.443736,123.571575 46.7339155,125.159692 50.1595362,126.321151 C47.9699978,114.504469 80.8836921,78.8336819 80.8836921,78.8336819 L80.8836921,78.8336819 Z"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/core/images/palette.tid b/core/images/palette.tid
old mode 100644
new mode 100755
diff --git a/core/images/permalink-button.tid b/core/images/permalink-button.tid
old mode 100644
new mode 100755
diff --git a/core/images/permaview-button.tid b/core/images/permaview-button.tid
old mode 100644
new mode 100755
diff --git a/core/images/picture.tid b/core/images/picture.tid
new file mode 100755
index 000000000..71d2bf1a6
--- /dev/null
+++ b/core/images/picture.tid
@@ -0,0 +1,8 @@
+title: $:/core/images/picture
+tags: $:/tags/Image
+
+<svg class="tc-image-picture tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <path d="M112,68.2332211 L112,20.0027785 C112,17.7898769 110.207895,16 107.997221,16 L20.0027785,16 C17.7898769,16 16,17.792105 16,20.0027785 L16,58.312373 L25.2413115,43.7197989 C28.041793,39.297674 34.2643908,38.7118128 37.8410347,42.5335275 L56.0882845,63.1470817 L69.7748997,56.7400579 C72.766567,55.3552503 76.3013751,55.9473836 78.678437,58.2315339 C78.8106437,58.3585731 79.0742301,58.609836 79.4527088,58.9673596 C80.0910923,59.570398 80.8117772,60.2441563 81.598127,60.9705595 C83.8422198,63.043576 86.1541548,65.1151944 88.3956721,67.0372264 C89.1168795,67.6556396 89.8200801,68.2492007 90.5021258,68.8146755 C92.6097224,70.5620551 94.4693308,72.0029474 95.9836366,73.0515697 C96.7316295,73.5695379 97.3674038,73.9719282 98.0281481,74.3824999 C98.4724987,74.4989557 99.0742374,74.5263881 99.8365134,74.4317984 C101.709944,74.1993272 104.074502,73.2878514 106.559886,71.8846196 C107.705822,71.2376318 108.790494,70.5370325 109.764561,69.8410487 C110.323259,69.4418522 110.694168,69.1550757 110.834827,69.0391868 C111.210545,68.7296319 111.600264,68.4615815 112,68.2332211 L112,68.2332211 Z M0,8.00697327 C0,3.58484404 3.59075293,0 8.00697327,0 L119.993027,0 C124.415156,0 128,3.59075293 128,8.00697327 L128,119.993027 C128,124.415156 124.409247,128 119.993027,128 L8.00697327,128 C3.58484404,128 0,124.409247 0,119.993027 L0,8.00697327 L0,8.00697327 Z M95,42 C99.418278,42 103,38.418278 103,34 C103,29.581722 99.418278,26 95,26 C90.581722,26 87,29.581722 87,34 C87,38.418278 90.581722,42 95,42 L95,42 Z M32,76 C47.8587691,80.8294182 52.0345556,83.2438712 52.0345556,88 C52.0345556,92.7561288 32,95.4712486 32,102.347107 C32,109.222965 33.2849191,107.337637 33.2849191,112 L67.999999,112 C67.999999,112 54.3147136,105.375255 54.3147136,101.200691 C54.3147136,93.535181 64.9302432,92.860755 64.9302432,88 C64.9302432,80.6425555 50.8523779,79.167282 32,76 L32,76 Z"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/core/images/plugin-generic-language.tid b/core/images/plugin-generic-language.tid
old mode 100644
new mode 100755
diff --git a/core/images/plugin-generic-plugin.tid b/core/images/plugin-generic-plugin.tid
old mode 100644
new mode 100755
diff --git a/core/images/plugin-generic-theme.tid b/core/images/plugin-generic-theme.tid
old mode 100644
new mode 100755
diff --git a/core/images/preview-closed.tid b/core/images/preview-closed.tid
new file mode 100755
index 000000000..1ca8f24ba
--- /dev/null
+++ b/core/images/preview-closed.tid
@@ -0,0 +1,15 @@
+title: $:/core/images/preview-closed
+tags: $:/tags/Image
+
+<svg class="tc-image-preview-closed tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <path d="M0.0881363238,64 C-0.210292223,65.8846266 0.249135869,67.8634737 1.4664206,69.4579969 C16.2465319,88.8184886 39.1692554,100.414336 64,100.414336 C88.8307446,100.414336 111.753468,88.8184886 126.533579,69.4579969 C127.750864,67.8634737 128.210292,65.8846266 127.911864,64 C110.582357,78.4158332 88.3036732,87.0858436 64,87.0858436 C39.6963268,87.0858436 17.4176431,78.4158332 0.0881363238,64 Z"></path>
+        <rect x="62" y="96" width="4" height="16" rx="4"></rect>
+        <rect transform="translate(80.000000, 101.000000) rotate(-5.000000) translate(-80.000000, -101.000000) " x="78" y="93" width="4" height="16" rx="4"></rect>
+        <rect transform="translate(48.000000, 101.000000) rotate(-355.000000) translate(-48.000000, -101.000000) " x="46" y="93" width="4" height="16" rx="4"></rect>
+        <rect transform="translate(32.000000, 96.000000) rotate(-350.000000) translate(-32.000000, -96.000000) " x="30" y="88" width="4" height="16" rx="4"></rect>
+        <rect transform="translate(96.000000, 96.000000) rotate(-10.000000) translate(-96.000000, -96.000000) " x="94" y="88" width="4" height="16" rx="4"></rect>
+        <rect transform="translate(112.000000, 88.000000) rotate(-20.000000) translate(-112.000000, -88.000000) " x="110" y="80" width="4" height="16" rx="4"></rect>
+        <rect transform="translate(16.000000, 88.000000) rotate(-340.000000) translate(-16.000000, -88.000000) " x="14" y="80" width="4" height="16" rx="4"></rect>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/core/images/preview-open.tid b/core/images/preview-open.tid
new file mode 100755
index 000000000..17f2319e1
--- /dev/null
+++ b/core/images/preview-open.tid
@@ -0,0 +1,9 @@
+title: $:/core/images/preview-open
+tags: $:/tags/Image
+
+<svg class="tc-image-preview-open tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <path d="M64.1099282,99.5876785 C39.2791836,99.5876785 16.3564602,87.9918313 1.57634884,68.6313396 C-0.378878622,66.070184 -0.378878622,62.5174945 1.57634884,59.9563389 C16.3564602,40.5958472 39.2791836,29 64.1099282,29 C88.9406729,29 111.863396,40.5958472 126.643508,59.9563389 C128.598735,62.5174945 128.598735,66.070184 126.643508,68.6313396 C111.863396,87.9918313 88.9406729,99.5876785 64.1099282,99.5876785 Z M110.213805,67.5808331 C111.654168,66.0569335 111.654168,63.9430665 110.213805,62.4191669 C99.3257042,50.8995835 82.4391647,44 64.1470385,44 C45.8549124,44 28.9683729,50.8995835 18.0802717,62.4191669 C16.6399094,63.9430665 16.6399094,66.0569335 18.0802717,67.5808331 C28.9683729,79.1004165 45.8549124,86 64.1470385,86 C82.4391647,86 99.3257042,79.1004165 110.213805,67.5808331 Z"></path>
+        <path d="M63.5,88 C76.4786916,88 87,77.4786916 87,64.5 C87,51.5213084 76.4786916,41 63.5,41 C50.5213084,41 40,51.5213084 40,64.5 C40,77.4786916 50.5213084,88 63.5,88 Z"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/core/images/print-button.tid b/core/images/print-button.tid
new file mode 100644
index 000000000..5e7c1d8e0
--- /dev/null
+++ b/core/images/print-button.tid
@@ -0,0 +1,12 @@
+title: $:/core/images/print-button
+tags: $:/tags/Image
+
+<svg class="tc-image-print-button tc-image-button" viewBox="0 0 128 128" width="22pt" height="22pt">
+    <g fill-rule="evenodd">
+        <path d="M112,71 L112,30.5 L111.96811,30.5 L111.96811,30.5 C111.932942,28.4998414 111.151676,26.510538 109.625176,24.9840387 L86.9982489,2.35711116 C85.3482153,0.707077645 83.1589869,-0.071534047 81,0.0201838424 L81,0 L23.9992458,0 C19.5808867,0 16,3.58213437 16,8.00092105 L16,71 L24,71 L24,8 L81,8 L81,22.4996539 C81,26.9216269 84.5818769,30.5 89.0003461,30.5 L104,30.5 L104,71 L112,71 Z"></path>
+        <rect x="32" y="36" width="64" height="8" rx="4"></rect>
+        <rect x="32" y="52" width="64" height="8" rx="4"></rect>
+        <rect x="32" y="20" width="40" height="8" rx="4"></rect>
+        <path d="M0,80.0054195 C0,71.1658704 7.15611005,64 16.0008841,64 L111.999116,64 C120.83616,64 128,71.1553215 128,80.0054195 L128,111.99458 C128,120.83413 120.84389,128 111.999116,128 L16.0008841,128 C7.16383982,128 0,120.844679 0,111.99458 L0,80.0054195 Z M104,96 C108.418278,96 112,92.418278 112,88 C112,83.581722 108.418278,80 104,80 C99.581722,80 96,83.581722 96,88 C96,92.418278 99.581722,96 104,96 Z"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/core/images/quote.tid b/core/images/quote.tid
new file mode 100755
index 000000000..882b1debc
--- /dev/null
+++ b/core/images/quote.tid
@@ -0,0 +1,8 @@
+title: $:/core/images/quote
+tags: $:/tags/Image
+
+<svg class="tc-image-quote tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <path d="M51.2188077,117.712501 L51.2188077,62.1993386 L27.4274524,62.1993386 C27.4274524,53.3075754 29.1096526,45.797753 32.4741035,39.669646 C35.8385544,33.541539 42.0867267,28.9154883 51.2188077,25.7913554 L51.2188077,2 C43.7689521,2.96127169 36.8599155,5.18417913 30.4914905,8.668789 C24.1230656,12.1533989 18.6559149,16.5391352 14.0898743,21.8261295 C9.52383382,27.1131238 5.97919764,33.2411389 3.45585945,40.2103586 C0.932521268,47.1795784 -0.208971741,54.6293222 0.0313461819,62.5598136 L0.0313461819,117.712501 L51.2188077,117.712501 Z M128,117.712501 L128,62.1993386 L104.208645,62.1993386 C104.208645,53.3075754 105.890845,45.797753 109.255296,39.669646 C112.619747,33.541539 118.867919,28.9154883 128,25.7913554 L128,2 C120.550144,2.96127169 113.641108,5.18417913 107.272683,8.668789 C100.904258,12.1533989 95.4371072,16.5391352 90.8710666,21.8261295 C86.3050261,27.1131238 82.7603899,33.2411389 80.2370517,40.2103586 C77.7137136,47.1795784 76.5722206,54.6293222 76.8125385,62.5598136 L76.8125385,117.712501 L128,117.712501 Z"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/core/images/refresh-button.tid b/core/images/refresh-button.tid
old mode 100644
new mode 100755
diff --git a/core/images/right-arrow.tid b/core/images/right-arrow.tid
old mode 100644
new mode 100755
diff --git a/core/images/save-button.tid b/core/images/save-button.tid
old mode 100644
new mode 100755
diff --git a/core/images/size.tid b/core/images/size.tid
new file mode 100755
index 000000000..4822dbb50
--- /dev/null
+++ b/core/images/size.tid
@@ -0,0 +1,6 @@
+title: $:/core/images/size
+tags: $:/tags/Image
+
+<svg class="tc-image-size tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <path d="M92.3431458,26 L83.1715729,35.1715729 C81.6094757,36.73367 81.6094757,39.26633 83.1715729,40.8284271 C84.73367,42.3905243 87.26633,42.3905243 88.8284271,40.8284271 L104.828427,24.8284271 C106.390524,23.26633 106.390524,20.73367 104.828427,19.1715729 L88.8284271,3.17157288 C87.26633,1.60947571 84.73367,1.60947571 83.1715729,3.17157288 C81.6094757,4.73367004 81.6094757,7.26632996 83.1715729,8.82842712 L92.3431457,18 L22,18 C19.790861,18 18,19.790861 18,22 L18,92.3431458 L8.82842712,83.1715729 C7.26632996,81.6094757 4.73367004,81.6094757 3.17157288,83.1715729 C1.60947571,84.73367 1.60947571,87.26633 3.17157288,88.8284271 L19.1715729,104.828427 C20.73367,106.390524 23.26633,106.390524 24.8284271,104.828427 L40.8284271,88.8284271 C42.3905243,87.26633 42.3905243,84.73367 40.8284271,83.1715729 C39.26633,81.6094757 36.73367,81.6094757 35.1715729,83.1715729 L26,92.3431458 L26,22 L22,26 L92.3431458,26 L92.3431458,26 Z M112,52 L112,116 L116,112 L52,112 C49.790861,112 48,113.790861 48,116 C48,118.209139 49.790861,120 52,120 L116,120 C118.209139,120 120,118.209139 120,116 L120,52 C120,49.790861 118.209139,48 116,48 C113.790861,48 112,49.790861 112,52 L112,52 Z"></path>
+</svg>
\ No newline at end of file
diff --git a/core/images/spiral.tid b/core/images/spiral.tid
old mode 100644
new mode 100755
diff --git a/core/images/stamp.tid b/core/images/stamp.tid
new file mode 100755
index 000000000..ab8949c1d
--- /dev/null
+++ b/core/images/stamp.tid
@@ -0,0 +1,8 @@
+title: $:/core/images/stamp
+tags: $:/tags/Image
+
+<svg class="tc-image-stamp tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <path d="M49.7334301,64 L16.0098166,64 C11.5838751,64 8,67.5829053 8,72.002643 L8,74.4986785 L8,97 L120,97 L120,74.4986785 L120,72.002643 C120,67.5737547 116.413883,64 111.990183,64 L78.2665699,64 C76.502049,60.7519149 75.5,57.0311962 75.5,53.0769231 C75.5,46.6017951 78.1869052,40.7529228 82.5087769,36.5800577 C85.3313113,32.7688808 87,28.0549983 87,22.952183 C87,10.2760423 76.7025492,0 64,0 C51.2974508,0 41,10.2760423 41,22.952183 C41,28.0549983 42.6686887,32.7688808 45.4912231,36.5800577 C49.8130948,40.7529228 52.5,46.6017951 52.5,53.0769231 C52.5,57.0311962 51.497951,60.7519149 49.7334301,64 Z M8,104 L120,104 L120,112 L8,112 L8,104 Z"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/core/images/star-filled.tid b/core/images/star-filled.tid
old mode 100644
new mode 100755
diff --git a/core/images/storyview-classic.tid b/core/images/storyview-classic.tid
old mode 100644
new mode 100755
diff --git a/core/images/storyview-pop.tid b/core/images/storyview-pop.tid
old mode 100644
new mode 100755
diff --git a/core/images/storyview-zoomin.tid b/core/images/storyview-zoomin.tid
old mode 100644
new mode 100755
diff --git a/core/images/strikethrough.tid b/core/images/strikethrough.tid
new file mode 100755
index 000000000..80898c870
--- /dev/null
+++ b/core/images/strikethrough.tid
@@ -0,0 +1,9 @@
+title: $:/core/images/strikethrough
+tags: $:/tags/Image
+
+<svg class="tc-image-strikethrough tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <path d="M92.793842,38.7255689 L108.215529,38.7255689 C107.987058,31.985687 106.70193,26.1883331 104.360107,21.3333333 C102.018284,16.4783336 98.8197436,12.4516001 94.7643909,9.25301205 C90.7090382,6.05442399 85.9969032,3.71263572 80.6278447,2.22757697 C75.2587862,0.742518233 69.4328739,0 63.1499331,0 C57.552404,0 52.0977508,0.713959839 46.7858099,2.14190094 C41.473869,3.56984203 36.7331757,5.74027995 32.5635877,8.65327979 C28.3939997,11.5662796 25.0526676,15.2788708 22.5394913,19.7911647 C20.026315,24.3034585 18.7697456,29.6438781 18.7697456,35.8125837 C18.7697456,41.4101128 19.883523,46.0651309 22.1111111,49.7777778 C24.3386992,53.4904246 27.3087722,56.5176144 31.021419,58.8594378 C34.7340659,61.2012612 38.9321497,63.0861151 43.6157965,64.5140562 C48.2994433,65.9419973 53.068695,67.1985666 57.9236948,68.2838019 C62.7786945,69.3690371 67.5479462,70.4256977 72.231593,71.4538153 C76.9152398,72.4819329 81.1133237,73.8241773 84.8259705,75.480589 C88.5386174,77.1370007 91.5086903,79.2788802 93.7362784,81.9062918 C95.9638666,84.5337035 97.0776439,87.9607107 97.0776439,92.1874163 C97.0776439,96.6425926 96.1637753,100.298067 94.3360107,103.153949 C92.5082461,106.009831 90.109341,108.265944 87.1392236,109.922356 C84.1691061,111.578768 80.827774,112.749662 77.1151272,113.435074 C73.4024803,114.120485 69.7184476,114.463186 66.0629183,114.463186 C61.4935068,114.463186 57.0383974,113.892018 52.6974565,112.749665 C48.3565156,111.607312 44.5582492,109.836692 41.3025435,107.437751 C38.0468378,105.03881 35.4194656,101.983062 33.4203481,98.270415 C31.4212305,94.5577681 30.4216867,90.1312171 30.4216867,84.9906292 L15,84.9906292 C15,92.4159229 16.3422445,98.8415614 19.0267738,104.267738 C21.711303,109.693914 25.3667774,114.149023 29.9933066,117.633199 C34.6198357,121.117376 39.9888137,123.71619 46.1004016,125.429719 C52.2119895,127.143248 58.6947448,128 65.5488621,128 C71.1463912,128 76.7723948,127.343157 82.4270415,126.029451 C88.0816882,124.715745 93.1936407,122.602424 97.7630522,119.689424 C102.332464,116.776425 106.073613,113.006717 108.986613,108.380187 C111.899613,103.753658 113.356091,98.1847715 113.356091,91.6733601 C113.356091,85.6188899 112.242314,80.5926126 110.014726,76.5943775 C107.787137,72.5961424 104.817065,69.2833688 101.104418,66.6559572 C97.3917708,64.0285455 93.193687,61.9437828 88.5100402,60.4016064 C83.8263934,58.85943 79.0571416,57.5171855 74.2021419,56.3748327 C69.3471422,55.2324798 64.5778904,54.1758192 59.8942436,53.2048193 C55.2105968,52.2338193 51.012513,51.0058084 47.2998661,49.5207497 C43.5872193,48.0356909 40.6171463,46.1222786 38.3895582,43.7804552 C36.1619701,41.4386318 35.0481928,38.3828836 35.0481928,34.6131191 C35.0481928,30.6148841 35.8192694,27.273552 37.3614458,24.5890228 C38.9036222,21.9044935 40.9598265,19.762614 43.5301205,18.1633199 C46.1004145,16.5640259 49.041929,15.4216902 52.3547523,14.7362784 C55.6675757,14.0508667 59.0374661,13.708166 62.4645248,13.708166 C70.9179361,13.708166 77.8576257,15.6786952 83.2838019,19.6198126 C88.709978,23.56093 91.8799597,29.9294518 92.793842,38.7255689 L92.793842,38.7255689 Z"></path>
+        <rect x="5" y="54" width="118" height="16"></rect>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/core/images/subscript.tid b/core/images/subscript.tid
new file mode 100755
index 000000000..a56aa2f1d
--- /dev/null
+++ b/core/images/subscript.tid
@@ -0,0 +1,8 @@
+title: $:/core/images/subscript
+tags: $:/tags/Image
+
+<svg class="tc-image-subscript tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <path d="M2.27170276,16 L22.1825093,16 L43.8305003,49.6746527 L66.4138983,16 L85.1220387,16 L53.5854592,61.9685735 L87.3937414,111.411516 L67.0820462,111.411516 L43.295982,74.9306422 L19.1090291,111.411516 L0,111.411516 L33.8082822,61.9685735 L2.27170276,16 Z M127.910914,128.411516 L85.3276227,128.411516 C85.3870139,123.24448 86.6342108,118.730815 89.0692508,114.870386 C91.5042907,111.009956 94.8301491,107.654403 99.0469256,104.803624 C101.066227,103.318844 103.174584,101.878629 105.372059,100.482935 C107.569534,99.0872413 109.588805,97.5876355 111.429933,95.9840726 C113.271061,94.3805097 114.785514,92.6433426 115.973338,90.7725192 C117.161163,88.9016958 117.784761,86.7487964 117.844152,84.3137564 C117.844152,83.1853233 117.710524,81.9826691 117.443264,80.7057579 C117.176003,79.4288467 116.656338,78.2410402 115.884252,77.1423026 C115.112166,76.0435651 114.04314,75.123015 112.677142,74.3806248 C111.311144,73.6382345 109.529434,73.267045 107.331959,73.267045 C105.312658,73.267045 103.634881,73.6679297 102.298579,74.4697112 C100.962276,75.2714926 99.8932503,76.3702137 99.0914688,77.7659073 C98.2896874,79.161601 97.6957841,80.8096826 97.3097412,82.7102016 C96.9236982,84.6107206 96.7009845,86.6596869 96.6415933,88.857162 L86.4857457,88.857162 C86.4857457,85.4124713 86.9460207,82.2202411 87.8665846,79.2803758 C88.7871485,76.3405105 90.1679736,73.801574 92.0091014,71.6634901 C93.8502292,69.5254062 96.092214,67.8476295 98.7351233,66.6301095 C101.378033,65.4125895 104.451482,64.8038386 107.955564,64.8038386 C111.756602,64.8038386 114.933984,65.4274371 117.487807,66.6746527 C120.041629,67.9218683 122.105443,69.4957119 123.67931,71.3962309 C125.253178,73.2967499 126.366746,75.3605638 127.02005,77.5877345 C127.673353,79.8149053 128,81.9381095 128,83.9574109 C128,86.4518421 127.613963,88.7086746 126.841877,90.727976 C126.069791,92.7472774 125.03046,94.6032252 123.723854,96.2958749 C122.417247,97.9885247 120.932489,99.5475208 119.269534,100.97291 C117.60658,102.398299 115.884261,103.734582 114.102524,104.981797 C112.320788,106.229013 110.539078,107.416819 108.757341,108.545253 C106.975605,109.673686 105.327523,110.802102 103.813047,111.930535 C102.298571,113.058968 100.977136,114.231927 99.8487031,115.449447 C98.7202699,116.666967 97.9481956,117.958707 97.5324571,119.324705 L127.910914,119.324705 L127.910914,128.411516 Z"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/core/images/superscript.tid b/core/images/superscript.tid
new file mode 100755
index 000000000..ca48636e0
--- /dev/null
+++ b/core/images/superscript.tid
@@ -0,0 +1,8 @@
+title: $:/core/images/superscript
+tags: $:/tags/Image
+
+<svg class="tc-image-superscript tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <path d="M2.27170276,16 L22.1825093,16 L43.8305003,49.6746527 L66.4138983,16 L85.1220387,16 L53.5854592,61.9685735 L87.3937414,111.411516 L67.0820462,111.411516 L43.295982,74.9306422 L19.1090291,111.411516 L0,111.411516 L33.8082822,61.9685735 L2.27170276,16 Z M127.910914,63.4115159 L85.3276227,63.4115159 C85.3870139,58.2444799 86.6342108,53.7308149 89.0692508,49.8703857 C91.5042907,46.0099565 94.8301491,42.654403 99.0469256,39.8036245 C101.066227,38.318844 103.174584,36.8786285 105.372059,35.4829349 C107.569534,34.0872413 109.588805,32.5876355 111.429933,30.9840726 C113.271061,29.3805097 114.785514,27.6433426 115.973338,25.7725192 C117.161163,23.9016958 117.784761,21.7487964 117.844152,19.3137564 C117.844152,18.1853233 117.710524,16.9826691 117.443264,15.7057579 C117.176003,14.4288467 116.656338,13.2410402 115.884252,12.1423026 C115.112166,11.0435651 114.04314,10.123015 112.677142,9.38062477 C111.311144,8.63823453 109.529434,8.26704499 107.331959,8.26704499 C105.312658,8.26704499 103.634881,8.6679297 102.298579,9.46971115 C100.962276,10.2714926 99.8932503,11.3702137 99.0914688,12.7659073 C98.2896874,14.161601 97.6957841,15.8096826 97.3097412,17.7102016 C96.9236982,19.6107206 96.7009845,21.6596869 96.6415933,23.857162 L86.4857457,23.857162 C86.4857457,20.4124713 86.9460207,17.2202411 87.8665846,14.2803758 C88.7871485,11.3405105 90.1679736,8.80157397 92.0091014,6.6634901 C93.8502292,4.52540622 96.092214,2.84762946 98.7351233,1.63010947 C101.378033,0.412589489 104.451482,-0.196161372 107.955564,-0.196161372 C111.756602,-0.196161372 114.933984,0.427437071 117.487807,1.67465266 C120.041629,2.92186826 122.105443,4.49571195 123.67931,6.39623095 C125.253178,8.29674995 126.366746,10.3605638 127.02005,12.5877345 C127.673353,14.8149053 128,16.9381095 128,18.9574109 C128,21.4518421 127.613963,23.7086746 126.841877,25.727976 C126.069791,27.7472774 125.03046,29.6032252 123.723854,31.2958749 C122.417247,32.9885247 120.932489,34.5475208 119.269534,35.97291 C117.60658,37.3982993 115.884261,38.7345816 114.102524,39.9817972 C112.320788,41.2290128 110.539078,42.4168194 108.757341,43.5452525 C106.975605,44.6736857 105.327523,45.8021019 103.813047,46.9305351 C102.298571,48.0589682 100.977136,49.2319272 99.8487031,50.4494472 C98.7202699,51.6669672 97.9481956,52.9587068 97.5324571,54.3247048 L127.910914,54.3247048 L127.910914,63.4115159 Z"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/core/images/tag-button.tid b/core/images/tag-button.tid
old mode 100644
new mode 100755
diff --git a/core/images/theme-button.tid b/core/images/theme-button.tid
old mode 100644
new mode 100755
diff --git a/core/images/tip.tid b/core/images/tip.tid
old mode 100644
new mode 100755
diff --git a/core/images/twitter.tid b/core/images/twitter.tid
old mode 100644
new mode 100755
diff --git a/core/images/underline.tid b/core/images/underline.tid
new file mode 100755
index 000000000..22465748b
--- /dev/null
+++ b/core/images/underline.tid
@@ -0,0 +1,8 @@
+title: $:/core/images/underline
+tags: $:/tags/Image
+
+<svg class="tc-image-underline tc-image-button" width="22pt" height="22pt" viewBox="0 0 128 128">
+    <g fill-rule="evenodd">
+        <path d="M7,117.421488 L121.247934,117.421488 L121.247934,128 L7,128 L7,117.421488 Z M104.871212,98.8958333 L104.871212,0 L88.6117424,0 L88.6117424,55.8560606 C88.6117424,60.3194668 88.0060035,64.432115 86.7945076,68.1941288 C85.5830116,71.9561425 83.7657949,75.239885 81.342803,78.0454545 C78.9198111,80.8510241 75.8911167,83.0189317 72.2566288,84.5492424 C68.6221409,86.0795531 64.3182067,86.844697 59.344697,86.844697 C53.0959284,86.844697 48.1862552,85.0593613 44.6155303,81.4886364 C41.0448054,77.9179114 39.2594697,73.0720003 39.2594697,66.9507576 L39.2594697,0 L23,0 L23,65.0378788 C23,70.3939662 23.5419769,75.2717583 24.625947,79.6714015 C25.709917,84.0710447 27.5908957,87.864883 30.2689394,91.0530303 C32.9469831,94.2411776 36.4538925,96.6960141 40.7897727,98.4176136 C45.125653,100.139213 50.545422,101 57.0492424,101 C64.3182182,101 70.630655,99.5653553 75.9867424,96.6960227 C81.3428298,93.8266902 85.742407,89.33147 89.1856061,83.2102273 L89.5681818,83.2102273 L89.5681818,98.8958333 L104.871212,98.8958333 Z"></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/core/images/unfold-all-button.tid b/core/images/unfold-all-button.tid
old mode 100644
new mode 100755
diff --git a/core/images/unfold-button.tid b/core/images/unfold-button.tid
old mode 100644
new mode 100755
diff --git a/core/images/unlocked-padlock.tid b/core/images/unlocked-padlock.tid
old mode 100644
new mode 100755
diff --git a/core/images/up-arrow.tid b/core/images/up-arrow.tid
old mode 100644
new mode 100755
diff --git a/core/images/video.tid b/core/images/video.tid
old mode 100644
new mode 100755
diff --git a/core/images/warning.tid b/core/images/warning.tid
old mode 100644
new mode 100755
diff --git a/core/language/en-GB/Buttons.multids b/core/language/en-GB/Buttons.multids
index 1c1c23c50..412e35f8f 100644
--- a/core/language/en-GB/Buttons.multids
+++ b/core/language/en-GB/Buttons.multids
@@ -62,6 +62,10 @@ NewJournal/Caption: new journal
 NewJournal/Hint: Create a new journal tiddler
 NewJournalHere/Caption: new journal here
 NewJournalHere/Hint: Create a new journal tiddler tagged with this one
+NewImage/Caption: new image
+NewImage/Hint: Create a new image tiddler
+NewMarkdown/Caption: new Markdown tiddler
+NewMarkdown/Hint: Create a new Markdown tiddler
 NewTiddler/Caption: new tiddler
 NewTiddler/Hint: Create a new tiddler
 OpenWindow/Caption: open in new window
@@ -72,6 +76,8 @@ Permalink/Caption: permalink
 Permalink/Hint: Set browser address bar to a direct link to this tiddler
 Permaview/Caption: permaview
 Permaview/Hint: Set browser address bar to a direct link to all the tiddlers in this story
+Print/Caption: print page
+Print/Hint: Print the current page
 Refresh/Caption: refresh
 Refresh/Hint: Perform a full refresh of the wiki
 Save/Caption: ok
@@ -88,3 +94,78 @@ TagManager/Caption: tag manager
 TagManager/Hint: Open tag manager
 Theme/Caption: theme
 Theme/Hint: Choose the display theme
+Bold/Caption: bold
+Bold/Hint: Apply bold formatting to selection
+Clear/Caption: clear
+Clear/Hint: Clear image to solid colour
+EditorHeight/Caption: editor height
+EditorHeight/Caption/Auto: Automatically adjust height to fit content
+EditorHeight/Caption/Fixed: Fixed height:
+EditorHeight/Hint: Choose the height of the text editor
+Excise/Caption: excise
+Excise/Caption/Excise: Perform excision
+Excise/Caption/MacroName: Macro name:
+Excise/Caption/NewTitle: Title of new tiddler:
+Excise/Caption/Replace: Replace excised text with:
+Excise/Caption/Replace/Macro: macro
+Excise/Caption/Replace/Link: link
+Excise/Caption/Replace/Transclusion: transclusion
+Excise/Caption/Tag: Tag new tiddler with the title of this tiddler
+Excise/Caption/TiddlerExists: Warning: tiddler already exists
+Excise/Hint: Excise the selected text into a new tiddler
+Heading1/Caption: heading 1
+Heading1/Hint: Apply heading level 1 formatting to lines containing selection
+Heading2/Caption: heading 2
+Heading2/Hint: Apply heading level 2 formatting to lines containing selection
+Heading3/Caption: heading 3
+Heading3/Hint: Apply heading level 3 formatting to lines containing selection
+Heading4/Caption: heading 4
+Heading4/Hint: Apply heading level 4 formatting to lines containing selection
+Heading5/Caption: heading 5
+Heading5/Hint: Apply heading level 5 formatting to lines containing selection
+Heading6/Caption: heading 6
+Heading6/Hint: Apply heading level 6 formatting to lines containing selection
+Italic/Caption: italic
+Italic/Hint: Apply italic formatting to selection
+LineWidth/Caption: line width
+LineWidth/Hint: Set line width for painting
+Link/Caption: link
+Link/Hint: Create wikitext link
+ListBullet/Caption: bulleted list
+ListBullet/Hint: Apply bulleted list formatting to lines containing selection
+ListNumber/Caption: numbered list
+ListNumber/Hint: Apply numbered list formatting to lines containing selection
+MonoBlock/Caption: monospaced block
+MonoBlock/Hint: Apply monospaced block formatting to lines containing selection
+MonoLine/Caption: monospaced
+MonoLine/Hint: Apply monospaced character formatting to selection
+Opacity/Caption: opacity
+Opacity/Hint: Set painting opacity
+Paint/Caption: paint colour
+Paint/Hint: Set painting colour
+Picture/Caption: picture
+Picture/Hint: Insert picture
+Preview/Caption: preview
+Preview/Hint: Show preview pane
+PreviewType/Caption: preview type
+PreviewType/Hint: Choose preview type
+Quote/Caption: quote
+Quote/Hint: Apply quoted text formatting to lines containing selection
+Size/Caption: image size
+Size/Caption/Height: Height:
+Size/Caption/Resize: Resize image
+Size/Caption/Width: Width:
+Size/Hint: Set image size
+Stamp/Caption: stamp
+Stamp/Caption/New: Add your own
+Stamp/Hint: Insert a preconfigured snippet of text
+Stamp/New/Title: Name as shown in menu
+Stamp/New/Text: Text of snippet. (Remember to add a descriptive title in the caption field).
+Strikethrough/Caption: strikethrough
+Strikethrough/Hint: Apply strikethrough formatting to selection
+Subscript/Caption: subscript
+Subscript/Hint: Apply subscript formatting to selection
+Superscript/Caption: superscript
+Superscript/Hint: Apply superscript formatting to selection
+Underline/Caption: underline
+Underline/Hint: Apply underline formatting to selection
diff --git a/core/language/en-GB/ControlPanel.multids b/core/language/en-GB/ControlPanel.multids
index abd4e9ae7..5204d62aa 100644
--- a/core/language/en-GB/ControlPanel.multids
+++ b/core/language/en-GB/ControlPanel.multids
@@ -27,6 +27,19 @@ EditorTypes/Hint: These tiddlers determine which editor is used to edit specific
 EditorTypes/Type/Caption: Type
 Info/Caption: Info
 Info/Hint: Information about this TiddlyWiki
+KeyboardShortcuts/Add/Prompt: Type shortcut here
+KeyboardShortcuts/Add/Caption: add shortcut
+KeyboardShortcuts/Caption: Keyboard Shortcuts
+KeyboardShortcuts/Hint: Manage keyboard shortcut assignments
+KeyboardShortcuts/NoShortcuts/Caption: No keyboard shortcuts assigned
+KeyboardShortcuts/Remove/Hint: remove keyboard shortcut
+KeyboardShortcuts/Platform/All: All platforms
+KeyboardShortcuts/Platform/Mac: Macintosh platform only
+KeyboardShortcuts/Platform/NonMac: Non-Macintosh platforms only
+KeyboardShortcuts/Platform/Linux: Linux platform only
+KeyboardShortcuts/Platform/NonLinux: Non-Linux platforms only
+KeyboardShortcuts/Platform/Windows: Windows platform only
+KeyboardShortcuts/Platform/NonWindows: Non-Windows platforms only
 LoadedModules/Caption: Loaded Modules
 LoadedModules/Hint: These are the currently loaded tiddler modules linked to their source tiddlers. Any italicised modules lack a source tiddler, typically because they were setup during the boot process.
 Palette/Caption: Palette
@@ -39,12 +52,13 @@ Palette/HideEditor/Caption: hide editor
 Palette/Prompt: Current palette:
 Palette/ShowEditor/Caption: show editor
 Parsing/Caption: Parsing
-Parsing/Hint: Here you can globally disable individual wiki parser rules. Take care as disabling some parser rules can prevent ~TiddlyWiki functioning correctly (you can restore normal operation with [[safe mode|http://tiddlywiki.com/#SafeMode]] )
+Parsing/Hint: Here you can globally disable/enable wiki parser rules. For changes to take effect, save and reload your wiki. Disabling certain parser rules can prevent <$text text="TiddlyWiki"/> from functioning correctly. Use [[safe mode|http://tiddlywiki.com/#SafeMode]] to restore normal operation.
 Parsing/Block/Caption: Block Parse Rules
 Parsing/Inline/Caption: Inline Parse Rules
 Parsing/Pragma/Caption: Pragma Parse Rules
-Plugins/Add/Hint: Install plugins from the official library
 Plugins/Add/Caption: Get more plugins
+Plugins/Add/Hint: Install plugins from the official library
+Plugins/AlreadyInstalled/Hint: This plugin is already installed at version <$text text=<<installedVersion>>/>
 Plugins/Caption: Plugins
 Plugins/Disable/Caption: disable
 Plugins/Disable/Hint: Disable this plugin when reloading page
@@ -52,14 +66,17 @@ Plugins/Disabled/Status: (disabled)
 Plugins/Empty/Hint: None
 Plugins/Enable/Caption: enable
 Plugins/Enable/Hint: Enable this plugin when reloading page
-Plugins/Install: install
+Plugins/Install/Caption: install
 Plugins/Installed/Hint: Currently installed plugins:
 Plugins/Languages/Caption: Languages
 Plugins/Languages/Hint: Language pack plugins
+Plugins/NoInfoFound/Hint: No ''"<$text text=<<currentTab>>/>"'' found
+Plugins/NoInformation/Hint: No information provided
+Plugins/NotInstalled/Hint: This plugin is not currently installed
 Plugins/OpenPluginLibrary: open plugin library
 Plugins/Plugins/Caption: Plugins
 Plugins/Plugins/Hint: Plugins
-Plugins/Reinstall: reinstall
+Plugins/Reinstall/Caption: reinstall
 Plugins/Themes/Caption: Themes
 Plugins/Themes/Hint: Theme plugins
 Saving/Caption: Saving
@@ -83,6 +100,9 @@ Settings/CamelCase/Caption: Camel Case Wiki Links
 Settings/CamelCase/Hint: You can globally disable automatic linking of ~CamelCase phrases. Requires reload to take effect
 Settings/CamelCase/Description: Enable automatic ~CamelCase linking
 Settings/Caption: Settings
+Settings/EditorToolbar/Caption: Editor Toolbar
+Settings/EditorToolbar/Hint: Enable or disable the editor toolbar:
+Settings/EditorToolbar/Description: Show editor toolbar
 Settings/Hint: These settings let you customise the behaviour of TiddlyWiki.
 Settings/NavigationAddressBar/Caption: Navigation Address Bar
 Settings/NavigationAddressBar/Hint: Behaviour of the browser address bar when navigating to a tiddler:
@@ -118,6 +138,9 @@ Settings/TitleLinks/Caption: Tiddler Titles
 Settings/TitleLinks/Hint: Optionally display tiddler titles as links
 Settings/TitleLinks/No/Description: Do not display tiddler titles as links
 Settings/TitleLinks/Yes/Description: Display tiddler titles as links
+Settings/MissingLinks/Caption: Wiki Links
+Settings/MissingLinks/Hint: Choose whether to link to tiddlers that do not exist yet
+Settings/MissingLinks/Description: Enable links to missing tiddlers
 StoryView/Caption: Story View
 StoryView/Prompt: Current view:
 Theme/Caption: Theme
@@ -130,6 +153,8 @@ Toolbars/EditToolbar/Hint: Choose which buttons are displayed for tiddlers in ed
 Toolbars/Hint: Select which toolbar buttons are displayed
 Toolbars/PageControls/Caption: Page Toolbar
 Toolbars/PageControls/Hint: Choose which buttons are displayed on the main page toolbar
+Toolbars/EditorToolbar/Caption: Editor Toolbar
+Toolbars/EditorToolbar/Hint: Choose which buttons are displayed in the editor toolbar. Note that some buttons will only appear when editing tiddlers of a certain type
 Toolbars/ViewToolbar/Caption: View Toolbar
 Toolbars/ViewToolbar/Hint: Choose which buttons are displayed for tiddlers in view mode
 Tools/Download/Full/Caption: Download full wiki
diff --git a/core/language/en-GB/Docs/ModuleTypes.multids b/core/language/en-GB/Docs/ModuleTypes.multids
index 7d666e309..b58c85ad8 100644
--- a/core/language/en-GB/Docs/ModuleTypes.multids
+++ b/core/language/en-GB/Docs/ModuleTypes.multids
@@ -1,16 +1,21 @@
 title: $:/language/Docs/ModuleTypes/
 
+allfilteroperator: A sub-operator for the ''all'' filter operator.
 animation: Animations that may be used with the RevealWidget.
+bitmapeditoroperation: A bitmap editor toolbar operation.
 command: Commands that can be executed under Node.js.
 config: Data to be inserted into `$tw.config`.
 filteroperator: Individual filter operator methods.
 global: Global data to be inserted into `$tw`.
+info: Publishes system information via the [[$:/temp/info-plugin]] pseudo-plugin.
 isfilteroperator: Operands for the ''is'' filter operator.
+library: Generic module type for general purpose JavaScript modules.
 macro: JavaScript macro definitions.
 parser: Parsers for different content types.
 saver: Savers handle different methods for saving files from the browser.
 startup: Startup functions.
 storyview: Story views customise the animation and behaviour of list widgets.
+texteditoroperation: A text editor toolbar operation.
 tiddlerdeserializer: Converts different content types into tiddlers.
 tiddlerfield: Defines the behaviour of an individual tiddler field.
 tiddlermethod: Adds methods to the `$tw.Tiddler` prototype.
diff --git a/core/language/en-GB/EditTemplate.multids b/core/language/en-GB/EditTemplate.multids
index 2125495e2..8d8801af9 100644
--- a/core/language/en-GB/EditTemplate.multids
+++ b/core/language/en-GB/EditTemplate.multids
@@ -1,10 +1,8 @@
 title: $:/language/EditTemplate/
 
 Body/External/Hint: This is an external tiddler stored outside of the main TiddlyWiki file. You can edit the tags and fields but cannot directly edit the content itself
-Body/Hint: Use [[wiki text|http://tiddlywiki.com/static/WikiText.html]] to add formatting, images, and dynamic features
 Body/Placeholder: Type the text for this tiddler
-Body/Preview/Button/Hide: hide preview
-Body/Preview/Button/Show: show preview
+Body/Preview/Type/Output: output
 Field/Remove/Caption: remove field
 Field/Remove/Hint: Remove field
 Fields/Add/Button: add
@@ -19,6 +17,7 @@ Tags/Add/Button: add
 Tags/Add/Placeholder: tag name
 Tags/Dropdown/Caption: tag list
 Tags/Dropdown/Hint: Show tag list
+Title/BadCharacterWarning: Warning: avoid using any of the characters <<bad-chars>> in tiddler titles
 Type/Dropdown/Caption: content type list
 Type/Dropdown/Hint: Show content type list
 Type/Delete/Caption: delete content type
diff --git a/core/language/en-GB/GettingStarted.tid b/core/language/en-GB/GettingStarted.tid
index 2be983442..5911f04d7 100644
--- a/core/language/en-GB/GettingStarted.tid
+++ b/core/language/en-GB/GettingStarted.tid
@@ -11,7 +11,7 @@ Before you start storing important information in ~TiddlyWiki it is important to
 
 |<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
 |<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
-|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
 </div>
 
 See the [[control panel|$:/ControlPanel]] for more options.
diff --git a/core/language/en-GB/Import.multids b/core/language/en-GB/Import.multids
index 9475d6a2c..697d3b510 100644
--- a/core/language/en-GB/Import.multids
+++ b/core/language/en-GB/Import.multids
@@ -1,6 +1,6 @@
 title: $:/language/Import/
 
-Imported: The following tiddlers were imported:
+Imported/Hint: The following tiddlers were imported:
 Listing/Cancel/Caption: Cancel
 Listing/Hint: These tiddlers are ready to import:
 Listing/Import/Caption: Import
diff --git a/core/language/en-GB/Misc.multids b/core/language/en-GB/Misc.multids
index d953eb01f..c21b68326 100644
--- a/core/language/en-GB/Misc.multids
+++ b/core/language/en-GB/Misc.multids
@@ -5,10 +5,12 @@ BinaryWarning/Prompt: This tiddler contains binary data
 ClassicWarning/Hint: This tiddler is written in TiddlyWiki Classic wiki text format, which is not fully compatible with TiddlyWiki version 5. See http://tiddlywiki.com/static/Upgrading.html for more details.
 ClassicWarning/Upgrade/Caption: upgrade
 CloseAll/Button: close all
+ColourPicker/Recent: Recent:
 ConfirmCancelTiddler: Do you wish to discard changes to the tiddler "<$text text=<<title>>/>"?
 ConfirmDeleteTiddler: Do you wish to delete the tiddler "<$text text=<<title>>/>"?
 ConfirmOverwriteTiddler: Do you wish to overwrite the tiddler "<$text text=<<title>>/>"?
 ConfirmEditShadowTiddler: You are about to edit a ShadowTiddler. Any changes will override the default system making future upgrades non-trivial. Are you sure you want to edit "<$text text=<<title>>/>"?
+Count: count
 DefaultNewTiddlerTitle: New Tiddler
 DropMessage: Drop here (or use the 'Escape' key to cancel)
 Encryption/Cancel: Cancel
@@ -19,11 +21,23 @@ Encryption/Password: Password
 Encryption/RepeatPassword: Repeat password
 Encryption/PasswordNoMatch: Passwords do not match
 Encryption/SetPassword: Set password
+Error/Caption: Error
+Error/Filter: Filter error
+Error/FilterSyntax: Syntax error in filter expression
+Error/IsFilterOperator: Filter Error: Unknown operand for the 'is' filter operator
+Error/LoadingPluginLibrary: Error loading plugin library
+Error/RecursiveTransclusion: Recursive transclusion error in transclude widget
+Error/RetrievingSkinny: Error retrieving skinny tiddler list
+Error/SavingToTWEdit: Error saving to TWEdit
+Error/WhileSaving: Error while saving
+Error/XMLHttpRequest: XMLHttpRequest error code
 InternalJavaScriptError/Title: Internal JavaScript Error
 InternalJavaScriptError/Hint: Well, this is embarrassing. It is recommended that you restart TiddlyWiki by refreshing your browser
 InvalidFieldName: Illegal characters in field name "<$text text=<<fieldName>>/>". Fields can only contain lowercase letters, digits and the characters underscore (`_`), hyphen (`-`) and period (`.`)
 LazyLoadingWarning: <p>Loading external text from ''<$text text={{!!_canonical_uri}}/>''</p><p>If this message doesn't disappear you may be using a browser that doesn't support external text in this configuration. See http://tiddlywiki.com/#ExternalText</p>
+LoginToTiddlySpace: Login to TiddlySpace
 MissingTiddler/Hint: Missing tiddler "<$text text=<<currentTiddler>>/>" - click {{$:/core/images/edit-button}} to create
+No: No
 OfficialPluginLibrary: Official ~TiddlyWiki Plugin Library
 OfficialPluginLibrary/Hint: The official ~TiddlyWiki plugin library at tiddlywiki.com. Plugins, themes and language packs are maintained by the core team.
 PluginReloadWarning: Please save {{$:/core/ui/Buttons/save-wiki}} and reload {{$:/core/ui/Buttons/refresh}} to allow changes to plugins to take effect
@@ -36,3 +50,4 @@ TagManager/Info/Heading: Info
 TagManager/Tag/Heading: Tag
 Tiddler/DateFormat: DDth MMM YYYY at hh12:0mmam
 UnsavedChangesWarning: You have unsaved changes in TiddlyWiki
+Yes: Yes
diff --git a/core/language/en-GB/Search.multids b/core/language/en-GB/Search.multids
index fd6eadc7e..f6b207000 100644
--- a/core/language/en-GB/Search.multids
+++ b/core/language/en-GB/Search.multids
@@ -8,6 +8,7 @@ Matches: //<small><<resultCount>> matches</small>//
 Matches/All: All matches:
 Matches/Title: Title matches:
 Search: Search
+Search/TooShort: Search text too short
 Shadows/Caption: Shadows
 Shadows/Hint: Search for shadow tiddlers
 Shadows/Matches: //<small><<resultCount>> matches</small>//
diff --git a/core/language/en-GB/Snippets/ListByTag.tid b/core/language/en-GB/Snippets/ListByTag.tid
new file mode 100644
index 000000000..e8f9cef49
--- /dev/null
+++ b/core/language/en-GB/Snippets/ListByTag.tid
@@ -0,0 +1,5 @@
+title: $:/language/Snippets/ListByTag
+tags: $:/tags/TextEditor/Snippet
+caption: List of tiddlers by tag
+
+<<list-links "[tag[task]sort[title]]">>
diff --git a/core/language/en-GB/Snippets/MacroDefinition.tid b/core/language/en-GB/Snippets/MacroDefinition.tid
new file mode 100644
index 000000000..3829ac903
--- /dev/null
+++ b/core/language/en-GB/Snippets/MacroDefinition.tid
@@ -0,0 +1,7 @@
+title: $:/language/Snippets/MacroDefinition
+tags: $:/tags/TextEditor/Snippet
+caption: Macro definition
+
+\define macroName(param1:"default value",param2)
+Text of the macro
+\end
diff --git a/core/language/en-GB/Snippets/Table 4x3.tid b/core/language/en-GB/Snippets/Table 4x3.tid
new file mode 100644
index 000000000..99f64a68d
--- /dev/null
+++ b/core/language/en-GB/Snippets/Table 4x3.tid	
@@ -0,0 +1,8 @@
+title: $:/language/Snippets/Table4x3
+tags: $:/tags/TextEditor/Snippet
+caption: Table with 4 columns by 3 rows
+
+|! |!Alpha |!Beta |!Gamma |!Delta |
+|!One | | | | |
+|!Two | | | | |
+|!Three | | | | |
diff --git a/core/language/en-GB/Snippets/TableOfContents.tid b/core/language/en-GB/Snippets/TableOfContents.tid
new file mode 100644
index 000000000..40fe4aafb
--- /dev/null
+++ b/core/language/en-GB/Snippets/TableOfContents.tid
@@ -0,0 +1,9 @@
+title: $:/language/Snippets/TableOfContents
+tags: $:/tags/TextEditor/Snippet
+caption: Table of Contents
+
+<div class="tc-table-of-contents">
+
+<<toc-selective-expandable 'TableOfContents'>>
+
+</div>
\ No newline at end of file
diff --git a/core/language/en-GB/ThemeTweaks.multids b/core/language/en-GB/ThemeTweaks.multids
new file mode 100644
index 000000000..694d56b13
--- /dev/null
+++ b/core/language/en-GB/ThemeTweaks.multids
@@ -0,0 +1,41 @@
+title: $:/language/ThemeTweaks/
+
+ThemeTweaks: Theme Tweaks
+ThemeTweaks/Hint: You can tweak certain aspects of the ''Vanilla'' theme.
+Options: Options
+Options/SidebarLayout: Sidebar layout
+Options/SidebarLayout/Fixed-Fluid: Fixed story, fluid sidebar
+Options/SidebarLayout/Fluid-Fixed: Fluid story, fixed sidebar
+Options/StickyTitles: Sticky titles
+Options/StickyTitles/Hint: Causes tiddler titles to "stick" to the top of the browser window. Caution: Does not work at all with Chrome, and causes some layout issues in Firefox
+Options/CodeWrapping: Wrap long lines in code blocks
+Settings: Settings
+Settings/FontFamily: Font family
+Settings/CodeFontFamily: Code font family
+Settings/BackgroundImage: Page background image
+Settings/BackgroundImageAttachment: Page background image attachment
+Settings/BackgroundImageAttachment/Scroll: Scroll with tiddlers
+Settings/BackgroundImageAttachment/Fixed: Fixed to window
+Settings/BackgroundImageSize: Page background image size
+Settings/BackgroundImageSize/Auto: Auto
+Settings/BackgroundImageSize/Cover: Cover
+Settings/BackgroundImageSize/Contain: Contain
+Metrics: Sizes
+Metrics/FontSize: Font size
+Metrics/LineHeight: Line height
+Metrics/BodyFontSize: Font size for tiddler body
+Metrics/BodyLineHeight: Line height for tiddler body
+Metrics/StoryLeft: Story left position
+Metrics/StoryLeft/Hint: how far the left margin of the story river<br>(tiddler area) is from the left of the page
+Metrics/StoryTop: Story top position
+Metrics/StoryTop/Hint: how far the top margin of the story river<br>is from the top of the page
+Metrics/StoryRight: Story right
+Metrics/StoryRight/Hint: how far the left margin of the sidebar <br>is from the left of the page
+Metrics/StoryWidth: Story width
+Metrics/StoryWidth/Hint: the overall width of the story river
+Metrics/TiddlerWidth: Tiddler width
+Metrics/TiddlerWidth/Hint: within the story river
+Metrics/SidebarBreakpoint: Sidebar breakpoint
+Metrics/SidebarBreakpoint/Hint: the minimum page width at which the story<br>river and sidebar will appear side by side
+Metrics/SidebarWidth: Sidebar width
+Metrics/SidebarWidth/Hint: the width of the sidebar in fluid-fixed layout
diff --git a/core/modules/commands/savetiddler.js b/core/modules/commands/savetiddler.js
index b6c6ac376..efc484ec7 100644
--- a/core/modules/commands/savetiddler.js
+++ b/core/modules/commands/savetiddler.js
@@ -32,13 +32,17 @@ Command.prototype.execute = function() {
 		path = require("path"),
 		title = this.params[0],
 		filename = path.resolve(this.commander.outputPath,this.params[1]),
-		tiddler = this.commander.wiki.getTiddler(title),
-		type = tiddler.fields.type || "text/vnd.tiddlywiki",
-		contentTypeInfo = $tw.config.contentTypeInfo[type] || {encoding: "utf8"};
-	$tw.utils.createFileDirectories(filename);
-	fs.writeFile(filename,tiddler.fields.text,contentTypeInfo.encoding,function(err) {
-		self.callback(err);
-	});
+		tiddler = this.commander.wiki.getTiddler(title);
+	if(tiddler) {
+		var type = tiddler.fields.type || "text/vnd.tiddlywiki",
+			contentTypeInfo = $tw.config.contentTypeInfo[type] || {encoding: "utf8"};
+		$tw.utils.createFileDirectories(filename);
+		fs.writeFile(filename,tiddler.fields.text,contentTypeInfo.encoding,function(err) {
+			self.callback(err);
+		});
+	} else {
+		return "Missing tiddler: " + title;
+	}
 	return null;
 };
 
diff --git a/core/modules/deserializers.js b/core/modules/deserializers.js
index 00815f831..16f5a373f 100644
--- a/core/modules/deserializers.js
+++ b/core/modules/deserializers.js
@@ -72,8 +72,16 @@ exports["application/x-tiddler-html-div"] = function(text,fields) {
 };
 
 exports["application/json"] = function(text,fields) {
-	var incoming = JSON.parse(text),
+	var incoming,
 		results = [];
+	try {
+		incoming = JSON.parse(text);
+	} catch(e) {
+		incoming = [{
+			title: "JSON error: " + e,
+			text: ""
+		}]
+	}
 	if($tw.utils.isArray(incoming)) {
 		for(var t=0; t<incoming.length; t++) {
 			var incomingFields = incoming[t],
diff --git a/core/modules/editor/engines/framed.js b/core/modules/editor/engines/framed.js
new file mode 100644
index 000000000..d4328c509
--- /dev/null
+++ b/core/modules/editor/engines/framed.js
@@ -0,0 +1,206 @@
+/*\
+title: $:/core/modules/editor/engines/framed.js
+type: application/javascript
+module-type: library
+
+Text editor engine based on a simple input or textarea within an iframe. This is done so that the selection is preserved even when clicking away from the textarea
+
+\*/
+(function(){
+
+/*jslint node: true,browser: true */
+/*global $tw: false */
+"use strict";
+
+var HEIGHT_VALUE_TITLE = "$:/config/TextEditor/EditorHeight/Height";
+
+function FramedEngine(options) {
+	// Save our options
+	options = options || {};
+	this.widget = options.widget;
+	this.value = options.value;
+	this.parentNode = options.parentNode;
+	this.nextSibling = options.nextSibling;
+	// Create our hidden dummy text area for reading styles
+	this.dummyTextArea = this.widget.document.createElement("textarea");
+	if(this.widget.editClass) {
+		this.dummyTextArea.className = this.widget.editClass;
+	}
+	this.dummyTextArea.setAttribute("hidden","true");
+	this.parentNode.insertBefore(this.dummyTextArea,this.nextSibling);
+	this.widget.domNodes.push(this.dummyTextArea);
+	// Create the iframe
+	this.iframeNode = this.widget.document.createElement("iframe");
+	this.parentNode.insertBefore(this.iframeNode,this.nextSibling);
+	this.iframeDoc = this.iframeNode.contentWindow.document;
+	// (Firefox requires us to put some empty content in the iframe)
+	this.iframeDoc.open();
+	this.iframeDoc.write("");
+	this.iframeDoc.close();
+	// Style the iframe
+	this.iframeNode.className = this.dummyTextArea.className;
+	this.iframeNode.style.border = "none";
+	this.iframeNode.style.padding = "0";
+	this.iframeNode.style.resize = "none";
+	this.iframeDoc.body.style.margin = "0";
+	this.iframeDoc.body.style.padding = "0";
+	this.widget.domNodes.push(this.iframeNode);
+	// Construct the textarea or input node
+	var tag = this.widget.editTag;
+	if($tw.config.htmlUnsafeElements.indexOf(tag) !== -1) {
+		tag = "input";
+	}
+	this.domNode = this.iframeDoc.createElement(tag);
+	// Set the text
+	if(this.widget.editTag === "textarea") {
+		this.domNode.appendChild(this.iframeDoc.createTextNode(this.value));
+	} else {
+		this.domNode.value = this.value;
+	}
+	// Set the attributes
+	if(this.widget.editType) {
+		this.domNode.setAttribute("type",this.widget.editType);
+	}
+	if(this.widget.editPlaceholder) {
+		this.domNode.setAttribute("placeholder",this.widget.editPlaceholder);
+	}
+	if(this.widget.editSize) {
+		this.domNode.setAttribute("size",this.widget.editSize);
+	}
+	if(this.widget.editRows) {
+		this.domNode.setAttribute("rows",this.widget.editRows);
+	}
+	// Copy the styles from the dummy textarea
+	this.copyStyles();
+	// Add event listeners
+	$tw.utils.addEventListeners(this.domNode,[
+		{name: "input",handlerObject: this,handlerMethod: "handleInputEvent"},
+		{name: "keydown",handlerObject: this.widget,handlerMethod: "handleKeydownEvent"}
+	]);
+	// Insert the element into the DOM
+	this.iframeDoc.body.appendChild(this.domNode);
+}
+
+/*
+Copy styles from the dummy text area to the textarea in the iframe
+*/
+FramedEngine.prototype.copyStyles = function() {
+	// Copy all styles
+	$tw.utils.copyStyles(this.dummyTextArea,this.domNode);
+	// Override the ones that should not be set the same as the dummy textarea
+	this.domNode.style.display = "block";
+	this.domNode.style.width = "100%";
+	this.domNode.style.margin = "0";
+	// In Chrome setting -webkit-text-fill-color overrides the placeholder text colour
+	this.domNode.style["-webkit-text-fill-color"] = "currentcolor";
+};
+
+/*
+Set the text of the engine if it doesn't currently have focus
+*/
+FramedEngine.prototype.setText = function(text,type) {
+	if(!this.domNode.isTiddlyWikiFakeDom) {
+		if(this.domNode.ownerDocument.activeElement !== this.domNode) {
+			this.domNode.value = text;
+		}
+		// Fix the height if needed
+		this.fixHeight();
+	}
+};
+
+/*
+Get the text of the engine
+*/
+FramedEngine.prototype.getText = function() {
+	return this.domNode.value;
+};
+
+/*
+Fix the height of textarea to fit content
+*/
+FramedEngine.prototype.fixHeight = function() {
+	// Make sure styles are updated
+	this.copyStyles();
+	// Adjust height
+	if(this.widget.editTag === "textarea") {
+		if(this.widget.editAutoHeight) {
+			if(this.domNode && !this.domNode.isTiddlyWikiFakeDom) {
+				var newHeight = $tw.utils.resizeTextAreaToFit(this.domNode,this.widget.editMinHeight);
+				this.iframeNode.style.height = (newHeight + 14) + "px"; // +14 for the border on the textarea
+			}
+		} else {
+			var fixedHeight = parseInt(this.widget.wiki.getTiddlerText(HEIGHT_VALUE_TITLE,"400px"),10);
+			fixedHeight = Math.max(fixedHeight,20);
+			this.domNode.style.height = fixedHeight + "px";
+			this.iframeNode.style.height = (fixedHeight + 14) + "px";
+		}
+	}
+};
+
+/*
+Focus the engine node
+*/
+FramedEngine.prototype.focus  = function() {
+	if(this.domNode.focus && this.domNode.select) {
+		this.domNode.focus();
+		this.domNode.select();
+	}
+};
+
+/*
+Handle a dom "input" event which occurs when the text has changed
+*/
+FramedEngine.prototype.handleInputEvent = function(event) {
+	this.widget.saveChanges(this.getText());
+	this.fixHeight();
+	return true;
+};
+
+/*
+Create a blank structure representing a text operation
+*/
+FramedEngine.prototype.createTextOperation = function() {
+	var operation = {
+		text: this.domNode.value,
+		selStart: this.domNode.selectionStart,
+		selEnd: this.domNode.selectionEnd,
+		cutStart: null,
+		cutEnd: null,
+		replacement: null,
+		newSelStart: null,
+		newSelEnd: null
+	};
+	operation.selection = operation.text.substring(operation.selStart,operation.selEnd);
+	return operation;
+};
+
+/*
+Execute a text operation
+*/
+FramedEngine.prototype.executeTextOperation = function(operation) {
+	// Perform the required changes to the text area and the underlying tiddler
+	var newText = operation.text;
+	if(operation.replacement !== null) {
+		newText = operation.text.substring(0,operation.cutStart) + operation.replacement + operation.text.substring(operation.cutEnd);
+		// Attempt to use a execCommand to modify the value of the control
+		if(this.iframeDoc.queryCommandSupported("insertText") && this.iframeDoc.queryCommandSupported("delete") && !$tw.browser.isFirefox) {
+			this.domNode.focus();
+			this.domNode.setSelectionRange(operation.cutStart,operation.cutEnd);
+			if(operation.replacement === "") {
+				this.iframeDoc.execCommand("delete",false,"");
+			} else {
+				this.iframeDoc.execCommand("insertText",false,operation.replacement);
+			}
+		} else {
+			this.domNode.value = newText;
+		}
+		this.domNode.focus();
+		this.domNode.setSelectionRange(operation.newSelStart,operation.newSelEnd);
+	}
+	this.domNode.focus();
+	return newText;
+};
+
+exports.FramedEngine = FramedEngine;
+
+})();
diff --git a/core/modules/editor/engines/simple.js b/core/modules/editor/engines/simple.js
new file mode 100644
index 000000000..900d95276
--- /dev/null
+++ b/core/modules/editor/engines/simple.js
@@ -0,0 +1,148 @@
+/*\
+title: $:/core/modules/editor/engines/simple.js
+type: application/javascript
+module-type: library
+
+Text editor engine based on a simple input or textarea tag
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+var HEIGHT_VALUE_TITLE = "$:/config/TextEditor/EditorHeight/Height";
+
+function SimpleEngine(options) {
+	// Save our options
+	options = options || {};
+	this.widget = options.widget;
+	this.value = options.value;
+	this.parentNode = options.parentNode;
+	this.nextSibling = options.nextSibling;
+	// Construct the textarea or input node
+	var tag = this.widget.editTag;
+	if($tw.config.htmlUnsafeElements.indexOf(tag) !== -1) {
+		tag = "input";
+	}
+	this.domNode = this.widget.document.createElement(tag);
+	// Set the text
+	if(this.widget.editTag === "textarea") {
+		this.domNode.appendChild(this.widget.document.createTextNode(this.value));
+	} else {
+		this.domNode.value = this.value;
+	}
+	// Set the attributes
+	if(this.widget.editType) {
+		this.domNode.setAttribute("type",this.widget.editType);
+	}
+	if(this.widget.editPlaceholder) {
+		this.domNode.setAttribute("placeholder",this.widget.editPlaceholder);
+	}
+	if(this.widget.editSize) {
+		this.domNode.setAttribute("size",this.widget.editSize);
+	}
+	if(this.widget.editRows) {
+		this.domNode.setAttribute("rows",this.widget.editRows);
+	}
+	if(this.widget.editClass) {
+		this.domNode.className = this.widget.editClass;
+	}
+	// Add an input event handler
+	$tw.utils.addEventListeners(this.domNode,[
+		{name: "focus", handlerObject: this, handlerMethod: "handleFocusEvent"},
+		{name: "input", handlerObject: this, handlerMethod: "handleInputEvent"}
+	]);
+	// Insert the element into the DOM
+	this.parentNode.insertBefore(this.domNode,this.nextSibling);
+	this.widget.domNodes.push(this.domNode);
+}
+
+/*
+Set the text of the engine if it doesn't currently have focus
+*/
+SimpleEngine.prototype.setText = function(text,type) {
+	if(!this.domNode.isTiddlyWikiFakeDom) {
+		if(this.domNode.ownerDocument.activeElement !== this.domNode) {
+			this.domNode.value = text;
+		}
+		// Fix the height if needed
+		this.fixHeight();
+	}
+};
+
+/*
+Get the text of the engine
+*/
+SimpleEngine.prototype.getText = function() {
+	return this.domNode.value;
+};
+
+/*
+Fix the height of textarea to fit content
+*/
+SimpleEngine.prototype.fixHeight = function() {
+	if(this.widget.editTag === "textarea") {
+		if(this.widget.editAutoHeight) {
+			if(this.domNode && !this.domNode.isTiddlyWikiFakeDom) {
+				$tw.utils.resizeTextAreaToFit(this.domNode,this.widget.editMinHeight);
+			}
+		} else {
+			var fixedHeight = parseInt(this.widget.wiki.getTiddlerText(HEIGHT_VALUE_TITLE,"400px"),10);
+			fixedHeight = Math.max(fixedHeight,20);
+			this.domNode.style.height = fixedHeight + "px";
+		}
+	}
+};
+
+/*
+Focus the engine node
+*/
+SimpleEngine.prototype.focus  = function() {
+	if(this.domNode.focus && this.domNode.select) {
+		this.domNode.focus();
+		this.domNode.select();
+	}
+};
+
+/*
+Handle a dom "input" event which occurs when the text has changed
+*/
+SimpleEngine.prototype.handleInputEvent = function(event) {
+	this.widget.saveChanges(this.getText());
+	this.fixHeight();
+	return true;
+};
+
+/*
+Handle a dom "focus" event
+*/
+SimpleEngine.prototype.handleFocusEvent = function(event) {
+	if(this.widget.editFocusPopup) {
+		$tw.popup.triggerPopup({
+			domNode: this.domNode,
+			title: this.widget.editFocusPopup,
+			wiki: this.widget.wiki,
+			force: true
+		});
+	}
+	return true;
+};
+
+/*
+Create a blank structure representing a text operation
+*/
+SimpleEngine.prototype.createTextOperation = function() {
+	return null;
+};
+
+/*
+Execute a text operation
+*/
+SimpleEngine.prototype.executeTextOperation = function(operation) {
+};
+
+exports.SimpleEngine = SimpleEngine;
+
+})();
diff --git a/core/modules/editor/factory.js b/core/modules/editor/factory.js
new file mode 100644
index 000000000..baad9ef94
--- /dev/null
+++ b/core/modules/editor/factory.js
@@ -0,0 +1,307 @@
+/*\
+title: $:/core/modules/editor/factory.js
+type: application/javascript
+module-type: library
+
+Factory for constructing text editor widgets with specified engines for the toolbar and non-toolbar cases
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+var DEFAULT_MIN_TEXT_AREA_HEIGHT = "100px"; // Minimum height of textareas in pixels
+
+// Configuration tiddlers
+var HEIGHT_MODE_TITLE = "$:/config/TextEditor/EditorHeight/Mode";
+var ENABLE_TOOLBAR_TITLE = "$:/config/TextEditor/EnableToolbar";
+
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
+
+function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
+
+	var EditTextWidget = function(parseTreeNode,options) {
+		// Initialise the editor operations if they've not been done already
+		if(!this.editorOperations) {
+			EditTextWidget.prototype.editorOperations = {};
+			$tw.modules.applyMethods("texteditoroperation",this.editorOperations);
+		}
+		this.initialise(parseTreeNode,options);
+	};
+
+	/*
+	Inherit from the base widget class
+	*/
+	EditTextWidget.prototype = new Widget();
+
+	/*
+	Render this widget into the DOM
+	*/
+	EditTextWidget.prototype.render = function(parent,nextSibling) {
+		// Save the parent dom node
+		this.parentDomNode = parent;
+		// Compute our attributes
+		this.computeAttributes();
+		// Execute our logic
+		this.execute();
+		// Create the wrapper for the toolbar and render its content
+		if(this.editShowToolbar) {
+			this.toolbarNode = this.document.createElement("div");
+			this.toolbarNode.className = "tc-editor-toolbar";
+			parent.insertBefore(this.toolbarNode,nextSibling);
+			this.renderChildren(this.toolbarNode,null);
+			this.domNodes.push(this.toolbarNode);
+		}
+		// Create our element
+		var editInfo = this.getEditInfo(),
+			Engine = this.editShowToolbar ? toolbarEngine : nonToolbarEngine;
+		this.engine = new Engine({
+				widget: this,
+				value: editInfo.value,
+				type: editInfo.type,
+				parentNode: parent,
+				nextSibling: nextSibling
+			});
+		// Call the postRender hook
+		if(this.postRender) {
+			this.postRender();
+		}
+		// Fix height
+		this.engine.fixHeight();
+		// Focus if required
+		if(this.editFocus === "true" || this.editFocus === "yes") {
+			this.engine.focus();
+		}
+		// Add widget message listeners
+		this.addEventListeners([
+			{type: "tm-edit-text-operation", handler: "handleEditTextOperationMessage"}
+		]);
+	};
+
+	/*
+	Get the tiddler being edited and current value
+	*/
+	EditTextWidget.prototype.getEditInfo = function() {
+		// Get the edit value
+		var self = this,
+			value,
+			type = "text/plain",
+			update;
+		if(this.editIndex) {
+			value = this.wiki.extractTiddlerDataItem(this.editTitle,this.editIndex,this.editDefault);
+			update = function(value) {
+				var data = self.wiki.getTiddlerData(self.editTitle,{});
+				if(data[self.editIndex] !== value) {
+					data[self.editIndex] = value;
+					self.wiki.setTiddlerData(self.editTitle,data);
+				}
+			};
+		} else {
+			// Get the current tiddler and the field name
+			var tiddler = this.wiki.getTiddler(this.editTitle);
+			if(tiddler) {
+				// If we've got a tiddler, the value to display is the field string value
+				value = tiddler.getFieldString(this.editField);
+				if(this.editField === "text") {
+					type = tiddler.fields.type || "text/vnd.tiddlywiki";
+				}
+			} else {
+				// Otherwise, we need to construct a default value for the editor
+				switch(this.editField) {
+					case "text":
+						value = "Type the text for the tiddler '" + this.editTitle + "'";
+						type = "text/vnd.tiddlywiki";
+						break;
+					case "title":
+						value = this.editTitle;
+						break;
+					default:
+						value = "";
+						break;
+				}
+				if(this.editDefault !== undefined) {
+					value = this.editDefault;
+				}
+			}
+			update = function(value) {
+				var tiddler = self.wiki.getTiddler(self.editTitle),
+					updateFields = {
+						title: self.editTitle
+					};
+				updateFields[self.editField] = value;
+				self.wiki.addTiddler(new $tw.Tiddler(self.wiki.getCreationFields(),tiddler,updateFields,self.wiki.getModificationFields()));
+			};
+		}
+		if(this.editType) {
+			type = this.editType;
+		}
+		return {value: value || "", type: type, update: update};
+	};
+
+	/*
+	Handle an edit text operation message from the toolbar
+	*/
+	EditTextWidget.prototype.handleEditTextOperationMessage = function(event) {
+		// Prepare information about the operation
+		var operation = this.engine.createTextOperation();
+		// Invoke the handler for the selected operation
+		var handler = this.editorOperations[event.param];
+		if(handler) {
+			handler.call(this,event,operation);
+		}
+		// Execute the operation via the engine
+		var newText = this.engine.executeTextOperation(operation);
+		// Fix the tiddler height and save changes
+		this.engine.fixHeight();
+		this.saveChanges(newText);
+	};
+
+	/*
+	Compute the internal state of the widget
+	*/
+	EditTextWidget.prototype.execute = function() {
+		// Get our parameters
+		this.editTitle = this.getAttribute("tiddler",this.getVariable("currentTiddler"));
+		this.editField = this.getAttribute("field","text");
+		this.editIndex = this.getAttribute("index");
+		this.editDefault = this.getAttribute("default");
+		this.editClass = this.getAttribute("class");
+		this.editPlaceholder = this.getAttribute("placeholder");
+		this.editSize = this.getAttribute("size");
+		this.editRows = this.getAttribute("rows");
+		this.editAutoHeight = this.wiki.getTiddlerText(HEIGHT_MODE_TITLE,"auto");
+		this.editAutoHeight = this.getAttribute("autoHeight",this.editAutoHeight === "auto" ? "yes" : "no") === "yes";
+		this.editMinHeight = this.getAttribute("minHeight",DEFAULT_MIN_TEXT_AREA_HEIGHT);
+		this.editFocusPopup = this.getAttribute("focusPopup");
+		this.editFocus = this.getAttribute("focus");
+		// Get the default editor element tag and type
+		var tag,type;
+		if(this.editField === "text") {
+			tag = "textarea";
+		} else {
+			tag = "input";
+			var fieldModule = $tw.Tiddler.fieldModules[this.editField];
+			if(fieldModule && fieldModule.editTag) {
+				tag = fieldModule.editTag;
+			}
+			if(fieldModule && fieldModule.editType) {
+				type = fieldModule.editType;
+			}
+			type = type || "text";
+		}
+		// Get the rest of our parameters
+		this.editTag = this.getAttribute("tag",tag);
+		this.editType = this.getAttribute("type",type);
+		// Make the child widgets
+		this.makeChildWidgets();
+		// Determine whether to show the toolbar
+		this.editShowToolbar = this.wiki.getTiddlerText(ENABLE_TOOLBAR_TITLE,"yes");
+		this.editShowToolbar = (this.editShowToolbar === "yes") && !!(this.children && this.children.length > 0);
+	};
+
+	/*
+	Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
+	*/
+	EditTextWidget.prototype.refresh = function(changedTiddlers) {
+		var changedAttributes = this.computeAttributes();
+		// Completely rerender if any of our attributes have changed
+		if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes["default"] || changedAttributes["class"] || changedAttributes.placeholder || changedAttributes.size || changedAttributes.autoHeight || changedAttributes.minHeight || changedAttributes.focusPopup ||  changedAttributes.rows || changedTiddlers[HEIGHT_MODE_TITLE] || changedTiddlers[ENABLE_TOOLBAR_TITLE]) {
+			this.refreshSelf();
+			return true;
+		} else if(changedTiddlers[this.editTitle]) {
+			var editInfo = this.getEditInfo();
+			this.updateEditor(editInfo.value,editInfo.type);
+		}
+		this.engine.fixHeight();
+		if(this.editShowToolbar) {
+			return this.refreshChildren(changedTiddlers);			
+		} else {
+			return false;
+		}
+	};
+
+	/*
+	Update the editor with new text. This method is separate from updateEditorDomNode()
+	so that subclasses can override updateEditor() and still use updateEditorDomNode()
+	*/
+	EditTextWidget.prototype.updateEditor = function(text,type) {
+		this.updateEditorDomNode(text,type);
+	};
+
+	/*
+	Update the editor dom node with new text
+	*/
+	EditTextWidget.prototype.updateEditorDomNode = function(text,type) {
+		this.engine.setText(text,type);
+	};
+
+	/*
+	Save changes back to the tiddler store
+	*/
+	EditTextWidget.prototype.saveChanges = function(text) {
+		var editInfo = this.getEditInfo();
+		if(text !== editInfo.value) {
+			editInfo.update(text);
+		}
+	};
+
+	/*
+	Handle a dom "keydown" event, which we'll bubble up to our container for the keyboard widgets benefit
+	*/
+	EditTextWidget.prototype.handleKeydownEvent = function(event) {
+		// Check for a keyboard shortcut
+		if(this.toolbarNode) {
+			var shortcutElements = this.toolbarNode.querySelectorAll("[data-tw-keyboard-shortcut]");
+			for(var index=0; index<shortcutElements.length; index++) {
+				var el = shortcutElements[index],
+					shortcutData = el.getAttribute("data-tw-keyboard-shortcut"),
+					keyInfoArray = $tw.keyboardManager.parseKeyDescriptors(shortcutData,{
+						wiki: this.wiki
+					});
+				if($tw.keyboardManager.checkKeyDescriptors(event,keyInfoArray)) {
+					var clickEvent = this.document.createEvent("Events");
+				    clickEvent.initEvent("click",true,false);
+				    el.dispatchEvent(clickEvent);
+					event.preventDefault();
+					event.stopPropagation();
+					return true;			
+				}
+			}
+		}
+		// Propogate the event to the container
+		if(this.propogateKeydownEvent(event)) {
+			// Ignore the keydown if it was already handled
+			event.preventDefault();
+			event.stopPropagation();
+			return true;
+		}
+		// Otherwise, process the keydown normally
+		return false;
+	};
+
+	/*
+	Propogate keydown events to our container for the keyboard widgets benefit
+	*/
+	EditTextWidget.prototype.propogateKeydownEvent = function(event) {
+		var newEvent = this.document.createEventObject ? this.document.createEventObject() : this.document.createEvent("Events");
+		if(newEvent.initEvent) {
+			newEvent.initEvent("keydown", true, true);
+		}
+		newEvent.keyCode = event.keyCode;
+		newEvent.which = event.which;
+		newEvent.metaKey = event.metaKey;
+		newEvent.ctrlKey = event.ctrlKey;
+		newEvent.altKey = event.altKey;
+		newEvent.shiftKey = event.shiftKey;
+		return !this.parentDomNode.dispatchEvent(newEvent);
+	};
+
+	return EditTextWidget;
+
+}
+
+exports.editTextWidgetFactory = editTextWidgetFactory;
+
+})();
diff --git a/core/modules/editor/operations/bitmap/clear.js b/core/modules/editor/operations/bitmap/clear.js
new file mode 100644
index 000000000..cb86b43a1
--- /dev/null
+++ b/core/modules/editor/operations/bitmap/clear.js
@@ -0,0 +1,24 @@
+/*\
+title: $:/core/modules/editor/operations/bitmap/clear.js
+type: application/javascript
+module-type: bitmapeditoroperation
+
+Bitmap editor operation to clear the image
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+exports["clear"] = function(event) {
+	var ctx = this.canvasDomNode.getContext("2d");
+	ctx.globalAlpha = 1;
+	ctx.fillStyle = event.paramObject.colour || "white";
+	ctx.fillRect(0,0,this.canvasDomNode.width,this.canvasDomNode.height);
+	// Save changes
+	this.strokeEnd();
+};
+
+})();
diff --git a/core/modules/editor/operations/bitmap/resize.js b/core/modules/editor/operations/bitmap/resize.js
new file mode 100644
index 000000000..12059a5cb
--- /dev/null
+++ b/core/modules/editor/operations/bitmap/resize.js
@@ -0,0 +1,29 @@
+/*\
+title: $:/core/modules/editor/operations/bitmap/resize.js
+type: application/javascript
+module-type: bitmapeditoroperation
+
+Bitmap editor operation to resize the image
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+exports["resize"] = function(event) {
+	// Get the new width
+	var newWidth = parseInt(event.paramObject.width || this.canvasDomNode.width,10),
+		newHeight = parseInt(event.paramObject.height || this.canvasDomNode.height,10);
+	// Update if necessary
+	if(newWidth > 0 && newHeight > 0 && !(newWidth === this.currCanvas.width && newHeight === this.currCanvas.height)) {
+		this.changeCanvasSize(newWidth,newHeight);
+	}
+	// Update the input controls
+	this.refreshToolbar();
+	// Save the image into the tiddler
+	this.saveChanges();
+};
+
+})();
diff --git a/core/modules/editor/operations/text/excise.js b/core/modules/editor/operations/text/excise.js
new file mode 100644
index 000000000..ced771719
--- /dev/null
+++ b/core/modules/editor/operations/text/excise.js
@@ -0,0 +1,49 @@
+/*\
+title: $:/core/modules/editor/operations/text/excise.js
+type: application/javascript
+module-type: texteditoroperation
+
+Text editor operation to excise the selection to a new tiddler
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+exports["excise"] = function(event,operation) {
+	var editTiddler = this.wiki.getTiddler(this.editTitle),
+		editTiddlerTitle = this.editTitle;
+	if(editTiddler && editTiddler.fields["draft.of"]) {
+		editTiddlerTitle = editTiddler.fields["draft.of"];
+	}
+	var excisionTitle = event.paramObject.title || this.wiki.generateNewTitle("New Excision");
+	this.wiki.addTiddler(new $tw.Tiddler(
+		this.wiki.getCreationFields(),
+		this.wiki.getModificationFields(),
+		{
+			title: excisionTitle,
+			text: operation.selection,
+			tags: event.paramObject.tagnew === "yes" ?  [editTiddlerTitle] : []
+		}
+	));
+	operation.replacement = excisionTitle;
+	switch(event.paramObject.type || "transclude") {
+		case "transclude":
+			operation.replacement = "{{" + operation.replacement+ "}}";
+			break;
+		case "link":
+			operation.replacement = "[[" + operation.replacement+ "]]";
+			break;
+		case "macro":
+			operation.replacement = "<<" + (event.paramObject.macro || "translink") + " \"\"\"" + operation.replacement + "\"\"\">>";
+			break;
+	}
+	operation.cutStart = operation.selStart;
+	operation.cutEnd = operation.selEnd;
+	operation.newSelStart = operation.selStart;
+	operation.newSelEnd = operation.selStart + operation.replacement.length;
+};
+
+})();
diff --git a/core/modules/editor/operations/text/make-link.js b/core/modules/editor/operations/text/make-link.js
new file mode 100644
index 000000000..e8caf21c5
--- /dev/null
+++ b/core/modules/editor/operations/text/make-link.js
@@ -0,0 +1,29 @@
+/*\
+title: $:/core/modules/editor/operations/text/make-link.js
+type: application/javascript
+module-type: texteditoroperation
+
+Text editor operation to make a link
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+exports["make-link"] = function(event,operation) {
+	if(operation.selection) {
+		operation.replacement = "[[" + operation.selection + "|" + event.paramObject.text + "]]";
+		operation.cutStart = operation.selStart;
+		operation.cutEnd = operation.selEnd;
+	} else {
+		operation.replacement = "[[" + event.paramObject.text + "]]";
+		operation.cutStart = operation.selStart;
+		operation.cutEnd = operation.selEnd;
+	}
+	operation.newSelStart = operation.selStart + operation.replacement.length;
+	operation.newSelEnd = operation.newSelStart;
+};
+
+})();
diff --git a/core/modules/editor/operations/text/prefix-lines.js b/core/modules/editor/operations/text/prefix-lines.js
new file mode 100644
index 000000000..ad67232fc
--- /dev/null
+++ b/core/modules/editor/operations/text/prefix-lines.js
@@ -0,0 +1,54 @@
+/*\
+title: $:/core/modules/editor/operations/text/prefix-lines.js
+type: application/javascript
+module-type: texteditoroperation
+
+Text editor operation to add a prefix to the selected lines
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+exports["prefix-lines"] = function(event,operation) {
+	// Cut just past the preceding line break, or the start of the text
+	operation.cutStart = $tw.utils.findPrecedingLineBreak(operation.text,operation.selStart);
+	// Cut to just past the following line break, or to the end of the text
+	operation.cutEnd = $tw.utils.findFollowingLineBreak(operation.text,operation.selEnd);
+	// Compose the required prefix
+	var prefix = $tw.utils.repeat(event.paramObject.character,event.paramObject.count);
+	// Process each line
+	var lines = operation.text.substring(operation.cutStart,operation.cutEnd).split(/\r?\n/mg);
+	$tw.utils.each(lines,function(line,index) {
+		// Remove and count any existing prefix characters
+		var count = 0;
+		while(line.charAt(0) === event.paramObject.character) {
+			line = line.substring(1);
+			count++;
+		}
+		// Remove any whitespace
+		while(line.charAt(0) === " ") {
+			line = line.substring(1);
+		}
+		// We're done if we removed the exact required prefix, otherwise add it
+		if(count !== event.paramObject.count) {
+			// Apply the prefix
+			line =  prefix + " " + line;
+		}
+		// Save the modified line
+		lines[index] = line;
+	});
+	// Stitch the replacement text together and set the selection
+	operation.replacement = lines.join("\n");
+	if(lines.length === 1) {
+		operation.newSelStart = operation.cutStart + operation.replacement.length;
+		operation.newSelEnd = operation.newSelStart;
+	} else {
+		operation.newSelStart = operation.cutStart;
+		operation.newSelEnd = operation.newSelStart + operation.replacement.length;
+	}
+};
+
+})();
diff --git a/core/modules/editor/operations/text/replace-all.js b/core/modules/editor/operations/text/replace-all.js
new file mode 100644
index 000000000..fc1541935
--- /dev/null
+++ b/core/modules/editor/operations/text/replace-all.js
@@ -0,0 +1,23 @@
+/*\
+title: $:/core/modules/editor/operations/text/replace-all.js
+type: application/javascript
+module-type: texteditoroperation
+
+Text editor operation to replace the entire text
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+exports["replace-all"] = function(event,operation) {
+	operation.cutStart = 0;
+	operation.cutEnd = operation.text.length;
+	operation.replacement = event.paramObject.text;
+	operation.newSelStart = 0;
+	operation.newSelEnd = operation.replacement.length;
+};
+
+})();
diff --git a/core/modules/editor/operations/text/replace-selection.js b/core/modules/editor/operations/text/replace-selection.js
new file mode 100644
index 000000000..740a41fb1
--- /dev/null
+++ b/core/modules/editor/operations/text/replace-selection.js
@@ -0,0 +1,23 @@
+/*\
+title: $:/core/modules/editor/operations/text/replace-selection.js
+type: application/javascript
+module-type: texteditoroperation
+
+Text editor operation to replace the selection
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+exports["replace-selection"] = function(event,operation) {
+	operation.replacement = event.paramObject.text;
+	operation.cutStart = operation.selStart;
+	operation.cutEnd = operation.selEnd;
+	operation.newSelStart = operation.selStart;
+	operation.newSelEnd = operation.selStart + operation.replacement.length;
+};
+
+})();
diff --git a/core/modules/editor/operations/text/wrap-lines.js b/core/modules/editor/operations/text/wrap-lines.js
new file mode 100644
index 000000000..521811f50
--- /dev/null
+++ b/core/modules/editor/operations/text/wrap-lines.js
@@ -0,0 +1,28 @@
+/*\
+title: $:/core/modules/editor/operations/text/wrap-lines.js
+type: application/javascript
+module-type: texteditoroperation
+
+Text editor operation to wrap the selected lines with a prefix and suffix
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+exports["wrap-lines"] = function(event,operation) {
+	// Cut just past the preceding line break, or the start of the text
+	operation.cutStart = $tw.utils.findPrecedingLineBreak(operation.text,operation.selStart);
+	// Cut to just past the following line break, or to the end of the text
+	operation.cutEnd = $tw.utils.findFollowingLineBreak(operation.text,operation.selEnd);
+	// Add the prefix and suffix
+	operation.replacement = event.paramObject.prefix + "\n" +
+				operation.text.substring(operation.cutStart,operation.cutEnd) + "\n" +
+				event.paramObject.suffix + "\n";
+	operation.newSelStart = operation.cutStart + event.paramObject.prefix.length + 1;
+	operation.newSelEnd = operation.newSelStart + (operation.cutEnd - operation.cutStart);
+};
+
+})();
diff --git a/core/modules/editor/operations/text/wrap-selection.js b/core/modules/editor/operations/text/wrap-selection.js
new file mode 100644
index 000000000..30e41e841
--- /dev/null
+++ b/core/modules/editor/operations/text/wrap-selection.js
@@ -0,0 +1,52 @@
+/*\
+title: $:/core/modules/editor/operations/text/wrap-selection.js
+type: application/javascript
+module-type: texteditoroperation
+
+Text editor operation to wrap the selection with the specified prefix and suffix
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+exports["wrap-selection"] = function(event,operation) {
+	if(operation.selStart === operation.selEnd) {
+		// No selection; check if we're within the prefix/suffix
+		if(operation.text.substring(operation.selStart - event.paramObject.prefix.length,operation.selStart + event.paramObject.suffix.length) === event.paramObject.prefix + event.paramObject.suffix) {
+			// Remove the prefix and suffix unless they comprise the entire text
+			if(operation.selStart > event.paramObject.prefix.length || (operation.selEnd + event.paramObject.suffix.length) < operation.text.length ) {
+				operation.cutStart = operation.selStart - event.paramObject.prefix.length;
+				operation.cutEnd = operation.selEnd + event.paramObject.suffix.length;
+				operation.replacement = "";
+				operation.newSelStart = operation.cutStart;
+				operation.newSelEnd = operation.newSelStart;
+			}
+		} else {
+			// Wrap the cursor instead
+			operation.cutStart = operation.selStart;
+			operation.cutEnd = operation.selEnd;
+			operation.replacement = event.paramObject.prefix + event.paramObject.suffix;
+			operation.newSelStart = operation.selStart + event.paramObject.prefix.length;
+			operation.newSelEnd = operation.newSelStart;
+		}
+	} else if(operation.text.substring(operation.selStart,operation.selStart + event.paramObject.prefix.length) === event.paramObject.prefix && operation.text.substring(operation.selEnd - event.paramObject.suffix.length,operation.selEnd) === event.paramObject.suffix) {
+		// Prefix and suffix are already present, so remove them
+		operation.cutStart = operation.selStart;
+		operation.cutEnd = operation.selEnd;
+		operation.replacement = operation.selection.substring(event.paramObject.prefix.length,operation.selection.length - event.paramObject.suffix.length);
+		operation.newSelStart = operation.selStart;
+		operation.newSelEnd = operation.selStart + operation.replacement.length;
+	} else {
+		// Add the prefix and suffix
+		operation.cutStart = operation.selStart;
+		operation.cutEnd = operation.selEnd;
+		operation.replacement = event.paramObject.prefix + operation.selection + event.paramObject.suffix;
+		operation.newSelStart = operation.selStart;
+		operation.newSelEnd = operation.selStart + operation.replacement.length;
+	}
+};
+
+})();
diff --git a/core/modules/filters.js b/core/modules/filters.js
index 8fbcac587..76046b828 100644
--- a/core/modules/filters.js
+++ b/core/modules/filters.js
@@ -20,7 +20,7 @@ Parses an operation (i.e. a run) within a filter string
 Returns the new start position, after the parsed operation
 */
 function parseFilterOperation(operators,filterString,p) {
-	var operator, operand, bracketPos, curlyBracketPos;
+	var nextBracketPos, operator;
 	// Skip the starting square bracket
 	if(filterString.charAt(p++) !== "[") {
 		throw "Missing [ in filter expression";
@@ -33,14 +33,14 @@ function parseFilterOperation(operators,filterString,p) {
 			operator.prefix = filterString.charAt(p++);
 		}
 		// Get the operator name
-		var nextBracketPos = filterString.substring(p).search(/[\[\{<\/]/);
+		nextBracketPos = filterString.substring(p).search(/[\[\{<\/]/);
 		if(nextBracketPos === -1) {
 			throw "Missing [ in filter expression";
 		}
 		nextBracketPos += p;
 		var bracket = filterString.charAt(nextBracketPos);
 		operator.operator = filterString.substring(p,nextBracketPos);
-		
+
 		// Any suffix?
 		var colon = operator.operator.indexOf(':');
 		if(colon > -1) {
@@ -79,7 +79,7 @@ console.log("WARNING: Filter",operator.operator,"has a deprecated regexp operand
 				}
 				break;
 		}
-		
+
 		if(nextBracketPos === -1) {
 			throw "Missing closing bracket in filter expression";
 		}
@@ -87,7 +87,7 @@ console.log("WARNING: Filter",operator.operator,"has a deprecated regexp operand
 			operator.operand = filterString.substring(p,nextBracketPos);
 		}
 		p = nextBracketPos + 1;
-			
+
 		// Push this operator
 		operators.push(operator);
 	} while(filterString.charAt(p) !== "]");
@@ -121,7 +121,7 @@ exports.parseFilter = function(filterString) {
 			operandRegExp.lastIndex = p;
 			match = operandRegExp.exec(filterString);
 			if(!match || match.index !== p) {
-				throw "Syntax error in filter expression";
+				throw $tw.language.getString("Error/FilterSyntax");
 			}
 			var operation = {
 				prefix: "",
@@ -171,7 +171,7 @@ exports.compileFilter = function(filterString) {
 		filterParseTree = this.parseFilter(filterString);
 	} catch(e) {
 		return function(source,widget) {
-			return ["Filter error: " + e];
+			return [$tw.language.getString("Error/Filter") + ": " + e];
 		};
 	}
 	// Get the hashmap of filter operator functions
diff --git a/core/modules/filters/days.js b/core/modules/filters/days.js
index 39cd375f7..318d72567 100644
--- a/core/modules/filters/days.js
+++ b/core/modules/filters/days.js
@@ -27,6 +27,7 @@ exports.days = function(source,operator,options) {
 		};
 
 	if(operator.prefix === "!") {
+		targetTimeStamp = targetTimeStamp - 1000*60*60*24*dayIntervalSign;
 		source(function(tiddler,title) {
 			if(tiddler && tiddler.fields[fieldName]) {
 				if(!isWithinDays($tw.utils.parseDate(tiddler.fields[fieldName]))) {
diff --git a/core/modules/filters/encodings.js b/core/modules/filters/encodings.js
new file mode 100644
index 000000000..24c44aaa3
--- /dev/null
+++ b/core/modules/filters/encodings.js
@@ -0,0 +1,83 @@
+/*\
+title: $:/core/modules/filters/decodeuricomponent.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operator for applying decodeURIComponent() to each item.
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Export our filter functions
+*/
+
+exports.decodeuricomponent = function(source,operator,options) {
+	var results = [];
+	source(function(tiddler,title) {
+		results.push(decodeURIComponent(title));
+	});
+	return results;
+};
+
+exports.encodeuricomponent = function(source,operator,options) {
+	var results = [];
+	source(function(tiddler,title) {
+		results.push(encodeURIComponent(title));
+	});
+	return results;
+};
+
+exports.decodeuri = function(source,operator,options) {
+	var results = [];
+	source(function(tiddler,title) {
+		results.push(decodeURI(title));
+	});
+	return results;
+};
+
+exports.encodeuri = function(source,operator,options) {
+	var results = [];
+	source(function(tiddler,title) {
+		results.push(encodeURI(title));
+	});
+	return results;
+};
+
+exports.decodehtml = function(source,operator,options) {
+	var results = [];
+	source(function(tiddler,title) {
+		results.push($tw.utils.htmlDecode(title));
+	});
+	return results;
+};
+
+exports.encodehtml = function(source,operator,options) {
+	var results = [];
+	source(function(tiddler,title) {
+		results.push($tw.utils.htmlEncode(title));
+	});
+	return results;
+};
+
+exports.stringify = function(source,operator,options) {
+	var results = [];
+	source(function(tiddler,title) {
+		results.push($tw.utils.stringify(title));
+	});
+	return results;
+};
+
+exports.escaperegexp = function(source,operator,options) {
+	var results = [];
+	source(function(tiddler,title) {
+		results.push($tw.utils.escapeRegExp(title));
+	});
+	return results;
+};
+
+})();
diff --git a/core/modules/filters/has.js b/core/modules/filters/has.js
index 9a82f3111..7a1738782 100644
--- a/core/modules/filters/has.js
+++ b/core/modules/filters/has.js
@@ -25,7 +25,7 @@ exports.has = function(source,operator,options) {
 		});
 	} else {
 		source(function(tiddler,title) {
-			if(tiddler && $tw.utils.hop(tiddler.fields,operator.operand) && tiddler.fields[operator.operand] !== "") {
+			if(tiddler && $tw.utils.hop(tiddler.fields,operator.operand) && !(tiddler.fields[operator.operand] === "" || tiddler.fields[operator.operand].length === 0)) {
 				results.push(title);
 			}
 		});
diff --git a/core/modules/filters/is.js b/core/modules/filters/is.js
index d27d00907..0db243044 100644
--- a/core/modules/filters/is.js
+++ b/core/modules/filters/is.js
@@ -32,7 +32,7 @@ exports.is = function(source,operator,options) {
 	if(isFilterOperator) {
 		return isFilterOperator(source,operator.prefix,options);
 	} else {
-		return ["Filter Error: Unknown operand for the 'is' filter operator"];
+		return [$tw.language.getString("Error/IsFilterOperator")];
 	}
 };
 
diff --git a/core/modules/filters/minlength.js b/core/modules/filters/minlength.js
new file mode 100644
index 000000000..d4e679bef
--- /dev/null
+++ b/core/modules/filters/minlength.js
@@ -0,0 +1,29 @@
+/*\
+title: $:/core/modules/filters/minlength.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operator for filtering out titles that don't meet the minimum length in the operand
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Export our filter function
+*/
+exports.minlength = function(source,operator,options) {
+	var results = [],
+		minLength = parseInt(operator.operand || "",10) || 0;
+	source(function(tiddler,title) {
+		if(title.length >= minLength) {
+			results.push(title);
+		}
+	});
+	return results;
+};
+
+})();
diff --git a/core/modules/filters/wikiparserrules.js b/core/modules/filters/wikiparserrules.js
index ee57113c8..213298515 100644
--- a/core/modules/filters/wikiparserrules.js
+++ b/core/modules/filters/wikiparserrules.js
@@ -16,10 +16,11 @@ Filter operator for returning the names of the wiki parser rules in this wiki
 Export our filter function
 */
 exports.wikiparserrules = function(source,operator,options) {
-	var results = [];
+	var results = [],
+		operand = operator.operand;
 	$tw.utils.each($tw.modules.types.wikirule,function(mod) {
 		var exp = mod.exports;
-		if(exp.types[operator.operand]) {
+		if(!operand || exp.types[operand]) {
 			results.push(exp.name);
 		}
 	});
diff --git a/core/modules/info/platform.js b/core/modules/info/platform.js
index 9f6097f74..c30f5b83c 100644
--- a/core/modules/info/platform.js
+++ b/core/modules/info/platform.js
@@ -18,6 +18,21 @@ exports.getInfoTiddlerFields = function() {
 	// Basics
 	infoTiddlerFields.push({title: "$:/info/browser", text: mapBoolean(!!$tw.browser)});
 	infoTiddlerFields.push({title: "$:/info/node", text: mapBoolean(!!$tw.node)});
+	// Document location
+	if($tw.browser) {
+		var setLocationProperty = function(name,value) {
+				infoTiddlerFields.push({title: "$:/info/url/" + name, text: value});			
+			},
+			location = document.location;
+		setLocationProperty("full", (location.toString()).split("#")[0]);
+		setLocationProperty("host", location.host);
+		setLocationProperty("hostname", location.hostname);
+		setLocationProperty("protocol", location.protocol);
+		setLocationProperty("port", location.port);
+		setLocationProperty("pathname", location.pathname);
+		setLocationProperty("search", location.search);
+		setLocationProperty("origin", location.origin);
+	}
 	return infoTiddlerFields;
 };
 
diff --git a/core/modules/keyboard.js b/core/modules/keyboard.js
new file mode 100644
index 000000000..bfa76d7e2
--- /dev/null
+++ b/core/modules/keyboard.js
@@ -0,0 +1,279 @@
+/*\
+title: $:/core/modules/keyboard.js
+type: application/javascript
+module-type: global
+
+Keyboard handling utilities
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+var namedKeys = {
+	"cancel": 3,
+	"help": 6,
+	"backspace": 8,
+	"tab": 9,
+	"clear": 12,
+	"return": 13,
+	"enter": 13,
+	"pause": 19,
+	"escape": 27,
+	"space": 32,
+	"page_up": 33,
+	"page_down": 34,
+	"end": 35,
+	"home": 36,
+	"left": 37,
+	"up": 38,
+	"right": 39,
+	"down": 40,
+	"printscreen": 44,
+	"insert": 45,
+	"delete": 46,
+	"0": 48,
+	"1": 49,
+	"2": 50,
+	"3": 51,
+	"4": 52,
+	"5": 53,
+	"6": 54,
+	"7": 55,
+	"8": 56,
+	"9": 57,
+	"firefoxsemicolon": 59,
+	"firefoxequals": 61,
+	"a": 65,
+	"b": 66,
+	"c": 67,
+	"d": 68,
+	"e": 69,
+	"f": 70,
+	"g": 71,
+	"h": 72,
+	"i": 73,
+	"j": 74,
+	"k": 75,
+	"l": 76,
+	"m": 77,
+	"n": 78,
+	"o": 79,
+	"p": 80,
+	"q": 81,
+	"r": 82,
+	"s": 83,
+	"t": 84,
+	"u": 85,
+	"v": 86,
+	"w": 87,
+	"x": 88,
+	"y": 89,
+	"z": 90,
+	"numpad0": 96,
+	"numpad1": 97,
+	"numpad2": 98,
+	"numpad3": 99,
+	"numpad4": 100,
+	"numpad5": 101,
+	"numpad6": 102,
+	"numpad7": 103,
+	"numpad8": 104,
+	"numpad9": 105,
+	"multiply": 106,
+	"add": 107,
+	"separator": 108,
+	"subtract": 109,
+	"decimal": 110,
+	"divide": 111,
+	"f1": 112,
+	"f2": 113,
+	"f3": 114,
+	"f4": 115,
+	"f5": 116,
+	"f6": 117,
+	"f7": 118,
+	"f8": 119,
+	"f9": 120,
+	"f10": 121,
+	"f11": 122,
+	"f12": 123,
+	"f13": 124,
+	"f14": 125,
+	"f15": 126,
+	"f16": 127,
+	"f17": 128,
+	"f18": 129,
+	"f19": 130,
+	"f20": 131,
+	"f21": 132,
+	"f22": 133,
+	"f23": 134,
+	"f24": 135,
+	"firefoxminus": 173,
+	"semicolon": 186,
+	"equals": 187,
+	"comma": 188,
+	"dash": 189,
+	"period": 190,
+	"slash": 191,
+	"backquote": 192,
+	"openbracket": 219,
+	"backslash": 220,
+	"closebracket": 221,
+	"quote": 222
+};
+
+function KeyboardManager(options) {
+	var self = this;
+	options = options || "";
+	// Save the named key hashmap
+	this.namedKeys = namedKeys;
+	// Create a reverse mapping of code to keyname
+	this.keyNames = [];
+	$tw.utils.each(namedKeys,function(keyCode,name) {
+		self.keyNames[keyCode] = name.substr(0,1).toUpperCase() + name.substr(1);
+	});
+	// Save the platform-specific name of the "meta" key
+	this.metaKeyName = $tw.platform.isMac ? "cmd-" : "win-";
+}
+
+/*
+Return an array of keycodes for the modifier keys ctrl, shift, alt, meta
+*/
+KeyboardManager.prototype.getModifierKeys = function() {
+	return [
+		16, // Shift
+		17, // Ctrl
+		18, // Alt
+		20, // CAPS LOCK
+		91, // Meta (left)
+		93, // Meta (right)
+		224 // Meta (Firefox)
+	]
+};
+
+/*
+Parses a key descriptor into the structure:
+{
+	keyCode: numeric keycode
+	shiftKey: boolean
+	altKey: boolean
+	ctrlKey: boolean
+	metaKey: boolean
+}
+Key descriptors have the following format:
+	ctrl+enter
+	ctrl+shift+alt+A
+*/
+KeyboardManager.prototype.parseKeyDescriptor = function(keyDescriptor) {
+	var components = keyDescriptor.split(/\+|\-/),
+		info = {
+			keyCode: 0,
+			shiftKey: false,
+			altKey: false,
+			ctrlKey: false,
+			metaKey: false
+		};
+	for(var t=0; t<components.length; t++) {
+		var s = components[t].toLowerCase(),
+			c = s.charCodeAt(0);
+		// Look for modifier keys
+		if(s === "ctrl") {
+			info.ctrlKey = true;
+		} else if(s === "shift") {
+			info.shiftKey = true;
+		} else if(s === "alt") {
+			info.altKey = true;
+		} else if(s === "meta" || s === "cmd" || s === "win") {
+			info.metaKey = true;
+		}
+		// Replace named keys with their code
+		if(this.namedKeys[s]) {
+			info.keyCode = this.namedKeys[s];
+		}
+	}
+	if(info.keyCode) {
+		return info;
+	} else {
+		return null;
+	}
+};
+
+/*
+Parse a list of key descriptors into an array of keyInfo objects. The key descriptors can be passed as an array of strings or a space separated string
+*/
+KeyboardManager.prototype.parseKeyDescriptors = function(keyDescriptors,options) {
+	var self = this;
+	options = options || {};
+	options.stack = options.stack || [];
+	var wiki = options.wiki || $tw.wiki;
+	if(typeof keyDescriptors === "string" && keyDescriptors === "") {
+		return [];
+	}
+	if(!$tw.utils.isArray(keyDescriptors)) {
+		keyDescriptors = keyDescriptors.split(" ");
+	}
+	var result = [];
+	$tw.utils.each(keyDescriptors,function(keyDescriptor) {
+		// Look for a named shortcut
+		if(keyDescriptor.substr(0,2) === "((" && keyDescriptor.substr(-2,2) === "))") {
+			if(options.stack.indexOf(keyDescriptor) === -1) {
+				options.stack.push(keyDescriptor);
+				var name = keyDescriptor.substring(2,keyDescriptor.length - 2),
+					lookupName = function(configName) {
+						var keyDescriptors = wiki.getTiddlerText("$:/config/" + configName + "/" + name);
+						if(keyDescriptors) {
+							result.push.apply(result,self.parseKeyDescriptors(keyDescriptors,options));
+						}
+					};
+				lookupName("shortcuts");
+				lookupName($tw.platform.isMac ? "shortcuts-mac" : "shortcuts-not-mac");
+				lookupName($tw.platform.isWindows ? "shortcuts-windows" : "shortcuts-not-windows");
+				lookupName($tw.platform.isLinux ? "shortcuts-linux" : "shortcuts-not-linux");
+			}
+		} else {
+			result.push(self.parseKeyDescriptor(keyDescriptor));
+		}
+	});
+	return result;
+};
+
+KeyboardManager.prototype.getPrintableShortcuts = function(keyInfoArray) {
+	var self = this,
+		result = [];
+	$tw.utils.each(keyInfoArray,function(keyInfo) {
+		if(keyInfo) {
+			result.push((keyInfo.ctrlKey ? "ctrl-" : "") + 
+				   (keyInfo.shiftKey ? "shift-" : "") + 
+				   (keyInfo.altKey ? "alt-" : "") + 
+				   (keyInfo.metaKey ? self.metaKeyName : "") + 
+				   (self.keyNames[keyInfo.keyCode]));
+		}
+	});
+	return result;
+}
+
+KeyboardManager.prototype.checkKeyDescriptor = function(event,keyInfo) {
+	return keyInfo &&
+			event.keyCode === keyInfo.keyCode && 
+			event.shiftKey === keyInfo.shiftKey && 
+			event.altKey === keyInfo.altKey && 
+			event.ctrlKey === keyInfo.ctrlKey && 
+			event.metaKey === keyInfo.metaKey;
+};
+
+KeyboardManager.prototype.checkKeyDescriptors = function(event,keyInfoArray) {
+	for(var t=0; t<keyInfoArray.length; t++) {
+		if(this.checkKeyDescriptor(event,keyInfoArray[t])) {
+			return true;
+		}
+	}
+	return false;
+};
+
+exports.KeyboardManager = KeyboardManager;
+
+})();
diff --git a/core/modules/macros/displayshortcuts.js b/core/modules/macros/displayshortcuts.js
new file mode 100644
index 000000000..b18297238
--- /dev/null
+++ b/core/modules/macros/displayshortcuts.js
@@ -0,0 +1,45 @@
+/*\
+title: $:/core/modules/macros/displayshortcuts.js
+type: application/javascript
+module-type: macro
+
+Macro to display a list of keyboard shortcuts in human readable form. Notably, it resolves named shortcuts like `((bold))` to the underlying keystrokes.
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Information about this macro
+*/
+
+exports.name = "displayshortcuts";
+
+exports.params = [
+	{name: "shortcuts"},
+	{name: "prefix"},
+	{name: "separator"},
+	{name: "suffix"}
+];
+
+/*
+Run the macro
+*/
+exports.run = function(shortcuts,prefix,separator,suffix) {
+	var shortcutArray = $tw.keyboardManager.getPrintableShortcuts($tw.keyboardManager.parseKeyDescriptors(shortcuts,{
+		wiki: this.wiki
+	}));
+	if(shortcutArray.length > 0) {
+		shortcutArray.sort(function(a,b) {
+		    return a.toLowerCase().localeCompare(b.toLowerCase());
+		})
+		return prefix + shortcutArray.join(separator) + suffix;
+	} else {
+		return "";
+	}
+};
+
+})();
diff --git a/core/modules/macros/makedatauri.js b/core/modules/macros/makedatauri.js
index 4b578f466..a7474bdf0 100644
--- a/core/modules/macros/makedatauri.js
+++ b/core/modules/macros/makedatauri.js
@@ -3,7 +3,7 @@ title: $:/core/modules/macros/makedatauri.js
 type: application/javascript
 module-type: macro
 
-Macro to convert the content of a tiddler to a data URI
+Macro to convert a string of text to a data URI
 
 <<makedatauri text:"Text to be converted" type:"text/vnd.tiddlywiki">>
 
diff --git a/core/modules/parsers/htmlparser.js b/core/modules/parsers/htmlparser.js
index b2528e961..39b0c21df 100644
--- a/core/modules/parsers/htmlparser.js
+++ b/core/modules/parsers/htmlparser.js
@@ -24,7 +24,7 @@ var HtmlParser = function(type,text,options) {
 		tag: "iframe",
 		attributes: {
 			src: {type: "string", value: src},
-			sandbox: {type: "string", value: "sandbox"}
+			sandbox: {type: "string", value: ""}
 		}
 	}];
 };
diff --git a/core/modules/parsers/parseutils.js b/core/modules/parsers/parseutils.js
index 97c994050..0d74355f7 100644
--- a/core/modules/parsers/parseutils.js
+++ b/core/modules/parsers/parseutils.js
@@ -218,6 +218,7 @@ exports.parseAttribute = function(source,pos) {
 	// Define our regexps
 	var reAttributeName = /([^\/\s>"'=]+)/g,
 		reUnquotedAttribute = /([^\/\s<>"'=]+)/g,
+		reFilteredValue = /\{\{\{(.+?)\}\}\}/g,
 		reIndirectValue = /\{\{([^\}]+)\}\}/g;
 	// Skip whitespace
 	pos = $tw.utils.skipWhiteSpace(source,pos);
@@ -243,29 +244,37 @@ exports.parseAttribute = function(source,pos) {
 			node.type = "string";
 			node.value = stringLiteral.value;
 		} else {
-			// Look for an indirect value
-			var indirectValue = $tw.utils.parseTokenRegExp(source,pos,reIndirectValue);
-			if(indirectValue) {
-				pos = indirectValue.end;
-				node.type = "indirect";
-				node.textReference = indirectValue.match[1];
+			// Look for a filtered value
+			var filteredValue = $tw.utils.parseTokenRegExp(source,pos,reFilteredValue);
+			if(filteredValue) {
+				pos = filteredValue.end;
+				node.type = "filtered";
+				node.filter = filteredValue.match[1];
 			} else {
-				// Look for a unquoted value
-				var unquotedValue = $tw.utils.parseTokenRegExp(source,pos,reUnquotedAttribute);
-				if(unquotedValue) {
-					pos = unquotedValue.end;
-					node.type = "string";
-					node.value = unquotedValue.match[1];
+				// Look for an indirect value
+				var indirectValue = $tw.utils.parseTokenRegExp(source,pos,reIndirectValue);
+				if(indirectValue) {
+					pos = indirectValue.end;
+					node.type = "indirect";
+					node.textReference = indirectValue.match[1];
 				} else {
-					// Look for a macro invocation value
-					var macroInvocation = $tw.utils.parseMacroInvocation(source,pos);
-					if(macroInvocation) {
-						pos = macroInvocation.end;
-						node.type = "macro";
-						node.value = macroInvocation;
-					} else {
+					// Look for a unquoted value
+					var unquotedValue = $tw.utils.parseTokenRegExp(source,pos,reUnquotedAttribute);
+					if(unquotedValue) {
+						pos = unquotedValue.end;
 						node.type = "string";
-						node.value = "true";
+						node.value = unquotedValue.match[1];
+					} else {
+						// Look for a macro invocation value
+						var macroInvocation = $tw.utils.parseMacroInvocation(source,pos);
+						if(macroInvocation) {
+							pos = macroInvocation.end;
+							node.type = "macro";
+							node.value = macroInvocation;
+						} else {
+							node.type = "string";
+							node.value = "true";
+						}
 					}
 				}
 			}
diff --git a/core/modules/parsers/wikiparser/rules/extlink.js b/core/modules/parsers/wikiparser/rules/extlink.js
index 539d0f11b..07ddbfb88 100644
--- a/core/modules/parsers/wikiparser/rules/extlink.js
+++ b/core/modules/parsers/wikiparser/rules/extlink.js
@@ -26,7 +26,7 @@ exports.types = {inline: true};
 exports.init = function(parser) {
 	this.parser = parser;
 	// Regexp to match
-	this.matchRegExp = /~?(?:file|http|https|mailto|ftp|irc|news|data|skype):[^\s<>{}\[\]`|'"\\^~]+(?:\/|\b)/mg;
+	this.matchRegExp = /~?(?:file|http|https|mailto|ftp|irc|news|data|skype):[^\s<>{}\[\]`|"\\^]+(?:\/|\b)/mg;
 };
 
 exports.parse = function() {
@@ -42,7 +42,8 @@ exports.parse = function() {
 			attributes: {
 				href: {type: "string", value: this.match[0]},
 				"class": {type: "string", value: "tc-tiddlylink-external"},
-				target: {type: "string", value: "_blank"}
+				target: {type: "string", value: "_blank"},
+				rel: {type: "string", value: "noopener noreferrer"}
 			},
 			children: [{
 				type: "text", text: this.match[0]
diff --git a/core/modules/parsers/wikiparser/rules/html.js b/core/modules/parsers/wikiparser/rules/html.js
index 71cdfd5dc..dd1ea4540 100644
--- a/core/modules/parsers/wikiparser/rules/html.js
+++ b/core/modules/parsers/wikiparser/rules/html.js
@@ -101,6 +101,10 @@ exports.parseTag = function(source,pos,options) {
 		node.type = node.tag.substr(1);
 	}
 	pos = token.end;
+	// Check that the tag is terminated by a space, / or >
+	if(!$tw.utils.parseWhiteSpace(source,pos) && !(source.charAt(pos) === "/") && !(source.charAt(pos) === ">") ) {
+		return null;
+	}
 	// Process attributes
 	var attribute = $tw.utils.parseAttribute(source,pos);
 	while(attribute) {
diff --git a/core/modules/parsers/wikiparser/rules/macrodef.js b/core/modules/parsers/wikiparser/rules/macrodef.js
index 1a0f34e01..daf854cab 100644
--- a/core/modules/parsers/wikiparser/rules/macrodef.js
+++ b/core/modules/parsers/wikiparser/rules/macrodef.js
@@ -61,7 +61,7 @@ exports.parse = function() {
 		reEnd = /(\r?\n\\end[^\S\n\r]*(?:$|\r?\n))/mg;
 	} else {
 		// Otherwise, the end of the definition is marked by the end of the line
-		reEnd = /(\r?\n)/mg;
+		reEnd = /($|\r?\n)/mg;
 		// Move past any whitespace
 		this.parser.pos = $tw.utils.skipWhiteSpace(this.parser.source,this.parser.pos);
 	}
diff --git a/core/modules/parsers/wikiparser/rules/prettyextlink.js b/core/modules/parsers/wikiparser/rules/prettyextlink.js
index 45bcbbf43..19b4f725b 100644
--- a/core/modules/parsers/wikiparser/rules/prettyextlink.js
+++ b/core/modules/parsers/wikiparser/rules/prettyextlink.js
@@ -106,6 +106,7 @@ exports.parseLink = function(source,pos) {
 	}
 	node.attributes.href = {type: "string", value: URL};
 	node.attributes.target = {type: "string", value: "_blank"};
+	node.attributes.rel = {type: "string", value: "noopener noreferrer"};
 	// Update the end position
 	node.end = closePos + 2;
 	return node;
diff --git a/core/modules/parsers/wikiparser/rules/prettylink.js b/core/modules/parsers/wikiparser/rules/prettylink.js
index 33841f116..56a2850a3 100644
--- a/core/modules/parsers/wikiparser/rules/prettylink.js
+++ b/core/modules/parsers/wikiparser/rules/prettylink.js
@@ -40,7 +40,8 @@ exports.parse = function() {
 			attributes: {
 				href: {type: "string", value: link},
 				"class": {type: "string", value: "tc-tiddlylink-external"},
-				target: {type: "string", value: "_blank"}
+				target: {type: "string", value: "_blank"},
+				rel: {type: "string", value: "noopener noreferrer"}
 			},
 			children: [{
 				type: "text", text: text
diff --git a/core/modules/parsers/wikiparser/rules/syslink.js b/core/modules/parsers/wikiparser/rules/syslink.js
index 441fe2aa5..6eb2cdcd4 100644
--- a/core/modules/parsers/wikiparser/rules/syslink.js
+++ b/core/modules/parsers/wikiparser/rules/syslink.js
@@ -18,7 +18,12 @@ exports.types = {inline: true};
 exports.init = function(parser) {
 	this.parser = parser;
 	// Regexp to match
-	this.matchRegExp = /~?\$:\/[a-zA-Z0-9/.\-_]+/mg;
+	this.matchRegExp = new RegExp(
+		"~?\\$:\\/[" +
+		$tw.config.textPrimitives.anyLetter.substr(1,$tw.config.textPrimitives.anyLetter.length - 2) +
+		"\/._-]+",
+		"mg"
+	);
 };
 
 exports.parse = function() {
diff --git a/core/modules/parsers/wikiparser/wikiparser.js b/core/modules/parsers/wikiparser/wikiparser.js
index 736e2dbdf..2a55399dd 100644
--- a/core/modules/parsers/wikiparser/wikiparser.js
+++ b/core/modules/parsers/wikiparser/wikiparser.js
@@ -16,6 +16,7 @@ Attributes are stored as hashmaps of the following objects:
 
 	{type: "string", value: <string>} - literal string
 	{type: "indirect", textReference: <textReference>} - indirect through a text reference
+	{type: "macro", macro: <TBD>} - indirect through a macro invocation
 
 \*/
 (function(){
diff --git a/core/modules/pluginswitcher.js b/core/modules/pluginswitcher.js
index 9c05d375f..ab82be933 100644
--- a/core/modules/pluginswitcher.js
+++ b/core/modules/pluginswitcher.js
@@ -18,12 +18,14 @@ wiki: wiki store to be used
 pluginType: type of plugin to be switched
 controllerTitle: title of tiddler used to control switching of this resource
 defaultPlugins: array of default plugins to be used if nominated plugin isn't found
+onSwitch: callback when plugin is switched (single parameter is array of plugin titles)
 */
 function PluginSwitcher(options) {
 	this.wiki = options.wiki;
 	this.pluginType = options.pluginType;
 	this.controllerTitle = options.controllerTitle;
 	this.defaultPlugins = options.defaultPlugins || [];
+	this.onSwitch = options.onSwitch;
 	// Switch to the current plugin
 	this.switchPlugins();
 	// Listen for changes to the selected plugin
@@ -64,6 +66,10 @@ PluginSwitcher.prototype.switchPlugins = function() {
 	var registeredTiddlers = $tw.wiki.registerPluginTiddlers(this.pluginType,plugins);
 	// Unpack the current theme tiddlers
 	$tw.wiki.unpackPluginTiddlers();
+	// Call the switch handler
+	if(this.onSwitch) {
+		this.onSwitch(plugins);
+	}
 };
 
 exports.PluginSwitcher = PluginSwitcher;
diff --git a/core/modules/saver-handler.js b/core/modules/saver-handler.js
index 78e0598a6..4c938f7af 100644
--- a/core/modules/saver-handler.js
+++ b/core/modules/saver-handler.js
@@ -151,7 +151,7 @@ SaverHandler.prototype.saveWiki = function(options) {
 		text = this.wiki.renderTiddler(downloadType,template,options),
 		callback = function(err) {
 			if(err) {
-				alert("Error while saving:\n\n" + err);
+				alert($tw.language.getString("Error/WhileSaving") + ":\n\n" + err);
 			} else {
 				// Clear the task queue if we're saving (rather than downloading)
 				if(method !== "download") {
diff --git a/core/modules/savers/download.js b/core/modules/savers/download.js
index 8d1436f29..ea7c62f58 100644
--- a/core/modules/savers/download.js
+++ b/core/modules/savers/download.js
@@ -34,6 +34,7 @@ DownloadSaver.prototype.save = function(text,method,callback,options) {
 	// Set up the link
 	var link = document.createElement("a");
 	link.setAttribute("target","_blank");
+	link.setAttribute("rel","noopener noreferrer");
 	if(Blob !== undefined) {
 		var blob = new Blob([text], {type: "text/html"});
 		link.setAttribute("href", URL.createObjectURL(blob));
diff --git a/core/modules/savers/put.js b/core/modules/savers/put.js
new file mode 100644
index 000000000..39f1ca18c
--- /dev/null
+++ b/core/modules/savers/put.js
@@ -0,0 +1,80 @@
+/*\
+title: $:/core/modules/savers/put.js
+type: application/javascript
+module-type: saver
+
+Saves wiki by performing a PUT request to the server
+
+Works with any server which accepts a PUT request
+to the current URL, such as a WebDAV server.
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Select the appropriate saver module and set it up
+*/
+var PutSaver = function(wiki) {
+	this.wiki = wiki;
+	var self = this;
+	// Async server probe. Until probe finishes, save will fail fast
+	// See also https://github.com/Jermolene/TiddlyWiki5/issues/2276
+	var req = new XMLHttpRequest();
+	req.open("OPTIONS",encodeURI(document.location.protocol + "//" + document.location.hostname + ":" + document.location.port + document.location.pathname));
+	req.onload = function() {
+		// Check DAV header http://www.webdav.org/specs/rfc2518.html#rfc.section.9.1
+		self.serverAcceptsPuts = (this.status === 200 && !!this.getResponseHeader('dav'));
+	};
+	req.send();
+};
+
+PutSaver.prototype.save = function(text,method,callback) {
+	if (!this.serverAcceptsPuts) {
+		return false;
+	}
+	var req = new XMLHttpRequest();
+	// TODO: store/check ETags if supported by server, to protect against overwrites
+	// Prompt: Do you want to save over this? Y/N
+	// Merging would be ideal, and may be possible using future generic merge flow
+	req.onload = function() {
+		if (this.status === 200 || this.status === 201) {
+			callback(null); // success
+		}
+		else {
+			callback(this.responseText); // fail
+		}
+	};
+	req.open("PUT", encodeURI(window.location.href));
+	req.setRequestHeader("Content-Type", "text/html;charset=UTF-8");
+	req.send(text);
+	return true;
+};
+
+/*
+Information about this saver
+*/
+PutSaver.prototype.info = {
+	name: "put",
+	priority: 2000,
+	capabilities: ["save", "autosave"]
+};
+
+/*
+Static method that returns true if this saver is capable of working
+*/
+exports.canSave = function(wiki) {
+	return /^https?:/.test(location.protocol);
+};
+
+/*
+Create an instance of this saver
+*/
+exports.create = function(wiki) {
+	return new PutSaver(wiki);
+};
+
+})();
diff --git a/core/modules/savers/twedit.js b/core/modules/savers/twedit.js
index 33d748f67..6907a542c 100644
--- a/core/modules/savers/twedit.js
+++ b/core/modules/savers/twedit.js
@@ -39,7 +39,7 @@ TWEditSaver.prototype.save = function(text,method,callback) {
 	// Error handler
 	var errorHandler = function(event) {
 		// Error
-		callback("Error saving to TWEdit: " + event.target.error.code);
+		callback($tw.language.getString("Error/SavingToTWEdit") + ": " + event.target.error.code);
 	};
 	// Get the file system
 	window.requestFileSystem(LocalFileSystem.PERSISTENT,0,function(fileSystem) {
diff --git a/core/modules/savers/upload.js b/core/modules/savers/upload.js
index 897496b6a..bcf4b9d54 100644
--- a/core/modules/savers/upload.js
+++ b/core/modules/savers/upload.js
@@ -54,7 +54,7 @@ UploadSaver.prototype.save = function(text,method,callback) {
 	// Do the HTTP post
 	var http = new XMLHttpRequest();
 	http.open("POST",url,true,username,password);
-	http.setRequestHeader("Content-Type","multipart/form-data; ;charset=UTF-8; boundary=" + boundary);
+	http.setRequestHeader("Content-Type","multipart/form-data; charset=UTF-8; boundary=" + boundary);
 	http.onreadystatechange = function() {
 		if(http.readyState == 4 && http.status == 200) {
 			if(http.responseText.substr(0,4) === "0 - ") {
@@ -67,7 +67,7 @@ UploadSaver.prototype.save = function(text,method,callback) {
 	try {
 		http.send(data);
 	} catch(ex) {
-		return callback("Error:" + ex);
+		return callback($tw.language.getString("Error/Caption") + ":" + ex);
 	}
 	$tw.notifier.display("$:/language/Notifications/Save/Starting");
 	return true;
diff --git a/core/modules/startup/browser-messaging.js b/core/modules/startup/browser-messaging.js
index 481449c74..c38ba7b85 100644
--- a/core/modules/startup/browser-messaging.js
+++ b/core/modules/startup/browser-messaging.js
@@ -78,7 +78,7 @@ exports.startup = function() {
 		if(url) {
 			loadIFrame(url,function(err,iframeInfo) {
 				if(err) {
-					alert("Error loading plugin library: " + url);
+					alert($tw.language.getString("Error/LoadingPluginLibrary") + ": " + url);
 				} else {
 					iframeInfo.domNode.contentWindow.postMessage({
 						verb: "GET",
@@ -100,7 +100,7 @@ exports.startup = function() {
 		if(url && title) {
 			loadIFrame(url,function(err,iframeInfo) {
 				if(err) {
-					alert("Error loading plugin library: " + url);
+					alert($tw.language.getString("Error/LoadingPluginLibrary") + ": " + url);
 				} else {
 					iframeInfo.domNode.contentWindow.postMessage({
 						verb: "GET",
diff --git a/core/modules/startup/rootwidget.js b/core/modules/startup/rootwidget.js
index fdc6c738e..2b5111aff 100644
--- a/core/modules/startup/rootwidget.js
+++ b/core/modules/startup/rootwidget.js
@@ -28,7 +28,7 @@ exports.startup = function() {
 	// Install the notification  mechanism
 	$tw.notifier = new $tw.utils.Notifier($tw.wiki);
 	$tw.rootWidget.addEventListener("tm-notify",function(event) {
-		$tw.notifier.display(event.param);
+		$tw.notifier.display(event.param,{variables: event.paramObject});
 	});
 	// Install the scroller
 	$tw.pageScroller = new $tw.utils.PageScroller();
diff --git a/core/modules/startup/startup.js b/core/modules/startup/startup.js
index 08f9641e3..56d780159 100755
--- a/core/modules/startup/startup.js
+++ b/core/modules/startup/startup.js
@@ -24,9 +24,34 @@ var widget = require("$:/core/modules/widgets/widget.js");
 
 exports.startup = function() {
 	var modules,n,m,f;
+	// Minimal browser detection
 	if($tw.browser) {
 		$tw.browser.isIE = (/msie|trident/i.test(navigator.userAgent));
+		$tw.browser.isFirefox = !!document.mozFullScreenEnabled;
 	}
+	// Platform detection
+	$tw.platform = {};
+	if($tw.browser) {
+		$tw.platform.isMac = /Mac/.test(navigator.platform);
+		$tw.platform.isWindows = /win/i.test(navigator.platform);
+		$tw.platform.isLinux = /Linux/i.test(navigator.appVersion);
+	} else {
+		switch(require("os").platform()) {
+			case "darwin":
+				$tw.platform.isMac = true;
+				break;
+			case "win32":
+				$tw.platform.isWindows = true;
+				break;
+			case "freebsd":
+				$tw.platform.isLinux = true;
+				break;
+			case "linux":
+				$tw.platform.isLinux = true;
+				break;
+		}
+	}
+	// Initialise version
 	$tw.version = $tw.utils.extractVersionInfo();
 	// Set up the performance framework
 	$tw.perf = new $tw.Performance($tw.wiki.getTiddlerText(PERFORMANCE_INSTRUMENTATION_CONFIG_TITLE,"no") === "yes");
@@ -38,7 +63,17 @@ exports.startup = function() {
 		controllerTitle: "$:/language",
 		defaultPlugins: [
 			"$:/languages/en-US"
-		]
+		],
+		onSwitch: function(plugins) {
+			if($tw.browser) {
+				var pluginTiddler = $tw.wiki.getTiddler(plugins[0]);
+				if(pluginTiddler) {
+					document.documentElement.setAttribute("dir",pluginTiddler.getFieldString("text-direction") || "auto");
+				} else {
+					document.documentElement.removeAttribute("dir");
+				}
+			}
+		}
 	});
 	// Kick off the theme manager
 	$tw.themeManager = new $tw.PluginSwitcher({
@@ -50,6 +85,8 @@ exports.startup = function() {
 			"$:/themes/tiddlywiki/vanilla"
 		]
 	});
+	// Kick off the keyboard manager
+	$tw.keyboardManager = new $tw.KeyboardManager();
 	// Clear outstanding tiddler store change events to avoid an unnecessary refresh cycle at startup
 	$tw.wiki.clearTiddlerEventQueue();
 	// Create a root widget for attaching event handlers. By using it as the parentWidget for another widget tree, one can reuse the event handlers
diff --git a/core/modules/startup/story.js b/core/modules/startup/story.js
index 987bee216..8ef57076f 100644
--- a/core/modules/startup/story.js
+++ b/core/modules/startup/story.js
@@ -53,6 +53,10 @@ exports.startup = function() {
 		$tw.rootWidget.addEventListener("tm-browser-refresh",function(event) {
 			window.location.reload(true);
 		});
+		// Listen for the tm-print message
+		$tw.rootWidget.addEventListener("tm-print",function(event) {
+			(event.event.view || window).print();
+		});
 		// Listen for the tm-home message
 		$tw.rootWidget.addEventListener("tm-home",function(event) {
 			window.location.hash = "";
diff --git a/core/modules/startup/windows.js b/core/modules/startup/windows.js
index 9ce34f842..69966f346 100644
--- a/core/modules/startup/windows.js
+++ b/core/modules/startup/windows.js
@@ -49,7 +49,10 @@ exports.startup = function() {
 			$tw.wiki.removeEventListener("change",refreshHandler);
 		},false);
 		// Set up the styles
-		var styleWidgetNode = $tw.wiki.makeTranscludeWidget("$:/core/ui/PageStylesheet",{document: $tw.fakeDocument, variables: variables}),
+		var styleWidgetNode = $tw.wiki.makeTranscludeWidget("$:/core/ui/PageStylesheet",{
+				document: $tw.fakeDocument,
+				variables: variables,
+				importPageMacros: true}),
 			styleContainer = $tw.fakeDocument.createElement("style");
 		styleWidgetNode.render(styleContainer,null);
 		var styleElement = srcDocument.createElement("style");
diff --git a/core/modules/syncer.js b/core/modules/syncer.js
index 223998e1c..cb1191f16 100644
--- a/core/modules/syncer.js
+++ b/core/modules/syncer.js
@@ -96,11 +96,26 @@ Syncer.prototype.readTiddlerInfo = function() {
 		self.tiddlerInfo[title] = {
 			revision: tiddler.fields.revision,
 			adaptorInfo: self.syncadaptor && self.syncadaptor.getTiddlerInfo(tiddler),
-			changeCount: self.wiki.getChangeCount(title)
+			changeCount: self.wiki.getChangeCount(title),
+			hasBeenLazyLoaded: false
 		};
 	});
 };
 
+/*
+Create an tiddlerInfo structure if it doesn't already exist
+*/
+Syncer.prototype.createTiddlerInfo = function(title) {
+	if(!$tw.utils.hop(this.tiddlerInfo,title)) {
+		this.tiddlerInfo[title] = {
+			revision: null,
+			adaptorInfo: {},
+			changeCount: -1,
+			hasBeenLazyLoaded: false
+		};
+	}
+};
+
 /*
 Checks whether the wiki is dirty (ie the window shouldn't be closed)
 */
@@ -120,7 +135,7 @@ Syncer.prototype.updateDirtyStatus = function() {
 /*
 Save an incoming tiddler in the store, and updates the associated tiddlerInfo
 */
-Syncer.prototype.storeTiddler = function(tiddlerFields) {
+Syncer.prototype.storeTiddler = function(tiddlerFields,hasBeenLazyLoaded) {
 	// Save the tiddler
 	var tiddler = new $tw.Tiddler(this.wiki.getTiddler(tiddlerFields.title),tiddlerFields);
 	this.wiki.addTiddler(tiddler);
@@ -128,7 +143,8 @@ Syncer.prototype.storeTiddler = function(tiddlerFields) {
 	this.tiddlerInfo[tiddlerFields.title] = {
 		revision: tiddlerFields.revision,
 		adaptorInfo: this.syncadaptor.getTiddlerInfo(tiddler),
-		changeCount: this.wiki.getChangeCount(tiddlerFields.title)
+		changeCount: this.wiki.getChangeCount(tiddlerFields.title),
+		hasBeenLazyLoaded: hasBeenLazyLoaded !== undefined ? hasBeenLazyLoaded : true
 	};
 };
 
@@ -180,7 +196,7 @@ Syncer.prototype.syncFromServer = function() {
 			},self.pollTimerInterval);
 			// Check for errors
 			if(err) {
-				self.logger.alert("Error retrieving skinny tiddler list:",err);
+				self.logger.alert($tw.language.getString("Error/RetrievingSkinny") + ":",err);
 				return;
 			}
 			// Process each incoming tiddler
@@ -202,7 +218,7 @@ Syncer.prototype.syncFromServer = function() {
 						});
 					} else {
 						// Load the skinny version of the tiddler
-						self.storeTiddler(tiddlerFields);
+						self.storeTiddler(tiddlerFields,false);
 					}
 				}
 			}
@@ -238,11 +254,17 @@ Syncer.prototype.syncToServer = function(changes) {
 Lazily load a skinny tiddler if we can
 */
 Syncer.prototype.handleLazyLoadEvent = function(title) {
-	// Queue up a sync task to load this tiddler
-	this.enqueueSyncTask({
-		type: "load",
-		title: title
-	});
+	// Don't lazy load the same tiddler twice
+	var info = this.tiddlerInfo[title];
+	if(!info || !info.hasBeenLazyLoaded) {
+		this.createTiddlerInfo(title);
+		this.tiddlerInfo[title].hasBeenLazyLoaded = true;
+		// Queue up a sync task to load this tiddler
+		this.enqueueSyncTask({
+			type: "load",
+			title: title
+		});		
+	}
 };
 
 /*
@@ -253,7 +275,7 @@ Syncer.prototype.handleLoginEvent = function() {
 	this.getStatus(function(err,isLoggedIn,username) {
 		if(!isLoggedIn) {
 			$tw.passwordPrompt.createPrompt({
-				serviceName: "Login to TiddlySpace",
+				serviceName: $tw.language.getString("LoginToTiddlySpace"),
 				callback: function(data) {
 					self.login(data.username,data.password,function(err,isLoggedIn) {
 						self.syncFromServer();
@@ -324,13 +346,7 @@ Syncer.prototype.enqueueSyncTask = function(task) {
 	task.queueTime = now;
 	task.lastModificationTime = now;
 	// Fill in some tiddlerInfo if the tiddler is one we haven't seen before
-	if(!$tw.utils.hop(this.tiddlerInfo,task.title)) {
-		this.tiddlerInfo[task.title] = {
-			revision: null,
-			adaptorInfo: {},
-			changeCount: -1
-		};
-	}
+	this.createTiddlerInfo(task.title);
 	// Bail if this is a save and the tiddler is already at the changeCount that the server has
 	if(task.type === "save" && this.wiki.getChangeCount(task.title) <= this.tiddlerInfo[task.title].changeCount) {
 		return;
@@ -387,8 +403,8 @@ Process the task queue, performing the next task if appropriate
 */
 Syncer.prototype.processTaskQueue = function() {
 	var self = this;
-	// Only process a task if we're not already performing a task. If we are already performing a task then we'll dispatch the next one when it completes
-	if(this.numTasksInProgress() === 0) {
+	// Only process a task if the sync adaptor is fully initialised and we're not already performing a task. If we are already performing a task then we'll dispatch the next one when it completes
+	if((!this.syncadaptor.isReady || this.syncadaptor.isReady()) && this.numTasksInProgress() === 0) {
 		// Choose the next task to perform
 		var task = this.chooseNextTask();
 		// Perform the task if we had one
@@ -483,7 +499,7 @@ Syncer.prototype.dispatchTask = function(task,callback) {
 			}
 			// Store the tiddler
 			if(tiddlerFields) {
-				self.storeTiddler(tiddlerFields);
+				self.storeTiddler(tiddlerFields,true);
 			}
 			// Invoke the callback
 			callback(null);
diff --git a/core/modules/utils/dom/dom.js b/core/modules/utils/dom/dom.js
index 35f556262..118498bc3 100644
--- a/core/modules/utils/dom/dom.js
+++ b/core/modules/utils/dom/dom.js
@@ -60,6 +60,20 @@ exports.toggleClass = function(el,className,status) {
 	}
 };
 
+/*
+Get the first parent element that has scrollbars or use the body as fallback.
+*/
+exports.getScrollContainer = function(el) {
+	var doc = el.ownerDocument;
+	while(el.parentNode) {	
+		el = el.parentNode;
+		if(el.scrollTop) {
+			return el;
+		}
+	}
+	return doc.body;
+};
+
 /*
 Get the scroll position of the viewport
 Returns:
@@ -76,6 +90,31 @@ exports.getScrollPosition = function() {
 	}
 };
 
+/*
+Adjust the height of a textarea to fit its content, preserving scroll position, and return the height
+*/
+exports.resizeTextAreaToFit = function(domNode,minHeight) {
+	// Get the scroll container and register the current scroll position
+	var container = $tw.utils.getScrollContainer(domNode),
+		scrollTop = container.scrollTop;
+    // Measure the specified minimum height
+	domNode.style.height = minHeight;
+	var measuredHeight = domNode.offsetHeight;
+	// Set its height to auto so that it snaps to the correct height
+	domNode.style.height = "auto";
+	// Calculate the revised height
+	var newHeight = Math.max(domNode.scrollHeight + domNode.offsetHeight - domNode.clientHeight,measuredHeight);
+	// Only try to change the height if it has changed
+	if(newHeight !== domNode.offsetHeight) {
+		domNode.style.height = newHeight + "px";
+		// Make sure that the dimensions of the textarea are recalculated
+		$tw.utils.forceLayout(domNode);
+		// Set the container to the position we registered at the beginning
+		container.scrollTop = scrollTop;
+	}
+	return newHeight;
+};
+
 /*
 Gets the bounding rectangle of an element in absolute page coordinates
 */
@@ -164,5 +203,32 @@ exports.addEventListeners = function(domNode,events) {
 	});
 };
 
+/*
+Get the computed styles applied to an element as an array of strings of individual CSS properties
+*/
+exports.getComputedStyles = function(domNode) {
+	var textAreaStyles = window.getComputedStyle(domNode,null),
+		styleDefs = [],
+		name;
+	for(var t=0; t<textAreaStyles.length; t++) {
+		name = textAreaStyles[t];
+		styleDefs.push(name + ": " + textAreaStyles.getPropertyValue(name) + ";");
+	}
+	return styleDefs;
+};
+
+/*
+Apply a set of styles passed as an array of strings of individual CSS properties
+*/
+exports.setStyles = function(domNode,styleDefs) {
+	domNode.style.cssText = styleDefs.join("");
+};
+
+/*
+Copy the computed styles from a source element to a destination element
+*/
+exports.copyStyles = function(srcDomNode,dstDomNode) {
+	$tw.utils.setStyles(dstDomNode,$tw.utils.getComputedStyles(srcDomNode));
+};
 
 })();
diff --git a/core/modules/utils/dom/http.js b/core/modules/utils/dom/http.js
index 2e6b3e9b0..990109249 100644
--- a/core/modules/utils/dom/http.js
+++ b/core/modules/utils/dom/http.js
@@ -45,7 +45,7 @@ exports.httpRequest = function(options) {
 				return;
 			}
 		// Something went wrong
-		options.callback("XMLHttpRequest error code: " + this.status);
+		options.callback($tw.language.getString("Error/XMLHttpRequest") + ": " + this.status);
 		}
 	};
 	// Make the request
diff --git a/core/modules/utils/dom/keyboard.js b/core/modules/utils/dom/keyboard.js
index fda8e012a..0ba1af5a0 100644
--- a/core/modules/utils/dom/keyboard.js
+++ b/core/modules/utils/dom/keyboard.js
@@ -3,7 +3,7 @@ title: $:/core/modules/utils/dom/keyboard.js
 type: application/javascript
 module-type: utils
 
-Keyboard utilities
+Keyboard utilities; now deprecated. Instead, use $tw.keyboardManager
 
 \*/
 (function(){
@@ -12,60 +12,14 @@ Keyboard utilities
 /*global $tw: false */
 "use strict";
 
-var namedKeys = {
-	"backspace": 8,
-	"tab": 9,
-	"enter": 13,
-	"escape": 27
-};
-
-/*
-Parses a key descriptor into the structure:
-{
-	keyCode: numeric keycode
-	shiftKey: boolean
-	altKey: boolean
-	ctrlKey: boolean
-}
-Key descriptors have the following format:
-	ctrl+enter
-	ctrl+shift+alt+A
-*/
-exports.parseKeyDescriptor = function(keyDescriptor) {
-	var components = keyDescriptor.split("+"),
-		info = {
-			keyCode: 0,
-			shiftKey: false,
-			altKey: false,
-			ctrlKey: false
-		};
-	for(var t=0; t<components.length; t++) {
-		var s = components[t].toLowerCase();
-		// Look for modifier keys
-		if(s === "ctrl") {
-			info.ctrlKey = true;
-		} else if(s === "shift") {
-			info.shiftKey = true;
-		} else if(s === "alt") {
-			info.altKey = true;
-		} else if(s === "meta") {
-			info.metaKey = true;
+["parseKeyDescriptor","checkKeyDescriptor"].forEach(function(method) {
+	exports[method] = function() {
+		if($tw.keyboardManager) {
+			return $tw.keyboardManager[method].apply($tw.keyboardManager,Array.prototype.slice.call(arguments,0));
+		} else {
+			return null
 		}
-		// Replace named keys with their code
-		if(namedKeys[s]) {
-			info.keyCode = namedKeys[s];
-		}
-	}
-	return info;
-};
-
-exports.checkKeyDescriptor = function(event,keyInfo) {
-	var metaKeyStatus = !!keyInfo.metaKey; // Using a temporary variable to keep JSHint happy
-	return event.keyCode === keyInfo.keyCode && 
-			event.shiftKey === keyInfo.shiftKey && 
-			event.altKey === keyInfo.altKey && 
-			event.ctrlKey === keyInfo.ctrlKey && 
-			event.metaKey === metaKeyStatus;	
-};
+	};
+});
 
 })();
diff --git a/core/modules/utils/dom/modal.js b/core/modules/utils/dom/modal.js
index 2a966a7db..74fceb1ba 100644
--- a/core/modules/utils/dom/modal.js
+++ b/core/modules/utils/dom/modal.js
@@ -81,14 +81,16 @@ Modal.prototype.display = function(title,options) {
 		}}}],
 		parentWidget: $tw.rootWidget,
 		document: document,
-		variables: variables
+		variables: variables,
+		importPageMacros: true
 	});
 	headerWidgetNode.render(headerTitle,null);
 	// Render the body of the message
 	var bodyWidgetNode = this.wiki.makeTranscludeWidget(title,{
 		parentWidget: $tw.rootWidget,
 		document: document,
-		variables: variables
+		variables: variables,
+		importPageMacros: true
 	});
 	bodyWidgetNode.render(modalBody,null);
 	// Setup the link if present
@@ -102,6 +104,7 @@ Modal.prototype.display = function(title,options) {
 		var link = document.createElement("a");
 		link.setAttribute("href",tiddler.fields.help);
 		link.setAttribute("target","_blank");
+		link.setAttribute("rel","noopener noreferrer");
 		link.appendChild(document.createTextNode("Help"));
 		modalFooterHelp.appendChild(link);
 		modalFooterHelp.style.float = "left";
@@ -122,12 +125,13 @@ Modal.prototype.display = function(title,options) {
 				attributes: {
 					text: {
 						type: "string",
-						value: "Close"
+						value: $tw.language.getString("Buttons/Close/Caption")
 			}}}
 		]}],
 		parentWidget: $tw.rootWidget,
 		document: document,
-		variables: variables
+		variables: variables,
+		importPageMacros: true
 	});
 	footerWidgetNode.render(modalFooterButtons,null);
 	// Set up the refresh handler
diff --git a/core/modules/utils/dom/notifier.js b/core/modules/utils/dom/notifier.js
index ca8e54ad7..3897b0e52 100644
--- a/core/modules/utils/dom/notifier.js
+++ b/core/modules/utils/dom/notifier.js
@@ -41,7 +41,11 @@ Notifier.prototype.display = function(title,options) {
 	// Create the variables
 	var variables = $tw.utils.extend({currentTiddler: title},options.variables);
 	// Render the body of the notification
-	var widgetNode = this.wiki.makeTranscludeWidget(title,{parentWidget: $tw.rootWidget, document: document, variables: variables});
+	var widgetNode = this.wiki.makeTranscludeWidget(title,{
+		parentWidget: $tw.rootWidget,
+		document: document,
+		variables: variables,
+		importPageMacros: true});
 	widgetNode.render(notification,null);
 	refreshHandler = function(changes) {
 		widgetNode.refresh(changes,notification,null);
diff --git a/core/modules/utils/filesystem.js b/core/modules/utils/filesystem.js
index 553209c6b..7ffe07ee7 100644
--- a/core/modules/utils/filesystem.js
+++ b/core/modules/utils/filesystem.js
@@ -160,4 +160,25 @@ exports.isDirectoryEmpty = function(dirPath) {
 	return empty;
 };
 
+/*
+Recursively delete a tree of empty directories
+*/
+exports.deleteEmptyDirs = function(dirpath,callback) {
+	var self = this;
+	fs.readdir(dirpath,function(err,files) {
+		if(err) {
+			return callback(err);
+		}
+		if(files.length > 0) {
+			return callback(null);
+		}
+		fs.rmdir(dirpath,function(err) {
+			if(err) {
+				return callback(err);
+			}
+			self.deleteEmptyDirs(path.dirname(dirpath),callback);
+		});
+	});
+};
+
 })();
diff --git a/core/modules/utils/pluginmaker.js b/core/modules/utils/pluginmaker.js
index 559f5aada..1fc1a3986 100644
--- a/core/modules/utils/pluginmaker.js
+++ b/core/modules/utils/pluginmaker.js
@@ -28,7 +28,7 @@ exports.repackPlugin = function(title,additionalTiddlers,excludeTiddlers) {
 	try {
 		jsonPluginTiddler = JSON.parse(pluginTiddler.fields.text);
 	} catch(e) {
-		throw "Cannot parse plugin tiddler " + title + "\nError: " + e;
+		throw "Cannot parse plugin tiddler " + title + "\n" + $tw.language.getString("Error/Caption") + ": " + e;
 	}
 	// Get the list of tiddlers
 	var tiddlers = Object.keys(jsonPluginTiddler.tiddlers);
diff --git a/core/modules/utils/utils.js b/core/modules/utils/utils.js
index 90015609d..94c08f329 100644
--- a/core/modules/utils/utils.js
+++ b/core/modules/utils/utils.js
@@ -17,7 +17,27 @@ Display a warning, in colour if we're on a terminal
 */
 exports.warning = function(text) {
 	console.log($tw.node ? "\x1b[1;33m" + text + "\x1b[0m" : text);
-}
+};
+
+/*
+Repeatedly replaces a substring within a string. Like String.prototype.replace, but without any of the default special handling of $ sequences in the replace string
+*/
+exports.replaceString = function(text,search,replace) {
+	return text.replace(search,function() {
+		return replace;
+	});
+};
+
+/*
+Repeats a string
+*/
+exports.repeat = function(str,count) {
+	var result = "";
+	for(var t=0;t<count;t++) {
+		result += str;
+	}
+	return result;
+};
 
 /*
 Trim whitespace from the start and end of a string
@@ -31,6 +51,39 @@ exports.trim = function(str) {
 	}
 };
 
+/*
+Find the line break preceding a given position in a string
+Returns position immediately after that line break, or the start of the string
+*/
+exports.findPrecedingLineBreak = function(text,pos) {
+	var result = text.lastIndexOf("\n",pos - 1);
+	if(result === -1) {
+		result = 0;
+	} else {
+		result++;
+		if(text.charAt(result) === "\r") {
+			result++;
+		}
+	}
+	return result;
+};
+
+/*
+Find the line break following a given position in a string
+*/
+exports.findFollowingLineBreak = function(text,pos) {
+	// Cut to just past the following line break, or to the end of the text
+	var result = text.indexOf("\n",pos);
+	if(result === -1) {
+		result = text.length;
+	} else {
+		if(text.charAt(result) === "\r") {
+			result++;
+		}
+	}
+	return result;
+};
+
 /*
 Return the number of keys in an object
 */
@@ -383,17 +436,18 @@ exports.htmlEncode = function(s) {
 
 // Converts all HTML entities to their character equivalents
 exports.entityDecode = function(s) {
-	var e = s.substr(1,s.length-2); // Strip the & and the ;
+	var converter = String.fromCodePoint || String.fromCharCode,
+		e = s.substr(1,s.length-2); // Strip the & and the ;
 	if(e.charAt(0) === "#") {
 		if(e.charAt(1) === "x" || e.charAt(1) === "X") {
-			return String.fromCharCode(parseInt(e.substr(2),16));	
+			return converter(parseInt(e.substr(2),16));	
 		} else {
-			return String.fromCharCode(parseInt(e.substr(1),10));
+			return converter(parseInt(e.substr(1),10));
 		}
 	} else {
 		var c = $tw.config.htmlEntities[e];
 		if(c) {
-			return String.fromCharCode(c);
+			return converter(c);
 		} else {
 			return s; // Couldn't convert it as an entity, just return it raw
 		}
@@ -450,7 +504,7 @@ exports.escapeRegExp = function(s) {
 
 // Checks whether a link target is external, i.e. not a tiddler title
 exports.isLinkExternal = function(to) {
-	var externalRegExp = /(?:file|http|https|mailto|ftp|irc|news|data|skype):[^\s<>{}\[\]`|'"\\^~]+(?:\/|\b)/i;
+	var externalRegExp = /^(?:file|http|https|mailto|ftp|irc|news|data|skype):[^\s<>{}\[\]`|"\\^]+(?:\/|\b)/i;
 	return externalRegExp.test(to);
 };
 
@@ -654,4 +708,20 @@ exports.sign = Math.sign || function(x) {
 	return x > 0 ? 1 : -1;
 };
 
+/*
+IE does not have an endsWith function
+*/
+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) {
+			position = str.length;
+		}
+		position -= ending.length;
+		var lastIndex = str.indexOf(ending, position);
+		return lastIndex !== -1 && lastIndex === position;
+	}
+};
+
 })();
diff --git a/core/modules/widgets/action-createtiddler.js b/core/modules/widgets/action-createtiddler.js
new file mode 100644
index 000000000..01010b940
--- /dev/null
+++ b/core/modules/widgets/action-createtiddler.js
@@ -0,0 +1,81 @@
+/*\
+title: $:/core/modules/widgets/action-createtiddler.js
+type: application/javascript
+module-type: widget
+
+Action widget to create a new tiddler with a unique name and specified fields.
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
+
+var CreateTiddlerWidget = function(parseTreeNode,options) {
+	this.initialise(parseTreeNode,options);
+};
+
+/*
+Inherit from the base widget class
+*/
+CreateTiddlerWidget.prototype = new Widget();
+
+/*
+Render this widget into the DOM
+*/
+CreateTiddlerWidget.prototype.render = function(parent,nextSibling) {
+	this.computeAttributes();
+	this.execute();
+};
+
+/*
+Compute the internal state of the widget
+*/
+CreateTiddlerWidget.prototype.execute = function() {
+	this.actionBaseTitle = this.getAttribute("$basetitle");
+	this.actionSaveTitle = this.getAttribute("$savetitle");
+	this.actionTimestamp = this.getAttribute("$timestamp","yes") === "yes";
+};
+
+/*
+Refresh the widget by ensuring our attributes are up to date
+*/
+CreateTiddlerWidget.prototype.refresh = function(changedTiddlers) {
+	var changedAttributes = this.computeAttributes();
+	if($tw.utils.count(changedAttributes) > 0) {
+		this.refreshSelf();
+		return true;
+	}
+	return this.refreshChildren(changedTiddlers);
+};
+
+/*
+Invoke the action associated with this widget
+*/
+CreateTiddlerWidget.prototype.invokeAction = function(triggeringWidget,event) {
+	var title = this.wiki.generateNewTitle(this.actionBaseTitle),
+		fields = {},
+		creationFields,
+		modificationFields;
+	$tw.utils.each(this.attributes,function(attribute,name) {
+		if(name.charAt(0) !== "$") {
+			fields[name] = attribute;
+		}
+	});
+	if(this.actionTimestamp) {
+		creationFields = this.wiki.getCreationFields();
+		modificationFields = this.wiki.getModificationFields();
+	}
+	var tiddler = this.wiki.addTiddler(new $tw.Tiddler(creationFields,fields,modificationFields,{title: title}));
+	if(this.actionSaveTitle) {
+		this.wiki.setTextReference(this.actionSaveTitle,title,this.getVariable("currentTiddler"));
+	}
+	return true; // Action was invoked
+};
+
+exports["action-createtiddler"] = CreateTiddlerWidget;
+
+})();
diff --git a/core/modules/widgets/action-deletefield.js b/core/modules/widgets/action-deletefield.js
index 8e9080f91..93b45b40a 100644
--- a/core/modules/widgets/action-deletefield.js
+++ b/core/modules/widgets/action-deletefield.js
@@ -67,7 +67,7 @@ DeleteFieldWidget.prototype.invokeAction = function(triggeringWidget,event) {
 				removeFields[name] = undefined;
 			}
 		});
-		this.wiki.addTiddler(new $tw.Tiddler(this.wiki.getModificationFields(),tiddler,removeFields,this.wiki.getCreationFields()));
+		this.wiki.addTiddler(new $tw.Tiddler(this.wiki.getCreationFields(),tiddler,removeFields,this.wiki.getModificationFields()));
 	}
 	return true; // Action was invoked
 };
diff --git a/core/modules/widgets/action-sendmessage.js b/core/modules/widgets/action-sendmessage.js
index 2f1b9cae4..c53314b2d 100644
--- a/core/modules/widgets/action-sendmessage.js
+++ b/core/modules/widgets/action-sendmessage.js
@@ -78,7 +78,8 @@ SendMessageWidget.prototype.invokeAction = function(triggeringWidget,event) {
 		param: param,
 		paramObject: paramObject,
 		tiddlerTitle: this.getVariable("currentTiddler"),
-		navigateFromTitle: this.getVariable("storyTiddler")
+		navigateFromTitle: this.getVariable("storyTiddler"),
+		event: event
 	});
 	return true; // Action was invoked
 };
diff --git a/core/modules/widgets/button.js b/core/modules/widgets/button.js
index da4ba5a01..07c0c5ac1 100644
--- a/core/modules/widgets/button.js
+++ b/core/modules/widgets/button.js
@@ -86,6 +86,9 @@ ButtonWidget.prototype.render = function(parent,nextSibling) {
 			self.setTiddler();
 			handled = true;
 		}
+		if(self.actions) {
+			self.invokeActionString(self.actions,self,event);
+		}
 		if(handled) {
 			event.preventDefault();
 			event.stopPropagation();
@@ -128,12 +131,13 @@ ButtonWidget.prototype.navigateTo = function(event) {
 		navigateFromNode: this,
 		navigateFromClientRect: { top: bounds.top, left: bounds.left, width: bounds.width, right: bounds.right, bottom: bounds.bottom, height: bounds.height
 		},
-		navigateSuppressNavigation: event.metaKey || event.ctrlKey || (event.button === 1)
+		navigateSuppressNavigation: event.metaKey || event.ctrlKey || (event.button === 1),
+		event: event
 	});
 };
 
 ButtonWidget.prototype.dispatchMessage = function(event) {
-	this.dispatchEvent({type: this.message, param: this.param, tiddlerTitle: this.getVariable("currentTiddler")});
+	this.dispatchEvent({type: this.message, param: this.param, tiddlerTitle: this.getVariable("currentTiddler"), event: event});
 };
 
 ButtonWidget.prototype.triggerPopup = function(event) {
@@ -153,6 +157,7 @@ Compute the internal state of the widget
 */
 ButtonWidget.prototype.execute = function() {
 	// Get attributes
+	this.actions = this.getAttribute("actions");
 	this.to = this.getAttribute("to");
 	this.message = this.getAttribute("message");
 	this.param = this.getAttribute("param");
diff --git a/core/modules/widgets/edit-bitmap.js b/core/modules/widgets/edit-bitmap.js
index aaac6c696..f094d9464 100644
--- a/core/modules/widgets/edit-bitmap.js
+++ b/core/modules/widgets/edit-bitmap.js
@@ -13,16 +13,22 @@ Edit-bitmap widget
 "use strict";
 
 // Default image sizes
-var DEFAULT_IMAGE_WIDTH = 300,
-	DEFAULT_IMAGE_HEIGHT = 185;
+var DEFAULT_IMAGE_WIDTH = 600,
+	DEFAULT_IMAGE_HEIGHT = 370;
 
 // Configuration tiddlers
 var LINE_WIDTH_TITLE = "$:/config/BitmapEditor/LineWidth",
-	LINE_COLOUR_TITLE = "$:/config/BitmapEditor/Colour";
+	LINE_COLOUR_TITLE = "$:/config/BitmapEditor/Colour",
+	LINE_OPACITY_TITLE = "$:/config/BitmapEditor/Opacity";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
 
 var EditBitmapWidget = function(parseTreeNode,options) {
+	// Initialise the editor operations if they've not been done already
+	if(!this.editorOperations) {
+		EditBitmapWidget.prototype.editorOperations = {};
+		$tw.modules.applyMethods("bitmapeditoroperation",this.editorOperations);
+	}
 	this.initialise(parseTreeNode,options);
 };
 
@@ -42,7 +48,12 @@ EditBitmapWidget.prototype.render = function(parent,nextSibling) {
 	this.computeAttributes();
 	// Execute our logic
 	this.execute();
-	// Create our element
+	// Create the wrapper for the toolbar and render its content
+	this.toolbarNode = this.document.createElement("div");
+	this.toolbarNode.className = "tc-editor-toolbar";
+	parent.insertBefore(this.toolbarNode,nextSibling);
+	this.domNodes.push(this.toolbarNode);
+	// Create the on-screen canvas
 	this.canvasDomNode = $tw.utils.domMaker("canvas",{
 		document: this.document,
 		"class":"tc-edit-bitmapeditor",
@@ -60,29 +71,33 @@ EditBitmapWidget.prototype.render = function(parent,nextSibling) {
 			name: "mouseup", handlerObject: this, handlerMethod: "handleMouseUpEvent"
 		}]
 	});
-	this.widthDomNode = $tw.utils.domMaker("input",{
-		document: this.document,
-		"class":"tc-edit-bitmapeditor-width",
-		eventListeners: [{
-			name: "change", handlerObject: this, handlerMethod: "handleWidthChangeEvent"
-		}]
-	});
-	this.heightDomNode = $tw.utils.domMaker("input",{
-		document: this.document,
-		"class":"tc-edit-bitmapeditor-height",
-		eventListeners: [{
-			name: "change", handlerObject: this, handlerMethod: "handleHeightChangeEvent"
-		}]
-	});
-	// Insert the elements into the DOM
+	// Set the width and height variables
+	this.setVariable("tv-bitmap-editor-width",this.canvasDomNode.width + "px");
+	this.setVariable("tv-bitmap-editor-height",this.canvasDomNode.height + "px");
+	// Render toolbar child widgets
+	this.renderChildren(this.toolbarNode,null);
+	// // Insert the elements into the DOM
 	parent.insertBefore(this.canvasDomNode,nextSibling);
-	parent.insertBefore(this.widthDomNode,nextSibling);
-	parent.insertBefore(this.heightDomNode,nextSibling);
-	this.domNodes.push(this.canvasDomNode,this.widthDomNode,this.heightDomNode);
+	this.domNodes.push(this.canvasDomNode);
 	// Load the image into the canvas
 	if($tw.browser) {
 		this.loadCanvas();
 	}
+	// Add widget message listeners
+	this.addEventListeners([
+		{type: "tm-edit-bitmap-operation", handler: "handleEditBitmapOperationMessage"}
+	]);
+};
+
+/*
+Handle an edit bitmap operation message from the toolbar
+*/
+EditBitmapWidget.prototype.handleEditBitmapOperationMessage = function(event) {
+	// Invoke the handler
+	var handler = this.editorOperations[event.param];
+	if(handler) {
+		handler.call(this,event);
+	}
 };
 
 /*
@@ -91,13 +106,28 @@ Compute the internal state of the widget
 EditBitmapWidget.prototype.execute = function() {
 	// Get our parameters
 	this.editTitle = this.getAttribute("tiddler",this.getVariable("currentTiddler"));
+	// Make the child widgets
+	this.makeChildWidgets();
 };
 
 /*
-Note that the bitmap editor intentionally doesn't try to refresh itself because it would be confusing to have the image changing spontaneously while editting it
+Just refresh the toolbar
 */
 EditBitmapWidget.prototype.refresh = function(changedTiddlers) {
-	return false;
+	return this.refreshChildren(changedTiddlers);
+};
+
+/*
+Set the bitmap size variables and refresh the toolbar
+*/
+EditBitmapWidget.prototype.refreshToolbar = function() {
+	// Set the width and height variables
+	this.setVariable("tv-bitmap-editor-width",this.canvasDomNode.width + "px");
+	this.setVariable("tv-bitmap-editor-height",this.canvasDomNode.height + "px");
+	// Refresh each of our child widgets
+	$tw.utils.each(this.children,function(childWidget) {
+		childWidget.refreshSelf();
+	});
 };
 
 EditBitmapWidget.prototype.loadCanvas = function() {
@@ -112,7 +142,7 @@ EditBitmapWidget.prototype.loadCanvas = function() {
 		self.currCanvas = self.document.createElement("canvas");
 		self.initCanvas(self.currCanvas,currImage.width,currImage.height,currImage);
 		// Set the width and height input boxes
-		self.updateSize();
+		self.refreshToolbar();
 	};
 	currImage.onerror = function() {
 		// Set the on-screen canvas size and clear it
@@ -121,7 +151,7 @@ EditBitmapWidget.prototype.loadCanvas = function() {
 		self.currCanvas = self.document.createElement("canvas");
 		self.initCanvas(self.currCanvas,DEFAULT_IMAGE_WIDTH,DEFAULT_IMAGE_HEIGHT);
 		// Set the width and height input boxes
-		self.updateSize();
+		self.refreshToolbar();
 	};
 	// Get the current bitmap into an image object
 	currImage.src = "data:" + tiddler.fields.type + ";base64," + tiddler.fields.text;
@@ -139,14 +169,6 @@ EditBitmapWidget.prototype.initCanvas = function(canvas,width,height,image) {
 	}
 };
 
-/*
-** Update the input boxes with the actual size of the canvas
-*/
-EditBitmapWidget.prototype.updateSize = function() {
-	this.widthDomNode.value = this.currCanvas.width;
-	this.heightDomNode.value = this.currCanvas.height;
-};
-
 /*
 ** Change the size of the canvas, preserving the current image
 */
@@ -167,28 +189,6 @@ EditBitmapWidget.prototype.changeCanvasSize = function(newWidth,newHeight) {
 	ctx.drawImage(this.currCanvas,0,0);
 };
 
-EditBitmapWidget.prototype.handleWidthChangeEvent = function(event) {
-	// Get the new width
-	var newWidth = parseInt(this.widthDomNode.value,10);
-	// Update if necessary
-	if(newWidth > 0 && newWidth !== this.currCanvas.width) {
-		this.changeCanvasSize(newWidth,this.currCanvas.height);
-	}
-	// Update the input controls
-	this.updateSize();
-};
-
-EditBitmapWidget.prototype.handleHeightChangeEvent = function(event) {
-	// Get the new width
-	var newHeight = parseInt(this.heightDomNode.value,10);
-	// Update if necessary
-	if(newHeight > 0 && newHeight !== this.currCanvas.height) {
-		this.changeCanvasSize(this.currCanvas.width,newHeight);
-	}
-	// Update the input controls
-	this.updateSize();
-};
-
 EditBitmapWidget.prototype.handleTouchStartEvent = function(event) {
 	this.brushDown = true;
 	this.strokeStart(event.touches[0].clientX,event.touches[0].clientY);
@@ -264,8 +264,9 @@ EditBitmapWidget.prototype.strokeMove = function(x,y) {
 	// Redraw the previous image
 	ctx.drawImage(this.currCanvas,0,0);
 	// Render the stroke
+	ctx.globalAlpha = parseFloat(this.wiki.getTiddlerText(LINE_OPACITY_TITLE,"1.0"));
 	ctx.strokeStyle = this.wiki.getTiddlerText(LINE_COLOUR_TITLE,"#ff0");
-	ctx.lineWidth = parseInt(this.wiki.getTiddlerText(LINE_WIDTH_TITLE,"3"),10);
+	ctx.lineWidth = parseFloat(this.wiki.getTiddlerText(LINE_WIDTH_TITLE,"3"));
 	ctx.lineCap = "round";
 	ctx.lineJoin = "round";
 	ctx.beginPath();
@@ -292,7 +293,7 @@ EditBitmapWidget.prototype.saveChanges = function() {
 	var tiddler = this.wiki.getTiddler(this.editTitle);
 	if(tiddler) {
 		// data URIs look like "data:<type>;base64,<text>"
-		var dataURL = this.canvasDomNode.toDataURL(tiddler.fields.type,1.0),
+		var dataURL = this.canvasDomNode.toDataURL(tiddler.fields.type),
 			posColon = dataURL.indexOf(":"),
 			posSemiColon = dataURL.indexOf(";"),
 			posComma = dataURL.indexOf(","),
diff --git a/core/modules/widgets/edit-shortcut.js b/core/modules/widgets/edit-shortcut.js
new file mode 100644
index 000000000..78f34839c
--- /dev/null
+++ b/core/modules/widgets/edit-shortcut.js
@@ -0,0 +1,139 @@
+/*\
+title: $:/core/modules/widgets/edit-shortcut.js
+type: application/javascript
+module-type: widget
+
+Widget to display an editable keyboard shortcut
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
+
+var EditShortcutWidget = function(parseTreeNode,options) {
+	this.initialise(parseTreeNode,options);
+};
+
+/*
+Inherit from the base widget class
+*/
+EditShortcutWidget.prototype = new Widget();
+
+/*
+Render this widget into the DOM
+*/
+EditShortcutWidget.prototype.render = function(parent,nextSibling) {
+	this.parentDomNode = parent;
+	this.computeAttributes();
+	this.execute();
+	this.inputNode = this.document.createElement("input");
+	// Assign classes
+	if(this.shortcutClass) {
+		this.inputNode.className = this.shortcutClass;		
+	}
+	// Assign other attributes
+	if(this.shortcutStyle) {
+		this.inputNode.setAttribute("style",this.shortcutStyle);
+	}
+	if(this.shortcutTooltip) {
+		this.inputNode.setAttribute("title",this.shortcutTooltip);
+	}
+	if(this.shortcutPlaceholder) {
+		this.inputNode.setAttribute("placeholder",this.shortcutPlaceholder);
+	}
+	if(this.shortcutAriaLabel) {
+		this.inputNode.setAttribute("aria-label",this.shortcutAriaLabel);
+	}
+	// Assign the current shortcut
+	this.updateInputNode();
+	// Add event handlers
+	$tw.utils.addEventListeners(this.inputNode,[
+		{name: "keydown", handlerObject: this, handlerMethod: "handleKeydownEvent"}
+	]);
+	// Link into the DOM
+	parent.insertBefore(this.inputNode,nextSibling);
+	this.domNodes.push(this.inputNode);
+};
+
+/*
+Compute the internal state of the widget
+*/
+EditShortcutWidget.prototype.execute = function() {
+	this.shortcutTiddler = this.getAttribute("tiddler");
+	this.shortcutField = this.getAttribute("field");
+	this.shortcutIndex = this.getAttribute("index");
+	this.shortcutPlaceholder = this.getAttribute("placeholder");
+	this.shortcutDefault = this.getAttribute("default","");
+	this.shortcutClass = this.getAttribute("class");
+	this.shortcutStyle = this.getAttribute("style");
+	this.shortcutTooltip = this.getAttribute("tooltip");
+	this.shortcutAriaLabel = this.getAttribute("aria-label");
+};
+
+/*
+Update the value of the input node
+*/
+EditShortcutWidget.prototype.updateInputNode = function() {
+	if(this.shortcutField) {
+		var tiddler = this.wiki.getTiddler(this.shortcutTiddler);
+		if(tiddler && $tw.utils.hop(tiddler.fields,this.shortcutField)) {
+			this.inputNode.value = tiddler.getFieldString(this.shortcutField);
+		} else {
+			this.inputNode.value = this.shortcutDefault;
+		}
+	} else if(this.shortcutIndex) {
+		this.inputNode.value = this.wiki.extractTiddlerDataItem(this.shortcutTiddler,this.shortcutIndex,this.shortcutDefault);
+	} else {
+		this.inputNode.value = this.wiki.getTiddlerText(this.shortcutTiddler,this.shortcutDefault);
+	}
+};
+
+/*
+Handle a dom "keydown" event
+*/
+EditShortcutWidget.prototype.handleKeydownEvent = function(event) {
+	// Ignore shift, ctrl, meta, alt
+	if(event.keyCode && $tw.keyboardManager.getModifierKeys().indexOf(event.keyCode) === -1) {
+		// Get the shortcut text representation
+		var value = $tw.keyboardManager.getPrintableShortcuts([{
+			ctrlKey: event.ctrlKey,
+			shiftKey: event.shiftKey,
+			altKey: event.altKey,
+			metaKey: event.metaKey,
+			keyCode: event.keyCode
+		}]);
+		if(value.length > 0) {
+			this.wiki.setText(this.shortcutTiddler,this.shortcutField,this.shortcutIndex,value[0]);
+		}
+		// Ignore the keydown if it was already handled
+		event.preventDefault();
+		event.stopPropagation();
+		return true;		
+	} else {
+		return false;
+	}
+};
+
+/*
+Selectively refreshes the widget if needed. Returns true if the widget needed re-rendering
+*/
+EditShortcutWidget.prototype.refresh = function(changedTiddlers) {
+	var changedAttributes = this.computeAttributes();
+	if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes.placeholder || changedAttributes["default"] || changedAttributes["class"] || changedAttributes.style || changedAttributes.tooltip || changedAttributes["aria-label"]) {
+		this.refreshSelf();
+		return true;
+	} else if(changedTiddlers[this.shortcutTiddler]) {
+		this.updateInputNode();
+		return true;
+	} else {
+		return false;	
+	}
+};
+
+exports["edit-shortcut"] = EditShortcutWidget;
+
+})();
diff --git a/core/modules/widgets/edit-text.js b/core/modules/widgets/edit-text.js
index c0588f93c..bc7b77490 100644
--- a/core/modules/widgets/edit-text.js
+++ b/core/modules/widgets/edit-text.js
@@ -12,280 +12,10 @@ Edit-text widget
 /*global $tw: false */
 "use strict";
 
-var DEFAULT_MIN_TEXT_AREA_HEIGHT = "100px"; // Minimum height of textareas in pixels
+var editTextWidgetFactory = require("$:/core/modules/editor/factory.js").editTextWidgetFactory,
+	FramedEngine = require("$:/core/modules/editor/engines/framed.js").FramedEngine,
+	SimpleEngine = require("$:/core/modules/editor/engines/simple.js").SimpleEngine;
 
-var Widget = require("$:/core/modules/widgets/widget.js").widget;
-
-var EditTextWidget = function(parseTreeNode,options) {
-	this.initialise(parseTreeNode,options);
-};
-
-/*
-Inherit from the base widget class
-*/
-EditTextWidget.prototype = new Widget();
-
-/*
-Render this widget into the DOM
-*/
-EditTextWidget.prototype.render = function(parent,nextSibling) {
-	var self = this;
-	// Save the parent dom node
-	this.parentDomNode = parent;
-	// Compute our attributes
-	this.computeAttributes();
-	// Execute our logic
-	this.execute();
-	// Create our element
-	var editInfo = this.getEditInfo(),
-		tag = this.editTag;
-	if($tw.config.htmlUnsafeElements.indexOf(tag) !== -1) {
-		tag = "input";
-	}
-	var domNode = this.document.createElement(tag);
-	if(this.editType) {
-		domNode.setAttribute("type",this.editType);
-	}
-	if(editInfo.value === "" && this.editPlaceholder) {
-		domNode.setAttribute("placeholder",this.editPlaceholder);
-	}
-	if(this.editSize) {
-		domNode.setAttribute("size",this.editSize);
-	}
-	if(this.editRows) {
-		domNode.setAttribute("rows",this.editRows);
-	}
-	// Assign classes
-	if(this.editClass) {
-		domNode.className = this.editClass;
-	}
-	// Set the text
-	if(this.editTag === "textarea") {
-		domNode.appendChild(this.document.createTextNode(editInfo.value));
-	} else {
-		domNode.value = editInfo.value;
-	}
-	// Add an input event handler
-	$tw.utils.addEventListeners(domNode,[
-		{name: "focus", handlerObject: this, handlerMethod: "handleFocusEvent"},
-		{name: "input", handlerObject: this, handlerMethod: "handleInputEvent"}
-	]);
-	// Insert the element into the DOM
-	parent.insertBefore(domNode,nextSibling);
-	this.domNodes.push(domNode);
-	if(this.postRender) {
-		this.postRender();
-	}
-	// Fix height
-	this.fixHeight();
-	// Focus field
-	if(this.editFocus === "true") {
-		if(domNode.focus && domNode.select) {
-			domNode.focus();
-			domNode.select();
-		}
-	}
-};
-
-/*
-Get the tiddler being edited and current value
-*/
-EditTextWidget.prototype.getEditInfo = function() {
-	// Get the edit value
-	var self = this,
-		value,
-		update;
-	if(this.editIndex) {
-		value = this.wiki.extractTiddlerDataItem(this.editTitle,this.editIndex,this.editDefault);
-		update = function(value) {
-			var data = self.wiki.getTiddlerData(self.editTitle,{});
-			if(data[self.editIndex] !== value) {
-				data[self.editIndex] = value;
-				self.wiki.setTiddlerData(self.editTitle,data);
-			}
-		};
-	} else {
-		// Get the current tiddler and the field name
-		var tiddler = this.wiki.getTiddler(this.editTitle);
-		if(tiddler) {
-			// If we've got a tiddler, the value to display is the field string value
-			value = tiddler.getFieldString(this.editField);
-		} else {
-			// Otherwise, we need to construct a default value for the editor
-			switch(this.editField) {
-				case "text":
-					value = "Type the text for the tiddler '" + this.editTitle + "'";
-					break;
-				case "title":
-					value = this.editTitle;
-					break;
-				default:
-					value = "";
-					break;
-			}
-			if(this.editDefault !== undefined) {
-				value = this.editDefault;
-			}
-		}
-		update = function(value) {
-			var tiddler = self.wiki.getTiddler(self.editTitle),
-				updateFields = {
-					title: self.editTitle
-				};
-			updateFields[self.editField] = value;
-			self.wiki.addTiddler(new $tw.Tiddler(self.wiki.getCreationFields(),tiddler,updateFields,self.wiki.getModificationFields()));
-		};
-	}
-	return {value: value, update: update};
-};
-
-/*
-Compute the internal state of the widget
-*/
-EditTextWidget.prototype.execute = function() {
-	// Get our parameters
-	this.editTitle = this.getAttribute("tiddler",this.getVariable("currentTiddler"));
-	this.editField = this.getAttribute("field","text");
-	this.editIndex = this.getAttribute("index");
-	this.editDefault = this.getAttribute("default");
-	this.editClass = this.getAttribute("class");
-	this.editPlaceholder = this.getAttribute("placeholder");
-	this.editSize = this.getAttribute("size");
-	this.editRows = this.getAttribute("rows");
-	this.editAutoHeight = this.getAttribute("autoHeight","yes") === "yes";
-	this.editMinHeight = this.getAttribute("minHeight",DEFAULT_MIN_TEXT_AREA_HEIGHT);
-	this.editFocusPopup = this.getAttribute("focusPopup");
-	this.editFocus = this.getAttribute("focus");
-	// Get the editor element tag and type
-	var tag,type;
-	if(this.editField === "text") {
-		tag = "textarea";
-	} else {
-		tag = "input";
-		var fieldModule = $tw.Tiddler.fieldModules[this.editField];
-		if(fieldModule && fieldModule.editTag) {
-			tag = fieldModule.editTag;
-		}
-		if(fieldModule && fieldModule.editType) {
-			type = fieldModule.editType;
-		}
-		type = type || "text";
-	}
-	// Get the rest of our parameters
-	this.editTag = this.getAttribute("tag",tag);
-	this.editType = this.getAttribute("type",type);
-};
-
-/*
-Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
-*/
-EditTextWidget.prototype.refresh = function(changedTiddlers) {
-	var changedAttributes = this.computeAttributes();
-	// Completely rerender if any of our attributes have changed
-	if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes["default"] || changedAttributes["class"] || changedAttributes.placeholder || changedAttributes.size || changedAttributes.autoHeight || changedAttributes.minHeight || changedAttributes.focusPopup ||  changedAttributes.rows) {
-		this.refreshSelf();
-		return true;
-	} else if(changedTiddlers[this.editTitle]) {
-		this.updateEditor(this.getEditInfo().value);
-		return true;
-	}
-	// Fix the height anyway in case there has been a reflow
-	this.fixHeight();
-	return false;
-};
-
-/*
-Update the editor with new text. This method is separate from updateEditorDomNode()
-so that subclasses can override updateEditor() and still use updateEditorDomNode()
-*/
-EditTextWidget.prototype.updateEditor = function(text) {
-	this.updateEditorDomNode(text);
-};
-
-/*
-Update the editor dom node with new text
-*/
-EditTextWidget.prototype.updateEditorDomNode = function(text) {
-	// Replace the edit value if the tiddler we're editing has changed
-	var domNode = this.domNodes[0];
-	if(!domNode.isTiddlyWikiFakeDom) {
-		if(this.document.activeElement !== domNode) {
-			domNode.value = text;
-		}
-		// Fix the height if needed
-		this.fixHeight();
-	}
-};
-
-/*
-Get the first parent element that has scrollbars or use the body as fallback.
-*/
-EditTextWidget.prototype.getScrollContainer = function(el) {
-	while(el.parentNode) {	
-		el = el.parentNode;
-		if(el.scrollTop) {
-			return el;
-		}
-	}
-	return this.document.body;
-};
-
-/*
-Fix the height of textareas to fit their content
-*/
-EditTextWidget.prototype.fixHeight = function() {
-	var domNode = this.domNodes[0];
-	if(this.editAutoHeight && domNode && !domNode.isTiddlyWikiFakeDom && this.editTag === "textarea") {
-		// Resize the textarea to fit its content, preserving scroll position
-		// Get the scroll container and register the current scroll position
-		var container = this.getScrollContainer(domNode),
-			scrollTop = container.scrollTop;
-                // Measure the specified minimum height
-		domNode.style.height = this.editMinHeight;
-		var minHeight = domNode.offsetHeight;
-		// Set its height to auto so that it snaps to the correct height
-		domNode.style.height = "auto";
-		// Calculate the revised height
-		var newHeight = Math.max(domNode.scrollHeight + domNode.offsetHeight - domNode.clientHeight,minHeight);
-		// Only try to change the height if it has changed
-		if(newHeight !== domNode.offsetHeight) {
-			domNode.style.height = newHeight + "px";
-			// Make sure that the dimensions of the textarea are recalculated
-			$tw.utils.forceLayout(domNode);
-			// Set the container to the position we registered at the beginning
-			container.scrollTop = scrollTop;
-		}
-	}
-};
-
-/*
-Handle a dom "input" event
-*/
-EditTextWidget.prototype.handleInputEvent = function(event) {
-	this.saveChanges(this.domNodes[0].value);
-	this.fixHeight();
-	return true;
-};
-
-EditTextWidget.prototype.handleFocusEvent = function(event) {
-	if(this.editFocusPopup) {
-		$tw.popup.triggerPopup({
-			domNode: this.domNodes[0],
-			title: this.editFocusPopup,
-			wiki: this.wiki,
-			force: true
-		});
-	}
-	return true;
-};
-
-EditTextWidget.prototype.saveChanges = function(text) {
-	var editInfo = this.getEditInfo();
-	if(text !== editInfo.value) {
-		editInfo.update(text);
-	}
-};
-
-exports["edit-text"] = EditTextWidget;
+exports["edit-text"] = editTextWidgetFactory(FramedEngine,SimpleEngine);
 
 })();
diff --git a/core/modules/widgets/edit.js b/core/modules/widgets/edit.js
index 38b676e57..ebcc775ca 100644
--- a/core/modules/widgets/edit.js
+++ b/core/modules/widgets/edit.js
@@ -57,7 +57,8 @@ EditWidget.prototype.execute = function() {
 			index: {type: "string", value: this.editIndex},
 			"class": {type: "string", value: this.editClass},
 			"placeholder": {type: "string", value: this.editPlaceholder}
-		}
+		},
+		children: this.parseTreeNode.children
 	}]);
 };
 
diff --git a/core/modules/widgets/entity.js b/core/modules/widgets/entity.js
index 7e2b9dc66..5c885baea 100755
--- a/core/modules/widgets/entity.js
+++ b/core/modules/widgets/entity.js
@@ -29,7 +29,8 @@ Render this widget into the DOM
 EntityWidget.prototype.render = function(parent,nextSibling) {
 	this.parentDomNode = parent;
 	this.execute();
-	var textNode = this.document.createTextNode($tw.utils.entityDecode(this.parseTreeNode.entity));
+	var entityString = this.getAttribute("entity",this.parseTreeNode.entity || ""),
+		textNode = this.document.createTextNode($tw.utils.entityDecode(entityString));
 	parent.insertBefore(textNode,nextSibling);
 	this.domNodes.push(textNode);
 };
@@ -44,7 +45,13 @@ EntityWidget.prototype.execute = function() {
 Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
 */
 EntityWidget.prototype.refresh = function(changedTiddlers) {
-	return false;
+	var changedAttributes = this.computeAttributes();
+	if(changedAttributes.entity) {
+		this.refreshSelf();
+		return true;
+	} else {
+		return false;	
+	}
 };
 
 exports.entity = EntityWidget;
diff --git a/core/modules/widgets/fields.js b/core/modules/widgets/fields.js
index 511b6f7d5..d75a3b6e9 100755
--- a/core/modules/widgets/fields.js
+++ b/core/modules/widgets/fields.js
@@ -75,9 +75,9 @@ FieldsWidget.prototype.execute = function() {
 						value = reMatch[1];
 					}
 				}
-				row = row.replace("$name$",fieldName);
-				row = row.replace("$value$",value);
-				row = row.replace("$encoded_value$",$tw.utils.htmlEncode(value));
+				row = $tw.utils.replaceString(row,"$name$",fieldName);
+				row = $tw.utils.replaceString(row,"$value$",value);
+				row = $tw.utils.replaceString(row,"$encoded_value$",$tw.utils.htmlEncode(value));
 				text.push(row);
 			}
 		}
diff --git a/core/modules/widgets/image.js b/core/modules/widgets/image.js
index 50c0703b1..4ecafbd2b 100644
--- a/core/modules/widgets/image.js
+++ b/core/modules/widgets/image.js
@@ -87,6 +87,9 @@ ImageWidget.prototype.render = function(parent,nextSibling) {
 						src = _canonical_uri;
 						break;
 				}	
+			} else {
+				// Just trigger loading of the tiddler
+				this.wiki.getTiddlerText(this.imageSource);
 			}
 		}
 	}
diff --git a/core/modules/widgets/keyboard.js b/core/modules/widgets/keyboard.js
index df32cc5b8..8d2c105a7 100644
--- a/core/modules/widgets/keyboard.js
+++ b/core/modules/widgets/keyboard.js
@@ -41,8 +41,11 @@ KeyboardWidget.prototype.render = function(parent,nextSibling) {
 	domNode.className = classes.join(" ");
 	// Add a keyboard event handler
 	domNode.addEventListener("keydown",function (event) {
-		if($tw.utils.checkKeyDescriptor(event,self.keyInfo)) {
-			self.invokeActions(this,event);
+		if($tw.keyboardManager.checkKeyDescriptors(event,self.keyInfoArray)) {
+			self.invokeActions(self,event);
+			if(self.actions) {
+				self.invokeActionString(self.actions,self,event);
+			}
 			self.dispatchMessage(event);
 			event.preventDefault();
 			event.stopPropagation();
@@ -65,10 +68,11 @@ Compute the internal state of the widget
 */
 KeyboardWidget.prototype.execute = function() {
 	// Get attributes
+	this.actions = this.getAttribute("actions");
 	this.message = this.getAttribute("message");
 	this.param = this.getAttribute("param");
 	this.key = this.getAttribute("key");
-	this.keyInfo = $tw.utils.parseKeyDescriptor(this.key);
+	this.keyInfoArray = $tw.keyboardManager.parseKeyDescriptors(this.key);
 	this["class"] = this.getAttribute("class");
 	// Make child widgets
 	this.makeChildWidgets();
diff --git a/core/modules/widgets/link.js b/core/modules/widgets/link.js
index c749ff945..e4596c72c 100755
--- a/core/modules/widgets/link.js
+++ b/core/modules/widgets/link.js
@@ -13,6 +13,7 @@ Link widget
 "use strict";
 
 var Widget = require("$:/core/modules/widgets/widget.js").widget;
+var MISSING_LINK_CONFIG_TITLE = "$:/config/MissingLinks";
 
 var LinkWidget = function(parseTreeNode,options) {
 	this.initialise(parseTreeNode,options);
@@ -35,9 +36,10 @@ LinkWidget.prototype.render = function(parent,nextSibling) {
 	this.execute();
 	// Get the value of the tv-wikilinks configuration macro
 	var wikiLinksMacro = this.getVariable("tv-wikilinks"),
-		useWikiLinks = wikiLinksMacro ? (wikiLinksMacro.trim() !== "no") : true;
+		useWikiLinks = wikiLinksMacro ? (wikiLinksMacro.trim() !== "no") : true,
+		missingLinksEnabled = !(this.hideMissingLinks && this.isMissing && !this.isShadow);
 	// Render the link if required
-	if(useWikiLinks) {
+	if(useWikiLinks && missingLinksEnabled) {
 		this.renderLink(parent,nextSibling);
 	} else {
 		// Just insert the link text
@@ -80,8 +82,8 @@ LinkWidget.prototype.renderLink = function(parent,nextSibling) {
 	// Set an href
 	var wikiLinkTemplateMacro = this.getVariable("tv-wikilink-template"),
 		wikiLinkTemplate = wikiLinkTemplateMacro ? wikiLinkTemplateMacro.trim() : "#$uri_encoded$",
-		wikiLinkText = wikiLinkTemplate.replace("$uri_encoded$",encodeURIComponent(this.to));
-	wikiLinkText = wikiLinkText.replace("$uri_doubleencoded$",encodeURIComponent(encodeURIComponent(this.to)));
+		wikiLinkText = $tw.utils.replaceString(wikiLinkTemplate,"$uri_encoded$",encodeURIComponent(this.to));
+	wikiLinkText = $tw.utils.replaceString(wikiLinkText,"$uri_doubleencoded$",encodeURIComponent(encodeURIComponent(this.to)));
 	wikiLinkText = this.getVariable("tv-get-export-link",{params: [{name: "to",value: this.to}],defaultValue: wikiLinkText});
 	if(tag === "a") {
 		domNode.setAttribute("href",wikiLinkText);
@@ -216,6 +218,7 @@ LinkWidget.prototype.execute = function() {
 	// Determine the link characteristics
 	this.isMissing = !this.wiki.tiddlerExists(this.to);
 	this.isShadow = this.wiki.isShadowTiddler(this.to);
+	this.hideMissingLinks = ($tw.wiki.getTiddlerText(MISSING_LINK_CONFIG_TITLE,"yes") === "no");
 	// Make the child widgets
 	this.makeChildWidgets();
 };
@@ -225,7 +228,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 */
 LinkWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
-	if(changedAttributes.to || changedTiddlers[this.to] || changedAttributes["aria-label"] || changedAttributes.tooltip) {
+	if(changedAttributes.to || changedTiddlers[this.to] || changedAttributes["aria-label"] || changedAttributes.tooltip || changedTiddlers[MISSING_LINK_CONFIG_TITLE]) {
 		this.refreshSelf();
 		return true;
 	}
diff --git a/core/modules/widgets/linkcatcher.js b/core/modules/widgets/linkcatcher.js
index 51738d6d8..d279140c0 100644
--- a/core/modules/widgets/linkcatcher.js
+++ b/core/modules/widgets/linkcatcher.js
@@ -45,6 +45,7 @@ LinkCatcherWidget.prototype.execute = function() {
 	this.catchMessage = this.getAttribute("message");
 	this.catchSet = this.getAttribute("set");
 	this.catchSetTo = this.getAttribute("setTo");
+	this.catchActions = this.getAttribute("actions");
 	// Construct the child widgets
 	this.makeChildWidgets();
 };
@@ -80,6 +81,9 @@ LinkCatcherWidget.prototype.handleNavigateEvent = function(event) {
 		var tiddler = this.wiki.getTiddler(this.catchSet);
 		this.wiki.addTiddler(new $tw.Tiddler(tiddler,{title: this.catchSet, text: this.catchSetTo}));
 	}
+	if(this.catchActions) {
+		this.invokeActionString(this.catchActions,this);
+	}
 	return false;
 };
 
diff --git a/core/modules/widgets/list.js b/core/modules/widgets/list.js
index 4c5b265f2..f4981df33 100755
--- a/core/modules/widgets/list.js
+++ b/core/modules/widgets/list.js
@@ -43,6 +43,9 @@ ListWidget.prototype.render = function(parent,nextSibling) {
 	this.renderChildren(parent,nextSibling);
 	// Construct the storyview
 	var StoryView = this.storyViews[this.storyViewName];
+	if(this.storyViewName && !StoryView) {
+		StoryView = this.storyViews["classic"];
+	}
 	if(StoryView && !this.document.isTiddlyWikiFakeDom) {
 		this.storyview = new StoryView(this);
 	} else {
diff --git a/core/modules/widgets/navigator.js b/core/modules/widgets/navigator.js
index b6aab02f4..fa54a80d3 100755
--- a/core/modules/widgets/navigator.js
+++ b/core/modules/widgets/navigator.js
@@ -73,7 +73,7 @@ NavigatorWidget.prototype.refresh = function(changedTiddlers) {
 		this.refreshSelf();
 		return true;
 	} else {
-		return this.refreshChildren(changedTiddlers);		
+		return this.refreshChildren(changedTiddlers);
 	}
 };
 
@@ -355,6 +355,9 @@ NavigatorWidget.prototype.handleSaveTiddlerEvent = function(event) {
 				if(isRename) {
 					this.wiki.deleteTiddler(draftOf);
 				}
+				// #2381 always remove new title & old
+				this.removeTitleFromStory(storyList,draftTitle);
+				this.removeTitleFromStory(storyList,draftOf);
 				if(!event.paramObject || event.paramObject.suppressNavigation !== "yes") {
 					// Replace the draft in the story with the original
 					this.replaceFirstTitleInStory(storyList,title,draftTitle);
@@ -451,7 +454,7 @@ NavigatorWidget.prototype.handleNewTiddlerEvent = function(event) {
 	// Merge the tags
 	var mergedTags = [];
 	if(existingTiddler && existingTiddler.fields.tags) {
-		$tw.utils.pushTop(mergedTags,existingTiddler.fields.tags)
+		$tw.utils.pushTop(mergedTags,existingTiddler.fields.tags);
 	}
 	if(additionalFields && additionalFields.tags) {
 		// Merge tags
@@ -492,7 +495,6 @@ NavigatorWidget.prototype.handleNewTiddlerEvent = function(event) {
 
 // Import JSON tiddlers into a pending import tiddler
 NavigatorWidget.prototype.handleImportTiddlersEvent = function(event) {
-	var self = this;
 	// Get the tiddlers
 	var tiddlers = [];
 	try {
@@ -544,7 +546,7 @@ NavigatorWidget.prototype.handleImportTiddlersEvent = function(event) {
 		history.push(IMPORT_TITLE);
 		// Save the updated story and history
 		this.saveStoryList(storyList);
-		this.addToHistory(history);		
+		this.addToHistory(history);
 	}
 	return false;
 };
@@ -556,7 +558,7 @@ NavigatorWidget.prototype.handlePerformImportEvent = function(event) {
 		importData = this.wiki.getTiddlerDataCached(event.param,{tiddlers: {}}),
 		importReport = [];
 	// Add the tiddlers to the store
-	importReport.push($tw.language.getString("Import/Imported") + "\n");
+	importReport.push($tw.language.getString("Import/Imported/Hint") + "\n");
 	$tw.utils.each(importData.tiddlers,function(tiddlerFields) {
 		var title = tiddlerFields.title;
 		if(title && importTiddler && importTiddler.fields["selection-" + title] !== "unchecked") {
@@ -577,8 +579,7 @@ NavigatorWidget.prototype.handlePerformImportEvent = function(event) {
 };
 
 NavigatorWidget.prototype.handleFoldTiddlerEvent = function(event) {
-	var self = this,
-		paramObject = event.paramObject || {};
+	var paramObject = event.paramObject || {};
 	if(paramObject.foldedState) {
 		var foldedState = this.wiki.getTiddlerText(paramObject.foldedState,"show") === "show" ? "hide" : "show";
 		this.wiki.setText(paramObject.foldedState,"text",null,foldedState);
@@ -613,8 +614,7 @@ NavigatorWidget.prototype.handleUnfoldAllTiddlersEvent = function(event) {
 };
 
 NavigatorWidget.prototype.handleRenameTiddlerEvent = function(event) {
-	var self = this,
-		paramObject = event.paramObject || {},
+	var paramObject = event.paramObject || {},
 		from = paramObject.from || event.tiddlerTitle,
 		to = paramObject.to;
 	$tw.wiki.renameTiddler(from,to);
diff --git a/core/modules/widgets/select.js b/core/modules/widgets/select.js
index b0d7385cb..4d1111730 100644
--- a/core/modules/widgets/select.js
+++ b/core/modules/widgets/select.js
@@ -51,6 +51,7 @@ SelectWidget.prototype.render = function(parent,nextSibling) {
 Handle a change event
 */
 SelectWidget.prototype.handleChangeEvent = function(event) {
+	// Get the new value and assign it to the tiddler
 	if(this.selectMultiple == false) {
 		var value = this.getSelectDomNode().value;
 	} else {
@@ -58,6 +59,10 @@ SelectWidget.prototype.handleChangeEvent = function(event) {
 				value = $tw.utils.stringifyList(value);
 	}
 	this.wiki.setText(this.selectTitle,this.selectField,this.selectIndex,value);
+	// Trigger actions
+	if(this.selectActions) {
+		this.invokeActionString(this.selectActions,this,event);
+	}
 };
 
 /*
@@ -132,6 +137,7 @@ Compute the internal state of the widget
 */
 SelectWidget.prototype.execute = function() {
 	// Get our parameters
+	this.selectActions = this.getAttribute("actions");
 	this.selectTitle = this.getAttribute("tiddler",this.getVariable("currentTiddler"));
 	this.selectField = this.getAttribute("field","text");
 	this.selectIndex = this.getAttribute("index");
diff --git a/core/modules/widgets/setvariable.js b/core/modules/widgets/setvariable.js
index f75fa2c98..76844b62d 100755
--- a/core/modules/widgets/setvariable.js
+++ b/core/modules/widgets/setvariable.js
@@ -40,6 +40,7 @@ SetWidget.prototype.execute = function() {
 	// Get our parameters
 	this.setName = this.getAttribute("name","currentTiddler");
 	this.setFilter = this.getAttribute("filter");
+	this.setSelect = this.getAttribute("select");
 	this.setValue = this.getAttribute("value");
 	this.setEmptyValue = this.getAttribute("emptyValue");
 	// Set context variable
@@ -56,7 +57,15 @@ SetWidget.prototype.getValue = function() {
 	if(this.setFilter) {
 		var results = this.wiki.filterTiddlers(this.setFilter,this);
 		if(!this.setValue) {
-			value = $tw.utils.stringifyList(results);
+			var select;
+			if(this.setSelect) {
+				select = parseInt(this.setSelect,10);
+			}
+			if(select !== undefined) {
+				value = results[select] || "";
+			} else {
+				value = $tw.utils.stringifyList(results);			
+			}
 		}
 		if(results.length === 0 && this.setEmptyValue !== undefined) {
 			value = this.setEmptyValue;
@@ -72,7 +81,7 @@ Selectively refreshes the widget if needed. Returns true if the widget or any of
 */
 SetWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes();
-	if(changedAttributes.name || changedAttributes.filter || changedAttributes.value || changedAttributes.emptyValue ||
+	if(changedAttributes.name || changedAttributes.filter || changedAttributes.select ||changedAttributes.value || changedAttributes.emptyValue ||
 	   (this.setFilter && this.getValue() != this.variables[this.setName].value)) {
 		this.refreshSelf();
 		return true;
diff --git a/core/modules/widgets/transclude.js b/core/modules/widgets/transclude.js
index 34a912851..7af61fc8e 100755
--- a/core/modules/widgets/transclude.js
+++ b/core/modules/widgets/transclude.js
@@ -68,7 +68,7 @@ TranscludeWidget.prototype.execute = function() {
 			parseTreeNodes = [{type: "element", tag: "span", attributes: {
 				"class": {type: "string", value: "tc-error"}
 			}, children: [
-				{type: "text", text: "Recursive transclusion error in transclude widget"}
+				{type: "text", text: $tw.language.getString("Error/RecursiveTransclusion")}
 			]}];
 		}
 	}
diff --git a/core/modules/widgets/view.js b/core/modules/widgets/view.js
index 5e1fa9a01..bbe9106be 100755
--- a/core/modules/widgets/view.js
+++ b/core/modules/widgets/view.js
@@ -55,6 +55,9 @@ ViewWidget.prototype.execute = function() {
 		case "htmlwikified":
 			this.text = this.getValueAsHtmlWikified();
 			break;
+		case "plainwikified":
+			this.text = this.getValueAsPlainWikified();
+			break;
 		case "htmlencodedplainwikified":
 			this.text = this.getValueAsHtmlEncodedPlainWikified();
 			break;
@@ -135,6 +138,10 @@ ViewWidget.prototype.getValueAsHtmlWikified = function() {
 	return this.wiki.renderText("text/html","text/vnd.tiddlywiki",this.getValueAsText(),{parentWidget: this});
 };
 
+ViewWidget.prototype.getValueAsPlainWikified = function() {
+	return this.wiki.renderText("text/plain","text/vnd.tiddlywiki",this.getValueAsText(),{parentWidget: this});
+};
+
 ViewWidget.prototype.getValueAsHtmlEncodedPlainWikified = function() {
 	return $tw.utils.htmlEncode(this.wiki.renderText("text/plain","text/vnd.tiddlywiki",this.getValueAsText(),{parentWidget: this}));
 };
diff --git a/core/modules/widgets/widget.js b/core/modules/widgets/widget.js
index 679433071..f4905d433 100755
--- a/core/modules/widgets/widget.js
+++ b/core/modules/widgets/widget.js
@@ -125,7 +125,7 @@ Widget.prototype.substituteVariableParameters = function(text,formalParams,actua
 			// If we've still not got a value, use the default, if any
 			paramValue = paramValue || paramInfo["default"] || "";
 			// Replace any instances of this parameter
-			text = text.replace(new RegExp("\\$" + $tw.utils.escapeRegExp(paramInfo.name) + "\\$","mg"),paramValue);
+			text = $tw.utils.replaceString(text,new RegExp("\\$" + $tw.utils.escapeRegExp(paramInfo.name) + "\\$","mg"),paramValue);
 		}
 	}
 	return text;
@@ -222,7 +222,9 @@ Widget.prototype.computeAttributes = function() {
 		self = this,
 		value;
 	$tw.utils.each(this.parseTreeNode.attributes,function(attribute,name) {
-		if(attribute.type === "indirect") {
+		if(attribute.type === "filtered") {
+			value = self.wiki.filterTiddlers(attribute.filter,self)[0] || "";
+		} else if(attribute.type === "indirect") {
 			value = self.wiki.getTextReference(attribute.textReference,"",self.getVariable("currentTiddler"));
 		} else if(attribute.type === "macro") {
 			value = self.getVariable(attribute.value.name,{params: attribute.value.params});
@@ -493,8 +495,11 @@ Widget.prototype.invokeActions = function(triggeringWidget,event) {
 	for(var t=0; t<this.children.length; t++) {
 		var child = this.children[t];
 		// Invoke the child if it is an action widget
-		if(child.invokeAction && child.invokeAction(triggeringWidget,event)) {
-			handled = true;
+		if(child.invokeAction) {
+			child.refreshSelf();
+			if(child.invokeAction(triggeringWidget,event)) {
+				handled = true;
+			}
 		}
 		// Propagate through through the child if it permits it
 		if(child.allowActionPropagation() && child.invokeActions(triggeringWidget,event)) {
@@ -504,6 +509,23 @@ Widget.prototype.invokeActions = function(triggeringWidget,event) {
 	return handled;
 };
 
+/*
+Invoke the action widgets defined in a string
+*/
+Widget.prototype.invokeActionString = function(actions,triggeringWidget,event) {
+	actions = actions || "";
+	var parser = this.wiki.parseText("text/vnd.tiddlywiki",actions,{
+			parentWidget: this,
+			document: this.document
+		}),
+		widgetNode = this.wiki.makeWidget(parser,{
+			parentWidget: this,
+			document: this.document
+		});
+	var container = this.document.createElement("div");
+	widgetNode.render(container,null);
+	return widgetNode.invokeActions(this,event);
+};
 
 Widget.prototype.allowActionPropagation = function() {
 	return true;
diff --git a/core/modules/widgets/wikify.js b/core/modules/widgets/wikify.js
new file mode 100644
index 000000000..853ebff1b
--- /dev/null
+++ b/core/modules/widgets/wikify.js
@@ -0,0 +1,157 @@
+/*\
+title: $:/core/modules/widgets/wikify.js
+type: application/javascript
+module-type: widget
+
+Widget to wikify text into a variable
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+var Widget = require("$:/core/modules/widgets/widget.js").widget;
+
+var WikifyWidget = function(parseTreeNode,options) {
+	this.initialise(parseTreeNode,options);
+};
+
+/*
+Inherit from the base widget class
+*/
+WikifyWidget.prototype = new Widget();
+
+/*
+Render this widget into the DOM
+*/
+WikifyWidget.prototype.render = function(parent,nextSibling) {
+	this.parentDomNode = parent;
+	this.computeAttributes();
+	this.execute();
+	this.renderChildren(parent,nextSibling);
+};
+
+/*
+Compute the internal state of the widget
+*/
+WikifyWidget.prototype.execute = function() {
+	// Get our parameters
+	this.wikifyName = this.getAttribute("name");
+	this.wikifyText = this.getAttribute("text");
+	this.wikifyType = this.getAttribute("type");
+	this.wikifyMode = this.getAttribute("mode","block");
+	this.wikifyOutput = this.getAttribute("output","text");
+	// Create the parse tree
+	this.wikifyParser = this.wiki.parseText(this.wikifyType,this.wikifyText,{
+			parseAsInline: this.wikifyMode === "inline"
+		});
+	// Create the widget tree 
+	this.wikifyWidgetNode = this.wiki.makeWidget(this.wikifyParser,{
+			document: $tw.fakeDocument,
+			parentWidget: this
+		});
+	// Render the widget tree to the container
+	this.wikifyContainer = $tw.fakeDocument.createElement("div");
+	this.wikifyWidgetNode.render(this.wikifyContainer,null);
+	this.wikifyResult = this.getResult();
+	// Set context variable
+	this.setVariable(this.wikifyName,this.wikifyResult);
+	// Construct the child widgets
+	this.makeChildWidgets();
+};
+
+/*
+Return the result string
+*/
+WikifyWidget.prototype.getResult = function() {
+	var result;
+	switch(this.wikifyOutput) {
+		case "text":
+			result = this.wikifyContainer.textContent;
+			break;
+		case "formattedtext":
+			result = this.wikifyContainer.formattedTextContent;
+			break;
+		case "html":
+			result = this.wikifyContainer.innerHTML;
+			break;
+		case "parsetree":
+			result = JSON.stringify(this.wikifyParser.tree,0,$tw.config.preferences.jsonSpaces);
+			break;
+		case "widgettree":
+			result = JSON.stringify(this.getWidgetTree(),0,$tw.config.preferences.jsonSpaces);
+			break;
+	}
+	return result;
+};
+
+/*
+Return a string of the widget tree
+*/
+WikifyWidget.prototype.getWidgetTree = function() {
+	var copyNode = function(widgetNode,resultNode) {
+			var type = widgetNode.parseTreeNode.type;
+			resultNode.type = type;
+			switch(type) {
+				case "element":
+					resultNode.tag = widgetNode.parseTreeNode.tag;
+					break;
+				case "text":
+					resultNode.text = widgetNode.parseTreeNode.text;
+					break;	
+			}
+			if(Object.keys(widgetNode.attributes || {}).length > 0) {
+				resultNode.attributes = {};
+				$tw.utils.each(widgetNode.attributes,function(attr,attrName) {
+					resultNode.attributes[attrName] = widgetNode.getAttribute(attrName);
+				});
+			}
+			if(Object.keys(widgetNode.children || {}).length > 0) {
+				resultNode.children = [];
+				$tw.utils.each(widgetNode.children,function(widgetChildNode) {
+					var node = {};
+					resultNode.children.push(node);
+					copyNode(widgetChildNode,node);
+				});
+			}
+		},
+		results = {};
+	copyNode(this.wikifyWidgetNode,results);
+	return results;
+};
+
+/*
+Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
+*/
+WikifyWidget.prototype.refresh = function(changedTiddlers) {
+	var changedAttributes = this.computeAttributes();
+	// Refresh ourselves entirely if any of our attributes have changed
+	if(changedAttributes.name || changedAttributes.text || changedAttributes.type || changedAttributes.mode || changedAttributes.output) {
+		this.refreshSelf();
+		return true;
+	} else {
+		// Refresh the widget tree
+		if(this.wikifyWidgetNode.refresh(changedTiddlers)) {
+			// Check if there was any change
+			var result = this.getResult();
+			if(result !== this.wikifyResult) {
+				// If so, save the change
+				this.wikifyResult = result;
+				this.setVariable(this.wikifyName,this.wikifyResult);
+				// Refresh each of our child widgets
+				$tw.utils.each(this.children,function(childWidget) {
+					childWidget.refreshSelf();
+				});
+				return true;
+			}
+		}
+		// Just refresh the children
+		return this.refreshChildren(changedTiddlers);
+	}
+};
+
+exports.wikify = WikifyWidget;
+
+})();
diff --git a/core/modules/wiki.js b/core/modules/wiki.js
index 64abe9e89..63e31303c 100755
--- a/core/modules/wiki.js
+++ b/core/modules/wiki.js
@@ -328,7 +328,7 @@ exports.sortTiddlers = function(titles,sortField,isDescending,isCaseSensitive,is
 				var result = 
 					isNaN(x) && !isNaN(y) ? (isDescending ? -1 : 1) :
 					!isNaN(x) && isNaN(y) ? (isDescending ? 1 : -1) :
-					                        (isDescending ? y - x :  x - y);
+											(isDescending ? y - x :  x - y);
 				return result;
 			};
 		if(sortField !== "title") {
@@ -784,6 +784,7 @@ Options include:
 	_canonical_uri: optional string of the canonical URI of this content
 */
 exports.parseText = function(type,text,options) {
+	text = text || "";
 	options = options || {};
 	// Select a parser
 	var Parser = $tw.Wiki.parsers[type];
@@ -903,31 +904,54 @@ options: as for wiki.makeWidget() plus:
 options.field: optional field to transclude (defaults to "text")
 options.mode: transclusion mode "inline" or "block"
 options.children: optional array of children for the transclude widget
+options.importVariables: optional importvariables filter string for macros to be included
+options.importPageMacros: optional boolean; if true, equivalent to passing "[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]" to options.importVariables
 */
 exports.makeTranscludeWidget = function(title,options) {
 	options = options || {};
-	var parseTree = {tree: [{
+	var parseTreeDiv = {tree: [{
 			type: "element",
 			tag: "div",
-			children: [{
-				type: "transclude",
-				attributes: {
-					tiddler: {
-						name: "tiddler",
-						type: "string",
-						value: title}},
-				isBlock: !options.parseAsInline}]}
-	]};
+			children: []}]},
+		parseTreeImportVariables = {
+			type: "importvariables",
+			attributes: {
+				filter: {
+					name: "filter",
+					type: "string"
+				}
+			},
+			isBlock: false,
+			children: []},
+		parseTreeTransclude = {
+			type: "transclude",
+			attributes: {
+				tiddler: {
+					name: "tiddler",
+					type: "string",
+					value: title}},
+			isBlock: !options.parseAsInline};
+	if(options.importVariables || options.importPageMacros) {
+		if(options.importVariables) {
+			parseTreeImportVariables.attributes.filter.value = options.importVariables;
+		} else if(options.importPageMacros) {
+			parseTreeImportVariables.attributes.filter.value = "[[$:/core/ui/PageMacros]] [all[shadows+tiddlers]tag[$:/tags/Macro]!has[draft.of]]";
+		}
+		parseTreeDiv.tree[0].children.push(parseTreeImportVariables);
+		parseTreeImportVariables.children.push(parseTreeTransclude);
+	} else {
+		parseTreeDiv.tree[0].children.push(parseTreeTransclude);
+	}
 	if(options.field) {
-		parseTree.tree[0].children[0].attributes.field = {type: "string", value: options.field};
+		parseTreeTransclude.attributes.field = {type: "string", value: options.field};
 	}
 	if(options.mode) {
-		parseTree.tree[0].children[0].attributes.mode = {type: "string", value: options.mode};
+		parseTreeTransclude.attributes.mode = {type: "string", value: options.mode};
 	}
 	if(options.children) {
-		parseTree.tree[0].children[0].children = options.children;
+		parseTreeTransclude.children = options.children;
 	}
-	return $tw.wiki.makeWidget(parseTree,options);
+	return $tw.wiki.makeWidget(parseTreeDiv,options);
 };
 
 /*
@@ -1117,29 +1141,24 @@ exports.readFile = function(file,callback) {
 	var reader = new FileReader();
 	// Onload
 	reader.onload = function(event) {
-		// Deserialise the file contents
 		var text = event.target.result,
 			tiddlerFields = {title: file.name || "Untitled", type: type};
-		// Are we binary?
 		if(isBinary) {
-			// The base64 section starts after the first comma in the data URI
 			var commaPos = text.indexOf(",");
 			if(commaPos !== -1) {
-				tiddlerFields.text = text.substr(commaPos+1);
-				callback([tiddlerFields]);
+				text = text.substr(commaPos + 1);
 			}
+		}
+		// Check whether this is an encrypted TiddlyWiki file
+		var encryptedJson = $tw.utils.extractEncryptedStoreArea(text);
+		if(encryptedJson) {
+			// If so, attempt to decrypt it with the current password
+			$tw.utils.decryptStoreAreaInteractive(encryptedJson,function(tiddlers) {
+				callback(tiddlers);
+			});
 		} else {
-			// Check whether this is an encrypted TiddlyWiki file
-			var encryptedJson = $tw.utils.extractEncryptedStoreArea(text);
-			if(encryptedJson) {
-				// If so, attempt to decrypt it with the current password
-				$tw.utils.decryptStoreAreaInteractive(encryptedJson,function(tiddlers) {
-					callback(tiddlers);
-				});
-			} else {
-				// Otherwise, just try to deserialise any tiddlers in the file
-				callback(self.deserializeTiddlers(type,text,tiddlerFields));
-			}
+			// Otherwise, just try to deserialise any tiddlers in the file
+			callback(self.deserializeTiddlers(type,text,tiddlerFields));
 		}
 	};
 	// Kick off the read
@@ -1164,7 +1183,9 @@ exports.findDraft = function(targetTitle) {
 }
 
 /*
-Check whether the specified draft tiddler has been modified
+Check whether the specified draft tiddler has been modified.
+If the original tiddler doesn't exist, create  a vanilla tiddler variable,
+to check if additional fields have been added.
 */
 exports.isDraftModified = function(title) {
 	var tiddler = this.getTiddler(title);
@@ -1172,11 +1193,9 @@ exports.isDraftModified = function(title) {
 		return false;
 	}
 	var ignoredFields = ["created", "modified", "title", "draft.title", "draft.of"],
-		origTiddler = this.getTiddler(tiddler.fields["draft.of"]);
-	if(!origTiddler) {
-		return tiddler.fields.text !== "";
-	}
-	return tiddler.fields["draft.title"] !== tiddler.fields["draft.of"] || !tiddler.isEqual(origTiddler,ignoredFields);
+		origTiddler = this.getTiddler(tiddler.fields["draft.of"]) || new $tw.Tiddler({text:"", tags:[]}),
+		titleModified = tiddler.fields["draft.title"] !== tiddler.fields["draft.of"];
+	return titleModified || !tiddler.isEqual(origTiddler,ignoredFields);
 };
 
 /*
@@ -1218,3 +1237,4 @@ exports.invokeUpgraders = function(titles,tiddlers) {
 };
 
 })();
+
diff --git a/core/templates/raw-static-tiddler.tid b/core/templates/raw-static-tiddler.tid
new file mode 100644
index 000000000..0531a391c
--- /dev/null
+++ b/core/templates/raw-static-tiddler.tid
@@ -0,0 +1,7 @@
+title: $:/core/templates/raw-static-tiddler
+
+<!--
+
+This template is used for saving tiddlers as static HTML
+
+--><$view field="text" format="plainwikified" />
\ No newline at end of file
diff --git a/core/templates/static.area.tid b/core/templates/static.area.tid
index a7fbdf7bc..d235ab4ed 100644
--- a/core/templates/static.area.tid
+++ b/core/templates/static.area.tid
@@ -1,6 +1,7 @@
 title: $:/core/templates/static.area
 
 <$reveal type="nomatch" state="$:/isEncrypted" text="yes">
+{{{ [all[shadows+tiddlers]tag[$:/tags/RawStaticContent]!has[draft.of]] ||$:/core/templates/raw-static-tiddler}}}
 {{$:/core/templates/static.content||$:/core/templates/html-tiddler}}
 </$reveal>
 <$reveal type="match" state="$:/isEncrypted" text="yes">
diff --git a/core/templates/static.template.html.tid b/core/templates/static.template.html.tid
index 27a2e324d..5da5fb752 100644
--- a/core/templates/static.template.html.tid
+++ b/core/templates/static.template.html.tid
@@ -15,6 +15,7 @@ type: text/vnd.tiddlywiki-html
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <meta name="apple-mobile-web-app-capable" content="yes" />
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
+<meta name="mobile-web-app-capable" content="yes"/>
 <meta name="format-detection" content="telephone=no">
 <link id="faviconLink" rel="shortcut icon" href="favicon.ico">
 <title>{{$:/core/wiki/title}}</title>
diff --git a/core/templates/static.tiddler.html.tid b/core/templates/static.tiddler.html.tid
index bcc008660..6fb56b6cd 100644
--- a/core/templates/static.tiddler.html.tid
+++ b/core/templates/static.tiddler.html.tid
@@ -13,6 +13,7 @@ title: $:/core/templates/static.tiddler.html
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <meta name="apple-mobile-web-app-capable" content="yes" />
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
+<meta name="mobile-web-app-capable" content="yes"/>
 <meta name="format-detection" content="telephone=no">
 <link id="faviconLink" rel="shortcut icon" href="favicon.ico">
 <link rel="stylesheet" href="static.css">
diff --git a/core/templates/tiddlywiki5.html.tid b/core/templates/tiddlywiki5.html.tid
index 3f8701f18..160d5040b 100644
--- a/core/templates/tiddlywiki5.html.tid
+++ b/core/templates/tiddlywiki5.html.tid
@@ -12,6 +12,7 @@ title: $:/core/templates/tiddlywiki5.html
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <meta name="apple-mobile-web-app-capable" content="yes" />
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
+<meta name="mobile-web-app-capable" content="yes"/>
 <meta name="format-detection" content="telephone=no" />
 <meta name="copyright" content="{{$:/core/copyright.txt}}" />
 <link id="faviconLink" rel="shortcut icon" href="favicon.ico">
diff --git a/core/ui/AboveStory/tw2-plugin-check.tid b/core/ui/AboveStory/tw2-plugin-check.tid
index cce2deb9c..6c3687ad2 100644
--- a/core/ui/AboveStory/tw2-plugin-check.tid
+++ b/core/ui/AboveStory/tw2-plugin-check.tid
@@ -10,7 +10,7 @@ tags: $:/tags/AboveStory
 
 <ul>
 
-<$list filter="[all[system+tiddlers]tag[systemConfig]limit[1]]">
+<$list filter="[all[system+tiddlers]tag[systemConfig]]">
 
 <li>
 
diff --git a/core/ui/AdvancedSearch/Filter.tid b/core/ui/AdvancedSearch/Filter.tid
index 93179bbaa..f6f13a863 100644
--- a/core/ui/AdvancedSearch/Filter.tid
+++ b/core/ui/AdvancedSearch/Filter.tid
@@ -3,35 +3,13 @@ tags: $:/tags/AdvancedSearch
 caption: {{$:/language/Search/Filter/Caption}}
 
 \define lingo-base() $:/language/Search/
-<$linkcatcher to="$:/temp/advancedsearch">
-
 <<lingo Filter/Hint>>
 
 <div class="tc-search tc-advanced-search">
 <$edit-text tiddler="$:/temp/advancedsearch" type="search" tag="input"/>
-<$button popup=<<qualify "$:/state/filterDropdown">> class="tc-btn-invisible">
-{{$:/core/images/down-arrow}}
-</$button>
-<$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
-<$button class="tc-btn-invisible">
-<$action-setfield $tiddler="$:/temp/advancedsearch" $field="text" $value=""/>
-{{$:/core/images/close-button}}
-</$button>
-<$macrocall $name="exportButton" exportFilter={{$:/temp/advancedsearch}} lingoBase="$:/language/Buttons/ExportTiddlers/"/>
-</$reveal>
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/AdvancedSearch/FilterButton]!has[draft.of]]"><$transclude/></$list>
 </div>
 
-<div class="tc-block-dropdown-wrapper">
-<$reveal state=<<qualify "$:/state/filterDropdown">> type="nomatch" text="" default="">
-<div class="tc-block-dropdown tc-edit-type-dropdown">
-<$list filter="[all[shadows+tiddlers]tag[$:/tags/Filter]]"><$link to={{!!filter}}><$transclude field="description"/></$link>
-</$list>
-</div>
-</$reveal>
-</div>
-
-</$linkcatcher>
-
 <$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
 <$set name="resultCount" value="""<$count filter={{$:/temp/advancedsearch}}/>""">
 <div class="tc-search-results">
diff --git a/core/ui/AdvancedSearch/FilterButtons/clear.tid b/core/ui/AdvancedSearch/FilterButtons/clear.tid
new file mode 100644
index 000000000..3dd22e03d
--- /dev/null
+++ b/core/ui/AdvancedSearch/FilterButtons/clear.tid
@@ -0,0 +1,9 @@
+title: $:/core/ui/AdvancedSearch/Filter/FilterButtons/clear
+tags: $:/tags/AdvancedSearch/FilterButton
+
+<$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
+<$button class="tc-btn-invisible">
+<$action-setfield $tiddler="$:/temp/advancedsearch" $field="text" $value=""/>
+{{$:/core/images/close-button}}
+</$button>
+</$reveal>
diff --git a/core/ui/AdvancedSearch/FilterButtons/delete.tid b/core/ui/AdvancedSearch/FilterButtons/delete.tid
new file mode 100644
index 000000000..fea48a667
--- /dev/null
+++ b/core/ui/AdvancedSearch/FilterButtons/delete.tid
@@ -0,0 +1,26 @@
+title: $:/core/ui/AdvancedSearch/Filter/FilterButtons/delete
+tags: $:/tags/AdvancedSearch/FilterButton
+
+<$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
+<$button popup=<<qualify "$:/state/filterDeleteDropdown">> class="tc-btn-invisible">
+{{$:/core/images/delete-button}}
+</$button>
+</$reveal>
+
+<$reveal state=<<qualify "$:/state/filterDeleteDropdown">> type="popup" position="belowleft" animate="yes">
+<div class="tc-block-dropdown-wrapper">
+<div class="tc-block-dropdown tc-edit-type-dropdown">
+<div class="tc-dropdown-item-plain">
+<$set name="resultCount" value="""<$count filter={{$:/temp/advancedsearch}}/>""">
+Are you sure you wish to delete <<resultCount>> tiddler(s)?
+</$set>
+</div>
+<div class="tc-dropdown-item-plain">
+<$button class="tc-btn">
+<$action-deletetiddler $filter={{$:/temp/advancedsearch}}/>
+Delete these tiddlers
+</$button>
+</div>
+</div>
+</div>
+</$reveal>
diff --git a/core/ui/AdvancedSearch/FilterButtons/dropdown.tid b/core/ui/AdvancedSearch/FilterButtons/dropdown.tid
new file mode 100644
index 000000000..ee1c5eb37
--- /dev/null
+++ b/core/ui/AdvancedSearch/FilterButtons/dropdown.tid
@@ -0,0 +1,19 @@
+title: $:/core/ui/AdvancedSearch/Filter/FilterButtons/dropdown
+tags: $:/tags/AdvancedSearch/FilterButton
+
+<span class="tc-popup-keep">
+<$button popup=<<qualify "$:/state/filterDropdown">> class="tc-btn-invisible">
+{{$:/core/images/down-arrow}}
+</$button>
+</span>
+
+<$reveal state=<<qualify "$:/state/filterDropdown">> type="popup" position="belowleft" animate="yes">
+<$linkcatcher to="$:/temp/advancedsearch">
+<div class="tc-block-dropdown-wrapper">
+<div class="tc-block-dropdown tc-edit-type-dropdown">
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/Filter]]"><$link to={{!!filter}}><$transclude field="description"/></$link>
+</$list>
+</div>
+</div>
+</$linkcatcher>
+</$reveal>
diff --git a/core/ui/AdvancedSearch/FilterButtons/export.tid b/core/ui/AdvancedSearch/FilterButtons/export.tid
new file mode 100644
index 000000000..ec9ea91ac
--- /dev/null
+++ b/core/ui/AdvancedSearch/FilterButtons/export.tid
@@ -0,0 +1,6 @@
+title: $:/core/ui/AdvancedSearch/Filter/FilterButtons/export
+tags: $:/tags/AdvancedSearch/FilterButton
+
+<$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
+<$macrocall $name="exportButton" exportFilter={{$:/temp/advancedsearch}} lingoBase="$:/language/Buttons/ExportTiddlers/"/>
+</$reveal>
diff --git a/core/ui/AdvancedSearch/Shadows.tid b/core/ui/AdvancedSearch/Shadows.tid
index cd4a6cd38..b2455bfbb 100644
--- a/core/ui/AdvancedSearch/Shadows.tid
+++ b/core/ui/AdvancedSearch/Shadows.tid
@@ -21,6 +21,8 @@ caption: {{$:/language/Search/Shadows/Caption}}
 
 <$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
 
+<$list filter="[{$:/temp/advancedsearch}minlength{$:/config/Search/MinLength}limit[1]]" emptyMessage="""<div class="tc-search-results">{{$:/language/Search/Search/TooShort}}</div>""" variable="listItem">
+
 <$set name="resultCount" value="""<$count filter="[all[shadows]search{$:/temp/advancedsearch}] -[[$:/temp/advancedsearch]]"/>""">
 
 <div class="tc-search-results">
@@ -33,6 +35,8 @@ caption: {{$:/language/Search/Shadows/Caption}}
 
 </$set>
 
+</$list>
+
 </$reveal>
 
 <$reveal state="$:/temp/advancedsearch" type="match" text="">
diff --git a/core/ui/AdvancedSearch/Standard.tid b/core/ui/AdvancedSearch/Standard.tid
index 174e6b24a..2342cb5b7 100644
--- a/core/ui/AdvancedSearch/Standard.tid
+++ b/core/ui/AdvancedSearch/Standard.tid
@@ -20,6 +20,7 @@ caption: {{$:/language/Search/Standard/Caption}}
 </$linkcatcher>
 
 <$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
+<$list filter="[{$:/temp/advancedsearch}minlength{$:/config/Search/MinLength}limit[1]]" emptyMessage="""<div class="tc-search-results">{{$:/language/Search/Search/TooShort}}</div>""" variable="listItem">
 <$set name="searchTiddler" value="$:/temp/advancedsearch">
 <$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]]">
@@ -29,4 +30,5 @@ caption: {{$:/language/Search/Standard/Caption}}
 <$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/SearchResults]!has[draft.of]]" default={{$:/config/SearchResults/Default}}/>
 </$list>
 </$set>
+</$list>
 </$reveal>
diff --git a/core/ui/AdvancedSearch/System.tid b/core/ui/AdvancedSearch/System.tid
index 19cdfa86e..6de9d0786 100644
--- a/core/ui/AdvancedSearch/System.tid
+++ b/core/ui/AdvancedSearch/System.tid
@@ -21,6 +21,8 @@ caption: {{$:/language/Search/System/Caption}}
 
 <$reveal state="$:/temp/advancedsearch" type="nomatch" text="">
 
+<$list filter="[{$:/temp/advancedsearch}minlength{$:/config/Search/MinLength}limit[1]]" emptyMessage="""<div class="tc-search-results">{{$:/language/Search/Search/TooShort}}</div>""" variable="listItem">
+
 <$set name="resultCount" value="""<$count filter="[is[system]search{$:/temp/advancedsearch}] -[[$:/temp/advancedsearch]]"/>""">
 
 <div class="tc-search-results">
@@ -33,6 +35,8 @@ caption: {{$:/language/Search/System/Caption}}
 
 </$set>
 
+</$list>
+
 </$reveal>
 
 <$reveal state="$:/temp/advancedsearch" type="match" text="">
diff --git a/core/ui/AlertTemplate.tid b/core/ui/AlertTemplate.tid
index 87ddbd376..bcfc3c3fa 100644
--- a/core/ui/AlertTemplate.tid
+++ b/core/ui/AlertTemplate.tid
@@ -5,7 +5,7 @@ title: $:/core/ui/AlertTemplate
 <$button class="tc-btn-invisible"><$action-deletetiddler $tiddler=<<currentTiddler>>/>{{$:/core/images/delete-button}}</$button>
 </div>
 <div class="tc-alert-subtitle">
-<$view field="component"/> - <$view field="modified" format="date" template="0hh:0mm:0ss DD MM YYYY"/> <$reveal type="nomatch" state="!!count" text=""><span class="tc-alert-highlight">(count: <$view field="count"/>)</span></$reveal>
+<$view field="component"/> - <$view field="modified" format="date" template="0hh:0mm:0ss DD MM YYYY"/> <$reveal type="nomatch" state="!!count" text=""><span class="tc-alert-highlight">({{$:/language/Count}}: <$view field="count"/>)</span></$reveal>
 </div>
 <div class="tc-alert-body">
 
diff --git a/core/ui/Components/plugin-info.tid b/core/ui/Components/plugin-info.tid
new file mode 100644
index 000000000..a5fbf141a
--- /dev/null
+++ b/core/ui/Components/plugin-info.tid
@@ -0,0 +1,95 @@
+title: $:/core/ui/Components/plugin-info
+
+\define lingo-base() $:/language/ControlPanel/Plugins/
+
+\define popup-state-macro()
+$(qualified-state)$-$(currentTiddler)$
+\end
+
+\define tabs-state-macro()
+$(popup-state)$-$(pluginInfoType)$
+\end
+
+\define plugin-icon-title()
+$(currentTiddler)$/icon
+\end
+
+\define plugin-disable-title()
+$:/config/Plugins/Disabled/$(currentTiddler)$
+\end
+
+\define plugin-table-body(type,disabledMessage,default-popup-state)
+<div class="tc-plugin-info-chunk tc-small-icon">
+<$reveal type="nomatch" state=<<popup-state>> text="yes" default="""$default-popup-state$""">
+<$button class="tc-btn-invisible tc-btn-dropdown" set=<<popup-state>> setTo="yes">
+{{$:/core/images/right-arrow}}
+</$button>
+</$reveal>
+<$reveal type="match" state=<<popup-state>> text="yes" default="""$default-popup-state$""">
+<$button class="tc-btn-invisible tc-btn-dropdown" set=<<popup-state>> setTo="no">
+{{$:/core/images/down-arrow}}
+</$button>
+</$reveal>
+</div>
+<div class="tc-plugin-info-chunk">
+<$transclude tiddler=<<currentTiddler>> subtiddler=<<plugin-icon-title>>>
+<$transclude tiddler="$:/core/images/plugin-generic-$type$"/>
+</$transclude>
+</div>
+<div class="tc-plugin-info-chunk">
+<h1>
+''<$view field="description"><$view field="title"/></$view>'' $disabledMessage$
+</h1>
+<h2>
+<$view field="title"/>
+</h2>
+<h2>
+<div><em><$view field="version"/></em></div>
+</h2>
+</div>
+\end
+
+\define plugin-info(type,default-popup-state)
+<$set name="popup-state" value=<<popup-state-macro>>>
+<$reveal type="nomatch" state=<<plugin-disable-title>> text="yes">
+<$link to={{!!title}} class="tc-plugin-info">
+<<plugin-table-body type:"$type$" default-popup-state:"""$default-popup-state$""">>
+</$link>
+</$reveal>
+<$reveal type="match" state=<<plugin-disable-title>> text="yes">
+<$link to={{!!title}} class="tc-plugin-info tc-plugin-info-disabled">
+<<plugin-table-body type:"$type$" default-popup-state:"""$default-popup-state$""" disabledMessage:"<$macrocall $name='lingo' title='Disabled/Status'/>">>
+</$link>
+</$reveal>
+<$reveal type="match" text="yes" state=<<popup-state>> default="""$default-popup-state$""">
+<div class="tc-plugin-info-dropdown">
+<div class="tc-plugin-info-dropdown-body">
+<$list filter="[all[current]] -[[$:/core]]">
+<div style="float:right;">
+<$reveal type="nomatch" state=<<plugin-disable-title>> text="yes">
+<$button set=<<plugin-disable-title>> setTo="yes" tooltip={{$:/language/ControlPanel/Plugins/Disable/Hint}} aria-label={{$:/language/ControlPanel/Plugins/Disable/Caption}}>
+<<lingo Disable/Caption>>
+</$button>
+</$reveal>
+<$reveal type="match" state=<<plugin-disable-title>> text="yes">
+<$button set=<<plugin-disable-title>> setTo="no" tooltip={{$:/language/ControlPanel/Plugins/Enable/Hint}} aria-label={{$:/language/ControlPanel/Plugins/Enable/Caption}}>
+<<lingo Enable/Caption>>
+</$button>
+</$reveal>
+</div>
+</$list>
+<$reveal type="nomatch" text="" state="!!list">
+<$set name="tabsList" filter="[<currentTiddler>list[]] contents">
+<$macrocall $name="tabs" state=<<tabs-state-macro>> tabsList=<<tabsList>> default="readme" template="$:/core/ui/PluginInfo"/>
+</$set>
+</$reveal>
+<$reveal type="match" text="" state="!!list">
+<<lingo NoInformation/Hint>>
+</$reveal>
+</div>
+</div>
+</$reveal>
+</$set>
+\end
+
+<$macrocall $name="plugin-info" type=<<plugin-type>> default-popup-state=<<default-popup-state>>/>
diff --git a/core/ui/ControlPanel/Basics.tid b/core/ui/ControlPanel/Basics.tid
index 714954a35..52ff077c3 100644
--- a/core/ui/ControlPanel/Basics.tid
+++ b/core/ui/ControlPanel/Basics.tid
@@ -19,7 +19,7 @@ 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-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit tag="textarea" tiddler="$:/DefaultTiddlers" class="tc-edit-texteditor"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
 |<$link to="$:/config/NewJournal/Title"><<lingo NewJournal/Title/Prompt>></$link> |<$edit-text tiddler="$:/config/NewJournal/Title" default="" tag="input"/> |
 |<$link to="$:/config/NewJournal/Tags"><<lingo NewJournal/Tags/Prompt>></$link> |<$edit-text tiddler="$:/config/NewJournal/Tags" default="" tag="input"/> |
 |<<lingo Language/Prompt>> |{{$:/snippets/minilanguageswitcher}} |
diff --git a/core/ui/ControlPanel/KeyboardShortcuts.tid b/core/ui/ControlPanel/KeyboardShortcuts.tid
new file mode 100644
index 000000000..64301a4ac
--- /dev/null
+++ b/core/ui/ControlPanel/KeyboardShortcuts.tid
@@ -0,0 +1,140 @@
+title: $:/core/ui/ControlPanel/KeyboardShortcuts
+tags: $:/tags/ControlPanel
+caption: {{$:/language/ControlPanel/KeyboardShortcuts/Caption}}
+
+\define lingo-base() $:/language/ControlPanel/KeyboardShortcuts/
+
+\define new-shortcut(title)
+<div class="tc-dropdown-item-plain">
+<$edit-shortcut tiddler="$title$" placeholder={{$:/language/ControlPanel/KeyboardShortcuts/Add/Prompt}} style="width:auto;"/> <$button>
+<<lingo Add/Caption>>
+<$action-listops
+	$tiddler="$(shortcutTitle)$"
+	$field="text"
+	$subfilter="[{$title$}]"
+/>
+<$action-deletetiddler
+	$tiddler="$title$"
+/>
+</$button>
+</div>
+\end
+
+\define shortcut-list-item(caption)
+<td>
+</td>
+<td style="text-align:right;font-size:0.7em;">
+<<lingo Platform/$caption$>>
+</td>
+<td>
+<div style="position:relative;">
+<$button popup=<<qualify "$:/state/dropdown/$(shortcutTitle)$">> class="tc-btn-invisible">
+{{$:/core/images/edit-button}}
+</$button>
+<$macrocall $name="displayshortcuts" $output="text/html" shortcuts={{$(shortcutTitle)$}} prefix="<kbd>" separator="</kbd> <kbd>" suffix="</kbd>"/>
+
+<$reveal state=<<qualify "$:/state/dropdown/$(shortcutTitle)$">> type="popup" position="below" animate="yes">
+<div class="tc-block-dropdown-wrapper">
+<div class="tc-block-dropdown tc-edit-type-dropdown tc-popup-keep">
+<$list filter="[list[$(shortcutTitle)$!!text]sort[title]]" variable="shortcut" emptyMessage="""
+<div class="tc-dropdown-item-plain">
+//<<lingo NoShortcuts/Caption>>//
+</div>
+""">
+<div class="tc-dropdown-item-plain">
+<$button class="tc-btn-invisible" tooltip=<<lingo Remove/Hint>>>
+<$action-listops
+	$tiddler="$(shortcutTitle)$"
+	$field="text"
+	$subfilter="+[remove<shortcut>]"
+/>
+&times;
+</$button>
+<kbd>
+<$macrocall $name="displayshortcuts" $output="text/html" shortcuts=<<shortcut>>/>
+</kbd>
+</div>
+</$list>
+<hr/>
+<$macrocall $name="new-shortcut" title=<<qualify "$:/state/new-shortcut/$(shortcutTitle)$">>/>
+</div>
+</div>
+</$reveal>
+</div>
+</td>
+\end
+
+\define shortcut-list(caption,prefix)
+<tr>
+<$list filter="[all[tiddlers+shadows][$prefix$$(shortcutName)$]]" variable="shortcutTitle">
+<<shortcut-list-item "$caption$">>
+</$list>
+</tr>
+\end
+
+\define shortcut-editor()
+<<shortcut-list "All" "$:/config/shortcuts/">>
+<<shortcut-list "Mac" "$:/config/shortcuts-mac/">>
+<<shortcut-list "NonMac" "$:/config/shortcuts-not-mac/">>
+<<shortcut-list "Linux" "$:/config/shortcuts-linux/">>
+<<shortcut-list "NonLinux" "$:/config/shortcuts-not-linux/">>
+<<shortcut-list "Windows" "$:/config/shortcuts-windows/">>
+<<shortcut-list "NonWindows" "$:/config/shortcuts-not-windows/">>
+\end
+
+\define shortcut-preview()
+<$macrocall $name="displayshortcuts" $output="text/html" shortcuts={{$(shortcutPrefix)$$(shortcutName)$}} prefix="<kbd>" separator="</kbd> <kbd>" suffix="</kbd>"/>
+\end
+
+\define shortcut-item-inner()
+<tr>
+<td>
+<$reveal type="nomatch" state=<<dropdownStateTitle>> text="open">
+<$button class="tc-btn-invisible">
+<$action-setfield
+	$tiddler=<<dropdownStateTitle>>
+	$value="open"
+/>
+{{$:/core/images/right-arrow}}
+</$button>
+</$reveal>
+<$reveal type="match" state=<<dropdownStateTitle>> text="open">
+<$button class="tc-btn-invisible">
+<$action-setfield
+	$tiddler=<<dropdownStateTitle>>
+	$value="close"
+/>
+{{$:/core/images/down-arrow}}
+</$button>
+</$reveal>
+''<$text text=<<shortcutName>>/>''
+</td>
+<td>
+<$transclude tiddler="$:/config/ShortcutInfo/$(shortcutName)$"/>
+</td>
+<td>
+<$list filter="$:/config/shortcuts/ $:/config/shortcuts-mac/ $:/config/shortcuts-not-mac/ $:/config/shortcuts-linux/ $:/config/shortcuts-not-linux/ $:/config/shortcuts-windows/ $:/config/shortcuts-not-windows/" variable="shortcutPrefix">
+<<shortcut-preview>>
+</$list>
+</td>
+</tr>
+<$set name="dropdownState" value={{$(dropdownStateTitle)$}}>
+<$list filter="[<dropdownState>prefix[open]]" variable="listItem">
+<<shortcut-editor>>
+</$list>
+</$set>
+\end
+
+\define shortcut-item()
+<$set name="dropdownStateTitle" value=<<qualify "$:/state/dropdown/keyboardshortcut/$(shortcutName)$">>>
+<<shortcut-item-inner>>
+</$set>
+\end
+
+<table>
+<tbody>
+<$list filter="[all[shadows+tiddlers]removeprefix[$:/config/ShortcutInfo/]]" variable="shortcutName">
+<<shortcut-item>>
+</$list>
+</tbody>
+</table>
diff --git a/core/ui/ControlPanel/Modals/AddPlugins.tid b/core/ui/ControlPanel/Modals/AddPlugins.tid
index d05c41767..76305e4ed 100644
--- a/core/ui/ControlPanel/Modals/AddPlugins.tid
+++ b/core/ui/ControlPanel/Modals/AddPlugins.tid
@@ -1,13 +1,11 @@
 title: $:/core/ui/ControlPanel/Modals/AddPlugins
 subtitle: {{$:/core/images/download-button}} {{$:/language/ControlPanel/Plugins/Add/Caption}}
 
-\define lingo-base() $:/language/ControlPanel/Plugins/
-
 \define install-plugin-button()
 <$button>
 <$action-sendmessage $message="tm-load-plugin-from-library" url={{!!url}} title={{$(assetInfo)$!!original-title}}/>
-<$list filter="[<assetInfo>get[original-title]get[version]]" variable="installedVersion" emptyMessage="""{{$:/language/ControlPanel/Plugins/Install}}""">
-{{$:/language/ControlPanel/Plugins/Reinstall}}
+<$list filter="[<assetInfo>get[original-title]get[version]]" variable="installedVersion" emptyMessage="""{{$:/language/ControlPanel/Plugins/Install/Caption}}""">
+{{$:/language/ControlPanel/Plugins/Reinstall/Caption}}
 </$list>
 </$button>
 \end
@@ -48,9 +46,9 @@ $:/state/add-plugin-info/$(connectionTiddler)$/$(assetInfo)$
 <$reveal type="match" text="yes" state=<<popup-state>>>
 <div class="tc-plugin-info-dropdown">
 <div class="tc-plugin-info-dropdown-message">
-<$list filter="[<assetInfo>get[original-title]get[version]]" variable="installedVersion" emptyMessage="""This plugin is not currently installed""">
+<$list filter="[<assetInfo>get[original-title]get[version]]" variable="installedVersion" emptyMessage="""{{$:/language/ControlPanel/Plugins/NotInstalled/Hint}}""">
 <em>
-This plugin is already installed at version <$text text=<<installedVersion>>/>
+{{$:/language/ControlPanel/Plugins/AlreadyInstalled/Hint}}
 </em>
 </$list>
 </div>
diff --git a/core/ui/ControlPanel/Parsing.tid b/core/ui/ControlPanel/Parsing.tid
index de027f9c3..4ba0f0ae1 100644
--- a/core/ui/ControlPanel/Parsing.tid
+++ b/core/ui/ControlPanel/Parsing.tid
@@ -4,30 +4,30 @@ caption: {{$:/language/ControlPanel/Parsing/Caption}}
 
 \define lingo-base() $:/language/ControlPanel/Parsing/
 
-\define parsing-inner(typeCap)
-<li>
-<$checkbox tiddler="""$:/config/WikiParserRules/$typeCap$/$(currentTiddler)$""" field="text" checked="enable" unchecked="disable" default="enable"> ''<$text text=<<currentTiddler>>/>'': </$checkbox>
-</li>
+\define toggle(Type)
+<$checkbox
+tiddler="""$:/config/WikiParserRules/$Type$/$(rule)$"""
+field="text"
+checked="enable"
+unchecked="disable"
+default="enable">
+<<rule>>
+</$checkbox>
 \end
 
-\define parsing-outer(typeLower,typeCap)
-<ul>
-<$list filter="[wikiparserrules[$typeLower$]]">
-<<parsing-inner typeCap:"$typeCap$">>
+\define rules(type,Type)
+<$list filter="[wikiparserrules[$type$]]" variable="rule">
+<dd><<toggle $Type$>></dd>
 </$list>
-</ul>
 \end
 
 <<lingo Hint>>
 
-! <<lingo Pragma/Caption>>
-
-<<parsing-outer typeLower:"pragma" typeCap:"Pragma">>
-
-! <<lingo Inline/Caption>>
-
-<<parsing-outer typeLower:"inline" typeCap:"Inline">>
-
-! <<lingo Block/Caption>>
-
-<<parsing-outer typeLower:"block" typeCap:"Block">>
+<dl>
+<dt><<lingo Pragma/Caption>></dt>
+<<rules pragma Pragma>>
+<dt><<lingo Inline/Caption>></dt>
+<<rules inline Inline>>
+<dt><<lingo Block/Caption>></dt>
+<<rules block Block>>
+</dl>
\ No newline at end of file
diff --git a/core/ui/ControlPanel/Plugins.tid b/core/ui/ControlPanel/Plugins.tid
index d91dead26..49ff58e5e 100644
--- a/core/ui/ControlPanel/Plugins.tid
+++ b/core/ui/ControlPanel/Plugins.tid
@@ -4,95 +4,11 @@ caption: {{$:/language/ControlPanel/Plugins/Caption}}
 
 \define lingo-base() $:/language/ControlPanel/Plugins/
 
-\define popup-state-macro()
-$(qualified-state)$-$(currentTiddler)$
-\end
-
-\define tabs-state-macro()
-$(popup-state)$-$(pluginInfoType)$
-\end
-
-\define plugin-icon-title()
-$(currentTiddler)$/icon
-\end
-
-\define plugin-disable-title()
-$:/config/Plugins/Disabled/$(currentTiddler)$
-\end
-
-\define plugin-table-body(type,disabledMessage)
-<div class="tc-plugin-info-chunk tc-small-icon">
-<$reveal type="nomatch" state=<<popup-state>> text="yes">
-<$button class="tc-btn-invisible tc-btn-dropdown" set=<<popup-state>> setTo="yes">
-{{$:/core/images/right-arrow}}
-</$button>
-</$reveal>
-<$reveal type="match" state=<<popup-state>> text="yes">
-<$button class="tc-btn-invisible tc-btn-dropdown" set=<<popup-state>> setTo="no">
-{{$:/core/images/down-arrow}}
-</$button>
-</$reveal>
-</div>
-<div class="tc-plugin-info-chunk">
-<$transclude tiddler=<<currentTiddler>> subtiddler=<<plugin-icon-title>>>
-<$transclude tiddler="$:/core/images/plugin-generic-$type$"/>
-</$transclude>
-</div>
-<div class="tc-plugin-info-chunk">
-<h1>
-''<$view field="description"><$view field="title"/></$view>'' $disabledMessage$
-</h1>
-<h2>
-<$view field="title"/>
-</h2>
-<h2>
-<div><em><$view field="version"/></em></div>
-</h2>
-</div>
-\end
-
 \define plugin-table(type)
+<$set name="plugin-type" value="""$type$""">
 <$set name="qualified-state" value=<<qualify "$:/state/plugin-info">>>
-<$list filter="[!has[draft.of]plugin-type[$type$]sort[description]]" emptyMessage=<<lingo "Empty/Hint">>>
-<$set name="popup-state" value=<<popup-state-macro>>>
-<$reveal type="nomatch" state=<<plugin-disable-title>> text="yes">
-<$link to={{!!title}} class="tc-plugin-info">
-<<plugin-table-body type:"$type$">>
-</$link>
-</$reveal>
-<$reveal type="match" state=<<plugin-disable-title>> text="yes">
-<$link to={{!!title}} class="tc-plugin-info tc-plugin-info-disabled">
-<<plugin-table-body type:"$type$" disabledMessage:"<$macrocall $name='lingo' title='Disabled/Status'/>">>
-</$link>
-</$reveal>
-<$reveal type="match" text="yes" state=<<popup-state>>>
-<div class="tc-plugin-info-dropdown">
-<div class="tc-plugin-info-dropdown-body">
-<$list filter="[all[current]] -[[$:/core]]">
-<div style="float:right;">
-<$reveal type="nomatch" state=<<plugin-disable-title>> text="yes">
-<$button set=<<plugin-disable-title>> setTo="yes" tooltip={{$:/language/ControlPanel/Plugins/Disable/Hint}} aria-label={{$:/language/ControlPanel/Plugins/Disable/Caption}}>
-<<lingo Disable/Caption>>
-</$button>
-</$reveal>
-<$reveal type="match" state=<<plugin-disable-title>> text="yes">
-<$button set=<<plugin-disable-title>> setTo="no" tooltip={{$:/language/ControlPanel/Plugins/Enable/Hint}} aria-label={{$:/language/ControlPanel/Plugins/Enable/Caption}}>
-<<lingo Enable/Caption>>
-</$button>
-</$reveal>
-</div>
-</$list>
-<$reveal type="nomatch" text="" state="!!list">
-<$macrocall $name="tabs" state=<<tabs-state-macro>> tabsList={{!!list}} default="readme" template="$:/core/ui/PluginInfo"/>
-</$reveal>
-<$reveal type="match" text="" state="!!list">
-No information provided
-</$reveal>
-</div>
-</div>
-</$reveal>
+<$list filter="[!has[draft.of]plugin-type[$type$]sort[description]]" emptyMessage=<<lingo "Empty/Hint">> template="$:/core/ui/Components/plugin-info"/>
 </$set>
-</$list>
 </$set>
 \end
 
diff --git a/core/ui/ControlPanel/Settings/EditorToolbar.tid b/core/ui/ControlPanel/Settings/EditorToolbar.tid
new file mode 100644
index 000000000..aa142bf62
--- /dev/null
+++ b/core/ui/ControlPanel/Settings/EditorToolbar.tid
@@ -0,0 +1,9 @@
+title: $:/core/ui/ControlPanel/Settings/EditorToolbar
+tags: $:/tags/ControlPanel/Settings
+caption: {{$:/language/ControlPanel/Settings/EditorToolbar/Caption}}
+
+\define lingo-base() $:/language/ControlPanel/Settings/EditorToolbar/
+<<lingo Hint>>
+
+<$checkbox tiddler="$:/config/TextEditor/EnableToolbar" field="text" checked="yes" unchecked="no" default="yes"> <$link to="$:/config/TextEditor/EnableToolbar"><<lingo Description>></$link> </$checkbox>
+
diff --git a/core/ui/ControlPanel/Settings/MissingLinks.tid b/core/ui/ControlPanel/Settings/MissingLinks.tid
new file mode 100644
index 000000000..4a7ba5f2e
--- /dev/null
+++ b/core/ui/ControlPanel/Settings/MissingLinks.tid
@@ -0,0 +1,9 @@
+title: $:/core/ui/ControlPanel/Settings/MissingLinks
+tags: $:/tags/ControlPanel/Settings
+caption: {{$:/language/ControlPanel/Settings/MissingLinks/Caption}}
+
+\define lingo-base() $:/language/ControlPanel/Settings/MissingLinks/
+<<lingo Hint>>
+
+<$checkbox tiddler="$:/config/MissingLinks" field="text" checked="yes" unchecked="no" default="yes"> <$link to="$:/config/MissingLinks"><<lingo Description>></$link> </$checkbox>
+
diff --git a/core/ui/ControlPanel/Toolbars/EditorToolbar.tid b/core/ui/ControlPanel/Toolbars/EditorToolbar.tid
new file mode 100644
index 000000000..ce700fa98
--- /dev/null
+++ b/core/ui/ControlPanel/Toolbars/EditorToolbar.tid
@@ -0,0 +1,21 @@
+title: $:/core/ui/ControlPanel/Toolbars/EditorToolbar
+tags: $:/tags/ControlPanel/Toolbars
+caption: {{$:/language/ControlPanel/Toolbars/EditorToolbar/Caption}}
+
+\define lingo-base() $:/language/TiddlerInfo/
+
+\define config-title()
+$:/config/EditorToolbarButtons/Visibility/$(listItem)$
+\end
+
+\define toolbar-button()
+<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler={{$(listItem)$!!icon}}/> <$transclude tiddler=<<listItem>> field="caption"/> -- <i class="tc-muted"><$transclude tiddler=<<listItem>> field="description"/></i></$checkbox>
+\end
+
+{{$:/language/ControlPanel/Toolbars/EditorToolbar/Hint}}
+
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/EditorToolbar]!has[draft.of]]" variable="listItem">
+
+<<toolbar-button>>
+
+</$list>
diff --git a/core/ui/EditTemplate.tid b/core/ui/EditTemplate.tid
index 10c364681..184172214 100644
--- a/core/ui/EditTemplate.tid
+++ b/core/ui/EditTemplate.tid
@@ -1,16 +1,26 @@
 title: $:/core/ui/EditTemplate
 
+\define actions()
+<$action-sendmessage $message="tm-add-tag" $param={{$:/temp/NewTagName}}/>
+<$action-deletetiddler $tiddler="$:/temp/NewTagName"/>
+<$action-sendmessage $message="tm-add-field" $name={{$:/temp/newfieldname}} $value={{$:/temp/newfieldvalue}}/>
+<$action-deletetiddler $tiddler="$:/temp/newfieldname"/>
+<$action-deletetiddler $tiddler="$:/temp/newfieldvalue"/>
+<$action-sendmessage $message="tm-save-tiddler"/>
+\end
 \define frame-classes()
 tc-tiddler-frame tc-tiddler-edit-frame $(missingTiddlerClass)$ $(shadowTiddlerClass)$ $(systemTiddlerClass)$
 \end
 <div class=<<frame-classes>>>
+<$fieldmangler>
 <$set name="storyTiddler" value=<<currentTiddler>>>
-<$keyboard key={{$:/config/shortcuts/cancel-edit-tiddler}} message="tm-cancel-tiddler">
-<$keyboard key={{$:/config/shortcuts/save-tiddler}} message="tm-save-tiddler">
+<$keyboard key="((cancel-edit-tiddler))" message="tm-cancel-tiddler">
+<$keyboard key="((save-tiddler))" actions=<<actions>>>
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/EditTemplate]!has[draft.of]]" variable="listItem">
 <$transclude tiddler=<<listItem>>/>
 </$list>
 </$keyboard>
 </$keyboard>
 </$set>
+</$fieldmangler>
 </div>
diff --git a/core/ui/EditTemplate/Preview/output.tid b/core/ui/EditTemplate/Preview/output.tid
new file mode 100644
index 000000000..fa330b8c0
--- /dev/null
+++ b/core/ui/EditTemplate/Preview/output.tid
@@ -0,0 +1,9 @@
+title: $:/core/ui/EditTemplate/body/preview/output
+tags: $:/tags/EditPreview
+caption: {{$:/language/EditTemplate/Body/Preview/Type/Output}}
+
+<$set name="tv-tiddler-preview" value="yes">
+
+<$transclude />
+
+</$set>
diff --git a/core/ui/EditTemplate/body-editor.tid b/core/ui/EditTemplate/body-editor.tid
new file mode 100644
index 000000000..3de3beec9
--- /dev/null
+++ b/core/ui/EditTemplate/body-editor.tid
@@ -0,0 +1,30 @@
+title: $:/core/ui/EditTemplate/body/editor
+
+<$edit
+
+  field="text"
+  class="tc-edit-texteditor"
+  placeholder={{$:/language/EditTemplate/Body/Placeholder}}
+
+><$set
+
+  name="targetTiddler"
+  value=<<currentTiddler>>
+
+><$list
+
+  filter="[all[shadows+tiddlers]tag[$:/tags/EditorToolbar]!has[draft.of]]"
+
+><$reveal
+
+  type="nomatch"
+  state=<<config-visibility-title>>
+  text="hide"
+  class="tc-text-editor-toolbar-item-wrapper"
+
+><$transclude
+
+  tiddler="$:/core/ui/EditTemplate/body/toolbar/button"
+  mode="inline"
+
+/></$reveal></$list></$set></$edit>
diff --git a/core/ui/EditTemplate/body-toolbar-button.tid b/core/ui/EditTemplate/body-toolbar-button.tid
new file mode 100644
index 000000000..4b273c2f0
--- /dev/null
+++ b/core/ui/EditTemplate/body-toolbar-button.tid
@@ -0,0 +1,107 @@
+title: $:/core/ui/EditTemplate/body/toolbar/button
+
+\define toolbar-button-icon()
+<$list
+
+  filter="[all[current]!has[custom-icon]]"
+  variable="no-custom-icon"
+
+><$transclude
+
+  tiddler={{!!icon}}
+
+/></$list>
+\end
+
+\define toolbar-button-tooltip()
+{{!!description}}<$macrocall $name="displayshortcuts" $output="text/plain" shortcuts={{!!shortcuts}} prefix="` - [" separator="] [" suffix="]`"/>
+\end
+
+\define toolbar-button()
+<$list
+
+  filter={{!!condition}}
+  variable="list-condition"
+
+><$wikify
+
+  name="tooltip-text"
+  text=<<toolbar-button-tooltip>>
+  mode="inline"
+  output="text"
+
+><$list
+
+  filter="[all[current]!has[dropdown]]"
+  variable="no-dropdown"
+
+><$button
+
+  class="tc-btn-invisible $(buttonClasses)$"
+  tooltip=<<tooltip-text>>
+
+><span
+
+  data-tw-keyboard-shortcut={{!!shortcuts}}
+
+/><<toolbar-button-icon>><$transclude
+
+  tiddler=<<currentTiddler>>
+  field="text"
+
+/></$button></$list><$list
+
+  filter="[all[current]has[dropdown]]"
+  variable="dropdown"
+
+><$set
+
+  name="dropdown-state"
+  value=<<qualify "$:/state/EditorToolbarDropdown">>
+
+><$button
+
+  popup=<<dropdown-state>>
+  class="tc-popup-keep tc-btn-invisible $(buttonClasses)$"
+  selectedClass="tc-selected"
+  tooltip=<<tooltip-text>>
+
+><span
+
+  data-tw-keyboard-shortcut={{!!shortcuts}}
+
+/><<toolbar-button-icon>><$transclude
+
+  tiddler=<<currentTiddler>>
+  field="text"
+
+/></$button><$reveal
+
+  state=<<dropdown-state>>
+  type="popup"
+  position="below"
+  animate="yes"
+  tag="span"
+
+><div
+
+  class="tc-drop-down tc-popup-keep"
+
+><$transclude
+
+  tiddler={{!!dropdown}}
+  mode="block"
+
+/></div></$reveal></$set></$list></$wikify></$list>
+\end
+
+\define toolbar-button-outer()
+<$set
+
+  name="buttonClasses"
+  value={{!!button-classes}}
+
+><<toolbar-button>></$set>
+\end
+
+<<toolbar-button-outer>>
\ No newline at end of file
diff --git a/core/ui/EditTemplate/body.tid b/core/ui/EditTemplate/body.tid
index 24932c16e..f6cb3469e 100644
--- a/core/ui/EditTemplate/body.tid
+++ b/core/ui/EditTemplate/body.tid
@@ -2,6 +2,9 @@ title: $:/core/ui/EditTemplate/body
 tags: $:/tags/EditTemplate
 
 \define lingo-base() $:/language/EditTemplate/Body/
+\define config-visibility-title()
+$:/config/EditorToolbarButtons/Visibility/$(currentTiddler)$
+\end
 <$list filter="[is[current]has[_canonical_uri]]">
 
 <div class="tc-message-box">
@@ -20,19 +23,17 @@ tags: $:/tags/EditTemplate
 
 <$reveal state="$:/state/showeditpreview" type="match" text="yes">
 
-<em class="tc-edit"><<lingo Hint>></em> <$button type="set" set="$:/state/showeditpreview" setTo="no"><<lingo Preview/Button/Hide>></$button>
-
 <div class="tc-tiddler-preview">
+
+<$transclude tiddler="$:/core/ui/EditTemplate/body/editor" mode="inline"/>
+
 <div class="tc-tiddler-preview-preview">
-<$set name="tv-tiddler-preview" value="yes">
 
-<$transclude />
+<$transclude tiddler={{$:/state/editpreviewtype}} mode="inline">
 
-</$set>
-</div>
+<$transclude tiddler="$:/core/ui/EditTemplate/body/preview/output" mode="inline"/>
 
-<div class="tc-tiddler-preview-edit">
-<$edit field="text" class="tc-edit-texteditor" placeholder={{$:/language/EditTemplate/Body/Placeholder}}/>
+</$transclude>
 
 </div>
 
@@ -42,8 +43,7 @@ tags: $:/tags/EditTemplate
 
 <$reveal state="$:/state/showeditpreview" type="nomatch" text="yes">
 
-<em class="tc-edit"><<lingo Hint>></em> <$button type="set" set="$:/state/showeditpreview" setTo="yes"><<lingo Preview/Button/Show>></$button>
-<$edit field="text" class="tc-edit-texteditor" placeholder={{$:/language/EditTemplate/Body/Placeholder}}/>
+<$transclude tiddler="$:/core/ui/EditTemplate/body/editor" mode="inline"/>
 
 </$reveal>
 
diff --git a/core/ui/EditTemplate/fields.tid b/core/ui/EditTemplate/fields.tid
index fbd02e9ce..86de3a37d 100644
--- a/core/ui/EditTemplate/fields.tid
+++ b/core/ui/EditTemplate/fields.tid
@@ -73,7 +73,7 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$
 <div class="tc-dropdown-item">
 <<lingo Fields/Add/Dropdown/User>>
 </div>
-<$list filter="[!is[shadow]!is[system]fields[]sort[]] -created -creator -draft.of -draft.title -modified -modifier -tags -text -title -type"  variable="currentField">
+<$list filter="[!is[shadow]!is[system]fields[]search:title{$:/temp/newfieldname}sort[]] -created -creator -draft.of -draft.title -modified -modifier -tags -text -title -type"  variable="currentField">
 <$link to=<<currentField>>>
 <<currentField>>
 </$link>
@@ -81,7 +81,7 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$
 <div class="tc-dropdown-item">
 <<lingo Fields/Add/Dropdown/System>>
 </div>
-<$list filter="[fields[]sort[]] -[!is[shadow]!is[system]fields[]]" variable="currentField">
+<$list filter="[fields[]search:title{$:/temp/newfieldname}sort[]] -[!is[shadow]!is[system]fields[]]" variable="currentField">
 <$link to=<<currentField>>>
 <<currentField>>
 </$link>
@@ -97,4 +97,3 @@ $:/config/EditTemplateFields/Visibility/$(currentField)$
 </span>
 </div>
 </$fieldmangler>
-
diff --git a/core/ui/EditTemplate/tags.tid b/core/ui/EditTemplate/tags.tid
index c9f65e4c5..e806fd90c 100644
--- a/core/ui/EditTemplate/tags.tid
+++ b/core/ui/EditTemplate/tags.tid
@@ -4,13 +4,24 @@ tags: $:/tags/EditTemplate
 \define lingo-base() $:/language/EditTemplate/
 \define tag-styles()
 background-color:$(backgroundColor)$;
+fill:$(foregroundColor)$;
+color:$(foregroundColor)$;
+\end
+\define tag-body-inner(colour,fallbackTarget,colourA,colourB)
+<$vars foregroundColor=<<contrastcolour target:"""$colour$""" fallbackTarget:"""$fallbackTarget$""" colourA:"""$colourA$""" colourB:"""$colourB$""">> backgroundColor="""$colour$""">
+<span style=<<tag-styles>> class="tc-tag-label">
+<$view field="title" format="text" />
+<$button message="tm-remove-tag" param={{!!title}} class="tc-btn-invisible tc-remove-tag-button">&times;</$button>
+</span>
+</$vars>
+\end
+\define tag-body(colour,palette)
+<$macrocall $name="tag-body-inner" colour="""$colour$""" fallbackTarget={{$palette$##tag-background}} colourA={{$palette$##foreground}} colourB={{$palette$##background}}/>
 \end
 <div class="tc-edit-tags">
 <$fieldmangler>
-<$list filter="[all[current]tags[]sort[title]]" storyview="pop"><$set name="backgroundColor" value={{!!color}}><span style=<<tag-styles>> class="tc-tag-label">
-<$view field="title" format="text" />
-<$button message="tm-remove-tag" param={{!!title}} class="tc-btn-invisible tc-remove-tag-button">&times;</$button></span>
-</$set>
+<$list filter="[all[current]tags[]sort[title]]" storyview="pop">
+<$macrocall $name="tag-body" colour={{!!color}} palette={{$:/palette}}/>
 </$list>
 
 <div class="tc-edit-add-tag">
diff --git a/core/ui/EditTemplate/title.tid b/core/ui/EditTemplate/title.tid
index 829f91afe..0eda4218d 100644
--- a/core/ui/EditTemplate/title.tid
+++ b/core/ui/EditTemplate/title.tid
@@ -1,4 +1,18 @@
 title: $:/core/ui/EditTemplate/title
 tags: $:/tags/EditTemplate
 
-<$edit-text field="draft.title" class="tc-titlebar tc-edit-texteditor" focus="true"/>
\ No newline at end of file
+<$vars pattern="""[\|\[\]{}]""" bad-chars="""`| [ ] { }`""">
+
+<$list filter="[is[current]regexp:draft.title<pattern>]" variable="listItem">
+
+<div class="tc-message-box">
+
+{{$:/language/EditTemplate/Title/BadCharacterWarning}}
+
+</div>
+
+</$list>
+
+</$vars>
+
+<$edit-text field="draft.title" class="tc-titlebar tc-edit-texteditor" focus="true"/>
diff --git a/core/ui/EditToolbar/save.tid b/core/ui/EditToolbar/save.tid
index 18a7c446a..38dd224ea 100644
--- a/core/ui/EditToolbar/save.tid
+++ b/core/ui/EditToolbar/save.tid
@@ -3,8 +3,7 @@ tags: $:/tags/EditToolbar
 caption: {{$:/core/images/done-button}} {{$:/language/Buttons/Save/Caption}}
 description: {{$:/language/Buttons/Save/Hint}}
 
-<$fieldmangler>
-<$button tooltip={{$:/language/Buttons/Save/Hint}} aria-label={{$:/language/Buttons/Save/Caption}} class=<<tv-config-toolbar-class>>>
+<$fieldmangler><$button tooltip={{$:/language/Buttons/Save/Hint}} aria-label={{$:/language/Buttons/Save/Caption}} class=<<tv-config-toolbar-class>>>
 <$action-sendmessage $message="tm-add-tag" $param={{$:/temp/NewTagName}}/>
 <$action-deletetiddler $tiddler="$:/temp/NewTagName"/>
 <$action-sendmessage $message="tm-add-field" $name={{$:/temp/newfieldname}} $value={{$:/temp/newfieldvalue}}/>
diff --git a/core/ui/EditorToolbar/bold.tid b/core/ui/EditorToolbar/bold.tid
new file mode 100644
index 000000000..ffe84de61
--- /dev/null
+++ b/core/ui/EditorToolbar/bold.tid
@@ -0,0 +1,14 @@
+title: $:/core/ui/EditorToolbar/bold
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/bold
+caption: {{$:/language/Buttons/Bold/Caption}}
+description: {{$:/language/Buttons/Bold/Hint}}
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+shortcuts: ((bold))
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="wrap-selection"
+	prefix="''"
+	suffix="''"
+/>
diff --git a/core/ui/EditorToolbar/clear-dropdown.tid b/core/ui/EditorToolbar/clear-dropdown.tid
new file mode 100644
index 000000000..8876ecf2b
--- /dev/null
+++ b/core/ui/EditorToolbar/clear-dropdown.tid
@@ -0,0 +1,21 @@
+title: $:/core/ui/EditorToolbar/clear-dropdown
+
+''{{$:/language/Buttons/Clear/Hint}}''
+
+<div class="tc-colour-chooser">
+
+<$macrocall $name="colour-picker" actions="""
+
+<$action-sendmessage
+	$message="tm-edit-bitmap-operation"
+	$param="clear"
+	colour=<<colour-picker-value>>
+/>
+
+<$action-deletetiddler
+	$tiddler=<<dropdown-state>>
+/>
+
+"""/>
+
+</div>
diff --git a/core/ui/EditorToolbar/clear.tid b/core/ui/EditorToolbar/clear.tid
new file mode 100644
index 000000000..876c9f51c
--- /dev/null
+++ b/core/ui/EditorToolbar/clear.tid
@@ -0,0 +1,8 @@
+title: $:/core/ui/EditorToolbar/clear
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/erase
+caption: {{$:/language/Buttons/Clear/Caption}}
+description: {{$:/language/Buttons/Clear/Hint}}
+condition: [<targetTiddler>is[image]]
+dropdown: $:/core/ui/EditorToolbar/clear-dropdown
+
diff --git a/core/ui/EditorToolbar/editor-height-dropdown.tid b/core/ui/EditorToolbar/editor-height-dropdown.tid
new file mode 100644
index 000000000..da1925b05
--- /dev/null
+++ b/core/ui/EditorToolbar/editor-height-dropdown.tid
@@ -0,0 +1,8 @@
+title: $:/core/ui/EditorToolbar/editor-height-dropdown
+
+\define lingo-base() $:/language/Buttons/EditorHeight/
+''<<lingo Hint>>''
+
+<$radio tiddler="$:/config/TextEditor/EditorHeight/Mode" value="auto"> {{$:/core/images/auto-height}} <<lingo Caption/Auto>></$radio>
+
+<$radio tiddler="$:/config/TextEditor/EditorHeight/Mode" value="fixed"> {{$:/core/images/fixed-height}} <<lingo Caption/Fixed>> <$edit-text tag="input" tiddler="$:/config/TextEditor/EditorHeight/Height" default="100px"/></$radio>
diff --git a/core/ui/EditorToolbar/editor-height.tid b/core/ui/EditorToolbar/editor-height.tid
new file mode 100644
index 000000000..c6c45775f
--- /dev/null
+++ b/core/ui/EditorToolbar/editor-height.tid
@@ -0,0 +1,15 @@
+title: $:/core/ui/EditorToolbar/editor-height
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/fixed-height
+custom-icon: yes
+caption: {{$:/language/Buttons/EditorHeight/Caption}}
+description: {{$:/language/Buttons/EditorHeight/Hint}}
+condition: [<targetTiddler>!is[image]]
+dropdown: $:/core/ui/EditorToolbar/editor-height-dropdown
+
+<$reveal tag="span" state="$:/config/TextEditor/EditorHeight/Mode" type="match" text="fixed">
+{{$:/core/images/fixed-height}}
+</$reveal>
+<$reveal tag="span" state="$:/config/TextEditor/EditorHeight/Mode" type="match" text="auto">
+{{$:/core/images/auto-height}}
+</$reveal>
diff --git a/core/ui/EditorToolbar/excise-dropdown.tid b/core/ui/EditorToolbar/excise-dropdown.tid
new file mode 100644
index 000000000..47aa27c8b
--- /dev/null
+++ b/core/ui/EditorToolbar/excise-dropdown.tid
@@ -0,0 +1,49 @@
+title: $:/core/ui/EditorToolbar/excise-dropdown
+
+\define lingo-base() $:/language/Buttons/Excise/
+
+\define body(config-title)
+''<<lingo Hint>>''
+
+<<lingo Caption/NewTitle>> <$edit-text tag="input" tiddler="$config-title$/new-title" default="" focus="true"/>
+
+<$set name="new-title" value={{$config-title$/new-title}}>
+<$list filter="""[<new-title>is[tiddler]]""">
+<div class="tc-error">
+<<lingo Caption/TiddlerExists>>
+</div>
+</$list>
+</$set>
+
+<$checkbox tiddler="""$config-title$/tagnew""" field="text" checked="yes" unchecked="no" default="false"> <<lingo Caption/Tag>></$checkbox>
+
+<<lingo Caption/Replace>> <$select tiddler="""$config-title$/type""" default="transclude">
+<option value="link"><<lingo Caption/Replace/Link>></option>
+<option value="transclude"><<lingo Caption/Replace/Transclusion>></option>
+<option value="macro"><<lingo Caption/Replace/Macro>></option>
+</$select>
+
+<$reveal state="""$config-title$/type""" type="match" text="macro">
+<<lingo Caption/MacroName>> <$edit-text tag="input" tiddler="""$config-title$/macro-title""" default="translink"/>
+</$reveal>
+
+<$button>
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="excise"
+	title={{$config-title$/new-title}}
+	type={{$config-title$/type}}
+	macro={{$config-title$/macro-title}}
+	tagnew={{$config-title$/tagnew}}
+/>
+<$action-deletetiddler
+	$tiddler="$config-title$/new-title"
+/>
+<$action-deletetiddler
+	$tiddler=<<dropdown-state>>
+/>
+<<lingo Caption/Excise>>
+</$button>
+\end
+
+<$macrocall $name="body" config-title=<<qualify "$:/state/Excise/">>/>
diff --git a/core/ui/EditorToolbar/excise.tid b/core/ui/EditorToolbar/excise.tid
new file mode 100644
index 000000000..dc2b34d3b
--- /dev/null
+++ b/core/ui/EditorToolbar/excise.tid
@@ -0,0 +1,9 @@
+title: $:/core/ui/EditorToolbar/excise
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/excise
+caption: {{$:/language/Buttons/Excise/Caption}}
+description: {{$:/language/Buttons/Excise/Hint}}
+condition: [<targetTiddler>!is[image]]
+shortcuts: ((excise))
+dropdown: $:/core/ui/EditorToolbar/excise-dropdown
+
diff --git a/core/ui/EditorToolbar/heading-1.tid b/core/ui/EditorToolbar/heading-1.tid
new file mode 100644
index 000000000..2f0f41847
--- /dev/null
+++ b/core/ui/EditorToolbar/heading-1.tid
@@ -0,0 +1,15 @@
+title: $:/core/ui/EditorToolbar/heading-1
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/heading-1
+caption: {{$:/language/Buttons/Heading1/Caption}}
+description: {{$:/language/Buttons/Heading1/Hint}}
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+button-classes: tc-text-editor-toolbar-item-start-group
+shortcuts: ((heading-1))
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="prefix-lines"
+	character="!"
+	count="1"
+/>
diff --git a/core/ui/EditorToolbar/heading-2.tid b/core/ui/EditorToolbar/heading-2.tid
new file mode 100644
index 000000000..7139bf3d0
--- /dev/null
+++ b/core/ui/EditorToolbar/heading-2.tid
@@ -0,0 +1,14 @@
+title: $:/core/ui/EditorToolbar/heading-2
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/heading-2
+caption: {{$:/language/Buttons/Heading2/Caption}}
+description: {{$:/language/Buttons/Heading2/Hint}}
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+shortcuts: ((heading-2))
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="prefix-lines"
+	character="!"
+	count="2"
+/>
diff --git a/core/ui/EditorToolbar/heading-3.tid b/core/ui/EditorToolbar/heading-3.tid
new file mode 100644
index 000000000..e00dd832b
--- /dev/null
+++ b/core/ui/EditorToolbar/heading-3.tid
@@ -0,0 +1,14 @@
+title: $:/core/ui/EditorToolbar/heading-3
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/heading-3
+caption: {{$:/language/Buttons/Heading3/Caption}}
+description: {{$:/language/Buttons/Heading3/Hint}}
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+shortcuts: ((heading-3))
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="prefix-lines"
+	character="!"
+	count="3"
+/>
diff --git a/core/ui/EditorToolbar/heading-4.tid b/core/ui/EditorToolbar/heading-4.tid
new file mode 100644
index 000000000..4a4b7a90b
--- /dev/null
+++ b/core/ui/EditorToolbar/heading-4.tid
@@ -0,0 +1,14 @@
+title: $:/core/ui/EditorToolbar/heading-4
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/heading-4
+caption: {{$:/language/Buttons/Heading4/Caption}}
+description: {{$:/language/Buttons/Heading4/Hint}}
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+shortcuts: ((heading-4))
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="prefix-lines"
+	character="!"
+	count="4"
+/>
diff --git a/core/ui/EditorToolbar/heading-5.tid b/core/ui/EditorToolbar/heading-5.tid
new file mode 100644
index 000000000..09f0bcf4c
--- /dev/null
+++ b/core/ui/EditorToolbar/heading-5.tid
@@ -0,0 +1,14 @@
+title: $:/core/ui/EditorToolbar/heading-5
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/heading-5
+caption: {{$:/language/Buttons/Heading5/Caption}}
+description: {{$:/language/Buttons/Heading5/Hint}}
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+shortcuts: ((heading-5))
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="prefix-lines"
+	character="!"
+	count="5"
+/>
diff --git a/core/ui/EditorToolbar/heading-6.tid b/core/ui/EditorToolbar/heading-6.tid
new file mode 100644
index 000000000..d5d8dc045
--- /dev/null
+++ b/core/ui/EditorToolbar/heading-6.tid
@@ -0,0 +1,14 @@
+title: $:/core/ui/EditorToolbar/heading-6
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/heading-6
+caption: {{$:/language/Buttons/Heading6/Caption}}
+description: {{$:/language/Buttons/Heading6/Hint}}
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+shortcuts: ((heading-6))
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="prefix-lines"
+	character="!"
+	count="6"
+/>
diff --git a/core/ui/EditorToolbar/italic.tid b/core/ui/EditorToolbar/italic.tid
new file mode 100644
index 000000000..518f3d0c2
--- /dev/null
+++ b/core/ui/EditorToolbar/italic.tid
@@ -0,0 +1,14 @@
+title: $:/core/ui/EditorToolbar/italic
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/italic
+caption: {{$:/language/Buttons/Italic/Caption}}
+description: {{$:/language/Buttons/Italic/Hint}}
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+shortcuts: ((italic))
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="wrap-selection"
+	prefix="//"
+	suffix="//"
+/>
diff --git a/core/ui/EditorToolbar/line-width-dropdown.tid b/core/ui/EditorToolbar/line-width-dropdown.tid
new file mode 100644
index 000000000..b99bdcde4
--- /dev/null
+++ b/core/ui/EditorToolbar/line-width-dropdown.tid
@@ -0,0 +1,42 @@
+title: $:/core/ui/EditorToolbar/line-width-dropdown
+
+\define lingo-base() $:/language/Buttons/LineWidth/
+
+\define toolbar-line-width-inner()
+<$button tag="a" tooltip="""$(line-width)$""">
+
+<$action-setfield
+	$tiddler="$:/config/BitmapEditor/LineWidth"
+	$value="$(line-width)$"
+/>
+
+<$action-deletetiddler
+	$tiddler=<<dropdown-state>>
+/>
+
+<div style="display: inline-block; margin: 4px calc(80px - $(line-width)$); background-color: #000; width: calc(100px + $(line-width)$ * 2); height: $(line-width)$; border-radius: 120px; vertical-align: middle;"/>
+
+<span style="margin-left: 8px;">
+
+<$text text="""$(line-width)$"""/>
+
+<$reveal state="$:/config/BitmapEditor/LineWidth" type="match" text="""$(line-width)$""" tag="span">
+
+<$entity entity="&nbsp;"/>
+
+<$entity entity="&#x2713;"/>
+
+</$reveal>
+
+</span>
+
+</$button>
+\end
+
+''<<lingo Hint>>''
+
+<$list filter={{$:/config/BitmapEditor/LineWidths}} variable="line-width">
+
+<<toolbar-line-width-inner>>
+
+</$list>
diff --git a/core/ui/EditorToolbar/line-width.tid b/core/ui/EditorToolbar/line-width.tid
new file mode 100644
index 000000000..3910745a3
--- /dev/null
+++ b/core/ui/EditorToolbar/line-width.tid
@@ -0,0 +1,9 @@
+title: $:/core/ui/EditorToolbar/line-width
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/line-width
+caption: {{$:/language/Buttons/LineWidth/Caption}}
+description: {{$:/language/Buttons/LineWidth/Hint}}
+condition: [<targetTiddler>is[image]]
+dropdown: $:/core/ui/EditorToolbar/line-width-dropdown
+
+<$text text={{$:/config/BitmapEditor/LineWidth}}/>
\ No newline at end of file
diff --git a/core/ui/EditorToolbar/link-dropdown.tid b/core/ui/EditorToolbar/link-dropdown.tid
new file mode 100644
index 000000000..782bc6d6f
--- /dev/null
+++ b/core/ui/EditorToolbar/link-dropdown.tid
@@ -0,0 +1,73 @@
+title: $:/core/ui/EditorToolbar/link-dropdown
+
+\define lingo-base() $:/language/Buttons/Link/
+
+\define link-actions()
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="make-link"
+	text={{$(linkTiddler)$}}
+/>
+
+<$action-deletetiddler
+	$tiddler=<<dropdown-state>>
+/>
+
+<$action-deletetiddler
+	$tiddler=<<searchTiddler>>
+/>
+
+<$action-deletetiddler
+	$tiddler=<<linkTiddler>>
+/>
+\end
+
+\define external-link()
+<$button class="tc-btn-invisible" style="width: auto; display: inline-block; background-colour: inherit;">
+<$action-sendmessage $message="tm-edit-text-operation" $param="make-link" text={{$(searchTiddler)$}}
+/>
+{{$:/core/images/chevron-right}}
+<$action-deletetiddler
+	$tiddler=<<dropdown-state>>
+/>
+
+<$action-deletetiddler
+	$tiddler=<<searchTiddler>>
+/>
+
+<$action-deletetiddler
+	$tiddler=<<linkTiddler>>
+/>
+</$button>
+\end
+
+
+\define body(config-title)
+''<<lingo Hint>>''
+
+<$vars searchTiddler="""$config-title$/search""" linkTiddler="""$config-title$/link""" linktext="" >
+
+<$edit-text tiddler=<<searchTiddler>> type="search" tag="input" focus="true" placeholder={{$:/language/Search/Search}} default=""/>
+<$reveal tag="span" state=<<searchTiddler>> type="nomatch" text="">
+<<external-link>>
+<$button class="tc-btn-invisible" style="width: auto; display: inline-block; background-colour: inherit;">
+<$action-setfield $tiddler=<<searchTiddler>> text="" />
+{{$:/core/images/close-button}}
+</$button>
+</$reveal>
+
+<$reveal tag="div" state=<<searchTiddler>> type="nomatch" text="">
+
+<$linkcatcher actions=<<link-actions>> to=<<linkTiddler>>>
+
+{{$:/core/ui/SearchResults}}
+
+</$linkcatcher>
+
+</$reveal>
+
+</$vars>
+
+\end
+
+<$macrocall $name="body" config-title=<<qualify "$:/state/Link/">>/>
\ No newline at end of file
diff --git a/core/ui/EditorToolbar/link.tid b/core/ui/EditorToolbar/link.tid
new file mode 100644
index 000000000..e0527cfab
--- /dev/null
+++ b/core/ui/EditorToolbar/link.tid
@@ -0,0 +1,10 @@
+title: $:/core/ui/EditorToolbar/link
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/link
+caption: {{$:/language/Buttons/Link/Caption}}
+description: {{$:/language/Buttons/Link/Hint}}
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+button-classes: tc-text-editor-toolbar-item-start-group
+shortcuts: ((link))
+dropdown: $:/core/ui/EditorToolbar/link-dropdown
+
diff --git a/core/ui/EditorToolbar/list-bullet.tid b/core/ui/EditorToolbar/list-bullet.tid
new file mode 100644
index 000000000..dfa14cc18
--- /dev/null
+++ b/core/ui/EditorToolbar/list-bullet.tid
@@ -0,0 +1,14 @@
+title: $:/core/ui/EditorToolbar/list-bullet
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/list-bullet
+caption: {{$:/language/Buttons/ListBullet/Caption}}
+description: {{$:/language/Buttons/ListBullet/Hint}}
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+shortcuts: ((list-bullet))
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="prefix-lines"
+	character="*"
+	count="1"
+/>
diff --git a/core/ui/EditorToolbar/list-number.tid b/core/ui/EditorToolbar/list-number.tid
new file mode 100644
index 000000000..81b9152d0
--- /dev/null
+++ b/core/ui/EditorToolbar/list-number.tid
@@ -0,0 +1,14 @@
+title: $:/core/ui/EditorToolbar/list-number
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/list-number
+caption: {{$:/language/Buttons/ListNumber/Caption}}
+description: {{$:/language/Buttons/ListNumber/Hint}}
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+shortcuts: ((list-number))
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="prefix-lines"
+	character="#"
+	count="1"
+/>
diff --git a/core/ui/EditorToolbar/mono-block.tid b/core/ui/EditorToolbar/mono-block.tid
new file mode 100644
index 000000000..4ef741695
--- /dev/null
+++ b/core/ui/EditorToolbar/mono-block.tid
@@ -0,0 +1,16 @@
+title: $:/core/ui/EditorToolbar/mono-block
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/mono-block
+caption: {{$:/language/Buttons/MonoBlock/Caption}}
+description: {{$:/language/Buttons/MonoBlock/Hint}}
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+button-classes: tc-text-editor-toolbar-item-start-group
+shortcuts: ((mono-block))
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="wrap-lines"
+	prefix="
+```"
+	suffix="```"
+/>
diff --git a/core/ui/EditorToolbar/mono-line.tid b/core/ui/EditorToolbar/mono-line.tid
new file mode 100644
index 000000000..15ca77de1
--- /dev/null
+++ b/core/ui/EditorToolbar/mono-line.tid
@@ -0,0 +1,14 @@
+title: $:/core/ui/EditorToolbar/mono-line
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/mono-line
+caption: {{$:/language/Buttons/MonoLine/Caption}}
+description: {{$:/language/Buttons/MonoLine/Hint}}
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+shortcuts: ((mono-line))
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="wrap-selection"
+	prefix="`"
+	suffix="`"
+/>
diff --git a/core/ui/EditorToolbar/more-dropdown.tid b/core/ui/EditorToolbar/more-dropdown.tid
new file mode 100644
index 000000000..289f74011
--- /dev/null
+++ b/core/ui/EditorToolbar/more-dropdown.tid
@@ -0,0 +1,19 @@
+title: $:/core/ui/EditorToolbar/more-dropdown
+
+\define config-title()
+$:/config/EditorToolbarButtons/Visibility/$(toolbarItem)$
+\end
+
+\define conditional-button()
+<$list filter={{$(toolbarItem)$!!condition}} variable="condition">
+<$transclude tiddler="$:/core/ui/EditTemplate/body/toolbar/button" mode="inline"/> <$transclude tiddler=<<toolbarItem>> field="description"/>
+</$list>
+\end
+
+<div class="tc-text-editor-toolbar-more">
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/EditorToolbar]!has[draft.of]] -[[$:/core/ui/EditorToolbar/more]]">
+<$reveal type="match" state=<<config-visibility-title>> text="hide" tag="div">
+<<conditional-button>>
+</$reveal>
+</$list>
+</div>
diff --git a/core/ui/EditorToolbar/more.tid b/core/ui/EditorToolbar/more.tid
new file mode 100644
index 000000000..8945f6def
--- /dev/null
+++ b/core/ui/EditorToolbar/more.tid
@@ -0,0 +1,8 @@
+title: $:/core/ui/EditorToolbar/more
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/down-arrow
+caption: {{$:/language/Buttons/More/Caption}}
+description: {{$:/language/Buttons/More/Hint}}
+condition: [<targetTiddler>]
+dropdown: $:/core/ui/EditorToolbar/more-dropdown
+text:
diff --git a/core/ui/EditorToolbar/opacity-dropdown.tid b/core/ui/EditorToolbar/opacity-dropdown.tid
new file mode 100644
index 000000000..80d287342
--- /dev/null
+++ b/core/ui/EditorToolbar/opacity-dropdown.tid
@@ -0,0 +1,54 @@
+title: $:/core/ui/EditorToolbar/opacity-dropdown
+
+\define lingo-base() $:/language/Buttons/Opacity/
+
+\define toolbar-opacity-inner()
+<$button tag="a" tooltip="""$(opacity)$""">
+
+<$action-setfield
+	$tiddler="$:/config/BitmapEditor/Opacity"
+	$value="$(opacity)$"
+/>
+
+<$action-deletetiddler
+	$tiddler=<<dropdown-state>>
+/>
+
+<div style="display: inline-block; vertical-align: middle; background-color: $(current-paint-colour)$; opacity: $(opacity)$; width: 1em; height: 1em; border-radius: 50%;"/>
+
+<span style="margin-left: 8px;">
+
+<$text text="""$(opacity)$"""/>
+
+<$reveal state="$:/config/BitmapEditor/Opacity" type="match" text="""$(opacity)$""" tag="span">
+
+<$entity entity="&nbsp;"/>
+
+<$entity entity="&#x2713;"/>
+
+</$reveal>
+
+</span>
+
+</$button>
+\end
+
+\define toolbar-opacity()
+''<<lingo Hint>>''
+
+<$list filter={{$:/config/BitmapEditor/Opacities}} variable="opacity">
+
+<<toolbar-opacity-inner>>
+
+</$list>
+\end
+
+<$set name="current-paint-colour" value={{$:/config/BitmapEditor/Colour}}>
+
+<$set name="current-opacity" value={{$:/config/BitmapEditor/Opacity}}>
+
+<<toolbar-opacity>>
+
+</$set>
+
+</$set>
diff --git a/core/ui/EditorToolbar/opacity.tid b/core/ui/EditorToolbar/opacity.tid
new file mode 100644
index 000000000..4b2170c06
--- /dev/null
+++ b/core/ui/EditorToolbar/opacity.tid
@@ -0,0 +1,9 @@
+title: $:/core/ui/EditorToolbar/opacity
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/opacity
+caption: {{$:/language/Buttons/Opacity/Caption}}
+description: {{$:/language/Buttons/Opacity/Hint}}
+condition: [<targetTiddler>is[image]]
+dropdown: $:/core/ui/EditorToolbar/opacity-dropdown
+
+<$text text={{$:/config/BitmapEditor/Opacity}}/>
diff --git a/core/ui/EditorToolbar/paint-dropdown.tid b/core/ui/EditorToolbar/paint-dropdown.tid
new file mode 100644
index 000000000..c2deaa757
--- /dev/null
+++ b/core/ui/EditorToolbar/paint-dropdown.tid
@@ -0,0 +1,16 @@
+title: $:/core/ui/EditorToolbar/paint-dropdown
+
+''{{$:/language/Buttons/Paint/Hint}}''
+
+<$macrocall $name="colour-picker" actions="""
+
+<$action-setfield
+	$tiddler="$:/config/BitmapEditor/Colour"
+	$value=<<colour-picker-value>>
+/>
+
+<$action-deletetiddler
+	$tiddler=<<dropdown-state>>
+/>
+
+"""/>
diff --git a/core/ui/EditorToolbar/paint.tid b/core/ui/EditorToolbar/paint.tid
new file mode 100644
index 000000000..8ca488888
--- /dev/null
+++ b/core/ui/EditorToolbar/paint.tid
@@ -0,0 +1,14 @@
+title: $:/core/ui/EditorToolbar/paint
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/paint
+caption: {{$:/language/Buttons/Paint/Caption}}
+description: {{$:/language/Buttons/Paint/Hint}}
+condition: [<targetTiddler>is[image]]
+dropdown: $:/core/ui/EditorToolbar/paint-dropdown
+
+\define toolbar-paint()
+<div style="display: inline-block; vertical-align: middle; background-color: $(colour-picker-value)$; width: 1em; height: 1em; border-radius: 50%;"/>
+\end
+<$set name="colour-picker-value" value={{$:/config/BitmapEditor/Colour}}>
+<<toolbar-paint>>
+</$set>
diff --git a/core/ui/EditorToolbar/picture-dropdown.tid b/core/ui/EditorToolbar/picture-dropdown.tid
new file mode 100644
index 000000000..89ba004e5
--- /dev/null
+++ b/core/ui/EditorToolbar/picture-dropdown.tid
@@ -0,0 +1,21 @@
+title: $:/core/ui/EditorToolbar/picture-dropdown
+
+\define replacement-text()
+[img[$(imageTitle)$]]
+\end
+
+''{{$:/language/Buttons/Picture/Hint}}''
+
+<$macrocall $name="image-picker" actions="""
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="replace-selection"
+	text=<<replacement-text>>
+/>
+
+<$action-deletetiddler
+	$tiddler=<<dropdown-state>>
+/>
+
+"""/>
diff --git a/core/ui/EditorToolbar/picture.tid b/core/ui/EditorToolbar/picture.tid
new file mode 100644
index 000000000..cf10c0017
--- /dev/null
+++ b/core/ui/EditorToolbar/picture.tid
@@ -0,0 +1,9 @@
+title: $:/core/ui/EditorToolbar/picture
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/picture
+caption: {{$:/language/Buttons/Picture/Caption}}
+description: {{$:/language/Buttons/Picture/Hint}}
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+shortcuts: ((picture))
+dropdown: $:/core/ui/EditorToolbar/picture-dropdown
+
diff --git a/core/ui/EditorToolbar/preview-type-dropdown.tid b/core/ui/EditorToolbar/preview-type-dropdown.tid
new file mode 100644
index 000000000..0098aa034
--- /dev/null
+++ b/core/ui/EditorToolbar/preview-type-dropdown.tid
@@ -0,0 +1,33 @@
+title: $:/core/ui/EditorToolbar/preview-type-dropdown
+
+\define preview-type-button()
+<$button tag="a">
+
+<$action-setfield $tiddler="$:/state/editpreviewtype" $value="$(previewType)$"/>
+
+<$action-deletetiddler
+	$tiddler=<<dropdown-state>>
+/>
+
+<$transclude tiddler=<<previewType>> field="caption" mode="inline">
+
+<$view tiddler=<<previewType>> field="title" mode="inline"/>
+
+</$transclude> 
+
+<$reveal tag="span" state="$:/state/editpreviewtype" type="match" text=<<previewType>> default="$:/core/ui/EditTemplate/body/preview/output">
+
+<$entity entity="&nbsp;"/>
+
+<$entity entity="&#x2713;"/>
+
+</$reveal>
+
+</$button>
+\end
+
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/EditPreview]!has[draft.of]]" variable="previewType">
+
+<<preview-type-button>>
+
+</$list>
diff --git a/core/ui/EditorToolbar/preview-type.tid b/core/ui/EditorToolbar/preview-type.tid
new file mode 100644
index 000000000..5e7d315ce
--- /dev/null
+++ b/core/ui/EditorToolbar/preview-type.tid
@@ -0,0 +1,8 @@
+title: $:/core/ui/EditorToolbar/preview-type
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/chevron-down
+caption: {{$:/language/Buttons/PreviewType/Caption}}
+description: {{$:/language/Buttons/PreviewType/Hint}}
+condition: [all[shadows+tiddlers]tag[$:/tags/EditPreview]!has[draft.of]butfirst[]limit[1]]
+button-classes: tc-text-editor-toolbar-item-adjunct
+dropdown: $:/core/ui/EditorToolbar/preview-type-dropdown
diff --git a/core/ui/EditorToolbar/preview.tid b/core/ui/EditorToolbar/preview.tid
new file mode 100644
index 000000000..96cb14cac
--- /dev/null
+++ b/core/ui/EditorToolbar/preview.tid
@@ -0,0 +1,18 @@
+title: $:/core/ui/EditorToolbar/preview
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/preview-open
+custom-icon: yes
+caption: {{$:/language/Buttons/Preview/Caption}}
+description: {{$:/language/Buttons/Preview/Hint}}
+condition: [<targetTiddler>]
+button-classes: tc-text-editor-toolbar-item-start-group
+shortcuts: ((preview))
+
+<$reveal state="$:/state/showeditpreview" type="match" text="yes" tag="span">
+{{$:/core/images/preview-open}}
+<$action-setfield $tiddler="$:/state/showeditpreview" $value="no"/>
+</$reveal>
+<$reveal state="$:/state/showeditpreview" type="nomatch" text="yes" tag="span">
+{{$:/core/images/preview-closed}}
+<$action-setfield $tiddler="$:/state/showeditpreview" $value="yes"/>
+</$reveal>
diff --git a/core/ui/EditorToolbar/quote.tid b/core/ui/EditorToolbar/quote.tid
new file mode 100644
index 000000000..1fe5fd9e1
--- /dev/null
+++ b/core/ui/EditorToolbar/quote.tid
@@ -0,0 +1,15 @@
+title: $:/core/ui/EditorToolbar/quote
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/quote
+caption: {{$:/language/Buttons/Quote/Caption}}
+description: {{$:/language/Buttons/Quote/Hint}}
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+shortcuts: ((quote))
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="wrap-lines"
+	prefix="
+<<<"
+	suffix="<<<"
+/>
diff --git a/core/ui/EditorToolbar/size-dropdown.tid b/core/ui/EditorToolbar/size-dropdown.tid
new file mode 100644
index 000000000..96e4ec7d9
--- /dev/null
+++ b/core/ui/EditorToolbar/size-dropdown.tid
@@ -0,0 +1,76 @@
+title: $:/core/ui/EditorToolbar/size-dropdown
+
+\define lingo-base() $:/language/Buttons/Size/
+
+\define toolbar-button-size-preset(config-title)
+<$set name="width" filter="$(sizePair)$ +[first[]]">
+
+<$set name="height" filter="$(sizePair)$ +[last[]]">
+
+<$button tag="a">
+
+<$action-setfield
+	$tiddler="""$config-title$/new-width"""
+	$value=<<width>>
+/>
+
+<$action-setfield
+	$tiddler="""$config-title$/new-height"""
+	$value=<<height>>
+/>
+
+<$action-deletetiddler
+	$tiddler="""$config-title$/presets-popup"""
+/>
+
+<$text text=<<width>>/> &times; <$text text=<<height>>/>
+
+</$button>
+
+</$set>
+
+</$set>
+\end
+
+\define toolbar-button-size(config-title)
+''{{$:/language/Buttons/Size/Hint}}''
+
+<<lingo Caption/Width>> <$edit-text tag="input" tiddler="""$config-title$/new-width""" default=<<tv-bitmap-editor-width>> focus="true" size="8"/> <<lingo Caption/Height>> <$edit-text tag="input" tiddler="""$config-title$/new-height""" default=<<tv-bitmap-editor-height>> size="8"/> <$button popup="""$config-title$/presets-popup""" class="tc-btn-invisible tc-popup-keep" style="width: auto; display: inline-block; background-colour: inherit;" selectedClass="tc-selected">
+{{$:/core/images/down-arrow}}
+</$button>
+
+<$reveal tag="span" state="""$config-title$/presets-popup""" type="popup" position="belowleft" animate="yes">
+
+<div class="tc-drop-down tc-popup-keep">
+
+<$list filter={{$:/config/BitmapEditor/ImageSizes}} variable="sizePair">
+
+<$macrocall $name="toolbar-button-size-preset" config-title="$config-title$"/>
+
+</$list>
+
+</div>
+
+</$reveal>
+
+<$button>
+<$action-sendmessage
+	$message="tm-edit-bitmap-operation"
+	$param="resize"
+	width={{$config-title$/new-width}}
+	height={{$config-title$/new-height}}
+/>
+<$action-deletetiddler
+	$tiddler="""$config-title$/new-width"""
+/>
+<$action-deletetiddler
+	$tiddler="""$config-title$/new-height"""
+/>
+<$action-deletetiddler
+	$tiddler=<<dropdown-state>>
+/>
+<<lingo Caption/Resize>>
+</$button>
+\end
+
+<$macrocall $name="toolbar-button-size" config-title=<<qualify "$:/state/Size/">>/>
diff --git a/core/ui/EditorToolbar/size.tid b/core/ui/EditorToolbar/size.tid
new file mode 100644
index 000000000..ca9d31331
--- /dev/null
+++ b/core/ui/EditorToolbar/size.tid
@@ -0,0 +1,8 @@
+title: $:/core/ui/EditorToolbar/size
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/size
+caption: {{$:/language/Buttons/Size/Caption}}
+description: {{$:/language/Buttons/Size/Hint}}
+condition: [<targetTiddler>is[image]]
+dropdown: $:/core/ui/EditorToolbar/size-dropdown
+
diff --git a/core/ui/EditorToolbar/stamp-dropdown.tid b/core/ui/EditorToolbar/stamp-dropdown.tid
new file mode 100644
index 000000000..01b3abd90
--- /dev/null
+++ b/core/ui/EditorToolbar/stamp-dropdown.tid
@@ -0,0 +1,52 @@
+title: $:/core/ui/EditorToolbar/stamp-dropdown
+
+\define toolbar-button-stamp-inner()
+<$button tag="a">
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="replace-selection"
+	text={{$(snippetTitle)$}}
+/>
+
+<$action-deletetiddler
+	$tiddler=<<dropdown-state>>
+/>
+
+<$view tiddler=<<snippetTitle>> field="caption" mode="inline">
+
+<$view tiddler=<<snippetTitle>> field="title" mode="inline"/>
+
+</$view>
+
+</$button>
+\end
+
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/TextEditor/Snippet]!has[draft.of]sort[caption]]" variable="snippetTitle">
+
+<<toolbar-button-stamp-inner>>
+
+</$list>
+
+----
+
+<$button tag="a">
+
+<$action-sendmessage
+	$message="tm-new-tiddler"
+	tags="$:/tags/TextEditor/Snippet"
+	caption={{$:/language/Buttons/Stamp/New/Title}}
+	text={{$:/language/Buttons/Stamp/New/Text}}
+/>
+
+<$action-deletetiddler
+	$tiddler=<<dropdown-state>>
+/>
+
+<em>
+
+<$text text={{$:/language/Buttons/Stamp/Caption/New}}/>
+
+</em>
+
+</$button>
diff --git a/core/ui/EditorToolbar/stamp.tid b/core/ui/EditorToolbar/stamp.tid
new file mode 100644
index 000000000..bd83a2928
--- /dev/null
+++ b/core/ui/EditorToolbar/stamp.tid
@@ -0,0 +1,9 @@
+title: $:/core/ui/EditorToolbar/stamp
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/stamp
+caption: {{$:/language/Buttons/Stamp/Caption}}
+description: {{$:/language/Buttons/Stamp/Hint}}
+condition: [<targetTiddler>!is[image]]
+shortcuts: ((stamp))
+dropdown: $:/core/ui/EditorToolbar/stamp-dropdown
+text:
diff --git a/core/ui/EditorToolbar/strikethrough.tid b/core/ui/EditorToolbar/strikethrough.tid
new file mode 100644
index 000000000..53808cac3
--- /dev/null
+++ b/core/ui/EditorToolbar/strikethrough.tid
@@ -0,0 +1,14 @@
+title: $:/core/ui/EditorToolbar/strikethrough
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/strikethrough
+caption: {{$:/language/Buttons/Strikethrough/Caption}}
+description: {{$:/language/Buttons/Strikethrough/Hint}}
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+shortcuts: ((strikethrough))
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="wrap-selection"
+	prefix="~~"
+	suffix="~~"
+/>
diff --git a/core/ui/EditorToolbar/subscript.tid b/core/ui/EditorToolbar/subscript.tid
new file mode 100644
index 000000000..e2c83abbd
--- /dev/null
+++ b/core/ui/EditorToolbar/subscript.tid
@@ -0,0 +1,14 @@
+title: $:/core/ui/EditorToolbar/subscript
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/subscript
+caption: {{$:/language/Buttons/Subscript/Caption}}
+description: {{$:/language/Buttons/Subscript/Hint}}
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+shortcuts: ((subscript))
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="wrap-selection"
+	prefix=",,"
+	suffix=",,"
+/>
diff --git a/core/ui/EditorToolbar/superscript.tid b/core/ui/EditorToolbar/superscript.tid
new file mode 100644
index 000000000..c1a40efea
--- /dev/null
+++ b/core/ui/EditorToolbar/superscript.tid
@@ -0,0 +1,14 @@
+title: $:/core/ui/EditorToolbar/superscript
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/superscript
+caption: {{$:/language/Buttons/Superscript/Caption}}
+description: {{$:/language/Buttons/Superscript/Hint}}
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+shortcuts: ((superscript))
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="wrap-selection"
+	prefix="^^"
+	suffix="^^"
+/>
diff --git a/core/ui/EditorToolbar/underline.tid b/core/ui/EditorToolbar/underline.tid
new file mode 100644
index 000000000..ec6d63319
--- /dev/null
+++ b/core/ui/EditorToolbar/underline.tid
@@ -0,0 +1,14 @@
+title: $:/core/ui/EditorToolbar/underline
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/underline
+caption: {{$:/language/Buttons/Underline/Caption}}
+description: {{$:/language/Buttons/Underline/Hint}}
+condition: [<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]
+shortcuts: ((underline))
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="wrap-selection"
+	prefix="__"
+	suffix="__"
+/>
diff --git a/core/ui/MoreSideBar/Plugins.tid b/core/ui/MoreSideBar/Plugins.tid
new file mode 100644
index 000000000..614bcaeee
--- /dev/null
+++ b/core/ui/MoreSideBar/Plugins.tid
@@ -0,0 +1,8 @@
+title: $:/core/ui/MoreSideBar/Plugins
+tags: $:/tags/MoreSideBar
+caption: {{$:/language/ControlPanel/Plugins/Caption}}
+
+
+{{$:/language/ControlPanel/Plugins/Installed/Hint}}
+
+<<tabs "[all[shadows+tiddlers]tag[$:/tags/MoreSideBar/Plugins]!has[draft.of]]" "$:/core/ui/MoreSideBar/Plugins/Plugins">>
diff --git a/core/ui/MoreSideBar/plugins/Languages.tid b/core/ui/MoreSideBar/plugins/Languages.tid
new file mode 100644
index 000000000..2220f0124
--- /dev/null
+++ b/core/ui/MoreSideBar/plugins/Languages.tid
@@ -0,0 +1,5 @@
+title: $:/core/ui/MoreSideBar/Plugins/Languages
+tags: $:/tags/MoreSideBar/Plugins
+caption: {{$:/language/ControlPanel/Plugins/Languages/Caption}}
+
+<$list filter="[!has[draft.of]plugin-type[language]sort[description]]" template="$:/core/ui/PluginListItemTemplate" emptyMessage={{$:/language/ControlPanel/Plugins/Empty/Hint}}/>
diff --git a/core/ui/MoreSideBar/plugins/Plugins.tid b/core/ui/MoreSideBar/plugins/Plugins.tid
new file mode 100644
index 000000000..96933542a
--- /dev/null
+++ b/core/ui/MoreSideBar/plugins/Plugins.tid
@@ -0,0 +1,5 @@
+title: $:/core/ui/MoreSideBar/Plugins/Plugins
+tags: $:/tags/MoreSideBar/Plugins
+caption: {{$:/language/ControlPanel/Plugins/Plugins/Caption}}
+
+<$list filter="[!has[draft.of]plugin-type[plugin]sort[description]]" template="$:/core/ui/PluginListItemTemplate" emptyMessage={{$:/language/ControlPanel/Plugins/Empty/Hint}}>>/>
diff --git a/core/ui/MoreSideBar/plugins/Theme.tid b/core/ui/MoreSideBar/plugins/Theme.tid
new file mode 100644
index 000000000..48447cd6e
--- /dev/null
+++ b/core/ui/MoreSideBar/plugins/Theme.tid
@@ -0,0 +1,5 @@
+title: $:/core/ui/MoreSideBar/Plugins/Theme
+tags: $:/tags/MoreSideBar/Plugins
+caption: {{$:/language/ControlPanel/Plugins/Themes/Caption}}
+
+<$list filter="[!has[draft.of]plugin-type[theme]sort[description]]" template="$:/core/ui/PluginListItemTemplate" emptyMessage={{$:/language/ControlPanel/Plugins/Empty/Hint}}/>
diff --git a/core/ui/PageControls/new-image.tid b/core/ui/PageControls/new-image.tid
new file mode 100644
index 000000000..bb9d4cd9c
--- /dev/null
+++ b/core/ui/PageControls/new-image.tid
@@ -0,0 +1,14 @@
+title: $:/core/ui/Buttons/new-image
+tags: $:/tags/PageControls
+caption: {{$:/core/images/new-image-button}} {{$:/language/Buttons/NewImage/Caption}}
+description: {{$:/language/Buttons/NewImage/Hint}}
+
+<$button tooltip={{$:/language/Buttons/NewImage/Hint}} aria-label={{$:/language/Buttons/NewImage/Caption}} class=<<tv-config-toolbar-class>>>
+<$action-sendmessage $message="tm-new-tiddler" type="image/jpeg"/>
+<$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
+{{$:/core/images/new-image-button}}
+</$list>
+<$list filter="[<tv-config-toolbar-text>prefix[yes]]">
+<span class="tc-btn-text"><$text text={{$:/language/Buttons/NewImage/Caption}}/></span>
+</$list>
+</$button>
diff --git a/core/ui/PageControls/print.tid b/core/ui/PageControls/print.tid
new file mode 100644
index 000000000..cc2709cd2
--- /dev/null
+++ b/core/ui/PageControls/print.tid
@@ -0,0 +1,13 @@
+title: $:/core/ui/Buttons/print
+tags: $:/tags/PageControls
+caption: {{$:/core/images/print-button}} {{$:/language/Buttons/Print/Caption}}
+description: {{$:/language/Buttons/Print/Hint}}
+
+<$button message="tm-print" tooltip={{$:/language/Buttons/Print/Hint}} aria-label={{$:/language/Buttons/Print/Caption}} class=<<tv-config-toolbar-class>>>
+<$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
+{{$:/core/images/print-button}}
+</$list>
+<$list filter="[<tv-config-toolbar-text>prefix[yes]]">
+<span class="tc-btn-text"><$text text={{$:/language/Buttons/Print/Caption}}/></span>
+</$list>
+</$button>
\ No newline at end of file
diff --git a/core/ui/PluginInfo.tid b/core/ui/PluginInfo.tid
index 08167f1ec..d8944bf35 100644
--- a/core/ui/PluginInfo.tid
+++ b/core/ui/PluginInfo.tid
@@ -6,10 +6,15 @@ $(currentTiddler)$/$(languageTitle)$/$(currentTab)$
 \define info-tiddler-title()
 $(currentTiddler)$/$(currentTab)$
 \end
+\define default-tiddler-title()
+$:/core/ui/PluginInfo/Default/$(currentTab)$
+\end
 <$transclude tiddler=<<localised-info-tiddler-title>> mode="block">
 <$transclude tiddler=<<currentTiddler>> subtiddler=<<localised-info-tiddler-title>> mode="block">
 <$transclude tiddler=<<currentTiddler>> subtiddler=<<info-tiddler-title>> mode="block">
-No ''"<$text text=<<currentTab>>/>"'' found
+<$transclude tiddler=<<default-tiddler-title>> mode="block">
+{{$:/language/ControlPanel/Plugin/NoInfoFound/Hint}}
+</$transclude>
 </$transclude>
 </$transclude>
 </$transclude>
diff --git a/core/ui/PluginInfoDefaultContents.tid b/core/ui/PluginInfoDefaultContents.tid
new file mode 100644
index 000000000..f006d0c60
--- /dev/null
+++ b/core/ui/PluginInfoDefaultContents.tid
@@ -0,0 +1,13 @@
+title: $:/core/ui/PluginInfo/Default/contents
+
+\define lingo-base() $:/language/TiddlerInfo/Advanced/PluginInfo/
+<<lingo Hint>>
+<ul>
+<$list filter="[all[current]plugintiddlers[]sort[title]]" emptyMessage=<<lingo Empty/Hint>>>
+<li>
+<$link to={{!!title}}>
+<$view field="title"/>
+</$link>
+</li>
+</$list>
+</ul>
diff --git a/core/ui/PluginListItemTemplate.tid b/core/ui/PluginListItemTemplate.tid
new file mode 100644
index 000000000..f781bca92
--- /dev/null
+++ b/core/ui/PluginListItemTemplate.tid
@@ -0,0 +1,9 @@
+title: $:/core/ui/PluginListItemTemplate
+
+<div class="tc-menu-list-item">
+<$link to={{!!title}}>
+<$view field="description">
+<$view field="title"/>
+</$view>
+</$link>
+</div>
\ No newline at end of file
diff --git a/core/ui/SideBarLists.tid b/core/ui/SideBarLists.tid
index dfe012502..f54380721 100644
--- a/core/ui/SideBarLists.tid
+++ b/core/ui/SideBarLists.tid
@@ -17,9 +17,12 @@ title: $:/core/ui/SideBarLists
 {{$:/core/images/close-button}}
 </$button>
 <$button popup=<<qualify "$:/state/popup/search-dropdown">> class="tc-btn-invisible">
+{{$:/core/images/down-arrow}}
+<$list filter="[{$:/temp/search}minlength{$:/config/Search/MinLength}limit[1]]" variable="listItem">
 <$set name="resultCount" value="""<$count filter="[!is[system]search{$(searchTiddler)$}]"/>""">
-{{$:/core/images/down-arrow}} {{$:/language/Search/Matches}}
+{{$:/language/Search/Matches}}
 </$set>
+</$list>
 </$button>
 </$reveal>
 <$reveal state="$:/temp/search" type="match" text="">
@@ -33,8 +36,12 @@ title: $:/core/ui/SideBarLists
 
 <$reveal tag="div" class="tc-block-dropdown tc-search-drop-down tc-popup-handle" state=<<qualify "$:/state/popup/search-dropdown">> type="nomatch" text="" default="">
 
+<$list filter="[{$:/temp/search}minlength{$:/config/Search/MinLength}limit[1]]" emptyMessage="""<div class="tc-search-results">{{$:/language/Search/Search/TooShort}}</div>""" variable="listItem">
+
 {{$:/core/ui/SearchResults}}
 
+</$list>
+
 </$reveal>
 
 </$reveal>
diff --git a/core/ui/TagTemplate.tid b/core/ui/TagTemplate.tid
index 006758f73..f302d8f3d 100644
--- a/core/ui/TagTemplate.tid
+++ b/core/ui/TagTemplate.tid
@@ -7,18 +7,18 @@ color:$(foregroundColor)$;
 \end
 
 \define tag-body-inner(colour,fallbackTarget,colourA,colourB)
-<$set name="foregroundColor" value=<<contrastcolour target:"""$colour$""" fallbackTarget:"""$fallbackTarget$""" colourA:"""$colourA$""" colourB:"""$colourB$""">>>
-<$set name="backgroundColor" value="""$colour$""">
+<$vars foregroundColor=<<contrastcolour target:"""$colour$""" fallbackTarget:"""$fallbackTarget$""" colourA:"""$colourA$""" colourB:"""$colourB$""">> backgroundColor="""$colour$""">
 <$button popup=<<qualify "$:/state/popup/tag">> class="tc-btn-invisible tc-tag-label" style=<<tag-styles>>>
 <$transclude tiddler={{!!icon}}/> <$view field="title" format="text" />
 </$button>
-<$reveal state=<<qualify "$:/state/popup/tag">> type="popup" position="below" animate="yes"><div class="tc-drop-down"><$transclude tiddler="$:/core/ui/ListItemTemplate"/>
+<$reveal state=<<qualify "$:/state/popup/tag">> type="popup" position="below" animate="yes" class="tc-drop-down"><$transclude tiddler="$:/core/ui/ListItemTemplate"/>
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/TagDropdown]!has[draft.of]]" variable="listItem"> 
+<$transclude tiddler=<<listItem>>/> 
+</$list> 
 <hr>
 <$list filter="[all[current]tagging[]]" template="$:/core/ui/ListItemTemplate"/>
-</div>
 </$reveal>
-</$set>
-</$set>
+</$vars>
 \end
 
 \define tag-body(colour,palette)
@@ -27,4 +27,4 @@ color:$(foregroundColor)$;
 </span>
 \end
 
-<$macrocall $name="tag-body" colour={{!!color}} palette={{$:/palette}}/>
\ No newline at end of file
+<$macrocall $name="tag-body" colour={{!!color}} palette={{$:/palette}}/>
diff --git a/core/ui/ViewTemplate/plugin.tid b/core/ui/ViewTemplate/plugin.tid
index 2c7d2081c..07bb3b618 100644
--- a/core/ui/ViewTemplate/plugin.tid
+++ b/core/ui/ViewTemplate/plugin.tid
@@ -2,7 +2,11 @@ title: $:/core/ui/ViewTemplate/plugin
 tags: $:/tags/ViewTemplate
 
 <$list filter="[all[current]has[plugin-type]] -[all[current]field:plugin-type[import]]">
-
-{{||$:/core/ui/TiddlerInfo/Advanced/PluginInfo}}
-
+<$set name="plugin-type" value={{!!plugin-type}}>
+<$set name="default-popup-state" value="yes">
+<$set name="qualified-state" value=<<qualify "$:/state/plugin-info">>>
+{{||$:/core/ui/Components/plugin-info}}
+</$set>
+</$set>
+</$set>
 </$list>
diff --git a/core/ui/ViewToolbar/fold-bar.tid b/core/ui/ViewToolbar/fold-bar.tid
index 6e813dbb4..1b62975c5 100644
--- a/core/ui/ViewToolbar/fold-bar.tid
+++ b/core/ui/ViewToolbar/fold-bar.tid
@@ -1,6 +1,6 @@
 title: $:/core/ui/Buttons/fold-bar
 tags: $:/tags/ViewToolbar
-caption: {{$:/language/Buttons/Fold/FoldBar/Caption}}
+caption: {{$:/core/images/chevron-up}} {{$:/language/Buttons/Fold/FoldBar/Caption}}
 description: {{$:/language/Buttons/Fold/FoldBar/Hint}}
 
 <!-- This dummy toolbar button is here to allow visibility of the fold-bar to be controlled as if it were a toolbar button -->
\ No newline at end of file
diff --git a/core/wiki/config/BitmapEditorColour.tid b/core/wiki/config/BitmapEditorColour.tid
index 7c3902acb..de99f92fc 100644
--- a/core/wiki/config/BitmapEditorColour.tid
+++ b/core/wiki/config/BitmapEditorColour.tid
@@ -1,3 +1,3 @@
 title: $:/config/BitmapEditor/Colour
 
-#ff0
\ No newline at end of file
+#444
\ No newline at end of file
diff --git a/core/wiki/config/BitmapEditorImageSizes.tid b/core/wiki/config/BitmapEditorImageSizes.tid
new file mode 100644
index 000000000..28de18611
--- /dev/null
+++ b/core/wiki/config/BitmapEditorImageSizes.tid
@@ -0,0 +1,3 @@
+title: $:/config/BitmapEditor/ImageSizes
+
+[[62px 100px]] [[100px 62px]] [[124px 200px]] [[200px 124px]] [[248px 400px]] [[371px 600px]] [[400px 248px]] [[556px 900px]] [[600px 371px]] [[742px 1200px]] [[900px 556px]] [[1200px 742px]]
\ No newline at end of file
diff --git a/core/wiki/config/BitmapEditorLineWidth.tid b/core/wiki/config/BitmapEditorLineWidth.tid
index ba51e732c..bfd979d5f 100644
--- a/core/wiki/config/BitmapEditorLineWidth.tid
+++ b/core/wiki/config/BitmapEditorLineWidth.tid
@@ -1,3 +1,3 @@
 title: $:/config/BitmapEditor/LineWidth
 
-3
\ No newline at end of file
+3px
\ No newline at end of file
diff --git a/core/wiki/config/BitmapEditorLineWidths.tid b/core/wiki/config/BitmapEditorLineWidths.tid
new file mode 100644
index 000000000..b44e933cd
--- /dev/null
+++ b/core/wiki/config/BitmapEditorLineWidths.tid
@@ -0,0 +1,3 @@
+title: $:/config/BitmapEditor/LineWidths
+
+0.25px 0.5px 1px 2px 3px 4px 6px 8px 10px 16px 20px 28px 40px 56px 80px
\ No newline at end of file
diff --git a/core/wiki/config/BitmapEditorOpacities.tid b/core/wiki/config/BitmapEditorOpacities.tid
new file mode 100644
index 000000000..a9b7e251e
--- /dev/null
+++ b/core/wiki/config/BitmapEditorOpacities.tid
@@ -0,0 +1,3 @@
+title: $:/config/BitmapEditor/Opacities
+
+0.01 0.025 0.05 0.075 0.1 0.15 0.2 0.3 0.4 0.5 0.6 0.7 0.8 0.9 1.0
\ No newline at end of file
diff --git a/core/wiki/config/BitmapEditorOpacity.tid b/core/wiki/config/BitmapEditorOpacity.tid
new file mode 100644
index 000000000..9abdc4c5f
--- /dev/null
+++ b/core/wiki/config/BitmapEditorOpacity.tid
@@ -0,0 +1,3 @@
+title: $:/config/BitmapEditor/Opacity
+
+1.0
\ No newline at end of file
diff --git a/core/wiki/config/EditorToolbarButtons.multids b/core/wiki/config/EditorToolbarButtons.multids
new file mode 100644
index 000000000..a80583d7d
--- /dev/null
+++ b/core/wiki/config/EditorToolbarButtons.multids
@@ -0,0 +1,5 @@
+title: $:/config/EditorToolbarButtons/Visibility/$:/
+
+core/ui/EditorToolbar/heading-4: hide
+core/ui/EditorToolbar/heading-5: hide
+core/ui/EditorToolbar/heading-6: hide
diff --git a/core/wiki/config/MissingLinks.tid b/core/wiki/config/MissingLinks.tid
new file mode 100644
index 000000000..99944224f
--- /dev/null
+++ b/core/wiki/config/MissingLinks.tid
@@ -0,0 +1,2 @@
+title: $:/config/MissingLinks
+text: yes
diff --git a/core/wiki/config/OfficialPluginLibrary.tid b/core/wiki/config/OfficialPluginLibrary.tid
index e4bfbc02c..78e513137 100644
--- a/core/wiki/config/OfficialPluginLibrary.tid
+++ b/core/wiki/config/OfficialPluginLibrary.tid
@@ -1,6 +1,6 @@
 title: $:/config/OfficialPluginLibrary
 tags: $:/tags/PluginLibrary
-url: http://tiddlywiki.com/library/v5.1.9/index.html
+url: http://tiddlywiki.com/library/v5.1.13/index.html
 caption: {{$:/language/OfficialPluginLibrary}}
 
 {{$:/language/OfficialPluginLibrary/Hint}}
diff --git a/core/wiki/config/PageControlButtons.multids b/core/wiki/config/PageControlButtons.multids
index 393898551..9086e8f18 100644
--- a/core/wiki/config/PageControlButtons.multids
+++ b/core/wiki/config/PageControlButtons.multids
@@ -13,8 +13,10 @@ core/ui/Buttons/language: hide
 core/ui/Buttons/tag-manager: hide
 core/ui/Buttons/more-page-actions: hide
 core/ui/Buttons/new-journal: hide
+core/ui/Buttons/new-image: hide
 core/ui/Buttons/palette: hide
 core/ui/Buttons/permaview: hide
+core/ui/Buttons/print: hide
 core/ui/Buttons/storyview: hide
 core/ui/Buttons/theme: hide
 core/ui/Buttons/unfold-all: hide
diff --git a/core/wiki/config/SearchMinLength.tid b/core/wiki/config/SearchMinLength.tid
new file mode 100644
index 000000000..16acd5579
--- /dev/null
+++ b/core/wiki/config/SearchMinLength.tid
@@ -0,0 +1,3 @@
+title: $:/config/Search/MinLength
+
+3
\ No newline at end of file
diff --git a/core/wiki/config/ShortcutInfo.multids b/core/wiki/config/ShortcutInfo.multids
new file mode 100644
index 000000000..8cd3c488f
--- /dev/null
+++ b/core/wiki/config/ShortcutInfo.multids
@@ -0,0 +1,26 @@
+title: $:/config/ShortcutInfo/
+
+bold: {{$:/language/Buttons/Bold/Hint}}
+cancel-edit-tiddler: {{$:/language/Buttons/Cancel/Hint}}
+excise: {{$:/language/Buttons/Excise/Hint}}
+heading-1: {{$:/language/Buttons/Heading1/Hint}}
+heading-2: {{$:/language/Buttons/Heading2/Hint}}
+heading-3: {{$:/language/Buttons/Heading3/Hint}}
+heading-4: {{$:/language/Buttons/Heading4/Hint}}
+heading-5: {{$:/language/Buttons/Heading5/Hint}}
+heading-6: {{$:/language/Buttons/Heading6/Hint}}
+italic: {{$:/language/Buttons/Italic/Hint}}
+link: {{$:/language/Buttons/Link/Hint}}
+list-bullet: {{$:/language/Buttons/ListBullet/Hint}}
+list-number: {{$:/language/Buttons/ListNumber/Hint}}
+mono-block: {{$:/language/Buttons/MonoBlock/Hint}}
+mono-line: {{$:/language/Buttons/MonoLine/Hint}}
+picture: {{$:/language/Buttons/Picture/Hint}}
+preview: {{$:/language/Buttons/Preview/Hint}}
+quote: {{$:/language/Buttons/Quote/Hint}}
+save-tiddler: {{$:/language/Buttons/Save/Hint}}
+stamp: {{$:/language/Buttons/Stamp/Hint}}
+strikethrough: {{$:/language/Buttons/Strikethrough/Hint}}
+subscript: {{$:/language/Buttons/Subscript/Hint}}
+superscript: {{$:/language/Buttons/Superscript/Hint}}
+underline: {{$:/language/Buttons/Underline/Hint}}
diff --git a/core/wiki/config/TextEditorEditorHeightHeight.tid b/core/wiki/config/TextEditorEditorHeightHeight.tid
new file mode 100644
index 000000000..208b2b3a7
--- /dev/null
+++ b/core/wiki/config/TextEditorEditorHeightHeight.tid
@@ -0,0 +1,3 @@
+title: $:/config/TextEditor/EditorHeight/Height
+
+400px
\ No newline at end of file
diff --git a/core/wiki/config/TextEditorEditorHeightMode.tid b/core/wiki/config/TextEditorEditorHeightMode.tid
new file mode 100644
index 000000000..09449ffa2
--- /dev/null
+++ b/core/wiki/config/TextEditorEditorHeightMode.tid
@@ -0,0 +1,3 @@
+title: $:/config/TextEditor/EditorHeight/Mode
+
+auto
\ No newline at end of file
diff --git a/core/wiki/config/shortcuts/cancel-edit-tiddler.tid b/core/wiki/config/shortcuts/cancel-edit-tiddler.tid
deleted file mode 100644
index dbb09ad0f..000000000
--- a/core/wiki/config/shortcuts/cancel-edit-tiddler.tid
+++ /dev/null
@@ -1,3 +0,0 @@
-title: $:/config/shortcuts/cancel-edit-tiddler
-
-escape
\ No newline at end of file
diff --git a/core/wiki/config/shortcuts/save-tiddler.tid b/core/wiki/config/shortcuts/save-tiddler.tid
deleted file mode 100644
index da80be94c..000000000
--- a/core/wiki/config/shortcuts/save-tiddler.tid
+++ /dev/null
@@ -1,3 +0,0 @@
-title: $:/config/shortcuts/save-tiddler
-
-ctrl+enter
\ No newline at end of file
diff --git a/core/wiki/config/shortcuts/shortcuts-linux.multids b/core/wiki/config/shortcuts/shortcuts-linux.multids
new file mode 100644
index 000000000..4fb8cb5fc
--- /dev/null
+++ b/core/wiki/config/shortcuts/shortcuts-linux.multids
@@ -0,0 +1,2 @@
+title: $:/config/shortcuts-linux/
+
diff --git a/core/wiki/config/shortcuts/shortcuts-mac.multids b/core/wiki/config/shortcuts/shortcuts-mac.multids
new file mode 100644
index 000000000..adf3f8bd2
--- /dev/null
+++ b/core/wiki/config/shortcuts/shortcuts-mac.multids
@@ -0,0 +1,5 @@
+title: $:/config/shortcuts-mac/
+
+bold: meta-B
+italic: meta-I
+underline: meta-U
diff --git a/core/wiki/config/shortcuts/shortcuts-not-linux.multids b/core/wiki/config/shortcuts/shortcuts-not-linux.multids
new file mode 100644
index 000000000..e0a175ec4
--- /dev/null
+++ b/core/wiki/config/shortcuts/shortcuts-not-linux.multids
@@ -0,0 +1,2 @@
+title: $:/config/shortcuts-not-linux/
+
diff --git a/core/wiki/config/shortcuts/shortcuts-not-mac.multids b/core/wiki/config/shortcuts/shortcuts-not-mac.multids
new file mode 100644
index 000000000..3d7e3a2d8
--- /dev/null
+++ b/core/wiki/config/shortcuts/shortcuts-not-mac.multids
@@ -0,0 +1,5 @@
+title: $:/config/shortcuts-not-mac/
+
+bold: ctrl-B
+italic: ctrl-I
+underline: ctrl-U
diff --git a/core/wiki/config/shortcuts/shortcuts-not-windows.multids b/core/wiki/config/shortcuts/shortcuts-not-windows.multids
new file mode 100644
index 000000000..5a80888c5
--- /dev/null
+++ b/core/wiki/config/shortcuts/shortcuts-not-windows.multids
@@ -0,0 +1,2 @@
+title: $:/config/shortcuts-not-windows/
+
diff --git a/core/wiki/config/shortcuts/shortcuts-windows.multids b/core/wiki/config/shortcuts/shortcuts-windows.multids
new file mode 100644
index 000000000..45f0db02b
--- /dev/null
+++ b/core/wiki/config/shortcuts/shortcuts-windows.multids
@@ -0,0 +1,2 @@
+title: $:/config/shortcuts-windows/
+
diff --git a/core/wiki/config/shortcuts/shortcuts.multids b/core/wiki/config/shortcuts/shortcuts.multids
new file mode 100644
index 000000000..84503a77b
--- /dev/null
+++ b/core/wiki/config/shortcuts/shortcuts.multids
@@ -0,0 +1,23 @@
+title: $:/config/shortcuts/
+
+cancel-edit-tiddler: escape
+excise: ctrl-E
+heading-1: ctrl-1
+heading-2: ctrl-2
+heading-3: ctrl-3
+heading-4: ctrl-4
+heading-5: ctrl-5
+heading-6: ctrl-6
+link: ctrl-L
+list-bullet: ctrl-shift-L
+list-number: ctrl-shift-N
+mono-block: ctrl-shift-M
+mono-line: ctrl-M
+picture: ctrl-shift-I
+preview: alt-P
+quote: ctrl-Q
+save-tiddler: ctrl+enter
+stamp: ctrl-S
+strikethrough: ctrl-T
+subscript: ctrl-shift-B
+superscript: ctrl-shift-P
diff --git a/core/wiki/macros/CSS.tid b/core/wiki/macros/CSS.tid
index 7aa5a2b51..1b7c35eff 100644
--- a/core/wiki/macros/CSS.tid
+++ b/core/wiki/macros/CSS.tid
@@ -51,6 +51,14 @@ background-image: -ms-linear-gradient($gradient$);
 ``
 \end
 
+\define column-count(columns)
+``
+-moz-column-count: $columns$;
+-webkit-column-count: $columns$;
+column-count: $columns$;
+``
+\end
+
 \define datauri(title)
 <$macrocall $name="makedatauri" type={{$title$!!type}} text={{$title$}}/>
 \end
diff --git a/core/wiki/macros/colour-picker.tid b/core/wiki/macros/colour-picker.tid
new file mode 100644
index 000000000..af74577e3
--- /dev/null
+++ b/core/wiki/macros/colour-picker.tid
@@ -0,0 +1,55 @@
+title: $:/core/macros/colour-picker
+tags: $:/tags/Macro
+
+\define colour-picker-update-recent()
+<$action-listops
+	$tiddler="$:/config/ColourPicker/Recent"
+	$subfilter="$(colour-picker-value)$ [list[$:/config/ColourPicker/Recent]remove[$(colour-picker-value)$]] +[limit[8]]"
+/>
+\end
+
+\define colour-picker-inner(actions)
+<$button tag="a" tooltip="""$(colour-picker-value)$""">
+
+$(colour-picker-update-recent)$
+
+$actions$
+
+<div style="background-color: $(colour-picker-value)$; width: 100%; height: 100%; border-radius: 50%;"/>
+
+</$button>
+\end
+
+\define colour-picker-recent-inner(actions)
+<$set name="colour-picker-value" value="$(recentColour)$">
+<$macrocall $name="colour-picker-inner" actions="""$actions$"""/>
+</$set>
+\end
+
+\define colour-picker-recent(actions)
+{{$:/language/ColourPicker/Recent}} <$list filter="[list[$:/config/ColourPicker/Recent]]" variable="recentColour">
+<$macrocall $name="colour-picker-recent-inner" actions="""$actions$"""/></$list>
+\end
+
+\define colour-picker(actions)
+<div class="tc-colour-chooser">
+
+<$macrocall $name="colour-picker-recent" actions="""$actions$"""/>
+
+---
+
+<$list filter="LightPink Pink Crimson LavenderBlush PaleVioletRed HotPink DeepPink MediumVioletRed Orchid Thistle Plum Violet Magenta Fuchsia DarkMagenta Purple MediumOrchid DarkViolet DarkOrchid Indigo BlueViolet MediumPurple MediumSlateBlue SlateBlue DarkSlateBlue Lavender GhostWhite Blue MediumBlue MidnightBlue DarkBlue Navy RoyalBlue CornflowerBlue LightSteelBlue LightSlateGrey SlateGrey DodgerBlue AliceBlue SteelBlue LightSkyBlue SkyBlue DeepSkyBlue LightBlue PowderBlue CadetBlue Azure LightCyan PaleTurquoise Cyan Aqua DarkTurquoise DarkSlateGrey DarkCyan Teal MediumTurquoise LightSeaGreen Turquoise Aquamarine MediumAquamarine MediumSpringGreen MintCream SpringGreen MediumSeaGreen SeaGreen Honeydew LightGreen PaleGreen DarkSeaGreen LimeGreen Lime ForestGreen Green DarkGreen Chartreuse LawnGreen GreenYellow DarkOliveGreen YellowGreen OliveDrab Beige LightGoldenrodYellow Ivory LightYellow Yellow Olive DarkKhaki LemonChiffon PaleGoldenrod Khaki Gold Cornsilk Goldenrod DarkGoldenrod FloralWhite OldLace Wheat Moccasin Orange PapayaWhip BlanchedAlmond NavajoWhite AntiqueWhite Tan BurlyWood Bisque DarkOrange Linen Peru PeachPuff SandyBrown Chocolate SaddleBrown Seashell Sienna LightSalmon Coral OrangeRed DarkSalmon Tomato MistyRose Salmon Snow LightCoral RosyBrown IndianRed Red Brown FireBrick DarkRed Maroon White WhiteSmoke Gainsboro LightGrey Silver DarkGrey Grey DimGrey Black" variable="colour-picker-value">
+<$macrocall $name="colour-picker-inner" actions="""$actions$"""/>
+</$list>
+
+---
+
+<$edit-text tiddler="$:/config/ColourPicker/New" tag="input" default="" placeholder=""/> 
+<$edit-text tiddler="$:/config/ColourPicker/New" type="color" tag="input"/>
+<$set name="colour-picker-value" value={{$:/config/ColourPicker/New}}>
+<$macrocall $name="colour-picker-inner" actions="""$actions$"""/>
+</$set>
+
+</div>
+
+\end
diff --git a/core/wiki/macros/image-picker.tid b/core/wiki/macros/image-picker.tid
new file mode 100644
index 000000000..68bbba34d
--- /dev/null
+++ b/core/wiki/macros/image-picker.tid
@@ -0,0 +1,26 @@
+title: $:/core/macros/image-picker
+tags: $:/tags/Macro
+
+\define image-picker-inner(actions)
+<$button tag="a" tooltip="""$(imageTitle)$""">
+
+$actions$
+
+<$transclude tiddler=<<imageTitle>>/>
+
+</$button>
+\end
+
+\define image-picker(actions,subfilter:"")
+<div class="tc-image-chooser">
+
+<$list filter="[all[shadows+tiddlers]is[image]$subfilter$!has[draft.of]] -[type[application/pdf]] +[sort[title]]" variable="imageTitle">
+
+<$macrocall $name="image-picker-inner" actions="""$actions$"""/>
+
+</$list>
+
+</div>
+
+\end
+
diff --git a/core/wiki/macros/toc.tid b/core/wiki/macros/toc.tid
index 1be085ee9..75431c575 100644
--- a/core/wiki/macros/toc.tid
+++ b/core/wiki/macros/toc.tid
@@ -31,7 +31,7 @@ tags: $:/tags/Macro
 \end
 
 \define toc-linked-expandable-body(tag,sort:"",itemClassFilter)
-<$set name="toc-state" value=<<qualify "$:/state/toc/$tag$-$(currentTiddler)$">>>
+<$set name="toc-state" value=<<qualify """$:/state/toc/$tag$-$(currentTiddler)$""">>>
 <$set name="toc-item-class" filter="""$itemClassFilter$""" value="toc-item-selected" emptyValue="toc-item">
 <li class=<<toc-item-class>>>
 <$link>
@@ -56,7 +56,7 @@ tags: $:/tags/Macro
 \end
 
 \define toc-unlinked-expandable-body(tag,sort:"",itemClassFilter)
-<$set name="toc-state" value=<<qualify "$:/state/toc/$tag$-$(currentTiddler)$">>>
+<$set name="toc-state" value=<<qualify """$:/state/toc/$tag$-$(currentTiddler)$""">>>
 <$set name="toc-item-class" filter="""$itemClassFilter$""" value="toc-item-selected" emptyValue="toc-item">
 <li class=<<toc-item-class>>>
 <$reveal type="nomatch" state=<<toc-state>> text="open">
@@ -79,18 +79,24 @@ tags: $:/tags/Macro
 </$set>
 \end
 
+\define toc-expandable-empty-message()
+<<toc-linked-expandable-body tag:"""$(tag)$""" sort:"""$(sort)$""" itemClassFilter:"""$(itemClassFilter)$""">>
+\end
+
 \define toc-expandable(tag,sort:"",itemClassFilter)
+<$vars tag="""$tag$""" sort="""$sort$""" itemClassFilter="""$itemClassFilter$""">
 <ol class="tc-toc toc-expandable">
 <$list filter="[all[shadows+tiddlers]tag[$tag$]!has[draft.of]$sort$]">
-<$list filter="[all[current]toc-link[no]]" emptyMessage="<<toc-linked-expandable-body tag:'$tag$' sort:'$sort$' itemClassFilter:'$itemClassFilter$'>>">
+<$list filter="[all[current]toc-link[no]]" emptyMessage=<<toc-expandable-empty-message>>>
 <<toc-unlinked-expandable-body tag:"""$tag$""" sort:"""$sort$""" itemClassFilter:"""itemClassFilter""">>
 </$list>
 </$list>
 </ol>
+</$vars>
 \end
 
 \define toc-linked-selective-expandable-body(tag,sort:"",itemClassFilter)
-<$set name="toc-state" value=<<qualify "$:/state/toc/$tag$-$(currentTiddler)$">>>
+<$set name="toc-state" value=<<qualify """$:/state/toc/$tag$-$(currentTiddler)$""">>>
 <$set name="toc-item-class" filter="""$itemClassFilter$""" value="toc-item-selected" emptyValue="toc-item">
 <li class=<<toc-item-class>>>
 <$link>
@@ -117,7 +123,7 @@ tags: $:/tags/Macro
 \end
 
 \define toc-unlinked-selective-expandable-body(tag,sort:"",itemClassFilter)
-<$set name="toc-state" value=<<qualify "$:/state/toc/$tag$-$(currentTiddler)$">>>
+<$set name="toc-state" value=<<qualify """$:/state/toc/$tag$-$(currentTiddler)$""">>>
 <$set name="toc-item-class" filter="""$itemClassFilter$""" value="toc-item-selected" emptyValue="toc-item">
 <li class=<<toc-item-class>>>
 <$list filter="[all[current]tagging[]limit[1]]" variable="ignore" emptyMessage="<$button class='tc-btn-invisible'>{{$:/core/images/blank}}</$button> <$view field='caption'><$view field='title'/></$view>">
@@ -142,14 +148,20 @@ tags: $:/tags/Macro
 </$set>
 \end
 
+\define toc-selective-expandable-empty-message()
+<<toc-linked-selective-expandable-body tag:"""$(tag)$""" sort:"""$(sort)$""" itemClassFilter:"""$(itemClassFilter)$""">>
+\end
+
 \define toc-selective-expandable(tag,sort:"",itemClassFilter)
+<$vars tag="""$tag$""" sort="""$sort$""" itemClassFilter="""$itemClassFilter$""">
 <ol class="tc-toc toc-selective-expandable">
 <$list filter="[all[shadows+tiddlers]tag[$tag$]!has[draft.of]$sort$]">
-<$list filter="[all[current]toc-link[no]]" variable="ignore" emptyMessage="<<toc-linked-selective-expandable-body tag:'$tag$' sort:'$sort$' itemClassFilter:'$itemClassFilter$'>>">
+<$list filter="[all[current]toc-link[no]]" variable="ignore" emptyMessage=<<toc-selective-expandable-empty-message>>>
 <<toc-unlinked-selective-expandable-body tag:"""$tag$""" sort:"""$sort$""" itemClassFilter:"""$itemClassFilter$""">>
 </$list>
 </$list>
 </ol>
+</$vars>
 \end
 
 \define toc-tabbed-selected-item-filter(selectedTiddler)
diff --git a/core/wiki/macros/translink.tid b/core/wiki/macros/translink.tid
new file mode 100644
index 000000000..4c5018673
--- /dev/null
+++ b/core/wiki/macros/translink.tid
@@ -0,0 +1,15 @@
+title: $:/core/macros/translink
+tags: $:/tags/Macro
+
+\define translink(title,mode:"block")
+<div style="border:1px solid #ccc; padding: 0.5em; background: black; foreground; white;">
+<$link to="""$title$""">
+<$text text="""$title$"""/>
+</$link>
+<div style="border:1px solid #ccc; padding: 0.5em; background: white; foreground; black;">
+<$transclude tiddler="""$title$""" mode="$mode$">
+"<$text text="""$title$"""/>" is missing
+</$transclude>
+</div>
+</div>
+\end
diff --git a/core/wiki/tags/AdvancedSearchFilterButton.tid b/core/wiki/tags/AdvancedSearchFilterButton.tid
new file mode 100644
index 000000000..74d38bdc2
--- /dev/null
+++ b/core/wiki/tags/AdvancedSearchFilterButton.tid
@@ -0,0 +1,2 @@
+title: $:/tags/AdvancedSearch/FilterButton
+list: $:/core/ui/AdvancedSearch/Filter/FilterButtons/dropdown $:/core/ui/AdvancedSearch/Filter/FilterButtons/clear $:/core/ui/AdvancedSearch/Filter/FilterButtons/export $:/core/ui/AdvancedSearch/Filter/FilterButtons/delete
diff --git a/core/wiki/tags/EditorToolbar.tid b/core/wiki/tags/EditorToolbar.tid
new file mode 100644
index 000000000..4611721ea
--- /dev/null
+++ b/core/wiki/tags/EditorToolbar.tid
@@ -0,0 +1,2 @@
+title: $:/tags/EditorToolbar
+list: $:/core/ui/EditorToolbar/paint $:/core/ui/EditorToolbar/opacity $:/core/ui/EditorToolbar/line-width $:/core/ui/EditorToolbar/clear $:/core/ui/EditorToolbar/bold $:/core/ui/EditorToolbar/italic $:/core/ui/EditorToolbar/strikethrough $:/core/ui/EditorToolbar/underline $:/core/ui/EditorToolbar/superscript $:/core/ui/EditorToolbar/subscript $:/core/ui/EditorToolbar/mono-line $:/core/ui/EditorToolbar/mono-block $:/core/ui/EditorToolbar/quote $:/core/ui/EditorToolbar/list-bullet $:/core/ui/EditorToolbar/list-number $:/core/ui/EditorToolbar/heading-1 $:/core/ui/EditorToolbar/heading-2 $:/core/ui/EditorToolbar/heading-3 $:/core/ui/EditorToolbar/heading-4 $:/core/ui/EditorToolbar/heading-5 $:/core/ui/EditorToolbar/heading-6 $:/core/ui/EditorToolbar/link $:/core/ui/EditorToolbar/excise $:/core/ui/EditorToolbar/picture $:/core/ui/EditorToolbar/stamp $:/core/ui/EditorToolbar/size $:/core/ui/EditorToolbar/editor-height $:/core/ui/EditorToolbar/more $:/core/ui/EditorToolbar/preview $:/core/ui/EditorToolbar/preview-type
diff --git a/core/wiki/tags/MoreSideBar.tid b/core/wiki/tags/MoreSideBar.tid
index b7f17dace..2dc0adb53 100644
--- a/core/wiki/tags/MoreSideBar.tid
+++ b/core/wiki/tags/MoreSideBar.tid
@@ -1,3 +1,3 @@
 title: $:/tags/MoreSideBar
-list: [[$:/core/ui/MoreSideBar/All]] [[$:/core/ui/MoreSideBar/Recent]] [[$:/core/ui/MoreSideBar/Tags]] [[$:/core/ui/MoreSideBar/Missing]] [[$:/core/ui/MoreSideBar/Drafts]] [[$:/core/ui/MoreSideBar/Orphans]] [[$:/core/ui/MoreSideBar/Types]] [[$:/core/ui/MoreSideBar/System]] [[$:/core/ui/MoreSideBar/Shadows]]
+list: [[$:/core/ui/MoreSideBar/All]] [[$:/core/ui/MoreSideBar/Recent]] [[$:/core/ui/MoreSideBar/Tags]] [[$:/core/ui/MoreSideBar/Missing]] [[$:/core/ui/MoreSideBar/Drafts]] [[$:/core/ui/MoreSideBar/Orphans]] [[$:/core/ui/MoreSideBar/Types]] [[$:/core/ui/MoreSideBar/System]] [[$:/core/ui/MoreSideBar/Shadows]] [[$:/core/ui/MoreSideBar/Plugins]]
 
diff --git a/core/wiki/tags/PageControls.tid b/core/wiki/tags/PageControls.tid
index 9ed29e911..3bef09b7d 100644
--- a/core/wiki/tags/PageControls.tid
+++ b/core/wiki/tags/PageControls.tid
@@ -1,2 +1,2 @@
 title: $:/tags/PageControls
-list: [[$:/core/ui/Buttons/home]] [[$:/core/ui/Buttons/close-all]] [[$:/core/ui/Buttons/fold-all]] [[$:/core/ui/Buttons/unfold-all]] [[$:/core/ui/Buttons/permaview]] [[$:/core/ui/Buttons/new-tiddler]] [[$:/core/ui/Buttons/new-journal]] [[$:/core/ui/Buttons/import]] [[$:/core/ui/Buttons/export-page]] [[$:/core/ui/Buttons/control-panel]] [[$:/core/ui/Buttons/advanced-search]] [[$:/core/ui/Buttons/tag-manager]] [[$:/core/ui/Buttons/language]] [[$:/core/ui/Buttons/palette]] [[$:/core/ui/Buttons/theme]] [[$:/core/ui/Buttons/storyview]] [[$:/core/ui/Buttons/encryption]] [[$:/core/ui/Buttons/full-screen]] [[$:/core/ui/Buttons/save-wiki]] [[$:/core/ui/Buttons/refresh]] [[$:/core/ui/Buttons/more-page-actions]]
+list: [[$:/core/ui/Buttons/home]] [[$:/core/ui/Buttons/close-all]] [[$:/core/ui/Buttons/fold-all]] [[$:/core/ui/Buttons/unfold-all]] [[$:/core/ui/Buttons/permaview]] [[$:/core/ui/Buttons/new-tiddler]] [[$:/core/ui/Buttons/new-journal]] [[$:/core/ui/Buttons/new-image]] [[$:/core/ui/Buttons/import]] [[$:/core/ui/Buttons/export-page]] [[$:/core/ui/Buttons/control-panel]] [[$:/core/ui/Buttons/advanced-search]] [[$:/core/ui/Buttons/tag-manager]] [[$:/core/ui/Buttons/language]] [[$:/core/ui/Buttons/palette]] [[$:/core/ui/Buttons/theme]] [[$:/core/ui/Buttons/storyview]] [[$:/core/ui/Buttons/encryption]] [[$:/core/ui/Buttons/full-screen]] [[$:/core/ui/Buttons/save-wiki]] [[$:/core/ui/Buttons/refresh]] [[$:/core/ui/Buttons/more-page-actions]]
diff --git a/editions/de-AT-server/tiddlywiki.info b/editions/de-AT-server/tiddlywiki.info
index 59780efac..12c109150 100644
--- a/editions/de-AT-server/tiddlywiki.info
+++ b/editions/de-AT-server/tiddlywiki.info
@@ -2,7 +2,8 @@
 	"description": "Server configuration of the German (Österreich) edition",
 	"plugins": [
 		"tiddlywiki/tiddlyweb",
-		"tiddlywiki/filesystem"
+		"tiddlywiki/filesystem",
+		"tiddlywiki/highlight"
 	],
 	"themes": [
 		"tiddlywiki/vanilla",
diff --git a/editions/de-AT/tiddlywiki.info b/editions/de-AT/tiddlywiki.info
index a04bf3087..57d062d9a 100755
--- a/editions/de-AT/tiddlywiki.info
+++ b/editions/de-AT/tiddlywiki.info
@@ -5,9 +5,10 @@
 	"themes": [
 		"tiddlywiki/vanilla",
 		"tiddlywiki/snowwhite",
-		"tiddlywiki/nighttime",
 		"tiddlywiki/starlight",
+		"tiddlywiki/seamless",
 		"tiddlywiki/centralised",
+		"tiddlywiki/tight",
 		"tiddlywiki/readonly"
 	],
 	"languages": [
@@ -19,7 +20,8 @@
 		"index": [
 			"--rendertiddler","$:/core/save/all","index.html","text/plain"],
 		"empty": [
-			"--rendertiddler","$:/editions/de-AT-DE/download-empty","empty.html","text/plain"],
+			"--rendertiddler","$:/editions/de-AT-DE/download-empty","empty.html","text/plain",
+			"--rendertiddler","$:/editions/de-AT-DE/download-empty","empty.hta","text/plain"],
 		"favicon": [
 			"--savetiddler","$:/favicon.ico","favicon.ico"],
 		"static": [
@@ -28,4 +30,4 @@
 			"--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain",
 			"--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"]
 	}
-}
+}
\ No newline at end of file
diff --git a/editions/de-DE/tiddlywiki.info b/editions/de-DE/tiddlywiki.info
index 25c8e32ca..6138d40bb 100755
--- a/editions/de-DE/tiddlywiki.info
+++ b/editions/de-DE/tiddlywiki.info
@@ -5,9 +5,10 @@
 	"themes": [
 		"tiddlywiki/vanilla",
 		"tiddlywiki/snowwhite",
-		"tiddlywiki/nighttime",
 		"tiddlywiki/starlight",
+		"tiddlywiki/seamless",
 		"tiddlywiki/centralised",
+		"tiddlywiki/tight",
 		"tiddlywiki/readonly"
 	],
 	"languages": [
@@ -22,7 +23,8 @@
 		"index": [
 			"--rendertiddler","$:/core/save/all","index.html","text/plain"],
 		"empty": [
-			"--rendertiddler","$:/editions/de-AT-DE/download-empty","empty.html","text/plain"],
+			"--rendertiddler","$:/editions/de-AT-DE/download-empty","empty.html","text/plain",
+			"--rendertiddler","$:/editions/de-AT-DE/download-empty","empty.hta","text/plain"],
 		"favicon": [
 			"--savetiddler","$:/favicon.ico","favicon.ico"],
 		"static": [
@@ -31,4 +33,4 @@
 			"--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain",
 			"--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"]
 	}
-}
+}
\ No newline at end of file
diff --git a/editions/dev/tiddlers/from Heigele and Jurke/Data Management during Runtime.tid b/editions/dev/tiddlers/from Heigele and Jurke/Data Management during Runtime.tid
index 80863bc56..dd746d45c 100644
--- a/editions/dev/tiddlers/from Heigele and Jurke/Data Management during Runtime.tid	
+++ b/editions/dev/tiddlers/from Heigele and Jurke/Data Management during Runtime.tid	
@@ -3,7 +3,7 @@ modified: 20140708085602231
 tags: doc
 title: Data Management during Runtime
 
-During the runtime the data of Tiddlywiki is stored in javascript objects. These objects are synchronized with the DOM-Representation of Tiddlywiki. This means every change of the original data of a Tiddler, fires an event which changes all DOM-Representations of the Tiddler and the javascript object. The barbone Wiki store is created during the boot process and is kept in a object called \$tw.Wiki. This object contains amongst others a hashmap of the different Tiddlers of Tiddlywiki. The Hashmap is used to store the javascript object representation of the different Tiddlers. Furthermore this object is used to manage the tiddlers during runtime, it provides methods for adding tiddlers, search tiddlers by name and delete tiddlers.
+During the runtime the data of Tiddlywiki is stored in javascript objects. These objects are synchronized with the DOM-Representation of Tiddlywiki. This means every change of the original data of a Tiddler, fires an event which changes all DOM-Representations of the Tiddler and the javascript object. The bare-bones Wiki store is created during the boot process and is kept in a object called \$tw.Wiki. This object contains amongst others a hashmap of the different Tiddlers of Tiddlywiki. The Hashmap is used to store the javascript object representation of the different Tiddlers. Furthermore this object is used to manage the tiddlers during runtime, it provides methods for adding tiddlers, search tiddlers by name and delete tiddlers.
 As shown in the picture below, every change at the DOM triggers an event which changes the corresponding widget which again changes the store of the tiddlers. The whole image shows how WikiText is parsed by a set of rules into the parse tree and this parse tree is rendered as a tree of widgets. This Rendertree is synchronised to the DOM. Every modification on the Rendertree provokes a start of the rendering-pipeline. As well as every change on the wikiText triggers an event at the RenderTree. This Process uses a selective updating so that only the changed parts are updated. This means only widgets which have to change the DOM in consequence of a changed tiddler are refreshed.
 
 {{TiddlyWikiArchitecture.svg}}
\ No newline at end of file
diff --git a/editions/dev/tiddlers/from Heigele and Jurke/Microkernel and Datamodel.tid b/editions/dev/tiddlers/from Heigele and Jurke/Microkernel and Datamodel.tid
index 3e13539ba..3a5461b90 100644
--- a/editions/dev/tiddlers/from Heigele and Jurke/Microkernel and Datamodel.tid	
+++ b/editions/dev/tiddlers/from Heigele and Jurke/Microkernel and Datamodel.tid	
@@ -3,7 +3,7 @@ modified: 20140709093651688
 tags: redo
 title: Microkernel and Datamodel
 
-The microkernel is responsible for creating a barbone TW environment.
-It is running under Node.js or in a HTML5 Browser. The Bootkernel just loads enough functionality to load the modules containing the main logic of the application. This boot-kernel contains a few helper methods, the module mechanism as well as the function to create a tiddler and manage them. The boot-kernel also creates the barbone wiki store, which holds all the information of the wiki during the runtime. After creating the store, the boot-kernel is in charge of decrypting the encrypted tiddlers and extracting all the tiddlers e.g. the core module tiddlers embedded in the DOM structure of the HTML file. Furthermore the boot kernel offers the functionality to load tiddlers from a file, when you run TW with Node.js.
+The microkernel is responsible for creating a bare-bones TW environment.
+It is running under Node.js or in a HTML5 Browser. The Bootkernel just loads enough functionality to load the modules containing the main logic of the application. This boot-kernel contains a few helper methods, the module mechanism as well as the function to create a tiddler and manage them. The boot-kernel also creates the bare-bones wiki store, which holds all the information of the wiki during the runtime. After creating the store, the boot-kernel is in charge of decrypting the encrypted tiddlers and extracting all the tiddlers e.g. the core module tiddlers embedded in the DOM structure of the HTML file. Furthermore the boot kernel offers the functionality to load tiddlers from a file, when you run TW with Node.js.
 
 {{StartupTimeline.png}}
\ No newline at end of file
diff --git a/editions/dev/tiddlers/from Heigele and Jurke/The Heart of TiddlyWiki Boot-Kernel.tid b/editions/dev/tiddlers/from Heigele and Jurke/The Heart of TiddlyWiki Boot-Kernel.tid
index 484e6bec6..ef0ad4deb 100644
--- a/editions/dev/tiddlers/from Heigele and Jurke/The Heart of TiddlyWiki Boot-Kernel.tid	
+++ b/editions/dev/tiddlers/from Heigele and Jurke/The Heart of TiddlyWiki Boot-Kernel.tid	
@@ -3,6 +3,6 @@ modified: 20140708090217085
 tags: doc
 title: The Heart of TiddlyWiki (Boot-Kernel)
 
-The boot-kernel is responsible for creating a barbone TW environment. It is running under Node.js or in a HTML5 Browser. The Bootkernel just loads enough functionality to load the modules containing the main logic of the application. This boot-kernel contains a few helper methods, the module mechanism as well as the function to create a tiddler and manage them. The boot-kernel also creates the barbone wiki store, which holds all the information of the wiki during the runtime. After creating the store, the boot-kernel is in charge of decrypting the encrypted tiddlers and extracting all the tiddlers e.g. the core module tiddlers embedded in the DOM structure of the HTML file. Furthermore the boot kernel offers the functionality to load tiddlers from a file, when you run TW with Node.js. All other functionality which is not a part of the boot kernel is added dynamically by modules and plugins. The boot kernel is able to load the core plugins and perform the startup plugins. The core contains the startup modules shown in the picture below.
+The boot-kernel is responsible for creating a bare-bones TW environment. It is running under Node.js or in a HTML5 Browser. The Bootkernel just loads enough functionality to load the modules containing the main logic of the application. This boot-kernel contains a few helper methods, the module mechanism as well as the function to create a tiddler and manage them. The boot-kernel also creates the bare-bones wiki store, which holds all the information of the wiki during the runtime. After creating the store, the boot-kernel is in charge of decrypting the encrypted tiddlers and extracting all the tiddlers e.g. the core module tiddlers embedded in the DOM structure of the HTML file. Furthermore the boot kernel offers the functionality to load tiddlers from a file, when you run TW with Node.js. All other functionality which is not a part of the boot kernel is added dynamically by modules and plugins. The boot kernel is able to load the core plugins and perform the startup plugins. The core contains the startup modules shown in the picture below.
 
 {{index.svg}}
\ No newline at end of file
diff --git a/editions/dev/tiddlers/from tw5.com/How to customise the password prompt.tid b/editions/dev/tiddlers/from tw5.com/How to customise the password prompt.tid
index 53eb35433..3848cdfca 100644
--- a/editions/dev/tiddlers/from tw5.com/How to customise the password prompt.tid	
+++ b/editions/dev/tiddlers/from tw5.com/How to customise the password prompt.tid	
@@ -5,11 +5,11 @@ modified: 20141006085526118
 
 You can customise the text and appearance of the password prompt that is displayed when encrypted TiddlyWiki files are first opened.
 
-To do so, create a tiddler tagged {{$:/core/wiki/rawmarkup|$:/core/ui/TagTemplate}} containing:
+To do so, create a tiddler tagged {{$:/core/wiki/rawmarkup||$:/core/ui/TagTemplate}} containing:
 
 # A JavaScript `<script>` tag containing code to override the configuration variable `$tw.boot.encryptionPrompts.decrypt`
 # CSS `<style>` definitions targeting the `tc-password-wrapper` class to apply styles to the form
 
 Raw markup tiddlers are spliced into the top of the standalone HTML file, and are executed before the boot prefix and boot kernel.
 
-See $:/PathEncryptionPrompt for an example.
+See $:/PatchEncryptionPrompt for an example.
diff --git a/editions/dev/tiddlers/system/github-fork-ribbon.tid b/editions/dev/tiddlers/system/github-fork-ribbon.tid
index 8559b97a3..b080b4e35 100644
--- a/editions/dev/tiddlers/system/github-fork-ribbon.tid
+++ b/editions/dev/tiddlers/system/github-fork-ribbon.tid
@@ -3,4 +3,4 @@ tags: $:/tags/PageControls
 caption: ~GitHub ribbon
 description: ~GitHub ribbon for tw5.com/dev
 
-<div class="github-fork-ribbon-wrapper right" style><div class="github-fork-ribbon" style="background-color:#DF4848;"><a href="https://github.com/Jermolene/TiddlyWiki5" target="_blank">Find me on ~GitHub</a></div></div>
\ No newline at end of file
+<div class="github-fork-ribbon-wrapper right" style><div class="github-fork-ribbon" style="background-color:#DF4848;"><a href="https://github.com/Jermolene/TiddlyWiki5" target="_blank" rel="noopener noreferrer">Find me on ~GitHub</a></div></div>
\ No newline at end of file
diff --git a/editions/dev/tiddlywiki.info b/editions/dev/tiddlywiki.info
index b9d121fac..320b09dd2 100644
--- a/editions/dev/tiddlywiki.info
+++ b/editions/dev/tiddlywiki.info
@@ -9,7 +9,6 @@
 	"themes": [
 		"tiddlywiki/vanilla",
 		"tiddlywiki/snowwhite",
-		"tiddlywiki/nighttime",
 		"tiddlywiki/starlight",
 		"tiddlywiki/seamless",
 		"tiddlywiki/centralised",
@@ -17,15 +16,29 @@
 		"tiddlywiki/readonly"
 	],
 	"languages": [
-		"en-US",
-		"en-GB",
+		"ca-ES",
+		"cs-CZ",
+		"da-DK",
 		"de-AT",
 		"de-DE",
+		"el-GR",
+		"en-GB",
+		"en-US",
+		"es-ES",
 		"fr-FR",
-		"zh-Hans",
-		"zh-Hant",
+		"hi-IN",
+		"ia-IA",
 		"it-IT",
-		"ja-JP"
+		"ja-JP",
+		"ko-KR",
+		"nl-NL",
+		"pa-IN",
+		"pt-PT",
+		"ru-RU",
+		"sk-SK",
+		"sv-SE",
+		"zh-Hans",
+		"zh-Hant"
 	],
 	"build": {
 		"index": [
diff --git a/editions/empty/tiddlywiki.info b/editions/empty/tiddlywiki.info
index 6d24d2bd1..6d8c58b97 100644
--- a/editions/empty/tiddlywiki.info
+++ b/editions/empty/tiddlywiki.info
@@ -17,7 +17,7 @@
 		"static": [
 			"--rendertiddler","$:/core/templates/static.template.html","static.html","text/plain",
 			"--rendertiddler","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
-			"--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain",
-			"--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain"]
+			"--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain",
+			"--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"]
 	}
 }
\ No newline at end of file
diff --git a/editions/es-ES-server/tiddlers/config-Navigation-UpdateAddressBar.tid b/editions/es-ES-server/tiddlers/config-Navigation-UpdateAddressBar.tid
new file mode 100644
index 000000000..86952857c
--- /dev/null
+++ b/editions/es-ES-server/tiddlers/config-Navigation-UpdateAddressBar.tid
@@ -0,0 +1,6 @@
+created: 20140910212049455
+title: $:/config/Navigation/UpdateAddressBar
+type: text/vnd.tiddlywiki
+note: <!-- TODO: Remove before end of beta -->
+
+permaview
\ No newline at end of file
diff --git a/editions/es-ES-server/tiddlers/config-more-button.tid b/editions/es-ES-server/tiddlers/config-more-button.tid
new file mode 100644
index 000000000..035cbf4ca
--- /dev/null
+++ b/editions/es-ES-server/tiddlers/config-more-button.tid
@@ -0,0 +1,7 @@
+created: 20140912140419093
+modified: 20140912140418015
+title: $:/config/PageControlButtons/Visibility/$:/core/ui/Buttons/more-page-actions
+type: text/vnd.tiddlywiki
+note: <!-- TODO: Remove before end of beta -->
+
+show
\ No newline at end of file
diff --git a/editions/es-ES-server/tiddlers/system/GoogleAnalyticsAccount.tid b/editions/es-ES-server/tiddlers/system/GoogleAnalyticsAccount.tid
new file mode 100644
index 000000000..29cbc27e0
--- /dev/null
+++ b/editions/es-ES-server/tiddlers/system/GoogleAnalyticsAccount.tid
@@ -0,0 +1,2 @@
+title: $:/GoogleAnalyticsAccount
+
diff --git a/editions/es-ES-server/tiddlers/system/GoogleAnalyticsDomain.tid b/editions/es-ES-server/tiddlers/system/GoogleAnalyticsDomain.tid
new file mode 100644
index 000000000..0c6a7e02d
--- /dev/null
+++ b/editions/es-ES-server/tiddlers/system/GoogleAnalyticsDomain.tid
@@ -0,0 +1,2 @@
+title: $:/GoogleAnalyticsDomain
+
diff --git a/editions/es-ES-server/tiddlers/system/favicon.ico b/editions/es-ES-server/tiddlers/system/favicon.ico
new file mode 100644
index 000000000..3765a9a88
Binary files /dev/null and b/editions/es-ES-server/tiddlers/system/favicon.ico differ
diff --git a/editions/es-ES-server/tiddlers/system/favicon.ico.meta b/editions/es-ES-server/tiddlers/system/favicon.ico.meta
new file mode 100644
index 000000000..2f3e81713
--- /dev/null
+++ b/editions/es-ES-server/tiddlers/system/favicon.ico.meta
@@ -0,0 +1,2 @@
+title: $:/favicon.ico
+type: image/x-icon
diff --git a/editions/es-ES-server/tiddlywiki.info b/editions/es-ES-server/tiddlywiki.info
new file mode 100644
index 000000000..93ba8ff12
--- /dev/null
+++ b/editions/es-ES-server/tiddlywiki.info
@@ -0,0 +1,19 @@
+{
+	"description": "Configuración en modo servidor de la edición es-ES",
+	"plugins": [
+		"tiddlywiki/tiddlyweb",
+		"tiddlywiki/filesystem",
+		"tiddlywiki/highlight"
+	],
+	"themes": [
+		"tiddlywiki/vanilla",
+		"tiddlywiki/snowwhite"
+	],
+	"includeWikis": [
+		"../es-ES"
+	],
+	"config": {
+		"retain-original-tiddler-path": true,
+		"default-tiddler-location": "../es-ES/tiddlers"
+	}
+}
diff --git a/editions/es-ES/tiddlers/$__Acknowledgements.tid b/editions/es-ES/tiddlers/$__Acknowledgements.tid
new file mode 100644
index 000000000..48074d928
--- /dev/null
+++ b/editions/es-ES/tiddlers/$__Acknowledgements.tid
@@ -0,0 +1,14 @@
+created: 20160511152639376
+modified: 20160511152744722
+title: $:/Acknowledgements
+type: text/vnd.tiddlywiki
+
+TiddlyWiki incorpora código de los siguientes proyectos OpenSource:
+
+* [[The Stanford Javascript Crypto Library|http://bitwiseshiftleft.github.io/sjcl/]]
+* [[The Jasmine JavaScript Test Framework|http://pivotal.github.io/jasmine/]]
+* [[Normalize.css by Nicolas Gallagher|http://necolas.github.io/normalize.css/]]
+
+...y materiales de estos otros proyectos:
+
+* Banderas del mundo [[Wikipedia|http://commons.wikimedia.org/wiki/Category:SVG_flags_by_country]]
diff --git a/editions/es-ES/tiddlers/$__AdvancedSearch.tid b/editions/es-ES/tiddlers/$__AdvancedSearch.tid
new file mode 100644
index 000000000..ca032f83a
--- /dev/null
+++ b/editions/es-ES/tiddlers/$__AdvancedSearch.tid
@@ -0,0 +1,12 @@
+caption: Búsqueda avanzada
+color: #bbb
+created: 20160503162505558
+es-title: Búsqueda avanzada
+icon: $:/core/images/advanced-search-button
+modified: 20160503162506925
+title: $:/AdvancedSearch
+type: text/vnd.tiddlywiki
+
+<div class="tc-advanced-search">
+<<tabs "[all[shadows+tiddlers]tag[$:/tags/AdvancedSearch]!has[draft.of]]" "$:/core/ui/AdvancedSearch/System">>
+</div>
diff --git a/editions/es-ES/tiddlers/$__ContributionBanner.tid b/editions/es-ES/tiddlers/$__ContributionBanner.tid
new file mode 100644
index 000000000..772e14d74
--- /dev/null
+++ b/editions/es-ES/tiddlers/$__ContributionBanner.tid
@@ -0,0 +1,23 @@
+created: 20160419092851048
+list-after: $:/core/ui/EditTemplate/title
+modified: 20160515101246618
+tags: $:/tags/EditTemplate
+title: $:/ContributionBanner
+type: text/vnd.tiddlywiki
+
+\define makeGitHubLink()
+https://github.com/Jermolene/TiddlyWiki5/edit/master/editions/es-ES/tiddlers/$(githubLink)$
+\end
+\define innerMakeGitHubLink(linkText)
+<$set name="githubLink" value={{$:/config/OriginalTiddlerPaths##$(draftOfTiddler)$}}>
+<a href=<<makeGitHubLink>> class="tc-tiddlylink-external" target="_blank">$linkText$</a>
+</$set>
+\end
+\define outerMakeGitHubLink(linkText)
+<$set name="draftOfTiddler" value={{$(currentTiddler)$!!draft.of}}>
+<<innerMakeGitHubLink "$linkText$">>
+</$set>
+\end
+<div class="tc-improvement-banner">
+{{$:/core/images/star-filled}} ¿Puedes ayudarnos a mejorar la documentación? [[Aquí te explicamos|Improving TiddlyWiki Documentation]] cómo editar  <<outerMakeGitHubLink "este tiddler en ~GitHub">>
+</div>
diff --git a/editions/es-ES/tiddlers/$__CurvedText.tid b/editions/es-ES/tiddlers/$__CurvedText.tid
new file mode 100644
index 000000000..0511db5c0
--- /dev/null
+++ b/editions/es-ES/tiddlers/$__CurvedText.tid
@@ -0,0 +1,6 @@
+created: 20160418045226492
+modified: 20160503054145721
+title: $:/CurvedText
+type: text/vnd.tiddlywiki
+
+esto es una simple prueba
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/$__DefaultTiddlers.tid b/editions/es-ES/tiddlers/$__DefaultTiddlers.tid
new file mode 100644
index 000000000..46e2cc263
--- /dev/null
+++ b/editions/es-ES/tiddlers/$__DefaultTiddlers.tid
@@ -0,0 +1,8 @@
+created: 20131127215321439
+modified: 20141129081225712
+title: $:/DefaultTiddlers
+type: text/vnd.tiddlywiki
+
+HelloThere
+GettingStarted
+Community
diff --git a/editions/es-ES/tiddlers/$__SVGExampleRadius.tid b/editions/es-ES/tiddlers/$__SVGExampleRadius.tid
new file mode 100644
index 000000000..5c733a3c5
--- /dev/null
+++ b/editions/es-ES/tiddlers/$__SVGExampleRadius.tid
@@ -0,0 +1,6 @@
+created: 20160502152252058
+modified: 20160503053741952
+title: $:/SVGExampleRadius
+type: text/vnd.tiddlywiki
+
+45
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/$__SiteSubtitle.tid b/editions/es-ES/tiddlers/$__SiteSubtitle.tid
new file mode 100644
index 000000000..ff6207d0a
--- /dev/null
+++ b/editions/es-ES/tiddlers/$__SiteSubtitle.tid
@@ -0,0 +1,4 @@
+title: $:/SiteSubtitle
+type: text/vnd.tiddlywiki
+
+Cuaderno de notas personal no-lineal en la web
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/$__StoryList.tid b/editions/es-ES/tiddlers/$__StoryList.tid
new file mode 100644
index 000000000..523878d1e
--- /dev/null
+++ b/editions/es-ES/tiddlers/$__StoryList.tid
@@ -0,0 +1,6 @@
+created: 20160511060801385
+list: Reference JSONTiddlers
+modified: 20160511060801385
+title: $:/StoryList
+type: text/vnd.tiddlywiki
+
diff --git a/editions/es-ES/tiddlers/$__UploadName.tid b/editions/es-ES/tiddlers/$__UploadName.tid
new file mode 100644
index 000000000..ac278b28d
--- /dev/null
+++ b/editions/es-ES/tiddlers/$__UploadName.tid
@@ -0,0 +1,6 @@
+created: 20160423045141139
+modified: 20160423051016210
+title: $:/UploadName
+type: text/vnd.tiddlywiki
+
+tw5es-es
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/$__UploadURL.tid b/editions/es-ES/tiddlers/$__UploadURL.tid
new file mode 100644
index 000000000..0853d98e4
--- /dev/null
+++ b/editions/es-ES/tiddlers/$__UploadURL.tid
@@ -0,0 +1,6 @@
+created: 20160423050733871
+modified: 20160426145737700
+title: $:/UploadURL
+type: text/vnd.tiddlywiki
+
+http://tw5es-es.tiddlyspot.com/store.cgi
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/$__core_ui_DefaultSearchResultList.tid b/editions/es-ES/tiddlers/$__core_ui_DefaultSearchResultList.tid
new file mode 100644
index 000000000..ef851b658
--- /dev/null
+++ b/editions/es-ES/tiddlers/$__core_ui_DefaultSearchResultList.tid
@@ -0,0 +1,18 @@
+caption: {{$:/language/Search/DefaultResults/Caption}}
+created: 20141117081621387
+modified: 20160515100401168
+tags: $:/tags/SearchResults
+title: $:/core/ui/DefaultSearchResultList
+type: text/vnd.tiddlywiki
+
+\define searchResultList()
+//<small>{{$:/language/Search/Matches/Title}}</small>//
+
+<$list filter="[!is[system]search:title{$(searchTiddler)$}sort[caption]limit[250]] [!is[system]search:es-title{$(searchTiddler)$}sort[title]limit[250]][!is[system]search:en-title{$(searchTiddler)$}sort[title]limit[250]]" template="$:/core/ui/ListItemTemplate"/>
+
+//<small>{{$:/language/Search/Matches/All}}</small>//
+
+<$list filter="[!is[system]search{$(searchTiddler)$}sort[title]limit[250]]" template="$:/core/ui/ListItemTemplate"/>
+
+\end
+<<searchResultList>>
diff --git a/editions/es-ES/tiddlers/$__core_ui_ListItemTemplate.tid b/editions/es-ES/tiddlers/$__core_ui_ListItemTemplate.tid
new file mode 100644
index 000000000..92d873f84
--- /dev/null
+++ b/editions/es-ES/tiddlers/$__core_ui_ListItemTemplate.tid
@@ -0,0 +1,12 @@
+created: 20141117221740337
+modified: 20160515100528031
+title: $:/core/ui/ListItemTemplate
+type: text/vnd.tiddlywiki
+
+<div class="tc-menu-list-item">
+<$link to={{!!title}}>
+<$view field="es-title">
+<$view field="title"/>
+</$view>
+</$link>
+</div>
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/$__core_ui_SideBar_Open.tid b/editions/es-ES/tiddlers/$__core_ui_SideBar_Open.tid
new file mode 100644
index 000000000..e5d080537
--- /dev/null
+++ b/editions/es-ES/tiddlers/$__core_ui_SideBar_Open.tid
@@ -0,0 +1,15 @@
+caption: {{$:/language/SideBar/Open/Caption}}
+created: 20160429080322465
+modified: 20160515100901701
+tags: $:/tags/SideBar
+title: $:/core/ui/SideBar/Open
+type: text/vnd.tiddlywiki
+
+\define lingo-base() $:/language/CloseAll/
+<$list filter="[list[$:/StoryList]]" history="$:/HistoryList" storyview="pop">
+
+<$button message="tm-close-tiddler" tooltip={{$:/language/Buttons/Close/Hint}} aria-label={{$:/language/Buttons/Close/Caption}} class="tc-btn-invisible tc-btn-mini">&times;</$button> <$link to={{!!title}}><$transclude field="es-title"><$view field="title"/></$transclude></$link>
+
+</$list>
+
+<$button message="tm-close-all-tiddlers" class="tc-btn-invisible tc-btn-mini"><<lingo Button>></$button>
diff --git a/editions/es-ES/tiddlers/$__core_ui_TagTemplate.tid b/editions/es-ES/tiddlers/$__core_ui_TagTemplate.tid
new file mode 100644
index 000000000..d6880d23d
--- /dev/null
+++ b/editions/es-ES/tiddlers/$__core_ui_TagTemplate.tid
@@ -0,0 +1,33 @@
+created: 20160504080001125
+modified: 20160515100830717
+title: $:/core/ui/TagTemplate
+type: text/vnd.tiddlywiki
+
+\define tag-styles()
+background-color:$(backgroundColor)$;
+fill:$(foregroundColor)$;
+color:$(foregroundColor)$;
+\end
+
+\define tag-body-inner(colour,fallbackTarget,colourA,colourB)
+<$set name="foregroundColor" value=<<contrastcolour target:"""$colour$""" fallbackTarget:"""$fallbackTarget$""" colourA:"""$colourA$""" colourB:"""$colourB$""">>>
+<$set name="backgroundColor" value="""$colour$""">
+<$button popup=<<qualify "$:/state/popup/tag">> class="tc-btn-invisible tc-tag-label" style=<<tag-styles>>>
+<$transclude tiddler={{!!icon}}/> <$view field="es-title"><$view field="title" format="text" /></$view>
+</$button>
+<$reveal state=<<qualify "$:/state/popup/tag">> type="popup" position="below" animate="yes"><div class="tc-drop-down"><$transclude tiddler="$:/core/ui/ListItemTemplate"/>
+<hr>
+<$list filter="[all[current]tagging[]]" template="$:/core/ui/ListItemTemplate"/>
+</div>
+</$reveal>
+</$set>
+</$set>
+\end
+
+\define tag-body(colour,palette)
+<span class="tc-tag-list-item">
+<$macrocall $name="tag-body-inner" colour="""$colour$""" fallbackTarget={{$palette$##tag-background}} colourA={{$palette$##foreground}} colourB={{$palette$##background}}/>
+</span>
+\end
+
+<$macrocall $name="tag-body" colour={{!!color}} palette={{$:/palette}}/>
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/$__core_ui_ViewTemplate_title.tid b/editions/es-ES/tiddlers/$__core_ui_ViewTemplate_title.tid
new file mode 100644
index 000000000..0ed035127
--- /dev/null
+++ b/editions/es-ES/tiddlers/$__core_ui_ViewTemplate_title.tid
@@ -0,0 +1,46 @@
+created: 20141119191707140
+modified: 20160515100614389
+tags: $:/tags/ViewTemplate
+title: $:/core/ui/ViewTemplate/title
+type: text/vnd.tiddlywiki
+
+\define title-styles()
+fill:$(foregroundColor)$;
+\end
+\define config-title()
+$:/config/ViewToolbarButtons/Visibility/$(listItem)$
+\end
+<div class="tc-tiddler-title">
+<div class="tc-titlebar">
+<span class="tc-tiddler-controls">
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem"><$reveal type="nomatch" state=<<config-title>> text="hide"><$transclude tiddler=<<listItem>>/></$reveal></$list>
+</span>
+<$set name="tv-wikilinks" value={{$:/config/Tiddlers/TitleLinks}}>
+<$link>
+<$set name="foregroundColor" value={{!!color}}>
+<span class="tc-tiddler-title-icon" style=<<title-styles>>>
+<$transclude tiddler={{!!icon}}/>
+</span>
+</$set>
+<$list filter="[all[current]removeprefix[$:/]]">
+<h2 class="tc-title" title={{$:/language/SystemTiddler/Tooltip}}>
+<span class="tc-system-title-prefix">$:/</span><$text text=<<currentTiddler>>/>
+</h2>
+</$list>
+<$list filter="[all[current]!prefix[$:/]]">
+<h2 class="tc-title">
+<$view field="es-title">
+<$view field="title"/>
+</$view>
+</h2>
+</$list>
+</$link>
+</$set>
+</div>
+
+<$reveal type="nomatch" text="" default="" state=<<tiddlerInfoState>> class="tc-tiddler-info tc-popup-handle" animate="yes" retain="yes">
+
+<$transclude tiddler="$:/core/ui/TiddlerInfo"/>
+
+</$reveal>
+</div>
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/$__edition_tw5.com_dropbox-url.js.tid b/editions/es-ES/tiddlers/$__edition_tw5.com_dropbox-url.js.tid
new file mode 100644
index 000000000..f8542a0b5
--- /dev/null
+++ b/editions/es-ES/tiddlers/$__edition_tw5.com_dropbox-url.js.tid
@@ -0,0 +1,39 @@
+created: 20160417162545133
+modified: 20160417162810899
+module-type: macro
+tags: $:/tags/Macro
+title: $:/edition/tw5.com/dropbox-url.js
+type: application/javascript
+
+/*\
+title: $:/edition/tw5.com/dropbox-url.js
+type: application/javascript
+tags: $:/tags/Macro
+module-type: macro
+
+Implements the Dropbox URL converter macro.
+
+```
+<$macrocall $name="dropbox-url" url={{$:/temp/dropbox}}/>
+```
+
+\*/
+
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+exports.name = "dropbox-url";
+
+exports.params = [
+	{name: "url", default: "https://www.dropbox.com/s/<blablabla>/mi_archivo.html"}
+];
+
+exports.run = function(url) {
+	url = url.replace("www.dropbox.com","dl.dropboxusercontent.com");
+	return "`" + url + "` <small>([[abrir|" + url + "]])</small>";
+};
+
+})();
diff --git a/editions/es-ES/tiddlers/$__editions_tw5.com_wikitext-macros.tid b/editions/es-ES/tiddlers/$__editions_tw5.com_wikitext-macros.tid
new file mode 100644
index 000000000..1dcc6d074
--- /dev/null
+++ b/editions/es-ES/tiddlers/$__editions_tw5.com_wikitext-macros.tid
@@ -0,0 +1,47 @@
+created: 20150117184156000
+modified: 20160428152133143
+tags: $:/tags/Macro
+title: $:/editions/tw5.com/wikitext-macros
+type: text/vnd.tiddlywiki
+
+\define wikitext-example(src)
+<div class="doc-example">
+
+```
+$src$
+```
+
+Tiene este aspecto:
+
+$src$
+
+... y su código HTML es:
+
+$$$text/vnd.tiddlywiki>text/html
+$src$
+$$$
+</div>
+\end
+
+\define wikitext-example-without-html(src)
+<div class="doc-example">
+
+```
+$src$
+```
+
+Este es su aspecto:
+
+$src$
+</div>
+\end
+
+\define tw-code(tiddler)
+<$codeblock language={{$tiddler$!!type}} code={{$tiddler$}}/>
+\end
+
+\define tw-code-link(tiddler)
+[[$tiddler$]]:
+
+<<tw-code $tiddler$>>
+\end
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/$__plugins_tiddlywiki_railroad_readme.tid b/editions/es-ES/tiddlers/$__plugins_tiddlywiki_railroad_readme.tid
new file mode 100644
index 000000000..e529c8940
--- /dev/null
+++ b/editions/es-ES/tiddlers/$__plugins_tiddlywiki_railroad_readme.tid
@@ -0,0 +1,10 @@
+created: 20150102163222184
+modified: 20160504142457039
+title: $:/plugins/tiddlywiki/railroad/readme
+type: text/vnd.tiddlywiki
+
+Este plugin proporciona un widget para la elaboración de diagramas sintácticos en forma de imágenes SVG.
+
+La [[notación|$:/plugins/tiddlywiki/railroad/syntax]] del diagrama puede guardarse en un tiddler exclusivo con el campo <<.field type>> definido como `text/vnd.tiddlywiki.railroad`, de forma que esté disponible para transclusión allí donde se necesite. 
+
+El plugin se basa en una [[librería de Tab Atkins|https://github.com/tabatkins/railroad-diagrams]], y se ha trabajado en ella para hacerla más flexible, lo que incluye que los componentes del diagrama actúen como enlaces o admitan transclusión de otros tiddlers. 
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/$__theme.tid b/editions/es-ES/tiddlers/$__theme.tid
new file mode 100644
index 000000000..751dc5e7e
--- /dev/null
+++ b/editions/es-ES/tiddlers/$__theme.tid
@@ -0,0 +1,6 @@
+created: 20160427065415135
+modified: 20160427065439255
+title: $:/theme
+type: text/vnd.tiddlywiki
+
+$:/themes/tiddlywiki/snowwhite
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/$__themes_tiddlywiki_vanilla_metrics_sidebarbreakpoint.tid b/editions/es-ES/tiddlers/$__themes_tiddlywiki_vanilla_metrics_sidebarbreakpoint.tid
new file mode 100644
index 000000000..075cefcc6
--- /dev/null
+++ b/editions/es-ES/tiddlers/$__themes_tiddlywiki_vanilla_metrics_sidebarbreakpoint.tid
@@ -0,0 +1,6 @@
+created: 20160426085410546
+modified: 20160426085450560
+title: $:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint
+type: text/vnd.tiddlywiki
+
+960px
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/$__themes_tiddlywiki_vanilla_metrics_sidebarwidth.tid b/editions/es-ES/tiddlers/$__themes_tiddlywiki_vanilla_metrics_sidebarwidth.tid
new file mode 100644
index 000000000..4503aa418
--- /dev/null
+++ b/editions/es-ES/tiddlers/$__themes_tiddlywiki_vanilla_metrics_sidebarwidth.tid
@@ -0,0 +1,6 @@
+created: 20160426084847813
+modified: 20160426085509178
+title: $:/themes/tiddlywiki/vanilla/metrics/sidebarwidth
+type: text/vnd.tiddlywiki
+
+400px
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/$__themes_tiddlywiki_vanilla_metrics_storyleft.tid b/editions/es-ES/tiddlers/$__themes_tiddlywiki_vanilla_metrics_storyleft.tid
new file mode 100644
index 000000000..d164d8409
--- /dev/null
+++ b/editions/es-ES/tiddlers/$__themes_tiddlywiki_vanilla_metrics_storyleft.tid
@@ -0,0 +1,6 @@
+created: 20160426085333301
+modified: 20160426085344985
+title: $:/themes/tiddlywiki/vanilla/metrics/storyleft
+type: text/vnd.tiddlywiki
+
+0px
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/$__themes_tiddlywiki_vanilla_metrics_storyright.tid b/editions/es-ES/tiddlers/$__themes_tiddlywiki_vanilla_metrics_storyright.tid
new file mode 100644
index 000000000..7a7c16367
--- /dev/null
+++ b/editions/es-ES/tiddlers/$__themes_tiddlywiki_vanilla_metrics_storyright.tid
@@ -0,0 +1,6 @@
+created: 20160426084832669
+modified: 20160426085548779
+title: $:/themes/tiddlywiki/vanilla/metrics/storyright
+type: text/vnd.tiddlywiki
+
+650px
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/$__themes_tiddlywiki_vanilla_metrics_storywidth.tid b/editions/es-ES/tiddlers/$__themes_tiddlywiki_vanilla_metrics_storywidth.tid
new file mode 100644
index 000000000..f2425c5be
--- /dev/null
+++ b/editions/es-ES/tiddlers/$__themes_tiddlywiki_vanilla_metrics_storywidth.tid
@@ -0,0 +1,6 @@
+created: 20160426084803261
+modified: 20160426085526274
+title: $:/themes/tiddlywiki/vanilla/metrics/storywidth
+type: text/vnd.tiddlywiki
+
+650px
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/$__themes_tiddlywiki_vanilla_metrics_tiddlerwidth.tid b/editions/es-ES/tiddlers/$__themes_tiddlywiki_vanilla_metrics_tiddlerwidth.tid
new file mode 100644
index 000000000..3a904e483
--- /dev/null
+++ b/editions/es-ES/tiddlers/$__themes_tiddlywiki_vanilla_metrics_tiddlerwidth.tid
@@ -0,0 +1,6 @@
+created: 20160426084816661
+modified: 20160426085539631
+title: $:/themes/tiddlywiki/vanilla/metrics/tiddlerwidth
+type: text/vnd.tiddlywiki
+
+650px
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/$__themes_tiddlywiki_vanilla_themetweaks.tid b/editions/es-ES/tiddlers/$__themes_tiddlywiki_vanilla_themetweaks.tid
new file mode 100644
index 000000000..e60699508
--- /dev/null
+++ b/editions/es-ES/tiddlers/$__themes_tiddlywiki_vanilla_themetweaks.tid
@@ -0,0 +1,71 @@
+caption: Ajustes de tema
+created: 20160427065547366
+modified: 20160427065556693
+tags: $:/tags/ControlPanel/Appearance
+title: $:/themes/tiddlywiki/vanilla/themetweaks
+type: text/vnd.tiddlywiki
+
+\define backgroundimage-dropdown()
+<div class="tc-drop-down-wrapper">
+<$button popup=<<qualify "$:/state/popup/themetweaks/backgroundimage">> class="tc-btn-invisible tc-btn-dropdown">{{$:/core/images/down-arrow}}</$button>
+<$reveal state=<<qualify "$:/state/popup/themetweaks/backgroundimage">> type="popup" position="belowleft" text="" default="">
+<div class="tc-drop-down">
+<$linkcatcher to="$:/themes/tiddlywiki/vanilla/settings/backgroundimage">
+<$link to="">
+(none)
+</$link>
+<hr>
+<$list filter="[all[shadows+tiddlers]is[image]] -[type[application/pdf]] +[sort[title]]">
+<$link to={{!!title}}>
+<$transclude/> <$view field="title"/>
+</$link>
+</$list>
+</$linkcatcher>
+</div>
+</$reveal>
+</div>
+\end
+
+\define backgroundimageattachment-dropdown()
+<$select tiddler="$:/themes/tiddlywiki/vanilla/settings/backgroundimageattachment" default="scroll">
+<option value="scroll">Scroll with tiddlers</option>
+<option value="fixed">Fixed to window</option>
+</$select>
+\end
+
+\define backgroundimagesize-dropdown()
+<$select tiddler="$:/themes/tiddlywiki/vanilla/settings/backgroundimagesize" default="scroll">
+<option value="auto">Auto</option>
+<option value="cover">Cover</option>
+<option value="contain">Contain</option>
+</$select>
+\end
+
+You can tweak certain aspects of the ''Vanilla'' theme.
+
+! Options
+
+|[[Sidebar layout|$:/themes/tiddlywiki/vanilla/options/sidebarlayout]] |<$select tiddler="$:/themes/tiddlywiki/vanilla/options/sidebarlayout"><option value="fixed-fluid">Fixed story, fluid sidebar</option><option value="fluid-fixed">Fluid story, fixed sidebar</option></$select> |
+|[[Sticky titles|$:/themes/tiddlywiki/vanilla/options/stickytitles]]<br>//Causes tiddler titles to "stick" to the top of the browser window. Caution: Does not work at all with Chrome, and causes some layout issues in Firefox// |<$select tiddler="$:/themes/tiddlywiki/vanilla/options/stickytitles"><option value="no">No</option><option value="yes">Yes</option></$select> |
+
+! Settings
+
+|[[Font family|$:/themes/tiddlywiki/vanilla/settings/fontfamily]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/settings/fontfamily" default="" tag="input"/> | |
+|[[Code font family|$:/themes/tiddlywiki/vanilla/settings/codefontfamily]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/settings/codefontfamily" default="" tag="input"/> | |
+|[[Page background image|$:/themes/tiddlywiki/vanilla/settings/backgroundimage]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/settings/backgroundimage" default="" tag="input"/> |<<backgroundimage-dropdown>> |
+|[[Page background image attachment |$:/themes/tiddlywiki/vanilla/settings/backgroundimageattachment]] |<<backgroundimageattachment-dropdown>> | |
+|[[Page background image size |$:/themes/tiddlywiki/vanilla/settings/backgroundimagesize]] |<<backgroundimagesize-dropdown>> | |
+
+! Sizes
+
+|[[Font size|$:/themes/tiddlywiki/vanilla/metrics/fontsize]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/fontsize" default="" tag="input"/> |
+|[[Line height|$:/themes/tiddlywiki/vanilla/metrics/lineheight]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/lineheight" default="" tag="input"/> |
+|[[Font size for tiddler body|$:/themes/tiddlywiki/vanilla/metrics/bodyfontsize]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/bodyfontsize" default="" tag="input"/> |
+|[[Line height for tiddler body|$:/themes/tiddlywiki/vanilla/metrics/bodylineheight]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/bodylineheight" default="" tag="input"/> |
+|[[Story left position|$:/themes/tiddlywiki/vanilla/metrics/storyleft]]<br>//how far the left margin of the story river<br>(tiddler area) is from the left of the page// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storyleft" default="" tag="input"/> |
+|[[Story top position|$:/themes/tiddlywiki/vanilla/metrics/storytop]]<br>//how far the top margin of the story river<br>is from the top of the page// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storytop" default="" tag="input"/> |
+|[[Story right|$:/themes/tiddlywiki/vanilla/metrics/storyright]]<br>//how far the left margin of the sidebar <br>is from the left of the page// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storyright" default="" tag="input"/> |
+|[[Story width|$:/themes/tiddlywiki/vanilla/metrics/storywidth]]<br>//the overall width of the story river// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storywidth" default="" tag="input"/> |
+|[[Tiddler width|$:/themes/tiddlywiki/vanilla/metrics/tiddlerwidth]]<br>//within the story river//<br> |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/tiddlerwidth" default="" tag="input"/> |
+|[[Sidebar breakpoint|$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint]]<br>//the minimum page width at which the story<br>river and sidebar will appear side by side// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint" default="" tag="input"/> |
+|[[Sidebar width|$:/themes/tiddlywiki/vanilla/metrics/sidebarwidth]]<br>//the width of the sidebar in fluid-fixed layout// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/sidebarwidth" default="" tag="input"/> |
diff --git a/editions/es-ES/tiddlers/A_Gentle_Guide_to_TiddlyWiki.tid b/editions/es-ES/tiddlers/A_Gentle_Guide_to_TiddlyWiki.tid
new file mode 100644
index 000000000..b0d8f5ff4
--- /dev/null
+++ b/editions/es-ES/tiddlers/A_Gentle_Guide_to_TiddlyWiki.tid
@@ -0,0 +1,25 @@
+caption: Amable introducción
+created: 20150325170720682
+es-title: Amable introducción a TiddlyWiki
+modified: 20160416054440172
+tags: HelloThere
+title: A Gentle Guide to TiddlyWiki
+type: text/vnd.tiddlywiki
+
+TiddlyWiki es una herramienta increíblemente flexible y versátil, concebida y construida de forma muy distinta a la mayoría de software. Esto puede hacerla difícil de comprender hasta ese momento en que algo hace //clic// y se convierte en una extensión natural de tu cerebro.
+
+Para empezar por lo básico, TiddlyWiki es una aplicación web para la toma de notas que puedes descargar libre y gratuitamente, que puedes guardar donde quieras y adaptar del modo que desees. Úsala para [[escribir|Creating and editing tiddlers]], [[organizar|Structuring TiddlyWiki]] y [[compartir|Sharing your tiddlers with others]] notas de un modo que los procesadores de texto y otras herramientas para tomar notas no pueden. 
+
+~TiddlyWiki está diseñada para estructurar contenidos de modo [[no lineal|Philosophy of Tiddlers]] valiéndose de StoryLists, etiquetas, enlaces y otras características. Puedes organizar y recuperar tus notas de la manera que mejor se adapte a tu forma de pensar, en lugar de sentirte encadenado a una estructura predeterminada de organización.
+
+~TiddlyWiki is designed to be non-linear, structuring content with stories, tags, hyperlinks, and other features. You can organise and retrieve your notes in ways that conform to your personal thought patterns, rather than feel chained to one preset organisational structure.
+
+Puedes usar ~TiddlyWiki tanto online como sin conexión de red. Como archivo único que consultas y editas con cualquier navegador web, o puedes utilizarlo como una poderosa [[aplicación de Node.js|TiddlyWiki on Node.js]], que guarda por separado cada una de tus notas.
+
+¿Cómo hacer que ~TiddlyWiki trabaje para ti? Te recomendamos empezar consultando la documentación introductoria que se muestra más abajo y echar un vistazo al [[índice|TableOfContents]] que tienes a tu disposición en la barra lateral.
+
+También puedes seguir estas  [[sencillas instrucciones|GettingStarted]] e ir descubriendo por ti mismo a partir de ahí. 
+
+<<list-links "[tag[HelloThere]]">>
+
+También hay [[tutoriales en video|TiddlyWiki Video Tutorials by Francis Meetze]] (en inglés)
diff --git a/editions/es-ES/tiddlers/About.tid b/editions/es-ES/tiddlers/About.tid
new file mode 100644
index 000000000..5af48d5d2
--- /dev/null
+++ b/editions/es-ES/tiddlers/About.tid
@@ -0,0 +1,11 @@
+caption: Acerca de ~TiddlyWiki
+created: 20140912145139340
+es-title: Acerca de TiddlyWiki
+modified: 20160511151921526
+tags: TableOfContents
+title: About
+type: text/vnd.tiddlywiki
+
+Información sobre quiénes y cómo hacemos ~TiddlyWiki:
+
+<<list-links "[tag[About]]">>
diff --git a/editions/es-ES/tiddlers/Acknowledgements.tid b/editions/es-ES/tiddlers/Acknowledgements.tid
new file mode 100644
index 000000000..1629dd953
--- /dev/null
+++ b/editions/es-ES/tiddlers/Acknowledgements.tid
@@ -0,0 +1,11 @@
+caption: Agradecimientos
+created: 20140129204112515
+es-title: Agradecimientos
+modified: 20160511152611559
+tags: About
+title: Acknowledgements
+type: text/vnd.tiddlywiki
+
+TiddlyWiki no sería posible sin el constante apoyo de la [[comunidad|Community]] de TiddlyWiki. Su atención y feedback constante han hecho posible tener una idea precisa de qué se espera de este producto y su pasión nos ha enseñado que la inversión en ella merece la pena. 
+
+{{$:/Acknowledgements}}
diff --git a/editions/es-ES/tiddlers/Adding_Babel_Polyfill_to_TiddlyWiki.tid b/editions/es-ES/tiddlers/Adding_Babel_Polyfill_to_TiddlyWiki.tid
new file mode 100644
index 000000000..c4f09fb0c
--- /dev/null
+++ b/editions/es-ES/tiddlers/Adding_Babel_Polyfill_to_TiddlyWiki.tid
@@ -0,0 +1,67 @@
+caption: Añadir a ~Tiddlywiki el Polyfill de Babel
+created: 20160112025328000
+es-title: Incorporar el polyfill de Babel a TiddlyWiki
+modified: 20160506153636017
+tags: documenting Concepts
+title: Adding Babel Polyfill to TiddlyWiki
+type: text/vnd.tiddlywiki
+
+No todos los navegadores soportan las últimas características de ES2015. El proyecto [[Babel|https://babeljs.io/docs/learn-es2015/]] ofrece un [[polyfill|https://en.wikipedia.org/wiki/Polyfill]] que puede incluirse en ~TiddlyWiki, de modo que dichas características estén disponibles para nuevos plugins. Para hacerlo, es necesaria una copia del código fuente del polyfill. 
+
+Puede obtenerse una copia a través de <<.def "npm">> o se puede descargar desde la página del proyecto. En la documentación del [[polyfill de Babel|https://babeljs.io/docs/usage/polyfill/]] existe información específica para su instalación. 
+
+Hay que crear una carpeta `plugins/babel-polyfill` dentro de la carpeta <<.place editions>> de ~TiddlyWiki. En ella hay que crear el documento `plugins/babel-polyfill/plugin.info`, con el siguiente contenido:
+
+```json
+{
+  "title": "$:/plugins/babel/babel-polyfill",
+  "description": "Babel Polyfills for ES2015 support",
+  "author": "Your Name Here",
+  "core-version": ">=5.0.0"
+}
+```
+
+Crea la carpeta `plugins/babel-polyfill/files`. Dentro, el archivo `plugins/babel-polyfill/files/tiddlywiki.files`, con el siguiente contenido:
+
+```json
+{
+  "tiddlers": [
+    {
+      "file": "polyfill.min.js",
+      "fields": {
+        "title": "$:/plugins/babel/babel-polyfill/polyfill.min.js",
+        "type": "application/javascript",
+        "module-type": "library",
+        "global-module": "true"
+      }
+    }
+  ]
+}
+```
+
+Copia entonces el archivo `polyfill.min.js` que ya has descargado.
+
+<<.tip "Si lo has descargado vía ''npm'', tiene que estar en `./node_modules/babel-polyfill/dist/polyfill.min.js`.">>
+
+Por último, necesitarás un inicializador, para lo que deberás crear el archivo `plugins/babel-polyfill/plugin.js`, con el siguiente contenido:
+
+```javascript
+/*\
+title: $:/plugins/babel/babel-polyfill/plugin.js
+type: application/javascript
+module-type: startup
+
+Load the babel-polyfill library on startup
+
+\*/
+
+exports.startup = function() {
+  $tw.modules.execute('$:/plugins/babel/babel-polyfill/polyfill.min.js');
+}
+```
+
+<<.warning "Debido a que se prevee que el polyfill se use en el navegador, necesitamos cargar la librería de manera condicional, lo que ES2016 no permite. Es por esto por lo que no usamos para ello la declaración `import` de ES2015, sino que está escrito como dependencia de ~TiddlyWiki">>
+
+Ahora están disponibles todas las características del entorno de ejecución ES2015. 
+
+En [[Escribir plugins con ES2016|Using ES2016 for Writing Plugins]] está disponible la información necesaria sobre la sintaxis de ES2015 para programar plugins.
diff --git a/editions/es-ES/tiddlers/Adding_a_Table_of_Contents_to_the_Sidebar.tid b/editions/es-ES/tiddlers/Adding_a_Table_of_Contents_to_the_Sidebar.tid
new file mode 100644
index 000000000..9267e9c43
--- /dev/null
+++ b/editions/es-ES/tiddlers/Adding_a_Table_of_Contents_to_the_Sidebar.tid
@@ -0,0 +1,24 @@
+caption: Añadir pestaña de contenidos
+created: 20160424150551727
+es-title: Añadir una tabla de contenidos a la barra lateral
+modified: 20160426102736986
+tags: [[Customise TiddlyWiki]]
+title: Adding a Table of Contents to the Sidebar
+type: text/vnd.tiddlywiki
+
+Es posible añadir una [[tabla de contenidos|Table-of-Contents Macros]] a la barra lateral, siguiendo estos pasos:
+
+# Crea un tiddler llamado [[TableOfContents]]
+# Etiquétalo como <<.tag ~$:/tags/SideBar>>
+# En el cuerpo del tiddler, escribe el siguiente texto: <div><pre><code><$text text="""
+<div class="tc-table-of-contents">
+
+<<toc-selective-expandable 'TableOfContents'>>
+
+</div>"""/></code></pre></div>
+
+# Añade el campo <<.field caption>> con el texto <<.def Contenidos>> o la referencia adecuada a un tiddler o variable. p. ej, en el caso de la tabla de contenidos de este wiki,  <<.field caption>> toma su valor del contenido de <<.tid "~$:/language/SideBar/Contents/Caption">>.
+
+# Añade el campo <<.field ''list-after''>> con el valor <<.word ~$:/core/ui/SideBar/Open>> para que la pestaña de de contenidos se muestre inmediatamente después de la de <<.sidebar-tab Open>>
+
+Añade entradas a la tabla de contenidos creando tiddlers con la etiqueta <<.em ~TableOfContents>>. Una forma sencilla de hacerlo es con el botón <<.button new-here>> del desplegable <<.button more-tiddler-actions>>. De igual modo, a partir de estas, se pueden crear subentradas etiquetadas con el nombre de la entrada del nivel superior. 
diff --git a/editions/es-ES/tiddlers/Adding_a_Twitter_Follow_button.tid b/editions/es-ES/tiddlers/Adding_a_Twitter_Follow_button.tid
new file mode 100644
index 000000000..1959951a7
--- /dev/null
+++ b/editions/es-ES/tiddlers/Adding_a_Twitter_Follow_button.tid
@@ -0,0 +1,22 @@
+caption: Botón "Seguir en Twitter"
+created: 20140103091348509
+es-title: Añadir botón "Seguir en Twitter"
+modified: 20160418051111158
+tags: Learning
+title: Adding a Twitter Follow button
+type: text/vnd.tiddlywiki
+
+Esta es una macro para crear el botón "Seguir en Twitter" para seguir una cuenta en particular:
+
+```
+\define twitterFollowButton(username)
+<iframe allowtransparency="true" frameborder="0" scrolling="no" src="//platform.twitter.com/widgets/follow_button.html?screen_name=$username$"  style="width:300px; height:20px;"></iframe>
+\end
+```
+El único cambio respecto de la versión publicada en https://dev.twitter.com/docs/follow-button es que se han eliminado las nuevas líneas.
+
+Ten en cuenta que "src URL" aparece sin protocolo (o sea, "http" o "https"). Se hace así para que funcione en sitios alojados tanto en uno como en otro. Si quieres que el botón de Twitter funcione mientras manejas TiddlyWiki offline como "file://", tendrás que añadir el protocolo manualmente. Por ejemplo:
+
+```
+<iframe allowtransparency="true" frameborder="0" scrolling="no" src="http://platform.twitter.com/widgets/follow_button.html?screen_name=jermolene"  style="width:300px; height:20px;"></iframe>
+```
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Adopt_a_Titles_Policy.tid b/editions/es-ES/tiddlers/Adopt_a_Titles_Policy.tid
new file mode 100644
index 000000000..c46a70090
--- /dev/null
+++ b/editions/es-ES/tiddlers/Adopt_a_Titles_Policy.tid
@@ -0,0 +1,15 @@
+caption: Políticas de estilo
+created: 20130825103300000
+es-title: Define políticas de estilo
+modified: 20160418091257866
+tags: Learning
+title: Adopt a Titles Policy
+type: text/vnd.tiddlywiki
+
+Mantener la coherencia entre títulos de tiddler puede volverse más y más difícil a medida la estructura de tu TiddlyWiki se vuelve más y más compleja. Por ejemplo: ¿Hay que referirse a términos en plural o en singular? ¿En ~CamelCase o separando palabras? ¿Con mayúscula sólo al principio o Con Mayúscula En Cada Palabra? ¿Traducimos los términos en inglés o los incorporamos a nuestra terminología?
+
+Redactar formalmente una política de estilos puede ser de gran ayuda para reducir toda posible confusión. Por ejemplo, la [[Guía de estilo|Documentation Style Guide]] de este TiddlyWiki.
+
+!! Tiddlers de sistema
+
+Una convención que te resultará útil es la de usar el prefijo `$:/_`para todo nuevo tiddler de sistema que crees, porque así te aseguras de que aparezca al principio de las listas, por ejemplo, la lista de tiddlers de sistema de la barra lateral en la pestaña Más/Sistema.
diff --git a/editions/es-ES/tiddlers/AlertMechanism.tid b/editions/es-ES/tiddlers/AlertMechanism.tid
new file mode 100644
index 000000000..199d70aff
--- /dev/null
+++ b/editions/es-ES/tiddlers/AlertMechanism.tid
@@ -0,0 +1,20 @@
+caption: Alertas
+created: 20140213224306412
+es-title: Mecanismo de alertas
+modified: 20160428151401815
+tags: Mechanisms Features
+title: AlertMechanism
+type: text/vnd.tiddlywiki
+
+Las alertas se muestran como cajas amarillas superpuestas a la ventana principal de ~TiddlyWiki. Cada una corresponde a un tiddler con la etiqueta <<.tag ~$:/tags/Alert]]. Pinchando el icono de la papelera en una alerta borra el tiddler correspondiente.
+
+Aquí va una demostración: <$fieldmangler tiddler="SampleAlert"><$set name="currentTiddler" value="SampleAlert"><$button message="tm-add-tag" param="$:/tags/Alert">Alerta</$button></$set></$fieldmangler>.
+
+Los tiddlers de alerta contienen los siguientes campos:
+
+|!Campo |!Descripción |
+|title |Por defecto, con el prefijo `$:/temp/alerts/` |
+|text |Texto de la alerta |
+|modified |Fecha y hora de la alerta (para ordenarlos en pantalla) |
+|component |Componente asociado a la alerta |
+|tags |Deben incluir [[$:/tags/Alert]] |
diff --git a/editions/es-ES/tiddlers/Articles.tid b/editions/es-ES/tiddlers/Articles.tid
new file mode 100644
index 000000000..2f82b46a4
--- /dev/null
+++ b/editions/es-ES/tiddlers/Articles.tid
@@ -0,0 +1,29 @@
+caption: Artículos
+created: 20140320230543190
+es-title: Artículos
+modified: 20160413161517651
+tags: Community
+title: Articles
+type: text/vnd.tiddlywiki
+
+Estos son algunos artículos recientes publicados sobre ~TiddlyWiki. 
+
+Envía nuevos artículos que encuentres via [[GitHub|https://github.com/Jermolene/TiddlyWiki5]] o [[Twitter|https://twitter.com/tiddlywiki]], o publícalas en el [[grupo|https://groups.google.com/forum/?hl=es#!forum/tiddlywiki]]
+
+<div class="tc-link-info">
+
+<$list filter="[tag[Articles]!sort[modified]]">
+
+<div class="tc-link-info-item">
+
+! <$link><$view field="title"/></$link>
+
+<div class="tc-subtitle">Posted <$view field="modified" format="relativedate"/></div>
+
+<$transclude/>
+
+</div>
+
+</$list>
+
+</div>
diff --git a/editions/es-ES/tiddlers/Audio.tid b/editions/es-ES/tiddlers/Audio.tid
new file mode 100644
index 000000000..ae68a2729
--- /dev/null
+++ b/editions/es-ES/tiddlers/Audio.tid
@@ -0,0 +1,27 @@
+caption: Audio
+created: 20141018131647392
+es-title: Audio en TiddlyWiki
+modified: 20160428153844198
+tags: [[Working with TiddlyWiki]] Features
+title: Audio
+type: text/vnd.tiddlywiki
+
+Se pueden incorporar archivos de audio a ~TiddlyWiki de manera muy similar a como se hace con [[imágenes|Images in WikiText]].
+
+! Audio incrustado
+
+Se pueden incrustar pequeños archivos de audio directamente en ~TiddlyWiki. No es conveniente hacerlo con archivos grandes (de más de unos pocos cientos de Kb), porque aumenta el tamaño del archivo de ~Tiddlywiki.
+
+Veamos un ejemplo: el tiddler [[TiddlyWiki.mp3]] contiene la grabación de la palabra <<.word TiddlyWiki>> en inglés. Si abres el tiddler, verás un pequeño reproductor de audio que te permitirá oirlo. 
+
+Por supuesto, como ocurre con cualquier otro tiddler, puedes hacer la transclusión de su contenido:
+
+<<wikitext-example-without-html '{{TiddlyWiki.mp3}}'>>
+
+! Audio externo
+
+Un tiddler de audio externo usa el campo <<.field _canonical_uri>> para apuntar al origen externo de un archivo o stream de audio y bloquear el campo <<.field Text>>. Esto reduce considerablemente su tamaño a la vez que nos sigue permitiendo su reproducción.
+
+Otro ejemplo: el tiddler [[Caruso - Ave Maria]] apunta a un archivo online almacenado en http://archive.org:
+
+<<wikitext-example-without-html '{{Caruso - Ave Maria}}'>>
diff --git a/editions/es-ES/tiddlers/AutoSave.tid b/editions/es-ES/tiddlers/AutoSave.tid
new file mode 100644
index 000000000..e3e3b499d
--- /dev/null
+++ b/editions/es-ES/tiddlers/AutoSave.tid
@@ -0,0 +1,13 @@
+caption: Autoguardado
+created: 20140206211715540
+es-title: Guardado automático
+modified: 20160428155227657
+tags: Features
+title: AutoSave
+type: text/vnd.tiddlywiki
+
+Si hay un SaverModule disponible que lo permita, ~TiddlyWiki guardará el documento en su estado actual en cuanto se pulsen los botones <<.button save>> o <<.button delete>>
+
+Debieras ver entonces una notificación amarilla en la esquina superior derecha de la ventana que confirma que se ha realizado el guardado.
+
+Se puede activar y desactivar el guardado automático en la pestaña <<.controlpanel-tab Settings>> del panel de control. Entre bambalinas, se controla mediante el tiddler de configuración <<.tid ~$:/config/AutoSave>>, que en su cuerpo indica con los valores <<.em Sí>> o <<.em No>> si activa el autoguardado.
diff --git a/editions/es-ES/tiddlers/Blog_Edition.tid b/editions/es-ES/tiddlers/Blog_Edition.tid
new file mode 100644
index 000000000..9d455da80
--- /dev/null
+++ b/editions/es-ES/tiddlers/Blog_Edition.tid
@@ -0,0 +1,11 @@
+caption: Edición Blog
+created: 20150902123139133
+es-title: Edición Blog
+modified: 20160504051105282
+tags: Editions
+title: Blog Edition
+type: text/vnd.tiddlywiki
+
+Desarrollada para su uso en Node.js, la edición <<.word blog>> de ~TiddlyWiki contiene herramientas para la publicación de blogs estáticos en HTML.
+
+Mientras se prepara la documentación, puedes ver un ejemplo de su uso en http://jermolene.com/
diff --git a/editions/es-ES/tiddlers/BrowserCompatibility.tid b/editions/es-ES/tiddlers/BrowserCompatibility.tid
new file mode 100644
index 000000000..a1400d2d1
--- /dev/null
+++ b/editions/es-ES/tiddlers/BrowserCompatibility.tid
@@ -0,0 +1,18 @@
+caption: Navegadores compatibles
+created: 20160423055210605
+es-title: Compatibilidad con navegadores
+modified: 20160423055539347
+tags: [[Working with TiddlyWiki]]
+title: BrowserCompatibility
+type: text/vnd.tiddlywiki
+
+TiddlyWiki ha sido diseñado para trabajar en navegadores compatibles con HTML5.
+
+La tabla siguiente es un resumen de versiones de los navegadores en los que se sabe que ~TiddlyWiki funciona correctamente:
+
+|!Navegador |!Status |
+|Internet Explorer |Versión 10 y superiores |
+|Chromium/Chrome |Todas las recientes |
+|Firefox |Todas las recientes |
+|Firefox for Android |Todas las recientes |
+|Safari |Versión 6 y superiores |
diff --git a/editions/es-ES/tiddlers/CamelCase.tid b/editions/es-ES/tiddlers/CamelCase.tid
new file mode 100644
index 000000000..38ce5e789
--- /dev/null
+++ b/editions/es-ES/tiddlers/CamelCase.tid
@@ -0,0 +1,11 @@
+caption: ~CamelCase
+created: 20130828185300000
+es-title: CamelCase
+modified: 20160424053359855
+tags: Definitions
+title: CamelCase
+type: text/vnd.tiddlywiki
+
+El [[CamelCase|https://es.wikipedia.org/wiki/CamelCase]] se forma tomando una frase, poniendo la inicial de cada palabra en mayúscula y pegando una palabra a la otra, sin espacios. Esto hace que visualmente al texto le salgan //jorobas// y de ahí el nombre. 
+
+La mayoría de wikis usan ~CamelCase como una forma rápida de crear hipertexto.
diff --git a/editions/es-ES/tiddlers/CodeMirror_Plugin.tid b/editions/es-ES/tiddlers/CodeMirror_Plugin.tid
new file mode 100644
index 000000000..3621b8657
--- /dev/null
+++ b/editions/es-ES/tiddlers/CodeMirror_Plugin.tid
@@ -0,0 +1,12 @@
+caption: ~CodeMirror
+created: 20160107223435497
+es-title: CodeMirror
+list: 
+modified: 20160504052000617
+tags: [[Plugin Editions]]
+title: CodeMirror Plugin
+type: text/vnd.tiddlywiki
+
+El plugin [[CodeMirror|http://codemirror.net/]] incorpora un sofisticado editor web de texto.
+
+DIsponible en: http://tiddlywiki.com/plugins/tiddlywiki/codemirror/
diff --git a/editions/es-ES/tiddlers/ColourPalettes.tid b/editions/es-ES/tiddlers/ColourPalettes.tid
new file mode 100644
index 000000000..8a978d111
--- /dev/null
+++ b/editions/es-ES/tiddlers/ColourPalettes.tid
@@ -0,0 +1,35 @@
+caption: Paletas cromáticas
+created: 20140216102454178
+es-title: Paletas cromáticas en TiddlyWiki
+modified: 20160507042920576
+tags: Concepts
+title: ColourPalettes
+type: text/vnd.tiddlywiki
+
+Una paleta de colores es un [[tiddler de datos|DataTiddlers]] que proporciona valores [[CSS]] a una serie de parámetros de color de diferentes componentes, definidos de esta manera:
+
+```
+page-background: #fe0
+table-border: #ccc
+...
+```
+
+Hay varias paletas definidas en el núcleo de ~TiddlyWiki. El tiddler <<.tid ~$:/palette>> contiene el título de la paleta actualmente seleccionada. 
+
+Para saber el color de algún elemento definido en la paleta actual, por ejemplo para su uso en una hoja de estilos, se puede usar la macro <<.mlink color>>:
+
+```
+<<colour page-background>>
+```
+Devuelve el siguiente valor, correspondiente al color aplicado al componente <<.word page-background>>: <<colour page-background>>. 
+
+Los tiddlers que definen una paleta de color tienen que tener los siguientes campos: 
+
+|!Nombre |!Valor |
+|title |Lleva el prefijo `$:/` |
+|type |`application/x-tiddler-dictionary` |
+|tags |`$:/tags/Palette` |
+|description |Descripción para mostrar en el selector de paletas |
+|text |`nombre: valor` |
+
+El valor CSS puede definirse bien usando un nombre predefinido (p.ej: ~BlanchedAlmond), su valor hexadecimal (p.ej, para el anterior: #FFEBCD), o rgba (el anterior: 255, 235, 205,1)
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Commands.tid b/editions/es-ES/tiddlers/Commands.tid
new file mode 100644
index 000000000..d31b45db8
--- /dev/null
+++ b/editions/es-ES/tiddlers/Commands.tid
@@ -0,0 +1,11 @@
+caption: Comandos Node.js
+created: 20150117174359000
+es-title: Comandos en Node.js
+modified: 20160507043151318
+tags: Concepts Reference
+title: Commands
+type: text/vnd.tiddlywiki
+
+Un <<.def comando>> es una de las siguientes palabras, escritas con el prefijo `--`, usada como opción en la línea de comandos para indicar a [[TiddlyWiki en Node.js|TiddlyWiki on Node.js]] qué acción se desea.
+
+<<list-links "[tag[Commands]]">>
diff --git a/editions/es-ES/tiddlers/Community.tid b/editions/es-ES/tiddlers/Community.tid
new file mode 100644
index 000000000..709213923
--- /dev/null
+++ b/editions/es-ES/tiddlers/Community.tid
@@ -0,0 +1,11 @@
+caption: Comunidad
+created: 20130909151600000
+es-title: Comunidad
+modified: 20160511151601621
+tags: TableOfContents
+title: Community
+type: text/vnd.tiddlywiki
+
+Aquí reunimos las últimas y más útiles novedades procedentes de la comunidad TiddlyWiki.
+
+<<tabs "Forums Latest Tutorials Resources Examples Articles Meetups" "Latest">>
diff --git a/editions/es-ES/tiddlers/Compose_ballad.tid b/editions/es-ES/tiddlers/Compose_ballad.tid
new file mode 100644
index 000000000..4359812e8
--- /dev/null
+++ b/editions/es-ES/tiddlers/Compose_ballad.tid
@@ -0,0 +1,9 @@
+caption: Componer balada
+created: 20130825143000000
+es-title: Componer balada
+modified: 20160418045700440
+tags: task
+title: Compose ballad
+type: text/vnd.tiddlywiki
+
+//Tarea de muestra para el [[Ejemplo de administración de tareas|TaskManagementExample]]//
diff --git a/editions/es-ES/tiddlers/Concepts.tid b/editions/es-ES/tiddlers/Concepts.tid
new file mode 100644
index 000000000..1e3476c4a
--- /dev/null
+++ b/editions/es-ES/tiddlers/Concepts.tid
@@ -0,0 +1,12 @@
+caption: Conceptos
+color: #FF8383
+created: 20130825144700000
+es-title: Conceptos
+modified: 20160506151445487
+tags: Reference
+title: Concepts
+type: text/vnd.tiddlywiki
+
+Estos son los conceptos básicos presentes en ~TiddlyWiki. Comprender cómo encajan estos conceptos unos con otros es fundamental para el conocimiento en profundidad de ~TiddlyWiki. 
+
+<<list-links "[tag[Concepts]]">>
diff --git a/editions/es-ES/tiddlers/Configuring_the_default_TiddlerInfo_tab.tid b/editions/es-ES/tiddlers/Configuring_the_default_TiddlerInfo_tab.tid
new file mode 100644
index 000000000..6886bea2c
--- /dev/null
+++ b/editions/es-ES/tiddlers/Configuring_the_default_TiddlerInfo_tab.tid
@@ -0,0 +1,21 @@
+caption: Pestaña por defecto de ~InfoPanel
+created: 20140828080837703
+es-title: Configuración de la pestaña por defecto del InfoPanel
+modified: 20160426133136283
+tags: [[Customise TiddlyWiki]]
+title: Configuring the default TiddlerInfo tab
+type: text/vnd.tiddlywiki
+
+El tiddler de configuración [[$:/config/TiddlerInfo/Default]] contiene el título del tiddler de la pestaña abierta por defecto en el InfoPanel. 
+
+Su valor por defecto es <<.tid ~$:/core/ui/TiddlerInfo/Tools>>, que corresponde a la pestaña <<.info-tab Tools>>. 
+
+Todos los valores posibles para seleccionar la pestaña abierta por defecto son:
+
+<ul>
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/TiddlerInfo]!has[draft.of]]">
+<li>
+<$view field="title"/>
+</li>
+</$list>
+</ul>
diff --git a/editions/es-ES/tiddlers/Contributing.tid b/editions/es-ES/tiddlers/Contributing.tid
new file mode 100644
index 000000000..8211f62e3
--- /dev/null
+++ b/editions/es-ES/tiddlers/Contributing.tid
@@ -0,0 +1,41 @@
+caption: Contribuciones
+created: 20131101111400000
+es-title: Cómo contribuir con TiddlyWiki
+modified: 20160413170206770
+tags: Community
+title: Contributing
+type: text/vnd.tiddlywiki
+
+Estamos encantados de recibir contribuciones al código y la documentación de TiddlyWiki, ya sea:
+
+* [[Reportando Bugs|ReportingBugs]]
+
+* Ayudando a [[mejorar la documentación|Improving TiddlyWiki Documentation]]
+
+* Aportando código a través de [[GitHub|https://github.com/Jermolene/TiddlyWiki5]]
+** Más detalles en http://tiddlywiki.com/dev 
+
+Hay, además, más formas de 
+[[contribuir con el proyecto|HelpingTiddlyWiki]].
+
+!! CLA: Acuerdo de licencia de contribución
+
+{{Contributor License Agreement}}
+
+!! Cómo firmar el CLA
+
+{{Signing the Contributor License Agreement}}
+
+---
+
+//Los documentos que componen el CLA de este proyecto se crearon usando las siguientes plantillas del//  [[Proyecto Harmony|http://www.harmonyagreements.org]]:
+
+* "HA-CLA-I-LIST Version 1.0" para el "CLA-individual" 
+* "HA-CLA-E-LIST Version 1.0" para el "CLA-entity"
+
+-----------
+Observaciones:
+
+*>«When not owning the copyright in the entire work of authorship...»
+
+En caso de que, como dice el texto, no seas propietario de los derechos de la totalidad del trabajo de tu autoría, exprésalo claramente. De otro modo, asumiremos que eres el único poseedor legal de los derechos de tu contribución al proyecto. En tal caso, proporciona también enlaces e información que aclare bajo qué licencia se distribuye el código del que no eres propietario. 
diff --git a/editions/es-ES/tiddlers/Contributor_License_Agreement.tid b/editions/es-ES/tiddlers/Contributor_License_Agreement.tid
new file mode 100644
index 000000000..b8ba431e9
--- /dev/null
+++ b/editions/es-ES/tiddlers/Contributor_License_Agreement.tid
@@ -0,0 +1,15 @@
+caption: CLA - Acuerdo de licencia
+created: 20150630205511173
+es-title: Acuerdo de licencia de contribución
+modified: 20160413171201065
+tags: 
+title: Contributor License Agreement
+type: text/vnd.tiddlywiki
+
+Al igual que sucede en otros proyectos de Código Abierto, TiddlyWiki5 necesita que quien quiera contribuir con él, firme un acuerdo de licencia de contribución. 
+
+Es un acuerdo legal que permite a quien contribuye afirmar que los derechos de su contribución son exclusivamente suyos y que está de acuerdo en licenciarlos a la Asociación UnaMesa (entidad legal que, en nombre de la comunidad, es propietaria de TiddlyWiki).
+
+* Si eres persona física, necesitas firmar la [[licencia individual|https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-individual.md]]
+
+*Si eres persona fiscal, la de [[entidades|https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-entity.md]]
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Contributors.tid b/editions/es-ES/tiddlers/Contributors.tid
new file mode 100644
index 000000000..635da11c6
--- /dev/null
+++ b/editions/es-ES/tiddlers/Contributors.tid
@@ -0,0 +1,46 @@
+caption: Colaboradores
+created: 20140916132828137
+es-title: Colaboradores
+modified: 20160511153232257
+tags: About
+title: Contributors
+type: text/vnd.tiddlywiki
+
+Las siguientes personas han dedicado generosamente su tiempo a [[contribuir al desarrollo de TiddlyWiki|https://github.com/Jermolene/TiddlyWiki5/graphs/contributors]]:
+
+* Jeremy Ruston ([[@Jermolene|https://github.com/Jermolene]])
+* Dave Gifford ([[@giffmex|https://github.com/giffmex]])
+* Bram Chen ([[@BramChen|https://github.com/BramChen]])
+* Mario Pietsch ([[@pmario|https://github.com/pmario]])
+* Xavier Cazin ([[@xcazin|https://github.com/xcazin]])
+* Eric Shulman ([[@ericshulman|https://github.com/ericshulman]])
+* Stephan Hradek ([[@Skeeve|https://github.com/Skeeve]])
+* ~BuggyJef ([[@buggyj|https://github.com/buggyj]])
+* Nathan Cain ([[@natecain|https://github.com/natecain]])
+* Ton Gerner ([[@gernert|https://github.com/gernert]])
+* Devin Weaver ([[@sukima|https://github.com/sukima]])
+* João Bolila ([[@jbolila|https://github.com/jbolila]])
+* David Johnston ([[@Brennall|https://github.com/Brennall]])
+* David Jade ([[@davidjade|https://github.com/davidjade]])
+* Bob Robison ([[@grayeul|https://github.com/grayeul]])
+* [[@nameanyone|https://github.com/nameanyone]]
+* Maurizio Pollio ([[@mpollio|https://github.com/mpollio]])
+* Ogoshi Masayuki ([[@ogoshima|https://github.com/ogoshima]])
+* Chris Sugden ([[@csugden|https://github.com/csugden]])
+* [[@asampal|https://github.com/asampal]]
+* Bow Yi Jang ([[@Eucaly|https://github.com/Eucaly]])
+* Mal Gamble ([[@malgam|https://github.com/malgam]])
+* Michael Fogleman ([[@mwfogleman|https://github.com/mwfogleman]])
+* Daniel Barrett ([[@shendaras|https://github.com/shendaras]])
+* Simon Baird ([[@simonbaird|https://github.com/simonbaird]])
+* James Anderson ([[@welford|https://github.com/welford]])
+* Jon Lister ([[@jayfresh|https://github.com/jayfresh]])
+* [[@TheDiveO|https://github.com/TheDiveO]]
+* Danielo Rodríguez ([[@danielo515|https://github.com/danielo515]])
+* [[@willover|https://github.com/willover]]
+* [[@slotik|https://github.com/slotik]]
+* Irene Knapp ([[@IreneKnapp|https://github.com/IreneKnapp]])
+* Brian Shaver ([[@shakerlxxv|https://github.com/shakerlxxv]])
+* Tobi Beer ([[@tobibeer|https://github.com/tobibeer]])
+* Craig Cook ([[@BoyCook|https://github.com/BoyCook]])
+* Pau ~DeLuca([[@PauDeLuca|https://github.com/PauDeLuca]])
diff --git a/editions/es-ES/tiddlers/Copying_tiddlers_between_TiddlyWiki_files.tid b/editions/es-ES/tiddlers/Copying_tiddlers_between_TiddlyWiki_files.tid
new file mode 100644
index 000000000..1024b0ebb
--- /dev/null
+++ b/editions/es-ES/tiddlers/Copying_tiddlers_between_TiddlyWiki_files.tid
@@ -0,0 +1,9 @@
+caption: Importar tiddlers
+created: 20140908131700000
+es-title: Copiar tiddlers de un TiddlyWiki a otro
+modified: 20160418041102221
+tags: Learning
+title: Copying tiddlers between TiddlyWiki files
+type: text/vnd.tiddlywiki
+
+Puedes copiar un tiddler individual de un TiddlyWiki a otro arrastrando su enlace de una ventana del navegador a otra.
diff --git a/editions/es-ES/tiddlers/CountWidget.tid b/editions/es-ES/tiddlers/CountWidget.tid
new file mode 100644
index 000000000..b40466e66
--- /dev/null
+++ b/editions/es-ES/tiddlers/CountWidget.tid
@@ -0,0 +1,18 @@
+caption: Widgets: Count
+created: 20131024141900000
+es-title: CountWidget
+modified: 20160420050708574
+tags: Widgets
+title: CountWidget
+type: text/vnd.tiddlywiki
+
+!! Introducción
+
+~CountWidget muestra el número de tiddlers que coinciden con determinada [[expresión de filtro|Filters]].
+
+!! Contenido y atributos
+
+El contenido del widget `<$count>` se ignora.
+
+|!Atributo |!Descripción |
+|filter |Expresión de filtro para contar |
diff --git a/editions/es-ES/tiddlers/Creating_SubStories.tid b/editions/es-ES/tiddlers/Creating_SubStories.tid
new file mode 100644
index 000000000..266ffdf80
--- /dev/null
+++ b/editions/es-ES/tiddlers/Creating_SubStories.tid
@@ -0,0 +1,46 @@
+caption: Subhistorias
+created: 20140214215718317
+es-title: Crear subhistorias en TiddlyWiki
+modified: 20160418043031981
+tags: Learning
+title: Creating SubStories
+type: text/vnd.tiddlywiki
+
+Este ejemplo muestra cómo, dentro de un un tiddler, se pueden mostrar subhistorias independientes de la historia principal.
+
+Este es el código:
+
+```
+<$navigator story="MiSubHistoria" history="MiSubHistoria">
+
+Haz clic en este enlace para empezar:[[¡Hola! ¿Qué tal?|HelloThere]]
+
+<$list filter="[list[MiSubHistoria]]" history="MiSubHistoria">
+<div>
+
+! <$button message="tm-close-tiddler" class="tc-btn-invisible">{{$:/core/images/close-button}}</$button> <$view field="es-title"/>
+
+<$transclude/>
+</div>
+</$list>
+
+</$navigator>
+```
+
+Ahora puedes abrir el tiddler [[¡Hola! ¿Qué tal?|HelloThere]] como subhistoria haciendo clic en el siguiente enlace. Los enlaces de la subhistoria se abren en la subhistoria y no en la principal.
+
+<$navigator story="MiSubHistoria" history="MiSubHistoria">
+
+Haz clic en este enlace para empezar:[[¡Hola! ¿Qué tal?|HelloThere]]
+
+<$list filter="[list[MiSubHistoria]]" history="MiSubHistoria">
+<div>
+
+! <$button message="tm-close-tiddler" class="tc-btn-invisible">{{$:/core/images/close-button}}</$button> <$view field="es-title"/>
+
+<$transclude/>
+
+</div>
+</$list>
+
+</$navigator>
diff --git a/editions/es-ES/tiddlers/Creating_a_custom_export_format.tid b/editions/es-ES/tiddlers/Creating_a_custom_export_format.tid
new file mode 100644
index 000000000..9fc231efb
--- /dev/null
+++ b/editions/es-ES/tiddlers/Creating_a_custom_export_format.tid
@@ -0,0 +1,25 @@
+caption: Formatos personalizados de exportación
+created: 20141124173526227
+es-title: Crear formato personalizado de exportación
+modified: 20160426140251183
+tags: [[Customise TiddlyWiki]]
+title: Creating a custom export format
+type: text/vnd.tiddlywiki
+
+Para crear un formato personalizado de exportación de tiddlers en texto plano, sigue los siguientes pasos:
+
+# Crea un tiddler con los siguientes campos y valores:
+
+#* <<.field Tags>>: <<.tag ~$:/tags/Exporter>>
+#* <<.field description>>: descripción del formato
+#* <<.field extension>>: extensión de archivo por defecto, incluyendo el punto; por ejemplo, `.tmx`
+# Escribe el siguiente contenido:
+
+```
+\define renderContent()
+{{{ $(exportFilter)$ ||$:/core/templates/plain-text-tiddler}}}
+\end
+<<renderContent>>
+```
+
+La variable `exportFilter` contiene un filtro que define qué tiddlers se exportarán. 
diff --git a/editions/es-ES/tiddlers/Creating_and_editing_tiddlers.tid b/editions/es-ES/tiddlers/Creating_and_editing_tiddlers.tid
new file mode 100644
index 000000000..850b9b2c5
--- /dev/null
+++ b/editions/es-ES/tiddlers/Creating_and_editing_tiddlers.tid
@@ -0,0 +1,48 @@
+caption: Edición de tiddlers
+created: 20140904140300000
+es-title: Crear y editar tiddlers
+modified: 20160422153052849
+tags: [[Working with TiddlyWiki]]
+title: Creating and editing tiddlers
+type: text/vnd.tiddlywiki
+
+! Crear un tiddler
+
+Un tiddler se crea con un simple clic, bien en el botón <<.button new-tiddler>> de la  barra lateral, o en el enlace a un tiddler vacío, que se distinguen por estar en [[cursiva azul]]
+
+Mira también:
+
+* [[Creación de entradas de diario|Creating journal tiddlers]]
+
+! Editar un tiddler
+
+Haz clic en el botón <<.button edit>>, situado arriba a la derecha del tiddler que quieres editar. 
+
+!! Borrador
+
+Cuando creas un tiddler nuevo o editas uno ya existente, el tiddler se muestra en modo borrador o de edición y muestra un panel de control que permite modificarlo de varias formas, compuesto de las siguientes partes (de arriba hacia abajo):
+
+''Campo de título'' - SIrve para cambiar el título de un tiddler (por defecto "Nuevo Tiddler")
+
+*''Selector de etiquetas'' - SIrve para añadir o quitar etiquetas. A medida que escribas en el cuadro, una lista desplegable te mostrará cualquier etiqueta ya existente que coincida con lo escrito. Puedes seleccionar una etiqueta de la lista o escribir una completamente nueva y pulsar el botón ''añadir'' para incorporarla al tiddler. Cada etiqueta se muestra como una //píldora// coloreada. Si haces clic en la ''x'' de una píldora, quitarás la etiqueta del tiddler y si no hay más tiddlers con esa etiqueta, la borrarás también de la lista.
+
+*''Área de texto'' - Escribe aquí el contenido del texto. Pulsando el botón ''mostrar vista previa'' verás qué aspecto tendrán tus cambios cuando guardes el tiddler y salgas del modo de edición. Si te molesta, puedes ocultarla pulsando el botón ''ocultar vista previa''.
+
+*''Selector de tipo'' - Se usa cuando hay que indicar a TIddlywiki que interprete ese tiddler de forma especial, de acuerdo con el tipo seleccionado. Por ejemplo, una imagen en jpg: si seleccionamos el tipo como "imagen .JPEG", Tiddlywiki sabrá cómo interpretar el tiddler y nos mostrará la imagen que queremos ver. Si no seleccionamos nada, nos mostrará un montón de código incomprensible, ya que el tipo por defecto es `text/vnd.tiddlywiki`, lo que significa que el tiddler contiene WikiText... y como tal lo interpreta.
+
+*''Selector de campos'' - Se usa para añadir o quitar campos del tiddler. Estos campos sirven tanto para complementar la información del tiddler como para establecer la relación que mantiene con otros. Por ejemplo: si estás editando un tiddler que servirá para etiquetar a otros tiddlers, puedes añadir un [[campo ''list''|ListField]] para establecer el orden que esos otros tiddlers tendrán en la lista.
+
+
+! Guardar, cancelar o borrar
+
+Cuando termines con la edición, pulsa uno de los botones que tienes arriba a la derecha del tiddler:
+
+*El botón <<.button save>> guarda los cambios realizados en el tiddler y sale del editor. 
+
+**Si tienes el wiki configurado para que [[guarde automáticamente|AutoSave]] los cambios, no necesitas hacer nada más: tus cambios quedan guardados de forma permanente al salir del editor. Si no tienes el Autosave configurado, los cambios se guardan sólo temporalmente en el navegador y se perderán en cuanto cierres la página. ~TiddlyWIki te avisa en tal caso de que tienes cambios pendientes de guardar mostrándote un botón rojo a la derecha, en la barra lateral. 
+
+**Ese es el botón  <<.button save-wiki>> . Para conservar tus cambios permanentemente, haz clic en él. ~TiddlyWiki guardará los cambios y el botón cambiará su color, indicando que ya no hay peligro.
+
+*El botón <<.button cancel>>  interrumpe la edición, descarta todos los cambios (previa confirmación) y sale del editor.
+
+*El botón <<.button delete>> elimina por completo el tiddler. Para hacerlo pide confirmación, pero ten en cuenta que una vez confirmado, el borrado de un tiddler es irrecuperable.
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Creating_journal_tiddlers.tid b/editions/es-ES/tiddlers/Creating_journal_tiddlers.tid
new file mode 100644
index 000000000..5ca707566
--- /dev/null
+++ b/editions/es-ES/tiddlers/Creating_journal_tiddlers.tid
@@ -0,0 +1,47 @@
+caption: Entradas de diario
+created: 20141010093214683
+es-title: Creación de entradas de diario
+modified: 20160422153138748
+tags: [[Working with TiddlyWiki]]
+title: Creating journal tiddlers
+type: text/vnd.tiddlywiki
+
+!! Introducción
+
+Las <<.def "entradas de diario">> son tiddlers que usan fechas u horas como título. Son una forma rápida de registrar información que precisa de algún tipo de marca de tiempo.
+
+En ellos puedes, como en cualquier otro tiddler, usar etiquetas para enlazar con otros y así establecer diferentes relaciones entre fragmentos de información que de otro modo estarían inconexos. 
+
+Por ejemplo: podemos usar una entrada de diario titulada <<.tid "10 de octubre">> para registrar pensamientos e información diversa de aquel día. Las etiquetas <<.tag shopping>> y <<.tag Londres>> podrían servirnos, además de para indicarnos que esa fecha tiene que ver con estar de shopping en Londres, para etiquetar con ellas cualquier otra información relativa a ambos temas.
+
+!! Creación de una entrada de diario
+
+La manera más sencilla es mediante el botón <<.button new-journal>> de la pestaña <<.sidebar-tab Tools>> de la barra lateral.  Si lo usas con frecuencia, pincha en la casilla para que aparezca entre los iconos que se muestran sobre el cuadro de búsqueda.
+
+El botón <<.button new-journal>> crea un tiddler en blanco con etiqueta <<.tag Diario>> y título derivado de la fecha de hoy. Si ya existe una entrada con esa misma fecha, entonces lo abre para su edición.
+
+!! Creación de una entrada con etiquetas
+
+Es habitual, revisando u organizando notas o trabajando en grupo, crear una entrada con la fecha del día y etiquetarla con el título de los tiddlers que revisamos. Además de creando una entrada y escribiendo etiquetas manualmente, tenemos otra forma de hacerlo, que añade automáticamente las etiquetas:
+
+* En el tiddler que estamos revisando, pinchamos en el botón <<.button more-tiddler-actions>> y hacemos clic en <<.button new-journal-here>>. 
+**Algo menos a mano, peo igualmente útil, este botón está también está en la pestaña <<.info-tab Tools>> del panel de <<.button info>> del tiddler.
+
+*En el siguiente tiddler que revisemos, repetimos la operación anterior y se nos volverá a abrir la entrada, que además de la etiqueta <<.tag Diario>> y la del título anterior, llevará ya la del nuevo.
+
+Pongamos por caso que estamos revisando un tiddler llamado <<.tid "Quijote">>. Del modo antes descrito, tendremos una entrada con la fecha del día y la etiqueta <<.tag Quijote>> en la que hacer nuestras anotaciones, que guardamos y cerramos para seguir revisando notas.
+
+Al rato, mientras revisamos otro tiddler llamado <<.tid Hamlet>>, repetimos la operación y el resultado será la entrada del día abierta y lista para escribir en ella nuestra anotación, con las etiquetas <<.tag Diario>>, <<.tag Quijote>> y <<.tag Hamlet>> añadidas automáticamente, sin riesgo de equivocarnos y sin tener que perder concentración rebuscando entre otras entradas.
+
+!! Customización de entradas
+
+Podemos configurar mínimamente cómo se crean las nuevas entradas de diario en la pestaña <<.controlpanel-tab Basics>>, de la sección <<.controlpanel-tab Info>> del [[panel de control|$:/ControlPanel]]
+
+* <<.em "Formato de título para las nuevas entradas de diario">> permite especificar el título de las entradas como una cadena con [[formato de fecha|DateFormat]]. El valor por defecto `DD de MMM de YYYY` da como resultado fechas del estilo <<.word "10 de octubre de 2014">>
+
+* <<.em "Etiqueta para las nuevas entradas de diario">> permite [[especificar|Title List]] qué etiquetas aparecerán por defecto al crear nuevas entradas. Por ejemplo: `DIario [[Vacaciones de verano]]`...etc
+
+<<.def Nota:>> Si quieres crear entradas separadas cada vez que pulses <<.button new-journal>>, aunque lo hagas varias veces el mismo día, puedes incluir la hora en el formato del título. Algo como `YYYY-0MM-0DD a las 0hh0mm'0ss''` dará como resultado títulos del estilo <<.em "2016-06-08 a las 07:09:05">>
+
+<<.def Nota2:>> Otro truco muy útil es incluir `$(currentTiddler)$` en el título. Esto significa que si pulsas <<.button new-journal-here>> en un tiddler, su título, además de etiquetar la entrada, forma parte del título. 
+
diff --git a/editions/es-ES/tiddlers/Current_Tiddler.tid b/editions/es-ES/tiddlers/Current_Tiddler.tid
new file mode 100644
index 000000000..f1f60f5d1
--- /dev/null
+++ b/editions/es-ES/tiddlers/Current_Tiddler.tid
@@ -0,0 +1,20 @@
+caption: Current Tiddler
+created: 20130825144900000
+es-title: Current Tiddler
+modified: 20160507044348759
+tags: Concepts
+title: Current Tiddler
+type: text/vnd.tiddlywiki
+
+La variable <<.def "current tiddler">> proporciona el contexto en el que se interpretan diversos aspectos de WikiText.
+
+Por ejemplo, `{{!!title}}` indica el valor del campo <<.field title>> de cualquier tiddler actual, sea este cual sea. Esta técnica puede usarse para crear [[plantillas|TemplateTiddlers]] de uso general.
+
+El título del tiddler actual siempre se puede invocar con la variable <<.vlink currentTiddler>>.
+
+Las dos formas principales en que se puede cambiar el tiddler actual son:
+
+* El widget <<.wlink TiddlerWidget>>
+* El widget <<.wlink ListWidget>> (cuando su atributo <<.attr variable>> no ha sido puenteado)
+
+Por lo tanto, decir <<.word "el tiddler actual">> <<.em "no siempre">> equivale a decir [[tiddler que se está viendo o editando|storyTiddler Variable]].
diff --git a/editions/es-ES/tiddlers/Customise_TiddlyWiki.tid b/editions/es-ES/tiddlers/Customise_TiddlyWiki.tid
new file mode 100644
index 000000000..d86f1ecae
--- /dev/null
+++ b/editions/es-ES/tiddlers/Customise_TiddlyWiki.tid
@@ -0,0 +1,12 @@
+caption: Modificar ~TiddlyWiki
+created: 20140904101600000
+es-title: Cómo modificar TiddlyWiki
+list: [[Initial customisation]]
+modified: 20160428141103062
+tags: TableOfContents
+title: Customise TiddlyWiki
+type: text/vnd.tiddlywiki
+
+Información para customizar ~TiddlyWiki
+
+<<list-links "[tag[Customise TiddlyWiki]]">>
diff --git a/editions/es-ES/tiddlers/Customising_search_results.tid b/editions/es-ES/tiddlers/Customising_search_results.tid
new file mode 100644
index 000000000..d6f66b36f
--- /dev/null
+++ b/editions/es-ES/tiddlers/Customising_search_results.tid
@@ -0,0 +1,33 @@
+caption: Personalizar resultados de búsqueda
+created: 20141027151552783
+es-title: Visualización personalizada de resultados de búsqueda
+modified: 20160426145023142
+tags: [[Customise TiddlyWiki]]
+title: Customising search results
+type: text/vnd.tiddlywiki
+
+Por defecto, los resultados de búsquedas en la barra lateral se muestran como una simple lista de títulos de tiddler. La forma de mostrar los resultados puede modificarse a gusto mediante plugins de visualización. Si el sistema detecta visualizaciones adicionales, las mostrará en pestañas. 
+
+Las distintas visualizaciones de resultados se guardan en tiddlers con la etiqueta <<.tag ~$:/tags/SearchResults>>. La lista por defecto de resultados de búsqueda está implementada en el sistema y reside en el tiddler <<.tid ~$:/core/ui/DefaultSearchResultList>>.
+
+Para crear una nueva visualización de resultados:
+
+# Crea un nuevo tiddler con la etiqueta <<.tag ~$:/tags/SearchResults>>
+# Usa la variable <<.var searchTiddler>> para acceder al título del tiddler que contiene el término de búsqueda actual
+
+Si quieres que sea la nueva visualización la que se muestre por defecto, crea un tiddler llamado <<.tid ~$:/config/SearchResults/Default>> que contenga en el texto el título de la nueva visualización. 
+
+Este es un ejemplo de visualización alternativa que muestra los resultados en orden cronológicamente inverso:
+
+```
+\define searchResults()
+<$set name="resultCount" value="""<$count filter="[!is[system]search{$(searchTiddler)$}]"/>""">
+
+{{$:/language/Search/Matches}}
+
+</$set>
+<<timeline subfilter:"!is[system]search{$(searchTiddler)$}">>
+\end
+<<searchResults>>
+```
+
diff --git a/editions/es-ES/tiddlers/D3_Plugin.tid b/editions/es-ES/tiddlers/D3_Plugin.tid
new file mode 100644
index 000000000..6b5bc0008
--- /dev/null
+++ b/editions/es-ES/tiddlers/D3_Plugin.tid
@@ -0,0 +1,12 @@
+caption: D3
+created: 20160107223425581
+es-title: D3
+list: 
+modified: 20160504052212184
+tags: [[Plugin Editions]]
+title: D3 Plugin
+type: text/vnd.tiddlywiki
+
+El plugin D3 integra en ~TiddlyWiki la librería de visualización D3.
+
+Disponible en: http://tiddlywiki.com/plugins/tiddlywiki/d3/
diff --git a/editions/es-ES/tiddlers/DataTiddlers.tid b/editions/es-ES/tiddlers/DataTiddlers.tid
new file mode 100644
index 000000000..91c87e754
--- /dev/null
+++ b/editions/es-ES/tiddlers/DataTiddlers.tid
@@ -0,0 +1,34 @@
+caption: Tiddlers de datos
+created: 20130829164700000
+es-title: Tiddlers de datos
+modified: 20160511055335042
+tags: Concepts
+title: DataTiddlers
+type: text/vnd.tiddlywiki
+
+Un <<.def "tiddler de datos">> o <<.def DataTiddler>> es una base de datos en miniatura, contenida en un tiddler.
+
+Existen dos formatos estándar:
+
+* [[Diccionarios|DictionaryTiddlers]]
+* [[Tiddlers JSON|JSONTiddlers]]
+
+Se pueden definir otros formatos para obtener bloques de datos que se comporten como tiddlers de datos. 
+
+Para buscar un valor por su nombre, usa una [[Referencia textual|TextReference]]. Por ejemplo, si un [[diccionario|DictionaryTiddlers]] llamado `DiasdelMes` contiene:
+
+```
+oct:31
+nov:30
+dec:31
+```
+
+... entonces, `{{MonthDays##nov}}` devolverá el valor `30`.
+
+Lo mismo sucede si `DiasdelMes` es un [[tiddler JSON|JSONTiddlers]] con el siguiente contenido:
+
+```
+{"oct":31,"nov":30,"dec":31}
+```
+
+<<.tip "Nota: Sólo es posible recuperar datos por este medio de las propiedades inmediatas del objeto raíz de un tiddler JSON">>
diff --git a/editions/es-ES/tiddlers/DateFormat.tid b/editions/es-ES/tiddlers/DateFormat.tid
new file mode 100644
index 000000000..71b91e802
--- /dev/null
+++ b/editions/es-ES/tiddlers/DateFormat.tid
@@ -0,0 +1,47 @@
+caption: Formatos de fecha
+created: 20140418142957325
+es-title: Formatos de fecha
+modified: 20160422160649482
+tags: Features
+title: DateFormat
+type: text/vnd.tiddlywiki
+
+ViewWidget acepta un atributo <<.em "de plantilla">> que permite dar formato a los valores de fecha que se especifiquen. La cadena que da formato a la fecha se procesa con arreglo a las siguientes sustituciones:
+
+|!Símbolo |!Valor sustitutivo |
+|`DDD` |Día completo de la semana|
+|`ddd` |Día de la semana, abreviado |
+|`DD` |Día del mes |
+|`0DD` |Día del mes, con cero delante |
+|`DDth` |Añade sufijo al día |
+|`WW` |Número de semana ISO-8601 |
+|`0WW` |Número de semana, con cero delante|
+|`MMM` |Mes completo |
+|`mmm` |Mes, abreviado |
+|`MM` |Mes, en cifras |
+|`0MM` |Mes, en cifras, con cero delante|
+|`YYYY` |Año completo |
+|`YY` |Año, en dos cifras |
+|`wYYYY` |Año completo con respecto al número de semana |
+|`wYY` |Año en dos cifras con respecto al número de semana |
+|`hh` |Hora |
+|`0hh` |Hora, con cero delante |
+|`hh12` |Hora, en ciclos de 12 horas |
+|`0hh12` |Hora en ciclos de 12 horas, con cero delante |
+|`mm` |Minutos |
+|`0mm` |Minutos, con cero delante |
+|`ss` |Segundos |
+|`0ss` |Segundos, con cero delante |
+|`am` o `pm` |Indicador am/pm en minúsculas|
+|`AM` o `PM` |Indicador AM/PM en mayúsculas |
+|`TZD` |Huso horario |
+|`\` |Escape de caracteres. Los caracteres así marcados no se interpretan   |
+
+Otro texto añadido al formato pasa sin cambios, de modo que se admiten comas, guiones, barras, dos puntos y otros separadores.
+
+!! Ejemplos
+
+|!Plantilla |!Resultadao |
+|`DDth de MMM de YYYY` |1º de mayo de 2011 |
+|`DD MMM \M\M\M YYYY` |1 mayo MMM 2011 |
+|`DD mmm hh:mm:ss` |1 may 2011 11:38:42 |
diff --git a/editions/es-ES/tiddlers/Date_Fields.tid b/editions/es-ES/tiddlers/Date_Fields.tid
new file mode 100644
index 000000000..d6622ecd8
--- /dev/null
+++ b/editions/es-ES/tiddlers/Date_Fields.tid
@@ -0,0 +1,30 @@
+caption: Campos de fecha
+created: 20150117190213631
+es-title: Campos de fecha
+modified: 20160511055256823
+tags: Concepts
+title: Date Fields
+type: text/vnd.tiddlywiki
+
+Algunos [[campos|TiddlerFields]] de tiddler se usan para guardar fechas y horas.
+
+Los dos campos estándar son <<.field created>> y <<.field modified>>.
+
+El valor de estos campos es una cadena de 17 caracteres:
+
+* 4 dígitos para el año
+* 2 dígitos para el mes
+* 2 dígitos para el día
+* 2 dígitos para la hora
+* 2 dígitos para el minuto
+* 2 dígitos para el segundo
+* 3 dígitos para el milisegundo
+
+Para evitar cualquier problema derivado de posibles diferencias horarias, ~TiddlyWiki siempre usa horas [[UTC|https://es.wikipedia.org/wiki/Tiempo_universal_coordinado]].
+
+Como ejemplo, el campo <<.field created>> de este tiddler tiene el valor <<.value """<$view field="created"/>""">>.
+
+Las fechas pueden [[formatearse|DateFormat]] convenientemente para mostrarlas en pantalla:
+
+<$macrocall $name="wikitext-example-without-html"
+src="""<$view field="created" format="date" template="DDD DD de MMM de YYYY"/>""">
diff --git a/editions/es-ES/tiddlers/DictionaryTiddlers.tid b/editions/es-ES/tiddlers/DictionaryTiddlers.tid
new file mode 100644
index 000000000..baf761b1d
--- /dev/null
+++ b/editions/es-ES/tiddlers/DictionaryTiddlers.tid
@@ -0,0 +1,15 @@
+caption: Tiddlers diccionario
+created: 20141228094500000
+es-title: Tiddlers diccionario
+modified: 20160511055855885
+tags: Concepts
+title: DictionaryTiddlers
+type: text/vnd.tiddlywiki
+
+Un <<.def "tiddler diccionario">> es un [[tiddler de datos|DataTiddlers]] que contiene una simple lista de pares de nombre-valor.
+
+Su [[tipo|ContentType]] es <code>application/x-tiddler-dictionary</code>.
+
+El campo <<.field text>> consta de una o más líneas con el formato <code>//name//: //value//</code>.
+
+Una [[paleta de colores|ColourPalettes]], es un ejemplo de diccionario. 
diff --git a/editions/es-ES/tiddlers/Discover_TiddlyWiki.tid b/editions/es-ES/tiddlers/Discover_TiddlyWiki.tid
new file mode 100644
index 000000000..7c28ca0c5
--- /dev/null
+++ b/editions/es-ES/tiddlers/Discover_TiddlyWiki.tid
@@ -0,0 +1,38 @@
+caption: Descubre TiddlyWiki
+created: 20140904121000000
+es-title: Descubre TiddlyWiki
+modified: 20160416112247974
+tags: HelloThere
+title: Discover TiddlyWiki
+type: text/vnd.tiddlywiki
+
+Nunca has visto //nada// parecido a esto. ~TiddlyWiki es:
+
+:: una herramienta,
+:: una caja de herramientas,
+:: una comunidad
+:: y toda una filosofía
+
+!! ~TiddlyWiki es una herramienta
+
+''~TiddlyWiki es, antes que nada, una herramienta'' libre y gratuita que se puede descargar para capturar y organizar contenidos: de la web, de tus documentos o directamente de tu cerebro. Es una herramienta para tomar notas, marcar y fijar referencias, escribir, administrar proyectos y tareas, colaborar en equipo, escribir un blog o publicar. 
+
+En ~TiddlyWiki creas o pegas contenidos en notas que llamamos //tiddlers// y las conectas entre sí con enlaces y etiquetas, de modo que puedas recuperarlas rápidamente mediante TagPills, pestañas y la ventana ultrarrápida de búsqueda de ~TIddlyWiki. También puedes incluir dinámicamente el contenido de un tiddler dentro de otro --como si jugaras con bloques de construcción-- para crear artículos, listas, presentaciones y más. 
+
+!! ~TiddlyWiki es una caja de herramientas
+
+Además de una herramienta versátil, ''~TiddlyWiki es también una caja de herramientas''
+
+Donde otros productos para tomar notas te enganchan con un programa muy básico y luego te cobran por las características realmente útiles, ~TiddlyWiki cuenta con una creciente colección totalmente gratuita de temas visuales, paletas de color, plugins, widgets y macros que puedes combinar como prefieras para obtener un ~TiddlyWiki a medida y de la forma que tú y sólo tú quieres. 
+
+!! ~TiddlyWiki es también una comunidad online
+
+Somos una [[comunidad|Community]] de usuarios y desarrolladores que se ayuda mutuamente a imaginar nuevas formas de pensar, organizar y crear nuevas soluciones, de modo que ~TiddlyWiki evoluciona y se adapta contínuamente a tus necesidades. Los usuarios y desarrolladores de ~TiddlyWiki compartimos preguntas y consejos en el Grupo de Google de ~TiddlyWiki. También creamos tutoriales, adaptaciones y plugins para mejorar la experiencia de uso de ~TiddlyWiki. En la sección ''Comunidad'' del índice encontrarás más información al respecto.
+
+!! Finalmente ~TiddlyWiki es una filosofía
+
+El propósito de tomar notas y organizarlas es el poder recuperarlas más tarde para su uso. Si no hay forma de encontrar lo que buscas en el momento en que lo necesitas, tu programa de notas es, sencillamente, una monumental pérdida de tiempo. 
+
+Para la [[filosofía|Philosophy of Tiddlers]] de ~TiddlyWiki, la mejor forma de tomar notas es fragmentando la información en sus unidades semánticas significativas más pequeñas. A estas unidades las llamamos //tiddlers//. Un tiddler puede ser una imagen, la dirección de una página, un concepto, la definición de un término o una adaptación especial, como, por ejemplo, una macro.
+
+Estos tiddlers pueden luego entretejerse para crear con ellos unidades mayores de información: historias, artículos, listas, galerías de imágenes y mucho más. Las herramientas de ~TiddlyWiki como etiquetas, enlaces y filtros están especialmente diseñadas para relacionar y conectar tiddlers entre sí de múltiples maneras, facilitando así la futura recuperación de notas y permitiendo incluso descubrir relaciones inesperadas entre tiddlers y la información que contienen. 
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Documentation_Macros.tid b/editions/es-ES/tiddlers/Documentation_Macros.tid
new file mode 100644
index 000000000..f4cc1044d
--- /dev/null
+++ b/editions/es-ES/tiddlers/Documentation_Macros.tid
@@ -0,0 +1,170 @@
+caption: Macros para documentación
+created: 20150110182600000
+es-title: Macros para documentación
+modified: 20160511154246355
+tags: [[Improving TiddlyWiki Documentation]]
+title: Documentation Macros
+type: text/vnd.tiddlywiki
+
+Las siguientes son macros utilizadas en la documentación de ~TiddlyWiki. Sus nombres comienzan con un punto para mantenerlas fuera del alcance accidental de nombres con los que el usuario pueda intentar experimentar.
+
+
+!!Generales
+
+|!Macro |!Se usa para |!Ejemplo |
+|.def |definición de un término |<<.def widget>> |
+|.em |énfasis menor en una frase |<<.em cualquiera>> |
+|.strong |énfasis mayor en un tiddler |<<.strong ¡Importante!>> |
+|.place |texto comodín |<<.place tagname>> |
+|.word |mencionar una palabra o frase |<<.word "hello world">> |
+
+!!Advertencias
+
+|!Macro |!Se usa para |!Ejemplo |
+|.tip |señalar consejos y recomendaciones |<<.tip "Enciende la pantalla o no verás nada">> |
+|.warning |señalar advertencias |<<.warning "Haz copia de seguridad antes de actualizar">> |
+
+!!Bloques
+|!Macro |!Se usa para |
+|.preamble |enfatizar un preámbulo o un párrafo que sobresale del resto del texto |
+
+!!!Ejemplo: 
+
+<<.preamble "Esto es un ejemplo de bloque de preámbulo. Para que su visualización sea la correcta, debe constar de un único párrafo, separado del resto del texto por //enters//. No admite su inclusión en tablas ni la inclusión de macros, pero sí [[enlaces|TiddlerLinks]] y formato en ''~WikiText'' ">>
+
+!!Tiddlers y campos
+
+|!Macro |!Se usa para |!Ejemplo |
+|.tid |referirse al título de un tiddler |<<.tid "Título de ejemplo">> |
+|.tag |referirse a una etiqueta  |<<.tag "Etiqueta de ejemplo">> |
+|.field |referirse al campo de un tiddler |<<.field "campo de ejemplo">> |
+|.value |referirse al valor de un campo |<<.value "valor de ejemplo">> |
+|.op |referirse a un operador de filtro |<<.op backlinks>> |
+|.var |referirse a una variable o nombre de macro |<<.var currentTiddler>> |
+|.wid |referirse al nombre de un widget |<<.wid list>> |
+|.attr |referirse al nombre de un atributo |<<.attr filter>> |
+|.param |referirse al nombre de un parámetro de macro |<<.param text>> |
+
+!!Enlaces
+
+|!Macro |!Se usa para |!Ejemplo |
+|.link |señalar enlaces con ~WikiText |<<.link "^^esto es^^ ~~wikitext~~" WikiText>> |
+|.clink |señalar links con formato de código |<<.clink `<$list>` ListWidget>> |
+|.dlink |señalar links internos con formato de definición |<<.dlink widget Widgets>> |
+|.dlink-ex |señalar links externos con formato de definición |<<.dlink-ex Ejemplo "http://ejemplo.com/">> |
+|.flink |señalar enlaces a campos |<<.flink ListField>> |
+|.mlink |señalar enlaces a macros |<<.mlink qualify>> |
+|.mlink2 |señalar enlaces a macros, con //targets// específicos |<<.mlink2 foo "Macro de ejemplo">> |
+|.olink |señalar enlaces a operadores de filtro |<<.olink prefix>> |
+|.olink2 |señalar enlaces a operadores de filtro con //targets// específicos |<<.olink2 foo prefix>> |
+|.vlink |señalar enlaces a variables |<<.vlink currentTiddler>> |
+|.vlink2 |señalar enlaces a variables, con //targets// específicos |<<.vlink2 foo "Examples of Variables">> |
+|.wlink |señalar enlaces a widgets |<<.wlink ButtonWidget>> |
+|.wlink2 |señalar enlaces a widgets con texto específico |<<.wlink2 foo ButtonWidget>> |
+
+!!Interfaz de usuario
+
+|!Macro |!Se usa para |!Ejemplo |
+|.key |indicar una tecla del teclado |<<.key Escape>> |
+|.keycombo |indicar combinaciones de teclas |<<.keycombo Ctrl Enter>> |
+
+!!Pestañas
+
+|!Macro |!Se usa para |!Ejemplo |
+|.sidebar-tab |invocar el nombre de una pestaña de la barra lateral |<<.sidebar-tab More>> |
+|.more-tab |invocar el nombre de una subpestaña de la pestaña Más |<<.more-tab Shadows>> |
+|.info-tab |invocar el nombre de una pestaña del InfoPanel |<<.info-tab Fields>> |
+|.controlpanel-tab |invocar el nombre de una pestaña del [[Panel de Control|$:/ControlPanel]] |<<.controlpanel-tab Settings>> |
+|.advancedsearch-tab |invocar el nombre de una pestaña del cuadro de búsqueda avanzada |<<.advancedsearch-tab Filter>> |
+|.toc-tab |invocar el nombre del índice de tw5.com |<<.toc-tab>> |
+|.example-tab |indicar un ejemplo de nombre de pestaña |<<.example-tab "Ejemplo">> |
+
+!!!Parámetros de .sidebar-tab
+
+|Open |<<.sidebar-tab Open>> |
+|Recent |<<.sidebar-tab Recent>> |
+|Tools |<<.sidebar-tab Tools>> |
+|More |<<.sidebar-tab More>> |
+
+!!!Parámetros de .more-tab
+
+|All |<<.more-tab All>> |
+|Recent |<<.more-tab Recent>> |
+|Tags |<<.more-tab Tags>> |
+|Missing |<<.more-tab Missing>> |
+|Drafts |<<.more-tab Drafts>> |
+|Orphans |<<.more-tab Orphans>> |
+|Types |<<.more-tab Types>> |
+|System |<<.more-tab System>> |
+|Shadows |<<.more-tab Shadows>> |
+
+!!!Parámetros de .info-tab
+
+|Tools |<<.info-tab Tools>> |
+|References |<<.info-tab References>> |
+|Tagging |<<.info-tab Tagging>> |
+|List |<<.info-tab List>> |
+|Listed |<<.info-tab Listed>> |
+|Fields |<<.info-tab Fields>> |
+|Advanced |<<.info-tab Advanced>> |
+
+!!!Parámetros de .controlpanel-tab
+
+|Info |<<.controlpanel-tab Info>> |
+|Appearance |<<.controlpanel-tab Appearance>> |
+|Settings |<<.controlpanel-tab Settings>> |
+|Saving |<<.controlpanel-tab Saving>> |
+|Plugins |<<.controlpanel-tab Plugins>> |
+
+!!!Parámetros de .advancedsearch-tab
+
+|Standard |<<.advancedsearch-tab Standard>> |
+|System |<<.advancedsearch-tab System>> |
+|Shadows |<<.advancedsearch-tab Shadows>> |
+|Filter |<<.advancedsearch-tab Filter>> |
+
+!!Botones
+
+|!Macro |!Se usa para |!Ejemplo |
+|.button |insertar el nombre y el icono de un botón estándar |<<.button "new-tiddler">> |
+
+!!!Parámetros de .button
+
+!!!!Barra de tiddler
+
+|clone |<<.button "clone">> |
+|close |<<.button "close">> |
+|close-others |<<.button "close-others">> |
+|edit |<<.button "edit">> |
+|export-tiddler |<<.button "export-tiddler">> |
+|info |<<.button "info">> |
+|more-tiddler-actions |<<.button "more-tiddler-actions">> |
+|new-here |<<.button "new-here">> |
+|new-journal-here |<<.button "new-journal-here">> |
+|permalink |<<.button "permalink">> |
+
+!!!!Barra de edición
+
+|cancel |<<.button "cancel">> |
+|delete |<<.button "delete">> |
+|save |<<.button "save">> |
+
+!!!!Barra de página
+|advanced-search |<<.button "advanced-search">> |
+|close-all |<<.button "close-all">> |
+|control-panel |<<.button "control-panel">> |
+|encryption |<<.button "encryption">> |
+|export-page |<<.button "export-page">> |
+|full-screen |<<.button "full-screen">> |
+|home |<<.button "home">> |
+|import |<<.button "import">> |
+|language |<<.button "language">> |
+|more-page-actions |<<.button "more-page-actions">> |
+|new-journal |<<.button "new-journal">> |
+|new-tiddler |<<.button "new-tiddler">> |
+|permaview |<<.button "permaview">> |
+|refresh |<<.button "refresh">> |
+|save-wiki |<<.button "save-wiki">> |
+|storyview |<<.button "storyview">> |
+|tag-manager |<<.button "tag-manager">> |
+|theme |<<.button "theme">> |
diff --git a/editions/es-ES/tiddlers/Documentation_Style_Guide.tid b/editions/es-ES/tiddlers/Documentation_Style_Guide.tid
new file mode 100644
index 000000000..f391b2fce
--- /dev/null
+++ b/editions/es-ES/tiddlers/Documentation_Style_Guide.tid
@@ -0,0 +1,26 @@
+caption: Guía de estilo
+created: 20140904164608166
+es-title: Guía de estilo para documentación
+modified: 20160418141921258
+tags: [[Improving TiddlyWiki Documentation]]
+title: Documentation Style Guide
+type: text/vnd.tiddlywiki
+
+La documentación de ~TiddlyWiki intenta seguir un estilo editorial consistente. Consta de dos áreas, cada una de ellas con su propio tono y dirigida a un público específico, así evitamos saturar de información al lector principiante mientras aún podemos ofrecer acceso rápido a la información que el lector experto necesita.
+
+* [[Material didáctico |Instruction Tiddlers]]
+* [[Material de referencia|Reference Tiddlers]]
+
+Temas adicionales:
+
+* [[Estilo de los títulos|Tiddler Title Policy]]
+
+* [[Estructura de tiddlers|Tiddler Structure]]
+
+* [[Ortografía|Spelling]]
+
+* [[Tipografía|Typography]]
+
+* [[Macros para documentación|Documentation Macros]]
+
+* [[Estilo de redacción técnica|Technical Prose Style]]
diff --git a/editions/es-ES/tiddlers/Dominant_Append.tid b/editions/es-ES/tiddlers/Dominant_Append.tid
new file mode 100644
index 000000000..01436a062
--- /dev/null
+++ b/editions/es-ES/tiddlers/Dominant_Append.tid
@@ -0,0 +1,13 @@
+caption: Anexión dominante
+created: 20150123220223000
+es-title: Anexión dominante
+modified: 20160421062101543
+tags: Filters
+title: Dominant Append
+type: text/vnd.tiddlywiki
+
+Los [[filtros|Filters]] manipulan [[conjuntos de títulos|Title Selection]] en los que ningún título puede aparecer más de una vez. Muchas veces necesitan anexar unos conjuntos a otros. 
+
+En estos casos, la anexión se realiza de modo que si hubiera un título duplicado, se descarta el más antiguo y decimos que los títulos así anexados son dominantes.
+
+Por ejemplo: si una selección contiene los títulos `A, B, C, D` y se anexa la selección compuesta por `A, BB, C, DD`, el resultado es `B, D, A, C, BB, DD` (En primer lugar, los títulos no duplicados de la primera selección, en segundo, la versión más nueva de los duplicados y en último, los no duplicados de la segunda selección).
diff --git a/editions/es-ES/tiddlers/Draft_of_'Nuevo_Tiddler'.tid b/editions/es-ES/tiddlers/Draft_of_'Nuevo_Tiddler'.tid
new file mode 100644
index 000000000..e8310cb53
--- /dev/null
+++ b/editions/es-ES/tiddlers/Draft_of_'Nuevo_Tiddler'.tid
@@ -0,0 +1,11 @@
+created: 20160422103150655
+draft.of: Nuevo Tiddler
+draft.title: Nuevo Tiddler
+modified: 20160422103359572
+tags: 
+title: Draft of 'Nuevo Tiddler'
+type: text/vnd.tiddlywiki
+
+<<.flink PluginTypeField>>
+
+<<.toc-tab HelloThere>>
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Editing_Tiddlers_with_Emacs.tid b/editions/es-ES/tiddlers/Editing_Tiddlers_with_Emacs.tid
new file mode 100644
index 000000000..1107748f0
--- /dev/null
+++ b/editions/es-ES/tiddlers/Editing_Tiddlers_with_Emacs.tid
@@ -0,0 +1,40 @@
+caption: Edición con Emacs
+created: 20140406210404245
+es-title: Editar tiddlers con Emacs
+modified: 20160418044315545
+tags: Learning
+title: Editing Tiddlers with Emacs
+type: text/vnd.tiddlywiki
+
+Michael Fogleman ha escrito [[tid-mode|https://github.com/mwfogleman/tid-mode]], un modo de edición para [[Emacs|http://www.gnu.org/software/emacs/]] con el fin de editar los archivos .tid de TiddlyWiki. Deriva de text-mode, se vale de los útiles //minor modes// //org-struct// y //subword// y actualiza los tiempos de modificación al guardar un archivo .tid.
+
+Redactó también dos funiones de ayuda para editar TiddlyWiki con Emacs. El primero abre un directorio de tiddlers en Dired. El segundo abre TiddlyWiki en el navegador.
+
+```
+(defun open-wiki ()
+  "Abre un directorio de TiddlyWiki en Dired."
+  (interactive)
+  (dired "~/Dropbox/wiki/tiddlers/"))
+```
+  
+```
+(defun browse-wiki ()
+  "Abre TiddlyWiki en el navegador."
+  (interactive)
+  (browse-url "127.0.0.1:8080/"))
+```
+
+Esta última función puede requerir que se indique un navegador:
+
+```
+(setq browse-url-browser-function 'browse-url-generic
+      browse-url-generic-program "chromium")
+```
+
+Puedes vincular cualquiera de estas funciones con la función global-set-key:
+
+```
+(global-set-key (kbd "C-c w") 'open-wiki)
+```
+
+Por el momento, no están integradas en tid-mode.
diff --git a/editions/es-ES/tiddlers/Editing_Tiddlers_with_Vim.tid b/editions/es-ES/tiddlers/Editing_Tiddlers_with_Vim.tid
new file mode 100644
index 000000000..b81fc3b1e
--- /dev/null
+++ b/editions/es-ES/tiddlers/Editing_Tiddlers_with_Vim.tid
@@ -0,0 +1,11 @@
+caption: Edición con Vim
+created: 20140406210404245
+es-title: Editar tiddlers con Vim
+modified: 20160419091110916
+tags: Learning
+title: Editing Tiddlers with Vim
+type: text/vnd.tiddlywiki
+
+Devin Weaver ha escrito un  plugin para [[Vim|http://www.vim.org/]], publicado en https://github.com/sukima/vim-tiddlywiki
+
+Soporta la mayor parte de la sintaxis de TiddlyWiki e incluye un plugin que actualiza automáticamente el campo `modified`.
diff --git a/editions/es-ES/tiddlers/Editions.tid b/editions/es-ES/tiddlers/Editions.tid
new file mode 100644
index 000000000..3cafb716e
--- /dev/null
+++ b/editions/es-ES/tiddlers/Editions.tid
@@ -0,0 +1,18 @@
+caption: Ediciones
+created: 20140908125500000
+es-title: Ediciones de TiddlyWiki
+list: [[Empty Edition]]
+modified: 20160503165705134
+tags: TableOfContents
+title: Editions
+type: text/vnd.tiddlywiki
+
+TiddlyWiki se distribuye en distintas ediciones, especialmente concebidas para servir a un propósito determinado.
+
+Una edición consta de los componentes del núcleo de ~TiddlyWiki, así como plugins, documentación y ejemplos de contenido para que puedas ponerte en marcha lo antes posible.
+
+Los componentes de las diferentes ediciones pueden combinarse y modificarse de modo que construyas la mejor solución para tu aplicación particular.
+
+<<list-links "[tag[Editions]]">>
+
+<<.tip "Conviene no confundir las ediciones en que se presenta ~TiddlyWiki con las [[plataformas|Platforms]] en las que funciona, como [[HTML único|Saving]], o aplicación de [[Node.js|TiddlyWiki on Node.js]]">>
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Empty_Edition.tid b/editions/es-ES/tiddlers/Empty_Edition.tid
new file mode 100644
index 000000000..f2c5f894e
--- /dev/null
+++ b/editions/es-ES/tiddlers/Empty_Edition.tid
@@ -0,0 +1,17 @@
+caption: Edición básica
+created: 20140916213421041
+es-title: Edición básica
+modified: 20160603133503597
+tags: Editions
+title: Empty Edition
+type: text/vnd.tiddlywiki
+
+La edición básica de TiddlyWiki es una distribución sin modificar del núcleo de ~TiddlyWiki, sin otros plugins ni configuración adicional instalados. 
+
+Puede descargarse desde:
+
+> {{$:/editions/es-ES/snippets/download-empty-button}}
+
+>Si el botón no funciona, guarda este enlace: http://tiddlywiki.com/languages/es-ES/empty.html
+
+> Seguramente el navegador te pida que confirmes la descarga
diff --git a/editions/es-ES/tiddlers/Encryption.tid b/editions/es-ES/tiddlers/Encryption.tid
new file mode 100644
index 000000000..f5d6bc5a2
--- /dev/null
+++ b/editions/es-ES/tiddlers/Encryption.tid
@@ -0,0 +1,23 @@
+caption: Cifrado
+created: 20130825160900000
+es-title: Cifrado
+modified: 20160426063330696
+tags: Features [[Working with TiddlyWiki]]
+title: Encryption
+type: text/vnd.tiddlywiki
+
+Usado como archivo único de HTML, TiddlyWiki5 permite encriptar el contenido mediante la [[Stanford JavaScript Crypto Library]].
+
+#En la pestaña <<.sidebar-tab Tools>> de la barra lateral, localiza el botón <<.button encryption>>.
+
+# Si el botón muestra la leyenda <<.word "Asignar contraseña">>, significa que el wiki no está encriptado. Pinchando el botón se abrirá el cuadro de diálogo que permite asignar la contraseña de cifrado
+
+# Abre el archivo en un editor de texto para verificar que los datos están encriptados
+
+# Al abrir el archivo en el navegador, se te pedirá la contraseña antes de mostrarte su contenido.
+
+TiddlyWIki ofrece otras dos funciones de encriptación, sin relación con esta:
+
+* La de asignar una contraseña para guardar en TiddlySpot, en la pestaña <<.controlpanel-tab Saving>> del panel de control
+
+* La de utilizar autenticación básica estándar HTTP en [[Node.js|TiddlyWiki on Node.js]] mediante el comando [[server|ServerCommand]]. Combinada con SSL, esta función ofrece el mismo nivel de cifrado de tráfico que tienes en servicios del tipo de Google o Dropbox, aunque no cifra los datos guardados en el disco. 
diff --git a/editions/es-ES/tiddlers/Examples.tid b/editions/es-ES/tiddlers/Examples.tid
new file mode 100644
index 000000000..c64c8b462
--- /dev/null
+++ b/editions/es-ES/tiddlers/Examples.tid
@@ -0,0 +1,27 @@
+caption: Ejemplos
+created: 20140320230543190
+es-title: Ejemplos
+modified: 20160605052926372
+tags: HelloThere Community
+title: Examples
+type: text/vnd.tiddlywiki
+
+Esta es una muestra de algunos interesantes ejemplos  de uso de ~TiddlyWiki en la web.
+
+Envía más ejemplos que encuentres para ampliar esta lista via [[GitHub|https://github.com/Jermolene/TiddlyWiki5]] o [[Twitter|https://twitter.com/tiddlywiki]], o publícalas en el [[grupo|https://groups.google.com/forum/?hl=es#!forum/tiddlywiki]]
+
+<div class="tc-link-info">
+
+<$list filter="[tag[Examples]!sort[modified]]">
+
+<div class="tc-link-info-item">
+
+! <$link><$view field="title"/></$link>
+
+<div class="tc-subtitle">Posted <$view field="modified" format="relativedate"/></div>
+
+<$transclude/>
+
+</div>
+
+</$list>
diff --git a/editions/es-ES/tiddlers/ExternalImages.tid b/editions/es-ES/tiddlers/ExternalImages.tid
new file mode 100644
index 000000000..181528679
--- /dev/null
+++ b/editions/es-ES/tiddlers/ExternalImages.tid
@@ -0,0 +1,73 @@
+caption: Imágenes externas
+created: 20140610213500000
+es-title: Imágenes externas
+modified: 20160426055543779
+tags: Concepts Features
+title: ExternalImages
+type: text/vnd.tiddlywiki
+
+Por imágenes externas nos referimos en tiddlywiki a tiddlers que, en lugar de incrustarla, apuntan a la URI de una imagen. Se trabaja más rápido que con imágenes incrustadas, especialmente si el wiki contiene gran número de imágenes o imágenes muy grandes. Sin embargo, supone abandonar la política inicial de <<.word "único archivo">> de ~TiddlyWiki.
+
+Las imágenes esternas se usan en el navegador. Puede crearlas la configuración de Node.js al construir ~TiddlyWiki o pueden crearse manualmente en el navegador.
+
+!! En qué consisten
+
+Una imagen externa es un tiddler de imagen que contiene el campo <<.em "_canonical_uri">> cuyo valor es la URI de la imagen en cuestión. La URI puede ser absoluta o relativa al documento HTML. El campo <<.em text>> de un tiddler se ignora o se omite cuando se proporciona URI canónica de una imagen externa. 
+
+!! Creación manual de imágenes externas
+
+Para crear manualmente una imagen externa, simplemente crea un tiddler con el tipo apropiado de contenido y añade el campo <<.em "_canonical_uri">> indicando la ruta actual a la imagen.
+
+<<.warning "Comprueba bien que escribes correctamente la ruta y que escribes  [[URI|https://es.wikipedia.org/wiki/Identificador_de_recursos_uniforme]], no URL">>
+
+!! Creación de imágenes externas en Node.js
+
+Para crear un archivo HTML estático de ~TiddlyWiki acompañado por una carpeta de imágenes externas referenciadas en el HTML
+
+# Crea tiddlers de imagen en los WikiFolders, de la manera habitual
+# Guarda las imágenes como archivos separados (por convención, en una subcarpeta llamada <<.em images>>)
+# Externaliza los tiddlers correspondientes a cada imagen habilitando el campo <<.em "_canonical_uri">>
+# Guarda el archivo HTML principal
+
+
+>Las imágenes deben añadirse a la subcarpeta <<.def antes>> de externalizar los tiddlers. El campo <<.em "_canonical_uri">> invalida el campo <<.em text>> del tiddler, lo que lleva consigo que cualquier ulterior intento de guardado fallará.
+
+>Como ejemplo, véase el target <<.def externalimages>> de la demo <<.word tw5.com>>:
+
+```
+--savetiddlers [is[image]] images
+--setfield [is[image]] _canonical_uri $:/core/templates/canonical-uri-external-image text/plain
+--setfield [is[image]] text "" text/plain
+--rendertiddler $:/core/save/all externalimages.html text/plain
+```
+
+!!! Guardar archivos separados de imagen
+
+Para guardar las imágenes de un wiki en una subcarpeta <<.em images>> puede usarse el comando `--savetiddlers` de la siguiente manera:
+
+```
+--savetiddlers [is[image]] images
+```
+
+!!! Externalizar tiddlers de imagen
+
+Se usan dos comandos `--setfield`: el primero establece el campo <<.em ''_canonical_uri''>> con valor derivado del título del tiddler. El segundo limpia el campo <<.em text>>.
+
+```
+--setfield [is[image]] _canonical_uri $:/core/templates/canonical-uri-external-image text/plain
+--setfield [is[image]] text "" text/plain
+```
+
+La plantilla [[$:/core/templates/canonical-uri-external-image]] contiene:
+
+<pre>
+
+<$view tiddler="$:/core/templates/canonical-uri-external-image" field="text" format="text"/>
+
+</pre>
+
+<<.warning "Estas operaciones modifican los tiddlers en el WikiStore y pueden afectar al funcionamiento de posteriores comandos.">>
+
+!! Uso de imágenes externas
+
+No es posible editar una imagen externa directamente en el navegador, salvo para editar la URI  de forma que apunte a otra imagen.
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Features.tid b/editions/es-ES/tiddlers/Features.tid
new file mode 100644
index 000000000..3eb285b92
--- /dev/null
+++ b/editions/es-ES/tiddlers/Features.tid
@@ -0,0 +1,13 @@
+caption: Características
+created: 20130822172800000
+es-title: Características
+modified: 20160429042823820
+tags: TableOfContents
+title: Features
+type: text/vnd.tiddlywiki
+
+Más información sobre características específicas de ~TiddlyWiki:
+
+<<list-links "[tag[Features]]">>
+
+...y por último, pero no por ello menos importante: ~TiddlyWiki es un raro y práctico ejemplar de [[quine|Quine]]
diff --git a/editions/es-ES/tiddlers/Filter_Expression.tid b/editions/es-ES/tiddlers/Filter_Expression.tid
new file mode 100644
index 000000000..ed9b3475b
--- /dev/null
+++ b/editions/es-ES/tiddlers/Filter_Expression.tid
@@ -0,0 +1,34 @@
+caption: Expresiones
+created: 20150124182421000
+es-title: Expresión de filtros
+modified: 20160420174819458
+tags: [[Filter Syntax]]
+title: Filter Expression
+type: text/vnd.tiddlywiki
+
+<$railroad text="""
+[{:
+  [:[[espacio|"Filter Whitespace"]] ]
+  ("+"|:-|"-")
+  [[instruccion|"Filter Run"]]
+}]
+"""/>
+
+Una <<.def "expresión de filtro">> corresponde al nivel más externo de la [[sintaxis de filtros|Filter Syntax]]. Consta de una o más [[instrucciones|Filter Run]].
+
+El input de una instrucción es, generalmente, la lista de todos los títulos de tiddlers no-[[ocultos|ShadowTiddlers]] del wiki, sin ningún orden en particular. 
+
+Un prefijo, sin embargo, puede cambiar las cosas:
+
+* Si una instrucción no lleva los prefijos `+` o `-`, su output [[se añade dominantemente|Dominant Append]] al output del filtro.
+
+*Si una instrucción lleva el prefijo `-`, su output <<.em "se elimina">> del output del filtro, si estuviera presente.
+
+* Si una instrucción lleva el prefijo `+`, recibe como input el output del filtro y lo <<.em "lo reemplaza">> por el output de dicha instrucción. Toda instrucción posterior vuelve a recibir como input todos los títulos del wiki, salvo que también lleve el prefijo `+`.
+
+Dicho en lenguaje técnico, claros y conciso:
+
+|!Instrucción |!Interpretación |!Output |
+|`runA runB` |suma de conjuntos |cumple A <<.def O>> B|
+|`runA +runB` |intersección de conjuntos |cumple A <<.def Y>> B|
+|`runA -runB` |diferencia de conjuntos |cumple A <<.def "Y NO">> B|
diff --git a/editions/es-ES/tiddlers/Filter_Parameter.tid b/editions/es-ES/tiddlers/Filter_Parameter.tid
new file mode 100644
index 000000000..c76e11464
--- /dev/null
+++ b/editions/es-ES/tiddlers/Filter_Parameter.tid
@@ -0,0 +1,29 @@
+caption: Parámetros
+created: 20150220152540000
+es-title: Parámetros de filtro
+modified: 20160421055748029
+tags: [[Filter Syntax]]
+title: Filter Parameter
+type: text/vnd.tiddlywiki
+
+<$railroad text="""
+( "[" [:{/"nada excepto ]"/}] "]"
+  |
+  "{" [:{/"nada excepto }"/}] "}"
+  |
+  "<" [:{/"nada excepto >"/}] ">"
+)
+"""/>
+
+Los parámetros de un [[operador|Filter Operators]] son valores que pueden ser:
+
+;<<.def rígidos>> o <<.def "a fuego">>
+: `[tal cual]`
+: El parámetro es el valor exacto y literal que aparece entre corchetes.
+;<<.def flexibles>>
+: <<.def indirectos>>
+:: `{tal cual}`
+:: El parámetro es el texto indicado por la [[referencia|TextReference]] cuyo nombre se muestra entre llaves, es decir, el valor de determinado [[campo|TiddlerFields]] en un tiddler en concreto o el valor de una propiedad de determinado [[tiddler de datos|DataTiddlers]].
+: <<.def variables>>
+:: `<tal cual>`
+:: El parámetro es el valor actual de la [[variable|Variables]] cuyo nombre aparece entre comillas angulares simples. Los parámetros de macros <<.em no>> están soportados.
diff --git a/editions/es-ES/tiddlers/Filter_Run.tid b/editions/es-ES/tiddlers/Filter_Run.tid
new file mode 100644
index 000000000..1767289b9
--- /dev/null
+++ b/editions/es-ES/tiddlers/Filter_Run.tid
@@ -0,0 +1,30 @@
+caption: Instrucciones
+created: 20150124182117000
+es-title: Instrucciones de filtro
+modified: 20160421054304561
+tags: [[Filter Syntax]]
+title: Filter Run
+type: text/vnd.tiddlywiki
+
+<$railroad text="""
+( "[" { [[paso|"Filter Step"]] } "]"
+  |
+  [:{/"nada excepto [ ] o espacio"/}]
+  |
+  '"' [:{/'nada excepto "'/}] '"'
+  |
+  "'" [:{/"nada excepto '"/}] "'"
+)
+"""/>
+
+Una <<.def instrucción>> se compone de [[pasos|Filter Step]] y devuelve como output una [[selección|Title Selection]] que contribuye a una [[expresión|Filter Expression]] mayor.
+
+Los pasos se procesan de izquierda a derecha y el input del primer paso es el mismo que el de la instrucción de la que forma parte. En todos los demás pasos, el input corresponde al output del paso anterior.
+
+{{Selection Constructors}}
+
+Las tres últimas opciones del diagrama que se muestra más arriba coinciden con sintaxis del tipo `HelloThere`, `"HelloThere"`, `'HelloThere'` y `"Filter Operators"`y son abreviaturas de `[title[...]]`.
+
+Las opciones entrecomilladas existen como soporte para títulos que contengan corchetes, como `"un tiddler [[[[inusual]]]]"`.
+
+The quoted options exist to support titles that contain square brackets, as in `"An [[[[Unusual]]]] Tiddler"`.
diff --git a/editions/es-ES/tiddlers/Filter_Step.tid b/editions/es-ES/tiddlers/Filter_Step.tid
new file mode 100644
index 000000000..c78853d88
--- /dev/null
+++ b/editions/es-ES/tiddlers/Filter_Step.tid
@@ -0,0 +1,23 @@
+caption: Pasos
+created: 20150124182127000
+es-title: Pasos de filtro
+modified: 20160421053348528
+tags: [[Filter Syntax]]
+title: Filter Step
+type: text/vnd.tiddlywiki
+
+<$railroad text="""
+[:"!"]
+[: [[operador|"Filter Operators"]] [:":" sufijo] ]
+[[parametro|"Filter Parameter"]]
+"""/>
+
+Un <<.def paso>> representa una operación única que se realiza dentro de un [[filtro|Filter Syntax]].
+
+En términos de programación, se parece a la llamada de una función en la que el input es un parámetro implícito. El output de un paso es una [[selección|Title Selection]] que contribuye a una [[instrucción|Filter Run]] y, por lo tanto, a la [[expresión|Filter Expression]] que lo contiene en su totalidad.
+
+El <<.def operador>> de un paso se obtiene de una lista predefinida de [[palabras clave|Filter Operators]], que puede extenderse mediante plugins. Todo operador no reconocido se trata como sufijo de <<.olink field>>. Si se omite el operador, se lo considera por defecto como `title`.
+
+Un <<.def sufijo>> es texto adicional --generalmente el nombre de un [[campo|TiddlerFields]]-- que complementa el significado de ciertos operadores.
+
+Muchos pasos requieren un valor explícito de <<.def parámetro>>, llamado también <<.def operando>>, que concreta lo que tiene que hacer.
diff --git a/editions/es-ES/tiddlers/Filter_Syntax.tid b/editions/es-ES/tiddlers/Filter_Syntax.tid
new file mode 100644
index 000000000..1c6e957ef
--- /dev/null
+++ b/editions/es-ES/tiddlers/Filter_Syntax.tid
@@ -0,0 +1,20 @@
+caption: Filtros: Sintaxis
+created: 20140210141217955
+es-title: Sintaxis de expresiones de búsqueda
+list: [[Filter Expression]] [[Filter Run]] [[Filter Step]] [[Filter Parameter]] [[Filter Whitespace]]
+modified: 20160420173154550
+tags: Filters
+title: Filter Syntax
+type: text/vnd.tiddlywiki
+
+<<.preamble """Los [[filtros|Filters]] siguen una gramática especial que aquí presentamos mediante [[diagramas sintácticos|Railroad Diagrams]], para uso de quienes encuentran útil la descripción sintáctica formal. Puedes, sin embargo, [[aprender a escribir filtros|Introduction to filter notation]] sin necesidad de comprender esta sección.""">>
+
+Un <<.def filtro>> es una una secuencia de instrucciones que transforma un <<.def input>> o <<.word entrada>> en un <<.def output>> o <<.word salida>>. Tanto el input como el output son [[conjuntos ordenados de títulos|Title Selection]] de cosas tales como tiddlers y campos. 
+
+Un filtro es una [[expresión|Filter Expression]] construida con piezas más pequeñas --que llamamos [[instrucciones|Filter Run]] y [[pasos|Filter Step]]--, cada uno de los cuales transforma a su vez un input en un output.
+
+Un filtro comienza con un output vacío y sus ejecuciones se procesan de izquierda a derecha, modificando progresivamente dicho output. 
+
+Estas son las diferentes piezas que componen un filtro:
+
+<<list-links "[tag[Filter Syntax]]">>
diff --git a/editions/es-ES/tiddlers/Filter_Whitespace.tid b/editions/es-ES/tiddlers/Filter_Whitespace.tid
new file mode 100644
index 000000000..803ee5133
--- /dev/null
+++ b/editions/es-ES/tiddlers/Filter_Whitespace.tid
@@ -0,0 +1,13 @@
+caption: Espacios en blanco
+created: 20150124182304000
+es-title: Espacios en blanco
+modified: 20160421063428408
+tags: [[Filter Syntax]]
+title: Filter Whitespace
+type: text/vnd.tiddlywiki
+
+<$railroad text="""
+{( "espacio" | "tabulador" | "entrada de línea" | "return" | "tabulador vertical" | "entrada de formulario" )}
+"""/>
+
+Entre las diferentes [[instrucciones|Filter Run]] de una [[expresión|Filter Expression]] pueden aparecer diferentes caracteres en blanco.
diff --git a/editions/es-ES/tiddlers/Filters.tid b/editions/es-ES/tiddlers/Filters.tid
new file mode 100644
index 000000000..86ef59dc4
--- /dev/null
+++ b/editions/es-ES/tiddlers/Filters.tid
@@ -0,0 +1,32 @@
+caption: Filtros
+created: 20130827080000000
+es-title: FIltros y expresiones de búsqueda
+list: [[Introduction to filter notation]] [[Filter Syntax]]
+modified: 20160419165818368
+tags: Reference Concepts
+title: Filters
+type: text/vnd.tiddlywiki
+
+Piensa en ~TiddlyWiki como en una base de datos cuyos registros son tiddlers. Una base de datos proporciona los medios para encontrar entre sus registros aquellos que coinciden con un determinado patrón de búsqueda. La forma de hacerlo en ~TiddlyWiki es mediante <<.em filtros>>.
+
+Un <<.def filtro>> es una expresión breve y concisa que describe a un [[conjunto de tiddlers|Title Selection]] llamado <<.def "output">> o <<.def salida>>. Siempre que ~TiddlyWiki encuentra un filtro, calcula su output. De este modo, puede realizar determinadas tareas con esa selección de tiddlers en particular, como [[contarlos|CountWidget]] o [[hacer una lista|ListWidget]] con ellos.
+
+El siguiente ejemplo especifica un filtro de búsqueda a la macro <<.mlink list-links>> para que muestre un listado de tiddlers cuyos títulos comienzan con la letra hache:
+
+> `<<list-links "[prefix[H]]">>`
+
+Y este es su output:
+
+<<list-links "[prefix[H]]">>
+
+El output cambiará en la medida en que cambie el wiki según se añadan y se eliminen tiddlers. En cualquier caso, ~TiddlyWIki lo volverá a calcular al vuelo, manteniendo así al día cualquier cuenta o lista basada en dicho filtro.
+
+[[Búsqueda avanzada|$:/AdvancedSearch]] tiene una pestaña llamada <<.advancedsearch-tab Filter>>, que facilita experimentar con filtros. 
+
+;Para saber más:
+
+*> [[Introducción a la notación de filtros|Introduction to filter notation]] -- Guía paso a paso
+
+*> [[Sintaxis de filtros|Filter Syntax]] -- Reglas detalladas para uso técnico
+
+*> [[Operadores de filtro|Filter Operators]] -- métodos disponibles de búsqueda 
diff --git a/editions/es-ES/tiddlers/Formatting_text_in_TiddlyWiki.tid b/editions/es-ES/tiddlers/Formatting_text_in_TiddlyWiki.tid
new file mode 100644
index 000000000..e4a6e7195
--- /dev/null
+++ b/editions/es-ES/tiddlers/Formatting_text_in_TiddlyWiki.tid
@@ -0,0 +1,63 @@
+caption: Formatos en ~TiddlyWiki
+created: 20140908131500000
+es-title: Dar formato al texto en TiddlyWiki
+modified: 20160424052545413
+tags: [[Working with TiddlyWiki]]
+title: Formatting text in TiddlyWiki
+type: text/vnd.tiddlywiki
+
+Para controlar cómo se muestra el texto de un tiddler, puedes usar un formateo especial que llamamos WikiText. 
+
+! Formato simple
+
+En su forma más simple, WikiText te permite usar funciones habituales en el proceso de textos como negrita, cursiva, listas y tablas. Por ejemplo:
+
+At its simplest, WikiText lets you use familiar word-processing features like bold, italic, lists and tables. For example:
+
+```
+Jovencillo ''emponzoñado'' de ~~whisky~~ ¡Qué //figurota// `exhibe`!
+
+```
+
+… se muestra como:
+
+Jovencillo ''emponzoñado'' de ~~whisky~~ ¡Qué //figurota// `exhibe`!
+
+! Working with Tiddlers
+
+Se puede enlazar a otros tiddlers en WikiText usando corchetes dobles o aprovechando la función de enlace automático de las palabras en CamelCase:
+
+```
+Este es un enlace al tiddler HelloThere y, este otro, a [[Historia de TiddlyWiki|History of TiddlyWiki]]
+```
+
+… se muestra como:
+
+Este es un enlace al tiddler HelloThere y, este otro, a [[Historia de TiddlyWiki|History of TiddlyWiki]]
+
+! Macros
+
+Las macros permiten empaquetar fragmentos de WikiText de difícil ejecución o que se repiten con frecuencia, para así poder usarlos con facilidad y consistentemente.
+
+Por ejemplo, esta es la definición de una macro que inserta un icono y da formato especial a  a un texto usado como advertencia, por ejemplo, en un manual:
+
+`\define .warning(_) 
+<div class="doc-icon-block">
+<div class="doc-block-icon">{{$:/core/images/warning}}</div>
+ $_$</div>`
+
+El código que la define hace referencia, en este caso, a <<.em clases>> definidas en la [[hoja de estilos|Cascading Style Sheets]] del documento.
+
+Para llamar una macro en WikiText, la escribimos entre dobles comillas angulares simples y con el texto al que queremos aplicarla entre comillas rectas: `<<.warning "texto">>`
+
+El resultado tiene este aspecto:
+
+<<.warning "Este es un texto que, de no ser por la macro `.warning`, tendríamos que formatear a mano cada vez que quisiéramos insertar un texto de advertencia, lo que por un lado tiene su complejidad y, por otro, lleva tiempo y está sujeto a errores. De este modo nos aseguramos rápidamente, sin posibilidad de error y sin distracciones, de que todas las advertencias que escribimos tienen el mismo aspecto">>
+
+! ~WikiText avanzado
+
+Las funciones avanzadas de WikiText te permiten generar listas automáticamente entre otras funciones interactivas como  menús desplegables. De hecho, la interfaz entera de ~TiddlyWiki está escrita en ~WikiText, de modo que casi todo cuanto ves puede es adaptable para su uso en otros wikis.
+
+Algunas de estas funciones avanzadas requieren el uso de código complejo. Por ese motivo TIddlyWiki incorpora varias macros que simplifican algunas tareas en la interfaz de usuario, como la creación de pestañas, tablas de contenido y listas.
+
+<<.tip "[[Aquí|WikiText]] tienes instrucciones más extensas y detalladas sobre el uso de ~WikiText">>
diff --git a/editions/es-ES/tiddlers/Forums.tid b/editions/es-ES/tiddlers/Forums.tid
new file mode 100644
index 000000000..63ecc4339
--- /dev/null
+++ b/editions/es-ES/tiddlers/Forums.tid
@@ -0,0 +1,39 @@
+caption: Foros
+created: 20140721121924384
+es-title: Foros
+modified: 20160413152559250
+tags: Community
+title: Forums
+type: text/vnd.tiddlywiki
+
+!Foros de discusión de ~TiddlyWiki. 
+
+Son listas de correo en las que hablamos de ~TiddlyWiki: pedimos ayuda, anunciamos la publicación de nuevas ediciones o de nuevos plugins, debatimos sobre nuevas características, o simplemente compartimos experiencias. 
+
+Puedes participar a través de la página web asociada, o suscribirte via mail.
+
+!!Usuarios
+
+[[Grupo principal de TiddlyWiki| http://groups.google.com/group/TiddlyWiki]]
+
+>No necesitas tener cuenta en Google para acceder al grupo. Suscríbete igualmente enviando un mail a:
+* mailto:tiddlywiki+subscribe@googlegroups.com 
+
+Además, puedes participar en nuestras [[reuniones periódicas online|TiddlyWiki Hangouts]]
+
+o síguenos [[en Twitter|http://twitter.com/TiddlyWiki]] si quieres recibir las últimas noticias
+
+!! Desarrolladores
+
+[[Grupo de desarrollo de TiddlyWiki|http://groups.google.com/group/TiddlyWikiDev]]
+
+>No necesitas tener cuenta en Google para acceder al grupo. Suscríbete igualmente enviando un mail a:
+*mailto:tiddlywikidev+subscribe@googlegroups.com.
+
+Accede a nuestra [[página de desarrollo|https://github.com/Jermolene/TiddlyWiki5]] en GitHub y haz tu contribución.
+
+Síguenos [[en Twitter|http://twitter.com/TiddlyWiki]] si quieres estar al tanto de las últimas noticias
+
+Las nuevas ediciones de TiddlyWiki, TiddlyDesktop y TiddlyFox se anuncian en los foros de discusión y en [[Twitter|https://twitter.com/TiddlyWiki]]. 
+
+También puedes suscribirte al feed de [[versiones|https://github.com/jermolene/tiddlywiki5/releases.atom]] en ~GitHub
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Full_Edition.tid b/editions/es-ES/tiddlers/Full_Edition.tid
new file mode 100644
index 000000000..106a64d3e
--- /dev/null
+++ b/editions/es-ES/tiddlers/Full_Edition.tid
@@ -0,0 +1,13 @@
+caption: Edición completa
+created: 20150310103210459
+es-title: Edición completa
+modified: 20160605040305652
+tags: Editions
+title: Full Edition
+type: text/vnd.tiddlywiki
+
+La edición completa de ~Tiddlywiki consta de todos los idiomas, temas y plugins disponibles. Su uso está previsto para pruebas, especialmente para el cambio de un idioma a otro.
+
+La edición completa puede descargarse de:
+
+http://tiddlywiki.com/editions/full/
diff --git a/editions/es-ES/tiddlers/Future_Proof.tid b/editions/es-ES/tiddlers/Future_Proof.tid
new file mode 100644
index 000000000..e566d6665
--- /dev/null
+++ b/editions/es-ES/tiddlers/Future_Proof.tid
@@ -0,0 +1,11 @@
+caption: Perdurable
+created: 20131213101024997
+es-title: A prueba de futuro
+modified: 20160503161914814
+tags: Features
+title: Future Proof
+type: text/vnd.tiddlywiki
+
+~TiddlyWiki se ha diseñado teniendo en mente las necesidades de perdurabilidad del usuario. 
+
+Puesto que es OpenSource y no necesita infrastructura alguna, podemos asegurar que lo único que necesitarás para acceder a un archivo de ~TiddlyWiki, incluso en un futuro lejano, es un navegador HTML normal y corriente. Si estás hoy al inicio de tu carrera, puedes estar seguro de que podrás seguir usándolo cuando te jubiles. 
diff --git a/editions/es-ES/tiddlers/Get_the_Ring.tid b/editions/es-ES/tiddlers/Get_the_Ring.tid
new file mode 100644
index 000000000..3879207e8
--- /dev/null
+++ b/editions/es-ES/tiddlers/Get_the_Ring.tid
@@ -0,0 +1,9 @@
+caption: Conseguir el anillo
+created: 20130825143100000
+es-title: Conseguir el anillo
+modified: 20160418045706407
+tags: task
+title: Get the Ring
+type: text/vnd.tiddlywiki
+
+//Tarea de muestra para el [[Ejemplo de administración de tareas|TaskManagementExample]]//
diff --git a/editions/es-ES/tiddlers/GettingStarted.tid b/editions/es-ES/tiddlers/GettingStarted.tid
new file mode 100644
index 000000000..6ccebc399
--- /dev/null
+++ b/editions/es-ES/tiddlers/GettingStarted.tid
@@ -0,0 +1,37 @@
+caption: En Marcha
+created: 20131129090249275
+es-title: Puesta en marcha
+modified: 20160603132644119
+tags: [[Working with TiddlyWiki]]
+title: GettingStarted
+type: text/vnd.tiddlywiki
+
+\define default-platform()
+GettingStarted - $(browser-name)$
+\end
+Breves instrucciones para empezar a trabajar en las diferentes plataformas y configuraciones con las que TiddlyWiki es compatible. [[Aquí|A Gentle Guide to TiddlyWiki]] encontrarás una introducción algo más amena.
+
+<$set name="browser-name" value={{$:/info/browser/name}}>
+<$macrocall $name="tabs" state="$:/state/tabs/platform" tabsList="[prefix[GettingStarted - ]]" default=<<default-platform>> class="tc-vertical"/>
+</$set>
+
+Solución de problemas:
+
+* No intentes guardar cambios con la opción ''Archivo''/''Guardar'' o ''Guardar como'' del navegador: __No funciona__
+
+Te interesa ver también:
+
+* [[Cifrado|Encryption]] explica cómo usar la función incorporada de cifrado para proteger tus contenidos con contraseña.
+* [[Guardar en TiddlySpot|Saving on TiddlySpot]], servicio gratuito que te permite usar TiddlyWiki online
+* Guardar en TiddlyDesktop, aplicación para trabajar con TiddlyWiki en el escritorio
+* También puedes descargar este TIddlywiki en su versión íntegra, con toda su documentación:
+
+<<<
+{{$:/snippets/download-wiki-button}}
+
+Si el botón no funciona, guarda el siguiente enlace:
+
+<a href="http://tiddlywiki.com/languages/es-ES/index.html" download="index.html">~http://tiddlywiki.com/languages/es-ES/index.html</a>
+
+El navegador puede pedirte que confirmes la acción antes de comenzar la descarga
+<<<
diff --git a/editions/es-ES/tiddlers/GettingStarted_-_Android.tid b/editions/es-ES/tiddlers/GettingStarted_-_Android.tid
new file mode 100644
index 000000000..bad9fcfc4
--- /dev/null
+++ b/editions/es-ES/tiddlers/GettingStarted_-_Android.tid
@@ -0,0 +1,16 @@
+caption: Android
+created: 20140811171036268
+es-title: EnMarcha - Android
+modified: 20160413084854160
+title: GettingStarted - Android
+type: text/vnd.tiddlywiki
+
+Hay dos formas de usar TiddlyWiki en Android:
+
+! Con Firefox y TiddlyFox
+
+{{Saving with TiddlyFox on Android}}
+
+! Con AndTidWiki
+
+{{Saving on Android}}
diff --git a/editions/es-ES/tiddlers/GettingStarted_-_Chrome.tid b/editions/es-ES/tiddlers/GettingStarted_-_Chrome.tid
new file mode 100644
index 000000000..7b7bef150
--- /dev/null
+++ b/editions/es-ES/tiddlers/GettingStarted_-_Chrome.tid
@@ -0,0 +1,10 @@
+caption: Chrome
+created: 20140811165935523
+es-title: EnMarcha - Chrome
+modified: 20160413085812048
+title: GettingStarted - Chrome
+type: text/vnd.tiddlywiki
+
+En Google Chrome, TiddlyWiki sólo puede guardar cambios usando el módulo alternativo de guardado compatible con HTML5
+
+{{Saving with the HTML5 fallback saver}}
diff --git a/editions/es-ES/tiddlers/GettingStarted_-_Firefox.tid b/editions/es-ES/tiddlers/GettingStarted_-_Firefox.tid
new file mode 100644
index 000000000..b4fbce568
--- /dev/null
+++ b/editions/es-ES/tiddlers/GettingStarted_-_Firefox.tid
@@ -0,0 +1,10 @@
+caption: Firefox
+created: 20140811170425199
+es-title: EnMarcha - Firefox
+modified: 20160413095347479
+title: GettingStarted - Firefox
+type: text/vnd.tiddlywiki
+
+Como mejor funciona TiddlyWIki en Firefox es con la extensión TiddlyFox.
+
+{{Saving with TiddlyFox}}
diff --git a/editions/es-ES/tiddlers/GettingStarted_-_Internet_Explorer.tid b/editions/es-ES/tiddlers/GettingStarted_-_Internet_Explorer.tid
new file mode 100644
index 000000000..0530b9ba7
--- /dev/null
+++ b/editions/es-ES/tiddlers/GettingStarted_-_Internet_Explorer.tid
@@ -0,0 +1,10 @@
+caption: Internet Explorer
+created: 20140811172058274
+es-title: EnMarcha - Internet Explorer
+modified: 20160413100007423
+title: GettingStarted - Internet Explorer
+type: text/vnd.tiddlywiki
+
+{{Saving with TiddlyIE}}
+
+En [[Ejecutar como Aplicación HTA| Windows HTA Hack]] se describe un método alternativo para usar TiddlyWiki con Internet Explorer.
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/GettingStarted_-_Node.js.tid b/editions/es-ES/tiddlers/GettingStarted_-_Node.js.tid
new file mode 100644
index 000000000..6b3bf83f2
--- /dev/null
+++ b/editions/es-ES/tiddlers/GettingStarted_-_Node.js.tid
@@ -0,0 +1,8 @@
+caption: Node.js
+created: 20140811172010003
+es-title: EnMarcha - Node.js
+modified: 20160413105535386
+title: GettingStarted - Node.js
+type: text/vnd.tiddlywiki
+
+{{Installing TiddlyWiki on Node.js}}
diff --git a/editions/es-ES/tiddlers/GettingStarted_-_Safari.tid b/editions/es-ES/tiddlers/GettingStarted_-_Safari.tid
new file mode 100644
index 000000000..5139a5454
--- /dev/null
+++ b/editions/es-ES/tiddlers/GettingStarted_-_Safari.tid
@@ -0,0 +1,11 @@
+caption: Safari
+created: 20140811171121022
+es-title: EnMarcha - Safari
+modified: 20160413143044214
+title: GettingStarted - Safari
+type: text/vnd.tiddlywiki
+
+En Safari, TiddlyWiki sólo puede guardar cambios de forma manual, valiéndose para ello del módulo alternativo de guardado compatible con HTML5. 
+
+{{Saving on Safari}}
+
diff --git a/editions/es-ES/tiddlers/GettingStarted_-_iOS.tid b/editions/es-ES/tiddlers/GettingStarted_-_iOS.tid
new file mode 100644
index 000000000..0466f3482
--- /dev/null
+++ b/editions/es-ES/tiddlers/GettingStarted_-_iOS.tid
@@ -0,0 +1,8 @@
+caption: iPad/iPhone
+created: 20140811170918707
+es-title: EnMarcha - IOS
+modified: 20160413104034157
+title: GettingStarted - iOS
+type: text/vnd.tiddlywiki
+
+{{Saving on iPad/iPhone}}
diff --git a/editions/es-ES/tiddlers/Getting_Started_Video.tid b/editions/es-ES/tiddlers/Getting_Started_Video.tid
new file mode 100644
index 000000000..0cc161c79
--- /dev/null
+++ b/editions/es-ES/tiddlers/Getting_Started_Video.tid
@@ -0,0 +1,13 @@
+caption: Video: Inicio
+created: 20140104134911101
+es-title: Videotutorial de inicio
+modified: 20160421134904459
+tags: Videos [[Working with TiddlyWiki]]
+title: Getting Started Video
+type: text/vnd.tiddlywiki
+
+Este breve tutorial te enseña cómo guardar cambios en TiddlyWIki.
+
+//El video está un poco anticuado, pero esperamos poder ponerlo pronto al día.//
+
+<iframe width="560" height="315" src="http://www.youtube.com/embed/1g66s7UbyuU" frameborder="0" allowfullscreen></iframe>
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Glosario_en-GB_-__es-ES.tid b/editions/es-ES/tiddlers/Glosario_en-GB_-__es-ES.tid
new file mode 100644
index 000000000..2169ff89c
--- /dev/null
+++ b/editions/es-ES/tiddlers/Glosario_en-GB_-__es-ES.tid
@@ -0,0 +1,16 @@
+created: 20141217193625476
+modified: 20160411174752421
+title: Glosario en-GB -> es-ES
+type: text/vnd.tiddlywiki
+
+|!en-GB |!es-ES |!Comentario |h
+|Tiddler |Tiddler|Invariable |
+
+(Véase el capítulo de [[tablas|Tables in WikiText]] para saber cómo editar el glosario)
+
+----
+
+!!!''¡Importante!!'' - Palabras y referencias reservadas para el sistema
+
+* Nombres de `campo` y sus referencias (nombre del campo, sin separador, seguido de //Field//. P. Ej.:ListField)
+* Nombre de widgets. P. Ej.: NavigatorWidget
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Go_to_Mordor.tid b/editions/es-ES/tiddlers/Go_to_Mordor.tid
new file mode 100644
index 000000000..6fdc94720
--- /dev/null
+++ b/editions/es-ES/tiddlers/Go_to_Mordor.tid
@@ -0,0 +1,9 @@
+caption: ir a Mordor
+created: 20130825143100000
+es-title: Ir a Mordor
+modified: 20160418045726558
+tags: task done
+title: Go to Mordor
+type: text/vnd.tiddlywiki
+
+//Tarea de muestra para el [[Ejemplo de administración de tareas|TaskManagementExample]]//
diff --git a/editions/es-ES/tiddlers/Hard_and_Soft_Links.tid b/editions/es-ES/tiddlers/Hard_and_Soft_Links.tid
new file mode 100644
index 000000000..46dbe8b12
--- /dev/null
+++ b/editions/es-ES/tiddlers/Hard_and_Soft_Links.tid
@@ -0,0 +1,17 @@
+caption: Enlaces físicos y simbólicos
+created: 20150123220237000
+es-title: Enlaces físicos y simbólicos
+modified: 20160511060750282
+tags: Concepts
+title: Hard and Soft Links
+type: text/vnd.tiddlywiki
+
+Un <<.def "enlace físico">> o <<.def "hard link">> es uno que puede reconocerse visualmente, examinando el texto en WikiText.
+
+Un enlace es <<.def simbólico>> o <<.def "soft link">> si:
+
+* forma parte de una [[transclusión|Transclusion]] de otro tiddler
+* proviene de una [[macro|Macros]] o una [[variable|Variables]]
+* lo genera un widget cuyo atributo <<.attr to>> es una transclusión, macro o variable
+
+<$macrocall $name=".warning" _="""Los operadores de filtro como <<.olink backlinks>>, <<.olink links>>, <<.olink all>> o <<.olink is>> no reconocen enlaces simbólicos."""/>
diff --git a/editions/es-ES/tiddlers/HelloThere.tid b/editions/es-ES/tiddlers/HelloThere.tid
new file mode 100644
index 000000000..e0a897652
--- /dev/null
+++ b/editions/es-ES/tiddlers/HelloThere.tid
@@ -0,0 +1,35 @@
+caption: ¡Hola!
+created: 20130822170200000
+es-title: ¡Hola! ¿Qué tal?
+list: [[A Gentle Guide to TiddlyWiki]] [[Discover TiddlyWiki]] [[Some of the things you can do with TiddlyWiki]] [[Ten reasons to switch to TiddlyWiki]] Examples [[What happened to the original TiddlyWiki?]]
+modified: 20160605052349288
+tags: TableOfContents
+title: HelloThere
+type: text/vnd.tiddlywiki
+
+''¿Nunca has tenido la sensación de que no te cabe en la cabeza todo lo que tienes que recordar?''
+
+BIenvenido a TiddlyWiki, un bloc de notas [[no lineal|Philosophy of Tiddlers]] único para [[capturar|Creating and editing tiddlers]], [[organizar|Structuring TiddlyWiki]] y [[compartir|Sharing your tiddlers with others]] información compleja.
+
+Úsalo para mantener tu [[lista de tareas|TaskManagementExample]], para desarrollar un [[ensayo o novela|"TiddlyWiki for Scholars" by Alberto Molina]], o incluso para organizar tu boda. Toma nota de todo cuanto te pase por la cabeza o construye una web flexible y ágil, que satisfaga tus necesidades.
+
+<div style="font-size:0.7em;text-align:center;margin-top:2em;margin-bottom:2em;">
+<<list-thumbnails filter:"[tag[HelloThumbnail]]" width:"168" height:"95">>
+</div>
+
+Al revés que los servicios online convencionales, TiddlyWiki te deja escoger dónde quieres guardar tus datos, garantizándote que, por más que pase el tiempo, podrás seguir usando en el futuro las notas que tomes hoy.
+
+<div style="font-size:0.7em;text-align:center;margin-top:3em;margin-bottom:3em;">
+<a href="http://groups.google.com/group/TiddlyWiki" class="tc-btn-big-green" style="background-color:#FF8C19;" target="_blank" rel="noopener noreferrer">
+{{$:/core/images/mail}} ~TiddlyWiki en Google Groups
+</a>
+<a href="http://www.youtube.com/c/JeremyRuston" class="tc-btn-big-green" style="background-color:#e52d27;" target="_blank" rel="noopener noreferrer">
+{{$:/core/images/video}} ~TiddlyWiki en ~YouTube
+</a>
+<a href="https://twitter.com/TiddlyWiki" class="tc-btn-big-green" style="background-color:#5E9FCA;" target="_blank" rel="noopener noreferrer">
+{{$:/core/images/twitter}} @~TiddlyWiki en Twitter
+</a>
+<a href="https://github.com/Jermolene/TiddlyWiki5" class="tc-btn-big-green" style="background-color:#444;" target="_blank" rel="noopener noreferrer">
+{{$:/core/images/github}} ~TiddlyWiki en ~GitHub
+</a>
+</div>
diff --git a/editions/es-ES/tiddlers/HelloThumbnail_-_Classic.tid b/editions/es-ES/tiddlers/HelloThumbnail_-_Classic.tid
new file mode 100644
index 000000000..98c5ad593
--- /dev/null
+++ b/editions/es-ES/tiddlers/HelloThumbnail_-_Classic.tid
@@ -0,0 +1,10 @@
+caption: ~TiddlyWiki Classic
+color: #D5B7EA
+created: 20160605063552797
+es-title: HolaMiniatura - Classic
+image: TiddlyWiki Classic.png
+link: TiddlyWikiClassic
+modified: 20160605063552797
+tags: HelloThumbnail
+title: HelloThumbnail - Classic
+
diff --git a/editions/es-ES/tiddlers/HelloThumbnail_-_Developers.tid b/editions/es-ES/tiddlers/HelloThumbnail_-_Developers.tid
new file mode 100644
index 000000000..3994bab34
--- /dev/null
+++ b/editions/es-ES/tiddlers/HelloThumbnail_-_Developers.tid
@@ -0,0 +1,11 @@
+background-color: #EAE57D
+caption: Desarrolladores
+color: #6B6E98
+created: 20160605063000303
+es-title: HolaMiniatura - Desarrolladores
+image: Dev Thumbnail.jpg
+link: Developers
+modified: 20160605063018257
+tags: HelloThumbnail
+title: HelloThumbnail - Developers
+
diff --git a/editions/es-ES/tiddlers/HelloThumbnail_-_Gentle_Guide.tid b/editions/es-ES/tiddlers/HelloThumbnail_-_Gentle_Guide.tid
new file mode 100644
index 000000000..bfb596f58
--- /dev/null
+++ b/editions/es-ES/tiddlers/HelloThumbnail_-_Gentle_Guide.tid
@@ -0,0 +1,12 @@
+background-color: #EDB431
+caption: Amable introducción
+color: #fff
+created: 20150325172634195
+es-title: HolaMiniatura - Amable introducción
+image: Motovun Jack.jpg
+link: A Gentle Guide to TiddlyWiki
+modified: 20160605062556596
+tags: HelloThumbnail
+title: HelloThumbnail - Gentle Guide
+type: text/vnd.tiddlywiki
+
diff --git a/editions/es-ES/tiddlers/HelloThumbnail_-_HelpingTiddlyWiki.tid b/editions/es-ES/tiddlers/HelloThumbnail_-_HelpingTiddlyWiki.tid
new file mode 100644
index 000000000..3bfdc51e0
--- /dev/null
+++ b/editions/es-ES/tiddlers/HelloThumbnail_-_HelpingTiddlyWiki.tid
@@ -0,0 +1,11 @@
+background-color: #fff
+caption: ~TiddlyWiki ayudando
+color: #B7D5EA
+created: 20160605062718206
+es-title: HolaMiniatura - TiddlyWikiAyudando
+image: Tiddler Poster.png
+link: HelpingTiddlyWiki
+modified: 20160605062929945
+tags: HelloThumbnail
+title: HelloThumbnail - HelpingTiddlyWiki
+
diff --git a/editions/es-ES/tiddlers/HelloThumbnail_-_Introduction_Video.tid b/editions/es-ES/tiddlers/HelloThumbnail_-_Introduction_Video.tid
new file mode 100644
index 000000000..ea3e025b0
--- /dev/null
+++ b/editions/es-ES/tiddlers/HelloThumbnail_-_Introduction_Video.tid
@@ -0,0 +1,12 @@
+background-color: #fff
+caption: Introducción a ~TiddlyWiki
+color: red
+created: 20160605062107182
+es-title: HolaMiniatura - Principios básicos
+icon: {{$:/core/images/video}}
+image: Introduction Video Thumbnail.jpg
+link: Introduction Video
+modified: 20160605062138614
+tags: HelloThumbnail
+title: HelloThumbnail - Introduction Video
+
diff --git a/editions/es-ES/tiddlers/HelloThumbnail_-_Latest_Version.tid b/editions/es-ES/tiddlers/HelloThumbnail_-_Latest_Version.tid
new file mode 100644
index 000000000..7f59f2f90
--- /dev/null
+++ b/editions/es-ES/tiddlers/HelloThumbnail_-_Latest_Version.tid
@@ -0,0 +1,10 @@
+caption: Qué hay de nuevo en <<version>>
+color: #fff
+created: 20160605063421736
+es-title: HolaMiniatura - Ultima versión
+image: New Release Banner.png
+link: Releases
+modified: 20160605063512135
+tags: HelloThumbnail
+title: HelloThumbnail - Latest Version
+
diff --git a/editions/es-ES/tiddlers/Hidden_Setting__Search_AutoFocus.tid b/editions/es-ES/tiddlers/Hidden_Setting__Search_AutoFocus.tid
new file mode 100644
index 000000000..f26497122
--- /dev/null
+++ b/editions/es-ES/tiddlers/Hidden_Setting__Search_AutoFocus.tid
@@ -0,0 +1,11 @@
+caption: Ajuste oculto: Search ~AutoFocus 
+created: 20150619162518761
+es-title: Ajuste oculto: AutoFocus de la barra de búsqueda
+modified: 20160426152203677
+tags: [[Hidden Settings]]
+title: Hidden Setting: Search AutoFocus
+type: text/vnd.tiddlywiki
+
+Al abrir TiddlyWiki, el foco se sitúa por defecto en la barra de búsqueda. Si esto te ocasiona algún problema, puedes modificarlo cambiando el texto de <<.em true>> a <<.em false>> en el siguiente tiddler: 
+
+$:/config/Search/AutoFocus
diff --git a/editions/es-ES/tiddlers/Hidden_Setting__Typing_Refresh_Delay.tid b/editions/es-ES/tiddlers/Hidden_Setting__Typing_Refresh_Delay.tid
new file mode 100644
index 000000000..a601bd20f
--- /dev/null
+++ b/editions/es-ES/tiddlers/Hidden_Setting__Typing_Refresh_Delay.tid
@@ -0,0 +1,13 @@
+caption: Ajuste oculto: Retardo del teclado
+created: 20150619162409306
+es-title: Ajuste oculto: Retardo entre pulsaciones del teclado
+modified: 20160426153953083
+tags: [[Hidden Settings]]
+title: Hidden Setting: Typing Refresh Delay
+type: text/vnd.tiddlywiki
+
+Para asegurar que al escribir no haya errores de interpretación de las pulsaciones del teclado, TiddlyWiki retarda el procesamiento de cambios en el borrador durante un breve período. El valor por defecto de 400 ms da un nivel óptimo de respuesta en la mayoría de casos, pero no siempre es el más conveniente en dispositivos móviles de baja potencia. 
+
+Para modificar el tiempo de retardo, basta con cambiar el valor en milisegundos de este tiddler:
+
+$:/config/Drafts/TypingTimeout
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Hidden_Settings.tid b/editions/es-ES/tiddlers/Hidden_Settings.tid
new file mode 100644
index 000000000..0704650aa
--- /dev/null
+++ b/editions/es-ES/tiddlers/Hidden_Settings.tid
@@ -0,0 +1,13 @@
+caption: Ajustes ocultos
+created: 20150619162223882
+es-title: Ajustes ocultos
+modified: 20160426151522460
+tags: [[Customise TiddlyWiki]]
+title: Hidden Settings
+type: text/vnd.tiddlywiki
+
+Los ajustes de configuración de TiddlyWiki se exponen en el <<.button control-panel>>, pero algunos más avanzados no tienen interfaz propiamente dicha, por lo que, si es necesario, se editan directamente en los tiddlers de configuración.
+
+Arrastra los siguientes enlaces a tu wiki para cambiar estos ajustes. 
+
+<<list-links "[tag[Hidden Settings]]">>
diff --git a/editions/es-ES/tiddlers/Highlight_Plugin.tid b/editions/es-ES/tiddlers/Highlight_Plugin.tid
new file mode 100644
index 000000000..3d844d042
--- /dev/null
+++ b/editions/es-ES/tiddlers/Highlight_Plugin.tid
@@ -0,0 +1,12 @@
+caption: Highlight
+created: 20160107223417655
+es-title: Highlight
+list: 
+modified: 20160504052407652
+tags: [[Plugin Editions]]
+title: Highlight Plugin
+type: text/vnd.tiddlywiki
+
+Desarrollado para programadores, el plugin Highlight permite aplicar colores a la sintaxis del texto.
+
+See http://tiddlywiki.com/plugins/tiddlywiki/highlight/
diff --git a/editions/es-ES/tiddlers/How_to_add_a_banner_for_GitHub_contributions.tid b/editions/es-ES/tiddlers/How_to_add_a_banner_for_GitHub_contributions.tid
new file mode 100644
index 000000000..3d7e64d1e
--- /dev/null
+++ b/editions/es-ES/tiddlers/How_to_add_a_banner_for_GitHub_contributions.tid
@@ -0,0 +1,26 @@
+caption: Banner para contribuciones en GitHub
+created: 20141123094403948
+es-title: Cómo añadir un banner para pedir contribuciones en GitHub
+modified: 20160419135034099
+tags: Learning
+title: How to add a banner for GitHub contributions
+type: text/vnd.tiddlywiki
+
+Cuando editas un tiddler en http://tiddlywiki.com, aparece una pequeña banda de color rosa que te invita a editar la fuente del tiddler en GitHub. 
+
+Si usas Node.js, puedes reproducir este mismo efecto para tu propio ~TiddlyWiki, de la siguiente manera:
+
+# Asegúrate de incluir el siguiente ajuste en el archivo `tiddlywiki.info` de tu directorio:
+
+#> <pre><code>	"config": {
+		"retain-original-tiddler-path": true
+	}</code></pre>
+
+# Copia el tiddler [[$:/ContributionBanner]] a tu wiki 
+
+# Haz los siguientes cambios:
+
+## Modifica la URL del enlace en GitHub para que apunte a tu propio directorio 
+
+## Modifica la frase <<.word "¿Puedes ayudarnos a mejorar la documentación?">> del modo que mejor convenza a los lectores para que contribuyan contigo.
+## Ajusta convenientemente el enlace [[Mejorar la documentación de TiddlyWiki|Improving TiddlyWiki Documentation]] para que apunte en la dirección del tiddler que contiene las instrucciones.
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/How_to_add_a_new_tab_to_the_sidebar.tid b/editions/es-ES/tiddlers/How_to_add_a_new_tab_to_the_sidebar.tid
new file mode 100644
index 000000000..c254c603b
--- /dev/null
+++ b/editions/es-ES/tiddlers/How_to_add_a_new_tab_to_the_sidebar.tid
@@ -0,0 +1,20 @@
+caption: Añadir pestañas a la barra lateral
+created: 20141117000000000
+es-title: Cómo añadir pestañas a la barra lateral
+modified: 20160419144422300
+tags: Learning [[Customise TiddlyWiki]]
+title: How to add a new tab to the sidebar
+type: text/vnd.tiddlywiki
+
+Para crear una nueva pestaña en la barra lateral:
+
+# Crea un tiddler nuevo y ponle la [[etiqueta de sistema|SystemTags]] [[$:/tags/SideBar]]
+
+#* Si vas a crear un sumario o tabla de contenidos, puedes usar la [[macro de sumario |Table-of-Contents Macros]]. Tienes un ejemplo en el [[propio índice|TableOfContents]] de este sitio
+
+# Por defecto se usa el título del tiddler como título de la pestaña, pero puedes puentearlo con el campo `caption`
+
+#Para definir en qué orden tiene que aparecer la pestaña, puedes usar los campos `list-before` y `list-after`, tal como se indica en [[Etiquetas|Tagging]]
+#* P. ej.: establece el valor de `list-after` como [[$:/core/ui/SideBar/Open]] para colocar tu pestaña inmediatamente después de la solapa <<.sidebar-tab Open>>
+
+<<.tip "Nota: de igual manera, puedes crear nuevas pestañas dentro de la pestaña ''Más'', con la etiqueta `$:/tags/MoreSideBar`." >>
diff --git a/editions/es-ES/tiddlers/How_to_apply_custom_styles_by_tag.tid b/editions/es-ES/tiddlers/How_to_apply_custom_styles_by_tag.tid
new file mode 100644
index 000000000..3c83fec88
--- /dev/null
+++ b/editions/es-ES/tiddlers/How_to_apply_custom_styles_by_tag.tid
@@ -0,0 +1,54 @@
+caption: Estilos CSS con etiquetas
+created: 20141001132300000
+es-title: Cómo aplicar estilos CSS mediante etiquetas
+modified: 20160419152957461
+tags: Learning
+title: How to apply custom styles by tag
+type: text/vnd.tiddlywiki
+
+Se pueden aplicar estilos personalizados a tiddlers con una pestaña particular definiendo una clase CSS con el nombre `tc-tagged-<etiqueta>`.
+
+Por ejemplo: Para que una serie de tiddlers con la etiqueta <<.tag ~VistaNocturna>> se muestren con un esquema de colores apropiado para leer con poca luz, tendremos que [[crear una hoja de estilos|Using Stylesheets]] que defina la clase `tc-tagged-VistaNocturna`, del modo siguiente: 
+
+```
+.tc-tagged-VistaNocturna {
+	background-color:black;
+	color: orange;
+	padding: 35px 35px;
+}
+
+.tc-tagged-VistaNocturna .tc-tiddler-body {
+	font-size: 1.5em;
+}
+```
+La clase `tc-tagged-VistaNocturna` se aplica a todo el tiddler y no sólo al texto. Si queremos referirnos sólo a una parte del tiddler, se puede habilitar el selector CSS, como hemos hecho aquí con `.tc-tagged-NightReader .tc-tiddler-body`.
+
+Nótese que las etiquetas que contengan espacios o caracterres no alfanuméricos, para que CSS los interprete, tendrán que convertirse según la codificación URI, lo que hace que la clase CSS resultante sea difícil de predecir y más proclive a errores.
+
+Por ejemplo:
+
+|!Etiqueta |!Nombre de clase generado |
+|`$:/mytag` |`tc-tagged-%24%3A%2Fmytag` |
+|`Doctor Who` |`tc-tagged-Doctor%20Who` |
+|`£35.23` |`tc-tagged-%C2%A335.23` |
+
+Aunque ~TiddlyWiki generará las etiquetas, para usarlas en la hoja de estilos se tendrá que usar la correspondiente equivalencia en [[código porciento|https://es.wikipedia.org/wiki/C%C3%B3digo_porciento]]:
+
+```
+.tc-tagged-Doctor\%20Who {
+    background-image: url(./tardis_back.svg);
+    background-repeat: no-repeat;
+    background-position: right;
+    color:#FBFBFB;
+}
+```
+Hay disponible una función en ~JavaScript para realizar la conversión:
+
+```
+$tw.utils.tagToCssSelector("$:/tags/Stylesheet")
+```
+...que genera la siguiente respuesta:
+
+```
+tc-tagged-\%24\%3A\%2Ftags\%2FStylesheet
+```
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/How_to_export_tiddlers.tid b/editions/es-ES/tiddlers/How_to_export_tiddlers.tid
new file mode 100644
index 000000000..452a03613
--- /dev/null
+++ b/editions/es-ES/tiddlers/How_to_export_tiddlers.tid
@@ -0,0 +1,32 @@
+caption: Exportación de tiddlers
+created: 20151006145934884
+es-title: Cómo exportar tiddlers
+modified: 20160419161840318
+tags: Learning
+title: How to export tiddlers
+type: text/vnd.tiddlywiki
+
+!! Exportar todos los tiddlers
+
+Para exportar <<.em todos>> los tiddlers del wiki, haz clic en la pestaña <<.sidebar-tab Tools>> de la barra lateral y a continuación selecciona el botón <<.button export-page>>. Un menú desplegable te dará la opción de exportar los tiddlers en varios formatos.
+
+!! Exportar un solo tiddler
+
+Si quieres exportar un tiddler en particular, abre primero dicho tiddler y haz clic en el botón <<.button more-tiddler-actions>> de la barra. De la lista desplegable que aparece, selecciona la opción <<.button export-tiddler>>. Un menú desplegable te mostrará las diferentes opciones de exportación disponibles.
+
+!! Exportar tiddlers coincidentes con un criterio de búsqueda (filtros)
+
+Para exportar una selección de tiddlers, haz clic en la lupa junto al área de <<.button advanced-search>> de la barra lateral para abrir el tiddler de [[Búsqueda avanzada|$:/AdvancedSearch]]. Haz clic en la pestaña <<.advancedsearch-tab Filter>>, que es la que te permite exportar una selección de tiddlers y escribe el criterio de búsqueda conforme a la sintaxis empleada por los [[filtros|Filters]].
+
+Una vez escrita la expresión de filtrado, aparecerá la lista de tiddlers coincidentes con el criterio de búsqueda. Entonces puedes hacer clic en el botón {{$:/core/ui/Buttons/export-tiddler}}, a la derecha del campo de búsqueda. Un menú desplegable te ofrecerá las opciones de exportación disponibles.
+
+!! Formatos de exportación
+
+Actualmente, los formatos de exportación disponibles son:
+
+  * CSV
+  * JSON
+  * HTML estático
+  * archivo .tid
+
+<<.warning "La exportación en formato ''.tid'' difiere de las demás, ya que por ahora sólo es capaz de exportar un único tiddler --el primero de la lista--. Para exportar en este formato la selección entera, habrá que abrirlos todos y exportar manualmente tiddler por tiddler.">>
diff --git a/editions/es-ES/tiddlers/How_to_put_the_last_modification_date_in_a_banner.tid b/editions/es-ES/tiddlers/How_to_put_the_last_modification_date_in_a_banner.tid
new file mode 100644
index 000000000..bb94c4ef2
--- /dev/null
+++ b/editions/es-ES/tiddlers/How_to_put_the_last_modification_date_in_a_banner.tid
@@ -0,0 +1,34 @@
+caption: Banner de fecha de última modificación
+created: 20141020111002211
+es-title: Cómo mostrar en un banner la fecha de última modificación del wiki
+modified: 20160421093614488
+tags: Learning
+title: How to put the last modification date in a banner
+type: text/vnd.tiddlywiki
+
+Así es como se muestra la fecha de última modificación del wiki en un banner, en una esquina de la ventana:
+
+# [[Instala el plugin|Installing a plugin from the plugin library]] <<.def "Corner ribbon">> en ~TiddlyWiki.
+
+# Guarda y recarga el wiki
+
+# Crea un tiddler llamado [[$:/_MyRibbon]], con la etiqueta [[$:/tags/PageControls]] y el siguiente contenido:
+<div>
+
+```
+<div class="github-fork-ribbon-wrapper right">
+<div class="github-fork-ribbon" style="background-color:#DF4848;">
+<$list filter="[!is[system]!has[draft.of]!sort[modified]limit[1]]">
+<$link>
+<$view field="modified" format="date" template="DD mmm YYYY at 0hh:0mm"/>
+</$link>
+</$list>
+</div>
+</div>
+```
+</div>
+# Puedes cambiar el valor de `background-color` según tus preferencias
+
+# También puedes cambiar la posición de `right` a `right-bottom`
+
+## Para poner el banner a la izquierda, la etiqueta de [[MyRibbon|$:/_MyRibbon]] debe ser [[$:/tags/PageTemplate]] en lugar de [[$:/tags/PageControls]] y la posición `left`
diff --git a/editions/es-ES/tiddlers/ImageGallery_Example.tid b/editions/es-ES/tiddlers/ImageGallery_Example.tid
new file mode 100644
index 000000000..60a9a5bd0
--- /dev/null
+++ b/editions/es-ES/tiddlers/ImageGallery_Example.tid
@@ -0,0 +1,24 @@
+caption: Galería de imágenes
+created: 20140809113603449
+es-title: Ejemplo de galería de imágenes / hoja de contactos
+modified: 20160418044736941
+tags: Learning
+title: ImageGallery Example
+type: text/vnd.tiddlywiki
+
+Este es un ejemplo de uso de ListWidget y TranscludeWidget para mostrar una cuadrilla de las imágenes del sistema (es decir, de tiddlers con la etiqueta [[$:/tags/Image]]).
+
+<style>
+.my-gallery svg {
+width: 4em;
+height: 4em;
+margin: 1em;
+}
+</style>
+<div class="my-gallery">
+<$list filter="[all[tiddlers+shadows]tag[$:/tags/Image]]">
+<span title=<<currentTiddler>>>
+<$transclude/>
+</span>
+</$list>
+</div>
diff --git a/editions/es-ES/tiddlers/Images_in_WikiText.tid b/editions/es-ES/tiddlers/Images_in_WikiText.tid
new file mode 100644
index 000000000..eaac1396a
--- /dev/null
+++ b/editions/es-ES/tiddlers/Images_in_WikiText.tid
@@ -0,0 +1,38 @@
+caption: Imágenes en ~WikiText
+created: 20131205160221762
+es-title: Uso y manipulación de imágenes en WikiText
+modified: 20160427054751442
+tags: WikiText [[Working with TiddlyWiki]]
+title: Images in WikiText
+type: text/vnd.tiddlywiki
+
+! Inserción y formato de imágenes
+
+Se puede insertar y dar formato a imágenes con WikiText. La sintaxis para ello es la siguiente:
+
+`[img atributo [descripción|origen]]`
+
+!!Ejemplos:
+
+|!Acción |!Sintaxis |!Código de ejemplo |!Resultado |
+|Insertar imagen<br> (origen interno) |`[img[Título del tiddler con la imagen]]` |`[img[Motovun Jack.jpg]]` |[img[Motovun Jack.jpg]] |
+|Insertar imagen<br> (origen externo) |`[img[URL de la imagen]]` |`[img[http://tiddlywiki.com/favicon.ico]]` |[img[http://tiddlywiki.com/favicon.ico]] |
+|Insertar imagen<br> con descripción emergente |`[img[descripción|origen]]` |`[img[Descripción emergente|Motovun Jack.jpg ]]`<br><br>^^(Pasa el ratón por encima de la imagen para ver la descripción emergente)^^ |[img[Esta es una descripción emergente|Motovun Jack.jpg]] |
+|Insertar imagen <br>con atributos |`[img atributo[descripción|origen]]` |`[img width=100 [Motovun Jack.jpg]]` |[img width=100 [Motovun Jack.jpg]] |
+
+Los atributos pueden definirse directamente como el valor de clases CSS como ancho y altura o por [[transclusión|Transclusion]] o [[referencia|TextReference]] de variables.
+
+La sintaxis de imágenes en ~TiddlyWiki se compone de métodos abreviados para invocar ImageWidget.
+
+! Inserción de imágenes mediante transclusión de tiddlers
+
+También puede mostrarse la imagen contenida en un tiddler por [[transclusión|Transclusion]] de este, escribiendo el título del tiddler entre llaves. Esto simplifica muchas veces la inclusión, pero tiene la desventaja de no poder controlar directamente el tamaño de la imagen.
+
+
+`{{Motovun Jack.jpg}}` se muestra como:
+
+{{Motovun Jack.jpg}}
+
+!Uso de imágenes externas
+
+{{ExternalImages}}
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/ImportTiddlers.tid b/editions/es-ES/tiddlers/ImportTiddlers.tid
new file mode 100644
index 000000000..934188c25
--- /dev/null
+++ b/editions/es-ES/tiddlers/ImportTiddlers.tid
@@ -0,0 +1,15 @@
+caption: Importación
+created: 20130825162000000
+es-title: Importar tiddlers
+modified: 20160429043819830
+tags: Features
+title: ImportTiddlers
+type: text/vnd.tiddlywiki
+
+En ~TiddlyWiki puedes importar contenido de varias maneras:
+
+* Usa el botón <<.button import>>, en la pestaña <<.sidebar-tab Tools>> de la barra lateral para seleccionar un archivo local
+
+* Arrastra archivos desde cualquier ventana de tu escritorio a la del navegador
+* Copia contenido directamente del portapapeles mediante la opción del menú, o pulsando <<.keycombo Ctrl V>>/<<.keycombo Cmmd V>>
+** Por el momento, únicamente Chrome/Chromium permite esta acción
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Improving_TiddlyWiki_Documentation.tid b/editions/es-ES/tiddlers/Improving_TiddlyWiki_Documentation.tid
new file mode 100644
index 000000000..35691e51e
--- /dev/null
+++ b/editions/es-ES/tiddlers/Improving_TiddlyWiki_Documentation.tid
@@ -0,0 +1,45 @@
+caption: Proponer mejoras en documentación
+created: 20140820151051019
+es-title: Mejorar la documentación de TiddlyWiki
+modified: 20160419141618531
+tags: Community
+title: Improving TiddlyWiki Documentation
+type: text/vnd.tiddlywiki
+
+Cualquiera puede proponer mejoras en la documentación de TiddlyWiki que aparece en http://tiddlywiki.com.
+
+# Lee y sigue la [[Guía de estilo para documentación |Documentation Style Guide]]
+
+# Date de alta en https://github.com
+
+# Si no lo has hecho aún, firma el [[acuerdo de licencia de contribución|Contributor License Agreement]]
+
+# En http://tiddlywiki.com, haz clic en el botón <<.button "edit">> del tiddler que quieres mejorar
+
+# Aparecerá un banner de color rosa con el texto <<.em "Can you help us improve this documentation? Find out how to edit this tiddler on ~GitHub">>
+
+## Haz clic en el enlace externo <<.dlink-ex "this tiddler on ~GitHub">>
+
+## Se te indicará que necesitas hacer un <<.def fork>> del repositorio para poder proponer cambios. Un <<.def fork>> es una copia del repositorio que incluirá los cambios que propongas.
+
+# Se abrirá una nueva ventana en el navegador, con el tiddler listo para editar en github.com
+
+# Bajo la ventana de edición del tiddler, verás un cuadro titulado <<.word "Propose file change">>
+
+# Escribe un breve título que explique la naturaleza del cambio, p. ej.: <<.word "Sustitución de formato directo por estilos">>
+
+# Si es necesario, puedes desarrollarlo convenientemente más abajo
+
+# Haz clic en el botón verde <<.word "Propose file change">>
+
+# En la página siguiente, pulsa el botón verde <<.word "Create pull request">>
+
+[[Jermolene|https://github.com/Jermolene]] u otro de los desarrolladores principales tendrán así la oportunidad de incorporar tus cambios en la próxima edición de http://tiddlywiki.com.
+
+Mario Pietsch ha creado estos videotutoriales al respecto:
+
+<iframe width="560" height="315" src="http://www.youtube.com/embed/L4zTkMYcri8" frameborder="0" allowfullscreen></iframe>
+
+<iframe width="560" height="315" src="http://www.youtube.com/embed/6ElUruH92tc" frameborder="0" allowfullscreen></iframe>
+
+<iframe width="560" height="315" src="http://www.youtube.com/embed/axFCk9KsMFc" frameborder="0" allowfullscreen></iframe>
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/InfoPanel.tid b/editions/es-ES/tiddlers/InfoPanel.tid
new file mode 100644
index 000000000..d354db01c
--- /dev/null
+++ b/editions/es-ES/tiddlers/InfoPanel.tid
@@ -0,0 +1,23 @@
+caption: InfoPanel
+created: 20150917193630604
+es-title: Panel de información de tiddler
+modified: 20160429043844918
+tags: Features
+title: InfoPanel
+type: text/vnd.tiddlywiki
+
+Cada tiddler contiene un panel oculto con información adicional. Para mostrarlo, haz clic en el botón <<.button more-tiddler-actions>> en la barra del título y selecciona el botón <<.button info>> en la lista desplegable.
+
+El InfoPanel contiene las siguientes pestañas:
+
+* <<.info-tab Tools>> ofrece botones para realizar diferentes acciones. Puedes seleccionar el botón que quieras añadir a la barra del tiddler marcando la casilla que tiene al lado. Esto afectará a todos los tiddlers en el wiki. 
+
+* <<.info-tab References>>, <<.info-tab Tagging>>, <<.info-tab List>> y <<.info-tab Listed>> dan un listado de diferentes tipos de tiddlers relacionados con el actual. Ver [[uso de links para navegar entre tiddlers |Using links to navigate between tiddlers]]
+
+* <<.info-tab Fields>> da una lista de los [[campos|TiddlerFields]] contenidos en el tiddler, excepto <<.field text>>
+
+* <<.info-tab Advanced>> indica si el tiddler es de tipo [[oculto|ShadowTiddlers]]. Si lo es, dice también de qué plugin forma parte y si está o no anulado por un tiddler común. 
+
+* <<.example-tab "Sources">> indica el origen, en el sitio de TiddlyWiki, de aquellos tiddlers que forman parte de la documentación oficial, donde se lo encuentra como página HTML estática. En tal caso, para facilitar contribuciones que mejoren la documentación, se muestra también la ruta del archivo original en GitHub.
+
+Para cerrar el panel, basta con hacer clic fuera de él.
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Informacion_para_traductores.tid b/editions/es-ES/tiddlers/Informacion_para_traductores.tid
new file mode 100644
index 000000000..d9cb18c2f
--- /dev/null
+++ b/editions/es-ES/tiddlers/Informacion_para_traductores.tid
@@ -0,0 +1,29 @@
+created: 20141115212945847
+list-after: RoadMap
+modified: 20160511152131764
+tags: $:/tags/SideBar About
+title: Información para traductores
+type: text/vnd.tiddlywiki
+
+Para contribuir con esta traducción de la documentación de //tiddlywiki.com//, lo suyo, cuando esté lista, es ver en la página del proyecto, qué tiddlers necesitan traducción, actualización o corrección.
+Evite los tiddlers etiquetados como "en proceso", porque como la etiqueta indica, ya hay gente trabajando en ellos. A continuación:
+
+*Si trabaja en Node.js con un //clon de Git// de la edición `es_ES`, puede traducir a partir de su clon, respetando únicamente el par de indicaciones que se dan más abajo y proponer un //pull request// en ~GitHub, ayudándose, si hiciera falta, de la [[documentación|Improving TiddlyWiki Documentation]].
+*Si no, traduzca directamente, bien en línea, bien en una copia de la página http://tw5es-es.tiddlyspot.com. 
+*Cuando termine:
+**exporte su trabajo a [[un fichero JSON|Exporter un sous-ensemble de tiddlers]]
+**envíe el archivo a paulus-arroba-alamier-punto-com para que pueda efectuar el correspondiente //pull request// en ~GitHub, o bien
+**cuelgue el archivo en algún lugar accesible (en Dropbox, por ejemplo) y publique el enlace en el [[grupo de TiddlyWiki|https://groups.google.com/forum/#!forum/tiddlywiki]]
+
+No tenemos aún mecanismos demasiados sofisticados para gestionar el trabajo de traducción en paralelo (las plataformas que lo permiten cuestan un dineral), por lo que se ruega que actualice y comparta su trabajo con frecuencia. Es preferible enviar un tiddler por vez --que no es molestia alguna, en serio-- que darse cuenta demasiado tarde de que se está trabajando en paralelo --lo que sí puede ser un lío a veces--.
+
+Al trabajar en la traducción, tenga en cuenta lo siguiente:
+
+*''Los títulos de los tiddlers no se traducen'': Para que el sistema funcione correctamente, no deben modificarse los títulos en inglés de los tiddlers. 
+**La traducción del título se hace en el campo `es-title`, usando, cuando sea necesario, el formato ~WikiText para los [[enlaces|Linking in WikiText]].
+**Traduzca también el campo `caption`, tanto para tener una versión reducida del título (ej: Enlaces en Wikitext => Enlaces) para incluirla en enlaces, como para su visualización en pestañas.
+
+*''Sírvase del glosario'': con la intención de disponer de una base terminológica común que dé coherencia a la traducción y que sirva para posteriores trabajos, estamos trabajando en un [[glosario|Glosario en-GB->es-ES]], para el que se ruega colaboración, comentario y crítica.
+
+*''Tiene a su disposición algunas abreviaturas'' que facilitan la escritura de algunos caracteres, como las comillas tipográficas (<<gf>>), o palabras que se repiten con frecuencia como <<tw>> o que son complicadas de componer, como <<latex>>.
+**Estas abreviaturas están definidas como macros en el tiddler [[$:/editions/es-ES/util-macros]]. No dude en añadir las que considere necesarias.
diff --git a/editions/es-ES/tiddlers/Installing_TiddlyWiki_on_Node.js.tid b/editions/es-ES/tiddlers/Installing_TiddlyWiki_on_Node.js.tid
new file mode 100644
index 000000000..ba2c6ddfe
--- /dev/null
+++ b/editions/es-ES/tiddlers/Installing_TiddlyWiki_on_Node.js.tid
@@ -0,0 +1,49 @@
+created: 20131219100608529
+es-title: Instalar TiddlyWiki en Node.js
+modified: 20160603132303620
+tags: [[TiddlyWiki on Node.js]]
+title: Installing TiddlyWiki on Node.js
+type: text/vnd.tiddlywiki
+
+# Descarga e instala [[Node.js]] desde la página oficial: http://nodejs.org
+
+#Abre una terminal de línea de comandos y teclea:
+
+#> `npm install -g tiddlywiki` (ver nota * más abajo)
+
+#> Si te da fallo, necesitas volver a ejecutar la orden como administrador:
+
+#> `sudo npm install -g tiddlywiki` (Mac/Linux)
+
+# Comprueba que TiddlyWiki se ha instalado con el comando:
+
+#> `tiddlywiki --version`
+
+# Si todo está bien, TiddlyWiki devolverá el número de versión (p. ej, en este caso, <<version>>. Puede que también muestre alguna información complementaria, de depuración. 
+
+# Probemos a ponerlo en marcha:
+
+## `tiddlywiki miwiki --init server` creará, en el mismo directorio en el que hayas abierto la consola, una carpeta llamada ''miwiki'', con los componentes necesarios.
+
+## `tiddlywiki miwiki --server` pondrá en marcha TiddlyWiki, que podrás ver y editar en el navegador.
+
+## Abre el navegador y escribe http://127.0.0.1:8080/ (o __localhost:8080__) en la barra de direcciones.
+
+## Crea y edita tiddlers del modo acostumbrado. Los cambios se guardarán automáticamente en la carpeta ''miwiki/tiddlers''
+
+## Para apagar TiddlyWiki, cierra el navegador y haz ''Ctrl-C'' en la línea de comandos (o ciérrala: la consola te advertirá de que al hacerlo //matarás// el proceso en marcha. Confirma y listo)
+
+# # Como opción, puedes hacer una copia offline del wiki:
+
+#* Con TiddlyWiki abierto en el navegador, haz click en el botón ''Guardar cambios'' {{$:/core/images/save-button}} de la barra lateral
+
+#* Con TiddlyWiki apagado y desde el mismo directorio desde donde lo iniciaste, teclea el siguiente comando en la consola:
+
+#>`tiddlywiki --build index`
+
+
+> ''Nota:'' El argumento `-g` hace que TiddlyWiki se instale globalmente (es decir, en todo el equipo). Sin él, TiddlyWiki estará disponible __únicamente en el directorio desde el que lo instales__.
+
+> ''Si usas Debian'' o un sistema basado en Debian y recibes un mensaje del tipo `node: command not found` pese a haber instalado node.js, puede que necesites crear un enlace simbólico entre `nodejs` y `node`. En tal caso, consulta el manual de tu distribución de Linux y `whereis` ([[más información sobre este comando|https://en.wikipedia.org/wiki/Whereis]]) para crearlo correctamente (ver también [[issue 1434|http://github.com/Jermolene/TiddlyWiki5/issues/1434]] en GitHub).
+
+>Ejemplo en Debian v8.0: `sudo ln -s /usr/bin/nodejs /usr/bin/node`
diff --git a/editions/es-ES/tiddlers/Installing_a_plugin_from_the_plugin_library.tid b/editions/es-ES/tiddlers/Installing_a_plugin_from_the_plugin_library.tid
new file mode 100644
index 000000000..e99691bad
--- /dev/null
+++ b/editions/es-ES/tiddlers/Installing_a_plugin_from_the_plugin_library.tid
@@ -0,0 +1,29 @@
+caption: Librería oficial de plugins
+created: 20160107222352710
+es-title: Cómo instalar plugins desde la librería oficial
+modified: 20160504155725022
+tags: Plugins
+title: Installing a plugin from the plugin library
+type: text/vnd.tiddlywiki
+
+# Sólo [[por si acaso|The First Rule of Using TiddlyWiki]], haz copia de seguridad de tu archivo HTML de ~TiddlyWiki
+
+# Abre ~TiddlyWiki en el navegador
+
+# Abre la pestaña <<.controlpanel-tab Plugins>> del [[Panel de control|$:/ControlPanel]]
+
+# Pincha en el botón <<.word "Obtén complementos y extensiones">> para abrir la librería oficial
+
+# Cuando se haya cargado la librería:
+
+## Selecciona la pestaña adecuada al tipo de plugin que buscas
+
+## Desplázate o usa el cuadro para encontrar lo que buscas
+
+# Pincha el botón <<.word "instalar>>
+
+# Guarda los cambios con el botón <<.button save-wiki>>
+
+# Recarga la página
+
+# El plugin está instalado y listo para su uso
diff --git a/editions/es-ES/tiddlers/Instruction_Tiddlers.tid b/editions/es-ES/tiddlers/Instruction_Tiddlers.tid
new file mode 100644
index 000000000..e6f674066
--- /dev/null
+++ b/editions/es-ES/tiddlers/Instruction_Tiddlers.tid
@@ -0,0 +1,58 @@
+caption: Estilo: Material didáctico
+created: 20150110101500000
+es-title: Guía de estilo para la redacción de material didáctico
+modified: 20160418141755791
+tags: [[Improving TiddlyWiki Documentation]]
+title: Instruction Tiddlers
+type: text/vnd.tiddlywiki
+
+Las <<.def "instruciones de uso">> hablan directamente al lector --presumiblemente principiante o intermedio-- y lo guían a través de determinado proceso. 
+
+Estos pueden subcategorizarse como:
+
+;BIenvenida
+* ¿Qué es ~TiddlyWiki y qué me importa?
+
+* Demostraciones de características clave y sus beneficios para el usuario
+
+* Preguntas de uso frecuente
+
+* Ejemplos reales de uso de ~TiddlyWiki
+
+* Información sobre el proyecto en sí
+
+;Tutorial
+
+* Presentación ordenada de material para novatos
+
+* Cada tiddler presenta un tema o un concepto nuevo
+
+* Su contenido principal contiene muy pocos enlaces
+
+* Una sección de información complementaria <<.word "para saber más....">> puede ofrecer enlaces relacionados al final del artículo
+
+;Ejercicio
+
+* Acompaña al tutorial
+
+* Da la solución a pedido del usuario
+
+;Guía paso-a-paso (How-to)
+
+* Lista de pasos numerados para realizar pequeñas tareas específicas
+
+* Concisa, con enlace a tiddlers de referencia cuando sea necesario y apropiado
+
+* Suele abrirlo un preámbulo para aclarar la naturaleza y objetivos de la tarea
+
+;Ejemplo
+
+* Acompaña a [[tiddlers de referencia|Reference Tiddlers]]
+
+* Puede contener explicaciones y comentarios similares
+
+* Para que la información de referencia sea lo más aséptica posible, debe mantenerse separado de esta.
+
+Las instrucciones de uso hablan al lector directamente y <<.word "de tú">> y pueden ser razonablemente informales en su tono, pero debe evitarse el uso de coloquialismos, regionalismos, referencias culturales y humorísticas, ya que pueden desconcertar o incluso ofender a lectores internacionales. 
+
+Al hablar de características y procedimientos, hay que intentar no frustrar al lector abusando de expresiones como <<.word conveniente>> o <<.word fácil>>. 
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Interactive_Git_Documentation_by_Devin_Weaver.tid b/editions/es-ES/tiddlers/Interactive_Git_Documentation_by_Devin_Weaver.tid
new file mode 100644
index 000000000..e15bc6197
--- /dev/null
+++ b/editions/es-ES/tiddlers/Interactive_Git_Documentation_by_Devin_Weaver.tid
@@ -0,0 +1,18 @@
+caption: "Interactive Git Documentation", de Devin Weaver
+created: 20150621212120755
+es-title: "Interactive Git Documentation", de Devin Weaver
+modified: 20160417095622425
+tags: Examples
+title: Interactive Git Documentation by Devin Weaver
+type: text/vnd.tiddlywiki
+url: http://sukima.github.io/GitFixUm/
+
+Guía para arreglar un repositorio //roto// de Git, al estilo //elige tu propia aventura//
+
+{{!!url}}
+
+<<<
+Este documento es un intento de hacer una guía bastante exhaustiva para recuperar un repositorio de Git de lo que no tenías intención de hacer.
+
+No es que Git sea tan complicado que necesites todo un libro para resolver tu problema en particular, sino que el abanico de cosas que puedes haber hecho para armar lío es tan grande, que se necesitan varias técnicas para solucionarlo, dependiendo de qué hayas hecho y de qué querías hacer. 
+<<<
diff --git a/editions/es-ES/tiddlers/Introducing_TiddlyDesktop_Video.tid b/editions/es-ES/tiddlers/Introducing_TiddlyDesktop_Video.tid
new file mode 100644
index 000000000..4e6301dbe
--- /dev/null
+++ b/editions/es-ES/tiddlers/Introducing_TiddlyDesktop_Video.tid
@@ -0,0 +1,11 @@
+caption: Video: TiddlyDesktop
+created: 20140126124827076
+es-title: Video de introducción a TiddlyDesktop
+modified: 20160417154652337
+tags: Videos TiddlyDesktop
+title: Introducing TiddlyDesktop Video
+type: text/vnd.tiddlywiki
+
+Esta breve introducción muestra cómo instalar y usar TiddlyDesktop (en inglés):
+
+<iframe width="560" height="315" src="http://www.youtube.com/embed/i3Bggkm7paA" frameborder="0" allowfullscreen></iframe>
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Introduction_Video.tid b/editions/es-ES/tiddlers/Introduction_Video.tid
new file mode 100644
index 000000000..928922e24
--- /dev/null
+++ b/editions/es-ES/tiddlers/Introduction_Video.tid
@@ -0,0 +1,15 @@
+caption: Video: Principios básicos
+created: 20141126153016142
+es-title: Principios básicos
+modified: 20160417154600552
+tags: Videos [[Working with TiddlyWiki]]
+title: Introduction Video
+type: text/vnd.tiddlywiki
+
+Esta breve presentación expone los principios básicos de TiddlyWiki.
+
+<iframe width="560" height="315" src="http://www.youtube.com/embed/KtCUr83XgyE" frameborder="0" allowfullscreen></iframe>
+
+El TiddlyWiki usado para este video se encuentra aquí:
+
+http://tiddlywiki.com/editions/introduction/
diff --git a/editions/es-ES/tiddlers/Introduction_to_filter_notation.tid b/editions/es-ES/tiddlers/Introduction_to_filter_notation.tid
new file mode 100644
index 000000000..51d6e9c61
--- /dev/null
+++ b/editions/es-ES/tiddlers/Introduction_to_filter_notation.tid
@@ -0,0 +1,97 @@
+caption: FIltros: Introducción
+created: 20140410101941871
+es-title: Introducción a la notación de filtros
+modified: 20160420173056133
+tags: Learning Filters
+title: Introduction to filter notation
+type: text/vnd.tiddlywiki
+
+<<.preamble """Aquí se tratan los fundamentos de la creación de [[filtros|Filters]] para obtener una selección de tiddlers. Para una exposición más técnica del tema, véase [[Sintaxis de filtros|Filter Syntax]].""">>
+
+<$macrocall $name=".tip" _="""Los filtros no hacen nada por sí mismos. Necesitan siempre un contexto. La manera más sencilla de experimentar con expresiones de filtro es escribirlos en el campo de búsqueda de la pestaña <<.advancedsearch-tab Filter>>, en la [[Búsqueda avanzada|$:/AdvancedSearch]]."""/>
+
+El caso más simple es aquel en que ya conoces exactamente qué tiddlers quieres seleccionar. Escribe cada título en corchetes dobles, separados por por un espacio:
+
+> `[[Libro de recetas]] [[HuevosRevueltos]] [[Tarta de manzana de mamá]]`
+
+Se pueden opitir los corchetes si el título no contiene espacios:
+
+> `[[Libro de recetas]] HuevosRevueltos [[Tarta de manzana de mamá]]`
+
+Los corchetes dobles son, de hecho, la abreviatura de un filtro:
+
+> `[title[HuevosRevueltos]]`
+
+... que nos sirve de <<.def "modelo genera">> para cualquier filtro:
+
+> `[operador[parámetro]]`
+
+Por ejemplo: Para seleccionar todos los tiddlers etiquetados como <<.tag Receta>>:
+operador
+> `[tag[Recetas]]`
+
+Podemos invertir el significado añadiendo un signo de exclamación `!` al operador. Así, por ejemplo, para seleccionar aquellos tiddlers que <<.em no>> contengan la etiqueta <<.tag Recetas>>, escribiremos:
+
+> `[!tag[Recipe]]`
+
+Se pueden filtrar tiddlers por otros campos, no sólo por título y etiqueta: 
+
+> `[field:raciones[4]]`
+
+Con este ejemplo se seleccionarán todos aquellos tiddlers que tengan <<.value 4>> como valor del campo <<.field raciones>>.
+
+Como la palabra "raciones" no es operador estándar de filtro y es improbable que alguna vez lo sea, se puede omitir sin peligro alguno el prefijo `field:`
+
+> `[raciones[4]]` 
+
+!!Combinaciones
+
+Los filtros vistos hasta ahora constan de un único paso, pero se se puede ejecutar una <<.def instrucción>> que consta de varios varios <<.def pasos>>, del modo siguiente:
+
+> `[tag[Vegetariano]!tag[sopas]raciones[4]]`
+
+>(Nótese cómo la instrucción entera queda encerrada por corchetes.
+
+Un tiddler debe coincidir con <<.em todos>> los pasos de la instrucción. Así, el ejemplo anterior nos devolverá una lista de recetas vegetarianas --excepto sopas--, para 4 personas.
+
+Una secuencia de instrucciones separadas seleccionará los tiddlers que coincidan con <<.em cualquiera>> de ellas. Puede servirnos para, por ejemplo, encontrar recetas para 3, 4 ó 5 personas, es decir, que cumplan <<.em cualquiera>> de las condiciones impuestas por estas: la primera, la segunda <<.def O>> la tercera.
+
+> `[raciones[3]] [raciones[4]] [raciones[5]]`
+
+Y, si quisiéramos ignorar las recetas vegetarianas para 4 personas, podríamos decir:
+
+> `[raciones[3]] [raciones[4]!tag[Vegetariano]] [serving[5]]`
+
+Por defecto, cada instrucción toma en consideración todos los tiddlers del wiki, pero podemos usar el signo `+` para restringir la acción de una instrucción a los tiddlers seleccionados por las precedentes, del modo que el resultado cumpla <<.em todas>> las condiciones: la anterior <<.def Y>> esta.
+
+> `[raciones[3]] [raciones[4]] [raciones[5]] + [tag[Vegetariano]] +[sort[title]]`
+
+Asi seleccionaremos recetas para 3, 4 ó 5 personas y <<.em "de entre estas, únicamente">> las vegetarianas, para, finalmente, ordenarlas por orden alfabético de sus títulos.
+
+De forma análoga podemos usar el signo `-` para <<.em eliminar>> los tiddlers que cumplen determinada condición de los resultados obtenidos hasta el momento, de modo que se cumplan unas condiciones <<.def "Y NO">> las otras. 
+
+Así podemos, por ejemplo, seleccionar todas las recetas vegetarianas salvo dos de ellas en particular:
+
+> `[tag[Vegetariano]] -[title[HuevosRevueltos]] -RopaVieja`
+
+...o todas las recetas sin gluten, menos las vegetarianas:
+
+> `[raciones[3]] [raciones[4]] [raciones[5]] + [tag[Sin gluten]] -[tag[Vegetariano]] +[sort[title]]`
+
+!!Parámetros especiales
+
+Los parámetros de cada instrucción de filtrado vista hasta el momento se indica entre corchetes, significando con ello que ~TiddlyWiki debe interpretarlos literalmente, pero tenemos otras formas de indicar parámetros:
+
+<<.def "Entre llaves">> `{}`, para indicar que el parámetro es una [[referencia de texto|TextReference]] y que debe buscar su valor en el <<.field texto>> de un tiddler en particular. 
+
+Por ejemplo: si tenemos un tiddler llamado <<.tid Preferencias>>, cuyo texto es la palabra <<.value Vegetariano>>, podemos decir
+
+> `[tag{Preferencias}]`
+
+como alternativa a `[tag[Vegetariano]]`. Esto permite que las preferencias cambien, sin necesidad de modificar el criterio de búsqueda.
+
+<<.def "Entre comillas angulares simples">> `<>`, para indicar que el parámetro es el nombre de una [[variable|Variables]] cuyo valor debe usar. 
+
+Aquí usaremos la variable incorporada <<.vlink currentTiddler>> en un filtro que selecciona todos los tiddlers cuyo texto contiene el título del actual:
+
+> `[search<currentTiddler>]`
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/JavaScript.tid b/editions/es-ES/tiddlers/JavaScript.tid
new file mode 100644
index 000000000..65564d13e
--- /dev/null
+++ b/editions/es-ES/tiddlers/JavaScript.tid
@@ -0,0 +1,15 @@
+created: 20130825142100000
+modified: 20160504163509529
+tags: Definitions
+title: JavaScript
+type: text/vnd.tiddlywiki
+
+~JavaScript es un lenguaje de programación originariamente para incluir pequeños //scripts// en páginas web. Por ese motivo se lo consideraba más un juguete que un lenguaje en sí. Con los años, sin embargo, se ha reconocido su potencial y se ha ganado por propio derecho un lugar en la programación más allá de los límites del propio navegador y la web. 
+
+~JavaScript tiene este aspecto:
+
+```
+function circleArea(radius) {
+	return radius * 2 * 3.141592653;
+}
+```
diff --git a/editions/es-ES/tiddlers/KaTeX_Plugin.tid b/editions/es-ES/tiddlers/KaTeX_Plugin.tid
new file mode 100644
index 000000000..8ce83cd8d
--- /dev/null
+++ b/editions/es-ES/tiddlers/KaTeX_Plugin.tid
@@ -0,0 +1,12 @@
+caption: ~KaTeX
+created: 20160107223410181
+es-title: KaTeX
+list: 
+modified: 20160504052624108
+tags: [[Plugin Editions]]
+title: KaTeX Plugin
+type: text/vnd.tiddlywiki
+
+Este plugin permite mostrar notación matemática escrita en ~LaTeX.
+
+Disponible en: http://tiddlywiki.com/plugins/tiddlywiki/katex/
diff --git a/editions/es-ES/tiddlers/KeyboardShortcuts.tid b/editions/es-ES/tiddlers/KeyboardShortcuts.tid
new file mode 100644
index 000000000..7b6074ead
--- /dev/null
+++ b/editions/es-ES/tiddlers/KeyboardShortcuts.tid
@@ -0,0 +1,15 @@
+caption: Atajos de teclado
+created: 20140526204527418
+es-title: Atajos de teclado
+modified: 20160423061920763
+tags: Features [[Working with TiddlyWiki]]
+title: KeyboardShortcuts
+type: text/vnd.tiddlywiki
+
+~TiddlyWiki ofrece actualmente un muy limitado soporte de atajos de teclado, pero está en proyecto desarrollarlo en próximas ediciones.
+
+!! Atajos de edición
+
+|Teclas |Descripción |
+|<kbd>ctrl-enter</kbd> |Confirmar los cambios realizados en el borrador en foco |
+|<kbd>escape</kbd> |Descartar los cambios realizados y abandonar la edición del borrador en foco |
diff --git a/editions/es-ES/tiddlers/Kill_the_Dragon.tid b/editions/es-ES/tiddlers/Kill_the_Dragon.tid
new file mode 100644
index 000000000..30690108d
--- /dev/null
+++ b/editions/es-ES/tiddlers/Kill_the_Dragon.tid
@@ -0,0 +1,10 @@
+caption: Matar al dragón
+created: 20130825143100000
+es-title: Matar al dragón
+list-before: Get the Ring
+modified: 20160418045703741
+tags: task
+title: Kill the Dragon
+type: text/vnd.tiddlywiki
+
+//Tarea de muestra para el [[Ejemplo de administración de tareas|TaskManagementExample]]//
diff --git a/editions/es-ES/tiddlers/Languages.tid b/editions/es-ES/tiddlers/Languages.tid
new file mode 100644
index 000000000..fa3c13f2b
--- /dev/null
+++ b/editions/es-ES/tiddlers/Languages.tid
@@ -0,0 +1,19 @@
+caption: Idiomas
+created: 20141202125500000
+es-title: Idiomas
+modified: 20160503163510984
+tags: TableOfContents
+title: Languages
+type: text/vnd.tiddlywiki
+
+!! Plugins de idioma
+
+La interfaz de usuario de ~TiddlyWiki está disponible en más de 20 idiomas. Puedes instalar cualquiera de ellos desde el panel de control, en la pestaña <<.controlpanel-tab Plugins>>.
+
+Aprendiendo a [[traducir TiddlyWiki|Translate TiddlyWiki into your language]] a tu idioma puedes contribuir a ampliar la librería. 
+
+!! Ediciones en otros idiomas
+
+Existen ediciones precompiladas en algunos idiomas, que contienen documentación adicional:
+
+<<list-links "[tag[Languages]]">>
diff --git a/editions/es-ES/tiddlers/Latest.tid b/editions/es-ES/tiddlers/Latest.tid
new file mode 100644
index 000000000..844a46622
--- /dev/null
+++ b/editions/es-ES/tiddlers/Latest.tid
@@ -0,0 +1,27 @@
+caption: Novedades
+created: 20140321090511826
+es-title: Novedades
+modified: 20160413160205281
+tags: Community
+title: Latest
+type: text/vnd.tiddlywiki
+
+Las últimas noticias, artículos, recursos y ejemplos.
+
+<div class="tc-link-info">
+
+<$list filter="[tag[Articles]] [tag[Examples]] [tag[Resources]] [tag[Tutorials]] +[!sort[modified]limit[8]]">
+
+<div class="tc-link-info-item">
+
+! <$link><$view field="title"/></$link>
+
+<div class="tc-subtitle">Posted <$view field="modified" format="relativedate"/></div>
+
+<$transclude/>
+
+</div>
+
+</$list>
+
+</div>
diff --git a/editions/es-ES/tiddlers/LazyLoading.tid b/editions/es-ES/tiddlers/LazyLoading.tid
new file mode 100644
index 000000000..6d4ba7ed9
--- /dev/null
+++ b/editions/es-ES/tiddlers/LazyLoading.tid
@@ -0,0 +1,34 @@
+caption: Carga diferida
+created: 20140206214608586
+es-title: Carga diferida o Lazy Loading
+modified: 20160503054340337
+tags: Features
+title: LazyLoading
+type: text/vnd.tiddlywiki
+
+Generalmente, todo el contenido de todos los tiddlers se incrusta en el archivo HTML principal. <<.def "Lazy loading">> o <<.def "Carga diferida">> es la técnica por la que sólo se incrustan los metadatos del tiddler (es decir, todos los campos menos <<.field text>>), que se pide al servidor cuando se necesita. ([[Más información, aquí|https://es.wikipedia.org/wiki/Lazy_loading]])
+
+Puede aplicarse carga diferida en dos configuraciones:
+
+* En [[Node.js|TiddlyWiki on Node.js]] se puede aplicar a los tiddlers de imágenes o a todos los tiddlers excepto los de sistema
+
+* En [[TiddlyWiki in the Sky for TiddlyWeb]], se puede aplicar a todos los tiddlers
+
+! Carga diferida en Node.js
+
+Para iniciar ~TiddlyWiki en carga diferida de imágenes, utiliza este comando: 
+
+```
+tiddlywiki --server 8080 $:/core/save/lazy-images
+```
+
+para aplicar la carga diferida a todos los tiddlers salvo los de sistema, utiliza este este otro:
+
+```
+tiddlywiki --server 8080 $:/core/save/lazy-all
+```
+
+! Carga diferida en TiddlyWeb
+
+En la configuración actual, la carga diferida se aplica por defecto.
+
diff --git a/editions/es-ES/tiddlers/Learning.tid b/editions/es-ES/tiddlers/Learning.tid
new file mode 100644
index 000000000..0f6209f3c
--- /dev/null
+++ b/editions/es-ES/tiddlers/Learning.tid
@@ -0,0 +1,14 @@
+caption: Aprender TIddlyWiki
+created: 20140912140047779
+es-title: Aprende a usar TiddlyWiki
+list: Videos [[Introduction to Filters]] [[Sharing a TiddlyWiki on Dropbox]] [[Sharing your tiddlers with others]] [[Copying tiddlers between TiddlyWiki files]] [[Creating SubStories]] [[Editing Tiddlers with Emacs]] [[ImageGallery Example]] [[Making curved text with SVG]] TaskManagementExample [[Adding a Twitter Follow button]] [[Philosophy of Tiddlers]] [[Adopt a Titles Policy]]
+modified: 20160421063611395
+tags: TableOfContents
+title: Learning
+type: text/vnd.tiddlywiki
+
+Aprende a usar TiddlyWiki:
+
+<<list-links "[tag[Learning]]">>
+
+MIra también la [[documentación|Reference]] completa, que incluye nociones avanzadas de WikiText, macros, widgets, filtros... etc.
diff --git a/editions/es-ES/tiddlers/ListField.tid b/editions/es-ES/tiddlers/ListField.tid
new file mode 100644
index 000000000..de1caf876
--- /dev/null
+++ b/editions/es-ES/tiddlers/ListField.tid
@@ -0,0 +1,17 @@
+caption: list
+created: 20130830092500000
+es-title: Campo "list"
+modified: 20160415043859028
+tags: Fields
+title: ListField
+type: text/vnd.tiddlywiki
+
+El [[campo|TiddlerFields]] `list` es una característica opcional que se usa para estructurar contenido. Su valor es una [[lista|Title List]] y puede usarse de varias maneras:
+
+* El campo `list` de un tiddler que se usa como etiqueta determina el orden en que se presentan los tiddlers que llevan esa etiqueta. Más detalles en [[Etiquetas|Tagging]]
+
+* El [[filtro|Filters]] `list` selecciona entradas de una lista
+
+* El [[filtro|Filters]]  `listed` muestra qué tiddlers incluyen un tiddler (o selección de varios tiddlers) como entradas de lista.
+
+* El widget [[Navegador|NavigatorWidget]] manipula un StoryList que contiene un campo `list` de los tiddlers que se muestran en la columna principal.
diff --git a/editions/es-ES/tiddlers/ListWidget.tid b/editions/es-ES/tiddlers/ListWidget.tid
new file mode 100644
index 000000000..60481d701
--- /dev/null
+++ b/editions/es-ES/tiddlers/ListWidget.tid
@@ -0,0 +1,102 @@
+caption: list
+created: 20131024141900000
+es-title: ListWidget
+modified: 20160507044251692
+tags: Widgets
+title: ListWidget
+type: text/vnd.tiddlywiki
+
+!! Introducción
+
+El ListWidget muestra una secuencia de tiddlers que coinciden con una [[expresión de filtro|Filters]]. Sirve para:
+
+* Mostrar listas particulares de enlaces, como en la barra lateral de ~TiddlyWiki5
+
+* Confeccionar listas a medida, como <<.word "todos aquellos tiddlers con etiqueta `tarea`, no etiquetados como `hecha`">>
+
+* Hacer una lista de las etiquetas aplicadas a un tiddler
+
+* Manejar el ~StoryRIver principal
+
+Los tiddlers se muestran por transclusión, uno a uno, en una plantilla. Hay diversas maneras de especificar la plantilla, así como de controlar el comportamiento de la lista.
+
+!! Ejemplos
+
+<<.def "lista plana">>: lista sin formato
+
+```
+<$list filter="[tag[Contents]sort[title]]"/>
+```
+
+Se muestra como:
+
+<<<
+<$list filter="[tag[Contents]sort[title]]"/>
+<<<
+
+<<.def "custom item output">>
+
+```
+<$list filter="[tag[Contents]sort[title]]">
+<<currentTiddler>>
+{{||$:/core/ui/ViewTemplate/subtitle}}
+
+</$list>
+```
+
+Se muestra como
+
+<<<
+<$list filter="[tag[Contents]sort[title]]">
+<<currentTiddler>>
+{{||$:/core/ui/ViewTemplate/subtitle}}
+
+</$list>
+<<<
+
+<<.def "custom template output">>
+
+```
+<$list filter="[tag[Contents]sort[title]]" template="$:/core/ui/ViewTemplate/subtitle"/>
+```
+
+Se muestra como:
+
+<<<
+<$list filter="[tag[Contents]sort[title]]" template="$:/core/ui/ViewTemplate/subtitle"/>
+<<<
+
+!!! Listas anidadas
+
+En [[listas anidadas|NestedLists]] se explica cómo generar listas anidadas con ListWidget.
+
+!! Contenido y atributos
+
+El contenido del widget `<$list>` es una plantilla opcional usada para representar cada tiddler de la lista. Alternativamente, puede especificarse la plantilla como título de un tiddler en el atributo `template`. Como alternativa, la plantilla por defecto sólo muestra el título del tiddler.
+
+|!Atributo |!Descripción |
+|filter |Tiddler de [[filtro|Filters]] para mostrar |
+|template |Título de la plantilla de transclusión para cada tiddler de la lista. Si no es especifica ninguna, es el propio cuerpo de ListWidget el que sirve como plantilla. The title of a template tiddler for transcluding each tiddler in the list. Sin cuerpo, sólo se muestra un enlace al tiddler. |
+|editTemplate |Plantilla alternativa para el uso de [[borradores|DraftMechanism]] en modo edición |
+|variable |Nombre de la [[variable|Variables]] que guarda el título de cada tiddler. Por defecto, ''currentTiddler'' |
+|emptyMessage |Mensaje que se muestra si la lista está vacía |
+|storyview |nombre optativo del módulo responsable de animar/procesar la lista |
+|history |Título del tiddler que contiene el historial de navegación |
+
+!!! Modo edición
+
+El widget `<$list>`puede procesar tiddlers en borrador con una plantilla diferente. Consultar [[borradores|DraftMechanism]]
+
+!!! Atributo `storyview`
+
+El atributo `storyview` especifica el nombre de de un módulo optativo que puede animar los cambios realizados en la lista (incluso la navegación). El núcleo incluye por defecto los siguientes módulos:
+
+* <<.def classic>>: muestra la lista como una secuencia ordenada de tiddlers
+* <<.def zooming>>: muestra sólo el tiddler actual con una animación de zoom al navegar entre tiddlers
+* <<.def pop>>: muestra los tiddlers de uno en uno, con efecto de tiddler emergente.
+
+Para que la animación de `storyview` sea correcta, cada entrada de la lista debe ser un único bloque DOM.
+
+!!! Histórico y navegación
+
+El atributo opcional `history` especifica el nombre del tiddler usado para rastrear el actual, con el fin de presentar el histórico de navegación. Cuando el histórico cambia, le pide a la ListView que procese la navegación al siguiente tiddler. Véase [[Histórico|HistoryMechanism]] para mayor información.
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Make_the_beds.tid b/editions/es-ES/tiddlers/Make_the_beds.tid
new file mode 100644
index 000000000..d2367df5e
--- /dev/null
+++ b/editions/es-ES/tiddlers/Make_the_beds.tid
@@ -0,0 +1,9 @@
+caption: Hacer las camas
+created: 20130825143100000
+es-title: Hacer las camas
+modified: 20160603152714437
+tags: task
+title: Make the beds
+type: text/vnd.tiddlywiki
+
+//Tarea de muestra para el [[Ejemplo de administración de tareas|TaskManagementExample]]//
diff --git a/editions/es-ES/tiddlers/Making_curved_text_with_SVG.tid b/editions/es-ES/tiddlers/Making_curved_text_with_SVG.tid
new file mode 100644
index 000000000..ddd0e5c7f
--- /dev/null
+++ b/editions/es-ES/tiddlers/Making_curved_text_with_SVG.tid
@@ -0,0 +1,48 @@
+caption: Texto curvo con SVG
+created: 20140324223413403
+es-title: Cómo haer textos curvos con SVG
+modified: 20160418045621456
+tags: Learning
+title: Making curved text with SVG
+type: text/vnd.tiddlywiki
+
+\define textOnPath(text)
+$$$.svg
+<svg width="100%" height="100%" viewBox="0 0 1000 300" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="background:white;">
+<defs>
+<path id="MyPath" d="M 100 200 C 200 100 300   0 400 100 C 500 200 600 300 700 200 C 800 100 900 100 900 100"/>
+</defs>
+<use xlink:href="#MyPath" fill="none" stroke="#ddd"/>
+<text font-family="'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif" font-size="42.5">
+<textPath xlink:href="#MyPath">
+$text$
+</textPath>
+</text>
+</svg>
+$$$
+\end
+Este ejemplo muestra cómo usar SVG para mostrar transclusiones de texto a lo largo de un recorrido. Escribe algo en el cuadro de texto para probarlo. 
+
+<$edit-text tiddler="$:/CurvedText" tag="input" placeholder="Escribe algo aquí" default=""/>
+
+<$macrocall $name="textOnPath" text={{$:/CurvedText}}/>
+
+Este es el código:
+
+```
+\define textOnPath(text)
+$$$.svg
+<svg width="100%" height="100%" viewBox="0 0 1000 300" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="background:white;">
+<defs>
+<path id="MyPath" d="M 100 200 C 200 100 300   0 400 100 C 500 200 600 300 700 200 C 800 100 900 100 900 100"/>
+</defs>
+<use xlink:href="#MyPath" fill="none" stroke="#ddd"/>
+<text font-family="'Helvetica Neue', Helvetica, Arial, 'Lucida Grande', sans-serif" font-size="42.5">
+<textPath xlink:href="#MyPath">
+$text$
+</textPath>
+</text>
+</svg>
+$$$
+\end
+```
diff --git a/editions/es-ES/tiddlers/Manually_installing_a_plugin.tid b/editions/es-ES/tiddlers/Manually_installing_a_plugin.tid
new file mode 100644
index 000000000..e21fb0516
--- /dev/null
+++ b/editions/es-ES/tiddlers/Manually_installing_a_plugin.tid
@@ -0,0 +1,23 @@
+caption: Instalar plugins
+created: 20160107222430613
+es-title: Cómo instalar manualmente un plugin
+modified: 20160504155741852
+tags: Plugins
+title: Manually installing a plugin
+type: text/vnd.tiddlywiki
+
+# Sólo [[por si acaso|The First Rule of Using TiddlyWiki]], haz copia de seguridad de tu archivo HTML de ~TiddlyWiki
+
+# Abre ~TiddlyWiki en el navegador
+
+# En otra ventana del navegador, busca un enlace al plugin que quieres instalar en la página que lo contiene, p. ej., el enlace <<.tid ~$:/plugins/tiddlywiki/katex>> en http://tiddlywiki.com/plugins/tiddlywiki/katex/)
+
+# Arrastra el enlace hasta tu página. Aparecerá una banda de color verde en la parte superior de la pantalla. 
+
+# Suelta el enlace y aparecerá el tiddler de importación que te mostrará el título del tiddler que acabas de arrastrar. Confirma la importación con el botón.
+
+# Guarda los cambios con el botón <<.button save-wiki>>
+
+# Recarga la página
+
+# El plugin está instalado y listo para su uso
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Markdown_Plugin.tid b/editions/es-ES/tiddlers/Markdown_Plugin.tid
new file mode 100644
index 000000000..c609eb6aa
--- /dev/null
+++ b/editions/es-ES/tiddlers/Markdown_Plugin.tid
@@ -0,0 +1,12 @@
+caption: Markdown
+created: 20160107223401584
+es-title: Markdown
+list: 
+modified: 20160504052806643
+tags: [[Plugin Editions]]
+title: Markdown Plugin
+type: text/vnd.tiddlywiki
+
+Para uso con el lenguaje de marcado Markdown, en lugar de WikiText.
+
+Disponible http://tiddlywiki.com/plugins/tiddlywiki/markdown/
diff --git a/editions/es-ES/tiddlers/MathML.tid b/editions/es-ES/tiddlers/MathML.tid
new file mode 100644
index 000000000..6f5ba54d4
--- /dev/null
+++ b/editions/es-ES/tiddlers/MathML.tid
@@ -0,0 +1,21 @@
+caption: MathML
+created: 20130901213100000
+es-title: MathML
+modified: 20160429052548236
+tags: Definitions Features
+title: MathML
+type: text/vnd.tiddlywiki
+
+<<.def ~MathML>> es un lenguaje de marcas para notación matemática que puede usarse en HTML.
+
+Si tu navegador lo soporta, los elementos de ~MathML pueden usarse en WikiText como HTML.
+
+Este es un ejemplo de matriz ~MathML sacado de [[ W3C|http://www.w3.org/Math/XSL/csmall2.xml]]:
+
+```
+<math><mrow><mo>[</mo><mtable><mtr><mtd><mn>0</mn></mtd><mtd><mn>1</mn></mtd><mtd><mn>0</mn></mtd></mtr><mtr><mtd><mn>0</mn></mtd><mtd><mn>0</mn></mtd><mtd><mn>1</mn></mtd></mtr><mtr><mtd><mn>1</mn></mtd><mtd><mn>0</mn></mtd><mtd><mn>0</mn></mtd></mtr></mtable><mo>]</mo></mrow></math>
+```
+
+Y se ve así:
+
+<math><mrow><mo>[</mo><mtable><mtr><mtd><mn>0</mn></mtd><mtd><mn>1</mn></mtd><mtd><mn>0</mn></mtd></mtr><mtr><mtd><mn>0</mn></mtd><mtd><mn>0</mn></mtd><mtd><mn>1</mn></mtd></mtr><mtr><mtd><mn>1</mn></mtd><mtd><mn>0</mn></mtd><mtd><mn>0</mn></mtd></mtr></mtable><mo>]</mo></mrow></math>
diff --git a/editions/es-ES/tiddlers/Meetups.tid b/editions/es-ES/tiddlers/Meetups.tid
new file mode 100644
index 000000000..576e6d394
--- /dev/null
+++ b/editions/es-ES/tiddlers/Meetups.tid
@@ -0,0 +1,15 @@
+caption: Eventos
+created: 20140721121924384
+es-title: Eventos
+modified: 20160413162930015
+tags: Community
+title: Meetups
+type: text/vnd.tiddlywiki
+
+Reuniones presenciales que los entusiastas de ~TiddlyWiki celebran en todo el mundo:
+
+* [[OXTWIG]], el ''Oxford ~TiddlyWiki Interest Group'' se reúne mensualmente en Oxford, Gran Bretaña, para compartir experiencias de uso de TiddlyWiki
+* [[TiddlyWiki Camp Paris]] es un evento de un día de celebración y exploración de TiddlyWiki, tanto para usuarios expertos, como para principiantes.
+
+//Si tú también compartes nuestro entusiasmo por ~TiddlyWiki, anímate a organizar un ''TWIG'' local en tu ciudad. Es una manera magnífica de promover el uso y el interés por TiddlyWiki//
+
diff --git a/editions/es-ES/tiddlers/Messages.tid b/editions/es-ES/tiddlers/Messages.tid
new file mode 100644
index 000000000..32f56689f
--- /dev/null
+++ b/editions/es-ES/tiddlers/Messages.tid
@@ -0,0 +1,13 @@
+caption: Mensajes
+created: 20140226083311937
+es-title: Mensajes
+modified: 20160416051230719
+tags: Concepts Reference
+title: Messages
+type: text/vnd.tiddlywiki
+
+Son mensajes generados por widgets en respuesta a acciones del usuario. Estos mensajes recorren la estructura en árbol del widget hasta que encuentran el ascendiente que los procesa.
+
+El núcleo lleva implementados los siguientes mensajes:
+
+<<list-links "[tag[Messages]]">>
diff --git a/editions/es-ES/tiddlers/MiSubHistoria.tid b/editions/es-ES/tiddlers/MiSubHistoria.tid
new file mode 100644
index 000000000..c08bd8786
--- /dev/null
+++ b/editions/es-ES/tiddlers/MiSubHistoria.tid
@@ -0,0 +1,20 @@
+created: 20160418042347474
+current-tiddler: HelloThere
+list: HelloThere
+modified: 20160418042348622
+title: MiSubHistoria
+type: application/json
+
+[
+    {
+        "title": "HelloThere",
+        "fromPageRect": {
+            "top": 494.26666259765625,
+            "left": 1022.3333129882812,
+            "width": 79,
+            "right": 1101.3333129882812,
+            "bottom": 511.26666259765625,
+            "height": 17
+        }
+    }
+]
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Modals.tid b/editions/es-ES/tiddlers/Modals.tid
new file mode 100644
index 000000000..f80cfbe89
--- /dev/null
+++ b/editions/es-ES/tiddlers/Modals.tid
@@ -0,0 +1,13 @@
+caption: Modales
+created: 20160107225427489
+es-title: Diálogos modales
+modified: 20160429053708789
+tags: Features
+title: Modals
+type: text/vnd.tiddlywiki
+
+Los diálogos modales (o <<.word asistentes>> difuminan la ventana principal de ~TiddlyWiki para mostrar un tiddler aislado que el usuario tiene que atender explícitamente.
+
+Los modales se muestran mediante el mensaje [[tm-modal|WidgetMessage: tm-modal]].
+
+<$button message="tm-modal" param="SampleWizard">Modal de ejemplo</$button>
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/MySubHistoryList.tid b/editions/es-ES/tiddlers/MySubHistoryList.tid
new file mode 100644
index 000000000..62f3b911f
--- /dev/null
+++ b/editions/es-ES/tiddlers/MySubHistoryList.tid
@@ -0,0 +1,30 @@
+created: 20160418041703568
+current-tiddler: HelloThere
+modified: 20160418042212774
+title: MySubHistoryList
+type: application/json
+
+[
+    {
+        "title": "HelloThere",
+        "fromPageRect": {
+            "top": 629,
+            "left": 304,
+            "width": 80,
+            "right": 384,
+            "bottom": 647,
+            "height": 18
+        }
+    },
+    {
+        "title": "HelloThere",
+        "fromPageRect": {
+            "top": 516.2666625976562,
+            "left": 1022.3333129882812,
+            "width": 79,
+            "right": 1101.3333129882812,
+            "bottom": 533.2666625976562,
+            "height": 17
+        }
+    }
+]
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/MySubStoryList.tid b/editions/es-ES/tiddlers/MySubStoryList.tid
new file mode 100644
index 000000000..fddc034e8
--- /dev/null
+++ b/editions/es-ES/tiddlers/MySubStoryList.tid
@@ -0,0 +1,6 @@
+created: 20160418042212769
+list: HelloThere
+modified: 20160418042212769
+title: MySubStoryList
+type: text/vnd.tiddlywiki
+
diff --git a/editions/es-ES/tiddlers/Navigating_between_open_tiddlers.tid b/editions/es-ES/tiddlers/Navigating_between_open_tiddlers.tid
new file mode 100644
index 000000000..b0c117815
--- /dev/null
+++ b/editions/es-ES/tiddlers/Navigating_between_open_tiddlers.tid
@@ -0,0 +1,21 @@
+caption: Desplazamiento entre tiddlers abiertos
+created: 20140908092600000
+es-title: Cómo moverse entre tiddlers abiertos
+modified: 20160422052224873
+tags: [[Working with TiddlyWiki]]
+title: Navigating between open tiddlers
+type: text/vnd.tiddlywiki
+
+En la vista por defecto <<.word classic>>, los tiddlers abiertos se muestran en una columna vertical llamada StoryRiver. Hay varias maneras de moverse por ella, saltando adelante y atrás entre los diferentes tiddlers abiertos.
+
+* La más sencilla es por medio de la pestaña <<.sidebar-tab Open>> de la barra lateral.
+
+** La pestaña <<.sidebar-tab Open>> contiene la lista de tiddlers abiertos. Pinchando en cualquiera de ellos se salta a ese tiddler y haciéndolo en la <<.word x>> junto al título, se cierra. Hay también un práctico botón <<.word "cerrar todo">> abajo del todo de la lista.
+
+* Otra manera es desplazándose por la página, usando bien la rueda del ratón o la barra de desplazamiento de la derecha.
+
+** Cuando la barra lateral y la StoryView se extienden más allá de la pantalla visible, habrá <<.em dos>> barras. La de más a la derecha controla la ~StoryRiver. La otra, la barra lateral. 
+
+* Otra forma posible, usada por muchos principiantes, consiste en <<.def "cerrar tiddlers de uno en uno">> hasta llegar al que están buscando. 
+
+** Al cerrar un tiddler del principio o del medio de la lista hará que los tiddlers de más abajo se deslicen <<.word "río arriba">>, poniendo a la vista el tiddler inmediatamente debajo del que se acaba de cerrar. 
diff --git a/editions/es-ES/tiddlers/NavigatorWidget.tid b/editions/es-ES/tiddlers/NavigatorWidget.tid
new file mode 100644
index 000000000..08ea99798
--- /dev/null
+++ b/editions/es-ES/tiddlers/NavigatorWidget.tid
@@ -0,0 +1,37 @@
+caption: navigator
+created: 20131024141900000
+es-title: Widget Navegador
+modified: 20160415051406374
+tags: Widgets
+title: NavigatorWidget
+type: text/vnd.tiddlywiki
+
+! Introducción
+
+El widget ''Navegador'' manipula el TiddlerStore, StoryList y HistoryList en respuesta a una serie de [[mensajes|Messages]].
+
+!Contenido y atributos
+
+El widget muestra en pantalla su contenido y responde a los mensajes que se le envían
+
+The navigator widget displays any contained content, and responds to Messages dispatched within it.
+
+|!Atributo |!Descripción |
+|story |Nombre del tiddler que contiene el `StoryList` que se va a manipular |
+|history |Nombre del tiddler que contiene el `HistoryList` que se va a manipular |
+|openLinkFromInsideRiver |Determina dónde se van a abrir los tiddlers nuevos que se invoquen desde dentro del `StoryRiver`:  ''al principio'' o ''al final'' del StoryRiver o ''encima'' o ''debajo'' del tiddler actual  |
+|openLinkFromOutsideRiver|Determina dónde se van a abrir los tiddlers nuevos que se llamen desde fuera del `StoryRiver`:  ''al principio'' o ''al final'' del StoryRiver |
+
+! Mensajes del widget
+
+El navegador maneja los siguientes [[mensajes|Messages]]:
+
+<ul>
+<$list filter="[tag[navigator-message]]">
+<li>
+<$link to={{!!title}}>
+<$view field="title"/>
+</$link>
+</li>
+</$list>
+</ul>
diff --git a/editions/es-ES/tiddlers/Notifications.tid b/editions/es-ES/tiddlers/Notifications.tid
new file mode 100644
index 000000000..c3915e9be
--- /dev/null
+++ b/editions/es-ES/tiddlers/Notifications.tid
@@ -0,0 +1,11 @@
+caption: Notificaciones
+created: 20160107225753340
+es-title: Mensajes de notificación
+modified: 20160429053719631
+tags: Features
+title: Notifications
+type: text/vnd.tiddlywiki
+
+Las <<.def notificaciones>> son pequeños mensajes de información que aparecen en la esquina superior derecha de la ventana y que desaparecen automáticamente.
+
+<$button message="tm-notify" param="SampleNotification">Notificación de ejemplo</$button>
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/OXTWIG.tid b/editions/es-ES/tiddlers/OXTWIG.tid
new file mode 100644
index 000000000..3d97d02e7
--- /dev/null
+++ b/editions/es-ES/tiddlers/OXTWIG.tid
@@ -0,0 +1,25 @@
+caption: Video: OXTWIG
+created: 20140222133223882
+es-title: OXTWIG: OXford TiddlyWiki Interest Group
+modified: 20160417155229042
+tags: Meetups Videos
+title: OXTWIG
+type: text/vnd.tiddlywiki
+
+El OXTWIG: ''Oxford ~TiddlyWiki Interest Group'' se reúne mensualmente para conversar y hacer demostraciones de TiddlyWiki.
+
+Ver https://oxtwig.eventbrite.co.uk/ para más información sobre nuestra próxima reunión.
+
+También tenemos lista de correo: https://groups.google.com/forum/#!members/oxtwig
+
+!! OXTWIG #2
+
+La segunda reunión del OXTWIG se celebró el jueves 16 de enero de 2014:
+
+<iframe width="560" height="315" src="http://www.youtube.com/embed/WOK_nVBf_6U" frameborder="0" allowfullscreen></iframe>
+
+!! OXTWIG #1
+
+La primera reunión del OXTWIG se celebró el jueves 21 de noviembre de 2013: 
+
+<iframe width="560" height="315" src="http://www.youtube.com/embed/tpNf_Dms_TE" frameborder="0" allowfullscreen></iframe>
diff --git a/editions/es-ES/tiddlers/Obadiah_TOC.tid b/editions/es-ES/tiddlers/Obadiah_TOC.tid
new file mode 100644
index 000000000..84d9e4da5
--- /dev/null
+++ b/editions/es-ES/tiddlers/Obadiah_TOC.tid
@@ -0,0 +1,13 @@
+caption: "Índice del libro de Abdías", de Dave Gifford
+created: 20131207085406905
+es-title: "Índice del libro de Abdías", de Dave Gifford
+modified: 20160417152959549
+tags: Examples
+title: Obadiah TOC
+type: text/vnd.tiddlywiki
+url: http://giffmex.org/experiments/obadiah.html
+
+Introducción de Dave Gifford al libro bíblico de Abdías, que usa la macro Índice y varios ajustes personalizados de ~TiddlyWiki: botones "nuevo aquí", [[esta plantilla personalizada de visualización|http://giffmex.org/experiments/obadiah.html#%24%3A%2F_aa%2FViewTemplate%2FNoteList]] para añadir notas e imágenes dentro de cualquier tiddler y un tiddler de transclusión para facilitar la impresión ([[este tiddler|http://giffmex.org/experiments/obadiah.html#An%20introduction%20to%20Obadiah]])
+
+{{!!url}}
+
diff --git a/editions/es-ES/tiddlers/Order_of_Tagged_Tiddlers.tid b/editions/es-ES/tiddlers/Order_of_Tagged_Tiddlers.tid
new file mode 100644
index 000000000..8a87f023a
--- /dev/null
+++ b/editions/es-ES/tiddlers/Order_of_Tagged_Tiddlers.tid
@@ -0,0 +1,19 @@
+caption: Orden de listas
+created: 20160426093524576
+es-title: Orden de los tiddlers etiquetados
+modified: 20160426094124972
+tags: Tagging
+title: Order of Tagged Tiddlers
+type: text/vnd.tiddlywiki
+
+Cuando ~TiddlyWiki genera una lista de los tiddlers que comparten una etiqueta en particular (p. ej, en la lista que aparece al pinchar en una etiqueta), los ordena conforme a las siguientes reglas:
+
+# Primero, los [[declarados|Title List]] en el campo <<.field list>> del [[TagTiddler|TagTiddlers]] y en el orden que este indica
+
+# Luego, los no-declarados que tengan el campo <<.field list-before>>, que van inmediatamente <<.em antes>> del título que respectivamente indiquen. 
+
+#* Si el campo existe pero tiene valor en blanco, el tiddler se coloca al principio de la lista. En caso de que sean varios los tiddlers etiquetados no declarados que tienen el campo <<.field list-before>> en blanco, se colocarán por orden alfabético ascendente al principio de la lista, ignorando mayúsculas y minúsculas.
+
+# A continuación, los no-declarados que tengan el campo <<.field list-after>>, que van inmediatamente <<.em después>> del título que respectivamente indiquen. 
+
+# Finalmente, cerrando la lista, por orden alfabético ascendente, ignorando mayúsculas y minúsculas, todos los demás tiddlers que queden.
diff --git a/editions/es-ES/tiddlers/PESpot_Lesson_Planner_by_Patrick_Detzner.tid b/editions/es-ES/tiddlers/PESpot_Lesson_Planner_by_Patrick_Detzner.tid
new file mode 100644
index 000000000..456fffab4
--- /dev/null
+++ b/editions/es-ES/tiddlers/PESpot_Lesson_Planner_by_Patrick_Detzner.tid
@@ -0,0 +1,15 @@
+caption: "PESpot Lesson Planner", de Patrick Detzner
+created: 20150403104722092
+es-title: "PESpot Lesson Planner", de Patrick Detzner
+modified: 20160417153558347
+tags: Examples
+title: PESpot Lesson Planner by Patrick Detzner
+type: text/vnd.tiddlywiki
+url: http://pespot.tiddlyspot.com
+
+Sistema para crear planes docentes, construido con TiddlyWiki
+
+{{!!url}}
+
+<<<
+Construí un programa que sirviera de ayuda para la redacción y planifiación de leciones y que automatizara algunas de las tediosas tareas envueltas en la creación de un plan dociente. <<<
diff --git a/editions/es-ES/tiddlers/Page_and_tiddler_layout_customisation.tid b/editions/es-ES/tiddlers/Page_and_tiddler_layout_customisation.tid
new file mode 100644
index 000000000..bdfa4f0ef
--- /dev/null
+++ b/editions/es-ES/tiddlers/Page_and_tiddler_layout_customisation.tid
@@ -0,0 +1,69 @@
+caption: Modificación del diseño de tiddlers y página
+created: 20141120125300000
+es-title: Modificación del diseño de tiddlers y de la página
+modified: 20160428062508818
+tags: [[Customise TiddlyWiki]]
+title: Page and tiddler layout customisation
+type: text/vnd.tiddlywiki
+
+Algo que muchos usuarios desconocen es hasta qué punto pueden customizar ~TIddlyWiki simplemente añadiendo o quitando etiquetas de sistema de tiddlers ocultos clave o de sus propios tiddlers.
+
+* Puedes añadir o quitar funciones por defecto en tiddlers, tanto en modo de visionado como en modo de edición (digamos que encuentras que el subtítulo de tiddler distrae o que quieres añadir un recordatorio para cuando se editen tiddlers)
+
+* También puedes añadir o quitar funciones por defecto en el diseño general de la página (quizá necesites un reloj en la barra lateral, o sustituir uno de los botones de control por otro que hayas hecho tú)
+
+* O puedes reorganizar el orden en que se muestran (quizá prefieres mostrar las etiquetas por encima del título, o que el subtítulo de la página aparezca por debajo de los botones)
+
+Una vez sepas qué es lo que quieres hacer, te parecerá que todas estas cosas son bastante fáciles.
+
+! Añadir tiddlers a medida a la interfaz de usuario
+
+Puedes crear el tiddler que quieras y asignarle la etiqueta de sistema apropiada para que aparezca en tal o cual sitio. Por ejemplo, si creas un tiddler llamado <<.word Recordatorio>> con el texto <<.word "Esto es un recordatorio">> y la etiqueta <<.em ~$:/tags/EditTemplate>>, las palabras <<.word "Esto es un recordatorio">> aparecerán en todos los tiddlers que abras para edición.
+
+Al crear tiddlers para que se muestren dentro de otros tiddlers o para que formen parte del diseño de página, necesitarás con toda probabilidad reorganizar el diseño para que tus tiddlers se muestren exactamente donde quieres que aparezcan. Para hacerlo, edita el tiddler oculto apropiado con el prefijo <<.em ~$:/tags>> e incluye el título de tu tiddler en el lugar adecuado del campo <<.field list>>. Por ejemplo, si quieres que la frase <<.word "Esto es un recordatorio">> del ejemplo anterior aparezca por encima del editor de etiquetas en modo de edición, edita el tiddler <<.tid "~$:/tags/EditTemplate">> e inserta `[[Recordatorio]]` en el campo <<.field list>>, justo antes de <<.tid "~$:/core/ui/EditTemplate/tags">>
+
+! Crear nuevos botones en la barra de tiddler y los controles de página
+
+Digamos que tienes un tiddler llamado <<.tid "Plantilla Recetas">> y quieres un botón que cree nuevas recetas a partir de él. Para hacerlo tendrás que hacer lo siguiente:
+
+# Primero, necesitarás una imagen para el botón. Si ninguna de las imágenes del sistema (tiddlers ocultos con el prefijo y la etiqueta <<.tag ~$:/core/images>>), necesitarás crear o buscar una imagen SVG para ello (por ejemplo una de http://flaticon.com).
+#*En cualquier caso, arrástrala a tu página para [[importarla|ImportTiddlers]], edita convenientemente el tiddler y ajusta sus dimensiones a 22px x 22px
+
+# Necesitarás crear un tiddler que contenga el botón.  Créalo, dale título y añade el código para habilitar el botón:
+#* ``\define newHereButtonTags()
+[[$(currentTiddler)$]]
+\end
+\define newHereButton()
+<$button class=<<tv-config-toolbar-class>>>
+<$action-sendmessage
+  $message="tm-new-tiddler"
+$param="TÍTULO DE LA PLANTILLA QUE QUIERES QUE ABRA"
+title="New tiddler"
+  tags=<<newHereButtonTags>> />
+<$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
+{{NOMBRE DE LA IMAGEN DEL BOTÓN}}
+</$list>
+<$list filter="[<tv-config-toolbar-text>prefix[yes]]">
+<span class="tc-btn-text"><$text text="NOMBRE DEL BOTÓN PARA MOSTRAR EN PANTALLA"/></span>
+</$list>
+</$button>
+\end
+
+<<newHereButton>>
+``
+
+#* Asígnale la etiqueta <<.tag ~$:/tags/ViewToolbar]]>>
+
+# Hay que crear un tiddler que le diga a ~TiddlyWIki si el botón será o no visible en la barra. Llamémosle por ejemplo <<.tid "~$:/config/ViewToolbarButtons/Visibility/Receta"">>. Escribe `reveal` en el cuerpo y guárdalo.
+
+# Habrá que posicionar el botón adecuadamente. Abre el tiddler <<.tid ~$:/tags/ViewToolbar>> e inserta el nombre de tu botón en el lugar adecuado del campo <<.field list>>.
+
+! Eliminar tiddlers ocultos de la interfaz de usuario
+
+En la subpestaña <<.more-tab Shadows>> de la pestaña <<.sidebar-tab More>> en la barra lateral, verás la lista de todos los tiddlers ocultos. En ella verás algunos con el prefijo <<.place ~$:/core/ui/>>. Estos son los que definen la interfaz de usuario y llevan [[etiquetas de sistema|SystemTags]]. Añadir o eliminar estas etiquetas modifica el diseño, tanto de los tiddlers, como de la página entera.
+
+Por ejemplo: <<.tid ~$:/core/ui/SideBar/More>> es el tiddler que define la pestaña <<.sidebar-tab More>>. Si le quitas la etiqueta, quitarás dicha pestaña de la barra lateral y si se la vuelves a asignar, volverás a mostrarla.
+
+Puedes aplicar el mismo procedimiento para cualquier tiddler de la interfaz que lleve el prefijo <<.tid ~$:/core/ui/>>. Por ejemplo, quitar la etiqueta de sistema al tiddler <<.tid ~$:/core/ui/ViewTemplate/subtitle>> eliminará el subtítulo de todos los tiddlers.
+
+Si modificas un tiddler oculto de esta manera, sobreescribirás el valor predefinido. Para revertirlo a su origen, simplemente borra el tiddler modificado para restaurar el tiddler oculto.
diff --git a/editions/es-ES/tiddlers/PermaLinks.tid b/editions/es-ES/tiddlers/PermaLinks.tid
new file mode 100644
index 000000000..7cff7c7fa
--- /dev/null
+++ b/editions/es-ES/tiddlers/PermaLinks.tid
@@ -0,0 +1,69 @@
+caption: Permalinks
+created: 20140502213500000
+es-title: Permalinks
+modified: 20160502145938493
+tags: Features Concepts
+title: PermaLinks
+type: text/vnd.tiddlywiki
+
+Un <<.def permalink>> permite enlaces directos a tiddlers individuales de un ~TiddlyWiki
+
+!Permalinks sencillos
+
+La forma más simple de un permalink es un enlace sencillo adjunto a la dirección de base con `#`:
+
+http://tiddlywiki.com/#HelloThere
+
+El título del tiddler puede contener espacios si es necesario:
+
+[[http://tiddlywiki.com/#Using TiddlyWiki on Node.js]]
+
+No es necesario encerrar el título en corchetes dobles, aunque si lo haces, no pasa nada, porque se elmininan.
+
+! Permalinks al ~StoryRiver
+
+El permalink también puede definir la secuencia de tiddlers que se abre junto al tiddler principal, como hace un [[filtro|Filters]]:
+
+[[http://tiddlywiki.com/#TiddlerFields:Tiddlers TiddlerTags TiddlerFields ContentType]]
+
+Si el tiddler principal no está presente entre los tiddlers de la StoryRiver, se inserta automáticamente al principio, lo que significa que estos dos ejemplos apuntan al tiddler <<.tid Tiddlers>> en la secuencia <<.tid "Tiddlers, Tags, ~TiddlerFields">>:
+
+[[http://tiddlywiki.com/#Tiddlers:Tags TiddlerFields]]
+
+[[http://tiddlywiki.com/#Tiddlers:Tiddlers Tags TiddlerFields]]
+
+También es posible definir un filtro sin especificar un tiddler en concreto:
+
+<a href="http://tiddlywiki.com/#:[tags[task]]">~http://tiddlywiki.com/#:[tags[task]]</a>
+
+! Codificación de URL's
+
+Existen restricciones técnicas a los caracteres que pueden usarse en una URL. Para permitir apuntar a cualquier tiddler, los caracteres no permitidos están sujetos a un proceso llamado <<.def codificación>>, mediante el cual los caracteres problemáticos se sustituyen por un código numérico, también llamado <<.def "código por ciento">>. Así, por ejemplo, el caracter que representa un espacio se sustituye por el código `%20`.
+
+Tanto el título del tiddler como el filtro de la historia deben codificarse para URL (no así los dos puntos). ~Tiddlywiki genera URL's debidamente codificadas que pueden tener un aspecto bastante aterrador. Sin embargo, en la práctica, los navegadores procesan todos los caracteres en fragmentos de URL, así que cuando creas permalinks de forma manual puedes ignorar la codificación URL.
+
+! Comportamiento de los permalinks
+
+Dos importantes aspectos del comportamiento de los permalinks en ~TiddlyWiki pueden controlarse con las opciones de la pestaña <<.controlpanel-tab Advanced>>/<<.controlpanel-tab Settings>>:
+
+* Actualizar o no la barra del navegador según se navega para que refleje los cambios que se producen al abrir nuevos tiddlers en la historia y en tal caso, si la actualización incluye la secuencia completa de tiddlers navegados
+
+* Actualizar o no el historial del navegador, de modo que se pueda retroceder en la apertura de tiddlers mediante los botones <<.place Adelante>> y <<.place Atrás>> del navegador (desactivado por defecto)
+
+Escribir o navegar a un permalink siempre hará que el navegador lo procese, lo que abre y cierra tiddlers del modo que el permalink requiere, en lugar de, por ejemplo, añadir el permalink a la vista actual de tiddlers.
+
+!! Detalles técnicos
+
+Al iniciarse y cada vez que un permalink varía dinámicamente --editando la barra de direcciones, por ejemplo--, ~TIddlyWiki procesa los permalinks conforme a las siguientes reglas. 
+
+# Si el permalink contiene <<.def "dos puntos">>, considera la cadena anterior como <<.em target>> y la posterior como <<.em filtro>> del StoryRiver
+
+# Si no contiene dos puntos, considera toda la cadena como <<.em target>> y el filtro como <<.word "no especificado">>
+
+# Si no se especifica filtro, pero sí un <<.em target>>, al arrancar considera que el filtro está en blanco. Si tampoco se especifica target, considera a los tiddlers por defecto como tal.
+
+# Fuera del proceso de arranque, considera la actual lista de tiddlers de la historia un filtro no especificado 
+
+# Considera los tiddlers abiertos como lista de tiddlers del permalink
+# Si se especifica target, pero no está abierto, lo añade al principio de la lista
+# Si se especifica target, lo pone en foco. De otro modo, lo pone en el primer tiddler de la lista
diff --git a/editions/es-ES/tiddlers/Philosophy_of_Tiddlers.tid b/editions/es-ES/tiddlers/Philosophy_of_Tiddlers.tid
new file mode 100644
index 000000000..9b6058f6e
--- /dev/null
+++ b/editions/es-ES/tiddlers/Philosophy_of_Tiddlers.tid
@@ -0,0 +1,13 @@
+caption: Filosofía
+created: 20131128075743966
+es-title: Filosofía del tiddler
+modified: 20160421094827753
+tags: Learning
+title: Philosophy of Tiddlers
+type: text/vnd.tiddlywiki
+
+El propósito de guardar y organizar información es poder usarla de nuevo. El valor de la información almacenada es directamente proporcional a la facilidad con la que se puede volver a usar.
+
+La filosofía de los [[tiddlers|Tiddlers]] consiste en maximizar las posibilidades de reutilización de la información descomponiéndola primero en unidades mínimas, semánticamente significativas, estructurar un [[entramado de relaciones entre ellas |Structuring TiddlyWiki]] y, por medio de agregación y composición, unir estos fragmentos para presentar una narración o historia.
+
+TiddlyWiki aspira a proporcionar un álgebra de tiddlers, una forma clara y concisa de expresar y explorar relaciones entre unidades mínimas de información significativa.
diff --git a/editions/es-ES/tiddlers/Platforms.tid b/editions/es-ES/tiddlers/Platforms.tid
new file mode 100644
index 000000000..e902eb492
--- /dev/null
+++ b/editions/es-ES/tiddlers/Platforms.tid
@@ -0,0 +1,11 @@
+caption: Plataformas
+created: 20150412185300152
+es-title: Plataformas
+modified: 20160506042722156
+tags: TableOfContents
+title: Platforms
+type: text/vnd.tiddlywiki
+
+TiddlyWiki puede usarse en varias plataformas:
+
+<<list-links "[tag[Platforms]]">>
diff --git a/editions/es-ES/tiddlers/Plugin_Editions.tid b/editions/es-ES/tiddlers/Plugin_Editions.tid
new file mode 100644
index 000000000..a84285c6b
--- /dev/null
+++ b/editions/es-ES/tiddlers/Plugin_Editions.tid
@@ -0,0 +1,11 @@
+caption: Ediciones de plugins
+created: 20160107223443647
+es-title: Ediciones de plugins
+modified: 20160605040445323
+tags: Editions
+title: Plugin Editions
+type: text/vnd.tiddlywiki
+
+Estas ediciones contienen demos de los plugins originales de ~TiddlyWiki y se prepararon para ediciones anteriores, que carecían de la librería de plugins.
+
+<<list-links "[tag[Plugin Editions]]">>
diff --git a/editions/es-ES/tiddlers/Plugins.tid b/editions/es-ES/tiddlers/Plugins.tid
new file mode 100644
index 000000000..5e0d8fd1e
--- /dev/null
+++ b/editions/es-ES/tiddlers/Plugins.tid
@@ -0,0 +1,17 @@
+caption: Plugins
+created: 20140910215514237
+es-title: Complementos y extensiones
+modified: 20160504145400028
+tags: Concepts TableOfContents
+title: Plugins
+type: text/vnd.tiddlywiki
+
+Los complementos y extensiones (<<.def plugins>>) de ~TiddlyWiki son componentes opcionales que modifican y extienden su funcionalidad. Puedes instalarlos desde la [[librería oficial|Installing a plugin from the plugin library]] o desde las distintas páginas de [[recursos|Resources]] publicadas por la comunidad.
+
+{{$:/core/ui/ControlPanel/Plugins/AddPlugins}}
+
+Estructuralmente, un plugin es un paquete de tiddlers distribuido conjuntamente como un único tiddler, que puede ser instalado, copiado o borrado como una sola unidad. Cada tiddler que forma parte del plugin es un tiddler oculto. [[Aquí|PluginMechanism]] puedes profundizar sobre el tema sobre cómo funcionan y se implementan a nivel interno.
+
+Los complementos y extensiones pueden contener módulos de JavaScript, hojas de estilos y plantillas. También pueden usarse para distribuir texto común, imágenes, audio o cualquier otro tipo de contenidos.
+
+<<list-links "[tag[Plugins]]">>
diff --git a/editions/es-ES/tiddlers/Preserving_open_tiddlers_at_startup.tid b/editions/es-ES/tiddlers/Preserving_open_tiddlers_at_startup.tid
new file mode 100644
index 000000000..2b975a673
--- /dev/null
+++ b/editions/es-ES/tiddlers/Preserving_open_tiddlers_at_startup.tid
@@ -0,0 +1,16 @@
+caption: Tiddlers abiertos al inicio
+created: 20140101192052333
+es-title: Cargar los últimos tiddlers abiertos al inicio
+modified: 20160427053631307
+tags: [[Customise TiddlyWiki]]
+title: Preserving open tiddlers at startup
+type: text/vnd.tiddlywiki
+
+Generalmente, ~TiddlyWiki muestra al inicio los tiddlers especificados en <<.tid ~$:/DefautTiddlers>>
+
+A veces, sin embargo, es útil mostrar los mismos tiddlers que estaban abiertos cuando se guardó el archivo. Para hacerlo, en <<.tid ~$:/DefautTiddlers>> en lugar una lista de tiddlers, debe especificarse el siguiente filtro:
+
+```
+[list[$:/StoryList]]
+```
+Este filtro devuelve la lista de tiddlers que figuran en <<.tid ~$:/StoryList>>, que es donde el sistema almacena el histórico de tiddlers.
diff --git a/editions/es-ES/tiddlers/Quine.tid b/editions/es-ES/tiddlers/Quine.tid
new file mode 100644
index 000000000..a711fcca0
--- /dev/null
+++ b/editions/es-ES/tiddlers/Quine.tid
@@ -0,0 +1,11 @@
+caption: Quine
+created: 20160428142759864
+es-title: Quine
+modified: 20160428143539736
+tags: Definitions
+title: Quine
+type: text/vnd.tiddlywiki
+
+Wikipedia [[define un Quine|https://es.wikipedia.org/wiki/Quine_%28programa%29]] como //un programaque produce su código fuente como única salida//.
+
+~TiddlyWiki es un raro ejemplo de <<.em Quine>> con utilidad práctica: es esa capacidad para producir una copia de su propio código fuente lo que constituye el secreto de su capacidad para almacenar independientemente cambios en sí mismo.
diff --git a/editions/es-ES/tiddlers/Railroad_Diagrams.tid b/editions/es-ES/tiddlers/Railroad_Diagrams.tid
new file mode 100644
index 000000000..fad610ca7
--- /dev/null
+++ b/editions/es-ES/tiddlers/Railroad_Diagrams.tid
@@ -0,0 +1,20 @@
+caption: Diagramas sintácticos
+created: 20150105133800000
+es-title: Diagramas sintácticos
+modified: 20160420150832016
+title: Railroad Diagrams
+type: text/vnd.tiddlywiki
+
+Los <<.def "diagramas sintácticos">> o <<.word "de ferrocarril">> son una forma visual de explicar las reglas sintácticas de un lenguaje de programación. Para entenderlos, hay que leerlos como si fueran planos de metro. 
+
+Cada diagrama empieza a la izquierda y acaba a la derecha, así que simplemente sigue las líneas de principio a fin. Todas las líneas intermedias son igualmente válidas. A veces unas líneas saltan por encima de un elemento opcional, o vuelven sobre sí mismas, para indicar que ese elemento puede repetirse.
+
+<$railroad text="""
+inicio [:opcional] {reiterado +","} fin
+"""/>
+
+En este ejemplo, se incluye una coma entre cada iteración del elemento `reiterado`. El camino señalado con una coma va de derecha a izquierda y sólo puede se puede seguir pasando una primera vez por el elemento `reiterado`.
+
+Los caracteres en caja redonda son literales, es decir, que se refieren a sí mismos. Un nombre en caja rectangular, por el contrario, se refiere a otro diagrama sintáctico.
+
+Los diagramas sintácticos de la documentación de ~TiddlyWiki se generan con el plugin [[Railroad|Railroad Plugin]].
diff --git a/editions/es-ES/tiddlers/Railroad_Plugin.tid b/editions/es-ES/tiddlers/Railroad_Plugin.tid
new file mode 100644
index 000000000..6dface063
--- /dev/null
+++ b/editions/es-ES/tiddlers/Railroad_Plugin.tid
@@ -0,0 +1,12 @@
+caption: Diagramas sintácticos
+created: 20160107223348621
+es-title: Diagramas sintácticos
+list: 
+modified: 20160504143404183
+tags: [[Plugin Editions]]
+title: Railroad Plugin
+type: text/vnd.tiddlywiki
+
+{{$:/plugins/tiddlywiki/railroad/readme}}
+
+Para más información sobre el uso de este plugin, [[pincha aquí|$:/plugins/tiddlywiki/railroad/syntax]]
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Reference.tid b/editions/es-ES/tiddlers/Reference.tid
new file mode 100644
index 000000000..f6a0e790b
--- /dev/null
+++ b/editions/es-ES/tiddlers/Reference.tid
@@ -0,0 +1,16 @@
+caption: Referencia
+created: 20140910212931897
+es-title: Material de referencia
+list: Concepts Definitions WikiText Macros Widgets Filters Messages Commands Mechanisms
+modified: 20160511152812725
+tags: TableOfContents
+title: Reference
+type: text/vnd.tiddlywiki
+
+Los siguientes temas constituyen la documentación de referencia de ~TiddlyWiki: 
+
+<div class="tc-table-of-contents">
+
+<<toc-selective-expandable 'Reference'>>
+
+</div>
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Reference_Tiddlers.tid b/editions/es-ES/tiddlers/Reference_Tiddlers.tid
new file mode 100644
index 000000000..47810b7a2
--- /dev/null
+++ b/editions/es-ES/tiddlers/Reference_Tiddlers.tid
@@ -0,0 +1,35 @@
+caption: Estilo: Material de referencia
+created: 20141226192500000
+es-title: Guía de estilo para la redacción de material de referencia
+modified: 20160418141821319
+tags: [[Improving TiddlyWiki Documentation]]
+title: Reference Tiddlers
+type: text/vnd.tiddlywiki
+
+Los <<.def "tiddlers de referencia">> ofrecen información al lector --presumiblemente de nivel intermedio o experto-- de manera comprensible e interreferenciada. 
+
+Se estructura en varias subcategorías:
+
+;Conceptos
+
+* Definidos, juntos forman un glosario
+
+;Manual de usuario
+
+* Presenta aspectos técnicos de las características de ~WikiText
+
+* Se subdivide en: mensajes, operadores, variables, widgets... etc
+
+;Manual de desarrollador
+
+* Presenta aspectos técnicos de la arquitectura interna de ~TiddlyWiki
+
+El material de referencia se redacta en estilo formal que evita referirse al lector y enfoca su atención en el comportamiento de ~TiddlyWiki. Predomina el uso de la voz pasiva y las expresiones impersonales:
+
+Reference material is written in a terse, formal style that avoids referring to the reader, and instead focuses on how ~TiddlyWiki itself behaves. The passive voice is often suitable:
+
+* <<.word "se especifica la plantilla como tiddler">> mejor que <<.word "especifica la plantilla como tiddler">>
+* <<.word "el widget puede servir para varios fines">> mejor que <<.word "puedes usar el widget para varios fines">>
+* Pero <<.word "este widget tiene varios usos posibles">> es aún mejor, ya que es más conciso y menos retorcido.
+
+Al redactar en inglés, se evita el uso de formas verbales contraídas, pero aquellas que terminan en <<.word "n't">>, como (<<.word "aren't">>, <<.word "doesn't">>, <<.word "hasn't">>, <<.word "isn't">>... etc, son aceptables, ya que así es menos probable que en su lectura se pase por alto el <<.word not>> de las formas no contraídas.
diff --git a/editions/es-ES/tiddlers/Resources.tid b/editions/es-ES/tiddlers/Resources.tid
new file mode 100644
index 000000000..2f29f5b20
--- /dev/null
+++ b/editions/es-ES/tiddlers/Resources.tid
@@ -0,0 +1,29 @@
+caption: Recursos
+created: 20140320230543190
+es-title: Recursos
+modified: 20160413161642742
+tags: Community
+title: Resources
+type: text/vnd.tiddlywiki
+
+Páginas con recursos creados por la [[comunidad|Community]] para ayudarte a sacarle todo el jugo a ~TiddlyWiki: Plugins, macros, utilidades y mucho más.
+
+Envía más recursos que encuentres para ampliar esta lista via [[GitHub|https://github.com/Jermolene/TiddlyWiki5]] o [[Twitter|https://twitter.com/tiddlywiki]], o publícalas en el [[grupo|https://groups.google.com/forum/?hl=es#!forum/tiddlywiki]]
+
+<div class="tc-link-info">
+
+<$list filter='[tag[Resources]!sort[modified]]'>
+
+<div class="tc-link-info-item">
+
+! <$link><$view field="title"/></$link>
+
+<div class="tc-subtitle">Posted <$view field="modified" format="relativedate"/></div>
+
+<$transclude/>
+
+</div>
+
+</$list>
+
+</div>
diff --git a/editions/es-ES/tiddlers/Resume_Builder_Edition.tid b/editions/es-ES/tiddlers/Resume_Builder_Edition.tid
new file mode 100644
index 000000000..f183e3994
--- /dev/null
+++ b/editions/es-ES/tiddlers/Resume_Builder_Edition.tid
@@ -0,0 +1,13 @@
+caption: Editor de currículum
+created: 20150718123139133
+es-title: Editor de currículum
+modified: 20160605040631147
+tags: Editions
+title: Résumé Builder Edition
+type: text/vnd.tiddlywiki
+
+El <<.def "Editor de currículum">> es una edición especial de ~Tiddlywiki concebida para la creación de manera sencilla de un currículum profesional que se puede imprimir o guardar en la web.
+
+http://tiddlywiki.com/editions/resumebuilder/
+
+(En inglés. Está en preparación la edición en castellano)
diff --git a/editions/es-ES/tiddlers/SafeMode.tid b/editions/es-ES/tiddlers/SafeMode.tid
new file mode 100644
index 000000000..fdcec0650
--- /dev/null
+++ b/editions/es-ES/tiddlers/SafeMode.tid
@@ -0,0 +1,29 @@
+caption: Modo Seguro
+created: 20140419082845576
+es-title: TiddlyWiki en modo de recuperación
+modified: 20160503162352208
+tags: Features
+title: SafeMode
+type: text/vnd.tiddlywiki
+
+! Introducción
+
+El <<.def "modo seguro">> desactiva la mayoría de customizaciones en ~TiddlyWiki en caso de que, a fuerza de adaptaciones sucesivas, dejen de funcionar correctamente. Un caso frecuente es el de la [[actualización|Upgrading]] del núcleo, que muchas veces <<.word rompe>> las customizaciones del usuario, especialmente en versiones Beta.
+
+! Cómo activar el modo seguro
+
+Modo seguro se activa al arrancar ~TiddlyWiki con el hash `#:safe`. 
+
+http://tiddlywiki.com/#:safe
+
+! Cómo trabaja el modo seguro
+
+Activar modo seguro produce los siguientes cambios en el funcionamiento de ~TiddlyWiki:
+
+* Todos los plugins se desactivan temporalmente.
+
+* Todos aquellos tiddlers que <<.word puentean>> tiddlers ocultos reciben el prefijo `SAFE:`, lo que restaura los originales
+
+* Algunas opciones de configuración se ignoran y usan los valores por defecto.
+
+Se muestra un informe de los tiddlers modificados por el usuario, de modo que pueden inspeccionarse en busca de fallos.
diff --git a/editions/es-ES/tiddlers/SampleAlert.tid b/editions/es-ES/tiddlers/SampleAlert.tid
new file mode 100644
index 000000000..59b3d5baa
--- /dev/null
+++ b/editions/es-ES/tiddlers/SampleAlert.tid
@@ -0,0 +1,11 @@
+caption: Notificación 
+component: Demo alerta
+created: 20160428150254657
+es-title: Alerta de ejemplo
+modified: 20160429054033333
+title: SampleAlert
+type: text/vnd.tiddlywiki
+
+Esta es una alerta de demostración. 
+
+Pinchando en el icono del cubo de basura se borra el tiddler que la contiene. Otra forma de librarse de ella es editar el tiddler [[Alerta de demostración|SampleAlert]] y quitarle la etiqueta.
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/SampleModal.tid b/editions/es-ES/tiddlers/SampleModal.tid
new file mode 100644
index 000000000..1cda94e69
--- /dev/null
+++ b/editions/es-ES/tiddlers/SampleModal.tid
@@ -0,0 +1,14 @@
+caption: Modal
+created: 20140912145537860
+es-title: MuestraModal
+footer: <$button message="tm-close-tiddler">Close</$button>
+modified: 20160415151609720
+subtitle: Este es un tiddler modal creado especialmente para <<yourName>>
+title: SampleModal
+type: text/vnd.tiddlywiki
+
+! ¡Hola, <<yourName>>!
+
+Este es un ejemplo de modal que contiene el siguiente mensaje:
+
+<<yourMessage>>
diff --git a/editions/es-ES/tiddlers/SampleNotification.tid b/editions/es-ES/tiddlers/SampleNotification.tid
new file mode 100644
index 000000000..ad4655b5a
--- /dev/null
+++ b/editions/es-ES/tiddlers/SampleNotification.tid
@@ -0,0 +1,8 @@
+caption: Notificación de ejemplo
+created: 20140912145543340
+es-title: Notificación de ejemplo
+modified: 20160429054048686
+title: SampleNotification
+type: text/vnd.tiddlywiki
+
+{{$:/core/images/info-button}} ¡Esto es una notificación!
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/SampleWizard.tid b/editions/es-ES/tiddlers/SampleWizard.tid
new file mode 100644
index 000000000..a8a7b20cf
--- /dev/null
+++ b/editions/es-ES/tiddlers/SampleWizard.tid
@@ -0,0 +1,12 @@
+created: 20140912145537860
+footer: <$button message="tm-close-tiddler">Cerrar</$button>
+modified: 20160416120434451
+subtitle: Soy un asistente modal
+title: SampleWizard
+type: text/vnd.tiddlywiki
+
+Este es un asistente de diálogo modal, guardado en el tiddler SampleWizard
+
+{{Motovun Jack.jpg}}
+
+Puedes <$button message="tm-modal" param="SampleWizard2">anidar asistentes</$button>.
diff --git a/editions/es-ES/tiddlers/SampleWizard2.tid b/editions/es-ES/tiddlers/SampleWizard2.tid
new file mode 100644
index 000000000..2bb0e84fc
--- /dev/null
+++ b/editions/es-ES/tiddlers/SampleWizard2.tid
@@ -0,0 +1,10 @@
+created: 20140912145532856
+footer: <$button message="tm-close-tiddler">Cerrar</$button>
+modified: 20160416120503104
+subtitle: Soy otro asistente modal
+title: SampleWizard2
+type: text/vnd.tiddlywiki
+
+Este es otro diálogo de asistente modal, guardado en el tiddler SampleWizard2.
+
+Puedes <$button message="tm-modal" param="SampleWizard">anidar asistentes</$button>
diff --git a/editions/es-ES/tiddlers/Saving.tid b/editions/es-ES/tiddlers/Saving.tid
new file mode 100644
index 000000000..6833f73d5
--- /dev/null
+++ b/editions/es-ES/tiddlers/Saving.tid
@@ -0,0 +1,11 @@
+caption: Guardar en ~TiddlyWiki
+created: 20140912140651119
+es-title: Guardar en TiddlyWiki
+modified: 20160422205412149
+tags: [[Working with TiddlyWiki]]
+title: Saving
+type: text/vnd.tiddlywiki
+
+Métodos disponibles para guardar cambios en ~TiddlyWiki
+
+<<list-links "[tag[Saving]]">>
diff --git a/editions/es-ES/tiddlers/Saving_on_Android.tid b/editions/es-ES/tiddlers/Saving_on_Android.tid
new file mode 100644
index 000000000..48e8bde0b
--- /dev/null
+++ b/editions/es-ES/tiddlers/Saving_on_Android.tid
@@ -0,0 +1,13 @@
+caption: Guardar en Android
+created: 20130825161400000
+es-title: Guardar en Android
+modified: 20160603150211485
+tags: Saving
+title: Saving on Android
+type: text/vnd.tiddlywiki
+
+La aplicación para dispositivos Android ~AndTidWiki permite editar y guardar cambios en TiddlyWiki5, incluso al trabajar offline, sin conexión de red.
+
+[[Descárgala de aquí|https://play.google.com/store/apps/details?id=de.mgsimon.android.andtidwiki&hl=es]].
+
+//Nota: ~AndTidWiki es un proyecto independiente de TiddlyWiki//
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Saving_on_InternetExplorer.tid b/editions/es-ES/tiddlers/Saving_on_InternetExplorer.tid
new file mode 100644
index 000000000..47d8704d4
--- /dev/null
+++ b/editions/es-ES/tiddlers/Saving_on_InternetExplorer.tid
@@ -0,0 +1,12 @@
+caption: Guardar en Internet Explorer
+created: 20131212182652334
+es-title: Guardar en Internet Explorer
+modified: 20160422201134073
+tags: Saving
+title: Saving on InternetExplorer
+type: text/vnd.tiddlywiki
+
+Por defecto, ~TiddlyWiki guarda los cambios en InternetExplorer 10 y superiores usando un módulo de guardado que descarga el archivo modificado en vez de guardarlo directamente. Hay dos alternativas para guardar los cambios directamente en el archivo:
+
+* [[Usando la extensión TiddlyIE |Saving with TiddlyIE]]
+* Ejecutándolo como [[aplicación HTA|Windows HTA Hack]] cambiando la extensión `*.html` por `*.hta`
diff --git a/editions/es-ES/tiddlers/Saving_on_Safari.tid b/editions/es-ES/tiddlers/Saving_on_Safari.tid
new file mode 100644
index 000000000..69c4bc890
--- /dev/null
+++ b/editions/es-ES/tiddlers/Saving_on_Safari.tid
@@ -0,0 +1,34 @@
+caption: Guardar en Safari
+created: 20140811171304926
+es-title: Guardar en Safari
+modified: 20160603131745607
+tags: Saving
+title: Saving on Safari
+type: text/vnd.tiddlywiki
+
+Este método para guardar cambios es un poco rudimentario porque requiere intervención manual para cada acción de guardado.
+
+# Descarga un TiddlyWiki en blanco pulsando este botón
+
+#> {{$:/editions/es-ES/snippets/download-empty-button}}
+
+#>Si el botón no funciona, guarda este enlace: http://tiddlywiki.com/languages/es-ES/empty.html
+
+#> Seguramente el navegador te pida que confirmes la descarga
+
+#Localiza el archivo que acabas de descargar
+
+#*Puedes cambiarle el nombre, siempre que mantengas la extensión `.html` o `.htm`
+
+#Abre el archivo en el navegador
+
+# Crea un nuevo tiddler usando el botón ''Nuevo tiddler'' {{$:/core/images/new-button}} de la barra lateral. Escribe algo en él y haz clic en el botón ''OK'' {{$:/core/images/done-button}}
+
+# Guarda los cambios con el botón ''Guardar cambios'' {{$:/core/images/save-button}} de la barra lateral
+
+# Se mostrará una ventana emergente ''Descargar cambios'', con un enlace con el nombre //Clic-derecho para guardar cambios//
+# Haz clic con el botón derecho y selecciona ''Descargar destino como...'' (u opción parecida) en el menú desplegable
+# Ve hasta la carpeta que contiene el archivo HTML de tu wiki y selecciona el archivo
+# Clic en el botón ''Guardar''
+# Clic en ''Reemplazar'' para confirmar la sustitución del archivo existente
+# Comprueba que los cambios se han guardado correctamente
diff --git a/editions/es-ES/tiddlers/Saving_on_TiddlySpot.tid b/editions/es-ES/tiddlers/Saving_on_TiddlySpot.tid
new file mode 100644
index 000000000..9d4583e49
--- /dev/null
+++ b/editions/es-ES/tiddlers/Saving_on_TiddlySpot.tid
@@ -0,0 +1,53 @@
+caption: Guardar en ~TiddlySpot
+created: 20130825213500000
+es-title: Guardar en TiddlySpot
+modified: 20160423054950812
+tags: Saving
+title: Saving on TiddlySpot
+type: text/vnd.tiddlywiki
+
+{{TiddlySpot}}
+
+Puedes subir un documento de ~TiddlyWiki5 a TiddlySpot siguiendo estos pasos:
+
+# Regístrate en http://tiddlyspot.com/ para poder crear un wiki y recuerda el nombre y la contraseña elegidos
+
+# Abre tu copia local de ~TiddlyWiki en el navegador
+
+# En la pestaña <<.controlpanel-tab Saving>> del [[panel de control|$:/ControlPanel]], rellena los campos de nombre y contraseña en TiddlySpot
+
+# Haz clic en el botón <<.button save-wiki>>. Una notificación en la esquina superior derecha de la pantalla te confirmará el guardado. Guardar puede llevar algún tiempo, dependiendo de la velocidad de conexión y del tamaño del wiki.
+
+# Navega hasta tu wiki en ~TiddlySpot: http://tuwiki.tiddlyspot.com/
+
+Ten en cuenta que la contraseña se envía sin encriptar. Más información en http://faq.tiddlyspot.com/:
+
+<<<
+''¿Es seguro ~TiddlySpot?''
+
+No. ~TiddlySpot no usa SSL/https. Tu contraseña se envía sin encriptar al guardar y al identificarte en un sitio privado. Esto significa que tu sitio en ~TiddlySpot es vulnerable al //sniffing// de paquetes y que tu contraseña puede ser vista por terceras partes malintencionadas. Los datos de tu sitio en ~TiddlySpot también se envían sin encriptar cuando accedes a tu sitio, aunque sea privado. Por este motivo te recomendamos que no incluyas en ~TiddlySpot información sensible como detalles bancarios y que no uses contraseñas que ya tengas en uso en otros sitios seguros.
+<<<
+
+!! Problemas al guardar en ~TiddlySpot
+
+Si usas Firefox, es más que probable que tropieces con este error al intentar guardar tu wiki en ~TiddlySpot:
+
+<<<
+Error while saving:
+
+Error:NS_ERROR_DOM_BAD_URI: Access to restricted URI denied
+<<<
+
+La operación de guardado falla por restricciones de seguridad de Firefox y está fuera de nuestro alcance. Hasta que se resuelva, nuestro consejo es que para guardar en ~TiddlySpot uses otro navegador, por ejemplo, Chromium:
+
+*# Abre tu wiki local con Chromium y repite los pasos 1 a 5 descritos más arriba
+
+*# Una vez hayas comprobado en Chromium que ~TiddlySpot ha alojado tu wiki correctamente, podrás  acceder, editar y [[guardar con Firefox|Saving with TiddlyFox]] en la copia online.
+
+* Después de subir tu archivo local por primera vez, podrás editar tu wiki y guardar cambios online con [[cualquier navegador moderno|BrowserCompatibility]] de tu preferencia.
+
+** No olvides introducir los datos de tu sitio de ~TiddlySpot en <<.controlpanel-tab Saving>> cada nuevo navegador con el que quieras guardar cambios online
+
+<<.tip "Ver también [[Actualizaciones|Upgrading]]">>
+
+<<.warning "Si lo que quieres es trabajar en local, subiendo luego los cambios a ~TiddlySpot, tendrás que volver a usar Chromium para evitar el error de Firefox.">>
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Saving_on_a_PHP_Server.tid b/editions/es-ES/tiddlers/Saving_on_a_PHP_Server.tid
new file mode 100644
index 000000000..da2f1d697
--- /dev/null
+++ b/editions/es-ES/tiddlers/Saving_on_a_PHP_Server.tid
@@ -0,0 +1,39 @@
+caption: Guardar en servidor php
+created: 20140111091844267
+es-title: Guardar en un servidor php
+modified: 20160422200511304
+tags: Saving
+title: Saving on a PHP Server
+type: text/vnd.tiddlywiki
+
+El módulo incorporado de guardado en TiddlySpot también puede usarse para guardar cambios en un sencillo script de PHP que puede ejecutarse en la mayoría de proveedores.
+
+<<.warning "Estas son instrucciones preliminares que aún necesitan verificación">>
+
+# Descarga una copia de <<.def store.php>> de [[aquí|https://code.google.com/p/bidix/source/browse/trunk/TiddlyHome/_th/lib/store.php]]
+
+# Edita tu copia de <<.def store.php>> para incluir tu nombre de usuario y contraseña. Busca la línea `$USERS = array( 'UserName1'=>'Password1'...etc` y sustituye <<.em Username1>> y <<.em Password1>> por los tuyos, respectivamente
+
+#* Asegúrate de dejar intactos el código y su puntuación.
+
+# Guarda los cambios
+
+# Mediante FTP o web, sube el archivo <<.def store.php>>al servidor. Asegúrate de que el nombre de archivo es correcto
+
+#* Si el archivo ha subido correctamente, lo verás en el navegador.
+
+# En ~TiddlyWiki, ve a la pestaña <<.controlpanel-tab Saving>> del [[Panel de control|$:/ControlPanel]] e introduce la siguiente información:
+
+#* Tu nombre de usuario como nombre de wiki
+
+#* Tu contraseña
+
+#* La URL del archivo ''store.php'', <<.em " La URL del archivo ''store.php'', no la del wiki">>
+
+La pestaña <<.controlpanel-tab Saving>> del panel de control incluye las siguientes opciones de configuración:
+
+|!Nombre |!Descripción |
+|Dirección (URL) del servidor |URL completa del archivo <<.def store.php>> en el servidor |
+|Nombre de archivo |Nombre de archivo usado para guardar el ~TiddlyWiki (por defecto <<.def index.html>> |
+|Directorio de almacenamiento |Ruta relativa al archivo <<.def store.php>> del directorio usado para guardar el wiki |
+|Directorio de copias de seguridad |Ruta relativa al archivo <<.def store.php>> del directorio donde se guarda la copia de seguridad del wiki.  |
diff --git a/editions/es-ES/tiddlers/Saving_on_iPad_iPhone.tid b/editions/es-ES/tiddlers/Saving_on_iPad_iPhone.tid
new file mode 100644
index 000000000..d1f4eceee
--- /dev/null
+++ b/editions/es-ES/tiddlers/Saving_on_iPad_iPhone.tid
@@ -0,0 +1,34 @@
+caption: Guardar en iPad/iPhone
+created: 20131129101027725
+es-title: Guardar en iPad/iPhone
+modified: 20160605183216156
+tags: Saving
+title: Saving on iPad/iPhone
+type: text/vnd.tiddlywiki
+
+La aplicación para iPad e iPhone ''TWEdit'' permite editar y guardar cambios en TiddlyWiki5, incluso cuando se trabaja offline, sin conexión de red.
+[[Descárgala aquí|https://itunes.apple.com/es/app/twedit/id409607956?mt=8]].
+
+Instrucciones de uso:
+
+# Abre TWEdit
+
+# Toca el título en el centro de la barra de herramientas en uso
+
+#* Aparecerá un cuadro de texto en el que puedes indicar una URL
+
+# Escribe la URL `http://tiddlywiki.com/languages/es-ES/empty.html`
+
+# Cuando se cargue el TiddlyWiki vacío, toca el icono ''Guardar'' (el segundo icono por la derecha, en la barra superior)
+
+#* Aparecerá un cuadro de alerta en el que debes indicar un nombre para el archivo local.
+
+#* Escribe el nombre que quieras usar para tu documento (siempre con la extensión `.html`)
+
+# Comprueba que funciona con el botón ''Nuevo tiddler'' {{$:/core/images/new-button}} de la barra lateral. Escribe algo en el tiddler y haz click en el botón ''OK'' {{$:/core/images/done-button}}
+
+# Guarda ahora los cambios haciendo click en el botón ''Guardar cambios'' {{$:/core/images/save-button}} de la barra lateral.
+
+#* Aparecerá un mensaje de confirmación arriba a la derecha
+
+//''Nota:'' TWEdit es un proyecto independiente de TiddlyWiki//
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Saving_with_TiddlyFox.tid b/editions/es-ES/tiddlers/Saving_with_TiddlyFox.tid
new file mode 100644
index 000000000..ae5c7aabb
--- /dev/null
+++ b/editions/es-ES/tiddlers/Saving_with_TiddlyFox.tid
@@ -0,0 +1,37 @@
+caption: Guardar en Firefox
+created: 20131221085742684
+es-title: Guardar con TiddlyFox
+modified: 20160603145935964
+tags: Saving
+title: Saving with TiddlyFox
+type: text/vnd.tiddlywiki
+
+Si usas ''Firefox para Android'', las instrucciones que necesitas son [[estas|Saving with TiddlyFox on Android]].
+
+#Comprueba que tienes la última versión de Firefox
+
+#* http://getfirefox.com
+
+# Descarga e instala la última versión disponible de TiddlyFox
+
+#* https://addons.mozilla.org/es/firefox/addon/tiddlyfox/
+
+# Reinicia Firefox
+
+# Descarga un TiddlyWiki en blanco pulsando este botón:
+
+#> {{$:/editions/es-ES/snippets/download-empty-button}}
+
+# Localiza el archivo que acabas de descargar
+
+#* Puedes cambiarle el nombre, pero mantén la extensión `.html` o `.htm`
+
+# Abre el archivo en Firefox
+
+# Dale a ''OK'' cuando TiddlyFox te pregunte si quieres activar la función de guardado para el archivo
+
+# Crea un nuevo tiddler usando el botón ''Nuevo'' {{$:/core/images/new-button}} de la barra lateral. Escribe algo en él y haz clic en el botón ''OK'' {{$:/core/images/done-button}}
+
+# Guarda los cambios con el botón ''Guardar'' {{$:/core/images/save-button}} de la barra lateral
+
+# Recarga la página para comprobar que se han guardado correctamente los cambios
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Saving_with_TiddlyFox_on_Android.tid b/editions/es-ES/tiddlers/Saving_with_TiddlyFox_on_Android.tid
new file mode 100644
index 000000000..7766ffdf0
--- /dev/null
+++ b/editions/es-ES/tiddlers/Saving_with_TiddlyFox_on_Android.tid
@@ -0,0 +1,42 @@
+caption: TiddlyFox en Android
+created: 20140103134551508
+es-title: Guardar con TiddlyFox en Android
+modified: 20160603145948981
+tags: Saving
+title: Saving with TiddlyFox on Android
+type: text/vnd.tiddlywiki
+
+También puedes consultar el [[video tutorial|TiddlyWiki on Firefox for Android Video]]
+
+
+# Asegúrate de que tienes la última versión de [[Firefox para Android|Firefox for Android]]
+
+#* http://getfirefox.com
+
+#Descarga e instala la última versión de la extensión TiddlyFox de:
+
+#* https://addons.mozilla.org/es/firefox/addon/tiddlyfox/
+
+#Instala esta extensión para poder guardar localmente el archivo TiddlyWiki:
+
+#* https://addons.mozilla.org/es/android/addon/save-link-menus/
+
+#Descarga un TiddlyWiki en blanco guardando el enlace:
+
+#* http://tiddlywiki.com/languages/es-ES/empty.html
+
+#>Para guardar el enlace, mantenlo presionado y selecciona "Save link" (asegúrate de tener instalada la extensión "save-link-menus")
+
+#Cuando se haya descargado el archivo, haz click en él, bien en la barra de notificaciones, bien en el administrador de descargas.
+
+# Para abrirlo, selecciona Firefox en vez del navegador por defecto de Android.
+
+# Haz clic en ''OK'' cuando TiddlyFox te pregunte si quieres activar la función de guardado para el archivo.
+
+# Comprueba que funciona con el botón ''Nuevo tiddler'' {{$:/core/images/new-button}} de la barra lateral. Escribe algo en el tiddler y haz click en el botón ''OK'' {{$:/core/images/done-button}}
+
+# Guarda ahora los cambios haciendo click en el botón ''Guardar cambios'' {{$:/core/images/save-button}} de la barra lateral.
+
+#* Arriba a la derecha aparecerá una notificación en amarillo que dice ''Guardado''
+
+# Actualiza la ventana del navegador para comprobar que los cambios se han guardado correctamente.
diff --git a/editions/es-ES/tiddlers/Saving_with_TiddlyIE.tid b/editions/es-ES/tiddlers/Saving_with_TiddlyIE.tid
new file mode 100644
index 000000000..e68febe84
--- /dev/null
+++ b/editions/es-ES/tiddlers/Saving_with_TiddlyIE.tid
@@ -0,0 +1,35 @@
+caption: Guardar: TiddlyIE
+created: 20131211220000000
+es-title: Guardar con TiddlyIE
+modified: 20160603131831758
+tags: [[Saving on InternetExplorer]]
+title: Saving with TiddlyIE
+type: text/vnd.tiddlywiki
+
+#Descarga e instala la extensión TiddlyIE:
+#* https://github.com/davidjade/TiddlyIE/releases
+
+#Reinicia Internet Explorer. Se te preguntará si quieres activar TiddlyIE
+
+#>Puede que también te pida activar //Microsoft Script Runtime//
+
+
+# Descarga un TiddlyWiki en blanco pulsando este botón
+
+#> {{$:/editions/es-ES/snippets/download-empty-button}}
+
+#>Si el botón no funciona, guarda este enlace: http://tiddlywiki.com/languages/es-ES/empty.html
+
+#> Seguramente el navegador te pida que confirmes la descarga
+
+#Localiza el archivo que acabas de descargar
+
+#*Puedes cambiarle el nombre, pero mantén la extensión `.html` o `.htm`
+
+#Abre el archivo con Internet Explorer
+
+# Crea un nuevo tiddler usando el botón ''Nuevo tiddler'' {{$:/core/images/new-button}} de la barra lateral. Escribe algo en él y haz clic en el botón ''OK'' {{$:/core/images/done-button}}
+
+# Guarda los cambios con el botón ''Guardar cambios'' {{$:/core/images/save-button}} de la barra lateral. Internet Explorer abrirá un cuadro de diálogo para que confirmes que quieres guardar el archivo localmente.
+
+# Recarga la página para comprobar que los cambios se han guardado correctamente
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Saving_with_the_HTML5_fallback_saver.tid b/editions/es-ES/tiddlers/Saving_with_the_HTML5_fallback_saver.tid
new file mode 100644
index 000000000..05e66d367
--- /dev/null
+++ b/editions/es-ES/tiddlers/Saving_with_the_HTML5_fallback_saver.tid
@@ -0,0 +1,35 @@
+caption: Guardar con módulo HTML5
+created: 20131129092604900
+es-title: Guardar con el módulo alternativo de guardado
+modified: 20160603131518256
+tags: Saving
+title: Saving with the HTML5 fallback saver
+type: text/vnd.tiddlywiki
+
+Este método para guardar cambios es un poco rudimentario porque requiere intervención manual para cada acción de guardado. Tiene, sin embargo, la ventaja de que funciona en casi todos los navegadores de escritorio y en muchos navegadores móviles.
+
+# Descarga un TiddlyWiki en blanco pulsando este botón
+
+#> {{$:/editions/es-ES/snippets/download-empty-button}}
+
+#>Si el botón no funciona, guarda este enlace: http://tiddlywiki.com/languages/es-ES/empty.html
+
+#> Seguramente el navegador te pida que confirmes la descarga
+
+#Localiza el archivo que acabas de descargar
+
+#*Puedes cambiarle el nombre, siempre que mantengas la extensión `.html` o `.htm`
+
+#Abre el archivo en el navegador
+
+# Crea un nuevo tiddler usando el botón ''Nuevo tiddler'' {{$:/core/images/new-button}} de la barra lateral. Escribe algo en él y haz clic en el botón ''OK'' {{$:/core/images/done-button}}
+
+# Guarda los cambios con el botón ''Guardar cambios'' {{$:/core/images/save-button}} de la barra lateral
+
+# El navegador descargará una copia del wiki que incluye tus cambios.
+
+# Localiza el archivo nuevo y ábrelo en el navegador
+
+# Comprueba que los cambios se han guardado correctamente
+
+''Consejo'': la mayoría de navegadores permiten la opción de especificar la localización de cada descarga, en lugar de descargar a la carpeta por defecto. Esta opción te permite "planchar" tu archivo con la nueva versión.
diff --git a/editions/es-ES/tiddlers/Scalability.tid b/editions/es-ES/tiddlers/Scalability.tid
new file mode 100644
index 000000000..045ee4db3
--- /dev/null
+++ b/editions/es-ES/tiddlers/Scalability.tid
@@ -0,0 +1,9 @@
+caption: Escalable
+created: 20130822173400000
+es-title: Escalabilidad
+modified: 20160429055303277
+tags: Features
+title: Scalability
+type: text/vnd.tiddlywiki
+
+Puedes sentirte tentado de pensar que la arquitectura de [[página única|SinglePageApplication]] de ~TiddlyWiki lo hace inadecuado para grandes cantidades de datos. La verdad es que los usuarios de ~TiddlyWiki suelen trabajar sin problemas con archivos de 20 ó 30 Mb... y se han hecho experimentos satisfactorios con archivos de varios Gb. 
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Searching_in_TiddlyWiki.tid b/editions/es-ES/tiddlers/Searching_in_TiddlyWiki.tid
new file mode 100644
index 000000000..c265d1e34
--- /dev/null
+++ b/editions/es-ES/tiddlers/Searching_in_TiddlyWiki.tid
@@ -0,0 +1,29 @@
+caption: Búsquedas
+created: 20140210160125905
+es-title: Búsquedas en TiddlyWiki
+modified: 20160422095858816
+tags: Features [[Working with TiddlyWiki]]
+title: Searching in TiddlyWiki
+type: text/vnd.tiddlywiki
+
+La función de búsqueda en ~TiddlyWiki es rápida y flexible
+
+!! Búsqueda estándar
+
+El cuadro de búsqueda de la barra lateral devuelve una lista de tiddlers coincidentes con el texto que se escriba en él. 
+
+<<.tip "
+Las pestañas de la barra lateral quedan ocultas bajo los resultados de la búsqueda hasta que se pulse en cualquier lugar para ocultarlos o se pinche la ''x'' para resetearlo. 
+">>
+
+!! Búsqueda avanzada
+
+Si se pincha en el botón con forma de lupa que hay a la derecha del cuadro de búsqueda, se abre la [[búsqueda avanzada|$:/AdvancedSearch]], que contiene cuatro pestañas. 
+
+* <<.advancedsearch-tab Standard>> es una instancia más del cuadro de búsqueda estándar de la barra lateral
+
+* <<.advancedsearch-tab System>> restringe el ámbito de búsqueda a los [[tiddlers de sistema|SystemTiddlers]]
+
+* <<.advancedsearch-tab Shadows>> restringe el ámbito de búsqueda a los [[tiddlers ocultos|ShadowTiddlers]]
+
+* <<.advancedsearch-tab Filter>> no es en sí un cuadro de búsqueda, sino una manera rápida de obtener una lista de tiddlers que cumplen todas las condiciones de una expresión de [[filtros|Filters]]. Por ejemplo: <<.word "Todas las etitquetas, excepto las de sistema">>
diff --git a/editions/es-ES/tiddlers/Selection_Constructors.tid b/editions/es-ES/tiddlers/Selection_Constructors.tid
new file mode 100644
index 000000000..42fce1b1c
--- /dev/null
+++ b/editions/es-ES/tiddlers/Selection_Constructors.tid
@@ -0,0 +1,15 @@
+caption: Constructores de selección
+created: 20150117204109000
+es-title: Constructores de selección
+modified: 20160420183010734
+tags: Filters
+title: Selection Constructors
+type: text/vnd.tiddlywiki
+
+El output de un [[paso|Filter Step]] depende de su [[operador|Filter Operators]]:
+
+* La mayoría de operadores obtienen su output a partir del input. Por ejemplo, muchos devuelven un subconjunto del input, cumpliendo así realmente con la función de <<.word filtros>>, al reducir el output de la instrucción que los contiene. Estos operadores se llaman <<.def "modificadores de selección">>.
+
+* Unos pocos operadores, sin embargo, ignoran el input y generan un output independiente. A estos se les llama <<.def "constructores de selección">>, porque construyen una [[selección|Title Selection]] totalmente nueva.
+
+Un buen ejemplo de constructor es <<.olink title>>. El output de `[title[A]title[B]]` es <<.tid B>>, mientras que <<.olink field>> es un modificador, por lo que `[title[A]field:title[B]` no genera output alguno.
diff --git a/editions/es-ES/tiddlers/Setting_a_favicon.tid b/editions/es-ES/tiddlers/Setting_a_favicon.tid
new file mode 100644
index 000000000..aebebc8fe
--- /dev/null
+++ b/editions/es-ES/tiddlers/Setting_a_favicon.tid
@@ -0,0 +1,19 @@
+caption: Favicons en ~TiddlyWiki
+created: 20131224074240979
+es-title: Definir un favicon
+modified: 20160427054526689
+tags: [[Customise TiddlyWiki]]
+title: Setting a favicon
+type: text/vnd.tiddlywiki
+
+El <<.word favicon>> es un pequeño icono que la mayoría de navegadores incorporan a la ventana para ayudar al usuario a identificar páginas. 
+
+! favicons en el navegador
+
+Cuando ~TiddlyWiki arranca en el navegador, busca un tiddler llamado <<.tid $:/favicon.ico>> y lo usa dinámicamente como favicon de la página. Si modificas la imagen, el favicon cambiará al instante.
+
+! favicons en el servidor
+
+Trabajando en la versión servidor de ~TiddlyWiki, es el comando ServerCommand quien facilita el contenido del tiddler [[$:/favicon.ico]] a la ruta `/favicon.ico`.
+
+
diff --git a/editions/es-ES/tiddlers/Setting_a_page_background_image.tid b/editions/es-ES/tiddlers/Setting_a_page_background_image.tid
new file mode 100644
index 000000000..238891a06
--- /dev/null
+++ b/editions/es-ES/tiddlers/Setting_a_page_background_image.tid
@@ -0,0 +1,29 @@
+caption: Fondos de página
+created: 20150417155912612
+es-title: Definir fondo de página
+modified: 20160427065343774
+tags: [[Customise TiddlyWiki]]
+title: Setting a page background image
+type: text/vnd.tiddlywiki
+
+# Importa la imagen como un tiddler. Consulta [[Images in WikiText]]
+
+#* También pueden usarse [[imágenes externas|ExternalImages]]
+
+# Abre el [[Panel de control|ControlPanel]] y la pestaña <<.em "Theme Tweaks">> en <<.controlpanel-tab "Appearance">>
+
+# Selecciona la imagen en el desplegable <<.word "Page background image">>
+
+# Establece <<.word "Page background image attachment">> como <<.word "Fixed to window">> para mantener la imagen fija y que el contenido se desplace sobre ella o como <<.word "Scroll with tiddlers">> para que se muevan simultáneamente.
+
+#* [[iPhone/iPad no soporta|http://stackoverflow.com/a/20444219]] el ajuste como imagen fija, por razones de rendimiento
+
+# Ajusta el tamaño de la imagen con <<.word "Page background image size">>:
+
+#* <<.word Auto>> hace que la imagen, si es necesario, forme mosaico para cubrir el fondo de la página 
+
+#* <<.word Cover>> ajusta la imagen de forma que cubra por completo el fondo de la página, lo que puede provocar que zonas de la imagen queden fuera de la vista.
+
+#* <<.word Contain>> hace que la imagen cambie su tamaño para ajustarse a los bordes de la página, lo que puede producir deformaciones en la imagen según sean sus dimensiones (p.ej, una imagen cuadrada se estirará horizontalmente de forma desproporcionada a su altura para encajar en una pantalla rectangular panorámica)
+
+De forma complementaria, puede ser necesario cambiar la <<.controlpanel-tab Palette>> de colores para mantener el nivel de legibilidad de la barra lateral. 
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Sharing_a_TiddlyWiki_on_Dropbox.tid b/editions/es-ES/tiddlers/Sharing_a_TiddlyWiki_on_Dropbox.tid
new file mode 100644
index 000000000..9680b3111
--- /dev/null
+++ b/editions/es-ES/tiddlers/Sharing_a_TiddlyWiki_on_Dropbox.tid
@@ -0,0 +1,35 @@
+caption: TiddlyWiki en Dropbox
+created: 20140122085818089
+es-title: Compartir un TiddlyWiki en Dropbox
+modified: 20160417162424439
+tags: Learning
+title: Sharing a TiddlyWiki on Dropbox
+type: text/vnd.tiddlywiki
+
+Puedes trabajar en un TiddlyWiki en Dropbox y publicar una URL que cualquiera puede ver en vista de sólo lectura.
+
+#Guarda el TiddlyWiki en tu carpeta de Dropbox
+
+# Selecciona la opción de Dropbox ''Copiar enlace de Dropbox'' para tener una URL pública del archivo
+
+#* En el sitio web de Dropbox se hace haciendo clic sobre el botón ''Compartir'' que aparece al pasar el ratón por encima del archivo. Además de obtener el enlace público al documento (cualquiera que tenga el enlace podrá verlo), puedes decidir limitar qué usuarios tienen acceso al documento, o ponerle caducidad al enlace. Dropbox también añade la opción de copiar el enlace público al menú contextual (clic con el botón derecho sobre el archivo) en sus ediciones de escritorio para OS X, Windows y Linux. 
+
+#> La URL generada por Dropbox tiene este formato:
+
+#> `https://www.dropbox.com/s/<blablablaincomprensible>/mi_archivo.html`
+
+# Cuidadosamente modifica la URL, conservando el blablablaincomprensible, así:
+
+#> `https://dl.dropboxusercontent.com/s/<blablablaincomprensible>/mi_archivo.html`
+
+El resultado es una URL "secreta" que puedes enviar a otros para que vean el documento.
+
+''Nota'': Si compartes la URL sin modificar, aquel que la reciba verá el archivo en la interfaz online de Dropbox, no verá el archivo abierto. 
+
+----
+
+Para ayudarte a modificar la URL pública de dropbox, cópiala aquí y así obtendrás la nueva URL secreta:
+
+<$edit-text tiddler="$:/temp/dropboxurl" default="https://www.dropbox.com/s/<blablabla>/mi_archivo.html" tag="input" type="text" size="60"/>
+
+<$macrocall $name="dropbox-url" url={{$:/temp/dropboxurl}}/>
diff --git a/editions/es-ES/tiddlers/Sharing_your_tiddlers_with_others.tid b/editions/es-ES/tiddlers/Sharing_your_tiddlers_with_others.tid
new file mode 100644
index 000000000..958499acd
--- /dev/null
+++ b/editions/es-ES/tiddlers/Sharing_your_tiddlers_with_others.tid
@@ -0,0 +1,34 @@
+caption: Compartir Tiddlers
+created: 20140908163900000
+es-title: Compartir Tiddlers con los demás
+modified: 20160412163859576
+tags: Learning
+title: Sharing your tiddlers with others
+type: text/vnd.tiddlywiki
+
+Hay muchas formas de compartir tiddlers:
+
+*Puedes enviar un ~Tiddlywiki por mail.
+
+*Puedes publicarlo online y enviar un enlace... 
+
+**a todo el archivo (URL del archivo),
+
+**a un tiddler específico (enlace que llamamos [[PermaLink|PermaLinks]]),
+
+**a una serie concreta de tiddlers (que llamamos PermaView)
+
+*Puedes //robar// tiddlers de un ~TiddlyWiki que alguien haya publicado por ahí y, simplemente, importarlos al tuyo, arrastrándolos con el ratón:
+
+**Abre tu ~TiddlyWiki en el navegador, en otra pestaña o en una nueva ventana.
+
+**Busca un enlace al tiddler que te interesa
+
+**Haz clic con el botón izquierdo del ratón y mantenlo presionado
+
+**Arrastra el enlace a la ventana o pestaña en la que tienes tu ~TiddlyWIki hasta que aparezca una barra en la parte superior de la pantalla que indica que tu ~TiddlyWiki está listo para recibirlo.
+
+**Al soltar el botón, aparecerá un tiddler pidiéndote que confirmes la importación.*
+
+*Puedes [[compartirlo en Dropbox|Sharing a TiddlyWiki on Dropbox]]
+* Puedes [[exportar tiddlers|How to export tiddlers]] a una gran variedad de formatos: HTML estático, CSV...
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Signing_the_Contributor_License_Agreement.tid b/editions/es-ES/tiddlers/Signing_the_Contributor_License_Agreement.tid
new file mode 100644
index 000000000..3836867ef
--- /dev/null
+++ b/editions/es-ES/tiddlers/Signing_the_Contributor_License_Agreement.tid
@@ -0,0 +1,30 @@
+caption: CLA - Cómo firmar
+created: 20150630205653005
+es-title: Cómo firmar el Acuerdo de licencia
+modified: 20160413172711483
+tags: 
+title: Signing the Contributor License Agreement
+type: text/vnd.tiddlywiki
+
+Crea un //pull request// en GitHub para añadir tu nombre a `cla-individual.md` o `cla-entity.md`, según corresponda si eres persona física o fiscal, con la fecha en formato YYYY/MM/DD.
+
+''paso a paso''
+
+# Según seas persona física o fiscal, ve a  
+#*[[licenses/CLA-individual|https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-individual.md]] o a
+
+#*[[licenses/CLA-entity|https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-entity.md]] 
+
+#Haz clic en el botón ''Edit'' arriba a la derecha (al hacerlo se creará un fork del repositorio para que puedas editar el archivo)
+
+# Añade tu nombre al final del documento
+
+#* P. Ej.: `Jeremy Ruston, @Jermolene, 2011/11/22`
+
+# Bajo el cuadro de edición del documento, debieras ver otro más pequeño, con el título ''Propose file change''
+
+# Escribe un título que explique de qué cambio se trata (p. ej.: "signing the CLA")
+
+# Haz clic en el botón verde que dice ''Propose file change''
+
+# En la página siguiente, haz clic en el botón verde que dice ''Create pull request''
diff --git a/editions/es-ES/tiddlers/Simple_Zork-like_Game_by_Jed_Carty.tid b/editions/es-ES/tiddlers/Simple_Zork-like_Game_by_Jed_Carty.tid
new file mode 100644
index 000000000..928a731a6
--- /dev/null
+++ b/editions/es-ES/tiddlers/Simple_Zork-like_Game_by_Jed_Carty.tid
@@ -0,0 +1,19 @@
+caption: "Simple Zork-like Game", de Jed Carty
+created: 20141118143636664
+es-title: "Simple Zork-like Game", de Jed Carty
+modified: 20160417101152125
+tags: Examples
+title: Simple Zork-like Game by Jed Carty
+type: text/vnd.tiddlywiki
+url: http://zorklike.tiddlyspot.com
+
+Juego sencillo, construido en TiddlyWiki, presentado en 
+A simple game built with TiddlyWiki, presentado en [[este post|https://groups.google.com/d/topic/tiddlywiki/4aRpZht1vOs/discussion]].
+
+{{!!url}}
+
+<<<
+Quise ver si era posible hacer algún tipo de juego usando sólo el núcleo de TiddlyWiki, sin plugins ni JavaScript. Hice una versión muy esquemática de juego de ficción al estilo de Zork. Es lo más sencillo que se puede hacer y que se pueda llamar juego, pero puede que le añada cosas más adelante. Lo hice en la versión 5.1.5 prerelease, porque el widget action-setfield ahorra mucho tiempo de definir macros.
+
+Una de las finalidades es no usar nada más que lo que contiene el núcleo de ~TiddlyWiki, tal cual: sin usar JavaScript ni plugin alguno.
+<<<
diff --git a/editions/es-ES/tiddlers/SingleFileApplication.tid b/editions/es-ES/tiddlers/SingleFileApplication.tid
new file mode 100644
index 000000000..fb5b3d35c
--- /dev/null
+++ b/editions/es-ES/tiddlers/SingleFileApplication.tid
@@ -0,0 +1,14 @@
+caption: Archivo único
+created: 20130822174000000
+es-title: Aplicación de archivo único
+modified: 20160429055855664
+tags: Definitions
+title: SingleFileApplication
+type: text/vnd.tiddlywiki
+
+Una <<.def "aplicación de archivo único">> es una en la que todos sus recursos se presentan en un único archivo estático. Esto significa que puede descargarse y usarse offline sin perder funcionalidad. Del mismo modo puede alojarse en casi cualquier tipo de servidor web.
+
+~TiddlyWiki es un caso particular de aplicación de archivo único porque guarda sus datos en sí mismo y es capaz, además, de guardar cambios en sí mismo, lo que también lo convierte en un curioso caso de [[quine|Quine]] con aplicaciones prácticas.
+
+Por definición, una aplicación de archivo único lo es también de [[página única|SinglePageApplication]], pero lo contrario no siempre es del todo cierto.
+
diff --git a/editions/es-ES/tiddlers/SinglePageApplication.tid b/editions/es-ES/tiddlers/SinglePageApplication.tid
new file mode 100644
index 000000000..6ad36960f
--- /dev/null
+++ b/editions/es-ES/tiddlers/SinglePageApplication.tid
@@ -0,0 +1,13 @@
+caption: Página única
+created: 20130822173900000
+es-title: Aplicación de página única
+modified: 20160429055921886
+tags: Definitions
+title: SinglePageApplication
+type: text/vnd.tiddlywiki
+
+Tal como lo define [[WIkipedia|https://es.wikipedia.org/wiki/Single-page_application]], una <<.def "aplicación de página única">> es una que cabe en una sola página con el propósito de dar una experiencia más fluida a los usuarios, que carga dinámicamente contenido adicional a medida que el usuario navega por el sitio.
+
+Es frecuente que las aplicaciones de página única se diseñen cuidadosamente para ocultar su naturaleza, de modo que su apariencia y funcionamiento sea la de una página estática común, respetando la barra de dirección y los controles de navegación adelante y atrás. 
+
+De manera inusual, TiddlyWiki es también una aplicación de [[archivo único|SingleFileApplication]].
diff --git a/editions/es-ES/tiddlers/Some_of_the_things_you_can_do_with_TiddlyWiki.tid b/editions/es-ES/tiddlers/Some_of_the_things_you_can_do_with_TiddlyWiki.tid
new file mode 100644
index 000000000..effa1928f
--- /dev/null
+++ b/editions/es-ES/tiddlers/Some_of_the_things_you_can_do_with_TiddlyWiki.tid
@@ -0,0 +1,35 @@
+caption: Cosas que puedes hacer
+created: 20140904090300000
+es-title: Varias de las muchas cosas que puedes hacer con TiddlyWiki
+modified: 20160605050204409
+tags: HelloThere
+title: Some of the things you can do with TiddlyWiki
+type: text/vnd.tiddlywiki
+
+* Tomar notas y usar etiquetas y enlaces para formar relaciones entre ellas
+
+* Organizarte usando pestañas, solapas, tablas, listas e índices 
+
+* Organizar tus páginas web favoritas, como en [[este ejemplo|http://giffmex.org/experiments/tidmarks.html]]
+
+* Llevar el control de tareas y reuniones y organizarlos con múltiples etiquetas (mira nuestro sencillo ejemplo de [[administrador de tareas|TaskManagementExample]]
+
+* Hacer inventario de absolutamente todo: de tus recetas, tu biblioteca, tus contactos, tu colección de música ...etc.
+
+* Crear un blog o página web personal
+
+* Escribir un libro
+
+* Organizar tus imágenes en galerías (mira un sencillo ejemplo de [[hoja de contactos|ImageGallery Example]]
+
+* Compartir con otros la información de tu ~TiddlyWiki, bien como archivo publicado online, como adjunto en un correo, como documento de tiddler individual o como enlace a un tiddler específico publicado online. Intenta arrastrar un tiddler de un ~TiddlyWiki a otro y verás qué ocurre)
+
+* Bocetar sobre una imagen (edita [[Motovun Jack.jpg]] y dibuja con el ratón sobre la imagen para ver qué pasa)
+
+* Usar elementos web habituales, como las llamadas //lightboxes//. (MIra un ejemplo pulsando el botón que aparece en SampleWizard)
+
+* Crear una presentación de diapositivas
+
+* Preparar toda una base de conocimientos, local u online con un archivo ~TiddlyWiki que enlace a otros. Aquí hay un [[ejemplo en castellano|http://recursos.giffmex.org]]
+
+* Preparar una presentación visual de datos, usando tiddlers como fuente de datos. Un buen ejemplo lo tienes [[en esta página| http://tiddlywiki.com/plugins/tiddlywiki/d3/]]
diff --git a/editions/es-ES/tiddlers/Spelling.tid b/editions/es-ES/tiddlers/Spelling.tid
new file mode 100644
index 000000000..6854916f0
--- /dev/null
+++ b/editions/es-ES/tiddlers/Spelling.tid
@@ -0,0 +1,22 @@
+caption: Ortografía
+created: 20150110182900000
+es-title: Ortografía
+modified: 20160418162314298
+tags: [[Improving TiddlyWiki Documentation]]
+title: Spelling
+type: text/vnd.tiddlywiki
+
+Al ser de origen británico, ~TiddlyWiki prefiere, para su documentación en inglés, el [[uso ortográfico británico frente al americano |http://en.wikipedia.org/wiki/American_and_British_English_spelling_differences]].
+
+Por ese motivo, palabras como <<.word colour>> siguen la norma británica, salvo en aquellos casos en que por motivos técnicos es obligado el uso de la norma americana (p.ej., código en CSS o JavaScript).
+
+En esta edición en castellano, nos remitimos al [[uso ortográfico y estilístico peninsular|http://www.wikilengua.org/index.php/Portada]], a la vez que invitamos a los usuarios hispanohablantes del resto de países a contribuir con este proyecto aportando el material que consideren necesario para que ~TiddlyWiki y su documentación se adapte a la rica variedad de dialectos de nuestra lengua.
+
+Fuera de eso, los acrónimos técnicos estándar se escriben en mayúscula y sin puntos: <<.word HTML>>
+
+Conviene evitar abreviar arbitrariamente palabras y frases, aunque las siguientes son aceptables:
+
+|!Abreviatura |!Significado |!Observaciones |
+|p.ej. |por ejemplo |punto detrás de cada letra, aunque le sigan coma o dos puntos |
+|i.e. |esto es, es decir, |punto detrás de cada letra |
+|...etc |etcétera |puntos suspensivos delante y sin punto detrás |
diff --git a/editions/es-ES/tiddlers/Structuring_TiddlyWiki.tid b/editions/es-ES/tiddlers/Structuring_TiddlyWiki.tid
new file mode 100644
index 000000000..be6695545
--- /dev/null
+++ b/editions/es-ES/tiddlers/Structuring_TiddlyWiki.tid
@@ -0,0 +1,14 @@
+caption: Estructurar ~TiddlyWiki
+created: 20131128090536894
+es-title: Estructurar TiddlyWiki
+modified: 20160422205446418
+tags: [[Working with TiddlyWiki]]
+title: Structuring TiddlyWiki
+type: text/vnd.tiddlywiki
+
+TiddlyWiki5 proporciona varias herramientas útiles para estructurar información en forma de  [[tiddlers|Tiddlers]] y estructurar las diferentes relaciones que se establecen entre ellos:
+
+* [[Enlaces|TiddlerLinks]]
+* [[Etiquetas|Tagging]]
+* [[Listas|Title List]]
+* [[Tiddlers de datos|DataTiddlers]]
diff --git a/editions/es-ES/tiddlers/TW2Parser_Plugin.tid b/editions/es-ES/tiddlers/TW2Parser_Plugin.tid
new file mode 100644
index 000000000..9e54f3bb2
--- /dev/null
+++ b/editions/es-ES/tiddlers/TW2Parser_Plugin.tid
@@ -0,0 +1,12 @@
+caption: Intérprete TW2
+created: 20160107223340750
+es-title: Intérprete TW2
+list: 
+modified: 20160504142710275
+tags: [[Plugin Editions]]
+title: TW2Parser Plugin
+type: text/vnd.tiddlywiki
+
+Este es un plugin experimental que añade la funcionalidad de mostrar WikiText escrito para la primera versión <<.word Classic>> de ~TiddlyWiki.
+
+Está disponible en: http://tiddlywiki.com/plugins/tiddlywiki/tw2parser/
diff --git a/editions/es-ES/tiddlers/TagTiddlers.tid b/editions/es-ES/tiddlers/TagTiddlers.tid
new file mode 100644
index 000000000..e165e93cb
--- /dev/null
+++ b/editions/es-ES/tiddlers/TagTiddlers.tid
@@ -0,0 +1,13 @@
+caption: ~TagTiddlers
+created: 20141228094500000
+es-title: Tiddlers etiqueta
+modified: 20160426090824254
+tags: Tagging
+title: TagTiddlers
+type: text/vnd.tiddlywiki
+
+Un <<.def ~TagTiddler>> o <<.word "tiddler etiqueta">> es un tiddler cuyo título se usa para etiquetar a otros.
+
+La pestaña <<.info-tab Tagging>> del InfoPanel muestra qué tiddlers usan el título del actual como etiqueta. 
+
+Se pueden usar etiquetas sin correspondencia con un ~TagTiddler.
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Tagging.tid b/editions/es-ES/tiddlers/Tagging.tid
new file mode 100644
index 000000000..0bec4d0df
--- /dev/null
+++ b/editions/es-ES/tiddlers/Tagging.tid
@@ -0,0 +1,47 @@
+caption: Etiquetas
+created: 20140904075400000
+es-title: Organizarse con etiquetas
+modified: 20160414162409272
+tags: [[Working with TiddlyWiki]] Concepts
+title: Tagging
+type: text/vnd.tiddlywiki
+
+Poner etiquetas es una forma de organizar tiddlers en categorías.
+
+Por ejemplo, si tuvieras una serie de tiddlers que representa a un grupo de gente que conoces, podrías etiquetarlos como ''amigo'', ''familiar'', ''colega''...etc, para indicar tu relación con ellos.
+
+Una etiqueta es, de hecho, un tiddler (o un tiddler en potencia) y también puede tener sus propias etiquetas. Además puedes añadir cualquier número de etiquetas a un mismo tiddler.
+
+En [[Crear y editar tiddlers |Creating and editing tiddlers]] te decimos cómo etiquetar tiddlers.
+
+Al etiquetar tiddlers, puedes ver, buscar y organizar la información de múltiples maneras:
+
+* Haciendo clic en las píldoras de colores de un tiddler tienes acceso inmediato a cualquiera de los tiddlers que tienen misma etiqueta, así como al tiddler que representa esa etiqueta y que contiene, en forma de índice, una lista de todos esos tiddlers etiquetados igual.
+
+* Si un tiddler sirve como etiqueta, la pestaña ''Etiquetado'' en el InfoPanel te mostrará qué tiddlers son los que llevan el título de ese tiddler como etiqueta.
+
+* La pestaña ''Más'' de la barra lateral presenta una vista general, organizada por solapas, que te permite acceder a todos los tiddlers etiquetados.
+
+* Puedes usar [[filtros |Filters]] para crear listas de tiddlers basadas en sus etiquetas. Puedes mostrar cualquier combinación de [[campos|TiddlerFields]] de esos tiddlers. Por ejemplo, puedes confeccionar un glosario haciendo una lista de los campos "título" y "texto" de todos los tiddlers con la etiqueta "Glosario". Tales listas pueden formatearse como prefieras con viñetas, números, o separadas por comas.
+
+* Hay un número de etiquetas especiales ''de sistema'' que controlan tanto el layout de los tiddlers, como el de toda la página. Más información en [[Diseño de tiddlers y de página|Page and tiddler layout customisation]]
+
+Hay un par más de cosas que se pueden hacer con etiquetas:
+
+!!Ponerles color e icono
+
+Se puede usar el [[gestor de etiquetas|$:/TagManager]] de la pestaña ''Más'' de la barra lateral para cambiarles el color o para añadirles un icono.
+
+* Para cambiar el color, haz clic en el botón de la columna ''Color'' y  selecciona uno nuevo en la rueda. También puedes hacer clic en el icono de la columna ''Información'' e introducir un valor CSS en el campo ''Color''
+
+* Para añadir un icono a la etiqueta, haz clic en el botón {{$:/core/images/down-arrow}} de la columna ''Icono'' y selecciona uno de entre los disponibles. También, si sabes el nombre del tiddler que contiene el icono que quieres usar, puedes introducirlo directamente en el campo correspondiente de la columna ''Información''
+
+* To change the icon, click the {{$:/core/images/down-arrow}} button in the ''Icon'' column and choose from the list of available icons
+
+!! Cambiar el orden de etiquetado
+
+Por defecto, los tiddlers se muestran en orden alfabético.
+
+Si quieres cambiarlo, añade el campo <<.flink ListField>> al tiddler y como valor enumera los tiddlers según  el orden que quieras que tengan en la [[lista|Title List]].
+
+El campo ''list'' no necesita enumerarlos a todos. En [[Orden de los tiddlers etiquetados|Order of Tagged Tiddlers]] se especifican más concretamente las reglas que sigue ~TiddlyWiki para ordenarlos.
diff --git a/editions/es-ES/tiddlers/TaskManagementExample.tid b/editions/es-ES/tiddlers/TaskManagementExample.tid
new file mode 100644
index 000000000..b915cd7cc
--- /dev/null
+++ b/editions/es-ES/tiddlers/TaskManagementExample.tid
@@ -0,0 +1,27 @@
+caption: Administración de tareas
+created: 20130825213300000
+es-title: Ejemplo de administración de tareas
+modified: 20160416115204535
+tags: Learning
+title: TaskManagementExample
+type: text/vnd.tiddlywiki
+
+TiddlyWiki5 sirve también como sencillo sistema de administración de tareas, sin necesidad de mayores complicaciones. La idea consiste en etiquetar las tareas como `task`, de modo que una vez hechas se etiqueten también como `done`. Así resulta bastante sencillo generar listas de tareas. 
+
+Aquí tienes un ejemplo:
+
+! Tareas pendientes
+
+<$list filter="[!has[draft.of]tag[task]!tag[done]sort[created]]">
+
+<$checkbox tag="done"> <$link to={{!!title}}><$view field="caption"/></$link></$checkbox>
+
+</$list>
+
+! Tareas completadas
+
+<$list filter="[!has[draft.of]tag[task]tag[done]sort[created]]">
+
+<$checkbox tag="done"> ~~<$link to={{!!title}}><$view field="caption"/></$link>~~</$checkbox>
+
+</$list>
diff --git a/editions/es-ES/tiddlers/Technical_Prose_Style.tid b/editions/es-ES/tiddlers/Technical_Prose_Style.tid
new file mode 100644
index 000000000..742e33e41
--- /dev/null
+++ b/editions/es-ES/tiddlers/Technical_Prose_Style.tid
@@ -0,0 +1,20 @@
+caption: Estilo: Redacción técnica
+created: 20150110182900000
+es-title: Estilo de redacción técnica
+modified: 20160419090557219
+tags: [[Improving TiddlyWiki Documentation]]
+title: Technical Prose Style
+type: text/vnd.tiddlywiki
+
+Al redactar [[material didáctico|Instruction Tiddlers]], empieza por planificar la información que quieres presentar como un itinerario: debe ser una progresión sencilla, lógica y directa de ideas, sin retrocesos ni saltos. Aplica este enfoque incluso en frases sueltas, de modo que el discurso vaya de la causa al efecto y de lo viejo conocido a lo nuevo desconocido.
+
+Usa frases cortas y sencillas. Una frase en estilo técnico y claro raramente contiene más de una idea, por eso se evita el uso de paréntesis. De igual manera, haz que la estructura de los párrafos sea sencilla. Una presentación lisa y llana suele ser más fácil de comprender que una una exposición jerarquizada de conceptos.
+
+A menudo se puede simplificar una frase sin necesidad de cambiar su significado, tanto como para ajustar su vocabulario o estructura gramatical. <<.word "Se realiza la ejecución de la macro">> sólo significa <<.word "Macro en ejecución">>. <<.word "Tus expectativas podrían ser...">> es lo mismo que <<.word "puedes esperar que...">>.
+
+Usa preferentemente la voz activa: <<.word "Fulano crea un tiddler">> es mejor que <<.word "un tiddler es creado por Fulano">> o <<.word "se crea un tiddler por Fulano">>. 
+El uso de oraciones pasivas o impersonales puede ser útil cuando se quiere que el lector se centre en una acción o en su resultado: <<.word "se crea un tiddler">>, pero en general es más claro partir de una causa y explicar su efecto y decir algo del estilo de <<.word "esta acción crea un tiddler">>, de la forma más natural y sencilla posible.
+
+En la documentación generalmente se presentan conceptos paralelos, bien por su parecido, bien por su diferencia. Al lector puede serle más fácil comprenderlo si se usan las mismas frases o la misma estructura de exposición, pero debe de hacerse de manera equilibrada para que no resulte monótono.
+
+Son preferibles las instrucciones claras y precisas a una larga e intrincada explicación. Si algo tiene nombre, úsalo. Si no lo tiene, ponlo en un tiddler.
diff --git a/editions/es-ES/tiddlers/Ten_reasons_to_switch_to_TiddlyWiki.tid b/editions/es-ES/tiddlers/Ten_reasons_to_switch_to_TiddlyWiki.tid
new file mode 100644
index 000000000..22a0d3a83
--- /dev/null
+++ b/editions/es-ES/tiddlers/Ten_reasons_to_switch_to_TiddlyWiki.tid
@@ -0,0 +1,30 @@
+caption: Diez motivos para cambiar
+created: 20140904085700000
+es-title: Diez razones para cambiar a TiddlyWiki
+modified: 20160416063351852
+tags: HelloThere
+title: Ten reasons to switch to TiddlyWiki
+type: text/vnd.tiddlywiki
+
+@@.tc-double-spaced-list
+
+# Con ~TiddlyWiki puedes organizar tus notas a tu manera, no a la suya. Tus notas se adaptan a tu forma de pensar, en lugar de ponerte un corsé estructurado jerárquicamente en cuadernos y pestañas
+
+# El enfoque no linear de~TiddlyWiki's te hará ver tu información de formas nuevas y más útiles
+
+# Encontrar tus notas en ~TiddlyWiki es cosa de un segundo
+
+# Hay muchas maneras de personalizar y adaptar cada aspecto de ~TiddlyWiki
+
+# ~TiddlyWiki es libre y gratuito y es compatible, además, con cualquier plataforma. Funciona en cualquier navegador web y no necesitas comprar ningún programa ni pagar suscripción alguna para usarlo como se te antoje. 
+
+# ~TiddlyWiki promueve el libre intercambio de información. Hay muchas formas de compartir información en ~TiddlyWiki
+
+# Con ~TiddlyWiki, tu información es tuya y sólo tuya y puedes guardarla donde te dé la gana: en el ordenador, en el móvil, en la tablet, en un pendrive, en Dropbox, en un servidor... Tú mandas.
+
+# ~TiddlyWiki cuenta con un número creciente de plugins, temas, widgets e idiomas en permanente desarrollo
+
+# La comunidad ~TiddlyWiki es amable y hará siempre lo que pueda para proporcionarte la ayuda que necesitas
+
+# Si además eres programador, encontrarás incluso más formas de jugar con ~TiddlyWiki, porque cuanto más aprendes de ~TiddlyWiki, más te diviertes con él. 
+@@
diff --git a/editions/es-ES/tiddlers/Text-Slicer_Edition.tid b/editions/es-ES/tiddlers/Text-Slicer_Edition.tid
new file mode 100644
index 000000000..7601f3cd6
--- /dev/null
+++ b/editions/es-ES/tiddlers/Text-Slicer_Edition.tid
@@ -0,0 +1,11 @@
+caption: Cortatextos
+created: 20150718123139133
+es-title: Cortatextos
+modified: 20160605040709346
+tags: Editions
+title: Text-Slicer Edition
+type: text/vnd.tiddlywiki
+
+El <<.def " Cortatextos">> es una edición especial que contiene herramientas para dividir largos textos en tiddlers individuales.
+
+http://tiddlywiki.com/editions/text-slicer/
diff --git a/editions/es-ES/tiddlers/The_First_Rule_of_Using_TiddlyWiki.tid b/editions/es-ES/tiddlers/The_First_Rule_of_Using_TiddlyWiki.tid
new file mode 100644
index 000000000..7a2220da7
--- /dev/null
+++ b/editions/es-ES/tiddlers/The_First_Rule_of_Using_TiddlyWiki.tid
@@ -0,0 +1,39 @@
+caption: Primera regla de uso
+created: 20140419132828051
+es-title: Primera regla al usar TiddlyWiki
+modified: 20160421134758270
+tags: [[Working with TiddlyWiki]]
+title: The First Rule of Using TiddlyWiki
+type: text/vnd.tiddlywiki
+
+!! Historias de terror
+
+Cada tanto se cuentan en los grupos de discusión historias que parten el corazón sobre usuarios que por uno u otro motivo han perdido los datos guardados en TiddlyWiki:
+
+>Mi TiddlyWiki acaba de ser borrado por completo durante un cuelgue de Firefox cuando guardaba...
+
+https://groups.google.com/d/topic/tiddlywiki/oG2L7OXhUoI/discussion
+
+> La última vez que lo usé fue anoche, en casa, en mi ordenador con Windows 7. Le di a <<.button save>> para guardar la última entrada y se guardó via TiddlyFox. Expulsé el USB, llegué al trabajo esta mañana, enchufé el USB, metí la contraseña y, como se negaba a abrir, después de varios intentos busqué el archivo html de TW5. Fue entonces cuando me di cuenta de que el tamaño del archivo ya no es de 3Mb, sino de 80Kb. Me parece que lo he perdido todo.
+
+https://groups.google.com/d/topic/tiddlywiki/SXStDJ0ntGI/discussion
+
+¡Que no te pase a ti!!
+
+!!! La primera regla de uso de TiddlyWiki es:
+
+<p style="font-size:40pt;line-height:48pt;font-weight:700;color:red;">
+¡¡Haz copia de seguridad!!
+</p>
+
+TiddlyWiki es un sistema altamente flexible y customizable que te pone firmemente a cargo de tus datos. En el desarrollo de TiddlyWiki se pone todo el cuidado posible para garantizar que es un lugar seguro donde guardar tus datos más preciados. Sin embargo y en última instancia, la responsibilidad de reducir el riesgo de pérdida de datos recae sobre sus usuarios.
+
+La mejor manera de asegurarse de que tus datos están seguros es mediante un riguroso sistema de <<.word backup>> o copia de seguridad.
+
+*Usa servicios del estilo de Dropbox para tener siempre una copia de seguridad online. Dropbox tiene además una [[característica especial|https://www.dropbox.com/help/11]], que guarda y permite recuperar versiones anteriores de un archivo.
+
+* Haz copia de seguridad antes de actualizar TiddlyWiki a una nueva versión
+
+* Piensa siempre en cómo protegerte en el peor de los casos: ¿qué pasa si falla el USB o se rompe el disco duro? ¿Qué pasa si el ordenador se bloquea por un virus?
+
+* Actúa de manera defensiva y redundante: haz varias copias de seguridad y mantenlas en distintos sitios
diff --git a/editions/es-ES/tiddlers/TiddlerLinks.tid b/editions/es-ES/tiddlers/TiddlerLinks.tid
new file mode 100644
index 000000000..6f2fb20fc
--- /dev/null
+++ b/editions/es-ES/tiddlers/TiddlerLinks.tid
@@ -0,0 +1,31 @@
+caption: Enlaces
+created: 20130825202900000
+es-title: Enlaces - TiddlerLinks
+modified: 20160414061639029
+tags: Concepts
+title: TiddlerLinks
+type: text/vnd.tiddlywiki
+
+Un enlace es la región de un tiddler sobre la que se puede hacer clic para navegar a otro. El comportamiento de navegación lo determina el StoryView actual. La vista "classic" muestra la historia como una secuencia lineal de tiddlers.
+
+Si se mantiene pulsada la tecla ''Ctrl'' o ''command'' al hacer clic en un enlace, se abre el tiddler de destino, pero no se navega hasta él. Esta es una forma muy útil de //poner en cola// una serie de tiddlers para su lectura.
+
+Los enlaces o //links// son útiles para modelar relaciones orgánicas entre tiddlers y, más particularmente, para iterar la navegación entre tiddlers.
+
+El [[Panel de información|InfoPanel]] muestra en la pestaña ''Referencias'' una lista de los links que //llegan// al tiddler.
+
+En [[Filtros|Filters]] se pueden incluir los siguientes operadores para trabajar con enlaces:
+
+* `[links[]]` - devuelve el título de los tiddlers enlazados desde el tiddler o selección actual de tiddlers.
+
+* `[backlinks[]]` - devuelve el título de los tiddlers que enlazan con el tiddler o selección actual de tiddlers.
+
+TiddlyWiki5 modifica la apariencia de los enlaces para dar información adicional sobre el tipo de tiddler al que se enlaza:
+
+|!Descripción del link |!Apariencia |
+|A un tiddler existente |[[TalCual|TiddlerLinks]] |
+|A un tiddler que no existe (faltante) |[[TalCual|ATiddlerThatDoesntExist]] |
+|A un tiddler oculto que no ha sido anulado |[[TalCual|$:/core/copyright.txt]] |
+|A un tiddler oculto que ha sido anulado por un tiddler común  |[[TalCual|$:/SiteTitle]] |
+
+Los enlaces externos se muestran así: http://tiddlywiki.com/ o [[así|http://tiddlywiki.com/]].
diff --git a/editions/es-ES/tiddlers/Tiddler_Structure.tid b/editions/es-ES/tiddlers/Tiddler_Structure.tid
new file mode 100644
index 000000000..283062200
--- /dev/null
+++ b/editions/es-ES/tiddlers/Tiddler_Structure.tid
@@ -0,0 +1,21 @@
+caption: Estilo: Estructura de tiddlers
+created: 20150110183300000
+es-title: Estructura de tiddlers
+modified: 20160418155732287
+tags: [[Improving TiddlyWiki Documentation]]
+title: Tiddler Structure
+type: text/vnd.tiddlywiki
+
+Conforme a nuestra [[filosofía|Philosophy of Tiddlers]], los tiddlers de la documentación son breves y están interrelacionados.
+
+Cuando parece que un tiddler necesita subapartardos, es señal de que quizá convendría dividirlo en tiddlers más pequeños. Es razonable, sin embargo, que un tiddler [[de referencia|Reference Tiddlers]] vaya encabezado por una sección introductoria general, seguido de una serie de secciones.
+
+Coherencia terminológica es esencial para no confundir al lector. 
+
+Consistencia tipográfica y de puntuación dan calidad profesional a la documentación. El uso de macros se recomienda por razones de consistencia del texto y de mantenimiento de futuras revisiones.
+
+Se aconseja el uso de listas numeradas para intrucciones paso-a-paso y el de viñetas para listas cuyo orden es arbitrario. Se prefiere el uso de listas de definición sobre el de listas con viñetas si cada elemento de la lista comienza con un término y dos puntos. En la medida de lo posible conviene evitar niveles excesivos de anidamiento de listas.
+
+Conviene usar tablas cuando la información encaja naturalmente en tres o cuatro columnas y para listas de parámetros, atributos... etc 
+
+La documentación describe la realidad actual de ~TiddlyWiki y debe evitarse discutir futuras aspiraciones del proyecto.
diff --git a/editions/es-ES/tiddlers/Tiddler_Title_Policy.tid b/editions/es-ES/tiddlers/Tiddler_Title_Policy.tid
new file mode 100644
index 000000000..3d56cf8ae
--- /dev/null
+++ b/editions/es-ES/tiddlers/Tiddler_Title_Policy.tid
@@ -0,0 +1,32 @@
+caption: Estilo: Títulos
+created: 20150110183300000
+es-title: Estilo de los títulos
+modified: 20160418153611550
+tags: [[Improving TiddlyWiki Documentation]]
+title: Tiddler Title Policy
+type: text/vnd.tiddlywiki
+
+Muchos tiddlers de la documentación, especialmente [[los de referencia|Reference Tiddlers]], hacen referencia a un único concepto. Sus títulos debieran ser sintagmas nominales simples y claros como <<.tid "List Widget">>, <<.tid "~TiddlerFields">> o <<.tid "Material de referencia">>.
+
+En la edición original inglesa, cada sustantivo del título se escribe con mayúscula, mientras que artículos, preposiciones y conjunciones se escriben con minúscula. Ej:<<.tid "Ejemplo de Título de la Edición en Inglés">>
+
+En la presente edición en castellano, sólo lleva mayúscula la palabra inicial del título y el resto se escribe en minúscula y termina sin punto: <<.tid "Ejemplo de título de la edición en castellano">>
+
+Las etiquetas siguen también este mismo patrón.
+
+Los títulos de este tipo son en plural si se refieren a una categoría de elementos: ---Ej: <<.tid "Atajos de teclado">>---, ya que etiquetan tiddlers más específicos dentro de su categoría.
+
+Cuando el objeto del título sea un concepto más que una categoría, se enuncia en singular. Ej:<<.tid "List Widget">>, <<.tid "Operador de etiqueta">>
+
+En la edición inglesa, los títulos comienzan enunciando su parte más distintiva. Por ejemplo, los tiddlers que documentan operadores de filtro tienen títulos del estilo  <<.tid "addprefix Operator">>. De este modo, en teoría, el lector puede identificar rápidamente un tiddler particular en una lista de enlaces. 
+
+En la presente edición en castellano, sin embargo y por coherencia gramatical, los títulos se enuncian en el orden lógico y acostumbrado en nuestra lengua. El ejemplo anterior sería, por tanto: <<.tid "Operador addprefix">>. Nótese, sin embargo, lo siguiente:
+
+*Con el fin de mantener la integridad del código de ~TiddlyWiki y las referencias de su documentación, así como de facilitar futuras actualizaciones, estamos obligados a dejar los títulos de de la documentación original en inglés sin traducir. Esto, que podría ser un inconveniente, nos da la ventaja de poder explotar las funcionalidades de TiddlyWiki y así ofrecer al lector un doble juego de títulos para cada tiddler:
+
+** Un ''título completo'', que es el que corresponde a la traducción del título original, que se muestra en el encabezamiento de cada tiddler (en el presente: <<.tid "Estilo de los títulos">>)
+** Un ''título abreviado'', que es una descripción esquemática del contenido del tiddler, lo que resulta útil para identificar un tiddler en particular en una lista de enlaces o en el índice de la barra lateral (en el presente: <<.tid "Estilo: Títulos">>)
+
+Al redactar material de referencia debe evitarse que el título comience con artículo y en general debe evitarse el abuso de determinantes.
+
+En anteriores ediciones, muchos títulos se escribían en CamelCase. Para hacerlos más legibles, se ha ido abandonando gradualmente esta práctica y se desaconseja su uso, salvo en casos como TiddlyWiki o JavaScript, ya que tal es su forma estándar. 
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Tiddlers.tid b/editions/es-ES/tiddlers/Tiddlers.tid
new file mode 100644
index 000000000..63a703544
--- /dev/null
+++ b/editions/es-ES/tiddlers/Tiddlers.tid
@@ -0,0 +1,15 @@
+created: 20130825213500000
+modified: 20160412173931392
+tags: Concepts
+title: Tiddlers
+type: text/vnd.tiddlywiki
+
+Los Tiddlers son las unidades fundamentales de información en TiddlyWiki.
+
+Funcionan mejor cuanto más pequeños son, de modo que puedan entretejerse más fácilmente de las más diferentes formas posibles.
+
+Otros sistemas tienen conceptos análogos con nombres genéricos como "items", "entradas", "entidades", "nodos" o "records". TiddlyWiki es de la opinión de que es preferible ser vagamente preciso a ser vagamente genérico; de ahí que nos guste «Tiddler», que en origen es una palabra coloquial inglesa, usada para referirse a un pez pequeño. 
+
+Internamente, los tiddlers se componen de una lista de valores únicos llamados campos. El único campo obligatorio es `título`, pero los tiddlers útiles tienen también un campo `texto` y todos o algunos de los campos estándar que se muestran en TiddlerFields.
+
+En TiddlyWiki, los tiddlers están por todas partes. Sirven para guardarlo todo, desde módulos en código de JavaScript, a ajustes y configuraciones asociadas a la interfaz de usuario.
diff --git a/editions/es-ES/tiddlers/TiddlyDesktop.tid b/editions/es-ES/tiddlers/TiddlyDesktop.tid
new file mode 100644
index 000000000..97220a0b5
--- /dev/null
+++ b/editions/es-ES/tiddlers/TiddlyDesktop.tid
@@ -0,0 +1,29 @@
+caption: TiddlyDesktop
+created: 20140126125259638
+es-title: TiddlyDesktop
+modified: 20160422202937418
+tags: Definitions Saving Platforms
+title: TiddlyDesktop
+type: text/vnd.tiddlywiki
+
+~TiddlyDesktop es una aplicación de escritorio para trabajar con archivos de ~TiddlyWikii, tanto del veterano [[TiddlyWiki Classic|TiddlyWikiClassic]], como del nuevo TiddlyWiki5. Se puede instalar en ,Windows, Mac OS X o Linux. 
+
+Aquí hay un video de [[introducción a TiddlyDesktop|Introducing TiddlyDesktop Video]]
+
+! Instrucciones
+
+# Descarga la última versión de TiddlyDesktop de https://github.com/Jermolene/TiddlyDesktop/releases
+
+# Ejecuta TiddlyDesktop
+
+# Usa el botón <<.def browse>> para abrir archivos de TiddlyWiki 
+
+# Guarda los cambios como habitualmente
+
+! Fuente
+
+~TiddlyDesktop se basa en [[NW.js]], proyecto [[de código abierto|OpenSource]] y la fuente se encuentra en GitHub:
+
+https://github.com/Jermolene/TiddlyDesktop/
+
+Consulta las [[versiones de TiddlyDesktop|TiddlyDesktop Releases]]
diff --git a/editions/es-ES/tiddlers/TiddlySpace.tid b/editions/es-ES/tiddlers/TiddlySpace.tid
new file mode 100644
index 000000000..04e70dd2c
--- /dev/null
+++ b/editions/es-ES/tiddlers/TiddlySpace.tid
@@ -0,0 +1,11 @@
+caption: TiddlySpace
+created: 20130830084200000
+es-title: TiddlySpace
+modified: 20160429051351375
+tags: Definitions
+title: TiddlySpace
+type: text/vnd.tiddlywiki
+
+TiddlySpace es un entorno web para ~TiddlyWiki, construido desde TiddlyWeb.
+
+TiddlySpace fue originalmente esponsorizado por [[Osmosoft]] en [[BT]].
diff --git a/editions/es-ES/tiddlers/TiddlySpot.tid b/editions/es-ES/tiddlers/TiddlySpot.tid
new file mode 100644
index 000000000..05d7dd972
--- /dev/null
+++ b/editions/es-ES/tiddlers/TiddlySpot.tid
@@ -0,0 +1,8 @@
+caption: ~TiddlySpot
+created: 20160422203510605
+es-title: TiddlySpot
+modified: 20160423054916462
+title: TiddlySpot
+type: text/vnd.tiddlywiki
+
+~TiddlySpot es un servicio de alojamiento gratuito para documentos de TiddlyWiki hecho por Simon y Daniel Baird. La manera más sencilla de empezar a usarlo es registrarse en http://tiddlyspot.com. Por defecto muestra la última versión de [[TiddlyWiki Classic|TiddlyWikiClassic]], pero es totalmente compatible con [[TW5|TiddlyWiki5]]
diff --git a/editions/es-ES/tiddlers/TiddlyWeb.tid b/editions/es-ES/tiddlers/TiddlyWeb.tid
new file mode 100644
index 000000000..c4b353ba2
--- /dev/null
+++ b/editions/es-ES/tiddlers/TiddlyWeb.tid
@@ -0,0 +1,15 @@
+caption: TiddlyWeb
+created: 20130830084100000
+es-title: TiddlyWeb
+modified: 20160429051929031
+tags: Definitions
+title: TiddlyWeb
+type: text/vnd.tiddlywiki
+
+TiddlyWeb es una aplicación de servidor que publica [[Tiddlers]] en la web:
+
+http://tiddlyweb.com/
+
+TiddlyWeb puede usarse para alojar wikis hechos en ~TiddlyWiki Classic  y TiddlyWiki5, de modo que los tiddlers individuales estén disponibles en una API HTTP flexible. 
+
+TiddlyWeb fue originalmente esponsorizada por Osmosoft en BT, junto con TiddlySpace.
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/TiddlyWiki.tid b/editions/es-ES/tiddlers/TiddlyWiki.tid
new file mode 100644
index 000000000..686b39706
--- /dev/null
+++ b/editions/es-ES/tiddlers/TiddlyWiki.tid
@@ -0,0 +1,15 @@
+created: 20130822170700000
+modified: 20160412092500740
+tags: Concepts
+title: TiddlyWiki
+type: text/vnd.tiddlywiki
+
+~TiddlyWiki es una potente herramienta interactiva para la manipulación de información compleja con estructura que no encaja fácilmente en las herramientas tradicionales, como hojas de cálculo o procesadores de texto.
+
+~TiddlyWiki está diseñado para adaptarse a tu forma de pensar y ayudarte a manejar todo aquello que no acaba de encajar. La [[idea fundamental |Philosophy of Tiddlers]] es que la información es más útil y está más a mano si la dividimos en unidades mínimas, semánticamente significativas --[[tiddlers|Tiddlers]]-- y le damos títulos que permitan  [[estructurarlas|Structuring TiddlyWiki]] mediante [[enlaces|TiddlerLinks]], [[etiquetas|Tagging]], [[listas|ListField]] y [[macros|Macros]].
+
+Los tiddlers se valen de una notación especial que llamamos WikiText para explotar, de forma sencilla, una amplia variedad de opciones de formato de texto y enlace hipertextual.  ~TiddlyWiki tiene como objetivo proporcionar una interfaz fluida de trabajo que permita agregar tiddlers y componer así narraciones más largas.
+
+La gente adora ~TiddlyWIki. Primero, porque puede usarse tal cual, sin necesidad de complicadas infrastructuras de servidor y, porque al ser de [[código abierto|OpenSource]], brinda una libertad sin precedentes para que cualquiera pueda mantener su información más preciada bajo su propio control.
+
+~TiddlyWiki fue creado originalmente por JeremyRuston y es en la actualidad un próspero proyecto open source, con una animada [[comunidad|Community]] de desarrolladores independientes.
diff --git a/editions/es-ES/tiddlers/TiddlyWiki5.tid b/editions/es-ES/tiddlers/TiddlyWiki5.tid
new file mode 100644
index 000000000..d16d785a0
--- /dev/null
+++ b/editions/es-ES/tiddlers/TiddlyWiki5.tid
@@ -0,0 +1,7 @@
+created: 20130825213600000
+modified: 20160412165205300
+tags: Concepts
+title: TiddlyWiki5
+type: text/vnd.tiddlywiki
+
+TiddlyWiki5 es la nueva reencarnación de TiddlyWiki para los próximos 25 años. Es un wiki completamente interactivo, escrito en JavaScript, que puedes ejecutar localmente en el navegador o en un servidor, mediante [[Node.js]].
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/TiddlyWikiClassic.tid b/editions/es-ES/tiddlers/TiddlyWikiClassic.tid
new file mode 100644
index 000000000..0e08fc08d
--- /dev/null
+++ b/editions/es-ES/tiddlers/TiddlyWikiClassic.tid
@@ -0,0 +1,15 @@
+created: 20131222152210279
+modified: 20160416061337351
+tags: Definitions
+title: TiddlyWikiClassic
+type: text/vnd.tiddlywiki
+
+"~TiddlyWiki Classic" se refiere a las versiones de TiddlyWiki anteriores a la 5.0, cuando se decidió reescribir ~TiddlyWiki por completo y empezando de cero.  
+
+TiddlyWiki Classic recibe aún mantenimiento y está disponible en:
+
+http://classic.tiddlywiki.com/
+
+Mario Pietsch ha publicado una página que compara la  sintaxis y otras diferencias entre la versión [[Classic|TiddlyWikiClassic]] y la [[actual|TiddlyWiki5]]:
+
+http://compare-tw2-tw5.tiddlyspace.com
diff --git a/editions/es-ES/tiddlers/TiddlyWikiFolders.tid b/editions/es-ES/tiddlers/TiddlyWikiFolders.tid
new file mode 100644
index 000000000..c0b5ee4b7
--- /dev/null
+++ b/editions/es-ES/tiddlers/TiddlyWikiFolders.tid
@@ -0,0 +1,138 @@
+caption: WikiFolders
+created: 20130825214200000
+es-title: WikiFolders
+modified: 20160506092009086
+tags: [[TiddlyWiki on Node.js]]
+title: TiddlyWikiFolders
+type: text/vnd.tiddlywiki
+
+[[Node.js|TiddlyWiki on Node.js]] soporta, además de wikis de archivo único, wikis estructurados en carpetas que llamamos <<.def ~WikiFolders>>. Dichas carpetas contienen, lógicamente, tiddlers y las distinguimos según el tipo de tiddlers que contengan.
+
+! ~WikiFolders y archivos
+
+Los ~WikiFolders contienen los siguientes archivos y carpetas:
+
+* <<.tid tiddlywiki.info>> - Archivo .JSON que contiene metadatos necesarios para construir el wiki
+
+* <<.place \tiddlers>> - Carpeta que contiene los tiddlers que forman parte del contenido del wiki
+
+* <<.place \plugins>> - Carpeta que contiene los diferentes [[plugins folders|PluginMechanism]] que se incluyen en el wiki
+
+Sólo el archivo <<.em tiddlywiki.info>> es obligatoriamente necesario. Todas las demás carpetas son opcionales. 
+
+!! Contenido del archivo <<.em tiddlywiki.info>>
+
+Este archivo contiene un objeto JSON que consta de los siguientes campos:
+
+* <<.field plugins>> - nombres de los plugins que se incluyen en el wiki
+
+* <<.field themes>> - nombres de los temas que se incluyen en el wiki
+
+* <<.field languages>> - nombres de los idiomas que se incluyen en el wiki
+
+* <<.field includeWikis>> - referencias a carpetas externas que se incluyen en el wiki
+
+* <<.field build>> - hashmap de targets de compilación, definidos como símbolos de comandos. (ver BuildCommand para más información)
+
+* <<.field config>> - hashmap opcional de opciones de configuración
+
+!!! <<.def includeWikis>>
+
+Los valores de <<.field includeWikis>> pueden ser bien una cadena con la ruta relativa al wiki, o un objeto con los siguientes campos:
+
+* <<.field path>> - ruta relativa al ~WikiFolder
+
+* <<.field read-only>> - con el valor <<.em true>>, previene la modificación de los tiddlers del wiki que se incluye. Toda modificación que se haga en estos se guardará en el directorio definido como  <<.em default-tiddler-location>>, que se describe más abajo
+
+!!! <<.def build>>
+
+Los tiddlers objeto de este comando cuyo origen no se defina en el archivo <<.em tiddlywiki.info>> se combinarán con los del wiki actual.
+
+!!! <<.def config>>
+
+Las opciones de configuración incluyen:
+
+* <<.em default-tiddler-location>> - ruta relativa a la localización por defecto de la carpeta en que se almacenan los tiddlers nuevos. 
+
+* <<.em retain-original-tiddler-path>> - si se define como <<.em true>>, el servidor generará el tiddler <<.tid ~$:/config/OriginalTiddlerPaths>>, que contiene la ruta original de cada tiddler contenido en el wiki. 
+
+!!! Ejemplo:
+
+```
+{
+	"plugins": [
+		"tiddlywiki/tiddlyweb",
+		"tiddlywiki/filesystem"
+	],
+	"includeWikis": [
+		"../tw5.com"
+	],
+	"build": {
+		"index": [
+			"--rendertiddler","$:/core/save/all","index.html","text/plain"],
+		"favicon": [
+			"--savetiddler","$:/favicon.ico","favicon.ico",
+			"--savetiddler","$:/green_favicon.ico","static/favicon.ico"]
+	},
+	"config": {
+		"retain-original-tiddler-path": true	
+	}
+}
+```
+
+!! Contenido de la carpeta <<.em tiddlers>> 
+
+Toddos los archivos <<.em .tid>> de la carpeta <<.em tiddlers>> se leen cuando se genera el wiki. Las subcarpetas se escanean recursivamente en busca de cualquier otro archivo <<.em .tid>> durante el proceso.
+
+Los tiddlers nuevos se guardan en la raíz de la carpeta <<.em tiddlers>>, salvo que se [[configure|Customizing Tiddler File Naming]] de otro modo.
+
+Las subcarpetas de <<.em tiddlers>> también pueden contener un archivo JSON que puentee el proceso por defecto para esa carpeta. En este ejemplo se ilustra el formato de este tipo de archivos:
+
+```
+{
+	"tiddlers": [
+		{
+			"file": "d3.min.js",
+			"fields": {
+				"type": "application/javascript",
+				"title": "$:/plugins/tiddlywiki/d3/d3.js",
+				"module-type": "library"
+			},
+			"prefix": "var d3;if($tw.browser){\n",
+			"suffix": "}\nexports.d3 = d3;\n"
+		},
+		{
+			"file": "cloud/d3.layout.cloud.js",
+			"fields": {
+				"type": "application/javascript",
+				"title": "$:/plugins/tiddlywiki/d3/d3.layout.cloud.js",
+				"module-type": "library"
+			}
+		},
+		{
+			"file": "local/mytiddler.tid",
+			"isTiddlerFile": true,
+			"fields": {
+				"title": "A different title"
+			}
+		}
+	],
+	"directories": [
+		"../../mytiddlers/store"
+	]
+}
+```
+Un elemento JSON es un objeto con la propiedad <<.em tiddlers>>, que a su vez contiene una matriz de información sobre cada tiddler que se carga en el wiki. Esta información es:
+
+
+* Ruta, absoluta o relativa, al archivo que se incluye, bien como 
+
+** `file`: nombre del archivo que contiene el tiddler
+
+** `isTiddlerFile`: si su valor es `true`, se extraen los tiddlers de su contenido. En caso contrario, se asigna el contenido en bruto del archivo al campo <<.field text>>, sin interpretación alguna. 
+
+* `fields`: objet que contiene campos que puentean los proporcionados por el archivo
+
+* `prefix` & `suffix`: (opcional) especifica cadenas usadas como prefijo o sufijo del del contenido de un tiddler
+
+La propiedad <<.em directories>> permite definir una lista de directorios de los que se cargarán recursivamente los tiddlers
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/TiddlyWiki_Hangouts.tid b/editions/es-ES/tiddlers/TiddlyWiki_Hangouts.tid
new file mode 100644
index 000000000..c9247601e
--- /dev/null
+++ b/editions/es-ES/tiddlers/TiddlyWiki_Hangouts.tid
@@ -0,0 +1,15 @@
+caption: VIdeo: "Hangouts"
+created: 20130823091700000
+es-title: "Hangouts" de TiddlyWiki
+modified: 20160421094239570
+tags: Community Videos
+title: TiddlyWiki Hangouts
+type: text/vnd.tiddlywiki
+
+La comunidad TiddlyWiki mantiene reuniones periódicas online con Google Hangouts. Normalmente, los martes, de 17:00 a 19:00 hs (hora central europea). 
+
+De todos modos, se anuncian debidamente en el [[Grupo de TiddlyWiki|https://groups.google.com/d/forum/tiddlywiki]] y en la cuenta [[@TiddlyWiki|https://twitter.com/TiddlyWiki]] de Twitter.
+
+Los últimos //Hangouts// están archivados en este canal de ~YouTube:
+
+<iframe width="560" height="315" src="http://www.youtube.com/embed/videoseries?list=PLVT_2PPd-1p34gGCQ5qpwC8QdykxVAI3u" frameborder="0" allowfullscreen></iframe>
diff --git a/editions/es-ES/tiddlers/TiddlyWiki_Video_Tutorials_by_Francis_Meetze.tid b/editions/es-ES/tiddlers/TiddlyWiki_Video_Tutorials_by_Francis_Meetze.tid
new file mode 100644
index 000000000..6efa6ffe8
--- /dev/null
+++ b/editions/es-ES/tiddlers/TiddlyWiki_Video_Tutorials_by_Francis_Meetze.tid
@@ -0,0 +1,15 @@
+caption: Videotutoriales
+created: 20150926170842677
+es-title: Tutoriales en video de Francis Meetze
+modified: 20160416055058359
+tags: Resources
+title: TiddlyWiki Video Tutorials by Francis Meetze
+type: text/vnd.tiddlywiki
+url: https://www.youtube.com/playlist?list=PLzZCajspPU_UjFn0uy-J9URz0LP4zhxRK
+
+Exhaustiva y recomendada serie de tutoriales para empezar a moverte cómodamente con TiddlyWiki. 
+{{!!url}}
+
+<<<
+Estos tutoriales están pensados para darte las nociones básicas que te permitan empezar de inmediato a usar ~TiddlyWiki. Echamos una rápida mirada a la tecnología detrás de ~TiddlyWiki y a cómo instalarlo y crear tu primer Tiddler. 
+<<<
diff --git a/editions/es-ES/tiddlers/TiddlyWiki_in_the_Sky_for_TiddlyWeb.tid b/editions/es-ES/tiddlers/TiddlyWiki_in_the_Sky_for_TiddlyWeb.tid
new file mode 100644
index 000000000..786c45deb
--- /dev/null
+++ b/editions/es-ES/tiddlers/TiddlyWiki_in_the_Sky_for_TiddlyWeb.tid
@@ -0,0 +1,27 @@
+caption: TiddlyWiki in the Sky
+created: 20131129100250644
+es-title: TiddlyWiki in the Sky para TiddlyWeb
+modified: 20160506043944286
+tags: [[Hosting your TiddlyWiki on the web]] Platforms
+title: TiddlyWiki in the Sky for TiddlyWeb
+type: text/vnd.tiddlywiki
+
+TiddlyWiki in the Sky para TiddlyWeb permite sincronizar contenidos entre ~TiddlyWiki en el navegador y el servidor de TiddlyWeb (o TiddlySpace). Sus características incluyen:
+
+* Carga diferida
+
+* Sincronización de dos vías entre navegador y servidor
+
+** La sincronización del servidor se realiza por <<.word polling>> (cada 60 segundos)
+
+* <<.word Throttling>>, para que los tiddlers que cambian rápidamente no saturen el servidor
+
+Para probar ~TiddlyWiki in the Sky para TiddlyWeb:
+
+# Crea, si es necesario, una cuenta en http://tiddlyspace.com/
+
+# Crea un nuevo espacio
+
+# Incluye el espacio `tw5tiddlyweb`
+
+# Visita `http://<mi_espacio>.tiddlyspace.com/tw5`
diff --git a/editions/es-ES/tiddlers/TiddlyWiki_on_Firefox_for_Android_Video.tid b/editions/es-ES/tiddlers/TiddlyWiki_on_Firefox_for_Android_Video.tid
new file mode 100644
index 000000000..15b4e4860
--- /dev/null
+++ b/editions/es-ES/tiddlers/TiddlyWiki_on_Firefox_for_Android_Video.tid
@@ -0,0 +1,11 @@
+caption: Video: TiddlyWIki en Firefox Android
+created: 20140104134947485
+es-title: Video sobre TiddlyWiki en Firefox para Android
+modified: 20160426085737997
+tags: Videos [[Saving with TiddlyFox]]
+title: TiddlyWiki on Firefox for Android Video
+type: text/vnd.tiddlywiki
+
+Este breve //screencast// muestra cómo configurar Firefox para Android para guardar cambios en TiddlyWiki:
+
+<iframe width="560" height="315" src="http://www.youtube.com/embed/iikkv9orGGI" frameborder="0" allowfullscreen></iframe>
diff --git a/editions/es-ES/tiddlers/TiddlyWiki_on_Node.js.tid b/editions/es-ES/tiddlers/TiddlyWiki_on_Node.js.tid
new file mode 100644
index 000000000..bcc1f3021
--- /dev/null
+++ b/editions/es-ES/tiddlers/TiddlyWiki_on_Node.js.tid
@@ -0,0 +1,21 @@
+caption: Node.js
+created: 20160506044956173
+es-title: TiddlyWiki en Node.js
+modified: 20160506045028538
+tags: Platforms
+title: TiddlyWiki on Node.js
+type: text/vnd.tiddlywiki
+
+Ejecutar ~TiddlyWiki en [[Node.js]] tiene una serie de importantes ventajas sobre la versión de archivo único:
+
+* Puedes editar contenidos en cualquier navegador compatible con HTML5 browser, incluso en smartphones y tablets.
+
+* Los tiddlers individuales se guardan como archivos separados, que puedes organizar a tu gusto
+
+* Puedes construir múltiples wikis con diferentes combinaciones de contenido único y compartido
+
+Para mayor información, consulta:
+
+* [[Instalación en Node.js|Installing TiddlyWiki on Node.js]]
+* [[Uso en Node.js|Using TiddlyWiki on Node.js]]
+* [[Actualización en Node.js|Upgrading TiddlyWiki on Node.js]]
diff --git a/editions/es-ES/tiddlers/TitleField.tid b/editions/es-ES/tiddlers/TitleField.tid
new file mode 100644
index 000000000..644086a4e
--- /dev/null
+++ b/editions/es-ES/tiddlers/TitleField.tid
@@ -0,0 +1,7 @@
+created: 20160422101108721
+modified: 20160422101121578
+tags: 
+title: TitleField
+type: text/vnd.tiddlywiki
+
+sdfasdfasdfadf
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Title_List.tid b/editions/es-ES/tiddlers/Title_List.tid
new file mode 100644
index 000000000..cbb82a4bc
--- /dev/null
+++ b/editions/es-ES/tiddlers/Title_List.tid
@@ -0,0 +1,17 @@
+caption: Listas
+created: 20150117152418000
+es-title: Listas
+modified: 20160415042010368
+tags: Concepts
+title: Title List
+type: text/vnd.tiddlywiki
+
+Una <<.def "lista">> es una línea de texto que presenta el título de uno o más tiddlers como una cadena de títulos separados por espacios.
+
+Si un título <<.em "contiene">> espacios, se enuncia con corchetes dobles:
+
+`EnMarcha [[Descubre TiddlyWiki]] Actualizaciones`
+
+La función de creación de listas se usa en varios lugares, incluyendo PermaLinks y el campo [[lista|ListField]]
+
+Son, de hecho, la forma más simple de [[filtro|Filters]] y una de las maneras que hay de presentar una [[selección de títulos|Title Selection]].
diff --git a/editions/es-ES/tiddlers/Title_Selection.tid b/editions/es-ES/tiddlers/Title_Selection.tid
new file mode 100644
index 000000000..fe1bca980
--- /dev/null
+++ b/editions/es-ES/tiddlers/Title_Selection.tid
@@ -0,0 +1,13 @@
+caption: Selección de títulos
+created: 20150117152418000
+es-title: Selección de títulos
+modified: 20160419163955922
+tags: Concepts
+title: Title Selection
+type: text/vnd.tiddlywiki
+
+Una <<.def "selección de títulos">> es una lista ordenada de títulos (o cadenas similares), en que cada elemento aparece sólo una vez.
+
+La selección de títulos es importante en operaciones de [[búsqueda|Filters]]
+
+La manera más sencilla de obtener una es escribiendo una [[lista|Title List]].
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Tutorials.tid b/editions/es-ES/tiddlers/Tutorials.tid
new file mode 100644
index 000000000..b28fcc95d
--- /dev/null
+++ b/editions/es-ES/tiddlers/Tutorials.tid
@@ -0,0 +1,29 @@
+caption: Tutoriales
+created: 20140908125300000
+es-title: Tutoriales
+modified: 20160605054416164
+tags: Community
+title: Tutorials
+type: text/vnd.tiddlywiki
+
+Páginas con tutoriales y consejos relacionados con ~TiddlyWiki.
+
+Envía más tutoriales que encuentres para ampliar esta lista via [[GitHub|https://github.com/Jermolene/TiddlyWiki5]] o [[Twitter|https://twitter.com/tiddlywiki]], o publícalas en el [[grupo|https://groups.google.com/forum/?hl=es#!forum/tiddlywiki]]
+
+<div class="tc-link-info">
+
+<$list filter="[tag[Tutorials]!sort[modified]]">
+
+<div class="tc-link-info-item">
+
+! <$link><$view field="title"/></$link>
+
+<div class="tc-subtitle">Posted <$view field="modified" format="relativedate"/></div>
+
+<$transclude/>
+
+</div>
+
+</$list>
+
+</div>
diff --git a/editions/es-ES/tiddlers/Typography.tid b/editions/es-ES/tiddlers/Typography.tid
new file mode 100644
index 000000000..58edf9220
--- /dev/null
+++ b/editions/es-ES/tiddlers/Typography.tid
@@ -0,0 +1,23 @@
+caption: Tipografía
+created: 20141226192500000
+es-title: Estilo: Tipografía
+modified: 20160418170133348
+tags: documenting
+title: Typography
+type: text/vnd.tiddlywiki
+
+Se recomienda el uso de las [[macros de documentación|Documentation Macros]] para facilitar las futuras tareas de mantenimiento del texto frente a nuevos cambios y actualizaciones. 
+
+Se recomienda precaución en el uso arbitrario de estilos directos de formato (''negrita'', //cursiva// ...etc). Si se puede usar una macro, conviene usarla. Si no existe la macro adecuada, se puede crear o, si no se sabe cómo, pedir su creación en el [[Grupo de Google|http://groups.google.com/group/TiddlyWiki]].
+
+Por el mismo motivo, se aconseja el uso de acentos graves <code>&#96;...&#96;</code> para transcribir fragmentos de código y ~WikiText, pero no para nombres de cosas tales como campos, operadores, variables o widgets. Estas tienen su macro correspondiente.
+
+Para mantener cierto orden y evitar colisiones de código al usar distintos sistemas operativos:
+
+* Apóstrofos y comillas deben ser del tipo recto `'` `"`
+
+* Las elipsis se señalan con tres puntos individuales `...`, en lugar de con <<.word "puntos suspensivos">> `…`.
+
+* Se recomienda evitar el uso de un único guión como signo de puntuación. En su lugar, debe usarse guión doble `--` --que ~TiddlyWiki interpreta como guión corto o <<.word en-dash>>--.
+
+*Los elementos de una lista o tabla llevan punto al final <<.em únicamente>> si se trata de frases completas. Si no es así, no llevan puntuación alguna.
diff --git a/editions/es-ES/tiddlers/Uninstalling_a_plugin.tid b/editions/es-ES/tiddlers/Uninstalling_a_plugin.tid
new file mode 100644
index 000000000..eb43e2bef
--- /dev/null
+++ b/editions/es-ES/tiddlers/Uninstalling_a_plugin.tid
@@ -0,0 +1,23 @@
+caption: Desinstalar plugins
+created: 20160107222504269
+es-title: Cómo desinstalar un plugin
+modified: 20160504154335550
+tags: Plugins
+title: Uninstalling a plugin
+type: text/vnd.tiddlywiki
+
+# Sólo [[por si acaso|The First Rule of Using TiddlyWiki]], haz copia de seguridad de tu archivo HTML de ~TiddlyWiki
+
+# Abre la pestaña <<.controlpanel-tab Plugins>> del [[Panel de control|$:/ControlPanel]]
+
+# Pincha el nombre del plugin que quieres desinstalar para abrir el tiddler que lo contiene. 
+
+# Pincha el botón <<.button edit>>
+
+# Pincha el botón <<.button delete>>
+
+# Guarda los cambios con el botón <<.button save-wiki>>
+
+# Recarga la página
+
+# El plugin se ha desinstalado por completo
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Upgrading.tid b/editions/es-ES/tiddlers/Upgrading.tid
new file mode 100644
index 000000000..6a5678428
--- /dev/null
+++ b/editions/es-ES/tiddlers/Upgrading.tid
@@ -0,0 +1,77 @@
+caption: Actualizaciones
+created: 20131202102427114
+es-title: Actualizar TiddlyWiki a la última versión
+modified: 20160421152501155
+tags: Features [[Working with TiddlyWiki]]
+title: Upgrading
+type: text/vnd.tiddlywiki
+
+Se publican con regularidad nuevas versiones de TiddlyWiki que incorporan correcciones de <<.word bugs>> y mejoras. Es buena idea mantenerse al día actualizándolo a la última versión.
+
+<<.tip "
+El procedimiento que aquí se describe es para actualizar un Tiddlywiki autónomo como ''archivo único en html''. Para actualizar [[TiddlyWiki en Node.js|TiddlyWiki on Node.js]], el procedimiento [[es otro|Upgrading TiddlyWiki on Node.js]].
+">>
+
+<<.tip "
+Al actualizar, recuerda la [[primera regla de uso de TiddlyWiki|The First Rule of Using TiddlyWiki]] y que ''tú eres el responsable de velar por tus datos''. Asegúrate de hacer copias de seguridad con regularidad y, muy especialmente, antes de actualizar el núcleo de ~TiddlyWiki
+">>
+
+!! Actualización online
+
+Este procedimiento funcionará en la mayoría de navegadores. Ni uno solo de tus datos personales saldrá de tu ordenador durante todo el proceso.
+
+# Localiza el archivo HTML de ~TiddlyWiki en tu disco duro
+
+# Abre el navegador y ve a http://tiddlywiki.com/upgrade.html. Ahí encontrarás el <<.word Upgrader>>: asistente de actualización de ~TiddlyWiki. Tiene una gran flecha en el centro y, debajo de ella, el número de versión al que corresponde
+
+# Arrastra el archivo HTML de TiddlyWiki a la ventana del navegador donde tienes el Upgrader y suéltalo sobre la flecha
+
+#* Si tu archivo está cifrado, se te pedirá la contraseña
+
+# Se te mostrará una tabla de tiddlers
+
+#* Son <<.em "absolutamente todos">> los tiddlers que forman parte de tu versión de ~TiddlyWiki
+
+#* En la columna <<.def Select>>, verás <<.em marcados>> los tiddlers que formarán parte de la nueva versión.
+Guarda los cambios de la nueva versión
+#* Los tiddlers que <<.def NO>> se actualizarán aparecen <<.em desmarcados>> y una nota en la columna <<.def status>> te dice el motivo. Si todo te parece bien...
+
+# ...haz clic en el botón <<.def Upgrade>>, que tienes arriba del todo
+
+# Haz clic en el botón verde <<.def "Save upgraded ~TiddlyWiki file">>
+
+El navegador te pedirá que descargues un archivo llamado <<.word "upgrade.thml">>. Este archivo es la versión actualizada de tu archivo. Localízalo en tu disco duro, cambia el nombre por el de tu wiki y sustituye en su localización el viejo archivo por el nuevo.
+
+!! Actualización offline
+
+Puedes descargar el <<.def Upgrader>> a tu disco duro y realizar el proceso anterior de arrastra-y-suelta para actualizar tu archivo localmente, sin necesidad de conexión de red.
+
+!! Problemas conocidos durante la actualización
+
+!!! Firefox Security Restrictions
+
+Se han dado casos del siguiente error al intentar actualizar en Firefox: 
+
+<<<
+Error while saving:
+
+Error:NS_ERROR_DOM_BAD_URI: Access to restricted URI denied
+<<<
+
+* La actualización falla o se interrumpe por restricciones de seguridad de Firefox. 
+
+* Comprueba si la versión de Firefox instalada en tu ordenador es la última disponible. En caso negativo, actualiza el navegador y vuelve a intentarlo.
+
+* Si el error persiste, sugerimos usar otro navegador o actualizar ~TiddlyWiki offline 
+
+!!! Customizaciones incompatibles
+
+Es posible --y se han dado casos de ello-- que customizaciones de versiones anteriores de ~Tiddlywiki dejen de funcionar después actualizar el núcleo a la última versión. 
+
+Hay dos maneras maneras en que puedes diagnosticar y solucionar los problemas que se presenten: 
+
+* Repite la actualización deseleccionando manualmente los tiddlers de tu versión que aplican customizaciones a ~TiddlyWiki
+* Desactiva las customizaciones abriendo ~TiddlyWiki en [[Modo seguro|SafeMode]]
+
+<<.tip
+"Puedes ver una lista de tiddlers ocultos modificados en la pestaña ''Filtro'' de la [[Búsqueda avanzada|$:/AdvancedSearch]]. En el desplegable, selecciona 'Tiddlers ocultos anulados' ">>
diff --git a/editions/es-ES/tiddlers/Upgrading_TiddlyWiki_on_Node.js.tid b/editions/es-ES/tiddlers/Upgrading_TiddlyWiki_on_Node.js.tid
new file mode 100644
index 000000000..a4b2dff65
--- /dev/null
+++ b/editions/es-ES/tiddlers/Upgrading_TiddlyWiki_on_Node.js.tid
@@ -0,0 +1,19 @@
+caption: Actualizar en Node.js
+created: 20131219100544073
+es-title: Actualizar TiddlyWiki a la última versión en Node.js
+modified: 20160506045433452
+tags: [[TiddlyWiki on Node.js]]
+title: Upgrading TiddlyWiki on Node.js
+type: text/vnd.tiddlywiki
+
+Si has instalado [[TiddlyWiki en Node.js|TiddlyWiki on Node.js]] de la forma habitual, puedes actualizarlo a la última versión con este comando:
+
+```
+npm update -g tiddlywiki
+```
+
+En Mac o Linux necesitas añadir <<.word sudo>>:
+
+```
+sudo npm update -g tiddlywiki
+```
diff --git a/editions/es-ES/tiddlers/UsingSVG.tid b/editions/es-ES/tiddlers/UsingSVG.tid
new file mode 100644
index 000000000..21ec4eb31
--- /dev/null
+++ b/editions/es-ES/tiddlers/UsingSVG.tid
@@ -0,0 +1,88 @@
+caption: Uso de SVG's
+created: 20131028132700000
+es-title: Uso de imágenes SVG
+modified: 20160503054238164
+tags: Features
+title: UsingSVG
+type: text/vnd.tiddlywiki
+
+~Tiddlywiki permite el uso de imágenes SVG de dos maneras:
+
+* Los tiddlers de tipo `image/svg+xml` se interpretan como imágenes SVG, es decir que se muestran como elementos `<img>` con el SVG incrustado en el atributo `src`.
+
+** Como ejemplos de imagen SVG, véanse [[Motovun Jack.svg]] y [[Tiddler Fishes.svg]]
+
+* También pueden incluirse elementos SVG directamente con WikiText. 
+
+! Transclusión de tiddlers SVG
+
+Se pueden incrustar SVG's mediante transclusión
+
+```
+{{Motovun Jack.jpg}}
+```
+
+! Incrustación de elementos SVG
+
+La otra forma de usar un SVG es incrustándolo directamente.
+
+Al incrustar un SVG en el texto como elemento `<img>`, este permanece en un entorno restringido y contenido. No puede, por ejemplo, usar los estilos CSS del documento padre, por ejemplo, ni se puede hacer una transclusión aislada del SVG.
+
+También puede incluirse el `<svg>` directamente.
+
+Este es el código...
+
+```
+<svg width="150" height="100">
+  <circle cx="100" cy="50" r="40" stroke="black" stroke-width="2" fill="red" />
+</svg>
+```
+...y este el resultado:
+
+<svg width="150" height="100">
+  <circle cx="100" cy="50" r="40" stroke="black" stroke-width="2" fill="red" />
+</svg>
+
+Para hacerlo, no necesitamos la directiva `<?xml version="1.0"?>`.
+
+! Inclusión de contenido HTML o ~WikiText en imágenes SVG
+
+Se pueden incluir sencillas cadenas de texto en un SVG mediante el elemento `<text>`
+
+Este es el código...
+
+```
+<svg width="300px" height="30px" viewBox="0 0 1000 300"><text x="250" y="150" font-family="Verdana" font-size="200">Hello, out there</text><rect x="1" y="1" width="998" height="298" fill="none" stroke-width="2" /></svg>
+```
+
+...y este el resultado
+
+<svg width="300px" height="30px" viewBox="0 0 1000 300"><text x="250" y="150" font-family="Verdana" font-size="200">Hello, out there</text><rect x="1" y="1" width="998" height="298" fill="none" stroke-width="2" /></svg>
+
+Se puede incluir HTML o ~WikiText <<.def dentro>> de imágenes SVG incrustadas en el texto mediante el elemento `<foreignObject>`. Por ejemplo:
+
+```
+<svg width="260px" height="260px"><circle cx="150" cy="150" r="100" fill="blue" stoke="red"/><foreignObject x="70" y="110" width="150" height="180"><body>Esto es un poco de texto que incluye un [[enlace a otro tiddler|HelloThere]].</body></foreignObject></svg>
+```
+<svg width="260px" height="260px"><circle cx="150" cy="150" r="100" fill="blue" stoke="red"/><foreignObject x="70" y="110" width="150" height="180"><body>Esto es un poco de texto que incluye un [[enlace a otro tiddler|HelloThere]].</body></foreignObject></svg>
+
+!! Incrustación y transclusión combinadas
+
+Al definiri elementos SVG podemos jugar con algunos de sus parámetros mediante transclusión. Como ejemplo, veamos el caso de este círculo SVG que podemos modificar mediante transclusión del valor de su radio desde el tiddler [[$:/SVGExampleRadius]]:
+
+Este es el código...
+
+```
+<svg width="150" height="150"><circle cx="75" cy="75" r={{$:/SVGExampleRadius}} stroke="black" stroke-width="2" fill="green"/></svg>
+```
+...y este el resultado:
+
+<svg width="150" height="150"><circle cx="75" cy="75" r={{$:/SVGExampleRadius}} stroke="black" stroke-width="2" fill="green"/></svg>
+
+Podemos variar el radio del círculo (como podríamos variar cualquier otro parámetro con la misma técnica) editando el siguiente valor, alojado en otro tiddler:
+
+ <$edit-text tiddler="$:/SVGExampleRadius" tag="input"/>
+
+! Texto curvo en SVG's
+
+{{Making curved text with SVG}}
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Using_Stylesheets.tid b/editions/es-ES/tiddlers/Using_Stylesheets.tid
new file mode 100644
index 000000000..1ec51772e
--- /dev/null
+++ b/editions/es-ES/tiddlers/Using_Stylesheets.tid
@@ -0,0 +1,51 @@
+caption: Hojas de estilos
+created: 20140305091244145
+es-title: Uso de hojas de estilos
+modified: 20160428095328970
+tags: [[Customise TiddlyWiki]]
+title: Using Stylesheets
+type: text/vnd.tiddlywiki
+
+El primer paso para cambiar la apariencia de ~TiddlyWiki es elegir y aplicar uno de los temas disponibles o modificar la [[paleta de colores|ColourPalettes]].
+
+Además, pueden definirse [[hojas de estilos CSS|http://www.w3schools.com/css]] mediante la etiqueta <<.tag ~$:/Stylesheet>>. Intenta crear una hoja de estilos con el siguiente contenido para cambiar el actual color de fondo a rojo:
+
+```
+html body.tc-body {
+	background: red;
+}
+```
+
+! Puentear estilos del tema
+
+Las hojas personales de estilos se aplican independientemente de los estilos definidos por el tema. Por ello, a menudo es necesario que las reglas CSS de tu hoja de estilos sean más específicas que las del tema que quieres puentear. Por ejemplo, `html body.tc-body` es más específco que `body.tc-body`.
+
+! Tipo <<.word "estilos">>
+
+Normalmente es mejor definir como <<-field type>> el valor <<.place text/css>>. Así te aseguras de que ~TiddlyWiki entienda el contenido como hoja de estilos en texto plano y no aplique reglas de WikiText en su interpretación.
+
+Si necesitas usar macros y transclusiones en tu hoja de estilos, tendrás que usar el <<.field type>> por defecto `text/vnd.tiddlywiki`, permitiendo así el proceso de WikiText. Ahí va un ejemplo:
+
+```
+\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline html
+
+body.tc-body pre {
+	<<box-shadow "inset 0 1px 0 #fff">>
+}
+```
+La directiva `\rules` al inicio restringe la aplicación de reglas WikiText a exclusivamente macros y transclusiones, lo que impide que accidentalmente se active cualquier otro proceso indeseado.
+
+Un tiddler de estilos se procesa de tal manera que primero se procesa como WikiText y, entonces, el resultado se aplica como CSS. Por lo tanto, se ignora todo tag HTML usado en los estilos. Así, por ejemplo, aquellos elementos HTML generados por RevealWidget no afectarán en absoluto al resultado. Por ese motivo pueden //envolverse// las reglas CSS en tags `<pre>` para mostrarlos como bloques de código, sin que afecten al proceso.
+
+```
+\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline html
+
+<pre>body.tc-body pre {
+	<<box-shadow "inset 0 1px 0 #fff">>
+}
+</pre>
+```
+
+! Stylesheet Macros
+
+El núcleo de ~TiddlyWiki proporciona una serie de [[macros globales|Stylesheet Macros]], útiles para la construcción de hojas de estilos. 
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Using_TiddlyWiki_on_Node.js.tid b/editions/es-ES/tiddlers/Using_TiddlyWiki_on_Node.js.tid
new file mode 100644
index 000000000..b541ed527
--- /dev/null
+++ b/editions/es-ES/tiddlers/Using_TiddlyWiki_on_Node.js.tid
@@ -0,0 +1,28 @@
+caption: Uso en Node.js
+created: 20131219100520659
+es-title: Uso de TiddlyWiki en Node.js
+modified: 20160506051541044
+tags: [[TiddlyWiki on Node.js]]
+title: Using TiddlyWiki on Node.js
+type: text/vnd.tiddlywiki
+
+~TiddlyWiki se puede usar desde la línea de comandos para ejecutar una larga lista de operaciones basadas en [[carpetas|TiddlyWikiFolders]], [[tiddlers|TiddlerFiles]] y archivos HTML de ~Tiddlywiki.
+
+Por ejemplo, el siguiente comando carga tiddlers de un archivo HTML de ~TiddlyWIki y guarda uno de ellos (~ReadMe) como HTML estático (readme.html):
+
+```
+tiddlywiki --verbose --load mi_wiki.html --rendertiddler ReadMe ./readme.html
+```
+Ejecutar ~TiddlyWiki desde la línea de comandos pone en marcha el núcleo, carga los plugins y establece un <<.word almacén>> de tiddlers en blanco. A partir de entonces procesa los argumentos de la línea de comandos de izquierda a derecha. Los argumentos se separan con espacios.
+
+El primer argumento es la ruta opcional al [[WikiFolder|TiddlyWikiFolders]] que se va a cargar. Si no se especifica, se usa el directorio actual.
+
+Le siguen uno o varios comandos con sus respectivos argumentos. Los comandos se identifican con el prefijo `--`.
+
+```
+tiddlywiki [<ruta>] [--<comando> [<argumento>[,<argumento>]]]
+```
+
+Los comandos disponibles son:
+
+<<list-links "[tag[Commands]]">>
diff --git a/editions/es-ES/tiddlers/Using_links_to_navigate_between_tiddlers.tid b/editions/es-ES/tiddlers/Using_links_to_navigate_between_tiddlers.tid
new file mode 100644
index 000000000..8760c9eda
--- /dev/null
+++ b/editions/es-ES/tiddlers/Using_links_to_navigate_between_tiddlers.tid
@@ -0,0 +1,53 @@
+caption: Desplazarse con enlaces
+created: 20140908093600000
+es-title: Usar enlaces para desplazarse entre tiddlers
+modified: 20160422093819943
+tags: [[Working with TiddlyWiki]]
+title: Using links to navigate between tiddlers
+type: text/vnd.tiddlywiki
+
+Para moverte de un tiddler a otro puedes usar enlaces (generalmente de color azul). Pinchar cualquier enlace te llevará automáticamente al tiddler en cuestión. Si está cerrado, lo abrirá. Lo fabuloso de ~TiddlyWiki es que hace los enlaces a tiddlers tan accesibles como sea posible. ¡Hay enlaces por todos lados! Estos son los lugares clave donde puedes encontrar enlaces a otros tiddlers en ~TiddlyWiki:
+
+* En el cuerpo de cualquier tiddler puedes <<.def "crear un link">> a otro tiddler, tanto si ya existe como si no. [[Enlaces en WikiText|Linking in WikiText]] te muestra varias formas sencillas de crear enlaces entre tiddlers.
+
+* Cada <<.def pastilla>> que veas en un tiddler (como la que hay bajo el título de este tiddler, que dice <<.def "Working with ~TiddlyWiki">>, contiene un enlace al tiddler de su correspondiente etiqueta. 
+
+* El <<.def InfoPanel>> de un tiddler te muestra cuatro pestañas que contienen listas adicionales de enlaces relacionados con este. 
+
+** La pestaña <<.info-tab References>> te da una lista de los enlaces que apuntan al tiddler actual
+
+** <<.info-tab Tagging>> muestra una lista de enlaces de tiddlers etiquetados con el título del actual. 
+
+** <<.info-tab List>> muestra una lista de enlaces de tiddlers mencionados en el campo <<.flink ListField>> del tiddler actual. 
+
+** <<.info-tab Listed>> muestra una lista de enlaces de tiddlers que incluyen el actual en sus respectivos <<.flink ListField>> 
+
+* Las <<.def "pestañas">> de la barra lateral también contienen innumerables enlaces a tiddlers:
+
+** <<.sidebar-tab Open>> muestra una lista de tiddlers actualmente abiertos. Es decir, a la vista. 
+
+** <<.sidebar-tab Recent>> enumera los últimos 100 tiddlers modificados, por orden ascendente de antigüedad.
+
+** <<.sidebar-tab More>> ofrece ocho listas adicionales de enlaces:
+
+*** <<.more-tab All>> contiene la lista alfabética de todos los tiddlers del wiki.
+
+*** <<.more-tab Tags>> contiene la lista alfabética de todas las etiquetas del wiki. Pinchando en cualquiera de ellas, además, obtienes una lista alfabética de todos los tiddlers etiquetados con ella
+
+*** <<.more-tab Missing>> contiene la lista de enlaces vacíos, es decir, que enlazan con tiddlers que aún no existen. Función muy útil para encontrar aquellos tiddlers que uno planeó escribir cuando redacta
+
+*** <<.more-tab Drafts>> contiene la lista de tiddlers que actualmente están en borrador. ~TiddlyWiki considera que, mientras esté en edición, un borrador es un tiddler aparte del original, de modo que mientras se edita, existen dos tiddlers iguales e independientes, lo que por un lado conserva intacto el contenido original hasta que se pulse el botón <<.button save>> y, por otro, nos permite trabajar tranquilamente en un borrador sin mostrar tiddlers inacabados ni perder cambios
+
+*** <<.more-tab Orphans>> contiene la lista de aquellos tiddlers que no enlazan a ningún otro ni mediante links, ni etiquetas ni listas. Muestra qué tiddlers necesitan integrarse con el resto, algo muy útil a la hora de editar un wiki
+
+*** <<.more-tab Types>> contiene una lista por tipo de contenido de tiddlers con contenido especial, como imágenes, audio, código, archivo PDF ...etc
+
+*** <<.more-tab System>> contiene la lista de todos los [[tiddlers de sistema|SystemTiddlers]]
+
+*** <<.more-tab Shadows>> contiene la lista de todos los [[tiddlers ocultos|ShadowTiddlers]].
+
+* FInalmente, también puedes crear tus propias listas de enlaces, usando varios métodos:
+
+** Por [[transclusión|Transclusion in WikiText]] de [[filtros|Filters]]: si escribimos `{{{[tag[Contents]]}}}` en un tiddler, nos mostrará la lista de tiddlers que llevan la etiqueta <<.em Contents>>. 
+
+** Puedes usar ListWidget. Es algo más complejo que la transclusión de filtros, pero a cambio te da más flexibilidad a la hora de diseñar la lista para que se muestre tal y como quieres.
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/Videos.tid b/editions/es-ES/tiddlers/Videos.tid
new file mode 100644
index 000000000..6c742982f
--- /dev/null
+++ b/editions/es-ES/tiddlers/Videos.tid
@@ -0,0 +1,13 @@
+caption: Videos
+created: 20140912150153512
+es-title: Videos
+modified: 20160417153908323
+tags: Learning
+title: Videos
+type: text/vnd.tiddlywiki
+
+Están disponibles los siguientes videos sobre TiddlyWiki:
+
+<<list-links "[tag[Videos]]">>
+
+La finalidad es mantener una serie de videos que sirvan de guía para la puesta en marcha de ~TiddlyWiki. Toda [[contribución|Contributing]] es bienvenida.
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/What_happened_to_the_original_TiddlyWiki_.tid b/editions/es-ES/tiddlers/What_happened_to_the_original_TiddlyWiki_.tid
new file mode 100644
index 000000000..de8413966
--- /dev/null
+++ b/editions/es-ES/tiddlers/What_happened_to_the_original_TiddlyWiki_.tid
@@ -0,0 +1,19 @@
+caption: ¿Y el original?
+created: 20140904085100000
+es-title: ¿Qué pasó con el TiddlyWiki original?
+modified: 20160605052442495
+tags: HelloThere
+title: What happened to the original TiddlyWiki?
+type: text/vnd.tiddlywiki
+
+<a class="tc-float-right tc-bordered-image" href="http://classic.tiddlywiki.com/" target="_blank" rel="noopener noreferrer">[img width="200" [TiddlyWiki Classic.png]]</a>
+
+La versión original de TiddlyWiki, que llamamos [[Classic|TiddlyWikiClassic]], sigue disponible en:
+
+http://classic.tiddlywiki.com.
+
+Ten en cuenta que la [[versión actual|TiddlyWiki5]] de ~TiddlyWiki no es totalmente compatible con la versión [[Classic|TiddlyWikiClassic]]. Se pueden importar contenidos, pero necesitan algo de //masaje// para adaptarse al nuevo formato de escritura, WikiText.
+
+Actualmente está en desarrollo un plugin: ''tw2parser'', intérprete que permita reproducir fielmente y sin mayor complicación los contenidos creados por TiddlyWikiClassic.
+
+http://tiddlywiki.com/plugins/tiddlywiki/tw2parser/
diff --git a/editions/es-ES/tiddlers/WidgetMessage__tm-add-field.tid b/editions/es-ES/tiddlers/WidgetMessage__tm-add-field.tid
new file mode 100644
index 000000000..8efa09b2a
--- /dev/null
+++ b/editions/es-ES/tiddlers/WidgetMessage__tm-add-field.tid
@@ -0,0 +1,14 @@
+caption: tm-add-field
+created: 20140908185153663
+es-title: Mensaje: tm-add-field
+modified: 20160416051117201
+tags: Messages
+title: WidgetMessage: tm-add-field
+type: text/vnd.tiddlywiki
+
+El mensaje `tm-add-field` define un determinado campo y lo añade con valor en blanco, si dicho campo no existe. 
+
+|!Nombre |!Descripción |
+|param |Nombre del campo |
+
+Este mensaje lo genera normalmente ButtonWidget y lo procesa FieldManglerWidget.
diff --git a/editions/es-ES/tiddlers/WidgetMessage__tm-add-tag.tid b/editions/es-ES/tiddlers/WidgetMessage__tm-add-tag.tid
new file mode 100644
index 000000000..6057c536a
--- /dev/null
+++ b/editions/es-ES/tiddlers/WidgetMessage__tm-add-tag.tid
@@ -0,0 +1,15 @@
+caption: tm-add-tag
+created: 20140908185153663
+es-title: Mensaje: tm-add-tag
+modified: 20160415060517606
+tags: Messages
+title: WidgetMessage: tm-add-tag
+type: text/vnd.tiddlywiki
+
+EL mensaje `tm-add-tag` añade la etiqueta que se especifique.
+
+|!Name |!Description |
+|param |Nombre de la etiqueta |
+
+Este mensaje lo genera normalmente ButtonWidget y lo procesa FieldManglerWidget.
+
diff --git a/editions/es-ES/tiddlers/WidgetMessage__tm-auto-save-wiki.tid b/editions/es-ES/tiddlers/WidgetMessage__tm-auto-save-wiki.tid
new file mode 100644
index 000000000..7164809b6
--- /dev/null
+++ b/editions/es-ES/tiddlers/WidgetMessage__tm-auto-save-wiki.tid
@@ -0,0 +1,13 @@
+caption: tm-auto-save-wiki
+created: 20160416050650782
+es-title: Mensaje: tm-auto-save-wiki
+modified: 20160416051042641
+tags: Messages
+title: WidgetMessage: tm-auto-save-wiki
+type: text/vnd.tiddlywiki
+
+El mensaje `tm-auto-save-wiki` realiza, siempre que sea necesario, el guardado en segundo plano de TiddlyWiki.
+
+El mensaje ''autosave wiki'' se genera siempre que se producen cambios en el TiddlerStore. Por ejemplo: [[tm-save-tiddler|WidgetMessage: tm-save-tiddler]], [[tm-delete-tiddler|WidgetMessage: tm-delete-tiddler]] y [[tm-perform-import|WidgetMessage: tm-perform-import]] guardan, borran y añaden tiddlers respectivamente, lo que tiene como resultado que, al ser procesados, NavigatorWidget genere el mensaje `auto-save-widget`.
+
+Lo procesa SyncMechanism en el  núcleo de ~TiddlyWiki, invocando el [[SaverModule|SaverModules]] actual. No todos los SaverModules tienen capacidad para hacerlo.
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/WidgetMessage__tm-browser-refresh.tid b/editions/es-ES/tiddlers/WidgetMessage__tm-browser-refresh.tid
new file mode 100644
index 000000000..27608c17a
--- /dev/null
+++ b/editions/es-ES/tiddlers/WidgetMessage__tm-browser-refresh.tid
@@ -0,0 +1,11 @@
+caption: tm-browser-refresh
+created: 20140819110529062
+es-title: Mensaje: tm-browser-refresh
+modified: 20160415091241622
+tags: Messages
+title: WidgetMessage: tm-browser-refresh
+type: text/vnd.tiddlywiki
+
+El mensaje `tm-browser-refresh` recarga la página, causando el reinicio de todos los plugins. No necesita ninguna propiedad del objeto `event`. 
+
+Este mensaje se genera con el ButtonWidget y se procesa en el núcleo.
diff --git a/editions/es-ES/tiddlers/WidgetMessage__tm-cancel-tiddler.tid b/editions/es-ES/tiddlers/WidgetMessage__tm-cancel-tiddler.tid
new file mode 100644
index 000000000..54214d471
--- /dev/null
+++ b/editions/es-ES/tiddlers/WidgetMessage__tm-cancel-tiddler.tid
@@ -0,0 +1,17 @@
+caption: tm-cancel-tiddler
+created: 20140226193622350
+es-title: Mensaje: tm-cancel-tiddler
+modified: 20160416050616634
+tags: Messages navigator-message
+title: WidgetMessage: tm-cancel-tiddler
+type: text/vnd.tiddlywiki
+
+El mensaje `tm-cancel-tiddler` cancela la edición de un tiddler y abandona los cambios realizados en el borrador.
+
+Requiere de las siguientes propiedades del objeto `event`:
+
+|!Nombre |!Descripción |
+|param |Título del tiddler cuya edición se cancela |
+|tiddlerTitle |Título alternativo usado si no se especifica ''param'' (asignado automáticamente por ButtonWidget)  |
+
+Este mensaje lo genera normalmente ButtonWidget y lo procesa NavigatorWidget.
diff --git a/editions/es-ES/tiddlers/WidgetMessage__tm-clear-password.tid b/editions/es-ES/tiddlers/WidgetMessage__tm-clear-password.tid
new file mode 100644
index 000000000..5f340eeb7
--- /dev/null
+++ b/editions/es-ES/tiddlers/WidgetMessage__tm-clear-password.tid
@@ -0,0 +1,11 @@
+caption: tm-clear-password
+created: 20140226084018038
+es-title: Mensaje: tm-clear-password
+modified: 20160416050300855
+tags: Messages
+title: WidgetMessage: tm-clear-password
+type: text/vnd.tiddlywiki
+
+El mensaje `tm-clear-password`borra la contraseña actual del depósito de claves y cambia el valor de [[$:/isEncrypted]]. Consulta EncryptionMechanism para más información.
+
+Este mensaje lo genera normalmente ButtonWidget y lo procesa el propio núcleo.
diff --git a/editions/es-ES/tiddlers/WidgetMessage__tm-close-all-tiddlers.tid b/editions/es-ES/tiddlers/WidgetMessage__tm-close-all-tiddlers.tid
new file mode 100644
index 000000000..d371dd638
--- /dev/null
+++ b/editions/es-ES/tiddlers/WidgetMessage__tm-close-all-tiddlers.tid
@@ -0,0 +1,11 @@
+caption: tm-close-all-tiddlers
+created: 20140226194242809
+es-title: Mensaje: tm-close-all-tiddlers
+modified: 20160416045312918
+tags: Messages navigator-message
+title: WidgetMessage: tm-close-all-tiddlers
+type: text/vnd.tiddlywiki
+
+El mensaje `tm-close-all-tiddlers` vacía la StoryList.
+
+Este mensaje lo genera normalmente ButtonWidget y lo procesa NavigatorWidget.
diff --git a/editions/es-ES/tiddlers/WidgetMessage__tm-close-other-tiddlers.tid b/editions/es-ES/tiddlers/WidgetMessage__tm-close-other-tiddlers.tid
new file mode 100644
index 000000000..fb59a45b1
--- /dev/null
+++ b/editions/es-ES/tiddlers/WidgetMessage__tm-close-other-tiddlers.tid
@@ -0,0 +1,17 @@
+caption: tm-close-other-tiddlers
+created: 20140302183306544
+es-title: Mensaje: tm-close-other-tiddlers
+modified: 20160416045151243
+tags: Messages navigator-message
+title: WidgetMessage: tm-close-other-tiddlers
+type: text/vnd.tiddlywiki
+
+El mensaje `tm-close-other-tiddlers` elimina de la StoryList todos los tiddlers menos el que se indica. 
+
+Requiere las siguientes propiedades del objeto `event`:
+
+|!Nombre |!Descripción |
+|param |Título del tiddler que no se cerrará |
+|tiddlerTitle |Título alternativo usado si no se especifica ''param'' (asignado automáticamente por ButtonWidget)  |
+
+Este mensaje lo genera normalmente ButtonWidget y lo procesa NavigatorWidget.
diff --git a/editions/es-ES/tiddlers/WidgetMessage__tm-close-tiddler.tid b/editions/es-ES/tiddlers/WidgetMessage__tm-close-tiddler.tid
new file mode 100644
index 000000000..155df15d7
--- /dev/null
+++ b/editions/es-ES/tiddlers/WidgetMessage__tm-close-tiddler.tid
@@ -0,0 +1,17 @@
+caption: tm-close-tiddler
+created: 20140226193940778
+es-title: Mensaje: tm-close-tiddler
+modified: 20160416044845312
+tags: Messages navigator-message
+title: WidgetMessage: tm-close-tiddler
+type: text/vnd.tiddlywiki
+
+El mensaje `tm-close-tiddler` elimina de la StoryList el tiddler que se indique. 
+
+Requiere las siguientes propiedades del objeto `event`:
+
+|!Nombre |!Descripción |
+|param |Título del tiddler que se quiere cerrar |
+|tiddlerTitle |Título alternativo usado si no se especifica ''param'' (asignado automáticamente por ButtonWidget)  |
+
+Este mensaje normalmente lo genera ButtonWidget y lo procesa NavigatorWidget.
diff --git a/editions/es-ES/tiddlers/WidgetMessage__tm-delete-tiddler.tid b/editions/es-ES/tiddlers/WidgetMessage__tm-delete-tiddler.tid
new file mode 100644
index 000000000..7adea9f94
--- /dev/null
+++ b/editions/es-ES/tiddlers/WidgetMessage__tm-delete-tiddler.tid
@@ -0,0 +1,17 @@
+caption: tm-delete-tiddler
+created: 20140226090324129
+es-title: Mensaje: tm-delete-tiddler
+modified: 20160416044521502
+tags: Messages navigator-message
+title: WidgetMessage: tm-delete-tiddler
+type: text/vnd.tiddlywiki
+
+El mensaje `tm-delete-tiddler` borra el tiddler especificado y lo elimina de la StoryList actual. Si se trata de un borrador, elimina también el tiddler especificado en el campo `draft.of`.
+
+Requiere las siguientes propiedades del objeto `event`:
+
+|!Nombre |!Descripción |
+|param |Título del tiddler para borrar |
+|tiddlerTitle |Título alternativo usado si no se especifica ''param'' (asignado automáticamente por ButtonWidget)  |
+
+Este mensaje lo genera normalmente ButtonWidget y lo procesa NavigatorWidget.
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/WidgetMessage__tm-download-file.tid b/editions/es-ES/tiddlers/WidgetMessage__tm-download-file.tid
new file mode 100644
index 000000000..1ace443bc
--- /dev/null
+++ b/editions/es-ES/tiddlers/WidgetMessage__tm-download-file.tid
@@ -0,0 +1,17 @@
+caption: tm-download-file
+created: 20140811112201235
+es-title: Mensaje: tm-download-file
+modified: 20160416044054991
+tags: Messages
+title: WidgetMessage: tm-download-file
+type: text/vnd.tiddlywiki
+
+El mensaje `tm-download-file` hace que el [[SaverModule|SaverModules]] actual indique al usuario que descargue como archivo el resultado de la interpretación de un determinado tiddler.
+
+Requiere las siguientes propiedades del objeto `event`:
+
+|!Nombre |!Descripción |
+|param |Título del tiddler usado como plantilla del nuevo tiddler |
+|paramObject |HashMap opcional de valores de variable que se usará para la conversión |
+
+Este mensaje lo genera normalmente ButtonWidget y lo procesa SyncMechanism en el núcleo de TiddlyWiki, que invoca el [[SaverModule|SaverModules]] actual.
diff --git a/editions/es-ES/tiddlers/WidgetMessage__tm-edit-tiddler.tid b/editions/es-ES/tiddlers/WidgetMessage__tm-edit-tiddler.tid
new file mode 100644
index 000000000..b9262a7b5
--- /dev/null
+++ b/editions/es-ES/tiddlers/WidgetMessage__tm-edit-tiddler.tid
@@ -0,0 +1,17 @@
+caption: tm-edit-tiddler
+created: 20140226085529797
+es-title: Mensaje: tm-edit-tiddler
+modified: 20160416043352274
+tags: Messages navigator-message
+title: WidgetMessage: tm-edit-tiddler
+type: text/vnd.tiddlywiki
+
+El mensaje `tm-edit-tiddler` sustituye en la StoryList el tiddler especificado por un borrador de sí mismo. 
+
+Requiere las siguientes propiedades del objeto `event`:
+
+|!Nombre |!Descripción |
+|param |Título del tiddler que pasa a modo edición |
+|tiddlerTitle |Título alternativo usado si no se especifica ''param'' (asignado automáticamente por ButtonWidget)  |
+
+Este mensaje normalmente lo generan ButtonWidget o ActionSendMessageWidget y loprocesa NavigatorWidget.
diff --git a/editions/es-ES/tiddlers/WidgetMessage__tm-full-screen.tid b/editions/es-ES/tiddlers/WidgetMessage__tm-full-screen.tid
new file mode 100644
index 000000000..67cf86b1f
--- /dev/null
+++ b/editions/es-ES/tiddlers/WidgetMessage__tm-full-screen.tid
@@ -0,0 +1,11 @@
+caption: tm-full-screen
+created: 20140811112400855
+es-title: Mensaje: tm-full-screen
+modified: 20160416042755269
+tags: Messages
+title: WidgetMessage: tm-full-screen
+type: text/vnd.tiddlywiki
+
+El mensaje `tm-full-screen` alterna el modo de vista en pantalla completa, si el navegador lo permite. 
+
+Este mensaje lo procesa el núcleo de ~TiddlyWiki.
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/WidgetMessage__tm-home.tid b/editions/es-ES/tiddlers/WidgetMessage__tm-home.tid
new file mode 100644
index 000000000..7449870f6
--- /dev/null
+++ b/editions/es-ES/tiddlers/WidgetMessage__tm-home.tid
@@ -0,0 +1,15 @@
+caption: tm-home
+created: 20140819110529062
+es-title: Mensajes: tm-home
+modified: 20160416042553510
+tags: Messages
+title: WidgetMessage: tm-home
+type: text/vnd.tiddlywiki
+
+El mensaje `tm-home` cierra cualquier tiddler que se haya abierto y abre los tiddlers por defecto definidos en [[$:/DefaultTiddlers]]. 
+
+También elimina cualquier [[permalink|PermaLinks]] de la barra de dirección del navegador
+
+No requiere propiedad alguna del objeto `event`.
+
+Este mensaje normalmente lo genera ButtonWidget y lo procesa el núcleo de ~TiddlyWiki.
diff --git a/editions/es-ES/tiddlers/WidgetMessage__tm-import-tiddlers.tid b/editions/es-ES/tiddlers/WidgetMessage__tm-import-tiddlers.tid
new file mode 100644
index 000000000..daebefaca
--- /dev/null
+++ b/editions/es-ES/tiddlers/WidgetMessage__tm-import-tiddlers.tid
@@ -0,0 +1,18 @@
+caption: tm-import-tiddlers
+created: 20140716084658099
+es-title: Mensaje: tm-import-tiddlers
+modified: 20160416051305474
+tags: Messages navigator-message
+title: WidgetMessage: tm-import-tiddlers
+type: text/vnd.tiddlywiki
+
+El mensaje `tm-import-tiddlers` añade una lista de tiddlers a [[$:/Import]], señalando así que están pendientes de importación. También aplica cualquier módulo ''upgrader'' activo a cada tiddler según llega. Consulta UpgradeMechanism para mayor información.
+
+|!Nombre |!Descripción |
+|param |texto JSON de la matriz de tiddlers para importar |
+
+Este mensaje lo generan normalmente DropzoneWidget o BrowseWidget y lo procesa NavigatorWidget.
+
+!! Variables de configuración
+
+* <<.vlink tv-auto-open-on-import>>
diff --git a/editions/es-ES/tiddlers/WidgetMessage__tm-login.tid b/editions/es-ES/tiddlers/WidgetMessage__tm-login.tid
new file mode 100644
index 000000000..9fca57acf
--- /dev/null
+++ b/editions/es-ES/tiddlers/WidgetMessage__tm-login.tid
@@ -0,0 +1,11 @@
+caption: tm-login
+created: 20140811112445887
+es-title: Mensajes: tm-login
+modified: 20160415160229935
+tags: Messages
+title: WidgetMessage: tm-login
+type: text/vnd.tiddlywiki
+
+El mensaje `tm-login` pide al usuario que introduzca un nombre de usuario y contraseña e intenta iniciar sesión en el servidor. El tiddler [[$:/status/IsLoggedIn]] informa del actual estado de inicio de sesión con los valores "yes" o "no" y [[$:/status/UserName]] indica el nombre de usuario actual.
+
+Este mensaje lo procesa SyncMechanism en el núcleo de ~TiddlyWiki invocando el [[SyncAdaptorModule|SyncAdaptorModules]] actual, (generalmente, el plugin  ''tiddlywiki/tiddlywebadaptor'').
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/WidgetMessage__tm-logout.tid b/editions/es-ES/tiddlers/WidgetMessage__tm-logout.tid
new file mode 100644
index 000000000..45c97cd1c
--- /dev/null
+++ b/editions/es-ES/tiddlers/WidgetMessage__tm-logout.tid
@@ -0,0 +1,12 @@
+caption: tm-logout
+created: 20140811112457311
+es-title: Mensaje: tm-logout
+modified: 20160415160213368
+tags: Messages
+title: WidgetMessage: tm-logout
+type: text/vnd.tiddlywiki
+
+El mensaje `tm-logout` desconecta al usuario de su sesión actual en el servidor. 
+El tiddler [[$:/status/IsLoggedIn]] indica el estado actual de inicio de sesión con los valores "yes" o "no" y [[$:/status/UserName]] indica el nombre de usuario actual
+
+Este mensaje lo procesa SyncMechanism en el núcleo de ~TiddlyWiki invocando el [[SyncAdaptorModule|SyncAdaptorModules]] actual, (generalmente, el plugin  ''tiddlywiki/tiddlywebadaptor'').
diff --git a/editions/es-ES/tiddlers/WidgetMessage__tm-modal.tid b/editions/es-ES/tiddlers/WidgetMessage__tm-modal.tid
new file mode 100644
index 000000000..0bf00d423
--- /dev/null
+++ b/editions/es-ES/tiddlers/WidgetMessage__tm-modal.tid
@@ -0,0 +1,34 @@
+caption: tm-modal
+created: 20140811112133701
+es-title: Mensaje: tm-modal
+modified: 20160415153537297
+tags: Messages
+title: WidgetMessage: tm-modal
+type: text/vnd.tiddlywiki
+
+El mensaje `tm-modal` muestra determinado tiddler sobre una ventana modal que atenúa la página principal. Requiere de las siguientes propiedades en el objeto `event`:
+
+|!Nombre |!Descripción |
+|param |Título del tiddler que se quiere mostrar |
+|paramObject |HashMap de variables que se le suministra al modal |
+
+La variable <<.def "current tiddler">> se asigna al tiddler modal, pero puede anularse especificando un valor diferente en `paramObject`.
+
+Este mensaje se genera normalmente con ButtonWidget y lo procesa el núcleo de ~TiddlyWiki.
+
+!! Ejemplo
+
+Este es un ejemplo de modal y de cómo se le pasan parámetros:
+
+
+<$macrocall $name='wikitext-example-without-html' 
+
+src='Escribe tu nombre: <$edit-text tiddler="$:/temp/yourName" tag="input" default="Nombre"/>
+
+Escribe tu mensaje:
+<$edit-text tiddler="$:/temp/yourMessage" default="Mensaje"/>
+
+<$button>
+<$action-sendmessage $message="tm-modal" $param="SampleModal" yourName={{$:/temp/yourName}} yourMessage={{$:/temp/yourMessage}}/>
+¡Haz clic!
+</$button>'/>
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/WidgetMessage__tm-navigate.tid b/editions/es-ES/tiddlers/WidgetMessage__tm-navigate.tid
new file mode 100644
index 000000000..d4a1ba414
--- /dev/null
+++ b/editions/es-ES/tiddlers/WidgetMessage__tm-navigate.tid
@@ -0,0 +1,19 @@
+caption: tm-navigate
+created: 20140226085215941
+es-title: Mensaje: tm-navigate
+modified: 20160415144216276
+tags: Messages
+title: WidgetMessage: tm-navigate
+type: text/vnd.tiddlywiki
+
+El mensaje `tm-navigate` inserta el tiddler que se indica en la StoryList y lo coloca al inicio de la HistoryList. Si el tiddler no está ya en la StoryList, se colocará inmediatamente después del que se especifique en `event.navigateFromTitle`.
+
+Este mensaje precisa de las siguientes propiedades del objeto `event`:
+
+|!Nombre |!Descripción |
+|navigateTo |Título del tiddler al que se navega |
+|navigateFromTitle |Título del tiddler desde el que se inicia la navegación |
+|navigateFromClientRect |Coordenadas en la página cliente del cuadro del elemento que inicia la navegación |
+|navigateSuppressNavigation |''true'' hace que el nuevo tiddler se añada a la StoryList, sin sumarse a la HistoryList. Esto suprime el desplazamiento asociado con la navegación a un tiddler |
+
+Este mensaje pueden generarlo LinkWidget, ActionNavigateWidget y ButtonWidget, pero lo procesa NavigatorWidget.
diff --git a/editions/es-ES/tiddlers/WidgetMessage__tm-new-tiddler.tid b/editions/es-ES/tiddlers/WidgetMessage__tm-new-tiddler.tid
new file mode 100644
index 000000000..b827c74df
--- /dev/null
+++ b/editions/es-ES/tiddlers/WidgetMessage__tm-new-tiddler.tid
@@ -0,0 +1,42 @@
+caption: tm-new-tiddler
+created: 20140226194405353
+es-title: Mensaje: tm-new-tiddler
+modified: 20160415130948422
+tags: Messages navigator-message
+title: WidgetMessage: tm-new-tiddler
+type: text/vnd.tiddlywiki
+
+El mensaje `tm-new-tiddler` crea un nuevo borrador y lo añade a la StoryList actual. Precisa de las siguientes propiedades del objeto `event`:
+
+
+|!Nombre |!Descripción |
+|param |Título opcional de un tiddler que sirva de plantilla para el nuevo tiddler |
+|paramObject |HashMap opcional de TiddlerFields adicionales |
+|navigateFromTitle |Título del tiddler desde el que se inició la navegación hacia el nuevo tiddler |
+
+El título del borrador se elige conforme a las siguientes reglas:
+
+* Si se usó un HashMap y se definió un campo `title`, usa su valor
+
+* Si se usó plantilla, usa el título y un sufijo numérico para hacerlo único
+
+* Si no, genera un nuevo título basándose en el nuevo título por defecto y un sufijo numérico para hacerlo único.
+
+El mensaje `tm-new-tiddler` se genera normalmente con ButtonWidget o  ActionSendMessageWidget y lo procesa NavigatorWidget.
+
+!! Ejemplos
+
+Si queremos hacer un botón que cree nuevos tiddlers con la etiqueta "tarea", tendremos que crear un tiddler llamado por ejemplo "~PlantillaTarea" con las etiquetas que se quieren asignar ("tarea", en este caso) y entonces definir el botón de esta forma: 
+
+```
+<$button message="tm-new-tiddler" param="PlantillaTarea">Nueva Tarea </$button>
+```
+
+Si en lugar de a partir de una plantilla, queremos un botón que cree tiddlers a partir de una serie de atributos:
+
+```
+<$button>
+<$action-sendmessage $message="tm-new-tiddler" title="This is newly created tiddler" tags="OneTag [[Another Tag]]" text=<<now "Today is DDth, MMM YYYY">>/>
+New Tiddler
+</$button>
+```
diff --git a/editions/es-ES/tiddlers/WidgetMessage__tm-notify.tid b/editions/es-ES/tiddlers/WidgetMessage__tm-notify.tid
new file mode 100644
index 000000000..8c0f6e936
--- /dev/null
+++ b/editions/es-ES/tiddlers/WidgetMessage__tm-notify.tid
@@ -0,0 +1,14 @@
+caption: tm-notify
+created: 20140811112304772
+es-title: Mensaje: tm-notify
+modified: 20160415114838901
+tags: Messages
+title: WidgetMessage: tm-notify
+type: text/vnd.tiddlywiki
+
+El mensaje `tm-notify` muestra un tiddler determinado como una pequeña alerta en la esquina superior derecha de la página. Requiere las siguientes propiedades del objeto `event`:
+
+|!Nombre |!Descripción |
+|param |Título del tiddler que se mostrará |
+
+Este mensaje lo procesa el núcleo de ~TiddlyWiki
diff --git a/editions/es-ES/tiddlers/WidgetMessage__tm-perform-import.tid b/editions/es-ES/tiddlers/WidgetMessage__tm-perform-import.tid
new file mode 100644
index 000000000..97c32195d
--- /dev/null
+++ b/editions/es-ES/tiddlers/WidgetMessage__tm-perform-import.tid
@@ -0,0 +1,16 @@
+caption: tm-perform-import
+created: 20140716084242809
+es-title: Mensajes: tm-perform-import
+modified: 20160415113056593
+tags: Messages navigator-message
+title: WidgetMessage: tm-perform-import
+type: text/vnd.tiddlywiki
+
+El mensaje `tm-perform-import` toma tiddlers de un plugin específico y los copia en el TiddlerStore principal. Consulta UpgradeMechanism para tener una idea general de cómo el núcleo usa este mensaje.
+
+|!Nombre |!Descripción |
+|param |Título del tiddler pendiente de importar. (Por defecto, ''$:/Import'' |
+
+Para seleccionar los tiddlers que van a importarse, se usan campos con nombres formados por `selection-` más el título del tiddler. El valor ''unchecked'' omite el tiddler durante la importación.
+
+Este mensaje normalmente lo genera ButtonWidget y lo procesa NavigatorWidget.
diff --git a/editions/es-ES/tiddlers/WidgetMessage__tm-permalink.tid b/editions/es-ES/tiddlers/WidgetMessage__tm-permalink.tid
new file mode 100644
index 000000000..6112bc2f9
--- /dev/null
+++ b/editions/es-ES/tiddlers/WidgetMessage__tm-permalink.tid
@@ -0,0 +1,17 @@
+caption: tm-permalink
+created: 20140723103751357
+es-title: Mensaje: tm-permalink
+modified: 20160415111836727
+tags: Messages
+title: WidgetMessage: tm-permalink
+type: text/vnd.tiddlywiki
+
+El mensaje `tm-permalink` cambia la dirección de la barra del navegador para formar un  [[permalink|PermaLinks]]: dirección web que lleva hasta un tiddler específico (por defecto, el tiddler actual).
+
+Este mensaje permite las siguientes propiedades del objeto `event`:
+
+|!Nombre |!Descripción |
+|param |Título del tiddler para el permalink |
+|tiddlerTitle |El tiddler actual (usado por defecto si no se especifica otro en el `param`) |
+
+Este mensaje puede generarse con el ButtonWidget y lo procesa el mecanismo StoryMechanism
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/WidgetMessage__tm-permaview.tid b/editions/es-ES/tiddlers/WidgetMessage__tm-permaview.tid
new file mode 100644
index 000000000..46f10a1ca
--- /dev/null
+++ b/editions/es-ES/tiddlers/WidgetMessage__tm-permaview.tid
@@ -0,0 +1,17 @@
+caption: tm-permaview
+created: 20140723103751357
+es-title: Mensaje: tm-permaview
+modified: 20160415110056356
+tags: Messages
+title: WidgetMessage: tm-permaview
+type: text/vnd.tiddlywiki
+
+El mensaje `tm-permaview` cambia la dirección del navegador para formar una [[permaview|PermaLinks]]: dirección web que especifica qué tiddlers aparecerán abiertos en el StoryRiver y entre estos, cuál se muestra primero en pantalla (por defecto, el tiddler actual).
+
+Este mensaje permite las siguientes propiedades del objeto `event`:
+
+|!Nombre |!Descripción |
+|param |Título del tiddler de la permaview que primero se mostrará en pantalla |
+|tiddlerTitle |Tiddler actual (usado por defecto si no se especifica otro en el `param`) |
+
+Este mensaje puede generarse con el ButtonWidget y lo procesa el mecanismo StoryMechanism
diff --git a/editions/es-ES/tiddlers/WidgetMessage__tm-remove-field.tid b/editions/es-ES/tiddlers/WidgetMessage__tm-remove-field.tid
new file mode 100644
index 000000000..57e1508d9
--- /dev/null
+++ b/editions/es-ES/tiddlers/WidgetMessage__tm-remove-field.tid
@@ -0,0 +1,14 @@
+caption: tm-remove-field
+created: 20140908185153663
+es-title: Mensaje: tm-remove-field
+modified: 20160415103257754
+tags: Messages
+title: WidgetMessage: tm-remove-field
+type: text/vnd.tiddlywiki
+
+El mensaje `tm-remove-field` elimina el campo especificado. 
+
+|!Nombre |!Descripción |
+|param |Nombre del campo para eliminar |
+
+Este mensaje se genera normalmente con ButtonWidget y lo procesa FieldManglerWidget.
diff --git a/editions/es-ES/tiddlers/WidgetMessage__tm-remove-tag.tid b/editions/es-ES/tiddlers/WidgetMessage__tm-remove-tag.tid
new file mode 100644
index 000000000..77d58ce49
--- /dev/null
+++ b/editions/es-ES/tiddlers/WidgetMessage__tm-remove-tag.tid
@@ -0,0 +1,14 @@
+caption: tm-remove-tag
+created: 20140908185153663
+es-title: Mensaje: tm-remove-tag
+modified: 20160415102953003
+tags: Messages
+title: WidgetMessage: tm-remove-tag
+type: text/vnd.tiddlywiki
+
+El mensaje `tm-remove-tag` elimina la etiqueta especificada.
+
+|!Name |!Description |
+|param |Nombre de etiqueta para borrar |
+
+Este mensaje normalmente se genera con ButtonWidget y lo procesa FieldManglerWidget.
diff --git a/editions/es-ES/tiddlers/WidgetMessage__tm-save-tiddler.tid b/editions/es-ES/tiddlers/WidgetMessage__tm-save-tiddler.tid
new file mode 100644
index 000000000..29ddf1d78
--- /dev/null
+++ b/editions/es-ES/tiddlers/WidgetMessage__tm-save-tiddler.tid
@@ -0,0 +1,15 @@
+caption: tm-save-tiddler
+created: 20140226090544323
+es-title: Mensaje: tm-save-tiddler
+modified: 20160415101900363
+tags: Messages navigator-message
+title: WidgetMessage: tm-save-tiddler
+type: text/vnd.tiddlywiki
+
+El mensaje `tm-save-tiddler` se aplica a los tiddlers en borrador. Sobreescribe el tiddler identificado en el campo `draft.of` y elimina el borrador. Este mensaje requere las siguientes propiedades del objeto `event`
+
+|!Nombre |!Descripción |
+|param |Título del tiddler que se sobreescribe |
+|tiddlerTitle |Tídulo alternativo si no se especifica ''param'' (asignado automáticamente por ButtonWidget)  |
+
+Este mensaje normalmente lo genera ButtonWidget y lo procesa NavigatorWidget.
diff --git a/editions/es-ES/tiddlers/WidgetMessage__tm-save-wiki.tid b/editions/es-ES/tiddlers/WidgetMessage__tm-save-wiki.tid
new file mode 100644
index 000000000..3f7b19627
--- /dev/null
+++ b/editions/es-ES/tiddlers/WidgetMessage__tm-save-wiki.tid
@@ -0,0 +1,19 @@
+caption: tm-save-wiki
+created: 20140811112325641
+es-title: Mensaje: tm-save-wiki
+modified: 20160415095926978
+tags: Messages
+title: WidgetMessage: tm-save-wiki
+type: text/vnd.tiddlywiki
+
+El mensaje `tm-save-wiki`hace que el SaverModule actual realice una operación de guardado de todo el wiki. Dicha operación puede requerir intervención del usuario. Precisa de las siguientes propiedades en el objeto `event`:
+
+|!Nombre |!Descripción |
+|param |Título del tiddler que sirve de plantilla para generar el wiki. (por defecto `$:/core/save/all`) |
+|paramObject |HashMap opcional de valores de variable para usar al generar el wiki |
+
+Este mensaje lo genera habitualmente ButtonWidget.
+
+The save wiki message is usually generated by the ButtonWidget.
+
+El SyncMechanism del núcleo es quien procesa este mensaje invocando el [[SaverModule|SaverModules]] actual.
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/WidgetMessage__tm-server-refresh.tid b/editions/es-ES/tiddlers/WidgetMessage__tm-server-refresh.tid
new file mode 100644
index 000000000..dec6a2a58
--- /dev/null
+++ b/editions/es-ES/tiddlers/WidgetMessage__tm-server-refresh.tid
@@ -0,0 +1,12 @@
+caption: tm-server-refresh
+created: 20160415093830059
+es-title: Mensaje: tm-server-refresh
+modified: 20160415093852680
+tags: Messages
+title: WidgetMessage: tm-server-refresh
+type: text/vnd.tiddlywiki
+
+El mensaje `tm-server-refresh` intenta sincronizar con el servidor los últimos cambios del cliente. 
+
+El SyncMechanism del núcleo es quien procesa este mensaje invocando el  [[Módulo de sincronización|SyncAdaptorModules]] actual, (normalmente, el plugin ''tiddlywiki/tiddlywebadaptor'').
+
diff --git a/editions/es-ES/tiddlers/WidgetMessage__tm-set-password.tid b/editions/es-ES/tiddlers/WidgetMessage__tm-set-password.tid
new file mode 100644
index 000000000..a526a7f8c
--- /dev/null
+++ b/editions/es-ES/tiddlers/WidgetMessage__tm-set-password.tid
@@ -0,0 +1,13 @@
+caption: tm-set-password
+created: 20140226084623977
+es-title: Mensaje: tm-set-password
+modified: 20160415092319425
+tags: Messages
+title: WidgetMessage: tm-set-password
+type: text/vnd.tiddlywiki
+
+El mensaje `tm-set-password`pide al usuario que establezca una contraseña y la guarda en el depósito, sustituyendo cualquier otra contraseña que se hubiera guardado anteriormente. Como consecuencia, establece también el valor de [[$:/isEncrypted]] 
+
+Más detalles en EncryptionMechanism.
+
+Este mensaje lo genera habitualmente ButtonWidget y se procesa en el propio núcleo.
diff --git a/editions/es-ES/tiddlers/Windows_HTA_Hack.tid b/editions/es-ES/tiddlers/Windows_HTA_Hack.tid
new file mode 100644
index 000000000..6aa100a3f
--- /dev/null
+++ b/editions/es-ES/tiddlers/Windows_HTA_Hack.tid
@@ -0,0 +1,16 @@
+created: 20131212223146250
+es-title: Ejecutar como aplicación HTA
+modified: 20160413103922670
+tags: [[Saving on InternetExplorer]]
+title: Windows HTA Hack
+type: text/vnd.tiddlywiki
+
+En Windows es posible convertir TiddlyWiki en aplicación local cambiando la extensión `.html` por `.hta` (HTML-Application).
+
+Con este cambio se permite que el módulo ''fsosaver'' use el ~FileSystemObject de ~ActiveX para guardar los cambios.
+
+Hay que tener presente que con este enfoque el archivo TiddlyWiki se guarda codificado en formato UTF-16, que tiene la desventaja de hacerlo el doble de grande que con la codificación habitual en UTF-8. SIn embargo, abrir el archivo y guardarlo por otro medio lo vuelve a codificar como UTF-8.
+
+En la Wikipedia encontrarás más detalles sobre las aplicaciones HTML o HTA: 
+
+http://en.wikipedia.org/wiki/HTML_Application
diff --git a/editions/es-ES/tiddlers/Working_with_TiddlyWiki.tid b/editions/es-ES/tiddlers/Working_with_TiddlyWiki.tid
new file mode 100644
index 000000000..5469c4051
--- /dev/null
+++ b/editions/es-ES/tiddlers/Working_with_TiddlyWiki.tid
@@ -0,0 +1,13 @@
+caption: Trabajar con TiddlyWiki
+created: 20140904101100000
+es-title: Trabajar con TiddlyWiki
+list: [[The First Rule of Using TiddlyWiki]] GettingStarted [[Getting Started Video]] Upgrading [[Navigating between open tiddlers]] [[Using links to navigate between tiddlers]] [[Searching in TiddlyWiki]] [[Creating and editing tiddlers]] [[Creating journal tiddlers]] Saving [[Formatting text in TiddlyWiki]] [[Structuring TiddlyWiki]] Tagging [[Images in WikiText]] KeyboardShortcuts Encryption
+modified: 20160421093840593
+tags: TableOfContents
+title: Working with TiddlyWiki
+type: text/vnd.tiddlywiki
+
+Información de ayuda para empezar a usar ~TiddlyWiki:
+
+<<list-links "[tag[Working with TiddlyWiki]]">>
+
diff --git a/editions/es-ES/tiddlers/_A_Thesis_Notebook__by_Alberto_Molina.tid b/editions/es-ES/tiddlers/_A_Thesis_Notebook__by_Alberto_Molina.tid
new file mode 100644
index 000000000..bdcc3ac1e
--- /dev/null
+++ b/editions/es-ES/tiddlers/_A_Thesis_Notebook__by_Alberto_Molina.tid
@@ -0,0 +1,20 @@
+caption: "A Thesis Notebook", de Alberto Molina
+created: 20130302085406905
+es-title: "A Thesis Notebook", de Alberto Molina
+modified: 20160417093653037
+tags: Examples
+title: "A Thesis Notebook" by Alberto Molina
+type: text/vnd.tiddlywiki
+url: http://tesis.tiddlyspot.com/
+
+Cuaderno de tesis basado en TiddlyWiki
+
+{{!!url}}
+
+<<<
+Este es un ejemplo de cuaderno de tesis, construido sobre TiddlyWiki 5.0.8-beta.
+
+TiddlyWiki es un gran programa creado por Jeremy Ruston. Te permite, entre otras cosas, tomar notas, organizar ideaas, guardar información y ver todas tus cosas de la forma que queres. Es una herramiente increíblemente flexible que puedes adaptar para que satisfaga casi todas tus necesidades. 
+
+Este TiddlyWiki ha sido adaptado para servir de cuaderno de notas de filosofía, centrado en autores, libros y artículos, conceptos y teorías, además de notas personales. Lo uso junto con Zotero, que es un programa de bibliografía. Ambos son proyectos gratuitos de código abierto. TiddlyWiki se puede descargar de http://tiddlywiki.com
+<<<
diff --git a/editions/es-ES/tiddlers/_PETTIL_-_Forth_for_the_Commodore_PET__by_Charlie_Hitselberger.tid b/editions/es-ES/tiddlers/_PETTIL_-_Forth_for_the_Commodore_PET__by_Charlie_Hitselberger.tid
new file mode 100644
index 000000000..aa944c7d0
--- /dev/null
+++ b/editions/es-ES/tiddlers/_PETTIL_-_Forth_for_the_Commodore_PET__by_Charlie_Hitselberger.tid
@@ -0,0 +1,24 @@
+caption: "PETTIL - Forth for the Commodore PET", de Charlie Hitselberger
+created: 20140716085406905
+est-title: "PETTIL - Forth for the Commodore PET", de Charlie Hitselberger
+modified: 20160417094349850
+tags: Examples
+title: "PETTIL - Forth for the Commodore PET" by Charlie Hitselberger
+type: text/vnd.tiddlywiki
+url: http://chitselb.com/files/tiddlypettil.html
+
+Intérprete rápido de de Forth para el [[Commodore PET|http://en.wikipedia.org/wiki/Commodore_PET]], escrito en lenguaje ensamblador 6502. El ~TiddlyWiki que contiene documentación del programa se genera automáticamente de la fuente: ver: https://github.com/chitselb/pettil.
+
+{{!!url}}
+
+<<<
+Los objetivos del proyecto son, sin ningún orden en particular: 
+
+*hacer un Forth que funcione en mi Commodore PET 2001
+
+*divertirme
+
+* desarrollar mi pericia con el "6502 assembly golf"
+
+*encontrar otra gente interesada en este proyecto
+<<<
diff --git a/editions/es-ES/tiddlers/_TiddlyWiki_for_Scholars__by_Alberto_Molina.tid b/editions/es-ES/tiddlers/_TiddlyWiki_for_Scholars__by_Alberto_Molina.tid
new file mode 100644
index 000000000..d6457ff01
--- /dev/null
+++ b/editions/es-ES/tiddlers/_TiddlyWiki_for_Scholars__by_Alberto_Molina.tid
@@ -0,0 +1,16 @@
+caption: TiddlyWiki for Scholars
+created: 20140720085406905
+es-title: "TiddlyWiki for Scholars", por Alberto Molina
+modified: 20160412171901066
+tags: Resources
+title: "TiddlyWiki for Scholars" by Alberto Molina
+type: text/vnd.tiddlywiki
+url: http://tw5.scholars.tiddlyspot.com/
+
+Edición de una versión anterior de TiddlyWiki, adaptada para la toma rigurosa de notas académicas. 
+
+{{!!url}}
+
+<<<
+''~TiddlyWiki for Scholars'' es una customización personal de TiddlyWiki 5.0.13-beta que hice para tomar notas de lectura, pero que puede servir también a otros fines La idea subyacente en esta adaptación es la de poder crear y mostrar información relacionada con el tiddler que se visualiza, sin tener que salir de él para hacerlo. 
+<<<
diff --git a/editions/es-ES/tiddlers/images/favicon.ico b/editions/es-ES/tiddlers/images/favicon.ico
new file mode 100644
index 000000000..d4fae0448
Binary files /dev/null and b/editions/es-ES/tiddlers/images/favicon.ico differ
diff --git a/editions/es-ES/tiddlers/images/favicon.ico.meta b/editions/es-ES/tiddlers/images/favicon.ico.meta
new file mode 100644
index 000000000..2f3e81713
--- /dev/null
+++ b/editions/es-ES/tiddlers/images/favicon.ico.meta
@@ -0,0 +1,2 @@
+title: $:/favicon.ico
+type: image/x-icon
diff --git a/editions/es-ES/tiddlers/images/green_favicon.ico b/editions/es-ES/tiddlers/images/green_favicon.ico
new file mode 100644
index 000000000..06e5f8e80
Binary files /dev/null and b/editions/es-ES/tiddlers/images/green_favicon.ico differ
diff --git a/editions/es-ES/tiddlers/images/green_favicon.ico.meta b/editions/es-ES/tiddlers/images/green_favicon.ico.meta
new file mode 100644
index 000000000..f2e1cfa3c
--- /dev/null
+++ b/editions/es-ES/tiddlers/images/green_favicon.ico.meta
@@ -0,0 +1,2 @@
+title: $:/green_favicon.ico
+type: image/x-icon
diff --git a/editions/es-ES/tiddlers/prueba.tid b/editions/es-ES/tiddlers/prueba.tid
new file mode 100644
index 000000000..bffa36e4b
--- /dev/null
+++ b/editions/es-ES/tiddlers/prueba.tid
@@ -0,0 +1,7 @@
+created: 20160422133907806
+modified: 20160422133919726
+tags: 
+title: prueba
+type: text/vnd.tiddlywiki
+
+blablabla
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/system/download-empty-button.tid b/editions/es-ES/tiddlers/system/download-empty-button.tid
new file mode 100644
index 000000000..26206a08f
--- /dev/null
+++ b/editions/es-ES/tiddlers/system/download-empty-button.tid
@@ -0,0 +1,6 @@
+title: $:/editions/es-ES/snippets/download-empty-button
+
+<$button class="tc-btn-big-green">
+<$action-sendmessage $message="tm-download-file" $param="$:/editions/es-ES/download-empty" filename="empty_es.html"/>
+Descargar un wiki en blanco {{$:/core/images/save-button}}
+</$button>
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/system/download-empty.tid b/editions/es-ES/tiddlers/system/download-empty.tid
new file mode 100755
index 000000000..64928eb2f
--- /dev/null
+++ b/editions/es-ES/tiddlers/system/download-empty.tid
@@ -0,0 +1,10 @@
+title: $:/editions/es-ES/download-empty
+type: text/vnd.tiddlywiki
+
+\define saveTiddlerFilter()
+[[$:/core]] [[$:/isEncrypted]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] [[$:/languages/es-ES]] [[$:/language]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
+\end
+\define savingEmpty()
+yes
+\end
+{{$:/core/templates/tiddlywiki5.html}}
diff --git a/editions/es-ES/tiddlers/system/language.tid b/editions/es-ES/tiddlers/system/language.tid
new file mode 100644
index 000000000..e6a9232d6
--- /dev/null
+++ b/editions/es-ES/tiddlers/system/language.tid
@@ -0,0 +1,6 @@
+created: 20160411180834313
+modified: 20160412080831472
+title: $:/language
+type: text/vnd.tiddlywiki
+
+$:/languages/es-ES
\ No newline at end of file
diff --git a/editions/es-ES/tiddlers/task.tid b/editions/es-ES/tiddlers/task.tid
new file mode 100644
index 000000000..c2019d0d4
--- /dev/null
+++ b/editions/es-ES/tiddlers/task.tid
@@ -0,0 +1,7 @@
+color: #8d9ac3
+created: 20130825213200000
+list: [[Make the beds]]
+modified: 20160603152407526
+title: task
+
+//Tarea de muestra para el [[Ejemplo de administración de tareas|TaskManagementExample]]//
diff --git a/editions/es-ES/tiddlers/tv-auto-open-on-import_Variable.tid b/editions/es-ES/tiddlers/tv-auto-open-on-import_Variable.tid
new file mode 100644
index 000000000..a0b84e5e9
--- /dev/null
+++ b/editions/es-ES/tiddlers/tv-auto-open-on-import_Variable.tid
@@ -0,0 +1,13 @@
+caption: tv-auto-open-on-import
+created: 20150228120919000
+es-title: Variable: tv-auto-open-on-import
+modified: 20160416040705105
+tags: Variables [[Core Variables]] [[Configuration Variables]]
+title: tv-auto-open-on-import Variable
+type: text/vnd.tiddlywiki
+
+La [[variable|Variables]] <<.def tv-auto-open-on-import>> controla si el mensaje `tm-import-tiddlers` abre en el StoryRiver el tiddler [[$:/Import]] (que muestra la lista de tiddlers pendientes de importación).
+
+Por defecto, el tiddler se abre, pero si la variable tiene valor <<.value no>>, no lo hace.
+
+Un ejemplo de ajuste de esta variable con valor <<.value no>> puede verse en el plugin de actualización en el [[asistente de actualización de TiddlyWiki|http://www.tiddlywiki.com/upgrade.html]], donde el usuario arrastra los archivos que quiera actualizar pero en pantalla no se muestra la importación del modo habitual.
\ No newline at end of file
diff --git a/editions/es-ES/tiddlywiki.info b/editions/es-ES/tiddlywiki.info
new file mode 100644
index 000000000..29aa2d4e4
--- /dev/null
+++ b/editions/es-ES/tiddlywiki.info
@@ -0,0 +1,43 @@
+{
+	"description": "Spanish (Spain) edition",
+	"plugins": [
+	],
+	"themes": [
+		"tiddlywiki/vanilla",
+		"tiddlywiki/snowwhite",
+		"tiddlywiki/starlight",
+		"tiddlywiki/seamless",
+		"tiddlywiki/centralised",
+		"tiddlywiki/tight",
+		"tiddlywiki/readonly"
+	],
+	"languages": [
+		"es-ES"
+	],
+	"includeWikis": [
+		{"path": "../tw5.com", "read-only": true}
+	],
+	"build": {
+		"index": [
+			"--savetiddlers","[tag[external-image]]","images",
+			"--rendertiddlers","[tag[external-text]]","$:/core/templates/tid-tiddler","text","text/plain",".tid",
+			"--setfield","[tag[external-image]]","_canonical_uri","$:/core/templates/canonical-uri-external-image","text/plain",
+			"--setfield","[tag[external-text]]","_canonical_uri","$:/core/templates/canonical-uri-external-text","text/plain",
+			"--setfield","[tag[external-image]] [tag[external-text]]","text","","text/plain",
+			"--rendertiddler","$:/core/save/all","index.html","text/plain"],
+		"empty": [
+			"--rendertiddler","$:/editions/es-ES/download-empty","empty.html","text/plain",
+			"--rendertiddler","$:/editions/es-ES/download-empty","empty.hta","text/plain"],
+		"favicon": [
+			"--savetiddler","$:/favicon.ico","favicon.ico",
+			"--savetiddler","$:/green_favicon.ico","static/favicon.ico"],
+		"static": [
+			"--rendertiddler","$:/core/templates/static.template.html","static.html","text/plain",
+			"--rendertiddler","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
+			"--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain",
+			"--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"]
+	},
+	"config": {
+		"retain-original-tiddler-path": true
+	}
+}
\ No newline at end of file
diff --git a/editions/fr-FR-server/tiddlywiki.info b/editions/fr-FR-server/tiddlywiki.info
index c75481757..b7460b53f 100644
--- a/editions/fr-FR-server/tiddlywiki.info
+++ b/editions/fr-FR-server/tiddlywiki.info
@@ -1,18 +1,19 @@
 {
-    "description": "Configuration en mode serveur de l'édition fr-FR",
-    "plugins": [
-        "tiddlywiki/tiddlyweb",
-        "tiddlywiki/filesystem",
-        "tiddlywiki/highlight"
-    ],
-    "themes": [
-        "tiddlywiki/vanilla"
-    ],
-    "includeWikis": [
-        "../fr-FR"
-    ],
-    "config": {
-        "retain-original-tiddler-path": true,
-        "default-tiddler-location": "../fr-FR/tiddlers"
-    }
+	"description": "Configuration en mode serveur de l'édition fr-FR",
+	"plugins": [
+		"tiddlywiki/tiddlyweb",
+		"tiddlywiki/filesystem",
+		"tiddlywiki/highlight"
+	],
+	"themes": [
+		"tiddlywiki/vanilla",
+		"tiddlywiki/snowwhite"
+	],
+	"includeWikis": [
+		"../fr-FR"
+	],
+	"config": {
+		"retain-original-tiddler-path": true,
+		"default-tiddler-location": "../fr-FR/tiddlers"
+	}
 }
diff --git a/editions/fr-FR/tiddlers/$__core_ui_DefaultSearchResultList.tid b/editions/fr-FR/tiddlers/$__core_ui_DefaultSearchResultList.tid
index 30206872f..7cdf9b11c 100644
--- a/editions/fr-FR/tiddlers/$__core_ui_DefaultSearchResultList.tid
+++ b/editions/fr-FR/tiddlers/$__core_ui_DefaultSearchResultList.tid
@@ -6,18 +6,13 @@ title: $:/core/ui/DefaultSearchResultList
 type: text/vnd.tiddlywiki
 
 \define searchResultList()
-<$set name="resultCount" value="""<$count filter="[!is[system]search{$(searchTiddler)$}]"/>""">
-
-{{$:/language/Search/Matches}}
-
-</$set>
-
-//<small>Correspondances parmi les titres :</small>//
+//<small>{{$:/language/Search/Matches/Title}}</small>//
 
 <$list filter="[!is[system]search:title{$(searchTiddler)$}sort[caption]limit[250]] [!is[system]search:fr-title{$(searchTiddler)$}sort[title]limit[250]][!is[system]search:en-title{$(searchTiddler)$}sort[title]limit[250]]" template="$:/core/ui/ListItemTemplate"/>
 
-//<small>Toutes les correspondances :</small>//
+//<small>{{$:/language/Search/Matches/All}}</small>//
 
 <$list filter="[!is[system]search{$(searchTiddler)$}sort[title]limit[250]]" template="$:/core/ui/ListItemTemplate"/>
+
 \end
 <<searchResultList>>
diff --git a/editions/fr-FR/tiddlers/$__core_ui_ListItemTemplate.tid b/editions/fr-FR/tiddlers/$__core_ui_ListItemTemplate.tid
index 84457c8be..534c30e7b 100644
--- a/editions/fr-FR/tiddlers/$__core_ui_ListItemTemplate.tid
+++ b/editions/fr-FR/tiddlers/$__core_ui_ListItemTemplate.tid
@@ -9,4 +9,4 @@ type: text/vnd.tiddlywiki
 <$view field="title"/>
 </$view>
 </$link>
-</div>
+</div>
\ No newline at end of file
diff --git a/editions/fr-FR/tiddlers/$__core_ui_TagTemplate.tid b/editions/fr-FR/tiddlers/$__core_ui_TagTemplate.tid
new file mode 100644
index 000000000..e4b944483
--- /dev/null
+++ b/editions/fr-FR/tiddlers/$__core_ui_TagTemplate.tid
@@ -0,0 +1,33 @@
+created: 20160504080001125
+modified: 20160504080318928
+title: $:/core/ui/TagTemplate
+type: text/vnd.tiddlywiki
+
+\define tag-styles()
+background-color:$(backgroundColor)$;
+fill:$(foregroundColor)$;
+color:$(foregroundColor)$;
+\end
+
+\define tag-body-inner(colour,fallbackTarget,colourA,colourB)
+<$set name="foregroundColor" value=<<contrastcolour target:"""$colour$""" fallbackTarget:"""$fallbackTarget$""" colourA:"""$colourA$""" colourB:"""$colourB$""">>>
+<$set name="backgroundColor" value="""$colour$""">
+<$button popup=<<qualify "$:/state/popup/tag">> class="tc-btn-invisible tc-tag-label" style=<<tag-styles>>>
+<$transclude tiddler={{!!icon}}/> <$view field="fr-title"><$view field="title" format="text" /></$view>
+</$button>
+<$reveal state=<<qualify "$:/state/popup/tag">> type="popup" position="below" animate="yes"><div class="tc-drop-down"><$transclude tiddler="$:/core/ui/ListItemTemplate"/>
+<hr>
+<$list filter="[all[current]tagging[]]" template="$:/core/ui/ListItemTemplate"/>
+</div>
+</$reveal>
+</$set>
+</$set>
+\end
+
+\define tag-body(colour,palette)
+<span class="tc-tag-list-item">
+<$macrocall $name="tag-body-inner" colour="""$colour$""" fallbackTarget={{$palette$##tag-background}} colourA={{$palette$##foreground}} colourB={{$palette$##background}}/>
+</span>
+\end
+
+<$macrocall $name="tag-body" colour={{!!color}} palette={{$:/palette}}/>
\ No newline at end of file
diff --git a/editions/fr-FR/tiddlers/$__core_ui_ViewTemplate_title.tid b/editions/fr-FR/tiddlers/$__core_ui_ViewTemplate_title.tid
index cc3a62456..86c96643b 100644
--- a/editions/fr-FR/tiddlers/$__core_ui_ViewTemplate_title.tid
+++ b/editions/fr-FR/tiddlers/$__core_ui_ViewTemplate_title.tid
@@ -15,8 +15,10 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$
 <span class="tc-tiddler-controls">
 <$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem"><$reveal type="nomatch" state=<<config-title>> text="hide"><$transclude tiddler=<<listItem>>/></$reveal></$list>
 </span>
+<$set name="tv-wikilinks" value={{$:/config/Tiddlers/TitleLinks}}>
+<$link>
 <$set name="foregroundColor" value={{!!color}}>
-<span style=<<title-styles>>>
+<span class="tc-tiddler-title-icon" style=<<title-styles>>>
 <$transclude tiddler={{!!icon}}/>
 </span>
 </$set>
@@ -32,11 +34,13 @@ $:/config/ViewToolbarButtons/Visibility/$(listItem)$
 </$view>
 </h2>
 </$list>
+</$link>
+</$set>
 </div>
 
-<$reveal type="nomatch" text="" default="" state=<<tiddlerInfoState>> class="tc-tiddler-info tc-popup" animate="yes" retain="yes">
+<$reveal type="nomatch" text="" default="" state=<<tiddlerInfoState>> class="tc-tiddler-info tc-popup-handle" animate="yes" retain="yes">
 
 <$transclude tiddler="$:/core/ui/TiddlerInfo"/>
 
 </$reveal>
-</div>
+</div>
\ No newline at end of file
diff --git a/editions/fr-FR/tiddlers/$__editions_fr-FR_Macros_toc-caption.tid b/editions/fr-FR/tiddlers/$__editions_fr-FR_Macros_toc-caption.tid
index 62d3f0d69..6f08f9c13 100644
--- a/editions/fr-FR/tiddlers/$__editions_fr-FR_Macros_toc-caption.tid
+++ b/editions/fr-FR/tiddlers/$__editions_fr-FR_Macros_toc-caption.tid
@@ -13,4 +13,3 @@ type: text/vnd.tiddlywiki
 </$transclude>
 </$set>
 \end
-
diff --git a/editions/fr-FR/tiddlers/$__editions_tw5.com_doc-macros b/editions/fr-FR/tiddlers/$__editions_tw5.com_doc-macros
deleted file mode 100644
index 54157aa8f..000000000
--- a/editions/fr-FR/tiddlers/$__editions_tw5.com_doc-macros
+++ /dev/null
@@ -1,110 +0,0 @@
-created: 20150531155638729
-modified: 20150620170244944
-tags: $:/tags/Macro
-title: $:/editions/tw5.com/doc-macros
-type: text/vnd.tiddlywiki
-
-\define .concat(1,2,3,4,5) $1$$2$$3$$4$$5$
-
-\define .def(_) <dfn class="doc-def">$_$</dfn>
-\define .em(_) <em class="doc-em">$_$</em>
-\define .strong(_) <strong class="doc-strong">$_$</strong>
-\define .place(_) <code class="doc-place">$_$</code>
-\define .word(_) "$_$"
-
-\define .preamble(_) :.doc-preamble $_$
-\define .note(_)
-@@.doc-note
-;Note
-: $_$
-@@
-\end
-
-\define .tid(_) <code class="doc-tiddler">$_$</code>
-\define .tag(_) <code class="doc-tag">$_$</code>
-\define .field(_) <code class="doc-field">$_$</code>
-\define .value(_) <code class="doc-value">$_$</code>
-\define .op(_) <code class="doc-operator">$_$</code>
-\define .var(_) <code class="doc-var">$_$</code>
-\define .wid(_) <code class="doc-widget">$$_$</code>
-\define .attr(_) <code class="doc-attr">$_$</code>
-\define .param(_) <code class="doc-param">$_$</code>
-
-\define .mtitle(_) $_$ Macro
-\define .otitle(_) $_$ Operator
-\define .vtitle(_) $_$ Variable
-
-\define .link(_,to) <$link to="$to$">$_$</$link>
-\define .clink(_,to) <span class="doc-clink"><<.link """$_$""" "$to$">></span>
-\define .dlink(_,to) <$macrocall $name=".link" _=<<.def "$_$">> to="$to$">/>
-\define .dlink-ex(_,to) <a href="$to$" class="tc-tiddlylink-external" target="_blank"><<.def "$_$">></a>
-\define .flink(to) <$macrocall $name=".link" _=<<.field {{$to$!!caption}}>> to="$to$"/>
-\define .mlink(_,to) <$macrocall $name=".link" _=<<.var "$_$">> to=<<.mtitle "$_$">>/>
-\define .mlink2(_,to) <$macrocall $name=".link" _=<<.var "$_$">> to="$to$"/>
-\define .olink(_) <$macrocall $name=".link" _=<<.op "$_$">> to=<<.otitle "$_$">>/>
-\define .olink2(_,to) <$macrocall $name=".link" _=<<.op "$_$">> to=<<.otitle "$to$">>/>
-\define .vlink(_,to) <$macrocall $name=".link" _=<<.var "$_$">> to=<<.vtitle "$_$">>/>
-\define .vlink2(_,to) <$macrocall $name=".link" _=<<.var "$_$">> to="$to$"/>
-\define .wlink(to) <$macrocall $name=".link" _=<<.wid {{$to$!!caption}}>> to="$to$"/>
-\define .wlink2(_,to) <$macrocall $name=".link" _="$_$" to="$to$"/>
-
-\define .key(_) <span class="doc-key">$_$</span>
-\define .combokey(_) <$macrocall $name=".if" cond="$_$" then=<<.key '$_$'>>/>
-\define .keycombo(1,2,3,4) <<.combokey "$1$">><<.if "$2$" +>><<.combokey "$2$">><<.if "$3$" +>><<.combokey "$3$">><<.if "$4$" +>><<.combokey "$4$">>
-
-\define .tab(_) <span class="doc-tab">{{$_$!!caption}}</span>
-\define .sidebar-tab(_) <<.tab "$:/core/ui/SideBar/$_$">>
-\define .more-tab(_) <<.tab "$:/core/ui/MoreSideBar/$_$">>
-\define .info-tab(_) <<.tab "$:/core/ui/TiddlerInfo/$_$">>
-\define .controlpanel-tab(_) <<.tab "$:/core/ui/ControlPanel/$_$">>
-\define .advancedsearch-tab(_) <<.tab "$:/core/ui/AdvancedSearch/$_$">>
-\define .toc-tab() <<.tab "TableOfContents">>
-\define .example-tab(_) <span class="doc-tab">$_$</span>
-
-\define .button(_) <span class="doc-button">{{$:/core/ui/Buttons/$_$!!caption}}</span>
-
-\define .tip(_) <div class="doc-icon-block"><div class="doc-block-icon">{{$:/core/images/tip}}</div> $_$</div>
-\define .warning(_) <div class="doc-icon-block"><div class="doc-block-icon">{{$:/core/images/warning}}</div> $_$</div>
-
-\define .state-prefix() $:/state/editions/tw5.com/
-
-\define .lorem()
-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
-\end
-
-\define .toc-lorem()
-C'est un exemple de tiddler. Voir [[Macros Table des matières (Exemples)|Table-of-Contents Macros (Examples)]].
-
-<<.lorem>>
-\end
-
-\define .example(n,eg,egvar:NO-SUCH-VAR)
-<div class="doc-example">
-<$reveal default="$egvar$" type="match" text="NO-SUCH-VAR">
-	<$codeblock code="""$eg$"""/>
-</$reveal>
-<$reveal default="$egvar$" type="nomatch" text="NO-SUCH-VAR">
-	<!-- allow an example to contain """ -->
-	<$codeblock code=<<$egvar$>>/>
-</$reveal>
-<$list filter="[title<.state-prefix>addsuffix{!!title}addsuffix[/]addsuffix[$n$]]" variable=".state">
-<$reveal state=<<.state>> type="nomatch" text="show">
-	<dl>
-	<dd><$button set=<<.state>> setTo="show">Essayez</$button></dd>
-	</dl>
-</$reveal>
-<$reveal state=<<.state>> type="match" text="show">
-	<dl>
-	<dd><$button set=<<.state>> setTo="">Cachez</$button></dd>
-	</dl>
-	<blockquote class="doc-example-result">
-	<$reveal default="$egvar$" type="match" text="NO-SUCH-VAR">
-		$eg$
-	</$reveal>
-	<$reveal default="$egvar$" type="nomatch" text="NO-SUCH-VAR">
-		<<$egvar$>>
-	</$reveal>
-	</blockquote>
-</$reveal>
-</$list>
-\end
diff --git a/editions/fr-FR/tiddlers/$__editions_tw5.com_snippets_download-empty-button.tid b/editions/fr-FR/tiddlers/$__editions_tw5.com_snippets_download-empty-button.tid
deleted file mode 100644
index c7903847f..000000000
--- a/editions/fr-FR/tiddlers/$__editions_tw5.com_snippets_download-empty-button.tid
+++ /dev/null
@@ -1,9 +0,0 @@
-created: 20150614115838978
-modified: 20150614115932020
-title: $:/editions/tw5.com/snippets/download-empty-button
-type: text/vnd.tiddlywiki
-
-<$button class="tc-btn-big-green">
-<$action-sendmessage $message="tm-download-file" $param="$:/editions/tw5.com/download-empty" filename="empty.html"/>
-Télécharger la base {{$:/core/images/save-button}}
-</$button>
\ No newline at end of file
diff --git a/editions/fr-FR/tiddlers/$__themes_tiddlywiki_vanilla_themetweaks.tid b/editions/fr-FR/tiddlers/$__themes_tiddlywiki_vanilla_themetweaks.tid
deleted file mode 100644
index 4951dff40..000000000
--- a/editions/fr-FR/tiddlers/$__themes_tiddlywiki_vanilla_themetweaks.tid
+++ /dev/null
@@ -1,69 +0,0 @@
-caption: Réglages Thème
-created: 20150603170902280
-modified: 20150615104641450
-tags: $:/tags/ControlPanel/Appearance
-title: $:/themes/tiddlywiki/vanilla/themetweaks
-type:  l
-
-\define backgroundimage-dropdown()
-<div class="tc-drop-down-wrapper">
-<$button popup=<<qualify "$:/state/popup/themetweaks/backgroundimage">> class="tc-btn-invisible tc-btn-dropdown">{{$:/core/images/down-arrow}}</$button>
-<$reveal state=<<qualify "$:/state/popup/themetweaks/backgroundimage">> type="popup" position="belowleft" text="" default="">
-<div class="tc-drop-down">
-<$linkcatcher to="$:/themes/tiddlywiki/vanilla/settings/backgroundimage">
-<$link to="">
-(none)
-</$link>
-<hr>
-<$list filter="[all[shadows+tiddlers]is[image]] -[type[application/pdf]] +[sort[title]]">
-<$link to={{!!title}}>
-<$transclude/> <$view field="title"/>
-</$link>
-</$list>
-</$linkcatcher>
-</div>
-</$reveal>
-</div>
-\end
-
-\define backgroundimageattachment-dropdown()
-<$select tiddler="$:/themes/tiddlywiki/vanilla/settings/backgroundimageattachment" default="scroll">
-<option value="scroll">Défile avec les tiddlers</option>
-<option value="fixed">Fixée à la fenêtre</option>
-</$select>
-\end
-
-\define backgroundimagesize-dropdown()
-<$select tiddler="$:/themes/tiddlywiki/vanilla/settings/backgroundimagesize" default="scroll">
-<option value="auto">Auto</option>
-<option value="cover">Élargie</option>
-<option value="contain">Contenue</option>
-</$select>
-\end
-
-Vous pouvez ajuster certains aspects du thème ''Vanilla''.
-
-! Options
-
-|[[Titres stickés |$:/themes/tiddlywiki/vanilla/options/stickytitles]]<br>//"Stick" les titres de tiddler en haut de la fenêtre du navigateur. Attention<<:>> Ne fonctionne pas du tout avec Chrome, et peut causer quelques problèmes de mise en page dans Firefox// |<$select tiddler="$:/themes/tiddlywiki/vanilla/options/stickytitles"><option value="no">No</option><option value="yes">Yes</option></$select> |
-
-! Réglages
-
-|[[Famille de polices|$:/themes/tiddlywiki/vanilla/settings/fontfamily]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/settings/fontfamily" default="" tag="input"/> | |
-|[[Code des familles de police|$:/themes/tiddlywiki/vanilla/settings/codefontfamily]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/settings/codefontfamily" default="" tag="input"/> | |
-|[[Image de fond de page|$:/themes/tiddlywiki/vanilla/settings/backgroundimage]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/settings/backgroundimage" default="" tag="input"/> |<<backgroundimage-dropdown>> |
-|[[Fixation de l'image de fond de page |$:/themes/tiddlywiki/vanilla/settings/backgroundimageattachment]] |<<backgroundimageattachment-dropdown>> | |
-|[[Taille de l'image de fond de page |$:/themes/tiddlywiki/vanilla/settings/backgroundimagesize]] |<<backgroundimagesize-dropdown>> | |
-
-! Tailles
-
-|[[Taille police|$:/themes/tiddlywiki/vanilla/metrics/fontsize]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/fontsize" default="" tag="input"/> |
-|[[Hauteur ligne|$:/themes/tiddlywiki/vanilla/metrics/lineheight]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/lineheight" default="" tag="input"/> |
-|[[Taille police dans un tiddler|$:/themes/tiddlywiki/vanilla/metrics/bodyfontsize]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/bodyfontsize" default="" tag="input"/> |
-|[[Hauteur de ligne dans un tiddler|$:/themes/tiddlywiki/vanilla/metrics/bodylineheight]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/bodylineheight" default="" tag="input"/> |
-|[[Position gauche du déroulé|$:/themes/tiddlywiki/vanilla/metrics/storyleft]]<br>//marge de gauche du déroulé principal<br>(zone des tiddlers) au bord gauche de la page// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storyleft" default="" tag="input"/> |
-|[[Position haute du déroulé|$:/themes/tiddlywiki/vanilla/metrics/storytop]]<br>//marge supérieure du déroulé pincipal<br>au bord supérieur de la page// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storytop" default="" tag="input"/> |
-|[[Droite du déroulé|$:/themes/tiddlywiki/vanilla/metrics/storyright]]<br>//marge de gauche du menu latéral<br>au bord gauche de la page// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storyright" default="" tag="input"/> |
-|[[Largeur du déroulé|$:/themes/tiddlywiki/vanilla/metrics/storywidth]]<br>//the overall width of the story river// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storywidth" default="" tag="input"/> |
-|[[Largeur des Tiddlers|$:/themes/tiddlywiki/vanilla/metrics/tiddlerwidth]]<br>//dans le déroulé //<br> |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/tiddlerwidth" default="" tag="input"/> |
-|[[Décroché Menu latéral|$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint]]<br>//la largeur minimum de la page à partir de laquelle, déroulé principal et menu latéral apparaissent côte à côte// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint" default="" tag="input"/> |
diff --git a/editions/fr-FR/tiddlers/Articles.tid b/editions/fr-FR/tiddlers/Articles.tid
index 60b07810d..247206e05 100644
--- a/editions/fr-FR/tiddlers/Articles.tid
+++ b/editions/fr-FR/tiddlers/Articles.tid
@@ -1,10 +1,10 @@
 created: 20140320230543190
-modified: 20150614160504438
+modified: 20160603043917787
 tags: Community
 title: Articles
 type: text/vnd.tiddlywiki
 
-Ici quelques articles récents rédigés sur ~TiddlyWiki. Soumettez les nouveaux articles via GitHub, Twitter ou en postant dans les [[Groupes TiddlyWiki|TiddlyWiki Group]].
+Ici quelques articles récents rédigés sur ~TiddlyWiki. Soumettez les nouveaux articles via GitHub, Twitter ou en postant dans les [[groupes de discussion TiddlyWiki|Forums]].
 
 <div class="tc-link-info">
 
diff --git a/editions/fr-FR/tiddlers/Empty Edition.tid b/editions/fr-FR/tiddlers/Empty Edition.tid
index 790d04641..c026698c3 100644
--- a/editions/fr-FR/tiddlers/Empty Edition.tid	
+++ b/editions/fr-FR/tiddlers/Empty Edition.tid	
@@ -1,6 +1,6 @@
 created: 20140916213421041
 fr-title: Édition « basique »
-modified: 20150614143931139
+modified: 20160526132027359
 tags: Editions
 title: Empty Edition
 type: text/vnd.tiddlywiki
@@ -9,4 +9,6 @@ L'édition <<gf "basique">> de ~TiddlyWiki est une distribution minimale, sans p
 
 L'édition //basique// peut être récupérée à l'adresse<<dp>>
 
-http://tiddlywiki.com/empty.html
+> {{$:/editions/fr-FR/snippets/download-empty-button}}
+> Si le bouton ne fonctionne pas, enregistrez ce lien<<dp>> http://tiddlywiki.com/languages/fr-FR/empty.html
+> Votre navigateur vous demandera peut-être d'accepter explicitement l'enregistrement avant qu'il démarre
diff --git a/editions/fr-FR/tiddlers/Examples.tid b/editions/fr-FR/tiddlers/Examples.tid
index 730495d00..f224b642b 100644
--- a/editions/fr-FR/tiddlers/Examples.tid
+++ b/editions/fr-FR/tiddlers/Examples.tid
@@ -1,13 +1,11 @@
-fr-title: Exemples d'utilisation
 created: 20140320230543190
-modified: 20141116113123645
+fr-title: Exemples d'utilisation
+modified: 20160603043913891
 tags: HelloThere Community
 title: Examples
 type: text/vnd.tiddlywiki
 
-Cette compilation montre des exemples intéressants et inspirants d'utilisation de <<tw>> qu'on peut trouver dans la nature.
-
-Proposez de nouvelles entrées pour cette collection via GitHub, Twitter ou en postant sur les  [[Forums TiddlyWiki|Forums]].
+Cette compilation montre des exemples intéressants et inspirants d'utilisation de ~TiddlyWiki qu'on peut trouver dans la nature. Proposez de nouvelles entrées pour cette collection via GitHub, Twitter ou en postant sur les  [[groupes de discussion TiddlyWiki|Forums]].
 
 <div class="tc-link-info">
 
diff --git a/editions/fr-FR/tiddlers/Full_Edition.tid b/editions/fr-FR/tiddlers/Full_Edition.tid
index 7b561f873..208585c6b 100644
--- a/editions/fr-FR/tiddlers/Full_Edition.tid
+++ b/editions/fr-FR/tiddlers/Full_Edition.tid
@@ -1,6 +1,6 @@
 created: 20150310103210459
 fr-title: Édition complète
-modified: 20150601074025421
+modified: 20160602055513646
 tags: Editions
 title: Full Edition
 type: text/vnd.tiddlywiki
@@ -9,4 +9,4 @@ L'édition <<gf complète>> de <<tw>> intègre toutes les langues, thèmes et pl
 
 L'édition complète peut être téléchargée via<<:>>
 
-http://tiddlywiki.com/editions/full/index.html
+http://tiddlywiki.com/editions/full/
diff --git a/editions/fr-FR/tiddlers/GettingStarted.tid b/editions/fr-FR/tiddlers/GettingStarted.tid
index efb2cc10b..165db5a44 100644
--- a/editions/fr-FR/tiddlers/GettingStarted.tid
+++ b/editions/fr-FR/tiddlers/GettingStarted.tid
@@ -1,6 +1,6 @@
 created: 20131129090249275
 fr-title: La mise en route
-modified: 20150614115652702
+modified: 20160526131021571
 tags: [[Working with TiddlyWiki]]
 title: GettingStarted
 type: text/vnd.tiddlywiki
@@ -26,7 +26,7 @@ Autres informations :
 
 Si le bouton ne fonctionne pas, sauvegardez ce lien :
 
-<a href="http://tiddlywiki.com/index.html" download="index.html">~http://tiddlywiki.com/index.html</a>
+<a href="http://tiddlywiki.com/languages/fr-FR/index.html" download="index.html">~http://tiddlywiki.com/languages/fr-FR/index.html</a>
 
 Votre navigateur vous demandera sans doute confirmation avant de démarrer le téléchargement.
 <<<
diff --git a/editions/fr-FR/tiddlers/HelloThere.tid b/editions/fr-FR/tiddlers/HelloThere.tid
index 52d140e96..e49e6e153 100644
--- a/editions/fr-FR/tiddlers/HelloThere.tid
+++ b/editions/fr-FR/tiddlers/HelloThere.tid
@@ -2,7 +2,7 @@ caption: Bienvenue !
 created: 20130822170200000
 fr-title: Bienvenue !
 list: [[Discover TiddlyWiki]] [[Some of the things you can do with TiddlyWiki]] [[Ten reasons to switch to TiddlyWiki]] Examples [[History of TiddlyWiki]] [[What happened to the original TiddlyWiki?]]
-modified: 20150623075554730
+modified: 20160603043549286
 tags: TableOfContents
 title: HelloThere
 type: text/vnd.tiddlywiki
@@ -20,13 +20,16 @@ Utilisez-le pour gérer votre [[liste de tâches|TaskManagementExample]], faire
 Contrairement aux services en ligne classiques, TiddlyWiki vous permet de choisir où conserver vos informations , et garantit que, dans les décennies à venir, vous pourrez toujours utiliser les notes que vous prenez aujourd'hui.
 
 <div style="font-size:0.7em;text-align:center;margin-top:3em;margin-bottom:3em;">
-<a href="http://groups.google.com/group/TiddlyWiki" class="tc-btn-big-green" style="background-color:#FF8C19;" target="_blank">
+<a href="http://groups.google.com/group/TiddlyWiki" class="tc-btn-big-green" style="background-color:#FF8C19;" target="_blank" rel="noopener noreferrer">
 {{$:/core/images/mail}} ~TiddlyWiki Mailing List
 </a>
-<a href="https://twitter.com/TiddlyWiki" class="tc-btn-big-green" style="background-color:#5E9FCA;" target="_blank">
+<a href="http://www.youtube.com/c/JeremyRuston" class="tc-btn-big-green" style="background-color:#e52d27;" target="_blank" rel="noopener noreferrer">
+{{$:/core/images/video}} ~TiddlyWiki sur ~YouTube
+</a>
+<a href="https://twitter.com/TiddlyWiki" class="tc-btn-big-green" style="background-color:#5E9FCA;" target="_blank" rel="noopener noreferrer">
 {{$:/core/images/twitter}} @~TiddlyWiki sur Twitter
 </a>
-<a href="https://github.com/Jermolene/TiddlyWiki5" class="tc-btn-big-green" style="background-color:#444;" target="_blank">
+<a href="https://github.com/Jermolene/TiddlyWiki5" class="tc-btn-big-green" style="background-color:#444;" target="_blank" rel="noopener noreferrer">
 {{$:/core/images/github}} ~TiddlyWiki sur ~GitHub
 </a>
-</div>
\ No newline at end of file
+</div>
diff --git a/editions/fr-FR/tiddlers/HelloThumbnail - Classic.tid b/editions/fr-FR/tiddlers/HelloThumbnail - Classic.tid
new file mode 100644
index 000000000..c13e0c4ec
--- /dev/null
+++ b/editions/fr-FR/tiddlers/HelloThumbnail - Classic.tid	
@@ -0,0 +1,10 @@
+caption: ~TiddlyWiki Classique
+color: #D5B7EA
+created: 20160603124228260
+fr-title: BonjourLaVignette - Classique
+image: TiddlyWiki Classic.png
+link: TiddlyWikiClassic
+modified: 20160603124229945
+tags: HelloThumbnail
+title: HelloThumbnail - Classic
+
diff --git a/editions/fr-FR/tiddlers/HelloThumbnail - Developers.tid b/editions/fr-FR/tiddlers/HelloThumbnail - Developers.tid
new file mode 100644
index 000000000..fae48fc6d
--- /dev/null
+++ b/editions/fr-FR/tiddlers/HelloThumbnail - Developers.tid	
@@ -0,0 +1,11 @@
+background-color: #EAE57D
+caption: Développeurs
+color: #6B6E98
+created: 20160603123918392
+fr-title: BonjourLaVignette - Développeurs
+image: Dev Thumbnail.jpg
+link: Developers
+modified: 20160603123922744
+tags: HelloThumbnail
+title: HelloThumbnail - Developers
+
diff --git a/editions/fr-FR/tiddlers/HelloThumbnail - Gentle Guide.tid b/editions/fr-FR/tiddlers/HelloThumbnail - Gentle Guide.tid
new file mode 100644
index 000000000..757a1d0d5
--- /dev/null
+++ b/editions/fr-FR/tiddlers/HelloThumbnail - Gentle Guide.tid	
@@ -0,0 +1,12 @@
+background-color: #EDB431
+caption: Un mini-guide
+color: #fff
+created: 20150325172634195
+fr-title: BonjourLaVignette - Mini-guide
+image: Motovun Jack.jpg
+link: A Gentle Guide to TiddlyWiki
+modified: 20160603123748899
+tags: HelloThumbnail
+title: HelloThumbnail - Gentle Guide
+type: text/vnd.tiddlywiki
+
diff --git a/editions/fr-FR/tiddlers/HelloThumbnail - HelpingTiddlyWiki.tid b/editions/fr-FR/tiddlers/HelloThumbnail - HelpingTiddlyWiki.tid
new file mode 100644
index 000000000..be1eff660
--- /dev/null
+++ b/editions/fr-FR/tiddlers/HelloThumbnail - HelpingTiddlyWiki.tid	
@@ -0,0 +1,11 @@
+background-color: #fff
+caption: Aider ~TiddlyWiki
+color: #B7D5EA
+created: 20160603123826290
+fr-title: BonjourLaVignette - AiderTiddlyWiki
+image: Tiddler Poster.png
+link: HelpingTiddlyWiki
+modified: 20160603123845024
+tags: HelloThumbnail
+title: HelloThumbnail - HelpingTiddlyWiki
+
diff --git a/editions/fr-FR/tiddlers/HelloThumbnail - Introduction Video.tid b/editions/fr-FR/tiddlers/HelloThumbnail - Introduction Video.tid
new file mode 100644
index 000000000..52964070a
--- /dev/null
+++ b/editions/fr-FR/tiddlers/HelloThumbnail - Introduction Video.tid	
@@ -0,0 +1,12 @@
+background-color: #fff
+caption: Introduction à ~TiddlyWiki
+color: red
+created: 20160603123154767
+fr-title: BonjourLaVignette - Introduction Vidéo
+icon: {{$:/core/images/video}}
+image: Introduction Video Thumbnail.jpg
+link: Introduction Video
+modified: 20160603123557963
+tags: HelloThumbnail
+title: HelloThumbnail - Introduction Video
+
diff --git a/editions/fr-FR/tiddlers/HelloThumbnail - Latest Version.tid b/editions/fr-FR/tiddlers/HelloThumbnail - Latest Version.tid
new file mode 100644
index 000000000..c8b7427ca
--- /dev/null
+++ b/editions/fr-FR/tiddlers/HelloThumbnail - Latest Version.tid	
@@ -0,0 +1,10 @@
+caption: Quoi de neuf dans <<version>>
+color: #fff
+created: 20160603124050989
+fr-title: BonjourLaVignette - Dernière Version
+image: New Release Banner.png
+link: Releases
+modified: 20160603124131122
+tags: HelloThumbnail
+title: HelloThumbnail - Latest Version
+
diff --git a/editions/fr-FR/tiddlers/HelpingTiddlyWiki.tid b/editions/fr-FR/tiddlers/HelpingTiddlyWiki.tid
index 6cadc37ea..7482e05a4 100644
--- a/editions/fr-FR/tiddlers/HelpingTiddlyWiki.tid
+++ b/editions/fr-FR/tiddlers/HelpingTiddlyWiki.tid
@@ -1,6 +1,6 @@
 created: 20130825160500000
 fr-title: AiderTiddlyWiki
-modified: 20150601140534842
+modified: 20160606102438250
 tags: Community
 title: HelpingTiddlyWiki
 type: text/vnd.tiddlywiki
@@ -11,7 +11,9 @@ Si vous appréciez l'utilité de TiddlyWiki, il y a plusieurs façons d'aider à
 
 Les Projets OpenSource comme << tw >> prospèrent grâce aux réactions et à l'engagement des utilisateurs. Plus ~TiddlyWiki deviendra d'autant plus utile à tous que nous serons de plus en plus nombreux à l'utiliser. Aussi, Si vous appréciez l'utilité de ~TiddlyWiki, faites le savoir. Le meilleur moyen de garantir son avenir est de devenir des centaines de fois plus populaire qu'auparavant.
 
+* [img[https://img.shields.io/twitter/url/http/tiddlywiki.com.svg?style=social]]
 * Tweeter sur ~TiddlyWiki: [[I love TiddlyWiki because...|https://twitter.com/intent/tweet?text=I+love+TiddlyWiki+because...&source=tiddlywiki5]]
+* [img[https://img.shields.io/github/stars/jermolene/tiddlywiki5.svg?style=social&label=Star]]
 * [[Etoiler le référentiel TiddlyWiki5 sur GitHub|https://github.com/Jermolene/TiddlyWiki5]]
 * [[Afficher la bannière TiddlyWiki|http://tiddlywiki.com/poster]]
 
diff --git a/editions/fr-FR/tiddlers/Resources.tid b/editions/fr-FR/tiddlers/Resources.tid
index f584850ff..171b7c281 100644
--- a/editions/fr-FR/tiddlers/Resources.tid
+++ b/editions/fr-FR/tiddlers/Resources.tid
@@ -1,11 +1,11 @@
 caption: Ressources
 created: 20140320230543190
-modified: 20141118215342409
+modified: 20160603043905955
 tags: Community
 title: Resources
 type: text/vnd.tiddlywiki
 
-Voici quelques sites contenant des ressources créées par la [[communauté|Community]] TiddlyWiki, pour vous aider à tirer le meilleur de TiddlyWiki : plugins, macros etc. N'hésitez pas à proposer de nouvelles ressources via GitHub, Twitter ou en postant sur les [[groupes de discussion Tiddlywiki|Forums]].
+Voici quelques sites contenant des ressources créées par la [[communauté|Community]] ~TiddlyWiki, pour vous aider à tirer le meilleur de ~TiddlyWiki : plugins, macros etc. N'hésitez pas à proposer de nouvelles ressources via GitHub, Twitter ou en postant sur les [[groupes de discussion TiddlyWiki|Forums]].
 
 <div class="tc-link-info">
 
diff --git a/editions/fr-FR/tiddlers/Saving on Android.tid b/editions/fr-FR/tiddlers/Saving on Android.tid
index c83dd8231..c0fb73a1b 100644
--- a/editions/fr-FR/tiddlers/Saving on Android.tid	
+++ b/editions/fr-FR/tiddlers/Saving on Android.tid	
@@ -1,10 +1,10 @@
-fr-title: Sauvegarder sur Android
 created: 20130825161400000
-modified: 20141115224705948
+fr-title: Sauvegarder sur Android
+modified: 20160602061013696
 tags: Saving
 title: Saving on Android
 type: text/vnd.tiddlywiki
 
-L'application ~AndTidWiki pour les appareils Android permet d'éditer des wikis TiddlyWiki5 et d'enregistrer les modifications, même si vous travaillez sans connexion au réseau. Vous pouvez la [[télécharger ici|https://play.google.com/store/apps/details?id=de.mgsimon.android.andtidwiki]].
+L'application ~AndTidWiki pour les appareils Android permet d'éditer des wikis TiddlyWiki5 et d'enregistrer les modifications, même si vous travaillez sans connexion au réseau. Vous pouvez la [[télécharger ici|https://play.google.com/store/apps/details?id=de.mgsimon.android.andtidwiki&hl=fr]].
 
 //Notez que ~AndTidWiki est publiée indépendamment de TiddlyWiki//
diff --git a/editions/fr-FR/tiddlers/Saving on Safari.tid b/editions/fr-FR/tiddlers/Saving on Safari.tid
index 19b3dd4f6..76ee06bc7 100644
--- a/editions/fr-FR/tiddlers/Saving on Safari.tid	
+++ b/editions/fr-FR/tiddlers/Saving on Safari.tid	
@@ -1,6 +1,6 @@
-fr-title: Sauvegarder sur Safari
 created: 20140811171304926
-modified: 20141115224836778
+fr-title: Sauvegarder sur Safari
+modified: 20160526130028399
 tags: Saving
 title: Saving on Safari
 type: text/vnd.tiddlywiki
@@ -8,14 +8,14 @@ type: text/vnd.tiddlywiki
 Cette manière d'enregistrer les modifications est assez pénible, car elle requiert une intervention manuelle à chaque enregistrement. 
 
 # [[Téléchargez|Download]] un TiddlyWiki en cliquant sur ce bouton<<dp>>
-#> {{$:/editions/tw5.com/snippets/download-empty-button}}
-#> Si le bouton ne fonctionne pas, enregistrez ce lien<<dp>> http://tiddlywiki.com/empty.html
+#> {{$:/editions/fr-FR/snippets/download-empty-button}}
+#> Si le bouton ne fonctionne pas, enregistrez ce lien<<dp>> http://tiddlywiki.com/languages/fr-FR/empty.html
 #> Votre navigateur vous demandera peut-être d'accepter explicitement l'enregistrement avant qu'il démarre
 # Localisez le fichier que vous venez de télécharger
 #* Vous pouvez le renommer, mais assurez-vous de conserver l'extension `.html` ou `.htm`
 # Ouvrez le fichier dans Safari
 # Essayez de créer un nouveau tiddler à l'aide du bouton ''nouveau tiddler'' {{$:/core/images/new-button}} de la barre latérale. Ajouter du contenu dans le tiddler, et cliquez sur le bouton ''terminé'' {{$:/core/images/done-button}}
-# Enregistrez vos modifications en cliquant sur le bouton ''enregistrer'' {{$:/core/images/save-button}} de la barre latérale
+# Enregistrez vos modifications en cliquant sur le bouton ''enregistrer les modifications'' {{$:/core/images/save-button}} de la barre latérale
 # Une fenêtre popup ''Enregistrer les modifications'' s'affiche, avec un lien ayant pour titre //Right-click to save changes//
 # Cliquez-droit sur le lien et choisissez "Télécharger le fichier lié sous..." à partir du menu contextuel
 # Naviguez jusqu'au dossier contenant le fichier HTML de votre wiki, et sélectionnez le fichier existant
diff --git a/editions/fr-FR/tiddlers/Saving on iPad_iPhone.tid b/editions/fr-FR/tiddlers/Saving on iPad_iPhone.tid
index 5a64cc52a..fcbaec49a 100644
--- a/editions/fr-FR/tiddlers/Saving on iPad_iPhone.tid	
+++ b/editions/fr-FR/tiddlers/Saving on iPad_iPhone.tid	
@@ -1,23 +1,23 @@
-fr-title: Sauvegarder sur iPad/iPhone
 created: 20131129101027725
-modified: 20141115224810470
+fr-title: Sauvegarder sur iPad/iPhone
+modified: 20160602062211339
 tags: Saving
 title: Saving on iPad/iPhone
 type: text/vnd.tiddlywiki
 
-L'application ''TWEdit'' pour iPad/iPhone permet d'éditer et de sauvegarder des modifications de wikis TiddlyWiki5, même si vous travaillez hors ligne sans connexion réseau. Vous pouvez la [[télécharger ici|https://itunes.apple.com/gb/app/twedit/id409607956?mt=8]].
+L'application ''TWEdit'' pour iPad/iPhone permet d'éditer et de sauvegarder des modifications de wikis TiddlyWiki5, même si vous travaillez hors ligne sans connexion réseau. Vous pouvez la [[télécharger ici|https://itunes.apple.com/fr/app/twedit/id409607956?mt=8]].
 
 Instructions d'utilisation<<dp>>
 
 # Ouvrez TWEdit
 # Tapez sur le titre au centre de la barre d'outils
 #* Une boîte texte doit apparaître dans laquelle vous pouvez saisir une URL
-# Entrez l'URL `http://tiddlywiki.com/empty.html`
+# Entrez l'URL `http://tiddlywiki.com/languages/fr-FR/empty.html`
 # Une fois le TiddlyWiki5 vide chargé, tapez sur l'icône ''save'' (il s'agit de la deuxième icône en partant de la droite sur la barre d'outils supérieure)
 #* Une boîte d'alerte devrait apparaître pour vous permettre d'entrer un nom de fichier local
 # Entrez le nom de fichier que vous souhaitez utiliser pour le document (en le suffixant par `.html`)
-# Éditez votre <<tw>> comme d'habitude
-# Pour enregistrer les changements, cliquez sur le bouton ''save'' de la barre d'outils
-#* Un message de confirmation doit apparaître en haut à droite
+# Essayez de créer un nouveau tiddler à l'aide du bouton ''nouveau tiddler'' {{$:/core/images/new-button}} de la barre latérale. Ajouter du contenu dans le tiddler, et cliquez sur le bouton ''terminé'' {{$:/core/images/done-button}}
+# Enregistrez vos modifications en cliquant sur le bouton ''enregistrer les modifications'' {{$:/core/images/save-button}} de la barre latérale
+#* Un message de confirmation doit apparaître en haut à droite de la fenêtre
 
 //Notez que TWEdit est publié indépendamment de TiddlyWiki//
diff --git a/editions/fr-FR/tiddlers/Saving with TiddlyFox on Android.tid b/editions/fr-FR/tiddlers/Saving with TiddlyFox on Android.tid
index 93d35149b..0ad97b0aa 100644
--- a/editions/fr-FR/tiddlers/Saving with TiddlyFox on Android.tid	
+++ b/editions/fr-FR/tiddlers/Saving with TiddlyFox on Android.tid	
@@ -1,6 +1,6 @@
-fr-title: Sauvegarder avec TiddlyFox sur Android
 created: 20140103134551508
-modified: 20141115225059890
+fr-title: Sauvegarder avec TiddlyFox sur Android
+modified: 20160602060542809
 tags: Saving
 title: Saving with TiddlyFox on Android
 type: text/vnd.tiddlywiki
@@ -10,16 +10,16 @@ type: text/vnd.tiddlywiki
 # Assurez-vous d'avoir installé la dernière version de [[Firefox pour Android|Firefox for Android]]
 #* http://getfirefox.com
 # Installez la dernière version de l'extension TiddlyFox depuis<<dp>>
-#* https://addons.mozilla.org/en-US/firefox/addon/tiddlyfox/
+#* https://addons.mozilla.org/fr/firefox/addon/tiddlyfox/
 # Installez aussi cette extension qui vous permettra de sauvegarder le fichier <<tw>> localement<<dp>>
-#* https://addons.mozilla.org/en-US/android/addon/save-link-menus/
+#* https://addons.mozilla.org/fr/android/addon/save-link-menus/
 # [[Téléchargez|Download]] un fichier <<tw>> vide en enregistrant ce lien<<dp>>
-#* http://tiddlywiki.com/empty.html
+#* http://tiddlywiki.com/languages/fr-FR/empty.html
 #> (pour enregistrer le lien, assurez-vous d'avoir installé l'extension "save-link-menus", appuyez quelques secondes sur le lien, puis choisissez "Save link")
 # Une fois le fichier téléchargé, cliquez dessus depuis la zone de notification ou l'application de gestion des téléchargements
 # Choisissez d'ouvrir le fichier avec Firefox (et non l'application par défaut proposée par Android)
 # Cliquez ''OK'' en réponse à la demande de TiddlyFox qui vous demande s'il faut activer l'enregistrement pour ce fichier
-# Essayez de créer un nouveau tiddler à l'aide du bouton ''plus'' {{$:/core/images/new-button}} de la barre latérale. Entrez du contenu dans le tiddler, puis cliquez sur le bouton ''tick'' {{$:/core/images/done-button}}
-# Sauvegardez vos modifications en cliquant sur le bouton ''enregistrement'' {{$:/core/images/save-button}} de la barre latérale
+# Essayez de créer un nouveau tiddler à l'aide du bouton ''nouveau tiddler'' {{$:/core/images/new-button}} de la barre latérale. Entrez du contenu dans le tiddler, puis cliquez sur le bouton ''terminé'' {{$:/core/images/done-button}}
+# Sauvegardez vos modifications en cliquant sur le bouton ''enregistrer les modifications'' {{$:/core/images/save-button}} de la barre latérale
 #* Attendez l'indication jaune ''Wiki enregistré'' en haut à droite de la fenêtre
 # Rafraîchissez la fenêtre du navigateur pour vérifier que vos modifications ont été correctement enregistrées
diff --git a/editions/fr-FR/tiddlers/Saving with TiddlyFox.tid b/editions/fr-FR/tiddlers/Saving with TiddlyFox.tid
index e50b2939c..0b0528023 100644
--- a/editions/fr-FR/tiddlers/Saving with TiddlyFox.tid	
+++ b/editions/fr-FR/tiddlers/Saving with TiddlyFox.tid	
@@ -1,6 +1,6 @@
-fr-title: Sauvegarder avec TiddlyFox
 created: 20131221085742684
-modified: 20141115230836244
+fr-title: Sauvegarder avec TiddlyFox
+modified: 20160602060530761
 tags: Saving
 title: Saving with TiddlyFox
 type: text/vnd.tiddlywiki
@@ -10,15 +10,15 @@ Si vous utilisez [[Firefox pour Android|Firefox for Android]], reportez-vous aux
 # Assurez-vous d'avoir la dernière version de [[Firefox]]
 #* http://getfirefox.com
 # Installez la dernière version de l'extension TiddlyFox à partir de<<dp>>
-#* https://addons.mozilla.org/en-US/firefox/addon/tiddlyfox/
+#* https://addons.mozilla.org/fr/firefox/addon/tiddlyfox/
 # Redémarrez [[Firefox]]
 # [[Téléchargez|Download]] un <<tw>> vide en cliquant sur ce bouton<<dp>>
-#> {{$:/editions/tw5.com/snippets/download-empty-button}}
+#> {{$:/editions/fr-FR/snippets/download-empty-button}}
 # Localisez le fichier que vous venez de télécharger
 #* Vous pouvez le renommer, mais assurez-vous de conserver l'extension `.html` ou `.htm`
 # Ouvrez le fichier dans [[Firefox]]
 # Cliquez ''OK'' en réponse à la demande de TiddlyFox d'activer l'enregistrement pour ce fichier
 # Essayez de créer un nouveau tiddler à l'aide du bouton ''nouveau tiddler'' {{$:/core/images/new-button}} de la barre latérale. Ajouter du contenu dans le tiddler, et cliquez sur le bouton ''terminé'' {{$:/core/images/done-button}}
-# Enregistrez vos modifications en cliquant sur le bouton ''enregistrement'' {{$:/core/images/save-button}} de la barre latérale
+# Enregistrez vos modifications en cliquant sur le bouton ''enregistrer les modifications'' {{$:/core/images/save-button}} de la barre latérale
 #* Attendez l'indication jaune ''Wiki enregistré'' en haut à droite de la fenêtre
 # Rafraîchissez la fenêtre du navigateur pour vérifier que vos modifications ont été correctement enregistrées
diff --git a/editions/fr-FR/tiddlers/Saving with TiddlyIE.tid b/editions/fr-FR/tiddlers/Saving with TiddlyIE.tid
index a3ec2f841..85267f88d 100644
--- a/editions/fr-FR/tiddlers/Saving with TiddlyIE.tid	
+++ b/editions/fr-FR/tiddlers/Saving with TiddlyIE.tid	
@@ -1,6 +1,6 @@
-fr-title: Sauvegarder avec TiddlyIE
 created: 20131211220000000
-modified: 20141115225430301
+fr-title: Sauvegarder avec TiddlyIE
+modified: 20160526125734183
 tags: [[Saving on InternetExplorer]]
 title: Saving with TiddlyIE
 type: text/vnd.tiddlywiki
@@ -10,10 +10,10 @@ type: text/vnd.tiddlywiki
 # Redémarrez Internet Explorer. IE vous demandera si vous voulez activer l'extension TiddlyIE.
 #> Il se peut aussi que vous ayez à activer le //Microsoft Scripting Runtime//
 # [[Téléchargez|Download]] un <<tw>> vide en enregistrant ce lien<<dp>>
-#> http://tiddlywiki.com/empty.html
+#> http://tiddlywiki.com/languages/fr-FR/empty.html
 # Localisez le fichier que vous venez de télécharger
 #* Vous pouvez le renommer, mais assurez-vous de conserver l'extension `.html` ou `.htm`
 # Ouvrez le fichier dans Internet Explorer
 # Essayez de créer un nouveau tiddler à l'aide du bouton ''nouveau tiddler'' {{$:/core/images/new-button}} de la barre latérale. Ajouter du contenu dans le tiddler, et cliquez sur le bouton ''terminé'' {{$:/core/images/done-button}}
-# Enregistrez vos modifications en cliquant sur le bouton ''enregistrement'' {{$:/core/images/save-button}} de la barre latérale. Internet Explorer vous demandera votre assentiment pour enregistrer le fichier localement en vous présentant un dialogue ''Enregistrer en tant que''.
+# Enregistrez vos modifications en cliquant sur le bouton ''enregistrer les modifications'' {{$:/core/images/save-button}} de la barre latérale. Internet Explorer vous demandera votre assentiment pour enregistrer le fichier localement en vous présentant un dialogue ''Enregistrer en tant que''.
 # Rafraîchissez la fenêtre du navigateur pour vérifier que vos modifications ont été correctement sauvegardées.
diff --git a/editions/fr-FR/tiddlers/Saving with the HTML5 fallback saver.tid b/editions/fr-FR/tiddlers/Saving with the HTML5 fallback saver.tid
index 90a2bd392..8c69c7b3f 100644
--- a/editions/fr-FR/tiddlers/Saving with the HTML5 fallback saver.tid	
+++ b/editions/fr-FR/tiddlers/Saving with the HTML5 fallback saver.tid	
@@ -1,6 +1,6 @@
-fr-title: Sauvegarder avec l'enregistreur HTML 5 par défaut
 created: 20131129092604900
-modified: 20141115224929627
+fr-title: Sauvegarder avec l'enregistreur HTML 5 par défaut
+modified: 20160526130128327
 tags: Saving
 title: Saving with the HTML5 fallback saver
 type: text/vnd.tiddlywiki
@@ -8,14 +8,14 @@ type: text/vnd.tiddlywiki
 Cette manière d'enregistrer les modifications est assez pénible, car elle requiert une intervention manuelle à chaque enregistrement. Elle a l'avantage de fonctionner avec pratiquement tous les navigateurs tournant sur les ordinateurs de bureaux, et de nombreux navigateurs tournant sur appareils mobiles.
 
 # [[Téléchargez|Download]] un TiddlyWiki en cliquant sur ce bouton<<dp>>
-#> {{$:/editions/tw5.com/snippets/download-empty-button}}
-#> Si le bouton ne fonctionne pas, enregistrez ce lien<<dp>> http://tiddlywiki.com/empty.html
+#> {{$:/editions/fr-FR/snippets/download-empty-button}}
+#> Si le bouton ne fonctionne pas, enregistrez ce lien<<dp>> http://tiddlywiki.com/languages/fr-FR/empty.html
 #> Votre navigateur vous demandera peut-être d'accepter explicitement l'enregistrement avant qu'il démarre
 # Localisez le fichier que vous venez de télécharger
 #* Vous pouvez le renommer, mais assurez-vous de conserver l'extension `.html` ou `.htm`
 # Ouvrez le fichier dans votre navigateur
 # Essayez de créer un nouveau tiddler à l'aide du bouton ''nouveau tiddler'' {{$:/core/images/new-button}} de la barre latérale. Ajouter du contenu dans le tiddler, et cliquez sur le bouton ''terminé'' {{$:/core/images/done-button}}
-# Enregistrez vos modifications en cliquant sur le bouton ''enregistrer'' {{$:/core/images/save-button}} de la barre latérale
+# Enregistrez vos modifications en cliquant sur le bouton ''enregistrer les modifications'' {{$:/core/images/save-button}} de la barre latérale
 # Votre navigateur téléchargera alors un nouvel exemplaire du wiki, avec vos modifications à l'intérieur
 # Localisez ce nouveau fichier et ouvrez-le dans votre navigateur
 # Vérifiez que vos modifications ont correctement été enregistrées
diff --git a/editions/fr-FR/tiddlers/Some of the things you can do with TiddlyWiki.tid b/editions/fr-FR/tiddlers/Some of the things you can do with TiddlyWiki.tid
index 179a6f420..35c3b3a3d 100644
--- a/editions/fr-FR/tiddlers/Some of the things you can do with TiddlyWiki.tid	
+++ b/editions/fr-FR/tiddlers/Some of the things you can do with TiddlyWiki.tid	
@@ -1,6 +1,6 @@
 created: 20140904090300000
 fr-title: Certaines choses que vous pouvez faire avec TiddlyWiki
-modified: 20150620090630130
+modified: 20160602061707749
 tags: HelloThere
 title: Some of the things you can do with TiddlyWiki
 type: text/vnd.tiddlywiki
@@ -18,4 +18,4 @@ type: text/vnd.tiddlywiki
 * Créer un assistant modal (on parle aussi de //lightbox//) — voir [[Exemple d'assistant|SampleWizard]]<<;>>
 * Créer une présentation de type « transparents »<<;>>
 * Créer une base de connaissance complète en local ou en ligne, à partir d'un fichier <<tw>> central pointant vers d'autres fichiers <<tw>> (un exemple est visible à l'adresse http://recursos.giffmex.org)<<;>>
-* Créer une infographie en utilisant des tiddlers comme données (voir les infographies à l'adresse http://tiddlywiki.com/plugins/tiddlywiki/d3/index.html).
+* Créer une infographie en utilisant des tiddlers comme données (voir les infographies à l'adresse http://tiddlywiki.com/plugins/tiddlywiki/d3/).
diff --git a/editions/fr-FR/tiddlers/TaskManagementExample.tid b/editions/fr-FR/tiddlers/TaskManagementExample.tid
index 7d2cf7b93..ef5b77f74 100644
--- a/editions/fr-FR/tiddlers/TaskManagementExample.tid
+++ b/editions/fr-FR/tiddlers/TaskManagementExample.tid
@@ -1,6 +1,6 @@
 created: 20130825213300000
 fr-title: Exemple de gestion de tâches
-modified: 20150602174012468
+modified: 20160523100238122
 tags: Learning
 title: TaskManagementExample
 type: text/vnd.tiddlywiki
@@ -19,6 +19,6 @@ TiddlyWiki5 peut servir de système de gestion de tâches simple sans personnali
 
 <$list filter="[!has[draft.of]tag[task]tag[done]sort[created]]">
 
-<$checkbox tag="done"> ~~<$link to={{!!title}}><$view field="title"/></$link>~~</$checkbox>
+<$checkbox tag="done"> ~~<$link to={{!!title}}><$view field="fr-title"><$view field="title"/></$view></$link>~~</$checkbox>
 
 </$list>
diff --git a/editions/fr-FR/tiddlers/TiddlyDesktop_Releases.tid b/editions/fr-FR/tiddlers/TiddlyDesktop_Releases.tid
index e3d418ee3..622beec51 100644
--- a/editions/fr-FR/tiddlers/TiddlyDesktop_Releases.tid
+++ b/editions/fr-FR/tiddlers/TiddlyDesktop_Releases.tid
@@ -1,7 +1,7 @@
 caption: ~TiddlyDesktop
 created: 20150419144649101
 fr-title: Versions de TiddlyDesktop
-modified: 20150531191328130
+modified: 20160602061547910
 tags: Releases
 title: TiddlyDesktop Releases
 type: text/vnd.tiddlywiki
@@ -10,4 +10,4 @@ Voici la description des récentes mise à jour de TiddlyDesktop
 
 <$list filter="[tag[TiddlyDesktopReleaseNotes]!sort[created]limit[1]]">
   <$macrocall $name="tabs" tabsList="[tag[TiddlyDesktopReleaseNotes]!sort[created]]"default={{!!title}} class="tc-vertical" template="ReleaseTemplate" />
-</$list>
\ No newline at end of file
+</$list>
diff --git a/editions/fr-FR/tiddlers/TiddlyFox.tid b/editions/fr-FR/tiddlers/TiddlyFox.tid
index 50dd8e264..d84c5b7f6 100644
--- a/editions/fr-FR/tiddlers/TiddlyFox.tid
+++ b/editions/fr-FR/tiddlers/TiddlyFox.tid
@@ -1,5 +1,5 @@
 created: 20130825161100000
-modified: 20140928165957195
+modified: 20160602060511458
 tags: Definitions
 title: TiddlyFox
 type: text/vnd.tiddlywiki
@@ -8,7 +8,7 @@ type: text/vnd.tiddlywiki
 
 //~TiddlyFox// peut être téléchargé depuis le site //Mozilla Addons//<<dp>>
 
-https://addons.mozilla.org/en-US/firefox/addon/tiddlyfox/
+https://addons.mozilla.org/fr/firefox/addon/tiddlyfox/
 
 <<<
 Vous pouvez également installer la dernière version de développement de ~TiddlyFox directement depuis GitHub<<dp>>
diff --git a/editions/fr-FR/tiddlers/Transclusion_Basic_Usage.tid b/editions/fr-FR/tiddlers/Transclusion_Basic_Usage.tid
index 146d1bed0..e9213a869 100644
--- a/editions/fr-FR/tiddlers/Transclusion_Basic_Usage.tid
+++ b/editions/fr-FR/tiddlers/Transclusion_Basic_Usage.tid
@@ -1,7 +1,7 @@
 caption: Utilisation basique
 created: 20141129201509859
 fr-title: Transclusion — utilisation basique
-modified: 20150624093230889
+modified: 20160517071012115
 tags: [[Transclusion in WikiText]]
 title: Transclusion Basic Usage
 type: text/vnd.tiddlywiki
@@ -35,7 +35,7 @@ Le tiddler en cours a été modifié le {{!!modified}}
 
 ! Erreurs Récursives
 
-Notez que l'utilisation de ``{{!!text}}`` ou ``{{}}`` engendre le message d'erreur (//Recursive transclusion error in transclude widget//), car il n'y a aucun sens à inclure le contenu du tiddler courant dans le contenu du tiddler courant (c.à.d, en lui-même). Chaque fois que vous rencontrez ce message d'erreur, cela voudra dire que vous essayez d'inclure quelque chose en lui-même, directement ou indirectement (par exemple si le tiddler A transclut le tiddler B qui transclut le tiddler C qui, à son tour, transclut le tiddler A).
+Notez que l'utilisation de ``{{!!text}}`` ou ``{{}}`` engendre le message d'erreur (//Erreur dans le widget transclude : transclusion récursive//), car il n'y a aucun sens à inclure le contenu du tiddler courant dans le contenu du tiddler courant (c.à.d, en lui-même). Chaque fois que vous rencontrez ce message d'erreur, cela voudra dire que vous essayez d'inclure quelque chose en lui-même, directement ou indirectement (par exemple si le tiddler A transclut le tiddler B qui transclut le tiddler C qui, à son tour, transclut le tiddler A).
 
 ! En savoir plus
 
diff --git a/editions/fr-FR/tiddlers/What happened to the original TiddlyWiki_.tid b/editions/fr-FR/tiddlers/What happened to the original TiddlyWiki_.tid
index cf0634f55..ec6e81429 100644
--- a/editions/fr-FR/tiddlers/What happened to the original TiddlyWiki_.tid	
+++ b/editions/fr-FR/tiddlers/What happened to the original TiddlyWiki_.tid	
@@ -1,11 +1,11 @@
-fr-title: Qu'est-il arrivé au TiddlyWiki d'origine ?
 created: 20140904085100000
-modified: 20141115224500991
+fr-title: Qu'est-il arrivé au TiddlyWiki d'origine ?
+modified: 20160603043618380
 tags: HelloThere
 title: What happened to the original TiddlyWiki?
 type: text/vnd.tiddlywiki
 
-<a class="tc-float-right tc-bordered-image" href="http://classic.tiddlywiki.com/" target="_blank">[img width="200" [TiddlyWiki Classic.png]]</a>
+<a class="tc-float-right tc-bordered-image" href="http://classic.tiddlywiki.com/" target="_blank" rel="noopener noreferrer">[img width="200" [TiddlyWiki Classic.png]]</a>
 
 La version [[originale|TiddlyWikiClassic]] de TiddlyWiki est toujours disponible à l'adresse :
 
diff --git a/editions/fr-FR/tiddlers/images/green_favicon.ico b/editions/fr-FR/tiddlers/images/green_favicon.ico
new file mode 100644
index 000000000..06e5f8e80
Binary files /dev/null and b/editions/fr-FR/tiddlers/images/green_favicon.ico differ
diff --git a/editions/fr-FR/tiddlers/images/green_favicon.ico.meta b/editions/fr-FR/tiddlers/images/green_favicon.ico.meta
new file mode 100644
index 000000000..f2e1cfa3c
--- /dev/null
+++ b/editions/fr-FR/tiddlers/images/green_favicon.ico.meta
@@ -0,0 +1,2 @@
+title: $:/green_favicon.ico
+type: image/x-icon
diff --git a/editions/fr-FR/tiddlers/system/download-empty-button.tid b/editions/fr-FR/tiddlers/system/download-empty-button.tid
index 4c85fb20c..ac59f51b6 100644
--- a/editions/fr-FR/tiddlers/system/download-empty-button.tid
+++ b/editions/fr-FR/tiddlers/system/download-empty-button.tid
@@ -3,4 +3,4 @@ title: $:/editions/fr-FR/snippets/download-empty-button
 <$button class="tc-btn-big-green">
 <$action-sendmessage $message="tm-download-file" $param="$:/editions/fr-FR/download-empty" filename="empty_fr.html"/>
 Télécharger un wiki vide {{$:/core/images/save-button}}
-</$button>
+</$button>
\ No newline at end of file
diff --git a/editions/fr-FR/tiddlers/task.tid b/editions/fr-FR/tiddlers/task.tid
index 15a364c1b..207b9a203 100644
--- a/editions/fr-FR/tiddlers/task.tid
+++ b/editions/fr-FR/tiddlers/task.tid
@@ -1,7 +1,7 @@
 color: #8d9ac3
 created: 20130825213200000
-modified: 20130825213200000
+list: [[Make the beds]]
+modified: 20160602061511598
 title: task
-type: text/vnd.tiddlywiki
 
-Sample tasks for the TaskManagementExample.
+//Il s'agit de tâches pour l'[[exemple de gestion de tâches|TaskManagementExample]]//
diff --git a/editions/fr-FR/tiddlywiki.info b/editions/fr-FR/tiddlywiki.info
index 31ae42437..f4b37b40d 100644
--- a/editions/fr-FR/tiddlywiki.info
+++ b/editions/fr-FR/tiddlywiki.info
@@ -5,27 +5,39 @@
 	"themes": [
 		"tiddlywiki/vanilla",
 		"tiddlywiki/snowwhite",
-		"tiddlywiki/nighttime",
 		"tiddlywiki/starlight",
+		"tiddlywiki/seamless",
 		"tiddlywiki/centralised",
+		"tiddlywiki/tight",
 		"tiddlywiki/readonly"
 	],
 	"languages": [
 		"fr-FR"
 	],
-    "includeWikis": [
-        {"path": "../tw5.com", "read-only": true}
-    ],
+	"includeWikis": [
+		{"path": "../tw5.com", "read-only": true}
+	],
 	"build": {
 		"index": [
+			"--savetiddlers","[tag[external-image]]","images",
+			"--rendertiddlers","[tag[external-text]]","$:/core/templates/tid-tiddler","text","text/plain",".tid",
+			"--setfield","[tag[external-image]]","_canonical_uri","$:/core/templates/canonical-uri-external-image","text/plain",
+			"--setfield","[tag[external-text]]","_canonical_uri","$:/core/templates/canonical-uri-external-text","text/plain",
+			"--setfield","[tag[external-image]] [tag[external-text]]","text","","text/plain",
 			"--rendertiddler","$:/core/save/all","index.html","text/plain"],
 		"empty": [
 			"--rendertiddler","$:/editions/fr-FR/download-empty","empty.html","text/plain",
 			"--rendertiddler","$:/editions/fr-FR/download-empty","empty.hta","text/plain"],
+		"favicon": [
+			"--savetiddler","$:/favicon.ico","favicon.ico",
+			"--savetiddler","$:/green_favicon.ico","static/favicon.ico"],
 		"static": [
 			"--rendertiddler","$:/core/templates/static.template.html","static.html","text/plain",
 			"--rendertiddler","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
 			"--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain",
 			"--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"]
+	},
+	"config": {
+		"retain-original-tiddler-path": true
 	}
-}
+}
\ No newline at end of file
diff --git a/editions/full/tiddlywiki.info b/editions/full/tiddlywiki.info
index 9b6f87a09..5c615490e 100644
--- a/editions/full/tiddlywiki.info
+++ b/editions/full/tiddlywiki.info
@@ -16,6 +16,7 @@
 		"tiddlywiki/railroad",
 		"tiddlywiki/stacked-view",
 		"tiddlywiki/text-slicer",
+		"tiddlywiki/xmldom",
 		"tiddlywiki/powered-by-tiddlywiki"
 	],
 	"languages": [
@@ -29,6 +30,7 @@
 		"en-US",
 		"es-ES",
 		"fr-FR",
+		"he-IL",
 		"hi-IN",
 		"ia-IA",
 		"it-IT",
diff --git a/editions/introduction/tiddlers/system/BitmapEditorColour.tid b/editions/introduction/tiddlers/system/BitmapEditorColour.tid
new file mode 100644
index 000000000..6d03a3f14
--- /dev/null
+++ b/editions/introduction/tiddlers/system/BitmapEditorColour.tid
@@ -0,0 +1,3 @@
+title: $:/config/BitmapEditor/Colour
+
+Yellow
\ No newline at end of file
diff --git a/editions/introduction/tiddlywiki.info b/editions/introduction/tiddlywiki.info
index 1fe3c6cd7..e2b99c8c3 100644
--- a/editions/introduction/tiddlywiki.info
+++ b/editions/introduction/tiddlywiki.info
@@ -9,7 +9,6 @@
 	"themes": [
 		"tiddlywiki/vanilla",
 		"tiddlywiki/snowwhite",
-		"tiddlywiki/nighttime",
 		"tiddlywiki/starlight",
 		"tiddlywiki/seamless",
 		"tiddlywiki/centralised",
diff --git a/editions/ja-JP/tiddlers/images/green_favicon.ico b/editions/ja-JP/tiddlers/images/green_favicon.ico
new file mode 100644
index 000000000..06e5f8e80
Binary files /dev/null and b/editions/ja-JP/tiddlers/images/green_favicon.ico differ
diff --git a/editions/ja-JP/tiddlers/images/green_favicon.ico.meta b/editions/ja-JP/tiddlers/images/green_favicon.ico.meta
new file mode 100644
index 000000000..f2e1cfa3c
--- /dev/null
+++ b/editions/ja-JP/tiddlers/images/green_favicon.ico.meta
@@ -0,0 +1,2 @@
+title: $:/green_favicon.ico
+type: image/x-icon
diff --git a/editions/ja-JP/tiddlers/system/download-empty-button.tid b/editions/ja-JP/tiddlers/system/download-empty-button.tid
new file mode 100644
index 000000000..7db9226b9
--- /dev/null
+++ b/editions/ja-JP/tiddlers/system/download-empty-button.tid
@@ -0,0 +1,6 @@
+title: $:/editions/ja-JP/snippets/download-empty-button
+
+<$button class="tc-btn-big-green">
+<$action-sendmessage $message="tm-download-file" $param="$:/editions/ja-JP/download-empty" filename="empty_ja.html"/>
+空のウィキをダウンロードする {{$:/core/images/save-button}}
+</$button>
\ No newline at end of file
diff --git a/editions/ja-JP/tiddlers/system/download-empty.tid b/editions/ja-JP/tiddlers/system/download-empty.tid
new file mode 100644
index 000000000..79b98e462
--- /dev/null
+++ b/editions/ja-JP/tiddlers/system/download-empty.tid
@@ -0,0 +1,10 @@
+title: $:/editions/ja-JP/download-empty
+type: text/vnd.tiddlywiki
+
+\define saveTiddlerFilter()
+[[$:/core]] [[$:/isEncrypted]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] [[$:/languages/ja-JP]] [[$:/language]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
+\end
+\define savingEmpty()
+yes
+\end
+{{$:/core/templates/tiddlywiki5.html}}
diff --git a/editions/ja-JP/tiddlers/language.tid b/editions/ja-JP/tiddlers/system/language.tid
similarity index 51%
rename from editions/ja-JP/tiddlers/language.tid
rename to editions/ja-JP/tiddlers/system/language.tid
index d79eee390..2ac925395 100644
--- a/editions/ja-JP/tiddlers/language.tid
+++ b/editions/ja-JP/tiddlers/system/language.tid
@@ -1,3 +1,3 @@
 title: $:/language
 
-$:/languages/ja-JP
+$:/languages/ja-JP
\ No newline at end of file
diff --git a/editions/ja-JP/tiddlywiki.info b/editions/ja-JP/tiddlywiki.info
index a0ff6b72f..2fe01f6fd 100644
--- a/editions/ja-JP/tiddlywiki.info
+++ b/editions/ja-JP/tiddlywiki.info
@@ -1,21 +1,43 @@
 {
-	"description": "Japanese edition",
+	"description": "Japanese (Japan) edition",
 	"plugins": [
 	],
 	"themes": [
 		"tiddlywiki/vanilla",
 		"tiddlywiki/snowwhite",
-		"tiddlywiki/nighttime",
 		"tiddlywiki/starlight",
 		"tiddlywiki/seamless",
 		"tiddlywiki/centralised",
+		"tiddlywiki/tight",
 		"tiddlywiki/readonly"
 	],
 	"languages": [
 		"ja-JP"
 	],
+	"includeWikis": [
+		{"path": "../tw5.com", "read-only": true}
+	],
 	"build": {
 		"index": [
-			"--rendertiddler","$:/core/save/all","ja-jp-demo.html","text/plain"]
+			"--savetiddlers","[tag[external-image]]","images",
+			"--rendertiddlers","[tag[external-text]]","$:/core/templates/tid-tiddler","text","text/plain",".tid",
+			"--setfield","[tag[external-image]]","_canonical_uri","$:/core/templates/canonical-uri-external-image","text/plain",
+			"--setfield","[tag[external-text]]","_canonical_uri","$:/core/templates/canonical-uri-external-text","text/plain",
+			"--setfield","[tag[external-image]] [tag[external-text]]","text","","text/plain",
+			"--rendertiddler","$:/core/save/all","index.html","text/plain"],
+		"empty": [
+			"--rendertiddler","$:/editions/ja-JP/download-empty","empty.html","text/plain",
+			"--rendertiddler","$:/editions/ja-JP/download-empty","empty.hta","text/plain"],
+		"favicon": [
+			"--savetiddler","$:/favicon.ico","favicon.ico",
+			"--savetiddler","$:/green_favicon.ico","static/favicon.ico"],
+		"static": [
+			"--rendertiddler","$:/core/templates/static.template.html","static.html","text/plain",
+			"--rendertiddler","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
+			"--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain",
+			"--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"]
+	},
+	"config": {
+		"retain-original-tiddler-path": true
 	}
-}
+}
\ No newline at end of file
diff --git a/editions/ko-KR-server/tiddlers/config-Navigation-UpdateAddressBar.tid b/editions/ko-KR-server/tiddlers/config-Navigation-UpdateAddressBar.tid
new file mode 100644
index 000000000..86952857c
--- /dev/null
+++ b/editions/ko-KR-server/tiddlers/config-Navigation-UpdateAddressBar.tid
@@ -0,0 +1,6 @@
+created: 20140910212049455
+title: $:/config/Navigation/UpdateAddressBar
+type: text/vnd.tiddlywiki
+note: <!-- TODO: Remove before end of beta -->
+
+permaview
\ No newline at end of file
diff --git a/editions/ko-KR-server/tiddlers/config-more-button.tid b/editions/ko-KR-server/tiddlers/config-more-button.tid
new file mode 100644
index 000000000..035cbf4ca
--- /dev/null
+++ b/editions/ko-KR-server/tiddlers/config-more-button.tid
@@ -0,0 +1,7 @@
+created: 20140912140419093
+modified: 20140912140418015
+title: $:/config/PageControlButtons/Visibility/$:/core/ui/Buttons/more-page-actions
+type: text/vnd.tiddlywiki
+note: <!-- TODO: Remove before end of beta -->
+
+show
\ No newline at end of file
diff --git a/editions/ko-KR-server/tiddlers/system/GoogleAnalyticsAccount.tid b/editions/ko-KR-server/tiddlers/system/GoogleAnalyticsAccount.tid
new file mode 100644
index 000000000..29cbc27e0
--- /dev/null
+++ b/editions/ko-KR-server/tiddlers/system/GoogleAnalyticsAccount.tid
@@ -0,0 +1,2 @@
+title: $:/GoogleAnalyticsAccount
+
diff --git a/editions/ko-KR-server/tiddlers/system/GoogleAnalyticsDomain.tid b/editions/ko-KR-server/tiddlers/system/GoogleAnalyticsDomain.tid
new file mode 100644
index 000000000..0c6a7e02d
--- /dev/null
+++ b/editions/ko-KR-server/tiddlers/system/GoogleAnalyticsDomain.tid
@@ -0,0 +1,2 @@
+title: $:/GoogleAnalyticsDomain
+
diff --git a/editions/ko-KR-server/tiddlers/system/favicon.ico b/editions/ko-KR-server/tiddlers/system/favicon.ico
new file mode 100644
index 000000000..3765a9a88
Binary files /dev/null and b/editions/ko-KR-server/tiddlers/system/favicon.ico differ
diff --git a/editions/ko-KR-server/tiddlers/system/favicon.ico.meta b/editions/ko-KR-server/tiddlers/system/favicon.ico.meta
new file mode 100644
index 000000000..2f3e81713
--- /dev/null
+++ b/editions/ko-KR-server/tiddlers/system/favicon.ico.meta
@@ -0,0 +1,2 @@
+title: $:/favicon.ico
+type: image/x-icon
diff --git a/editions/ko-KR-server/tiddlywiki.info b/editions/ko-KR-server/tiddlywiki.info
new file mode 100644
index 000000000..04e6a2f31
--- /dev/null
+++ b/editions/ko-KR-server/tiddlywiki.info
@@ -0,0 +1,19 @@
+{
+	"description": "Server configuration of the Korean (Korea Republic) edition",
+	"plugins": [
+		"tiddlywiki/tiddlyweb",
+		"tiddlywiki/filesystem",
+		"tiddlywiki/highlight"
+	],
+	"themes": [
+		"tiddlywiki/vanilla",
+		"tiddlywiki/snowwhite"
+	],
+	"includeWikis": [
+		"../ko-KR"
+	],
+	"config": {
+		"retain-original-tiddler-path": true,
+		"default-tiddler-location": "../ko-KR/tiddlers"
+	}
+}
diff --git a/editions/ko-KR/tiddlers/images/favicon.ico b/editions/ko-KR/tiddlers/images/favicon.ico
new file mode 100644
index 000000000..d4fae0448
Binary files /dev/null and b/editions/ko-KR/tiddlers/images/favicon.ico differ
diff --git a/editions/ko-KR/tiddlers/images/favicon.ico.meta b/editions/ko-KR/tiddlers/images/favicon.ico.meta
new file mode 100644
index 000000000..2f3e81713
--- /dev/null
+++ b/editions/ko-KR/tiddlers/images/favicon.ico.meta
@@ -0,0 +1,2 @@
+title: $:/favicon.ico
+type: image/x-icon
diff --git a/editions/ko-KR/tiddlers/images/green_favicon.ico b/editions/ko-KR/tiddlers/images/green_favicon.ico
new file mode 100644
index 000000000..06e5f8e80
Binary files /dev/null and b/editions/ko-KR/tiddlers/images/green_favicon.ico differ
diff --git a/editions/ko-KR/tiddlers/images/green_favicon.ico.meta b/editions/ko-KR/tiddlers/images/green_favicon.ico.meta
new file mode 100644
index 000000000..f2e1cfa3c
--- /dev/null
+++ b/editions/ko-KR/tiddlers/images/green_favicon.ico.meta
@@ -0,0 +1,2 @@
+title: $:/green_favicon.ico
+type: image/x-icon
diff --git a/editions/ko-KR/tiddlers/system/$--core-ui-DefaultSearchResultList.tid b/editions/ko-KR/tiddlers/system/$--core-ui-DefaultSearchResultList.tid
new file mode 100644
index 000000000..2eac849db
--- /dev/null
+++ b/editions/ko-KR/tiddlers/system/$--core-ui-DefaultSearchResultList.tid
@@ -0,0 +1,18 @@
+caption: {{$:/language/Search/DefaultResults/Caption}}
+created: 20141117081621387
+modified: 20160429080827508
+tags: $:/tags/SearchResults
+title: $:/core/ui/DefaultSearchResultList
+type: text/vnd.tiddlywiki
+
+\define searchResultList()
+//<small>{{$:/language/Search/Matches/Title}}</small>//
+
+<$list filter="[!is[system]search:title{$(searchTiddler)$}sort[caption]limit[250]] [!is[system]search:ko-title{$(searchTiddler)$}sort[title]limit[250]][!is[system]search:en-title{$(searchTiddler)$}sort[title]limit[250]]" template="$:/core/ui/ListItemTemplate"/>
+
+//<small>{{$:/language/Search/Matches/All}}</small>//
+
+<$list filter="[!is[system]search{$(searchTiddler)$}sort[title]limit[250]]" template="$:/core/ui/ListItemTemplate"/>
+
+\end
+<<searchResultList>>
diff --git a/editions/ko-KR/tiddlers/system/$--core-ui-ListItemTemplate.tid b/editions/ko-KR/tiddlers/system/$--core-ui-ListItemTemplate.tid
new file mode 100644
index 000000000..42ed18f7f
--- /dev/null
+++ b/editions/ko-KR/tiddlers/system/$--core-ui-ListItemTemplate.tid
@@ -0,0 +1,12 @@
+created: 20160429080523192
+modified: 20160429080534142
+title: $:/core/ui/ListItemTemplate
+type: text/vnd.tiddlywiki
+
+<div class="tc-menu-list-item">
+<$link to={{!!title}}>
+<$view field="ko-title">
+<$view field="title"/>
+</$view>
+</$link>
+</div>
\ No newline at end of file
diff --git a/editions/ko-KR/tiddlers/system/$--core-ui-SideBar-Open.tid b/editions/ko-KR/tiddlers/system/$--core-ui-SideBar-Open.tid
new file mode 100644
index 000000000..44b10aa08
--- /dev/null
+++ b/editions/ko-KR/tiddlers/system/$--core-ui-SideBar-Open.tid
@@ -0,0 +1,15 @@
+caption: {{$:/language/SideBar/Open/Caption}}
+created: 20160429080322465
+modified: 20160429080340559
+tags: $:/tags/SideBar
+title: $:/core/ui/SideBar/Open
+type: text/vnd.tiddlywiki
+
+\define lingo-base() $:/language/CloseAll/
+<$list filter="[list[$:/StoryList]]" history="$:/HistoryList" storyview="pop">
+
+<$button message="tm-close-tiddler" tooltip={{$:/language/Buttons/Close/Hint}} aria-label={{$:/language/Buttons/Close/Caption}} class="tc-btn-invisible tc-btn-mini">&times;</$button> <$link to={{!!title}}><$transclude field="ko-title"><$view field="title"/></$transclude></$link>
+
+</$list>
+
+<$button message="tm-close-all-tiddlers" class="tc-btn-invisible tc-btn-mini"><<lingo Button>></$button>
diff --git a/editions/ko-KR/tiddlers/system/$--core-ui-TagTemplate.tid b/editions/ko-KR/tiddlers/system/$--core-ui-TagTemplate.tid
new file mode 100644
index 000000000..af8ec66cc
--- /dev/null
+++ b/editions/ko-KR/tiddlers/system/$--core-ui-TagTemplate.tid
@@ -0,0 +1,33 @@
+created: 20160504080001125
+modified: 20160504080318928
+title: $:/core/ui/TagTemplate
+type: text/vnd.tiddlywiki
+
+\define tag-styles()
+background-color:$(backgroundColor)$;
+fill:$(foregroundColor)$;
+color:$(foregroundColor)$;
+\end
+
+\define tag-body-inner(colour,fallbackTarget,colourA,colourB)
+<$set name="foregroundColor" value=<<contrastcolour target:"""$colour$""" fallbackTarget:"""$fallbackTarget$""" colourA:"""$colourA$""" colourB:"""$colourB$""">>>
+<$set name="backgroundColor" value="""$colour$""">
+<$button popup=<<qualify "$:/state/popup/tag">> class="tc-btn-invisible tc-tag-label" style=<<tag-styles>>>
+<$transclude tiddler={{!!icon}}/> <$view field="ko-title"><$view field="title" format="text" /></$view>
+</$button>
+<$reveal state=<<qualify "$:/state/popup/tag">> type="popup" position="below" animate="yes"><div class="tc-drop-down"><$transclude tiddler="$:/core/ui/ListItemTemplate"/>
+<hr>
+<$list filter="[all[current]tagging[]]" template="$:/core/ui/ListItemTemplate"/>
+</div>
+</$reveal>
+</$set>
+</$set>
+\end
+
+\define tag-body(colour,palette)
+<span class="tc-tag-list-item">
+<$macrocall $name="tag-body-inner" colour="""$colour$""" fallbackTarget={{$palette$##tag-background}} colourA={{$palette$##foreground}} colourB={{$palette$##background}}/>
+</span>
+\end
+
+<$macrocall $name="tag-body" colour={{!!color}} palette={{$:/palette}}/>
\ No newline at end of file
diff --git a/editions/ko-KR/tiddlers/system/$--core-ui-ViewTemplate-title.tid b/editions/ko-KR/tiddlers/system/$--core-ui-ViewTemplate-title.tid
new file mode 100644
index 000000000..bac971b84
--- /dev/null
+++ b/editions/ko-KR/tiddlers/system/$--core-ui-ViewTemplate-title.tid
@@ -0,0 +1,46 @@
+created: 20160429080016628
+modified: 20160429080025660
+tags: $:/tags/ViewTemplate
+title: $:/core/ui/ViewTemplate/title
+type: text/vnd.tiddlywiki
+
+\define title-styles()
+fill:$(foregroundColor)$;
+\end
+\define config-title()
+$:/config/ViewToolbarButtons/Visibility/$(listItem)$
+\end
+<div class="tc-tiddler-title">
+<div class="tc-titlebar">
+<span class="tc-tiddler-controls">
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbar]!has[draft.of]]" variable="listItem"><$reveal type="nomatch" state=<<config-title>> text="hide"><$transclude tiddler=<<listItem>>/></$reveal></$list>
+</span>
+<$set name="tv-wikilinks" value={{$:/config/Tiddlers/TitleLinks}}>
+<$link>
+<$set name="foregroundColor" value={{!!color}}>
+<span class="tc-tiddler-title-icon" style=<<title-styles>>>
+<$transclude tiddler={{!!icon}}/>
+</span>
+</$set>
+<$list filter="[all[current]removeprefix[$:/]]">
+<h2 class="tc-title" title={{$:/language/SystemTiddler/Tooltip}}>
+<span class="tc-system-title-prefix">$:/</span><$text text=<<currentTiddler>>/>
+</h2>
+</$list>
+<$list filter="[all[current]!prefix[$:/]]">
+<h2 class="tc-title">
+<$view field="ko-title">
+<$view field="title"/>
+</$view>
+</h2>
+</$list>
+</$link>
+</$set>
+</div>
+
+<$reveal type="nomatch" text="" default="" state=<<tiddlerInfoState>> class="tc-tiddler-info tc-popup-handle" animate="yes" retain="yes">
+
+<$transclude tiddler="$:/core/ui/TiddlerInfo"/>
+
+</$reveal>
+</div>
\ No newline at end of file
diff --git a/editions/ko-KR/tiddlers/system/$--editions-ko-KR-Macros-list.tid b/editions/ko-KR/tiddlers/system/$--editions-ko-KR-Macros-list.tid
new file mode 100644
index 000000000..b2d3169e0
--- /dev/null
+++ b/editions/ko-KR/tiddlers/system/$--editions-ko-KR-Macros-list.tid
@@ -0,0 +1,24 @@
+created: 20141127091159720
+modified: 20160429070443000
+tags: $:/tags/Macro
+title: $:/editions/ko-KR/Macros/list
+type: text/vnd.tiddlywiki
+
+\define list-links(filter,type:"ul",subtype:"li",class:"")
+<!-- Essentially overriding $:/core/macros/list
+	 so that the list item is rather labeled with ko-title
+     when present. -->
+<$type$ class="$class$">
+<$list filter="$filter$">
+<$subtype$>
+<$link to={{!!title}}>
+<$transclude field="caption">
+<$view field="ko-title">
+<$view field="title"/>
+</$view>
+</$transclude>
+</$link>
+</$subtype$>
+</$list>
+</$type$>
+\end
diff --git a/editions/ko-KR/tiddlers/system/$--editions-ko-KR-Macros-timeline-title.tid b/editions/ko-KR/tiddlers/system/$--editions-ko-KR-Macros-timeline-title.tid
new file mode 100644
index 000000000..dd1a8d2e7
--- /dev/null
+++ b/editions/ko-KR/tiddlers/system/$--editions-ko-KR-Macros-timeline-title.tid
@@ -0,0 +1,11 @@
+created: 20141212105632762
+modified: 20160429070739423
+tags: $:/tags/Macro
+title: $:/editions/ko-KR/Macros/timeline-title
+type: text/vnd.tiddlywiki
+
+\define timeline-title()
+<$view field="ko-title">
+<$view field="title"/>
+</$view>
+\end
\ No newline at end of file
diff --git a/editions/ko-KR/tiddlers/system/$--editions-ko-KR-Macros-toc-caption.tid b/editions/ko-KR/tiddlers/system/$--editions-ko-KR-Macros-toc-caption.tid
new file mode 100644
index 000000000..aaf8f93f3
--- /dev/null
+++ b/editions/ko-KR/tiddlers/system/$--editions-ko-KR-Macros-toc-caption.tid
@@ -0,0 +1,16 @@
+created: 20141212090228728
+modified: 20160429070845087
+tags: $:/tags/Macro
+title: $:/editions/ko-KR/Macros/toc-caption
+type: text/vnd.tiddlywiki
+
+\define toc-caption()
+<$set name="tv-wikilinks" value="no">
+<$transclude field="caption">
+<$view field="ko-title">
+<$view field="title"/>
+</$view>
+</$transclude>
+</$set>
+\end
+
diff --git a/editions/ko-KR/tiddlers/system/ContributionBanner.tid b/editions/ko-KR/tiddlers/system/ContributionBanner.tid
new file mode 100644
index 000000000..8f04dba2c
--- /dev/null
+++ b/editions/ko-KR/tiddlers/system/ContributionBanner.tid
@@ -0,0 +1,20 @@
+title: $:/ContributionBanner
+tags: $:/tags/EditTemplate
+list-after: $:/core/ui/EditTemplate/title
+
+\define makeGitHubLink()
+https://github.com/Jermolene/TiddlyWiki5/edit/master/editions/ko-KR/tiddlers/$(githubLink)$
+\end
+\define innerMakeGitHubLink(linkText)
+<$set name="githubLink" value={{$:/config/OriginalTiddlerPaths##$(draftOfTiddler)$}}>
+<a href=<<makeGitHubLink>> class="tc-tiddlylink-external" target="_blank">$linkText$</a>
+</$set>
+\end
+\define outerMakeGitHubLink(linkText)
+<$set name="draftOfTiddler" value={{$(currentTiddler)$!!draft.of}}>
+<<innerMakeGitHubLink "$linkText$">>
+</$set>
+\end
+<div class="tc-improvement-banner">
+{{$:/core/images/star-filled}} 우리에게 이 설명문서를 개선하는 데 도움을 줄 수 있나요? <<outerMakeGitHubLink "~GitHub에서 이 티들러">>를 편집하는 [[방법에 대해 알아보세요|Improving TiddlyWiki Documentation]]
+</div>
diff --git a/editions/ko-KR/tiddlers/system/SiteSubtitle.tid b/editions/ko-KR/tiddlers/system/SiteSubtitle.tid
new file mode 100644
index 000000000..872b65970
--- /dev/null
+++ b/editions/ko-KR/tiddlers/system/SiteSubtitle.tid
@@ -0,0 +1,4 @@
+title: $:/SiteSubtitle
+type: text/vnd.tiddlywiki
+
+줄 없는 개인 웹 공책
\ No newline at end of file
diff --git a/editions/ko-KR/tiddlers/system/SiteTitle.tid b/editions/ko-KR/tiddlers/system/SiteTitle.tid
new file mode 100644
index 000000000..a42985fe6
--- /dev/null
+++ b/editions/ko-KR/tiddlers/system/SiteTitle.tid
@@ -0,0 +1,6 @@
+created: 20131211131022562
+modified: 20160429043058045
+title: $:/SiteTitle
+type: text/vnd.tiddlywiki
+
+[[티들리위키|TiddlyWiki]]
\ No newline at end of file
diff --git a/editions/ko-KR/tiddlers/system/Sources.tid b/editions/ko-KR/tiddlers/system/Sources.tid
new file mode 100644
index 000000000..4ec0595d0
--- /dev/null
+++ b/editions/ko-KR/tiddlers/system/Sources.tid
@@ -0,0 +1,28 @@
+title: $:/editions/ko-KR/TiddlerInfo/Sources
+tags: $:/tags/TiddlerInfo
+caption: 자료
+
+\define makeStaticLink()
+http://tiddlywiki.com/languages/ko-KR/static/<$view tiddler=<<currentTiddler>> field="title" format="doubleurlencoded"/>.html
+\end
+\define outerMakeStaticLink()
+<$macrocall $name="makeStaticLink" $output="text/plain"/>
+\end
+\define makeGitHubLink()
+https://github.com/Jermolene/TiddlyWiki5/blob/master/editions/ko-KR/tiddlers/$(githubLink)$
+\end
+\define outerMakeGitHubLink()
+<$set name="githubLink" value={{$:/config/OriginalTiddlerPaths##$(currentTiddler)$}}>
+<a href=<<makeGitHubLink>> class="tc-tiddlylink-external" target="_blank"><$text text=<<makeGitHubLink>>/></a>
+</$set>
+\end
+<$list filter="[all[current]!is[system]!is[shadow]]">
+
+이 티들러의 정적 HTML 표현은 다음 URL에서 사용할 수 있습니다:
+
+* <<outerMakeStaticLink>>
+
+이 티들러에 대해 ~GitHub pull request를 보내서 우리에게 설명문서를 개선하는 데 도움을 주세요:
+
+* <<outerMakeGitHubLink>>
+</$list>
\ No newline at end of file
diff --git a/editions/ko-KR/tiddlers/system/StaticBanner.tid b/editions/ko-KR/tiddlers/system/StaticBanner.tid
new file mode 100644
index 000000000..ae4961e02
--- /dev/null
+++ b/editions/ko-KR/tiddlers/system/StaticBanner.tid
@@ -0,0 +1,3 @@
+title: $:/StaticBanner
+
+<div class="tc-static-alert"><div class="tc-static-alert-inner">이 문서는 [[http://tiddlywiki.com/languages/ko-KR/]]에서 티들리위키의 정적 HTML 표현의 일부입니다</div></div>
diff --git a/editions/ko-KR/tiddlers/system/download-empty-button.tid b/editions/ko-KR/tiddlers/system/download-empty-button.tid
new file mode 100644
index 000000000..f11595890
--- /dev/null
+++ b/editions/ko-KR/tiddlers/system/download-empty-button.tid
@@ -0,0 +1,6 @@
+title: $:/editions/ko-KR/snippets/download-empty-button
+
+<$button class="tc-btn-big-green">
+<$action-sendmessage $message="tm-download-file" $param="$:/editions/ko-KR/download-empty" filename="empty_ko.html"/>
+빈 위키 다운로드 {{$:/core/images/save-button}}
+</$button>
\ No newline at end of file
diff --git a/editions/ko-KR/tiddlers/system/download-empty.tid b/editions/ko-KR/tiddlers/system/download-empty.tid
new file mode 100644
index 000000000..75f80307f
--- /dev/null
+++ b/editions/ko-KR/tiddlers/system/download-empty.tid
@@ -0,0 +1,10 @@
+title: $:/editions/ko-KR/download-empty
+type: text/vnd.tiddlywiki
+
+\define saveTiddlerFilter()
+[[$:/core]] [[$:/isEncrypted]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] [[$:/languages/ko-KR]] [[$:/language]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
+\end
+\define savingEmpty()
+yes
+\end
+{{$:/core/templates/tiddlywiki5.html}}
diff --git a/editions/ko-KR/tiddlers/system/language.tid b/editions/ko-KR/tiddlers/system/language.tid
new file mode 100644
index 000000000..f2aa8f205
--- /dev/null
+++ b/editions/ko-KR/tiddlers/system/language.tid
@@ -0,0 +1,3 @@
+title: $:/language
+
+$:/languages/ko-KR
\ No newline at end of file
diff --git a/editions/ko-KR/tiddlers/system/static.content.tid b/editions/ko-KR/tiddlers/system/static.content.tid
new file mode 100644
index 000000000..bcc9862a8
--- /dev/null
+++ b/editions/ko-KR/tiddlers/system/static.content.tid
@@ -0,0 +1,27 @@
+title: $:/core/templates/static.content
+type: text/vnd.tiddlywiki
+hack-to-give-us-something-to-compare-against: yes
+
+\define tv-wikilink-template() http://tiddlywiki.com/languages/ko-KR/static/$uri_doubleencoded$.html
+
+<!-- For Google, and people without JavaScript-->
+<$reveal state="!!hack-to-give-us-something-to-compare-against" type="nomatch" text=<<savingEmpty>>>
+
+이 브라우저는 자바스크립트를 실행하지 않은 것으로 보입니다. 같은 내용을 찾아보려면 정적 HTML 버전 중 하나를 사용할 수 있습니다:
+
+* http://tiddlywiki.com/languages/ko-KR/static.html - 구분된 문서의 개별 티들러 찾아보기
+* http://tiddlywiki.com/languages/ko-KR/alltiddlers.html#HelloThere - 모든 티들러를 포함하는 하나의 파일
+
+---
+
+{{HelloThere}}
+
+{{TiddlyWiki}}
+
+{{Features}}
+
+{{Community}}
+
+{{HelpingTiddlyWiki}}
+
+</$reveal>
diff --git a/editions/ko-KR/tiddlywiki.info b/editions/ko-KR/tiddlywiki.info
new file mode 100644
index 000000000..95753c164
--- /dev/null
+++ b/editions/ko-KR/tiddlywiki.info
@@ -0,0 +1,43 @@
+{
+	"description": "Korean (Korea Republic) edition",
+	"plugins": [
+	],
+	"themes": [
+		"tiddlywiki/vanilla",
+		"tiddlywiki/snowwhite",
+		"tiddlywiki/starlight",
+		"tiddlywiki/seamless",
+		"tiddlywiki/centralised",
+		"tiddlywiki/tight",
+		"tiddlywiki/readonly"
+	],
+	"languages": [
+		"ko-KR"
+	],
+	"includeWikis": [
+		{"path": "../tw5.com", "read-only": true}
+	],
+	"build": {
+		"index": [
+			"--savetiddlers","[tag[external-image]]","images",
+			"--rendertiddlers","[tag[external-text]]","$:/core/templates/tid-tiddler","text","text/plain",".tid",
+			"--setfield","[tag[external-image]]","_canonical_uri","$:/core/templates/canonical-uri-external-image","text/plain",
+			"--setfield","[tag[external-text]]","_canonical_uri","$:/core/templates/canonical-uri-external-text","text/plain",
+			"--setfield","[tag[external-image]] [tag[external-text]]","text","","text/plain",
+			"--rendertiddler","$:/core/save/all","index.html","text/plain"],
+		"empty": [
+			"--rendertiddler","$:/editions/ko-KR/download-empty","empty.html","text/plain",
+			"--rendertiddler","$:/editions/ko-KR/download-empty","empty.hta","text/plain"],
+		"favicon": [
+			"--savetiddler","$:/favicon.ico","favicon.ico",
+			"--savetiddler","$:/green_favicon.ico","static/favicon.ico"],
+		"static": [
+			"--rendertiddler","$:/core/templates/static.template.html","static.html","text/plain",
+			"--rendertiddler","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
+			"--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain",
+			"--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"]
+	},
+	"config": {
+		"retain-original-tiddler-path": true
+	}
+}
\ No newline at end of file
diff --git a/editions/prerelease/tiddlers/Release 5.1.14.tid b/editions/prerelease/tiddlers/Release 5.1.14.tid
new file mode 100644
index 000000000..f1ed54155
--- /dev/null
+++ b/editions/prerelease/tiddlers/Release 5.1.14.tid	
@@ -0,0 +1,88 @@
+caption: 5.1.14
+created: 20161017180417755
+modified: 20161017180417755
+tags: ReleaseNotes
+title: Release 5.1.14
+type: text/vnd.tiddlywiki
+
+//[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.13...v5.1.14]]//
+
+!! New Plugins
+
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/22c1b04ee79a5ccc25cbc33cc91bf5daac1df831]] QR code generator plugin
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/7f11c151f06cd039d1887a6940075237ccb4b7a9]] BibTeX importer plugin
+
+!! Performance Improvements
+
+* [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/989cee50594a76a0f30d1d2124ce9e5e5808c6cf]] search mechanism to require the search string to be a minimum length
+
+!! Translation Improvements
+
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/b96377099a7377e4c77582800cac78103a08b066]] new Hebrew translation
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/e20bce5450f40c8db891893fa0674c493bba7f11]] preliminary support for right-to-left (RTL) languages
+
+!! Usability Improvements
+
+* [[Improved|https://github.com/Jermolene/TiddlyWiki5/commit/7a6d7e2a1567ce04330939b3926b21b88796b4c9]] access to plugin information:
+** Refactored the display of plugin tiddlers to use the same format as the control panel, adding the shadow tiddler listing as an overridable extension tab
+** Added a new tab in the “More” sidebar providing quick access to all installed plugins
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/issues/2616]] height of preview pane to use a scrollbar when fixed height layout is selected
+* [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/4eed18496fe2f4f67ad6a382b813b5c5371d3930]] editor "link" button to create external links and missing links
+* [[Increased|https://github.com/Jermolene/TiddlyWiki5/commit/2d9aa12aa867d1b7c983e21de2ed60abf6f5a1bc]] size of icons in the "Filter" tab of $:/AdvancedSearch
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/ee66d1a1afb939c0cba8c2257b8300921831c716]] marker to indicate the version in which a new feature was released
+* [[Improved|https://github.com/Jermolene/TiddlyWiki5/pull/2590]] handling of <kbd>ctrl-Enter</kbd> to add tags and fields
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/issues/2381]] problem with multiple copies of a tiddler appearing in the story river
+* [[Improved|https://github.com/Jermolene/TiddlyWiki5/pull/2585]] dropdown for new field names with typeahead search
+
+!! Hackability Improvements
+
+* [[Improved|https://github.com/Jermolene/TiddlyWiki5/commit/87fa7f972cae859c466dea8a531d50f060e7d910]] modals and notifications so that global macros are available
+* [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/b35544bf4946596e60f7b0c7f0a55fa490ac2a24]] the SetWidget to allow a single result to be selected from a filtered result list
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/2f590a365e5b6bfecc1170fdbeaaf398795a2feb]] new `$:/info/url/*` [[information tiddlers|InfoMechanism]] providing document location information
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/b4b77d1681023d4ccc0e157df1ce67d0d388cd5a]] several new filter operators for string encoding/decoding:
+** [[decodehtml Operator]]
+** [[decodeuri Operator]]
+** [[decodeuricomponent Operator]]
+** [[encodehtml Operator]]
+** [[encodeuri Operator]]
+** [[encodeuricomponent Operator]]
+** [[escaperegexp Operator]]
+** [[stringify Operator]]
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/ffcbcbfa82cb8f1044c57967117aeae0978579f0]] new [[minlength Operator]]
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/c4e13bc94afb022e40aaa70b06464084188acfea]] new [[printer icon|$:/core/images/print-button]]
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/d9f301f7556ce899840dab0ebc31c040d9c7a72b]] support for "formattedtext" output type to the WikifyWidget
+* [[Improved|https://github.com/Jermolene/TiddlyWiki5/pull/2193]] [[wikiparserrules Operator]] to return all available parse rules
+
+!! Bug Fixes
+
+* [[Prevented|https://github.com/Jermolene/TiddlyWiki5/commit/f97c1226aac9f3a5b563fc8d95bfeff91b8ab810]] email addresses from being mis-recognised as HTML tags
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/pull/2572]] issue with `$tw.utils.strEndsWith()`
+* [[Partially fixed|https://github.com/Jermolene/TiddlyWiki5/issues/2599]] problem with action widgets being invoked independently of refresh cycle
+* [[Revised|https://github.com/Jermolene/TiddlyWiki5/issues/2522]] handling of `syncAdaptor.isReady()` method to improve compatibility with older adaptors
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/issues/2517]] problem with unsafe use of `String.prototype.replace()`, corrupting fields containing dollar signs
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/8b60dbb81d3495aa8be1f160e4f31bcae995f400]] problem with page background colour not showing through transparent background images
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/issues/2514]] sync problem with skinny tiddlers not being loaded
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/06b7de415cd2cef3848f2ef2516200ee79afd130]] problem with "Cancel" button in login dialogue also submitting the form
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/issues/2579]] typo affecting created/creator fields when deleting a field
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/issues/2595]] issue with system links containing international characters not being recognised
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/issues/2076]] issue with single line macro definitions without a terminating line break
+
+!! Node.js Bug Fixes
+
+* [[Improved|https://github.com/Jermolene/TiddlyWiki5/commit/1b41b4468495bbe66f99345ee94a67346176deb7]] support for bulk loading tiddler files via [[tiddlywiki.files Files]] within TiddlyWikiFolders
+
+! Contributors
+
+[[@Jermolene|https://github.com/Jermolene]] would like to thank the contributors to this release who have generously given their time to help improve TiddlyWiki:
+
+* [[@danielo515|https://github.com/danielo515]]
+* [[@DoronTzur|https://github.com/DoronTzur]]
+* [[@FND|https://github.com/FND]]
+* [[@hchaase|https://github.com/hchaase]]
+* [[@jest|https://github.com/jest]]
+* [[@nameanyone|https://github.com/nameanyone]]
+* [[@Serj-Aleks|https://github.com/Serj-Aleks]]
+* [[@stevesunypoly|https://github.com/stevesunypoly]]
+* [[@sukima|https://github.com/sukima]]
+* [[@tobibeer|https://github.com/tobibeer]]
+* [[@zakrec|https://github.com/zakrec]]
diff --git a/editions/prerelease/tiddlers/system/PrereleaseLocalPluginLibrary.tid b/editions/prerelease/tiddlers/system/PrereleaseLocalPluginLibrary.tid
index 1a03b1a77..3f7c07ffd 100644
--- a/editions/prerelease/tiddlers/system/PrereleaseLocalPluginLibrary.tid
+++ b/editions/prerelease/tiddlers/system/PrereleaseLocalPluginLibrary.tid
@@ -1,6 +1,6 @@
 title: $:/config/LocalPluginLibrary
 tags: $:/tags/PluginLibrary
-url: http://127.0.0.1:8080/prerelease/library/v5.1.10/index.html
+url: http://127.0.0.1:8080/prerelease/library/v5.1.12/index.html
 caption: {{$:/language/OfficialPluginLibrary}} (Prerelease Local)
 
 A locally installed version of the official ~TiddlyWiki plugin library at tiddlywiki.com for testing and debugging. //Requires a local web server to share the library//
diff --git a/editions/prerelease/tiddlers/system/PrereleaseOfficialPluginLibrary.tid b/editions/prerelease/tiddlers/system/PrereleaseOfficialPluginLibrary.tid
index 417681328..924fc6922 100644
--- a/editions/prerelease/tiddlers/system/PrereleaseOfficialPluginLibrary.tid
+++ b/editions/prerelease/tiddlers/system/PrereleaseOfficialPluginLibrary.tid
@@ -1,6 +1,6 @@
 title: $:/config/OfficialPluginLibrary
 tags: $:/tags/PluginLibrary
-url: http://tiddlywiki.com/prerelease/library/v5.1.10/index.html
+url: http://tiddlywiki.com/prerelease/library/v5.1.12/index.html
 caption: {{$:/language/OfficialPluginLibrary}} (Prerelease)
 
 The prerelease version of the official ~TiddlyWiki plugin library at tiddlywiki.com. Plugins, themes and language packs are maintained by the core team.
diff --git a/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid b/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid
index 6ef34d420..6dc10e33c 100644
--- a/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid	
+++ b/editions/prerelease/tiddlers/system/TiddlyWiki Pre-release.tid	
@@ -1,10 +1,6 @@
 title: TiddlyWiki Pre-release
 modified: 20150428204930183
 
-\define colour-picker(tiddler,colour)
-<$edit-text tiddler="""$tiddler$""" index="""$colour$""" type="color" tag="input"/>
-\end
-
 This is a pre-release build of TiddlyWiki. It is provided for testing purposes. ''Please don't try to use it for anything important'' -- you should use the latest official release from http://tiddlywiki.com.
 
 <$list filter="[tag[ReleaseNotes]!has[released]!sort[created]]">
diff --git a/editions/prerelease/tiddlywiki.info b/editions/prerelease/tiddlywiki.info
index 632fc48f6..3fe2c2159 100644
--- a/editions/prerelease/tiddlywiki.info
+++ b/editions/prerelease/tiddlywiki.info
@@ -7,16 +7,20 @@
 		"tiddlywiki/browser-sniff",
 		"tiddlywiki/help",
 		"tiddlywiki/stacked-view",
-		"tiddlywiki/powered-by-tiddlywiki"
+		"tiddlywiki/powered-by-tiddlywiki",
+		"tiddlywiki/internals",
+		"tiddlywiki/highlight",
+		"tiddlywiki/markdown",
+		"tiddlywiki/qrcode",
+		"tiddlywiki/bibtex"
 	],
 	"themes": [
 		"tiddlywiki/vanilla",
 		"tiddlywiki/snowwhite",
-		"tiddlywiki/nighttime",
 		"tiddlywiki/starlight",
 		"tiddlywiki/seamless",
-		"tiddlywiki/tight",
 		"tiddlywiki/centralised",
+		"tiddlywiki/tight",
 		"tiddlywiki/readonly"
 	],
 	"languages": [
diff --git a/editions/resumebuilder/tiddlywiki.info b/editions/resumebuilder/tiddlywiki.info
index 3126409bc..28f4ac3f3 100644
--- a/editions/resumebuilder/tiddlywiki.info
+++ b/editions/resumebuilder/tiddlywiki.info
@@ -12,8 +12,8 @@
 	],
 	"languages": [
 	],
-    "includeWikis": [
-    ],
+	"includeWikis": [
+	],
 	"build": {
 		"index": [
 			"--rendertiddler","$:/core/save/all","index.html","text/plain"],
diff --git a/editions/server/tiddlywiki.info b/editions/server/tiddlywiki.info
index 53951b8d1..7c623fdc4 100644
--- a/editions/server/tiddlywiki.info
+++ b/editions/server/tiddlywiki.info
@@ -8,5 +8,19 @@
 	"themes": [
 		"tiddlywiki/vanilla",
 		"tiddlywiki/snowwhite"
-	]
+	],
+	"build": {
+		"index": [
+			"--rendertiddler","$:/plugins/tiddlywiki/tiddlyweb/save/offline","index.html","text/plain"],
+		"externalimages": [
+			"--savetiddlers","[is[image]]","images",
+			"--setfield","[is[image]]","_canonical_uri","$:/core/templates/canonical-uri-external-image","text/plain",
+			"--setfield","[is[image]]","text","","text/plain",
+			"--rendertiddler","$:/plugins/tiddlywiki/tiddlyweb/save/offline","externalimages.html","text/plain"],
+		"static": [
+			"--rendertiddler","$:/core/templates/static.template.html","static.html","text/plain",
+			"--rendertiddler","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
+			"--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain",
+			"--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"]
+	}
 }
diff --git a/editions/text-slicer/tiddlywiki.info b/editions/text-slicer/tiddlywiki.info
index 8fa0682e3..11e1808de 100644
--- a/editions/text-slicer/tiddlywiki.info
+++ b/editions/text-slicer/tiddlywiki.info
@@ -1,7 +1,8 @@
 {
 	"description": "Tools for slicing up long texts into individual tiddlers",
 	"plugins": [
-		"tiddlywiki/text-slicer"
+		"tiddlywiki/text-slicer",
+		"tiddlywiki/xmldom"
 	],
 	"languages": [
 	],
diff --git a/editions/translators/tiddlywiki.info b/editions/translators/tiddlywiki.info
index 8e4dc295a..04e0dbbb0 100644
--- a/editions/translators/tiddlywiki.info
+++ b/editions/translators/tiddlywiki.info
@@ -14,6 +14,7 @@
 		"en-US",
 		"es-ES",
 		"fr-FR",
+		"he-IL",
 		"hi-IN",
 		"ia-IA",
 		"it-IT",
@@ -38,25 +39,28 @@
 		"output-files": [
 			"--rendertiddler","$:/plugins/tiddlywiki/translators/templates/Buttons.multids","language/Buttons.multids","text/plain",
 			"--rendertiddler","$:/plugins/tiddlywiki/translators/templates/ControlPanel.multids","language/ControlPanel.multids","text/plain",
+			"--rendertiddler","$:/plugins/tiddlywiki/translators/templates/CoreReadMe.tid","language/CoreReadMe.tid","text/plain",
 			"--rendertiddler","$:/plugins/tiddlywiki/translators/templates/Dates.multids","language/Dates.multids","text/plain",
 			"--rendertiddler","$:/plugins/tiddlywiki/translators/templates/EditTemplate.multids","language/EditTemplate.multids","text/plain",
+			"--rendertiddler","$:/plugins/tiddlywiki/translators/templates/Exporters.multids","language/Exporters.multids","text/plain",
 			"--rendertiddler","$:/plugins/tiddlywiki/translators/templates/Fields.multids","language/Fields.multids","text/plain",
 			"--rendertiddler","$:/plugins/tiddlywiki/translators/templates/Filters.multids","language/Filters.multids","text/plain",
+			"--rendertiddler","$:/plugins/tiddlywiki/translators/templates/GettingStarted.tid","language/GettingStarted.tid","text/plain",
 			"--rendertiddler","$:/plugins/tiddlywiki/translators/templates/Import.multids","language/Import.multids","text/plain",
 			"--rendertiddler","$:/plugins/tiddlywiki/translators/templates/Misc.multids","language/Misc.multids","text/plain",
-			"--rendertiddler","$:/plugins/tiddlywiki/translators/templates/Search.multids","language/Search.multids","text/plain",
-			"--rendertiddler","$:/plugins/tiddlywiki/translators/templates/SideBar.multids","language/SideBar.multids","text/plain",
-			"--rendertiddler","$:/plugins/tiddlywiki/translators/templates/TiddlerInfo.multids","language/TiddlerInfo.multids","text/plain",
+			"--rendertiddler","$:/plugins/tiddlywiki/translators/templates/ModuleTypes.multids","language/Docs/ModuleTypes.multids","text/plain",
 			"--rendertiddler","$:/plugins/tiddlywiki/translators/templates/NewJournal.multids","language/NewJournal.multids","text/plain",
 			"--rendertiddler","$:/plugins/tiddlywiki/translators/templates/Notifications.multids","language/Notifications.multids","text/plain",
-			"--rendertiddler","$:/plugins/tiddlywiki/translators/templates/CoreReadMe.tid","language/CoreReadMe.tid","text/plain",
-			"--rendertiddler","$:/plugins/tiddlywiki/translators/templates/GettingStarted.tid","language/GettingStarted.tid","text/plain",
-			"--rendertiddler","$:/plugins/tiddlywiki/translators/templates/SiteTitle.tid","language/SiteTitle.tid","text/plain",
-			"--rendertiddler","$:/plugins/tiddlywiki/translators/templates/SiteSubtitle.tid","language/SiteSubtitle.tid","text/plain",
-			"--rendertiddler","$:/plugins/tiddlywiki/translators/templates/ModuleTypes.multids","language/Docs/ModuleTypes.multids","text/plain",
 			"--rendertiddler","$:/plugins/tiddlywiki/translators/templates/PaletteColours.multids","language/Docs/PaletteColours.multids","text/plain",
+			"--rendertiddler","$:/plugins/tiddlywiki/translators/templates/Search.multids","language/Search.multids","text/plain",
+			"--rendertiddler","$:/plugins/tiddlywiki/translators/templates/SideBar.multids","language/SideBar.multids","text/plain",
+			"--rendertiddler","$:/plugins/tiddlywiki/translators/templates/SiteSubtitle.tid","language/SiteSubtitle.tid","text/plain",
+			"--rendertiddler","$:/plugins/tiddlywiki/translators/templates/SiteTitle.tid","language/SiteTitle.tid","text/plain",
+			"--rendertiddler","$:/plugins/tiddlywiki/translators/templates/ThemeTweaks.multids","language/ThemeTweaks.multids","text/plain",
+			"--rendertiddler","$:/plugins/tiddlywiki/translators/templates/TiddlerInfo.multids","language/TiddlerInfo.multids","text/plain",
+			"--rendertiddlers","[prefix[$:/language/Docs/Types/]removeprefix[$:/language/Docs/Types/]]","$:/plugins/tiddlywiki/translators/templates/type-tid","language/Types","text/plain",".tid",
 			"--rendertiddlers","[prefix[$:/language/Help/]removeprefix[$:/language/Help/]]","$:/plugins/tiddlywiki/translators/templates/help-tid","language/Help","text/plain",".tid",
 			"--rendertiddlers","[prefix[$:/language/Modals/]removeprefix[$:/language/Modals/]]","$:/plugins/tiddlywiki/translators/templates/modal-tid","language/Modals","text/plain",".tid",
-			"--rendertiddlers","[prefix[$:/language/Docs/Types/]removeprefix[$:/language/Docs/Types/]]","$:/plugins/tiddlywiki/translators/templates/type-tid","language/Types","text/plain",".tid"]
+			"--rendertiddlers","[prefix[$:/language/Snippets/]removeprefix[$:/language/Snippets/]]","$:/plugins/tiddlywiki/translators/templates/snippet-tid","language/Snippets","text/plain",".tid"]
 	}
 }
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/TiddlyWiki_European_Meetup_2016.tid b/editions/tw5.com/tiddlers/TiddlyWiki_European_Meetup_2016.tid
new file mode 100644
index 000000000..9f48cffd2
--- /dev/null
+++ b/editions/tw5.com/tiddlers/TiddlyWiki_European_Meetup_2016.tid
@@ -0,0 +1,15 @@
+created: 20160712121509718
+modified: 20160712121548453
+tags: Meetups
+title: TiddlyWiki European Meetup 2016
+type: text/vnd.tiddlywiki
+
+http://tiddlywiki.com/tiddlywiki-eu-meetup-2016/
+
+Here's the stream of day 1:
+
+<iframe width="560" height="315" src="http://www.youtube.com/embed/7o0ClSI7Tdg" frameborder="0" allowfullscreen></iframe>
+
+Here's day 2:
+
+<iframe width="560" height="315" src="http://www.youtube.com/embed/ipXyZkC8tjM" frameborder="0" allowfullscreen></iframe>
diff --git a/editions/tw5.com/tiddlers/about/Developers.tid b/editions/tw5.com/tiddlers/about/Developers.tid
index 337cfe895..49bf553a3 100644
--- a/editions/tw5.com/tiddlers/about/Developers.tid
+++ b/editions/tw5.com/tiddlers/about/Developers.tid
@@ -1,6 +1,6 @@
 created: 20150412191004348
-modified: 20150412192640718
-tags: Community
+modified: 20160710150754023
+tags: Community Reference
 title: Developers
 type: text/vnd.tiddlywiki
 
diff --git a/editions/tw5.com/tiddlers/about/History of TiddlyWiki.tid b/editions/tw5.com/tiddlers/about/History of TiddlyWiki.tid
index 25456498c..52d01fb86 100644
--- a/editions/tw5.com/tiddlers/about/History of TiddlyWiki.tid	
+++ b/editions/tw5.com/tiddlers/about/History of TiddlyWiki.tid	
@@ -4,7 +4,9 @@ tags: About
 title: History of TiddlyWiki
 type: text/vnd.tiddlywiki
 
-//These are personal reflections on the history and development of TiddlyWiki from JeremyRuston//
+//These are personal reflections on the history and development of TiddlyWiki from JeremyRuston.//
+
+//There is also a [[podcast|https://changelog.com/196/]] discussing TiddlyWiki's backstory.//
 
 ! Origins of TiddlyWiki
 
diff --git a/editions/tw5.com/tiddlers/community/Articles.tid b/editions/tw5.com/tiddlers/community/Articles.tid
index a57b5813b..8408056cb 100644
--- a/editions/tw5.com/tiddlers/community/Articles.tid
+++ b/editions/tw5.com/tiddlers/community/Articles.tid
@@ -1,10 +1,10 @@
 created: 20140320230543190
-modified: 20140320231444981
+modified: 20160602172752299
 tags: Community
 title: Articles
 type: text/vnd.tiddlywiki
 
-Here are some recent articles written about ~TiddlyWiki. Submit new articles via GitHub, Twitter or by posting in the [[TiddlyWiki Groups]].
+Here are some recent articles written about ~TiddlyWiki. Submit new articles via GitHub, Twitter or by posting in the [[TiddlyWiki Groups|Forums]].
 
 <div class="tc-link-info">
 
diff --git a/editions/tw5.com/tiddlers/community/Contributor_License_Agreement.tid b/editions/tw5.com/tiddlers/community/Contributor License Agreement.tid
similarity index 68%
rename from editions/tw5.com/tiddlers/community/Contributor_License_Agreement.tid
rename to editions/tw5.com/tiddlers/community/Contributor License Agreement.tid
index 692e4b3d1..0ea575d17 100644
--- a/editions/tw5.com/tiddlers/community/Contributor_License_Agreement.tid
+++ b/editions/tw5.com/tiddlers/community/Contributor License Agreement.tid	
@@ -4,7 +4,7 @@ tags:
 title: Contributor License Agreement
 type: text/vnd.tiddlywiki
 
-Like other OpenSource projects, TiddlyWiki5 needs a signed contributor license agreement from individual contributors. This is a legal agreement that allows contributors  to assert that they own the copyright of their contribution, and that they agree to license it to the UnaMesa Association (the legal entity that owns TiddlyWiki on behalf of the community).
+Like other OpenSource projects, TiddlyWiki5 needs a signed contributor license agreement from individual contributors. This is a legal agreement that allows contributors to assert that they own the copyright of their contribution, and that they agree to license it to the UnaMesa Association (the legal entity that owns TiddlyWiki on behalf of the community).
 
 * For individuals use: [[licenses/CLA-individual|https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-individual.md]]
 * For entities use: [[licenses/CLA-entity|https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-entity.md]]
diff --git a/editions/tw5.com/tiddlers/community/Examples.tid b/editions/tw5.com/tiddlers/community/Examples.tid
index 92758c656..100cb8dba 100644
--- a/editions/tw5.com/tiddlers/community/Examples.tid
+++ b/editions/tw5.com/tiddlers/community/Examples.tid
@@ -1,12 +1,10 @@
 created: 20140320230543190
-modified: 20140916121854696
+modified: 20160602172745917
 tags: HelloThere Community
 title: Examples
 type: text/vnd.tiddlywiki
 
-This collection showcases inspiring and interesting examples of TiddlyWiki being used in the wild.
-
-Submit new entries to this collection via GitHub, Twitter or by posting in the [[TiddlyWiki Groups|Forums]].
+This collection showcases inspiring and interesting examples of ~TiddlyWiki being used in the wild. Submit new entries to this collection via GitHub, Twitter or by posting in the [[TiddlyWiki Groups|Forums]].
 
 <div class="tc-link-info">
 
diff --git a/editions/tw5.com/tiddlers/community/Forums.tid b/editions/tw5.com/tiddlers/community/Forums.tid
index 321e026b0..01bd492c2 100644
--- a/editions/tw5.com/tiddlers/community/Forums.tid
+++ b/editions/tw5.com/tiddlers/community/Forums.tid
@@ -1,5 +1,5 @@
 created: 20140721121924384
-modified: 20140911085048371
+modified: 20160610085048371
 tags: Community
 title: Forums
 type: text/vnd.tiddlywiki
@@ -21,3 +21,7 @@ The ~TiddlyWiki discussion groups are mailing lists for talking about ~TiddlyWik
 * Get involved in the [[development on GitHub|https://github.com/Jermolene/TiddlyWiki5]]
 
 New releases of TiddlyWiki, TiddlyDesktop and TiddlyFox are announced via the discussion groups and [[Twitter|https://twitter.com/TiddlyWiki]] (you can also subscribe to an Atom/RSS feed of [[TiddlyWiki releases from GitHub|https://github.com/jermolene/tiddlywiki5/releases.atom]])
+
+! Documentation
+
+There is also a discussion group specifically for discussing TiddlyWiki documentation improvement initiatives: http://groups.google.com/group/tiddlywikidocs
diff --git a/editions/tw5.com/tiddlers/community/Meetups.tid b/editions/tw5.com/tiddlers/community/Meetups.tid
index 988beb861..dbd08f612 100644
--- a/editions/tw5.com/tiddlers/community/Meetups.tid
+++ b/editions/tw5.com/tiddlers/community/Meetups.tid
@@ -1,11 +1,12 @@
 created: 20140721121924384
-modified: 20150612100205079
+modified: 20160712121508468
 tags: Community
 title: Meetups
 type: text/vnd.tiddlywiki
 
 Local meetings around the world for ~TiddlyWiki people:
 
+* The [[TiddlyWiki European Meetup 2016]] in Oxford, UK
 * [[OXTWIG]], the ''Oxford ~TiddlyWiki Interest Group'' meets monthly in Oxford, UK to share experiences of using TiddlyWiki
 * ''[[TiddlyWiki Camp Paris]]'' is an all day celebration and exploration of TiddlyWiki for experienced users and beginners alike
 
diff --git a/editions/tw5.com/tiddlers/community/Resources.tid b/editions/tw5.com/tiddlers/community/Resources.tid
index c35860372..3eede0437 100644
--- a/editions/tw5.com/tiddlers/community/Resources.tid
+++ b/editions/tw5.com/tiddlers/community/Resources.tid
@@ -1,10 +1,10 @@
 created: 20140320230543190
-modified: 20140320231444981
+modified: 20160602172731726
 tags: Community
 title: Resources
 type: text/vnd.tiddlywiki
 
-These are sites with resources created by the TiddlyWiki [[Community]] help you get the best out of TiddlyWiki: plugins, macros and more. Submit new entries via GitHub, Twitter or by posting in the [[TiddlyWiki Groups]].
+These are sites with resources created by the ~TiddlyWiki [[Community]] help you get the best out of ~TiddlyWiki: plugins, macros and more. Submit new entries via GitHub, Twitter or by posting in the [[TiddlyWiki Groups|Forums]].
 
 <div class="tc-link-info">
 
diff --git a/editions/tw5.com/tiddlers/community/Signing_the_Contributor_License_Agreement.tid b/editions/tw5.com/tiddlers/community/Signing the Contributor License Agreement.tid
similarity index 86%
rename from editions/tw5.com/tiddlers/community/Signing_the_Contributor_License_Agreement.tid
rename to editions/tw5.com/tiddlers/community/Signing the Contributor License Agreement.tid
index 63919d7a5..c77d052f2 100644
--- a/editions/tw5.com/tiddlers/community/Signing_the_Contributor_License_Agreement.tid
+++ b/editions/tw5.com/tiddlers/community/Signing the Contributor License Agreement.tid	
@@ -1,5 +1,5 @@
 created: 20150630205653005
-modified: 20150630210016774
+modified: 20160617151534171
 tags: 
 title: Signing the Contributor License Agreement
 type: text/vnd.tiddlywiki
@@ -9,7 +9,7 @@ Create a GitHub pull request to add your name to `cla-individual.md` or `cla-ent
 ''step by step''
 
 # Navigate to [[licenses/CLA-individual|https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-individual.md]] or [[licenses/CLA-entity|https://github.com/Jermolene/TiddlyWiki5/tree/master/licenses/cla-entity.md]] according to whether you are signing as an individual or representative of an organisation
-# Click the edit button at the top-right corner (clicking this button will fork the project so you can edit the file)
+# Click the "edit" button at the top-right corner (clicking this button will fork the project so you can edit the file)
 # Add your name at the bottom
 #* eg: `Jeremy Ruston, @Jermolene, 2011/11/22`
 # Below the edit box for the CLA text you should see a box labelled ''Propose file change''
diff --git a/editions/tw5.com/tiddlers/community/TiddlyWiki_Camp_Paris.tid b/editions/tw5.com/tiddlers/community/TiddlyWiki Camp Paris.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/community/TiddlyWiki_Camp_Paris.tid
rename to editions/tw5.com/tiddlers/community/TiddlyWiki Camp Paris.tid
diff --git a/editions/tw5.com/tiddlers/community/Translate TiddlyWiki into your language.tid b/editions/tw5.com/tiddlers/community/Translate TiddlyWiki into your language.tid
index a98cbca33..322f260b8 100644
--- a/editions/tw5.com/tiddlers/community/Translate TiddlyWiki into your language.tid	
+++ b/editions/tw5.com/tiddlers/community/Translate TiddlyWiki into your language.tid	
@@ -1,13 +1,16 @@
 created: 20141126153016142
-modified: 20141126153016142
+modified: 20160622141441383
 tags: Community
 title: Translate TiddlyWiki into your language
 type: text/vnd.tiddlywiki
 
 There is a special edition of TiddlyWiki that simplifies creating and maintaining translations:
 
-http://tiddlywiki.com/editions/translators/
+* http://tiddlywiki.com/editions/translators/ to translate current version of ~TiddlyWiki
+* http://tiddlywiki.com/prerelease/editions/translators/ to translate latest prerelease version of ~TiddlyWiki
 
 Note that no knowledge of Node.js or GitHub is required.
 
+You can translate ~TiddlyWiki on Node.js, type `tiddlywiki editions/translators --server` and visit http://127.0.0.1:8080/ in your browser.
+
 See http://tiddlywiki.com/dev for technical details of creating and maintaining translations.
diff --git a/editions/tw5.com/tiddlers/community/Tutorials.tid b/editions/tw5.com/tiddlers/community/Tutorials.tid
index 7d32a7b6a..3f006d8a9 100644
--- a/editions/tw5.com/tiddlers/community/Tutorials.tid
+++ b/editions/tw5.com/tiddlers/community/Tutorials.tid
@@ -1,9 +1,10 @@
-title: Tutorials
+created: 20140908125300000
+modified: 20160602172722526
 tags: Community
-created: 201409081253
-modified: 201409081253
+title: Tutorials
+type: text/vnd.tiddlywiki
 
-Here are some webpages with tips and tutorials related to ~TiddlyWiki 
+Here are some webpages with tips and tutorials related to ~TiddlyWiki.
 
 <div class="tc-link-info">
 
diff --git a/editions/tw5.com/tiddlers/community/articles/_A free, open source wiki revisited_ by Mark Gibbs, NetworkWorld.tid b/editions/tw5.com/tiddlers/community/articles/_A free, open source wiki revisited_ by Mark Gibbs, NetworkWorld.tid
new file mode 100644
index 000000000..dc402677a
--- /dev/null
+++ b/editions/tw5.com/tiddlers/community/articles/_A free, open source wiki revisited_ by Mark Gibbs, NetworkWorld.tid	
@@ -0,0 +1,16 @@
+created: 20160204225047445
+modified: 20160204225307847
+tags: Articles
+title: "A free, open source wiki revisited" by Mark Gibbs, NetworkWorld
+type: text/vnd.tiddlywiki
+url: http://www.networkworld.com/article/3028098/open-source-tools/tiddlywiki-a-free-open-source-wiki-revisited.html
+
+Interesting article giving the perspective of someone who has been away from TiddlyWiki for a few years:
+
+{{!!url}}
+
+<<<
+Way back in the mists of time (actually, January 2009) I wrote about a really cool tool called TiddlyWiki, a “non-linear personal web notebook”. Fast forward to today and I just had an out of body experience: Completely by accident I found a TiddlyWiki that I started when I wrote that piece and it still works! 
+
+Finding code that works flawlessly after just two or three years is magical enough but after seven years?! And given that TiddlyWiki is written as a single page Web application and considering how different browsers are now than they were in 2009, the fact that the old version of TiddlyWiki still works is not short of miraculous.
+<<<
diff --git a/editions/tw5.com/tiddlers/community/articles/Notizen mit TiddlyWiki systemubergreifend nutzen.tid b/editions/tw5.com/tiddlers/community/articles/_Notizen mit TiddlyWiki systemubergreifend nutzen_ by Michael Sonntag.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/community/articles/Notizen mit TiddlyWiki systemubergreifend nutzen.tid
rename to editions/tw5.com/tiddlers/community/articles/_Notizen mit TiddlyWiki systemubergreifend nutzen_ by Michael Sonntag.tid
diff --git a/editions/tw5.com/tiddlers/community/articles/_Setting_Up_a_Personal_TiddlyWiki_Server_on_OS_X__by_Kris_Johnson.tid b/editions/tw5.com/tiddlers/community/articles/_Setting Up a Personal TiddlyWiki Server on OS X_ by Kris Johnson.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/community/articles/_Setting_Up_a_Personal_TiddlyWiki_Server_on_OS_X__by_Kris_Johnson.tid
rename to editions/tw5.com/tiddlers/community/articles/_Setting Up a Personal TiddlyWiki Server on OS X_ by Kris Johnson.tid
diff --git a/editions/tw5.com/tiddlers/community/articles/TiddlyWiki 5 im Betatest.tid b/editions/tw5.com/tiddlers/community/articles/_TiddlyWiki 5 im Betatest_ by besim.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/community/articles/TiddlyWiki 5 im Betatest.tid
rename to editions/tw5.com/tiddlers/community/articles/_TiddlyWiki 5 im Betatest_ by besim.tid
diff --git a/editions/tw5.com/tiddlers/community/articles/TiddlyWiki by Sander de Boer.tid b/editions/tw5.com/tiddlers/community/articles/_TiddlyWiki_ by Sander de Boer.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/community/articles/TiddlyWiki by Sander de Boer.tid
rename to editions/tw5.com/tiddlers/community/articles/_TiddlyWiki_ by Sander de Boer.tid
diff --git a/editions/tw5.com/tiddlers/community/examples/thesisnotebook.tid b/editions/tw5.com/tiddlers/community/examples/A Thesis Notebook.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/community/examples/thesisnotebook.tid
rename to editions/tw5.com/tiddlers/community/examples/A Thesis Notebook.tid
diff --git a/editions/tw5.com/tiddlers/community/examples/PESpot_Lesson_Planner_by_Patrick_Detzner.tid b/editions/tw5.com/tiddlers/community/examples/PESpot Lesson Planner by Patrick Detzner.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/community/examples/PESpot_Lesson_Planner_by_Patrick_Detzner.tid
rename to editions/tw5.com/tiddlers/community/examples/PESpot Lesson Planner by Patrick Detzner.tid
diff --git a/editions/tw5.com/tiddlers/community/examples/Game.tid b/editions/tw5.com/tiddlers/community/examples/Simple Zork like Game.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/community/examples/Game.tid
rename to editions/tw5.com/tiddlers/community/examples/Simple Zork like Game.tid
diff --git a/editions/tw5.com/tiddlers/community/examples/TriTarget.org by Devin Weaver.tid b/editions/tw5.com/tiddlers/community/examples/TriTarget.org by Devin Weaver.tid
new file mode 100644
index 000000000..830394a33
--- /dev/null
+++ b/editions/tw5.com/tiddlers/community/examples/TriTarget.org by Devin Weaver.tid	
@@ -0,0 +1,14 @@
+created: 20160424111304190
+modified: 20160424112155381
+tags: Examples
+title: TriTarget.org by Devin Weaver
+type: text/vnd.tiddlywiki
+url: https://tritarget.org
+
+A personal website built with TiddlyWiki.
+
+{{!!url}}
+
+<<<
+TriTarget.org is a name I came up with in high school. I was big into computer programming and wanted a company name that was kinda catchy. When I made a few programs in BASIC I would brand them with TriTarget as a way to show off my company (Even though I didn't have one).
+<<<
diff --git a/editions/tw5.com/tiddlers/community/resources/Ace_Editor_Plugin_by_Joerg_Plewe.tid b/editions/tw5.com/tiddlers/community/resources/Ace Editor Plugin by Joerg Plewe.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/community/resources/Ace_Editor_Plugin_by_Joerg_Plewe.tid
rename to editions/tw5.com/tiddlers/community/resources/Ace Editor Plugin by Joerg Plewe.tid
diff --git a/editions/tw5.com/tiddlers/community/resources/DullRoar.tid b/editions/tw5.com/tiddlers/community/resources/DullRoar.tid
deleted file mode 100644
index b881b7e2c..000000000
--- a/editions/tw5.com/tiddlers/community/resources/DullRoar.tid
+++ /dev/null
@@ -1,14 +0,0 @@
-created: 20150102155658750
-modified: 20150102155658750
-tags: Resources
-title: "Dull Roar" by Jim Lehmer
-type: text/vnd.tiddlywiki
-url: http://dullroar.com/tiddlywiki5.html
-
-A collection of hints and tips from Jim Lehmer, published as a static blog generated by TiddlyWiki.
-
-{{!!url}}
-
-<<<
-There is a decent write-up on generating static pages using Tiddlywiki on the main TW site. However, there are a few nuances not mentioned on that page, so here are a few of my notes on how I generate the pages for this site.
-<<<
diff --git a/editions/tw5.com/tiddlers/community/resources/EncryptTiddlerPlugin.tid b/editions/tw5.com/tiddlers/community/resources/Encrypt single tiddler plugin.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/community/resources/EncryptTiddlerPlugin.tid
rename to editions/tw5.com/tiddlers/community/resources/Encrypt single tiddler plugin.tid
diff --git a/editions/tw5.com/tiddlers/community/resources/IndexedDB_Plugin_by_Andreas_Abeck.tid b/editions/tw5.com/tiddlers/community/resources/IndexedDB Plugin by Andreas Abeck.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/community/resources/IndexedDB_Plugin_by_Andreas_Abeck.tid
rename to editions/tw5.com/tiddlers/community/resources/IndexedDB Plugin by Andreas Abeck.tid
diff --git a/editions/tw5.com/tiddlers/community/resources/SeeAlso_by_Matias_Goldman.tid b/editions/tw5.com/tiddlers/community/resources/SeeAlso by Matias Goldman.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/community/resources/SeeAlso_by_Matias_Goldman.tid
rename to editions/tw5.com/tiddlers/community/resources/SeeAlso by Matias Goldman.tid
diff --git a/editions/tw5.com/tiddlers/community/resources/TWaddle_by_Matias_Goldman.tid b/editions/tw5.com/tiddlers/community/resources/TWaddle by Matias Goldman.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/community/resources/TWaddle_by_Matias_Goldman.tid
rename to editions/tw5.com/tiddlers/community/resources/TWaddle by Matias Goldman.tid
diff --git a/editions/tw5.com/tiddlers/community/resources/TiddlyChrome by Arlen Beiler.tid b/editions/tw5.com/tiddlers/community/resources/TiddlyChrome by Arlen Beiler.tid
new file mode 100644
index 000000000..acdc92002
--- /dev/null
+++ b/editions/tw5.com/tiddlers/community/resources/TiddlyChrome by Arlen Beiler.tid	
@@ -0,0 +1,10 @@
+created: 20160422143238688
+modified: 20160422143637775
+tags: Resources
+title: TiddlyChrome by Arlen Beiler
+type: text/vnd.tiddlywiki
+url: https://github.com/Arlen22/tiddly-chrome-app/
+
+An extension application for Google Chrome that enables TiddlyWiki to save changes directly to the file system.
+
+{{!!url}}
diff --git a/editions/tw5.com/tiddlers/community/resources/TiddlyWiki_Jingle_by_Måns_Mårtensson.tid b/editions/tw5.com/tiddlers/community/resources/TiddlyWiki Jingle by Mans Martensson.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/community/resources/TiddlyWiki_Jingle_by_Måns_Mårtensson.tid
rename to editions/tw5.com/tiddlers/community/resources/TiddlyWiki Jingle by Mans Martensson.tid
diff --git a/editions/tw5.com/tiddlers/community/resources/TiddlyWiki Posts.tid b/editions/tw5.com/tiddlers/community/resources/TiddlyWiki Posts.tid
index e1afdd139..1a091f57b 100644
--- a/editions/tw5.com/tiddlers/community/resources/TiddlyWiki Posts.tid	
+++ b/editions/tw5.com/tiddlers/community/resources/TiddlyWiki Posts.tid	
@@ -5,7 +5,7 @@ title: "TiddlyWiki Posts" by Jeffrey Kishner
 type: text/vnd.tiddlywiki
 url: http://blog.jeffreykishner.com/tiddlywiki/
 
-A collection of articles covering integration with Fargo, Font Awesome and Google Calendar, and  tips for managing task lists.
+A collection of articles covering integration with Fargo, Font Awesome and Google Calendar, and tips for managing task lists.
 
 {{!!url}}
 
diff --git a/editions/tw5.com/tiddlers/community/resources/TiddlyWiki_Video_Tutorials_by_Francis_Meetze.tid b/editions/tw5.com/tiddlers/community/resources/TiddlyWiki Video Tutorials by Francis Meetze.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/community/resources/TiddlyWiki_Video_Tutorials_by_Francis_Meetze.tid
rename to editions/tw5.com/tiddlers/community/resources/TiddlyWiki Video Tutorials by Francis Meetze.tid
diff --git a/editions/tw5.com/tiddlers/community/resources/TiddlyWiki extensions for Sublime Text 3 by roma0104.tid b/editions/tw5.com/tiddlers/community/resources/TiddlyWiki extensions for Sublime Text 3 by roma0104.tid
new file mode 100644
index 000000000..faae8a3d2
--- /dev/null
+++ b/editions/tw5.com/tiddlers/community/resources/TiddlyWiki extensions for Sublime Text 3 by roma0104.tid	
@@ -0,0 +1,10 @@
+created: 20160424121451825
+modified: 20160424121733860
+tags: Resources
+title: TiddlyWiki extensions for Sublime Text 3 by roma0104
+type: text/vnd.tiddlywiki
+url: https://github.com/roma0104/sublime-tid
+
+[[Sublime Text 3|https://www.sublimetext.com/3]] syntax file for TiddlyWiki5 `*.tid` files.
+
+{{!!url}}
diff --git a/editions/tw5.com/tiddlers/community/resources/TiddlyWiki-zh.tid b/editions/tw5.com/tiddlers/community/resources/TiddlyWiki wu.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/community/resources/TiddlyWiki-zh.tid
rename to editions/tw5.com/tiddlers/community/resources/TiddlyWiki wu.tid
diff --git a/editions/tw5.com/tiddlers/community/resources/Wills gTD.tid b/editions/tw5.com/tiddlers/community/resources/Wills QnD gTD.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/community/resources/Wills gTD.tid
rename to editions/tw5.com/tiddlers/community/resources/Wills QnD gTD.tid
diff --git a/editions/tw5.com/tiddlers/community/resources/In My Socks by Jed Carty.tid b/editions/tw5.com/tiddlers/community/resources/_In My Socks_ by Jed Carty.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/community/resources/In My Socks by Jed Carty.tid
rename to editions/tw5.com/tiddlers/community/resources/_In My Socks_ by Jed Carty.tid
diff --git a/editions/tw5.com/tiddlers/community/resources/_Mal's Sandbox_ by Mal.tid b/editions/tw5.com/tiddlers/community/resources/_Mal's Sandbox_ by Mal.tid
new file mode 100644
index 000000000..189b90b16
--- /dev/null
+++ b/editions/tw5.com/tiddlers/community/resources/_Mal's Sandbox_ by Mal.tid	
@@ -0,0 +1,20 @@
+created: 20160501131111865
+modified: 20160501131900615
+tags: Resources
+title: "Mal's Sandbox" by Mal
+type: text/vnd.tiddlywiki
+url: http://malsandbox.tiddlyspot.com
+
+A collection of extensions by [[@malgam|https://github.com/malgam]]
+
+{{!!url}}
+
+<<<
+The "loadnew" plugin provides the JavaScript module $:/plugins/malgam/loadnew/loadnew.js that implements an incremental load command for Tiddlywiki 5.
+
+The javascript code is based on the built-in module $:/core/modules/commands/load.js that loads tiddlers from a Tiddlywiki file into a node.js Tiddlywiki instance. This command loads all non-system tiddlers, irrespective of whether they have been modified since last loaded. As a result, all tiddlers in the node.js tiddlers folder will end up with a new modification date.
+
+In contrast, the loadnew command only loads tiddlers that either don't already exist in the tiddlers folder, or have a newer modified date than the existing tiddler.
+
+With a backup strategy that uses a file system snapshot process to preserve historical versions of tiddlers, the loadnew command minimises the sizes of the resulting snapshots.
+<<<
diff --git a/editions/tw5.com/tiddlers/community/resources/_SK_Plugins_ by Stephen Kimmel.tid b/editions/tw5.com/tiddlers/community/resources/_SK_Plugins_ by Stephen Kimmel.tid
new file mode 100644
index 000000000..764acdf9e
--- /dev/null
+++ b/editions/tw5.com/tiddlers/community/resources/_SK_Plugins_ by Stephen Kimmel.tid	
@@ -0,0 +1,14 @@
+created: 20160505180545073
+modified: 20160505180934836
+tags: Resources
+title: "SK Plugins" by Stephen Kimmel
+type: text/vnd.tiddlywiki
+url: http://skplugins.tiddlyspot.com/
+
+A collection of plugins by Stephen Kimmel, including a number of additional editor toolbar buttons.
+
+{{!!url}}
+
+<<<
+In keeping with the general spirit of the TiddlyWiki community, ie, you develop something useful and/or potentially interesting you share it with others, I'm sharing some of the plugins I've developed to go with the new Editor Toolbar. You'll find them and a more extensive discussion of what each does at http://skplugins.tiddlyspot.com/ 
+<<<
diff --git a/editions/tw5.com/tiddlers/community/resources/TeXZilla  plugin by Joe Renes.tid b/editions/tw5.com/tiddlers/community/resources/_TW5-TeXZilla_ plugin by Joe Renes.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/community/resources/TeXZilla  plugin by Joe Renes.tid
rename to editions/tw5.com/tiddlers/community/resources/_TW5-TeXZilla_ plugin by Joe Renes.tid
diff --git a/editions/tw5.com/tiddlers/community/resources/TWeb.at from Mario Pietsch.tid b/editions/tw5.com/tiddlers/community/resources/_TWeb.at_ by Mario Pietsch.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/community/resources/TWeb.at from Mario Pietsch.tid
rename to editions/tw5.com/tiddlers/community/resources/_TWeb.at_ by Mario Pietsch.tid
diff --git a/editions/tw5.com/tiddlers/community/resources/Bourbon from mkt_memory.tid b/editions/tw5.com/tiddlers/community/resources/_TiddlyWiki5 Bourbon_ from mkt_memory.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/community/resources/Bourbon from mkt_memory.tid
rename to editions/tw5.com/tiddlers/community/resources/_TiddlyWiki5 Bourbon_ from mkt_memory.tid
diff --git a/editions/tw5.com/tiddlers/community/resources/datepicker based on Pikaday.tid b/editions/tw5.com/tiddlers/community/resources/datepicker based on Pikaday.tid
index 754f634db..d7e26eeca 100644
--- a/editions/tw5.com/tiddlers/community/resources/datepicker based on Pikaday.tid	
+++ b/editions/tw5.com/tiddlers/community/resources/datepicker based on Pikaday.tid	
@@ -8,5 +8,5 @@ url: http://kixam.github.io/TW5-datePicker/
 An interactive date picker plugin based on [[Pikaday|https://github.com/dbushell/Pikaday]]. A demo can be found here: {{!!url}}.
 
 <<<
-datepicker is a TiddlyWiki plugin that allows you to use a widget much like EditTextWidget to pick a date (not a time). It shows a nice interactive mini-calendar when clicked, allows you to set a date format for display, and is compatible with core date fields such as `modified` and `created`.
+datepicker is a TiddlyWiki plugin that allows you to use a widget much like EditTextWidget to pick a date, and optionaly a time. It shows a nice interactive mini-calendar when clicked, allows you to set a date format for display, and is compatible with core date fields such as `modified` and `created`.
 <<<
diff --git a/editions/tw5.com/tiddlers/community/resources/rboue's_plugins_for_TiddlyWiki.tid b/editions/tw5.com/tiddlers/community/resources/rboue's plugins for TiddlyWiki.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/community/resources/rboue's_plugins_for_TiddlyWiki.tid
rename to editions/tw5.com/tiddlers/community/resources/rboue's plugins for TiddlyWiki.tid
diff --git a/editions/tw5.com/tiddlers/community/resources/twproxy by Steve Gattuso.tid b/editions/tw5.com/tiddlers/community/resources/twproxy by Steve Gattuso.tid
new file mode 100644
index 000000000..20da1617e
--- /dev/null
+++ b/editions/tw5.com/tiddlers/community/resources/twproxy by Steve Gattuso.tid	
@@ -0,0 +1,16 @@
+created: 20160424150055313
+modified: 20160424150236151
+tags: Resources
+title: twproxy by Steve Gattuso
+type: text/vnd.tiddlywiki
+url: https://github.com/stevenleeg/twproxy
+
+An authentication proxy for your TiddlyWiki.
+
+{{!!url}}
+
+<<<
+One of my favorite aspects of TiddlyWiki has been that it's web-based, making it possible for me to access my wiki from everywhere (especially my phone). That being said, I'm a bit paranoid, so I was left a bit unsatisfied with the tiddlywiki server's HTTP basic auth for protecting my wiki. ~23 commits later, I've created something called twproxy that I'd like to share with you all today, as I'm hoping somebody other than myself will find it useful.
+
+Essentially it is a simple proxy that puts your wiki behind a username, password, and optional 2-factor auth prompt. This gives you added security in addition to the ability to remember your credentials past one browsing session (I was getting sick and tired of typing my username/password in over and over using basic auth).
+<<<
diff --git a/editions/tw5.com/tiddlers/community/tutorials/Creating a baby journal with TiddlyWiki.tid b/editions/tw5.com/tiddlers/community/tutorials/Creating a baby journal with TiddlyWiki 5.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/community/tutorials/Creating a baby journal with TiddlyWiki.tid
rename to editions/tw5.com/tiddlers/community/tutorials/Creating a baby journal with TiddlyWiki 5.tid
diff --git a/editions/tw5.com/tiddlers/concepts/ColourPalettes.tid b/editions/tw5.com/tiddlers/concepts/ColourPalettes.tid
index fd3cdf181..b52d8913b 100644
--- a/editions/tw5.com/tiddlers/concepts/ColourPalettes.tid
+++ b/editions/tw5.com/tiddlers/concepts/ColourPalettes.tid
@@ -1,5 +1,5 @@
 created: 20140216102454178
-modified: 20150221154036000
+modified: 20160617101212889
 tags: Concepts
 title: ColourPalettes
 type: text/vnd.tiddlywiki
@@ -12,7 +12,7 @@ table-border: #ccc
 ...
 ```
 
-Several palettes form part of the core. The system tiddler [[$:/palette]] always contains the title of the currently selected palette tiddler.
+Several palettes form part of the core. The system tiddler [[$:/palette]] always contains the title of the currently selected palette tiddler. You can change a palette using the {{$:/core/images/palette}} ''palette'' button, found on the "Tools" tab in the sidebar.
 
 To retrieve the value of a named colour from the current palette, e.g. for use in a stylesheet tiddler, use the <<.mlink colour>> macro:
 
diff --git a/editions/tw5.com/tiddlers/concepts/CurrentTiddler.tid b/editions/tw5.com/tiddlers/concepts/Current Tiddler.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/concepts/CurrentTiddler.tid
rename to editions/tw5.com/tiddlers/concepts/Current Tiddler.tid
diff --git a/editions/tw5.com/tiddlers/concepts/DataTiddlers.tid b/editions/tw5.com/tiddlers/concepts/DataTiddlers.tid
index d03be08aa..af1cda446 100644
--- a/editions/tw5.com/tiddlers/concepts/DataTiddlers.tid
+++ b/editions/tw5.com/tiddlers/concepts/DataTiddlers.tid
@@ -12,7 +12,7 @@ There are two standard formats:
 
 Other formats of tiddler can also be parsed to yield blocks of data that behave like data tiddlers.
 
-Use a TextReference to look up a value by its name. For example, if a [[DictionaryTiddler|DictionaryTiddlers]] called `MonthDays` contains:
+Use a TextReference to look up the value of a named property. For example, if a [[DictionaryTiddler|DictionaryTiddlers]] called `MonthDays` contains:
 
 ```
 oct:31
@@ -29,3 +29,5 @@ The same is true if `MonthDays` is a [[JSONTiddler|JSONTiddlers]] with the follo
 ```
 
 Note: //It is currently only possible to retrieve data from the immediate properties of the root object of a JSONTiddler.//
+
+The widgets ActionSetFieldWidget and ActionListopsWidget can manipulate named properties of data tiddlers by indicating the name of the property in the $index attribute. To create or modify a named property with ActionSetFieldWidget, provide a $value attribute. To delete a named property with ActionSetFieldWidget, omit the $value attribute. ActionListopsWidget assigns the named property the list constructed through its $filter and $subfilter attributes.
diff --git a/editions/tw5.com/tiddlers/concepts/DateFields.tid b/editions/tw5.com/tiddlers/concepts/Date Fields.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/concepts/DateFields.tid
rename to editions/tw5.com/tiddlers/concepts/Date Fields.tid
diff --git a/editions/tw5.com/tiddlers/concepts/DominantAppend.tid b/editions/tw5.com/tiddlers/concepts/Dominant Append.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/concepts/DominantAppend.tid
rename to editions/tw5.com/tiddlers/concepts/Dominant Append.tid
diff --git a/editions/tw5.com/tiddlers/concepts/HardAndSoftLinks.tid b/editions/tw5.com/tiddlers/concepts/Hard and Soft Links.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/concepts/HardAndSoftLinks.tid
rename to editions/tw5.com/tiddlers/concepts/Hard and Soft Links.tid
diff --git a/editions/tw5.com/tiddlers/concepts/Modules.tid b/editions/tw5.com/tiddlers/concepts/Modules.tid
index cc48f3a28..30630b66f 100644
--- a/editions/tw5.com/tiddlers/concepts/Modules.tid
+++ b/editions/tw5.com/tiddlers/concepts/Modules.tid
@@ -1,9 +1,9 @@
 created: 20131129162919588
-modified: 20131129162935396
+modified: 20160610082237902
 tags: Concepts
 title: Modules
 type: text/vnd.tiddlywiki
 
 A //module// in TiddlyWiki5 is a tiddler containing executable JavaScript, of the type `application/javascript` and with the field `module-type` set to the ModuleType of the module.
 
-See [[ControlPanel|$:/ControlPanel]] > ''Info'' > ''Advanced'' > ''Loaded Modules'' for a list of currently loaded modules.
+See [[control panel|$:/ControlPanel]] {{$:/core/images/options-button}} > ''Info'' > ''Advanced'' > ''Loaded Modules'' for a list of currently loaded modules.
diff --git a/editions/tw5.com/tiddlers/concepts/OrderOfTaggedTiddlers.tid b/editions/tw5.com/tiddlers/concepts/Order of Tagged Tiddlers.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/concepts/OrderOfTaggedTiddlers.tid
rename to editions/tw5.com/tiddlers/concepts/Order of Tagged Tiddlers.tid
diff --git a/editions/tw5.com/tiddlers/concepts/PermaLinks.tid b/editions/tw5.com/tiddlers/concepts/PermaLinks.tid
index 52c7b0225..c842c8e2d 100644
--- a/editions/tw5.com/tiddlers/concepts/PermaLinks.tid
+++ b/editions/tw5.com/tiddlers/concepts/PermaLinks.tid
@@ -1,5 +1,5 @@
 created: 20140502213500000
-modified: 20140912141257569
+modified: 20160622111355787
 tags: Features Concepts
 title: PermaLinks
 type: text/vnd.tiddlywiki
@@ -8,7 +8,7 @@ Permalinks allow direct links to individual tiddlers within a TiddlyWiki.
 
 ! Simple Permalinks
 
-The simplest form of permalink is a single target tiddler title appended to the base URL with `#`:
+The simplest form of permalink ({{$:/core/images/permalink-button}}) is a single target tiddler title appended to the base URL with `#`:
 
 http://tiddlywiki.com/#HelloThere
 
@@ -32,7 +32,7 @@ If the target tiddler isn't present in the story list then it is automatically i
 
 It is also possible to specify a story filter without specifying a target tiddler for navigation:
 
-<a href="http://tiddlywiki.com/#:[tags[task]]">~http://tiddlywiki.com/#:[tags[task]]</a>
+<a href="http://tiddlywiki.com/#:[tags[task]]" rel="noopener noreferrer">~http://tiddlywiki.com/#:[tags[task]]</a>
 
 ! About URL encoding
 
@@ -42,7 +42,7 @@ Both the target tiddler title and the story filter should be URL encoded (but no
 
 ! Permalink Behaviour
 
-Two important aspects of TiddlyWiki's behaviour with permalinks can be controlled via options in the $:/ControlPanel ''Advanced/Settings'' tab:
+Two important aspects of TiddlyWiki's behaviour with permalinks can be controlled via options in the [[control panel|$:/ControlPanel]] {{$:/core/images/options-button}} ''Settings'' tab:
 
 * Whether to automatically update the address bar at each navigation, and if so whether to include the story sequence as well as the target tiddler
 * Whether the updates to the address bar should affect browser history. The default is ''no''; when switched to ''yes'' you can rewind navigation between tiddlers using the browser back and forward buttons
diff --git a/editions/tw5.com/tiddlers/concepts/RailroadDiagrams.tid b/editions/tw5.com/tiddlers/concepts/Railroad Diagrams.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/concepts/RailroadDiagrams.tid
rename to editions/tw5.com/tiddlers/concepts/Railroad Diagrams.tid
diff --git a/editions/tw5.com/tiddlers/concepts/SelectionConstructors.tid b/editions/tw5.com/tiddlers/concepts/Selection Constructors.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/concepts/SelectionConstructors.tid
rename to editions/tw5.com/tiddlers/concepts/Selection Constructors.tid
diff --git a/editions/tw5.com/tiddlers/concepts/Story_River.tid b/editions/tw5.com/tiddlers/concepts/Story River.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/concepts/Story_River.tid
rename to editions/tw5.com/tiddlers/concepts/Story River.tid
diff --git a/editions/tw5.com/tiddlers/concepts/SystemTags.tid b/editions/tw5.com/tiddlers/concepts/SystemTags.tid
index 6742b1351..64a9b4d47 100644
--- a/editions/tw5.com/tiddlers/concepts/SystemTags.tid
+++ b/editions/tw5.com/tiddlers/concepts/SystemTags.tid
@@ -1,5 +1,5 @@
 created: 20130822080600000
-modified: 20140906224046452
+modified: 20160215115150854
 tags: Concepts
 title: SystemTags
 type: text/vnd.tiddlywiki
@@ -20,6 +20,7 @@ These are the available system tags
 * {{$:/tags/ControlPanel/Info||$:/core/ui/TagTemplate}} for control panel info tabs
 * {{$:/tags/ControlPanel/Settings||$:/core/ui/TagTemplate}} for control panel settings tabs
 * {{$:/tags/ControlPanel/Toolbars||$:/core/ui/TagTemplate}} for control panel toolbar customisation tabs
+* {{$:/tags/EditPreview||$:/core/ui/TagTemplate}} for custom preview panes
 * {{$:/tags/EditTemplate||$:/core/ui/TagTemplate}} for the edit template
 * {{$:/tags/EditToolbar||$:/core/ui/TagTemplate}} for the edit mode tiddler toolbar
 * {{$:/tags/Exporter||$:/core/ui/TagTemplate}} for the exporters
@@ -37,6 +38,7 @@ These are the available system tags
 * {{$:/tags/Stylesheet||$:/core/ui/TagTemplate}} to indicate that a tiddler should be applied as a CSS stylesheet
 * {{$:/tags/TiddlerInfo||$:/core/ui/TagTemplate}} for tiddler info panel tabs
 * {{$:/tags/TiddlerInfo/Advanced||$:/core/ui/TagTemplate}} for tabs under the advanced tiddler tab
+* {{$:/tags/ToolbarButtonStyle||$:/core/ui/TagTemplate}} for the style of the buttons
 * {{$:/tags/TopLeftBar||$:/core/ui/TagTemplate}} for the top left bar
 * {{$:/tags/TopRightBar||$:/core/ui/TagTemplate}} for the top right bar
 * {{$:/tags/ViewTemplate||$:/core/ui/TagTemplate}} for the view template
diff --git a/editions/tw5.com/tiddlers/concepts/TiddlerFields.tid b/editions/tw5.com/tiddlers/concepts/TiddlerFields.tid
index f72e55e80..6d6096e81 100644
--- a/editions/tw5.com/tiddlers/concepts/TiddlerFields.tid
+++ b/editions/tw5.com/tiddlers/concepts/TiddlerFields.tid
@@ -1,5 +1,5 @@
 created: 20130825213300000
-modified: 20140419151511111
+modified: 20160610081054535
 tags: Concepts
 title: TiddlerFields
 type: text/vnd.tiddlywiki
@@ -19,6 +19,7 @@ The standard fields are:
 |`tags` |TagsField |<<lingo tags>> |
 |`type` |TypeField |<<lingo type>> |
 |`list` |ListField |<<lingo list>> |
+|`caption` |CaptionField |<<lingo caption>> |
 
 Other fields used by the core are:
 
@@ -41,4 +42,4 @@ The TiddlyWebAdaptor uses a few more fields:
 |`bag` |BagField |<<lingo bag>> |
 |`revision` |RevisionField |<<lingo revision>> |
 
-See the ''Advanced > TiddlerFields'' tab of the [[control panel|$:/ControlPanel]] for details of the fields used in this wiki.
+See the ''Advanced > Tiddler Fields'' tab of the [[control panel|$:/ControlPanel]] {{$:/core/images/options-button}} for details of the fields used in this wiki.
diff --git a/editions/tw5.com/tiddlers/concepts/TiddlyWiki.tid b/editions/tw5.com/tiddlers/concepts/TiddlyWiki.tid
index 367842920..2256cd876 100644
--- a/editions/tw5.com/tiddlers/concepts/TiddlyWiki.tid
+++ b/editions/tw5.com/tiddlers/concepts/TiddlyWiki.tid
@@ -6,7 +6,7 @@ type: text/vnd.tiddlywiki
 
 ~TiddlyWiki is a rich, interactive tool for manipulating complex data with structure that doesn't easily fit into conventional tools like spreadsheets or wordprocessors.
 
-~TiddlyWiki is designed to fit around your brain, helping you deal with the things that won't fit. The [[fundamental idea|Philosophy of Tiddlers]] is that information is more useful and reusable if we cut it up into the smallest semantically meaningful chunks -- [[tiddlers|Tiddlers]] -- and give them titles so that they can be [[structured|Structuring TiddlyWiki]] with [[links|TiddlerLinks]], [[tags|Tagging]], [[lists|ListField]] and [[macros|Macros]].  Tiddlers use a WikiText notation that concisely represents a wide range of text formatting and hypertext features. ~TiddlyWiki aims to provide a fluid interface for working with tiddlers, allowing them to be aggregated and composed into longer narratives.
+~TiddlyWiki is designed to fit around your brain, helping you deal with the things that won't fit. The [[fundamental idea|Philosophy of Tiddlers]] is that information is more useful and reusable if we cut it up into the smallest semantically meaningful chunks -- [[tiddlers|Tiddlers]] -- and give them titles so that they can be [[structured|Structuring TiddlyWiki]] with [[links|TiddlerLinks]], [[tags|Tagging]], [[lists|ListField]] and [[macros|Macros]]. Tiddlers use a WikiText notation that concisely represents a wide range of text formatting and hypertext features. ~TiddlyWiki aims to provide a fluid interface for working with tiddlers, allowing them to be aggregated and composed into longer narratives.
 
 People love using ~TiddlyWiki. Because it can be used without any complicated server infrastructure, and because it is [[open source|OpenSource]], it has bought unprecedented freedom to everyone to keep their precious information under their own control.
 
diff --git a/editions/tw5.com/tiddlers/concepts/TiddlyWiki5.tid b/editions/tw5.com/tiddlers/concepts/TiddlyWiki5.tid
index 6e6262b02..53b958d1a 100644
--- a/editions/tw5.com/tiddlers/concepts/TiddlyWiki5.tid
+++ b/editions/tw5.com/tiddlers/concepts/TiddlyWiki5.tid
@@ -2,5 +2,6 @@ created: 201308252136
 modified: 201308252136
 tags: Concepts
 title: TiddlyWiki5
+type: text/vnd.tiddlywiki
 
-TiddlyWiki5 is a reboot of TiddlyWiki for the next 25 years. It is a complete interactive wiki in JavaScript that can be run in the browser or on the server under [[Node.js]].
+~TiddlyWiki5 is a reboot of TiddlyWiki for the next 25 years. It is a complete interactive wiki in JavaScript that can be run in the browser or on the server under [[Node.js]].
diff --git a/editions/tw5.com/tiddlers/concepts/TiddlyWikiFolders.tid b/editions/tw5.com/tiddlers/concepts/TiddlyWikiFolders.tid
index 2b846b0d5..839da5341 100644
--- a/editions/tw5.com/tiddlers/concepts/TiddlyWikiFolders.tid
+++ b/editions/tw5.com/tiddlers/concepts/TiddlyWikiFolders.tid
@@ -1,124 +1,40 @@
 created: 20130825214200000
-modified: 20150728104424501
+modified: 20161015134454785
 tags: [[TiddlyWiki on Node.js]]
 title: TiddlyWikiFolders
 type: text/vnd.tiddlywiki
 
 As well as traditional single file wikis, [[TiddlyWiki on Node.js]] supports wikis that are stored as a folder of individual tiddler files.
 
-! Wiki folder files and folders
+! Wiki Folder Structure
 
 Wiki folders can contain the following files and folders:
 
-* ''tiddlywiki.info'' - JSON file containing metadata for the wiki
+* ''tiddlywiki.info'' - JSON file containing metadata for the wiki -- see [[tiddlywiki.info Files]]
 * ''\tiddlers'' - folder containing tiddler files comprising the wiki
-* ''\plugins'' - folder containing [[plugin folders|PluginMechanism]] to be included in the wiki
+* ''\plugins'' - folder containing [[plugin folders|PluginFolders]] to be included in the wiki
+* ''\languages'' - folder containing [[plugin folders|PluginFolders]] for language plugins to be included in the wiki
+* ''\themes'' - folder containing [[plugin folders|PluginFolders]] for theme plugins to be included in the wiki
 
-Only the ''tiddlywiki.info'' file is required, the ''tiddlers'' and ''plugins'' folders are optional. Any files and folders not listed above are ignored.
+Only the ''tiddlywiki.info'' file is required; everything else is optional. Any files and folders not listed above are ignored.
 
-!! Content of `tiddlywiki.info` file
+!! Plugin processing
 
-The `tiddlywiki.info` file in a wiki folder contains a JSON object comprising the following fields:
-
-* ''plugins'' - an array of plugin names to be included in the wiki
-* ''themes'' - an array of theme names to be included in the wiki
-* ''languages'' - an array of language names to be included in the wiki
-* ''includeWikis'' - an array of references to external wiki folders to be included in the wiki
-* ''build'' - a hashmap of named build targets, each defined by an array of command tokens (see BuildCommand)
-* ''config'' - an optional hashmap of configuration options (see below)
-
-!!! ''includeWikis''
-
-The entries in the ''includeWikis'' array can be either a string specifying the relative path to the wiki, or an object with the following fields:
-
-* ''path'' - relative path to wiki folder
-* ''read-only'' - set //true// to prevent the tiddlers in the included wiki from being modified. The modifications will be written to the directory specified in ''default-tiddler-location'', described below
-
-!!! ''build''
-
-Note that the build targets of included wikis are merged if a target of that name isn't defined in the current `tiddlywiki.info` file.
-
-!!! ''config''
-
-Configuration options include:
-
-* ''default-tiddler-location'' - a string path to the default location for the filesystem adaptor to save new tiddlers (resolved relative to the wiki folder)
-
-* ''retain-original-tiddler-path'' - If true, the server will generate a tiddler [[$:/config/OriginalTiddlerPaths]] containing the original file paths of each tiddler in the wiki
-
-!!! Example
-
-For example:
+To be usable in the browser, plugins just need to be included in the wiki. For wikis that are generated on the server, TiddlyWikiFolders can contain a [[tiddlywiki.info file|tiddlywiki.info Files]] that identifies the plugins to be included in this wiki:
 
 ```
 {
 	"plugins": [
-		"tiddlywiki/tiddlyweb",
-		"tiddlywiki/filesystem"
-	],
-	"includeWikis": [
-		"../tw5.com"
-	],
-	"build": {
-		"index": [
-			"--rendertiddler","$:/core/save/all","index.html","text/plain"],
-		"favicon": [
-			"--savetiddler","$:/favicon.ico","favicon.ico",
-			"--savetiddler","$:/green_favicon.ico","static/favicon.ico"]
-	},
-	"config": {
-		"retain-original-tiddler-path": true	
-	}
-}
-```
-
-!! Content of `tiddlers` folder
-
-All the TiddlerFiles in the `tiddlers` folder are read into the wiki at startup. Sub-folders are scanned recursively for TiddlerFiles.
-
-Sub-folders within the `tiddlers` folder can also be given a `tiddlywiki.files` JSON file that overrides the default processing for that folder. The file format is illustrated with this example:
-
-```
-{
-	"tiddlers": [
-		{
-			"file": "d3.min.js",
-			"fields": {
-				"type": "application/javascript",
-				"title": "$:/plugins/tiddlywiki/d3/d3.js",
-				"module-type": "library"
-			},
-			"prefix": "var d3;if($tw.browser){\n",
-			"suffix": "}\nexports.d3 = d3;\n"
-		},
-		{
-			"file": "cloud/d3.layout.cloud.js",
-			"fields": {
-				"type": "application/javascript",
-				"title": "$:/plugins/tiddlywiki/d3/d3.layout.cloud.js",
-				"module-type": "library"
-			}
-		},
-		{
-			"file": "local/mytiddler.tid",
-			"isTiddlerFile": true,
-			"fields": {
-				"title": "A different title"
-			}
-		}
-	],
-	"directories": [
-		"../../mytiddlers/store"
+		"tiddlywiki/slider",
+		"tiddlytools/chooser"
 	]
 }
 ```
 
-The JSON data consists of an object with a `tiddlers` property that contains an array of information about each tiddler to be loaded into the wiki. That information consists of:
+Plugins names refer to plugin folders listed in TiddlyWiki5's root `plugins` folder. Plugins can also be included manually by copying them into the `plugins` subfolder of the wiki.
 
-* The relative or absolute path to the file to include as either:
-** `file`: the file containing the tiddler
-** `isTiddlerFile`: if `true`, the file will be deserialised to extract the tiddlers. Otherwise, the raw content of the file is assigned to the `text` field without any parsing
-* `fields`: an object containing fields that override any provided in the tiddler file
-* `prefix` & `suffix`: (optional) specify strings to be prefixed and suffixed to the tiddler file text content
+!! Processing of `tiddlers` folder
 
-The ''directories'' property allows a list of directories to be specified. All tiddlers will be recursively loaded from each directory listed.
+All the TiddlerFiles in the `tiddlers` folder are read into the wiki at startup. Sub-folders are scanned recursively for TiddlerFiles. Newly created tiddlers are stored in TiddlerFiles directly beneath the `tiddlers` folder, unless [[configured otherwise|Customising Tiddler File Naming]].
+
+The default processing for sub-folders within the `tiddlers` folder can  be overridden by providing a JSON file called `tiddlywiki.files` -- see [[tiddlywiki.files Files]].
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/concepts/TitleList.tid b/editions/tw5.com/tiddlers/concepts/Title List.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/concepts/TitleList.tid
rename to editions/tw5.com/tiddlers/concepts/Title List.tid
diff --git a/editions/tw5.com/tiddlers/concepts/TitleSelection.tid b/editions/tw5.com/tiddlers/concepts/Title Selection.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/concepts/TitleSelection.tid
rename to editions/tw5.com/tiddlers/concepts/Title Selection.tid
diff --git a/editions/tw5.com/tiddlers/definitions/CascadingStyleSheets.tid b/editions/tw5.com/tiddlers/definitions/Cascading Style Sheets.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/definitions/CascadingStyleSheets.tid
rename to editions/tw5.com/tiddlers/definitions/Cascading Style Sheets.tid
diff --git a/editions/tw5.com/tiddlers/definitions/CommaSeparatedValues.tid b/editions/tw5.com/tiddlers/definitions/Comma Separated Values.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/definitions/CommaSeparatedValues.tid
rename to editions/tw5.com/tiddlers/definitions/Comma Separated Values.tid
diff --git a/editions/tw5.com/tiddlers/definitions/DataURI.tid b/editions/tw5.com/tiddlers/definitions/Data URI.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/definitions/DataURI.tid
rename to editions/tw5.com/tiddlers/definitions/Data URI.tid
diff --git a/editions/tw5.com/tiddlers/definitions/Definitions.tid b/editions/tw5.com/tiddlers/definitions/Definitions.tid
index 42ec9cde0..b60d21ab6 100644
--- a/editions/tw5.com/tiddlers/definitions/Definitions.tid
+++ b/editions/tw5.com/tiddlers/definitions/Definitions.tid
@@ -3,6 +3,7 @@ created: 201308251451
 modified: 201308251451
 title: Definitions
 tags: Reference
+type: text/vnd.tiddlywiki
 
 These are definitions of technical words and phrases used in this documentation. (As distinct from the [[Concepts]] that make up TiddlyWiki itself).
 
diff --git a/editions/tw5.com/tiddlers/definitions/DocumentObjectModel.tid b/editions/tw5.com/tiddlers/definitions/Document Object Model.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/definitions/DocumentObjectModel.tid
rename to editions/tw5.com/tiddlers/definitions/Document Object Model.tid
diff --git a/editions/tw5.com/tiddlers/definitions/HyperTextMarkupLanguage.tid b/editions/tw5.com/tiddlers/definitions/HyperText Markup Language.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/definitions/HyperTextMarkupLanguage.tid
rename to editions/tw5.com/tiddlers/definitions/HyperText Markup Language.tid
diff --git a/editions/tw5.com/tiddlers/definitions/JavaScriptObjectNotation.tid b/editions/tw5.com/tiddlers/definitions/JavaScript Object Notation.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/definitions/JavaScriptObjectNotation.tid
rename to editions/tw5.com/tiddlers/definitions/JavaScript Object Notation.tid
diff --git a/editions/tw5.com/tiddlers/definitions/node.js.tid b/editions/tw5.com/tiddlers/definitions/Node.js.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/definitions/node.js.tid
rename to editions/tw5.com/tiddlers/definitions/Node.js.tid
diff --git a/editions/tw5.com/tiddlers/definitions/PercentEncoding.tid b/editions/tw5.com/tiddlers/definitions/Percent Encoding.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/definitions/PercentEncoding.tid
rename to editions/tw5.com/tiddlers/definitions/Percent Encoding.tid
diff --git a/editions/tw5.com/tiddlers/definitions/StanfordJavaScriptCryptoLibrary.tid b/editions/tw5.com/tiddlers/definitions/Stanford JavaScript Crypto Library.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/definitions/StanfordJavaScriptCryptoLibrary.tid
rename to editions/tw5.com/tiddlers/definitions/Stanford JavaScript Crypto Library.tid
diff --git a/editions/tw5.com/tiddlers/definitions/TiddlyFox.tid b/editions/tw5.com/tiddlers/definitions/TiddlyFox.tid
index 7393c5075..9b323ce37 100644
--- a/editions/tw5.com/tiddlers/definitions/TiddlyFox.tid
+++ b/editions/tw5.com/tiddlers/definitions/TiddlyFox.tid
@@ -1,5 +1,5 @@
 created: 20130825161100000
-modified: 20140103135209965
+modified: 20160601160149340
 tags: Definitions
 title: TiddlyFox
 type: text/vnd.tiddlywiki
@@ -8,7 +8,7 @@ TiddlyFox is an extension for Firefox that allows standalone TiddlyWiki files to
 
 TiddlyFox can be downloaded from the Mozilla Addons site:
 
-https://addons.mozilla.org/en-US/firefox/addon/tiddlyfox/
+https://addons.mozilla.org/en-GB/firefox/addon/tiddlyfox/
 
 <<<
 You can also install the latest development version of TiddlyFox direct from GitHub:
diff --git a/editions/tw5.com/tiddlers/demonstrations/Tasks/task.tid b/editions/tw5.com/tiddlers/demonstrations/Tasks/task.tid
index 62a1be33d..a861a82de 100644
--- a/editions/tw5.com/tiddlers/demonstrations/Tasks/task.tid
+++ b/editions/tw5.com/tiddlers/demonstrations/Tasks/task.tid
@@ -1,7 +1,7 @@
 color: #8d9ac3
 created: 201308252132
-modified: 20150124123528000
-title: task
 list: [[Make the beds]]
+modified: 201606011653
+title: task
 
-Sample tasks for the TaskManagementExample.
+//This tag identifies the tasks for the TaskManagementExample//
diff --git a/editions/tw5.com/tiddlers/editions/Blog_Edition.tid b/editions/tw5.com/tiddlers/editions/Blog Edition.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/editions/Blog_Edition.tid
rename to editions/tw5.com/tiddlers/editions/Blog Edition.tid
diff --git a/editions/tw5.com/tiddlers/editions/Empty Edition.tid b/editions/tw5.com/tiddlers/editions/Empty Edition.tid
index ec72cb3bf..55046a7b3 100644
--- a/editions/tw5.com/tiddlers/editions/Empty Edition.tid	
+++ b/editions/tw5.com/tiddlers/editions/Empty Edition.tid	
@@ -1,5 +1,5 @@
 created: 20140916213421041
-modified: 20140916213828557
+modified: 20160702084215576
 tags: Editions
 title: Empty Edition
 type: text/vnd.tiddlywiki
@@ -8,4 +8,6 @@ The "empty" edition of TiddlyWiki is a vanilla distribution, with no additional
 
 The empty edition can be downloaded from:
 
-<a href="empty.html" target="_blank">empty.html</a>
+* Link: [ext[empty.html]]
+* Built-in: {{$:/editions/tw5.com/snippets/download-empty-button}}
+Your browser may ask you to accept the download before it begins
diff --git a/editions/tw5.com/tiddlers/editions/Full Edition.tid b/editions/tw5.com/tiddlers/editions/Full Edition.tid
index 80aa1984d..beab1652f 100644
--- a/editions/tw5.com/tiddlers/editions/Full Edition.tid	
+++ b/editions/tw5.com/tiddlers/editions/Full Edition.tid	
@@ -1,5 +1,5 @@
 created: 20150310103210459
-modified: 20150310103210459
+modified: 20160602051530592
 tags: Editions
 title: Full Edition
 type: text/vnd.tiddlywiki
@@ -8,4 +8,4 @@ The "full" edition of TiddlyWiki consists of all the available languages, themes
 
 The full edition can be downloaded from:
 
-<a href="editions/full/index.html" target="_blank">editions/full/index.html</a>
+http://tiddlywiki.com/editions/full/
diff --git a/editions/tw5.com/tiddlers/editions/Resume_Builder_Edition.tid b/editions/tw5.com/tiddlers/editions/Resume Builder Edition.tid
similarity index 66%
rename from editions/tw5.com/tiddlers/editions/Resume_Builder_Edition.tid
rename to editions/tw5.com/tiddlers/editions/Resume Builder Edition.tid
index 281281413..cc0e7da37 100644
--- a/editions/tw5.com/tiddlers/editions/Resume_Builder_Edition.tid
+++ b/editions/tw5.com/tiddlers/editions/Resume Builder Edition.tid	
@@ -1,9 +1,9 @@
 created: 20150718123139133
-modified: 20150718123255662
+modified: 20160602051544252
 tags: Editions
 title: Résumé Builder Edition
 type: text/vnd.tiddlywiki
 
 The ''Résumé Builder'' edition of TiddlyWiki gets you started with a simple way to create a professional resume that you can save to the web or print.
 
-<a href="editions/resumebuilder/index.html" target="_blank">editions/resumebuilder/index.html</a>
+http://tiddlywiki.com/editions/resumebuilder/
diff --git a/editions/tw5.com/tiddlers/editions/Text_Slicer_Edition.tid b/editions/tw5.com/tiddlers/editions/Text Slicer Edition.tid
similarity index 64%
rename from editions/tw5.com/tiddlers/editions/Text_Slicer_Edition.tid
rename to editions/tw5.com/tiddlers/editions/Text Slicer Edition.tid
index 0eac50183..5d0568a48 100644
--- a/editions/tw5.com/tiddlers/editions/Text_Slicer_Edition.tid
+++ b/editions/tw5.com/tiddlers/editions/Text Slicer Edition.tid	
@@ -1,9 +1,9 @@
 created: 20150718123139133
-modified: 20150718123255662
+modified: 20160602051553479
 tags: Editions
 title: Text-Slicer Edition
 type: text/vnd.tiddlywiki
 
 The ''Text-Slicer'' edition of TiddlyWiki contains tools to help advanced users slice long texts up into individual tiddlers.
 
-<a href="editions/text-slicer/index.html" target="_blank">editions/text-slicer/index.html</a>
+http://tiddlywiki.com/editions/text-slicer/
diff --git a/editions/tw5.com/tiddlers/features/AutoSave.tid b/editions/tw5.com/tiddlers/features/AutoSave.tid
index 674df9901..c8e766098 100644
--- a/editions/tw5.com/tiddlers/features/AutoSave.tid
+++ b/editions/tw5.com/tiddlers/features/AutoSave.tid
@@ -1,11 +1,11 @@
 created: 20140206211715540
-modified: 20140912140613891
+modified: 20160610081543108
 tags: Features
 title: AutoSave
 type: text/vnd.tiddlywiki
 
-If there is a SaverModule available that supports it, TiddlyWiki will automatically trigger a save of the current document on clicking {{$:/core/images/done-button}} ''tick'' or {{$:/core/images/delete-button}} ''delete'' when editing a tiddler.
+If there is a SaverModule available that supports it, TiddlyWiki will automatically trigger a save of the current document on clicking {{$:/core/images/done-button}} ''ok'' or {{$:/core/images/delete-button}} ''delete'' when editing a tiddler.
 
 You should see a yellow notification at the top right of the window to confirm that an automatic save has taken place.
 
-Automatic saving can be enabled or disabled through the ''Saving'' tab of the [[control panel|$:/ControlPanel]]. Behind the scenes, it is controlled through the configuration tiddler [[$:/config/AutoSave]], which must have the value ''yes'' to enable automatic saving.
+Automatic saving can be enabled or disabled through the ''Settings'' tab of the [[control panel|$:/ControlPanel]] {{$:/core/images/options-button}}. Behind the scenes, it is controlled through the configuration tiddler [[$:/config/AutoSave]], which must have the value ''yes'' to enable automatic saving.
diff --git a/editions/tw5.com/tiddlers/features/ImportTiddlers.tid b/editions/tw5.com/tiddlers/features/ImportTiddlers.tid
index f99538bc4..dfeda4c63 100644
--- a/editions/tw5.com/tiddlers/features/ImportTiddlers.tid
+++ b/editions/tw5.com/tiddlers/features/ImportTiddlers.tid
@@ -1,12 +1,12 @@
 created: 20130825162000000
-modified: 20141125195251055
+modified: 20160610073731847
 tags: Features
 title: ImportTiddlers
 type: text/vnd.tiddlywiki
 
 You can import content into a TiddlyWiki file in several ways:
 
-* Use the ''import'' button (under the ''Tools'' tab in the sidebar) to select a local file
-* Drag and drop files from Windows Explorer or Mac OS X Finder into the TiddlyWiki browser window
+* Use the {{$:/core/images/import-button}} ''import'' button (under the ''Tools'' tab in the sidebar) to select a local file
+* Drag and drop files from Windows Explorer or OS X Finder etc. into the TiddlyWiki browser window
 * Paste content directly from the clipboard using the menu or keyboard shortcut (control-V or command-V)
 ** GoogleChrome is currently the only browser to support pasting
diff --git a/editions/tw5.com/tiddlers/features/SafeMode.tid b/editions/tw5.com/tiddlers/features/SafeMode.tid
index 813be6eaf..0de5634be 100644
--- a/editions/tw5.com/tiddlers/features/SafeMode.tid
+++ b/editions/tw5.com/tiddlers/features/SafeMode.tid
@@ -1,5 +1,5 @@
 created: 20140419082845576
-modified: 20140912141226700
+modified: 20160610082458079
 tags: Features
 title: SafeMode
 type: text/vnd.tiddlywiki
@@ -18,7 +18,7 @@ http://tiddlywiki.com/#:safe
 
 Safe mode triggers two changes:
 
-* All plugins are temporarily disabled. You can use the control panel to disable individual plugins
+* All plugins are temporarily disabled. You can use the [[control panel|$:/ControlPanel]] {{$:/core/images/options-button}} to disable individual plugins
 * Any tiddlers that override shadow tiddlers are renamed to give them the prefix `SAFE: `, thus restoring the underlying shadow tiddler
 * Certain configuration options are ignored, and the default settings used instead:
 ** WikiParserRuleConfiguration
diff --git a/editions/tw5.com/tiddlers/features/Searching.tid b/editions/tw5.com/tiddlers/features/Searching in TiddlyWiki.tid
similarity index 74%
rename from editions/tw5.com/tiddlers/features/Searching.tid
rename to editions/tw5.com/tiddlers/features/Searching in TiddlyWiki.tid
index 27fadec44..98cbf2eb1 100644
--- a/editions/tw5.com/tiddlers/features/Searching.tid
+++ b/editions/tw5.com/tiddlers/features/Searching in TiddlyWiki.tid	
@@ -1,25 +1,22 @@
 created: 20140210160125905
-modified: 20141113174103422
+modified: 20160607163012344
 tags: Features [[Working with TiddlyWiki]]
 title: Searching in TiddlyWiki
 type: text/vnd.tiddlywiki
 
-Searching is fast and flexible in ~TiddlyWiki. 
+Searching is fast and flexible in ~TiddlyWiki.
 
-''Standard search''
+! Standard search
 
 Typing text into the search box in the sidebar will turn up a list of all the tiddlers that contain that text.
 
 ://(Note that the sidebar tabs will be hidden by the search results until you click the 'x' to the right of the search box to remove the search results)//
 
-''Advanced searching''
+! Advanced searching
 
-Clicking on the magnifying glass icon to the right of the search box will open [[$:/AdvancedSearch]]. This tiddler contains four tabs:
+Clicking on the magnifying glass icon {{$:/core/images/advanced-search-button}} to the right of the search box will open [[$:/AdvancedSearch]]. This tiddler contains four tabs:
 
 * The ''standard'' tab contains another instance of the search box found in the sidebar
-
 * The ''system'' tab allows you to limit your search to system tiddlers
-
 * The ''shadows'' tab allows you to limit your search to shadow tiddlers
-
 * The ''filter'' tab is not a search box, per se, but a way to obtain a list of all tiddlers that meet the specific criteria described by that [[filter|Filters]], for example, "All tags except system tags"
diff --git a/editions/tw5.com/tiddlers/filters/FilterOperators.tid b/editions/tw5.com/tiddlers/filters/Filter Operators.tid
similarity index 98%
rename from editions/tw5.com/tiddlers/filters/FilterOperators.tid
rename to editions/tw5.com/tiddlers/filters/Filter Operators.tid
index a66884b74..b7818316d 100644
--- a/editions/tw5.com/tiddlers/filters/FilterOperators.tid
+++ b/editions/tw5.com/tiddlers/filters/Filter Operators.tid	
@@ -1,5 +1,5 @@
 created: 20140410103123179
-modified: 20160110091222187
+modified: 20161017154031883
 tags: Filters
 title: Filter Operators
 type: text/vnd.tiddlywiki
diff --git a/editions/tw5.com/tiddlers/filters/Introduction to Filters.tid b/editions/tw5.com/tiddlers/filters/Introduction to filter notation.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/filters/Introduction to Filters.tid
rename to editions/tw5.com/tiddlers/filters/Introduction to filter notation.tid
diff --git a/editions/tw5.com/tiddlers/filters/days.tid b/editions/tw5.com/tiddlers/filters/days.tid
index 732bb3aab..8ca1b2baf 100644
--- a/editions/tw5.com/tiddlers/filters/days.tid
+++ b/editions/tw5.com/tiddlers/filters/days.tid
@@ -3,7 +3,7 @@ title: days Operator
 type: text/vnd.tiddlywiki
 caption: days
 op-input: a [[selection of titles|Title Selection]]
-op-neg-output: those input tiddlers in which field <<.place F>> is more than <<.place D>> days in the { future | past }, where <<.place D>> is { positive | negative }
+op-neg-output: those input tiddlers in which field <<.place F>> is at least <<.place D>> days in the { future | past }, where <<.place D>> is { positive | negative }
 op-output: those input tiddlers in which field <<.place F>> is <<.place D>> days in the { future | past } or any time { before | after } that, including { past | future }, where <<.place D>> is { positive | negative }
 op-parameter: a number of days, defaulting to 0
 op-parameter-name: D
diff --git a/editions/tw5.com/tiddlers/filters/decodehtml_Operator.tid b/editions/tw5.com/tiddlers/filters/decodehtml_Operator.tid
new file mode 100644
index 000000000..f5f2eadba
--- /dev/null
+++ b/editions/tw5.com/tiddlers/filters/decodehtml_Operator.tid
@@ -0,0 +1,22 @@
+caption: decodehtml
+created: 20161017152925704
+modified: 20161017152951209
+op-input: a [[selection of titles|Title Selection]]
+op-output: the input with HTML decoding applied
+op-parameter: 
+op-parameter-name: 
+op-purpose: apply HTML decoding to a string
+tags: [[Filter Operators]] [[String Operators]]
+title: decodehtml Operator
+type: text/vnd.tiddlywiki
+from-version: 5.1.14
+
+"HTML decoding" means replacing HTML entities that represent special characters with that character:
+
+* `&amp;` replaced with `&`
+* `&nbsp;` replaced with ` ` (non breaking space)
+* `&lt;` replaced with `<`
+* `&gt;` replaced with `>`
+* `&quot;` replaced with `"`
+
+<<.operator-examples "decodehtml">>
diff --git a/editions/tw5.com/tiddlers/filters/decodeuri_Operator.tid b/editions/tw5.com/tiddlers/filters/decodeuri_Operator.tid
new file mode 100644
index 000000000..f9a9c3513
--- /dev/null
+++ b/editions/tw5.com/tiddlers/filters/decodeuri_Operator.tid
@@ -0,0 +1,16 @@
+caption: decodeuri
+created: 20161017152854460
+modified: 20161017152914038
+op-input: a [[selection of titles|Title Selection]]
+op-output: the input with URI decoding applied
+op-parameter: 
+op-parameter-name: 
+op-purpose: apply URI decoding to a string
+tags: [[Filter Operators]] [[String Operators]]
+title: decodeuri Operator
+type: text/vnd.tiddlywiki
+from-version: 5.1.14
+
+See Mozilla Developer Network for details of the [[decodeURI|https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/decodeURI]] operation.
+
+<<.operator-examples "decodeuri">>
diff --git a/editions/tw5.com/tiddlers/filters/decodeuricomponent_Operator.tid b/editions/tw5.com/tiddlers/filters/decodeuricomponent_Operator.tid
new file mode 100644
index 000000000..2dd731bd5
--- /dev/null
+++ b/editions/tw5.com/tiddlers/filters/decodeuricomponent_Operator.tid
@@ -0,0 +1,16 @@
+caption: decodeuricomponent
+created: 20161017152454726
+modified: 20161017152630625
+op-input: a [[selection of titles|Title Selection]]
+op-output: the input with URI component decoding applied
+op-parameter: 
+op-parameter-name: 
+op-purpose: apply URI component decoding to a string
+tags: [[Filter Operators]] [[String Operators]]
+title: decodeuricomponent Operator
+type: text/vnd.tiddlywiki
+from-version: 5.1.14
+
+See Mozilla Developer Network for details of the [[decodeURIComponent|https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/decodeURIComponent]] operation.
+
+<<.operator-examples "decodeuricomponent">>
diff --git a/editions/tw5.com/tiddlers/filters/encodehtml_Operator.tid b/editions/tw5.com/tiddlers/filters/encodehtml_Operator.tid
new file mode 100644
index 000000000..fda1ad331
--- /dev/null
+++ b/editions/tw5.com/tiddlers/filters/encodehtml_Operator.tid
@@ -0,0 +1,21 @@
+caption: encodehtml
+created: 20161017152953211
+modified: 20161017153015687
+op-input: a [[selection of titles|Title Selection]]
+op-output: the input with HTML encoding applied
+op-parameter: 
+op-parameter-name: 
+op-purpose: apply HTML encoding to a string
+tags: [[Filter Operators]] [[String Operators]]
+title: encodehtml Operator
+type: text/vnd.tiddlywiki
+from-version: 5.1.14
+
+"HTML encoding" means replacing special HTML characters with the corresponding HTML entity:
+
+* `&` replaced with `&amp;`
+* `<` replaced with `&lt;`
+* `>` replaced with `&gt;`
+* `"` replaced with `&quot;`
+
+<<.operator-examples "encodehtml">>
diff --git a/editions/tw5.com/tiddlers/filters/encodeuri_Operator.tid b/editions/tw5.com/tiddlers/filters/encodeuri_Operator.tid
new file mode 100644
index 000000000..77143a657
--- /dev/null
+++ b/editions/tw5.com/tiddlers/filters/encodeuri_Operator.tid
@@ -0,0 +1,16 @@
+caption: encodeuri
+created: 20161017152827112
+modified: 20161017152845585
+op-input: a [[selection of titles|Title Selection]]
+op-output: the input with URI encoding applied
+op-parameter: 
+op-parameter-name: 
+op-purpose: apply URI encoding to a string
+tags: [[Filter Operators]] [[String Operators]]
+title: encodeuri Operator
+type: text/vnd.tiddlywiki
+from-version: 5.1.14
+
+See Mozilla Developer Network for details of the [[encodeURI|https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/encodeURI]] operation.
+
+<<.operator-examples "encodeuri">>
diff --git a/editions/tw5.com/tiddlers/filters/encodeuricomponent_Operator.tid b/editions/tw5.com/tiddlers/filters/encodeuricomponent_Operator.tid
new file mode 100644
index 000000000..8aa961a96
--- /dev/null
+++ b/editions/tw5.com/tiddlers/filters/encodeuricomponent_Operator.tid
@@ -0,0 +1,16 @@
+caption: encodeuricomponent
+created: 20161017152747386
+modified: 20161017152809900
+op-input: a [[selection of titles|Title Selection]]
+op-output: the input with URI component encoding applied
+op-parameter: 
+op-parameter-name: 
+op-purpose: apply URI component encoding to a string
+tags: [[Filter Operators]] [[String Operators]]
+title: encodeuricomponent Operator
+type: text/vnd.tiddlywiki
+from-version: 5.1.14
+
+See Mozilla Developer Network for details of the [[encodeURIComponent|https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/encodeURIComponent]] operation.
+
+<<.operator-examples "encodeuricomponent">>
diff --git a/editions/tw5.com/tiddlers/filters/escaperegexp_Operator.tid b/editions/tw5.com/tiddlers/filters/escaperegexp_Operator.tid
new file mode 100644
index 000000000..e8ad42211
--- /dev/null
+++ b/editions/tw5.com/tiddlers/filters/escaperegexp_Operator.tid
@@ -0,0 +1,16 @@
+caption: escaperegexp
+created: 20161017153116372
+modified: 20161017153230962
+op-input: a [[selection of titles|Title Selection]]
+op-output: the input with escaping applied to special regular expression characters
+op-parameter: 
+op-parameter-name: 
+op-purpose: escape special characters used in regular expressions
+tags: [[Filter Operators]] [[String Operators]]
+title: escaperegexp Operator
+type: text/vnd.tiddlywiki
+from-version: 5.1.14
+
+See Mozilla Developer Network for details of the [[regular expression syntax|https://developer.mozilla.org/en/docs/Web/JavaScript/Reference/Global_Objects/RegExp]].
+
+<<.operator-examples "escaperegexp">>
diff --git a/editions/tw5.com/tiddlers/filters/examples/decodehtml_Operator_(Examples).tid b/editions/tw5.com/tiddlers/filters/examples/decodehtml_Operator_(Examples).tid
new file mode 100644
index 000000000..8bc44a122
--- /dev/null
+++ b/editions/tw5.com/tiddlers/filters/examples/decodehtml_Operator_(Examples).tid
@@ -0,0 +1,8 @@
+created: 20161017154848886
+modified: 20161017155350389
+tags: [[Operator Examples]] [[decodehtml Operator]]
+title: decodehtml Operator (Examples)
+type: text/vnd.tiddlywiki
+
+<<.operator-example 1 "[[Title with &lt; angle brackets &gt;]] +[decodehtml[]]">>
+<<.operator-example 2 "[[Title with an &amp; ampersand]] +[decodehtml[]]">>
diff --git a/editions/tw5.com/tiddlers/filters/examples/decodeuri_Operator_(Examples).tid b/editions/tw5.com/tiddlers/filters/examples/decodeuri_Operator_(Examples).tid
new file mode 100644
index 000000000..4d6377d3d
--- /dev/null
+++ b/editions/tw5.com/tiddlers/filters/examples/decodeuri_Operator_(Examples).tid
@@ -0,0 +1,8 @@
+created: 20161017154558573
+modified: 20161017155350399
+tags: [[Operator Examples]] [[decodeuri Operator]]
+title: decodeuri Operator (Examples)
+type: text/vnd.tiddlywiki
+
+<<.operator-example 1 "[[Title%20with%20Space]] +[decodeuri[]]">>
+<<.operator-example 2 "[[Title%20with%20Space]] [[Another%20title%20with%20Space]] +[decodeuri[]]">>
diff --git a/editions/tw5.com/tiddlers/filters/examples/decodeuricomponent_Operator_(Examples).tid b/editions/tw5.com/tiddlers/filters/examples/decodeuricomponent_Operator_(Examples).tid
new file mode 100644
index 000000000..3fb6005ca
--- /dev/null
+++ b/editions/tw5.com/tiddlers/filters/examples/decodeuricomponent_Operator_(Examples).tid
@@ -0,0 +1,8 @@
+created: 20161017153616709
+modified: 20161017155350393
+tags: [[Operator Examples]] [[decodeuricomponent Operator]]
+title: decodeuricomponent Operator (Examples)
+type: text/vnd.tiddlywiki
+
+<<.operator-example 1 "[[Title%20with%20Space]] +[decodeuricomponent[]]">>
+<<.operator-example 2 "[[Title%20with%20Space]] [[Another%20title%20with%20Space]] +[decodeuricomponent[]]">>
diff --git a/editions/tw5.com/tiddlers/filters/examples/encodehtml_Operator_(Examples).tid b/editions/tw5.com/tiddlers/filters/examples/encodehtml_Operator_(Examples).tid
new file mode 100644
index 000000000..5bc807284
--- /dev/null
+++ b/editions/tw5.com/tiddlers/filters/examples/encodehtml_Operator_(Examples).tid
@@ -0,0 +1,8 @@
+created: 20161017154758523
+modified: 20161017155350391
+tags: [[Operator Examples]] [[encodehtml Operator]]
+title: encodehtml Operator (Examples)
+type: text/vnd.tiddlywiki
+
+<<.operator-example 1 "[[Title with <angle brackets>]] +[encodehtml[]]">>
+<<.operator-example 2 "[[Title with an & ampersand]] +[encodehtml[]]">>
diff --git a/editions/tw5.com/tiddlers/filters/examples/encodeuri_Operator_(Examples).tid b/editions/tw5.com/tiddlers/filters/examples/encodeuri_Operator_(Examples).tid
new file mode 100644
index 000000000..cecc26652
--- /dev/null
+++ b/editions/tw5.com/tiddlers/filters/examples/encodeuri_Operator_(Examples).tid
@@ -0,0 +1,8 @@
+created: 20161017154702282
+modified: 20161017155350397
+tags: [[Operator Examples]] [[encodeuri Operator]]
+title: encodeuri Operator (Examples)
+type: text/vnd.tiddlywiki
+
+<<.operator-example 1 "[[Title with Space]] +[encodeuri[]]">>
+<<.operator-example 2 "[[Title with Space]] [[Another title with Space]] +[encodeuri[]]">>
diff --git a/editions/tw5.com/tiddlers/filters/examples/encodeuricomponent_Operator_(Examples).tid b/editions/tw5.com/tiddlers/filters/examples/encodeuricomponent_Operator_(Examples).tid
new file mode 100644
index 000000000..86507ab92
--- /dev/null
+++ b/editions/tw5.com/tiddlers/filters/examples/encodeuricomponent_Operator_(Examples).tid
@@ -0,0 +1,8 @@
+created: 20161017154451373
+modified: 20161017155350395
+tags: [[Operator Examples]] [[encodeuricomponent Operator]]
+title: encodeuricomponent Operator (Examples)
+type: text/vnd.tiddlywiki
+
+<<.operator-example 1 "[[Title with Space]] +[encodeuricomponent[]]">>
+<<.operator-example 2 "[[Title with Space]] [[Another title with Space]] +[encodeuricomponent[]]">>
diff --git a/editions/tw5.com/tiddlers/filters/examples/escaperegexp_Operator_(Examples).tid b/editions/tw5.com/tiddlers/filters/examples/escaperegexp_Operator_(Examples).tid
new file mode 100644
index 000000000..da0fa5ad6
--- /dev/null
+++ b/editions/tw5.com/tiddlers/filters/examples/escaperegexp_Operator_(Examples).tid
@@ -0,0 +1,7 @@
+created: 20161017155417183
+modified: 20161017155520892
+tags: [[Operator Examples]] [[escaperegexp Operator]]
+title: escaperegexp Operator (Examples)
+type: text/vnd.tiddlywiki
+
+<<.operator-example 1 """[[Title with dots . and dollars $]] +[escaperegexp[]]""">>
diff --git a/editions/tw5.com/tiddlers/filters/examples/minlength.tid b/editions/tw5.com/tiddlers/filters/examples/minlength.tid
new file mode 100644
index 000000000..fcad1bd50
--- /dev/null
+++ b/editions/tw5.com/tiddlers/filters/examples/minlength.tid
@@ -0,0 +1,11 @@
+created: 20161011074235805
+modified: 20161011074235805
+tags: [[Operator Examples]] [[minlength Operator]]
+title: minlength Operator (Examples)
+type: text/vnd.tiddlywiki
+
+<<.using-days-of-week>>
+
+<<.operator-example 1 "[list[Days of the Week]minlength[7]]">>
+<<.operator-example 2 "[list[Days of the Week]minlength[1]]">>
+
diff --git a/editions/tw5.com/tiddlers/filters/examples/stringify_Operator_(Examples).tid b/editions/tw5.com/tiddlers/filters/examples/stringify_Operator_(Examples).tid
new file mode 100644
index 000000000..8e33bc6be
--- /dev/null
+++ b/editions/tw5.com/tiddlers/filters/examples/stringify_Operator_(Examples).tid
@@ -0,0 +1,7 @@
+created: 20161017154944352
+modified: 20161017155350400
+tags: [[Operator Examples]] [[stringify Operator]]
+title: stringify Operator (Examples)
+type: text/vnd.tiddlywiki
+
+<<.operator-example 1 """[[Title with "double quotes" and \backslash]] +[stringify[]]""">>
diff --git a/editions/tw5.com/tiddlers/filters/minlength.tid b/editions/tw5.com/tiddlers/filters/minlength.tid
new file mode 100644
index 000000000..d450df35f
--- /dev/null
+++ b/editions/tw5.com/tiddlers/filters/minlength.tid
@@ -0,0 +1,14 @@
+caption: minlength
+created: 20161011074235805
+modified: 20161011074235805
+op-input: a list of items
+op-output: those items at least as long as the specified minimum length
+op-parameter: the minimum length for items
+op-parameter-name: minlength
+op-purpose: filter items shorter than the specified minimum length
+from-version: 5.1.14
+tags: [[Filter Operators]]
+title: minlength Operator
+type: text/vnd.tiddlywiki
+
+<<.operator-examples "minlength">>
diff --git a/editions/tw5.com/tiddlers/filters/stringify_Operator.tid b/editions/tw5.com/tiddlers/filters/stringify_Operator.tid
new file mode 100644
index 000000000..c880dba92
--- /dev/null
+++ b/editions/tw5.com/tiddlers/filters/stringify_Operator.tid
@@ -0,0 +1,14 @@
+caption: stringify
+created: 20161017153038029
+modified: 20161017153114691
+op-input: a [[selection of titles|Title Selection]]
+op-output: the input with ~JavaScript string encodings applied
+op-parameter: 
+op-parameter-name: 
+op-purpose: apply ~JavaScript string encoding to a string
+tags: [[Filter Operators]] [[String Operators]]
+title: stringify Operator
+type: text/vnd.tiddlywiki
+from-version: 5.1.14
+
+<<.operator-examples "stringify">>
diff --git a/editions/tw5.com/tiddlers/filters/syntax/FilterExpression.tid b/editions/tw5.com/tiddlers/filters/syntax/Filter Expression.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/filters/syntax/FilterExpression.tid
rename to editions/tw5.com/tiddlers/filters/syntax/Filter Expression.tid
diff --git a/editions/tw5.com/tiddlers/filters/syntax/FilterParameter.tid b/editions/tw5.com/tiddlers/filters/syntax/Filter Parameter.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/filters/syntax/FilterParameter.tid
rename to editions/tw5.com/tiddlers/filters/syntax/Filter Parameter.tid
diff --git a/editions/tw5.com/tiddlers/filters/syntax/FilterRun.tid b/editions/tw5.com/tiddlers/filters/syntax/Filter Run.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/filters/syntax/FilterRun.tid
rename to editions/tw5.com/tiddlers/filters/syntax/Filter Run.tid
diff --git a/editions/tw5.com/tiddlers/filters/syntax/FilterStep.tid b/editions/tw5.com/tiddlers/filters/syntax/Filter Step.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/filters/syntax/FilterStep.tid
rename to editions/tw5.com/tiddlers/filters/syntax/Filter Step.tid
diff --git a/editions/tw5.com/tiddlers/filters/syntax/FilterSyntax.tid b/editions/tw5.com/tiddlers/filters/syntax/Filter Syntax.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/filters/syntax/FilterSyntax.tid
rename to editions/tw5.com/tiddlers/filters/syntax/Filter Syntax.tid
diff --git a/editions/tw5.com/tiddlers/filters/syntax/FilterWhitespace.tid b/editions/tw5.com/tiddlers/filters/syntax/Filter Whitespace.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/filters/syntax/FilterWhitespace.tid
rename to editions/tw5.com/tiddlers/filters/syntax/Filter Whitespace.tid
diff --git a/editions/tw5.com/tiddlers/gettingstarted/GettingStarted - Android.tid b/editions/tw5.com/tiddlers/gettingstarted/GettingStarted - Android.tid
index c8ee9111d..0f34543a6 100644
--- a/editions/tw5.com/tiddlers/gettingstarted/GettingStarted - Android.tid	
+++ b/editions/tw5.com/tiddlers/gettingstarted/GettingStarted - Android.tid	
@@ -1,10 +1,10 @@
 caption: Android
 created: 20140811171036268
-modified: 20140916124042604
+modified: 20160430121735629
 title: GettingStarted - Android
 type: text/vnd.tiddlywiki
 
-There are two options for using TiddlyWiki on Android:
+There are three options for using TiddlyWiki on Android:
 
 ! Using Firefox and TiddlyFox
 
@@ -13,3 +13,7 @@ There are two options for using TiddlyWiki on Android:
 ! Using the AndTidWiki App
 
 {{Saving on Android}}
+
+! Using Node.js in Termux
+
+{{Serving TW5 from Android}}
diff --git a/editions/tw5.com/tiddlers/gettingstarted/GettingStarted - WebDAV.tid b/editions/tw5.com/tiddlers/gettingstarted/GettingStarted - WebDAV.tid
new file mode 100644
index 000000000..d624f6ebc
--- /dev/null
+++ b/editions/tw5.com/tiddlers/gettingstarted/GettingStarted - WebDAV.tid	
@@ -0,0 +1,24 @@
+caption: WebDAV
+created: 20160216191710789
+modified: 20160216204613016
+tags: 
+title: GettingStarted - WebDAV
+type: text/vnd.tiddlywiki
+
+If hosted on a [[WebDAV|https://en.wikipedia.org/wiki/WebDAV]]-enabled server, TiddlyWiki will automatically save changes via HTTP.
+
+!! Servers
+
+Many [[NAS|https://en.wikipedia.org/wiki/NAS]] or [[Subversion|https://en.wikipedia.org/wiki/Apache_Subversion]] servers support WebDAV out of the box. Setting up your own server might take some effort though:
+
+[[dav-server|https://github.com/edrex/dav-server]] is a quick way to serve up a folder of HTML ~TiddlyWikis.
+
+[[webdav server|https://play.google.com/store/apps/details?id=com.theolivetree.webdavserver&hl=en]] for Android lets you put wikis in your pocket. You can share with other devices on the local network too.
+
+!! Existing Wikis
+
+~WebDAV support was added Feb 16 2016. If you created your wiki before that, you'll need to [[Upgrade|Upgrading]] to enable ~WebDAV.
+
+!! Free Hosting
+
+None of the ~WebDAV hosting services tested (~~box.com~~, ~~swissdisk.com~~) support accessing HTML files via a webbrowser, so they won't work with ~TiddlyWiki. Maybe someday soon there will be a free ~WebDAV hosting service for ~TiddlyWikis.
diff --git a/editions/tw5.com/tiddlers/gettingstarted/GettingStarted.tid b/editions/tw5.com/tiddlers/gettingstarted/GettingStarted.tid
index 43ff1f79c..cfbe7af6a 100644
--- a/editions/tw5.com/tiddlers/gettingstarted/GettingStarted.tid
+++ b/editions/tw5.com/tiddlers/gettingstarted/GettingStarted.tid
@@ -1,5 +1,5 @@
 created: 20131129090249275
-modified: 20150417155848443
+modified: 20160622111349475
 tags: [[Working with TiddlyWiki]]
 title: GettingStarted
 type: text/vnd.tiddlywiki
@@ -29,7 +29,7 @@ See also:
 
 If the button doesn't work save this link:
 
-<a href="http://tiddlywiki.com/index.html" download="index.html">~http://tiddlywiki.com/index.html</a>
+<a href="http://tiddlywiki.com/index.html" download="index.html" rel="noopener noreferrer">~http://tiddlywiki.com/index.html</a>
 
 Your browser may ask you to accept the download before it begins
 <<<
diff --git a/editions/tw5.com/tiddlers/hellothere/A_Gentle_Guide_to_TiddlyWiki.tid b/editions/tw5.com/tiddlers/hellothere/A Gentle Guide to TiddlyWiki.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/hellothere/A_Gentle_Guide_to_TiddlyWiki.tid
rename to editions/tw5.com/tiddlers/hellothere/A Gentle Guide to TiddlyWiki.tid
diff --git a/editions/tw5.com/tiddlers/hellothere/HelloThere.tid b/editions/tw5.com/tiddlers/hellothere/HelloThere.tid
index 108b460bc..c50518574 100644
--- a/editions/tw5.com/tiddlers/hellothere/HelloThere.tid
+++ b/editions/tw5.com/tiddlers/hellothere/HelloThere.tid
@@ -1,6 +1,6 @@
 created: 20130822170200000
 list: [[A Gentle Guide to TiddlyWiki]] [[Discover TiddlyWiki]] [[Some of the things you can do with TiddlyWiki]] [[Ten reasons to switch to TiddlyWiki]] Examples [[What happened to the original TiddlyWiki?]]
-modified: 20160107231609312
+modified: 20160725084810809
 tags: TableOfContents
 title: HelloThere
 type: text/vnd.tiddlywiki
@@ -18,13 +18,16 @@ Use it to keep your [[to-do list|TaskManagementExample]], to plan an [[essay or
 Unlike conventional online services, TiddlyWiki lets you choose where to keep your data, guaranteeing that in the decades to come you will still be able to use the notes you take today.
 
 <div style="font-size:0.7em;text-align:center;margin-top:3em;margin-bottom:3em;">
-<a href="http://groups.google.com/group/TiddlyWiki" class="tc-btn-big-green" style="background-color:#FF8C19;" target="_blank">
+<a href="http://groups.google.com/group/TiddlyWiki" class="tc-btn-big-green" style="background-color:#FF8C19;" target="_blank" rel="noopener noreferrer">
 {{$:/core/images/mail}} ~TiddlyWiki Mailing List
 </a>
-<a href="https://twitter.com/TiddlyWiki" class="tc-btn-big-green" style="background-color:#5E9FCA;" target="_blank">
+<a href="http://www.youtube.com/c/JeremyRuston" class="tc-btn-big-green" style="background-color:#e52d27;" target="_blank" rel="noopener noreferrer">
+{{$:/core/images/video}} ~TiddlyWiki on ~YouTube
+</a>
+<a href="https://twitter.com/TiddlyWiki" class="tc-btn-big-green" style="background-color:#5E9FCA;" target="_blank" rel="noopener noreferrer">
 {{$:/core/images/twitter}} @~TiddlyWiki on Twitter
 </a>
-<a href="https://github.com/Jermolene/TiddlyWiki5" class="tc-btn-big-green" style="background-color:#444;" target="_blank">
+<a href="https://github.com/Jermolene/TiddlyWiki5" class="tc-btn-big-green" style="background-color:#444;" target="_blank" rel="noopener noreferrer">
 {{$:/core/images/github}} ~TiddlyWiki on ~GitHub
 </a>
 </div>
diff --git a/editions/tw5.com/tiddlers/hellothere/HelloThumbnail.tid b/editions/tw5.com/tiddlers/hellothere/HelloThumbnail.tid
index c5dce8d6f..7c22c8ecc 100644
--- a/editions/tw5.com/tiddlers/hellothere/HelloThumbnail.tid
+++ b/editions/tw5.com/tiddlers/hellothere/HelloThumbnail.tid
@@ -1,5 +1,5 @@
 created: 20150414070451144
-list: [[HelloThumbnail - Introduction Video]] [[HelloThumbnail - Gentle Guide]] [[HelloThumbnail - HelpingTiddlyWiki]] [[HelloThumbnail - Developers]] [[HelloThumbnail - Latest Version]] [[HelloThumbnail - Classic]]
+list: [[HelloThumbnail - Introduction Video]] [[HelloThumbnail - Gentle Guide]] [[HelloThumbnail - HelpingTiddlyWiki]] [[HelloThumbnail - Developers]] [[HelloThumbnail - TWEUM2016]] [[HelloThumbnail - Latest Version]] [[HelloThumbnail - Classic]]
 modified: 20150414070948246
 title: HelloThumbnail
 type: text/vnd.tiddlywiki
diff --git a/editions/tw5.com/tiddlers/hellothere/Some of the things you can do with TiddlyWiki.tid b/editions/tw5.com/tiddlers/hellothere/Some of the things you can do with TiddlyWiki.tid
index 8f89c3f8a..4f8619e24 100644
--- a/editions/tw5.com/tiddlers/hellothere/Some of the things you can do with TiddlyWiki.tid	
+++ b/editions/tw5.com/tiddlers/hellothere/Some of the things you can do with TiddlyWiki.tid	
@@ -1,5 +1,5 @@
 created: 20140904090300000
-modified: 20150414072129239
+modified: 20160602051709631
 tags: HelloThere
 title: Some of the things you can do with TiddlyWiki
 type: text/vnd.tiddlywiki
@@ -17,4 +17,4 @@ type: text/vnd.tiddlywiki
 * Use familiar web user interface elements such as lightboxes - see SampleWizard
 * Create a slideshow presentation
 * Set up an entire local or online knowledgebase, with a central ~TiddlyWiki file linking to other ~TiddlyWiki files (http://recursos.giffmex.org is a Spanish online example of this)
-* Set up a data visualisation using tiddlers as data (see the visualisations at http://tiddlywiki.com/plugins/tiddlywiki/d3/index.html)
+* Set up a data visualisation using tiddlers as data (see the visualisations at http://tiddlywiki.com/plugins/tiddlywiki/d3/)
diff --git a/editions/tw5.com/tiddlers/hellothere/What happened to the original TiddlyWiki.tid b/editions/tw5.com/tiddlers/hellothere/What happened to the original TiddlyWiki.tid
index abc2223f2..871943179 100644
--- a/editions/tw5.com/tiddlers/hellothere/What happened to the original TiddlyWiki.tid	
+++ b/editions/tw5.com/tiddlers/hellothere/What happened to the original TiddlyWiki.tid	
@@ -3,7 +3,7 @@ tags: HelloThere
 created: 201409040851
 modified: 201409040851
 
-<a class="tc-float-right tc-bordered-image" href="http://classic.tiddlywiki.com/" target="_blank">[img width="200" [TiddlyWiki Classic.png]]</a>
+<a class="tc-float-right tc-bordered-image" href="http://classic.tiddlywiki.com/" target="_blank" rel="noopener noreferrer">[img width="200" [TiddlyWiki Classic.png]]</a>
 
 The original [[Classic|TiddlyWikiClassic]] version of TiddlyWiki is still available at:
 
diff --git a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail_-_Gentle_Guide.tid b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Gentle Guide.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail_-_Gentle_Guide.tid
rename to editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - Gentle Guide.tid
diff --git a/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TWEUM2016.tid b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TWEUM2016.tid
new file mode 100644
index 000000000..de852ba10
--- /dev/null
+++ b/editions/tw5.com/tiddlers/hellothere/thumbnails/HelloThumbnail - TWEUM2016.tid	
@@ -0,0 +1,6 @@
+title: HelloThumbnail - TWEUM2016
+tags: HelloThumbnail
+color: #D5B7EA
+image: TWEUM2016 Thumbnail.jpg
+caption: European Meetup 2016
+link: TiddlyWiki European Meetup 2016
diff --git a/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting SearchMinLength.tid b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting SearchMinLength.tid
new file mode 100644
index 000000000..1fdcbbcbb
--- /dev/null
+++ b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting SearchMinLength.tid	
@@ -0,0 +1,11 @@
+created: 20161011074235805
+modified: 20161011074235805
+tags: [[Hidden Settings]]
+title: Hidden Setting: Search Minimum Length
+type: text/vnd.tiddlywiki
+
+<<.from-version "5.1.14">> Controls the minimum length of a search string before results are displayed.
+
+Defaults to "3".
+
+$:/config/Search/MinLength
diff --git a/editions/tw5.com/tiddlers/hiddensettings/Hidden_Setting__Search_AutoFocus.tid b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting_ Search AutoFocus.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/hiddensettings/Hidden_Setting__Search_AutoFocus.tid
rename to editions/tw5.com/tiddlers/hiddensettings/Hidden Setting_ Search AutoFocus.tid
diff --git a/editions/tw5.com/tiddlers/hiddensettings/Hidden_Setting__Typing_Refresh_Delay.tid b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting_ Typin Refresh Delay.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/hiddensettings/Hidden_Setting__Typing_Refresh_Delay.tid
rename to editions/tw5.com/tiddlers/hiddensettings/Hidden Setting_ Typin Refresh Delay.tid
diff --git a/editions/tw5.com/tiddlers/hiddensettings/Hidden_Settings.tid b/editions/tw5.com/tiddlers/hiddensettings/Hidden Settings.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/hiddensettings/Hidden_Settings.tid
rename to editions/tw5.com/tiddlers/hiddensettings/Hidden Settings.tid
diff --git a/editions/tw5.com/tiddlers/hiddensettings/Hidden_Setting__Keyboard_Shortcuts.tid b/editions/tw5.com/tiddlers/hiddensettings/Hidden_Setting__Keyboard_Shortcuts.tid
deleted file mode 100644
index c2e8c7c02..000000000
--- a/editions/tw5.com/tiddlers/hiddensettings/Hidden_Setting__Keyboard_Shortcuts.tid
+++ /dev/null
@@ -1,11 +0,0 @@
-created: 20150808123932042
-modified: 20150808124201286
-tags: [[Hidden Settings]]
-title: Hidden Setting: Keyboard Shortcuts
-type: text/vnd.tiddlywiki
-
-Until a proper user interface is built, KeyboardShortcuts can only be altered via hidden settings:
-
-$:/config/shortcuts/cancel-edit-tiddler - keyboard shortcut for cancelling editing
-
-$:/config/shortcuts/save-tiddler - keyboard shortcut for confirming editing a tiddler 
diff --git a/editions/tw5.com/tiddlers/howtos/Adding Babel Polyfill to TiddlyWiki.tid b/editions/tw5.com/tiddlers/howtos/Adding Babel Polyfill to TiddlyWiki.tid
new file mode 100644
index 000000000..944daadca
--- /dev/null
+++ b/editions/tw5.com/tiddlers/howtos/Adding Babel Polyfill to TiddlyWiki.tid	
@@ -0,0 +1,65 @@
+modified: 20160112175006000
+created: 20160112025328000
+title: Adding Babel Polyfill to TiddlyWiki
+tags: documenting Concepts
+type: text/vnd.tiddlywiki
+
+Not all browsers support the latest features of ES2015. The Babel project offers a polyfill that can be included into your TiddlyWiki so those features can be available to your plugins. To do this you will need a copy of the polyfill source.
+
+You can obtain the source either through <<.def "npm">> or downloaded/saved. See the [[Babel Polyfill documentation|https://babeljs.io/docs/usage/polyfill/]] for specific information on installing it.
+
+In your TiddlyWiki editions folder make sure you have a `plugins/babel-polyfill` folder. Then create the `plugins/babel-polyfill/plugin.info` file with the following in it:
+
+```json
+{
+  "title": "$:/plugins/babel/babel-polyfill",
+  "description": "Babel Polyfills for ES2015 support",
+  "author": "Your Name Here",
+  "core-version": ">=5.0.0"
+}
+```
+
+Create the folder `plugins/babel-polyfill/files` folder. Then create the `plugins/babel-polyfill/files/tiddlywiki.files` file with the following in it:
+
+```json
+{
+  "tiddlers": [
+    {
+      "file": "polyfill.min.js",
+      "fields": {
+        "title": "$:/plugins/babel/babel-polyfill/polyfill.min.js",
+        "type": "application/javascript",
+        "module-type": "library",
+        "global-module": "true"
+      }
+    }
+  ]
+}
+```
+
+Now copy the `polyfill.min.js` you downloaded/saved.
+
+<<.tip "If you downloaded this via ''npm'' then it would be available in `./node_modules/babel-polyfill/dist/polyfill.min.js`.">>
+
+Lastly you need a initializer so create the `plugins/babel-polyfill/plugin.js` file with the following in it:
+
+```javascript
+/*\
+title: $:/plugins/babel/babel-polyfill/plugin.js
+type: application/javascript
+module-type: startup
+
+Load the babel-polyfill library on startup
+
+\*/
+
+exports.startup = function() {
+  $tw.modules.execute('$:/plugins/babel/babel-polyfill/polyfill.min.js');
+}
+```
+
+<<.warning "Because the polyfill is meant to be used in the browser we need to conditionally load the library which ES2016 doesn't allow. This is why it is written using TiddlyWiki's dependency resolver instead of using ES2015 `import` statements.">>
+
+Now all the //runtime// ES2015 features are available like using `Promise` in your plugin code.
+
+See [[Using ES2016 for Writing Plugins]] on how to use the ES2015 //syntax// for your plugin code.
diff --git a/editions/tw5.com/tiddlers/howtos/Adding a Table of Contents to the Sidebar.tid b/editions/tw5.com/tiddlers/howtos/Adding a Table of Contents to the Sidebar.tid
new file mode 100644
index 000000000..73e93f819
--- /dev/null
+++ b/editions/tw5.com/tiddlers/howtos/Adding a Table of Contents to the Sidebar.tid	
@@ -0,0 +1,20 @@
+created: 20160424150551727
+modified: 20160608122742084
+tags: [[Customise TiddlyWiki]]
+title: Adding a Table of Contents to the Sidebar
+type: text/vnd.tiddlywiki
+
+A customisable [[table of contents|Table-of-Contents Macros]] can be added to the sidebar with the following steps:
+
+# Create a tiddler called [[TableOfContents]]
+# Give it the tag ''~$:/tags/SideBar''
+# Set the text to <div><pre><code><$text text="""
+<div class="tc-table-of-contents">
+
+<<toc-selective-expandable 'TableOfContents'>>
+
+</div>"""/></code></pre></div>
+# Add a ''caption'' field with the text ''Contents''
+# Add a ''list-after'' field with the text ''~$:/core/ui/SideBar/Open''
+
+Add entries to the table of contents by creating tiddlers tagged ''~TableOfContents''. An easy way is to choose {{$:/core/images/new-here-button}} ''new here'' from the tiddler toolbar. To create sub-entries, tag them with the name of the parent entry.
diff --git a/editions/tw5.com/tiddlers/howtos/Adding a Twitter Follow button.tid b/editions/tw5.com/tiddlers/howtos/Adding a Twitter Follow button.tid
index d652bbe93..6c7101c25 100644
--- a/editions/tw5.com/tiddlers/howtos/Adding a Twitter Follow button.tid	
+++ b/editions/tw5.com/tiddlers/howtos/Adding a Twitter Follow button.tid	
@@ -8,7 +8,7 @@ Here's a macro that provides a Twitter Follow button for a particular username:
 
 ```
 \define twitterFollowButton(username)
-<iframe allowtransparency="true" frameborder="0" scrolling="no" src="//platform.twitter.com/widgets/follow_button.html?screen_name=$username$"  style="width:300px; height:20px;"></iframe>
+<iframe allowtransparency="true" frameborder="0" scrolling="no" src="//platform.twitter.com/widgets/follow_button.html?screen_name=$username$" style="width:300px; height:20px;"></iframe>
 \end
 ```
 
@@ -17,5 +17,5 @@ The only change from the version published at https://dev.twitter.com/docs/follo
 Note that the src URL is given without a protocol (ie "http" or "https"). It's done this way so that it works on sites whether they are hosted on a HTTP or HTTPS domain. If you want the Twitter button to work while using a TiddlyWiki offline on a "file://" URL, then you'll need to manually add the protocol. For example:
 
 ```
-<iframe allowtransparency="true" frameborder="0" scrolling="no" src="http://platform.twitter.com/widgets/follow_button.html?screen_name=jermolene"  style="width:300px; height:20px;"></iframe>
+<iframe allowtransparency="true" frameborder="0" scrolling="no" src="http://platform.twitter.com/widgets/follow_button.html?screen_name=jermolene" style="width:300px; height:20px;"></iframe>
 ```
diff --git a/editions/tw5.com/tiddlers/howtos/Editing Tiddlers with Vim.tid b/editions/tw5.com/tiddlers/howtos/Editing Tiddlers with Vim.tid
new file mode 100644
index 000000000..0ab8d5933
--- /dev/null
+++ b/editions/tw5.com/tiddlers/howtos/Editing Tiddlers with Vim.tid	
@@ -0,0 +1,9 @@
+modified: 20160111190002
+created: 20140406210404245
+tags: Learning
+title: Editing Tiddlers with Vim
+type: text/vnd.tiddlywiki
+
+Devin Weaver has written a [[Vim|http://www.vim.org/]] plugin at https://github.com/sukima/vim-tiddlywiki
+
+It supports most of the TiddlyWiki syntax and includes a filetype plugin which will auto update the `modified` field.
diff --git a/editions/tw5.com/tiddlers/howtos/Generating Static Sites with TiddlyWiki.tid b/editions/tw5.com/tiddlers/howtos/Generating Static Sites with TiddlyWiki.tid
index f9d56e943..772b07493 100644
--- a/editions/tw5.com/tiddlers/howtos/Generating Static Sites with TiddlyWiki.tid	
+++ b/editions/tw5.com/tiddlers/howtos/Generating Static Sites with TiddlyWiki.tid	
@@ -1,5 +1,5 @@
 created: 20130828190200000
-modified: 20141013085608911
+modified: 20160622111343603
 tags: [[TiddlyWiki on Node.js]]
 title: Generating Static Sites with TiddlyWiki
 type: text/vnd.tiddlywiki
@@ -10,7 +10,7 @@ There is much flexibility in how the static HTML is generated. The following sce
 
 ! Wiki Snapshots and Tiddler Snapshots
 
-You can explore a static representation of this TiddlyWiki at <a href="static.html">static.html</a>. That file is a static snapshot of the current DefaultTiddlers. Any tiddlers that it links to are referred to via URLs of the form `/static/HelloThere.html` that point to static snapshots of individual tiddlers. The tiddler HTML files reference a `static.css` stylesheet file.
+You can explore a static representation of this TiddlyWiki at [ext[static.html]]. That file is a static snapshot of the current DefaultTiddlers. Any tiddlers that it links to are referred to via URLs of the form `/static/HelloThere.html` that point to static snapshots of individual tiddlers. The tiddler HTML files reference a `static.css` stylesheet file.
 
 The following commands are used to generate the sample static version of the TiddlyWiki5 site:
 
@@ -26,7 +26,7 @@ The first RenderTiddlersCommand generates the HTML representations of individual
 
 It is also possible to produce a single HTML file that contains static representations of tiddlers, and uses standard HTML anchor links to jump between them.
 
-For example: <a href="alltiddlers.html">alltiddlers.html</a>
+For example: [ext[alltiddlers.html]]
 
 The example is built by the following commands:
 
diff --git a/editions/tw5.com/tiddlers/howtos/How_to_build_a_TiddlyWiki5_from_individual_tiddlers.tid b/editions/tw5.com/tiddlers/howtos/How to build a TiddlyWiki5 from individual tiddlers.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/howtos/How_to_build_a_TiddlyWiki5_from_individual_tiddlers.tid
rename to editions/tw5.com/tiddlers/howtos/How to build a TiddlyWiki5 from individual tiddlers.tid
diff --git a/editions/tw5.com/tiddlers/howtos/How to export tiddlers.tid b/editions/tw5.com/tiddlers/howtos/How to export tiddlers.tid
index 3b30da8ac..de66f05e9 100644
--- a/editions/tw5.com/tiddlers/howtos/How to export tiddlers.tid	
+++ b/editions/tw5.com/tiddlers/howtos/How to export tiddlers.tid	
@@ -1,30 +1,30 @@
 created: 20151006145934884
-modified: 20151006155211988
+modified: 20160610084018658
 tags: Learning
 title: How to export tiddlers
 type: text/vnd.tiddlywiki
 
-!!! Selecting All tiddlers for export
+! Selecting All tiddlers for export
 
-To export ''all'' tiddlers click on the "Tools" tab of the Sidebar. Find and click the ``export all`` ({{$:/core/ui/Buttons/export-tiddler}}) button. A pop-up menu will offer you the chance to export tiddlers in multiple formats. 
+To export ''all'' tiddlers click on the "Tools" tab of the Sidebar. Find and click the {{$:/core/images/export-button}} ''export all'' button. A pop-up menu will offer you the chance to export tiddlers in multiple formats.
 
-!!! Exporting a tiddler
+! Exporting a tiddler
 
-If you want to export a particular tiddler, first navigate to that tiddler. Then click on the More Actions  icon ({{$:/core/ui/Buttons/more-tiddler-actions}}) that appears above the tiddler. From the list that appears select ``export tiddler``. A pop-up menu will offer you the chance to export the tiddler in multiple formats. 
+If you want to export a particular tiddler, first navigate to that tiddler. Then click on the {{$:/core/images/down-arrow}} ''more'' button that appears above the tiddler. From the list that appears select {{$:/core/images/export-button}} ''export tiddler''. A pop-up menu will offer you the chance to export the tiddler in multiple formats.
 
-!!! Exporting tiddlers matching a criteria (filter)
+! Exporting tiddlers matching a criteria (filter)
 
-To export a selection of tiddlers, click the little magnifying glass next to the search area on the sidebar. This will open the [[Advanced Search|$:/AdvancedSearch]] tiddler. Click on the ``Filter`` tab of the Advanced Search tiddler. Only the [[Filter|Filters]] tab will allow you to export a selection of tiddlers. [[Filters]] follow a particular syntax. Click on this [[Filters|Filters]] link to learn about how to make filters.
+To export a selection of tiddlers, click the little magnifying glass {{$:/core/images/advanced-search-button}} next to the search area on the sidebar. This will open the [[Advanced Search|$:/AdvancedSearch]] tiddler. Click on the "Filter" tab of the Advanced Search tiddler. Only the [[Filter|Filters]] tab will allow you to export a selection of tiddlers. [[Filters]] follow a particular syntax. Click on this [[Filters|Filters]] link to learn about how to make filters.
 
-Once you have written a filter, a list of tiddlers matching the filter will appear. Now you can click on the export icon ({{$:/core/ui/Buttons/export-tiddler}}) to the right of the filter input field. A pop-up menu will offer you the chance to export tiddlers in multiple formats. 
+Once you have written a filter, a list of tiddlers matching the filter will appear. Now you can click on the {{$:/core/images/export-button}} ''export tiddler'' button to the right of the filter input field. A pop-up menu will offer you the chance to export tiddlers in multiple formats.
 
-!!! Export formats
+! Export formats
 
 Currently, the export formats available are:
 
-  * CSV file format
-  * JSON file format
-  * Static HTML file
-  * ".tid" file format
+* CSV file format
+* JSON file format
+* Static HTML file
+* ".tid" file format
 
 The ``".tid"`` format is unique from the other formats in that only one tiddler will be exported, even if you are attempting to export all tiddlers or a selection of tiddlers.
diff --git a/editions/tw5.com/tiddlers/howtos/How to put the last modification date in a banner.tid b/editions/tw5.com/tiddlers/howtos/How to put the last modification date in a banner.tid
index 743fbe1d2..ba1d780be 100644
--- a/editions/tw5.com/tiddlers/howtos/How to put the last modification date in a banner.tid	
+++ b/editions/tw5.com/tiddlers/howtos/How to put the last modification date in a banner.tid	
@@ -1,13 +1,13 @@
-title: How to put the last modification date in a banner
 created: 20141020111002211
-modified: 20141020111002211
+modified: 20160617125921235
 tags: Learning
+title: How to put the last modification date in a banner
 type: text/vnd.tiddlywiki
 
 Here's how to display the last modification date of a wiki in a banner in the corner of the window:
 
-# Copy the plugin [[$:/plugins/tiddlywiki/github-fork-ribbon]] to your TiddlyWiki
-# Save and reload your wiki
+# [[Install the plugin|Installing a plugin from the plugin library]] <<.def "Corner ribbon">> in your ~TiddlyWiki
+# Save ({{$:/core/images/save-button}}) and reload ({{$:/core/images/refresh-button}}) your wiki
 # Create a new tiddler called [[$:/_MyRibbon]] tagged [[$:/tags/PageControls]] and containing:<div>
 
 ```
diff --git a/editions/tw5.com/tiddlers/howtos/KeyboardShortcuts.tid b/editions/tw5.com/tiddlers/howtos/KeyboardShortcuts.tid
index e5adee200..2a4d4d7fc 100644
--- a/editions/tw5.com/tiddlers/howtos/KeyboardShortcuts.tid
+++ b/editions/tw5.com/tiddlers/howtos/KeyboardShortcuts.tid
@@ -1,13 +1,13 @@
 created: 20140526204527418
-modified: 20150514091409984
+modified: 20160610082117953
 tags: Features [[Working with TiddlyWiki]]
 title: KeyboardShortcuts
 type: text/vnd.tiddlywiki
 
-Keyboard shortcut support is currently very limited but will be improved in later releases.
+Keyboard shortcuts are available for common editing operations:
 
-! Editing Shortcuts
+* Confirming changes to the draft tiddler containing the keyboard focus (defaults to <kbd>ctrl-Enter</kbd>
+* Abandoning changes to the draft tiddler containing the keyboard focus (defaults to <kbd>escape</kbd>)
+* Formatting operations from the tiddler editing toolbar (see the tooltips)
 
-|Key |Shortcut description |
-|<kbd>ctrl-enter</kbd> |Confirm changes to the draft tiddler containing the keyboard focus |
-|<kbd>escape</kbd> |Abandon changes to the draft tiddler containing the keyboard focus |
+The current shortcuts can be inspected and customised in the "Keyboard Shortcuts" tab of [[control panel|$:/ControlPanel]] {{$:/core/images/options-button}}.
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/howtos/Setting_a_page_background_image.tid b/editions/tw5.com/tiddlers/howtos/Setting a page background image.tid
similarity index 86%
rename from editions/tw5.com/tiddlers/howtos/Setting_a_page_background_image.tid
rename to editions/tw5.com/tiddlers/howtos/Setting a page background image.tid
index c7e30c835..47c8c5b6e 100644
--- a/editions/tw5.com/tiddlers/howtos/Setting_a_page_background_image.tid
+++ b/editions/tw5.com/tiddlers/howtos/Setting a page background image.tid	
@@ -1,12 +1,12 @@
 created: 20150417155912612
-modified: 20150417160627804
+modified: 20160610082700598
 tags: [[Customise TiddlyWiki]]
 title: Setting a page background image
 type: text/vnd.tiddlywiki
 
 # Import your image as a tiddler (see [[Images in WikiText]])
 #* You can also use an [[external image|ExternalImages]]
-# Open the $:/ControlPanel and switch to the ''Appearance''/''Theme Tweaks'' tab
+# Open the [[control panel|$:/ControlPanel]] {{$:/core/images/options-button}} and switch to the ''Appearance''/''Theme Tweaks'' tab
 # Select your image from the dropdown labelled "Page background image"
 # Set "Page background image attachment" to "Fixed to window" to have the background stay stationary and the content to scroll over the top of it, or "Scroll with tiddlers" to have it move (note that the iPhone/iPad [[doesn't support the fixed setting|http://stackoverflow.com/a/20444219]] for performance reasons)
 # Set "Page background image size" as follows:
diff --git a/editions/tw5.com/tiddlers/howtos/Tagging.tid b/editions/tw5.com/tiddlers/howtos/Tagging.tid
index a0ac4c21a..46b42e3e8 100644
--- a/editions/tw5.com/tiddlers/howtos/Tagging.tid
+++ b/editions/tw5.com/tiddlers/howtos/Tagging.tid
@@ -1,5 +1,5 @@
 created: 20140904075400000
-modified: 20150127154219000
+modified: 20160612132049797
 tags: [[Working with TiddlyWiki]] Concepts
 title: Tagging
 type: text/vnd.tiddlywiki
@@ -26,7 +26,7 @@ There are two more things you can do with tags:
 
 ! Set a tag's colour and icon
 
-You can use the [[tag manager|$:/TagManager]], found on the ''Tags'' tab under ''More'' in the sidebar, to change the colour of a tag's pill or add an icon to the pill.
+You can use the {{$:/core/images/tag-button}} [[tag manager|$:/TagManager]], found on the ''Tags'' tab under ''More'' in the sidebar, to change the colour of a tag's pill or add an icon to the pill.
 
 * To change the colour, click the button in the ''Colour'' column to select from a colour picker. Alternatively, click the icon in the ''Info'' column, then type a [[CSS]] colour value in the ''Colour'' field
 * To change the icon, click the {{$:/core/images/down-arrow}} button in the ''Icon'' column and choose from the list of available icons
diff --git a/editions/tw5.com/tiddlers/howtos/Upgrading.tid b/editions/tw5.com/tiddlers/howtos/Upgrading.tid
index e33890c4d..0f62b8fa9 100644
--- a/editions/tw5.com/tiddlers/howtos/Upgrading.tid
+++ b/editions/tw5.com/tiddlers/howtos/Upgrading.tid
@@ -1,5 +1,5 @@
 created: 20131202102427114
-modified: 20150412194953230
+modified: 20160617105124677
 tags: Features [[Working with TiddlyWiki]]
 title: Upgrading
 type: text/vnd.tiddlywiki
@@ -27,7 +27,7 @@ This process will work on most desktop browsers. Note that none of your personal
 #* If the file is encrypted you will be prompted for the password
 # Review the list of tiddlers that will be upgraded
 # Click ''Upgrade''
-# Save changes to save the new version
+# Save changes to save the new version ({{$:/core/images/save-button}})
 
 This will download a file called ''upgrade.html'' to your computer. This file is the upgrade of your old file. You may need to open the location where ''upgrade.html'' was downloaded, rename ''upgrade.html'' with the name of the old file you are upgrading, and replace the old file by moving the new file in its place.
 
diff --git a/editions/tw5.com/tiddlers/howtos/Using ES2016 for Writing Plugins.tid b/editions/tw5.com/tiddlers/howtos/Using ES2016 for Writing Plugins.tid
new file mode 100644
index 000000000..f34d10a4a
--- /dev/null
+++ b/editions/tw5.com/tiddlers/howtos/Using ES2016 for Writing Plugins.tid	
@@ -0,0 +1,197 @@
+modified: 20160305222940000
+created: 20160111034749658
+tags: documenting Concepts
+title: Using ES2016 for Writing Plugins
+type: text/vnd.tiddlywiki
+
+With the advent of ES2015 (also known as ES6) and the availability of [[Babel.js|http://babeljs.io/]] plugin developers can leverage ES2015 when writing TiddlyWiki plugins. Understanding the nuances between TiddlyWiki's module sandbox and how Babel compiles it's output ready for a module system like ~CommonJS/AMD.
+
+Please understand how the PluginMechanism works since this is all about writing a plugin using Babel to compile the output that will be included in the final TiddlyWiki (for example [[TiddlyWiki on Node.js]]).
+
+!! Installing and Configuring Babel
+
+You can install Babel using
+
+```
+$ npm install --global babel-cli babel-presets-es2015
+```
+
+If your developing the plugin for inclusion to the npm registry (or for convenience) you can avoid the global install and save it to the local `package.json` file with
+
+```
+$ npm install --save-dev babel-cli babel-presets-es2015
+```
+
+Inside your plugin project edit the file `.babelrc` and enter the following:
+
+```json
+{
+  "presets": [
+    "es2015"
+  ]
+}
+```
+
+<<.tip "I found it easier to manage my plugins as if they were ''npm'' modules complete with a `package.json` that compiles the output via `npm run build`. See [[npm-scripts documentation|https://docs.npmjs.com/misc/scripts]] for details.">>
+
+!! Compiling the Output
+
+Pick a folder to store the ES2015 JavaScript and a folder to output the TiddlyWiki ready JavaScript. In this example I will use `src` and `lib` respectively. With Babel installed and working I can compile all the JavaScript in the `src` folder to the `lib` folder by running this command:
+
+```
+$ babel src -d lib
+```
+
+<<.warning "Babel will //not// copy over non-JavaScript files. It is up to the developer to include all the supporting files themselves. Babel only converts the ~JavaScript files (ending in `.js`) from the `src` folder to the `lib` folder.">>
+
+!! Imports and Exports
+
+In a plugin written pre-ES2015 one would `require` a module through TiddlyWiki like so:
+
+```javascript
+var Widget = require('$:/core/modules/widgets/widget.js').widget;
+```
+
+But in ES2015 the following would look like:
+
+```javascript
+import { widget as Widget } from '$:/core/modules/widgets/widget.js';
+```
+
+Conveniently when Babel compiles this it will essentially output the same JavaScript as the first pre-ES2016 code.
+
+Also, in ES2016 you are required to declare your imports at the beginning and can not dynamically `require` things. This means you can not have an `import` statement in an if block or in a function. If that functionality is desired then you will have to go back to using the `require()` statement directly. But conciser that by doing so that you may be missing an oppertunity to make your code cleaner and better.
+
+Exporting is the same thing. Instead of assigning to a property of the `exports` variable you use the `export` keyword:
+
+```javascript
+export { MyWidget as mywidget };
+```
+
+<<.tip "It is illegal JavaScript to export with a name that is not an identifier even though it is ok to use a non-identifier (string) as a property key. What this means is if you want a widget to have a dash in it then you have to revert to using the `exports['my-widget'] = MyWidget;` syntax.">>
+
+It is important to understand that in ES2016 the ''default'' export is not supported in TiddlyWiki. This is mostly because the core code expects specific properties to be attached to the `exports` variable. Bable's `export` conversion plays well with this //except// with the default export.
+
+!! Classes
+
+In the example of a widget ES2016 plays well with class inheritance. To contrast the typical Widget definition would look something like this:
+
+```javascript
+function MyWidget() {
+  Widget.call(this);
+}
+MyWidget.prototype = new Widget();
+MyWidget.prototype.render = function(parent, nextSibling) {…};
+// And so on…
+```
+
+With classes this ceremony can be tightened up:
+
+```javascript
+class MyWidget extends Widget {
+  render(parent, nextSibling) {…}
+  // And so on…
+}
+```
+
+With classes one //could// eliminate much of the `Widget.execute()` cruft using <<.def "getters">>. I found this to be more readable then the typical mass assignment to `this`. It gave me the added benefit of allowing calculations in properties that normally would have conflated the `execute()` method. For example developing a compound property like so:
+
+```javascript
+class NameWidget extends Widget {
+  get title() { return this.getAttribute('title'); }
+  get firstName() { return this.getAttribute('first'); }
+  get lastName() { return this.getAttribute('last'); }
+  get fullName() { return `${this.title}. ${this.firstName} ${this.lastName}`; }
+}
+```
+
+!!! Non Class Modules
+
+For non class modules you can use the `export` keyword. Here is a simple [[Startup Module|ModuleType]]:
+
+```javascript
+export function startup() {
+  // Do stuff here
+}
+```
+
+Or in the case of a [[Macro|http://tiddlywiki.com/dev/#JavaScript%20Macros]]:
+
+```javascript
+export const name = 'my-macro';
+export const params = {};
+export function run() {…}
+```
+
+!! Polyfills
+
+ES2015 comes with some features that are part of the JavaScript core objects. These are not supported by all browsers. To use these features in [[most browsers|BrowserCompatibility]] you will need a <<.def "polyfill">>. Babel has a polyfill package that you can include. See [[Adding Babel Polyfill to TiddlyWiki]] for how to accomplish this.
+
+!! Example
+
+Here is an example ES2015 plugin/widget that will show the time and update it:
+
+```javascript
+
+/*\
+title: $:/plugins/sukima/clock-widget.js
+type: application/javascript
+module-type: widget
+
+A updating time stamp
+
+\*/
+import { widget as Widget } from '$:/core/modules/widgets/widget.js';
+
+class ClockWidget extends Widget {
+  constructor(parseTreeNode, options) {
+    super(parseTreeNode, options);
+    this.logger = new $tw.utils.Logger('clock-widget');
+  }
+
+  render(parent, nextSibling) {
+    if (!$tw.browser) { return; }
+    this.logger.log('Rendering clock DOM nodes');
+    this.computeAttributes()
+    this.parentDomNode = parent;
+    this.domNode = $tw.utils.domMaker('div', {
+      document: this.document,
+      class: 'tc-clock-widget'
+    });
+    parent.insertBefore(this.domNode, nextSibling);
+    this.tick();
+  }
+
+  tick() {
+    this.logger.log('Tick!');
+    if (!document.contains(this.domNode)) {
+      // Apparently the widget was removed from the DOM. Do some clean up.
+      return this.stop();
+    }
+    this.start();
+    this.domNode.innerHTML = this.dateString;
+  }
+
+  start() {
+    if (!this.clockTicker) {
+      this.logger.log('Starting clock');
+      this.clockTicker = setInterval(this.tick.bind(this), 1000);
+    }
+  }
+
+  stop() {
+    this.logger.log('Stopping clock');
+    clearInterval(this.clockTicker);
+    this.clockTicker = null;
+  }
+
+  get dateString() {
+    const format = 'DDth MMM YYYY at hh12:0mm:0ss am';
+    return $tw.utils.formatDateString(new Date(), format);
+  }
+}
+
+export { ClockWidget as clock };
+```
+
+<<.tip "Adding an extra space at the top causes Babel's output the preamble tiddler comment without any obscene indenting. Although it doesn't affect TiddlyWiki any, when reading the output it can be confusing when the tiddler information is rendered off the screen to the right.">>
diff --git a/editions/tw5.com/tiddlers/howtos/UsingSVG.tid b/editions/tw5.com/tiddlers/howtos/Using SVG.tid
similarity index 95%
rename from editions/tw5.com/tiddlers/howtos/UsingSVG.tid
rename to editions/tw5.com/tiddlers/howtos/Using SVG.tid
index 01c7d7e30..ccec0d4af 100644
--- a/editions/tw5.com/tiddlers/howtos/UsingSVG.tid
+++ b/editions/tw5.com/tiddlers/howtos/Using SVG.tid	
@@ -1,7 +1,7 @@
 created: 20131028132700000
-modified: 20150505063640327
+modified: 20160618085859219
 tags: Features
-title: UsingSVG
+title: Using SVG
 type: text/vnd.tiddlywiki
 
 TiddlyWiki5 allows you to use SVG to display vector graphics in two ways:
@@ -18,7 +18,7 @@ You can embed an SVG image tiddler using the ordinary transclusion syntax:
 {{Motovun Jack.jpg}}
 ```
 
-You can also use TypedBlockWikiText to embed an inline SVG tiddler.
+You can also use [[Typed Blocks in WikiText]] to embed an inline SVG tiddler.
 
 The implications of the image being rendered within an `<img>` element are that it is sandboxed; it can't use CSS styles from the parent document, for example. Neither can the image use WikiText features like transclusion.
 
diff --git a/editions/tw5.com/tiddlers/howtos/Using Stamp.tid b/editions/tw5.com/tiddlers/howtos/Using Stamp.tid
new file mode 100644
index 000000000..33872cf85
--- /dev/null
+++ b/editions/tw5.com/tiddlers/howtos/Using Stamp.tid	
@@ -0,0 +1,16 @@
+created: 20160618090057124
+modified: 20160618090130833
+tags: Learning
+title: Using Stamp
+type: text/vnd.tiddlywiki
+
+! Insert snippets
+You can insert preconfigured snippets of text to use stamp from toolbar. Click ''stamp'' ({{$:/core/images/stamp}}) and just select a snippet.
+
+! Create a snippet
+# Click ''stamp'' ({{$:/core/images/stamp}})
+# Create a snippet tiddler to use "//Add your own//" menu
+# Type some text of snippet for the tiddler, and caption for the name as shown in menu
+# Click the {{$:/core/images/done-button}} ''ok'' button
+
+''Tip:'' You can also create a snippet tiddler using the ''new tiddler'' {{$:/core/images/new-button}} button in the sidebar, and add tag ''~$:/tags/TextEditor/Snippet''
diff --git a/editions/tw5.com/tiddlers/images/New Release Banner.png b/editions/tw5.com/tiddlers/images/New Release Banner.png
index a6a6d046e..25573e05e 100644
Binary files a/editions/tw5.com/tiddlers/images/New Release Banner.png and b/editions/tw5.com/tiddlers/images/New Release Banner.png differ
diff --git a/editions/tw5.com/tiddlers/images/TWEUM2016 Thumbnail.jpg b/editions/tw5.com/tiddlers/images/TWEUM2016 Thumbnail.jpg
new file mode 100644
index 000000000..b9a2233f0
Binary files /dev/null and b/editions/tw5.com/tiddlers/images/TWEUM2016 Thumbnail.jpg differ
diff --git a/editions/tw5.com/tiddlers/images/TWEUM2016 Thumbnail.jpg.meta b/editions/tw5.com/tiddlers/images/TWEUM2016 Thumbnail.jpg.meta
new file mode 100644
index 000000000..afbc0ab9f
--- /dev/null
+++ b/editions/tw5.com/tiddlers/images/TWEUM2016 Thumbnail.jpg.meta	
@@ -0,0 +1,3 @@
+title: TWEUM2016 Thumbnail.jpg
+type: image/jpeg
+tags: picture
diff --git a/editions/tw5.com/tiddlers/languages/Castellano (Espana) Edition.tid b/editions/tw5.com/tiddlers/languages/Castellano (Espana) Edition.tid
new file mode 100644
index 000000000..9931beae4
--- /dev/null
+++ b/editions/tw5.com/tiddlers/languages/Castellano (Espana) Edition.tid	
@@ -0,0 +1,12 @@
+caption: Castellano (España)
+created: 20160511155557372
+list-before: Deutsch (Deutschland) Edition
+modified: 20160511160224223
+tags: Languages
+title: Edición en Castellano
+type: text/vnd.tiddlywiki
+
+La edición española de ~TiddlyWiki se encuentra aquí:
+
+* ''Documentación'' : http://tiddlywiki.com/languages/es-ES/index.html
+* ''~TiddlyWiki en blanco'' : http://tiddlywiki.com/languages/es-ES/empty.html
diff --git a/editions/tw5.com/tiddlers/languages/Korean (Korea Republic) Edition.tid b/editions/tw5.com/tiddlers/languages/Korean (Korea Republic) Edition.tid
new file mode 100644
index 000000000..d9f144d2a
--- /dev/null
+++ b/editions/tw5.com/tiddlers/languages/Korean (Korea Republic) Edition.tid	
@@ -0,0 +1,11 @@
+caption: 한국어 (대한민국)
+created: 20160424113322330
+modified: 20160424113322330
+tags: Languages
+title: Korean (Korea Republic) Edition
+type: text/vnd.tiddlywiki
+
+티들리위키 한국어 번역은 다음에서 사용할 수 있습니다:
+
+<!--* ''설명문서'' : http://tiddlywiki.com/languages/ko-KR/index.html-->
+* ''빈 위키'' : http://tiddlywiki.com/languages/ko-KR/empty.html
diff --git a/editions/tw5.com/tiddlers/languages/Languages.tid b/editions/tw5.com/tiddlers/languages/Languages.tid
index 0d65836f1..559a7e73e 100644
--- a/editions/tw5.com/tiddlers/languages/Languages.tid
+++ b/editions/tw5.com/tiddlers/languages/Languages.tid
@@ -1,12 +1,12 @@
 created: 20141202125500000
-modified: 20160106153341817
+modified: 20160617101222113
 tags: TableOfContents
 title: Languages
 type: text/vnd.tiddlywiki
 
 !! Language Plugins
 
-The core TiddlyWiki user interface is available in over 20 languages. You can install language plugins using the plugin manager under the [[control panel|$:/ControlPanel]] ''plugins'' tab.
+The core TiddlyWiki user interface is available in over 20 languages. You can install language plugins using the plugin manager under the [[control panel|$:/ControlPanel]] {{$:/core/images/options-button}} ''plugins'' tab. You can change the current language using the ''language'' button, found on the "Tools" tab in the sidebar.
 
 You can contribute a new language to the library by learning how to [[translate TiddlyWiki into your language|Translate TiddlyWiki into your language]].
 
diff --git a/editions/tw5.com/tiddlers/macros/colour-picker Macro.tid b/editions/tw5.com/tiddlers/macros/colour-picker Macro.tid
new file mode 100644
index 000000000..0614754dd
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/colour-picker Macro.tid	
@@ -0,0 +1,15 @@
+caption: colour-picker
+created: 20160418152741901
+modified: 20160418154330605
+tags: Macros [[Core Macros]]
+title: colour-picker Macro
+type: text/vnd.tiddlywiki
+
+The <<.def colour-picker>> [[macro|Macros]] displays an interactive colour picker, as can be seen in the core bitmap editor.
+
+!! Parameters
+
+;actions
+: Wikitext for the action widgets that should be executed when the user selects a colour. Within the text, the variable `colour-picker-value` contains the selected colour.
+
+<<.macro-examples "colour-picker">>
diff --git a/editions/tw5.com/tiddlers/macros/examples/colour-picker Macro (Example 1).tid b/editions/tw5.com/tiddlers/macros/examples/colour-picker Macro (Example 1).tid
new file mode 100644
index 000000000..4c767f706
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/examples/colour-picker Macro (Example 1).tid	
@@ -0,0 +1,15 @@
+created: 20160418154853776
+modified: 20160418155450547
+tags: 
+title: colour-picker Macro (Example 1)
+type: text/vnd.tiddlywiki
+
+Colour: <$edit-text tiddler='$:/_MyColour' tag='input' placeholder='(unset)' default=''/>
+
+---
+
+<$macrocall $name='colour-picker' actions="
+
+<$action-setfield $tiddler='$:/_MyColour' $value=<<colour-picker-value>>/>
+
+"/>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/macros/examples/colour-picker Macro (Examples).tid b/editions/tw5.com/tiddlers/macros/examples/colour-picker Macro (Examples).tid
new file mode 100644
index 000000000..47c211a47
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/examples/colour-picker Macro (Examples).tid	
@@ -0,0 +1,7 @@
+created: 20160418152735536
+modified: 20160418155324847
+tags: [[colour-picker Macro]] [[Macro Examples]]
+title: colour-picker Macro (Examples)
+type: text/vnd.tiddlywiki
+
+<$macrocall $name=".example" n="1" eg={{colour-picker Macro (Example 1)}}/>
diff --git a/editions/tw5.com/tiddlers/macros/examples/image-picker Macro (Example 1).tid b/editions/tw5.com/tiddlers/macros/examples/image-picker Macro (Example 1).tid
new file mode 100644
index 000000000..5c13646ca
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/examples/image-picker Macro (Example 1).tid	
@@ -0,0 +1,17 @@
+created: 20160418155523369
+modified: 20160418155913663
+tags: 
+title: image-picker Macro (Example 1)
+type: text/vnd.tiddlywiki
+
+Image: <$edit-text tiddler='$:/_MyImage' tag='input' placeholder='(unset)' default=''/>
+
+<$transclude tiddler={{$:/_MyImage}}/>
+
+---
+
+<$macrocall $name='image-picker' actions="
+
+<$action-setfield $tiddler='$:/_MyImage' $value=<<imageTitle>>/>
+
+"/>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/macros/examples/image-picker Macro (Example 2).tid b/editions/tw5.com/tiddlers/macros/examples/image-picker Macro (Example 2).tid
new file mode 100644
index 000000000..f05b320d5
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/examples/image-picker Macro (Example 2).tid	
@@ -0,0 +1,17 @@
+created: 20160418155523369
+modified: 20160418155913663
+tags: 
+title: image-picker Macro (Example 2)
+type: text/vnd.tiddlywiki
+
+Image: <$edit-text tiddler='$:/_MyImage' tag='input' placeholder='(unset)' default=''/>
+
+<$transclude tiddler={{$:/_MyImage}}/>
+
+---
+
+<$macrocall $name='image-picker' actions="
+
+<$action-setfield $tiddler='$:/_MyImage' $value=<<imageTitle>>/>
+
+" subfilter="prefix[Language]"/>
diff --git a/editions/tw5.com/tiddlers/macros/examples/image-picker Macro (Examples).tid b/editions/tw5.com/tiddlers/macros/examples/image-picker Macro (Examples).tid
new file mode 100644
index 000000000..eb5eb1f8b
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/examples/image-picker Macro (Examples).tid	
@@ -0,0 +1,11 @@
+created: 20160418155539132
+modified: 20160418155621890
+tags: [[image-picker Macro]] [[Macro Examples]]
+title: image-picker Macro (Examples)
+type: text/vnd.tiddlywiki
+
+<$macrocall $name=".example" n="1" eg={{image-picker Macro (Example 1)}}/>
+
+This next example shows how the <<.param subfilter>> parameter limits the list of images (here to those with the "Language" prefix):
+
+<$macrocall $name=".example" n="2" eg={{image-picker Macro (Example 2)}}/>
diff --git a/editions/tw5.com/tiddlers/macros/thumbnail_Macro_(Examples).tid b/editions/tw5.com/tiddlers/macros/examples/thumbnail Macro (Examples).tid
similarity index 100%
rename from editions/tw5.com/tiddlers/macros/thumbnail_Macro_(Examples).tid
rename to editions/tw5.com/tiddlers/macros/examples/thumbnail Macro (Examples).tid
diff --git a/editions/tw5.com/tiddlers/macros/image-picker Macro.tid b/editions/tw5.com/tiddlers/macros/image-picker Macro.tid
new file mode 100644
index 000000000..d6e2d38dd
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/image-picker Macro.tid	
@@ -0,0 +1,21 @@
+caption: image-picker
+created: 20160418155531395
+modified: 20160418155805435
+tags: Macros [[Core Macros]]
+title: image-picker Macro
+type: text/vnd.tiddlywiki
+
+The <<.def image-picker>> [[macro|Macros]] displays an interactive image picker, as can be seen in the core text editor.
+
+!! Parameters
+
+;actions
+: Wikitext for the action widgets that should be executed when the user selects an image. Within the text, the variable `imageTitle` contains the title of the tiddler containing the selected image.
+;subfilter
+: An optional extra [[filter step|Filter Step]], e.g. `tag[MyTag]`
+
+The images are selected by means of a [[filter expression|Filter Expression]], into which the <<.param subfilter>> parameter is spliced as follows:
+
+> `[all[shadows+tiddlers]is[image]$subfilter$!has[draft.of]] -[type[application/pdf]] +[sort[title]]`
+
+<<.macro-examples "image-picker">>
diff --git a/editions/tw5.com/tiddlers/macros/syntax/MacroCallSyntax.tid b/editions/tw5.com/tiddlers/macros/syntax/Macro Call Syntax.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/macros/syntax/MacroCallSyntax.tid
rename to editions/tw5.com/tiddlers/macros/syntax/Macro Call Syntax.tid
diff --git a/editions/tw5.com/tiddlers/macros/syntax/MacroDefinitionSyntax.tid b/editions/tw5.com/tiddlers/macros/syntax/Macro Definition Syntax.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/macros/syntax/MacroDefinitionSyntax.tid
rename to editions/tw5.com/tiddlers/macros/syntax/Macro Definition Syntax.tid
diff --git a/editions/tw5.com/tiddlers/macros/syntax/MacroSyntax.tid b/editions/tw5.com/tiddlers/macros/syntax/Macro Syntax.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/macros/syntax/MacroSyntax.tid
rename to editions/tw5.com/tiddlers/macros/syntax/Macro Syntax.tid
diff --git a/editions/tw5.com/tiddlers/macros/thumbnail_Macro.tid b/editions/tw5.com/tiddlers/macros/thumbnail Macro.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/macros/thumbnail_Macro.tid
rename to editions/tw5.com/tiddlers/macros/thumbnail Macro.tid
diff --git a/editions/tw5.com/tiddlers/mechanisms/AlertMechanism.tid b/editions/tw5.com/tiddlers/mechanisms/AlertMechanism.tid
index f5b215d17..ff54d1d0d 100644
--- a/editions/tw5.com/tiddlers/mechanisms/AlertMechanism.tid
+++ b/editions/tw5.com/tiddlers/mechanisms/AlertMechanism.tid
@@ -1,10 +1,10 @@
 created: 20140213224306412
-modified: 20160107225720338
+modified: 20160606125956564
 tags: Mechanisms Features
 title: AlertMechanism
 type: text/vnd.tiddlywiki
 
-Alerts are displayed as yellow boxes overlaying the main TiddlyWiki window. Each one corresponds to a tiddler with the tag [[$:/tags/Alert]]. Clicking the delete icon on an alert deletes the corresponding tiddler.
+Alerts are displayed as yellow boxes overlaying the main TiddlyWiki window. Each one corresponds to a tiddler with the tag [[$:/tags/Alert]]. Clicking the {{$:/core/images/delete-button}} delete icon on an alert deletes the corresponding tiddler.
 
 Here's a demo <$fieldmangler tiddler="SampleAlert"><$set name="currentTiddler" value="SampleAlert"><$button message="tm-add-tag" param="$:/tags/Alert">alert</$button></$set></$fieldmangler>.
 
diff --git a/editions/tw5.com/tiddlers/mechanisms/InfoMechanism.tid b/editions/tw5.com/tiddlers/mechanisms/InfoMechanism.tid
index ab709f1ed..137819bf1 100644
--- a/editions/tw5.com/tiddlers/mechanisms/InfoMechanism.tid
+++ b/editions/tw5.com/tiddlers/mechanisms/InfoMechanism.tid
@@ -1,9 +1,13 @@
 created: 20140720164948099
-modified: 20140720165248031
+modified: 20161017122011379
 tags: Mechanisms
 title: InfoMechanism
 type: text/vnd.tiddlywiki
 
+\define example(name)
+<$transclude tiddler="""$:/info/url/$name$""" mode="inline"/>
+\end
+
 System tiddlers in the namespace `$:/info/` are used to expose information about the system (including the current browser) so that WikiText applications can adapt themselves to available features.
 
 ! Information Tiddlers
@@ -11,4 +15,11 @@ System tiddlers in the namespace `$:/info/` are used to expose information about
 |!Title |!Description |
 |[[$:/info/browser]] |Running in the browser? ("yes" or "no") |
 |[[$:/info/node]] |Running under [[Node.js]]? ("yes" or "no") |
-
+|[[$:/info/url/full]] |<<.from-version "5.1.14">> Full URL of wiki (eg, ''<<example full>>'') |
+|[[$:/info/url/host]] |<<.from-version "5.1.14">> Host portion of URL of wiki (eg, ''<<example host>>'') |
+|[[$:/info/url/hostname]] |<<.from-version "5.1.14">> Hostname portion of URL of wiki (eg, ''<<example hostname>>'') |
+|[[$:/info/url/origin]] |<<.from-version "5.1.14">> Origin portion of URL of wiki (eg, ''<<example origin>>'') |
+|[[$:/info/url/pathname]] |<<.from-version "5.1.14">> Pathname portion of URL of wiki (eg, ''<<example pathname>>'') |
+|[[$:/info/url/port]] |<<.from-version "5.1.14">> Port portion of URL of wiki (eg, ''<<example port>>'') |
+|[[$:/info/url/protocol]] |<<.from-version "5.1.14">> Protocol portion of URL of wiki (eg, ''<<example protocol>>'') |
+|[[$:/info/url/search]] |<<.from-version "5.1.14">> Search portion of URL of wiki (eg, ''<<example search>>'') |
diff --git a/editions/tw5.com/tiddlers/mechanisms/PluginMechanism.tid b/editions/tw5.com/tiddlers/mechanisms/PluginMechanism.tid
index 39181b476..5b1a4ef27 100644
--- a/editions/tw5.com/tiddlers/mechanisms/PluginMechanism.tid
+++ b/editions/tw5.com/tiddlers/mechanisms/PluginMechanism.tid
@@ -1,14 +1,16 @@
 created: 20130826122000000
-modified: 20141029221758239
+modified: 20161015122959346
 tags: Mechanisms
 title: PluginMechanism
 type: text/vnd.tiddlywiki
 
-[[Plugins]] are bundles of tiddlers that are distributed and managed as a single unit by being packed into a single JSON tiddler. If a tiddler isn't found in the main store, then the registered plugins are searched for it instead.
+! Introduction
 
-Tiddlers within plugins behave something like shadow tiddlers in classic TiddlyWiki: they can be freely overwritten by creating a tiddler with the same title, but deleting that tiddler restores the underlying tiddler value from the plugin.
+[[Plugins]] are bundles of tiddlers that are distributed and managed as a single unit by being packed into a single JSON tiddler. Users can install them with drag and drop, or using the [[plugin library|Installing a plugin from the plugin library]].
 
-Plugins have a `plugin-type` field that may be (see the table below):
+The tiddlers within registered plugins behave as ShadowTiddlers: they can be freely overwritten by creating a tiddler with the same title, but deleting that tiddler restores the underlying tiddler value from the plugin.
+
+Plugins have a `plugin-type` field that may take the following values:
 
 * `plugin` //(default)// - a plain plugin
 * `theme` - a theme plugin (see ThemeMechanism)
@@ -18,103 +20,9 @@ Plugins can be used to package ordinary content, or can include JavaScript [[mod
 
 Plugins conventionally have a title of the form `$:/plugins/publisher/name`. Plugins that are part of the core TiddlyWiki distribution have titles of the form `$:/plugins/tiddlywiki/name`.
 
-Plugins that define macros, views or other named entities are expected to prefix the name with their publisher identifier, for example: `tiddlytools.slider`.
+When [[running TiddlyWiki under Node.js|TiddlyWiki on Node.js]], plugins can also be stored as individual tiddler files in [[PluginFolders]].
 
-! Plugin fields
+! More information
 
-Plugins are stored as tiddlers with the following fields:
+<<list-links "[tag[PluginMechanism]]">>
 
-|!Field |!Description |
-|title |Title of plugin |
-|description |Description of plugin |
-|author |Author of plugin |
-|version |Version string (must conform to SemanticVersioning convention) |
-|source |Source URL of plugin |
-|type |Must be ''application/json'' |
-|plugin-type |Can be ''plugin'' (default), ''language'' or ''theme'' |
-|text |JSON encoding of the list of tiddlers comprising the plugin |
-|list |Names of exposed plugin information tiddlers (see below) |
-|name |Name of the theme (only for themes) |
-|dependents |List of dependent plugins (currently only implemented for themes) |
-
-! Plugin folders
-
-On the server, plugins can be stored as ordinary JSON tiddlers but it is often more convenient to store them as separate tiddler files within folders. Plugin folders must contain a `plugin.info` file that contains the metadata for the plugin. It can also optionally identify files external to the plugin folder that should be loaded as tiddlers.
-
-The `plugin.info` file should contain the following JSON structure:
-
-The JSON structure for plugin tiddlers is as follows:
-
-```
-{
-	"title": "$:/plugins/publisher/name",
-	"description": "An exemplary plugin for demonstration purposes",
-	"author": "JeremyRuston",
-	"version": "1.2.3-alpha3",
-	"core-version": ">=5.0.0",
-	"source": "http://tiddlywiki.com/MyPlugin",
-	"plugin-type": "plugin",
-	"list": "readme license history"
-}
-```
-
-By convention, the titles of the individual tiddlers are prefixed with the title of the containing plugin, but they are not restricted to do so.
-
-Note that if the `version` field is omitted from a `plugin.info` file when the plugin folder is packed then it is automatically filled in by the core to the current core version number. This is to ensure that all the core plugins carry the correct version number. Generally plugin authors will want to ensure that they do explicitly specify a version number.
-
-! Plugin library
-
-The standard distribution of TiddlyWiki includes a number of standard plugins in the `plugins` directory.
-
-! Including plugins in a wiki
-
-To be usable in the browser, plugins just need to be included in the wiki. For wikis that are generated on the server, TiddlyWikiFolders can contain a `tiddlywiki.info` file that identifies the plugins to be included in this wiki:
-
-```
-{
-	"plugins": [
-		"tiddlywiki/slider",
-		"tiddlytools/chooser"
-	]
-}
-```
-
-Plugins names refer to plugin folders listed in TiddlyWiki5's root `plugins` folder.
-
-Plugins can also be included manually by copying them into the `plugins` subfolder of the wiki.
-
-! Plugin processing
-
-The wiki object keeps track of all of the currently loaded plugins. If a request for a tiddler isn't in the store then the wiki looks through the cascade of plugins to find the requested tiddler. It is a similar idea to the way that shadow tiddlers are implemented in classic TiddlyWiki.
-
-In the browser, any constituent tiddlers that are JavaScript modules (ie shadow tiddlers of content type `application/javascript` and possessing the field `module-type`) are executed during startup processing.
-
-!! Disabling Plugins
-
-Plugins can be disabled by creating a tiddler titled `$:/config/Plugins/Disabled/` concatenated with the plugin title, and setting its text to `yes`.
-
-For example, to disable the plugin `$:/plugins/tiddlywiki/highlight`, the title would be:
-
-```
-$:/config/Plugins/Disabled/$:/plugins/tiddlywiki/highlight
-```
-
-! Information Tiddlers for Plugins
-
-Plugin authors are encouraged to provide special information and documentation tiddlers that TiddlyWiki can include as plugin information tabs in the [[control panel|$:/ControlPanel]].
-
-Plugins should provide an icon contained in a tiddler with the title formed of `<plugin-name>/icon` (for example, [[$:/core/icon]]).
-
-Plugins expose the names of the individual information tabs that they wish to display in the `list` field of the plugin tiddler. By convention, some or all of the following should be provided:
-
-* ''readme'': basic information about the plugin
-* ''license'': the license under which the plugin is published
-
-The title of the associated information tiddler must be formed as follows:
-
-# `$:/<plugin-name>/<current-language>/<tab-name>` (for example, ''$:/core/en-GB/readme'')
-# `$:/<plugin-name>/<tab-name>` (for example, ''$:/core/readme'')
-
-Thus, plugins can provide language-specific versions of each information tiddler.
-
-Note that information tiddlers should not reference other tiddlers within the plugin. This is because plugins containing themes or languages are dynamically switched in and out as they are selected, and so their information tiddlers  may not be available for viewing. The control panel uses the 'subtiddler' attribute of the TranscludeWidget to access these tiddlers, which works independently of the plugin switching mechanism.
diff --git a/editions/tw5.com/tiddlers/mechanisms/SavingMechanism.tid b/editions/tw5.com/tiddlers/mechanisms/SavingMechanism.tid
index 1da06eedf..5bda7eb7d 100644
--- a/editions/tw5.com/tiddlers/mechanisms/SavingMechanism.tid
+++ b/editions/tw5.com/tiddlers/mechanisms/SavingMechanism.tid
@@ -1,14 +1,14 @@
 created: 20150709150749755
-modified: 20150712080651008
+modified: 20160709112741259
 tags: Mechanisms
 title: SavingMechanism
 type: text/vnd.tiddlywiki
 
-The SavingMechanism is the mechanism by which TiddlyWiki generates a new HTML file and stores it. It is different from the SyncMechanism, which is concerned with synchronising changes to individual tiddlers back to a server.
+The SavingMechanism is the mechanism by which TiddlyWiki generates a new HTML file and stores it. It is different from the sync mechanism, which is concerned with synchronising changes to individual tiddlers back to a server (see http://tiddlywiki.com/dev/#SyncAdaptorModules for more details).
 
 The following steps are involved:
 
-# The saver mechanism uses the filter defined in $:/config/SaverFilter to specify which modified tiddlers trigger the dirty state for the wiki
+# The saver mechanism uses the filter defined in $:/config/SaverFilter to specify which modified tiddlers trigger the dirty state for the wiki. (The dirty state is reflected in the red colouring of the "save changes" button in the sidebar).
 # The ButtonWidget is used to generate a [[tm-save-wiki|WidgetMessage: tm-save-wiki]] message to trigger the save operation
 # The optional parameter for the message specifies the template that will be used for generating the HTML file, defaulting to $:/core/save/all
 #* The plugin $:/plugins/tiddlywiki/tiddlyweb in the client-server configuration replaces the default template with $:/plugins/tiddlywiki/tiddlyweb/save/offline
diff --git a/editions/tw5.com/tiddlers/mechanisms/UpgradeMechanism.tid b/editions/tw5.com/tiddlers/mechanisms/UpgradeMechanism.tid
index f7354359e..afe751bce 100644
--- a/editions/tw5.com/tiddlers/mechanisms/UpgradeMechanism.tid
+++ b/editions/tw5.com/tiddlers/mechanisms/UpgradeMechanism.tid
@@ -1,7 +1,7 @@
-title: UpgradeMechanism
-modified: 20140711090154150
 created: 20140711090154150
+modified: 20160606122804180
 tags: Mechanisms
+title: UpgradeMechanism
 
 # Open upgrade.html
 # Includes a data tiddler called `$:/UpgradeLibrary` that contains the latest compatible versions of all plugins in the library
@@ -18,6 +18,5 @@ tags: Mechanisms
 ## Displays the payload tiddlers as a list of titles and checkboxes, with a dropdown showing the full details of the tiddler
 ## Perhaps we also suppress the usual JSON display for data tiddlers behind a reveal widget
 # The user can adjust the selection checkboxes
-# Clicking "done" unpacks the selected tiddlers from the pending import tiddler
+# Clicking "Upgrade" unpacks the selected tiddlers from the pending import tiddler
 # The pending import tiddler and the upgrade library tiddler are excluded from the subsequent save operation
-
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-add-field.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-add-field.tid
index 26fd76fac..f3d93b28e 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-add-field.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-add-field.tid	
@@ -10,4 +10,4 @@ The `tm-add-field` message is handled by the FieldManglerWidget. It adds the spe
 |!Name |!Description |
 |param |Name of field to add |
 
-The add field  message is usually generated with the ButtonWidget, and is handled by the FieldManglerWidget.
+The add field message is usually generated with the ButtonWidget, and is handled by the FieldManglerWidget.
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-edit-bitmap-operation.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-edit-bitmap-operation.tid
new file mode 100644
index 000000000..e8df75efd
--- /dev/null
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-edit-bitmap-operation.tid	
@@ -0,0 +1,68 @@
+caption: tm-edit-bitmap-operation
+created: 20160424204236050
+modified: 20160424215219517
+tags: Messages
+title: WidgetMessage: tm-edit-bitmap-operation
+type: text/vnd.tiddlywiki
+
+\define resizeDescription()
+<div>
+
+Resizes the image to the specified width and height. Parameters include:
+
+|!Name |!Description |
+|width |Specifies the width the image is resized to |
+|height |Specifies the height the image is resized to |
+
+</div>
+\end
+
+\define clearDescription()
+<div>
+
+Clears the contents of the image and fills it with a solid colour. Parameters include:
+
+|!Name |!Description |
+|colour |Colour the image should be filled with, defaults to <<.value "White">> |
+
+<<.tip "The colour field can take any normal CSS colour value, including the hexadecimal representation or the RGB format.">>
+</div>
+\end
+
+
+
+A `tm-edit-bitmap-operation` invokes one of the available operations on a __surrounding__ bitmap editor. Therefore the message has to be dispatched within the editor in order for it to catch it. The following properties on the `event` object are required:
+
+|!Name |!Description |
+|param |Name of the operation to be executed, see ''below'' for a list of possible operations |
+|paramObject| Hashmap of additional parameters required by the operation top be executed |
+
+The `tm-edit-bitmap-operation` message is usually generated by a ButtonWidget or an ActionWidget and is handled by the surrounding bitmap editor.
+
+! Bitmap Operations
+
+At this point the following bitmap operations have been implemented:
+
+|!Name |!Description |
+|<<.def "resize">>|<<resizeDescription>> |
+|<<.def "clear">>|<<clearDescription>> |
+
+
+!Example
+
+An example can be seen in [[$:/core/ui/EditorToolbar/size-dropdown]]:
+
+```
+<$button>
+<$action-sendmessage
+	$message="tm-edit-bitmap-operation"
+	$param="resize"
+	width={{$config-title$/new-width}}
+	height={{$config-title$/new-height}}
+/>
+...
+Resize
+</$button>
+```
+
+
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-edit-text-operation.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-edit-text-operation.tid
new file mode 100644
index 000000000..4a1410c70
--- /dev/null
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-edit-text-operation.tid	
@@ -0,0 +1,119 @@
+caption: tm-edit-text-operation
+created: 20160424211339792
+modified: 20160424230944519
+tags: Messages
+title: WidgetMessage: tm-edit-text-operation
+type: text/vnd.tiddlywiki
+
+\define exciseDescription()
+<div>
+
+Excises the currently selected text into a new tiddler and replaces it with a link, a macro or a transclude of the new tiddler. Parameters include:
+
+|!Name |!Description |
+|title |Title of the new tiddler the selected content is excised to|
+|type |Type of the replacement to be inserted: Can be one of <<.value "transclude">>, <<.value "link">> or <<.value "macro">>|
+|macro |In case //type=<<.value "macro">>//, specifies the name of the macro to be inserted. The title of the new tiddler is provided as the first parameter to the macro. Defaults to the ''translink'' macro|
+|tagnew |If '<<.value "yes">>', will tag the new tiddler with the title of the tiddler currently being edited |
+
+</div>
+\end
+
+\define replaceAllDescription()
+<div>
+
+Replaces ''all'' contents of the editor with the provided text.
+
+|!Name |!Description |
+|text |Text to be inserted|
+
+</div>
+\end
+
+\define replaceSelectionDescription()
+<div>
+
+Replaces the current selection with the provided text.
+
+|!Name |!Description |
+|text |Text to be inserted|
+
+</div>
+\end
+
+\define prefixLinesDescription()
+<div>
+
+Prefixes the currently selected line//(s)// with the provided character. If a line is already prefixed by the provided prefix, the prefix is removed instead.
+
+|!Name |!Description |
+|character |Prefix character|
+|count |Number of characters that make up the prefix|
+
+''Example'' Setting //character="<<.value "!">>"// and //count="<<.value "3">>"// would insert the prefix "<<.value "!!!" >>", which will resolve to a subheading when parsed as WikiText.
+
+</div>
+\end
+
+\define wrapLinesDescription()
+<div>
+
+Surrounds the selected //lines// with the provided <<.param "prefix">> and <<.param "suffix">>.
+
+|!Name |!Description |
+|prefix |String to be prefixed to the selected lines|
+|suffix |Suffix to be inserted after the selected lines|
+
+
+</div>
+\end
+
+
+\define wrapSelectionDescription()
+<div>
+
+Surrounds the current //selection// with the provided <<.param "prefix">> and <<.param "suffix">>.
+
+|!Name |!Description |
+|prefix |String to be prefixed to the selection|
+|suffix |Suffix to be inserted after the selection|
+
+</div>
+\end
+
+
+A `tm-edit-text-operation` invokes one of the available operations on a __surrounding__ text editor. Therefore the message has to be dispatched within the editor in order for it to catch it. The following properties on the `event` object are required:
+
+|!Name |!Description |
+|param |Name of the operation to be executed, see ''below'' for a list of possible operations |
+|paramObject|Hashmap of additional parameters required by the operation top be executed |
+
+The `tm-edit-text-operation` message is usually generated by a ButtonWidget or an ActionWidget and is handled by the surrounding text editor.
+
+! Text Operations
+
+At this point the following text operations have been implemented:
+
+|!Name |!Description |
+|<<.def "excise">>|<<exciseDescription>> |
+|<<.def "replace-all">>|<<replaceAllDescription>> |
+|<<.def "replace-selection">>|<<replaceSelectionDescription>> |
+|<<.def "prefix-lines">>|<<prefixLinesDescription>> |
+|<<.def "wrap-lines">>|<<wrapLinesDescription>> |
+|<<.def "wrap-selection">>|<<wrapSelectionDescription>> |
+
+
+!Example
+
+An example can be seen in [[$:/core/ui/EditorToolbar/bold]]:
+
+```
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="wrap-selection"
+	prefix="''"
+	suffix="''"
+/>
+```
+
+
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-fold-all-tiddlers.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-fold-all-tiddlers.tid
new file mode 100644
index 000000000..480048f48
--- /dev/null
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-fold-all-tiddlers.tid	
@@ -0,0 +1,17 @@
+caption: tm-fold-all-tiddlers
+created: 20160424230908388
+modified: 20160424232733820
+tags: Messages
+title: WidgetMessage: tm-fold-all-tiddlers
+type: text/vnd.tiddlywiki
+
+The `tm-fold-all-tiddlers` message folds all tiddlers in the current story list. It does so by setting the text of a state tiddler to either "<<.value "show">>" or "<<.value "hide">>", according to the fold state.
+
+|!Name |!Description |
+|foldedStatePrefix |Prefix for the state tiddler in which the fold state is stored. |
+
+<<.tip "The core uses a foldStatePrefix of '$:/state/folded/' to store the fold states for the default story view.">>
+<<.warning "The state tiddlers title is computed as 'foldStatePrefix + TiddlerTitle'. If the foldStatePrefix is not set, it will overwrite the text of the tiddler(s) itself, resulting in data loss. ">>
+
+
+The `tm-fold-all-tiddlers` message is usually generated with the ButtonWidget and is handled by the surrounding NavigatorWidget.
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-fold-other-tiddlers.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-fold-other-tiddlers.tid
new file mode 100644
index 000000000..09fd8a751
--- /dev/null
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-fold-other-tiddlers.tid	
@@ -0,0 +1,18 @@
+caption: tm-fold-other-tiddlers
+created: 20160424232355215
+modified: 20160424233338710
+tags: Messages
+title: WidgetMessage: tm-fold-other-tiddlers
+type: text/vnd.tiddlywiki
+
+The `tm-fold-other-tiddlers` message folds all tiddlers in the current story list, except the one specified in the `param` parameter. It does so by setting the text of a state tiddler to either "<<.value "show">>" or "<<.value "hide">>", according to the fold state.
+
+|!Name |!Description |
+|param|Title of the tiddler that should be ignored by the fold operation. |
+|foldedStatePrefix |Prefix for the state tiddler in which the fold state is stored. |
+
+<<.tip "The core uses a foldStatePrefix of '$:/state/folded/' to store the fold states for the default story view.">>
+<<.warning "The state tiddlers title is computed as 'foldStatePrefix + TiddlerTitle'. If the foldStatePrefix is not set, it will overwrite the text of the tiddler(s) itself, resulting in data loss. ">>
+
+
+The `tm-fold-other-tiddlers` message is usually generated with the ButtonWidget and is handled by the surrounding NavigatorWidget.
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-fold-tiddler.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-fold-tiddler.tid
new file mode 100644
index 000000000..872272128
--- /dev/null
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-fold-tiddler.tid	
@@ -0,0 +1,16 @@
+caption: tm-fold-tiddler
+created: 20160424232749223
+modified: 20160424233102003
+tags: Messages
+title: WidgetMessage: tm-fold-tiddler
+type: text/vnd.tiddlywiki
+
+The `tm-fold-tiddler` message folds the tiddler specified in the `param` parameter. It does so by setting the text of a state tiddler to either "<<.value "show">>" or "<<.value "hide">>", according to the fold state.
+
+|!Name |!Description |
+|param|Title of the tiddler that should be folded. If the tiddler is already folded, it will be unfolded instead. |
+|foldedStatePrefix |Prefix for the state tiddler in which the fold state is stored. If no state prefix is provided, `tm-fold-tiddler` will do nothing. |
+
+<<.tip "The core uses a foldStatePrefix of '$:/state/folded/' to store the fold states for the default story view.">>
+
+The `tm-fold-tiddler` message is usually generated with the ButtonWidget and is handled by the surrounding NavigatorWidget.
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-load-plugin-from-library.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-load-plugin-from-library.tid
new file mode 100644
index 000000000..c20f91eeb
--- /dev/null
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-load-plugin-from-library.tid	
@@ -0,0 +1,28 @@
+caption: tm-load-plugin-from-library
+created: 20160424233627001
+modified: 20160424235543975
+tags: Messages
+title: WidgetMessage: tm-load-plugin-from-library
+type: text/vnd.tiddlywiki
+
+The `tm-load-plugin-from-library` message load the specified tiddler or plugin from the specified plugin library.
+
+|!Name |!Description |
+|title |Title of the tiddler or plugin to be loaded into the current wiki |
+|url |Url specifying the plugin library from which the tiddler or plugin is to be loaded. |
+
+!Example
+
+The following snippet will install the CodeMirror plugin from the official plugin library:
+
+```
+<$button>
+<$action-sendmessage $message="tm-load-plugin-from-library" title="$:/plugins/tiddlywiki/codemirror" url="http://tiddlywiki.com/library/v5.1.11/index.html"/>
+Install CodeMirror
+</$button>
+```
+
+<<.tip "Usually a plugin library has to be loaded (initialized) first before it can be used. If the plugin library specified by 'url' has not been initialized yet, it will be loaded and initialized.">>
+
+
+The `tm-load-plugin-from-library` message is usually generated with the ButtonWidget and is handled by the core itself.
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-load-plugin-library.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-load-plugin-library.tid
new file mode 100644
index 000000000..14bfc2449
--- /dev/null
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-load-plugin-library.tid	
@@ -0,0 +1,25 @@
+caption: tm-load-plugin-library
+created: 20160424235548387
+modified: 20160425000427238
+tags: Messages
+title: WidgetMessage: tm-load-plugin-library
+type: text/vnd.tiddlywiki
+
+The `tm-load-plugin-library` message loads the specified plugin library and imports information about the contained plugins in temporary tiddlers.
+
+|!Name |!Description |
+|url |Url specifying the plugin library to be loaded. |
+|infoTitlePrefix|Prefix to the temporary tiddlers being created, containing information about the plugins the plugin library offers. Defaults to <<.value "$:/temp/RemoteAssetInfo/">> |
+
+!Example
+
+The following snippet will load the official plugin library:
+
+```
+<$button>
+<$action-sendmessage $message="tm-load-plugin-library" infoTitlePrefix="$:/temp/RemoteAssetInfo/" url="http://tiddlywiki.com/library/v5.1.11/index.html"/>
+Load official plugin library
+</$button>
+```
+
+The `tm-load-plugin-library` message is usually generated with the ButtonWidget and is handled by the core itself.
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-new-tiddler.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-new-tiddler.tid
index 167acec49..d060552d8 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-new-tiddler.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-new-tiddler.tid	
@@ -20,10 +20,19 @@ The title for the draft tiddler is chosen according to these rules:
 
 The new tiddler message is usually generated with the ButtonWidget or ActionSendMessageWidget and is handled by the NavigatorWidget.
 
-! Example
+! Examples
 
 To make a button that creates new tiddlers tagged "task", create a tiddler called "TaskTemplate" with that tag, and then make your button like this:
 
 ```
 <$button message="tm-new-tiddler" param="TaskTemplate">New Task</$button>
 ```
+
+To create a new tiddler with given attributes rather than from a template:
+
+```
+<$button>
+<$action-sendmessage $message="tm-new-tiddler" title="This is newly created tiddler" tags="OneTag [[Another Tag]]" text=<<now "Today is DDth, MMM YYYY">>/>
+New Tiddler
+</$button>
+```
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-notify.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-notify.tid
index 6d28adf70..f44839f45 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-notify.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-notify.tid	
@@ -1,5 +1,5 @@
 created: 20140811112304772
-modified: 20140811120248738
+modified: 20160701140248738
 tags: Messages
 title: WidgetMessage: tm-notify
 type: text/vnd.tiddlywiki
@@ -9,5 +9,6 @@ The notify message briefly displays a specified tiddler as a small alert in the
 
 |!Name |!Description |
 |param |Title of the tiddler to be displayed |
+|paramObject |Hashmap of variables to be provided to the notification |
 
 The notify message is handled by the TiddlyWiki core.
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-open-window.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-open-window.tid
new file mode 100644
index 000000000..dad280772
--- /dev/null
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-open-window.tid	
@@ -0,0 +1,18 @@
+caption: tm-open-window
+created: 20160424181447704
+modified: 20160424182909036
+tags: Messages
+title: WidgetMessage: tm-open-window
+type: text/vnd.tiddlywiki
+
+The `tm-open-window` message opens a tiddler in a new //browser// window. If no parameters are specified, the current tiddler is opened in a new window. Similiar to `tm-modal` any additional parameters passed via the <<.param "paramObject">> are being provided as variables to the new window.
+
+|!Name |!Description |
+|param |Title of the tiddler to be opened in a new browser window, defaults to <<.var "currentTiddler">> if empty |
+|template |Template in which the tiddler will be rendered in |
+|width |Width of the new browser window |
+|height |Height of the new browser window |
+|paramObject |Hashmap of variables that will be provided to the window  |
+
+
+The `tm-open-window` message is usually generated with the ButtonWidget and is handled by the core itself.
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-print.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-print.tid
new file mode 100644
index 000000000..c114811ef
--- /dev/null
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-print.tid	
@@ -0,0 +1,10 @@
+created: 20161008085627406
+modified: 20161008085627406
+tags: Messages
+title: WidgetMessage: tm-print
+type: text/vnd.tiddlywiki
+caption: tm-print
+
+<<.from-version "5.1.14">> The `tm-print` message causes the browser to display the print dialog for the current page. It does not require any properties on the `event` object.
+
+The print message is usually generated with the ButtonWidget and is handled by the core.
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-remove-field.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-remove-field.tid
index 398a58046..3a70bbec4 100644
--- a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-remove-field.tid	
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-remove-field.tid	
@@ -10,4 +10,4 @@ The `tm-remove-field` message is handled by the FieldManglerWidget. It removes t
 |!Name |!Description |
 |param |Name of field to remove |
 
-The remove field  message is usually generated with the ButtonWidget, and is handled by the FieldManglerWidget.
+The remove field message is usually generated with the ButtonWidget, and is handled by the FieldManglerWidget.
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-scroll.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-scroll.tid
new file mode 100644
index 000000000..d703d4ac7
--- /dev/null
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-scroll.tid	
@@ -0,0 +1,13 @@
+caption: tm-scroll
+created: 20160425000906330
+modified: 20160425001655166
+tags: Messages
+title: WidgetMessage: tm-scroll
+type: text/vnd.tiddlywiki
+
+The `tm-scroll` message causes the surrounding scrollable container to scroll to the specified DOM node into view. The `tm-scroll` is handled in various places in the core itself, but can also be handled by a [[ScrollableWidget]].
+
+|!Name |!Description |
+|target |Target DOM node the scrollable container should scroll to. |
+
+Due to the nature of the parameter, the `tm-scroll` can only be generated within javascript code.
diff --git a/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-unfold-all-tiddlers.tid b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-unfold-all-tiddlers.tid
new file mode 100644
index 000000000..906d8fabe
--- /dev/null
+++ b/editions/tw5.com/tiddlers/messages/WidgetMessage_ tm-unfold-all-tiddlers.tid	
@@ -0,0 +1,16 @@
+caption: tm-unfold-all-tiddlers
+created: 20160424233133261
+modified: 20160424233427308
+tags: Messages
+title: WidgetMessage: tm-unfold-all-tiddlers
+type: text/vnd.tiddlywiki
+
+The `tm-unfold-all-tiddlers` message unfolds all tiddlers in the current story list. It does so by setting the text of a state tiddler to either "<<.value "show">>" or "<<.value "hide">>", according to the fold state.
+
+|!Name |!Description |
+|foldedStatePrefix |Prefix for the state tiddler in which the fold state is stored. |
+
+<<.tip "The core uses a foldStatePrefix of '$:/state/folded/' to store the fold states for the default story view.">>
+<<.warning "The state tiddlers title is computed as 'foldStatePrefix + TiddlerTitle'. If the foldStatePrefix is not set, it will overwrite the text of the tiddler(s) itself, resulting in data loss. ">>
+
+The `tm-unfold-all-tiddlers` message is usually generated with the ButtonWidget and is handled by the surrounding NavigatorWidget.
diff --git a/editions/tw5.com/tiddlers/nodejs/Building TiddlyWikiClassic.tid b/editions/tw5.com/tiddlers/nodejs/Building TiddlyWikiClassic.tid
index bba1fc0e3..acde7851d 100644
--- a/editions/tw5.com/tiddlers/nodejs/Building TiddlyWikiClassic.tid	
+++ b/editions/tw5.com/tiddlers/nodejs/Building TiddlyWikiClassic.tid	
@@ -4,7 +4,7 @@ tags: [[TiddlyWiki on Node.js]]
 title: Building TiddlyWikiClassic
 type: text/vnd.tiddlywiki
 
-TiddlyWiki5 can be used to build older 2.x.x versions of TiddlyWikiClassic from their constituent components. Doing so involves these  features:
+TiddlyWiki5 can be used to build older 2.x.x versions of TiddlyWikiClassic from their constituent components. Doing so involves these features:
 
 * The `tiddlywiki/classictools` plugin, containing a deserializer module which allows tiddlers to be loaded from TiddlyWiki 2.x.x `.recipe` files
 * The `stripcomments` format for the ViewWidget, which strips single line JavaScript comments starting `//#`
diff --git a/editions/tw5.com/tiddlers/nodejs/Customising Tiddler File Naming.tid b/editions/tw5.com/tiddlers/nodejs/Customising Tiddler File Naming.tid
new file mode 100644
index 000000000..0b047b934
--- /dev/null
+++ b/editions/tw5.com/tiddlers/nodejs/Customising Tiddler File Naming.tid	
@@ -0,0 +1,23 @@
+created: 20160424181300000
+modified: 20160424181300000
+tags: [[TiddlyWiki on Node.js]]
+title: Customising Tiddler File Naming
+type: text/vnd.tiddlywiki
+
+By default, a [[TiddlyWiki on Node.js]] instance using a [[wiki folder|TiddlyWikiFolders]] will create new tiddler files by using the sanitised and disambiguated title as filename.
+
+This can be customised by creating a tiddler [[$:/config/FileSystemPaths]] containing one or more [[filter expressions|Filter Syntax]], each on a line of its own. Newly created tiddlers are matched to each filter in turn, and the first output of the first filter to produce any output is taken as a logical path to be used for the tiddler file. Logical paths don't include the `.tid` extension, and they always use `/` as directory separator (when generating the physical path, this is replaced by the correct separator for the platform ~TiddlyWiki is running on). If none of the filters matches, the logical path is simply the title with all occurences of `/` replaced by `_` (for backwards compatibility).
+
+In both cases, the characters `<>:"\|?*^ ` are replaced by `_` in order to guarantee that the resulting path is legal on all supported platforms.
+
+!! Example
+
+```
+[is[system]removeprefix[$:/]addprefix[_system/]]
+[tag[task][addprefix[mytasks/]]
+[!has[draft.of]]
+```
+
+This will store newly created system tiddlers in `tiddlers/_system` (after stripping the `$:/` prefix), tiddlers tagged [[task]] in a subdirectory `tiddlers/mytasks`, and also create subdirectory structures for all other non-draft tiddlers.
+
+Thus, $:/config/FileSystemPaths itself will end up in `tiddlers/_system/config/FileSystemPaths.tid` or `tiddlers\_system\config\FileSystemPaths.tid`, depending on the platform.
diff --git a/editions/tw5.com/tiddlers/nodejs/Installing_TiddlyWiki_Prerelease_on_Node.js.tid b/editions/tw5.com/tiddlers/nodejs/Installing TiddlyWiki Prerelease on Node.js.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/nodejs/Installing_TiddlyWiki_Prerelease_on_Node.js.tid
rename to editions/tw5.com/tiddlers/nodejs/Installing TiddlyWiki Prerelease on Node.js.tid
diff --git a/editions/tw5.com/tiddlers/nodejs/Installing TiddlyWiki on Node.js.tid b/editions/tw5.com/tiddlers/nodejs/Installing TiddlyWiki on Node.js.tid
index 9f51cc4bb..bdd90dc91 100644
--- a/editions/tw5.com/tiddlers/nodejs/Installing TiddlyWiki on Node.js.tid	
+++ b/editions/tw5.com/tiddlers/nodejs/Installing TiddlyWiki on Node.js.tid	
@@ -1,10 +1,12 @@
 created: 20131219100608529
-modified: 20150325173825615
+modified: 20160520090217678
 tags: [[TiddlyWiki on Node.js]]
 title: Installing TiddlyWiki on Node.js
 type: text/vnd.tiddlywiki
 
-# Install [[Node.js]] from http://nodejs.org
+# Install [[Node.js]]
+#* either from your favourite package manager: typically `apt-get install nodejs` on Debian/Ubuntu Linux or Termux for Android, or `brew install node` on a Mac
+#* or directly from http://nodejs.org
 # Open a command line terminal and type:
 #> `npm install -g tiddlywiki`
 #> If it fails with an error you may need to re-run the command as an administrator:
@@ -17,9 +19,13 @@ type: text/vnd.tiddlywiki
 ## `tiddlywiki mynewwiki --server` to start TiddlyWiki
 ## Visit http://127.0.0.1:8080/ in your browser
 ## Try editing and creating tiddlers
+# Optionally, make an offline copy:
+#* click the {{$:/core/images/save-button}} ''save changes'' button in the sidebar, ''OR''
+#* `tiddlywiki --build index`
+
 
 The `-g` flag causes TiddlyWiki to be installed globally. Without it, TiddlyWiki will only be available in the directory where you installed it.
 
-If you are using Debian or Debian-based Linux and you are reciving a `node: command not found` error though node.js package is installed, you may need to create a symbolic link between `nodejs` and `node`. Consult your distro's manual and `whereis` to correctly create a link. See github [[issue 1434|http://github.com/Jermolene/TiddlyWiki5/issues/1434]]
+If you are using Debian or Debian-based Linux and you are receiving a `node: command not found` error though node.js package is installed, you may need to create a symbolic link between `nodejs` and `node`. Consult your distro's manual and `whereis` to correctly create a link. See github [[issue 1434|http://github.com/Jermolene/TiddlyWiki5/issues/1434]]
 
-Example Debian v8.0: `sudo ln -s /usr/bin/nodejs /usr/bin/node`
\ No newline at end of file
+Example Debian v8.0: `sudo ln -s /usr/bin/nodejs /usr/bin/node`
diff --git a/editions/tw5.com/tiddlers/nodejs/Serving TW5 from Android.tid b/editions/tw5.com/tiddlers/nodejs/Serving TW5 from Android.tid
new file mode 100644
index 000000000..13eb60c79
--- /dev/null
+++ b/editions/tw5.com/tiddlers/nodejs/Serving TW5 from Android.tid	
@@ -0,0 +1,13 @@
+created: 20160602043529506
+modified: 20160602043531313
+tags: [[TiddlyWiki on Node.js]]
+title: Serving TW5 from Android
+type: text/vnd.tiddlywiki
+
+[[Termux|https://termux.com/]] is an open source Android application that combines a Linux system and a terminal.
+
+Once you open //Termux// on your Android system, it is straightforward to [[install|Installing TiddlyWiki on Node.js]] and [[run|Using TiddlyWiki on Node.js]] the [[Node.js flavour of TiddlyWiki|TiddlyWiki on Node.js]] from the command line. 
+
+From then on, as long as //Termux// is not closed, you may access your wiki anytime from your favourite Web browser pointing on the expected address and port.
+
+> __note to contributors__: in //Termux//, you may as well install //git//, //emacs// or //vi//, in order to edit and maintain individual tiddler files. This would probably require that you also attach a more powerful keyboard to your Android, like the [[Hacker's Keyboard|https://github.com/klausw/hackerskeyboard/]] application or a Bluetooth external device.
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/nodejs/tiddlywiki.files_Files.tid b/editions/tw5.com/tiddlers/nodejs/tiddlywiki.files_Files.tid
new file mode 100644
index 000000000..3df16e7c6
--- /dev/null
+++ b/editions/tw5.com/tiddlers/nodejs/tiddlywiki.files_Files.tid
@@ -0,0 +1,93 @@
+created: 20161015114118243
+modified: 20161015170604353
+tags: TiddlyWikiFolders
+title: tiddlywiki.files Files
+type: text/vnd.tiddlywiki
+
+! Introduction
+
+A `tiddlywiki.files` JSON file in a sub-folder within [[a TiddlyWiki folder|TiddlyWikiFolders]] overrides the usual logic for recursively scanning the folder for tiddler files. Instead, the `tiddlywiki.files` file specifies instructions for loading tiddlers from specific files and folders.
+
+The format of the file is an object with two optional properties:
+
+* ''tiddlers'' - an array of objects describing external files with the ability to override or modify any of the fields read from the file
+* ''directories'' - an array of objects describing external directories, a filter determining which files within those directories should be processed, and the ability to override or modify any of the fields read from the file
+
+Note that significant enhancements to `tiddlywiki.files` processing were introduced in [[Release 5.1.14]].
+
+!! Field overrides
+
+Both the ''tiddlers'' and ''directories'' sections of `tiddlywiki.files` files include the ability to override or customise the values of fields with a `fields` object.
+
+Each field can be specified as either a ''string'' or ''array'' value to be assigned directly to the field, or <<.from-version "5.1.14">> an ''object'' describing how to generate the value for the field. The object contains the following properties:
+
+* ''source'' - (optional) a string specifying the source value for the field. If not specified, the existing value is used
+** //filename// the filename of the file containing the tiddler
+** //basename// the filename of the file containing the tiddler without any extension
+** //extname// the extension of the filename of the file containing the tiddler
+** //created// the creation date/time of the file containing the tiddler
+** //modified// the modification date/time of the file containing the tiddler
+* ''prefix'' - (optional) a string to be prepended to the value of the field
+* ''suffix'' - (optional) a string to be appended to the value of the field
+
+! Tiddlers section
+
+The file specifications in the `tiddlers` array support the following properties:
+
+* ''file'': (required) the absolute or relative path to the file containing the tiddler data (relative paths are interpreted relative to the path of the `tiddlywiki.files` file)
+* ''isTiddlerFile'': (optional) if `true`, the file will be treated as a [[tiddler file|TiddlerFiles]] and deserialised to extract the tiddlers. Otherwise, the raw content of the file is assigned to the `text` field without any parsing
+* ''fields'': (optional) an object containing values that override or customise the fields provided in the tiddler file (see above)
+* ''prefix'' & ''suffix'': (optional) strings to be prefixed and suffixed to the tiddler `text` field
+*> Note that providing a ''prefix'' here is equivalent to setting the `text` field of the ''fields'' object to `{"prefix":"<prefixvalue>"}`.
+
+! Directories section
+
+Directory specifications in the `directories` array may take the following forms:
+
+* a ''string'' literal, specifying the absolute or relative path to the directory containing the tiddler files (relative paths are interpreted relative to the path of the `tiddlywiki.files` file). The directory is recursively searched for tiddler files
+* <<.from-version "5.1.14">> an ''object'' with the following properties:
+** ''path'' - (required) the absolute or relative path to the directory containing the tiddler files (relative paths are interpreted relative to the path of the `tiddlywiki.files` file). Note that the directory is not recursively searched; sub-directories are ignored
+** ''filesRegExp'' - (optional) a [[regular expression|https://developer.mozilla.org/en/docs/Web/JavaScript/Guide/Regular_Expressions]] that matches the filenames of the files that should be processed within the directory
+** ''isTiddlerFile'' - (required) if `true`, the file will be treated as a [[tiddler file|TiddlerFiles]] and deserialised to extract the tiddlers. Otherwise, the raw content of the file is assigned to the `text` field without any parsing
+** ''fields'' - (required) an object containing values that override or customise the fields provided in the tiddler file (see above)
+
+Fields can be overridden for particular files by creating a file with the same name plus the suffix `.meta` -- see TiddlerFiles.
+
+! Examples
+
+These example `tiddlywiki.files` must be placed in their own sub-directory of the [[wiki folder|TiddlyWikiFolders]].
+
+There are also several examples of `tiddlywiki.files` files in the main [[TiddlyWiki 5 GitHub repository|https://github.com/Jermolene/TiddlyWiki5]]. 
+
+!! Importing a folder of PDFs
+
+This example retrieves all the files with the extension `.pdf` from a folder specified by a relative path. Each tiddler is given the following fields:
+
+* ''title'' - set to the filename of the PDF file
+* ''created'' - set to the creation date/time of the PDF file
+* ''modified'' - set to the modification date/time of the PDF file
+* ''type'' - set to `application/pdf`
+* ''tags'' - set to `$:/tags/AttachedFile`
+* ''_canonical_uri'' - set to the string "pdfs/" concatenated with the filename
+
+```
+{
+    "directories": [
+        {
+            "path": "../../../input/pdfs",
+            "filesRegExp": "^.*\\.pdf$",
+            "isTiddlerFile": false,
+            "fields": {
+                "title": {"source": "filename"},
+                "created": {"source": "created"},
+                "modified": {"source": "modified"},
+                "type": "application/pdf",
+                "tags": ["$:/tags/AttachedFile"],
+                "_canonical_uri": {"source": "filename", "prefix": "pdfs/"}
+            }
+        }
+    ]
+}
+```
+
+The approach of re-using the filename of the PDF as the 
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/nodejs/tiddlywiki.info_Files.tid b/editions/tw5.com/tiddlers/nodejs/tiddlywiki.info_Files.tid
new file mode 100644
index 000000000..f3f572246
--- /dev/null
+++ b/editions/tw5.com/tiddlers/nodejs/tiddlywiki.info_Files.tid
@@ -0,0 +1,59 @@
+created: 20161015114042793
+modified: 20161015121622327
+tags: TiddlyWikiFolders
+title: tiddlywiki.info Files
+type: text/vnd.tiddlywiki
+
+[[TiddlyWikiFolders]] are configured with a single `tiddlywiki.info` file in the root of the wiki folder. It should contain a JSON object comprising the following properties:
+
+* ''plugins'' - an array of plugin names to be included in the wiki
+* ''themes'' - an array of theme names to be included in the wiki
+* ''languages'' - an array of language names to be included in the wiki
+* ''includeWikis'' - an array of references to external wiki folders to be included in the wiki
+* ''build'' - a hashmap of named build targets, each defined by an array of command tokens (see BuildCommand)
+* ''config'' - an optional hashmap of configuration options (see below)
+
+!!! ''includeWikis''
+
+The entries in the ''includeWikis'' array can be either a string specifying the relative path to the wiki, or an object with the following fields:
+
+* ''path'' - relative path to wiki folder
+* ''read-only'' - set //true// to prevent the tiddlers in the included wiki from being modified. The modifications will be written to the directory specified in ''default-tiddler-location'', described below
+
+!!! ''build''
+
+Note that the build targets of included wikis are merged if a target of that name isn't defined in the current `tiddlywiki.info` file.
+
+!!! ''config''
+
+Configuration options include:
+
+* ''default-tiddler-location'' - a string path to the default location for the filesystem adaptor to save new tiddlers (resolved relative to the wiki folder)
+
+* ''retain-original-tiddler-path'' - If true, the server will generate a tiddler [[$:/config/OriginalTiddlerPaths]] containing the original file paths of each tiddler in the wiki
+
+!!! Example
+
+For example:
+
+```
+{
+	"plugins": [
+		"tiddlywiki/tiddlyweb",
+		"tiddlywiki/filesystem"
+	],
+	"includeWikis": [
+		"../tw5.com"
+	],
+	"build": {
+		"index": [
+			"--rendertiddler","$:/core/save/all","index.html","text/plain"],
+		"favicon": [
+			"--savetiddler","$:/favicon.ico","favicon.ico",
+			"--savetiddler","$:/green_favicon.ico","static/favicon.ico"]
+	},
+	"config": {
+		"retain-original-tiddler-path": true	
+	}
+}
+```
diff --git a/editions/tw5.com/tiddlers/plugins/Disabling_Plugins.tid b/editions/tw5.com/tiddlers/plugins/Disabling_Plugins.tid
new file mode 100644
index 000000000..12c11a112
--- /dev/null
+++ b/editions/tw5.com/tiddlers/plugins/Disabling_Plugins.tid
@@ -0,0 +1,15 @@
+created: 20161015121727194
+modified: 20161015121728291
+tags: PluginMechanism
+title: Disabling Plugins
+type: text/vnd.tiddlywiki
+
+!! Disabling Plugins
+
+Plugins can be disabled by creating a tiddler titled `$:/config/Plugins/Disabled/` concatenated with the plugin title, and setting its text to `yes`.
+
+For example, to disable the plugin `$:/plugins/tiddlywiki/highlight`, the title would be:
+
+```
+$:/config/Plugins/Disabled/$:/plugins/tiddlywiki/highlight
+```
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/plugins/Installing a plugin from the plugin library.tid b/editions/tw5.com/tiddlers/plugins/Installing a plugin from the plugin library.tid
new file mode 100644
index 000000000..9ea210131
--- /dev/null
+++ b/editions/tw5.com/tiddlers/plugins/Installing a plugin from the plugin library.tid	
@@ -0,0 +1,43 @@
+created: 20160107222352710
+modified: 20160720145836265
+tags: Plugins
+title: Installing a plugin from the plugin library
+type: text/vnd.tiddlywiki
+
+! Standalone Configuration
+
+Follow these instructions when using TiddlyWiki as a standalone HTML file:
+
+# Create a backup of your current TiddlyWiki HTML file ([[just in case|The First Rule of Using TiddlyWiki]])
+# Open your TiddlyWiki in a browser
+# Open the [[control panel|$:/ControlPanel]] {{$:/core/images/options-button}}, click on the ''Plugins'' tab and then the {{$:/core/images/download-button}} ''Get more plugins'' button
+# Click {{$:/core/images/chevron-right}} ''open plugin library'' to open the official plugin library
+# When the library listing is loaded:
+## Use the tab to select between ''plugins'', ''themes'' and ''languages''
+## Use the ''search'' box to search the plugin details
+# Click the ''install'' button to install a plugin
+# Save your TiddlyWiki {{$:/core/images/save-button}}
+# ''Refresh the page so that TiddlyWiki loads the new plugin'' {{$:/core/images/refresh-button}}
+# The plugin should now be available for use
+
+! Client-Server Configuration
+
+Follow these instructions when using TiddlyWiki under Node.js:
+
+# Identify the plugins you want to install using the ''Plugins'' tab of [[control panel|$:/ControlPanel]] (''don't'' install the plugins from here, though). Plugins are identified by their type (ie language, theme or plugin) and their publisher and title. For example, the plugin `$:/plugins/tiddlywiki/internals` is referred to as ''tiddlywiki/internals''
+# Quit the server if it is running
+# Edit the `tiddlywiki.info` file (it is in JSON format) and locate the `plugins` and `themes` section (see below)
+# Add entries corresponding to the plugins you wish to add. Take care to retain commas to separate items, but do not terminate the last item in a list with a comma
+# Restart the server
+
+```
+{
+	"plugins": [
+		"tiddlywiki/codemirror"
+	],
+	"themes": [
+		"tiddlywiki/vanilla",
+		"tiddlywiki/snowwhite"
+	]
+}
+```
diff --git a/editions/tw5.com/tiddlers/plugins/Installing_a_plugin_from_the_plugin_library.tid b/editions/tw5.com/tiddlers/plugins/Installing_a_plugin_from_the_plugin_library.tid
deleted file mode 100644
index a071fdd24..000000000
--- a/editions/tw5.com/tiddlers/plugins/Installing_a_plugin_from_the_plugin_library.tid
+++ /dev/null
@@ -1,17 +0,0 @@
-created: 20160107222352710
-modified: 20160107224746041
-tags: Plugins
-title: Installing a plugin from the plugin library
-type: text/vnd.tiddlywiki
-
-# Create a backup of your current TiddlyWiki HTML file ([[just in case|The First Rule of Using TiddlyWiki]])
-# Open your TiddlyWiki in a browser
-# Open the [[$:/ControlPanel]], click on the ''Plugins'' tab and then the ''Get more plugins'' button
-# Click ''open plugin library'' to open the official plugin library
-# When the library listing is loaded:
-## Use the dropdown to select between ''plugins'', ''themes'' and ''languages''
-## Use the ''search'' box to search the plugin details
-# Click the ''install'' button to install a plugin
-# Save your TiddlyWiki
-# ''Refresh the page so that TiddlyWiki loads the new plugin''
-# The plugin should now be available for use
diff --git a/editions/tw5.com/tiddlers/plugins/Manually_installing_a_plugin.tid b/editions/tw5.com/tiddlers/plugins/Manually installing a plugin.tid
similarity index 77%
rename from editions/tw5.com/tiddlers/plugins/Manually_installing_a_plugin.tid
rename to editions/tw5.com/tiddlers/plugins/Manually installing a plugin.tid
index ecfb8b23f..3d9a9335c 100644
--- a/editions/tw5.com/tiddlers/plugins/Manually_installing_a_plugin.tid
+++ b/editions/tw5.com/tiddlers/plugins/Manually installing a plugin.tid	
@@ -1,5 +1,5 @@
 created: 20160107222430613
-modified: 20160107222721398
+modified: 20160617104949358
 tags: Plugins
 title: Manually installing a plugin
 type: text/vnd.tiddlywiki
@@ -8,6 +8,6 @@ type: text/vnd.tiddlywiki
 # Open your TiddlyWiki in a browser
 # In another browser window, find a link to the plugin, e.g. [[$:/plugins/tiddlywiki/example]]. You will typically find these links on the home page of the plugin (for example, http://tiddlywiki.com/plugins/tiddlywiki/katex/)
 # Drag the link [[$:/plugins/tiddlywiki/example]] to the browser window containing your TiddlyWiki
-# Save your TiddlyWiki
-# ''Refresh the page so that TiddlyWiki loads the new plugin''
+# Save your TiddlyWiki ({{$:/core/images/save-button}})
+# ''Refresh the page so that TiddlyWiki loads the new plugin'' ({{$:/core/images/refresh-button}})
 # The plugin should now be available for use
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/plugins/Plugin_Editions.tid b/editions/tw5.com/tiddlers/plugins/Plugin Editions.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/plugins/Plugin_Editions.tid
rename to editions/tw5.com/tiddlers/plugins/Plugin Editions.tid
diff --git a/editions/tw5.com/tiddlers/plugins/PluginFolders.tid b/editions/tw5.com/tiddlers/plugins/PluginFolders.tid
new file mode 100644
index 000000000..e3e7c6ad9
--- /dev/null
+++ b/editions/tw5.com/tiddlers/plugins/PluginFolders.tid
@@ -0,0 +1,28 @@
+created: 20161015113519246
+modified: 20161015113833256
+tags: PluginMechanism
+title: PluginFolders
+type: text/vnd.tiddlywiki
+
+On the server, plugins can be stored as ordinary JSON tiddlers but it is often more convenient to store them as separate tiddler files within folders. Plugin folders must contain a `plugin.info` file that contains the metadata for the plugin. It can also optionally identify files external to the plugin folder that should be loaded as tiddlers.
+
+The `plugin.info` file should contain the following JSON structure:
+
+The JSON structure for plugin tiddlers is as follows:
+
+```
+{
+	"title": "$:/plugins/publisher/name",
+	"description": "An exemplary plugin for demonstration purposes",
+	"author": "JeremyRuston",
+	"version": "1.2.3-alpha3",
+	"core-version": ">=5.0.0",
+	"source": "http://tiddlywiki.com/MyPlugin",
+	"plugin-type": "plugin",
+	"list": "readme license history"
+}
+```
+
+By convention, the titles of the individual tiddlers are prefixed with the title of the containing plugin, but they are not restricted to do so.
+
+Note that if the `version` field is omitted from a `plugin.info` file when the plugin folder is packed then it is automatically filled in by the core to the current core version number. This is to ensure that all the core plugins carry the correct version number. Generally plugin authors will want to ensure that they do explicitly specify a version number.
diff --git a/editions/tw5.com/tiddlers/plugins/Plugin_Fields.tid b/editions/tw5.com/tiddlers/plugins/Plugin_Fields.tid
new file mode 100644
index 000000000..86636179e
--- /dev/null
+++ b/editions/tw5.com/tiddlers/plugins/Plugin_Fields.tid
@@ -0,0 +1,22 @@
+created: 20161015122718559
+modified: 20161015122719647
+tags: PluginMechanism
+title: Plugin Fields
+type: text/vnd.tiddlywiki
+
+! Plugin fields
+
+Plugins are stored as tiddlers with the following fields:
+
+|!Field |!Description |
+|title |Title of plugin |
+|description |Description of plugin |
+|author |Author of plugin |
+|version |Version string (must conform to [ext[SemanticVersioning|http://semver.org/]] convention) |
+|source |Source URL of plugin |
+|type |Must be ''application/json'' |
+|plugin-type |Can be ''plugin'' (default), ''language'' or ''theme'' |
+|text |JSON encoding of the list of tiddlers comprising the plugin |
+|list |Names of exposed plugin information tiddlers (see below) |
+|name |Name of the theme (only for themes) |
+|dependents |List of dependent plugins (currently only implemented for themes) |
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/plugins/Plugin_Information_Tiddlers.tid b/editions/tw5.com/tiddlers/plugins/Plugin_Information_Tiddlers.tid
new file mode 100644
index 000000000..0c0f168c6
--- /dev/null
+++ b/editions/tw5.com/tiddlers/plugins/Plugin_Information_Tiddlers.tid
@@ -0,0 +1,25 @@
+created: 20161015121708376
+modified: 20161015121709477
+tags: PluginMechanism
+title: Plugin Information Tiddlers
+type: text/vnd.tiddlywiki
+
+! Information Tiddlers for Plugins
+
+Plugin authors are encouraged to provide special information and documentation tiddlers that TiddlyWiki can include as plugin information tabs in the [[control panel|$:/ControlPanel]].
+
+Plugins should provide an icon contained in a tiddler with the title formed of `<plugin-name>/icon` (for example, [[$:/core/icon]]).
+
+Plugins expose the names of the individual information tabs that they wish to display in the `list` field of the plugin tiddler. By convention, some or all of the following should be provided:
+
+* ''readme'': basic information about the plugin
+* ''license'': the license under which the plugin is published
+
+The title of the associated information tiddler must be formed as follows:
+
+# `$:/<plugin-name>/<current-language>/<tab-name>` (for example, ''$:/core/en-GB/readme'')
+# `$:/<plugin-name>/<tab-name>` (for example, ''$:/core/readme'')
+
+Thus, plugins can provide language-specific versions of each information tiddler.
+
+Note that information tiddlers should not reference other tiddlers within the plugin. This is because plugins containing themes or languages are dynamically switched in and out as they are selected, and so their information tiddlers may not be available for viewing. The control panel uses the 'subtiddler' attribute of the TranscludeWidget to access these tiddlers, which works independently of the plugin switching mechanism.
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/plugins/Uninstalling a plugin.tid b/editions/tw5.com/tiddlers/plugins/Uninstalling a plugin.tid
new file mode 100644
index 000000000..f2b0e633e
--- /dev/null
+++ b/editions/tw5.com/tiddlers/plugins/Uninstalling a plugin.tid	
@@ -0,0 +1,38 @@
+created: 20160107222504269
+modified: 20160720145839711
+tags: Plugins
+title: Uninstalling a plugin
+type: text/vnd.tiddlywiki
+
+! Standalone Configuration
+
+Follow these instructions when using TiddlyWiki as a standalone HTML file:
+
+# Create a backup of your current TiddlyWiki HTML file ([[just in case|The First Rule of Using TiddlyWiki]])
+# Open the [[control panel|$:/ControlPanel]] {{$:/core/images/options-button}} and go to the ''Plugins'' tab
+# Click on the plugin you want to delete to open its tiddler
+# Click the {{$:/core/images/down-arrow}} ''more'' button and {{$:/core/images/delete-button}} ''delete'' the tiddler
+# Save your TiddlyWiki {{$:/core/images/save-button}}
+# ''Refresh the window so that TiddlyWiki completely removes the plugin'' {{$:/core/images/refresh-button}}
+# The plugin should now be deleted
+
+! Client-Server Configuration
+
+Follow these instructions when using TiddlyWiki under Node.js:
+
+# Quit the server if it is running
+# Edit the `tiddlywiki.info` file (it is in JSON format) and locate the `plugins` and `themes` section (see below)
+# Remove the entries corresponding to the plugins you wish to remove. Take care to retain commas to separate items, but do not terminate the last item in a list with a comma
+# Restart the server
+
+```
+{
+	"plugins": [
+		"tiddlywiki/codemirror"
+	],
+	"themes": [
+		"tiddlywiki/vanilla",
+		"tiddlywiki/snowwhite"
+	]
+}
+```
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/plugins/Uninstalling_a_plugin.tid b/editions/tw5.com/tiddlers/plugins/Uninstalling_a_plugin.tid
deleted file mode 100644
index 683e5f5dd..000000000
--- a/editions/tw5.com/tiddlers/plugins/Uninstalling_a_plugin.tid
+++ /dev/null
@@ -1,13 +0,0 @@
-created: 20160107222504269
-modified: 20160107222727164
-tags: Plugins
-title: Uninstalling a plugin
-type: text/vnd.tiddlywiki
-
-# Create a backup of your current TiddlyWiki HTML file ([[just in case|The First Rule of Using TiddlyWiki]])
-# Open the [[$:/ControlPanel]] and go to the ''Plugins'' tab
-# Click on the plugin you want to delete to open its tiddler
-# Click the edit icon and then delete the tiddler
-# Save your TiddlyWiki
-# ''Refresh the window so that TiddlyWiki completely removes the plugin''
-# The plugin should now be deleted
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/reference/Reference.tid b/editions/tw5.com/tiddlers/reference/Reference.tid
index e51738e76..7d7f9f60e 100644
--- a/editions/tw5.com/tiddlers/reference/Reference.tid
+++ b/editions/tw5.com/tiddlers/reference/Reference.tid
@@ -1,9 +1,9 @@
 created: 20140910212931897
-modified: 20140910213038857
+list: Concepts Definitions WikiText Macros Variables Widgets Filters Messages Commands Mechanisms Developers
+modified: 20160710150825305
 tags: TableOfContents
 title: Reference
 type: text/vnd.tiddlywiki
-list: Concepts Definitions WikiText Macros Widgets Filters Messages Commands Mechanisms
 
 The following topics provide the canonical reference documentation for TiddlyWiki:
 
diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.10.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.10.tid
index 1b58f7dc6..a224a3a14 100644
--- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.10.tid	
+++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.10.tid	
@@ -88,7 +88,7 @@ Revert
 * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/7b8928886bf101b0cf4a8cc2d2dd2e576ec1c8d8]] new utility method `$tw.utils.tagToCssSelector(tagName)` for converting tag titles into a form suitable for matching the `tc-tagged-*` [[classes generated by TiddlyWiki|How to apply custom styles by tag]]
 * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/99df9f46f7cc4c1d3aa0320347f9b6c1bc458c60]] support for tiddlers containing mp4 videos
 * [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/fd997c45814e6bb5b576137bf62bad5575b0a28c]] the ActionSetFieldWidget to enable it to be used to delete a field or indexed property
-* [[Made|https://github.com/Jermolene/TiddlyWiki5/commit/746aab2cf6bbe3c1905efd5caf80e40e23b914b0]] the tw5.com documentation available as a plugin and an <a href="editions/tw5.com-docs/index.html" target="_blank">edition</a>, simplifying some scenarios for re-using it
+* [[Made|https://github.com/Jermolene/TiddlyWiki5/commit/746aab2cf6bbe3c1905efd5caf80e40e23b914b0]] the tw5.com documentation available as a plugin and an [[edition|http://tiddlywiki.com/editions/tw5.com-docs/index.html]], simplifying some scenarios for re-using it
 * [[Improved|https://github.com/Jermolene/TiddlyWiki5/commit/0035a0046315ee0203b1adfb75efdbb0e854a7f6]] rendering of "More" sidebar tab gradients in the "Snow White" theme
 * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/33563d01baed4b4092fc834eb6a1df55e1671418]] option in [[control panel|$:/ControlPanel]] to enable the display of detailed performance instrumentation in the browser developer console
 * [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/bc0cbf907063ccd484da7d56c8e42cf5e90489b8]] a LazyLoading template for all non-system tiddlers
diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.11.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.11.tid
new file mode 100644
index 000000000..18eff4b38
--- /dev/null
+++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.11.tid	
@@ -0,0 +1,11 @@
+caption: 5.1.11
+created: 20160130124109312
+modified: 20160130124109312
+tags: ReleaseNotes
+title: Release 5.1.11
+type: text/vnd.tiddlywiki
+released: 20160130124109312
+
+//[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.10...v5.1.11]]//
+
+This is a bug-fix release for [[Release 5.1.10]] that fixes a serious issue affecting the operation of the official plugin library.
diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.12.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.12.tid
new file mode 100644
index 000000000..ee26fb2a4
--- /dev/null
+++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.12.tid	
@@ -0,0 +1,127 @@
+caption: 5.1.12
+created: 20160713104714652
+modified: 20160713104714652
+tags: ReleaseNotes
+title: Release 5.1.12
+type: text/vnd.tiddlywiki
+released: 20160713104714652
+
+//[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.11...v5.1.12]]//
+
+! Major Improvements
+
+!! New Editor Toolbars
+
+[[Added|https://github.com/Jermolene/TiddlyWiki5/pull/2315]] support for extensible formatting toolbars for the editor widgets.
+
+* Formatting operations for WikiText, with support for Markdown:
+** Character formatting operations for bold, italic, strikethrough, underline, superscript, subscript, inline monospace
+** Line formatting operations for monospaced blocks, quoting, headings and both numbered and bulleted lists
+** Insert picture from a dropdown chooser
+** Stamp snippet of pre-programmed text
+** Excise selected text into a new tiddler
+** Optional automatic resizing to fit content
+* Full keyboard shortcut editor in control panel. Shortcuts are also shown in the toolbar button tooltips
+
+!! Improved Bitmap Editor
+
+The bitmap editor has been enhanced with a toolbar supporting:
+
+* Painting with selectable colour, width and opacity
+* Clearing the image
+* Resizing the image
+* Keeping track of recently chosen colours
+
+!! Improved Plugins
+
+Several of the official plugins available in the plugin library have been updated for this release. [[Upgrading]] will automatically update any installed plugins.
+
+* The KaTeX plugin has been updated to [[version v0.60.0|https://github.com/Khan/KaTeX/releases/tag/v0.6.0]]
+* The CodeMirror plugin has been updated to version 5.13.2, and integrated with the new editor toolbars. The default configuration has been updated to include syntax highlighting for HTML, ~JavaScript, CSS, XML, TiddlyWiki Classic and Markdown.
+* The Markdown plugin includes formatting toolbar buttons and a new "new markdown tiddler" button in the Tools tab of the sidebar.
+* The experimental Evernote plugin allows notes and images from `.enex` files to be imported into TiddlyWiki.
+* The new Internals plugin provides features to help understand the internal operation of TiddlyWiki, including new preview modes in the editor showing both the parse and widget trees of the current tiddler
+* Improved language translations:
+** Korean
+** Chinese (Simplified) and Chinese (Traditional)
+** German
+** French
+** Danish
+** Dutch
+
+!! Text-Slicer Plugin Improvements
+
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/176d2ccd76856b10aadd5e71af587574e7bcd447]] support for sticky notes within documents
+* [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/c98ef97d236fb023c3b5099a5fc52c1e8da7eb4d]] support for slicing documents to Node.js
+* [[Improved|https://github.com/Jermolene/TiddlyWiki5/commit/1335dff45013f83fb06a47453e6063b5c0e2c0b3]] document metadata display
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/46800d790a6521aafba24fc9cb9e0d0e8f1a48a2]] `list-children` filter operator
+* Fixed bugs
+
+! Other Improvements
+
+
+!! Usability Improvements
+
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/7908e10488cc4280dd8e4f405bcb09f2fb6d3524]] a setting for disabling linking to missing tiddlers
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/de3adf905aff80e547dc630890f0d18bd87da880]] a setting for forcing word wrapping in monospaced code blocks
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/issues/2351]] a warning when creating or editing tiddler titles containing troublesome characters
+* Addition of “new image” button to the “Tools” tab of the sidebar
+* Introduction of new general purpose [[colour-picker Macro]]
+* Introduction of new general purpose [[image-picker Macro]]
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/adf45b346847a81d4ed26397466daa4514035bb9]] a bulk delete button to [[advanced search|$:/AdvancedSearch]] "Filter" tab
+
+!! Hackability Improvements
+
+* [[Introduction|https://github.com/Jermolene/TiddlyWiki5/issues/2337]] of the new WikifyWidget
+* Introduction of new EditShortcutWidget for direct entry of keyboard shortcut codes
+* [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/7daebba46bad0e7ea3e4dfc1fc2e59e36414a683]] editor preview pane to allow plugins to add further types of preview (see the new `tiddlywiki/internals` plugin for an example)
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/f8565443d7617f4d18b90ba7ce3f55b9764eccb2]] a simple HTTP PUT saver for use with WebDav or REST servers
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/37823f64e96809df16884c605b062f8da2453635]] build targets to the server edition
+* [[Improved|https://github.com/Jermolene/TiddlyWiki5/pull/2364]] [[days Operator]] to better cope with operations on today and yesterday
+* [[Extended|https://github.com/Jermolene/TiddlyWiki5/commit/3c20f2396e7c794b6e28c3e369e09230352402d0]] ActionWidgets mechanism to allow them to be used with the LinkCatcherWidget and SelectWidget
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/19e699d3302da842c4a6596f7b9ecc4dcaf8fbc2]] `mobile-web-app-capable` meta tag for Android Chrome
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/commit/3d5885f5a5ef8a395ba15285e68c19a8db115e6b]] new `plainwikified` format for the ViewWidget
+
+!! Bug Fixes
+
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/54bf6c8a93f026ad1128dfc9cd745a67aaa6cda0]] problem with tiddler titles containing single quotes in [[Table-of-Contents Macros]]
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/037cfb7cc7c1b32153e23774697e8a9045d8f36a]] problem with z-ordering of modals in zoomin story view
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/pull/2284]] problem with [[has Operator]]
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/4a03dcab2031a31eb60f99b6d15a70ff0449182c]] problem with double byte entities in the EntityWidget
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/276074b6cfde9d916f9428b2185f795915e190ae]] problem with ScrollableWidget in static renderings
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/1e0d019610acd960b8c70c0b85b7bb1a25096a8f]] problem with repeatedly lazy loading of tiddlers without a text field
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/b326ba5b2c9e622f5fe99b00ab368bb484c1d4e5]] problem with titles containing URLs being interpreted as external links
+
+!! Node.js Improvements
+
+* [[Added|https://github.com/Jermolene/TiddlyWiki5/pull/2379]] ability to [[customise the paths used for tiddler saving|Customising Tiddler File Naming]]
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/bf74d13df544e323066cde9a019cbf1855d3db04]] problem saving non-JPG binary files
+
+! Contributors
+
+[[@Jermolene|https://github.com/Jermolene]] would like to thank the contributors to this release who have generously given their time to help improve TiddlyWiki:
+
+* [[@araname|https://github.com/araname]]
+* [[@BramChen|https://github.com/BramChen]]
+* [[@brentmaxwell|https://github.com/brentmaxwell]]
+* [[@Drakor|https://github.com/Drakor]]
+* [[@edrex|https://github.com/edrex]]
+* [[@Evolena|https://github.com/Evolena]]
+* [[@felixhayashi|https://github.com/felixhayashi]]
+* [[@FND|https://github.com/FND]]
+* [[@Infurnoape|https://github.com/Infurnoape]]
+* [[@kixam|https://github.com/kixam]]
+* [[@Marxsal|https://github.com/Marxsal]]
+* [[@maxthomax|https://github.com/maxthomax]]
+* [[@mklauber|https://github.com/mklauber]]
+* [[@nameanyone|https://github.com/nameanyone]]
+* [[@nome|https://github.com/nome]]
+* [[@PauDeLuca|https://github.com/PauDeLuca]]
+* [[@pmario|https://github.com/pmario]]
+* [[@rcrath|https://github.com/rcrath]]
+* [[@r1chard5mith|https://github.com/r1chard5mith]]
+* [[@sukima|https://github.com/sukima]]
+* [[@telmiger|https://github.com/telmiger]]
+* [[@twMat|https://github.com/twMat]]
+* [[@webninjasi|https://github.com/webninjasi]]
+* [[@xcazin|https://github.com/xcazin]]
diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.13.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.13.tid
new file mode 100644
index 000000000..593e1c85c
--- /dev/null
+++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.13.tid	
@@ -0,0 +1,32 @@
+caption: 5.1.13
+created: 20160713124714652
+modified: 20160725084810809
+released: 20160725084810809
+tags: ReleaseNotes
+title: Release 5.1.13
+type: text/vnd.tiddlywiki
+
+//[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.12...v5.1.13]]//
+
+This is a minor bug fix release.
+
+!! Bug Fixes
+
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/e49d310ea943916089b5381b00df20b1f9a9e52e]] (and [[refixed|https://github.com/Jermolene/TiddlyWiki5/commit/782553eb62ccfea31ad249911c3230e2137a07dd]]) [[problematic|https://github.com/Jermolene/TiddlyWiki5/issues/2501]] stricter external link matching rules introduced in 5.1.12
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/e282ff1d92d6d3abaf9fd50c9deff464ac028ad7]] [[problem|https://github.com/Jermolene/TiddlyWiki5/issues/2507]] with tiddlers titled "undefined"
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/commit/487d6642e34e5eb685ad83a11c8514dbc6fc4d89]] rendering [[problem|https://github.com/Jermolene/TiddlyWiki5/issues/2500]] with [[KaTeX Plugin]]
+* [[Removed|https://github.com/Jermolene/TiddlyWiki5/commit/8f6178acfce1f4f49d1a7d234c25dcbf0256aa10]] unneeded border in print stylesheet
+
+!! Node.js Bug Fixes
+
+* [[Fixed|https://github.com/Jermolene/TiddlyWiki5/pull/2504]] problem with extraneous `.tid` extension added to tiddler filenames
+
+!! Other Improvements
+
+* Updated Portuguese (Portugal) translation
+
+! Contributors
+
+[[@Jermolene|https://github.com/Jermolene]] would like to thank the contributors to this release who have generously given their time to help improve TiddlyWiki:
+
+* [[@sukima|https://github.com/sukima]]
diff --git a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.9.tid b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.9.tid
index f3e4eb654..8ab977572 100644
--- a/editions/tw5.com/tiddlers/releasenotes/Release 5.1.9.tid	
+++ b/editions/tw5.com/tiddlers/releasenotes/Release 5.1.9.tid	
@@ -6,6 +6,10 @@ title: Release 5.1.9
 type: text/vnd.tiddlywiki
 released: 20150703153725652
 
+\define custom-colour-picker(tiddler,colour)
+<$edit-text tiddler="""$tiddler$""" index="""$colour$""" type="color" tag="input"/>
+\end
+
 //[[See GitHub for detailed change history of this release|https://github.com/Jermolene/TiddlyWiki5/compare/v5.1.8...v5.1.9]]//
 
 ! Major Improvements
@@ -52,12 +56,12 @@ An experimental new tiddler toolbar button opens a single tiddler in a separate
 <$action-setfield $tiddler="$:/theme" text="$:/themes/tiddlywiki/vanilla"/>
 <$action-setfield $tiddler="$:/palette" text="$:/palettes/ContrastDark"/>
 Dark palette
-</$button>. Foreground: <<colour-picker "$:/palettes/ContrastDark" "foreground">>, Background: <<colour-picker "$:/palettes/ContrastDark" "background">>
+</$button>. Foreground: <<custom-colour-picker "$:/palettes/ContrastDark" "foreground">>, Background: <<custom-colour-picker "$:/palettes/ContrastDark" "background">>
 ** <$button>
 <$action-setfield $tiddler="$:/theme" text="$:/themes/tiddlywiki/vanilla"/>
 <$action-setfield $tiddler="$:/palette" text="$:/palettes/ContrastLight"/>
 Light palette
-</$button>. Foreground: <<colour-picker "$:/palettes/ContrastLight" "foreground">>, Background: <<colour-picker "$:/palettes/ContrastLight" "background">>
+</$button>. Foreground: <<custom-colour-picker "$:/palettes/ContrastLight" "foreground">>, Background: <<custom-colour-picker "$:/palettes/ContrastLight" "background">>
 ** <$button>
 <$action-setfield $tiddler="$:/theme" text="$:/themes/tiddlywiki/snowwhite"/>
 <$action-setfield $tiddler="$:/palette" text="$:/palettes/Vanilla"/>
diff --git a/editions/tw5.com/tiddlers/releasenotes/TiddlyWiki_Releases.tid b/editions/tw5.com/tiddlers/releasenotes/TiddlyWiki Releases.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/releasenotes/TiddlyWiki_Releases.tid
rename to editions/tw5.com/tiddlers/releasenotes/TiddlyWiki Releases.tid
diff --git a/editions/tw5.com/tiddlers/roadmap/RoadMap.tid b/editions/tw5.com/tiddlers/roadmap/RoadMap.tid
index cc4a01739..6765c0461 100644
--- a/editions/tw5.com/tiddlers/roadmap/RoadMap.tid
+++ b/editions/tw5.com/tiddlers/roadmap/RoadMap.tid
@@ -1,22 +1,17 @@
 created: 20130823203800000
-modified: 20140916132209824
+modified: 20160418123722695
 tags: About
 title: RoadMap
 type: text/vnd.tiddlywiki
 
-Even though TiddlyWiki is now out of beta, there are still many improvements planned for the coming months:
+There are still some areas of TiddlyWiki that have not been fully developed beyond the experimental stage:
 
-* Fixing hangovers from TiddlyWikiClassic
-* ~TiddlyWiki file format (to avoid illegal attribute names)
-* Aliases (alternative titles for tiddlers)
-* Search and replace
-* Tiddler renaming
-* Rich link tooltips, incorporating a preview
-* More keyboard shortcuts
-* Keyboard snippet expansion in the text editor
-* List editor with drag and drop
-* Selective/weighted searching by title, body and fields
-* Maths notation
+* Multiple users with the client-server configuration
+* Smartphone user experience
+* New tiddler manager, including bulk operations like search and replace
+* Federation that can run in the browser or under Node.js
+* Improved editions
+* Improved support for third party plugin libraries
 
 Also see the issues list on GitHub: https://github.com/Jermolene/TiddlyWiki5
 
diff --git a/editions/tw5.com/tiddlers/saving/Saving with Encryption.tid b/editions/tw5.com/tiddlers/saving/Encryption.tid
similarity index 65%
rename from editions/tw5.com/tiddlers/saving/Saving with Encryption.tid
rename to editions/tw5.com/tiddlers/saving/Encryption.tid
index 880445fd3..65c9abcfc 100644
--- a/editions/tw5.com/tiddlers/saving/Saving with Encryption.tid	
+++ b/editions/tw5.com/tiddlers/saving/Encryption.tid
@@ -1,5 +1,5 @@
 created: 20130825160900000
-modified: 20150607112027069
+modified: 20160610083350724
 tags: Features [[Working with TiddlyWiki]]
 title: Encryption
 type: text/vnd.tiddlywiki
@@ -7,16 +7,12 @@ type: text/vnd.tiddlywiki
 When used as a single HTML file, TiddlyWiki5 allows content to be encrypted using the [[Stanford JavaScript Crypto Library]].
 
 # Switch to the ''Tools'' tab in the sidebar and look for the button with a padlock icon
-
-# If the button is labelled "set password" then the current wiki is not encrypted. Clicking the button will prompt for a password that will be used to encrypt subsequent saves
-
-# If the button is labelled "clear password" then the current wiki is already encrypted. Clicking the button will remove the password so that subsequent saves will be unencrypted
-
+# If the button is labelled {{$:/core/images/unlocked-padlock}} ''set password'' then the current wiki is not encrypted. Clicking the button will prompt for a password that will be used to encrypt subsequent saves
+# If the button is labelled {{$:/core/images/locked-padlock}} ''clear password'' then the current wiki is already encrypted. Clicking the button will remove the password so that subsequent saves will be unencrypted
 # Optionally, open the saved file in a text editor and verify that your data is encrypted
-
 # Open the file in your browser. You will be prompted for a password before the content is displayed
 
 Note that TiddlyWiki has two other unrelated features concerned with passwords/encryption:
 
-* The ability to set a password when saving to TiddlySpot. This is done in the "Saving" tab of control panel
+* The ability to set a password when saving to TiddlySpot. This is done in the "Saving" tab of ''control panel'' {{$:/core/images/options-button}}.
 * The ability to use standard HTTP basic authentication with the [[Node.js|TiddlyWiki on Node.js]] server configuration. This is done on the command line with the ServerCommand. Combined with SSL, this gives the same level of transit encryption as you'd get with online services like Google or Dropbox, but there is no encryption of data on disk
diff --git a/editions/tw5.com/tiddlers/saving/Saving on Android.tid b/editions/tw5.com/tiddlers/saving/Saving on Android.tid
index 54bc74270..4fb483b16 100644
--- a/editions/tw5.com/tiddlers/saving/Saving on Android.tid	
+++ b/editions/tw5.com/tiddlers/saving/Saving on Android.tid	
@@ -1,9 +1,22 @@
 created: 20130825161400000
-modified: 20140912141110606
+modified: 20160601162226948
 tags: Saving
 title: Saving on Android
 type: text/vnd.tiddlywiki
 
-The AndTidWiki app for Android devices makes it possible to edit and save changes to TiddlyWiki5, including working offline without a network connection. [[Download it here|https://play.google.com/store/apps/details?id=de.mgsimon.android.andtidwiki]].
+The AndTidWiki app for Android devices makes it possible to edit and save changes to TiddlyWiki5, including working offline without a network connection. [[Download it here|https://play.google.com/store/apps/details?id=de.mgsimon.android.andtidwiki&hl=en]].
+
+Instructions for use:
+
+# [[Download]] an empty TiddlyWiki on another web browser
+# Move the file you just downloaded to the directory `/sdcard/andtidwiki`
+#* You may rename it, but be sure to keep the `.html` or `.htm` extension
+# Open AndTidWiki
+#* Don't use ''Menu''/''new ~TiddlyWiki'' menu option (it only supports the older TiddlyWikiClassic)
+# Open the file by touching its filename
+# Try creating a new tiddler using the ''new tiddler'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''ok'' button
+#* The wiki will be saved, and a confirmation message should appear at the top right of the window
+
+''Note:'' You can save your changes by clicking the {{$:/core/images/save-button}} ''save changes'' button in the sidebar even if you have not clicked the {{$:/core/images/done-button}} ''ok'' button to complete editing a tiddler
 
 //Note that AndTidWiki is published independently of TiddlyWiki//
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/saving/Saving on Safari.tid b/editions/tw5.com/tiddlers/saving/Saving on Safari.tid
index 9bf99f685..e04967b9e 100644
--- a/editions/tw5.com/tiddlers/saving/Saving on Safari.tid	
+++ b/editions/tw5.com/tiddlers/saving/Saving on Safari.tid	
@@ -1,5 +1,5 @@
 created: 20140811171304926
-modified: 20140912145848855
+modified: 20160520090313926
 tags: Saving
 title: Saving on Safari
 type: text/vnd.tiddlywiki
@@ -13,7 +13,7 @@ This method of saving changes is clunky because it requires manual intervention
 # Locate the file you just downloaded
 #* You may rename it, but be sure to keep the `.html` or `.htm` extension
 # Open the file in Safari
-# Try creating a new tiddler using the ''new tiddler'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''done'' button
+# Try creating a new tiddler using the ''new tiddler'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''ok'' button
 # Save your changes by clicking the {{$:/core/images/save-button}} ''save changes'' button in the sidebar
 # A popup "Download changes" window is displayed that includes a link labelled //Right-click to save changes//
 # Right-click on the link and select "Download Linked File As..." from the popup menu
diff --git a/editions/tw5.com/tiddlers/saving/Saving on TiddlySpot.tid b/editions/tw5.com/tiddlers/saving/Saving on TiddlySpot.tid
index 6d2558273..9fc47f865 100644
--- a/editions/tw5.com/tiddlers/saving/Saving on TiddlySpot.tid	
+++ b/editions/tw5.com/tiddlers/saving/Saving on TiddlySpot.tid	
@@ -1,5 +1,5 @@
 created: 20130825213500000
-modified: 20150421010050619
+modified: 20160610082610879
 tags: Saving
 title: Saving on TiddlySpot
 type: text/vnd.tiddlywiki
@@ -10,8 +10,8 @@ You can upload an existing TiddlyWiki5 document from your local disc to TiddlySp
 
 # Sign up for a new wiki at http://tiddlyspot.com/, and remember the wiki name and password
 # Open your locally stored TiddlyWiki document in your browser
-# Fill in the TiddlySpot wikiname and password in the control panel
-# Click the "Save Changes" button. You should get a confirmation notification at the top right saying ''Saved wiki''. Saving can take several seconds if you're on a slow connection or working with a large wiki.
+# Fill in the TiddlySpot wikiname and password in ''Saving'' tab of the ''control panel'' {{$:/core/images/options-button}}
+# Click the {{$:/core/images/save-button}} ''save changes'' button. You should get a confirmation notification at the top right saying ''Saved wiki''. Saving can take several seconds if you're on a slow connection or working with a large wiki.
 # Navigate to your TiddlySpot URL at http://{wikiname}.tiddlyspot.com/
 
 Note that your password is sent unencrypted when using TiddlySpot. From http://faq.tiddlyspot.com/:
diff --git a/editions/tw5.com/tiddlers/saving/Saving on a PHP Server.tid b/editions/tw5.com/tiddlers/saving/Saving on a PHP Server.tid
index 05914e5a2..9867f260f 100644
--- a/editions/tw5.com/tiddlers/saving/Saving on a PHP Server.tid	
+++ b/editions/tw5.com/tiddlers/saving/Saving on a PHP Server.tid	
@@ -1,5 +1,5 @@
 created: 20140111091844267
-modified: 20140912141118570
+modified: 20160610082607695
 tags: Saving
 title: Saving on a PHP Server
 type: text/vnd.tiddlywiki
@@ -15,7 +15,7 @@ The built-in TiddlySpot saver can also be used to save changes to a simple PHP s
 # Save the file
 # Using FTP or your web interface, upload ''store.php'' to your server. Make sure that the filename is correct
 #* If you've uploaded the file correctly you should be able to view it in your browser (eg, http://example.com/store.php)
-# In TiddlyWiki, go to the ''Saving'' tab of the control panel and enter the following information:
+# In TiddlyWiki, go to the ''Saving'' tab of the ''control panel'' {{$:/core/images/options-button}} and enter the following information:
 #* Your username as the wiki name
 #* Your password
 #* The URL of the ''store.php'' file (//''not'' the URL of the wiki, this must the full URL to the ''store.php'' file//)
diff --git a/editions/tw5.com/tiddlers/saving/Saving on iPad_iPhone.tid b/editions/tw5.com/tiddlers/saving/Saving on iPad_iPhone.tid
index b66f7c4ff..926cb62f6 100644
--- a/editions/tw5.com/tiddlers/saving/Saving on iPad_iPhone.tid	
+++ b/editions/tw5.com/tiddlers/saving/Saving on iPad_iPhone.tid	
@@ -1,5 +1,5 @@
 created: 20131129101027725
-modified: 20140912141016452
+modified: 20160602024857740
 tags: Saving
 title: Saving on iPad/iPhone
 type: text/vnd.tiddlywiki
@@ -12,11 +12,11 @@ Instructions for use:
 # Touch the title in the centre of the toolbar in order
 #* A text box should appear allowing you to enter a URL
 # Enter the URL `http://tiddlywiki.com/empty.html`
-# When the empty TiddlyWiki5 has loaded, touch the ''save'' icon (it's the second icon from the right on the top toolbar)
+# When the empty TiddlyWiki has loaded, touch the ''save'' icon (it's the second icon from the right on the top toolbar)
 #* An alert box should appear allowing you to enter a local filename
 # Enter the filename you wish to use for the document (ending with `.html`)
-# Edit your TiddlyWiki as normal
-# To save changes, click the ''save'' button in the sidebar
-#* A confirmation message should appear at the upper right
+# Try creating a new tiddler using the ''new tiddler'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''ok'' button
+# Save your changes by clicking the {{$:/core/images/save-button}} ''save changes'' button in the sidebar
+#* A confirmation message should appear at the top right of the window
 
 //Note that TWEdit is published independently of TiddlyWiki//
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/saving/Saving with TiddlyFox on Android.tid b/editions/tw5.com/tiddlers/saving/Saving with TiddlyFox on Android.tid
index d4c4c04a3..5c3c238af 100644
--- a/editions/tw5.com/tiddlers/saving/Saving with TiddlyFox on Android.tid	
+++ b/editions/tw5.com/tiddlers/saving/Saving with TiddlyFox on Android.tid	
@@ -1,5 +1,5 @@
 created: 20140103134551508
-modified: 20140912140933724
+modified: 20160601160224998
 tags: Saving
 title: Saving with TiddlyFox on Android
 type: text/vnd.tiddlywiki
@@ -9,16 +9,16 @@ type: text/vnd.tiddlywiki
 # Ensure you have the latest version of [[Firefox for Android]]
 #* http://getfirefox.com
 # Install the latest release of the TiddlyFox extension from:
-#* https://addons.mozilla.org/en-US/firefox/addon/tiddlyfox/
+#* https://addons.mozilla.org/en-GB/firefox/addon/tiddlyfox/
 # Install this extension to be able to save the TiddlyWiki file locally:
-#* https://addons.mozilla.org/en-US/android/addon/save-link-menus/
+#* https://addons.mozilla.org/en-GB/android/addon/save-link-menus/
 # [[Download]] an empty TiddlyWiki by saving this link:
 #* http://tiddlywiki.com/empty.html
 #> (to save the link, ensure you've installed the "save-link-menus" extension and then long-press on the link and choose "Save link")
 # When the file has downloaded, click on it within the notification tray or the download manager application
 # Choose to open the file in Firefox (rather than the default Android viewer)
 # Click ''OK'' in response to the prompt from TiddlyFox that asks whether to enable saving for this file
-# Try creating a new tiddler using the ''plus'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''tick'' button
-# Save your changes by clicking the {{$:/core/images/save-button}} ''Save changes'' button in the sidebar
+# Try creating a new tiddler using the ''new tiddler'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''ok'' button
+# Save your changes by clicking the {{$:/core/images/save-button}} ''save changes'' button in the sidebar
 #* Look for the yellow notification ''Saved wiki'' at the top right of the window
 # Refresh the browser window to verify that your changes have been saved correctly
diff --git a/editions/tw5.com/tiddlers/saving/Saving with TiddlyFox.tid b/editions/tw5.com/tiddlers/saving/Saving with TiddlyFox.tid
index 595136463..fa9aaa4dd 100644
--- a/editions/tw5.com/tiddlers/saving/Saving with TiddlyFox.tid	
+++ b/editions/tw5.com/tiddlers/saving/Saving with TiddlyFox.tid	
@@ -1,5 +1,5 @@
 created: 20131221085742684
-modified: 20140912140942913
+modified: 20160601160211867
 tags: Saving
 title: Saving with TiddlyFox
 type: text/vnd.tiddlywiki
@@ -9,7 +9,7 @@ If you're using [[Firefox for Android]], see the instructions for [[Saving with
 # Ensure you have the latest version of [[Firefox]]
 #* http://getfirefox.com
 # Install the latest release of the TiddlyFox extension from:
-#* https://addons.mozilla.org/en-US/firefox/addon/tiddlyfox/
+#* https://addons.mozilla.org/en-GB/firefox/addon/tiddlyfox/
 # Restart [[Firefox]]
 # [[Download]] an empty TiddlyWiki by clicking this button:
 #> {{$:/editions/tw5.com/snippets/download-empty-button}}
@@ -17,7 +17,7 @@ If you're using [[Firefox for Android]], see the instructions for [[Saving with
 #* You may rename it, but be sure to keep the `.html` or `.htm` extension
 # Open the file in [[Firefox]]
 # Click ''OK'' in response to the prompt from TiddlyFox that asks whether to enable saving for this file
-# Try creating a new tiddler using the ''plus'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''tick'' button
-# Save your changes by clicking the {{$:/core/images/save-button}} ''Save changes'' button in the sidebar
+# Try creating a new tiddler using the ''new tiddler'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''ok'' button
+# Save your changes by clicking the {{$:/core/images/save-button}} ''save changes'' button in the sidebar
 #* Look for the yellow notification ''Saved wiki'' at the top right of the window
 # Refresh the browser window to verify that your changes have been saved correctly
diff --git a/editions/tw5.com/tiddlers/saving/Saving with TiddlyIE.tid b/editions/tw5.com/tiddlers/saving/Saving with TiddlyIE.tid
index 02539a3c6..c059078ff 100644
--- a/editions/tw5.com/tiddlers/saving/Saving with TiddlyIE.tid	
+++ b/editions/tw5.com/tiddlers/saving/Saving with TiddlyIE.tid	
@@ -1,5 +1,5 @@
 created: 20131211220000000
-modified: 20140912141055656
+modified: 20160601111802610
 tags: [[Saving on InternetExplorer]]
 title: Saving with TiddlyIE
 type: text/vnd.tiddlywiki
@@ -11,8 +11,8 @@ type: text/vnd.tiddlywiki
 # [[Download]] an empty TiddlyWiki by saving this link:
 #> http://tiddlywiki.com/empty.html
 # Locate the file you just downloaded
-#* You may rename it, but be sure to keep the `.html` extension
+#* You may rename it, but be sure to keep the `.html` or `.htm` extension
 # Open the file in Internet Explorer
-# Try creating a new tiddler using the ''plus'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''tick'' button
-# Save your changes by clicking the {{$:/core/images/save-button}} ''Save changes'' button in the sidebar. Internet Explorer will ask for your consent to save the file locally by presenting a file ''Save As'' dialog.
+# Try creating a new tiddler using the ''new tiddler'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''ok'' button
+# Save your changes by clicking the {{$:/core/images/save-button}} ''save changes'' button in the sidebar. Internet Explorer will ask for your consent to save the file locally by presenting a file ''Save As'' dialog.
 # Refresh the browser window to verify that your changes have been saved correctly
diff --git a/editions/tw5.com/tiddlers/saving/Saving with the HTML5 fallback saver.tid b/editions/tw5.com/tiddlers/saving/Saving with the HTML5 fallback saver.tid
index cafd0ce5a..e69362044 100644
--- a/editions/tw5.com/tiddlers/saving/Saving with the HTML5 fallback saver.tid	
+++ b/editions/tw5.com/tiddlers/saving/Saving with the HTML5 fallback saver.tid	
@@ -1,5 +1,5 @@
 created: 20131129092604900
-modified: 20140912140952153
+modified: 20160520090349774
 tags: Saving
 title: Saving with the HTML5 fallback saver
 type: text/vnd.tiddlywiki
@@ -13,7 +13,7 @@ This method of saving changes is clunky because it requires manual intervention
 # Locate the file you just downloaded
 #* You may rename it, but be sure to keep the `.html` or `.htm` extension
 # Open the file in your browser
-# Try creating a new tiddler using the ''new tiddler'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''done'' button
+# Try creating a new tiddler using the ''new tiddler'' {{$:/core/images/new-button}} button in the sidebar. Type some content for the tiddler, and click the {{$:/core/images/done-button}} ''ok'' button
 # Save your changes by clicking the {{$:/core/images/save-button}} ''save changes'' button in the sidebar
 # Your browser will download a new copy of the wiki incorporating your changes
 # Locate the newly downloaded file and open it in your browser
diff --git a/editions/tw5.com/tiddlers/system/ContributionBanner.tid b/editions/tw5.com/tiddlers/system/ContributionBanner.tid
index 75f4235a6..01d8e2a3e 100644
--- a/editions/tw5.com/tiddlers/system/ContributionBanner.tid
+++ b/editions/tw5.com/tiddlers/system/ContributionBanner.tid
@@ -7,7 +7,7 @@ https://github.com/Jermolene/TiddlyWiki5/edit/master/editions/tw5.com/tiddlers/$
 \end
 \define innerMakeGitHubLink(linkText)
 <$set name="githubLink" value={{$:/config/OriginalTiddlerPaths##$(draftOfTiddler)$}}>
-<a href=<<makeGitHubLink>> class="tc-tiddlylink-external" target="_blank">$linkText$</a>
+<a href=<<makeGitHubLink>> class="tc-tiddlylink-external" target="_blank" rel="noopener noreferrer">$linkText$</a>
 </$set>
 \end
 \define outerMakeGitHubLink(linkText)
diff --git a/editions/tw5.com/tiddlers/system/Sources.tid b/editions/tw5.com/tiddlers/system/Sources.tid
index 414d1761f..eec21b82f 100644
--- a/editions/tw5.com/tiddlers/system/Sources.tid
+++ b/editions/tw5.com/tiddlers/system/Sources.tid
@@ -2,27 +2,36 @@ title: $:/editions/tw5.com/TiddlerInfo/Sources
 tags: $:/tags/TiddlerInfo
 caption: Sources
 
-\define makeStaticLink()
-http://tiddlywiki.com/static/<$view tiddler=<<currentTiddler>> field="title" format="doubleurlencoded"/>.html
+\define static-link-base()
+http://tiddlywiki.com/static/$(title)$.html
 \end
-\define outerMakeStaticLink()
-<$macrocall $name="makeStaticLink" $output="text/plain"/>
-\end
-\define makeGitHubLink()
-https://github.com/Jermolene/TiddlyWiki5/blob/master/editions/tw5.com/tiddlers/$(githubLink)$
-\end
-\define outerMakeGitHubLink()
-<$set name="githubLink" value={{$:/config/OriginalTiddlerPaths##$(currentTiddler)$}}>
-<a href=<<makeGitHubLink>> class="tc-tiddlylink-external" target="_blank"><$text text=<<makeGitHubLink>>/></a>
+
+\define make-static-link()
+<$set name="title" filter="[<currentTiddler>encodeuricomponent[]encodeuricomponent[]]" select="0">
+<a href=<<static-link-base>> class="tc-tiddlylink-external" target="_blank" rel="noopener noreferrer"><$text text=<<static-link-base>>/></a>
 </$set>
 \end
+
+\define github-link-base()
+https://github.com/Jermolene/TiddlyWiki5/blob/master/editions/tw5.com/tiddlers/$(title)$
+\end
+
+\define make-github-link()
+<$set name="title" value={{$:/config/OriginalTiddlerPaths##$(currentTiddler)$}}>
+<$set name="title" filter="[<title>encodeuricomponent[]]" select="0">
+<a href=<<github-link-base>> class="tc-tiddlylink-external" target="_blank" rel="noopener noreferrer"><$text text=<<github-link-base>>/></a>
+</$set>
+</$set>
+\end
+
 <$list filter="[all[current]!is[system]!is[shadow]]">
 
 A static HTML representation of this tiddler is available at the URL:
 
-* <<outerMakeStaticLink>>
+* <<make-static-link>>
 
 Help us to improve the documentation by sending a ~GitHub pull request for this tiddler:
 
-* <<outerMakeGitHubLink>>
-</$list>
\ No newline at end of file
+* <<make-github-link>>
+
+</$list>
diff --git a/editions/tw5.com/tiddlers/system/doc-macros.tid b/editions/tw5.com/tiddlers/system/doc-macros.tid
index adc2cabc1..e256bc1cd 100644
--- a/editions/tw5.com/tiddlers/system/doc-macros.tid
+++ b/editions/tw5.com/tiddlers/system/doc-macros.tid
@@ -36,7 +36,7 @@ tags: $:/tags/Macro
 \define .link(_,to) <$link to="$to$">$_$</$link>
 \define .clink(_,to) <span class="doc-clink"><<.link """$_$""" "$to$">></span>
 \define .dlink(_,to) <$macrocall $name=".link" _=<<.def "$_$">> to="$to$">/>
-\define .dlink-ex(_,to) <a href="$to$" class="tc-tiddlylink-external" target="_blank"><<.def "$_$">></a>
+\define .dlink-ex(_,to) <a href="$to$" class="tc-tiddlylink-external" target="_blank" rel="noopener noreferrer"><<.def "$_$">></a>
 \define .flink(to) <$macrocall $name=".link" _=<<.field {{$to$!!caption}}>> to="$to$"/>
 \define .mlink(_,to) <$macrocall $name=".link" _=<<.var "$_$">> to=<<.mtitle "$_$">>/>
 \define .mlink2(_,to) <$macrocall $name=".link" _=<<.var "$_$">> to="$to$"/>
diff --git a/editions/tw5.com/tiddlers/system/doc-styles.tid b/editions/tw5.com/tiddlers/system/doc-styles.tid
index 4fb5fe007..4d85a378a 100644
--- a/editions/tw5.com/tiddlers/system/doc-styles.tid
+++ b/editions/tw5.com/tiddlers/system/doc-styles.tid
@@ -161,3 +161,11 @@ tr.doc-table-subheading {
 .doc-block-icon .tc-image-warning {
 	fill: <<colour alert-highlight>>;
 }
+
+.doc-from-version {
+	display: inline-block;
+	border: 2px solid <<colour alert-border>>;
+	border-radius: 0.5em;
+	background: <<colour alert-background>>;
+    padding: 0 0.4em;
+}
diff --git a/editions/tw5.com/tiddlers/system/operator-macros.tid b/editions/tw5.com/tiddlers/system/operator-macros.tid
index 11fdcf8b2..57ab9445e 100644
--- a/editions/tw5.com/tiddlers/system/operator-macros.tid
+++ b/editions/tw5.com/tiddlers/system/operator-macros.tid
@@ -20,7 +20,7 @@ tags: $:/tags/Macro
 	<dd><$button set=<<.state>> setTo="">Hide</$button></dd>
 	</dl>
 	<blockquote class="doc-example-result">
-	<ul><$list filter="$eg$" emptyMessage="(empty)">
+	<ul><$list filter="""$eg$""" emptyMessage="(empty)">
 	<li><$link><$view field="title"/></$link></li>
 	</$list></ul>
 	</blockquote>
diff --git a/editions/tw5.com/tiddlers/system/operator-template.tid b/editions/tw5.com/tiddlers/system/operator-template.tid
index 312686cb5..13c5e28be 100644
--- a/editions/tw5.com/tiddlers/system/operator-template.tid
+++ b/editions/tw5.com/tiddlers/system/operator-template.tid
@@ -71,6 +71,9 @@ list-before: $:/core/ui/ViewTemplate/body
 </$set>
 <!-->
 </table>
+<$list filter="[all[current]has[from-version]]" variable="listItem">
+<$macrocall $name=".from-version" version={{!!from-version}}/>
+</$list>
 </$list>
 </$set>
 </$set>
diff --git a/editions/tw5.com/tiddlers/system/sidebarlayout.tid b/editions/tw5.com/tiddlers/system/sidebarlayout.tid
new file mode 100644
index 000000000..2bfa95e13
--- /dev/null
+++ b/editions/tw5.com/tiddlers/system/sidebarlayout.tid
@@ -0,0 +1,3 @@
+title: $:/themes/tiddlywiki/vanilla/options/sidebarlayout
+
+fluid-fixed
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/system/tw5.com-styles.tid b/editions/tw5.com/tiddlers/system/tw5.com-styles.tid
index 9c81de672..5164f84e3 100644
--- a/editions/tw5.com/tiddlers/system/tw5.com-styles.tid
+++ b/editions/tw5.com/tiddlers/system/tw5.com-styles.tid
@@ -1,37 +1,18 @@
 title: $:/_tw5.com-styles
 tags: $:/tags/Stylesheet
 
-@media (min-width: 600px) {
-
-	.tc-link-info {
-		display: -webkit-flex;
-		display: -ms-flexbox;
-		display: flex;
-
-		-webkit-flex-wrap: wrap;
-		-ms-flex-wrap: wrap;
-		flex-wrap: wrap;
-	}
-
-	.tc-link-info-item {
-		max-width: 24em;
-		margin-right: 10px;
-	}
-
-}
-
 .tc-double-spaced-list li {
-	padding-bottom:.5em;padding-top:.5em;
+	padding-bottom: .5em;
+	padding-top: .5em;
 }
 
 .tc-link-info-item {
-	display: inline-block;
-	border: none;
-	padding: 5px 10px;
-	margin-bottom: 10px;
-	background: #ddeeff;
-	font-size: 0.8em;
-	line-height: 1.2;
+    border: 1px solid #ebefcd;
+    padding: 5px 10px;
+    margin-bottom: 10px;
+    background: #fcfdf3;
+    font-size: 0.8em;
+    line-height: 1.2;
 }
 
 .tc-link-info-item h1 {
@@ -45,6 +26,7 @@ tags: $:/tags/Stylesheet
 	padding: 1em;
 	height: 400px;
 	position: relative;
+	overflow: auto;
 }
 
 .tc-improvement-banner {
diff --git a/editions/tw5.com/tiddlers/system/version-macros.tid b/editions/tw5.com/tiddlers/system/version-macros.tid
new file mode 100644
index 000000000..cc328887e
--- /dev/null
+++ b/editions/tw5.com/tiddlers/system/version-macros.tid
@@ -0,0 +1,8 @@
+created: 20161008085627406
+modified: 20161008085627406
+title: $:/editions/tw5.com/version-macros
+tags: $:/tags/Macro
+
+\define .from-version(version)
+<span class="doc-from-version">New in $version$</span>
+\end
diff --git a/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.1.tid b/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.1.tid
index 46b0333ff..8d14b4e89 100644
--- a/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.1.tid
+++ b/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.1.tid
@@ -6,7 +6,7 @@ title: TiddlyDesktop Release 0.0.1
 type: text/vnd.tiddlywiki
 released: 20140108
 
-<a href="https://github.com/Jermolene/TiddlyDesktop/releases/tag/v0.0.1" class="tc-btn-big-green" target="_blank">
+<a href="https://github.com/Jermolene/TiddlyDesktop/releases/tag/v0.0.1" class="tc-btn-big-green" target="_blank" rel="noopener noreferrer">
 {{$:/core/images/github}} Download from ~GitHub
 </a>
 
diff --git a/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.2.tid b/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.2.tid
index 9ff1024ca..42a82c925 100644
--- a/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.2.tid
+++ b/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.2.tid
@@ -6,7 +6,7 @@ title: TiddlyDesktop Release 0.0.2
 type: text/vnd.tiddlywiki
 released: 20140118
 
-<a href="https://github.com/Jermolene/TiddlyDesktop/releases/tag/v0.0.2" class="tc-btn-big-green" target="_blank">
+<a href="https://github.com/Jermolene/TiddlyDesktop/releases/tag/v0.0.2" class="tc-btn-big-green" target="_blank" rel="noopener noreferrer">
 {{$:/core/images/github}} Download from ~GitHub
 </a>
 
diff --git a/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.3.tid b/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.3.tid
index bc67079d4..a9e8e37b1 100644
--- a/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.3.tid
+++ b/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.3.tid
@@ -6,7 +6,7 @@ title: TiddlyDesktop Release 0.0.3
 type: text/vnd.tiddlywiki
 released: 20140130
 
-<a href="https://github.com/Jermolene/TiddlyDesktop/releases/tag/v0.0.3" class="tc-btn-big-green" target="_blank">
+<a href="https://github.com/Jermolene/TiddlyDesktop/releases/tag/v0.0.3" class="tc-btn-big-green" target="_blank" rel="noopener noreferrer">
 {{$:/core/images/github}} Download from ~GitHub
 </a>
 
diff --git a/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.4.tid b/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.4.tid
index 278a457c2..29967fd33 100644
--- a/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.4.tid
+++ b/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.4.tid
@@ -6,7 +6,7 @@ title: TiddlyDesktop Release 0.0.4
 type: text/vnd.tiddlywiki
 released: 20150111
 
-<a href="https://github.com/Jermolene/TiddlyDesktop/releases/tag/v0.0.4" class="tc-btn-big-green" target="_blank">
+<a href="https://github.com/Jermolene/TiddlyDesktop/releases/tag/v0.0.4" class="tc-btn-big-green" target="_blank" rel="noopener noreferrer">
 {{$:/core/images/github}} Download from ~GitHub
 </a>
 
diff --git a/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.5.tid b/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.5.tid
index f9e30a96b..6e5aad3eb 100644
--- a/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.5.tid
+++ b/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.5.tid
@@ -6,7 +6,7 @@ title: TiddlyDesktop Release 0.0.5
 type: text/vnd.tiddlywiki
 released: 20151026
 
-<a href="https://github.com/Jermolene/TiddlyDesktop/releases/tag/v0.0.5" class="tc-btn-big-green" target="_blank">
+<a href="https://github.com/Jermolene/TiddlyDesktop/releases/tag/v0.0.5" class="tc-btn-big-green" target="_blank" rel="noopener noreferrer">
 {{$:/core/images/github}} Download from ~GitHub
 </a>
 
@@ -19,8 +19,8 @@ Please report any problems or suggestions via GitHub issues, or post to the Tidd
 http://groups.google.com/group/TiddlyWiki
 
 * Upgraded to the latest stable v12.0.3 of nw.js, fixing a number of bugs in the process, including one that prevented v0.0.4 from being used successfully under Windows
-** Bugs fixed: <a href="https://github.com/Jermolene/TiddlyDesktop/issues/66">#66</a>, <a href="https://github.com/Jermolene/TiddlyDesktop/issues/65">#65</a>, <a href="https://github.com/Jermolene/TiddlyDesktop/issues/61">#61</a>, <a href="https://github.com/Jermolene/TiddlyDesktop/issues/57">#57</a>, <a href="https://github.com/Jermolene/TiddlyDesktop/issues/53">#53</a>, <a href="https://github.com/Jermolene/TiddlyDesktop/issues/52">#52</a>
+** Bugs fixed: [[#66|https://github.com/Jermolene/TiddlyDesktop/issues/66]], [[#65|https://github.com/Jermolene/TiddlyDesktop/issues/65]], [[#61|https://github.com/Jermolene/TiddlyDesktop/issues/61]], [[#57|https://github.com/Jermolene/TiddlyDesktop/issues/57]], [[#53|https://github.com/Jermolene/TiddlyDesktop/issues/53]], [[#52|https://github.com/Jermolene/TiddlyDesktop/issues/52]]
 * Added a warning about disrupting the backstage wiki
 * Switched to using "Settings" instead of "Control Panel", to reduce confusion with TiddlyWiki's control panel
 * Updated app icon
-* Cleaned up TiddlyWiki build products, fixing <a href="https://github.com/Jermolene/TiddlyDesktop/issues/67">#67</a>
+* Cleaned up TiddlyWiki build products, fixing [[#67|https://github.com/Jermolene/TiddlyDesktop/issues/67]]
diff --git a/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.6.tid b/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.6.tid
index 4c42e88af..56152123e 100644
--- a/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.6.tid
+++ b/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.6.tid
@@ -6,7 +6,7 @@ title: TiddlyDesktop Release 0.0.6
 type: text/vnd.tiddlywiki
 released: 20151029
 
-<a href="https://github.com/Jermolene/TiddlyDesktop/releases/tag/v0.0.6" class="tc-btn-big-green" target="_blank">
+<a href="https://github.com/Jermolene/TiddlyDesktop/releases/tag/v0.0.6" class="tc-btn-big-green" target="_blank" rel="noopener noreferrer">
 {{$:/core/images/github}} Download from ~GitHub
 </a>
 
diff --git a/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.7.tid b/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.7.tid
index 0af75b7ae..2489d8945 100644
--- a/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.7.tid
+++ b/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.7.tid
@@ -6,7 +6,7 @@ tags: TiddlyDesktopReleaseNotes
 title: TiddlyDesktop Release 0.0.7
 type: text/vnd.tiddlywiki
 
-<a href="https://github.com/Jermolene/TiddlyDesktop/releases/tag/v0.0.7" class="tc-btn-big-green" target="_blank">
+<a href="https://github.com/Jermolene/TiddlyDesktop/releases/tag/v0.0.7" class="tc-btn-big-green" target="_blank" rel="noopener noreferrer">
 {{$:/core/images/github}} Download from ~GitHub
 </a>
 
diff --git a/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.8.tid b/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.8.tid
index 6bbf7822c..d793ee55d 100644
--- a/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.8.tid
+++ b/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Release_0.0.8.tid
@@ -6,7 +6,7 @@ tags: TiddlyDesktopReleaseNotes
 title: TiddlyDesktop Release 0.0.8
 type: text/vnd.tiddlywiki
 
-<a href="https://github.com/Jermolene/TiddlyDesktop/releases/tag/v0.0.8" class="tc-btn-big-green" target="_blank">
+<a href="https://github.com/Jermolene/TiddlyDesktop/releases/tag/v0.0.8" class="tc-btn-big-green" target="_blank" rel="noopener noreferrer">
 {{$:/core/images/github}} Download from ~GitHub
 </a>
 
diff --git a/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Releases.tid b/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Releases.tid
index 4edf16a57..f470bc587 100644
--- a/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Releases.tid
+++ b/editions/tw5.com/tiddlers/tiddlydesktop/TiddlyDesktop_Releases.tid
@@ -1,6 +1,6 @@
 caption: ~TiddlyDesktop
 created: 20150419144649101
-modified: 20150419153948247
+modified: 20160602043500852
 tags: Releases
 title: TiddlyDesktop Releases
 type: text/vnd.tiddlywiki
@@ -9,4 +9,4 @@ Here are the details of recent releases of TiddlyDesktop
 
 <$list filter="[tag[TiddlyDesktopReleaseNotes]!sort[created]limit[1]]">
   <$macrocall $name="tabs" tabsList="[tag[TiddlyDesktopReleaseNotes]!sort[created]]"default={{!!title}} class="tc-vertical" template="ReleaseTemplate" />
-</$list>
\ No newline at end of file
+</$list>
diff --git a/editions/tw5.com/tiddlers/variables/CoreVariables.tid b/editions/tw5.com/tiddlers/variables/Core Variables.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/variables/CoreVariables.tid
rename to editions/tw5.com/tiddlers/variables/Core Variables.tid
diff --git a/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget.tid b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget.tid
new file mode 100644
index 000000000..a7d223e4e
--- /dev/null
+++ b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget.tid
@@ -0,0 +1,30 @@
+caption: action-createtiddler
+created: 20161020152745942
+modified: 20161020155119177
+tags: Widgets ActionWidgets
+title: ActionCreateTiddlerWidget
+type: text/vnd.tiddlywiki
+
+! Introduction
+
+The ''action-createtiddler'' widget is an [[action widget|ActionWidgets]] that creates new tiddlers. ActionWidgets are used within triggering widgets such as the ButtonWidget.
+
+There are several differences from the [[tm-new-tiddler message|WidgetMessage: tm-new-tiddler]]:
+
+* The new tiddler is not automatically displayed in the [[story river|StoryRiver]]
+* The title of the new tiddler is made available for subsequent operations
+
+! Content and Attributes
+
+The ''action-createtiddler'' widget is invisible. Any content within it is ignored.
+
+|!Attribute |!Description |
+|$basetitle |The initial title that will be attempted. If a tiddler with that title already exists, then a numerical counter is added to the title and incremented until it is unique|
+|$savetitle |A text reference identifying a field or index into which the title of the newly created tiddler will be stored after it is created |
+|$timestamp |Specifies whether the timestamp(s) of the target tiddler will be updated (''modified'' and ''modifier'', plus ''created'' and ''creator'' for newly created tiddlers). Can be "yes" (the default) or "no" |
+|//{any attributes not starting with $}// |Each attribute name specifies a field to be created in the new tiddler  |
+
+! Examples
+
+<$macrocall $name='wikitext-example-without-html'
+src={{ActionCreateTiddlerWidget Example}}/>
diff --git a/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget_Example.tid b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget_Example.tid
new file mode 100644
index 000000000..2be233566
--- /dev/null
+++ b/editions/tw5.com/tiddlers/widgets/ActionCreateTiddlerWidget_Example.tid
@@ -0,0 +1,12 @@
+created: 20161020153426686
+modified: 20161020155142990
+tags: ActionCreateTiddlerWidget
+title: ActionCreateTiddlerWidget Example
+type: text/vnd.tiddlywiki
+
+New button caption: <$edit-text tiddler="$:/state/new-button-caption" tag="input" default=""/>
+
+<$button>
+<$action-createtiddler $basetitle="Homemade Button" tags="$:/tags/PageControls" text={{$:/state/new-button-caption}}/>
+Create non-functional page control button
+</$button>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/widgets/ActionSendMessageWidget.tid b/editions/tw5.com/tiddlers/widgets/ActionSendMessageWidget.tid
index cd08292e1..93403c1ba 100644
--- a/editions/tw5.com/tiddlers/widgets/ActionSendMessageWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/ActionSendMessageWidget.tid
@@ -7,7 +7,7 @@ type: text/vnd.tiddlywiki
 
 ! Introduction
 
-The ''action-sendmessage'' widget is an [[action widget|ActionWidgets]] that sends a [[message|WidgetMessages]] back up the widget tree. ActionWidgets are used within triggering widgets such as the ButtonWidget.
+The ''action-sendmessage'' widget is an [[action widget|ActionWidgets]] that sends a [[message|Messages]] back up the widget tree. ActionWidgets are used within triggering widgets such as the ButtonWidget.
 
 ! Content and Attributes
 
diff --git a/editions/tw5.com/tiddlers/widgets/ActionWidgets.tid b/editions/tw5.com/tiddlers/widgets/ActionWidgets.tid
index 5a6301b14..a8ae466ed 100644
--- a/editions/tw5.com/tiddlers/widgets/ActionWidgets.tid
+++ b/editions/tw5.com/tiddlers/widgets/ActionWidgets.tid
@@ -1,12 +1,38 @@
 created: 20141008134425548
-modified: 20150128163157192
+modified: 20160429165240169
 tags: Widgets
 title: ActionWidgets
 type: text/vnd.tiddlywiki
 
-Action widgets are a special type of widget that perform an action such as sending a message, navigating to a tiddler, or changing the value of a tiddler. They are used in association with other widgets that trigger those actions (for example, the ButtonWidget).
+Action widgets are a special type of widget that have no visual appearance but perform an action when triggered (such as sending a message, navigating to a tiddler, or changing the value of a tiddler). Action widgets are used in association with other widgets that trigger those actions (for example, the ButtonWidget).
 
-Action widgets are invisible. They need not be immediate children of their triggering widget, but they must be descendents of it. The actions are performed in sequence. For example, here is a button that triggers two actions of sending different messages:
+The following action widgets are provided:
+
+<<list-links "[tag[ActionWidgets]]">>
+
+There are two ways to use action widgets:
+
+* Using the `actions` attribute of the triggering widget (this is the preferred way)
+* Embedding the actions within the triggering widget (an older technique that is now deprecated)
+
+!! Assigning action widgets with the `actions` attribute
+
+The action widgets are passed as a string to the `actions` attribute of the triggering widget. Usually, it is more convenient to use a macro to assign the action widgets to a variable. For example, here is a button that triggers two actions of sending different messages:
+
+```
+\define my-actions()
+<$action-sendmessage $message="tm-home"/>
+<$action-sendmessage $message="tm-full-screen"/>
+\end
+
+<$button actions=<<my-actions>>>
+Click me!
+</$button>
+```
+
+!! Assigning action widgets by embedding
+
+The action widgets need not be immediate children of their triggering widget, but they must be descendents of it. The actions are performed in sequence. Here is the above example rewritten to use embedding:
 
 ```
 <$button>
@@ -16,6 +42,3 @@ Click me!
 </$button>
 ```
 
-The following action widgets are provided:
-
-<<list-links "[tag[ActionWidgets]]">>
diff --git a/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid b/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid
index 28c1f6822..dcc8002a7 100644
--- a/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/ButtonWidget.tid
@@ -1,6 +1,6 @@
 caption: button
 created: 20131024141900000
-modified: 20150619111219516
+modified: 20160429175044822
 tags: Widgets
 title: ButtonWidget
 type: text/vnd.tiddlywiki
@@ -9,6 +9,7 @@ type: text/vnd.tiddlywiki
 
 The button widget displays an HTML `<button>` element that can perform a combination of optional actions when clicked:
 
+* Executing any ActionWidgets passed in the `actions` attribute
 * Executing any ActionWidgets that are immediate children of the button widget
 * Execute any integrated actions:
 ** Navigate to a specified tiddler
@@ -23,6 +24,7 @@ The integrated actions are provided as a shortcut for invoking common actions. T
 The content of the `<$button>` widget is displayed within the button.
 
 |!Attribute |!Description |
+|actions |A string containing ActionWidgets to be triggered when the key combination is detected |
 |to |The title of the tiddler to navigate to |
 |message |The name of the [[widget message|Messages]] to send when the button is clicked |
 |param |The optional parameter to the message |
@@ -37,7 +39,7 @@ The content of the `<$button>` widget is displayed within the button.
 |tag |An optional html tag to use instead of the default "button" |
 |default |Default value if `set` tiddler is missing for testing against `setTo` to determine `selectedClass` |
 
-''Note:'' In almost all other cases where a TextReference is used as a widget attribute, it will be placed between curly brackets, to [[transclude|Transclusion in WikiText]] the value currently stored there.  However, when we use a TextReference as the value of a button widget's `set` attribute, we are referencing //the storage location itself//, rather than the value stored there, so we do ''not'' use curly brackets there.  //Example:// we could code a button widget that sets the `caption` field of TiddlerA to be the same as that of TiddlerB as:
+''Note:'' In almost all other cases where a TextReference is used as a widget attribute, it will be placed between curly brackets, to [[transclude|Transclusion in WikiText]] the value currently stored there. However, when we use a TextReference as the value of a button widget's `set` attribute, we are referencing //the storage location itself//, rather than the value stored there, so we do ''not'' use curly brackets there. //Example:// we could code a button widget that sets the `caption` field of TiddlerA to be the same as that of TiddlerB as:
 
 ```
 <$button set="TiddlerA!!caption" setTo={{TiddlerB!!caption}} >
diff --git a/editions/tw5.com/tiddlers/widgets/CodeblockWidget.tid b/editions/tw5.com/tiddlers/widgets/CodeblockWidget.tid
index 5592b3b45..acdab9ef9 100644
--- a/editions/tw5.com/tiddlers/widgets/CodeblockWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/CodeblockWidget.tid
@@ -1,6 +1,6 @@
 caption: codeblock
 created: 20151103160200000
-modified: 20151103160200000
+modified: 20160817175325205
 tags: Widgets
 title: CodeBlockWidget
 type: text/vnd.tiddlywiki
@@ -16,9 +16,14 @@ displayed monospace. A language may optionally be specified using the
 
 The content of the `<$codeblock>` widget is ignored.
 
-|!Attribute |!Description|
-|code|Contents of the block to render as code|
-|language|Programming language for syntax highlighting|
+|!Attribute |!Description |
+|code |Contents of the block to render as code |
+|language |Programming language for syntax highlighting |
+
+The `language` attribute accepts either:
+
+* a Highlight.js language code (see https://highlightjs.org/static/demo/ for a list)
+* a MIME type (eg, `text/html` or `image/svg+xml`)
 
 ! Examples
 
diff --git a/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid b/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid
index b4e7c3c31..6f2224e53 100644
--- a/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/EditTextWidget.tid
@@ -23,7 +23,7 @@ The content of the `<$edit-text>` widget is ignored.
 |class |A CSS class to be assigned to the generated HTML editing element |
 |placeholder |Placeholder text to be displayed when the edit field is empty |
 |focusPopup |Title of a state tiddler for a popup that is displayed when the editing element has focus  |
-|focus |Set to "true" to automatically focus the editor after creation  |
+|focus |Set to "yes" or "true" to automatically focus the editor after creation  |
 |tag |Overrides the generated HTML editing element tag. Use `textarea` for a multi-line editor |
 |type |Overrides the generated HTML editing element `type` attribute |
 |size |The size of the input field (in characters) |
diff --git a/editions/tw5.com/tiddlers/widgets/EntityWidget.tid b/editions/tw5.com/tiddlers/widgets/EntityWidget.tid
new file mode 100644
index 000000000..1c649cdc5
--- /dev/null
+++ b/editions/tw5.com/tiddlers/widgets/EntityWidget.tid
@@ -0,0 +1,17 @@
+caption: entity
+created: 20160314165608218
+modified: 20160314165658703
+tags: Widgets
+title: EntityWidget
+type: text/vnd.tiddlywiki
+
+! Introduction
+
+The entity widget displays a specified HTML character entity.
+
+! Content and Attributes
+
+The content of the `<$entity>` widget is not used.
+
+|!Attribute |!Description |
+|entity |The entity to display (eg, `&times;`) |
diff --git a/editions/tw5.com/tiddlers/widgets/KeyboardWidget.tid b/editions/tw5.com/tiddlers/widgets/KeyboardWidget.tid
index 69a784bff..41a38c6c8 100644
--- a/editions/tw5.com/tiddlers/widgets/KeyboardWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/KeyboardWidget.tid
@@ -1,27 +1,28 @@
 caption: keyboard
 created: 20140302192136805
-modified: 20151224141005939
+modified: 20160429175258940
 tags: Widgets
 title: KeyboardWidget
 type: text/vnd.tiddlywiki
 
 ! Introduction
 
-The keyboard widget allows ActionWidgets to be triggered by specific key combinations. There is also a shorthand for generating [[Messages]].
+The keyboard widget allows ActionWidgets to be triggered by specific key combinations. There is also a shorthand for generating [[Messages]] via the `message` and `param` attributes.
 
 ! Content and Attributes
 
-The content of the `<$keyboard>` widget is rendered normally. The keyboard shortcut only takes effect within the contained content.
+The content of the `<$keyboard>` widget is rendered normally. The keyboard shortcuts only take effect when the focus is within the contained content.
 
 |!Attribute |!Description |
+|actions |A string containing ActionWidgets to be triggered when the key combination is detected |
 |message |The title of the [[WidgetMessage|Messages]] to generate |
 |param |The parameter to be passed with the [[WidgetMessage|Messages]] |
-|key |Key string identifying the key to be trapped (see below) |
+|key |Key string identifying the key(s) to be trapped (see below) |
 |class |A CSS class to be assigned to the generated HTML DIV element |
 
 ! Key Strings
 
-Key strings are made up of zero or more of the modifiers <kbd>alt</kbd>, <kbd>shift</kbd> or <kbd>ctrl</kbd> followed by the name of a key, all joined with "+" plus symbols. Key names are either the letter or digit printed on the key (eg "a" or "1"), or one of the special keys <kbd>backspace</kbd>, <kbd>tab</kbd>, <kbd>enter</kbd> or <kbd>escape</kbd>.
+Key strings are made up of one or more key specifiers separated by spaces. Each key specifier is zero or more of the modifiers <kbd>alt</kbd>, <kbd>shift</kbd>, <kbd>ctrl</kbd> or <kbd>meta</kbd> followed by the name of a key, all joined with "+" plus or "-" minus symbols. Key names are either the letter or digit printed on the key (eg "a" or "1"), or one of the special keys <kbd>backspace</kbd>, <kbd>tab</kbd>, <kbd>enter</kbd> or <kbd>escape</kbd>.
 
 For example:
 
diff --git a/editions/tw5.com/tiddlers/widgets/ListWidget.tid b/editions/tw5.com/tiddlers/widgets/ListWidget.tid
index 6e80b2d76..e666ba5b8 100644
--- a/editions/tw5.com/tiddlers/widgets/ListWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/ListWidget.tid
@@ -63,7 +63,7 @@ Displays as:
 
 !! Grouped Lists
 
-See NestedLists for how to generate nested and grouped lists using the ListWidget.
+See GroupedLists for how to generate nested and grouped lists using the ListWidget.
 
 ! Content and Attributes
 
@@ -94,4 +94,4 @@ In order for the storyviews to animate correctly each entry in the list should b
 
 !! History and navigation
 
-The optional `history` attribute specifies the name of a tiddler that is used to track the current tiddler for navigation purposes. When the history tiddler changes the list view responds by telling the listview to handle navigating to the new tiddler. See HistoryMechanism for details.
\ No newline at end of file
+The optional `history` attribute specifies the name of a tiddler that is used to track the current tiddler for navigation purposes. When the history tiddler changes the list view responds by telling the listview to handle navigating to the new tiddler. See HistoryMechanism for details.
diff --git a/editions/tw5.com/tiddlers/widgets/RadioWidget.tid b/editions/tw5.com/tiddlers/widgets/RadioWidget.tid
index dd6b61b89..b0339c656 100644
--- a/editions/tw5.com/tiddlers/widgets/RadioWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/RadioWidget.tid
@@ -7,7 +7,7 @@ caption: radio
 
 ! Introduction
 
-The radio widget displays an HTML `<input type="radio">`  that reflects whether a given tiddler field has a specified value. Selecting the radio button sets to the tiddler field to the value.
+The radio widget displays an HTML `<input type="radio">` that reflects whether a given tiddler field has a specified value. Selecting the radio button sets to the tiddler field to the value.
 
 ! Content and Attributes
 
diff --git a/editions/tw5.com/tiddlers/widgets/SelectWidget.tid b/editions/tw5.com/tiddlers/widgets/SelectWidget.tid
index f8db9617f..51aede5a1 100644
--- a/editions/tw5.com/tiddlers/widgets/SelectWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/SelectWidget.tid
@@ -1,6 +1,6 @@
 caption: select
 created: 20131024141900000
-modified: 20141203155137508
+modified: 20160429175220241
 tags: Widgets
 title: SelectWidget
 type: text/vnd.tiddlywiki
@@ -8,7 +8,7 @@ type: text/vnd.tiddlywiki
 ! Introduction
 
 The select widget displays a popup menu based on a [[HTML select element|https://developer.mozilla.org/en-US/docs/Web/HTML/Element/select]]. The popup (or dropdown) contains a list of items defined by `<option>` and `<optgroup>` elements. 
-Every time the user selects a new value in the menu, the selected value is written to the text of a specified tiddler field or index. If the tiddler value changes the menu is automatically updated to reflect the new value.
+Every time the user selects a new value in the menu, the selected value is written to the text of a specified tiddler field or index and any ActionWidgets within the `actions` attribute are triggered. Conversely, if the tiddler value is changed independently the select widget is automatically updated to reflect the new value.
 
 In multiple selection mode, the list of selected values is bound to the specified tiddler field or index. Browsers generally use the <kbd>ctrl</kbd> or <kbd>cmd</kbd> keys for multiple selection.
 
@@ -38,6 +38,7 @@ The content of the `<$select>` widget should be one or more HTML `<option>` or `
 |default |Default value to be used if the tiddler, field or index specifies a missing value |
 |multiple |If present, switches to multiple selection mode |
 |size |The number of rows to display in multiple selection mode |
+|actions |A string containing ActionWidgets to be triggered when the key combination is detected |
 
 ! Examples
 
diff --git a/editions/tw5.com/tiddlers/widgets/SetWidget.tid b/editions/tw5.com/tiddlers/widgets/SetWidget.tid
index c4204be59..bf1ec571f 100644
--- a/editions/tw5.com/tiddlers/widgets/SetWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/SetWidget.tid
@@ -1,8 +1,9 @@
-title: SetWidget
-created: 201311151827
-modified: 20150220162217000
-tags: Widgets
 caption: set
+created: 20131115182700000
+modified: 20161017122456014
+tags: Widgets
+title: SetWidget
+type: text/vnd.tiddlywiki
 
 ! Introduction
 
@@ -16,6 +17,7 @@ The content of the `<$set>` widget is the scope for the value assigned to the va
 |name |The name of the variable to assign (defaults to "currentTiddler") |
 |value |The value to assign to the variable if the filter is missing or not empty |
 |filter |An optional filter to be evaluated and assigned to the variable (see below) |
+|select |<<.from-version "5.1.14">> An optional zero-based index of the item to return from the filter output (see below) |
 |emptyValue |The value to assign to the variable if the filter is present and evaluates to an empty list (see below) |
 
 !! Simple Variable Assignment
@@ -55,3 +57,13 @@ This form of the set variable widget evaluates the filter and assigns the result
 <$text text=<<myVariable>>/>
 </$set>
 ```
+
+!! Filtered Item Variable Assignment
+
+<<.from-version "5.1.14">> This form of the set variable widget evaluates the filter and assigns the specified result to the variable as a single item (ie, not using double square brackets for titles containing spaces).
+
+```
+<$set name="myVariable" filter="[tag[HelloThere]]" select="0">
+<$text text=<<myVariable>>/>
+</$set>
+```
diff --git a/editions/tw5.com/tiddlers/widgets/ViewWidget.tid b/editions/tw5.com/tiddlers/widgets/ViewWidget.tid
index db32db4c1..66d415795 100644
--- a/editions/tw5.com/tiddlers/widgets/ViewWidget.tid
+++ b/editions/tw5.com/tiddlers/widgets/ViewWidget.tid
@@ -1,8 +1,9 @@
-title: ViewWidget
-created: 201310241419
-modified: 20150220161335000
-tags: Widgets
 caption: view
+created: 20131024141900000
+modified: 20160623152830060
+tags: Widgets
+title: ViewWidget
+type: text/vnd.tiddlywiki
 
 ! Introduction
 
@@ -26,8 +27,12 @@ The following formats can be specified in the `format` attribute:
 
 |!Format |!Description |
 |''text'' |Plain text |
-|''htmlwikified'' |The field is wikified and the resulting HTML returned as plain text |
-|''htmlencoded'' |The field is displayed with HTML encoding issues |
+|''htmlencoded'' |The field is displayed with HTML encoding |
+|''urlencoded'' |The field is displayed with URL encoding |
+|''doubleurlencoded'' |The field is displayed with double URL encoding |
+|''htmlwikified'' |The field is wikified and the resulting HTML returned as plain text (ie HTML elements will appear in plain text) |
+|''plainwikified'' |The field is wikified and the text content of the resulting HTML returned as plain text (ie HTML elements will be removed) |
+|''htmlencodedplainwikified'' |The field is wikified and the text content of the resulting HTML returned as HTML encoded plain text (ie HTML elements will be removed) |
 |''date'' |The field is interpreted as a UTC date and displayed according to the DateFormat specified in the `template` attribute |
 |''relativedate'' |The field is interpreted as a UTC date and displayed as the interval from the present instant |
 |''stripcomments'' |The field is interpreted as JavaScript source code and any lines beginning `\\#` are stripped |
diff --git a/editions/tw5.com/tiddlers/widgets/WikifyWidget.tid b/editions/tw5.com/tiddlers/widgets/WikifyWidget.tid
new file mode 100644
index 000000000..b058587fa
--- /dev/null
+++ b/editions/tw5.com/tiddlers/widgets/WikifyWidget.tid
@@ -0,0 +1,30 @@
+caption: wikify
+created: 20160321144949700
+modified: 20161017122117062
+tags: Widgets
+title: WikifyWidget
+type: text/vnd.tiddlywiki
+
+! Introduction
+
+The wikify widget parses and renders a string of text and assigns the result to a specified [[variable|Variables]]. The new value of the variable is available to the content within the wikify widget.
+
+! Content and Attributes
+
+The content of the `<$wikify>` widget is the scope for the value assigned to the variable.
+
+|!Attribute |!Description |
+|name |The name of the variable to assign |
+|text |The text to parse and render |
+|type |The ContentType of the text (defaults to `text/vnd.tiddlywiki`) |
+|mode |The parse mode: `block` (the default) or `inline` |
+|output |Keyword indicating the desired output type, defaulting to `text` (see below) |
+
+The available output types are:
+
+|!Keyword |!Description |
+|text |Return the plain text of the rendered output (ie HTML tags are omitted) |
+|formattedtext |Return the plain text with simple text formatting of the rendered output (ie HTML tags are omitted) |
+|html |Return the rendered HTML of the output |
+|parsetree |Return a formatted JSON representation of the parse tree |
+|widgettree |Return a formatted JSON representation of the widget tree |
diff --git a/editions/tw5.com/tiddlers/wikitext/Block Quotes in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Block Quotes in WikiText.tid
index b68d8bdd2..69c48744c 100644
--- a/editions/tw5.com/tiddlers/wikitext/Block Quotes in WikiText.tid	
+++ b/editions/tw5.com/tiddlers/wikitext/Block Quotes in WikiText.tid	
@@ -1,15 +1,15 @@
+caption: Block Quotes
 created: 20131206154636572
-modified: 20131206162157596
+modified: 20160607092444424
 tags: WikiText
 title: Block Quotes in WikiText
 type: text/vnd.tiddlywiki
-caption: Block Quotes
 
 There are two ways to produce HTML block quotes in TiddlyWiki5, one for content spread across multiple lines, and one for single line content.
 
 ! Multi-line Block Quotes
 
-The syntax for multi-line block quotes is:
+The syntax for multi-line block quotes ({{$:/core/images/quote}}) is:
 
 <<wikitext-example src:"<<<
 This is a block quoted paragraph
diff --git a/editions/tw5.com/tiddlers/wikitext/Code Blocks in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Code Blocks in WikiText.tid
index 8cb00fca1..9bf473e13 100644
--- a/editions/tw5.com/tiddlers/wikitext/Code Blocks in WikiText.tid	
+++ b/editions/tw5.com/tiddlers/wikitext/Code Blocks in WikiText.tid	
@@ -1,11 +1,11 @@
+caption: Code Blocks
 created: 20131205160047557
-modified: 20141024134125489
+modified: 20160606140326254
 tags: WikiText
 title: Code Blocks in WikiText
 type: text/vnd.tiddlywiki
-caption: Code Blocks
 
-You can  use triple backticks <code>&#96;&#96;&#96;</code> to mark code blocks:
+You can use triple backticks <code>&#96;&#96;&#96;</code> to mark code blocks ({{$:/core/images/mono-block}}):
 
 <pre>
 &#96;&#96;&#96;
@@ -40,5 +40,5 @@ This will be monospaced
 &#96;&#96;&#96;
 </pre>
 
-Note that  some keyboard layouts treat the backtick as a [[dead key|http://en.wikipedia.org/wiki/Dead_key]], making it hard to type. The trick is to type three backticks followed by a space. Alternatively, type all six backticks in one go, then a space, and then move the cursor back three characters to type or paste the content.
+Note that some keyboard layouts treat the backtick as a [[dead key|http://en.wikipedia.org/wiki/Dead_key]], making it hard to type. The trick is to type three backticks followed by a space. Alternatively, type all six backticks in one go, then a space, and then move the cursor back three characters to type or paste the content.
 
diff --git a/editions/tw5.com/tiddlers/wikitext/Formatting in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Formatting in WikiText.tid
index bd7346b3d..b0b500dc6 100644
--- a/editions/tw5.com/tiddlers/wikitext/Formatting in WikiText.tid	
+++ b/editions/tw5.com/tiddlers/wikitext/Formatting in WikiText.tid	
@@ -1,19 +1,19 @@
+caption: Formatting
 created: 20131205155959399
-modified: 20131230120942930
+modified: 20160606135946509
 tags: WikiText
 title: Formatting in WikiText
 type: text/vnd.tiddlywiki
-caption: Formatting
 
 Available character formatting includes:
 
-* <code>&#96;backticks&#96;</code> for `code`
+* <code>&#96;backticks&#96;</code> for `code` ({{$:/core/images/mono-line}})
 ** Alternatively, <code>&#96;&#96;double backticks allows &#96;embedded&#96; backticks&#96;&#96;</code>
-* `''bold''` for ''bold text''
-* `//italic//` for //italic text//
-* `__underscore__` for __underscored text__
-* `^^superscript^^` for ^^superscript^^ text
-* `,,subscript,,` for ,,subscripted,, text
-* `~~strikethrough~~` for ~~strikethrough~~ text
+* `''bold''` for ''bold text'' ({{$:/core/images/bold}})
+* `//italic//` for //italic text// ({{$:/core/images/italic}})
+* `__underscore__` for __underscored text__ ({{$:/core/images/underline}})
+* `^^superscript^^` for ^^superscripted^^ text ({{$:/core/images/superscript}})
+* `,,subscript,,` for ,,subscripted,, text ({{$:/core/images/subscript}})
+* `~~strikethrough~~` for ~~strikethrough~~ text ({{$:/core/images/strikethrough}})
 
 See also: [[Code Blocks in WikiText]]
diff --git a/editions/tw5.com/tiddlers/wikitext/HTML in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/HTML in WikiText.tid
index ff21b134e..f18aad0d1 100644
--- a/editions/tw5.com/tiddlers/wikitext/HTML in WikiText.tid	
+++ b/editions/tw5.com/tiddlers/wikitext/HTML in WikiText.tid	
@@ -1,9 +1,9 @@
+caption: HTML
 created: 20131205160816081
-modified: 20141018181414011
+modified: 20161021102422842
 tags: WikiText
 title: HTML in WikiText
 type: text/vnd.tiddlywiki
-caption: HTML
 
 HTML tags and comments can be used directly in WikiText. For example:
 
@@ -14,23 +14,29 @@ This is my nice and simple block of text. HelloThere
 </article>
 ```
 
+[[Widgets share the same syntax as HTML tags|Widgets in WikiText]], and so the following information applies to them, too.
+
 ! Content Parsing
 
-The content of an HTML element will be parsed in inline mode unless the opening tag is followed by two linebreaks, in which case it is parsed in block mode. (Inline mode means that block mode formatting such as tables, lists and headings is not recognised).
+The content of an HTML element will be parsed in inline mode unless the opening tag is followed by two linebreaks, in which case it will be parsed in block mode. (Inline mode means that block mode formatting such as tables, lists and headings is not recognised).
 
 ! Attributes
 
-Attributes in HTML tags can be specified as a literal, a transclusion or a macro invocation. For example, here the value of the `href` attribute will be set to the value of the tiddler MyLinkDestination:
+In an extension of conventional HTML syntax, attributes of elements/widgets can be specified in several different ways: 
 
-```
-<a href={{MyLinkDestination}}>link</a>
-```
+* a literal string
+* a transclusion of a TextReference
+* a transclusion of a [[macro/variable|Macros in WikiText]]
+* as the result of a [[Filter Expression]]
 
-Here an attribute is specified as a macro invocation:
+!! Literal Attribute Values
 
-```
-<a href=<<MyMacro "Brian">>>link</a>
-```
+Literal attribute values can use several different styles of quoting:
+
+* Single quotes (eg `attr='value'`)
+* Double quotes (eg `attr="value"`)
+* Tripe double quotes (eg `attr="""value"""`)
+* No quoting is necessary for values that do not contain spaces (eg `attr=value`)
 
 Literal attribute values can include line breaks. For example:
 
@@ -41,7 +47,7 @@ Rodentville,
 Ratland."/>
 ```
 
-By using triple-double quotes you can specify attribute values that include single double quotes. For example:
+By using triple-double quotes you can specify attribute values that contain single double quotes. For example:
 
 ```
 <div data-address="""Mouse House,
@@ -49,3 +55,34 @@ By using triple-double quotes you can specify attribute values that include sing
 Rodentville,
 Ratland."""/>
 ```
+
+!! Transcluded Attribute Values
+
+Transcluded attribute values are indicated with double curly braces around a TextReference. For example:
+
+```
+attr={{tiddler}}
+attr={{!!field}}
+attr={{tiddler!!field}}
+```
+
+!! Variable Attribute Values
+
+Variable attribute values are indicated with double angle brackets around a [[macro invocation|Macro Calls in WikiText]]. For example:
+
+```
+<div title=<<MyMacro "Brian">>>
+...
+</div>
+```
+
+!! Filtered Attribute Values
+
+Filtered attribute values are indicated with triple curly braces around a [[Filter Expression]]. The value will be the first item in the resulting list, or the empty string if the list is empty.
+
+This example shows how to add a prefix to a value:
+
+```
+<$text text={{{ [<currentTiddler>]addPrefix[$:/myprefix/]] }}}>
+```
+
diff --git a/editions/tw5.com/tiddlers/wikitext/HTML_Links_in_WikiText.tid b/editions/tw5.com/tiddlers/wikitext/HTML_Links_in_WikiText.tid
new file mode 100644
index 000000000..99ad2b447
--- /dev/null
+++ b/editions/tw5.com/tiddlers/wikitext/HTML_Links_in_WikiText.tid
@@ -0,0 +1,17 @@
+created: 20161021101834041
+modified: 20161021102041147
+tags: [[HTML in WikiText]]
+title: HTML Links in WikiText
+type: text/vnd.tiddlywiki
+
+It is often useful to be able to create HTML links to external resources. For example, here the value of the `href` attribute will be set to the value of the tiddler MyLinkDestination:
+
+```
+<a href={{MyLinkDestination}}>link</a>
+```
+
+However, there is an unexpected security issue that means that most of the time the link should have the `rel` attribute set to `noopener noreferrer` to maintain privacy of the URLs of private TiddlyWiki's (eg on Dropbox). See https://mathiasbynens.github.io/rel-noopener/ for more information.
+
+```
+<a href={{MyLinkDestination}} rel="noopener noreferrer">link</a>
+```
diff --git a/editions/tw5.com/tiddlers/wikitext/Images in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Images in WikiText.tid
index 263df768f..331344ab0 100644
--- a/editions/tw5.com/tiddlers/wikitext/Images in WikiText.tid	
+++ b/editions/tw5.com/tiddlers/wikitext/Images in WikiText.tid	
@@ -1,6 +1,6 @@
 caption: Images
 created: 20131205160221762
-modified: 20140919191059369
+modified: 20160617100358365
 tags: WikiText [[Working with TiddlyWiki]]
 title: Images in WikiText
 type: text/vnd.tiddlywiki
@@ -14,6 +14,8 @@ Images can be included in WikiText with the following syntax:
 [img[http://tiddlywiki.com/favicon.ico]]
 ```
 
+You can also insert images from the editor toolbar. Click ''picture'' ({{$:/core/images/picture}}) and select a picture file.
+
 If the image source is the title of an image tiddler then that tiddler is directly displayed. Otherwise it is interpreted as a URL and an HTML `<img>` tag is generated with the `src` attribute containing the URL.
 
 A tooltip can also be specified:
diff --git a/editions/tw5.com/tiddlers/wikitext/Linking in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Linking in WikiText.tid
index ab015ad43..cca620a4a 100644
--- a/editions/tw5.com/tiddlers/wikitext/Linking in WikiText.tid	
+++ b/editions/tw5.com/tiddlers/wikitext/Linking in WikiText.tid	
@@ -1,9 +1,9 @@
+caption: Linking
 created: 20131205155230596
-modified: 20130706185813974
+modified: 20160607095245257
 tags: WikiText
 title: Linking in WikiText
 type: text/vnd.tiddlywiki
-caption: Linking
 
 A key capability of WikiText is the ability to make links to other tiddlers or to external websites.
 
@@ -21,6 +21,8 @@ To link to a tiddler and specify the text of the link:
 [[Displayed Link Title|Tiddler Title]]
 ```
 
+You can also create a link from the editor toolbar. Click ''link'' ({{$:/core/images/link}}), and search and select a tiddler.
+
 ! ~CamelCase Links
 
 For tiddler titles that match the CamelCase rules, just typing the title without double square brackets will automatically create a link.
@@ -42,7 +44,7 @@ http://tiddlywiki.com/
 [[Mail me|mailto:me@where.net]]
 ```
 
-For this syntax to work, the URL has to be recognisable as a URL.  Otherwise, it is treated as a tiddler title.  As a result, in case you want to link to a resource locatable using a relative path, use the extended syntax:
+For this syntax to work, the URL has to be recognisable as a URL. Otherwise, it is treated as a tiddler title. As a result, in case you want to link to a resource locatable using a relative path, use the extended syntax:
 
 ```
 [ext[Open file|index.html]]
diff --git a/editions/tw5.com/tiddlers/wikitext/Lists in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Lists in WikiText.tid
index bf17bc110..3d38952d8 100644
--- a/editions/tw5.com/tiddlers/wikitext/Lists in WikiText.tid	
+++ b/editions/tw5.com/tiddlers/wikitext/Lists in WikiText.tid	
@@ -1,13 +1,13 @@
 caption: Lists
 created: 20131205160257619
-modified: 20140924112303029
+modified: 20160607093103220
 tags: WikiText
 title: Lists in WikiText
 type: text/vnd.tiddlywiki
 
-! Unordered Lists
+! Bulleted Lists
 
-You can create unordered lists with `*` characters:
+You can create bulleted (unordered) lists with `*` characters ({{$:/core/images/list-bullet}}):
 
 <<wikitext-example src:"* First list item
 * Second list item
@@ -15,9 +15,9 @@ You can create unordered lists with `*` characters:
 * Third list item
 ">>
 
-! Ordered Lists
+! Numbered Lists
 
-Ordered lists use `#` instead of `*`:
+Numbered (ordered) lists use `#` instead of `*` ({{$:/core/images/list-number}}):
 
 # First item
 # Second item
diff --git a/editions/tw5.com/tiddlers/wikitext/Widgets in WikiText.tid b/editions/tw5.com/tiddlers/wikitext/Widgets in WikiText.tid
index 97566ab7d..5ef9253c9 100644
--- a/editions/tw5.com/tiddlers/wikitext/Widgets in WikiText.tid	
+++ b/editions/tw5.com/tiddlers/wikitext/Widgets in WikiText.tid	
@@ -1,9 +1,9 @@
+caption: Widgets
 created: 20131205160840915
-modified: 20140619111725471
+modified: 20161020210726813
 tags: WikiText
 title: Widgets in WikiText
 type: text/vnd.tiddlywiki
-caption: Widgets
 
 Widgets provide rich functionality within WikiText. They have the same syntax as [[HTML elements|HTML in WikiText]], but the tag name always starts with `$`. For example:
 
@@ -19,6 +19,7 @@ Note that widgets inherit all the features of [[HTML in WikiText]]:
 ** Strings quoted with triple-double quotes
 ** Macro invocations (eg `attr=<<myMacro>>`)
 ** Transclusions (eg, `attr={{MyTiddler!!field}}`)
+** Filtered transclusions (eg, `attr={{{ [filter[op]] }}}`)
 * The content of a widget is parsed in inline mode unless the opening tag is followed by two linebreaks, which forces block mode
 ** 'Inline mode' means that 'block mode' parse rules like headings, tables and lists are not recognised
 
diff --git a/editions/tw5.com/tiddlers/workingwithtw/Creating and editing tiddlers.tid b/editions/tw5.com/tiddlers/workingwithtw/Creating and editing tiddlers.tid
index 17ec20402..1ca1bd1e2 100644
--- a/editions/tw5.com/tiddlers/workingwithtw/Creating and editing tiddlers.tid	
+++ b/editions/tw5.com/tiddlers/workingwithtw/Creating and editing tiddlers.tid	
@@ -1,5 +1,5 @@
 created: 20140904140300000
-modified: 20141010093319359
+modified: 20160607153747195
 tags: [[Working with TiddlyWiki]]
 title: Creating and editing tiddlers
 type: text/vnd.tiddlywiki
@@ -22,7 +22,7 @@ When you create a new tiddler or edit an existing one, the tiddler will go into
 
 *''The title field'' - Use this to change the title of the tiddler
 *''The tag selector'' - Use this to add or remove tags. As you type a tag name in the box, a dropdown list will show you any existing tags that match. You can pick from this list or create a completely new tag. Then click the ''add'' button to add the tag to the tiddler. Each tag is shown as a coloured pill. Click the "×" on a pill to remove that tag
-*''The text area'' - Use this to edit the main content of the tiddler. Click the ''show preview'' button to see what your changes will look like
+*''The text area'' - Use this to edit the main content of the tiddler. Click the ''preview'' button ({{$:/core/images/preview-closed}} / {{$:/core/images/preview-open}}) to see what your changes will look like
 *''The type selector'' - Use this when a tiddler needs to be displayed in a special way, such as an image. See ContentType for a list of the options. The default is `text/vnd.tiddlywiki`, which means the tiddler contains WikiText
 *''The field selector'' - Use this to add or remove fields on the tiddler. For example, if you are editing a tiddler that's being used to tag other tiddlers, you can add a [[''list'' field|ListField]] to change the order in which those tiddlers will be listed
 
@@ -30,6 +30,6 @@ When you create a new tiddler or edit an existing one, the tiddler will go into
 
 When you have finished editing, click a button at the top right of the tiddler:
 
-*The ''save'' button ({{$:/core/images/done-button}}) stores your changes to this one tiddler and leaves draft mode. If your wiki is configured to [[AutoSave]], your changes will be permanently saved. Otherwise they will only be stored temporarily in your web browser, and you will lose them if you close your ~TiddlyWiki page without first clicking the master ''save changes'' button {{$:/core/images/save-button}} in the sidebar.
+*The ''ok'' button ({{$:/core/images/done-button}}) stores your changes to this one tiddler and leaves draft mode. If your wiki is configured to [[AutoSave]], your changes will be permanently saved. Otherwise they will only be stored temporarily in your web browser, and you will lose them if you close your ~TiddlyWiki page without first clicking the master ''save changes'' button ({{$:/core/images/save-button}}) in the sidebar.
 *The ''cancel'' button ({{$:/core/images/cancel-button}}) discards your changes (after asking you to confirm) and leaves draft mode.
 *The ''delete'' button ({{$:/core/images/delete-button}}) deletes the entire tiddler (after asking you to confirm).
diff --git a/editions/tw5.com/tiddlers/workingwithtw/Creating journal tiddlers.tid b/editions/tw5.com/tiddlers/workingwithtw/Creating journal tiddlers.tid
index e6fa8417b..572a188a7 100644
--- a/editions/tw5.com/tiddlers/workingwithtw/Creating journal tiddlers.tid	
+++ b/editions/tw5.com/tiddlers/workingwithtw/Creating journal tiddlers.tid	
@@ -1,5 +1,5 @@
 created: 20141010093214683
-modified: 20150124202942000
+modified: 20160610081833756
 tags: [[Working with TiddlyWiki]]
 title: Creating journal tiddlers
 type: text/vnd.tiddlywiki
@@ -14,19 +14,19 @@ For example, you might use a journal tiddler called ''10th October 2014'' to rec
 
 ! Creating a journal tiddler
 
-The easiest way to create a journal tiddler is to use the ''new journal'' button in the ''Tools'' tab of the sidebar. If you find yourself often using the button, click the checkbox next to it to make the button available just above the search box.
+The easiest way to create a journal tiddler is to use the ''new journal'' button {{$:/core/images/new-journal-button}} in the ''Tools'' tab of the sidebar. If you find yourself often using the button, click the checkbox next to it to make the button available just above the search box.
 
 The ''new journal'' button creates a journal entry as a blank tiddler with the tag ''Journal'' and a title derived from today's date. If a journal tiddler with that title already exists, then this is opened for editing.
 
 ! Creating a tagged journal tiddler
 
-A common sequence of actions is to create (or reopen) today's journal entry and tag it with the title of another tiddler. This can be done with the ''new journal here'' button in the other tiddler's toolbar. You can find this button in the ''Tools'' tab of the tiddler's InfoPanel.
+A common sequence of actions is to create (or reopen) today's journal entry and tag it with the title of another tiddler. This can be done with the ''new journal here'' button {{$:/core/images/new-journal-button}} in the other tiddler's toolbar. You can find this button in the ''Tools'' tab of the tiddler's InfoPanel.
 
 For example, you might be reviewing a tiddler called ''Oxford Street'' and realise that it's relevant for planning your shopping trip. Click the ''new journal here'' button on the ''Oxford Street'' tiddler to bring up a journal entry tagged with ''Oxford Street''.
 
 ! Customising journal tiddlers
 
-To configure how new journal entries are created, visit the ''Basics'' tab under ''Info'' in the [[control panel|$:/ControlPanel]]:
+To configure how new journal entries are created, visit the ''Basics'' tab under ''Info'' in the [[control panel|$:/ControlPanel]] {{$:/core/images/options-button}}:
 
 * "Title of new journal tiddlers" specifies how these tiddlers should be named, as a [[date format string|DateFormat]]. The default setting of `DDth MMM YYYY` causes new entries to have titles of the form "10th October 2014"
 * "Tags for new journal tiddlers" [specifies|Title List] tags that will automatically appear on new journal entries. For example: `Journal [[Summer vacation]]`
diff --git a/editions/tw5.com/tiddlers/workingwithtw/Formatting text in TW.tid b/editions/tw5.com/tiddlers/workingwithtw/Formatting text in TiddlyWiki.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/workingwithtw/Formatting text in TW.tid
rename to editions/tw5.com/tiddlers/workingwithtw/Formatting text in TiddlyWiki.tid
diff --git a/editions/tw5.com/tiddlers/workingwithtw/Navigating between open tiddlers.tid b/editions/tw5.com/tiddlers/workingwithtw/Navigating between open tiddlers.tid
index afd33aca2..3f01e6c77 100644
--- a/editions/tw5.com/tiddlers/workingwithtw/Navigating between open tiddlers.tid	
+++ b/editions/tw5.com/tiddlers/workingwithtw/Navigating between open tiddlers.tid	
@@ -1,5 +1,5 @@
 created: 20140908092600000
-modified: 20141010184954582
+modified: 20160607145200048
 tags: [[Working with TiddlyWiki]]
 title: Navigating between open tiddlers
 type: text/vnd.tiddlywiki
@@ -8,7 +8,7 @@ In the default "classic" storyview mode, open tiddlers are displayed in a vertic
 
 * The best approach is to ''use the Open tab'' in the sidebar to click on the open tiddler to which you wish to navigate.
 
-** The ''Open'' tab contains a list of all the open tiddlers. You can click on any tiddler in the list to jump to it, or click the "×" next to a tiddler link to close it. There is also a handy ''close all'' button at the bottom of the list of open tiddlers.
+** The ''Open'' tab contains a list of all the open tiddlers. You can click on any tiddler in the list to jump to it, or click the "×" next to a tiddler link to close it. There is also a handy {{$:/core/images/close-all-button}} ''close all'' button at the bottom of the list of open tiddlers.
 
 * Another way is to simply ''scroll the page up and down'' using the story river scrollbar to the right.
 
diff --git a/editions/tw5.com/tiddlers/workingwithtw/Performance.tid b/editions/tw5.com/tiddlers/workingwithtw/Performance.tid
index ee35cb6e9..32c9707c8 100644
--- a/editions/tw5.com/tiddlers/workingwithtw/Performance.tid
+++ b/editions/tw5.com/tiddlers/workingwithtw/Performance.tid
@@ -1,5 +1,5 @@
 created: 20150330155120127
-modified: 20150330155547626
+modified: 20160607145222633
 tags: [[Working with TiddlyWiki]]
 title: Performance
 type: text/vnd.tiddlywiki
@@ -9,4 +9,4 @@ TiddlyWiki ships with defaults that are designed to get the best out of modern d
 * ''Avoid the "Recent" tab''. It is computationally slow to generate and update in response to tiddler changes.
 * ''Use the "Vanilla" theme''. The default "Snow White" theme includes visual effects like shadows, transparency and blurring that can be slow to render on older devices
 * ''Avoid large tiddlers''. Large bitmaps can significantly slow TiddlyWiki's performance. For example, an image taken with a modern smartphone will often be 5MB or more. Use ExternalImages whenever possible
-* ''Don't have too many tiddlers open at once''. Every tiddler you have open will require processing to keep it up to date as the store changes (for example, while you type into a draft tiddler). It is particularly easy when using zoomin story view to end up with dozens of tiddlers listed in the ''Open'' tab in the sidebar. Get into the habit of periodically closing all open tiddlers with the ''close all'' button
+* ''Don't have too many tiddlers open at once''. Every tiddler you have open will require processing to keep it up to date as the store changes (for example, while you type into a draft tiddler). It is particularly easy when using zoomin story view to end up with dozens of tiddlers listed in the ''Open'' tab in the sidebar. Get into the habit of periodically closing all open tiddlers with the {{$:/core/images/close-all-button}} ''close all'' button
diff --git a/editions/tw5.com/tiddlers/workingwithtw/Sharing tiddlers with others.tid b/editions/tw5.com/tiddlers/workingwithtw/Sharing your tiddlers with others.tid
similarity index 58%
rename from editions/tw5.com/tiddlers/workingwithtw/Sharing tiddlers with others.tid
rename to editions/tw5.com/tiddlers/workingwithtw/Sharing your tiddlers with others.tid
index 67d76c2d3..0c6b4a479 100644
--- a/editions/tw5.com/tiddlers/workingwithtw/Sharing tiddlers with others.tid	
+++ b/editions/tw5.com/tiddlers/workingwithtw/Sharing your tiddlers with others.tid	
@@ -1,5 +1,5 @@
 created: 20140908163900000
-modified: 20160106154652516
+modified: 20160610074043190
 tags: Learning
 title: Sharing your tiddlers with others
 type: text/vnd.tiddlywiki
@@ -9,8 +9,8 @@ There are a number of ways that people can share tiddlers:
 *You can attach a ~TiddlyWiki to an e-mail
 *You can publish your ~TiddlyWiki online, and grab a link to send or message to others:
 **A link to the URL of the file itself
-**A permalink to a specific tiddler (see [[PermaLinks]])
-**A permaview link of all the currently open tiddlers (see [[PermaView]])
-*You can grab tiddlers from ~TiddlyWikis that others have published online by clicking on a link to the tiddler within their file, and then dragging and dropping the link into your own file. An import tiddler will appear, and you can click to import the tiddler or tiddlers to your file.
+**A permalink ({{$:/core/images/permalink-button}}) to a specific tiddler (see [[PermaLinks]])
+**A permaview ({{$:/core/images/permaview-button}}) link of all the currently open tiddlers (see [[PermaView]])
+*You can grab tiddlers from ~TiddlyWikis that others have published online by clicking on a link to the tiddler within their file, and then dragging and dropping the link into your own file. An import tiddler will appear, and you can click to import the tiddler or tiddlers to your file. (see [[ImportTiddlers]])
 * You can [[share a Dropbox link to your TiddlyWiki|Sharing a TiddlyWiki on Dropbox]]
-* You can [[export tiddlers|How to export tiddlers]] in a variety of formats including text, static HTML, comma separated values (ie spreadsheet compatible)
+* You can [[export tiddlers|How to export tiddlers]] ({{$:/core/images/export-button}}) in a variety of formats including text, static HTML, comma separated values (ie spreadsheet compatible)
diff --git a/editions/tw5.com/tiddlers/workingwithtw/Using links to navigate.tid b/editions/tw5.com/tiddlers/workingwithtw/Using links to navigate between tiddlers.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/workingwithtw/Using links to navigate.tid
rename to editions/tw5.com/tiddlers/workingwithtw/Using links to navigate between tiddlers.tid
diff --git a/editions/tw5.com/tiddlywiki.info b/editions/tw5.com/tiddlywiki.info
index 703bec3b9..157f8ce80 100644
--- a/editions/tw5.com/tiddlywiki.info
+++ b/editions/tw5.com/tiddlywiki.info
@@ -4,12 +4,12 @@
 		"tiddlywiki/googleanalytics",
 		"tiddlywiki/nodewebkitsaver",
 		"tiddlywiki/browser-sniff",
-		"tiddlywiki/railroad"
+		"tiddlywiki/railroad",
+		"tiddlywiki/evernote"
 	],
 	"themes": [
 		"tiddlywiki/vanilla",
 		"tiddlywiki/snowwhite",
-		"tiddlywiki/nighttime",
 		"tiddlywiki/starlight",
 		"tiddlywiki/seamless",
 		"tiddlywiki/centralised",
@@ -26,6 +26,9 @@
 			"--setfield","[tag[external-text]]","_canonical_uri","$:/core/templates/canonical-uri-external-text","text/plain",
 			"--setfield","[tag[external-image]] [tag[external-text]]","text","","text/plain",
 			"--rendertiddler","$:/core/save/all","index.html","text/plain"],
+		"empty": [
+			"--rendertiddler","$:/editions/tw5.com/download-empty","empty.html","text/plain",
+			"--rendertiddler","$:/editions/tw5.com/download-empty","empty.hta","text/plain"],
 		"encrypted": [
 			"--password", "password",
 			"--rendertiddler", "$:/core/save/all", "encrypted.html", "text/plain",
@@ -37,12 +40,9 @@
 			"--rendertiddler","ReadMe","readme.md","text/html",
 			"--rendertiddler","ReadMeBinFolder","bin/readme.md","text/html",
 			"--rendertiddler","ContributingTemplate","contributing.md","text/html",
-			"--rendertiddler","$:/core/copyright.txt","licenses/copyright.md","text/plain"],
+			"--rendertiddler","$:/core/copyright.txt","license.md","text/plain"],
 		"tw2": [
 			"--rendertiddler","TiddlyWiki2ReadMe","tw2/readme.md","text/html"],
-		"empty": [
-			"--rendertiddler","$:/editions/tw5.com/download-empty","empty.html","text/plain",
-			"--rendertiddler","$:/editions/tw5.com/download-empty","empty.hta","text/plain"],
 		"static": [
 			"--rendertiddler","$:/core/templates/static.template.html","static.html","text/plain",
 			"--rendertiddler","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
diff --git a/editions/zh-Hans/tiddlers/images/green_favicon.ico b/editions/zh-Hans/tiddlers/images/green_favicon.ico
new file mode 100644
index 000000000..06e5f8e80
Binary files /dev/null and b/editions/zh-Hans/tiddlers/images/green_favicon.ico differ
diff --git a/editions/zh-Hans/tiddlers/images/green_favicon.ico.meta b/editions/zh-Hans/tiddlers/images/green_favicon.ico.meta
new file mode 100644
index 000000000..f2e1cfa3c
--- /dev/null
+++ b/editions/zh-Hans/tiddlers/images/green_favicon.ico.meta
@@ -0,0 +1,2 @@
+title: $:/green_favicon.ico
+type: image/x-icon
diff --git a/editions/zh-Hans/tiddlers/language.tid b/editions/zh-Hans/tiddlers/system/language.tid
similarity index 100%
rename from editions/zh-Hans/tiddlers/language.tid
rename to editions/zh-Hans/tiddlers/system/language.tid
diff --git a/editions/zh-Hans/tiddlywiki.info b/editions/zh-Hans/tiddlywiki.info
index f584583ad..9b05c9e26 100644
--- a/editions/zh-Hans/tiddlywiki.info
+++ b/editions/zh-Hans/tiddlywiki.info
@@ -8,26 +8,36 @@
 		"tiddlywiki/starlight",
 		"tiddlywiki/seamless",
 		"tiddlywiki/centralised",
+		"tiddlywiki/tight",
 		"tiddlywiki/readonly"
 	],
 	"languages": [
 		"zh-Hans"
 	],
-    "includeWikis": [
-        {"path": "../tw5.com", "read-only": true}
-    ],
+	"includeWikis": [
+		{"path": "../tw5.com", "read-only": true}
+	],
 	"build": {
 		"index": [
+			"--savetiddlers","[tag[external-image]]","images",
+			"--rendertiddlers","[tag[external-text]]","$:/core/templates/tid-tiddler","text","text/plain",".tid",
+			"--setfield","[tag[external-image]]","_canonical_uri","$:/core/templates/canonical-uri-external-image","text/plain",
+			"--setfield","[tag[external-text]]","_canonical_uri","$:/core/templates/canonical-uri-external-text","text/plain",
+			"--setfield","[tag[external-image]] [tag[external-text]]","text","","text/plain",
 			"--rendertiddler","$:/core/save/all","index.html","text/plain"],
 		"empty": [
 			"--rendertiddler","$:/editions/zh-Hans/download-empty","empty.html","text/plain",
 			"--rendertiddler","$:/editions/zh-Hans/download-empty","empty.hta","text/plain"],
 		"favicon": [
-			"--savetiddler","$:/favicon.ico","favicon.ico"],
+			"--savetiddler","$:/favicon.ico","favicon.ico",
+			"--savetiddler","$:/green_favicon.ico","static/favicon.ico"],
 		"static": [
 			"--rendertiddler","$:/core/templates/static.template.html","static.html","text/plain",
 			"--rendertiddler","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
 			"--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain",
 			"--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"]
+	},
+	"config": {
+		"retain-original-tiddler-path": true
 	}
 }
\ No newline at end of file
diff --git a/editions/zh-Hant/tiddlers/images/green_favicon.ico b/editions/zh-Hant/tiddlers/images/green_favicon.ico
new file mode 100644
index 000000000..06e5f8e80
Binary files /dev/null and b/editions/zh-Hant/tiddlers/images/green_favicon.ico differ
diff --git a/editions/zh-Hant/tiddlers/images/green_favicon.ico.meta b/editions/zh-Hant/tiddlers/images/green_favicon.ico.meta
new file mode 100644
index 000000000..f2e1cfa3c
--- /dev/null
+++ b/editions/zh-Hant/tiddlers/images/green_favicon.ico.meta
@@ -0,0 +1,2 @@
+title: $:/green_favicon.ico
+type: image/x-icon
diff --git a/editions/zh-Hant/tiddlers/language.tid b/editions/zh-Hant/tiddlers/system/language.tid
similarity index 100%
rename from editions/zh-Hant/tiddlers/language.tid
rename to editions/zh-Hant/tiddlers/system/language.tid
diff --git a/editions/zh-Hant/tiddlywiki.info b/editions/zh-Hant/tiddlywiki.info
index 26b4e9d89..37ff75d22 100644
--- a/editions/zh-Hant/tiddlywiki.info
+++ b/editions/zh-Hant/tiddlywiki.info
@@ -8,26 +8,36 @@
 		"tiddlywiki/starlight",
 		"tiddlywiki/seamless",
 		"tiddlywiki/centralised",
+		"tiddlywiki/tight",
 		"tiddlywiki/readonly"
 	],
 	"languages": [
 		"zh-Hant"
 	],
-    "includeWikis": [
-        {"path": "../tw5.com", "read-only": true}
-    ],
+	"includeWikis": [
+		{"path": "../tw5.com", "read-only": true}
+	],
 	"build": {
 		"index": [
+			"--savetiddlers","[tag[external-image]]","images",
+			"--rendertiddlers","[tag[external-text]]","$:/core/templates/tid-tiddler","text","text/plain",".tid",
+			"--setfield","[tag[external-image]]","_canonical_uri","$:/core/templates/canonical-uri-external-image","text/plain",
+			"--setfield","[tag[external-text]]","_canonical_uri","$:/core/templates/canonical-uri-external-text","text/plain",
+			"--setfield","[tag[external-image]] [tag[external-text]]","text","","text/plain",
 			"--rendertiddler","$:/core/save/all","index.html","text/plain"],
 		"empty": [
 			"--rendertiddler","$:/editions/zh-Hant/download-empty","empty.html","text/plain",
 			"--rendertiddler","$:/editions/zh-Hant/download-empty","empty.hta","text/plain"],
 		"favicon": [
-			"--savetiddler","$:/favicon.ico","favicon.ico"],
+			"--savetiddler","$:/favicon.ico","favicon.ico",
+			"--savetiddler","$:/green_favicon.ico","static/favicon.ico"],
 		"static": [
 			"--rendertiddler","$:/core/templates/static.template.html","static.html","text/plain",
 			"--rendertiddler","$:/core/templates/alltiddlers.template.html","alltiddlers.html","text/plain",
 			"--rendertiddlers","[!is[system]]","$:/core/templates/static.tiddler.html","static","text/plain",
 			"--rendertiddler","$:/core/templates/static.template.css","static/static.css","text/plain"]
+	},
+	"config": {
+		"retain-original-tiddler-path": true
 	}
 }
\ No newline at end of file
diff --git a/languages/ca-ES/EditTemplate.multids b/languages/ca-ES/EditTemplate.multids
index faab7be62..5b33e367a 100644
--- a/languages/ca-ES/EditTemplate.multids
+++ b/languages/ca-ES/EditTemplate.multids
@@ -1,10 +1,7 @@
 title: $:/language/EditTemplate/
 
 Body/External/Hint: Aquest és un tiddler extern desat fora del fitxer del TiddlyWiki principal. Podeu editar les etiquetes i camps però no podeu editar directament el seu contingut
-Body/Hint: Useu el [[text wiki|http://tiddlywiki.com/static/WikiText.html]] per afegir format, imagtes, i característiques dinàmiques
 Body/Placeholder: Escribiu el text per aquest tiddler
-Body/Preview/Button/Hide: amaga la previsualització
-Body/Preview/Button/Show: mostra la previsualització
 Field/Remove/Caption: suprimeix el camp
 Field/Remove/Hint: Suprimeix el camp
 Fields/Add/Button: afegeix
diff --git a/languages/ca-ES/Exporters.multids b/languages/ca-ES/Exporters.multids
new file mode 100644
index 000000000..f8e8d656d
--- /dev/null
+++ b/languages/ca-ES/Exporters.multids
@@ -0,0 +1,6 @@
+title: $:/language/Exporters/
+
+CsvFile: Fitxer CSV
+JsonFile: Fitxer JSON
+StaticRiver: HTML estàtic
+TidFile: Fitxer ".tid"
diff --git a/languages/ca-ES/GettingStarted.tid b/languages/ca-ES/GettingStarted.tid
index 711465558..b5f02722b 100644
--- a/languages/ca-ES/GettingStarted.tid
+++ b/languages/ca-ES/GettingStarted.tid
@@ -1,14 +1,17 @@
 title: GettingStarted
 
-Benvingut a TiddlyWiki i a la comunitat TiddlyWiki
+\define lingo-base() $:/language/ControlPanel/Basics/
+Benvingut a ~TiddlyWiki i a la comunitat ~TiddlyWiki
 
-Abans de començar a desar informació important al TiddlyWiki cal que us assegureu que podeu desar els canvis de forma fiable. Veieu els detalls a http://tiddlywiki.com/#GettingStarted
+Abans de començar a desar informació important al ~TiddlyWiki cal que us assegureu que podeu desar els canvis de forma fiable. Veieu els detalls a http://tiddlywiki.com/#GettingStarted
 
-!! Configureu aquest TiddlyWiki
+!! Configureu aquest ~TiddlyWiki
 
- HelloThere
-[[$:/Translators]]
-[[$:/plugins/tiddlywiki/translators/readme]]
+<div class="tc-control-panel">
 
+|<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
+|<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
+|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+</div>
 
-Veieu més opcions al  tauler de control.
+Veieu més opcions al [[tauler de control|$:/ControlPanel]].
diff --git a/languages/ca-ES/Misc.multids b/languages/ca-ES/Misc.multids
index de8095df7..00f23a857 100644
--- a/languages/ca-ES/Misc.multids
+++ b/languages/ca-ES/Misc.multids
@@ -18,10 +18,6 @@ Encryption/PromptSetPassword: Indiqueu una nova contrasenya per aquest TiddlyWik
 Encryption/RepeatPassword: Repetiu la contrasenya
 Encryption/SetPassword: Indiqueu la contrasenya
 Encryption/Username: Usuari
-Exporters/CsvFile: Fitxer CSV
-Exporters/JsonFile: Fitxer JSON
-Exporters/StaticRiver: HTML estàtic
-Exporters/TidFile: Fitxer ".tid"
 InvalidFieldName: Hi ha caràcters il·legals al nom del camp "<$text text=<<fieldName>>/>". Els camps només poden utilitzar minúscules, digits i els caràcters subratllat (`_`), guió (`-`) i punt (`.`)
 MissingTiddler/Hint: Falta el tiddler "<$text text=<<currentTiddler>>/>" - cliqueu {{$:/core/images/edit-button}} per generar-ho
 OfficialPluginLibrary: Biblioteca de connectors de ~TiddlyWiki Oficial
diff --git a/languages/ca-ES/SiteTitle.tid b/languages/ca-ES/SiteTitle.tid
index 97ceffbb4..b9f8506d8 100644
--- a/languages/ca-ES/SiteTitle.tid
+++ b/languages/ca-ES/SiteTitle.tid
@@ -1,3 +1,3 @@
 title: $:/SiteTitle
 
-El meu TiddlyWiki
\ No newline at end of file
+El meu ~TiddlyWiki
\ No newline at end of file
diff --git a/languages/cs-CZ/EditTemplate.multids b/languages/cs-CZ/EditTemplate.multids
index 5b64081af..ab81b5c93 100644
--- a/languages/cs-CZ/EditTemplate.multids
+++ b/languages/cs-CZ/EditTemplate.multids
@@ -1,10 +1,7 @@
 title: $:/language/EditTemplate/
 
 Body/External/Hint: Tohle je externí tiddler uložený mimo hlavní soubor TiddlyWiki. Můžete upravovat štítky a pole, ale nemůžete přímo upravovat samotný obsah
-Body/Hint: Použijte [[wiki text|http://tiddlywiki.com/static/WikiText.html]] pro vložení formátování, obrázků a pod.
 Body/Placeholder: Vložte text...
-Body/Preview/Button/Hide: skrýt náhled
-Body/Preview/Button/Show: náhled
 Field/Remove/Caption: odstranit pole
 Field/Remove/Hint: Odstranit pole
 Fields/Add/Button: přidat
diff --git a/languages/cs-CZ/Exporters.multids b/languages/cs-CZ/Exporters.multids
new file mode 100644
index 000000000..cd5160de1
--- /dev/null
+++ b/languages/cs-CZ/Exporters.multids
@@ -0,0 +1,6 @@
+title: $:/language/Exporters/
+
+CsvFile: CSV soubor
+JsonFile: JSON soubor
+StaticRiver: Tok tiddlerů jako statický HTML soubor
+TidFile: Samostatný tiddler ".tid" soubor
diff --git a/languages/cs-CZ/GettingStarted.tid b/languages/cs-CZ/GettingStarted.tid
index 0c3aa4341..bb5c01ac0 100644
--- a/languages/cs-CZ/GettingStarted.tid
+++ b/languages/cs-CZ/GettingStarted.tid
@@ -1,14 +1,18 @@
 title: GettingStarted
 
-Vítejte v TiddlyWiki a v TiddlyWiki komunitě
+\define lingo-base() $:/language/ControlPanel/Basics/
+Vítejte v ~TiddlyWiki a v ~TiddlyWiki komunitě
 
-Než začnete používat TiddlyWiki pro záznam důležitých informací, je potřeba se přesvědčit, zda lze informace v pořádku uložit na disk
+Než začnete používat ~TiddlyWiki pro záznam důležitých informací, je potřeba se přesvědčit, zda lze informace v pořádku uložit na disk
 Zjistěte více na http://tiddlywiki.com/#GettingStarted
 
-!! Nastavte si tutos TiddlyWiki
+!! Nastavte si tutos ~TiddlyWiki
 
-| | |
-| | |
-| | [list[$:/StoryList]] |
+<div class="tc-control-panel">
 
-V sekci control panel najdete další nastavení
+|<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
+|<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
+|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+</div>
+
+V sekci [[control panel|$:/ControlPanel]] najdete další nastavení
diff --git a/languages/cs-CZ/Misc.multids b/languages/cs-CZ/Misc.multids
index 3619bdb57..0111f81f0 100644
--- a/languages/cs-CZ/Misc.multids
+++ b/languages/cs-CZ/Misc.multids
@@ -12,10 +12,6 @@ DefaultNewTiddlerTitle: Nový Tiddler
 DropMessage: Zde pusťte (nebo zmáčknutím Esc zrušte)
 Encryption/ConfirmClearPassword: Chcete ztušit heslo? Tím se zruší šifrování této wiki
 Encryption/PromptSetPassword: Nastavte nové heslo pro tuto TiddlyWiki
-Exporters/CsvFile: CSV soubor
-Exporters/JsonFile: JSON soubor
-Exporters/StaticRiver: Tok tiddlerů jako statický HTML soubor
-Exporters/TidFile: Samostatný tiddler ".tid" soubor
 InvalidFieldName: Neplatné znaky v názvu pole "<$text text=<<fieldName>>/>". Název může obsahovat pouze malá písmena, čísla, podtržítko (`_`), pomlčku (`-`) a tečku (`.`)
 MissingTiddler/Hint: Chybějící tiddler "<$text text=<<currentTiddler>>/>" - klikněte na {{$:/core/images/edit-button}} pro jeho vytvoření
 RecentChanges/DateFormat: DD. MM. YYYY
diff --git a/languages/cs-CZ/SiteTitle.tid b/languages/cs-CZ/SiteTitle.tid
index d647d1161..61d41fc91 100644
--- a/languages/cs-CZ/SiteTitle.tid
+++ b/languages/cs-CZ/SiteTitle.tid
@@ -1,3 +1,3 @@
 title: $:/SiteTitle
 
-Moje TiddlyWiki
\ No newline at end of file
+Moje ~TiddlyWiki
\ No newline at end of file
diff --git a/languages/da-DK/Buttons.multids b/languages/da-DK/Buttons.multids
index 4c7b13422..987ca718b 100644
--- a/languages/da-DK/Buttons.multids
+++ b/languages/da-DK/Buttons.multids
@@ -2,8 +2,12 @@ title: $:/language/Buttons/
 
 AdvancedSearch/Caption: avanceret søgning
 AdvancedSearch/Hint: Avanceret søgning
+Bold/Caption: fed
+Bold/Hint: Føj fed formatering til udvalgte
 Cancel/Caption: fortryd
 Cancel/Hint: Fortryd redigering af denne tiddler
+Clear/Caption: tøm
+Clear/Hint: Erstat billede med solid farve
 Clone/Caption: klon
 Clone/Hint: Klon denne tiddler
 Close/Caption: luk
@@ -18,18 +22,33 @@ Delete/Caption: slet
 Delete/Hint: Slet denne tiddler
 Edit/Caption: redigér
 Edit/Hint: Redigér denne tiddler
+EditorHeight/Caption: editor højde
+EditorHeight/Caption/Auto: Automatisk tilpasning af højde til indhold
+EditorHeight/Caption/Fixed: Fixeret højde
+EditorHeight/Hint: Vælg højde på tekst editor
 Encryption/Caption: kryptering
 Encryption/ClearPassword/Caption: slet kodeord
 Encryption/ClearPassword/Hint: Slet kodeord og gem denne wiki uden kryptering
 Encryption/Hint: Angiv eller slet et kodeord for at gemme denne wiki
 Encryption/SetPassword/Caption: Angiv kodeord
 Encryption/SetPassword/Hint: Angiv et kodeord for gemme denne wiki i krypteret tilstand
+Excise/Caption: klip
+Excise/Caption/Excise: Udfør klip
+Excise/Caption/MacroName: Makro navn:
+Excise/Caption/NewTitle: Titel på ny tiddler:
+Excise/Caption/Replace: Erstat udklippet tekst med:
+Excise/Caption/Replace/Macro: makro
+Excise/Caption/Replace/Transclusion: transklusion
+Excise/Caption/Tag: Tag ny tiddler med titlen på denne tiddler
+Excise/Caption/TiddlerExists: Advarsel: tiddler eksister allerede
+Excise/Hint: Klip udvalgt tekst til en ny tiddler
 ExportPage/Caption: eksportér alle
 ExportPage/Hint: Eksportér alle tiddlere
 ExportTiddler/Caption: eksportér tiddler
 ExportTiddler/Hint: Eksportér tiddler
 ExportTiddlers/Caption: eksportér tiddlere
 ExportTiddlers/Hint: Eksportér tiddlere
+Fold/FoldBar/Hint: Valgfri bars til fold og udfold af tiddlere
 Fold/Hint: Fold denne tiddlers krop
 FoldAll/Caption: fold alle tiddlere
 FoldAll/Hint: Fold kroppen i alle åbne tiddlere
@@ -37,6 +56,18 @@ FoldOthers/Caption: fold andre tiddlere
 FoldOthers/Hint: Fold kroppen i andre åbne tiddlere
 FullScreen/Caption: fuldskærm
 FullScreen/Hint: Gå til eller forlad fuldskærmstilstand
+Heading1/Caption: overskrift 1
+Heading1/Hint: Føj overskrift niveau 1 formatering til linier indeholdende udvalgte
+Heading2/Caption: overskrift 2
+Heading2/Hint: Føj overskrift niveau 2 formatering til linier indeholdende udvalgte
+Heading3/Caption: overskrift 3
+Heading3/Hint: Føj overskrift niveau 3 formatering til linier indeholdende udvalgte
+Heading4/Caption: overskrift 4
+Heading4/Hint: Føj overskrift niveau 4 formatering til linier indeholdende udvalgte
+Heading5/Caption: overskrift 5
+Heading5/Hint: Føj overskrift niveau 5 formatering til linier indeholdende udvalgte
+Heading6/Caption: overskrift 6
+Heading6/Hint: Føj overskrift niveau 6 formatering til linier indeholdende udvalgte
 Help/Caption: hjælp
 Help/Hint: Vis hjælpepanel
 HideSideBar/Caption: skjul sidebar
@@ -47,25 +78,52 @@ Import/Caption: importér
 Import/Hint: Importér filer
 Info/Caption: info
 Info/Hint: Vis information om denne tiddler
+Italic/Caption: kursiv
+Italic/Hint: Føj kursiv formatering til udvalgte
 Language/Caption: sprog
 Language/Hint: Vælg brugerfladesprog
+LineWidth/Caption: linie tykkelse
+LineWidth/Hint: Sæt linie tykkelse til maling
+ListBullet/Caption: punkt liste
+ListBullet/Hint: Føj punkt liste formatering til linier indeholdende udvalgte
+ListNumber/Caption: nummereret liste
+ListNumber/Hint: Føj nummereret liste formatering til linier indeholdende udvalgte
+MonoBlock/Caption: monospaced blok
+MonoBlock/Hint: Føj monospaced blok formatering til linier indeholdende udvalgte
+MonoLine/Hint: Føj monospaced bogstav formatering til udvalgte
 More/Caption: mere
 More/Hint: Flere muligheder
 NewHere/Caption: ny her
 NewHere/Hint: Opret en ny tiddler tagget med denne tiddlers titel
+NewImage/Caption: nyt billede
+NewImage/Hint: Opret en ny billed tiddler
 NewJournal/Caption: ny journal
 NewJournal/Hint: Opret en ny journaltiddler
 NewJournalHere/Caption: ny journal her
-NewJournalHere/Hint: opret en ny journaltiddler tagget med denne tiddlers titel
+NewJournalHere/Hint: Opret en ny journaltiddler tagget med denne tiddlers titel
+NewMarkdown/Caption: ny Markdown tiddler
+NewMarkdown/Hint: Opret en ny Markdown tiddler
 NewTiddler/Caption: ny tiddler
 NewTiddler/Hint: Opret en ny tiddler
+Opacity/Caption: gennemsigtighed
+Opacity/Hint: Sæt gennemsigtighed af maling
 OpenWindow/Caption: Åben i nyt vindue
 OpenWindow/Hint: Åbn tiddler i nyt vindue
+Paint/Caption: male farve
+Paint/Hint: Sæt male farve
 Palette/Hint: Vælg farve palette
 Permalink/Caption: permalink
 Permalink/Hint: Sæt browserens adresselinie til et direkte link til denne tiddler
 Permaview/Caption: permaview
 Permaview/Hint: Sæt browserens adresselinie til et direkte link til alle tiddlere i denne historie
+Picture/Caption: billede
+Picture/Hint: Indsæt billede
+Preview/Caption: forhåndsvisning
+Preview/Hint: Vis forhåndsvisnings panel
+PreviewType/Caption: forhåndsvisnings type
+PreviewType/Hint: Vælg forhåndsvisnings type
+Quote/Caption: Citat
+Quote/Hint: Føj citat tekst formatering til linier indeholdende udvalgte
 Refresh/Caption: genopfrisk
 Refresh/Hint: Udfør en fuld genopfriskning af wiki'en
 Save/Caption: gem
@@ -74,12 +132,28 @@ SaveWiki/Caption: gem ændringer
 SaveWiki/Hint: Gem ændringer
 ShowSideBar/Caption: vis sidepanel
 ShowSideBar/Hint: Vis sidepanel
+Size/Caption: billed størrelse
+Size/Caption/Height: Højde:
+Size/Caption/Resize: Ændre billed størrelse
+Size/Caption/Width: Bredde:
+Size/Hint: Sæt billed størrelse
+Stamp/Caption: stempel
+Stamp/Caption/New: Tilføj dit eget
+Stamp/Hint: Indsæt et prækonfiguret klip med tekst
+Stamp/New/Text: Tekst i klippet. (Husk at skrive en beskrivende titel i caption feltet).
+Stamp/New/Title: Navn som vist i menu
 StoryView/Caption: historieVisning
 StoryView/Hint: Vælg historievisning
+Strikethrough/Caption: gennemstregning
+Strikethrough/Hint: Føj gennemstregnings formatering til udvalgte
+Subscript/Hint: Føj subscript formatering til udvalgte
+Superscript/Hint: Føj superscript formatering til udvalgte
 TagManager/Caption: tagadministrator
 TagManager/Hint: Åbn tagadministrator
 Theme/Caption: tema
 Theme/Hint: Vælg visningstema
+Underline/Caption: understregning
+Underline/Hint: Føj understregnings formatering til udvalgte
 Unfold/Caption: udfold tiddler
 Unfold/Hint: Udfold denne tiddlers krop
 UnfoldAll/Caption: udfold alle tiddlere
diff --git a/languages/da-DK/ControlPanel.multids b/languages/da-DK/ControlPanel.multids
index e41429878..22111eb5b 100644
--- a/languages/da-DK/ControlPanel.multids
+++ b/languages/da-DK/ControlPanel.multids
@@ -27,6 +27,19 @@ EditorTypes/Hint: Disse tiddlere bestemmer hvilken editor der bruges til at redi
 EditorTypes/Type/Caption: Type
 Info/Caption: Info
 Info/Hint: Information om denne TiddlyWiki
+KeyboardShortcuts/Add/Caption: Tilføj genvej
+KeyboardShortcuts/Add/Prompt: Skriv genvej her
+KeyboardShortcuts/Caption: Tastatur genveje
+KeyboardShortcuts/Hint: Administrér tastatur genvejs tilknytninger
+KeyboardShortcuts/NoShortcuts/Caption: Ingen tastatur genveje tilknyttet
+KeyboardShortcuts/Platform/All: Alle platforme
+KeyboardShortcuts/Platform/Linux: Linux platform udelukkende
+KeyboardShortcuts/Platform/Mac: Macintosh platform udelukkende
+KeyboardShortcuts/Platform/NonLinux: Ikke-Linux platforme udelukkende
+KeyboardShortcuts/Platform/NonMac: Ikke-Macintosh platforme udelukkende
+KeyboardShortcuts/Platform/NonWindows: Ikke-Windows platforme udelukkende
+KeyboardShortcuts/Platform/Windows: Windows platform udelukkende
+KeyboardShortcuts/Remove/Hint: fjern tastatur genvej
 LoadedModules/Caption: Indlæste moduler
 LoadedModules/Hint: Dette er de aktuelt indlæste tiddlermoduler der linkes til deres kildetiddlere. Alle moduler med kursiv mangler en kildetiddler, typisk fordi de blev sat op under bootprocessen.
 Palette/Caption: Palette
@@ -44,6 +57,7 @@ Parsing/Inline/Caption: Inline Parse regler
 Parsing/Pragma/Caption: Pragma Parse regler
 Plugins/Add/Caption: Få flere udvidelser
 Plugins/Add/Hint: Installér udvidelser fra det officielle bibliotek
+Plugins/AlreadyInstalled/Hint: Dette plugin er allerede installeret i version <$text text=<<installedVersion>>/>
 Plugins/Caption: Udvidelser
 Plugins/Disable/Caption: slå fra
 Plugins/Disable/Hint: Slå denne udvidelse fra, når siden genindlæses
@@ -51,13 +65,18 @@ Plugins/Disabled/Status: (slået fra)
 Plugins/Empty/Hint: Ingen
 Plugins/Enable/Caption: Slå til
 Plugins/Enable/Hint: Slå denne udvidelse til, når siden genindlæses
+Plugins/Install/Caption: installér
 Plugins/Installed/Hint: Aktuelt installerede udvidelser:
 Plugins/Language/Prompt: Sprog
 Plugins/Languages/Caption: Sprog
 Plugins/Languages/Hint: Sprogpakkeudvidelser
+Plugins/NoInformation/Hint: Ingen information leveret
+Plugins/NotInstalled/Hint: Dette plugin er ikke aktuelt installeret
+Plugins/OpenPluginLibrary: Åbn plugin bibliotek
 Plugins/Plugin/Prompt: Udvidelser 
 Plugins/Plugins/Caption: Udvidelser
 Plugins/Plugins/Hint: Udvidelser
+Plugins/Reinstall/Caption: geninstallér
 Plugins/Theme/Prompt: Temaer
 Plugins/Themes/Caption: Temaer
 Plugins/Themes/Hint: Tema udvidelser
@@ -91,6 +110,8 @@ Settings/LinkToBehaviour/OpenAtBottom: Åbn i bunden af story river
 Settings/LinkToBehaviour/OpenAtTop: Åbn i toppen af story river
 Settings/LinkToBehaviour/OpenBelow: Åbn nedenunder den aktuelle tiddler
 Settings/LinkToBehaviour/OutsideRiver/Hint: Navigation fra //udenfor// the story river
+Settings/MissingLinks/Description: Tillad links til manglende tiddlere
+Settings/MissingLinks/Hint: Vælg om der skal linkes til tiddlere som ikke eksisterer endnu
 Settings/NavigationAddressBar/Caption: Navigationsadressefelt
 Settings/NavigationAddressBar/Hint: Opførsel i browserens adresssefelt ved navigering til en tiddler:
 Settings/NavigationAddressBar/No/Description: Opdatér ikke adressefeltet
@@ -100,6 +121,9 @@ Settings/NavigationHistory/Caption: Navigationshistorie
 Settings/NavigationHistory/Hint: Opdatér browserhistorikken, når der navigeres til en tiddler:
 Settings/NavigationHistory/No/Description: Opdatér ikke historie
 Settings/NavigationHistory/Yes/Description: Opdatér historik
+Settings/PerformanceInstrumentation/Caption: Ydelses instrumentering
+Settings/PerformanceInstrumentation/Description: Tillad ydelses instrumentering
+Settings/PerformanceInstrumentation/Hint: Viser ydelses statistikker i browserens udvikler konsol. Kræver genindlæsning for at få effekt
 Settings/TitleLinks/Caption: Tiddler titler
 Settings/TitleLinks/Hint: Valgfri visning af tiddler tiddler som links
 Settings/TitleLinks/No/Description: Vis ikke tiddler titler som links
@@ -120,6 +144,8 @@ Theme/Prompt: Aktuelt tema
 TiddlerFields/Caption: Tiddler felter
 TiddlerFields/Hint: Dette er alle de TiddlerFelter der er i brug i denne wiki (inklusive systemtiddlere men eksklusive skyggetiddlere).
 Toolbars/Caption: Værktøjslinier
+Toolbars/EditorToolbar/Caption: Editor værktøjslinie
+Toolbars/EditorToolbar/Hint: Vælg hvilke knapper der vises i editorens værktøjslinie. Bemærk at nogen knapper kun vises, når der redigeres tiddlere af en bestemt type
 Toolbars/EditToolbar/Caption: Redigeringsværktøjslinie
 Toolbars/EditToolbar/Hint: Vælg hvilke knapper der vises i tiddlere i redigeringstilstand
 Toolbars/Hint: Vælg hvilke værktøjslinieknapper der vises
diff --git a/languages/da-DK/CoreReadMe.tid b/languages/da-DK/CoreReadMe.tid
index cd4b97d66..8d82ef96f 100644
--- a/languages/da-DK/CoreReadMe.tid
+++ b/languages/da-DK/CoreReadMe.tid
@@ -1,3 +1,2 @@
-title: $:/core/da-DK/readme
+title: $:/core/readme
 
-Dette plugin indeholder TiddlyWiki's kerne komponenter, besgtående af: * JavaScript code moduler* Ikoner* Templates som er nødvendige for at oprette TiddlyWiki's brugerflade * British English (en-GB) oversættelser af de lokaliserbare strenge som bruges af kernen
\ No newline at end of file
diff --git a/languages/da-DK/Docs/PaletteColours.multids b/languages/da-DK/Docs/PaletteColours.multids
index 52bcb94dd..71ee34ebe 100644
--- a/languages/da-DK/Docs/PaletteColours.multids
+++ b/languages/da-DK/Docs/PaletteColours.multids
@@ -61,6 +61,7 @@ sidebar-tab-foreground: Sidepanelets fane forgrund
 sidebar-tab-foreground-selected: Sidepanelets fane forgrund for valgte faner
 sidebar-tiddler-link-foreground: Sidepanelets tiddler link forgrund
 sidebar-tiddler-link-foreground-hover: Sidepanelets tiddler link forgrund når der peges
+site-title-foreground: Side titel forgrund
 static-alert-foreground: Statisk advarsel forgrund
 tab-background: Fanebaggrund
 tab-background-selected: Fanebaggrund for valgte faner
diff --git a/languages/da-DK/EditTemplate.multids b/languages/da-DK/EditTemplate.multids
index 6ce4ae025..e51df0060 100644
--- a/languages/da-DK/EditTemplate.multids
+++ b/languages/da-DK/EditTemplate.multids
@@ -1,10 +1,7 @@
 title: $:/language/EditTemplate/
 
 Body/External/Hint: Dette er en indlejret tiddler hentet fra et eksternt tiddlywikidokument. Du kan redigere tags og felter men kan ikke direkte redigere selve  indholdet
-Body/Hint: Brug [[wiki text|http://tiddlywiki.com/static/WikiText.html]] til at tilføje formatering, billeder og dynamiske egenskaber
 Body/Placeholder: Skriv denne tiddlers tekst
-Body/Preview/Button/Hide: skjul forhåndsvisning
-Body/Preview/Button/Show: vis forhåndsvisning
 Field/Remove/Caption: fjern felt
 Field/Remove/Hint: Fjern felt
 Fields/Add/Button: tilføj
@@ -19,6 +16,7 @@ Tags/Add/Button: tilføj
 Tags/Add/Placeholder: tagnavn
 Tags/Dropdown/Caption: tagliste
 Tags/Dropdown/Hint: Vis tagliste
+Title/BadCharacterWarning: Advarsel: undgå alle at bruge nogen af disse bogstaver <<bad-chars>> i tiddler titler
 Type/Delete/Caption: slet indholdstype
 Type/Delete/Hint: Slet indholdstype
 Type/Dropdown/Caption: indholdstypeliste
diff --git a/languages/da-DK/Exporters.multids b/languages/da-DK/Exporters.multids
new file mode 100644
index 000000000..28a0198fe
--- /dev/null
+++ b/languages/da-DK/Exporters.multids
@@ -0,0 +1,6 @@
+title: $:/language/Exporters/
+
+CsvFile: CSV tiddler fil
+JsonFile: JSON tiddler fil
+StaticRiver: Statiske HTML tiddlere
+TidFile: Enkelt tiddler ".tid" fil
diff --git a/languages/da-DK/GettingStarted.tid b/languages/da-DK/GettingStarted.tid
index 0a1b11df1..53575ea65 100644
--- a/languages/da-DK/GettingStarted.tid
+++ b/languages/da-DK/GettingStarted.tid
@@ -1,15 +1,17 @@
 title: GettingStarted
 
-Velkommen til TiddlyWiki og TiddlyWiki fællesskabet
+\define lingo-base() $:/language/ControlPanel/Basics/
+Velkommen til ~TiddlyWiki og ~TiddlyWiki fællesskabet
 
-Før du begynder at lagre vigtige informationer i TiddlyWiki er det vigtigt, at du sikrer dig, at du på pålidelig måde kan gemme ændringer. Se http://tiddlywiki.com/#GettingStarted for detaljer
+Før du begynder at lagre vigtige informationer i ~TiddlyWiki er det vigtigt, at du sikrer dig, at du på pålidelig måde kan gemme ændringer. Se http://tiddlywiki.com/#GettingStarted for detaljer
 
-!! Opsæt denne TiddlyWiki
+!! Opsæt denne ~TiddlyWiki
 
- HelloThere
-[[$:/Translators]]
-[[$:/plugins/tiddlywiki/translators/readme]]
+<div class="tc-control-panel">
 
+|<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
+|<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
+|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+</div>
 
-Se kontrol panel for flere muligheder.
-
+Se [[kontrol panel|$:/ControlPanel]] for flere muligheder.
diff --git a/languages/da-DK/Import.multids b/languages/da-DK/Import.multids
index 76576e3c2..bf79eca00 100644
--- a/languages/da-DK/Import.multids
+++ b/languages/da-DK/Import.multids
@@ -1,5 +1,6 @@
 title: $:/language/Import/
 
+Imported/Hint:  Følgende tiddlere blev importeret:
 Listing/Cancel/Caption: Fortryd
 Listing/Hint: Disse tiddlere er klar til import:
 Listing/Import/Caption: Importér
diff --git a/languages/da-DK/Misc.multids b/languages/da-DK/Misc.multids
index 7dce9bc79..b58315767 100644
--- a/languages/da-DK/Misc.multids
+++ b/languages/da-DK/Misc.multids
@@ -9,6 +9,7 @@ ConfirmCancelTiddler: Ønsker du at fortryde ændringer til denne tiddler "<$tex
 ConfirmDeleteTiddler: Ønsker du at slette denne tiddler "<$text text=<<title>>/>"?
 ConfirmEditShadowTiddler: Du skal til at redigere en skyggetiddler. Enhver ændring vil overskrive standardsystemet og gøre fremtidige opgraderinger mere besværlige. Er du sikker på, du ønsker at redigere "<$text text=<<title>>/>"?
 ConfirmOverwriteTiddler: Ønsker du at overskrive tiddleren "<$text text=<<title>>/>"?
+Count: tæl
 DefaultNewTiddlerTitle: Ny tiddler
 DropMessage: Slip her (eller klik escape for at fortryde)
 Encryption/Cancel: Fortryd
@@ -19,10 +20,8 @@ Encryption/PromptSetPassword: Angiv et nyt kodeord for denne ~TiddlyWiki
 Encryption/RepeatPassword: Gentag kodeord
 Encryption/SetPassword: Angiv kodeord
 Encryption/Username: Brugernavn
-Exporters/CsvFile: CSV tiddler fil
-Exporters/JsonFile: JSON tiddler fil
-Exporters/StaticRiver: Statiske HTML tiddlere
-Exporters/TidFile: Enkelt tiddler ".tid" fil
+InternalJavaScriptError/Hint: Oh, dette er pinligt. Det anbefales at du genstarter TiddlyWiki ved at opfriske din browser
+InternalJavaScriptError/Title: Intern JavaScript fejl
 InvalidFieldName: Illegale tegn i felt navn "<$text text=<<fieldName>>/>". Felter kan kun indeholde små bogstaver, tal og tegnene undersstreg (`_`), bindestreg (`-`) og punktum (`.`)
 LazyLoadingWarning: <p>indlæser ekstern tekst fra ''<$text text={{!!_canonical_uri}}/>''</p><p>Hvis denne besked ikke forsvinder, bruger du måske en browser, som ikke understøtter ekstern tekst i denne konfiguration. Se http://tiddlywiki.com/#ExternalText</p>
 MissingTiddler/Hint: Manglende tiddler "<$text text=<<currentTiddler>>/>" - klik {{$:/core/images/edit-button}} for at oprette den.
diff --git a/languages/da-DK/Search.multids b/languages/da-DK/Search.multids
index efa0bb642..3ee965b5c 100644
--- a/languages/da-DK/Search.multids
+++ b/languages/da-DK/Search.multids
@@ -5,6 +5,9 @@ Filter/Caption: Filter
 Filter/Hint: Søg med et [[filterudtryk|http://tiddlywiki.com/static/Filters.html]]
 Filter/Matches: //<small><<resultCount>> træffere</small>//
 Matches: //<small><<resultCount>> træffere</small>//
+Matches/All: Alle træffere:
+Matches/Title: Titel træffere:
+Search: Søg
 Shadows/Caption: Skygger
 Shadows/Hint: Søg i skyggetiddlere
 Shadows/Matches: //<small><<resultCount>> træffere</small>//
diff --git a/languages/da-DK/SiteTitle.tid b/languages/da-DK/SiteTitle.tid
index 4bbb2bea6..98e1de35d 100644
--- a/languages/da-DK/SiteTitle.tid
+++ b/languages/da-DK/SiteTitle.tid
@@ -1,3 +1,3 @@
 title: $:/SiteTitle
 
-Min TiddlyWiki
\ No newline at end of file
+Min ~TiddlyWiki
\ No newline at end of file
diff --git a/languages/da-DK/Snippets/ListByTag.tid b/languages/da-DK/Snippets/ListByTag.tid
new file mode 100644
index 000000000..28f09d3d8
--- /dev/null
+++ b/languages/da-DK/Snippets/ListByTag.tid
@@ -0,0 +1,5 @@
+title: $:/language/Snippets/ListByTag
+tags: $:/tags/TextEditor/Snippet
+caption: List tiddlere efter tag
+
+<<list-links "[tag[task]sort[title]]">>
diff --git a/languages/da-DK/Snippets/MacroDefinition.tid b/languages/da-DK/Snippets/MacroDefinition.tid
new file mode 100644
index 000000000..a557af6bf
--- /dev/null
+++ b/languages/da-DK/Snippets/MacroDefinition.tid
@@ -0,0 +1,7 @@
+title: $:/language/Snippets/MacroDefinition
+tags: $:/tags/TextEditor/Snippet
+caption: Makro definition
+
+\define macroName(param1:"default value",param2)
+Makroens tekst
+\end
diff --git a/languages/da-DK/Snippets/Table4x3.tid b/languages/da-DK/Snippets/Table4x3.tid
new file mode 100644
index 000000000..4c9367152
--- /dev/null
+++ b/languages/da-DK/Snippets/Table4x3.tid
@@ -0,0 +1,8 @@
+title: $:/language/Snippets/Table4x3
+tags: $:/tags/TextEditor/Snippet
+caption: Tabel med 4 kolonner og 3 rækker
+
+|! |!Alpha |!Beta |!Gamma |!Delta |
+|!En | | | | |
+|!To | | | | |
+|!Tre | | | | |
diff --git a/languages/da-DK/Snippets/TableOfContents.tid b/languages/da-DK/Snippets/TableOfContents.tid
new file mode 100644
index 000000000..3787e14ff
--- /dev/null
+++ b/languages/da-DK/Snippets/TableOfContents.tid
@@ -0,0 +1,9 @@
+title: $:/language/Snippets/TableOfContents
+tags: $:/tags/TextEditor/Snippet
+caption: Indholdsfortegnelse
+
+<div class="tc-table-of-contents">
+
+<<toc-selective-expandable 'TableOfContents'>>
+
+</div>
\ No newline at end of file
diff --git a/languages/de-DE/Buttons.multids b/languages/de-DE/Buttons.multids
index 14256d43e..9fc6b6bdc 100644
--- a/languages/de-DE/Buttons.multids
+++ b/languages/de-DE/Buttons.multids
@@ -43,7 +43,7 @@ FoldAll/Hint: Ausblenden der Textbereiche aller Tiddler
 UnfoldAll/Caption: Einblenden aller Textbereiche
 UnfoldAll/Hint: Einblenden der Textbereiche aller Tiddler
 FullScreen/Caption: Vollbild
-FullScreen/Hint: Aktivieren oder deaktivieren des Vollbild-Modus
+FullScreen/Hint: Aktivieren oder Deaktivieren des Vollbild-Modus
 Help/Caption: Hilfe
 Help/Hint: Hilfe anzeigen
 Import/Caption: Import
@@ -57,11 +57,15 @@ Language/Hint: Auswahldialog für die Systemsprache
 More/Caption: mehr
 More/Hint: Weitere Aktionen
 NewHere/Caption: Neu hier
-NewHere/Hint: Erstelle einen neuen Tiddler der mit diesem getaggt ist
+NewHere/Hint: Erstelle einen neuen Tiddler, der mit dem Namen dieses Tiddlers getaggt ist
 NewJournal/Caption: Neues Journal
 NewJournal/Hint: Erstelle einen neuen Journal-Tiddler
 NewJournalHere/Caption: Neues Journal hier
 NewJournalHere/Hint: Erstelle ein neues Journal der mit diesem getaggt ist
+NewImage/Caption: Neues Bild
+NewImage/Hint: Erstelle ein neues Bild
+NewMarkdown/Caption: Neuer Markdown Tiddler
+NewMarkdown/Hint: Erstelle einen neuen "Markdown" Tiddler
 NewTiddler/Caption: Neuer Tiddler
 NewTiddler/Hint: Erstelle einen neuen Tiddler
 OpenWindow/Caption: Öffne in neuem Fenster
@@ -71,7 +75,7 @@ Palette/Hint: Wähle eine Farbpalette
 Permalink/Caption: Permalink
 Permalink/Hint: Die Adressleiste des Browsers enthält einen Link zu diesem Tiddler
 Permaview/Caption: Permaview
-Permaview/Hint: Die Adressleiste des Browsers enthält einen Link zu allen offenen Tiddlern in dieser [[Story]]
+Permaview/Hint: Die Adressleiste des Browsers enthält einen Link zu allen offenen Tiddlern in dieser Story
 Refresh/Caption: Aktualisieren
 Refresh/Hint: Die Seite wird neu in den Browser geladen
 Save/Caption: Fertig
@@ -79,7 +83,7 @@ Save/Hint: Änderungen für diesen Tiddler bestätigen
 SaveWiki/Caption: Speichern
 SaveWiki/Hint: Das Wiki speichern
 StoryView/Caption: Story-Modus
-StoryView/Hint: Auswahl des Anzeigemodus für die [[Story]]
+StoryView/Hint: Auswahl des Anzeigemodus für die Story
 HideSideBar/Caption: Sidebar ausblenden
 HideSideBar/Hint: Sidebar ausblenden
 ShowSideBar/Caption: Sidebar einblenden
@@ -88,3 +92,79 @@ TagManager/Caption: Tag-Manager
 TagManager/Hint: Öffne den Tag-Manager
 Theme/Caption: Theme
 Theme/Hint: Theme auswählen
+Bold/Caption: Fett
+Bold/Hint: Ausgewählten Text fett darstellen
+Clear/Caption: Löschen
+Clear/Hint: Bild mit Hintergrund Farbe löschen
+EditorHeight/Caption: Editor Höhe
+EditorHeight/Caption/Auto: Editor Höhe an Inhalt anpassen
+EditorHeight/Caption/Fixed: Fixe Höhe:
+EditorHeight/Hint: Wählen Sie die Höhe des Editors
+Excise/Caption: Verschieben
+Excise/Caption/Excise: Text verschieben
+Excise/Caption/MacroName: Makro Name:
+Excise/Caption/NewTitle: Titel des neuen Tiddlers:
+Excise/Caption/Replace: Ersetze den verschobenen Text mit:
+Excise/Caption/Replace/Macro: Makro
+Excise/Caption/Replace/Link: Link
+Excise/Caption/Replace/Transclusion: Transklusion
+Excise/Caption/Tag: Tagge den neuen Tiddler mit dem Titel des aktuellen Tiddlers
+Excise/Caption/TiddlerExists: Warnung: Tiddler existiert bereits!
+Excise/Hint: Verschiebe den ausgewählten Text in einen neuen Tiddler
+Heading1/Caption: Überschrift 1
+Heading1/Hint: Überschrift 1 auf die Zeilen anwenden, die eine Auswahl enthalten
+Heading2/Caption: Überschrift 2
+Heading2/Hint: Überschrift 2 auf die Zeilen anwenden, die eine Auswahl enthalten
+Heading3/Caption: Überschrift 3
+Heading3/Hint: Überschrift 3 auf die Zeilen anwenden, die eine Auswahl enthalten
+Heading4/Caption: Überschrift 4
+Heading4/Hint: Überschrift 4 auf die Zeilen anwenden, die eine Auswahl enthalten
+Heading5/Caption: Überschrift 5
+Heading5/Hint: Überschrift 5 auf die Zeilen anwenden, die eine Auswahl enthalten
+Heading6/Caption: Überschrift 6
+Heading6/Hint: Überschrift 6 auf die Zeilen anwenden, die eine Auswahl enthalten
+Italic/Caption: Kursiv
+Italic/Hint: Kursiv auf den selektierten Text anwenden
+LineWidth/Caption: Zeilen Länge
+LineWidth/Hint: Wählen Sie die Zeilenlänge
+Link/Caption: Link
+Link/Hint: Erstellt einen Wiki-Link
+ListBullet/Caption: Punkteliste
+ListBullet/Hint: Zeilen, die eine Markierung enthalten, werden als Punkteliste formatiert
+ListNumber/Caption: Aufzählungsliste
+ListNumber/Hint: Zeilen, die eine Markierung enthalten, werden als Auzählungsliste formatiert
+MonoBlock/Caption: Dicktengleicher Textblock
+MonoBlock/Hint: Alle Zeilen die eine Markierung enthalten, werden als Textblock mit einer dicktengleichen Schrift formatiert
+MonoLine/Caption: Dicktengleich
+MonoLine/Hint: Alle markierten Zeichen werden mit einer dicktengleichen Schrift formatiert
+Opacity/Caption: Transparenz
+Opacity/Hint: Wählen sie die Transparenz
+Paint/Caption: Malfarbe
+Paint/Hint: Wählen Sie die Malfarbe
+Picture/Caption: Bild
+Picture/Hint: Bild einfügen
+Preview/Caption: Vorschau
+Preview/Hint: Vorschau einblenden
+PreviewType/Caption: Vorschau Typ
+PreviewType/Hint: Wählen Sie den Vorschau Typ
+Quote/Caption: Zitat
+Quote/Hint: Alle Zeilen, die eine Markierung enthalten werden als Referenz/Zitat formatiert
+Size/Caption: Bildgröße
+Size/Caption/Height: Höhe:
+Size/Caption/Resize: Bildgröße ändern
+Size/Caption/Width: Weite:
+Size/Hint: Bildweite ändern
+Stamp/Caption: Stempel
+Stamp/Caption/New: Eigenen Stempel erstellen
+Stamp/Hint: Textschnipsel hier einfügen
+Stamp/New/Title: Name, der im Menü angezeigt werden soll
+Stamp/New/Text: Text des Schnipsels. (Nicher vergessen eine aussagekräftigen Titel zu verwenden)
+Strikethrough/Caption: Durchgestrichen
+Strikethrough/Hint: Ausgewählten Text durchgestrichen darstgellen
+Subscript/Caption: Tiefsgestellt
+Subscript/Hint: Ausgewählten Text tiefgestellt darstellen
+Superscript/Caption: Hochgestellt
+Superscript/Hint: Ausgewählten Text hochgestellt darstellen
+Underline/Caption: Unterstreichen
+Underline/Hint: Ausgewählten Text unterstrichen darstellen
+
diff --git a/languages/de-DE/ControlPanel.multids b/languages/de-DE/ControlPanel.multids
old mode 100755
new mode 100644
index d96cf786b..549fb855d
--- a/languages/de-DE/ControlPanel.multids
+++ b/languages/de-DE/ControlPanel.multids
@@ -3,15 +3,15 @@ title: $:/language/ControlPanel/
 Advanced/Caption: Erweitert
 Advanced/Hint: Interne Informationen über dieses ~TiddlyWiki.
 Appearance/Caption: Design
-Appearance/Hint: Möglichkeiten um das Aussehen Ihres ~TiddlyWiki's anzupassen.
+Appearance/Hint: Möglichkeiten um das Aussehen Ihres ~TiddlyWikis anzupassen.
 Basics/AnimDuration/Prompt: Dauer der Animation:
 Basics/Caption: Basis
 Basics/DefaultTiddlers/BottomHint: Verwenden Sie &#91;&#91;doppelte eckige Klammern&#93;&#93; für Titel mit Leerzeichen oder wählen Sie <$button set="$:/DefaultTiddlers" setTo="[list[$:/StoryList]]">Offene Tiddler beim Laden wiederherstellen.</$button>
 Basics/DefaultTiddlers/Prompt: Standard-Tiddler:
 Basics/DefaultTiddlers/TopHint: Tiddler, die beim Start geladen werden:
 Basics/Language/Prompt: Hallo! Aktuelle Sprache:
-Basics/NewJournal/Title/Prompt: Titel des neuen Journal-Tiddlers
-Basics/NewJournal/Tags/Prompt: Tags des neuen Journal-Tiddlers
+Basics/NewJournal/Title/Prompt: Titel des neuen Journal-Tiddlers:
+Basics/NewJournal/Tags/Prompt: Tags des neuen Journal-Tiddlers:
 Basics/OverriddenShadowTiddlers/Prompt: Anzahl überschriebener Schatten-Tiddler:
 Basics/ShadowTiddlers/Prompt: Anzahl Schatten-Tiddler:
 Basics/Subtitle/Prompt: Untertitel:
@@ -27,6 +27,19 @@ EditorTypes/Hint: Diese Tiddler definieren, welcher Editor für bestimmte Tiddle
 EditorTypes/Type/Caption: MIME-Type
 Info/Caption: Info
 Info/Hint: Informationen über dieses TiddlyWiki
+KeyboardShortcuts/Add/Prompt: Tastenkürzel hier eingeben
+KeyboardShortcuts/Add/Caption: Tastenkürzel erstellen
+KeyboardShortcuts/Caption: Tastenkürzel
+KeyboardShortcuts/Hint: Tastenkürzel Zuweisungen bearbeiten
+KeyboardShortcuts/NoShortcuts/Caption: Keine Tastenkürzel Zusweisungen vorhanden
+KeyboardShortcuts/Remove/Hint: Löschen eines Tastenkürzels
+KeyboardShortcuts/Platform/All: Alle Plattformen
+KeyboardShortcuts/Platform/Mac: Nur Macintosh
+KeyboardShortcuts/Platform/NonMac: Alle Plattformen, außer Macintosh
+KeyboardShortcuts/Platform/Linux: Nur Linux
+KeyboardShortcuts/Platform/NonLinux: Alle Plattformen, außer Linux
+KeyboardShortcuts/Platform/Windows: Nur Windows
+KeyboardShortcuts/Platform/NonWindows: Alle Plattformen, außer Windows
 LoadedModules/Caption: Geladene Module
 LoadedModules/Hint: Hier werden die geladenen Module und ihre Quelltext-Komponenten angezeigt. Kursiv hervorgehobene Tiddler haben keinen Quelltext. Sie werden während des Boot-Prozesses (Aufrufen des Tiddlywikis) erstellt.
 Palette/Caption: Palette
@@ -45,6 +58,7 @@ Parsing/Inline/Caption: Inline Regeln
 Parsing/Pragma/Caption: Pragma Regeln
 Plugins/Add/Hint: Suche und installiere neue Plugins
 Plugins/Add/Caption: Suche
+Plugins/AlreadyInstalled/Hint: Dieses Plugin ist bereits installiert. Version: <$text text=<<installedVersion>>/>
 Plugins/Caption: Plugins
 Plugins/Disable/Caption: deaktivieren
 Plugins/Disable/Hint: Deaktivieren Sie dieses Plugin beim nächsten Laden der Seite.
@@ -52,29 +66,32 @@ Plugins/Disabled/Status: (deaktiviert)
 Plugins/Empty/Hint: keine
 Plugins/Enable/Caption: aktivieren
 Plugins/Enable/Hint: Aktivieren Sie dieses Plugin beim nächsten Laden der Seite.
-Plugins/Install: installieren
+Plugins/Install/Caption: installieren
 Plugins/Installed/Hint: Momentan installierte Plugins
 Plugins/Languages/Caption: Sprachen
 Plugins/Languages/Hint: Spracherweiterungen
+Plugins/NoInfoFound/Hint: Kein ''"<$text text=<<currentTab>>/>"'' gefunden
+Plugins/NoInformation/Hint: Kein Information vorhanden
+Plugins/NotInstalled/Hint: Dieses Plugin ist momentan nicht installiert
 Plugins/OpenPluginLibrary: Öffne das Plugin-Verzeichnis
 Plugins/Plugins/Caption: Plugins
 Plugins/Plugins/Hint: Erweiterungen
-Plugins/Reinstall: erneut installieren
+Plugins/Reinstall/Caption: erneut installieren
 Plugins/Themes/Caption: Themes
 Plugins/Themes/Hint: Theme Erweiterungen
 Saving/Caption: Speichern
 Saving/Heading: Speichern
 Saving/TiddlySpot/Advanced/Heading: Erweiterte Einstellungen
-Saving/TiddlySpot/BackupDir: "Backup" Verzeichnis
+Saving/TiddlySpot/BackupDir: Verzeichnis für das "Backup"
 Saving/TiddlySpot/Backups: "Backups"
 Saving/TiddlySpot/Description: Diese Einstellungen sind nur für http://tiddlyspot.com und kompatible Server aktiv!
-Saving/TiddlySpot/Filename: "Upload" Dateiname
+Saving/TiddlySpot/Filename: Dateiname für den "Upload"
 Saving/TiddlySpot/Heading: ~TiddlySpot
-Saving/TiddlySpot/Hint: //Die standard Server-URL ist `http://<wikiname>.tiddlyspot.com/store.cgi` und kann im Feld 'Server-URL' verändert werden. zB: http://example.com/store.php//
+Saving/TiddlySpot/Hint: //Die Standard-Server-URL ist `http://<wikiname>.tiddlyspot.com/store.cgi` und kann im Feld 'Server-URL' verändert werden. zB: http://example.com/store.php//
 Saving/TiddlySpot/Password: Passwort
 Saving/TiddlySpot/ServerURL: Server-URL
-Saving/TiddlySpot/UploadDir: "Upload" Verzeichnis
-Saving/TiddlySpot/UserName: Wiki Name
+Saving/TiddlySpot/UploadDir: Verzeichnis für den "Upload"
+Saving/TiddlySpot/UserName: Name des Wikis
 Settings/AutoSave/Caption: Automatisch speichern
 Settings/AutoSave/Disabled/Description: Änderungen NICHT automatisch speichern
 Settings/AutoSave/Enabled/Description: Änderungen automatisch speichern
@@ -83,6 +100,9 @@ Settings/CamelCase/Caption: Camel Case Wiki Links
 Settings/CamelCase/Hint: Hier können Sie die automatische Umwandlung von "~CamelCase Links" einstellen. ''Wichtig:'' Die Seite muss neu geladen werden, damit die Einstellungen wirksam werden.
 Settings/CamelCase/Description: Automatische ~CamelCase Umwandlung aktivieren
 Settings/Caption: Einstellungen
+Settings/EditorToolbar/Caption: Editor Toolbar
+Settings/EditorToolbar/Hint: Aktivieren oder deaktivieren der Editor Toolbar
+Settings/EditorToolbar/Description: Editor Toolbar anzeigen
 Settings/Hint: Diese erweiterten Einstellungen ermöglichen Ihnen, das Verhalten von TiddlyWiki zu ändern.
 Settings/NavigationAddressBar/Caption: Navigation Adresszeile
 Settings/NavigationAddressBar/Hint: Verhalten der Adresszeile des Browsers, wenn ein Tiddler geöffnet wird:
@@ -118,6 +138,9 @@ Settings/TitleLinks/Caption: Tiddler Titel
 Settings/TitleLinks/Hint: Tiddler Titel als Links anzeigen:
 Settings/TitleLinks/No/Description: Tiddler Titel normal anzeigen.
 Settings/TitleLinks/Yes/Description: Tiddler Titel als Link anzeigen.
+Settings/MissingLinks/Caption: Wiki-Links
+Settings/MissingLinks/Hint: Aktiviere Links zu fehlenden Tiddlern. zB: FehlenderTiddler [[Einführung]]
+Settings/MissingLinks/Description: Aktiviere Links zu fehlenden Tiddlern.
 StoryView/Caption: Anzeige
 StoryView/Prompt: Ausgewählte Anzeige:
 Theme/Caption: Theme
@@ -130,6 +153,8 @@ Toolbars/EditToolbar/Hint: Auswählen, welche Buttons im "Edit Modus" angezeigt
 Toolbars/Hint: Auswählen, welche "Toolbar Button" angezeigt werden
 Toolbars/PageControls/Caption: Page Toolbar
 Toolbars/PageControls/Hint: Auswählen, welche Buttons im Hauptmenü angezeigt werden:
+Toolbars/EditorToolbar/Caption: Editor Toolbar
+Toolbars/EditorToolbar/Hint: Auswählen, welche Editorbuttons angezeigt werden sollen. Manche Buttons sind vom Tiddler-Typ abhängig und werden eventuell ausgeblendet.
 Toolbars/ViewToolbar/Caption: View Toolbar
 Toolbars/ViewToolbar/Hint: Auswählen, welche Buttons im "View Modus" angezeigt werden:
 Tools/Download/Full/Caption: Herunterladen des ''gesamten Wikis''
diff --git a/languages/de-DE/EditTemplate.multids b/languages/de-DE/EditTemplate.multids
index 341e84e7e..aaba84c43 100644
--- a/languages/de-DE/EditTemplate.multids
+++ b/languages/de-DE/EditTemplate.multids
@@ -1,10 +1,8 @@
 title: $:/language/EditTemplate/
 
-Body/External/Hint: Diese ist ein externer Tiddler, der nicht im TW file gespeichert ist. Sie können die "Tags" und "Feld" Texte ändern, jedoch nicht den Inhalt des Tiddlers!
-Body/Hint: Verwenden Sie zum Formatieren [[WikiText|http://tiddlywiki.com/static/WikiText.html]].
+Body/External/Hint: Dies ist ein externer Tiddler, der nicht im TW file gespeichert ist. Sie können die "Tags" und "Feld" Texte ändern, jedoch nicht den Inhalt des Tiddlers!
 Body/Placeholder: Geben Sie den Text für diesen Tiddler ein.
-Body/Preview/Button/Hide: Vorschau aus
-Body/Preview/Button/Show: Vorschau
+Body/Preview/Type/Output: Anzeige
 Field/Remove/Caption: Lösche Feld
 Field/Remove/Hint: Lösche Feld
 Fields/Add/Button: ok
@@ -13,12 +11,13 @@ Fields/Add/Prompt: Feld einfügen:
 Fields/Add/Value/Placeholder: Feld Text / Wert
 Fields/Add/Dropdown/System: System Felder
 Fields/Add/Dropdown/User: Anwender Felder
-Shadow/Warning: Dies ist ein Schatten-Tiddler. Jede Änderung überschreibt die Standardversion des Plugins: <<pluginLink>>
+Shadow/Warning: Dies ist ein Schatten-Tiddler. Jede Änderung, die Sie machen, überschreibt die Standardversion des Plugins: <<pluginLink>>
 Shadow/OverriddenWarning: Dies ist ein veränderter Tiddler. Um zur Standardversion zurückzukehren, löschen Sie diesen Tiddler. Plugin: <<pluginLink>>
 Tags/Add/Button: ok
 Tags/Add/Placeholder: neuer Tag
 Tags/Dropdown/Caption: Tag Liste
 Tags/Dropdown/Hint: Tag Liste anzeigen
+Title/BadCharacterWarning: Warnung: Folgende Zeichen im Titel können zu Problemen führen: <<bad-chars>>
 Type/Dropdown/Caption: Tiddler Typ Liste
 Type/Dropdown/Hint: Anzeigen der Tiddler Typ Liste
 Type/Delete/Caption: Lösche Inhalts Typ
diff --git a/languages/de-DE/GettingStarted.tid b/languages/de-DE/GettingStarted.tid
index 4a714cc70..f5f59aa8b 100755
--- a/languages/de-DE/GettingStarted.tid
+++ b/languages/de-DE/GettingStarted.tid
@@ -1,6 +1,7 @@
 title: GettingStarted
 
-Willkommen bei TiddlyWiki, einem persönlichen nicht-linearen Web-Notizbuch.
+\define lingo-base() $:/language/ControlPanel/Basics/
+Willkommen bei ~TiddlyWiki, einem persönlichen nicht-linearen Web-Notizbuch.
 
 Vor dem Start, vergewissern Sie sich, dass Sie dieses Wiki auch wirklich speichern können. Weitere Informationen finden Sie für:
 
@@ -17,4 +18,15 @@ Erste Schritte:
 * Österreich: [[Weitere Informationen zu WikiText|http://tiddlywiki.com/languages/de-AT/index.html#WikiText]]
 * Deutschland: [[Weitere Informationen zu WikiText|http://tiddlywiki.com/languages/de-DE/index.html#WikiText]]
 
-Hinweis: Die österreichische und deutsche Version unterscheiden sich momentan nur in der Flagge, die bei der Standard Sprachauswahl angezeigt wird. In Zukunft können Beschriftungen der Benutzeroberfläche geringfügig von einander abweichen. zB: Jänner - Januar. 
\ No newline at end of file
+Hinweis: Die österreichische und deutsche Version unterscheiden sich momentan nur in der Flagge, die bei der Standard Sprachauswahl angezeigt wird. In Zukunft können Beschriftungen der Benutzeroberfläche geringfügig von einander abweichen. zB: Jänner - Januar.
+
+!! Einrichten dieser ~TiddlyWiki
+
+<div class="tc-control-panel">
+
+|<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
+|<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
+|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+</div>
+
+See the [[control panel|$:/ControlPanel]] for more options.
diff --git a/languages/de-DE/Import.multids b/languages/de-DE/Import.multids
index f06bd604b..41a64e421 100644
--- a/languages/de-DE/Import.multids
+++ b/languages/de-DE/Import.multids
@@ -1,6 +1,6 @@
  title: $:/language/Import/
 
-Imported: Folgende Tiddler wurden importiert: 
+Imported/Hint:  Folgende Tiddler wurden importiert: 
 Listing/Cancel/Caption: Abbrechen
 Listing/Hint: Diese Tiddler können importiert werden: 
 Listing/Import/Caption: Importieren
diff --git a/languages/de-DE/Misc.multids b/languages/de-DE/Misc.multids
index 86f6ee50e..d83f67ac1 100644
--- a/languages/de-DE/Misc.multids
+++ b/languages/de-DE/Misc.multids
@@ -5,10 +5,12 @@ BinaryWarning/Prompt: Dieser Tiddler enthält binäre Daten.
 ClassicWarning/Hint: Dieser Tiddler wurde im TiddlyWiki Classic Format erstellt. Dieses Format ist nur teilweise kompatibel mit TiddlyWiki Version 5. Mehr Info finden Sie unter: http://tiddlywiki.com/static/Upgrading.html
 ClassicWarning/Upgrade/Caption: upgrade
 CloseAll/Button: alle schließen
+ColourPicker/Recent: Kürzlich:
 ConfirmCancelTiddler: Wollen Sie die Änderungen im Tiddler: "<$text text=<<title>>/>" verwerfen?
 ConfirmDeleteTiddler: Wollen Sie den Tiddler: "<$text text=<<title>>/>" löschen?
 ConfirmOverwriteTiddler: Tiddler: "<$text text=<<title>>/>" existiert! OK überschreibt den tiddler!
 ConfirmEditShadowTiddler: Sie sind dabei, einen Schatten-Tiddler zu verändern. Zukünftige, automatische Anpassungen werden dadurch unterdrückt. Sie können Ihre Änderungen rückgängig machen, indem Sie diesen Tiddler wieder löschen. Wollen Sie den Tiddler: "<$text text=<<title>>/>" ändern?
+Count: Anzahl
 DefaultNewTiddlerTitle: Neuer Tiddler
 DropMessage: Hierher ziehen (oder Escape um abzubrechen)
 Encryption/Cancel: Abbrechen
@@ -19,11 +21,23 @@ Encryption/Password: Passwort
 Encryption/RepeatPassword: Passwort wiederholen
 Encryption/PasswordNoMatch: Passwörter stimmen nicht überein
 Encryption/SetPassword: Passwort setzen
+Error/Caption: Fehler
+Error/Filter: Filter Fehler
+Error/FilterSyntax: Syntax Fehler im Filter-Ausdruck
+Error/IsFilterOperator: Filter Fehler: Unbekannter Operand für den 'is' Filter Operator
+Error/LoadingPluginLibrary: Fehler beim Laden der "plugin library"
+Error/RecursiveTransclusion: Recursive Transclusion: Fehler im "transclude widget"
+Error/RetrievingSkinny: Fehler beim Empfangen einer "skinny" Tiddler Liste
+Error/SavingToTWEdit: Fehler beim Speichern mit "TWEdit"
+Error/WhileSaving: Fehler beim Speichern
+Error/XMLHttpRequest: XMLHttpRequest Fehler-Code
 InternalJavaScriptError/Title: Interner JavaScript Fehler
 InternalJavaScriptError/Hint: Es tut uns leid, aber bitte starten Sie Ihr TiddlyWiki neu, indem sie die Seite im Browser neu laden.
 InvalidFieldName: Das Feld: "<$text text=<<fieldName>>/>" enthält illegale Zeichen. Felder müssen klein geschrieben werden. Erlaubte Sonderzeichen sind: Zahlen, Unterstrich (`_`), Minus (`-`) und Punkt (`.`).
 LazyLoadingWarning: <p>Lade externe Datei von ''<$text text={{!!_canonical_uri}}/>''</p><p>Wenn diese Meldung nicht automatisch gelöscht wird, dann verwenden Sie wahrscheinlich einen Browser der diese Funktion nicht unterstützt. Siehe http://tiddlywiki.com/#ExternalText</p>
+LoginToTiddlySpace: Login bei TiddlySpace
 MissingTiddler/Hint: Fehlender Tiddler "<$text text=<<currentTiddler>>/>" - klicken Sie {{$:/core/images/edit-button}} um ihn zu erzeugen.
+No: Nein
 OfficialPluginLibrary: Offizielles ~TiddlyWiki Plugin-Verzeichnis
 OfficialPluginLibrary/Hint: Offizielles ~TiddlyWiki Plugin-Verzeichnis auf tiddlywiki.com. Plugin, Themes und Sprach Dateien werden vom "core team" gewartet.
 PluginReloadWarning: Das Wiki muss gespeichert {{$:/core/ui/Buttons/save-wiki}} und neu gladen {{$:/core/ui/Buttons/refresh}} werden, damit die Plugins ausgeführt werden.
@@ -34,5 +48,6 @@ TagManager/Count/Heading: Anzahl
 TagManager/Icon/Heading: Symbol
 TagManager/Info/Heading: Info
 TagManager/Tag/Heading: Tag
-Tiddler/DateFormat: DDth MMM YYYY um hh:mm
+Tiddler/DateFormat: DDth MMM YYYY um 0hh:0mm
 UnsavedChangesWarning: TiddlyWiki wurde geändert, aber noch nicht gespeichert!
+Yes: Ja
\ No newline at end of file
diff --git a/languages/de-DE/SiteTitle.tid b/languages/de-DE/SiteTitle.tid
index 40284e203..75741940e 100644
--- a/languages/de-DE/SiteTitle.tid
+++ b/languages/de-DE/SiteTitle.tid
@@ -1,3 +1,3 @@
 title: $:/SiteTitle
 
-Mein ~TiddlyWiki
+Mein ~TiddlyWiki
\ No newline at end of file
diff --git a/languages/de-DE/Snippets/ListByTag.tid b/languages/de-DE/Snippets/ListByTag.tid
new file mode 100644
index 000000000..db5f0ba05
--- /dev/null
+++ b/languages/de-DE/Snippets/ListByTag.tid
@@ -0,0 +1,5 @@
+title: $:/language/Snippets/ListByTag
+tags: $:/tags/TextEditor/Snippet
+caption: Tiddler-Liste mit tag: "task", sortiert nach "titel"
+
+<<list-links "[tag[task]sort[title]]">>
diff --git a/languages/de-DE/Snippets/MacroDefinition.tid b/languages/de-DE/Snippets/MacroDefinition.tid
new file mode 100644
index 000000000..7577ddab2
--- /dev/null
+++ b/languages/de-DE/Snippets/MacroDefinition.tid
@@ -0,0 +1,8 @@
+title: $:/language/Snippets/MacroDefinition
+tags: $:/tags/TextEditor/Snippet
+caption: Makro Definition
+
+\define makroName(param1:"standard parameter", param2)
+Text des Makros. Zugriff auf den $param1$.
+$param2$
+\end
diff --git a/languages/de-DE/Snippets/Table 4x3.tid b/languages/de-DE/Snippets/Table 4x3.tid
new file mode 100644
index 000000000..b74bd4867
--- /dev/null
+++ b/languages/de-DE/Snippets/Table 4x3.tid	
@@ -0,0 +1,10 @@
+title: $:/language/Snippets/Table4x3
+tags: $:/tags/TextEditor/Snippet
+caption: Tabelle mit 5 Spalten, 4 Zeilen, Kopf- und Fußzeile
+
+| |Alpha |Beta |Gamma |Delta |h
+|!Beta | | | | |
+|!Gamma | | | | |
+|!Delta | | | | |
+| |a|b|c|d|f
+| Beschriftung |c
diff --git a/languages/de-DE/Snippets/TableOfContents.tid b/languages/de-DE/Snippets/TableOfContents.tid
new file mode 100644
index 000000000..ff23ead0c
--- /dev/null
+++ b/languages/de-DE/Snippets/TableOfContents.tid
@@ -0,0 +1,9 @@
+title: $:/language/Snippets/TableOfContents
+tags: $:/tags/TextEditor/Snippet
+caption: Inhaltsverzeichnis
+
+<div class="tc-table-of-contents">
+
+<<toc-selective-expandable 'InhaltsVerzeichnis'>>
+
+</div>
\ No newline at end of file
diff --git a/languages/de-DE/ThemeTweaks.multids b/languages/de-DE/ThemeTweaks.multids
new file mode 100644
index 000000000..6f4adaf8f
--- /dev/null
+++ b/languages/de-DE/ThemeTweaks.multids
@@ -0,0 +1,41 @@
+title: $:/language/ThemeTweaks/
+
+ThemeTweaks: Theme Tweaks
+ThemeTweaks/Hint: Hier können sie verschiedene Elemente des ''Vanilla'' (Standard) Themas einstellen.
+Options: Optionen
+Options/SidebarLayout: Seitenleiste Darstellung
+Options/SidebarLayout/Fixed-Fluid: Fixe Story, variable Seitenleiste
+Options/SidebarLayout/Fluid-Fixed: Variable Story, fixe Seitenleiste
+Options/StickyTitles: "Klebender Titel"
+Options/StickyTitles/Hint: Tiddler-Titel bleiben beim "Scrollen" am oberen Bildschirmrand "kleben". Funktioniert möglicherweise nicht mit jedem Browser.
+Options/CodeWrapping: Lange Zeilen in "Code-Blöcken" umbrechen
+Settings: Einstellungen
+Settings/FontFamily: Schriftfamilie
+Settings/CodeFontFamily: "Code" Schriftfamilie
+Settings/BackgroundImage: Hintergrundbild für die Seite
+Settings/BackgroundImageAttachment: Hintergrundbild Anhang
+Settings/BackgroundImageAttachment/Scroll: Mit Inhalt "scrollen"
+Settings/BackgroundImageAttachment/Fixed: Fixe position im Fenster
+Settings/BackgroundImageSize: Hintergrundbild Größe
+Settings/BackgroundImageSize/Auto: Auto
+Settings/BackgroundImageSize/Cover: Abdecken
+Settings/BackgroundImageSize/Contain: Anpassen
+Metrics: Größen
+Metrics/FontSize: Schriftgröße
+Metrics/LineHeight: Zeilenhöhe
+Metrics/BodyFontSize: Schriftgröße für Tiddler Inhalt
+Metrics/BodyLineHeight: Zeilenhöhe für Tiddler Inhalt
+Metrics/StoryLeft: "Story" - linke Position
+Metrics/StoryLeft/Hint: Abstand des "story rivers" vom linken Fensterrand
+Metrics/StoryTop: "Story" - obere Position
+Metrics/StoryTop/Hint: Abstand des "story rivers" vom oberen Fensterrand
+Metrics/StoryRight: "Story" - rechte Position
+Metrics/StoryRight/Hint: Abstand der Seitenleiste from linken Fensterrand
+Metrics/StoryWidth: "Story" - Breite
+Metrics/StoryWidth/Hint: Breite des "story rivers" 
+Metrics/TiddlerWidth: Tiddlerbreite
+Metrics/TiddlerWidth/Hint: im "story river"
+Metrics/SidebarBreakpoint: Seitenleiste "breakpoint"
+Metrics/SidebarBreakpoint/Hint: Minimum Fensterbreite, bei der die Seitenleiste an den Anfang der Seite verschoben wird.
+Metrics/SidebarWidth: Seitenleiste Breite
+Metrics/SidebarWidth/Hint: Die Breite der Leiste bei variabler/fixer Darstellung
diff --git a/languages/de-DE/TiddlerInfo.multids b/languages/de-DE/TiddlerInfo.multids
index 122890677..eaf184a05 100755
--- a/languages/de-DE/TiddlerInfo.multids
+++ b/languages/de-DE/TiddlerInfo.multids
@@ -12,7 +12,7 @@ Advanced/ShadowInfo/OverriddenShadow/Hint: Der originale Schatten-Tiddler wurde
 Fields/Caption: Felder
 List/Caption: Liste
 List/Empty: Dieser Tiddler hat kein "list" Feld.
-Listed/Caption: Gelisted
+Listed/Caption: Gelistet
 Listed/Empty: Dieser Tiddler wird nicht von anderen Tiddlern gelistet.
 References/Caption: Referenzen
 References/Empty: Kein Tiddler linkt zu Diesem.
diff --git a/languages/el-GR/EditTemplate.multids b/languages/el-GR/EditTemplate.multids
index c3e84dfe1..b95ca81f8 100644
--- a/languages/el-GR/EditTemplate.multids
+++ b/languages/el-GR/EditTemplate.multids
@@ -1,10 +1,7 @@
 title: $:/language/EditTemplate/
 
 Body/External/Hint: Αυτό είναι ένα εξωτερικό tiddler αποθηκευμένο εκτός του κύριου TiddlyWiki αρχείου. Μπορείτε να τροποποιήσετε τις ετικέτες και τα πεδία αλλά δεν μπορείτε να τροποποιήσετε άμεσα το ίδιο το περιεχόμενο του
-Body/Hint: Χρησιμοποιήστε [[wiki text|http://tiddlywiki.com/static/WikiText.html]] για να προσθέσετε μορφοποιήσεις, εικόνες, και δυναμικά χαρακτηριστικά
 Body/Placeholder: Πληκτρολογήστε το κείμενο για αυτό το tiddler
-Body/Preview/Button/Hide: απόκρυψη προεπισκόπισης
-Body/Preview/Button/Show: εμφάνιση προεπισκόπισης
 Fields/Add/Button: προσθήκη
 Fields/Add/Name/Placeholder: όνομα πεδίου
 Fields/Add/Prompt: Πρόσθεσε ένα νέο πεδίο:
diff --git a/languages/el-GR/GettingStarted.tid b/languages/el-GR/GettingStarted.tid
index a4812f3ce..111369ba8 100644
--- a/languages/el-GR/GettingStarted.tid
+++ b/languages/el-GR/GettingStarted.tid
@@ -1,6 +1,7 @@
 title: GettingStarted
 
-Καλώς ήρθατε στο TiddlyWiki, το μη-γραμμικό προσωπικό σημειωματάριο του ιστού.
+\define lingo-base() $:/language/ControlPanel/Basics/
+Καλώς ήρθατε στο ~TiddlyWiki, το μη-γραμμικό προσωπικό σημειωματάριο του ιστού.
 
 Για να ξεκινήσετε, πρώτα επαληθεύστε ότι μπορείτε να αποθηκεύσετε τις αλλαγές σας με επιτυχία - δείτε στο http://tiddlywiki.com/ για περισσότερες οδηγίες.
 
@@ -11,3 +12,14 @@ title: GettingStarted
 ** Να σταματήσετε την εμφάνιση αυτού του μηνύματος τροποποιώντας την επιλογή προκαθορισμένα tiddlers κάτω από την καρτέλα ''Βασικά'' 
 * Αποθηκεύσετε τις αλλαγές χρησιμοποιώντας το κουμπί της 'αποθήκευσης' στην πλευρική γραμμή εργαλείων
 * Να μάθετε περισσότερα σχετικά με την γλώσσα [[WikiText|http://tiddlywiki.com/static/WikiText.html]]
+
+!! Ρυθμίστε αυτή την ~TiddlyWiki
+
+<div class="tc-control-panel">
+
+|<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
+|<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
+|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+</div>
+
+See the [[control panel|$:/ControlPanel]] for more options.
diff --git a/languages/es-ES/Buttons.multids b/languages/es-ES/Buttons.multids
index 98638cfc3..326119583 100644
--- a/languages/es-ES/Buttons.multids
+++ b/languages/es-ES/Buttons.multids
@@ -1,72 +1,166 @@
 title: $:/language/Buttons/
 
-AdvancedSearch/Caption: búsqueda avanzada
+AdvancedSearch/Caption: Búsqueda avanzada
 AdvancedSearch/Hint: Búsqueda avanzada
-Cancel/Caption: cancelar
-Cancel/Hint: Descartar cambios a este tiddler
-Clone/Caption: clonar
-Clone/Hint: Clonar este tiddler
-Close/Caption: cerrar
-Close/Hint: Cerrar este tiddler
-CloseAll/Caption: cerrar todos
-CloseAll/Hint: Cerrar todos los tiddlers
-CloseOthers/Caption: cerrar otros
-CloseOthers/Hint: Cerrar los otros tiddlers
-ControlPanel/Caption: panel de control
-ControlPanel/Hint: Abrir el panel de control
-Delete/Caption: borrar
-Delete/Hint: Borrar este tiddler
-Edit/Caption: editar
-Edit/Hint: Editar este tiddler
-Encryption/Caption: cifrado
-Encryption/ClearPassword/Caption: borrar contraseña
-Encryption/ClearPassword/Hint: Borrar la contraseña y guardar este wiki sin cifrar
-Encryption/Hint: Asignar o borrar contraseña de cifrado para guardar este wiki
+Bold/Caption: Negrita
+Bold/Hint: Aplicar formato de negrita a la selección
+Cancel/Caption: Cancelar
+Cancel/Hint: Descarta los cambios
+Clear/Caption: *clear
+Clear/Hint: *Clear image to solid colour
+Clone/Caption: Clonar
+Clone/Hint: Hace una copia exacta de este tiddler
+Close/Caption: Cerrar
+Close/Hint: Cierra este tiddler
+CloseAll/Caption: Cerrar todo
+CloseAll/Hint: Cierra todos los tiddlers
+CloseOthers/Caption: Cerrar los demás
+CloseOthers/Hint: Cierra todos tiddlers abiertos excepto este
+ControlPanel/Caption: Panel de Control
+ControlPanel/Hint: Abre el Panel de Control
+Delete/Caption: Borrar
+Delete/Hint: Borra este tiddler
+Edit/Caption: Editar
+Edit/Hint: Permite editar este tiddler
+EditorHeight/Caption: Altura del editor
+EditorHeight/Caption/Auto: Ajustar al contenido
+EditorHeight/Caption/Fixed: Altura fija
+EditorHeight/Hint: Determina la altura del cuadro de edición
+Encryption/Caption: Cifrado
+Encryption/ClearPassword/Caption: Borrar contraseña
+Encryption/ClearPassword/Hint: Borra la contraseña actual y guarda este wiki sin cifrar
+Encryption/Hint: Asigna o revoca la contraseña de cifrado para este wiki
 Encryption/SetPassword/Caption: Asignar contraseña
-Encryption/SetPassword/Hint: Asignar contraseña de cifrado para guardar este wiki
-ExportPage/Caption: exportar todos
-ExportPage/Hint: Exportar todos los tiddlers
-ExportTiddler/Caption: exportar tiddler
-ExportTiddler/Hint: Exportar este tiddler
-ExportTiddlers/Caption: exportar tiddlers
-ExportTiddlers/Hint: Exportar tiddlers
-FullScreen/Caption: pantalla completa
-FullScreen/Hint: Entrar o salir en modo de pantalla completa
-HideSideBar/Caption: ocultar barra lateral
-HideSideBar/Hint: Ocultar barra lateral
-Home/Caption: inicio
-Home/Hint: Abrir tiddlers por defecto
-Import/Caption: importar
-Import/Hint: Importar archivos
+Encryption/SetPassword/Hint: Asigna contraseña de cifrado
+Excise/Caption: Escindir
+Excise/Caption/Excise: Escindir
+Excise/Caption/MacroName: Nombre de la macro
+Excise/Caption/NewTitle: Título del nuevo tiddler
+Excise/Caption/Replace: Reemplazar texto escindido con:
+Excise/Caption/Replace/Link: enlace
+Excise/Caption/Replace/Transclusion: transclusión
+Excise/Caption/Tag: Etiqueta el nuevo tiddler con el título de este
+Excise/Caption/TiddlerExists: ¡Atención! El tiddler ya existe
+Excise/Hint: Corta el texto seleccionado y lo pega en un tiddler nuevo
+ExportPage/Caption: Exportar todos
+ExportPage/Hint: Exporta todos los tiddlers
+ExportTiddler/Caption: Exportar tiddler
+ExportTiddler/Hint: Exporta este tiddler
+ExportTiddlers/Caption: Exportar tiddlers
+ExportTiddlers/Hint: Exporta el grupo de tiddlers
+Fold/Caption: Comprimir tiddler
+Fold/FoldBar/Caption: Barra de vista comprimida
+Fold/FoldBar/Hint: Barras opcionales para comprimir y desplegar tiddlers
+Fold/Hint: Comprime la vista del tiddler ocultando el cuerpo y sólo muestra el título
+FoldAll/Caption: Comprimir todos
+FoldAll/Hint: Comprime la vista de todos los tiddlers abiertos
+FoldOthers/Caption: Comprimir los demás
+FoldOthers/Hint: Comprime la vista de todos los tiddlers abiertos excepto este
+FullScreen/Caption: Pantalla completa
+FullScreen/Hint: Entra y sale del modo de pantalla completa
+Heading1/Caption: Encabezamiento 1
+Heading1/Hint: Aplica formato de encabezamiento 1 a la selección
+Heading2/Caption: Encabezamiento 2
+Heading2/Hint: Aplica formato de encabezamiento 2 a la selección
+Heading3/Caption: Encabezamiento 3
+Heading3/Hint: Aplica formato de encabezamiento 3 a la selección
+Heading4/Caption: Encabezamiento 4
+Heading4/Hint: Aplica formato de encabezamiento 4 a la selección
+Heading5/Caption: Encabezamiento 5
+Heading5/Hint: Aplica formato de encabezamiento 5 a la selección
+Heading6/Caption: Encabezamiento 6
+Heading6/Hint: Aplica formato de encabezamiento 6 a la selección
+Help/Caption: Ayuda
+Help/Hint: Muestra el panel de ayuda
+HideSideBar/Caption: Ocultar barra lateral
+HideSideBar/Hint: Oculta la barra lateral
+Home/Caption: Inicio
+Home/Hint: Cierra todos los tiddlers abiertos y abre los que se muestran por defecto al inicio
+Import/Caption: Importar
+Import/Hint: Importa multitud de tipos de archivo, incluyendo textos, imágenes, TiddlyWiki y JSON
 Info/Caption: Información
-Info/Hint: Mostrar información de este tiddler
-Language/Caption: idioma
-Language/Hint: Seleccionar el idioma de interfaz
-More/Caption: más
-More/Hint: Más acciones
-NewHere/Caption: nuevo aquí
-NewHere/Hint: Crear un nuevo tiddler aquí que tenga las mismas etiquetas
-NewJournal/Caption: nuevo diario
-NewJournal/Hint: Crear un nuevo tiddler diario
-NewJournalHere/Caption: nuevo diario aquí
-NewJournalHere/Hint: Crear un nuevo diario aquí que tenga las mismas etiquetas
-NewTiddler/Caption: nuevo tiddler
-NewTiddler/Hint: Crear un nuevo tiddler
-Permalink/Caption: enlace permanente
-Permalink/Hint: Crear un enlace directo a este tiddler en la barra de direcciones del navegador
-Permaview/Caption: vista permanente
-Permaview/Hint: Crear un enlace directo a todos los tiddlers abiertos en la barra de direcciones del navegador
-Refresh/Caption: actualizar
-Refresh/Hint: Actualizar completamente este wiki
-Save/Caption: guardar
-Save/Hint: Guardar cambios a este tiddler
-SaveWiki/Caption: guardar cambios
-SaveWiki/Hint: Guardar los cambios realizados a este wiki
-ShowSideBar/Caption: mostrar barra lateral
-ShowSideBar/Hint: Mostrar la barra lateral
-StoryView/Caption: vista
-StoryView/Hint: Seleccionar el modo de visualización de los tiddlers
-TagManager/Caption: gestor de etiquetas
-TagManager/Hint: Abrir el gestor de etiquetas
-Theme/Caption: tema
-Theme/Hint: Seleccionar tema a visualizar
+Info/Hint: Muestra información sobre este tiddler
+Italic/Caption: Cursiva
+Italic/Hint: Aplica formato de cursiva a la selección
+Language/Caption: Idioma
+Language/Hint: Selecciona idioma de la interfaz de usuario
+LineWidth/Caption: Ancho del trazo
+LineWidth/Hint: Establece el ancho del trazo para pintar
+ListBullet/Caption: Lista con viñetas
+ListBullet/Hint: Aplica formato de lista con viñetas a la selección
+ListNumber/Caption: Lista numerada
+ListNumber/Hint: Aplica formato de lista numerada a la selección
+MonoBlock/Caption: Bloque monoespaciado
+MonoBlock/Hint: Aplica formato de bloque monoespaciado a la selección
+MonoLine/Caption: Monoespacio
+MonoLine/Hint: Aplica formato de monoespacio a la selección
+More/Caption: Más
+More/Hint: Otras acciones
+NewHere/Caption: Nuevo aquí
+NewHere/Hint: Crea un nuevo tiddler etiquetado con el título de este tiddler
+NewImage/Caption: Nueva imagen
+NewImage/Hint: Crea un nuevo tiddler de imagen
+NewJournal/Caption: Nueva entrada
+NewJournal/Hint: Crea una nueva entrada de diario
+NewJournalHere/Caption: Entrada nueva aquí
+NewJournalHere/Hint: Crea una nueva entrada de diario etiquetada con el título de este tiddler
+NewMarkdown/Caption: Nuevo tiddler en Markdown
+NewMarkdown/Hint: Crea un nuevo tiddler en Markdown
+NewTiddler/Caption: Nuevo tiddler
+NewTiddler/Hint: Crea un tiddler nuevo
+OpenWindow/Caption: Abrir en ventana nueva
+OpenWindow/Hint: Abre el tiddler en una nueva ventana
+Opacity/Caption: Opacidad
+Opacity/Hint: Establece la opacidad del trazo
+Paint/Caption: Color del trazo
+Paint/Hint: Establece el color del trazo
+Palette/Caption: Paleta
+Palette/Hint: Selecciona la paleta de color
+Permalink/Caption: Permalink
+Permalink/Hint: Crea en la barra de direcciones del navegador un enlace directo a este tiddler
+Permaview/Caption: Permaview
+Permaview/Hint: Crea en la barra de direcciones del navegador un enlace directo a todos los tiddlers abiertos
+Picture/Caption: Imagen
+Picture/Hint: Inserta imagen
+Preview/Caption: Vista previa
+Preview/Hint: Muestra el panel de vista previa
+PreviewType/Caption: Tipo de vista previa
+PreviewType/Hint: Selecciona el tipo de vista previa
+Quote/Caption: Bloque de cita
+Quote/Hint: Aplica formato de bloque de cita a la selección
+Refresh/Caption: Recargar
+Refresh/Hint: Actualiza completamente este wiki
+Save/Caption: Ok
+Save/Hint: Confirma y guarda los cambios realizados en el tiddler
+SaveWiki/Caption: Guardar cambios
+SaveWiki/Hint: Confirma y guarda todos los cambios realizados en el wiki
+ShowSideBar/Caption: Mostrar barra lateral
+ShowSideBar/Hint: Muestra la barra lateral
+Size/Caption: Tamaño de imagen
+Size/Caption/Height: Altura:
+Size/Caption/Resize: Cambiar tamaño
+Size/Caption/Width: Ancho:
+Size/Hint: Establece tamaño de la imagen
+Stamp/Caption: Snippet
+Stamp/Caption/New: Añade el tuyo propio
+Stamp/Hint: Inserta un snippet o fragmento de texto preconfigurado
+Stamp/New/Text: Texto del snippet (Recuerda añadir un título descriptivo en el campo "caption" ).
+Stamp/New/Title: Nombre para mostrar en el menú
+StoryView/Caption: Vista
+StoryView/Hint: Selecciona el modo de visualización de los tiddlers
+Strikethrough/Caption: Tachado
+Strikethrough/Hint: Aplica formado de tachado a la selección
+Subscript/Caption: Subíndice
+Subscript/Hint: Aplica formato de subíndice a la selección
+Superscript/Caption: Superíndice
+Superscript/Hint: Aplica formato de superíndice a la selección
+TagManager/Caption: Administrador de etiquetas
+TagManager/Hint: Abre el gestor de etiquetas
+Theme/Caption: Tema
+Theme/Hint: Selecciona un estilo visual para el wiki
+Underline/Caption: Subrayado
+Underline/Hint: Aplica formato de subrayado a la selección
+Unfold/Caption: Desplegar tiddler
+Unfold/Hint: Despliega el cuerpo de este tiddler y muestra su contenido
+UnfoldAll/Caption: Desplegar todos
+UnfoldAll/Hint: Despliega y muestra el contenido de todos los tiddlers abiertos
diff --git a/languages/es-ES/ControlPanel.multids b/languages/es-ES/ControlPanel.multids
index 002ad4f56..32bc8c54b 100644
--- a/languages/es-ES/ControlPanel.multids
+++ b/languages/es-ES/ControlPanel.multids
@@ -1,97 +1,154 @@
 title: $:/language/ControlPanel/
 
 Advanced/Caption: Avanzado
-Advanced/Hint: Información interna acerca de este TiddlyWiki
+Advanced/Hint: Información interna de TiddlyWiki
 Appearance/Caption: Aspecto
-Appearance/Hint: Formas de personalizar el aspecto de su TiddlyWiki
-Basics/AnimDuration/Prompt: Duración de la animación:
+Appearance/Hint: Personaliza la apariencia de TiddlyWiki
+Basics/AnimDuration/Prompt: Duración de la animación
 Basics/Caption: Básico
-Basics/DefaultTiddlers/BottomHint: Usar &#91;&#91;corchetes dobles&#93;&#93; para títulos con espacios. También puede elegir el <$button set="$:/DefaultTiddlers" setTo="[list[$:/StoryList]]">conservar el orden de la historia</$button>
-Basics/DefaultTiddlers/Prompt: Tiddlers por defecto:
-Basics/DefaultTiddlers/TopHint: Escojer los tiddlers que serán mostrados al inicio: 
-Basics/Language/Prompt: ¡Hola! Idioma actual:
-Basics/NewJournal/Tags/Prompt: Etiquetas para nuevos tiddlers diarios
-Basics/NewJournal/Title/Prompt: Título de nuevos tiddlers diarios
-Basics/OverriddenShadowTiddlers/Prompt: Número de tiddlers ocultos re-definidos:
-Basics/ShadowTiddlers/Prompt: Número de tiddlers ocultos:
-Basics/Subtitle/Prompt: Subtítulo:
-Basics/SystemTiddlers/Prompt: Número de tiddlers de sistema:
-Basics/Tags/Prompt: Número de etiquetas:
-Basics/Tiddlers/Prompt: Número de tiddlers:
+Basics/DefaultTiddlers/BottomHint: Usa &#91;&#91;corchetes dobles&#93;&#93; para títulos con espacios. También puedes mostrarlos ordenados <$button set="$:/DefaultTiddlers" setTo="[list[$:/StoryList]]">de más reciente a más antiguo</$button>
+Basics/DefaultTiddlers/Prompt: Tiddlers por defecto
+Basics/DefaultTiddlers/TopHint: Escoge qué tiddlers se muestran al inicio
+Basics/Language/Prompt: ¡Hola! Selecciona idioma actual
+Basics/NewJournal/Tags/Prompt: Etiqueta para las nuevas entradas de diario
+Basics/NewJournal/Title/Prompt: Formato de título para las nuevas entradas de diario
+Basics/OverriddenShadowTiddlers/Prompt: Número de tiddlers ocultos anulados
+Basics/ShadowTiddlers/Prompt: Número de tiddlers ocultos
+Basics/Subtitle/Prompt: Subtítulo
+Basics/SystemTiddlers/Prompt: Número de tiddlers de sistema
+Basics/Tags/Prompt: Número de etiquetas
+Basics/Tiddlers/Prompt: Número de tiddlers
 Basics/Title/Prompt: Título de este ~TiddlyWiki:
-Basics/Username/Prompt: Nombre de usuario:
-Basics/Version/Prompt: Versión de ~TiddlyWiki:
+Basics/Username/Prompt: Nombre de usuario
+Basics/Version/Prompt: Versión de ~TiddlyWiki
 EditorTypes/Caption: Tipos de editor
 EditorTypes/Editor/Caption: Editor
-EditorTypes/Hint: Estos tiddlers determinan qué editor es usado para editar ciertos tipos de tiddlers específicos.
+EditorTypes/Hint: Editores usados para ciertos tipos específicos de tiddler
 EditorTypes/Type/Caption: Tipo
 Info/Caption: Información
 Info/Hint: Información acerca de este TiddlyWiki
+KeyboardShortcuts/Add/Caption: Añadir atajo
+KeyboardShortcuts/Add/Prompt: Escribe el atajo
+KeyboardShortcuts/Caption: Atajos de teclado
+KeyboardShortcuts/Hint: Administra la asignación de atajos de teclado
+KeyboardShortcuts/NoShortcuts/Caption: No hay atajo asignado
+KeyboardShortcuts/Platform/All: Cualquier plataforma
+KeyboardShortcuts/Platform/Linux: Sólo Linux
+KeyboardShortcuts/Platform/Mac: Sólo Macintosh
+KeyboardShortcuts/Platform/NonLinux: Todas menos Linux
+KeyboardShortcuts/Platform/NonMac: Todas menos Macintosh
+KeyboardShortcuts/Platform/NonWindows: Todas menos Windows
+KeyboardShortcuts/Platform/Windows: Sólo windows
+KeyboardShortcuts/Remove/Hint: Eliminar atajo
 LoadedModules/Caption: Módulos cargados
-LoadedModules/Hint: Estos son los módulos de tiddlers cargados en este momento, enlazados a sus tiddlers de origen. Los módulos en itálica carecen de tiddler de origen, usualmente debido a que fueron configurados durante el inicio. 
+LoadedModules/Hint: Modulos cargados en este momento, enlazados con sus tiddlers de origen. Los módulos en itálica carecen de origen, debido normalmente a que se configuraron durante el inicio. 
 Palette/Caption: Paleta
-Palette/Editor/Clone/Caption: clonar
-Palette/Editor/Clone/Prompt: Se recomienda clonar esta paleta oculta antes de editarla. 
-Palette/Editor/Prompt: En edición
-Palette/Editor/Prompt/Modified: Esta paleta oculta ha sido modificada
-Palette/Editor/Reset/Caption: reiniciar
-Palette/HideEditor/Caption: ocultar editor
-Palette/Prompt: Paleta actual:
-Palette/ShowEditor/Caption: mostrar el editor
-Plugins/Caption:  Extensiones
-Plugins/Disable/Caption: desactivar
-Plugins/Disable/Hint: Desactivar esta extensión cuando se actualize esta página
-Plugins/Disabled/Status: (desactivada)
-Plugins/Empty/Hint: Ninguno
-Plugins/Enable/Caption: activar
-Plugins/Enable/Hint: Activar esta extensión cuando se actualize esta página
+Palette/Editor/Clone/Caption: Clonar
+Palette/Editor/Clone/Prompt: Se recomienda clonar esta paleta antes de editarla. 
+Palette/Editor/Prompt: Editando
+Palette/Editor/Prompt/Modified: Si te has perdido, no desesperes
+Palette/Editor/Reset/Caption: Restaura la paleta
+Palette/HideEditor/Caption: Cerrar el editor
+Palette/Prompt: Paleta actual
+Palette/ShowEditor/Caption: Abrir el editor
+Parsing/Block/Caption: Bloquear reglas sintácticas
+Parsing/Caption: Interpretación sintáctica
+Parsing/Hint: Aquí se pueden deshabilitar globalmente reglas de interpretación sintáctica del wiki. Ten cuidado: deshabilitar ciertas reglas puede hacer que ~TiddlyWiki deje de funcionar correctamente.
+En tal caso, puedes recuperar su normal funcionamiento en [[modo seguro|http://tiddlywiki.com/#SafeMode]].
+Parsing/Inline/Caption: Reglas sintácticas de texto
+Parsing/Pragma/Caption: Reglas sintácticas del compilador
+Plugins/Add/Caption: Obten complementos y extensiones
+Plugins/Add/Hint: Instala plugins desde la librería oficial
+Plugins/Caption: Plugins
+Plugins/Disable/Caption: Desactivar
+Plugins/Disable/Hint: Desactiva el plugin al actualizar la página
+Plugins/Disabled/Status: (Desactivado)
+Plugins/Empty/Hint: No se han instalado
+Plugins/Enable/Caption: Activar
+Plugins/Enable/Hint: Activa este plugin al actualizar la página
+Plugins/Install/Caption: Instalar
+Plugins/Installed/Hint: Plugins instalados actualmente
 Plugins/Language/Prompt: Idiomas
-Plugins/Plugin/Prompt: Extensiones
+Plugins/Languages/Caption: Idiomas
+Plugins/Languages/Hint: Extensiones de idioma
+Plugins/OpenPluginLibrary: Abrir biblioteca de complementos y extensiones
+Plugins/Plugin/Prompt: Plugins
+Plugins/Plugins/Caption: Plugins
+Plugins/Plugins/Hint: Complementos y extensiones
+Plugins/Reinstall/Caption: Reinstalar
 Plugins/Theme/Prompt: Temas
-Saving/Caption: Guardando
-Saving/Heading: Guardando
+Plugins/Themes/Caption: Temas
+Plugins/Themes/Hint: Extensiones de tema
+Saving/Caption: Servidor
+Saving/Heading: Servidor
 Saving/TiddlySpot/Advanced/Heading: Configuración Avanzada
 Saving/TiddlySpot/BackupDir: Directorio de copias de seguridad
 Saving/TiddlySpot/Backups: Copias de seguridad
-Saving/TiddlySpot/Description: Esta configuración es usada solamente cuando se guarda en http://tiddlyspot.com o en un servidor remoto compatible
-Saving/TiddlySpot/Filename: Nombre de archivo a subir
+Saving/TiddlySpot/Description: Esta configuración sólo se usa para guardar el wiki en http://tiddlyspot.com o en otro servidor compatible
+Saving/TiddlySpot/Filename: Nombre del archivo
 Saving/TiddlySpot/Heading: ~TiddlySpot
-Saving/TiddlySpot/Hint: //El hipervínculo (URL) por defecto del servidor es `http://<wikiname>.tiddlyspot.com/store.cgi` aunque cambiarse para usar otro servidor personalizado//
+Saving/TiddlySpot/Hint: //La dirección (URL) por defecto de// TiddlySpot //es `http://<wikiname>.tiddlyspot.com/store.cgi` aunque puede cambiarse a voluntad para usar otro servidor//
 Saving/TiddlySpot/Password: Contraseña
-Saving/TiddlySpot/ServerURL: Hipervínculo (URL) del servidor
-Saving/TiddlySpot/UploadDir: Directorio de subida
+Saving/TiddlySpot/ServerURL: Dirección (URL) del servidor
+Saving/TiddlySpot/UploadDir: Directorio de almacenamiento
 Saving/TiddlySpot/UserName: Nombre del Wiki
-Settings/AutoSave/Caption: Autoguardar
+Settings/AutoSave/Caption: Guardar automáticamente
 Settings/AutoSave/Disabled/Description: No guardar cambios automáticamente
 Settings/AutoSave/Enabled/Description: Guardar cambios automáticamente
-Settings/AutoSave/Hint: Guardar cambios automáticamente durante la edición
+Settings/AutoSave/Hint: Guarda automáticamente los cambios durante la edición
+Settings/CamelCase/Caption: Enlaces wiki mediante ~CamelCase
+Settings/CamelCase/Description: Activar enlaces automáticos mediante ~CamelCase
+Settings/CamelCase/Hint: Desactiva globalmente la opción de enlace automático mediante CamelCase <br>
+Requiere recargar la página para que surta efecto
 Settings/Caption: Configuración
-Settings/Hint: Esta configuración le permite personalizar el comportamiento de TiddlyWiki.
-Settings/NavigationAddressBar/Caption: Barra de Dirección del Navegador
-Settings/NavigationAddressBar/Hint: Comportamiento de la barra de dirección del navegador cuando se navega a un tiddler: 
+Settings/DefaultSidebarTab/Caption: Pestaña por defecto de la barra lateral
+Settings/DefaultSidebarTab/Hint: Indica qué pestaña de la barra lateral se muestra por defecto al inicio
+Settings/Hint: La configuración de estos ajustes te permite personalizar el comportamiento de TiddlyWiki.
+Settings/LinkToBehaviour/Caption: Comportamiento al abrir tiddlers...
+Settings/LinkToBehaviour/InsideRiver/Hint: ...dentro del StoryRiver
+Settings/LinkToBehaviour/OpenAbove: Abrirlo por encima del tiddler actual
+Settings/LinkToBehaviour/OpenAtBottom: Abrirlo al final del StoryRiver
+Settings/LinkToBehaviour/OpenAtTop: Abrirlo al principio del StoryRiver
+Settings/LinkToBehaviour/OpenBelow: Abrirlo por debajo del tiddler actual
+Settings/LinkToBehaviour/OutsideRiver/Hint: ...desde fuera del StoryRiver
+Settings/NavigationAddressBar/Caption: Barra de direcciones
+Settings/NavigationAddressBar/Hint: Comportamiento de la barra de dirección del navegador cuando se abre un tiddler
 Settings/NavigationAddressBar/No/Description: No actualizar la barra de dirección
-Settings/NavigationAddressBar/Permalink/Description: Incluir el tiddler de destino
-Settings/NavigationAddressBar/Permaview/Description: Incluir el tiddler de destino y la secuencia actual de tiddlers abiertos
-Settings/NavigationHistory/Caption: Historial de Navegación
-Settings/NavigationHistory/Hint: Actualizar el historial de navegación cuando se abre un tiddler:
+Settings/NavigationAddressBar/Permalink/Description: Añadir el tiddler de destino a la dirección
+Settings/NavigationAddressBar/Permaview/Description: Añadir el tiddler de destino y la secuencia actual de tiddlers abiertos
+Settings/NavigationHistory/Caption: Historial de navegación
+Settings/NavigationHistory/Hint: Actualiza el historial de navegación al abrir un tiddler
 Settings/NavigationHistory/No/Description: No actualizar el historial
 Settings/NavigationHistory/Yes/Description: Actualizar el historial
-Settings/ToolbarButtons/Caption: Botones de la Barra de Herramientas
-Settings/ToolbarButtons/Hint: Aspecto por defecto de los botones de la barra de herramientas: 
-Settings/ToolbarButtons/Icons/Description: Incluir ícono
-Settings/ToolbarButtons/Text/Description: Incluir texto
+Settings/PerformanceInstrumentation/Caption: //Performance Instrumentation//
+Settings/PerformanceInstrumentation/Description: Activar //performance instrumentation//
+Settings/PerformanceInstrumentation/Hint: Muestra estadísticas de las prestaciones de la página en la consola de desarrollo <br>
+Requiere recargar la página para que surta efecto
+Settings/TitleLinks/Caption: Títulos de tiddler
+Settings/TitleLinks/Hint: Los títulos de los tiddlers se mostrarán y se comportarán como enlaces
+Settings/TitleLinks/No/Description: No mostrar como enlaces
+Settings/TitleLinks/Yes/Description: Mostrar como enlaces
+Settings/ToolbarButtons/Caption: Botones de la barra de herramientas
+Settings/ToolbarButtons/Hint: Aspecto por defecto de los botones de la barra de herramientas
+Settings/ToolbarButtons/Icons/Description: Mostrar icono
+Settings/ToolbarButtons/Text/Description: Mostrar texto
+Settings/ToolbarButtonStyle/Caption: Estilo de botón
+Settings/ToolbarButtonStyle/Hint: Selecciona el estilo de los botones de la barra de herramientas
+Settings/ToolbarButtonStyle/Styles/Borderless: Sin borde
+Settings/ToolbarButtonStyle/Styles/Boxed: Cuadrado
+Settings/ToolbarButtonStyle/Styles/Rounded: Redondo
 StoryView/Caption: Vista
-StoryView/Prompt: Vista actual:
+StoryView/Prompt: Vista actual
 Theme/Caption: Tema
-Theme/Prompt: Tema actual:
-TiddlerFields/Caption: Campos del tiddler
-TiddlerFields/Hint: Este es la colección completa de campos de tiddler (TiddlerFields) en uso en este wiki (incluyendo los tiddlers de sistema, pero excluyendo los tiddlers ocultos).
-Toolbars/Caption: Barras de Herramientas
-Toolbars/EditToolbar/Caption: Editar la Barra de Herramientas
-Toolbars/EditToolbar/Hint: Seleccionar los botones a mostrar en los tiddlers en modo de edición
-Toolbars/Hint: Seleccionar los botones a mostrar
-Toolbars/PageControls/Caption: Barra de Herramientas de Página
-Toolbars/PageControls/Hint: Seleccionar los botones a mostrar en la barra de herramientas de página
-Toolbars/ViewToolbar/Caption: Mostrar la Barra de Herramientas
-Toolbars/ViewToolbar/Hint: Seleccionar qué botones mostrar en los tiddlers en modo de vista
-Tools/Download/Full/Caption: Bajar el wiki completo
+Theme/Prompt: Tema actual
+TiddlerFields/Caption: Campos de tiddler
+TiddlerFields/Hint: Esta es la colección completa de campos de tiddler (TiddlerFields) actualmente en uso en este wiki, que incluye los tiddlers de sistema, pero no los ocultos
+Toolbars/Caption: Barras de herramientas
+Toolbars/EditToolbar/Caption: Barra de edición
+Toolbars/EditToolbar/Hint: Selecciona qué botones mostrar en modo de edición
+Toolbars/Hint: Selecciona qué botones mostrar en las diferentes barras de herramientas
+Toolbars/PageControls/Caption: Barra de página
+Toolbars/PageControls/Hint: Selecciona qué botones mostrar en la barra de página
+Toolbars/ViewToolbar/Caption: Barra de visualización
+Toolbars/ViewToolbar/Hint: Selecciona qué botones mostrar en modo de visualización
+Tools/Download/Full/Caption: Descargar el wiki completo
\ No newline at end of file
diff --git a/languages/es-ES/CoreReadMe.tid b/languages/es-ES/CoreReadMe.tid
index 45edd41a5..b534f760a 100644
--- a/languages/es-ES/CoreReadMe.tid
+++ b/languages/es-ES/CoreReadMe.tid
@@ -1,8 +1,8 @@
 title: $:/core/readme
 
-Esta extensión contiene componentes del núcleo de de TiddlyWiki, que incluyen:
+Este plugin contiene componentes del núcleo de TiddlyWiki que incluyen:
 
 * Módulos de código JavaScript
-* Íconos
+* Iconos
 * Plantillas necesarias para crear la interfaz de usuario de TiddlyWiki
-* Traducciones al Español (ES-es) de las cadenas localizables usadas por el núcleo
+* Traducciones al castellano (ES-es) de las cadenas localizables usadas por el núcleo
diff --git a/languages/es-ES/Dates.multids b/languages/es-ES/Dates.multids
index 6aaf892c5..4fde1066c 100644
--- a/languages/es-ES/Dates.multids
+++ b/languages/es-ES/Dates.multids
@@ -1,36 +1,36 @@
 title: $:/language/
 
-Date/DaySuffix/1: ro
-Date/DaySuffix/10: mo
-Date/DaySuffix/11: mo
-Date/DaySuffix/12: mo
-Date/DaySuffix/13: ro
-Date/DaySuffix/14: to
-Date/DaySuffix/15: to
-Date/DaySuffix/16: to
-Date/DaySuffix/17: mo
-Date/DaySuffix/18: vo
-Date/DaySuffix/19: no
-Date/DaySuffix/2: do
-Date/DaySuffix/20: mo
-Date/DaySuffix/21: ro
-Date/DaySuffix/22: do
-Date/DaySuffix/23: ro
-Date/DaySuffix/24: to
-Date/DaySuffix/25: to
-Date/DaySuffix/26: to
-Date/DaySuffix/27: mo
-Date/DaySuffix/28: vo
-Date/DaySuffix/29: no
-Date/DaySuffix/3: ro
-Date/DaySuffix/30: mo
-Date/DaySuffix/31: ro
-Date/DaySuffix/4: to
-Date/DaySuffix/5: to
-Date/DaySuffix/6: to
-Date/DaySuffix/7: mo
-Date/DaySuffix/8: vo
-Date/DaySuffix/9: no
+Date/DaySuffix/1: º
+Date/DaySuffix/10: 
+Date/DaySuffix/11: 
+Date/DaySuffix/12: 
+Date/DaySuffix/13: 
+Date/DaySuffix/14: 
+Date/DaySuffix/15: 
+Date/DaySuffix/16: 
+Date/DaySuffix/17: 
+Date/DaySuffix/18: 
+Date/DaySuffix/19: 
+Date/DaySuffix/2: 
+Date/DaySuffix/20: 
+Date/DaySuffix/21: 
+Date/DaySuffix/22: 
+Date/DaySuffix/23: 
+Date/DaySuffix/24: 
+Date/DaySuffix/25: 
+Date/DaySuffix/26: 
+Date/DaySuffix/27: 
+Date/DaySuffix/28: 
+Date/DaySuffix/29: 
+Date/DaySuffix/3: 
+Date/DaySuffix/30: 
+Date/DaySuffix/31: 
+Date/DaySuffix/4: 
+Date/DaySuffix/5: 
+Date/DaySuffix/6: 
+Date/DaySuffix/7: 
+Date/DaySuffix/8: 
+Date/DaySuffix/9: 
 Date/Long/Day/0: domingo
 Date/Long/Day/1: lunes
 Date/Long/Day/2: martes
@@ -50,13 +50,13 @@ Date/Long/Month/6: junio
 Date/Long/Month/7: julio
 Date/Long/Month/8: agosto
 Date/Long/Month/9: septiembre
-Date/Short/Day/0: Dom
-Date/Short/Day/1: Lun
-Date/Short/Day/2: Mar
-Date/Short/Day/3: Mié
-Date/Short/Day/4: Jue
-Date/Short/Day/5: Vie
-Date/Short/Day/6: Sáb
+Date/Short/Day/0: Do
+Date/Short/Day/1: Lu
+Date/Short/Day/2: Ma
+Date/Short/Day/3: Mi
+Date/Short/Day/4: Ju
+Date/Short/Day/5: Vi
+Date/Short/Day/6: Sá
 Date/Short/Month/1: Ene
 Date/Short/Month/12: Dic
 Date/Short/Month/4: Abr
@@ -65,7 +65,7 @@ RelativeDate/Future/Days: dentro de <<period>> días
 RelativeDate/Future/Hours: en <<period>> horas
 RelativeDate/Future/Minutes: en <<period>> minutos
 RelativeDate/Future/Months: dentro de <<period>> meses
-RelativeDate/Future/Second: dentro de 1 segundo
+RelativeDate/Future/Second: en 1 segundo
 RelativeDate/Future/Seconds: en <<period>> segundos
 RelativeDate/Future/Years: dentro de <<period>> años
 RelativeDate/Past/Days: hace <<period>> días
diff --git a/languages/es-ES/Docs/ModuleTypes.multids b/languages/es-ES/Docs/ModuleTypes.multids
index 750e18361..fd15563ad 100644
--- a/languages/es-ES/Docs/ModuleTypes.multids
+++ b/languages/es-ES/Docs/ModuleTypes.multids
@@ -1,22 +1,22 @@
 title: $:/language/Docs/ModuleTypes/
 
-animation: Animaciones que pueden usarse con el RevealWidget.
-command: Comandos que pueden ser ejecutados en Node.js.
-config: Datos a ser insertados en `$tw.config`.
-filteroperator: Modos de operación individual de filtrado.
-global: Datos globales a ser insertados en `$tw`.
-isfilteroperator: Operandos para el operador de filtro ''is''.
-macro: Definiciones macro JavaScript.
-parser: Analizadores para diferentes tipos de contenido.
-saver: Guarda archivos desde el navegador en diferentes métodos.
+animation: Animaciones que pueden usarse con RevealWidget
+command: Comandos que pueden ejecutarse en Node.js
+config: Datos para insertar en `$tw.config`
+filteroperator: Operadores individuales de filtrado
+global: Datos globales para insertar en `$tw`
+isfilteroperator: Operandos para el operador ''is''
+macro: Definiciones macro de JavaScript.
+parser: Reglas sintácticas para diversos tipos de contenido.
+saver: Guarda archivos desde el navegador con diferentes métodos.
 startup: Funciones de inicio
-storyview: Personaliza la animación y comportamiento de las listas.
-tiddlerdeserializer: Convierte diferentes tipos de contenido en tiddlers.
-tiddlerfield: Define el comportamiento de un campo de tiddler individual.
-tiddlermethod: Añade métodos al tiddler prototipo `$tw.Tiddler`.
+storyview: Personaliza la animación y comportamiento de listas
+tiddlerdeserializer: Convierte diferentes tipos de contenido en tiddlers
+tiddlerfield: Define el comportamiento de un campo individual
+tiddlermethod: Añade métodos al prototipo `$tw.Tiddler`
 upgrader: Aplica la actualización a los tiddlers durante el proceso de actualización/importación.
-utils: Añade métodos a `$tw.utils`.
-utils-node: Añade métodos específicos de Node.js a `$tw.utils`.
-widget: Sintetiza representación y renovación de ''DOM''.
-wikimethod: Añade métodos a `$tw.Wiki`.
-wikirule: Reglas de análisis individual del analizador principal de WikiText.
+utils: Añade métodos a `$tw.utils`
+utils-node: Añade métodos específicos de Node.js a `$tw.utils`
+widget: Encapsula la representación y recarga de ''DOM''
+wikimethod: Añade métodos a `$tw.Wiki`
+wikirule: Reglas individuales del intérprete principal de WikiText
diff --git a/languages/es-ES/EditTemplate.multids b/languages/es-ES/EditTemplate.multids
index c5c664545..bb91c3f40 100644
--- a/languages/es-ES/EditTemplate.multids
+++ b/languages/es-ES/EditTemplate.multids
@@ -1,25 +1,28 @@
 title: $:/language/EditTemplate/
 
-Body/External/Hint: Este es un tiddler externo guardado fuera del archivo TiddlyWiki principal. Se puede editar las etiquetas y campos pero no se puede editar directamente el contenido
-Body/Hint: Usar [[texto wiki (instrucciones en inglés)|http://tiddlywiki.com/static/WikiText.html]] para añadir formato, imágenes y efectos dinámicos.
-Body/Placeholder: Escribir el texto de este tiddler
-Body/Preview/Button/Hide: ocultar vista previa
-Body/Preview/Button/Show: mostrar vista previa
-Field/Remove/Caption: eliminar campo
-Field/Remove/Hint: Eliminar campo
-Fields/Add/Button: añadir
-Fields/Add/Name/Placeholder: nombre del campo
-Fields/Add/Prompt: Añadir un nuevo campo:
-Fields/Add/Value/Placeholder: valor del campo
-Shadow/OverriddenWarning: Este es un tiddler oculto modificado. Puede restituirlo a su versión por defecto borrando este tiddler
-Shadow/Warning: Este es un tiddler oculto. Cualquier cambio que haga reemplazará la versión por defecto
-Tags/Add/Button: añadir
-Tags/Add/Placeholder: nombre de etiqueta
-Tags/Dropdown/Caption: lista de etiquetas
-Tags/Dropdown/Hint: Mostrar lista de etiquetas
-Type/Delete/Caption: borrar tipo de contenido
-Type/Delete/Hint: Borrar tipo de contenido
-Type/Dropdown/Caption: lista de tipos de contenido
-Type/Dropdown/Hint: Mostrar lista de tipos de contenido
-Type/Placeholder: tipo de contenido
+Body/External/Hint: Este es un tiddler externo, es decir, guardado fuera del archivo TiddlyWiki principal <br>
+Puedes editar sus etiquetas y campos, pero no se puede editar directamente el contenido
+Body/Placeholder: Escribe el texto aquí
+Body/Preview/Type/Output: Output
+Field/Remove/Caption: Eliminar campo
+Field/Remove/Hint: Elimina el campo y su valor
+Fields/Add/Button: Añadir campo
+Fields/Add/Dropdown/System: Campos de sistema
+Fields/Add/Dropdown/User: Campos de usuario
+Fields/Add/Name/Placeholder: Nombre
+Fields/Add/Prompt: Añadir
+Fields/Add/Value/Placeholder: Valor
+Shadow/OverriddenWarning: Este es un tiddler oculto modificado<br>
+Puedes restituirlo a su versión original eliminando este tiddler
+Shadow/Warning: Este es un tiddler oculto<br>
+Cualquier cambio que hagas reemplazará la versión original
+Tags/Add/Button: Añadir
+Tags/Add/Placeholder: Nombre
+Tags/Dropdown/Caption: Etiquetas
+Tags/Dropdown/Hint: Muestra la lista de etiquetas existentes
+Type/Delete/Caption: Borrar
+Type/Delete/Hint: Borra el tipo de contenido
+Type/Dropdown/Caption: Tipos de contenido
+Type/Dropdown/Hint: Muestra la lista de tipos disponibles
+Type/Placeholder: Nuevo tipo
 Type/Prompt: Tipo:
diff --git a/languages/es-ES/Exporters.multids b/languages/es-ES/Exporters.multids
new file mode 100644
index 000000000..3f2ab1189
--- /dev/null
+++ b/languages/es-ES/Exporters.multids
@@ -0,0 +1,6 @@
+title: $:/language/Exporters/
+
+CsvFile: Archivo de tipo .CSV
+JsonFile: Archivo de tipo .JSON
+StaticRiver: Cadena de tiddlers como .HTML estático
+TidFile: Tiddler individual como archivo ".tid" 
diff --git a/languages/es-ES/Fields.multids b/languages/es-ES/Fields.multids
index 50d185ac0..5b405ea22 100644
--- a/languages/es-ES/Fields.multids
+++ b/languages/es-ES/Fields.multids
@@ -1,35 +1,36 @@
 title: $:/language/Docs/Fields/
 
-_canonical_uri: El hipervínculo (URL) completo de un tiddler de imagen externo
-bag: El nombre de la bolsa de la que procede un tiddler
-caption: El texto que se muestra en una pestaña o botón
-color: El valor de color CSS asociado a un tiddler
-component: El nombre del componente responsable de un [[tiddler de alerta|AlertMechanism]]
-created: La fecha en que un tiddler fue creado
-creator: El nombre de la persona que creó un tiddler
-current-tiddler: Usado para almacenar el tiddler superior en una [[lista de historia|HistoryMechanism]]
-dependents: En una extensión, lista los títulos de las extensiones dependientes
-description: El texto descriptivo de una extensión, o un diálogo modal
-draft.of: En tiddlers en borrador, contiene el título del tiddler en que este borrador se encuentra basado
-draft.title: En tiddler en borrador, contiene el nuevo título propuesto para el tiddler
-footer: El texto al pie de página de un asistente de configuración
-hack-to-give-us-something-to-compare-against: Un campo de almacenamiento temporal usado en [[$:/core/templates/static.content]]
-icon: El título del tiddler que contiene el ícono asociado a un tiddler
-library: Si tiene "si" asignado, indica que un tiddler debería ser guardado como una colección de JavaScript
-list: Una lista ordenada de títulos de tiddlers asociados a un tiddler
-list-after: Si se encuentra asignado, el título del tiddler después de que este tiddler sea añadido a la lista ordenada de títulos de tiddler
-list-before: Si se encuentra asignado, el título de un tiddler antes de que este tiddler sea añadido a la lista ordenada de títulos de tiddler, o al comienzo de la lista si es que este campo se encuentra presente aunque vacío
-modified: La fecha y hora en que un tiddler fue modificado por última vez
-modifier: El título de tiddler asociado con la persona que modificó el tiddler por última vez
-name: El nombre legible associado con un tiddler extensión
-plugin-priority: Un valor numérico indicando la prioridad de un tiddler extensión
-plugin-type: El tipo de extensión en un tiddler extensión
-released: Fecha de publicación de una versión de TiddlyWiki
-revision: La revisión del tiddler retenido en el servidor
-source: El hipervínculo (URL) de origen asociado a un tiddler
-subtitle: El texto del subtítulo de un asistente de configuración
-tags: Una lista de etiquetas asociadas a un tiddler
-text: El texto principal de un tiddler
-title: El nombre único de un tiddler
-type: El tipo de contenido en un tiddler
-version: Información de la versión de una extensión
+_canonical_uri: Dirección (URI) completa -absoluta o relativa- de un tiddler externo de imagen
+bag: Nombre de la bolsa de la que procede un tiddler
+caption: Texto que se muestra en una pestaña o botón, con independencia del título del tiddler que lo define
+color: Valor CSS del color de fondo asociado a un tiddler
+component: Nombre del componente responsable de un [[tiddler de alerta|AlertMechanism]]
+created: Fecha de creación del tiddler
+creator: Nombre del autor del tiddler
+current-tiddler: Usado para incluir el tiddler superior en una [[historia|HistoryMechanism]]
+dependents: En un complemento o extensión, lista de sus dependencias
+description: Descripción de un complemento, extensión, o diálogo modal
+draft.of: Título del tiddler del que el actual es borrador
+draft.title: Nuevo título propuesto para el presente borrador
+footer: Texto al pie que figurará en un asistente
+hack-to-give-us-something-to-compare-against: Campo de almacenamiento temporal usado en [[$:/core/templates/static.content]]
+icon: Nombre del tiddler que contiene el icono que se quiere asociar al presente tiddler
+library: Si su valor es "Sí", indica que el tiddler debe guardarse como librería de JavaScript
+list: Lista ordenada de tiddlers asociados al presente tiddler
+list-after: Título del tiddler tras el que el presente será añadido a una lista de tiddlers.
+list-before: Título del tiddler antes del que el presente será añadido a una lista<br>
+Si el campo existe pero está vacío, el tiddler se añadirá al principio de la lista
+modified: Fecha y hora de última modificación
+modifier: Nombre del tiddler asociado con quien modificó por última vez el presente tiddler
+name: Nombre asociado con un complemento o extensión
+plugin-priority: Valor numérico que indica la prioridad de un complemento o extensión
+plugin-type: Tipo de complemento o extensión
+released: Fecha de la edición de TiddlyWiki
+revision: Revisión del tiddler existente en el servidor
+source: Dirección de la fuente asociada a un tiddler
+subtitle: Subtítulo que figurará en un asistente
+tags: Lista de etiquetas asignadas al tiddler
+text: Texto principal de un tiddler
+title: Nombre único de un tiddler
+type: Tipo de contenido en un tiddler
+version: Versión de un complemento o extensión
diff --git a/languages/es-ES/Filters.multids b/languages/es-ES/Filters.multids
index 11497c896..adc627df7 100644
--- a/languages/es-ES/Filters.multids
+++ b/languages/es-ES/Filters.multids
@@ -1,13 +1,14 @@
 title: $:/language/Filters/
 
-AllTags: Todas las etiquetas, salvo las de sistema
-AllTiddlers: Todos los tiddlers, salvo los de sistema
-Drafts: Tiddlers en borrador
-Missing: Tiddlers ausentes
+AllTags: Todas las etiquetas, excepto las de sistema
+AllTiddlers: Todos los tiddlers, excepto los de sistema
+Drafts: Borradores
+Missing: Tiddlers vacíos
 Orphans: Tiddlers huérfanos
-OverriddenShadowTiddlers: Tiddlers ocultos redefinidos
-RecentSystemTiddlers: Tiddlers recientemente modificados, incluyendo los de sistema
+OverriddenShadowTiddlers: Tiddlers ocultos anulados
+RecentSystemTiddlers: Tiddlers recientemente modificados, incluidos los de sistema
 RecentTiddlers: Tiddlers recientemente modificados
 ShadowTiddlers: Tiddlers ocultos
 SystemTags: Etiquetas de sistema
 SystemTiddlers: Tiddlers de sistema
+TypedTiddlers: Tiddlers que no sonWikiText
diff --git a/languages/es-ES/GettingStarted.tid b/languages/es-ES/GettingStarted.tid
index cb97c90ad..6eb420def 100644
--- a/languages/es-ES/GettingStarted.tid
+++ b/languages/es-ES/GettingStarted.tid
@@ -1,13 +1,18 @@
 title: GettingStarted
 
-Bienvenido a TiddlyWiki y a la comunidad TiddlyWiki.
+\define lingo-base() $:/language/ControlPanel/Basics/
+Bienvenido a TiddlyWiki y a su comunidad de usuarios
 
-Antes de que usted empiece a guardar información en TiddlyWiki es importante que se asegure que puede guardar cambios de manera fiable. Visite http://tiddlywiki.com/#GettingStarted para más información (en idioma inglés)
+Antes de guardar información importante en TiddlyWiki, es preciso que te asegures de poder hacerlo de manera fiable
 
-!! Configurar este TiddlyWiki
+Visita http://tiddlywiki.com/#GettingStarted para más información (en inglés)
+!! Configura este ~TiddlyWiki
+
+<div class="tc-control-panel">
 
 |<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
 |<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
-|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+</div>
 
-Vea más opciones en el panel de control.
+Consulta más opciones en el [[panel de control|$:/ControlPanel]]
diff --git a/languages/es-ES/Help/build.tid b/languages/es-ES/Help/build.tid
index 67229525f..9851c6a0c 100644
--- a/languages/es-ES/Help/build.tid
+++ b/languages/es-ES/Help/build.tid
@@ -1,11 +1,12 @@
 title: $:/language/Help/build
 description: Ejecuta automáticamente los comandos configurados
 
-Compila los objetivos especificados para el wiki actual. Si no se especifica ningún objetivo de compilado, todos los objetivos disponibles serán compilados
+Compila los targets que se especifican.<br>
+Si no se especifica ninguno, se incluirán todos los disponibles
 
 ```
 --build <target> [<target> ...]
 ```
 
-Los objetivos de compilado están definidos en el archivo `tiddlywiki.info` de un folder wiki.
+Los targets se definen en el archivo `tiddlywiki.info`
 
diff --git a/languages/es-ES/Help/clearpassword.tid b/languages/es-ES/Help/clearpassword.tid
index 728404eeb..133b55c38 100644
--- a/languages/es-ES/Help/clearpassword.tid
+++ b/languages/es-ES/Help/clearpassword.tid
@@ -1,7 +1,7 @@
 title: $:/language/Help/clearpassword
-description: Anula la contraseña de las operaciones de encriptado subsiguientes
+description: Anula la contraseña de las operaciones de cifrado subsiguientes
 
-Anula la contraseña de las operaciones de encriptado subsiguientes
+Revoca la contraseña de las operaciones subsiguientes de cifrado
 ```
 --clearpassword
 ```
diff --git a/languages/es-ES/Help/editions.tid b/languages/es-ES/Help/editions.tid
index b6539f7f5..e9de23814 100644
--- a/languages/es-ES/Help/editions.tid
+++ b/languages/es-ES/Help/editions.tid
@@ -1,7 +1,8 @@
 title: $:/language/Help/editions
-description: Lista las ediciones de TiddlyWiki disponibles
+description: Devuelve una lista de ediciones disponibles de TiddlyWiki
 
-Lista los nombres y descripciones de las ediciones disponibles. Usted puede crear un nuevo wiki de una edición específica con el comando `--init`.
+Lista y descripción de las ediciones disponibles.<br>
+Puedes crear una edición específica con el comando `--init`.
 
 ```
 --editions
diff --git a/languages/es-ES/Help/help.tid b/languages/es-ES/Help/help.tid
index 73af016c5..38dbbf9da 100644
--- a/languages/es-ES/Help/help.tid
+++ b/languages/es-ES/Help/help.tid
@@ -1,10 +1,10 @@
 title: $:/language/Help/help
 description: Muestra texto de ayuda para comandos de TiddlyWiki
 
-Muestra texto de ayuda para un comando:
+Muestra ayuda para un comando:
 
 ```
 --help [<command>]
 ```
 
-Si el nombre del comando es omitido entonces una lista de comandos es mostrada.
+Si se omite el comando, se muestra una lista de comandos disponibles
diff --git a/languages/es-ES/Help/init.tid b/languages/es-ES/Help/init.tid
index 72fa99d67..afc85f7cc 100644
--- a/languages/es-ES/Help/init.tid
+++ b/languages/es-ES/Help/init.tid
@@ -1,7 +1,7 @@
 title: $:/language/Help/init
-description: Inicializa un nueva folder wiki
+description: Inicializa un nuevo WikiFolder
 
-Inicializa una [[WikiFolder|WikiFolders]] con una copia de la edición especificada.
+Inicializa una [[WikiFolder|WikiFolders]] con una copia en blanco de la edición especificada.
 
 ```
 --init <edition> [<edition> ...]
@@ -15,9 +15,15 @@ tiddlywiki ./MyWikiFolder --init empty
 
 Nota:
 
-* El directorio del folder wiki será creado si es necesario
-* La "edition" por defecto es ''empty''
-* El comando init fallará si el folder wiki no está vacío
-* El comando init remueve cualquier definición de `includeWikis` contenida en el archivo `tiddlywiki.info`
-* Cuando se especifiquen múltiples ediciones, las ediciones inicializadas posteriormente sobreescribirán cualquier archivo compartido con las ediciones anteriores (de modo que el archivo `tiddlywiki.info` final será copiado de la última edición)
+* Se creará un directorio para el wiki si es necesario
+
+* La edición por defecto es ''empty''
+
+* El comando `--init` fallará si el directorio no está vacío
+
+* El comando `--init` elimina toda definición de `includeWikis` contenida en el archivo `tiddlywiki.info`
+
+* Cuando se indican varias ediciones para su inicialización, las ediciones //planchan// sucesivamente todo archivo compartido, de modo que el 
+archivo `tiddlywiki.info` final será el que corresponda a la última edición que se indique.
+
 * `--editions` muestra una lista de ediciones disponibles
diff --git a/languages/es-ES/Help/load.tid b/languages/es-ES/Help/load.tid
index d7cfb995f..92a66832a 100644
--- a/languages/es-ES/Help/load.tid
+++ b/languages/es-ES/Help/load.tid
@@ -7,10 +7,10 @@ Carga tiddlers de archivos de tipo TiddlyWiki 2.x.x.(`.html`), `.tiddler`, `.tid
 --load <filepath>
 ```
 
-Para cargar tiddlers de un archivo TiddlyWiki encriptado, debe primero especificar la contraseña con el comando PasswordCommand. Por ejemplo:
+Para cargar tiddlers de un TiddlyWiki encriptado, primero debes especificar la contraseña con el comando PasswordCommand. Por ejemplo:
 
 ```
 tiddlywiki ./MyWiki --password pa55w0rd --load my_encrypted_wiki.html
 ```
 
-Tenga en cuenta que TTiddlyWiki no cargará una versión más antigua de una extensión que haya sido cargada anteriormente.
+Ten en cuenta que TiddlyWiki no carga complementos o extensiones anteriores a los ya cargados. 
diff --git a/languages/es-ES/Help/makelibrary.tid b/languages/es-ES/Help/makelibrary.tid
index 1e89fc1d6..894752d5e 100644
--- a/languages/es-ES/Help/makelibrary.tid
+++ b/languages/es-ES/Help/makelibrary.tid
@@ -1,14 +1,16 @@
 title: $:/language/Help/makelibrary
-description: Construye la colección de extensiones requerida para proceso de actualización
+description: Compila la librería de plugins necesaria para actualizar TiddlyWiki
 
-Construye el tiddler `$:/UpgradeLibrary` (colección de actualización) para el proceso de actualización.
+
+Construye el tiddler `$:/UpgradeLibrary`: librería de actualización
  
-La colección de actualización está formateada como un tiddler de extensión ordinario con el tipo de extensión `library`. Este contiene una copia de cada una de las extensiones, temas y paquetes de idioma disponibles en el repositorio de TiddlyWiki5.
+La librería de actualización tiene formato de plugin ordinario, de tipo `library`<br>
+Contiene copia de cada uno de los plugins, temas y paquetes de idioma disponibles en el repositorio de TiddlyWiki5
 
-Este comando está previsto para uso interno; sólo es relevante para usuarios que estén compilando un procedimiento personalizado de actualización. 
+Este comando es, en principio, para uso interno del equipo de TiddlyWiki y sólo es de interés para aquellos usuarios que deseen compilar actualizaciones personalizadas
 
 ```
 --makelibrary <title>
 ```
 
-El argumento del título por defecto es `$:/UpgradeLibrary`.
+El título por defecto del tiddler resultante es `$:/UpgradeLibrary`.
diff --git a/languages/es-ES/Help/notfound.tid b/languages/es-ES/Help/notfound.tid
index 76bd187e9..aa884d281 100644
--- a/languages/es-ES/Help/notfound.tid
+++ b/languages/es-ES/Help/notfound.tid
@@ -1,4 +1,4 @@
 title: $:/language/Help/notfound
 description: 
 
-No existe dicho elemento de ayuda
\ No newline at end of file
+No existe tal elemento
\ No newline at end of file
diff --git a/languages/es-ES/Help/output.tid b/languages/es-ES/Help/output.tid
index 37748ed52..d04057a9a 100644
--- a/languages/es-ES/Help/output.tid
+++ b/languages/es-ES/Help/output.tid
@@ -1,10 +1,12 @@
 title: $:/language/Help/output
-description: Establece el directorio de salida para comandos subsiguientes
+description: Establece el directorio de salida para los comandos siguientes
 
-Establece el directorio de salida para comandos subsiguientes. El directorio por defecto es el subdirectorio `output`, en el directorio de la edición.
+Establece el directorio de salida para los comandos que le siguen <br>
+El directorio por defecto es el subdirectorio `output`, en el directorio del wiki
 
 ```
 --output <pathname>
 ```
 
-Si la ruta especificada es relativa, se interpreta como relativa al directorio de trabajo actual. Por ejemplo: `--output .` establece como directorio de salida al directorio de trabajo actual. 
+Si la ruta especificada es relativa, se interpreta como relativa al directorio actual de trabajo<br>
+Por ejemplo: `--output .` establece como directorio de salida el actual directorio de trabajo
diff --git a/languages/es-ES/Help/password.tid b/languages/es-ES/Help/password.tid
index 86f6a1d1c..e6d865408 100644
--- a/languages/es-ES/Help/password.tid
+++ b/languages/es-ES/Help/password.tid
@@ -1,7 +1,7 @@
 title: $:/language/Help/password
-description: Establece contraseña para operaciones de encriptado subsiguientes
+description: Establece contraseña para operaciones de cifrado subsiguientes
 
-Establece contraseña para las operaciones de encriptado subsiguientes
+Establece contraseña para las operaciones subsiguientes de cifrado
 
 ```
 --password <password>
diff --git a/languages/es-ES/Help/rendertiddler.tid b/languages/es-ES/Help/rendertiddler.tid
index 7d428460b..6ae1c2d9c 100644
--- a/languages/es-ES/Help/rendertiddler.tid
+++ b/languages/es-ES/Help/rendertiddler.tid
@@ -1,12 +1,13 @@
 title: $:/language/Help/rendertiddler
-description: Genera un tiddler individual en uno de un determinado ContentType
+description: Genera un tiddler del ContentType que se especifique
 
-Genera un tiddler individual en uno de un determinado ContentType (por defecto `text/html`) y lo guarda en el nombre de archivo especificado:
+Genera un tiddler del ContentType que se especifique (por defecto `text/html`) y lo guarda con el nombre de archivo especificado
 
 ```
 --rendertiddler <title> <filename> [<type>]
 ```
 
-Por defecto, el nombre de archivo es relativo al subdirectorio `output` (de salida) en el directorio de edición. Puede usarse el comando `--output` para dirigir la salida a otro directorio diferente.
+Por defecto, el nombre de archivo es relativo al subdirectorio `output` en el directorio del wiki<br>
+Puede usarse el comando `--output` para dirigir la salida a cualquier otro directorio
 
-Directorios no existentes en la ruta al nombre de archivo son creados automáticamente.
+Los directorios no existentes en la ruta del nombre de archivo se crean automáticamente.
diff --git a/languages/es-ES/Help/rendertiddlers.tid b/languages/es-ES/Help/rendertiddlers.tid
index 78bb2fae4..6c35c6acc 100644
--- a/languages/es-ES/Help/rendertiddlers.tid
+++ b/languages/es-ES/Help/rendertiddlers.tid
@@ -1,7 +1,7 @@
 title: $:/language/Help/rendertiddlers
 description: Genera tiddlers coincidentes con un determinado ContentType
 
-Genera un conjunto de tiddlers que coinciden con el argumento de un filtro para separar tiddlers de un determinado ContentType (por defecto `text/html`) y extensión de archivo (defaults to `.html`).
+Genera un conjunto de tiddlers de un determinado ContentType (por defecto `text/html`) y extensión de archivo (por defecto, `.html`), coincidentes con el argumento de un filtro
 
 ```
 --rendertiddlers <filter> <template> <pathname> [<type>] [<extension>]
@@ -13,6 +13,8 @@ Por ejemplo:
 --rendertiddlers [!is[system]] $:/core/templates/static.tiddler.html ./static text/plain
 ```
 
-Por defecto, la ruta es relativa al subdirectorio `output` (de salida) del directorio de edición. Puede usarse con el comando `--output` para dirigir la salida a un directorio diferente.
+Por defecto, la ruta es relativa al subdirectorio `output` del directorio del wiki<br>
+Puede usarse con el comando `--output` para dirigir la salida a un directorio diferente
 
-Cualquier archivo existente en el directorio de destino será borrado. El directorio de destino es creado automáticamente si no existiera.
+Cualquier archivo existente en el directorio de destino será borrado<br>
+Los directorios no existentes en la ruta del nombre de archivo se crean automáticamente.
diff --git a/languages/es-ES/Help/savetiddler.tid b/languages/es-ES/Help/savetiddler.tid
index 7ff3a412b..ab1ca6539 100644
--- a/languages/es-ES/Help/savetiddler.tid
+++ b/languages/es-ES/Help/savetiddler.tid
@@ -1,12 +1,13 @@
 title: $:/language/Help/savetiddler
 description: Guarda un tiddler en un archivo
 
-Guarda un tiddler individual en formato binario o como texto plano en el nombre de archivo especificado.
+Guarda un tiddler individual en formato binario o como texto plano con el nombre de archivo especificado.
 
 ```
 --savetiddler <title> <filename>
 ```
 
-Por defecto, el nombre de archivo es relativo al subdirectorio `output` del directorio de edición. El comando `--output` puede ser usado para dirigir la salida a un directorio diferente.
+Por defecto, la ruta es relativa al subdirectorio `output` del directorio del wiki<br>
+Puede usarse con el comando `--output` para dirigir la salida a un directorio diferente
 
-Directorios no existentes en la ruta al nombre de archivo son creados automáticamente.
+Los directorios no existentes en la ruta del nombre de archivo se crean automáticamente.
diff --git a/languages/es-ES/Help/savetiddlers.tid b/languages/es-ES/Help/savetiddlers.tid
index 7331bc4ee..0c3b6bf2f 100644
--- a/languages/es-ES/Help/savetiddlers.tid
+++ b/languages/es-ES/Help/savetiddlers.tid
@@ -1,5 +1,5 @@
 title: $:/language/Help/savetiddlers
-description: Guarda un grupo de tiddlers en formato plano en un directorio
+description: Guarda un grupo de tiddlers de formato plano en un directorio
 
 Guarda un grupo de tiddlers en formato binario o como texto plano en el directorio especificado.
 
@@ -7,6 +7,7 @@ Guarda un grupo de tiddlers en formato binario o como texto plano en el director
 --savetiddlers <filter> <pathname>
 ```
 
-Por defecto, la ruta es relativa al subdirectorio `output` del directorio de edición. El comando `--output` puede ser usado para dirigir la salida a un directorio diferente.
+Por defecto, la ruta es relativa al subdirectorio `output` del directorio del wiki<br>
+Puede usarse con el comando `--output` para dirigir la salida a un directorio diferente
 
-Directorios no existentes en la ruta al nombre de archivo son creados automáticamente.
+Los directorios no existentes en la ruta del nombre de archivo se crean automáticamente.
diff --git a/languages/es-ES/Help/server.tid b/languages/es-ES/Help/server.tid
index de87f7be7..8634c9e2a 100644
--- a/languages/es-ES/Help/server.tid
+++ b/languages/es-ES/Help/server.tid
@@ -3,7 +3,8 @@ description: Proporciona interfaz de servidor HTTP a TiddlyWiki
 
 El servidor compilado para TiddlyWiki5 es muy simple. Aunque es compatible con TiddlyWeb, no soporta muchas de las características necesarias para un uso robusto en Internet. 
 
-En la raíz, sirve una generación de un tiddler específico. Fuera de la raíz, sirve tiddlers individuales codificados en JSON, y soporta operaciones básicas HTTP de `GET`, `PUT` y `DELETE`.
+En la raíz, sirve un tiddler específico<br>
+Fuera de la raíz, sirve tiddlers individuales codificados en JSON, y soporta operaciones básicas HTTP de `GET`, `PUT` y `DELETE`.
 
 ```
 --server <port> <roottiddler> <rendertype> <servetype> <username> <password> <host> <pathprefix>
@@ -12,15 +13,15 @@ En la raíz, sirve una generación de un tiddler específico. Fuera de la raíz,
 Los parámetros son
 
 * ''port'' - número de puerto desde el que sirve (por defecto, "8080")
-* ''roottiddler'' - el tiddler a servir desde la raíz (por defecto, "$:/core/save/all")
-* ''rendertype'' - el tipo de contenido hacia donde el tiddler raíz debería ser generado (por defecto "text/plain")
-* ''servetype'' - el tipo de contenido con el que tiddler raíz debería ser servido (por defecto "text/html")
-* ''username'' - el nombre de usuario por defecto que firma la edición
+* ''roottiddler'' - tiddler que se sirve desde la raíz (por defecto, "$:/core/save/all")
+* ''rendertype'' - tipo de contenido con el que se genera el tiddler raíz (por defecto "text/plain")
+* ''servetype'' - tipo de contenido con el que se sirve el tiddler raíz (por defecto "text/html")
+* ''username'' - nombre de usuario por defecto que firma la edición
 * ''password'' - contraseña opcional para autenticación básica
 * ''host'' - nombre opcional del servidor desde el que se sirve (por defecto, "127.0.0.1" o "localhost")
 * ''pathprefix'' - prefijo opcional para rutas
 
-Si el parámetro de contraseña es especificado entonces el buscador preguntará al usuario por el nombre de usuario y la contraseña. Notar que la contraseña es transmitida en modo texto por lo que esta implementación no es apropiada para uso general.
+Si se ha definido contraseña, el navegador pedirá que se introduzca nombre y contraseña. <br>Nótese que la contraseña se transmite en modo texto por lo que esta implementación no es apropiada para uso general.
 
 Por ejemplo:
 
@@ -34,4 +35,4 @@ El nombre de usuario y la contraseña pueden ser especificados como cadenas de s
 --server 8080 $:/core/save/all text/plain text/html "" "" 192.168.0.245
 ```
 
-Para ejecutar simultáneamente múltiples servidores TiddlyWiki, usted deberá configurar cada uno en un puerto diferente.
+Para ejecutar simultáneamente múltiples servidores TiddlyWiki, deberán configurarse cada uno en un puerto diferente
diff --git a/languages/es-ES/Help/setfield.tid b/languages/es-ES/Help/setfield.tid
index 268ee67e4..b354af3ab 100644
--- a/languages/es-ES/Help/setfield.tid
+++ b/languages/es-ES/Help/setfield.tid
@@ -1,15 +1,15 @@
 title: $:/language/Help/setfield
 description: Prepara tiddlers externos para su uso
 
-//Notar que este comando es experimental y puede cambiar o ser reemplazado antes de que vaya a ser finalizado//
+//Téngase en cuenta que este comando es experimental y puede cambiar o ser reemplazado//
 
-Configura el campo especificado de un grupo de tiddlers al resultado de "wikify" un tiddler plantilla con la variable `currentTiddler` configurada al tiddler.
+Configura el campo especificado de un grupo de tiddlers como resultado de una plantilla con la variable `currentTiddler`
 
 ```
 --setfield <filter> <fieldname> <templatetitle> <rendertype>
 ```
 
-Los parámetros son:
+Sus parámetros son:
 
 * ''filter'' - filtro que identifica los tiddlers que se verán afectados
 * ''fieldname'' - el campo que será modificado (por defecto, "text")
diff --git a/languages/es-ES/Help/unpackplugin.tid b/languages/es-ES/Help/unpackplugin.tid
index 4efa445bf..71032e7d0 100644
--- a/languages/es-ES/Help/unpackplugin.tid
+++ b/languages/es-ES/Help/unpackplugin.tid
@@ -1,7 +1,7 @@
 title: $:/language/Help/unpackplugin
-description: Desenpaqueta los tiddlers de carga de una extensión
+description: Desenpaqueta los tiddlers de carga de un plugin
 
-Extrae los tiddlers de carga de una extensión, creándolos como tiddlers ordinarios: 
+Extrae los tiddlers de un plugin y los presenta como tiddlers ordinarios
 
 ```
 --unpackplugin <title>
diff --git a/languages/es-ES/Help/verbose.tid b/languages/es-ES/Help/verbose.tid
index b0f6d459c..6bc334689 100644
--- a/languages/es-ES/Help/verbose.tid
+++ b/languages/es-ES/Help/verbose.tid
@@ -1,7 +1,7 @@
 title: $:/language/Help/verbose
-description: Genera modo de salida en texto indefinido
+description: Activa el modo de salida como texto indefinido
 
-Genera texto indefinido, útil para identificar errores
+Genera texto aleatorio, útil para depurar errores
 
 ```
 --verbose
diff --git a/languages/es-ES/Help/version.tid b/languages/es-ES/Help/version.tid
index 06b273bb4..3ea0bcb27 100644
--- a/languages/es-ES/Help/version.tid
+++ b/languages/es-ES/Help/version.tid
@@ -1,7 +1,7 @@
 title: $:/language/Help/version
-description: Muestra el número de la versión de TiddlyWiki.
+description: Muestra el número de versión de TiddlyWiki
 
-Muestra el número de la versión de TiddlyWiki.
+Muestra el número de versión de TiddlyWiki
 
 ```
 --version
diff --git a/languages/es-ES/Import.multids b/languages/es-ES/Import.multids
index 8eee8380e..0c623b69b 100644
--- a/languages/es-ES/Import.multids
+++ b/languages/es-ES/Import.multids
@@ -1,14 +1,15 @@
 title: $:/language/Import/
 
+Imported/Hint:  Se importaron los siguientes tiddlers
 Listing/Cancel/Caption: Cancelar
-Listing/Hint: Estos tiddlers están listos para ser importados:
+Listing/Hint: Tiddlers listos para importar
 Listing/Import/Caption: Importar
 Listing/Select/Caption: Seleccionar
 Listing/Status/Caption: Estado
 Listing/Title/Caption: Título
-Upgrader/Plugins/Suppressed/Incompatible: Extensión incompatible u obsoleta bloqueada
-Upgrader/Plugins/Suppressed/Version: Extensión bloqueada (debido a que la <<incoming>> extensión es más antigua que la <<existing>> extensión)
-Upgrader/Plugins/Upgraded: Extensión actualizada de <<incoming>> a <<upgraded>>
+Upgrader/Plugins/Suppressed/Incompatible: Plugin bloqueado, incompatible u obsoleto
+Upgrader/Plugins/Suppressed/Version: Plugin bloqueado debido a que <<incoming>> es más antiguo que el <<existing>>
+Upgrader/Plugins/Upgraded: Plugin actualizado de <<incoming>> a <<upgraded>>
 Upgrader/State/Suppressed: Tiddler temporal bloqueado
 Upgrader/System/Suppressed: Tiddler de sistema bloqueado
 Upgrader/ThemeTweaks/Created: Ajuste de tema migrado de <$text text=<<from>>/>
diff --git a/languages/es-ES/Misc.multids b/languages/es-ES/Misc.multids
index ccec03df7..cb0bad3a1 100644
--- a/languages/es-ES/Misc.multids
+++ b/languages/es-ES/Misc.multids
@@ -1,27 +1,49 @@
 title: $:/language/
 
+AboveStory/ClassicPlugin/Warning: Parece que quieres cargar un plugin diseñado para ~TiddlyWiki Classic. <br>
+Ten en cuenta que [[estos plugins no funcionan en TiddlyWiki version 5.x.x|http://tiddlywiki.com/#TiddlyWikiClassic]]<br>
+Plugins de ~TiddlyWiki Classic detectados
 BinaryWarning/Prompt: Este tiddler contiene datos binarios
-ClassicWarning/Hint: Este tiddler está escrito en formato de texto de una versión de TiddlyWiki Classic, que no es totalmente compatible con la versión 5 de TiddlyWiki. Visite http://tiddlywiki.com/static/Upgrading.html para más detalles.
-ClassicWarning/Upgrade/Caption: actualizar
-CloseAll/Button: cerrar todo
-ConfirmCancelTiddler: ¿Desea descartar los cambios efectuados en el tiddler "<$text text=<<title>>/>"?
-ConfirmDeleteTiddler: ¿Desea borrar el tiddler "<$text text=<<title>>/>"?
-ConfirmEditShadowTiddler: Usted está punto de editar un tiddler oculto (ShadowTiddler). Cualquier cambio afectará el sistema predeterminado por defecto poniendo en riesgo futuras actualizaciones del sistema. ¿Está usted seguro que desea editar "<$text text=<<title>>/>"?
-ConfirmOverwriteTiddler: ¿Desea sobreescribir el tiddler "<$text text=<<title>>/>"?
+ClassicWarning/Hint: Este tiddler está escrito en formato de texto de una versión de TiddlyWiki Classic que no es totalmente compatible con la versión 5 de TiddlyWiki<br>
+Visite http://tiddlywiki.com/static/Upgrading.html para más información
+ClassicWarning/Upgrade/Caption: Actualizar
+CloseAll/Button: Cerrar todo
+ColourPicker/Recent: Recientes:
+ConfirmCancelTiddler: ¿Deseas descartar los cambios efectuados en "<$text text=<<title>>/>"?
+ConfirmDeleteTiddler: ¿Deseas borrar "<$text text=<<title>>/>"?
+ConfirmEditShadowTiddler: Estás a punto de editar un tiddler oculto<br>
+Todo cambio en él afectará al sistema por defecto y pondrá en riesgo futuras actualizaciones del sistema<br>
+¿Estás seguro de querer editar "<$text text=<<title>>/>"?
+ConfirmOverwriteTiddler: ¿Deseas sobreescribir "<$text text=<<title>>/>"?
+Count: Número
 DefaultNewTiddlerTitle: Nuevo Tiddler
-DropMessage: Suéltelo aquí (o pulse ''ESC'' para cancelar)
-Encryption/ConfirmClearPassword: ¿Desea usted borrar la contraseña? Esto removerá el cifrado que se aplica cuando se guarda este wiki
-Encryption/PromptSetPassword: Especificar una nueva contraseña para este TiddlyWiki
-Exporters/CsvFile: Archivo de tipo .CSV
-Exporters/JsonFile: Archivo de tipo .JSON
-Exporters/StaticRiver: Cadena de tiddlers como archivo estático .HTML
-Exporters/TidFile: Tiddler individual como archivo ".tid" 
-InvalidFieldName: Caracteres ilegales en el campo "<$text text=<<fieldName>>/>". Los campos sólo pueden contener letras en minúscula, dígitos y los caracteres guión bajo (`_`), guión corto (`-`) y punto (`.`)
-MissingTiddler/Hint: El tiddler "<$text text=<<currentTiddler>>/>" no existe - haga clic en {{$:/core/images/edit-button}} para crearlo
+DropMessage: Suéltalo aquí o pulsa ''ESC'' para cancelar
+Encryption/Cancel: Cancelar
+Encryption/ConfirmClearPassword: ¿Deseas borrar la contraseña? <br>
+Revocarás el cifrado que se aplica para guardar este wiki
+Encryption/Password: Contraseña
+Encryption/PasswordNoMatch: Las contraseñas no coinciden
+Encryption/PromptSetPassword: Especifica nueva contraseña para este TiddlyWiki
+Encryption/RepeatPassword: Repite la contraseña
+Encryption/SetPassword: Establecer contraseña
+Encryption/Username: Usuario
+InternalJavaScriptError/Hint: Tenemos un problema. Se recomienda que reinicies TiddlyWiki
+InternalJavaScriptError/Title: Error interno de JavaScript
+InvalidFieldName: Caracteres ilegales en el campo "<$text text=<<fieldName>>/>"<br>
+Los campos sólo pueden contener letras en minúscula, dígitos y los caracteres guión bajo (`_`), guión corto (`-`) y punto (`.`)
+LazyLoadingWarning: <p>Cargando texto externo desde ''<$text text={{!!_canonical_uri}}/>''</p><p>Si este mensaje no desaparece, puede que se deba a que estás usando un navegador que con esta configuración no permite texto externo</br>
+Vea http://tiddlywiki.com/#ExternalText</p>
+MissingTiddler/Hint: El tiddler "<$text text=<<currentTiddler>>/>" no existe - haz clic en {{$:/core/images/edit-button}} para crearlo
+OfficialPluginLibrary: Librería de plugins oficiales de ~TiddlyWiki
+OfficialPluginLibrary/Hint: Librería de plugins oficiales de ~TiddlyWiki en tiddlywiki.com<br>
+Plugins, temas y paquetes de idioma que mantiene el equipo de TiddlyWiki
+PluginReloadWarning: Guarda {{$:/core/ui/Buttons/save-wiki}} y recarga {{$:/core/ui/Buttons/refresh}} para que los cambios surtan efecto.
 RecentChanges/DateFormat: DD MMM YYYY
 SystemTiddler/Tooltip: Este es un tiddler de sistema
 TagManager/Colour/Heading: Color
-TagManager/Icon/Heading: Ícono
+TagManager/Count/Heading: Número
+TagManager/Icon/Heading: Icono
 TagManager/Info/Heading: Información
 TagManager/Tag/Heading: Etiqueta
-UnsavedChangesWarning: Usted tiene cambios sin guardar en TiddlyWiki
+Tiddler/DateFormat: DD MMM YYYY a las hh:0mm
+UnsavedChangesWarning: Tienes cambios sin guardar en TiddlyWiki
diff --git a/languages/es-ES/Modals/Download.tid b/languages/es-ES/Modals/Download.tid
index 6fda2101f..8e5e3a390 100644
--- a/languages/es-ES/Modals/Download.tid
+++ b/languages/es-ES/Modals/Download.tid
@@ -4,10 +4,11 @@ subtitle: Download changes
 footer: <$button message="tm-close-tiddler">Close</$button>
 help: http://tiddlywiki.com/static/DownloadingChanges.html
 
-Su navegador de internet solamente soporta guardado en forma manual.
+Tu navegador sólo permite guardar manualmente
 
-Para guardar su wiki modificado, haga clic con el botón derecho en enlace abajo indicado y seleccione "Descargar archivo" o "guardar archivo" y seleccione el folder y el nombre de archivo.
+Para guardar el wiki, haz clic con el botón derecho en el enlace de más abajo y selecciona "Descargar archivo" o "Guardar enlace como..." y selecciona a continuación la carpeta y el nombre que quieres darle
 
-//Usted puede acelerar ligeramente estas acciones haciendo clic en el enlace conjuntamente con la tecla "Control" (Windows) o con la tecla "option" (Mac OS X). No se le preguntará por el directorio o nombre de archivo, pero su navegador le asignará automáticamente un nombre probablemente irreconocible -- usted necesitará cambiar el nombre del archivo e incluir la extensión de archivo `.html` para poder usarlo.//
+//Puedes acelerar ligeramente estas acciones haciendo clic en el enlace conjuntamente con la tecla "Control" (Windows) o con la tecla "Option" (Mac OS X)<br>
+No se te pedirán carpeta ni nombre, sino que se asignará automáticamente un nombre probablemente irreconocible -- necesitarás cambiar el nombre y darle extensión `.html` para usarlo//
 
-En el caso de teléfonos celulares que no permiten bajar archivos usted puede en este caso marcar el enlace como favorito, y luego sincronizar su lista de favoritos con su ordenador desde el cual se puede bajar o guardar el wiki en forma normal.
+En el caso de teléfonos móviles que no permiten la descarga de archivos, puedes marcar el enlace como favorito y luego sincronizar favoritos con tu ordenador y descargarlo normalmente desde ahí
diff --git a/languages/es-ES/Modals/SaveInstructions.tid b/languages/es-ES/Modals/SaveInstructions.tid
index d712f657f..067156fd8 100644
--- a/languages/es-ES/Modals/SaveInstructions.tid
+++ b/languages/es-ES/Modals/SaveInstructions.tid
@@ -4,19 +4,19 @@ subtitle: Save your work
 footer: <$button message="tm-close-tiddler">Close</$button>
 help: http://tiddlywiki.com/static/SavingChanges.html
 
-Sus cambios efectuados a este wiki necesitan ser guardados como un archivo ~TiddlyWiki HTML.
+Los cambios realizados a este wiki necesitan ser guardados como archivo ~TiddlyWiki HTML.
 
 !!! Navegadores de ordenador
 
-# Seleccione ''Guardar como'' en el menú ''Archivo''
-# Eliga nombre de archivo y directorio
-#* Algunos navegadores piden también que especifique el formato de archivo como ''Página web, sólo HTML'' o similar
-# Cierre esta pestaña
+# Selecciona ''Guardar como'' en el menú ''Archivo''
+# Elige nombre de archivo y directorio
+#* Algunos navegadores también piden que especifiques el formato como ''Página web, sólo HTML'' o similar
+# Cierra esta pestaña
 
 !!! Navegadores en teléfonos o tabletas
 
-# Añada la página a sus favoritos
-#* Si tiene iCloud o Google Sync los favoritos se sincronizarán automáticamente con su ordenador, desde donde puede abrirlos o guardarlos como se explica más arriba
-# Cierre esta pestaña
+# Añade la página a tus favoritos
+#* Si tienes iCloud o Google Sync los favoritos se sincronizarán automáticamente con tu ordenador, desde donde puedes abrirlos o guardarlos como se explica más arriba
+# Cierra esta pestaña
 
-//Si en Mobile Safari vuelve a abrir los favoritos, volverá a ver este mensaje. Si quiere contiuar y usar el archivo, simplemente cierre haciendo clic en el boton de cerrar indicado abajo.//
+//Si en Mobile Safari vuelves a abrir los favoritos, volverás a ver este mensaje. Si quieres continuar y usar el archivo, simplemente cierra haciendo clic en el boton de cerrar indicado abajo.//
diff --git a/languages/es-ES/Notifications.multids b/languages/es-ES/Notifications.multids
index 80e1e644d..c699dd0d0 100644
--- a/languages/es-ES/Notifications.multids
+++ b/languages/es-ES/Notifications.multids
@@ -1,4 +1,4 @@
 title: $:/language/Notifications/
 
-Save/Done: Wiki guardado
-Save/Starting: Empezando a guardar wiki
+Save/Done: Guardado
+Save/Starting: Comenzando a guardar
diff --git a/languages/es-ES/Search.multids b/languages/es-ES/Search.multids
index 96f089222..73edfb949 100644
--- a/languages/es-ES/Search.multids
+++ b/languages/es-ES/Search.multids
@@ -2,15 +2,18 @@ title: $:/language/Search/
 
 DefaultResults/Caption: Lista
 Filter/Caption: Filtro
-Filter/Hint: Búsqueda por medio de una [[expresión de filtrado|http://tiddlywiki.com/static/Filters.html]]
-Filter/Matches: //<small><<resultCount>> hace juego con</small>//
-Matches: //<small><<resultCount>> hace juego con</small>//
+Filter/Hint: Búsqueda por medio de [[expresiones de filtrado|http://tiddlywiki.com/static/Filters.html]] <small> (instrucciones en inglés)</small>
+Filter/Matches: //<small><<resultCount>> coincidencias</small>//
+Matches: //<small><<resultCount>> coincidencias </small>//
+Matches/All: Cualquier coincidencia
+Matches/Title: En título
+Search: Búsqueda
 Shadows/Caption: Ocultos
-Shadows/Hint: Búsqueda por tiddlers ocultos
-Shadows/Matches: //<small><<resultCount>> hace juego con</small>//
+Shadows/Hint: Busca en los tiddlers ocultos
+Shadows/Matches: //<small><<resultCount>> coincidencias </small>//
 Standard/Caption: Estándar
-Standard/Hint: Búsqueda por tiddlers estándar
-Standard/Matches: //<small><<resultCount>> hace juego con</small>//
+Standard/Hint: Busca en los tiddlers estándar
+Standard/Matches: //<small><<resultCount>> coincidencias </small>//
 System/Caption: Sistema
-System/Hint: Búsqueda por tiddlers de sistema
-System/Matches: //<small><<resultCount>> hace juego con</small>//
+System/Hint: Busca en los tiddlers de sistema
+System/Matches: //<small><<resultCount>> coincidencias </small>//
diff --git a/languages/es-ES/SideBar.multids b/languages/es-ES/SideBar.multids
index 00e34cb64..6723fa5a2 100644
--- a/languages/es-ES/SideBar.multids
+++ b/languages/es-ES/SideBar.multids
@@ -3,7 +3,7 @@ title: $:/language/SideBar/
 All/Caption: Todos
 Contents/Caption: Contenido
 Drafts/Caption: Borradores
-Missing/Caption: Faltantes
+Missing/Caption: Vacíos
 More/Caption: Más
 Open/Caption: Abiertos
 Orphans/Caption: Huérfanos
@@ -11,6 +11,6 @@ Recent/Caption: Recientes
 Shadows/Caption: Ocultos
 System/Caption: Sistema
 Tags/Caption: Etiquetas
-Tags/Untagged/Caption: Sin etiquetar
+Tags/Untagged/Caption: Sin etiqueta
 Tools/Caption: Herramientas
 Types/Caption: Tipos
diff --git a/languages/es-ES/SiteSubtitle.tid b/languages/es-ES/SiteSubtitle.tid
index 0880c7745..b43a075ce 100644
--- a/languages/es-ES/SiteSubtitle.tid
+++ b/languages/es-ES/SiteSubtitle.tid
@@ -1,3 +1,3 @@
 title: $:/SiteSubtitle
 
-un bloc personal no-lineal en la web
\ No newline at end of file
+Cuaderno de notas personal no-lineal en la web
\ No newline at end of file
diff --git a/languages/es-ES/SiteTitle.tid b/languages/es-ES/SiteTitle.tid
index 716f75da8..f1899630c 100644
--- a/languages/es-ES/SiteTitle.tid
+++ b/languages/es-ES/SiteTitle.tid
@@ -1,3 +1,3 @@
 title: $:/SiteTitle
 
-Mi TiddlyWiki
\ No newline at end of file
+Mi ~TiddlyWiki
\ No newline at end of file
diff --git a/languages/es-ES/Snippets/ListByTag.tid b/languages/es-ES/Snippets/ListByTag.tid
new file mode 100644
index 000000000..871bda1e8
--- /dev/null
+++ b/languages/es-ES/Snippets/ListByTag.tid
@@ -0,0 +1,5 @@
+title: $:/language/Snippets/ListByTag
+tags: $:/tags/TextEditor/Snippet
+caption: Liste de tiddlers par etiqueta
+
+<<list-links "[tag[task]sort[title]]">>
diff --git a/languages/es-ES/Snippets/MacroDefinition.tid b/languages/es-ES/Snippets/MacroDefinition.tid
new file mode 100644
index 000000000..2a72a2d33
--- /dev/null
+++ b/languages/es-ES/Snippets/MacroDefinition.tid
@@ -0,0 +1,7 @@
+title: $:/language/Snippets/MacroDefinition
+tags: $:/tags/TextEditor/Snippet
+caption: Macro definition
+
+\define macroName(param1:"default value",param2)
+Texto de la macro
+\end
diff --git a/languages/es-ES/Snippets/Table 4x3.tid b/languages/es-ES/Snippets/Table 4x3.tid
new file mode 100644
index 000000000..de8bfcaad
--- /dev/null
+++ b/languages/es-ES/Snippets/Table 4x3.tid	
@@ -0,0 +1,8 @@
+title: $:/language/Snippets/Table4x3
+tags: $:/tags/TextEditor/Snippet
+caption: Table with 4 columns by 3 rows
+
+|! |!Alfa |!Beta |!Gamma |!Delta |
+|!Uno | | | | |
+|!Dos | | | | |
+|!Tres | | | | |
diff --git a/languages/es-ES/Snippets/TableOfContents.tid b/languages/es-ES/Snippets/TableOfContents.tid
new file mode 100644
index 000000000..40fe4aafb
--- /dev/null
+++ b/languages/es-ES/Snippets/TableOfContents.tid
@@ -0,0 +1,9 @@
+title: $:/language/Snippets/TableOfContents
+tags: $:/tags/TextEditor/Snippet
+caption: Table of Contents
+
+<div class="tc-table-of-contents">
+
+<<toc-selective-expandable 'TableOfContents'>>
+
+</div>
\ No newline at end of file
diff --git a/languages/es-ES/TiddlerInfo.multids b/languages/es-ES/TiddlerInfo.multids
index 68a17f5d7..a8aefc911 100644
--- a/languages/es-ES/TiddlerInfo.multids
+++ b/languages/es-ES/TiddlerInfo.multids
@@ -1,19 +1,19 @@
 title: $:/language/TiddlerInfo/
 
 Advanced/Caption: Avanzado
-Advanced/PluginInfo/Empty/Hint: no existe
-Advanced/PluginInfo/Heading: Detalles de la Extensión
-Advanced/PluginInfo/Hint: Esta extesnión contiene los siguientes tiddlers ocultos:
-Advanced/ShadowInfo/Heading: Estado de ocultamiento
-Advanced/ShadowInfo/NotShadow/Hint: El tiddler <$link to=<<infoTiddler>>><$text text=<<infoTiddler>>/></$link> no es un tiddler oculto
-Advanced/ShadowInfo/OverriddenShadow/Hint: Está sobrescrito por un tiddler común
-Advanced/ShadowInfo/Shadow/Hint: El tiddler <$link to=<<infoTiddler>>><$text text=<<infoTiddler>>/></$link> es un tiddler oculto
-Advanced/ShadowInfo/Shadow/Source: Está definido en la extensión <$link to=<<pluginTiddler>>><$text text=<<pluginTiddler>>/></$link>
+Advanced/PluginInfo/Empty/Hint: No se han instalado
+Advanced/PluginInfo/Heading: Detalles del plugin
+Advanced/PluginInfo/Hint: Este plugin contiene los siguientes tiddlers ocultos
+Advanced/ShadowInfo/Heading: Oculto
+Advanced/ShadowInfo/NotShadow/Hint: El tiddler <$link to=<<infoTiddler>>><$text text=<<infoTiddler>>/></$link> no es de tipo oculto
+Advanced/ShadowInfo/OverriddenShadow/Hint: Anulado por un tiddler estándar
+Advanced/ShadowInfo/Shadow/Hint: El tiddler <$link to=<<infoTiddler>>><$text text=<<infoTiddler>>/></$link> es de tipo oculto
+Advanced/ShadowInfo/Shadow/Source: Definido en el plugin <$link to=<<pluginTiddler>>><$text text=<<pluginTiddler>>/></$link>
 Fields/Caption: Campos
 List/Caption: Lista
-List/Empty: Este tiddler no tiene lista
-Listed/Caption: Listado
-Listed/Empty: Este tiddler no está en la lista de ningún otro
+List/Empty: Este tiddler no contiene listas
+Listed/Caption: En lista de
+Listed/Empty: Este tiddler no figura en la lista de ningún otro
 References/Caption: Referencias
 References/Empty: Ningún otro tiddler enlaza a este
 Tagging/Caption: Etiquetado
diff --git a/languages/es-ES/Types/application%2Fjavascript.tid b/languages/es-ES/Types/application%2Fjavascript.tid
index 888998bfb..97315c17f 100644
--- a/languages/es-ES/Types/application%2Fjavascript.tid
+++ b/languages/es-ES/Types/application%2Fjavascript.tid
@@ -1,4 +1,4 @@
 title: $:/language/Docs/Types/application/javascript
 description: Código JavaScript
 name: application/javascript
-group: Programador
+group: Desarrollador
diff --git a/languages/es-ES/Types/application%2Fjson.tid b/languages/es-ES/Types/application%2Fjson.tid
index 9b2c4d020..5a67916ca 100644
--- a/languages/es-ES/Types/application%2Fjson.tid
+++ b/languages/es-ES/Types/application%2Fjson.tid
@@ -1,4 +1,4 @@
 title: $:/language/Docs/Types/application/json
 description: Datos JSON
 name: application/json
-group: Programador
+group: Desarrollador
diff --git a/languages/es-ES/Types/application%2Fx-tiddler-dictionary.tid b/languages/es-ES/Types/application%2Fx-tiddler-dictionary.tid
index 17789d244..91a1ecd65 100644
--- a/languages/es-ES/Types/application%2Fx-tiddler-dictionary.tid
+++ b/languages/es-ES/Types/application%2Fx-tiddler-dictionary.tid
@@ -1,4 +1,4 @@
 title: $:/language/Docs/Types/application/x-tiddler-dictionary
 description: Diccionario de datos
 name: application/x-tiddler-dictionary
-group: Programador
+group: Desarrollador
diff --git a/languages/es-ES/Types/image%2Fgif.tid b/languages/es-ES/Types/image%2Fgif.tid
index 37de68752..64c4b96e5 100644
--- a/languages/es-ES/Types/image%2Fgif.tid
+++ b/languages/es-ES/Types/image%2Fgif.tid
@@ -1,4 +1,4 @@
 title: $:/language/Docs/Types/image/gif
-description: Imagen GIF
+description: Imagen .GIF
 name: image/gif
 group: Imagen
diff --git a/languages/es-ES/Types/image%2Fjpeg.tid b/languages/es-ES/Types/image%2Fjpeg.tid
index a2bdf5e71..04d3c8466 100644
--- a/languages/es-ES/Types/image%2Fjpeg.tid
+++ b/languages/es-ES/Types/image%2Fjpeg.tid
@@ -1,4 +1,4 @@
 title: $:/language/Docs/Types/image/jpeg
-description: Imagen JPEG
+description: Imagen .JPEG
 name: image/jpeg
 group: Imagen
diff --git a/languages/es-ES/Types/image%2Fpng.tid b/languages/es-ES/Types/image%2Fpng.tid
index ad7e63f90..5abbb4a7d 100644
--- a/languages/es-ES/Types/image%2Fpng.tid
+++ b/languages/es-ES/Types/image%2Fpng.tid
@@ -1,4 +1,4 @@
 title: $:/language/Docs/Types/image/png
-description: Imagen PNG
+description: Imagen .PNG
 name: image/png
 group: Imagen
diff --git a/languages/es-ES/Types/image%2Fsvg%2Bxml.tid b/languages/es-ES/Types/image%2Fsvg%2Bxml.tid
index 67d7eb035..04fb05653 100644
--- a/languages/es-ES/Types/image%2Fsvg%2Bxml.tid
+++ b/languages/es-ES/Types/image%2Fsvg%2Bxml.tid
@@ -1,4 +1,4 @@
 title: $:/language/Docs/Types/image/svg+xml
-description: Imagen SVG (Structured Vector Graphics)
+description: Imagen .SVG
 name: image/svg+xml
 group: Imagen
diff --git a/languages/es-ES/Types/text%2Fcss.tid b/languages/es-ES/Types/text%2Fcss.tid
index 1078f9de7..8fbc64f22 100644
--- a/languages/es-ES/Types/text%2Fcss.tid
+++ b/languages/es-ES/Types/text%2Fcss.tid
@@ -1,4 +1,4 @@
 title: $:/language/Docs/Types/text/css
-description: Hoja de estilo estática
+description: Hoja de estilos estática
 name: text/css
-group: Programador
+group: Desarrollador
diff --git a/languages/es-ES/Types/text%2Fx-tiddlywiki.tid b/languages/es-ES/Types/text%2Fx-tiddlywiki.tid
index 10dbff542..802e23ce2 100644
--- a/languages/es-ES/Types/text%2Fx-tiddlywiki.tid
+++ b/languages/es-ES/Types/text%2Fx-tiddlywiki.tid
@@ -1,4 +1,4 @@
 title: $:/language/Docs/Types/text/x-tiddlywiki
-description: TiddlyWiki Clásico
+description: TiddlyWiki Classic
 name: text/x-tiddlywiki
 group: Texto
diff --git a/languages/es-ES/plugin.info b/languages/es-ES/plugin.info
index b4cede908..63ea93a35 100644
--- a/languages/es-ES/plugin.info
+++ b/languages/es-ES/plugin.info
@@ -2,7 +2,7 @@
 	"title": "$:/languages/es-ES",
 	"name": "es-ES",
 	"plugin-type": "language",
-	"description": "España (Spain)",
-	"author": "Pau Deluca",
+	"description": "Castellano. (Spain)",
+	"author": "Pau DeLuca",
 	"core-version": ">=5.0.0"
 }
\ No newline at end of file
diff --git a/languages/fr-FR/Buttons.multids b/languages/fr-FR/Buttons.multids
index 8abab75eb..ba591b68d 100644
--- a/languages/fr-FR/Buttons.multids
+++ b/languages/fr-FR/Buttons.multids
@@ -5,51 +5,51 @@ AdvancedSearch/Hint: Recherche avancée
 Cancel/Caption: annuler
 Cancel/Hint: Annule l'édition de ce tiddler
 Clone/Caption: cloner
-Clone/Hint: Cloner ce tiddler
+Clone/Hint: Clone ce tiddler
 Close/Caption: fermer
-Close/Hint: Fermer ce tiddler
+Close/Hint: Ferme ce tiddler
 CloseAll/Caption: fermer tout
-CloseAll/Hint: Fermer tous les tiddlers
+CloseAll/Hint: Ferme tous les tiddlers
 CloseOthers/Caption: fermer les autres tiddlers
-CloseOthers/Hint: Fermer les autres tiddlers
+CloseOthers/Hint: Ferme les autres tiddlers
 ControlPanel/Caption: panneau de contrôle
 ControlPanel/Hint: Ouvrir le panneau de contrôle
 Delete/Caption: supprimer
-Delete/Hint: Supprimer ce tiddler
+Delete/Hint: Supprime ce tiddler
 Edit/Caption: éditer
-Edit/Hint: Éditer ce tiddler
+Edit/Hint: Édite ce tiddler
 Encryption/Caption: chiffrement
 Encryption/Hint: Affecte ou résilie le mot de passe pour la sauvegarde de ce wiki
 Encryption/ClearPassword/Caption: résilier le mot de passe
-Encryption/ClearPassword/Hint: Résilier le mot de passe et sauvegarder ce wiki sans chiffrement
+Encryption/ClearPassword/Hint: Résilie le mot de passe et sauvegarder ce wiki sans chiffrement
 Encryption/SetPassword/Caption: affecter un mot de passe
-Encryption/SetPassword/Hint: Affecter un mot de passe pour sauvegarder une version chiffrée de ce wiki
-ExportPage/Caption: exporte tout
-ExportPage/Hint: Exporter tous les tiddlers
-ExportTiddler/Caption: exporte ce tiddler
-ExportTiddler/Hint: Exporter ce tiddler
-ExportTiddlers/Caption: exporte ces tiddlers
-ExportTiddlers/Hint: Exporter ces tiddlers
-Fold/Caption: replie le tiddler
-Fold/Hint: Replier le corps du tiddler
+Encryption/SetPassword/Hint: Affecte un mot de passe pour sauvegarder une version chiffrée de ce wiki
+ExportPage/Caption: exporter tout
+ExportPage/Hint: Exporte tous les tiddlers
+ExportTiddler/Caption: exporter ce tiddler
+ExportTiddler/Hint: Exporte ce tiddler
+ExportTiddlers/Caption: exporter ces tiddlers
+ExportTiddlers/Hint: Exporte ces tiddlers
+Fold/Caption: replier le tiddler
+Fold/Hint: Replie le corps du tiddler
 Fold/FoldBar/Caption: fold-bar
 Fold/FoldBar/Hint: Barres optionnelles pour replier et déplier les tiddlers
-Unfold/Caption: déplie le tiddler
+Unfold/Caption: déplier le tiddler
 Unfold/Hint: Déplie le corps de ce tiddler
-FoldOthers/Caption: replie les autres tiddlers
+FoldOthers/Caption: replier les autres tiddlers
 FoldOthers/Hint: Replie le corps des autres tiddlers ouverts
 FoldAll/Caption: replie tous les tiddlers
-FoldAll/Hint: Replie le corps de tous les tiddlers ouverts
-UnfoldAll/Caption: déplie tous les tiddlers
+FoldAll/Hint: Replier le corps de tous les tiddlers ouverts
+UnfoldAll/Caption: déplier tous les tiddlers
 UnfoldAll/Hint: Déplie le corps de tous les tiddlers ouverts
 FullScreen/Caption: plein-écran
 FullScreen/Hint: Entre ou sort du mode plein-écran
 Help/Caption: aide
-Help/Hint: Affiche le panneau d'aide
+Help/Hint: Afficher le panneau d'aide
 Import/Caption: importer
-Import/Hint: Importer des fichiers
+Import/Hint: Importe des fichiers
 Info/Caption: informations
-Info/Hint: Afficher les informations sur ce tiddler
+Info/Hint: Affiche les informations sur ce tiddler
 Home/Caption: accueil
 Home/Hint: Ouvre les tiddlers par défaut
 Language/Caption: langue
@@ -62,29 +62,108 @@ NewJournal/Caption: nouveau journal
 NewJournal/Hint: Crée un nouveau tiddler journal
 NewJournalHere/Caption: nouveau journal, ici
 NewJournalHere/Hint: Crée un nouveau tiddler journal avec pour tag le tiddler courant
+NewImage/Caption: nouvelle image
+NewImage/Hint: Crée une nouveau tiddler image
+NewMarkdown/Caption: nouveau tiddler Markdown
+NewMarkdown/Hint: Crée un nouveau tiddler avec la syntaxe Markdown
 NewTiddler/Caption: nouveau tiddler
-NewTiddler/Hint: Créer un nouveau tiddler
+NewTiddler/Hint: Crée un nouveau tiddler
 OpenWindow/Caption: ouvrir dans une nouvelle fenêtre
-OpenWindow/Hint: Ouvrir ce tiddler dans une nouvelle fenêtre
+OpenWindow/Hint: Ouvre ce tiddler dans une nouvelle fenêtre
 Palette/Caption: palette
-Palette/Hint: Choisir une palette de couleur
+Palette/Hint: Choisit une palette de couleur
 Permalink/Caption: permalink
-Permalink/Hint: Remplacer l'URL dans la barre d'adresse du navigateur par un lien direct vers ce tiddler
+Permalink/Hint: Remplace l'URL dans la barre d'adresse du navigateur par un lien direct vers ce tiddler
 Permaview/Caption: permaview
-Permaview/Hint: Remplacer l'URL dans la barre d'adresse du navigateur par un lien direct vers l'ensemble des tiddlers présents dans le déroulé
+Permaview/Hint: Remplace l'URL dans la barre d'adresse du navigateur par un lien direct vers l'ensemble des tiddlers présents dans le déroulé
 Refresh/Caption: rafraîchir
 Refresh/Hint: Rafraîchit la totalité du wiki
 Save/Caption: enregistrer
-Save/Hint: Confirmer les changements apportés à ce tiddler
+Save/Hint: Confirme les changements apportés à ce tiddler
 SaveWiki/Caption: enregistrer les modifications
-SaveWiki/Hint: Enregistrer les modifications
+SaveWiki/Hint: Enregistre les modifications
 StoryView/Caption: vue sur le déroulé
-StoryView/Hint: Choix du mode de visualisation du déroulé
+StoryView/Hint: Choisit le mode de visualisation du déroulé
 HideSideBar/Caption: cacher la barre latérale
-HideSideBar/Hint: Cacher la barre latérale
+HideSideBar/Hint: Cache la barre latérale
 ShowSideBar/Caption: afficher la barre latérale
-ShowSideBar/Hint: Afficher la barre latérale
+ShowSideBar/Hint: Affiche la barre latérale
 TagManager/Caption: gestionnaire de tags
 TagManager/Hint:  Gestionnaire de tags
 Theme/Caption: thème
 Theme/Hint: Choix du thème pour l'affichage
+Bold/Caption: gras
+Bold/Hint: Met la sélection en gras
+Clear/Caption: effacer
+Clear/Hint: Remplace l'image par une couleur pleine
+EditorHeight/Caption: hauteur de l'éditeur
+EditorHeight/Caption/Auto: Ajuste automatiquement la hauteur en fonction du contenu
+EditorHeight/Caption/Fixed: Hauteur fixe :
+EditorHeight/Hint: Choisit la hauteur de l'éditeur de texte
+Excise/Caption: exciser
+Excise/Caption/Excise: Effectue une excision
+Excise/Caption/MacroName: Nom de la macro :
+Excise/Caption/NewTitle: Titre du nouveau tiddler :
+Excise/Caption/Replace: Remplacer le texte excisé par :
+Excise/Caption/Replace/Macro: macro
+Excise/Caption/Replace/Link: lien
+Excise/Caption/Replace/Transclusion: transclusion
+Excise/Caption/Tag: Utiliser le titre de ce tiddler comme tag du nouveau tiddler
+Excise/Caption/TiddlerExists: Attention : le tiddler existe déjà
+Excise/Hint: Excise le texte sélectionner vers un nouveau tiddler
+Heading1/Caption: en-tête 1
+Heading1/Hint: Applique le formatage des en-têtes de niveau 1 aux lignes de la sélection
+Heading2/Caption: en-tête 2
+Heading2/Hint: Applique le formatage des en-têtes de niveau 2 aux lignes de la sélection
+Heading3/Caption: en-tête 3
+Heading3/Hint: Applique le formatage des en-têtes de niveau 3 aux lignes de la sélection
+Heading4/Caption: en-tête 4
+Heading4/Hint: Applique le formatage des en-têtes de niveau 4 aux lignes de la sélection
+Heading5/Caption: en-tête 5
+Heading5/Hint: Applique le formatage des en-têtes de niveau 5 aux lignes de la sélection
+Heading6/Caption: en-tête 6
+Heading6/Hint: Applique le formatage des en-têtes de niveau 6 aux lignes de la sélection
+Italic/Caption: italiques
+Italic/Hint: Met la sélection en italiques
+LineWidth/Caption: épaisseur du trait
+LineWidth/Hint: Choisit une épaisseur de trait pour le remplissage
+Link/Caption: lien
+Link/Hint: Crée un lien wikitext
+ListBullet/Caption: liste à puces
+ListBullet/Hint: Formate les lignes de la sélection comme une liste à puces
+ListNumber/Caption: liste numérotée
+ListNumber/Hint: Formate les lignes de la sélection comme une liste numérotée
+MonoBlock/Caption: bloc de chasse constante
+MonoBlock/Hint: Formate les lignes de la sélection en bloc de chasse constante
+MonoLine/Caption: chasse constante
+MonoLine/Hint: Formate la sélection avec une police de caractères à chasse constante
+Opacity/Caption: opacité
+Opacity/Hint: Choisit l'opacité du remplissage
+Paint/Caption: couleur de remplissage
+Paint/Hint: Choisit la couleur de remplissage
+Picture/Caption: image
+Picture/Hint: Insère une image
+Preview/Caption: prévisualisation
+Preview/Hint: Affiche le panneau de prévisualisation
+PreviewType/Caption: type de prévisualisation
+PreviewType/Hint: Choisit le type de prévisualisation
+Quote/Caption: citation
+Quote/Hint: Formate les lignes de la sélection comme une citation
+Size/Caption: taille de l'image
+Size/Caption/Height: Hauteur :
+Size/Caption/Resize: Retailler l'image
+Size/Caption/Width: Largeur :
+Size/Hint: Choisit la taille de l'image
+Stamp/Caption: tampon
+Stamp/Caption/New: Ajoutez le vôtre
+Stamp/Hint: Insère un fragment de texte prédéterminé
+Stamp/New/Title: Nom tel qu'il apparaît dans le menu
+Stamp/New/Text: Texte du fragment. (N'oubliez pas d'ajouter une légende dans le champ //caption//.)
+Strikethrough/Caption: barré
+Strikethrough/Hint: Barre le texte sélectionné
+Subscript/Caption: indice
+Subscript/Hint: Met en indice le texte sélectionné
+Superscript/Caption: exposant
+Superscript/Hint: Met en exposant le texte sélectionné
+Underline/Caption: souligner
+Underline/Hint: Souligne le texte sélectionné
diff --git a/languages/fr-FR/ControlPanel.multids b/languages/fr-FR/ControlPanel.multids
index ce8982429..e65d3903e 100644
--- a/languages/fr-FR/ControlPanel.multids
+++ b/languages/fr-FR/ControlPanel.multids
@@ -27,6 +27,19 @@ EditorTypes/Hint: Ces tiddlers déterminent l'éditeur à utiliser pour éditer
 EditorTypes/Type/Caption: Type
 Info/Caption: Info
 Info/Hint: Information sur ce TiddlyWiki
+KeyboardShortcuts/Add/Prompt: Entre le raccourci ici
+KeyboardShortcuts/Add/Caption: ajoute un raccourci
+KeyboardShortcuts/Caption: Raccourcis clavier
+KeyboardShortcuts/Hint: Gère la spécification des raccourcis clavier
+KeyboardShortcuts/NoShortcuts/Caption: Aucun raccourci clavier spécifié
+KeyboardShortcuts/Remove/Hint: supprime le raccourci clavier
+KeyboardShortcuts/Platform/All: Toutes plates-formes
+KeyboardShortcuts/Platform/Mac: Plate-forme Macintosh seulement
+KeyboardShortcuts/Platform/NonMac: Plates-formes non-Macintosh seulement
+KeyboardShortcuts/Platform/Linux: Plate-forme Linux seulement
+KeyboardShortcuts/Platform/NonLinux: Plate-formes non-Linux seulement
+KeyboardShortcuts/Platform/Windows: Plate-forme Windows seulement
+KeyboardShortcuts/Platform/NonWindows: Plates-formes non-Windows seulement
 LoadedModules/Caption: Modules chargés
 LoadedModules/Hint: Liste des modules chargés, avec leurs tiddlers sources. Les italiques indiquent que les tiddlers sources n'existent pas, le plus souvent parce que le module a été créé lors du processus d'amorçage.
 Palette/Caption: Palette
@@ -40,6 +53,7 @@ Palette/Prompt: Palette en cours :
 Palette/ShowEditor/Caption: Afficher l'éditeur
 Plugins/Add/Hint: Installer des plugins à partir de la bibliothèque officielle
 Plugins/Add/Caption: Ajouter des plugins
+Plugins/AlreadyInstalled/Hint: Ce plugin est déjà installé dans la version <$text text=<<installedVersion>>/>
 Plugins/Caption: Plugins
 Plugins/Disable/Caption: désactiver
 Plugins/Disable/Hint: Désactive ce plugin au prochain rechargement de la page
@@ -47,14 +61,16 @@ Plugins/Disabled/Status: (désactivé)
 Plugins/Empty/Hint: Aucun
 Plugins/Enable/Caption: activer
 Plugins/Enable/Hint: Active ce plugin au prochain rechargement de la page
-Plugins/Install: installe
+Plugins/Install/Caption: installe
 Plugins/Installed/Hint: Plugins installés :
-Plugins/Languages/Caption: Languages
+Plugins/Languages/Caption: Langues
 Plugins/Languages/Hint: Plugins de langue
+Plugins/NoInformation/Hint: Aucune information disponible
+Plugins/NotInstalled/Hint: Ce plugin n'est pas installé
 Plugins/OpenPluginLibrary: ouvre la bibliothèque de plugins
 Plugins/Plugins/Caption: Plugins
 Plugins/Plugins/Hint: Plugins
-Plugins/Reinstall: réinstalle
+Plugins/Reinstall/Caption: réinstalle
 Plugins/Themes/Caption: Thèmes
 Plugins/Themes/Hint: Plugins de thème
 Parsing/Caption: Parsing
@@ -118,11 +134,14 @@ Settings/TitleLinks/Caption: Titres des tiddlers
 Settings/TitleLinks/Hint: Faut-il afficher les titres des tiddlers comme des liens ?
 Settings/TitleLinks/No/Description: Ne pas afficher les titres des tiddlers comme des liens
 Settings/TitleLinks/Yes/Description: Afficher les titres des tiddlers comme des liens
+Settings/MissingLinks/Caption: Liens wiki
+Settings/MissingLinks/Hint: Peut-on pointer vers des tiddlers qui n'existent pas encore ?
+Settings/MissingLinks/Description: Active les liens vers les tiddlers inexistants
 StoryView/Caption: Vue sur le déroulé
 StoryView/Prompt: Vue courante :
 Theme/Caption: Thème
 Theme/Prompt: Thème courant :
-TiddlerFields/Caption: Champs du tiddler
+TiddlerFields/Caption: Champs des tiddlers
 TiddlerFields/Hint: Il s'agit de la totalité des [[champs|TiddlerFields]] utilisés dans ce wiki (y compris les tiddlers système, mais non compris les tiddlers //shadow//).
 Toolbars/Caption: Barres d'outils
 Toolbars/EditToolbar/Caption: Barre d'outils du mode édition
@@ -130,6 +149,8 @@ Toolbars/EditToolbar/Hint: Choix des boutons à afficher pour les tiddlers en co
 Toolbars/Hint: Choix des boutons à afficher dans les barres d'outils
 Toolbars/PageControls/Caption: Barre d'outils de la page
 Toolbars/PageControls/Hint: Choix des boutons à afficher sur la barre d'outils principale de la page
+Toolbars/EditorToolbar/Caption: Barre d'outils de l'Éditeur
+Toolbars/EditorToolbar/Hint: Choisir les boutons à afficher dans la barre d'outils de l'éditeur. À noter que la présence de certains boutons dépendra du type du tiddler édité
 Toolbars/ViewToolbar/Caption: Barre d'outils du mode visualisation
 Toolbars/ViewToolbar/Hint: Choix des boutons à afficher pour les tiddlers en mode visualisation
 Tools/Download/Full/Caption: Télécharger le wiki complet
diff --git a/languages/fr-FR/EditTemplate.multids b/languages/fr-FR/EditTemplate.multids
index 6eb3fb60f..d9aa0eef9 100644
--- a/languages/fr-FR/EditTemplate.multids
+++ b/languages/fr-FR/EditTemplate.multids
@@ -1,10 +1,7 @@
 title: $:/language/EditTemplate/
 
 Body/External/Hint: Ceci est un tiddler externe, conservé en dehors du fichier TiddlyWiki principal. Vous pouvez éditer les tags et les champs mais pas directement le contenu lui-même
-Body/Hint: Utilisez [[WikiText|http://tiddlywiki.com/static/WikiText.html]] pour formater ou ajouter des images et des fonctions dynamiques
 Body/Placeholder: Entrez le texte ici
-Body/Preview/Button/Hide: Cacher la prévisualisation
-Body/Preview/Button/Show: Afficher la prévisualisation
 Field/Remove/Caption: supprimer le champ
 Field/Remove/Hint: Supprime le champ
 Fields/Add/Button: ajouter
@@ -19,6 +16,7 @@ Tags/Add/Button: ajouter
 Tags/Add/Placeholder: nom du tag
 Tags/Dropdown/Caption: liste des tags
 Tags/Dropdown/Hint: Montre la liste des tags
+Title/BadCharacterWarning: Attention : il est préférable d'éviter l'usage des caractères <<bad-chars>> dans les titres de tiddlers
 Type/Dropdown/Caption: liste des types de contenu
 Type/Dropdown/Hint: Montre la liste des types de contenu
 Type/Delete/Caption: supprimer le type de contenu
diff --git a/languages/fr-FR/GettingStarted.tid b/languages/fr-FR/GettingStarted.tid
index a75f2bcbe..7711da02b 100644
--- a/languages/fr-FR/GettingStarted.tid
+++ b/languages/fr-FR/GettingStarted.tid
@@ -8,8 +8,11 @@ correctement — reportez-vous aux [[instructions détaillées|http://tiddlywiki
 
 !! Personnalisez ce ~TiddlyWiki
 
+<div class="tc-control-panel">
+
 |<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
 |<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
 |<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+</div>
 
 Rendez-vous dans le [[panneau de contrôle|$:/ControlPanel]] pour plus d'options.
diff --git a/languages/fr-FR/Help/build.tid b/languages/fr-FR/Help/build.tid
index 18eb75282..2f4a2826c 100644
--- a/languages/fr-FR/Help/build.tid
+++ b/languages/fr-FR/Help/build.tid
@@ -7,5 +7,5 @@ Compile le wiki courant à partir des cibles spécifiées. Si aucune cible n'est
 --build <target> [<target> ...]
 ```
 
-Les cibles de compilation sont définies dans le fichier `tiddlywiki.info` du [dossier associé au wiki|TiddlyWikiFolders].
+Les cibles de compilation sont définies dans le fichier `tiddlywiki.info` du [[dossier associé au wiki|WikiFolders]].
 
diff --git a/languages/fr-FR/Help/init.tid b/languages/fr-FR/Help/init.tid
index d8bb6aff7..b32d2fd0a 100644
--- a/languages/fr-FR/Help/init.tid
+++ b/languages/fr-FR/Help/init.tid
@@ -1,7 +1,7 @@
 title: $:/language/Help/init
 description: Initialise un nouveau dossier wiki
 
-Initialise un [[dossier wiki (WikiFolder)|TiddlyWikiFolders]] vide en copiant l'une des éditions présentes dans le répertoire //editions//.
+Initialise un [[dossier wiki (WikiFolder)|WikiFolders]] vide en copiant l'une des éditions présentes dans le répertoire //editions//.
 
 ```
 --init <édition> [<édition> ...]
diff --git a/languages/fr-FR/Help/password.tid b/languages/fr-FR/Help/password.tid
index 4a49f0aa0..b82012207 100644
--- a/languages/fr-FR/Help/password.tid
+++ b/languages/fr-FR/Help/password.tid
@@ -6,5 +6,4 @@ Fournit un mot de passe pour les prochaines opérations de chiffrement.
 ```
 --password <motdepasse>
 ```
-''Note'' : Cette commande n'est pas appropriée pour servir un TiddlyWiki protégé par mot de passe. Pour cela, utilisez plutôt l'option password de la [[ServerCommand|commande Server]].
-
+''Note'' : Cette commande n'est pas appropriée pour servir un TiddlyWiki protégé par mot de passe. Pour cela, utilisez plutôt l'option password de la [[commande Server|ServerCommand]].
diff --git a/languages/fr-FR/Import.multids b/languages/fr-FR/Import.multids
index 912d9e4a5..dad9a5e07 100644
--- a/languages/fr-FR/Import.multids
+++ b/languages/fr-FR/Import.multids
@@ -1,6 +1,6 @@
 title: $:/language/Import/
 
-Imported: Les tiddlers suivants ont été importés :
+Imported/Hint:  Les tiddlers suivants ont été importés :
 Listing/Cancel/Caption: Annuler
 Listing/Hint: Les tiddlers suivants sont prêts pour l'importation :
 Listing/Import/Caption: Importer
diff --git a/languages/fr-FR/Misc.multids b/languages/fr-FR/Misc.multids
index 9c63d5d43..90ffb589b 100644
--- a/languages/fr-FR/Misc.multids
+++ b/languages/fr-FR/Misc.multids
@@ -9,6 +9,7 @@ ConfirmCancelTiddler: Souhaitez-vous annuler les modifications apportées au tid
 ConfirmDeleteTiddler: Souhaitez-vous supprimer le tiddler « <$text text=<<title>>/> » ?
 ConfirmOverwriteTiddler: Souhaitez-vous supplanter le tiddler « <$text text=<<title>>/> » ?
 ConfirmEditShadowTiddler: Vous êtes sur le point d'éditer un ShadowTiddler. Toute modification supplantera la version par défaut du système, rendant les prochaines mises à jour non-triviales. Êtes-vous sûr(e) de vouloir éditer "<$text text=<<title>>/>"?
+Count: total 
 DefaultNewTiddlerTitle: Nouveau tiddler
 DropMessage: Lâcher ici (ou appuyer sur « escape » pour annuler)
 Encryption/Cancel: Annuler
@@ -19,11 +20,23 @@ Encryption/Password: Mot de passe
 Encryption/RepeatPassword: Répéter le mot de passe
 Encryption/PasswordNoMatch: Les mots de passe ne correspondent pas
 Encryption/SetPassword: Définir ce mot de passe 
+Error/Caption: Erreur
+Error/Filter: Erreur de filtre
+Error/FilterSyntax: Erreur de syntaxe dans l'expression du filtre
+Error/IsFilterOperator: Erreu de filtre : Opérande inconnu pour l'opérateur de filtre 'is'
+Error/LoadingPluginLibrary: Erreur lors du chargement de la bibliothèque de plugins
+Error/RecursiveTransclusion: Erreur dans le widget //transclude// : transclusion récursive
+Error/RetrievingSkinny: Erreur pendant la récupération de la liste des tiddlers (dégrossis)
+Error/SavingToTWEdit: Erreur lors de l'enregistrement vers TWEdit
+Error/WhileSaving: Erreur lors de l'enregistrement
+Error/XMLHttpRequest: Code d'erreur XMLHttpRequest
 InternalJavaScriptError/Title: Erreur interne JavaScript
 InternalJavaScriptError/Hint: C'est assez embarrassant. Il est recommandé de rafraîchir l'affichage de votre navigateur
 InvalidFieldName: Caractères illicites dans le nom du champ « <$text text=<<fieldName>>/> ». Les champs ne peuvent contenir que des lettres minuscules non accentuées et les caractères souligné (`_`), tiret (`-`) et point (`.`)
 LazyLoadingWarning: <p>Chargement d'un texte externe ''<$text text={{!!_canonical_uri}}/>''</p><p>Si ce message ne disparaît pas, il se peut que vous utilisiez un navigateur qui n'accepte pas les textes externes dans cette configuration. Voir http://tiddlywiki.com/#ExternalText</p>
+LoginToTiddlySpace: Identification sur TiddlySpace
 MissingTiddler/Hint: Le tiddler « <$text text=<<currentTiddler>>/> » est manquant - cliquez sur {{$:/core/images/edit-button}} pour le créer
+No: Non
 OfficialPluginLibrary: Bibliothèque officielle des plugins ~TiddlyWiki
 OfficialPluginLibrary/Hint: La bibliothèque officielle des plugins ~TiddlyWiki sur tiddlywiki.com. Plugins, thèmes et packs pour les différentes langues sont maintenus par l'équipe responsable du noyau.
 PluginReloadWarning: Merci d'enregistrer {{$:/core/ui/Buttons/save-wiki}} et de recharger {{$:/core/ui/Buttons/refresh}} pour que les changements apportés aux plugins prennent effet
@@ -35,3 +48,4 @@ TagManager/Info/Heading: Info
 TagManager/Tag/Heading: Tag
 Tiddler/DateFormat: DD MMM YYYY à hhhmm
 UnsavedChangesWarning: Vos dernières modifications n'ont pas été sauvegardées dans votre TiddlyWiki
+Yes: Oui
diff --git a/languages/fr-FR/Modals/SaveInstructions.tid b/languages/fr-FR/Modals/SaveInstructions.tid
index 94935fb62..cf6e3ed41 100644
--- a/languages/fr-FR/Modals/SaveInstructions.tid
+++ b/languages/fr-FR/Modals/SaveInstructions.tid
@@ -19,4 +19,4 @@ Les modifications effectuées dans ce wiki doivent être sauvegardées sous form
 #* Si vous utilisez iCloud ou Google Sync, le signet sera automatiquement synchronisé avec le navigateur de votre ordinateur de bureau, d'où vous pourrez l'ouvrir et enregistrer le fichier comme indiqué ci-dessus
 # Fermez cet onglet
 
-//Si vous ouvrez  à nouveau le signet dans Safari pour mobile, vous verrez ce message une nouvelle fois. Si vous voulez continuer et utiliser le fichier, cliquez simplement sur le bouton ''Fermer'' ci-dessous//
+//Si vous ouvrez à nouveau le signet dans Safari pour mobile, vous verrez ce message une nouvelle fois. Si vous voulez continuer et utiliser le fichier, cliquez simplement sur le bouton ''Fermer'' ci-dessous//
diff --git a/languages/fr-FR/Snippets/ListByTag.tid b/languages/fr-FR/Snippets/ListByTag.tid
new file mode 100644
index 000000000..a92d57802
--- /dev/null
+++ b/languages/fr-FR/Snippets/ListByTag.tid
@@ -0,0 +1,5 @@
+title: $:/language/Snippets/ListByTag
+tags: $:/tags/TextEditor/Snippet
+caption: Liste de tiddlers par tag
+
+<<list-links "[tag[task]sort[title]]">>
diff --git a/languages/fr-FR/Snippets/Table 4x3.tid b/languages/fr-FR/Snippets/Table 4x3.tid
new file mode 100644
index 000000000..34c6b9560
--- /dev/null
+++ b/languages/fr-FR/Snippets/Table 4x3.tid	
@@ -0,0 +1,8 @@
+title: $:/language/Snippets/Table4x3
+tags: $:/tags/TextEditor/Snippet
+caption: Tableau avec 4 colonnes par trois lignes
+
+|! |!Alpha |!Beta |!Gamma |!Delta |
+|!Un | | | | |
+|!Deux | | | | |
+|!Trois | | | | |
diff --git a/languages/fr-FR/Snippets/TableOfContents.tid b/languages/fr-FR/Snippets/TableOfContents.tid
new file mode 100644
index 000000000..07cc3aaf5
--- /dev/null
+++ b/languages/fr-FR/Snippets/TableOfContents.tid
@@ -0,0 +1,9 @@
+title: $:/language/Snippets/TableOfContents
+tags: $:/tags/TextEditor/Snippet
+caption: Table des matières
+
+<div class="tc-table-of-contents">
+
+<<toc-selective-expandable 'TableOfContents'>>
+
+</div>
\ No newline at end of file
diff --git a/languages/fr-FR/ThemeTweaks.multids b/languages/fr-FR/ThemeTweaks.multids
new file mode 100644
index 000000000..c7af938f4
--- /dev/null
+++ b/languages/fr-FR/ThemeTweaks.multids
@@ -0,0 +1,41 @@
+title: $:/language/ThemeTweaks/
+
+ThemeTweaks: Réglages du thème
+ThemeTweaks/Hint: Vous pouvez ajuster certains aspects du thème ''Vanilla''.
+Options: Options
+Options/SidebarLayout: Agencement de la barre latérale
+Options/SidebarLayout/Fixed-Fluid: Déroulé fixe, barre latérale extensible
+Options/SidebarLayout/Fluid-Fixed: Déroulé extensible, barre latérale fixe
+Options/StickyTitles: Titres accrochés
+Options/StickyTitles/Hint: “Accroche" les titres de tiddler en haut de la fenêtre du navigateur pendant le défilement. Attention<<:>> Ne fonctionne pas du tout avec Chrome, et peut causer quelques problèmes de mise en page dans Firefox
+Options/CodeWrapping: Enroule les lignes trop longues à l'intérieur des blocs de code
+Settings: Réglages
+Settings/FontFamily: Famille de polices
+Settings/CodeFontFamily: Famille de polices pour le code
+Settings/BackgroundImage: Image de fond de page
+Settings/BackgroundImageAttachment: Arrimage de l'image de fond de page
+Settings/BackgroundImageAttachment/Scroll: Défile avec les tiddlers
+Settings/BackgroundImageAttachment/Fixed: Arrimée à la fenêtre
+Settings/BackgroundImageSize: Taille de l'image de fond de page
+Settings/BackgroundImageSize/Auto: Auto
+Settings/BackgroundImageSize/Cover: Élargie
+Settings/BackgroundImageSize/Contain: Contenue
+Metrics: Tailles
+Metrics/FontSize: Taille police
+Metrics/LineHeight: Hauteur ligne
+Metrics/BodyFontSize: Taille de la police dans un tiddler
+Metrics/BodyLineHeight: Hauteur de ligne dans un tiddler
+Metrics/StoryLeft: Gauche du déroulé
+Metrics/StoryLeft/Hint: marge gauche du déroulé principal<br>(zone des tiddlers) au bord gauche de la page
+Metrics/StoryTop: Haut du déroulé
+Metrics/StoryTop/Hint: marge supérieure du déroulé pincipal<br>au bord supérieur de la page
+Metrics/StoryRight: Droite du déroulé
+Metrics/StoryRight/Hint: marge de gauche du menu latéral<br>au bord gauche de la page
+Metrics/StoryWidth: Largeur du déroulé
+Metrics/StoryWidth/Hint: largeur hors tout du déroulé
+Metrics/TiddlerWidth: Largeur des tiddlers
+Metrics/TiddlerWidth/Hint: largeur des tiddlers dans le déroulé
+Metrics/SidebarBreakpoint: Décroché de la barre latérale
+Metrics/SidebarBreakpoint/Hint: largeur minimum de la page à partir de laquelle déroulé principal et barre latérale apparaissent côte à côte
+Metrics/SidebarWidth: Largeur de la barre latérale
+Metrics/SidebarWidth/Hint: largeur de la barre latérale dans l'agencement extensible-fixe
diff --git a/languages/he-IL/Buttons.multids b/languages/he-IL/Buttons.multids
new file mode 100644
index 000000000..05c842546
--- /dev/null
+++ b/languages/he-IL/Buttons.multids
@@ -0,0 +1,169 @@
+title: $:/language/Buttons/
+
+AdvancedSearch/Caption: חיפוש מתקדם
+AdvancedSearch/Hint: חיפוש מתקדם
+Bold/Caption: הדגש
+Bold/Hint: עיצוב טקסט מודגש
+Cancel/Caption: בטל
+Cancel/Hint: בטל שינויים בטידלר
+Clear/Caption: נקה
+Clear/Hint: נקה את התמונה לצבע אחיד
+Clone/Caption: שכםל
+Clone/Hint: שכפל את הטידלר
+Close/Caption: סגור
+Close/Hint: סגור טידלר זה
+CloseAll/Caption: סגור הכל
+CloseAll/Hint: סגור את כל הטידלרים
+CloseOthers/Caption: סגור אחרים
+CloseOthers/Hint: סגור טידלרים אחרים
+ControlPanel/Caption: לוח בקרה
+ControlPanel/Hint: פתח לוח בקרה
+Delete/Caption: מחק
+Delete/Hint: מחק טידלר זה
+Edit/Caption: ערוך
+Edit/Hint: ערוך טידלר זה
+EditorHeight/Caption: גובה העורך
+EditorHeight/Caption/Auto: התאם גובה לתוכן אוטומטית
+EditorHeight/Caption/Fixed: גובה קבוע
+EditorHeight/Hint: בחר את הגובה של העורך
+Encryption/Caption: הצפנה
+Encryption/ClearPassword/Caption: נקה סיסמה
+Encryption/ClearPassword/Hint: נקה סיסמה ושמור את הויקי ללא הצפנה
+Encryption/Hint: קבע או נקה סיסמה לשמירת ויקי זה
+Encryption/SetPassword/Caption: קבע סיסמה
+Encryption/SetPassword/Hint: קבע סיסמה לשמירת הויקי עם הצפנה
+Excise/Caption: הוצא
+Excise/Caption/Excise: הוצא לטידלר אחר
+Excise/Caption/MacroName: :שם המקרו
+Excise/Caption/NewTitle: שם הטידלר החדש:
+Excise/Caption/Replace: החלך את הטקסט המוצא ב:
+Excise/Caption/Replace/Link: קישור
+Excise/Caption/Replace/Macro: מקרו
+Excise/Caption/Replace/Transclusion: תרגום
+Excise/Caption/Tag: תייג את הטידלר החדש בשם של הטידלר הנוכחי
+Excise/Caption/TiddlerExists: אזהרה: טידלר כבר קיים
+Excise/Hint: הוצא את הטקסט הנבחר לטידלר חדש
+ExportPage/Caption: ייצא הכל
+ExportPage/Hint: ייצא את כל הטידלרים
+ExportTiddler/Caption: יצא טידלר
+ExportTiddler/Hint: יצא טידלר
+ExportTiddlers/Caption: ייצא טידלרים
+ExportTiddlers/Hint: ייצא טידלרים
+Fold/Caption: קפל טילדר
+Fold/FoldBar/Caption: קפל סרגל
+Fold/FoldBar/Hint: סרגלים אופציונליים לקפל ולפתוח טידלרים
+Fold/Hint: קפל את גוף הטידלר הזה
+FoldAll/Caption: קפל את כל הטידלרים
+FoldAll/Hint: קפל את הגופים של כל הטידלרים הפתוחים
+FoldOthers/Caption: קפל טידלרים אחרים
+FoldOthers/Hint: קפל את הגופים של כל הטידלרים הפתוחים האחרים
+FullScreen/Caption: מסך מלא
+FullScreen/Hint: היכנס או צא ממסך מלא
+Heading1/Caption: כותרת 1
+Heading1/Hint: יישם עיצוב כותרת ברמה 1 לשורות המכילות את הבחירה
+Heading2/Caption: כותרת 2
+Heading2/Hint: יישם עיצוב כותרת ברמה 2 לשורות המכילות את הבחירה
+Heading3/Caption: כותרת 3
+Heading3/Hint: יישם עיצוב כותרת ברמה 3 לשורות המכילות את הבחירה
+Heading4/Caption: כותרת 4
+Heading4/Hint: יישם עיצוב כותרת ברמה 4 לשורות המכילות את הבחירה
+Heading5/Caption: כותרת 5
+Heading5/Hint: יישם עיצוב כותרת ברמה 5 לשורות המכילות את הבחירה
+Heading6/Caption: כותרת 6
+Heading6/Hint: יישם עיצוב כותרת ברמה 6 לשורות המכילות את הבחירה
+Help/Caption: עזרה
+Help/Hint: הראה פנל עזרה
+HideSideBar/Caption: הסתר סרגל צידי
+HideSideBar/Hint: הסתר סרגל צידי
+Home/Caption: בית
+Home/Hint: פתח את טידלרי ברירת המחדל
+Import/Caption: יבא
+Import/Hint: ייבא סוגים רבים של קבצים כולל טקסט, תמונה TIDDLYWIKI ו JSON
+Info/Caption: מידע
+Info/Hint: הראה מידע לטידלר זה
+Italic/Caption: נטוי
+Italic/Hint: יישם עצוב טקסט נטוי לבחירה
+Language/Caption: שפה
+Language/Hint: בחר את שפת ממשק המשתמש
+LineWidth/Caption: רוחב שורה
+LineWidth/Hint: קבע רוחב שורה לציור
+Link/Caption: קישור
+Link/Hint: צור קישור WikiText
+ListBullet/Caption: רשימה עם תבליטים
+ListBullet/Hint: הוסף תבליטים לשורות שנבחרו
+ListNumber/Caption: רשימה ממוספרת
+ListNumber/Hint: מספר את השורות שנבחרו
+MonoBlock/Caption: בלוק בריווח אחיד
+MonoBlock/Hint: יישם ריווח אחיד לטקסט שנבחר
+MonoLine/Caption: בריווח אחיד
+MonoLine/Hint: ישם ריווח אחיד לטקסט שנבחרn
+More/Caption: עוד
+More/Hint: פעולות נוספות
+NewHere/Caption: חדש כאן
+NewHere/Hint: צור טידלר חדש מתויג בנוכחי
+NewImage/Caption: תמונה חדשה
+NewImage/Hint: צור טילדר תמונה חדש
+NewJournal/Caption: יומן חדש
+NewJournal/Hint: צור טידלר יומן חדש
+NewJournalHere/Caption: יומן חדש כאן
+NewJournalHere/Hint: צור טידלר יומן חדש מתויג בטידלר הנוכחי
+NewMarkdown/Caption: טידלר מרקדאון חדש
+NewMarkdown/Hint: צור טידלר מרקדאון חדש
+NewTiddler/Caption: טידלר חדש
+NewTiddler/Hint: צור טידלר חדש
+Opacity/Caption: שקיפות
+Opacity/Hint: קבע את שקיפות הציור
+OpenWindow/Caption: פתח בחלון חדש
+OpenWindow/Hint: פתח טידלר בחלון חדש
+Paint/Caption: צבע ציור
+Paint/Hint: קבע  את צבע הציור
+Palette/Caption: פלטת צבעים
+Palette/Hint: בחר את פלטת הצבעים
+Permalink/Caption: קישור קבוע
+Permalink/Hint: כוון את הדפדפן לקישור ישיר לטידלר זה
+Permaview/Caption: מבט קבוע
+Permaview/Hint: כוון את הדפדפן לקישור ישיר לכל הטידלרים שבסיפור זה
+Picture/Caption: תמונה
+Picture/Hint: הכנס תמונה
+Preview/Caption: מבט מקדים
+Preview/Hint: הראה את פנל המבט המקדים
+PreviewType/Caption: סוג המבט המקדים
+PreviewType/Hint: בחר סוג מבט מקדים
+Quote/Caption: צטט
+Quote/Hint: עיצוב ציטוט לבחירה
+Refresh/Caption: רענן
+Refresh/Hint: בצע רענון מלא של הויקי הזה
+Save/Caption: אשר
+Save/Hint: אשר שינויים לטידלר זה 
+SaveWiki/Caption: שמור שינויים 
+SaveWiki/Hint: שמור שינויים
+ShowSideBar/Caption: הראה פנל צד
+ShowSideBar/Hint: הראה פנל צד
+Size/Caption: גודל תמונה
+Size/Caption/Height: גובה
+Size/Caption/Resize: שנה גודל תמונה
+Size/Caption/Width: רוחב:
+Size/Hint: קבע גודל תמונה
+Stamp/Caption: חותמת
+Stamp/Caption/New: הוסף את שלך
+Stamp/Hint: הכנס קטע טקסט מוכן מראש
+Stamp/New/Text: הטקסט להכניס (זכור להוסיף כותרת אינפורמטיבית בשדה הכותרת)
+Stamp/New/Title: שם כמופיע בתפריט
+StoryView/Caption: מבט סיפור
+StoryView/Hint: בחר את ויזואליזציית הסיפור
+Strikethrough/Caption: קו מוחק
+Strikethrough/Hint: הוסף קו מחיקה לבחירה
+Subscript/Caption: כתב תחתי
+Subscript/Hint: עצב את הבחירה ככתב תחתי
+Superscript/Caption: כתב עילי
+Superscript/Hint: עצב את הבחירה ככתב עילי
+TagManager/Caption: מנהל תגים
+TagManager/Hint: פתח את מנהל התגים
+Theme/Caption: תימה
+Theme/Hint: בחר את התימה להצגה
+Underline/Caption: קו תחתי
+Underline/Hint: עצב את הבחירה עם קו תחתי
+Unfold/Caption: הראה טידלר
+Unfold/Hint: הראהאת גוף הטידלר הזה
+UnfoldAll/Caption: הראה את כל הטידלרים
+UnfoldAll/Hint: הראה את הגופים של כל הטידלרים הפתוחים
diff --git a/languages/he-IL/ControlPanel.multids b/languages/he-IL/ControlPanel.multids
new file mode 100644
index 000000000..bef37006b
--- /dev/null
+++ b/languages/he-IL/ControlPanel.multids
@@ -0,0 +1,151 @@
+title: $:/language/ControlPanel/
+
+Advanced/Caption: מתקדם
+Advanced/Hint: מידע פנימי על הטידליויקי הזה
+Appearance/Caption: תצוגה
+Appearance/Hint: דרכים להתאים את התוגה של הטידלי ויקי שלך
+Basics/AnimDuration/Prompt: זמן אנימציה:
+Basics/Caption: יסודות
+Basics/DefaultTiddlers/Prompt: טידלרי ברירת מחדל:
+Basics/DefaultTiddlers/TopHint: בחר איזה טידלרים יוצגו בהתחלה:
+Basics/Language/Prompt: השפה הנוכחית:
+Basics/NewJournal/Tags/Prompt: תגים לטידלרי יומן חדשים
+Basics/NewJournal/Title/Prompt: כותרת לטידלרי יומן חדשים:
+Basics/OverriddenShadowTiddlers/Prompt: מספר טידלרי צל שנעקפו:
+Basics/ShadowTiddlers/Prompt: מספר טידלרי צל:
+Basics/Subtitle/Prompt: תת כותרת:
+Basics/SystemTiddlers/Prompt: מספר טידלרי מערכת:
+Basics/Tags/Prompt: מספר תגיות:
+Basics/Tiddlers/Prompt: מספר טידלרים:
+Basics/Title/Prompt: הכותרת של הטידליויקי הזה:
+Basics/Username/Prompt: שם משתמש לחתימה על עריכות:
+Basics/Version/Prompt: גרסת טידליויקי:
+EditorTypes/Caption: סוגי עורכים:
+EditorTypes/Editor/Caption: עורך
+EditorTypes/Hint: הטידלרים האלה קובעים איזה עורך ישמש לכל סוג תוכן
+EditorTypes/Type/Caption: סוג
+Info/Caption: מידע
+Info/Hint: מידע על הטידליויקי הזה
+KeyboardShortcuts/Add/Caption: הוסף קיצור דרך
+KeyboardShortcuts/Add/Prompt: כתוב את קיצור הדרך כאן:
+KeyboardShortcuts/Caption: קיצורי דרך ללוח המקשים
+KeyboardShortcuts/Hint: קיצורי לוח מקשים
+KeyboardShortcuts/NoShortcuts/Caption: אין קיצורי לוח מקשים
+KeyboardShortcuts/Platform/All: כל הפלטפורמות
+KeyboardShortcuts/Platform/Linux: רק פלטפורמת לינוקס
+KeyboardShortcuts/Platform/Mac: רק פלטפורמת מקינטוש
+KeyboardShortcuts/Platform/NonLinux: רק פלטפורמת לא לינוקס
+KeyboardShortcuts/Platform/NonMac: רק פלטפורמות לא לינוקס
+KeyboardShortcuts/Platform/NonWindows: רק פלטפורמות לא חלונות
+KeyboardShortcuts/Platform/Windows: רק פלטפורמת חלונות
+KeyboardShortcuts/Remove/Hint: הסר מקש קיצור
+LoadedModules/Caption: מודולים טעונים
+LoadedModules/Hint: אלה הם הטידלרים הטעונים כעת, קשורים לטידלרי המקור שלהם. מודןלים בכתב נטוי הם ללא טידלר מקור, בדרך כלל משום שהם נקבעו בעת תהליך הטעינה.
+Palette/Caption: לוח צבעים
+Palette/Editor/Clone/Caption: שכפל
+Palette/Editor/Clone/Prompt: מומלץ שתשכפל את הפלטה הזו לפני שתערוך אותה
+Palette/Editor/Prompt: עריכה
+Palette/Editor/Prompt/Modified: פלטת צל זו שונתה
+Palette/Editor/Reset/Caption: אתחל
+Palette/HideEditor/Caption: הסתר עורך
+Palette/Prompt: פלטה נוכחית:
+Palette/ShowEditor/Caption: הראה עורך
+Parsing/Block/Caption: כללי פריסה של הבלוק
+Parsing/Caption: פריסה
+Parsing/Inline/Caption: כללי פריסה מובנים
+Parsing/Pragma/Caption: כללי פריסה פרגמה
+Plugins/Add/Caption: השג עוד פלאגינים
+Plugins/Add/Hint: התקן פלאגינים מהספרייה הרשמית
+Plugins/AlreadyInstalled/Hint: הפלאגין הזה כבר מותקן בגירסה <$text text=<<installedVersion>>/>
+Plugins/Caption: פלאגינים
+Plugins/Disable/Caption: הפסק
+Plugins/Disable/Hint: הפסק פלאגין זה בטעינת עמוד
+Plugins/Disabled/Status: (משותק)
+Plugins/Empty/Hint: אין
+Plugins/Enable/Caption: אפשר
+Plugins/Enable/Hint: אפשר פלאגין זה כשטוענים עמוד מחדש
+Plugins/Install/Caption: התקן
+Plugins/Installed/Hint: הפלאגינים המותקנים כעת:
+Plugins/Languages/Caption: שפות
+Plugins/Languages/Hint: פלאגינים של חבילות שפה
+Plugins/NoInfoFound/Hint:  ''"<$text text=<<currentTab>>/>"'' לא נמצא
+Plugins/NoInformation/Hint: מידע לא סופק
+Plugins/NotInstalled/Hint: פלאגין זה לא מותקן כעת
+Plugins/OpenPluginLibrary: פתח את ספריית הפלאגין
+Plugins/Plugins/Caption: פלאגינים
+Plugins/Plugins/Hint: פלאגינים
+Plugins/Reinstall/Caption: התקן מחדש
+Plugins/Themes/Caption: תימות 
+Plugins/Themes/Hint: פלאגינים של תימות
+Saving/Caption: שמיה
+Saving/Heading: שמירה
+Saving/TiddlySpot/Advanced/Heading: קביעות מתקדמות
+Saving/TiddlySpot/BackupDir: מחיצת גיבוי
+Saving/TiddlySpot/Backups: גיבוי
+Saving/TiddlySpot/Filename: שם קובץ לטעינה
+Saving/TiddlySpot/Password: סיסמה
+Saving/TiddlySpot/ServerURL: כתובת שרת 
+Saving/TiddlySpot/UploadDir: מחיצת העלאה
+Saving/TiddlySpot/UserName: שם ויקי
+Settings/AutoSave/Caption: שמירה אוטומטית
+Settings/AutoSave/Disabled/Description: אל שתמור שינויים אוטוטמטית
+Settings/AutoSave/Enabled/Description: שמור שינויים אוטומטית
+Settings/AutoSave/Hint: שמור שינויים אוטומטית בעת עריכה
+Settings/Caption: קביעות
+Settings/DefaultSidebarTab/Caption: לשונית סרגל צד ברירת מחדך
+Settings/DefaultSidebarTab/Hint: קבע איזו לשונית בסרגל הצד מוצגת כברירת מחדל
+Settings/EditorToolbar/Caption: סרגל כלים של העורך
+Settings/EditorToolbar/Description: הראה את סרגל הכלים של העורך
+Settings/EditorToolbar/Hint: הפעל או כבה את סרגל הכלים של העורך
+Settings/Hint: קביעות אלו עוזרות לך לקסטם את התנהגות טידליויקי
+Settings/LinkToBehaviour/Caption: התנהגות הפתיחה של טידלר
+Settings/LinkToBehaviour/InsideRiver/Hint: ניווט מתוך ובתוך נהר הסיפורים
+Settings/LinkToBehaviour/OpenAbove: פתח מעל הטידלר הנוכחי
+Settings/LinkToBehaviour/OpenAtBottom: פתח בתחתית נהר הסיפורים הנוכחי
+Settings/LinkToBehaviour/OpenAtTop: פתח בראש נהר הסיפורים
+Settings/LinkToBehaviour/OpenBelow: פתח מתחת לטידלר הנוכחי
+Settings/LinkToBehaviour/OutsideRiver/Hint: ניווט מחוץ לנהר הסיפורים
+Settings/MissingLinks/Caption: קישורי ויקי
+Settings/MissingLinks/Description: אפשר קישורים לטידלרים חסרים
+Settings/MissingLinks/Hint: בחר האם לקשר לטידלרים שאינם קיימים עדיין
+Settings/NavigationAddressBar/Caption: התנהגות סרגל ניווט הכתובת
+Settings/NavigationAddressBar/Hint: התנהגות סרגל ניווט הכתובת של הדפדפן כשמנווטים לטידלר
+Settings/NavigationAddressBar/No/Description: אל תעדכן את סרגל הכתובת
+Settings/NavigationAddressBar/Permalink/Description: כלול את טידלר המטרה
+Settings/NavigationAddressBar/Permaview/Description: כלול את טידלר המטרה ואת רצף הסיפור הנוכחי
+Settings/NavigationHistory/Caption: הסטורית ניווט
+Settings/NavigationHistory/Hint: עדכן ביטרית גלישה כשמנווטים לטידלר
+Settings/NavigationHistory/No/Description: אל תעדכן היסטוריה
+Settings/NavigationHistory/Yes/Description: עדכן היסטוריה
+Settings/PerformanceInstrumentation/Caption: מעקב לביצועים
+Settings/PerformanceInstrumentation/Description: אפשר מעקב ביצועים
+Settings/TitleLinks/Caption: כותרות טידלרים
+Settings/TitleLinks/Hint: אופציונלית הצג כותרות טידלרים כקישורים
+Settings/TitleLinks/No/Description: אל תראה כותרות טידלרים כקישורים
+Settings/TitleLinks/Yes/Description: הראה כותרות טידלרים כקישורים
+Settings/ToolbarButtons/Caption: כפתורי סרגל כלים
+Settings/ToolbarButtons/Hint: ברירת מחדל של כפתורי סרגל כלים:
+Settings/ToolbarButtons/Icons/Description: כלול צללמית
+Settings/ToolbarButtons/Text/Description: כלול טקסט
+Settings/ToolbarButtonStyle/Caption: סגנון כפתור בסרגל כלים
+Settings/ToolbarButtonStyle/Hint: בחר סגנון לכפתורי סרגל כלים
+Settings/ToolbarButtonStyle/Styles/Borderless: ללא גבול
+Settings/ToolbarButtonStyle/Styles/Boxed: בקופסה
+Settings/ToolbarButtonStyle/Styles/Rounded: מעוגלים
+StoryView/Caption: מבט סיפור
+StoryView/Prompt: מבט נוכחי:
+Theme/Caption: תימה
+Theme/Prompt: תימה נוכחית:
+TiddlerFields/Caption: שדות טידלר
+TiddlerFields/Hint: רשימה המלאה של שדות טידלרים בויקי זה (including system tiddlers but excluding shadow tiddlers).
+Toolbars/Caption: סרגלי כלים
+Toolbars/EditorToolbar/Caption: סרגל כלים עורך
+Toolbars/EditorToolbar/Hint: בחר את הכפתורים שיוצגו בסרגל הכלים של העורך. שים לב שכפתורים מסויימים יוצגו רק עבור סוגים מסויימים של טידלרים
+Toolbars/EditToolbar/Caption: סרגל כלים עריכה
+Toolbars/EditToolbar/Hint: בחר את הכפתורים שיוצגו לטידלרים במצב עריכה
+Toolbars/Hint: בחר איזה כפתורי סרגל כלים יוצגו
+Toolbars/PageControls/Caption: סרגל כלים של עמוד
+Toolbars/PageControls/Hint: בחר איזה כפתורים יוצגו בסרגל הכלים העיקרי
+Toolbars/ViewToolbar/Caption: סרגל כלים של מבטים
+Toolbars/ViewToolbar/Hint: בחר איזה כפתורים יוצגו לטידלרים במצב צפייה
+Tools/Download/Full/Caption: הורד את הויקי המלא
diff --git a/languages/he-IL/CoreReadMe.tid b/languages/he-IL/CoreReadMe.tid
new file mode 100644
index 000000000..65fc5fa2d
--- /dev/null
+++ b/languages/he-IL/CoreReadMe.tid
@@ -0,0 +1,8 @@
+title: $:/core/readme
+
+הפלאגין הזה כולל רכיבים מרכזיים בטידלי-ויקי הכוללים:
+
+* JavaScript code modules
+* Icons
+* Templates needed to create TiddlyWiki's user interface
+* British English (''en-GB'') translations of the localisable strings used by the core
diff --git a/languages/he-IL/Dates.multids b/languages/he-IL/Dates.multids
new file mode 100644
index 000000000..ee3a297f4
--- /dev/null
+++ b/languages/he-IL/Dates.multids
@@ -0,0 +1,87 @@
+title: $:/language/
+
+Date/DaySuffix/1: 
+Date/DaySuffix/10: 
+Date/DaySuffix/11: 
+Date/DaySuffix/12: 
+Date/DaySuffix/13: 
+Date/DaySuffix/14: 
+Date/DaySuffix/15: 
+Date/DaySuffix/16: 
+Date/DaySuffix/17: 
+Date/DaySuffix/18: 
+Date/DaySuffix/19: 
+Date/DaySuffix/2: 
+Date/DaySuffix/20: 
+Date/DaySuffix/21: 
+Date/DaySuffix/22: 
+Date/DaySuffix/23: 
+Date/DaySuffix/24: 
+Date/DaySuffix/25: 
+Date/DaySuffix/26: 
+Date/DaySuffix/27: 
+Date/DaySuffix/28: 
+Date/DaySuffix/29: 
+Date/DaySuffix/3: 
+Date/DaySuffix/30: 
+Date/DaySuffix/31: 
+Date/DaySuffix/4: 
+Date/DaySuffix/5: 
+Date/DaySuffix/6: 
+Date/DaySuffix/7: 
+Date/DaySuffix/8: 
+Date/DaySuffix/9: 
+Date/Long/Day/0: ראשון
+Date/Long/Day/1: שני
+Date/Long/Day/2: שלישי
+Date/Long/Day/3: רביעי
+Date/Long/Day/4: חמישי
+Date/Long/Day/5: שישי
+Date/Long/Day/6: שבת
+Date/Long/Month/1: ינואר
+Date/Long/Month/10: אוקטובר
+Date/Long/Month/11: נובמבר
+Date/Long/Month/12: דצמבר
+Date/Long/Month/2: פברואר
+Date/Long/Month/3: מרץ
+Date/Long/Month/4: אפריל
+Date/Long/Month/5: מאי
+Date/Long/Month/6: יוני
+Date/Long/Month/7: יולי
+Date/Long/Month/8: אוגוסט
+Date/Long/Month/9: ספטמבר
+Date/Period/am: לפנה"צ
+Date/Period/pm: אחה"צ
+Date/Short/Day/0: ראש
+Date/Short/Day/1: שני
+Date/Short/Day/2: שלי
+Date/Short/Day/3: רבי
+Date/Short/Day/4: חמי
+Date/Short/Day/5: שיש
+Date/Short/Day/6: שבת
+Date/Short/Month/1: ינו
+Date/Short/Month/10: אוק
+Date/Short/Month/11: נוב
+Date/Short/Month/12: דצמ
+Date/Short/Month/2: פבר
+Date/Short/Month/3: מרץ
+Date/Short/Month/4: אפר
+Date/Short/Month/5: מאי
+Date/Short/Month/6: יון
+Date/Short/Month/7: יול
+Date/Short/Month/8: אוג
+Date/Short/Month/9: ספט
+RelativeDate/Future/Days: <<period>> ימים מעכשיו
+RelativeDate/Future/Hours: <<period>> שעות מעכשיו
+RelativeDate/Future/Minutes: <<period>> דקות מעכשיו
+RelativeDate/Future/Months: <<period>> חודשים מעכשיו
+RelativeDate/Future/Second: 1 שנייה מעכשיו
+RelativeDate/Future/Seconds: <<period>> שניות מעכשיו
+RelativeDate/Future/Years: <<period>> שנים מעכשיו
+RelativeDate/Past/Days: <<period>> ימים קודם
+RelativeDate/Past/Hours: <<period>> שעות קודם
+RelativeDate/Past/Minutes: <<period>> דקות קודם
+RelativeDate/Past/Months: <<period>> חודשים קודם
+RelativeDate/Past/Second: 1 שנייה קודם
+RelativeDate/Past/Seconds: <<period>> שניות קודם
+RelativeDate/Past/Years: <<period>> שנים קודם
diff --git a/languages/he-IL/Docs/ModuleTypes.multids b/languages/he-IL/Docs/ModuleTypes.multids
new file mode 100644
index 000000000..2d153de4e
--- /dev/null
+++ b/languages/he-IL/Docs/ModuleTypes.multids
@@ -0,0 +1,22 @@
+title: $:/language/Docs/ModuleTypes/
+
+animation: אנימציות שאפשר להתשמש בהן עם RevealWidget.
+command: פקודות שאפשר להפעיל תחת Node.js.
+config: נתונים להכנסה לתוך `$tw.config`.
+filteroperator: מתודות אופרטוראי פילטר אינדיבידואליות
+global: נתונים גלובלים להכנסה לתוך `$tw`.
+isfilteroperator: אופרנדים עבור ''is'' אופרטור פילטר
+macro: JavaScript הגדרות מקרו
+parser: פורשים לסוגי תוכן שונים
+saver: שומרים מטפלים בשיטות שונות לשמירת קובץ מהדפדפן
+startup: פונקציות אתחול
+storyview: מבטי סיפור מקסטמים את ההנפשה וההתגנהגות של וידג'טי רשימה
+tiddlerdeserializer: ממירים סוגי תוכן שונים לטידלרים
+tiddlerfield: מגדירים את ההתנהגות של שדות טידלרים אינדיבידואליים.
+tiddlermethod: מוסיף שיטות ל `$tw.Tiddler` אב הטיפוס
+upgrader: מיישם עיבוד שדרוג לטידלרים בזמן ייבוא/שדרוג
+utils: מוסיף שיטות ל `$tw.utils`.
+utils-node: מוסיף Node.js-specific שיטות ל `$tw.utils`.
+widget: וידג'טים העוטפים DOM התוויה ועדכון
+wikimethod: מוסיף שיטות ל `$tw.Wiki`.
+wikirule: חוקי פרישה אינדיבידואלים עבור WikiText פורש העיקרי
diff --git a/languages/he-IL/Docs/PaletteColours.multids b/languages/he-IL/Docs/PaletteColours.multids
new file mode 100644
index 000000000..9eab689c8
--- /dev/null
+++ b/languages/he-IL/Docs/PaletteColours.multids
@@ -0,0 +1,105 @@
+title: $:/language/Docs/PaletteColours/
+
+alert-background: רקע התראה
+alert-border: גבול התראה
+alert-highlight: הדגשת התראה
+alert-muted-foreground: קדומני התראה מושתקת
+background: רקע כללי
+blockquote-bar: סרגל ציטוט
+button-background: רקע כפתור ברירת מחדל
+button-border: גבול כפתור ברירת מחדל
+button-foreground: קדומני כפתור ברירת מחדל
+code-background: רקע קוד
+code-border: גבול קוד
+code-foreground: קדומני קוד
+dirty-indicator: מסמן שינויים לא שמורים
+download-background: רקע כפתור הורדה
+download-foreground: קדומני כפתור הורדה
+dragger-background: רקע גורר
+dragger-foreground: קדומני גורר
+dropdown-background: רקע גלילה למטה
+dropdown-border: גבול גלילה למטה
+dropdown-tab-background: רקע לשונית גלילה למטה
+dropdown-tab-background-selected: רקע לשונית גלילה למטה ללשוניות בחורות
+dropzone-background: רקע אזור עזיבה
+external-link-background: רקע קישור חיצוני
+external-link-background-hover: רקע בריחוף מעל קישור חיצוני
+external-link-background-visited:  רקע קישור חיצוני שבוקר
+external-link-foreground: קדומני קישור חיצוני
+external-link-foreground-hover: קדומני בריחוף מעל קישור חיצוני
+external-link-foreground-visited: קדומני בקישור חיצוני שבוקר
+foreground: קדומני כללי
+message-background: רקע תיבת הודעה
+message-border: גבול תיבת הודעה
+message-foreground: קדומני תיבת הודעה
+modal-backdrop: "ווילוון" מודאלי
+modal-background: רקע מודאלי
+modal-border: גבול מודאלי
+modal-footer-background: רקע לכותרת תחתית מודאלית
+modal-footer-border: גבול כותרת תחתית מודאלית
+modal-header-border: גבול כותרת עילית מודאלית
+muted-foreground: קדומני מושתק כללי
+notification-background: רקע הודעות
+notification-border: גובל הודעות
+page-background: רקע עמוד
+pre-background: רקע קוד מעוצב מראש
+pre-border: גבול קוד מעוצב מראש
+primary: ראשוני כללי 
+sidebar-button-foreground: קדומני כפתור סרגל צד
+sidebar-controls-foreground: קדומני לבקרות סרגל צד
+sidebar-controls-foreground-hover:  ריחוף מעל קדומני לבקרות סרגל צד  
+sidebar-foreground: קדומני סרגל צד
+sidebar-foreground-shadow:  צל קדומני סרגל צד
+sidebar-muted-foreground: קדומני מושתק סרגל צד
+sidebar-muted-foreground-hover:  ריחוף מעל קדומני מושתק סרגל צד
+sidebar-tab-background: רקע לשונית סרגל צד
+sidebar-tab-background-selected: רקע לשונית סרגל צד ללשוניות בחורות
+sidebar-tab-border: גבול לשונית סרגל צד
+sidebar-tab-border-selected: גבול לשונית סרגל צד ללשוניות בחורות
+sidebar-tab-divider: מפריד לשונית סרגל צד
+sidebar-tab-foreground: קדומני לשונית סרגל צד
+sidebar-tab-foreground-selected: קדומני לשונית סרגל צד ללשוניות בחורות  
+sidebar-tiddler-link-foreground: קדומני לקישור טידלרים בסרגל צד
+sidebar-tiddler-link-foreground-hover:  קדומני לריחוף מעל לקישור טידלרים בסרגל צד
+site-title-foreground: קדומני לכותרת האתר
+static-alert-foreground: קדומני לאתראה סטטית 
+tab-background: רקע ללשונית
+tab-background-selected: רקע ללשונית ללשוניות בחורות 
+tab-border: גבול לשונית
+tab-border-selected: גבול לשונית ללשוניות בחורות
+tab-divider: מפריד לשוניות 
+tab-foreground: קדומני ללשונית
+tab-foreground-selected: קדומני ללשונית ללשוניות בחורות 
+table-border: גבול טבלה
+table-footer-background: רקע לכותרת תחתית לטבלה
+table-header-background: רקע לכותרת עילית לטבלה
+tag-background: רקע לתגית 
+tag-foreground: קדומני לתגית
+tiddler-background: רקע לטידלר
+tiddler-border: גבול לטידלר
+tiddler-controls-foreground: קדומני לבקרות טידלר
+tiddler-controls-foreground-hover: קדומני ךריחוף מעל לבקרות טידלר
+tiddler-controls-foreground-selected: קדומני לבקרות טידלר לטידלרים נבחרים
+tiddler-editor-background: רקע לעורך טידלרים
+tiddler-editor-border: גבול לעורך טידלרים
+tiddler-editor-border-image: תמונת גבול עורך טידלרים
+tiddler-editor-fields-even: רקע עורך טידלרים שדות זוגיים
+tiddler-editor-fields-odd: רקע עורך טידלרים שדות אי זוגיים
+tiddler-info-background: רקע ללוח מידע טידלר
+tiddler-info-border: גבול ללוח מידע טידלר
+tiddler-info-tab-background: גבול ללשונית לוח מידע טידלר
+tiddler-link-background: רקע קישור טידלר
+tiddler-link-foreground: קדומני קישור טידלר
+tiddler-subtitle-foreground: רקע לתת-כותרת טידלר
+tiddler-title-foreground: קודמני לכותרת טידלר
+toolbar-cancel-button: קדומני לכפתור בטל בסרגל
+toolbar-close-button: קדומני לכפתור סגורבסרגל
+toolbar-delete-button: קדומני לכפתור מחקבסרגל
+toolbar-done-button: קדומני לכפתור עשוי בסרגל
+toolbar-edit-button: קדומני לכפתור ערוך בסרגל
+toolbar-info-button: קדומני לכפתור מידע בסרגל
+toolbar-new-button: קדומני לכפתור טידלר חדש בסרגל
+toolbar-options-button: קדומני לכפתור אפשרויות בסרגל
+toolbar-save-button: קדומני לכפתור שמור בסרגל
+untagged-background: רקע לגלולה לא מסומנת
+very-muted-foreground: קדומני מאוד מושתק
diff --git a/languages/he-IL/EditTemplate.multids b/languages/he-IL/EditTemplate.multids
new file mode 100644
index 000000000..f198c813d
--- /dev/null
+++ b/languages/he-IL/EditTemplate.multids
@@ -0,0 +1,26 @@
+title: $:/language/EditTemplate/
+
+Body/External/Hint: זהו טידלר חיצוני המוחסן מחוץ לקובץ העיקרי של הטידליויקי. אתה יכול לערוך את התגים והשדות אבל לא ישירות את התוכן עצמו.
+Body/Placeholder: הקש את הטקסט לטידלר הזה
+Body/Preview/Type/Output: פלט
+Field/Remove/Caption: הסר שדה
+Field/Remove/Hint: הסר שדה
+Fields/Add/Button: הוסף
+Fields/Add/Dropdown/System: שדות מערכת
+Fields/Add/Dropdown/User: שדות משתמש
+Fields/Add/Name/Placeholder: שם שדה
+Fields/Add/Prompt: הוסף שדה חדש:
+Fields/Add/Value/Placeholder: ערך השדה
+Shadow/OverriddenWarning: זהו טידלר צל ששונה. אתה יכול לחזור לגרסה המקורית שבפלאגין<<pluginLink>> על ידי מחיקת הטידלר הזה
+Shadow/Warning: זהו טידלר צל. כל שינוי יחליף למעשה את הגריסה המקורית מהפלאגין <<pluginLink>>
+Tags/Add/Button: הוסף
+Tags/Add/Placeholder: שם התג
+Tags/Dropdown/Caption: רשימת תגים
+Tags/Dropdown/Hint: הראה רשימת תגים
+Title/BadCharacterWarning: אזהרה: הימנע משימוש בסימנים <<bad-chars>> בשמות טידלרים
+Type/Delete/Caption: מחק סוג תוכן
+Type/Delete/Hint: מחק סוג תוכן
+Type/Dropdown/Caption: רשימת סוגי תוכן
+Type/Dropdown/Hint: הראה רשימת סוגי תוכן
+Type/Placeholder: סוג תוכן
+Type/Prompt: סוג:
diff --git a/languages/he-IL/Exporters.multids b/languages/he-IL/Exporters.multids
new file mode 100644
index 000000000..87d7ade8f
--- /dev/null
+++ b/languages/he-IL/Exporters.multids
@@ -0,0 +1,6 @@
+title: $:/language/Exporters/
+
+CsvFile: CSV קובץ
+JsonFile: JSON קובץ
+StaticRiver: סטטי HTML
+TidFile: ".tid" קובץ
diff --git a/languages/he-IL/Fields.multids b/languages/he-IL/Fields.multids
new file mode 100644
index 000000000..ddc1418d0
--- /dev/null
+++ b/languages/he-IL/Fields.multids
@@ -0,0 +1,35 @@
+title: $:/language/Docs/Fields/
+
+_canonical_uri: ה URL השלם של טידלר תמונה חיצונית
+bag: שם השק ממנו בא הטידלר
+caption: הטקסט להצגה על צ=לשונית או כפתור
+color: ערך הצבע של CSS המקושר לטידלר זה
+component: שם הרכיב האחראי ל [[alert tiddler|AlertMechanism]]
+created: התאריך בו נוצר הטידלר
+creator: שם האדם שיצר את הטידלר
+current-tiddler: משמש לאגירת הטידלר העליון ב [[history list|HistoryMechanism]]
+dependents: עבור פלאגין רושם את שמות הפלאגינים התלויים בו
+description: התיאור של פלאגין או דיאלוג מודאלי
+draft.of: עבור טידלרי טיוטה, מכיל את כותרת הטידלר שעבורו הוא טיוטה
+draft.title: עבור טידלרי טיוטה, מכיל את הכותרת החדשה לטידלר המוצע
+footer: כותרת תחתונה לוויזארד
+hack-to-give-us-something-to-compare-against: שדה אחסון זמני המשמש ב [[$:/core/templates/static.content]]
+icon: שם הטידלר המכיל את הצלמית המקושרת לטידלר
+library: אם "yes" מציין שהטידלר צריך להישמר כספריית ג'אווהסקריפט
+list: רשימה סדורה של שמות טידלרים המקושרים לטידלר
+list-after: אם מכיל ערך, הכותרת של הטידלר שאחריו הטידלר הזה צריך להיות מוסף לרשימה הסדורה של כותרות טידלרים
+list-before:  אם מכיל ערך, הכותרת של הטידלר שלפניו הטידלר הזה צריך להיות מוסף לרשימה הסדורה של כותרות טידלרים או בתחילת הרשימה אם השדה נמצא אך ריק
+modified: התאריך והזמן בהם טידלר זה שונה לאחרונה
+modifier: שם הטידלר המזוהה עם האדם ששינה טידלר זה לאחרונה
+name: השם הקריא המקושר עם טידלר פלאגין
+plugin-priority: ערך מספרי המציין את העדיפות של טידלר פלאגין
+plugin-type: סוג הלאגין בטידלר פלאגין
+released: תאריך הגירסה של טידליויקי
+revision: גרסת הטידלר המוחזקת בשרת
+source: URL המקור המקושר לטידלר זה
+subtitle: תת הכותרת של הוויזארד
+tags: רשימת תגים המקושרץ לטידלר
+text: הטקסט העיקרי של הטידלר
+title: השם הייחודי של הטידלר
+type: סוג התוכן של הטידלר
+version: מידע גירסה לפלאגין
diff --git a/languages/he-IL/Filters.multids b/languages/he-IL/Filters.multids
new file mode 100644
index 000000000..04531dd87
--- /dev/null
+++ b/languages/he-IL/Filters.multids
@@ -0,0 +1,14 @@
+title: $:/language/Filters/
+
+AllTags: כל התגים חוץ מתגי מערכת
+AllTiddlers: כל הטידלרים חוץ מטידלרי מערכת
+Drafts: טידלרי טיוטה
+Missing: טידלרים חסרים
+Orphans: טידלרים יתומים
+OverriddenShadowTiddlers: טידלרי צל שכוסו
+RecentSystemTiddlers: טידלרים ששונו לארונה, כולל מערכת
+RecentTiddlers: טידלרים ששונו לאחרונה
+ShadowTiddlers: טידלרי צל
+SystemTags: תגיות מערכת
+SystemTiddlers: טידלרי מערכת
+TypedTiddlers: טידלרים שאינם בויקי-טקסט
diff --git a/languages/he-IL/GettingStarted.tid b/languages/he-IL/GettingStarted.tid
new file mode 100644
index 000000000..e4c91d1c7
--- /dev/null
+++ b/languages/he-IL/GettingStarted.tid
@@ -0,0 +1,17 @@
+title: GettingStarted
+
+\define lingo-base() $:/language/ControlPanel/Basics/
+~TiddlyWiki ולקהילת ~TiddlyWiki ברוך הבא ל 
+
+לפני שאתה מתחיל לאגור מידע חשוב ~TiddlyWiki חשוב לוודא שאתה יכול לשומרם באופן אמין. ראה http://tiddlywiki.com/#GettingStarted לפרטים
+
+!! אתחל ~TiddlyWiki
+
+<div class="tc-control-panel">
+
+|<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
+|<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
+|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+</div>
+
+ראה [[control panel|$:/ControlPanel]] לאופציות נוספות.
diff --git a/languages/he-IL/Import.multids b/languages/he-IL/Import.multids
new file mode 100644
index 000000000..700427933
--- /dev/null
+++ b/languages/he-IL/Import.multids
@@ -0,0 +1,15 @@
+title: $:/language/Import/
+
+Imported/Hint: הטידלרים הבאים ייובאו:
+Listing/Cancel/Caption: בטל
+Listing/Hint: טידלרים אלה מוכנים לייבוא:
+Listing/Import/Caption: יבא
+Listing/Select/Caption: בחר
+Listing/Status/Caption: סטטוס
+Listing/Title/Caption: כותרת
+Upgrader/Plugins/Suppressed/Incompatible: פלאגין חסום, לא תואם או פג-תוקף
+Upgrader/Plugins/Suppressed/Version: פלאגין חסום (בגלל <<incoming>>   ישן יותר מאשר  <<existing>>)
+Upgrader/Plugins/Upgraded: עודכן פלאגין מ <<incoming>> ל <<upgraded>>
+Upgrader/State/Suppressed: טידלר במצב זמני נחסם
+Upgrader/System/Suppressed: טידלר מערכת חסום
+Upgrader/ThemeTweaks/Created: יובא שינוי תימה <$text text=<<from>>/>
diff --git a/languages/he-IL/Misc.multids b/languages/he-IL/Misc.multids
new file mode 100644
index 000000000..9a7a05f5d
--- /dev/null
+++ b/languages/he-IL/Misc.multids
@@ -0,0 +1,45 @@
+title: $:/language/
+
+BinaryWarning/Prompt: הטידלר הזה כולל נתונים בינאריים
+ClassicWarning/Upgrade/Caption: שדרג
+CloseAll/Button: סגור הכל
+ColourPicker/Recent: אחרונים:
+ConfirmCancelTiddler: האם אתה רוצה לוותר על השינויים בטידלר "<$text text=<<title>>/>"?
+ConfirmDeleteTiddler: האם אתה רוצה למחוק את הטידלר "<$text text=<<title>>/>"?
+ConfirmOverwriteTiddler: האם אתה רוצה להחליף את הטידלר "<$text text=<<title>>/>"?
+Count: מספר
+DefaultNewTiddlerTitle: טידלר חדש:
+DropMessage: שמוט כאן (או השתמש ב ESCAPE לבטל)
+Encryption/Cancel: בטל
+Encryption/ConfirmClearPassword: האם אתה רוצה לנקות את הסיסמה? זה יבטל את ההצפנה של הטידלי-ויקי הזה
+Encryption/Password: סיסמה
+Encryption/PasswordNoMatch: סיסמאות לא מתאימות
+Encryption/PromptSetPassword: קבע סיסמה חדשה לטידליויקי זה
+Encryption/RepeatPassword: סיסמה שוב
+Encryption/SetPassword: קבע סיסמה
+Encryption/Username: שם משתמש
+Error/Caption: שגיאה
+Error/Filter: שגיאת פילטר
+Error/FilterSyntax: שגיאת תחביר בביטוי פילטר
+Error/IsFilterOperator: שגיאת פילטר: אופרנד לא ידוע לאופרטור 'is' 
+Error/LoadingPluginLibrary: שגיאה בטעינת ספריית פלאגין
+Error/RecursiveTransclusion: שגיאת טרנסקלוזיה רקורסיבית בוידג'ט הטרנסקלוזיה
+Error/RetrievingSkinny: שגיאה באחזור רשימת טידלרים סקיניים
+Error/SavingToTWEdit: שגיאה בשמירה TWEdit
+Error/WhileSaving: שגיאה בשמירה
+Error/XMLHttpRequest: XMLHttpRequest קוד שגיאה
+InternalJavaScriptError/Hint: מביך, אך מומלץ שתאתחל מחדש על ידי רפרוש הדפדפן
+InvalidFieldName: סימנים לא חוקיים בשם השדה "<$text text=<<fieldName>>/>". Fields can only contain lowercase letters, digits and the characters underscore (`_`), hyphen (`-`) and period (`.`)
+LoginToTiddlySpace: היכנס ל TiddlySpace
+MissingTiddler/Hint: טידלר חסר "<$text text=<<currentTiddler>>/>" -לחץ {{$:/core/images/edit-button}} כדי ליצור
+No: לא
+OfficialPluginLibrary: רשמית~TiddlyWiki ספריית פלאגינים
+PluginReloadWarning: נא שמור {{$:/core/ui/Buttons/save-wiki}} וטען מחדש {{$:/core/ui/Buttons/refresh}} כדי לאפשר לשינויי הפלאגינים להיכנס לתוקף
+SystemTiddler/Tooltip: זהו טידלר מערכת
+TagManager/Colour/Heading: צבע
+TagManager/Count/Heading: מספר
+TagManager/Icon/Heading: צלמית
+TagManager/Info/Heading: מידע
+TagManager/Tag/Heading: תג
+UnsavedChangesWarning: יש לך שינויים לא שמורים בטידלי-ויקי
+Yes: כן
diff --git a/languages/he-IL/NewJournal.multids b/languages/he-IL/NewJournal.multids
new file mode 100644
index 000000000..08bdfc5ec
--- /dev/null
+++ b/languages/he-IL/NewJournal.multids
@@ -0,0 +1,3 @@
+title: $:/config/NewJournal/
+
+Tags: יומן
diff --git a/languages/he-IL/Notifications.multids b/languages/he-IL/Notifications.multids
new file mode 100644
index 000000000..80ea62b11
--- /dev/null
+++ b/languages/he-IL/Notifications.multids
@@ -0,0 +1,4 @@
+title: $:/language/Notifications/
+
+Save/Done: ויקי נשמר
+Save/Starting: מתחיל לשמור ויקי
diff --git a/languages/he-IL/Search.multids b/languages/he-IL/Search.multids
new file mode 100644
index 000000000..7b9490c37
--- /dev/null
+++ b/languages/he-IL/Search.multids
@@ -0,0 +1,14 @@
+title: $:/language/Search/
+
+DefaultResults/Caption: רשימה
+Filter/Caption: פילטר
+Filter/Hint: חפש דרך [[filter expression|http://tiddlywiki.com/static/Filters.html]]
+Matches/All: כל ההתאמות:
+Matches/Title: התאמות שם:
+Search: חפש
+Shadows/Caption: צללים
+Shadows/Hint: חפש טידלרי צללים
+Standard/Caption: רגיל
+Standard/Hint: חפש טידלרים רגילים
+System/Caption: מערכת
+System/Hint: חפש טידלרי מערכת
diff --git a/languages/he-IL/SideBar.multids b/languages/he-IL/SideBar.multids
new file mode 100644
index 000000000..584e199d4
--- /dev/null
+++ b/languages/he-IL/SideBar.multids
@@ -0,0 +1,16 @@
+title: $:/language/SideBar/
+
+All/Caption: הכל
+Contents/Caption: תוכן
+Drafts/Caption: טיוטות
+Missing/Caption: חסרים
+More/Caption: עוד
+Open/Caption: פתוחים
+Orphans/Caption: יתומים
+Recent/Caption: אחרונים
+Shadows/Caption: צללים
+System/Caption: מערכת
+Tags/Caption: תגים
+Tags/Untagged/Caption: לא מתויגים
+Tools/Caption: כלים 
+Types/Caption: סוגים
diff --git a/languages/he-IL/SiteSubtitle.tid b/languages/he-IL/SiteSubtitle.tid
new file mode 100644
index 000000000..fdf79fc71
--- /dev/null
+++ b/languages/he-IL/SiteSubtitle.tid
@@ -0,0 +1,3 @@
+title: $:/SiteSubtitle
+
+יומן רשת אישי לא-לינארי
\ No newline at end of file
diff --git a/languages/he-IL/SiteTitle.tid b/languages/he-IL/SiteTitle.tid
new file mode 100644
index 000000000..8529a6878
--- /dev/null
+++ b/languages/he-IL/SiteTitle.tid
@@ -0,0 +1,3 @@
+title: $:/SiteTitle
+
+ה ~TiddlyWiki שלי
\ No newline at end of file
diff --git a/languages/he-IL/Snippets/ListByTag.tid b/languages/he-IL/Snippets/ListByTag.tid
new file mode 100644
index 000000000..220d9ed89
--- /dev/null
+++ b/languages/he-IL/Snippets/ListByTag.tid
@@ -0,0 +1,5 @@
+title: $:/language/Snippets/ListByTag
+tags: $:/tags/TextEditor/Snippet
+caption: רשימת טידלרים לפי תג
+
+<<list-links "[tag[task]sort[title]]">>
diff --git a/languages/he-IL/Snippets/MacroDefinition.tid b/languages/he-IL/Snippets/MacroDefinition.tid
new file mode 100644
index 000000000..8fa8164e2
--- /dev/null
+++ b/languages/he-IL/Snippets/MacroDefinition.tid
@@ -0,0 +1,7 @@
+title: $:/language/Snippets/MacroDefinition
+tags: $:/tags/TextEditor/Snippet
+caption: הגדרות מקרו
+
+\define macroName(param1:"default value",param2)
+Text of the macro
+\end
diff --git a/languages/he-IL/Snippets/Table4x3.tid b/languages/he-IL/Snippets/Table4x3.tid
new file mode 100644
index 000000000..53f207a2c
--- /dev/null
+++ b/languages/he-IL/Snippets/Table4x3.tid
@@ -0,0 +1,8 @@
+title: $:/language/Snippets/Table4x3
+tags: $:/tags/TextEditor/Snippet
+caption: טבלה בת 4 עמודות ו 3 שורות
+
+|! |!Alpha |!Beta |!Gamma |!Delta |
+|!One | | | | |
+|!Two | | | | |
+|!Three | | | | |
diff --git a/languages/he-IL/Snippets/TableOfContents.tid b/languages/he-IL/Snippets/TableOfContents.tid
new file mode 100644
index 000000000..06e2f49bc
--- /dev/null
+++ b/languages/he-IL/Snippets/TableOfContents.tid
@@ -0,0 +1,9 @@
+title: $:/language/Snippets/TableOfContents
+tags: $:/tags/TextEditor/Snippet
+caption: תוכן העניינים
+
+<div class="tc-table-of-contents">
+
+<<toc-selective-expandable 'TableOfContents'>>
+
+</div>
\ No newline at end of file
diff --git a/languages/he-IL/ThemeTweaks.multids b/languages/he-IL/ThemeTweaks.multids
new file mode 100644
index 000000000..c83204345
--- /dev/null
+++ b/languages/he-IL/ThemeTweaks.multids
@@ -0,0 +1,41 @@
+title: $:/language/ThemeTweaks/
+
+Metrics: גדלים
+Metrics/BodyFontSize: גודל גופן לגוף הטידלר
+Metrics/BodyLineHeight: גובה שורה לגוף הטידלר
+Metrics/FontSize: גודל גופן
+Metrics/LineHeight: גובה שורה
+Metrics/SidebarBreakpoint: נקודת השבירה של סרגל הצד
+Metrics/SidebarBreakpoint/Hint: רוחב דף מינימלי בו הסיפור וסרגל הצד יופיעו צד לצד
+Metrics/SidebarWidth: רוחב סרגל צד
+Metrics/SidebarWidth/Hint: רוחב סרגל צד במתווה סורם-קבוע
+Metrics/StoryLeft: מיקום שמאל הסיפור
+Metrics/StoryLeft/Hint: כמה רחוק שול שמאל של הטידלרים משול שמאל של העמוד
+Metrics/StoryRight: ימין הסיפור
+Metrics/StoryRight/Hint: כמה רחוק שול שמאל של סרגל הצד משול שמאל של העמוד
+Metrics/StoryTop: המיקום העליון של הסיפור
+Metrics/StoryTop/Hint: מרחק ראש הסיפור מראש הדף
+Metrics/StoryWidth: רוחב הסיפור
+Metrics/StoryWidth/Hint: הרוחב הכולל של נהר הסיפורים
+Metrics/TiddlerWidth: רוחב הטידלר
+Metrics/TiddlerWidth/Hint: בתוך נהר הסיפורים
+Options: אפשרויות
+Options/CodeWrapping: קפל שורות ארוכות בבלוקי קוד
+Options/SidebarLayout: מתווה סרגל צד
+Options/SidebarLayout/Fixed-Fluid: סיפור קבוע לוח צד גמיש
+Options/SidebarLayout/Fluid-Fixed: סיפור גמיש לוח צד קבוע
+Options/StickyTitles: כותרות דביקות
+Options/StickyTitles/Hint: גורם לכותרות טידלרים להידבק לראש חלון הדפדפן. לא עובד כלל בכרום וגורם בעיות מתווה בפירפוקס
+Settings: קביעות
+Settings/BackgroundImage: תמונת רקע של עמוד
+Settings/BackgroundImageAttachment: תמונת רקע עמוד מוצמדת
+Settings/BackgroundImageAttachment/Fixed: קבוע לחלון
+Settings/BackgroundImageAttachment/Scroll: גלגל עם טידלרים
+Settings/BackgroundImageSize: גודל תמונת רקע עמוד
+Settings/BackgroundImageSize/Auto: אוטומטי
+Settings/BackgroundImageSize/Contain: מכיל
+Settings/BackgroundImageSize/Cover: כיסוי
+Settings/CodeFontFamily: משפחת גופני קוד
+Settings/FontFamily: משפחת גופנים
+ThemeTweaks: התאמות תימה
+ThemeTweaks/Hint: אתה יכול להתאים היבטים מסויימים של תימת הווניל
diff --git a/languages/he-IL/TiddlerInfo.multids b/languages/he-IL/TiddlerInfo.multids
new file mode 100644
index 000000000..4eccda074
--- /dev/null
+++ b/languages/he-IL/TiddlerInfo.multids
@@ -0,0 +1,21 @@
+title: $:/language/TiddlerInfo/
+
+Advanced/Caption: מתקדם
+Advanced/PluginInfo/Empty/Hint: ללא
+Advanced/PluginInfo/Heading: פרטי פלאגין
+Advanced/PluginInfo/Hint: פלאגין זה כולל את טידלרי הצל הבאים:
+Advanced/ShadowInfo/Heading: מצב צל
+Advanced/ShadowInfo/NotShadow/Hint: הטידלר <$link to=<<infoTiddler>>><$text text=<<infoTiddler>>/></$link> אינו טידלר צל
+Advanced/ShadowInfo/OverriddenShadow/Hint: הוא ממוסך על ידי טידלר אחר
+Advanced/ShadowInfo/Shadow/Hint: הטידלר <$link to=<<infoTiddler>>><$text text=<<infoTiddler>>/></$link> הוא טילדר צל
+Advanced/ShadowInfo/Shadow/Source: הוא מוגדר בפלאגין <$link to=<<pluginTiddler>>><$text text=<<pluginTiddler>>/></$link>
+Fields/Caption: שדות
+List/Caption: רשימה
+List/Empty: לטידלר זה אין רשימה
+Listed/Caption: רשום
+Listed/Empty: הטידלר אינו רשום על ידי אחרים
+References/Caption: התייחסויות
+References/Empty: אין טידלרים המקושרים לזה
+Tagging/Caption: תיוג
+Tagging/Empty: אין טידלרים המתויגים על ידי זה
+Tools/Caption: כלים
diff --git a/languages/he-IL/Types/application%2Fjavascript.tid b/languages/he-IL/Types/application%2Fjavascript.tid
new file mode 100644
index 000000000..cdd451e45
--- /dev/null
+++ b/languages/he-IL/Types/application%2Fjavascript.tid
@@ -0,0 +1,4 @@
+title: $:/language/Docs/Types/application/javascript
+description: JavaScript קוד
+name: application/javascript
+group: מפתח
diff --git a/languages/he-IL/Types/application%2Fjson.tid b/languages/he-IL/Types/application%2Fjson.tid
new file mode 100644
index 000000000..59742a242
--- /dev/null
+++ b/languages/he-IL/Types/application%2Fjson.tid
@@ -0,0 +1,4 @@
+title: $:/language/Docs/Types/application/json
+description: JSON נתוני
+name: application/json
+group: מפתח
diff --git a/languages/he-IL/Types/application%2Fx-tiddler-dictionary.tid b/languages/he-IL/Types/application%2Fx-tiddler-dictionary.tid
new file mode 100644
index 000000000..a47ecb54b
--- /dev/null
+++ b/languages/he-IL/Types/application%2Fx-tiddler-dictionary.tid
@@ -0,0 +1,4 @@
+title: $:/language/Docs/Types/application/x-tiddler-dictionary
+description: מילון נתונים
+name: application/x-tiddler-dictionary
+group: מפתח
diff --git a/languages/he-IL/Types/image%2Fgif.tid b/languages/he-IL/Types/image%2Fgif.tid
new file mode 100644
index 000000000..537830ab5
--- /dev/null
+++ b/languages/he-IL/Types/image%2Fgif.tid
@@ -0,0 +1,4 @@
+title: $:/language/Docs/Types/image/gif
+description: GIF תמונת 
+name: image/gif
+group: תמונה
diff --git a/languages/he-IL/Types/image%2Fjpeg.tid b/languages/he-IL/Types/image%2Fjpeg.tid
new file mode 100644
index 000000000..7b517f191
--- /dev/null
+++ b/languages/he-IL/Types/image%2Fjpeg.tid
@@ -0,0 +1,4 @@
+title: $:/language/Docs/Types/image/jpeg
+description: JPEG תמונת
+name: image/jpeg
+group: תמונה
diff --git a/languages/he-IL/Types/image%2Fpng.tid b/languages/he-IL/Types/image%2Fpng.tid
new file mode 100644
index 000000000..d0e7930d8
--- /dev/null
+++ b/languages/he-IL/Types/image%2Fpng.tid
@@ -0,0 +1,4 @@
+title: $:/language/Docs/Types/image/png
+description: PNG תמונת
+name: image/png
+group: תמונה
diff --git a/languages/he-IL/Types/image%2Fsvg%2Bxml.tid b/languages/he-IL/Types/image%2Fsvg%2Bxml.tid
new file mode 100644
index 000000000..bd324a1a8
--- /dev/null
+++ b/languages/he-IL/Types/image%2Fsvg%2Bxml.tid
@@ -0,0 +1,4 @@
+title: $:/language/Docs/Types/image/svg+xml
+description: Structured Vector Graphics תמונת
+name: image/svg+xml
+group: תמונה
diff --git a/languages/he-IL/Types/image%2Fx-icon.tid b/languages/he-IL/Types/image%2Fx-icon.tid
new file mode 100644
index 000000000..55a37c04a
--- /dev/null
+++ b/languages/he-IL/Types/image%2Fx-icon.tid
@@ -0,0 +1,4 @@
+title: $:/language/Docs/Types/image/x-icon
+description: ICO format קובץ סמליל
+name: image/x-icon
+group: תמונה
diff --git a/languages/he-IL/Types/text%2Fcss.tid b/languages/he-IL/Types/text%2Fcss.tid
new file mode 100644
index 000000000..af2293056
--- /dev/null
+++ b/languages/he-IL/Types/text%2Fcss.tid
@@ -0,0 +1,4 @@
+title: $:/language/Docs/Types/text/css
+description: גליון עיצוב סטטי
+name: text/css
+group: מפתח
diff --git a/languages/he-IL/Types/text%2Fhtml.tid b/languages/he-IL/Types/text%2Fhtml.tid
new file mode 100644
index 000000000..b97a3c115
--- /dev/null
+++ b/languages/he-IL/Types/text%2Fhtml.tid
@@ -0,0 +1,4 @@
+title: $:/language/Docs/Types/text/html
+description: HTML טקסט
+name: text/html
+group: טקסט
diff --git a/languages/he-IL/Types/text%2Fplain.tid b/languages/he-IL/Types/text%2Fplain.tid
new file mode 100644
index 000000000..fb6789e17
--- /dev/null
+++ b/languages/he-IL/Types/text%2Fplain.tid
@@ -0,0 +1,4 @@
+title: $:/language/Docs/Types/text/plain
+description: טקסט רגיל
+name: text/plain
+group: טקסט
diff --git a/languages/he-IL/Types/text%2Fvnd.tiddlywiki.tid b/languages/he-IL/Types/text%2Fvnd.tiddlywiki.tid
new file mode 100644
index 000000000..417efc1c4
--- /dev/null
+++ b/languages/he-IL/Types/text%2Fvnd.tiddlywiki.tid
@@ -0,0 +1,4 @@
+title: $:/language/Docs/Types/text/vnd.tiddlywiki
+description: TiddlyWiki 5
+name: text/vnd.tiddlywiki
+group: טקסט
diff --git a/languages/he-IL/Types/text%2Fx-tiddlywiki.tid b/languages/he-IL/Types/text%2Fx-tiddlywiki.tid
new file mode 100644
index 000000000..a2049dd2a
--- /dev/null
+++ b/languages/he-IL/Types/text%2Fx-tiddlywiki.tid
@@ -0,0 +1,4 @@
+title: $:/language/Docs/Types/text/x-tiddlywiki
+description: TiddlyWiki Classic
+name: text/x-tiddlywiki
+group: טקסט
diff --git a/languages/he-IL/icon.tid b/languages/he-IL/icon.tid
new file mode 100644
index 000000000..c18b4a158
--- /dev/null
+++ b/languages/he-IL/icon.tid
@@ -0,0 +1,38 @@
+title: $:/languages/he-IL/icon
+type: image/svg+xml
+
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1"
+  xmlns:xlink="http://www.w3.org/1999/xlink"
+  width="660" height="480" viewBox="0 0 220 160">
+  <desc>Flag of Israel</desc>
+  <defs>
+    <!-- Specs are taken from "The Provisional Council of State Proclamation of
+      the Flag of the State of Israel," 25 Tishrei 5709 (28 October 1948)
+    For Magen David, the "Israel Science and Technology Homepage" at
+      http://www.science.co.il/Israel-flag.asp specifies each side as 60 cm.
+      Outer radius is then 30 / cos(30) = 20 * sqrt(3)
+    For equilateral triangles, middle radius = outer radius - width:
+      20 * sqrt(3) - 5.5
+    Coordinates for upward-pointing triangle relative to center are then:
+      (                            0,-(20*sqrt(3) - 5.5)          )
+      (-(20*sqrt(3) - 5.5) * cos(30), (20*sqrt(3) - 5.5) * sin(30))
+      ( (20*sqrt(3) - 5.5) * cos(30), (20*sqrt(3) - 5.5) * sin(30)) -->
+    <polygon id="triangle" points="0,-29.1410161513775421
+                -25.2368602791855814, 14.5705080756887710
+                 25.2368602791855814, 14.5705080756887710"
+      stroke="#0038b8" stroke-width="5.5" fill-opacity="0"/>
+  </defs>
+  <!-- "The flag is 220 cm long and 160 cm wide.  The background is white" -->
+  <rect width="220" height="160" fill="white"/>
+  <!-- "...two stripes of dark sky-blue, 25 cm broad, over the whole length of
+    the flag, at a distance of 15 cm from the top and from the bottom..."
+    Legislation does not specify exact shade of blue; "#0038b8" is typical of
+    flags used in Israel -->
+  <rect width="220" height="25" fill="#0038b8" y="15"/>
+  <rect width="220" height="25" fill="#0038b8" y="120"/>
+  <use xlink:href="#triangle" transform="translate(110,80)"/>
+  <use xlink:href="#triangle" transform="translate(110,80) rotate(180)"/>
+</svg>
diff --git a/languages/he-IL/plugin.info b/languages/he-IL/plugin.info
new file mode 100644
index 000000000..61e6be6cd
--- /dev/null
+++ b/languages/he-IL/plugin.info
@@ -0,0 +1,9 @@
+{
+	"title": "$:/languages/he-IL",
+	"name": "he-IL",
+	"plugin-type": "language",
+	"description": "Hebrew (Israel)",
+	"author": "DoronTzur",
+	"core-version": ">=5.0.0",
+	"text-direction": "rtl"
+}
\ No newline at end of file
diff --git a/languages/hi-IN/EditTemplate.multids b/languages/hi-IN/EditTemplate.multids
index 7af2905c4..8e626c814 100644
--- a/languages/hi-IN/EditTemplate.multids
+++ b/languages/hi-IN/EditTemplate.multids
@@ -1,10 +1,7 @@
 title: $:/language/EditTemplate/
 
 Body/External/Hint: यह मुख्य टिड्लीविकि फ़ाइल के बाहर संग्रहीत एक बाहरी tiddler है। आप टैग और क्षेत्रों को संपादित कर सकते हैं लेकिन सीधे ही सामग्री edit नहीं कर सकते
-Body/Hint: उपयोग [[wiki text|http://tiddlywiki.com/static/WikiText.html]] स्वरूपण, चित्र, और गतिशील सुविधाओं को जोड़ने के लिए
 Body/Placeholder: इस tiddler के लिए text टाइप करें
-Body/Preview/Button/Hide:  प्रीव्यू छुपाना
-Body/Preview/Button/Show: प्रीव्यू दिखाएँ 
 Field/Remove/Caption: क्षेत्र को हटाने
 Field/Remove/Hint: क्षेत्र निकालें
 Fields/Add/Button: जोड़ना
diff --git a/languages/hi-IN/Exporters.multids b/languages/hi-IN/Exporters.multids
new file mode 100644
index 000000000..9aa8d8169
--- /dev/null
+++ b/languages/hi-IN/Exporters.multids
@@ -0,0 +1,6 @@
+title: $:/language/Exporters/
+
+CsvFile: सी एस वी tiddlers फ़ाइल
+JsonFile: JSON  tiddlers  फ़ाइल 
+StaticRiver: स्थिर HTML फ़ाइल के रूप में tiddlers की नदी
+TidFile: सिंगल tiddler ".tid" फाइल
diff --git a/languages/hi-IN/GettingStarted.tid b/languages/hi-IN/GettingStarted.tid
index bd805a71f..d81abdfa9 100644
--- a/languages/hi-IN/GettingStarted.tid
+++ b/languages/hi-IN/GettingStarted.tid
@@ -1,16 +1,17 @@
 title: GettingStarted
 
+\define lingo-base() $:/language/ControlPanel/Basics/
 ~ टिड्लीविकि और ~ टिड्लीविकि समुदाय में आपका स्वागत है
 
 आप ~ टिड्लीविकि में महत्वपूर्ण जानकारी के भंडारण शुरू करने से पहले यह तुम मज़बूती परिवर्तन बचा सकता है कि यह सुनिश्चित करना महत्वपूर्ण है। जानकारी के लिए http://tiddlywiki.com/#GettingStarted देखें
 
-!! Set up this TiddlyWiki
+!! Set up this ~TiddlyWiki
 
-| | |
-| | |
-| | HelloThere
-[[$:/Translators]]
-[[$:/plugins/tiddlywiki/translators/readme]]
- |
+<div class="tc-control-panel">
 
-See the control panel for more options.
+|<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
+|<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
+|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+</div>
+
+See the [[control panel|$:/ControlPanel]] for more options.
diff --git a/languages/hi-IN/Misc.multids b/languages/hi-IN/Misc.multids
index 76881f636..fc85bb858 100644
--- a/languages/hi-IN/Misc.multids
+++ b/languages/hi-IN/Misc.multids
@@ -12,10 +12,6 @@ DefaultNewTiddlerTitle: नया Tiddler
 DropMessage: यहाँ ड्रॉप (या रद्द करने से बचने के लिए क्लिक करें)
 Encryption/ConfirmClearPassword: आप पासवर्ड को स्पष्ट करना चाहते हैं?  यह एन्क्रिप्शन को हटा देगा जब इस विकि बचत लागू किया
 Encryption/PromptSetPassword: इस टिड्लीविकि के लिए एक नया पासवर्ड सेट करें
-Exporters/CsvFile: सी एस वी tiddlers फ़ाइल
-Exporters/JsonFile: JSON  tiddlers  फ़ाइल 
-Exporters/StaticRiver: स्थिर HTML फ़ाइल के रूप में tiddlers की नदी
-Exporters/TidFile: सिंगल tiddler ".tid" फाइल
 InvalidFieldName: फ़ील्ड के नाम पर अवैध वर्ण "<$ पाठ पाठ = << FIELDNAME >> />"। फील्ड्स केवल छोटे अक्षरों, अंकों में हो सकते हैं और अक्षर, हाइफन (`-`) और अवधि (_``) अंडरस्कोर (`.`)
 MissingTiddler/Hint:  लापता Tiddler बनाने के लिए "<$ पाठ पाठ = << currentTiddler >> />" - क्लिक करें {{$: / कोर / छवियों / संपादित करें बटन}} बनाने के लिए
 RecentChanges/DateFormat: दिनांक / माह / वर्ष
diff --git a/languages/ia-IA/EditTemplate.multids b/languages/ia-IA/EditTemplate.multids
index dc83be964..c4b11dc96 100644
--- a/languages/ia-IA/EditTemplate.multids
+++ b/languages/ia-IA/EditTemplate.multids
@@ -1,10 +1,7 @@
 title: $:/language/EditTemplate/
 
 Body/External/Hint: Isto es un nota externe salvate extra le file principal del TiddlyWiki. Tu pote rediger le etiquettas e quadros ma non directemente rediger le contento mesme
-Body/Hint: Usa [[wiki text|http://tiddlywiki.com/static/WikiText.html]] pro adder formatation, ligamines e functiones dynamic
 Body/Placeholder: Scribe le texto pro iste nota
-Body/Preview/Button/Hide: cela previsualisation
-Body/Preview/Button/Show: monstra previsualisation
 Field/Remove/Caption: remove quadro
 Field/Remove/Hint: Remove quadro
 Fields/Add/Button: adde
diff --git a/languages/ia-IA/Exporters.multids b/languages/ia-IA/Exporters.multids
new file mode 100644
index 000000000..7a9b51a06
--- /dev/null
+++ b/languages/ia-IA/Exporters.multids
@@ -0,0 +1,6 @@
+title: $:/language/Exporters/
+
+CsvFile: File CSV de notas
+JsonFile: File JSON de notas
+StaticRiver: Fluvio de notas como static file HTML
+TidFile: Singule notitia como file ".tid"
diff --git a/languages/ia-IA/GettingStarted.tid b/languages/ia-IA/GettingStarted.tid
index f3e98c963..b79c7ca01 100644
--- a/languages/ia-IA/GettingStarted.tid
+++ b/languages/ia-IA/GettingStarted.tid
@@ -1,16 +1,17 @@
 title: GettingStarted
 
-Benvenite a TiddlyWiki e le communitate de TiddlyWiki
+\define lingo-base() $:/language/ControlPanel/Basics/
+Benvenite a ~TiddlyWiki e le communitate de ~TiddlyWiki
 
-Ante que tu comencia salvar informationes importante in TiddlyWiki, il es importante assecurar que tu pote salvar cambios con fide. Vide http://tiddlywiki.com/#GettingStarted pro detalios
+Ante que tu comencia salvar informationes importante in ~TiddlyWiki, il es importante assecurar que tu pote salvar cambios con fide. Vide http://tiddlywiki.com/#GettingStarted pro detalios
 
-!! Prepara iste TiddlyWiki
+!! Prepara iste ~TiddlyWiki
 
-| | |
-| | |
-| | HelloThere
-[[$:/Translators]]
-[[$:/plugins/tiddlywiki/translators/readme]]
- |
+<div class="tc-control-panel">
 
-Vide le control panel pro plus de optiones.
+|<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
+|<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
+|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+</div>
+
+Vide le [[control panel|$:/ControlPanel]] pro plus de optiones.
diff --git a/languages/ia-IA/Misc.multids b/languages/ia-IA/Misc.multids
index 1d1881711..a4eda66a4 100644
--- a/languages/ia-IA/Misc.multids
+++ b/languages/ia-IA/Misc.multids
@@ -12,10 +12,6 @@ DefaultNewTiddlerTitle: Nove nota
 DropMessage: Lassa cader ci (o clicca Esc pro cancellar)
 Encryption/ConfirmClearPassword: Desira tu remover le contrasigno? Isto va remover le usate codification quando iste wiki es conservate
 Encryption/PromptSetPassword: Fixa un nove contrasigno pro iste TiddlyWiki
-Exporters/CsvFile: File CSV de notas
-Exporters/JsonFile: File JSON de notas
-Exporters/StaticRiver: Fluvio de notas como static file HTML
-Exporters/TidFile: Singule notitia como file ".tid"
 InvalidFieldName: Signos illegal in le quadro "<$text text=<<fieldName>>/>". Quadros pote solmente continer litteras minuscule, cifras e le signos sublineate (`_`), ligamine (`-`) and puncto (`.`)
 MissingTiddler/Hint: Notas mancante "<$text text=<<currentTiddler>>/>" - clicca {{$:/core/images/edit-button}} pro crear
 RecentChanges/DateFormat: le DD de MMM YYYY
diff --git a/languages/ia-IA/SiteTitle.tid b/languages/ia-IA/SiteTitle.tid
index 716f75da8..f1899630c 100644
--- a/languages/ia-IA/SiteTitle.tid
+++ b/languages/ia-IA/SiteTitle.tid
@@ -1,3 +1,3 @@
 title: $:/SiteTitle
 
-Mi TiddlyWiki
\ No newline at end of file
+Mi ~TiddlyWiki
\ No newline at end of file
diff --git a/languages/it-IT/EditTemplate.multids b/languages/it-IT/EditTemplate.multids
index 8a53f3421..9a59c1dbc 100644
--- a/languages/it-IT/EditTemplate.multids
+++ b/languages/it-IT/EditTemplate.multids
@@ -1,10 +1,7 @@
 title: $:/language/EditTemplate/
 
 Body/External/Hint: Questo &egrave; un frammento esterno memorizzato al di fuori del file principale TiddlyWiki. Puoi editare le etichette ed i campi ma non puoi editare il contenuto
-Body/Hint: Utilizza il formato wiki per definire la formattazione, aggiungere immagini e caratteristiche dinamiche
 Body/Placeholder: Digita il testo di questo frammento
-Body/Preview/Button/Hide: Nascondi preview
-Body/Preview/Button/Show: Mostra preview
 Field/Remove/Caption: Rimuovi campo
 Field/Remove/Hint: Rimuovi campo
 Fields/Add/Button: Aggiungi
diff --git a/languages/it-IT/Exporters.multids b/languages/it-IT/Exporters.multids
new file mode 100644
index 000000000..cb62d1804
--- /dev/null
+++ b/languages/it-IT/Exporters.multids
@@ -0,0 +1,6 @@
+title: $:/language/Exporters/
+
+CsvFile: file CSV
+JsonFile: file JSON
+StaticRiver: HTML statico
+TidFile: ".tid" file
diff --git a/languages/it-IT/GettingStarted.tid b/languages/it-IT/GettingStarted.tid
index b0eb7177d..c3c7aaa82 100644
--- a/languages/it-IT/GettingStarted.tid
+++ b/languages/it-IT/GettingStarted.tid
@@ -1,11 +1,17 @@
 title: GettingStarted
 
-Benvenuto in TiddlyWiki e nella TiddlyWiki community
+\define lingo-base() $:/language/ControlPanel/Basics/
+Benvenuto in ~TiddlyWiki e nella ~TiddlyWiki community
 
-Prima di iniziare a memorizzare informazioni importanti in TiddlyWiki assicurati di riuscire a salvare in modo affidabile le modifiche. Leggi http://tiddlywiki.com/#GettingStarted per i dettagli.
+Prima di iniziare a memorizzare informazioni importanti in ~TiddlyWiki assicurati di riuscire a salvare in modo affidabile le modifiche. Leggi http://tiddlywiki.com/#GettingStarted per i dettagli.
 
-!! Imposta questo TiddlyWiki
+!! Imposta questo ~TiddlyWiki
 
- [list[$:/StoryList]]
+<div class="tc-control-panel">
 
-Apri il pannello di controllo per altre opzioni.
\ No newline at end of file
+|<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
+|<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
+|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+</div>
+
+Apri il [[pannello di controllo|$:/ControlPanel]] per altre opzioni.
diff --git a/languages/it-IT/Misc.multids b/languages/it-IT/Misc.multids
index 3d2d2d00d..6e87f8b11 100644
--- a/languages/it-IT/Misc.multids
+++ b/languages/it-IT/Misc.multids
@@ -8,6 +8,7 @@ ConfirmCancelTiddler: Vuoi annullare le modifiche al frammento "<$text text=<<ti
 ConfirmDeleteTiddler: Vuoi cancellare il frammento "<$text text=<<title>>/>"?
 ConfirmEditShadowTiddler: Stai per editare un frammento nascosto. Ogni modifica dei default di sistema render&agrave; i futuri aggiornamenti non semplici. Sei sicuro di voler editare "<$text text=<<title>>/>"?
 ConfirmOverwriteTiddler: Vuoi sovrascrivere il frammento "<$text text=<<title>>/>"?
+Count: Conteggio
 DefaultNewTiddlerTitle: Nuovo frammento
 DropMessage: Rilascia qui (o usa il tasto 'Escape' per cancellare)
 Encryption/Cancel: Cancella
@@ -18,10 +19,6 @@ Encryption/PromptSetPassword: Imposta una nuova pasword per questo ~TiddlyWiki
 Encryption/RepeatPassword: Ripeti password
 Encryption/SetPassword: Imposta password
 Encryption/Username: NomeUtente
-Exporters/CsvFile: file CSV
-Exporters/JsonFile: file JSON
-Exporters/StaticRiver: HTML statico
-Exporters/TidFile: ".tid" file
 InvalidFieldName: Caratteri non consentiti nel campo nome "<$text text=<<fieldName>>/>". I campi nome possono solo contenere lettere minuscole, numeri ed i caratteri sottolineato (`_`), meno (`-`) e punto (`.`)
 MissingTiddler/Hint: Frammento mancante "<$text text=<<currentTiddler>>/>" - clicca {{$:/core/images/edit-button}} per crearlo
 OfficialPluginLibrary: Libreria ufficiale plugin ~TiddlyWiki
diff --git a/languages/it-IT/SiteTitle.tid b/languages/it-IT/SiteTitle.tid
index 20a9b4b4b..bad1a8915 100644
--- a/languages/it-IT/SiteTitle.tid
+++ b/languages/it-IT/SiteTitle.tid
@@ -1,3 +1,3 @@
 title: $:/SiteTitle
 
-Il mio TiddlyWiki
\ No newline at end of file
+Il mio ~TiddlyWiki
\ No newline at end of file
diff --git a/languages/ja-JP/ControlPanel.multids b/languages/ja-JP/ControlPanel.multids
index 8ab9e43e9..2608edc3f 100644
--- a/languages/ja-JP/ControlPanel.multids
+++ b/languages/ja-JP/ControlPanel.multids
@@ -95,6 +95,6 @@ Toolbars/PageControls/Hint: サイドバーに表示するボタンを選んで
 Toolbars/ViewToolbar/Caption: 閲覧画面
 Toolbars/ViewToolbar/Hint: 閲覧画面に表示するボタンを選んでください。
 Tools/Caption: ツール
-Tools/Download/Full/Caption: 全てダウンロードする
+Tools/Download/Full/Caption: 全てウィキをダウンロードする
 Tools/Export/AllAsStaticHTML/Caption: すべての tiddler を含む閲覧用 HTML としてダウンロードする
 Tools/Export/Heading: エクスポート
diff --git a/languages/ja-JP/EditTemplate.multids b/languages/ja-JP/EditTemplate.multids
index 50e951038..e9262e402 100644
--- a/languages/ja-JP/EditTemplate.multids
+++ b/languages/ja-JP/EditTemplate.multids
@@ -1,10 +1,7 @@
 title: $:/language/EditTemplate/
 
 Body/External/Hint: このtiddlerは外部のTiddlyWikiのファイルに保存されています。タグやフィールドの編集はできますが、実際の外部コンテンツを直接編集することはできません。
-Body/Hint: 表示を整形したり画像や動的な要素を使いたい場合は [[wiki text|http://tiddlywiki.com/static/WikiText.html]] 書式を使用してください。
 Body/Placeholder: ここに tiddler の本文を入力してください。
-Body/Preview/Button/Hide: プレビューを隠す
-Body/Preview/Button/Show: プレビューを表示
 Field/Remove/Caption: fieldを削除
 Field/Remove/Hint: fieldを削除
 Fields/Add/Button: 追加
diff --git a/languages/ja-JP/Exporters.multids b/languages/ja-JP/Exporters.multids
new file mode 100644
index 000000000..4d317a95a
--- /dev/null
+++ b/languages/ja-JP/Exporters.multids
@@ -0,0 +1,3 @@
+title: $:/language/Exporters/
+
+StaticRiver: 静的HTMLファイルとして構成される一連のtiddler
diff --git a/languages/ja-JP/GettingStarted.tid b/languages/ja-JP/GettingStarted.tid
index e7e4b551e..551c5b427 100644
--- a/languages/ja-JP/GettingStarted.tid
+++ b/languages/ja-JP/GettingStarted.tid
@@ -1,6 +1,7 @@
 title: GettingStarted
 
-TiddlyWikiにようこそ。これは個人で使えるWeb ノートです。
+\define lingo-base() $:/language/ControlPanel/Basics/
+~TiddlyWikiにようこそ。これは個人で使えるWeb ノートです。
 
 作業を開始する前に保存機能が正しく使えるかどうかをご確認ください。 - 詳細は http://tiddlywiki.com/ の説明をご覧ください。
 
@@ -11,3 +12,14 @@ TiddlyWikiにようこそ。これは個人で使えるWeb ノートです。
 ** 「基本」タブのデフォルトtiddlerを変更することで、Wikiを開くたびにこのメッセージが表示されないようにできます。
 * 変更を保存するにはサイドバーの「ダウンロード」ボタンを押してください。
 * 書式に関する詳細は WikiText を参照してください。
+
+!! この~TiddlyWikiを設定
+
+<div class="tc-control-panel">
+
+|<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
+|<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
+|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+</div>
+
+See the [[control panel|$:/ControlPanel]] for more options.
diff --git a/languages/ja-JP/Misc.multids b/languages/ja-JP/Misc.multids
index 7faf209bc..c72c057aa 100644
--- a/languages/ja-JP/Misc.multids
+++ b/languages/ja-JP/Misc.multids
@@ -11,7 +11,6 @@ ConfirmOverwriteTiddler: 本当にこの tiddler "<$text text=<<title>>/>" を
 DropMessage: ドロップしてください。（止めるには、キャンセルをクリックしてください。）
 Encryption/ConfirmClearPassword: パスワードを削除すると暗号化も解除されますが、本当にパスワードを削除しますか？
 Encryption/PromptSetPassword: パスワードを入力してください。
-Exporters/StaticRiver: 静的HTMLファイルとして構成される一連のtiddler
 InvalidFieldName: フィールド名に不正な文字が使われています "<$text text=<<fieldName>>/>". フィールド名に使用できるのは英小文字かアンダースコア(`_`)、ハイフン(`-`)、ピリオド(`.`)のみです。
 MissingTiddler/Hint: 未作成の tiddler "<$text text=<<currentTiddler>>/>" - クリック {{$:/core/images/edit-button}} して作成
 RecentChanges/DateFormat: YYYY-MM-DD
diff --git a/languages/ja-JP/SideBar.multids b/languages/ja-JP/SideBar.multids
index e92c5990a..9fdd41c26 100644
--- a/languages/ja-JP/SideBar.multids
+++ b/languages/ja-JP/SideBar.multids
@@ -1,7 +1,7 @@
 title: $:/language/SideBar/
 
 All/Caption: 全て
-Contents/Caption: コンテンツ
+Contents/Caption: 目次
 Drafts/Caption: ドラフト
 Missing/Caption: 未作成
 More/Caption: 詳しく
diff --git a/languages/ja-JP/SiteTitle.tid b/languages/ja-JP/SiteTitle.tid
index a32da7dfe..0bf9d626c 100644
--- a/languages/ja-JP/SiteTitle.tid
+++ b/languages/ja-JP/SiteTitle.tid
@@ -1,3 +1,3 @@
 title: $:/SiteTitle
 
-My TiddlyWiki
\ No newline at end of file
+私の~TiddlyWiki
\ No newline at end of file
diff --git a/languages/ko-KR/Buttons.multids b/languages/ko-KR/Buttons.multids
index 9077cf850..1c082c4f3 100644
--- a/languages/ko-KR/Buttons.multids
+++ b/languages/ko-KR/Buttons.multids
@@ -2,8 +2,12 @@ title: $:/language/Buttons/
 
 AdvancedSearch/Caption: 고급 검색
 AdvancedSearch/Hint: 고급 검색
+Bold/Caption: 굵게
+Bold/Hint: 선택에 굵게 서식을 적용합니다
 Cancel/Caption: 취소
 Cancel/Hint: 이 티들러로의 바뀜을 버립니다
+Clear/Caption: 지우기
+Clear/Hint: 단색으로 그림을 지웁니다
 Clone/Caption: 복제
 Clone/Hint: 이 티들러를 복제합니다
 Close/Caption: 닫기
@@ -18,12 +22,27 @@ Delete/Caption: 삭제
 Delete/Hint: 이 티들러를 삭제합니다
 Edit/Caption: 편집
 Edit/Hint: 이 티들러를 편집합니다
+EditorHeight/Caption: 편집기 높이
+EditorHeight/Caption/Auto: 내용에 맞게 자동으로 높이를 조절합니다
+EditorHeight/Caption/Fixed: 고정된 높이:
+EditorHeight/Hint: 텍스트 편집기의 높이를 선택합니다
 Encryption/Caption: 암호화
 Encryption/ClearPassword/Caption: 비밀번호 지우기
 Encryption/ClearPassword/Hint: 비밀번호를 지우고 암호화 없이 이 위키를 저장합니다
 Encryption/Hint: 이 위키를 저장하기 위한 비밀번호를 설정하거나 지웁니다
 Encryption/SetPassword/Caption: 비밀번호 설정
 Encryption/SetPassword/Hint: 암호화로 이 위키를 저장하기 위해 비밀번호를 설정합니다
+Excise/Caption: 거두기
+Excise/Caption/Excise: 거두기 수행
+Excise/Caption/MacroName: 매크로 이름:
+Excise/Caption/NewTitle: 새 티들러의 제목:
+Excise/Caption/Replace: 다음으로 거둔 텍스트 바꾸기:
+Excise/Caption/Replace/Link: 링크
+Excise/Caption/Replace/Macro: 매크로
+Excise/Caption/Replace/Transclusion: 끼워넣기
+Excise/Caption/Tag: 이 티들러의 제목으로 된 새 티들러를 태그
+Excise/Caption/TiddlerExists: 경고: 티들러가 이미 존재합니다
+Excise/Hint: 새 티들러 안으로 선택한 텍스트를 거둡니다
 ExportPage/Caption: 모두 내보내기
 ExportPage/Hint: 모든 티들러를 내보냅니다
 ExportTiddler/Caption: 티들러 내보내기
@@ -31,6 +50,8 @@ ExportTiddler/Hint: 티들러를 내보냅니다
 ExportTiddlers/Caption: 여러 티들러 내보내기
 ExportTiddlers/Hint: 여러 티들러를 내보냅니다
 Fold/Caption: 티들러 접기
+Fold/FoldBar/Caption: 접기 막대
+Fold/FoldBar/Hint: 티들러를 선택적으로 접고 펼칠 수 있는 막대
 Fold/Hint: 이 티들러의 본문을 접습니다
 FoldAll/Caption: 모든 티들러 접기
 FoldAll/Hint: 모든 열린 티들러의 본문을 접습니다
@@ -38,6 +59,18 @@ FoldOthers/Caption: 다른 티들러 접기
 FoldOthers/Hint: 다른 열린 티들러의 본문을 접습니다
 FullScreen/Caption: 전체 화면
 FullScreen/Hint: 전체 화면 모드에 들어가거나 떠납니다
+Heading1/Caption: 1단계 문단 제목
+Heading1/Hint: 선택을 포함하는 줄에 1단계 문단 제목 서식을 적용합니다
+Heading2/Caption: 2단계 문단 제목
+Heading2/Hint: 선택을 포함하는 줄에 2단계 문단 제목 서식을 적용합니다
+Heading3/Caption: 3단계 문단 제목
+Heading3/Hint: 선택을 포함하는 줄에 3단계 문단 제목 서식을 적용합니다
+Heading4/Caption: 4단계 문단 제목
+Heading4/Hint: 선택을 포함하는 줄에 4단계 문단 제목 서식을 적용합니다
+Heading5/Caption: 5단계 문단 제목
+Heading5/Hint: 선택을 포함하는 줄에 5단계 문단 제목 서식을 적용합니다
+Heading6/Caption: 6단계 문단 제목
+Heading6/Hint: 선택을 포함하는 줄에 6단계 문단 제목 서식을 적용합니다
 Help/Caption: 도움말
 Help/Hint: 도움말 패널을 보여줍니다
 HideSideBar/Caption: 사이드바 숨기기
@@ -45,29 +78,59 @@ HideSideBar/Hint: 사이드바를 숨깁니다
 Home/Caption: 홈
 Home/Hint: 기본 티들러를 엽니다
 Import/Caption: 가져오기
-Import/Hint: 텍스트, 그림, TiddlyWiki 또는 JSON을 포함한 여러 파일의 형식을 가져옵니다
+Import/Hint: 텍스트, 그림, 티들리위키 또는 JSON을 포함한 여러 파일의 형식을 가져옵니다
 Info/Caption: 정보
 Info/Hint: 이 티들러에 대한 정보를 보여줍니다
+Italic/Caption: 기울임꼴
+Italic/Hint: 선택에 기울임꼴 서식을 적용합니다
 Language/Caption: 언어
 Language/Hint: 사용자 인터페이스 언어를 선택합니다
+LineWidth/Caption: 선 너비
+LineWidth/Hint: 페인트의 선 너비를 설정합니다
+Link/Caption: 링크
+Link/Hint: 위키텍스트 링크를 만듭니다
+ListBullet/Caption: 글머리 기호 목록
+ListBullet/Hint: 선택을 포함하는 줄에 글머리 기호 목록 서식을 적용합니다
+ListNumber/Caption: 번호가 매겨진 목록
+ListNumber/Hint: 선택을 포함하는 줄에 번호가 매겨진 목록 서식을 적용합니다
+MonoBlock/Caption: 고정폭 블럭
+MonoBlock/Hint: 선택을 포함하는 줄에 고정폭 블럭 서식을 적용합니다
+MonoLine/Caption: 고정폭
+MonoLine/Hint: 선택에 고정폭 글자 서식을 적용합니다
 More/Caption: 더 보기
 More/Hint: 더 많은 동작을 봅니다
 NewHere/Caption: 여기에 새 티들러
 NewHere/Hint: 이 티들러로 태그된 새로운 것을 만듭니다
+NewImage/Caption: 새 그림
+NewImage/Hint: 새 그림 티들러를 만듭니다
 NewJournal/Caption: 새 일지
 NewJournal/Hint: 새 일지 티들러를 만듭니다
 NewJournalHere/Caption: 여기에 새 일지
 NewJournalHere/Hint: 이 일지 티들러로 태그된 새로운 것을 만듭니다
+NewMarkdown/Caption: 새 마크다운 티들러
+NewMarkdown/Hint: 새 마크다운 티들러를 만듭니다
 NewTiddler/Caption: 새 티들러
 NewTiddler/Hint: 새 티들러를 만듭니다
+Opacity/Caption: 불투명도
+Opacity/Hint: 페인트 불투명도를 설정합니다
 OpenWindow/Caption: 새 창에서 열기
 OpenWindow/Hint: 새 창에서 티들러를 엽니다
+Paint/Caption: 페인트 색
+Paint/Hint: 페인트 색을 설정합니다
 Palette/Caption: 팔레트
 Palette/Hint: 컬러 팔레트를 선택합니다
 Permalink/Caption: 고유링크
 Permalink/Hint: 브라우저 주소 창에 이 티들러로의 직접 링크로 설정합니다
 Permaview/Caption: 고유보기
 Permaview/Hint: 이 이야기에서 브라우저 주소 창에 모든 티들러로의 직접 링크로 설정합니다
+Picture/Caption: 사진
+Picture/Hint: 사진을 넣습니다
+Preview/Caption: 미리 보기
+Preview/Hint: 미리 보기 창을 보여줍니다
+PreviewType/Caption: 미리 보기 형식
+PreviewType/Hint: 미리 보기 형식을 선택합니다
+Quote/Caption: 인용
+Quote/Hint: 선택을 포함하는 줄에 인용 문구 서식을 적용합니다
 Refresh/Caption: 새로 고침
 Refresh/Hint: 위키의 전체 새로 고침을 수행합니다
 Save/Caption: 확인
@@ -76,12 +139,30 @@ SaveWiki/Caption: 바뀜 저장
 SaveWiki/Hint: 바뀜을 저장합니다
 ShowSideBar/Caption: 사이드바 보이기
 ShowSideBar/Hint: 사이드바를 보여줍니다
+Size/Caption: 그림 크기
+Size/Caption/Height: 높이:
+Size/Caption/Resize: 그림 크기 조절
+Size/Caption/Width: 너비:
+Size/Hint: 그림 크기를 조절합니다
+Stamp/Caption: 도장
+Stamp/Caption/New: 스니펫 추가
+Stamp/Hint: 미리 구성된 텍스트 스니펫을 넣습니다
+Stamp/New/Text: 스니펫 텍스트. (캡션 필드에 설명 제목을 추가하는 것을 기억하세요).
+Stamp/New/Title: 메뉴에 보여지는 이름
 StoryView/Caption: 이야기보기
 StoryView/Hint: 이야기 보기를 선택합니다
+Strikethrough/Caption: 취소선
+Strikethrough/Hint: 선택에 취소선 서식을 적용합니다
+Subscript/Caption: 아래 첨자
+Subscript/Hint: 선택에 아래 첨자 서식을 적용합니다
+Superscript/Caption: 위 첨자
+Superscript/Hint: 선택에 위 첨자 서식을 적용합니다
 TagManager/Caption: 태그 관리자
 TagManager/Hint: 태그 관리자를 엽니다
 Theme/Caption: 테마
-Theme/Hint: 보일 테마를 선택합니다
+Theme/Hint: 표시할 테마를 선택합니다
+Underline/Caption: 밑줄
+Underline/Hint: 선택에 밑줄 서식을 적용합니다
 Unfold/Caption: 티들러 펼치기
 Unfold/Hint: 이 티들러의 본문을 펼칩니다
 UnfoldAll/Caption: 모든 티들러 펼치기
diff --git a/languages/ko-KR/ControlPanel.multids b/languages/ko-KR/ControlPanel.multids
index 3297a14f8..c91040132 100644
--- a/languages/ko-KR/ControlPanel.multids
+++ b/languages/ko-KR/ControlPanel.multids
@@ -1,14 +1,14 @@
 title: $:/language/ControlPanel/
 
 Advanced/Caption: 고급
-Advanced/Hint: 이 TiddlyWiki에 대한 내부 정보
+Advanced/Hint: 이 티들리위키에 대한 내부 정보
 Appearance/Caption: 외관
-Appearance/Hint: TiddlyWiki의 외관을 사용자 지정하는 방법입니다.
+Appearance/Hint: 티들리위키의 외관을 사용자 지정하는 방법입니다.
 Basics/AnimDuration/Prompt: 애니메이션 지속 시간:
 Basics/Caption: 기본
 Basics/DefaultTiddlers/BottomHint: 스페이스로 되어 있는 제목에는 &#91;&#91;이중 대괄호&#93;&#93;를 사용하세요. 또는 <$button set="$:/DefaultTiddlers" setTo="[list[$:/StoryList]]">이야기 정렬 유지</$button>로 선택할 수 있습니다
 Basics/DefaultTiddlers/Prompt: 기본 티들러:
-Basics/DefaultTiddlers/TopHint: 시작할 때 보여줄 티들러를 선택합니다:
+Basics/DefaultTiddlers/TopHint: 시작할 때 표시할 티들러를 선택합니다:
 Basics/Language/Prompt: 안녕! 현재 언어:
 Basics/NewJournal/Tags/Prompt: 새 일지 티들러에 대한 태그
 Basics/NewJournal/Title/Prompt: 새 일지 티들러의 제목
@@ -18,15 +18,28 @@ Basics/Subtitle/Prompt: 부제목:
 Basics/SystemTiddlers/Prompt: 시스템 티들러 수:
 Basics/Tags/Prompt: 태그 수:
 Basics/Tiddlers/Prompt: 티들러 수:
-Basics/Title/Prompt: 이 ~TiddlyWiki의 제목:
+Basics/Title/Prompt: 이 티들리위키의 제목:
 Basics/Username/Prompt: 편집에 서명하기 위한 사용자 이름:
-Basics/Version/Prompt: ~TiddlyWiki 버전:
+Basics/Version/Prompt: 티들리위키 버전:
 EditorTypes/Caption: 편집기 형식
 EditorTypes/Editor/Caption: 편집기
 EditorTypes/Hint: 이 티들러는 특정 티들러 형식을 편집하는 데 사용하는 편집기를 결정합니다.
 EditorTypes/Type/Caption: 형식
 Info/Caption: 정보
-Info/Hint: 이 TiddlyWiki에 대한 정보
+Info/Hint: 이 티들리위키에 대한 정보
+KeyboardShortcuts/Add/Caption: 단축키 추가
+KeyboardShortcuts/Add/Prompt: 여기에 단축키를 입력하세요
+KeyboardShortcuts/Caption: 키보드 단축키
+KeyboardShortcuts/Hint: 키보드 단축키 할당 관리
+KeyboardShortcuts/NoShortcuts/Caption: 할당된 키보드 단축키가 없음
+KeyboardShortcuts/Platform/All: 모든 플랫폼
+KeyboardShortcuts/Platform/Linux: Linux 플랫폼 전용
+KeyboardShortcuts/Platform/Mac: 매킨토시 플랫폼 전용
+KeyboardShortcuts/Platform/NonLinux: Linux가 아닌 플랫폼 전용
+KeyboardShortcuts/Platform/NonMac: 매킨토시가 아닌 플랫폼 전용
+KeyboardShortcuts/Platform/NonWindows: Windows가 아닌 플랫폼 전용
+KeyboardShortcuts/Platform/Windows: Windows 플랫폼 전용
+KeyboardShortcuts/Remove/Hint: 키보드 단축키 제거
 LoadedModules/Caption: 불러온 모듈
 LoadedModules/Hint: 현재 불러온 티들러 모듈의 원본 티들러로 연결된 현재 불러온 티들러 모듈입니다. 어떠한 기울린 모듈은 통상적으로 부팅 과정 중에 설치되었기 때문에 원본 티들러가 부족합니다.
 Palette/Caption: 팔레트
@@ -40,11 +53,12 @@ Palette/Prompt: 현재 팔레트:
 Palette/ShowEditor/Caption: 편집기 보이기
 Parsing/Block/Caption: 블록 파서 규칙
 Parsing/Caption: 구문 분석
-Parsing/Hint: 여기서 개별 위키 파서 규칙을 전역으로 비활성화할 수 있습니다. 어떤 파서 규칙을 비활성화하면 ~TiddlyWiki가 제대로 작동하는 것을 막을 수 있으므로 주의하십시오 ([[안전 모드|http://tiddlywiki.com/#SafeMode]]로 정상 작동하도록 복구할 수 있습니다)
+Parsing/Hint: 여기서 개별 위키 파서 규칙을 전역으로 비활성화할 수 있습니다. 어떤 파서 규칙을 비활성화하면 티들리위키가 제대로 작동하는 것을 막을 수 있으므로 주의하십시오 ([[안전 모드|http://tiddlywiki.com/#SafeMode]]로 정상 작동하도록 복구할 수 있습니다)
 Parsing/Inline/Caption: 인라인 파서 규칙
 Parsing/Pragma/Caption: 플라그마 파서 규칙
 Plugins/Add/Caption: 더 많은 플러그인 얻기
 Plugins/Add/Hint: 공식 라이브러리에서 플러그인을 설치합니다
+Plugins/AlreadyInstalled/Hint: 이 플러그인은 이미 <$text text=<<installedVersion>>/> 버전으로 설치되어 있습니다
 Plugins/Caption: 플러그인
 Plugins/Disable/Caption: 비활성화
 Plugins/Disable/Hint: 페이지를 다시 불러올 때 이 플러그인을 비활성화합니다
@@ -52,14 +66,17 @@ Plugins/Disabled/Status: (비활성화됨)
 Plugins/Empty/Hint: 없음
 Plugins/Enable/Caption: 활성화
 Plugins/Enable/Hint: 페이지를 다시 불러올 때 이 플러그인을 활성화합니다
-Plugins/Install: 설치
+Plugins/Install/Caption: 설치
 Plugins/Installed/Hint: 현재 설치된 플러그인:
 Plugins/Languages/Caption: 언어
 Plugins/Languages/Hint: 언어 팩 플러그인
+Plugins/NoInfoFound/Hint: ''"<$text text=<<currentTab>>/>"'' 찾을 수 없음
+Plugins/NoInformation/Hint: 제공된 정보 없음
+Plugins/NotInstalled/Hint: 이 플러그인은 현재 설치되어 있지 않습니다
 Plugins/OpenPluginLibrary: 플러그인 라이브러리 열기
 Plugins/Plugins/Caption: 플러그인
 Plugins/Plugins/Hint: 플러그인
-Plugins/Reinstall: 재설치
+Plugins/Reinstall/Caption: 재설치
 Plugins/Themes/Caption: 테마
 Plugins/Themes/Hint: 테마 플러그인
 Saving/Caption: 저장
@@ -83,8 +100,11 @@ Settings/CamelCase/Description: 자동으로 ~CamelCase 링크를 활성화
 Settings/CamelCase/Hint: ~CamelCase 어구를 자동으로 링크하는 것을 전역으로 비활성화할 수 있습니다. 적용하려면 다시 불러와야 합니다
 Settings/Caption: 설정
 Settings/DefaultSidebarTab/Caption: 기본 사이드바 탭
-Settings/DefaultSidebarTab/Hint: 기본적으로 보여지는 사이드바 탭을 지정합니다
-Settings/Hint: 이 설정은 TiddlyWiki의 동작을 사용자 지정할 수 있습니다.
+Settings/DefaultSidebarTab/Hint: 기본적으로 표시하는 사이드바 탭을 지정합니다
+Settings/EditorToolbar/Caption: 편집기 도구 모음
+Settings/EditorToolbar/Description: 편집기 도구 모음 보이기
+Settings/EditorToolbar/Hint: 편집기 도구 모음을 활성화하거나 비활성화합니다:
+Settings/Hint: 이 설정은 티들리위키의 동작을 사용자 지정할 수 있습니다.
 Settings/LinkToBehaviour/Caption: 티들러 열기 동작
 Settings/LinkToBehaviour/InsideRiver/Hint: 이야기 강 //안//에서 둘러보기
 Settings/LinkToBehaviour/OpenAbove: 현재 티들러 위에 열기
@@ -92,6 +112,9 @@ Settings/LinkToBehaviour/OpenAtBottom: 이야기 강의 아래에 열기
 Settings/LinkToBehaviour/OpenAtTop: 이야기 강의 위에 열기
 Settings/LinkToBehaviour/OpenBelow: 현재 티들러 아래에 열기
 Settings/LinkToBehaviour/OutsideRiver/Hint: 이야기 강 //바깥//에서 둘러보기
+Settings/MissingLinks/Caption: 위키 링크
+Settings/MissingLinks/Description: 없는 티들러로의 링크 활성화
+Settings/MissingLinks/Hint: 아직 존재하지 않는 티들러로 링크할지 선택
 Settings/NavigationAddressBar/Caption: 둘러보기 주소 창
 Settings/NavigationAddressBar/Hint: 티들러를 둘러볼 때 브라우저 주소 창의 동작:
 Settings/NavigationAddressBar/No/Description: 주소 창을 업데이트하지 않음
@@ -103,17 +126,17 @@ Settings/NavigationHistory/No/Description: 역사를 업데이트하지 않음
 Settings/NavigationHistory/Yes/Description: 역사를 업데이트
 Settings/PerformanceInstrumentation/Caption: 성능 계측
 Settings/PerformanceInstrumentation/Description: 성능 계측 활성화
-Settings/PerformanceInstrumentation/Hint: 브라우저 개발자 콘솔에서 성능 통계를 보여줍니다. 적용하려면 다시 불러와야 합니다
+Settings/PerformanceInstrumentation/Hint: 브라우저 개발자 콘솔에서 성능 통계를 표시합니다. 적용하려면 다시 불러와야 합니다
 Settings/TitleLinks/Caption: 티들러 제목
-Settings/TitleLinks/Hint: 티들러 제목을 링크로 선택적으로 보여줍니다
-Settings/TitleLinks/No/Description: 티들러 제목을 링크로 보여주지 않음
-Settings/TitleLinks/Yes/Description: 티들러 제목을 링크로 보여주기
-Settings/ToolbarButtons/Caption: 툴바 버튼
-Settings/ToolbarButtons/Hint: 기본 툴바 버튼 외관:
+Settings/TitleLinks/Hint: 티들러 제목을 링크로 선택적으로 표시합니다
+Settings/TitleLinks/No/Description: 티들러 제목을 링크로 표시하지 않음
+Settings/TitleLinks/Yes/Description: 티들러 제목을 링크로 표시
+Settings/ToolbarButtons/Caption: 도구 모음 버튼
+Settings/ToolbarButtons/Hint: 기본 도구 모음 버튼 외관:
 Settings/ToolbarButtons/Icons/Description: 아이콘을 포함
 Settings/ToolbarButtons/Text/Description: 텍스트를 포함
-Settings/ToolbarButtonStyle/Caption: 툴바 버튼 스타일
-Settings/ToolbarButtonStyle/Hint: 툴바 버튼에 대한 스타일을 선택합니다:
+Settings/ToolbarButtonStyle/Caption: 도구 모음 버튼 스타일
+Settings/ToolbarButtonStyle/Hint: 도구 모음 버튼에 대한 스타일을 선택합니다:
 Settings/ToolbarButtonStyle/Styles/Borderless: 테두리 없음
 Settings/ToolbarButtonStyle/Styles/Boxed: 상자형
 Settings/ToolbarButtonStyle/Styles/Rounded: 둥근형
@@ -123,12 +146,14 @@ Theme/Caption: 테마
 Theme/Prompt: 현재 테마:
 TiddlerFields/Caption: 티들러 필드
 TiddlerFields/Hint: 이 위키에 사용하고 있는 티들러필드의 전체 집합입니다. (시스템 티들러는 포함하지만 섀도우 티들러는 제외)
-Toolbars/Caption: 툴바
-Toolbars/EditToolbar/Caption: 편집 툴바
-Toolbars/EditToolbar/Hint: 편집 모드에서 티들러에 보여줄 버튼을 선택합니다
-Toolbars/Hint: 보여줄 툴바 버튼을 선택합니다
-Toolbars/PageControls/Caption: 페이지 툴바
-Toolbars/PageControls/Hint: 주요 페이지 툴바에 보여줄 버튼을 선택합니다
-Toolbars/ViewToolbar/Caption: 보기 툴바
-Toolbars/ViewToolbar/Hint: 보기 모드에서 티들러에 보여줄 버튼을 선택합니다
+Toolbars/Caption: 도구 모음
+Toolbars/EditorToolbar/Caption: 편집기 도구 모음
+Toolbars/EditorToolbar/Hint: 편집기 도구 모음에 표시할 버튼을 선택하세요. 어떤 버튼은 특정 형식의 티들러를 편집할 때에만 나타남을 참고하세요
+Toolbars/EditToolbar/Caption: 편집 도구 모음
+Toolbars/EditToolbar/Hint: 편집 모드에서 티들러에 표시할 버튼을 선택하세요
+Toolbars/Hint: 표시할 도구 모음 버튼을 선택합니다
+Toolbars/PageControls/Caption: 페이지 도구 모음
+Toolbars/PageControls/Hint: 주요 페이지 도구 모음에 표시할 버튼을 선택하세요
+Toolbars/ViewToolbar/Caption: 보기 도구 모음
+Toolbars/ViewToolbar/Hint: 보기 모드에서 티들러에 표시할 버튼을 선택하세요
 Tools/Download/Full/Caption: 전체 위키 다운로드
diff --git a/languages/ko-KR/CoreReadMe.tid b/languages/ko-KR/CoreReadMe.tid
index 931addca4..53e067c05 100644
--- a/languages/ko-KR/CoreReadMe.tid
+++ b/languages/ko-KR/CoreReadMe.tid
@@ -1,8 +1,8 @@
 title: $:/core/readme
 
-이 플러그인에는 다음을 갖춘 TiddlyWiki의 코어 구성 요소를 포함합니다:
+이 플러그인에는 다음을 갖춘 티들리위키의 코어 구성 요소를 포함합니다:
 
 * 자바스크립트 코드 모듈
 * 아이콘
-* TiddlyWiki의 사용자 인터페이스를 만드는 데 필요한 틀
+* 티들리위키의 사용자 인터페이스를 만드는 데 필요한 틀
 * 코어에 사용되는 지역화할 수 있는 문자열의 영국 영어 (en-GB) 번역
diff --git a/languages/ko-KR/Docs/PaletteColours.multids b/languages/ko-KR/Docs/PaletteColours.multids
index 6cc708a4d..d7687a0da 100644
--- a/languages/ko-KR/Docs/PaletteColours.multids
+++ b/languages/ko-KR/Docs/PaletteColours.multids
@@ -1,9 +1,9 @@
 title: $:/language/Docs/PaletteColours/
 
-alert-background: 알럿 배경
-alert-border: 알럿 테두리
-alert-highlight: 알럿 강조
-alert-muted-foreground: 알럿 조용한 전경
+alert-background: 경보 배경
+alert-border: 경보 테두리
+alert-highlight: 경보 강조
+alert-muted-foreground: 경보 조용한 전경
 background: 일반 배경
 blockquote-bar: 인용문 막대
 button-background: 기본 버튼 배경
@@ -62,7 +62,7 @@ sidebar-tab-foreground-selected: 선택한 탭에 대한 사이드바 탭 전경
 sidebar-tiddler-link-foreground: 사이드바 티들러 링크 전경
 sidebar-tiddler-link-foreground-hover: 사이드바 티들러 링크 전경 가리킬 때
 site-title-foreground: 사이트 제목 전경
-static-alert-foreground: 정적 알럿 전경
+static-alert-foreground: 정적 경보 전경
 tab-background: 탭 배경
 tab-background-selected: 선택한 탭에 대한 탭 배경
 tab-border: 탭 테두리
@@ -92,14 +92,14 @@ tiddler-link-background: 티들러 링크 배경
 tiddler-link-foreground: 티들러 링크 전경
 tiddler-subtitle-foreground: 티들러 부제목 전경
 tiddler-title-foreground: 티들러 제목 전경
-toolbar-cancel-button: 툴바 '취소' 버튼 전경
-toolbar-close-button: 툴바 '닫기' 버튼 전경
-toolbar-delete-button: 툴바 '삭제' 버튼 전경
-toolbar-done-button: 툴바 '완료' 버튼 전경
-toolbar-edit-button: 툴바 '편집' 버튼 전경
-toolbar-info-button: 툴바 '정보' 버튼 전경
-toolbar-new-button: 툴바 '새 티들러' 버튼 전경
-toolbar-options-button: 툴바 '옵션' 버튼 전경
-toolbar-save-button: 툴바 '저장' 버튼 전경
+toolbar-cancel-button: 도구 모음 '취소' 버튼 전경
+toolbar-close-button: 도구 모음 '닫기' 버튼 전경
+toolbar-delete-button: 도구 모음 '삭제' 버튼 전경
+toolbar-done-button: 도구 모음 '완료' 버튼 전경
+toolbar-edit-button: 도구 모음 '편집' 버튼 전경
+toolbar-info-button: 도구 모음 '정보' 버튼 전경
+toolbar-new-button: 도구 모음 '새 티들러' 버튼 전경
+toolbar-options-button: 도구 모음 '옵션' 버튼 전경
+toolbar-save-button: 도구 모음 '저장' 버튼 전경
 untagged-background: 태그되지 않음 배경
 very-muted-foreground: 매우 조용한 전경
diff --git a/languages/ko-KR/EditTemplate.multids b/languages/ko-KR/EditTemplate.multids
index 54893c111..d69c02b2a 100644
--- a/languages/ko-KR/EditTemplate.multids
+++ b/languages/ko-KR/EditTemplate.multids
@@ -1,10 +1,8 @@
 title: $:/language/EditTemplate/
 
-Body/External/Hint: 주요 TiddlyWiki 파일의 바깥에 저장된 바깥 티들러입니다. 태그와 필드를 편집할 수는 있지만 직접 내용 자체를 편집할 수는 없습니다
-Body/Hint: 서식, 그림, 및 동적 기능을 추가하려면 [[위키 텍스트|http://tiddlywiki.com/static/WikiText.html]]를 사용하세요
+Body/External/Hint: 주요 티들리위키 파일의 바깥에 저장된 바깥 티들러입니다. 태그와 필드를 편집할 수는 있지만 직접 내용 자체를 편집할 수는 없습니다
 Body/Placeholder: 이 티들러에 대한 텍스트를 입력하세요
-Body/Preview/Button/Hide: 미리 보기 숨기기
-Body/Preview/Button/Show: 미리 보기 보이기
+Body/Preview/Type/Output: 출력
 Field/Remove/Caption: 필드 제거
 Field/Remove/Hint: 필드를 제거합니다
 Fields/Add/Button: 추가
@@ -13,12 +11,13 @@ Fields/Add/Dropdown/User: 사용자 필드
 Fields/Add/Name/Placeholder: 필드 이름
 Fields/Add/Prompt: 새 필드 추가:
 Fields/Add/Value/Placeholder: 필드 값
-Shadow/OverriddenWarning: 이것은 수정된 섀도우 티들러입니다. 이 티들러를 삭제하여 기본 판으로 되돌릴 수 있습니다
-Shadow/Warning: 이것은 섀도우 티들러입니다. 어떤 바뀜도 기본 판을 덮어쓰게 됩니다
+Shadow/OverriddenWarning: 이것은 수정된 섀도우 티들러입니다. 이 티들러를 삭제하여 <<pluginLink>> 플러그인의 기본 판으로 되돌릴 수 있습니다
+Shadow/Warning: 이것은 섀도우 티들러입니다. 어떠한 바뀜도 <<pluginLink>> 플러그인에서의 기본 판을 덮어쓰게 됩니다
 Tags/Add/Button: 추가
 Tags/Add/Placeholder: 태그 이름
 Tags/Dropdown/Caption: 태그 목록
 Tags/Dropdown/Hint: 태그 목록을 보여줍니다
+Title/BadCharacterWarning: 경고: 티들러 제목에 문자 <<bad-chars>> 의 사용은 피하십시오
 Type/Delete/Caption: 내용 형식 삭제
 Type/Delete/Hint: 내용 형식을 삭제합니다
 Type/Dropdown/Caption: 내용 형식 목록
diff --git a/languages/ko-KR/Exporters.multids b/languages/ko-KR/Exporters.multids
new file mode 100644
index 000000000..3220beef8
--- /dev/null
+++ b/languages/ko-KR/Exporters.multids
@@ -0,0 +1,6 @@
+title: $:/language/Exporters/
+
+CsvFile: CSV 파일
+JsonFile: JSON 파일
+StaticRiver: 정적 HTML
+TidFile: ".tid" 파일
diff --git a/languages/ko-KR/Fields.multids b/languages/ko-KR/Fields.multids
index 3fe7f5a6d..d5e7ab880 100644
--- a/languages/ko-KR/Fields.multids
+++ b/languages/ko-KR/Fields.multids
@@ -2,9 +2,9 @@ title: $:/language/Docs/Fields/
 
 _canonical_uri: 바깥 그림 티들러의 전체 URI
 bag: 티들러의 유래가 된 가방 이름
-caption: 탭이나 버튼에 보여줄 텍스트
+caption: 탭이나 버튼에 표시할 텍스트
 color: 티들러와 연관된 CSS 색 값
-component: [[알럿 티들러|AlertMechanism]]에 대해 담당하는 구성 요소의 이름
+component: [[경보 티들러|AlertMechanism]]에 대해 담당하는 구성 요소의 이름
 created: 티들러가 만들어진 날짜
 creator: 티들러를 만든 사람의 이름
 current-tiddler: [[역사 목록|HistoryMechanism]]에서 최상위 티들러를 캐시하는 데 사용
@@ -24,7 +24,7 @@ modifier: 티들러를 마지막으로 수정한 사람과 관련된 티들러 
 name: 플러그인 티들러와 연관된 사람이 읽을 수 있는 이름
 plugin-priority: 플러그인 티들러의 우선 순위를 나타내는 숫자 값
 plugin-type: 플러그인 티들러에서 플러그인의 형식
-released: TiddlyWiki 배포 날짜
+released: 티들리위키 배포 날짜
 revision: 서버에 열린 티들러의 판
 source: 티들러와 연관된 원본 URL
 subtitle: 마법사를 위한 부제목 텍스트
diff --git a/languages/ko-KR/GettingStarted.tid b/languages/ko-KR/GettingStarted.tid
index aa1a0357c..fa2e90a62 100644
--- a/languages/ko-KR/GettingStarted.tid
+++ b/languages/ko-KR/GettingStarted.tid
@@ -1,17 +1,17 @@
 title: GettingStarted
 
 \define lingo-base() $:/language/ControlPanel/Basics/
-~TiddlyWiki와 ~TiddlyWiki 공동체에 오신 것을 환영합니다
+티들리위키와 티들리위키 공동체에 오신 것을 환영합니다
 
-~TiddlyWiki에 중요한 정보를 저장하는 것을 시작하기 전에 확실히 바뀜을 저장할 수 있는지 확인하는 것이 중요합니다. 자세한 사항은 http://tiddlywiki.com/#GettingStarted 를 참조하세요
+티들리위키에 중요한 정보를 저장하는 것을 시작하기 전에 확실히 바뀜을 저장할 수 있는지 확인하는 것이 중요합니다. 자세한 사항은 [[http://tiddlywiki.com/#GettingStarted]]를 보세요
 
-!! 이 ~TiddlyWiki 설정하기
+!! 이 티들리위키 설정하기
 
 <div class="tc-control-panel">
 
 |<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
 |<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
-|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
 </div>
 
 더 많은 옵션에 대해서는 [[제어판|$:/ControlPanel]]을 보세요.
diff --git a/languages/ko-KR/Help/editions.tid b/languages/ko-KR/Help/editions.tid
index df9841170..c8b8d589d 100644
--- a/languages/ko-KR/Help/editions.tid
+++ b/languages/ko-KR/Help/editions.tid
@@ -1,5 +1,5 @@
 title: $:/language/Help/editions
-description: TiddlyWiki의 사용할 수 있는 에디션을 나열합니다
+description: 티들리위키의 사용할 수 있는 에디션을 나열합니다
 
 사용할 수 있는 에디션의 이름과 설명을 나열합니다. `--init` 명령으로 지정한 에디션의 새 위키를 만들 수 있습니다.
 
diff --git a/languages/ko-KR/Help/help.tid b/languages/ko-KR/Help/help.tid
index 147e754fb..59b338119 100644
--- a/languages/ko-KR/Help/help.tid
+++ b/languages/ko-KR/Help/help.tid
@@ -1,10 +1,10 @@
 title: $:/language/Help/help
-description: TiddlyWiki 명령에 대한 도움말을 보여줍니다
+description: 티들리위키 명령에 대한 도움말을 표시합니다
 
-명령에 대한 도움말 텍스트를 보여줍니다:
+명령에 대한 도움말 텍스트를 표시합니다:
 
 ```
 --help [<명령>]
 ```
 
-명령 이름을 생략하면 사용할 수 있는 명령의 목록이 보여집니다.
+명령 이름을 생략하면 사용할 수 있는 명령의 목록이 표시됩니다.
diff --git a/languages/ko-KR/Help/load.tid b/languages/ko-KR/Help/load.tid
index c16233b6c..3cd3c9fa1 100644
--- a/languages/ko-KR/Help/load.tid
+++ b/languages/ko-KR/Help/load.tid
@@ -1,16 +1,16 @@
 title: $:/language/Help/load
 description: 파일에서 티들러를 불러옵니다
 
-2.x.x TiddlyWiki 파일 (`.html`), `.tiddler`, `.tid`, `.json` 또는 다른 파일에서 티들러를 불러옵니다
+2.x.x 티들리위키 파일 (`.html`), `.tiddler`, `.tid`, `.json` 또는 다른 파일에서 티들러를 불러옵니다
 
 ```
 --load <파일경로>
 ```
 
-암호화된 TiddlyWiki 파일에서 티들러를 불러오려면 먼저 비밀번호명령으로 비밀번호를 지정해야 합니다. 예를 들어:
+암호화된 티들리위키 파일에서 티들러를 불러오려면 먼저 비밀번호명령으로 비밀번호를 지정해야 합니다. 예를 들어:
 
 ```
 tiddlywiki ./MyWiki --password pa55w0rd --load my_encrypted_wiki.html
 ```
 
-TiddlyWiki는 이미 불러온 플러그인의 오래된 버전을 불러오지 않음을 참고하세요.
+티들리위키는 이미 불러온 플러그인의 오래된 버전을 불러오지 않음을 참고하세요.
diff --git a/languages/ko-KR/Help/makelibrary.tid b/languages/ko-KR/Help/makelibrary.tid
index 56f502cbe..716b8955d 100644
--- a/languages/ko-KR/Help/makelibrary.tid
+++ b/languages/ko-KR/Help/makelibrary.tid
@@ -3,7 +3,7 @@ description: 업그레이드 과정에 필요한 라이브러리 플러그인을
 
 업그레이드 과정에 `$:/UpgradeLibrary` 티들러를 구축합니다.
 
-업그레이드 라이브러리의 형식은 `library` 플러그인 형식과 일반 플러그인 티들러입니다. TiddlyWiki5 저장소 안에서 사용할 수 있는 각 플러그인, 테마 및 언어 팩의 복사본을 포함합니다.
+업그레이드 라이브러리의 형식은 `library` 플러그인 형식과 일반 플러그인 티들러입니다. 티들리위키5 저장소 안에서 사용할 수 있는 각 플러그인, 테마 및 언어 팩의 복사본을 포함합니다.
 
 이 명령은 내부 사용을 하는 것을 상정한 것이며; 사용자 정의 업그레이드 절차를 구축하는 사용자에게만 관련이 있습니다.
 
diff --git a/languages/ko-KR/Help/password.tid b/languages/ko-KR/Help/password.tid
index 95b9307d6..eb225db5d 100644
--- a/languages/ko-KR/Help/password.tid
+++ b/languages/ko-KR/Help/password.tid
@@ -7,4 +7,4 @@ description: 후속 암호화 조작을 하기 위해 비밀번호를 설정합
 --password <비밀번호>
 ```
 
-''참고'': 이것은 비밀번호로 보호된 TiddlyWiki를 서버에 넣어 사용해서는 안됩니다. 대신, [[ServerCommand]]에 따른 비밀번호 옵션을 보세요.
+''참고'': 이것은 비밀번호로 보호된 티들리위키를 서버에 넣어 사용해서는 안됩니다. 대신, [[서버명령|ServerCommand]]에 따른 비밀번호 옵션을 보세요.
diff --git a/languages/ko-KR/Help/server.tid b/languages/ko-KR/Help/server.tid
index 40b644aee..976e0142b 100644
--- a/languages/ko-KR/Help/server.tid
+++ b/languages/ko-KR/Help/server.tid
@@ -1,7 +1,7 @@
 title: $:/language/Help/server
-description: TiddlyWiki로 HTTP 서버 인터페이스를 제공합니다
+description: 티들리위키로 HTTP 서버 인터페이스를 제공합니다
 
-TiddlyWiki5에 내장된 서버는 매우 간단합니다. TiddlyWeb과는 호환할 수 있지만 안정적으로 인터넷에 연결하여 사용하는 데 필요한 많은 기능을 지원하지 않습니다.
+티들리위키5에 내장된 서버는 매우 간단합니다. 티들리웹과는 호환할 수 있지만 안정적으로 인터넷에 연결하여 사용하는 데 필요한 많은 기능을 지원하지 않습니다.
 
 루트에서, 지정한 티들러를 렌더하여 제공합니다. 루트 이외에는, JSON으로 인코딩된 개별 티들러를 제공하고, `GET`, `PUT` 및 `DELETE`의 기본 HTTP 운영을 지원합니다.
 
@@ -34,4 +34,4 @@ TiddlyWiki5에 내장된 서버는 매우 간단합니다. TiddlyWeb과는 호
 --server 8080 $:/core/save/all text/plain text/html "" "" 192.168.0.245
 ```
 
-동시에 여러 TiddlyWiki 서버를 실행하려면 각각 다른 포트를 할당해야 합니다.
+동시에 여러 티들리위키 서버를 실행하려면 각각 다른 포트를 할당해야 합니다.
diff --git a/languages/ko-KR/Help/version.tid b/languages/ko-KR/Help/version.tid
index 5a63e46ab..ed9a3ed41 100644
--- a/languages/ko-KR/Help/version.tid
+++ b/languages/ko-KR/Help/version.tid
@@ -1,7 +1,7 @@
 title: $:/language/Help/version
-description: TiddlyWiki의 버전 번호를 보여줍니다
+description: 티들리위키의 버전 번호를 표시합니다
 
-TiddlyWiki의 버전 번호를 보여줍니다.
+티들리위키의 버전 번호를 표시합니다.
 
 ```
 --version
diff --git a/languages/ko-KR/Import.multids b/languages/ko-KR/Import.multids
index 7d79de60d..16d7103b8 100644
--- a/languages/ko-KR/Import.multids
+++ b/languages/ko-KR/Import.multids
@@ -1,6 +1,6 @@
 title: $:/language/Import/
 
-Imported: 다음 티들러를 가져왔습니다:
+Imported/Hint:  다음 티들러를 가져왔습니다:
 Listing/Cancel/Caption: 취소
 Listing/Hint: 이 티들러는 가져올 준비가 되었습니다:
 Listing/Import/Caption: 가져오기
diff --git a/languages/ko-KR/Misc.multids b/languages/ko-KR/Misc.multids
index a9855b6d9..99b7ec8bf 100644
--- a/languages/ko-KR/Misc.multids
+++ b/languages/ko-KR/Misc.multids
@@ -1,35 +1,45 @@
 title: $:/language/
 
-AboveStory/ClassicPlugin/Warning: ~TiddlyWiki 클래식용으로 설계된 플러그인을 불러오려고 하는 것 같아 보입니다. [[이러한 플러그인은 TiddlyWiki 버전 5.x.x에 동작하지 않음|http://tiddlywiki.com/#TiddlyWikiClassic]]을 참고하세요. ~TiddlyWiki 클래식 플러그인이 감지되었습니다:
+AboveStory/ClassicPlugin/Warning: 티들리위키 클래식용으로 설계된 플러그인을 불러오려고 하는 것 같아 보입니다. [[이러한 플러그인은 티들리위키 버전 5.x.x에 동작하지 않음|http://tiddlywiki.com/#TiddlyWikiClassic]]을 참고하세요. 티들리위키 클래식 플러그인이 감지되었습니다:
 BinaryWarning/Prompt: 이 티들러는 바이너리 데이터를 포함합니다
-ClassicWarning/Hint: 이 티들러는 TiddlyWiki 클래식 위키 텍스트 형식으로 쓰여져 있으며, TiddlyWiki 버전 5와 완전히 호환되지 않습니다. 자세한 사항은 http://tiddlywiki.com/static/Upgrading.html 을 참조하세요.
+ClassicWarning/Hint: 이 티들러는 티들리위키 클래식 위키 텍스트 형식으로 쓰여져 있으며, 티들리위키 버전 5와 완전히 호환되지 않습니다. 자세한 사항은 [[http://tiddlywiki.com/static/Upgrading.html]]을 보세요.
 ClassicWarning/Upgrade/Caption: 업그레이드
 CloseAll/Button: 모두 닫기
+ColourPicker/Recent: 최근:
 ConfirmCancelTiddler: "<$text text=<<title>>/>" 티들러의 바뀜을 버리겠습니까?
 ConfirmDeleteTiddler: "<$text text=<<title>>/>" 티들러를 삭제하겠습니까?
 ConfirmEditShadowTiddler: 섀도우티들러를 편집하려고 합니다. 어떠한 바뀜도 향후 업그레이드가 하찮지 않게 하는 기본 시스템을 덮어씁니다. "<$text text=<<title>>/>" 티들러를 편집하겠습니까?
 ConfirmOverwriteTiddler: "<$text text=<<title>>/>" 티들러를 덮어쓰겠습니까?
+Count: 횟수
 DefaultNewTiddlerTitle: 새 티들러
 DropMessage: 여기에 놓기 (또는 취소하려면 'Escape' 키 사용)
 Encryption/Cancel: 취소
 Encryption/ConfirmClearPassword: 비밀번호를 지우겠습니까? 이 위키를 저장할 때 적용된 암호화를 제거합니다
 Encryption/Password: 비밀번호
 Encryption/PasswordNoMatch: 비밀번호가 일치하지 않습니다
-Encryption/PromptSetPassword: 이 TiddlyWiki에 대한 새 비밀번호를 설정합니다
+Encryption/PromptSetPassword: 이 티들리위키에 대한 새 비밀번호를 설정합니다
 Encryption/RepeatPassword: 비밀번호 다시 입력
 Encryption/SetPassword: 비밀번호 설정
 Encryption/Username: 사용자 이름
-Exporters/CsvFile: CSV 파일
-Exporters/JsonFile: JSON 파일
-Exporters/StaticRiver: 정적 HTML
-Exporters/TidFile: ".tid" 파일
-InternalJavaScriptError/Hint: 아이 창피해. 브라우저를 새로 고쳐 TiddlyWiki를 다시 시작할 것을 권장합니다
+Error/Caption: 오류
+Error/Filter: 필터 오류
+Error/FilterSyntax: 필터 표현식에서 구문 오류
+Error/IsFilterOperator: 필터 오류: 'is' 필터 연산자에 대한 알 수 없는 피연산자
+Error/LoadingPluginLibrary: 플러그인 라이브러리를 불러오는 중 오류
+Error/RecursiveTransclusion: 끼워넣기 위젯에서 재귀 끼워넣기 오류
+Error/RetrievingSkinny: 날씬한 티들러 목록을 얻는 중 오류
+Error/SavingToTWEdit: TW편집으로 저장하는 데 오류
+Error/WhileSaving: 저장하는 동안 오류
+Error/XMLHttpRequest: XMLHttpRequest 오류 코드
+InternalJavaScriptError/Hint: 아이 창피해. 브라우저를 새로 고쳐 티들리위키를 다시 시작할 것을 권장합니다
 InternalJavaScriptError/Title: 내부 자바스크립트 오류
 InvalidFieldName: "<$text text=<<fieldName>>/>" 필드 이름에 잘못된 문자가 있습니다. 필드는 소문자, 숫자 및 밑줄 문자 (`_`), 하이픈 (`-`) 및 마침표 (`.`)만을 포함할 수 있습니다.
-LazyLoadingWarning: <p>''<$text text={{!!_canonical_uri}}/>''에서 바깥 텍스트를 불러오는 중입니다</p><p>이 메시지가 사라지지 않으면 이 구성에서 바깥 텍스트를 지원하지 않는 브라우저를 사용하고 있을 수 있습니다. http://tiddlywiki.com/#ExternalText 를 보세요</p>
+LazyLoadingWarning: <p>''<$text text={{!!_canonical_uri}}/>''에서 바깥 텍스트를 불러오는 중입니다</p><p>이 메시지가 사라지지 않으면 이 구성에서 바깥 텍스트를 지원하지 않는 브라우저를 사용하고 있을 수 있습니다. [[http://tiddlywiki.com/#ExternalText]]를 보세요</p>
+LoginToTiddlySpace: TiddlySpace에 로그인
 MissingTiddler/Hint: "<$text text=<<currentTiddler>>/>" 티들러가 없습니다 - 만드려면 {{$:/core/images/edit-button}}을 클릭하세요
-OfficialPluginLibrary: 공식 ~TiddlyWiki 플러그인 라이브러리
-OfficialPluginLibrary/Hint: tiddlywiki.com에서의 공식 ~TiddlyWiki 플러그인 라이브러리입니다. 플러그인, 테마 및 언어 팩은 코어 팀이 유지 관리하고 있습니다.
+No: 아니오
+OfficialPluginLibrary: 공식 티들리위키 플러그인 라이브러리
+OfficialPluginLibrary/Hint: tiddlywiki.com에서의 공식 티들리위키 플러그인 라이브러리입니다. 플러그인, 테마 및 언어 팩은 코어 팀이 유지 관리하고 있습니다.
 PluginReloadWarning: 플러그인의 바뀜을 적용할 수 있도록 하려면 저장 {{$:/core/ui/Buttons/save-wiki}}하고 나서 다시 불러오세요 {{$:/core/ui/Buttons/refresh}}
 RecentChanges/DateFormat: YYYY년 MMM DD일
 SystemTiddler/Tooltip: 이것은 시스템 티들러입니다
@@ -38,5 +48,6 @@ TagManager/Count/Heading: 횟수
 TagManager/Icon/Heading: 아이콘
 TagManager/Info/Heading: 정보
 TagManager/Tag/Heading: 태그
-Tiddler/DateFormat: YYYY년 MMM DD일 am hh12:mm
-UnsavedChangesWarning: TiddlyWiki에 저장하지 않은 바뀜이 있습니다
+Tiddler/DateFormat: YYYY년 MMM DD일 am hh12:0mm
+UnsavedChangesWarning: 티들리위키에 저장하지 않은 바뀜이 있습니다
+Yes: 예
diff --git a/languages/ko-KR/Modals/Download.tid b/languages/ko-KR/Modals/Download.tid
index 6abe511f0..203eb7b16 100644
--- a/languages/ko-KR/Modals/Download.tid
+++ b/languages/ko-KR/Modals/Download.tid
@@ -1,7 +1,7 @@
 title: $:/language/Modals/Download
 type: text/vnd.tiddlywiki
-subtitle: Download changes
-footer: <$button message="tm-close-tiddler">Close</$button>
+subtitle: 바뀜 다운로드
+footer: <$button message="tm-close-tiddler">{{$:/language/Buttons/Close/Caption}}</$button>
 help: http://tiddlywiki.com/static/DownloadingChanges.html
 
 브라우저가 수동 저장만을 지원합니다.
diff --git a/languages/ko-KR/Modals/SaveInstructions.tid b/languages/ko-KR/Modals/SaveInstructions.tid
index 495f389fd..f1ae913b7 100644
--- a/languages/ko-KR/Modals/SaveInstructions.tid
+++ b/languages/ko-KR/Modals/SaveInstructions.tid
@@ -1,10 +1,10 @@
 title: $:/language/Modals/SaveInstructions
 type: text/vnd.tiddlywiki
-subtitle: Save your work
-footer: <$button message="tm-close-tiddler">Close</$button>
+subtitle: 작업 저장
+footer: <$button message="tm-close-tiddler">{{$:/language/Buttons/Close/Caption}}</$button>
 help: http://tiddlywiki.com/static/SavingChanges.html
 
-이 위키의 바뀜을 ~TiddlyWiki HTML 파일로 저장해야 합니다.
+이 위키의 바뀜을 티들리위키 HTML 파일로 저장해야 합니다.
 
 !!! 데스크톱 브라우저
 
diff --git a/languages/ko-KR/Notifications.multids b/languages/ko-KR/Notifications.multids
index 0a34c2bc3..71646192a 100644
--- a/languages/ko-KR/Notifications.multids
+++ b/languages/ko-KR/Notifications.multids
@@ -1,4 +1,4 @@
 title: $:/language/Notifications/
 
-Save/Done: 위키가 저장되었습니다
+Save/Done: 위키를 저장했습니다
 Save/Starting: 위키 저장을 시작하는 중
diff --git a/languages/ko-KR/SideBar.multids b/languages/ko-KR/SideBar.multids
index eda1eda4d..68c6a3938 100644
--- a/languages/ko-KR/SideBar.multids
+++ b/languages/ko-KR/SideBar.multids
@@ -1,7 +1,7 @@
 title: $:/language/SideBar/
 
 All/Caption: 모두
-Contents/Caption: 내용
+Contents/Caption: 목차
 Drafts/Caption: 초안
 Missing/Caption: 없음
 More/Caption: 더 보기
diff --git a/languages/ko-KR/SiteTitle.tid b/languages/ko-KR/SiteTitle.tid
index 677110f30..3638656ee 100644
--- a/languages/ko-KR/SiteTitle.tid
+++ b/languages/ko-KR/SiteTitle.tid
@@ -1,3 +1,3 @@
 title: $:/SiteTitle
 
-내 ~TiddlyWiki
\ No newline at end of file
+내 티들리위키
\ No newline at end of file
diff --git a/languages/ko-KR/Snippets/ListByTag.tid b/languages/ko-KR/Snippets/ListByTag.tid
new file mode 100644
index 000000000..c229acfdd
--- /dev/null
+++ b/languages/ko-KR/Snippets/ListByTag.tid
@@ -0,0 +1,5 @@
+title: $:/language/Snippets/ListByTag
+tags: $:/tags/TextEditor/Snippet
+caption: 태그별 티들러의 목록
+
+<<list-links "[tag[task]sort[title]]">>
diff --git a/languages/ko-KR/Snippets/MacroDefinition.tid b/languages/ko-KR/Snippets/MacroDefinition.tid
new file mode 100644
index 000000000..f61e3711d
--- /dev/null
+++ b/languages/ko-KR/Snippets/MacroDefinition.tid
@@ -0,0 +1,7 @@
+title: $:/language/Snippets/MacroDefinition
+tags: $:/tags/TextEditor/Snippet
+caption: 매크로 정의
+
+\define macroName(param1:"기본 값",param2)
+매크로의 텍스트
+\end
diff --git a/languages/ko-KR/Snippets/Table 4x3.tid b/languages/ko-KR/Snippets/Table 4x3.tid
new file mode 100644
index 000000000..ca0f0821b
--- /dev/null
+++ b/languages/ko-KR/Snippets/Table 4x3.tid	
@@ -0,0 +1,8 @@
+title: $:/language/Snippets/Table4x3
+tags: $:/tags/TextEditor/Snippet
+caption: 4열 3행으로 된 표
+
+|! |!알파 |!베타 |!감마 |!델타 |
+|!하나 | | | | |
+|!둘 | | | | |
+|!셋 | | | | |
diff --git a/languages/ko-KR/Snippets/TableOfContents.tid b/languages/ko-KR/Snippets/TableOfContents.tid
new file mode 100644
index 000000000..b20ebdb49
--- /dev/null
+++ b/languages/ko-KR/Snippets/TableOfContents.tid
@@ -0,0 +1,9 @@
+title: $:/language/Snippets/TableOfContents
+tags: $:/tags/TextEditor/Snippet
+caption: 목차
+
+<div class="tc-table-of-contents">
+
+<<toc-selective-expandable 'TableOfContents'>>
+
+</div>
\ No newline at end of file
diff --git a/languages/ko-KR/ThemeTweaks.multids b/languages/ko-KR/ThemeTweaks.multids
new file mode 100644
index 000000000..1c2382a5a
--- /dev/null
+++ b/languages/ko-KR/ThemeTweaks.multids
@@ -0,0 +1,41 @@
+title: $:/language/ThemeTweaks/
+
+ThemeTweaks: 테마 개조
+ThemeTweaks/Hint: ''Vanilla'' 테마의 특정한 면들을 개조할 수 있습니다.
+Options: 옵션
+Options/SidebarLayout: 사이드바 레이아웃
+Options/SidebarLayout/Fixed-Fluid: 고정된 이야기, 흐르는 사이드바
+Options/SidebarLayout/Fluid-Fixed: 흐르는 이야기, 고정된 사이드바
+Options/StickyTitles: 제목 고정
+Options/StickyTitles/Hint: 티들러 제목을 브라우저 창의 위에 "고정"합니다. 주의: Chrome으로는 전혀 작동되지 않으며, Firefox에서 일부 레이아웃 문제를 일으킵니다
+Options/CodeWrapping: 코드 블럭에서 긴 줄을 줄바꿈
+Settings: 설정
+Settings/FontFamily: 글꼴 집합
+Settings/CodeFontFamily: 코드 글꼴 집합
+Settings/BackgroundImage: 페이지 배경 그림
+Settings/BackgroundImageAttachment: 페이지 배경 그림 첨부
+Settings/BackgroundImageAttachment/Scroll: 티들러로 스크롤
+Settings/BackgroundImageAttachment/Fixed: 창에 고정
+Settings/BackgroundImageSize: 페이지 배경 그림 크기
+Settings/BackgroundImageSize/Auto: 자동
+Settings/BackgroundImageSize/Cover: 덮개
+Settings/BackgroundImageSize/Contain: 포함
+Metrics: 크기
+Metrics/FontSize: 글자 크기
+Metrics/LineHeight: 줄 높이
+Metrics/BodyFontSize: 티들러 본문의 글자 크기
+Metrics/BodyLineHeight: 티들러 본문의 줄 높이
+Metrics/StoryLeft: 이야기 왼쪽 위치
+Metrics/StoryLeft/Hint: 이야기 강(티들러 영역)의 왼쪽 여백은<br>페이지의 왼쪽에서 얼마나 멉니까
+Metrics/StoryTop: 이야기 위 위치
+Metrics/StoryTop/Hint: 이야기 강의 위 여백은 페이지의 위에서<br>얼마나 멉니까
+Metrics/StoryRight: 이야기 오른쪽
+Metrics/StoryRight/Hint: 사이드바의 인쪽 여백은 페이지의<br>왼쪽에서 얼마나 멉니까
+Metrics/StoryWidth: 이야기 너비
+Metrics/StoryWidth/Hint: 이야기 강의 전반적인 너비
+Metrics/TiddlerWidth: 티들러 너비
+Metrics/TiddlerWidth/Hint: 이야기 강에서
+Metrics/SidebarBreakpoint: 사이드바 중단점
+Metrics/SidebarBreakpoint/Hint: 이야기 강과 사이드바가 나란이 나타나는<br>최소 페이지 너비
+Metrics/SidebarWidth: 사이드바 너비
+Metrics/SidebarWidth/Hint: 흐르는-고정된 레이아웃에서 사이드바의 너비
diff --git a/languages/ko-KR/Types/text%2Fvnd.tiddlywiki.tid b/languages/ko-KR/Types/text%2Fvnd.tiddlywiki.tid
index fe7f99963..e290d059b 100644
--- a/languages/ko-KR/Types/text%2Fvnd.tiddlywiki.tid
+++ b/languages/ko-KR/Types/text%2Fvnd.tiddlywiki.tid
@@ -1,4 +1,4 @@
 title: $:/language/Docs/Types/text/vnd.tiddlywiki
-description: TiddlyWiki 5
+description: 티들리위키 5
 name: text/vnd.tiddlywiki
 group: 텍스트
diff --git a/languages/ko-KR/Types/text%2Fx-tiddlywiki.tid b/languages/ko-KR/Types/text%2Fx-tiddlywiki.tid
index c9329f208..f9d2c4c5f 100644
--- a/languages/ko-KR/Types/text%2Fx-tiddlywiki.tid
+++ b/languages/ko-KR/Types/text%2Fx-tiddlywiki.tid
@@ -1,4 +1,4 @@
 title: $:/language/Docs/Types/text/x-tiddlywiki
-description: TiddlyWiki 클래식
+description: 티들리위키 클래식
 name: text/x-tiddlywiki
 group: 텍스트
diff --git a/languages/nl-NL/Buttons.multids b/languages/nl-NL/Buttons.multids
index c09f650fb..1c5f827de 100644
--- a/languages/nl-NL/Buttons.multids
+++ b/languages/nl-NL/Buttons.multids
@@ -2,8 +2,12 @@ title: $:/language/Buttons/
 
 AdvancedSearch/Caption: geavanceerd zoeken
 AdvancedSearch/Hint: Geavanceerd zoeken
+Bold/Caption: vet
+Bold/Hint: Maak selectie vet
 Cancel/Caption: annuleer
 Cancel/Hint: Annuleer wijzigingen
+Clear/Caption: maak schoon
+Clear/Hint: Maak schoon en kleur
 Clone/Caption: kloon
 Clone/Hint: Kloon deze tiddler
 Close/Caption: sluit
@@ -18,12 +22,27 @@ Delete/Caption: verwijder
 Delete/Hint: Verwijder deze tiddler
 Edit/Caption: wijzig
 Edit/Hint: Wijzig deze tiddler
+EditorHeight/Caption: hoogte van de editor
+EditorHeight/Caption/Auto: Pas automatisch hoogte aan zodat inhoud past
+
+
+EditorHeight/Caption/Fixed: Vaste hoogte:
+EditorHeight/Hint: Kies de hoogte van de teksteditor
 Encryption/Caption: versleuteling
 Encryption/ClearPassword/Caption: verwijder wachtwoord
 Encryption/ClearPassword/Hint: Verwijder het wachtwoord en sla de wiki onversleuteld op
 Encryption/Hint: Vul in / verwijder wachtwoord om deze wiki op te slaan
 Encryption/SetPassword/Caption: vul wachtwoord in
 Encryption/SetPassword/Hint: Vul een wachtwoord in om deze wiki versleuteld op te slaan
+Excise/Caption: snij uit
+Excise/Caption/Excise: Snij uit
+Excise/Caption/MacroName: Macro naam:
+Excise/Caption/NewTitle: Titel van de nieuwe tiddler
+Excise/Caption/Replace: Vervang uitgesneden tekst door:
+Excise/Caption/Replace/Transclusion: transclusie
+Excise/Caption/Tag: Label de nieuwe tiddler met de titel van deze tiddler
+Excise/Caption/TiddlerExists: Waarschuwing: deze tiddler bestaat al
+Excise/Hint: Knip en plak de geselecteerde tekst in een nieuwe tiddler
 ExportPage/Caption: exporteer alle
 ExportPage/Hint: Exporteer alle tiddlers
 ExportTiddler/Caption: exporteer tiddler
@@ -40,6 +59,18 @@ FoldOthers/Caption: klap andere tiddlers in
 FoldOthers/Hint: Klap de tekst van alle andere open tiddlers in
 FullScreen/Caption: volledig scherm
 FullScreen/Hint: Start of verlaat 'volledig scherm'
+Heading1/Caption: kop 1
+Heading1/Hint: Formatteer gekozen regel als kop 1
+Heading2/Caption: kop 2
+Heading2/Hint: Formatteer gekozen regel als kop 2
+Heading3/Caption: kop 3
+Heading3/Hint: Formatteer gekozen regel als kop 3
+Heading4/Caption: kop 4
+Heading4/Hint: Formatteer gekozen regel als kop 4
+Heading5/Caption: kop 5
+Heading5/Hint: Formatteer gekozen regel als kop 5
+Heading6/Caption: kop 6
+Heading6/Hint: Formatteer gekozen regel als kop 6
 Help/Caption: hulp
 Help/Hint: Toon hulppaneel
 HideSideBar/Caption: verberg zijpaneel
@@ -50,24 +81,56 @@ Import/Caption: importeer
 Import/Hint: Importeer bestanden
 Info/Caption: info
 Info/Hint: Toon informatie over deze tiddler
+Italic/Caption: cursief
+Italic/Hint: Maak selectie cursief
 Language/Caption: taal
 Language/Hint: Kies de taal voor de gebruikersomgeving
+LineWidth/Caption: lijnbreedte
+LineWidth/Hint: Stel lijnbreedte in
+ListBullet/Caption: lijst met opsommingstekens
+ListBullet/Hint: Maak van selectie een lijst met opsommingstekens
+ListNumber/Caption: genummerde lijst
+ListNumber/Hint: Maak van selectie een genummerde lijst
+MonoBlock/Caption: blok in 'monospace'
+MonoBlock/Hint: Maak van selectie een 'monospace' blokformattering
+MonoLine/Caption: in 'monospace'
+MonoLine/Hint: Maak van selectie een 'monospace' karakterformattering
 More/Caption: meer
 More/Hint: Meer mogelijkheden
 NewHere/Caption: nieuw hier
 NewHere/Hint: Maak een nieuwe tiddler gelabeld met deze tiddler
+NewImage/Caption: nieuwe afbeelding
+
+NewImage/Hint: Maak een nieuwe afbeelding
 NewJournal/Caption: nieuw journaal
 NewJournal/Hint: Maak een nieuwe journaaltiddler
 NewJournalHere/Caption: nieuw journaal hier
 NewJournalHere/Hint: Maak een nieuwe journaaltiddler gelabeld met deze tiddler
+NewMarkdown/Caption: nieuwe 'Markdown' tiddler
+NewMarkdown/Hint: Maak een nieuwe 'Markdown' tiddler
 NewTiddler/Caption: nieuwe tiddler
 NewTiddler/Hint: Maak een nieuwe tiddler
+Opacity/Caption: ondoorzichtigheid
+Opacity/Hint: Stel de ondoorzichtigheid in
+OpenWindow/Caption: open in een nieuw venster
+OpenWindow/Hint: Open tiddler in nieuw venster
+Paint/Caption: kleur om te tekenen
+
+Paint/Hint: Kies kleur om te tekenen
 Palette/Caption: palet
 Palette/Hint: Kies het kleurpalet
 Permalink/Caption: permalink
 Permalink/Hint: Zet browseradres als directe link naar deze tiddler
 Permaview/Caption: permaview
 Permaview/Hint: Zet browseradres als directe link naar alle open tiddlers
+Picture/Caption: afbeelding
+Picture/Hint: Voeg afbeelding in
+Preview/Caption: voorbeeldweergave
+Preview/Hint: Toon voorbeeldweergavepaneel
+PreviewType/Caption: type voorbeeldweergave
+PreviewType/Hint: Kies type voorbeeldweergave
+Quote/Caption: 'blockquote'
+Quote/Hint: Maak van selectie een 'blockqoute'
 Refresh/Caption: ververs
 Refresh/Hint: Ververs deze wiki
 Save/Caption: opslaan
@@ -76,12 +139,30 @@ SaveWiki/Caption: opslaan
 SaveWiki/Hint: Sla wijzigingen op
 ShowSideBar/Caption: toon zijpaneel
 ShowSideBar/Hint: Toon zijpaneel
+Size/Caption: formaat van de afbeelding
+Size/Caption/Height: Hoogte:
+Size/Caption/Resize: Wijzig het formaat van de afbeelding
+Size/Caption/Width: Breedte:
+Size/Hint: Stel grootte van afbeelding in
+Stamp/Caption: stempel
+Stamp/Caption/New: Voeg je eigen ... toe
+Stamp/Hint: Voeg een bestaand tekstfragment in
+Stamp/New/Text: Tekstfragment (Denk eraan om een beschrijvende titel aan het 'caption' veld toe te voegen).
+Stamp/New/Title: Naam getoond in het menu
 StoryView/Caption: 'story' weergave
 StoryView/Hint: Kies de 'story' weergave
+Strikethrough/Caption: doorstrepen
+Strikethrough/Hint: Streep de selectie door
+Subscript/Caption: 'subscript'
+Subscript/Hint: Maak selectie 'subscript'
+Superscript/Caption: 'superscript'
+Superscript/Hint: Maak selectie 'superscript'
 TagManager/Caption: labelmanager
 TagManager/Hint: Open labelmanager
 Theme/Caption: thema
 Theme/Hint: Kies het thema
+Underline/Caption: onderstreept
+Underline/Hint: Onderstreep het geselecteerde
 Unfold/Caption: klap tiddler uit
 Unfold/Hint: Klap de tekst van deze tiddler uit
 UnfoldAll/Caption: klap alle tiddlers uit
diff --git a/languages/nl-NL/ControlPanel.multids b/languages/nl-NL/ControlPanel.multids
index 58573d2f8..48f734fc8 100644
--- a/languages/nl-NL/ControlPanel.multids
+++ b/languages/nl-NL/ControlPanel.multids
@@ -27,6 +27,19 @@ EditorTypes/Hint: Deze tiddlers bepalen welke editor wordt gebruikt voor specifi
 EditorTypes/Type/Caption: Type
 Info/Caption: Info
 Info/Hint: Informatie over deze TiddlyWiki
+KeyboardShortcuts/Add/Caption: voeg sneltoets toe
+KeyboardShortcuts/Add/Prompt: Type hier de sneltoets
+KeyboardShortcuts/Caption: Sneltoetsen
+KeyboardShortcuts/Hint: Beheer sneltoetstoewijzing
+KeyboardShortcuts/NoShortcuts/Caption: Geen sneltoetsen toegekend
+KeyboardShortcuts/Platform/All: Alle platformen
+KeyboardShortcuts/Platform/Linux: Alleen voor Linux
+KeyboardShortcuts/Platform/Mac: Alleen voor Macintosh
+KeyboardShortcuts/Platform/NonLinux: Alleen voor niet-Linux
+KeyboardShortcuts/Platform/NonMac: Alleen voor niet-Macintosh
+KeyboardShortcuts/Platform/NonWindows: Alleen voor niet-Windows
+KeyboardShortcuts/Platform/Windows: Alleen voor Windows
+KeyboardShortcuts/Remove/Hint: verwijder sneltoets
 LoadedModules/Caption: Geladen modules
 LoadedModules/Hint: Dit zijn de nu geladen tiddler modules gekoppeld aan hun brontiddlers. Alle cursieve modules hebben geen brontiddler, gewoonlijk omdat ze tijdens het bootproces gemaakt werden.
 Palette/Caption: Palet
@@ -45,6 +58,7 @@ Parsing/Inline/Caption: 'Inline parse' regels
 Parsing/Pragma/Caption: 'Pragma parse' regels
 Plugins/Add/Caption: Verkrijg meer plugins
 Plugins/Add/Hint: Installeer plugins van de officiële bibliotheek
+Plugins/AlreadyInstalled/Hint: Deze plugin is al geïnstalleerd met versie <$text text=<<installedVersion>>/>
 Plugins/Caption: Plugins
 Plugins/Disable/Caption: schakel uit
 Plugins/Disable/Hint: Schakel deze plugin uit na verversen van deze pagina
@@ -52,14 +66,16 @@ Plugins/Disabled/Status: (uitgeschakeld)
 Plugins/Empty/Hint: Niets
 Plugins/Enable/Caption: activeer
 Plugins/Enable/Hint: Activeer deze plugin bij verversen van deze pagina
-Plugins/Install: installeer
+Plugins/Install/Caption: installeer
 Plugins/Installed/Hint: Geïnstalleerde plugins:
 Plugins/Language/Prompt: Talen
 Plugins/Languages/Caption: Talen
 Plugins/Languages/Hint: Taal plugins
+Plugins/NoInformation/Hint: Geen informatie beschikbaar
+Plugins/NotInstalled/Hint: Deze plugin is nu niet geïnstalleerd
 Plugins/OpenPluginLibrary: open plugin bibliotheek
 Plugins/Plugin/Prompt: Plugins
-Plugins/Reinstall: herinstalleer
+Plugins/Reinstall/Caption: herinstalleer
 Plugins/Theme/Prompt: Thema's
 Plugins/Themes/Caption: Thema's
 Plugins/Themes/Hint: Thema plugins
@@ -94,6 +110,8 @@ Settings/LinkToBehaviour/OpenAtBottom: Open onderaan de 'story river'
 Settings/LinkToBehaviour/OpenAtTop: Open bovenaan de 'story river'
 Settings/LinkToBehaviour/OpenBelow: Open beneden de huidige tiddler
 Settings/LinkToBehaviour/OutsideRiver/Hint: Navigatie //van buiten// de 'story river'
+Settings/MissingLinks/Description: Sta links naar ontbrekende tiddlers toe
+Settings/MissingLinks/Hint: Kies om te linken naar nog niet bestaande tiddlers
 Settings/NavigationAddressBar/Caption: Navigatie adresbalk
 Settings/NavigationAddressBar/Hint: Gedrag van het browseradres bij navigeren naar een tiddler:
 Settings/NavigationAddressBar/No/Description: Verander het browseradres niet
@@ -126,6 +144,7 @@ Theme/Prompt: Huidig thema:
 TiddlerFields/Caption: Tiddler velden
 TiddlerFields/Hint: Dit is de complete reeks tiddlervelden in gebruik bij deze wiki (inclusief systeemtiddlers maar exclusief schaduwtiddlers).
 Toolbars/Caption: Knoppenbalken
+Toolbars/EditorToolbar/Hint: Kies welke knoppen in de editor knoppenbalk getoond worden. Sommige knoppen worden alleen getoond bij een bepaald tiddler type
 Toolbars/EditToolbar/Caption: Knoppenbalk bij wijzigen
 Toolbars/EditToolbar/Hint: Kies welke knoppen getoond worden voor tiddlers in wijzigmode
 Toolbars/Hint: Kies welke knoppen getoond worden
diff --git a/languages/nl-NL/EditTemplate.multids b/languages/nl-NL/EditTemplate.multids
index 44d89996d..412641bda 100644
--- a/languages/nl-NL/EditTemplate.multids
+++ b/languages/nl-NL/EditTemplate.multids
@@ -1,10 +1,7 @@
 title: $:/language/EditTemplate/
 
 Body/External/Hint: Dit is een externe tiddler die niet in de TiddlyWiki opgeslagen is. Je kan labels en velden wijzigen maar de tekst zelf niet.
-Body/Hint: Gebruik [[wiki text|http://tiddlywiki.com/static/WikiText.html]] om het formaat aan te passen en plaatjes e.d. toe te voegen
 Body/Placeholder: Typ de tekst voor deze tiddler
-Body/Preview/Button/Hide: verberg voorbeeld
-Body/Preview/Button/Show: toon voorbeeld
 Field/Remove/Caption: verwijder veld
 Field/Remove/Hint: Verwijder veld
 Fields/Add/Button: +
diff --git a/languages/nl-NL/Exporters.multids b/languages/nl-NL/Exporters.multids
new file mode 100644
index 000000000..bb7e1cd07
--- /dev/null
+++ b/languages/nl-NL/Exporters.multids
@@ -0,0 +1,6 @@
+title: $:/language/Exporters/
+
+CsvFile: CSV tiddlers bestand
+JsonFile: JSON tiddlers bestand
+StaticRiver: Serie tiddlers als statisch HTML bestand
+TidFile: Enkele tiddler ".tid" bestand
diff --git a/languages/nl-NL/GettingStarted.tid b/languages/nl-NL/GettingStarted.tid
index 29f59658b..e735a0ba3 100644
--- a/languages/nl-NL/GettingStarted.tid
+++ b/languages/nl-NL/GettingStarted.tid
@@ -1,15 +1,17 @@
 title: GettingStarted
 
-define lingo-base() $:/language/ControlPanel/Basics/
-Welkom bij TiddlyWiki en de TiddlyWiki gemeenschap
+\define lingo-base() $:/language/ControlPanel/Basics/
+Welkom bij ~TiddlyWiki en de ~TiddlyWiki gemeenschap
 
-Controleer eerst of je veranderingen op kan slaan voordat je belangrijke informatie aan TiddlyWiki toevoegt. Zie http://tiddlywiki.com/#GettingStarted voor details
+Controleer eerst of je veranderingen op kan slaan voordat je belangrijke informatie aan ~TiddlyWiki toevoegt. Zie http://tiddlywiki.com/#GettingStarted voor details
 
-!! Configureer deze TiddlyWiki
+!! Configureer deze ~TiddlyWiki
 
- HelloThere
-$:/Translators
-$:/plugins/tiddlywiki/translators/readme
+<div class="tc-control-panel">
 
+|<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
+|<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
+|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+</div>
 
-Zie het bedieningspaneel voor meer opties.
\ No newline at end of file
+Zie het [[bedieningspaneel|$:/ControlPanel]] voor meer opties.
diff --git a/languages/nl-NL/Import.multids b/languages/nl-NL/Import.multids
index 314f6f8c7..cb351e328 100644
--- a/languages/nl-NL/Import.multids
+++ b/languages/nl-NL/Import.multids
@@ -1,6 +1,6 @@
 title: $:/language/Import/
 
-Imported: De volgende tiddlers werden geïmporteerd:
+Imported/Hint:  De volgende tiddlers werden geïmporteerd:
 Listing/Cancel/Caption: Annuleer
 Listing/Hint: Deze tiddlers staan klaar voor import:
 Listing/Import/Caption: Importeer
diff --git a/languages/nl-NL/Misc.multids b/languages/nl-NL/Misc.multids
index 26ac56af0..b7a4d8293 100644
--- a/languages/nl-NL/Misc.multids
+++ b/languages/nl-NL/Misc.multids
@@ -9,6 +9,7 @@ ConfirmCancelTiddler: Wil je gemaakte wijzigingen aan de tiddler "<$text text=<<
 ConfirmDeleteTiddler: Wil je de tiddler "<$text text=<<title>>/>" verwijderen?
 ConfirmEditShadowTiddler: Je staat op het punt een schaduwtiddler te wijzigen. Toekomstige automatische veranderingen (upgrades) zijn dan niet mogelijk. Wil je "<$text text=<<title>>/>" wijzigen?
 ConfirmOverwriteTiddler: Wil je de tiddler "<$text text=<<title>>/>" overschrijven?
+Count: aantal
 DefaultNewTiddlerTitle: Nieuwe tiddler
 DropMessage: 'Drop' hier (of klik escape om te annuleren)
 Encryption/Cancel: Annuleer
@@ -19,10 +20,6 @@ Encryption/PromptSetPassword: Vul een nieuw wachtwoord in voor deze TiddlyWiki
 Encryption/RepeatPassword: Herhaal wachtwoord
 Encryption/SetPassword: Vul wachtwoord in
 Encryption/Username: Gebruikersnaam
-Exporters/CsvFile: CSV tiddlers bestand
-Exporters/JsonFile: JSON tiddlers bestand
-Exporters/StaticRiver: Serie tiddlers als statisch HTML bestand
-Exporters/TidFile: Enkele tiddler ".tid" bestand
 InternalJavaScriptError/Hint: Er is een probleem. Herstart TiddlyWiki door je browser te verversen
 InternalJavaScriptError/Title: Interne JavaScript Error
 InvalidFieldName: Illegale lettertekens in veldnaam "<$text text=<<fieldName>>/>". Velden kunnen alleen kleine letters, cijfers en de lettertekens liggend streepje (`_`), koppelteken (`-`) en punt (`.`)
diff --git a/languages/nl-NL/SiteTitle.tid b/languages/nl-NL/SiteTitle.tid
index 085538096..28268eb79 100644
--- a/languages/nl-NL/SiteTitle.tid
+++ b/languages/nl-NL/SiteTitle.tid
@@ -1,3 +1,3 @@
 title: $:/SiteTitle
 
-Mijn TiddlyWiki
\ No newline at end of file
+Mijn ~TiddlyWiki
\ No newline at end of file
diff --git a/languages/nl-NL/Snippets/ListByTag.tid b/languages/nl-NL/Snippets/ListByTag.tid
new file mode 100644
index 000000000..20d7b139c
--- /dev/null
+++ b/languages/nl-NL/Snippets/ListByTag.tid
@@ -0,0 +1,5 @@
+title: $:/language/Snippets/ListByTag
+tags: $:/tags/TextEditor/Snippet
+caption: Lijst van tiddlers met tag ...
+
+<<list-links "[tag[task]sort[title]]">>
diff --git a/languages/nl-NL/Snippets/MacroDefinition.tid b/languages/nl-NL/Snippets/MacroDefinition.tid
new file mode 100644
index 000000000..d830f023a
--- /dev/null
+++ b/languages/nl-NL/Snippets/MacroDefinition.tid
@@ -0,0 +1,7 @@
+title: $:/language/Snippets/MacroDefinition
+tags: $:/tags/TextEditor/Snippet
+caption: Macro definitie
+
+\define macroName(param1:"default value",param2)
+Tekst van de macro
+\end
diff --git a/languages/nl-NL/Snippets/Table4x3.tid b/languages/nl-NL/Snippets/Table4x3.tid
new file mode 100644
index 000000000..e8641c633
--- /dev/null
+++ b/languages/nl-NL/Snippets/Table4x3.tid
@@ -0,0 +1,8 @@
+title: $:/language/Snippets/Table4x3
+tags: $:/tags/TextEditor/Snippet
+caption: Tabel met 4 kolommen en 3 rijen
+
+|! |!Alpha |!Beta |!Gamma |!Delta |
+|!Een | | | | |
+|!Twee | | | | |
+|!Drie | | | | |
diff --git a/languages/nl-NL/Snippets/TableOfContents.tid b/languages/nl-NL/Snippets/TableOfContents.tid
new file mode 100644
index 000000000..26db5ffcc
--- /dev/null
+++ b/languages/nl-NL/Snippets/TableOfContents.tid
@@ -0,0 +1,9 @@
+title: $:/language/Snippets/TableOfContents
+tags: $:/tags/TextEditor/Snippet
+caption: Inhoudsopgave
+
+<div class="tc-table-of-contents">
+
+<<toc-selective-expandable 'TableOfContents'>>
+
+</div>
\ No newline at end of file
diff --git a/languages/pa-IN/EditTemplate.multids b/languages/pa-IN/EditTemplate.multids
index f574cc7e9..d4c8ac1e7 100644
--- a/languages/pa-IN/EditTemplate.multids
+++ b/languages/pa-IN/EditTemplate.multids
@@ -1,10 +1,7 @@
 title: $:/language/EditTemplate/
 
 Body/External/Hint: ਇਹ ਮੁੱਖ TiddlyWiki ਫਾਇਲ ਦੇ ਬਾਹਰ ਹੀ ਸੰਭਾਲਿਆ ਇੱਕ ਬਾਹਰੀ tiddler ਹੈ. ਤੁਸ ਟੈਗ ਅਤੇ ਖੇਤਰ ਨੂੰ ਸੋਧ ਸਕਦੇ ਹੋ, ਪਰ ਆਪਣੇ ਆਪ ਸਿੱਧੇ ਤੌਰ 'ਤੇ ਸਮੱਗਰੀ ਨੂੰ ਸੋਧ ਨਹੀ ਕਰ ਸਕਦੇ
-Body/Hint: ਸ਼ਾਮਿਲ ਕਰਨ ਲਈ ਫਾਰਮਿਟ, ਚਿੱਤਰ, ਅਤੇ ਆਰਜੀ ਫੀਚਰ: | [//tiddlywiki.com/static/WikiText.html] http [ਵਿਕਿ ਟੈਕਸਟ] ਵਰਤੋ
 Body/Placeholder:  ਪਾਠ ਟਾਈਪ ਲਈ ਇਸ tiddler ਨੂੰ  ਵਰਤੋ
-Body/Preview/Button/Hide: ਝਲਕ ਨੂੰ ਓਹਲੇ ਕਰਨ 
-Body/Preview/Button/Show: ਜਾਣਕਾਰੀ ਦੀ ਪ੍ਰਦਰਸ਼ਨੀ
 Field/Remove/Caption: ਖੇਤਰ ਨੂੰ ਹਟਾਉਣ
 Field/Remove/Hint: ਖੇਤਰ ਨੂੰ ਹਟਾਉਣ
 Fields/Add/Button: ਸ਼ਾਮਿਲ ਕਰੋ
diff --git a/languages/pa-IN/Exporters.multids b/languages/pa-IN/Exporters.multids
new file mode 100644
index 000000000..1148de631
--- /dev/null
+++ b/languages/pa-IN/Exporters.multids
@@ -0,0 +1,6 @@
+title: $:/language/Exporters/
+
+CsvFile: CSV ਫਾਇਲ  tiddlers
+JsonFile: JSON ਫਾਇਲ  tiddlers
+StaticRiver: ਸਟੈਟਿਕ HTML ਫਾਇਲ ਦੇ ਤੌਰ ਤੇ tiddlers ਦਾ ਰਿਵਰ
+TidFile: ਇਕਮਾਤਰ tiddler ".tid" ਫਾਇਲ
diff --git a/languages/pa-IN/Misc.multids b/languages/pa-IN/Misc.multids
index 96e2c133f..d1abf58ae 100644
--- a/languages/pa-IN/Misc.multids
+++ b/languages/pa-IN/Misc.multids
@@ -12,10 +12,6 @@ DefaultNewTiddlerTitle: ਨਿਊ Tiddler
 DropMessage:  ਇੱਥੇ ਛੱਡੋ (ਜ ਰੱਦ ਕਰਨ ਲਈ ਬਚ ਕਲਿੱਕ ਕਰੋ)
 Encryption/ConfirmClearPassword: ਤੁਸੀ ਪਾਸਵਰਡ ਨੂੰ ਸਾਫ਼ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ? ਇਹ ਇੰਕ੍ਰਿਪਸ਼ਨ ਹਟਾਉਣ  ਤੇ ਇਸ ਵਿਕੀ 'ਨੂੰ ਬਚਾਉਣ ਲਈ   ਲਾਗੂ ਕੀਤਾ ਜਾਵੇਗਾ
 Encryption/PromptSetPassword: TiddlyWiki ਲਈ ਇੱਕ ਪਾਸਵਰਡ ਸੈੱਟ ਕਰੋ
-Exporters/CsvFile: CSV ਫਾਇਲ  tiddlers
-Exporters/JsonFile: JSON ਫਾਇਲ  tiddlers
-Exporters/StaticRiver: ਸਟੈਟਿਕ HTML ਫਾਇਲ ਦੇ ਤੌਰ ਤੇ tiddlers ਦਾ ਰਿਵਰ
-Exporters/TidFile: ਇਕਮਾਤਰ tiddler ".tid" ਫਾਇਲ
 InvalidFieldName: ਖੇਤਰ ਦੇ ਨਾਮ ਵਿੱਚ ਗਲਤ ਅੱਖਰ "<$ ਪਾਠ = << >> fieldName />". ਖੇਤਰ ਸਿਰਫ ਛੋਟੇ ਅੱਖਰ, ਅੰਕ ਹੋ ਸਕਦੇ ਹਨ ਅਤੇ ਅੱਖਰ, ਹਾਈਫਨ (`-`) ਅਤੇ ਦੀ ਮਿਆਦ (_``) ਜ਼ੋਰ (`.`)
 MissingTiddler/Hint: Tiddler ਗੁੰਮ ਹੈ "<$ ਪਾਠ = << >> currentTiddler />" - ਕਲਿੱਕ ਕਰੋ {{$ / core / images / ਸੋਧ-ਬਟਨ}} ਨੂੰ ਬਣਾਉਣ ਲਈ
 RecentChanges/DateFormat: ਮਿਤੀ /ਮਹੀਨੇ /ਸਾਲ
diff --git a/languages/pt-PT/Buttons.multids b/languages/pt-PT/Buttons.multids
index 76bf7e5b3..764196ab1 100644
--- a/languages/pt-PT/Buttons.multids
+++ b/languages/pt-PT/Buttons.multids
@@ -2,8 +2,12 @@ title: $:/language/Buttons/
 
 AdvancedSearch/Caption: pesquisa avançada
 AdvancedSearch/Hint: Pesquisa avançada
+Bold/Caption: negrito
+Bold/Hint: Aplicar formatação negrito à selecção
 Cancel/Caption: cancelar
 Cancel/Hint: Cancelar a edição deste tiddler
+Clear/Caption: limpar
+Clear/Hint: Limpar imagem com cor sólida
 Clone/Caption: clonar
 Clone/Hint: Clonar este tiddler
 Close/Caption: fechar
@@ -18,20 +22,56 @@ Delete/Caption: eliminar
 Delete/Hint: eliminar este tiddler
 Edit/Caption: editar
 Edit/Hint: Editar este tiddler
+EditorHeight/Caption: altura do editor
+EditorHeight/Caption/Auto: Ajustar altura ao tamanho do conteúdo automaticamente
+EditorHeight/Caption/Fixed: Altura Fixa:
+EditorHeight/Hint: Escolha a altura do editor de texto
 Encryption/Caption: encriptação
 Encryption/ClearPassword/Caption: limpar palavra passe
 Encryption/ClearPassword/Hint: Limpar a palavra passe e guardar esta wiki sem encriptação
 Encryption/Hint: Definir ou limpar a palavra passe de gravação desta wiki
 Encryption/SetPassword/Caption: definir palavra passe
 Encryption/SetPassword/Hint: Definir a palavra passe para guardar esta wiki com encriptação
+Excise/Caption: separar
+Excise/Caption/Excise: Executar separação
+Excise/Caption/MacroName: Nome da Macro:
+Excise/Caption/NewTitle: Título do novo tiddler:
+Excise/Caption/Replace: Substituir texto separado por:
+Excise/Caption/Replace/Link: ligação
+Excise/Caption/Replace/Transclusion: transclusão
+Excise/Caption/Tag: Etiquetar novo tiddler com o título deste tiddler
+Excise/Caption/TiddlerExists: Atenção: tiddler já existente
+Excise/Hint: Separar o texto seleccionado para um novo tiddler
 ExportPage/Caption: exportar tudo
 ExportPage/Hint: Exportar todos os tiddlers
 ExportTiddler/Caption: exportar tiddler
 ExportTiddler/Hint: Exportar tiddler
 ExportTiddlers/Caption: exportar tiddlers
 ExportTiddlers/Hint: Exportar tiddlers
+Fold/Caption: dobrar tiddler
+Fold/FoldBar/Caption: dobra-lateral
+Fold/FoldBar/Hint: Barra lateral opcional para dobrar e desdobrar tiddlers
+Fold/Hint: Dobrar o corpo deste tiddler
+FoldAll/Caption: dobrar todos os tiddlers
+FoldAll/Hint: Dobrar o corpo de todos os tiddlers abertos
+FoldOthers/Caption: dobrar outros tiddlers
+FoldOthers/Hint: Dobrar o corpo dos outros tiddlers abertos
 FullScreen/Caption: Ecrã completo
 FullScreen/Hint: Entrar ou sair do modo de ecrã completo
+Heading1/Caption: cabeçalho 1
+Heading1/Hint: Aplicar formatação de cabeçalho nível 1 a todas as linhas contendo selecção
+Heading2/Caption: cabeçalho 2
+Heading2/Hint: Aplicar formatação de cabeçalho nível 2 a todas as linhas contendo selecção
+Heading3/Caption: cabeçalho 3
+Heading3/Hint: Aplicar formatação de cabeçalho nível 3 a todas as linhas contendo selecção
+Heading4/Caption: cabeçalho 4
+Heading4/Hint: Aplicar formatação de cabeçalho nível 4 a todas as linhas contendo selecção
+Heading5/Caption: cabeçalho 5
+Heading5/Hint: Aplicar formatação de cabeçalho nível 5 a todas as linhas contendo selecção
+Heading6/Caption: cabeçalho 6
+Heading6/Hint: Aplicar formatação de cabeçalho nível 6 a todas as linhas contendo selecção
+Help/Caption: ajuda
+Help/Hint: Mostrar painel de ajuda
 HideSideBar/Caption: esconder barra lateral
 HideSideBar/Hint: Esconder a barra lateral
 Home/Caption: Início
@@ -40,22 +80,56 @@ Import/Caption: importar
 Import/Hint: Importar ficheiros
 Info/Caption: informação
 Info/Hint: Mostrar informação sobre este tiddler
+Italic/Caption: itálico
+Italic/Hint: Aplicar formatação itálico à selecção
 Language/Caption: linguagem
 Language/Hint: Escolher a linguagem do interface do utilizador
+LineWidth/Caption: espessura da linha
+LineWidth/Hint: Definir espessura de linha para desenhar
+Link/Caption: ligação
+Link/Hint: Criar ligação em wikitext
+ListBullet/Caption: Lista com marcadores
+ListBullet/Hint: Aplicar formatação de lista com marcadores às linhas contendo selecção
+ListNumber/Caption: lista numerada
+ListNumber/Hint: Aplicar formatação de lista numerada às linhas contendo selecção
+MonoBlock/Caption: bloco mono-espaçado
+MonoBlock/Hint: Aplicar formatação de bloco mono-espaçado às linhas contendo selecção
+MonoLine/Caption: mono-espaçado
+MonoLine/Hint: Aplicar formatação mono-espaçado à selecção
 More/Caption: mais
 More/Hint: Mais acções
 NewHere/Caption: derivar
 NewHere/Hint: Criar um novo tiddler etiquetado com o actual
+NewImage/Caption: nova imagem
+NewImage/Hint: Criar novo tiddler de imagem
 NewJournal/Caption: novo diário
 NewJournal/Hint: Criar um novo tiddler-diário
 NewJournalHere/Caption: novo diário derivado
 NewJournalHere/Hint: Criar um novo tiddler-diário etiquetado com o actual
+NewMarkdown/Caption: novo tiddler Markdown
+NewMarkdown/Hint: Criar um novo tiddler Markdown
 NewTiddler/Caption: novo tiddler
 NewTiddler/Hint: Criar um novo tiddler
+Opacity/Caption: opacidade
+Opacity/Hint: Definir opacidade de desenho
+OpenWindow/Caption: abrir em nova janela
+OpenWindow/Hint: Abrir tiddler em nova janela
+Paint/Caption: cor de desenho
+Paint/Hint: Definir a cor de desenho
+Palette/Caption: paleta
+Palette/Hint: Escolher a paleta de cores
 Permalink/Caption: ligação directa
 Permalink/Hint: Define o endereço do navegador para apontar directamente para este tiddler
 Permaview/Caption: vista actual
 Permaview/Hint: Define o endereço do navegador para apontar directamente para todos os tiddlers actualmente exibidos
+Picture/Caption: imagem
+Picture/Hint: Inserir imagem
+Preview/Caption: pré-visualizar
+Preview/Hint: Mostrar o painel de pré-visualização
+PreviewType/Caption: tipo de pré-visualização
+PreviewType/Hint: Escolher o tipo de pré-visualização
+Quote/Caption: citação
+Quote/Hint: Aplicar formatação de citação às linhas contendo selecção
 Refresh/Caption: actualizar
 Refresh/Hint: Recarregar totalmente a wiki actual
 Save/Caption: guardar
@@ -64,9 +138,31 @@ SaveWiki/Caption: guardar alterações
 SaveWiki/Hint: Guardar as alterações
 ShowSideBar/Caption: Mostrar barra lateral
 ShowSideBar/Hint: Mostrar a barra lateral
+Size/Caption: tamanho da imagem
+Size/Caption/Height: Altura:
+Size/Caption/Resize: Redimensionar imagem
+Size/Caption/Width: Largura:
+Size/Hint: Definir tamanho da imagem
+Stamp/Caption: carimbo
+Stamp/Caption/New: Adicione o seu
+Stamp/Hint: Inserir um excerto de texto pré configurado
+Stamp/New/Text: Excerto de texto (Lembre-se de adicionar um título descritivo no campo da descrição).
+Stamp/New/Title: Nome a exibir no menu
 StoryView/Caption: Vista principal
 StoryView/Hint: Escolher a visualização principal
+Strikethrough/Caption: rasurado
+Strikethrough/Hint: Aplicar formatação rasurado à selecção
+Subscript/Caption: subscrita
+Subscript/Hint: Aplicar formatação subscrita à selecção
+Superscript/Caption: sobrescrita
+Superscript/Hint: Aplicar formatação sobrescrita à selecção
 TagManager/Caption: gestor de etiquetas
 TagManager/Hint: Abrir o gestor de etiquetas
 Theme/Caption: tema
 Theme/Hint: Escolher o tema de exibição
+Underline/Caption: sublinhar
+Underline/Hint: Aplicar formatação sublinhada à selecção
+Unfold/Caption: desdobrar tiddler
+Unfold/Hint: Desdobrar o corpo deste tiddler
+UnfoldAll/Caption: desdobrar todos os  tiddlers
+UnfoldAll/Hint: Desdobrar o corpo de todos os tiddlers
diff --git a/languages/pt-PT/ControlPanel.multids b/languages/pt-PT/ControlPanel.multids
index 46920a7a0..c7276462f 100644
--- a/languages/pt-PT/ControlPanel.multids
+++ b/languages/pt-PT/ControlPanel.multids
@@ -27,17 +27,38 @@ EditorTypes/Hint: Estes tiddlers determinam que editor é utilizado para editar
 EditorTypes/Type/Caption: Tipo
 Info/Caption: Informação
 Info/Hint: Informação acerca desta TiddlyWiki
+KeyboardShortcuts/Add/Caption: adicionar atalho
+KeyboardShortcuts/Add/Prompt: Digite o atalho aqui
+KeyboardShortcuts/Caption: Atalhos de Teclado
+KeyboardShortcuts/Hint: Gerir atribuições de atalhos de teclado
+KeyboardShortcuts/NoShortcuts/Caption: Nenhuns atalhos de teclado definidos
+KeyboardShortcuts/Platform/All: Todas as plataformas
+KeyboardShortcuts/Platform/Linux: Apenas plataforma Linux
+KeyboardShortcuts/Platform/Mac: Apenas plataforma Macintosh
+KeyboardShortcuts/Platform/NonLinux: Apenas plataformas não Linux
+KeyboardShortcuts/Platform/NonMac: Apenas plataformas não Macintosh
+KeyboardShortcuts/Platform/NonWindows: Apenas plataformas não Windows
+KeyboardShortcuts/Platform/Windows: Apenas plataforma Windows
+KeyboardShortcuts/Remove/Hint: remover atalho de teclado
 LoadedModules/Caption: Módulos Carregados
 LoadedModules/Hint: Estes são os módulos tiddler actualmente carregados conectados com os seus tiddlers fonte. Módulos em itálico não têm tiddler fonte, geralmente por serem carregados durante o período de arranque.
-Palette/Caption: Palete
-Palette/Editor/Clone/Caption: clone
-Palette/Editor/Clone/Prompt: Recomenda-se que clone esta palete-sombra antes de a editar
+Palette/Caption: Paleta
+Palette/Editor/Clone/Caption: clonar
+Palette/Editor/Clone/Prompt: Recomenda-se que clone esta paleta-sombra antes de a editar
 Palette/Editor/Prompt: Edição
-Palette/Editor/Prompt/Modified: Esta palete-sombra foi modificada
+Palette/Editor/Prompt/Modified: Esta paleta-sombra foi modificada
 Palette/Editor/Reset/Caption: repor
 Palette/HideEditor/Caption: esconder editor
-Palette/Prompt: Palete actual:
+Palette/Prompt: Paleta actual:
 Palette/ShowEditor/Caption: mostrar editor
+Parsing/Block/Caption: Regras de análise de blocos
+Parsing/Caption: Análise
+Parsing/Hint: Aqui pode desactivar globalmente regras individuais do analisador de wiki. Tenha em atenção que desactivar certas regras de análise pode impedir a ~TiddlyWiki de funcionar correctamente (pode repor o funcionamento normal com o [[modo de segurança|http://tiddlywiki.com/#SafeMode]] )
+Parsing/Inline/Caption: Regras de Análise em Linha
+Parsing/Pragma/Caption: Regras de Análise Pragma
+Plugins/Add/Caption: Obter mais extensões 
+Plugins/Add/Hint: Instalar extensões da biblioteca de extensões oficial
+Plugins/AlreadyInstalled/Hint: Esta extensão já se encontra instalada com a versão<$text text=<<installedVersion>>/>
 Plugins/Caption: Extensões
 Plugins/Disable/Caption: desactivar
 Plugins/Disable/Hint: Desactivar esta extensão quando recarregar a página
@@ -45,9 +66,22 @@ Plugins/Disabled/Status: (inactivo)
 Plugins/Empty/Hint: Nenhum
 Plugins/Enable/Caption: activar
 Plugins/Enable/Hint: Activar esta extensão quando recarregar a página
+Plugins/Install/Caption: instalar
+Plugins/Installed/Hint: Extensões actualmente instaladas:
 Plugins/Language/Prompt: Linguagens
+Plugins/Languages/Caption: Linguagens
+Plugins/Languages/Hint: Extensões de pacotes de idiomas
+Plugins/NoInfoFound/Hint: ''"<$text text=<<currentTab>>/>"'' não encontrado
+Plugins/NoInformation/Hint: Nenhuma informação fornecida
+Plugins/NotInstalled/Hint: Esta extensão não está actualmente instalada
+Plugins/OpenPluginLibrary: abrir biblioteca de extensões
 Plugins/Plugin/Prompt: Extensões
+Plugins/Plugins/Caption: Extensões
+Plugins/Plugins/Hint: Extensões
+Plugins/Reinstall/Caption: reinstalar
 Plugins/Theme/Prompt: Temas
+Plugins/Themes/Caption: Temas
+Plugins/Themes/Hint: Extensões de Temas
 Saving/Caption: A gravar
 Saving/Heading: A gravar
 Saving/TiddlySpot/Advanced/Heading: Definições Avançadas
@@ -65,8 +99,26 @@ Settings/AutoSave/Caption: Gravação Automática
 Settings/AutoSave/Disabled/Description: Não fazer gravação automática
 Settings/AutoSave/Enabled/Description: Fazer gravação automática
 Settings/AutoSave/Hint: Guardar alterações automaticamente durante a edição
+Settings/CamelCase/Caption: Ligações Wiki em Camel Case
+Settings/CamelCase/Description: Activar ligações em frases ~CamelCase automaticamente
+Settings/CamelCase/Hint: Pode desactivar a criação automática de ligações em frases em ~CamelCase. Requer recarregar o texto para que tome efeito
 Settings/Caption: Definições
+Settings/DefaultSidebarTab/Caption: Separador da barra lateral pré-definido
+Settings/DefaultSidebarTab/Hint: Definir que separador da barra lateral é exibido por defeito
+Settings/EditorToolbar/Caption: Barra de Ferramentas do Editor
+Settings/EditorToolbar/Description: Mostrar barra de ferramentas do editor
+Settings/EditorToolbar/Hint: Activar ou desactivar a barra de ferramentas do editor
 Settings/Hint: Estas definições permitem personalizar o comportamento da TiddlyWiki.
+Settings/LinkToBehaviour/Caption: Comportamento de Abertura de Tiddlers
+Settings/LinkToBehaviour/InsideRiver/Hint: Navegação do //interior// do rol de tiddlers
+Settings/LinkToBehaviour/OpenAbove: Abrir acima do tiddler actual
+Settings/LinkToBehaviour/OpenAtBottom: Abrir no fim do rol de tiddlers
+Settings/LinkToBehaviour/OpenAtTop: Abrir no topo do rol de tiddlers
+Settings/LinkToBehaviour/OpenBelow: Abrir abaixo do tiddler actual
+Settings/LinkToBehaviour/OutsideRiver/Hint: Navegação do //exterior // do rol de tiddlers
+Settings/MissingLinks/Caption: Ligações Wiki
+Settings/MissingLinks/Description: Activar ligações para tiddlers em falta
+Settings/MissingLinks/Hint: Definir se devem ser criadas ligações para tiddlers que ainda não existem
 Settings/NavigationAddressBar/Caption: Barra de Endereços de Navegação
 Settings/NavigationAddressBar/Hint: Comportamento da barra de endereços do navegador quando abrir um tiddler:
 Settings/NavigationAddressBar/No/Description: Não actualizar a barra de endereços
@@ -76,10 +128,22 @@ Settings/NavigationHistory/Caption: Histórico de Navegação
 Settings/NavigationHistory/Hint: Actualizar o histórico do navegador quando navegar para um tiddler
 Settings/NavigationHistory/No/Description: Não actualizar o histórico
 Settings/NavigationHistory/Yes/Description: Actualizar o histórico
+Settings/PerformanceInstrumentation/Caption: Instrumentação de Performance 
+Settings/PerformanceInstrumentation/Description: Activar instrumentação de performance 
+Settings/PerformanceInstrumentation/Hint: Exibe estatísticas de performance na consola de desenvolvimento do navegador. Requer recarregamento para que tome efeito
+Settings/TitleLinks/Caption: Títulos dos Tiddlers
+Settings/TitleLinks/Hint: Exibir opcionalmente títulos dos tiddlers como ligações
+Settings/TitleLinks/No/Description: Não exibir títulos dos tiddlers como ligações
+Settings/TitleLinks/Yes/Description: Exibir títulos dos tiddlers como ligações
 Settings/ToolbarButtons/Caption: Botões da Barra de Ferramentas
 Settings/ToolbarButtons/Hint: Aparência pré definida dos botões da barra de ferramentas:
 Settings/ToolbarButtons/Icons/Description: Incluir ícone
 Settings/ToolbarButtons/Text/Description: Incluir texto
+Settings/ToolbarButtonStyle/Caption: Estilo dos botões da barra de ferramentas
+Settings/ToolbarButtonStyle/Hint: Escolha o estilo dos botões da barra de ferramentas:
+Settings/ToolbarButtonStyle/Styles/Borderless: Sem moldura
+Settings/ToolbarButtonStyle/Styles/Boxed: Caixa
+Settings/ToolbarButtonStyle/Styles/Rounded: Arredondados
 StoryView/Caption: Vista principal
 StoryView/Prompt: Vista actual:
 Theme/Caption: Tema
@@ -87,6 +151,8 @@ Theme/Prompt: Tema Actual
 TiddlerFields/Caption: Campos dos Tiddlers
 TiddlerFields/Hint: Esta é uma lista completa dos campos dos tiddlers em utilização nesta wiki (incluindo tiddlers de sistema mas excluindo tiddlers-sombra).
 Toolbars/Caption: Barras de Ferramentas
+Toolbars/EditorToolbar/Caption: Barra de Ferramentas do Editor
+Toolbars/EditorToolbar/Hint: Escolha que botões devem ser exibidos na barra de ferramentas do editor. Alguns botões só serão exibidos enquanto edita tiddlers de certo tipo
 Toolbars/EditToolbar/Caption: Barra de Ferramentas de Edição
 Toolbars/EditToolbar/Hint: Escolher que botões são exibidos para tiddlers em modo de edição
 Toolbars/Hint: Seleccionar que botões da barra de ferramentas são exibidos
diff --git a/languages/pt-PT/Docs/PaletteColours.multids b/languages/pt-PT/Docs/PaletteColours.multids
index fa48a84ef..459a626ea 100644
--- a/languages/pt-PT/Docs/PaletteColours.multids
+++ b/languages/pt-PT/Docs/PaletteColours.multids
@@ -6,6 +6,9 @@ alert-highlight: Realce de alertas
 alert-muted-foreground: Fundo de alertas silenciados
 background: Fundo geral
 blockquote-bar: Barra de citação
+button-background: Fundo de botão pré-definido
+button-border: Moldura de botão pré-definido
+button-foreground: Primeiro plano de botão pré-definido
 code-background: Fundo de código
 code-border: Margem de código
 code-foreground: Primeiro plano de código
@@ -58,6 +61,7 @@ sidebar-tab-foreground: Primeiro plano de separador da barra lateral
 sidebar-tab-foreground-selected: Primeiro plano de separador seleccionado da barra lateral
 sidebar-tiddler-link-foreground: Primeiro plano de ligação para tiddler na barra lateral
 sidebar-tiddler-link-foreground-hover: Primeiro plano de ligação para tiddler na barra lateral sob o cursor
+site-title-foreground: Primeiro plano do site
 static-alert-foreground: Primeiro plano de alerta estático
 tab-background: Fundo de separador
 tab-background-selected: Fundo de separador seleccionado
diff --git a/languages/pt-PT/EditTemplate.multids b/languages/pt-PT/EditTemplate.multids
index 182fb3fad..d5e06d001 100644
--- a/languages/pt-PT/EditTemplate.multids
+++ b/languages/pt-PT/EditTemplate.multids
@@ -1,13 +1,13 @@
 title: $:/language/EditTemplate/
 
 Body/External/Hint: Este é um tiddler armazenado fora do ficheiro principal da Tiddlywiki. Pode mudar as etiquetas mas não pode editar o seu conteúdo
-Body/Hint: Utilize [[texto wiki|http://tiddlywiki.com/static/WikiText.html]] para adicionar formatação, imagens e funcionalidades dinâmicas
 Body/Placeholder: Escreva o texto para este tiddler
-Body/Preview/Button/Hide: esconder a pré visualização
-Body/Preview/Button/Show: mostrar a pré visualização
+Body/Preview/Type/Output: resultado
 Field/Remove/Caption: remover campo
 Field/Remove/Hint: Remover campo
 Fields/Add/Button: adicionar
+Fields/Add/Dropdown/System: Campos de Sistema
+Fields/Add/Dropdown/User: Campos do utilizador
 Fields/Add/Name/Placeholder: nome do campo
 Fields/Add/Prompt: Adicionar novo campo
 Fields/Add/Value/Placeholder: valor do campo
@@ -17,6 +17,7 @@ Tags/Add/Button: adicionar
 Tags/Add/Placeholder: nome da etiqueta
 Tags/Dropdown/Caption: lista de etiquetas
 Tags/Dropdown/Hint: Mostrar a lista de etiquetas
+Title/BadCharacterWarning: Atenção: Evite utilizar os caracteres <<bad-chars>> no título de tiddlers
 Type/Delete/Caption: apagar tipo de conteúdo
 Type/Delete/Hint: Apagar tipo de conteúdo
 Type/Dropdown/Caption: Lista de tipo de conteúdo
diff --git a/languages/pt-PT/Exporters.multids b/languages/pt-PT/Exporters.multids
new file mode 100644
index 000000000..d6ac07170
--- /dev/null
+++ b/languages/pt-PT/Exporters.multids
@@ -0,0 +1,6 @@
+title: $:/language/Exporters/
+
+CsvFile: Ficheiros CSV dos tiddlers
+JsonFile: Ficheiros JSON dos tiddlers
+StaticRiver: Sequência de tiddlers como ficheiro estático HTML
+TidFile: Tiddler individual em ficheiro ".tid"
diff --git a/languages/pt-PT/GettingStarted.tid b/languages/pt-PT/GettingStarted.tid
index 8c5698c7e..c139418c1 100644
--- a/languages/pt-PT/GettingStarted.tid
+++ b/languages/pt-PT/GettingStarted.tid
@@ -1,13 +1,17 @@
 title: GettingStarted
 
-Bem vindo à TiddlyWiki e à comunidade TiddlyWiki
+\define lingo-base() $:/language/ControlPanel/Basics/
+Bem vindo à ~TiddlyWiki e à comunidade ~TiddlyWiki
 
-Antes de começar a armazenar informação importante na TiddlyWiki é importante certificar-se que consegue gravar alterações de forma fiável. Para mais detalhes veja http://tiddlywiki.com/#GettingStarted
+Antes de começar a armazenar informação importante na ~TiddlyWiki é importante certificar-se que consegue gravar alterações de forma fiável. Para mais detalhes veja http://tiddlywiki.com/#GettingStarted
 
-!! Configurar esta TiddlyWiki
+!! Configurar esta ~TiddlyWiki
 
-| | |
-| | |
-| | [list[$:/StoryList]] |
+<div class="tc-control-panel">
 
-Veja o painel de controlo para mais opções.
+|<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
+|<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
+|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+</div>
+
+Veja o [[painel de controlo|$:/ControlPanel]] para mais opções.
diff --git a/languages/pt-PT/Help/build.tid b/languages/pt-PT/Help/build.tid
index f7aa61d45..912e7e8cc 100644
--- a/languages/pt-PT/Help/build.tid
+++ b/languages/pt-PT/Help/build.tid
@@ -7,5 +7,5 @@ Construir os alvos de construção especificados para a wiki actual. Se nenhum a
 --build <alvo> [<alvo> ...]
 ```
 
-Os alvos de contrução são definidos no ficheiro `tiddlywiki.info` na pasta da wiki.
+Os alvos de construção são definidos no ficheiro `tiddlywiki.info` na pasta da wiki.
 
diff --git a/languages/pt-PT/Import.multids b/languages/pt-PT/Import.multids
index 51355ba6a..9de568800 100644
--- a/languages/pt-PT/Import.multids
+++ b/languages/pt-PT/Import.multids
@@ -1,5 +1,6 @@
 title: $:/language/Import/
 
+Imported/Hint: Os seguintes tiddlers foram importados:
 Listing/Cancel/Caption: Cancelar
 Listing/Hint: Estes tiddlers estão prontos a importar:
 Listing/Import/Caption: Importar
diff --git a/languages/pt-PT/Misc.multids b/languages/pt-PT/Misc.multids
index e370885fe..5a0067cda 100644
--- a/languages/pt-PT/Misc.multids
+++ b/languages/pt-PT/Misc.multids
@@ -4,24 +4,47 @@ BinaryWarning/Prompt: Este tiddler contém informação binária
 ClassicWarning/Hint: Este tiddler está escrito no formato de texto wiki da TiddlyWiki Clássica, que não é totalmente compatível com a TiddlyWiki versão 5. Veja http://tiddlywiki.com/static/Upgrading.html para mais detalhes.
 ClassicWarning/Upgrade/Caption: actualizar
 CloseAll/Button: fechar todos
+ColourPicker/Recent: Recente:
 ConfirmCancelTiddler: Pretende descartar as alterações feitas no tiddler "<$text text=<<title>>/>"?
 ConfirmDeleteTiddler: Pretende apagar o tiddler "<$text text=<<title>>/>"?
 ConfirmEditShadowTiddler: Está prestes a editar um Tiddler-Sombra. Quaisquer alterações sobrepor-se-ão aos valores pré definidos de sistema, tornando futuras actualizações mais complexas. Tem a certeza que pretende editar "<$text text=<<title>>/>"?
 ConfirmOverwriteTiddler: Pretende substituir o tiddler "<$text text=<<title>>/>"?
+Count: contagem
 DefaultNewTiddlerTitle: Novo Tiddler
 DropMessage: Largue aqui (ou carregue no escape para cancelar)
+Encryption/Cancel: Cancelar
 Encryption/ConfirmClearPassword: Pretende remover a palavra-passe? Esta acção removerá a encriptação aplicada quando guardar esta wiki
+Encryption/Password: Palavra Passe
 Encryption/PromptSetPassword: Definir nova palavra passe para esta TiddlyWiki
-Exporters/CsvFile: Ficheiros CSV dos tiddlers
-Exporters/JsonFile: Ficheiros JSON dos tiddlers
-Exporters/StaticRiver: Sequência de tiddlers como ficheiro estático HTML
-Exporters/TidFile: Tiddler individual em ficheiro ".tid"
+Encryption/RepeatPassword: Repetir palavra passe
+Encryption/SetPassword: Definir palavra passe
+Encryption/Username: Nome de utilizador
+Error/Caption: Erro
+Error/Filter: Erro de filtro
+Error/FilterSyntax: Erro de sintaxe na expressão do filtro
+Error/IsFilterOperator: Erro de Filtro: Operando desconhecido para o operador de filtro 'is'
+Error/LoadingPluginLibrary: Erro ao carregar a biblioteca de extensões
+Error/RecursiveTransclusion: Erro de transclusão recursiva na widget de transclusão
+Error/RetrievingSkinny: Erro ao obter a lista simples de tiddlers
+Error/SavingToTWEdit: Erro ao gravar em TWEdit
+Error/WhileSaving: Erro ao gravar
+Error/XMLHttpRequest: Código de erro XMLHttpRequest
+InternalJavaScriptError/Hint: Bem, isto é embaraçoso. Recomenda-se que reinicie a sua TiddlyWiki recarregando o seu navegador
+InternalJavaScriptError/Title: Erro interno JavaScript
 InvalidFieldName: Caracteres ilegais no nome do ficheiro "<$text text=<<fieldName>>/>". Os campos apenas podem conter letras minúsculas, dígitos e os caracteres  subtraço (`_`), hífen (`-`) e ponto final (`.`)
+LazyLoadingWarning: <p>A carregar texto externo de ''<$text text={{!!_canonical_uri}}/>''</p><p>Se esta mensagem não desaparecer pode estar a utilizar um navegador que não suporta texto remoto nesta configuração. Veja http://tiddlywiki.com/#ExternalText</p>
+LoginToTiddlySpace: Entrar em TiddlySpace
 MissingTiddler/Hint: Tiddler "<$text text=<<currentTiddler>>/>" em falta - clique {{$:/core/images/edit-button}} para criar
+No: Não
+OfficialPluginLibrary: Biblioteca de Extensões Official ~TiddlyWiki
+OfficialPluginLibrary/Hint: A Biblioteca de Extensões Official ~TiddlyWiki em tiddlywiki.com. Extensões temas e pacotes de idiomas são mantidos pela equipa principal.
+PluginReloadWarning: Por favor grave  {{$:/core/ui/Buttons/save-wiki}} e recarregue {{$:/core/ui/Buttons/refresh}} para que as alterações às extensões tomem efeito
 RecentChanges/DateFormat: DD MMM AAAA
 SystemTiddler/Tooltip: Este é um tiddler de sistema
 TagManager/Colour/Heading: Cor
+TagManager/Count/Heading: Contagem
 TagManager/Icon/Heading: Ícone
 TagManager/Info/Heading: Informação
 TagManager/Tag/Heading: Etiqueta
 UnsavedChangesWarning: Têm alterações não guardadas na TiddlyWiki
+Yes: Sim
diff --git a/languages/pt-PT/Search.multids b/languages/pt-PT/Search.multids
index e9eb663f6..501c61ba6 100644
--- a/languages/pt-PT/Search.multids
+++ b/languages/pt-PT/Search.multids
@@ -5,6 +5,9 @@ Filter/Caption: Filtro
 Filter/Hint: Procurar através de [[expressão de filtros|http://tiddlywiki.com/static/Filters.html]]
 Filter/Matches: //<small><<resultCount>> resultados</small>//
 Matches: //<small><<resultCount>> resultados</small>//
+Matches/All: Todas as correspondências:
+Matches/Title: Correspondências em títulos:
+Search: Pesquisar
 Shadows/Caption: Sombras
 Shadows/Hint: Procurar tiddlers-sombra
 Shadows/Matches: //<small><<resultCount>> resultados</small>//
diff --git a/languages/pt-PT/SiteSubtitle.tid b/languages/pt-PT/SiteSubtitle.tid
index a69300ead..3134de483 100644
--- a/languages/pt-PT/SiteSubtitle.tid
+++ b/languages/pt-PT/SiteSubtitle.tid
@@ -1,3 +1,3 @@
 title: $:/SiteSubtitle
 
-European Portuguese translation for TiddlyWiki 5
\ No newline at end of file
+Tradução de Português Europeu para ~TiddlyWiki 5
\ No newline at end of file
diff --git a/languages/pt-PT/SiteTitle.tid b/languages/pt-PT/SiteTitle.tid
index cca1927e3..1412dfe0e 100644
--- a/languages/pt-PT/SiteTitle.tid
+++ b/languages/pt-PT/SiteTitle.tid
@@ -1,3 +1,3 @@
 title: $:/SiteTitle
 
-TiddlyWiki Portuguese Translation
\ No newline at end of file
+Tradução para Português da ~TiddlyWiki
\ No newline at end of file
diff --git a/languages/pt-PT/Snippets/ListByTag.tid b/languages/pt-PT/Snippets/ListByTag.tid
new file mode 100644
index 000000000..8cf790f6b
--- /dev/null
+++ b/languages/pt-PT/Snippets/ListByTag.tid
@@ -0,0 +1,5 @@
+title: $:/language/Snippets/ListByTag
+tags: $:/tags/TextEditor/Snippet
+caption: Lista de tiddlers por etiqueta
+
+<<list-links "[tag[task]sort[title]]">>
diff --git a/languages/pt-PT/Snippets/MacroDefinition.tid b/languages/pt-PT/Snippets/MacroDefinition.tid
new file mode 100644
index 000000000..0be62b5b6
--- /dev/null
+++ b/languages/pt-PT/Snippets/MacroDefinition.tid
@@ -0,0 +1,7 @@
+title: $:/language/Snippets/MacroDefinition
+tags: $:/tags/TextEditor/Snippet
+caption: Definição de Macro
+
+\define macroName(param1:"default value",param2)
+Texto da macro
+\end
diff --git a/languages/pt-PT/Snippets/Table4x3.tid b/languages/pt-PT/Snippets/Table4x3.tid
new file mode 100644
index 000000000..74a351694
--- /dev/null
+++ b/languages/pt-PT/Snippets/Table4x3.tid
@@ -0,0 +1,8 @@
+title: $:/language/Snippets/Table4x3
+tags: $:/tags/TextEditor/Snippet
+caption: Tabela com 4 colunas por 3 linhas
+
+|! |!Alfa |!Beta |!Gama |!Delta |
+|!Um| | | | |
+|!Dois| | | | |
+|!Três | | | | |
diff --git a/languages/pt-PT/Snippets/TableOfContents.tid b/languages/pt-PT/Snippets/TableOfContents.tid
new file mode 100644
index 000000000..8360638af
--- /dev/null
+++ b/languages/pt-PT/Snippets/TableOfContents.tid
@@ -0,0 +1,9 @@
+title: $:/language/Snippets/TableOfContents
+tags: $:/tags/TextEditor/Snippet
+caption: Tabela de Conteúdos
+
+<div class="tc-table-of-contents">
+
+<<toc-selective-expandable 'TableOfContents'>>
+
+</div>
\ No newline at end of file
diff --git a/languages/pt-PT/ThemeTweaks.multids b/languages/pt-PT/ThemeTweaks.multids
new file mode 100644
index 000000000..761bf6f3f
--- /dev/null
+++ b/languages/pt-PT/ThemeTweaks.multids
@@ -0,0 +1,41 @@
+title: $:/language/ThemeTweaks/
+
+Metrics: Tamanhos
+Metrics/BodyFontSize: Tamanho da fonte para o corpo do tiddler
+Metrics/BodyLineHeight: Altura da linha para o corpo do tiddler
+Metrics/FontSize: Tamanho de fonte
+Metrics/LineHeight: Altura de linha
+Metrics/SidebarBreakpoint: Ponto de quebra da barra lateral
+Metrics/SidebarBreakpoint/Hint: a largura mínima da página para qual o rol de<br>tiddlers e a barra lateral aparecem lado-a-lado
+Metrics/SidebarWidth: Largura da barra lateral
+Metrics/SidebarWidth/Hint: a largura da barra lateral no esquema fluido-fixo
+Metrics/StoryLeft: Posição à esquerda do rol
+Metrics/StoryLeft/Hint: Distancia a que a margem esquerda do rol de tiddlers<br>(área dos tiddlers) está da esquerda da página
+Metrics/StoryRight: Rol à direita
+Metrics/StoryRight/Hint: distancia da margem esquerda da barra<br>lateral à da esquerda da página
+Metrics/StoryTop: Posição vertical do rol
+Metrics/StoryTop/Hint: distancia da margem superior do<br>rol ao topo da página
+Metrics/StoryWidth: Largura do rol
+Metrics/StoryWidth/Hint: largura total do rol de tiddlers
+Metrics/TiddlerWidth: Largura dos tiddlers
+Metrics/TiddlerWidth/Hint: largura do rol de tiddlers
+Options: Opções
+Options/CodeWrapping: Dividir linhas longas em blocos de código
+Options/SidebarLayout: Esquema da barra lateral
+Options/SidebarLayout/Fixed-Fluid: Rol fixo, barra fluida
+Options/SidebarLayout/Fluid-Fixed: Rol fluido, barra lateral fixa
+Options/StickyTitles: Títulos persistentes
+Options/StickyTitles/Hint: Torna as barras de título dos tiddlers sempre visíveis como se ficassem coladas no topo da janela do navegador. Atenção, não funciona de todo com o Chrome, e pode causar problemas de apresentação no Firefox
+Settings: Definições
+Settings/BackgroundImage: Imagem de fundo da página
+Settings/BackgroundImageAttachment: Anexo de imagem de fundo da página
+Settings/BackgroundImageAttachment/Fixed: Fixa em relação à janela
+Settings/BackgroundImageAttachment/Scroll: Rolar com tiddlers
+Settings/BackgroundImageSize: Tamanho da imagem de fundo
+Settings/BackgroundImageSize/Auto: Automática
+Settings/BackgroundImageSize/Contain: Conter
+Settings/BackgroundImageSize/Cover: Cobrir
+Settings/CodeFontFamily: Família da fonte de código
+Settings/FontFamily: Família da fonte
+ThemeTweaks: Afinações dos Temas
+ThemeTweaks/Hint: Pode ajustar alguns parâmetros do tema ''Vanilla''.
diff --git a/languages/ru-RU/EditTemplate.multids b/languages/ru-RU/EditTemplate.multids
index 7c8f97594..1fa298f32 100644
--- a/languages/ru-RU/EditTemplate.multids
+++ b/languages/ru-RU/EditTemplate.multids
@@ -1,10 +1,7 @@
 title: $:/language/EditTemplate/
 
 Body/External/Hint: Содержимое этой заметки находится вне TiddlyWiki. Но вы можете редактировать метки и поля
-Body/Hint: Воспользуйтесь [[WikiText|http://tiddlywiki.com/static/WikiText.html]] для форматирования, добавления изображений и макросов
 Body/Placeholder: Введите текст заметки
-Body/Preview/Button/Hide: скрыть предпросмотр
-Body/Preview/Button/Show: предпросмотр
 Field/Remove/Caption: удалить поле
 Field/Remove/Hint: Удалить поле
 Fields/Add/Button: добавить
diff --git a/languages/ru-RU/Exporters.multids b/languages/ru-RU/Exporters.multids
index 332c93c8a..10ebad7b0 100644
--- a/languages/ru-RU/Exporters.multids
+++ b/languages/ru-RU/Exporters.multids
@@ -3,4 +3,4 @@ title: $:/language/Exporters/
 StaticRiver: Показываемые заметки в виде статического HTML файла
 JsonFile: Заметки в формате JSON
 CsvFile: Заметки в формате CSV
-TidFile: Одна заметка в формате ".tid"
\ No newline at end of file
+TidFile: Одна заметка в формате ".tid"
diff --git a/languages/ru-RU/GettingStarted.tid b/languages/ru-RU/GettingStarted.tid
index b8e2a8ae1..f5324a3b1 100644
--- a/languages/ru-RU/GettingStarted.tid
+++ b/languages/ru-RU/GettingStarted.tid
@@ -1,6 +1,7 @@
 title: GettingStarted
 
-Добро пожаловать в TiddlyWiki, нелинейную личную сетевую записную книжку.
+\define lingo-base() $:/language/ControlPanel/Basics/
+Добро пожаловать в ~TiddlyWiki, нелинейную личную сетевую записную книжку.
 
 Для начала убедитесь, что у вас работает сохранение - подробные инструкции на http://tiddlywiki.com/.
 
@@ -11,3 +12,14 @@ title: GettingStarted
 ** Убрать это сообщение, изменив настройку 'заметки по умолчанию' на вкладке Основные
 * Сохранить изменения при помощи кнопки 'скачать' на боковой панели
 * Изучить подробнее WikiText
+
+!! Set up this ~TiddlyWiki
+
+<div class="tc-control-panel">
+
+|<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
+|<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
+|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+</div>
+
+See the [[control panel|$:/ControlPanel]] for more options.
diff --git a/languages/ru-RU/Misc.multids b/languages/ru-RU/Misc.multids
index 430bd27e1..ad026bff8 100644
--- a/languages/ru-RU/Misc.multids
+++ b/languages/ru-RU/Misc.multids
@@ -8,6 +8,7 @@ ConfirmCancelTiddler: Отменить изменения заметки "<$text
 ConfirmDeleteTiddler: Удалить заметку "<$text text=<<title>>/>"?
 ConfirmEditShadowTiddler: Вы собираетесь редактировать встроенную заметку. Любое изменение переопределит стандартное значение и может привести к проблемам при обновлении TiddlyWiki. Вы действительно хотите редактировать "<$text text=<<title>>/>"?
 ConfirmOverwriteTiddler: Заменить заметку "<$text text=<<title>>/>"?
+Count: номер
 DefaultNewTiddlerTitle: Новая заметка
 DropMessage: Перетащите сюда (или нажмите escape для отмены)
 Encryption/Cancel: Отмена
@@ -18,10 +19,6 @@ Encryption/PromptSetPassword: Установить новый пароль дл
 Encryption/RepeatPassword: Повторите пароль
 Encryption/SetPassword: Введите пароль
 Encryption/Username: Имя пользователя
-Exporters/CsvFile: Заметки в формате CSV
-Exporters/JsonFile: Заметки в формате JSON
-Exporters/StaticRiver: Показываемые заметки в виде статического HTML файла
-Exporters/TidFile: Одна заметка в формате ".tid"
 InvalidFieldName: Недопустимые символы в названии поля "<$text text=<<fieldName>>/>". Поля могут содержать только латинские буквы нижнего регистра, цифры и символы: подчеркивание (`_`), дефис (`-`) и точку (`.`)
 MissingTiddler/Hint: Заметка "<$text text=<<currentTiddler>>/>" отсутствует - нажмите {{$:/core/images/edit-button}} чтобы её создать
 OfficialPluginLibrary: Официальная Библиотека Плагинов ~TiddlyWiki
diff --git a/languages/ru-RU/SiteTitle.tid b/languages/ru-RU/SiteTitle.tid
index 4dc133715..cae6a8a7d 100644
--- a/languages/ru-RU/SiteTitle.tid
+++ b/languages/ru-RU/SiteTitle.tid
@@ -1,3 +1,3 @@
 title: $:/SiteTitle
 
-Моя TiddlyWiki
\ No newline at end of file
+Моя ~TiddlyWiki
\ No newline at end of file
diff --git a/languages/sk-SK/EditTemplate.multids b/languages/sk-SK/EditTemplate.multids
index 16331e4a9..2493dd273 100644
--- a/languages/sk-SK/EditTemplate.multids
+++ b/languages/sk-SK/EditTemplate.multids
@@ -1,10 +1,7 @@
 title: $:/language/EditTemplate/
 
 Body/External/Hint: Toto je externý tiddler uložený mimo hlavného TiddlyWiki súboru. Môžete editovať štítky a polia, ale nemôžete priamo editovať samotný obsah
-Body/Hint: Na pridanie formátovania, obrázkov a dynamických vlastností použite [[wiki text|http://tiddlywiki.com/static/WikiText.html]]
 Body/Placeholder: Napíšte text pre tento tiddler
-Body/Preview/Button/Hide: zatvor náhľad
-Body/Preview/Button/Show: ukáž náhľad
 Field/Remove/Caption: odstrániť pole
 Field/Remove/Hint: Odstráň pole
 Fields/Add/Button: pridaj
diff --git a/languages/sk-SK/Exporters.multids b/languages/sk-SK/Exporters.multids
new file mode 100644
index 000000000..9fdeda673
--- /dev/null
+++ b/languages/sk-SK/Exporters.multids
@@ -0,0 +1,6 @@
+title: $:/language/Exporters/
+
+CsvFile: Tiddlery v CSV formáte
+JsonFile: Tiddlery v JSON formáte
+StaticRiver: Sada tiddlerov ako statický HTML súbor
+TidFile: Jeden tiddler ako ".tid" súbor
diff --git a/languages/sk-SK/GettingStarted.tid b/languages/sk-SK/GettingStarted.tid
index 1fae92864..a11c3d143 100644
--- a/languages/sk-SK/GettingStarted.tid
+++ b/languages/sk-SK/GettingStarted.tid
@@ -1,16 +1,17 @@
 title: GettingStarted
 
-Vitajte v TiddlyWiki a v TiddlyWiki komunite
+\define lingo-base() $:/language/ControlPanel/Basics/
+Vitajte v ~TiddlyWiki a v ~TiddlyWiki komunite
 
-Skôr ako začnete TiddlyWiki  plniť dôležitými informáciami, uistite sa, že jeho obsah dokážete uložiť. Viď podrobnosti na  http://tiddlywiki.com/#GettingStarted
+Skôr ako začnete ~TiddlyWiki  plniť dôležitými informáciami, uistite sa, že jeho obsah dokážete uložiť. Viď podrobnosti na  http://tiddlywiki.com/#GettingStarted
 
-!! Nakonfigurujte si tento TiddlyWiki
+!! Nakonfigurujte si tento ~TiddlyWiki
 
-| | |
-| | |
-| | HelloThere
-[[$:/Translators]]
-[[$:/plugins/tiddlywiki/translators/readme]]
- |
+<div class="tc-control-panel">
 
-Pre viac možností vyskúšajte control panel.
+|<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
+|<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
+|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+</div>
+
+Pre viac možností vyskúšajte [[control panel|$:/ControlPanel]].
diff --git a/languages/sk-SK/Misc.multids b/languages/sk-SK/Misc.multids
index e46e4f19d..72cb60254 100644
--- a/languages/sk-SK/Misc.multids
+++ b/languages/sk-SK/Misc.multids
@@ -12,10 +12,6 @@ DefaultNewTiddlerTitle: Nový tiddler
 DropMessage: Dropnúť sem (alebo zrušiť cez escape)
 Encryption/ConfirmClearPassword: Želáte si zrušiť heslo? Odstráni sa tým šifrovanie obsahu pri ukladaní wiki
 Encryption/PromptSetPassword: Nastav pre tento TiddlyWiki nové heslo
-Exporters/CsvFile: Tiddlery v CSV formáte
-Exporters/JsonFile: Tiddlery v JSON formáte
-Exporters/StaticRiver: Sada tiddlerov ako statický HTML súbor
-Exporters/TidFile: Jeden tiddler ako ".tid" súbor
 InvalidFieldName: Nepovolené znaky v názve poľa "<$text text=<<fieldName>>/>". Polia môžu obsahovať iba malé písmená, číslice a podčiarnik (`_`), pomlčku (`-`) alebo bodku (`.`)
 MissingTiddler/Hint: Chýbajúci tiddler "<$text text=<<currentTiddler>>/>" - ak ho chcete vytvoriť, kliknite {{$:/core/images/edit-button}} 
 RecentChanges/DateFormat: DDth MMM YYYY
diff --git a/languages/sk-SK/SiteTitle.tid b/languages/sk-SK/SiteTitle.tid
index 7504c78fe..ca2eaedc7 100644
--- a/languages/sk-SK/SiteTitle.tid
+++ b/languages/sk-SK/SiteTitle.tid
@@ -1,3 +1,3 @@
 title: $:/SiteTitle
 
-Môj TiddlyWiki
\ No newline at end of file
+Môj ~TiddlyWiki
\ No newline at end of file
diff --git a/languages/sv-SE/EditTemplate.multids b/languages/sv-SE/EditTemplate.multids
index 738fcde91..3cac50d09 100755
--- a/languages/sv-SE/EditTemplate.multids
+++ b/languages/sv-SE/EditTemplate.multids
@@ -1,10 +1,7 @@
 title: $:/language/EditTemplate/
 
 Body/External/Hint: This is an external tiddler stored outside of the main TiddlyWiki file. You can edit the tags and fields but cannot directly edit the content itself
-Body/Hint: Use [[wiki text|http://tiddlywiki.com/static/WikiText.html]] to add formatting, images, and dynamic features
 Body/Placeholder: Type the text for this tiddler
-Body/Preview/Button/Hide: göm förhandsvisning
-Body/Preview/Button/Show: visa förhandsvisning
 Field/Remove/Caption: ta bort fält
 Field/Remove/Hint: Ta bort fält
 Fields/Add/Button: lägg till
diff --git a/languages/sv-SE/GettingStarted.tid b/languages/sv-SE/GettingStarted.tid
index 5e4f7cf50..2a629e61c 100755
--- a/languages/sv-SE/GettingStarted.tid
+++ b/languages/sv-SE/GettingStarted.tid
@@ -3,7 +3,7 @@ title: GettingStarted
 \define lingo-base() $:/language/ControlPanel/Basics/
 Välkommen till ~TiddlyWiki och ~TiddlyWiki-community
 
-För att komma igång med denna tomma TiddlyWiki, måste du ändra följande. Kolla på http://tiddlywiki.com/#GettingStarted för detaljer
+För att komma igång med denna tomma ~TiddlyWiki, måste du ändra följande. Kolla på http://tiddlywiki.com/#GettingStarted för detaljer
 
 !! Ställ in denna ~TiddlyWiki
 
diff --git a/languages/sv-SE/Misc.multids b/languages/sv-SE/Misc.multids
index 12721cb7a..c064be15b 100755
--- a/languages/sv-SE/Misc.multids
+++ b/languages/sv-SE/Misc.multids
@@ -8,6 +8,7 @@ ConfirmCancelTiddler: Vill du ångra ändringar för denna tiddler "<$text text=
 ConfirmDeleteTiddler: Vill du ta bort denna tiddler "<$text text=<<title>>/>"?
 ConfirmOverwriteTiddler: Vill du skriva över denna tiddler "<$text text=<<title>>/>"?
 ConfirmEditShadowTiddler: You are about to edit a ShadowTiddler. Any changes will override the default system making future upgrades non-trivial. Are you sure you want to edit "<$text text=<<title>>/>"?
+Count: antal
 DefaultNewTiddlerTitle: Ny Tiddler
 DropMessage: Drop here (or use the 'Escape' key to cancel)
 Encryption/Cancel: Avbryt
diff --git a/languages/zh-Hans/Buttons.multids b/languages/zh-Hans/Buttons.multids
index afff59416..b7bc7c29a 100644
--- a/languages/zh-Hans/Buttons.multids
+++ b/languages/zh-Hans/Buttons.multids
@@ -62,6 +62,10 @@ NewJournal/Caption: 添加日志
 NewJournal/Hint: 创建一个新的日志条目
 NewJournalHere/Caption: 添加子日志
 NewJournalHere/Hint: 创建一个标签含此条目名称的新日志条目
+NewImage/Caption: 添加图像
+NewImage/Hint: 创建一个新的图像条目
+NewMarkdown/Caption: 添加 Markdown 条目
+NewMarkdown/Hint: 创建一个新的 Markdown 条目
 NewTiddler/Caption: 添加条目
 NewTiddler/Hint: 创建一个新的条目
 OpenWindow/Caption: 开启于新窗口
@@ -88,3 +92,78 @@ TagManager/Caption: 标签管理
 TagManager/Hint: 标签管理
 Theme/Caption: 布景主题
 Theme/Hint: 选择布景主题
+Bold/Caption: 粗体
+Bold/Hint: 套用粗体格式于所选文本
+Clear/Caption: 清除
+Clear/Hint: 清除图像为纯色
+EditorHeight/Caption: 编辑器高度
+EditorHeight/Caption/Auto: 自动调整高度以适合内容
+EditorHeight/Caption/Fixed: 固定高度︰
+EditorHeight/Hint: 选择文本编辑器的高度
+Excise/Caption: 剪切
+Excise/Caption/Excise: 执行剪切
+Excise/Caption/MacroName: 宏的名称︰
+Excise/Caption/NewTitle: 新条目的名称︰
+Excise/Caption/Replace: 替换剪切的文本为：
+Excise/Caption/Replace/Macro: 宏
+Excise/Caption/Replace/Link: 链接
+Excise/Caption/Replace/Transclusion: 嵌入
+Excise/Caption/Tag: 将新条目的标签设为此条目的名称
+Excise/Caption/TiddlerExists: 警示：条目已经存在
+Excise/Hint: 剪切所选文本到一个新条目
+Heading1/Caption: 标题 1
+Heading1/Hint: 套用标题级别 1 的格式于包含所选文本的列
+Heading2/Caption: 标题 2
+Heading2/Hint: 套用标题级别 2 的格式于包含所选文本的列
+Heading3/Caption: 标题 3
+Heading3/Hint: 套用标题级别 3 的格式于包含所选文本的列
+Heading4/Caption: 标题 4
+Heading4/Hint: 套用标题级别 4 的格式于包含所选文本的列
+Heading5/Caption: 标题 5
+Heading5/Hint: 套用标题级别 5 的格式于包含所选文本的列
+Heading6/Caption: 标题 6
+Heading6/Hint: 套用标题级别 6 的格式于包含所选文本的列
+Italic/Caption: 斜体
+Italic/Hint: 套用斜体格式于所选文本
+LineWidth/Caption: 线宽
+LineWidth/Hint: 设置绘画的线条宽度
+Link/Caption: 链接
+Link/Hint: 创建维基文字链接
+ListBullet/Caption: 符号清单
+ListBullet/Hint: 套用符号清单格式于包含所选文本的列
+ListNumber/Caption: 数字清单
+ListNumber/Hint: 套用数字清单格式于包含所选文本的列
+MonoBlock/Caption: 等宽区块
+MonoBlock/Hint: 套用等宽区块格式于包含所选文本的列
+MonoLine/Caption: 等宽
+MonoLine/Hint: 套用等宽字符格式于所选文本
+Opacity/Caption: 不透明度
+Opacity/Hint: 设置绘画的不透明度
+Paint/Caption: 绘画颜色
+Paint/Hint: 设置绘画的颜色
+Picture/Caption: 图片
+Picture/Hint: 插入图片
+Preview/Caption: 预览
+Preview/Hint: 显示预览窗格
+PreviewType/Caption: 预览类型
+PreviewType/Hint: 选择预览类型
+Quote/Caption: 引言
+Quote/Hint: 套用引言文本格式于包含所选文本的列
+Size/Caption: 图像大小
+Size/Caption/Height: 高度︰
+Size/Caption/Resize: 调整图像的大小
+Size/Caption/Width: 宽度：
+Size/Hint: 设置图像的大小
+Stamp/Caption: 印记
+Stamp/Caption/New: 添加您自己的
+Stamp/Hint: 插入一个预配置的文本片段
+Stamp/New/Title: 在选单中显示的标题
+Stamp/New/Text: 片段的文本。（记得在 `caption` 栏位中添加一个说明性的标题）。
+Strikethrough/Caption: 删除线
+Strikethrough/Hint: 套用删除线格式于所选文本
+Subscript/Caption: 下标
+Subscript/Hint: 套用下标格式于所选文本
+Superscript/Caption: 上标
+Superscript/Hint: 套用上标格式于所选文本
+Underline/Caption: 下划线
+Underline/Hint: 套用下划线格式于所选文本
diff --git a/languages/zh-Hans/ControlPanel.multids b/languages/zh-Hans/ControlPanel.multids
index d2b25b534..c174efa85 100644
--- a/languages/zh-Hans/ControlPanel.multids
+++ b/languages/zh-Hans/ControlPanel.multids
@@ -27,6 +27,19 @@ EditorTypes/Hint: 这些条目决定使用哪个编辑器来编辑特定条目
 EditorTypes/Type/Caption: 类型
 Info/Caption: 信息
 Info/Hint: 有关此 TiddlyWiki 的信息
+KeyboardShortcuts/Add/Prompt: 在此输入快捷键
+KeyboardShortcuts/Add/Caption: 添加快捷键
+KeyboardShortcuts/Caption: 快捷键
+KeyboardShortcuts/Hint: 管理键盘快捷键分配
+KeyboardShortcuts/NoShortcuts/Caption: 尚无指定快捷键
+KeyboardShortcuts/Remove/Hint: 删除快捷键
+KeyboardShortcuts/Platform/All: 所有平台
+KeyboardShortcuts/Platform/Mac: 仅 Macintosh 平台
+KeyboardShortcuts/Platform/NonMac: 仅非 Macintosh 平台
+KeyboardShortcuts/Platform/Linux: 仅 Linux 平台
+KeyboardShortcuts/Platform/NonLinux: 仅非 Linux 平台
+KeyboardShortcuts/Platform/Windows: 仅 Windows 平台
+KeyboardShortcuts/Platform/NonWindows: 仅非 Windows 平台
 LoadedModules/Caption: 已加载的模块
 LoadedModules/Hint: 这些是当前已加载的模块之源码条目。斜体的模块则无源码条目，通常是因为它们是在引导过程中设置。
 Palette/Caption: 调色板
@@ -40,6 +53,7 @@ Palette/Prompt: 当前的调色板：
 Palette/ShowEditor/Caption: 显示编辑器
 Plugins/Add/Hint: 从官方插件库安装插件
 Plugins/Add/Caption: 获取更多插件
+Plugins/AlreadyInstalled/Hint: 此插件已经安装版本 <$text text=<<installedVersion>>/>
 Plugins/Caption: 插件
 Plugins/Disable/Caption: 禁用
 Plugins/Disable/Hint: 重新加载页面时禁用此插件
@@ -47,18 +61,21 @@ Plugins/Disabled/Status: (已禁用)
 Plugins/Empty/Hint: 无
 Plugins/Enable/Caption: 启用
 Plugins/Enable/Hint: 重新加载页面时启用此插件
-Plugins/Install: 安装
+Plugins/Install/Caption: 安装
 Plugins/Installed/Hint: 当前已安装的插件：
 Plugins/Languages/Caption: 语言
 Plugins/Languages/Hint: 语言包插件
+Plugins/NoInfoFound/Hint: 无 ''"<$text text=<<currentTab>>/>"''
+Plugins/NoInformation/Hint: 未提供信息
+Plugins/NotInstalled/Hint: 尚未安装此插件
 Plugins/OpenPluginLibrary: 开启插件程式库
 Plugins/Plugins/Caption: 插件
 Plugins/Plugins/Hint: 插件
-Plugins/Reinstall: 重新安装
+Plugins/Reinstall/Caption: 重新安装
 Plugins/Themes/Caption: 布景主题
 Plugins/Themes/Hint: 布景主题插件
 Parsing/Caption: 解析
-Parsing/Hint: 在此您可以全域禁用个别的维基语法解析规则。请小心，禁用某些解析规则，会妨碍 ~TiddlyWiki 正常运作 (您可以用[[安全模式|http://tiddlywiki.com/#SafeMode]]恢复正常操作)
+Parsing/Hint: 在此您可以全域禁用或启用维基解析规则。要使更改生效，请保存并重新加载您的维基。禁用某些解析规则，会妨碍 <$text text="TiddlyWiki"/> 正常运作。可使用[[安全模式|http://tiddlywiki.com/#SafeMode]]恢复正常操作。
 Parsing/Block/Caption: 区块解析规则
 Parsing/Inline/Caption: 内联解析规则
 Parsing/Pragma/Caption: 编译指示解析规则
@@ -83,6 +100,9 @@ Settings/CamelCase/Caption: 驼峰式维基链接
 Settings/CamelCase/Hint: 您可以全域禁用驼峰式短语自动链接。须保存后重新加载，方才生效。
 Settings/CamelCase/Description: 启用自动驼峰式链接
 Settings/Caption: 设置
+Settings/EditorToolbar/Caption: 编辑器工具栏
+Settings/EditorToolbar/Hint: 启用或禁用编辑器工具栏︰
+Settings/EditorToolbar/Description: 显示编辑器工具栏
 Settings/DefaultSidebarTab/Caption: 默认侧边栏页签
 Settings/DefaultSidebarTab/Hint: 指定默认显示的侧边栏页签
 Settings/Hint: 这些高级设置让您定制 TiddlyWiki 的行为。
@@ -93,6 +113,9 @@ Settings/LinkToBehaviour/OpenAbove: 开启于当前条目之上
 Settings/LinkToBehaviour/OpenBelow: 开启于当前条目之下
 Settings/LinkToBehaviour/OpenAtTop: 开启于故事河的顶端
 Settings/LinkToBehaviour/OpenAtBottom: 开启于故事河的底部
+Settings/MissingLinks/Caption: 维基链接
+Settings/MissingLinks/Hint: 选择是否要链接到尚未存在的条目
+Settings/MissingLinks/Description: 启用链接到佚失条目
 Settings/NavigationAddressBar/Caption: 网址栏导览
 Settings/NavigationAddressBar/Hint: 在浏览器网址栏导览到条目时的行为：
 Settings/NavigationAddressBar/No/Description: 不更新网址栏
@@ -130,6 +153,8 @@ Toolbars/EditToolbar/Hint: 选择将显示哪些按钮于条目的编辑模式
 Toolbars/Hint: 选择将显示哪些工具栏按钮
 Toolbars/PageControls/Caption: 页面工具栏
 Toolbars/PageControls/Hint: 选择将显示哪些按钮于主页面的工具栏
+Toolbars/EditorToolbar/Caption: 编辑器工具栏
+Toolbars/EditorToolbar/Hint: 选择将显示哪些按钮于编辑器工具栏。请注意，某些按钮只会出现在编辑某一类型的条目时。
 Toolbars/ViewToolbar/Caption: 查看工具栏
 Toolbars/ViewToolbar/Hint: 选择将显示哪些按钮于条目的查看模式工具栏
 Tools/Download/Full/Caption: 下载完整副本
diff --git a/languages/zh-Hans/Docs/ModuleTypes.multids b/languages/zh-Hans/Docs/ModuleTypes.multids
index 010c8725c..8969e7131 100644
--- a/languages/zh-Hans/Docs/ModuleTypes.multids
+++ b/languages/zh-Hans/Docs/ModuleTypes.multids
@@ -1,22 +1,27 @@
 title: $:/language/Docs/ModuleTypes/
 
+allfilteroperator:  ''all'' 筛选器算子的子算子。
 animation: 动画模块包含可用于 RevealWidget 的动画。
+bitmapeditoroperation: 一个位图编辑器工具栏操作。
 command: 可于 Node.js 执行的指令。
 config: 加入 `$tw.config` 的数据。
 filteroperator: 个别筛选器算子方法。
 global: 加入 `$tw` 的全域数据。
+info: 透过 [[$:/temp/info-plugin]] 伪插件，发布系统信息。
 isfilteroperator: ''is'' 筛选器算子的运算符。
+library: 一般用途的 JavaScript 模块的通用模块类型。
 macro: JavaScript ''宏''定义。
 parser: 不同内容类型的解析器。
 saver: 于浏览器保存文件的不同的保存处理方法。
 startup: 启动时期的功能函数。
-storyview: 查看模式用以自订 list 小工具的动画与行为。
+storyview: 查看模式用以自订 list 小部件的动画与行为。
+texteditoroperation: 一个文本编辑器工具栏操作。
 tiddlerdeserializer: 转换不同内容类型至条目。
 tiddlerfield: 定义个别条目栏位的行为。
 tiddlermethod: 添加方法至 `$tw.Tiddler` 原型。
 upgrader: 于升级/导入过程中，套用升级处理至条目。
 utils: 添加方法至 `$tw.utils`。
 utils-node: 将特定于 Node.js 的方法添加到 '$tw.utils'。
-widget: 封装 DOM 渲染和刷新的小工具。
+widget: 封装 DOM 渲染和刷新的小部件。
 wikimethod: 添加方法至 `$tw.Wiki`。
 wikirule: WikiText 解析器的个别的语法规则。
diff --git a/languages/zh-Hans/EditTemplate.multids b/languages/zh-Hans/EditTemplate.multids
index dac971fc0..263c50cae 100644
--- a/languages/zh-Hans/EditTemplate.multids
+++ b/languages/zh-Hans/EditTemplate.multids
@@ -1,10 +1,8 @@
 title: $:/language/EditTemplate/
 
 Body/External/Hint: 这是保存于主要的 TiddlyWiki 文件之外的外部条目。你可以编辑其标签和栏位，但不能直接编辑内容本身
-Body/Hint: 使用 WikiText 来添加格式、图片及动态功能
 Body/Placeholder: 输入此条目的内容
-Body/Preview/Button/Hide: 隐藏预览
-Body/Preview/Button/Show: 显示预览
+Body/Preview/Type/Output: 输出
 Field/Remove/Caption: 删除栏位
 Field/Remove/Hint: 删除栏位
 Fields/Add/Button: 添加
@@ -19,6 +17,7 @@ Tags/Add/Button: 添加
 Tags/Add/Placeholder: 标签名称
 Tags/Dropdown/Caption: 标签清单
 Tags/Dropdown/Hint: 显示标签清单
+Title/BadCharacterWarning: 请注意，避免在条目名称中使用这些字符：<<bad-chars>>
 Type/Dropdown/Caption: 内容类型清单
 Type/Dropdown/Hint: 显示内容类型清单
 Type/Delete/Caption: 删除内容类型
diff --git a/languages/zh-Hans/GettingStarted.tid b/languages/zh-Hans/GettingStarted.tid
index bb9806c5f..940094b8e 100644
--- a/languages/zh-Hans/GettingStarted.tid
+++ b/languages/zh-Hans/GettingStarted.tid
@@ -1,7 +1,7 @@
 title: GettingStarted
 
 \define lingo-base() $:/language/ControlPanel/Basics/
-欢迎使用 TiddlyWiki 及参与 ~TiddlyWiki 社群
+欢迎使用 ~TiddlyWiki 及参与 ~TiddlyWiki 社群
 
 开始将重要资讯存放于 ~TiddlyWiki 之前，确认您可以可靠地保存变更是很重要的。详细资讯请参阅 http://tiddlywiki.com/#GettingStarted
 
@@ -11,7 +11,7 @@ title: GettingStarted
 
 |<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
 |<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
-|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
 </div>
 
 请参阅[[控制台|$:/ControlPanel]]查看更多选项。
\ No newline at end of file
diff --git a/languages/zh-Hans/Import.multids b/languages/zh-Hans/Import.multids
index f01383b87..82fd66924 100644
--- a/languages/zh-Hans/Import.multids
+++ b/languages/zh-Hans/Import.multids
@@ -1,6 +1,6 @@
 title: $:/language/Import/
 
-Imported: 下列条目已被导入：
+Imported/Hint:  下列条目已被导入：
 Listing/Cancel/Caption: 取消
 Listing/Hint: 这些条目已备妥导入：
 Listing/Import/Caption: 导入
diff --git a/languages/zh-Hans/Misc.multids b/languages/zh-Hans/Misc.multids
index b05898fad..bd69f0d98 100644
--- a/languages/zh-Hans/Misc.multids
+++ b/languages/zh-Hans/Misc.multids
@@ -5,10 +5,12 @@ BinaryWarning/Prompt: 此条目包含二进制数据
 ClassicWarning/Hint: 此条目以经典版 TiddlyWiki 标记格式撰写，不完全兼容新版 TiddlyWiki 的格式，详细信息请参阅：http://tiddlywiki.com/static/Upgrading。
 ClassicWarning/Upgrade/Caption: 升级
 CloseAll/Button: 全部关闭
+ColourPicker/Recent: 最近︰
 ConfirmCancelTiddler: 您确定要放弃对条目 "<$text text=<<title>>/>" 的更改？
 ConfirmDeleteTiddler: 您确定要删除条目 "<$text text=<<title>>/>"？
 ConfirmOverwriteTiddler: 您确定要覆写条目 "<$text text=<<title>>/>"？
 ConfirmEditShadowTiddler: 您即将要编辑默认条目，任何更改将会覆盖默认的系统，使未来的升级不寻常。您确定要编辑 "<$text text=<<title>>/>"?
+Count: 计数
 DefaultNewTiddlerTitle: 新条目
 DropMessage: 拖放到此处 （或按 ESC 键取消）
 Encryption/Cancel: 取消
@@ -19,11 +21,23 @@ Encryption/PromptSetPassword: 为此 TiddlyWiki 设置一个新密码
 Encryption/RepeatPassword: 重复输入密码
 Encryption/PasswordNoMatch: 密码不匹配
 Encryption/SetPassword: 设定密码
+Error/Caption: 错误
+Error/Filter: 筛选器错误
+Error/FilterSyntax: 筛选器运算式中的语法错误
+Error/IsFilterOperator: 筛选器错误︰'is' 筛选器运算符的未知操作数
+Error/LoadingPluginLibrary: 加载插件程式库时，发生错误
+Error/RecursiveTransclusion: 于 transclude 小部件中的递回嵌入错误
+Error/RetrievingSkinny: 简要条目清单撷取错误
+Error/SavingToTWEdit: 保存到 TWEdit 时，发生错误
+Error/WhileSaving: 保存时，发生错误
+Error/XMLHttpRequest: XMLHttpRequest 错误代码
 InternalJavaScriptError/Title: 内部的 JavaScript 错误
 InternalJavaScriptError/Hint: 喔，真是令人尴尬。建议刷新您的浏览器，重新启动 TiddlyWiki
 InvalidFieldName: 栏位名称 "<$text text=<<fieldName>>/>" 包含无效字符，栏位名称只能包含小写字母、数字、底线 (`_`)、 连字号 (`-`) 和小数点 (`.`)
 LazyLoadingWarning: <p>正在从 ''<$text text={{!!_canonical_uri}}/>'' 加载外部条目 ...</p><p>如果此信息未消失，可能您使用的浏览器不支援此配置的外部条目。请参阅 http://tiddlywiki.com/#ExternalText</p>
+LoginToTiddlySpace: 登录 TiddlySpace
 MissingTiddler/Hint: 佚失条目 "<$text text=<<currentTiddler>>/>" - 点击 {{$:/core/images/edit-button}} 可创建此条目
+No: 否
 OfficialPluginLibrary: ~TiddlyWiki 官方插件程式库
 OfficialPluginLibrary/Hint: 此为在 tiddlywiki.com 的 ~TiddlyWiki 官方插件程式库。由核心团队维护的插件、主题和语言包。
 PluginReloadWarning: 请保存 {{$:/core/ui/Buttons/save-wiki}} 并刷新页面 {{$:/core/ui/Buttons/refresh}} 允许更改插件才能生效
@@ -36,3 +50,4 @@ TagManager/Info/Heading: 信息
 TagManager/Tag/Heading: 标签
 Tiddler/DateFormat: YYYY年0MM月0DD日 0hh:0mm
 UnsavedChangesWarning: 在此 TiddlyWiki 您有尚未保存的变更
+Yes: 是
diff --git a/languages/zh-Hans/Search.multids b/languages/zh-Hans/Search.multids
index d3e2f570e..a9f963506 100644
--- a/languages/zh-Hans/Search.multids
+++ b/languages/zh-Hans/Search.multids
@@ -8,6 +8,7 @@ Matches: //<small><<resultCount>> 个条目符合条件</small>//
 Matches/All: 所有匹配：
 Matches/Title: 条目名称匹配：
 Search: 查找
+Search/TooShort: 查找文本太短
 Shadows/Caption: 默认
 Shadows/Hint: 查找默认条目
 Shadows/Matches: //<small><<resultCount>> 个条目符合条件</small>//
diff --git a/languages/zh-Hans/Snippets/ListByTag.tid b/languages/zh-Hans/Snippets/ListByTag.tid
new file mode 100644
index 000000000..5b65eb9b4
--- /dev/null
+++ b/languages/zh-Hans/Snippets/ListByTag.tid
@@ -0,0 +1,5 @@
+title: $:/language/Snippets/ListByTag
+tags: $:/tags/TextEditor/Snippet
+caption: 依标签筛选的条目列表
+
+<<list-links "[tag[task]sort[title]]">>
diff --git a/languages/zh-Hans/Snippets/MacroDefinition.tid b/languages/zh-Hans/Snippets/MacroDefinition.tid
new file mode 100644
index 000000000..51cacd686
--- /dev/null
+++ b/languages/zh-Hans/Snippets/MacroDefinition.tid
@@ -0,0 +1,7 @@
+title: $:/language/Snippets/MacroDefinition
+tags: $:/tags/TextEditor/Snippet
+caption: 宏的定义
+
+\define macroName(param1:"默认值",param2)
+宏的内容
+\end
diff --git a/languages/zh-Hans/Snippets/Table 4x3.tid b/languages/zh-Hans/Snippets/Table 4x3.tid
new file mode 100644
index 000000000..b1b7b0ea7
--- /dev/null
+++ b/languages/zh-Hans/Snippets/Table 4x3.tid	
@@ -0,0 +1,8 @@
+title: $:/language/Snippets/Table4x3
+tags: $:/tags/TextEditor/Snippet
+caption: 4 x 3 的表格
+
+|! | !一 | !二 | !三 | !四 |
+|! 1| | | | |
+|! 2| | | | |
+|! 3 | | | | |
diff --git a/languages/zh-Hans/Snippets/TableOfContents.tid b/languages/zh-Hans/Snippets/TableOfContents.tid
new file mode 100644
index 000000000..a57db21f1
--- /dev/null
+++ b/languages/zh-Hans/Snippets/TableOfContents.tid
@@ -0,0 +1,9 @@
+title: $:/language/Snippets/TableOfContents
+tags: $:/tags/TextEditor/Snippet
+caption: 目录
+
+<div class="tc-table-of-contents">
+
+<<toc-selective-expandable 'TableOfContents'>>
+
+</div>
\ No newline at end of file
diff --git a/languages/zh-Hans/ThemeTweaks.multids b/languages/zh-Hans/ThemeTweaks.multids
new file mode 100644
index 000000000..f0d4dded5
--- /dev/null
+++ b/languages/zh-Hans/ThemeTweaks.multids
@@ -0,0 +1,41 @@
+title: $:/language/ThemeTweaks/
+
+ThemeTweaks: 主题调整
+ThemeTweaks/Hint: 您可以调整 ''Vanilla'' 布景主题的某些样貌。
+Options: 选项
+Options/SidebarLayout: 侧边栏布局
+Options/SidebarLayout/Fixed-Fluid: 固定故事，浮动侧边栏
+Options/SidebarLayout/Fluid-Fixed: 浮动故事，固定侧边栏
+Options/StickyTitles: 置顶标题
+Options/StickyTitles/Hint: 导致条目名称"黏着"于浏览器窗口的顶部。<br>注意︰此功能无法运作于 Chrome，且于 Firefox 中会导致一些布局问题
+Options/CodeWrapping: 在代码区块中折行
+Settings: 设置
+Settings/FontFamily: 字型
+Settings/CodeFontFamily: 代码字型
+Settings/BackgroundImage: 页面背景图像
+Settings/BackgroundImageAttachment: 页面背景图像附属
+Settings/BackgroundImageAttachment/Scroll: 随条目卷动
+Settings/BackgroundImageAttachment/Fixed: 固定于窗口
+Settings/BackgroundImageSize: 页面背景图像大小
+Settings/BackgroundImageSize/Auto: 自动
+Settings/BackgroundImageSize/Cover: 覆盖
+Settings/BackgroundImageSize/Contain: 包含
+Metrics: 大小
+Metrics/FontSize: 字体大小
+Metrics/LineHeight: 行高
+Metrics/BodyFontSize: 条目本文的字体大小
+Metrics/BodyLineHeight: 条目本文的行高
+Metrics/StoryLeft: 故事左侧位置
+Metrics/StoryLeft/Hint: 故事河（条目区）的左边缘与页面左端的间距
+Metrics/StoryTop: 故事顶端位置
+Metrics/StoryTop/Hint: 故事河（条目区）的上边缘与页面顶端的间距
+Metrics/StoryRight: 故事右侧位置
+Metrics/StoryRight/Hint: 侧边栏的左边缘与页面左端的间距
+Metrics/StoryWidth: 故事的宽度
+Metrics/StoryWidth/Hint: 故事河的整体宽度
+Metrics/TiddlerWidth: 条目宽度
+Metrics/TiddlerWidth/Hint: 在故事河内
+Metrics/SidebarBreakpoint: 侧边栏中断点
+Metrics/SidebarBreakpoint/Hint: 故事河和侧边栏会并排显示的最小页面宽度
+Metrics/SidebarWidth: 侧边栏宽度
+Metrics/SidebarWidth/Hint: 在浮动-固定布局中，侧边栏的宽度
diff --git a/languages/zh-Hant/Buttons.multids b/languages/zh-Hant/Buttons.multids
index 4843c94d7..04b179cd7 100644
--- a/languages/zh-Hant/Buttons.multids
+++ b/languages/zh-Hant/Buttons.multids
@@ -62,6 +62,10 @@ NewJournal/Caption: 新增日誌
 NewJournal/Hint: 建立一個新的日誌條目
 NewJournalHere/Caption: 新增子日誌
 NewJournalHere/Hint: 建立一個標籤含此條目名稱的新日誌條目
+NewImage/Caption: 新增圖像
+NewImage/Hint: 建立一個新的圖像條目
+NewMarkdown/Caption: 新增 Markdown 條目
+NewMarkdown/Hint: 建立一個新的 Markdown 條目
 NewTiddler/Caption: 新增條目
 NewTiddler/Hint: 建立一個新的條目
 OpenWindow/Caption: 開啟於新視窗
@@ -88,3 +92,78 @@ TagManager/Caption: 標籤管理
 TagManager/Hint: 標籤管理
 Theme/Caption: 佈景主題
 Theme/Hint: 選擇佈景主題
+Bold/Caption: 粗體
+Bold/Hint: 套用粗體格式於所選文字
+Clear/Caption: 清除
+Clear/Hint: 清除圖像為純色
+EditorHeight/Caption: 編輯器高度
+EditorHeight/Caption/Auto: 自動調整高度以適合內容
+EditorHeight/Caption/Fixed: 固定高度︰
+EditorHeight/Hint: 選擇文字編輯器的高度
+Excise/Caption: 剪切
+Excise/Caption/Excise: 執行剪切
+Excise/Caption/MacroName: 巨集名稱︰
+Excise/Caption/NewTitle: 新條目的名稱︰
+Excise/Caption/Replace: 替換剪切的文本為：
+Excise/Caption/Replace/Macro: 巨集
+Excise/Caption/Replace/Link: 鏈接
+Excise/Caption/Replace/Transclusion: 嵌入
+Excise/Caption/Tag: 將新條目的標籤設為此條目的名稱
+Excise/Caption/TiddlerExists: 警示：條目已經存在
+Excise/Hint: 剪切所選文字到一個新條目
+Heading1/Caption: 標題 1
+Heading1/Hint: 套用標題級別 1 的格式於包含所選文字的列
+Heading2/Caption: 標題 2
+Heading2/Hint: 套用標題級別 2 的格式於包含所選文字的列
+Heading3/Caption: 標題 3
+Heading3/Hint: 套用標題級別 3 的格式於包含所選文字的列
+Heading4/Caption: 標題 4
+Heading4/Hint: 套用標題級別 4 的格式於包含所選文字的列
+Heading5/Caption: 標題 5
+Heading5/Hint: 套用標題級別 5 的格式於包含所選文字的列
+Heading6/Caption: 標題 6
+Heading6/Hint: 套用標題級別 6 的格式於包含所選文字的列
+Italic/Caption: 斜體
+Italic/Hint: 套用斜體格式於所選文字
+LineWidth/Caption: 線寬
+LineWidth/Hint: 設定繪畫的線條寬度
+Link/Caption: 鏈接
+Link/Hint: 建立維基文字鏈接
+ListBullet/Caption: 符號清單
+ListBullet/Hint: 套用符號清單格式於包含所選文字的列
+ListNumber/Caption: 數字清單
+ListNumber/Hint: 套用數字清單格式於包含所選文字的列
+MonoBlock/Caption: 等寬區塊
+MonoBlock/Hint: 套用等寬區塊格式於包含所選文字的列
+MonoLine/Caption: 等寬
+MonoLine/Hint: 套用等寬字元格式於所選文字
+Opacity/Caption: 不透明度
+Opacity/Hint: 設定繪畫的不透明度
+Paint/Caption: 繪畫顏色
+Paint/Hint: 設定繪畫的顏色
+Picture/Caption: 圖片
+Picture/Hint: 插入圖片
+Preview/Caption: 預覽
+Preview/Hint: 顯示預覽窗格
+PreviewType/Caption: 預覽類型
+PreviewType/Hint: 選擇預覽類型
+Quote/Caption: 引言
+Quote/Hint: 套用引言文字格式於包含所選文字的列
+Size/Caption: 圖像大小
+Size/Caption/Height: 高度︰
+Size/Caption/Resize: 調整圖像的大小
+Size/Caption/Width: 寬度：
+Size/Hint: 設定圖像的大小
+Stamp/Caption: 印記
+Stamp/Caption/New: 新增您自己的
+Stamp/Hint: 插入一個預配置的文字片段
+Stamp/New/Title: 在選單中顯示的標題
+Stamp/New/Text: 片段的文字。（記得在 `caption` 欄位中新增一個說明性的標題）。
+Strikethrough/Caption: 刪除線
+Strikethrough/Hint: 套用刪除線格式於所選文字
+Subscript/Caption: 下標
+Subscript/Hint: 套用下標格式於所選文字
+Superscript/Caption: 上標
+Superscript/Hint: 套用上標格式於所選文字
+Underline/Caption: 底線
+Underline/Hint: 套用底線格式於所選文字
diff --git a/languages/zh-Hant/ControlPanel.multids b/languages/zh-Hant/ControlPanel.multids
index 7871cda11..c520535b7 100644
--- a/languages/zh-Hant/ControlPanel.multids
+++ b/languages/zh-Hant/ControlPanel.multids
@@ -27,6 +27,19 @@ EditorTypes/Hint: 這些條目決定使用哪個編輯器來編輯特定條目
 EditorTypes/Type/Caption: 類型
 Info/Caption: 資訊
 Info/Hint: 有關此 TiddlyWiki 的資訊
+KeyboardShortcuts/Add/Prompt: 在此輸入快捷鍵
+KeyboardShortcuts/Add/Caption: 新增快捷鍵
+KeyboardShortcuts/Caption: 快捷鍵
+KeyboardShortcuts/Hint: 管理鍵盤快捷鍵分配
+KeyboardShortcuts/NoShortcuts/Caption: 尚無指定快捷鍵
+KeyboardShortcuts/Remove/Hint: 刪除快捷鍵
+KeyboardShortcuts/Platform/All: 所有平臺
+KeyboardShortcuts/Platform/Mac: 僅 Macintosh 平臺
+KeyboardShortcuts/Platform/NonMac: 僅非 Macintosh 平臺
+KeyboardShortcuts/Platform/Linux: 僅 Linux 平臺
+KeyboardShortcuts/Platform/NonLinux: 僅非 Linux 平臺
+KeyboardShortcuts/Platform/Windows: 僅 Windows 平臺
+KeyboardShortcuts/Platform/NonWindows: 僅非 Windows 平臺
 LoadedModules/Caption: 已載入的模組
 LoadedModules/Hint: 這些是當前已載入的模組之源碼條目。斜體的模組則無源碼條目，通常是因為它們是在引導過程中設置。
 Palette/Caption: 調色盤
@@ -40,6 +53,7 @@ Palette/Prompt: 當前的調色盤：
 Palette/ShowEditor/Caption: 顯示編輯器
 Plugins/Add/Hint: 從官方插件庫安裝插件
 Plugins/Add/Caption: 獲取更多插件
+Plugins/AlreadyInstalled/Hint: 此插件已經安裝版本 <$text text=<<installedVersion>>/>
 Plugins/Caption: 插件
 Plugins/Disable/Caption: 停用
 Plugins/Disable/Hint: 重新載入頁面時停用此插件
@@ -47,18 +61,21 @@ Plugins/Disabled/Status: (已停用)
 Plugins/Empty/Hint: 無
 Plugins/Enable/Caption: 啟用
 Plugins/Enable/Hint: 重新載入頁面時啟用此插件
-Plugins/Install: 安裝
+Plugins/Install/Caption: 安裝
 Plugins/Installed/Hint: 當前已安裝的插件：
 Plugins/Languages/Caption: 語言
 Plugins/Languages/Hint: 語言包插件
+Plugins/NoInfoFound/Hint: 無 ''"<$text text=<<currentTab>>/>"''
+Plugins/NoInformation/Hint: 未提供資訊
+Plugins/NotInstalled/Hint: 尚未安裝此插件
 Plugins/OpenPluginLibrary: 開啟插件程式庫
 Plugins/Plugins/Caption: 插件
 Plugins/Plugins/Hint: 插件
-Plugins/Reinstall: 重新安裝
+Plugins/Reinstall/Caption: 重新安裝
 Plugins/Themes/Caption: 佈景主題
 Plugins/Themes/Hint: 佈景主題插件
 Parsing/Caption: 解析
-Parsing/Hint: 在此您可以全域停用個別的維基語法解析規則。請小心，停用某些解析規則，會妨礙 ~TiddlyWiki 正常運作 (您可以用[[安全模式|http://tiddlywiki.com/#SafeMode]]恢復正常操作)
+Parsing/Hint: 在此您可以全域停用或啟用維基解析規則。要使更改生效，請儲存並重新載入您的維基。停用某些解析規則，會妨礙 <$text text="TiddlyWiki"/>  正常運作。可使用[[安全模式|http://tiddlywiki.com/#SafeMode]]恢復正常操作。
 Parsing/Block/Caption: 區塊解析規則
 Parsing/Inline/Caption: 行內解析規則
 Parsing/Pragma/Caption: 編譯指示解析規則
@@ -83,6 +100,9 @@ Settings/CamelCase/Caption: 駝峰式維基鏈接
 Settings/CamelCase/Hint: 您可以全域停用駝峰式短語自動鏈接。須儲存後重新載入，方才生效。
 Settings/CamelCase/Description: 啟用自動駝峰式鏈接
 Settings/Caption: 設定
+Settings/EditorToolbar/Caption: 編輯器工具列
+Settings/EditorToolbar/Hint: 啟用或停用編輯器工具列︰
+Settings/EditorToolbar/Description: 顯示編輯器工具列
 Settings/DefaultSidebarTab/Caption: 預設側邊欄頁籤
 Settings/DefaultSidebarTab/Hint: 指定預設顯示的側邊欄頁籤
 Settings/Hint: 這些進階設定讓您自訂 TiddlyWiki 的行為。
@@ -93,6 +113,9 @@ Settings/LinkToBehaviour/OpenAbove: 開啟於當前條目之上
 Settings/LinkToBehaviour/OpenBelow: 開啟於當前條目之下
 Settings/LinkToBehaviour/OpenAtTop: 開啟於故事河的頂端
 Settings/LinkToBehaviour/OpenAtBottom: 開啟於故事河的底部
+Settings/MissingLinks/Caption: 維基鏈接
+Settings/MissingLinks/Hint: 選擇是否要鏈接到尚未存在的條目
+Settings/MissingLinks/Description: 啟用鏈接到佚失條目
 Settings/NavigationAddressBar/Caption: 網址列導覽
 Settings/NavigationAddressBar/Hint: 在瀏覽器網址列導覽到條目時的行為：
 Settings/NavigationAddressBar/No/Description: 不更新網址列
@@ -130,6 +153,8 @@ Toolbars/EditToolbar/Hint: 選擇將顯示哪些按鈕於條目的編輯模式
 Toolbars/Hint: 選擇將顯示哪些工具列按鈕
 Toolbars/PageControls/Caption: 頁面工具列
 Toolbars/PageControls/Hint: 選擇將顯示哪些按鈕於主頁面的工具列
+Toolbars/EditorToolbar/Caption: 編輯器工具列
+Toolbars/EditorToolbar/Hint: 選擇將顯示哪些按鈕於編輯器工具列。請注意，某些按鈕只會出現在編輯某一類型的條目時。
 Toolbars/ViewToolbar/Caption: 檢視工具列
 Toolbars/ViewToolbar/Hint: 選擇將顯示哪些按鈕於條目的檢視模式工具列
 Tools/Download/Full/Caption: 下載完整副本
diff --git a/languages/zh-Hant/Docs/ModuleTypes.multids b/languages/zh-Hant/Docs/ModuleTypes.multids
index 461652ce6..4a4c70566 100644
--- a/languages/zh-Hant/Docs/ModuleTypes.multids
+++ b/languages/zh-Hant/Docs/ModuleTypes.multids
@@ -1,16 +1,21 @@
 title: $:/language/Docs/ModuleTypes/
 
+allfilteroperator:  ''all'' 篩選器運算子的子運算子。
 animation: 動畫模組包含可用於 RevealWidget 的動畫。
+bitmapeditoroperation: 一個點陣圖編輯器工具列操作。
 command: 可於 Node.js 執行的指令。
 config: 加入 `$tw.config` 的資料。
 filteroperator: 個別篩選器運算元方法。
 global: 加入 `$tw` 的全域資料。
+info: 透過 [[$:/temp/info-plugin]] 偽插件，發佈系統資訊。
 isfilteroperator: ''is'' 篩選器運算元的運算子。
+library: 一般用途的 JavaScript 模組的通用的模組類型。
 macro: JavaScript ''巨集''定義。
 parser: 不同內容類型的解析器。
 saver: 於瀏覽器儲存檔案的不同的儲存處理方法。
 startup: 啟動時期的功能函數。
 storyview: 檢視模式用以自訂 list 小工具的動畫與行為。
+texteditoroperation: 一個文字編輯器工具列操作。
 tiddlerdeserializer: 轉換不同內容類型至條目。
 tiddlerfield: 定義個別條目欄位的行為。
 tiddlermethod: 新增方法至 `$tw.Tiddler` 原型。
diff --git a/languages/zh-Hant/EditTemplate.multids b/languages/zh-Hant/EditTemplate.multids
index 1cd11961c..0bfaecadf 100644
--- a/languages/zh-Hant/EditTemplate.multids
+++ b/languages/zh-Hant/EditTemplate.multids
@@ -1,10 +1,8 @@
 title: $:/language/EditTemplate/
 
 Body/External/Hint: 這是儲存於主要的 TiddlyWiki 檔之外的外部條目。你可以編輯其標籤和欄位，但不能直接編輯內容本身
-Body/Hint: 使用 WikiText 來新增格式、圖片及動態功能
 Body/Placeholder: 輸入此條目的內容
-Body/Preview/Button/Hide: 隱藏預覽
-Body/Preview/Button/Show: 顯示預覽
+Body/Preview/Type/Output: 輸出
 Field/Remove/Caption: 刪除欄位
 Field/Remove/Hint: 刪除欄位
 Fields/Add/Button: 新增
@@ -19,6 +17,7 @@ Tags/Add/Button: 新增
 Tags/Add/Placeholder: 標籤名稱
 Tags/Dropdown/Caption: 標籤清單
 Tags/Dropdown/Hint: 顯示標籤清單
+Title/BadCharacterWarning: 請注意，避免在條目名稱中使用這些字元：<<bad-chars>>
 Type/Dropdown/Caption: 內容類型清單
 Type/Dropdown/Hint: 顯示內容類型清單
 Type/Delete/Caption: 刪除內容類型
diff --git a/languages/zh-Hant/GettingStarted.tid b/languages/zh-Hant/GettingStarted.tid
index 03e5188c9..abd686f12 100644
--- a/languages/zh-Hant/GettingStarted.tid
+++ b/languages/zh-Hant/GettingStarted.tid
@@ -1,7 +1,7 @@
 title: GettingStarted
 
 \define lingo-base() $:/language/ControlPanel/Basics/
-歡迎使用 TiddlyWiki 及參與 ~TiddlyWiki 社群
+歡迎使用 ~TiddlyWiki 及參與 ~TiddlyWiki 社群
 
 開始將重要資訊存放於 ~TiddlyWiki 之前，確認您可以可靠地儲存變更是很重要的。詳細資訊請參閱 http://tiddlywiki.com/#GettingStarted
 
@@ -11,7 +11,7 @@ title: GettingStarted
 
 |<$link to="$:/SiteTitle"><<lingo Title/Prompt>></$link> |<$edit-text tiddler="$:/SiteTitle" default="" tag="input"/> |
 |<$link to="$:/SiteSubtitle"><<lingo Subtitle/Prompt>></$link> |<$edit-text tiddler="$:/SiteSubtitle" default="" tag="input"/> |
-|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit-text tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
+|<$link to="$:/DefaultTiddlers"><<lingo DefaultTiddlers/Prompt>></$link> |<<lingo DefaultTiddlers/TopHint>><br> <$edit tag="textarea" tiddler="$:/DefaultTiddlers"/><br>//<<lingo DefaultTiddlers/BottomHint>>// |
 </div>
 
 請參閱[[控制台|$:/ControlPanel]]查看更多選項。
\ No newline at end of file
diff --git a/languages/zh-Hant/Import.multids b/languages/zh-Hant/Import.multids
index c19b5288b..c01ff5901 100644
--- a/languages/zh-Hant/Import.multids
+++ b/languages/zh-Hant/Import.multids
@@ -1,6 +1,6 @@
 title: $:/language/Import/
 
-Imported: 下列條目已被導入：
+Imported/Hint:  下列條目已被導入：
 Listing/Cancel/Caption: 取消
 Listing/Hint: 這些條目已備妥導入：
 Listing/Import/Caption: 導入
diff --git a/languages/zh-Hant/Misc.multids b/languages/zh-Hant/Misc.multids
index 4a8d92f13..ab020d66a 100644
--- a/languages/zh-Hant/Misc.multids
+++ b/languages/zh-Hant/Misc.multids
@@ -5,10 +5,12 @@ BinaryWarning/Prompt: 此條目包含二進位資料
 ClassicWarning/Hint: 此條目以經典版 TiddlyWiki 標記格式撰寫，不完全相容新版 TiddlyWiki 的格式，詳細資訊請參閱：http://tiddlywiki.com/static/Upgrading。
 ClassicWarning/Upgrade/Caption: 升級
 CloseAll/Button: 全部關閉
+ColourPicker/Recent: 最近︰
 ConfirmCancelTiddler: 您確定要放棄對條目 "<$text text=<<title>>/>" 的更改？
 ConfirmDeleteTiddler: 您確定要刪除條目 "<$text text=<<title>>/>"？
 ConfirmOverwriteTiddler: 您確定要覆寫條目 "<$text text=<<title>>/>"？
 ConfirmEditShadowTiddler: 您即將要編輯預設條目，任何更改將會覆蓋預設的系統，使未來的升級不尋常。您確定要編輯 "<$text text=<<title>>/>"?
+Count: 計數
 DefaultNewTiddlerTitle: 新條目
 DropMessage: 拖放到此處 （或按 ESC 鍵取消）
 Encryption/Cancel: 取消
@@ -19,11 +21,23 @@ Encryption/PromptSetPassword: 為此 TiddlyWiki 設定一個新密碼
 Encryption/RepeatPassword: 重複輸入密碼
 Encryption/PasswordNoMatch: 密碼不匹配
 Encryption/SetPassword: 設定密碼
+Error/Caption: 錯誤
+Error/Filter: 篩選器錯誤
+Error/FilterSyntax: 篩選器運算式中的語法錯誤
+Error/IsFilterOperator: 篩選器錯誤︰'is' 篩選器運算子的未知運算元
+Error/LoadingPluginLibrary: 載入插件程式庫時，發生錯誤
+Error/RecursiveTransclusion: 於 transclude 小工具中的遞迴嵌入錯誤
+Error/RetrievingSkinny: 簡要條目清單擷取錯誤
+Error/SavingToTWEdit: 儲存到 TWEdit 時，發生錯誤
+Error/WhileSaving: 儲存時，發生錯誤
+Error/XMLHttpRequest: XMLHttpRequest 錯誤代碼
 InternalJavaScriptError/Title: 內部的 JavaScript 錯誤
 InternalJavaScriptError/Hint: 喔，真是令人尷尬。建議刷新您的瀏覽器，重新啟動 TiddlyWiki
 InvalidFieldName: 欄位名稱 "<$text text=<<fieldName>>/>" 包含無效字元，欄位名稱只能包含小寫字母、數字、底線 (`_`)、 連接號 (`-`) 和小數點 (`.`)
 LazyLoadingWarning: <p>正在從 ''<$text text={{!!_canonical_uri}}/>'' 載入外部條目 ...</p><p>如果此訊息未消失，可能您使用的瀏覽器不支援此配置的外部條目。請參閱 http://tiddlywiki.com/#ExternalText</p>
+LoginToTiddlySpace: 登入 TiddlySpace
 MissingTiddler/Hint: 佚失條目 "<$text text=<<currentTiddler>>/>" - 點擊 {{$:/core/images/edit-button}} 可建立此條目
+No: 否
 OfficialPluginLibrary: ~TiddlyWiki 官方插件程式庫
 OfficialPluginLibrary/Hint: 此為在 tiddlywiki.com 的 ~TiddlyWiki 官方插件程式庫。由核心團隊維護的插件、主題和語言包。
 PluginReloadWarning: 請儲存 {{$:/core/ui/Buttons/save-wiki}} 並刷新頁面 {{$:/core/ui/Buttons/refresh}} 允許更改插件才能生效
@@ -36,3 +50,4 @@ TagManager/Info/Heading: 資訊
 TagManager/Tag/Heading: 標籤
 Tiddler/DateFormat: YYYY年0MM月0DD日 0hh:0mm
 UnsavedChangesWarning: 在此 TiddlyWiki 您有尚未儲存的變更
+Yes: 是
diff --git a/languages/zh-Hant/Search.multids b/languages/zh-Hant/Search.multids
index ba33cd35e..f8477e620 100644
--- a/languages/zh-Hant/Search.multids
+++ b/languages/zh-Hant/Search.multids
@@ -8,6 +8,7 @@ Matches: //<small><<resultCount>> 個條目符合條件</small>//
 Matches/All: 所有匹配：
 Matches/Title: 條目名稱匹配：
 Search: 搜尋
+Search/TooShort: 搜尋文字太短
 Shadows/Caption: 預設
 Shadows/Hint: 尋找預設條目
 Shadows/Matches: //<small><<resultCount>> 個條目符合條件</small>//
diff --git a/languages/zh-Hant/Snippets/ListByTag.tid b/languages/zh-Hant/Snippets/ListByTag.tid
new file mode 100644
index 000000000..51aa4f6df
--- /dev/null
+++ b/languages/zh-Hant/Snippets/ListByTag.tid
@@ -0,0 +1,5 @@
+title: $:/language/Snippets/ListByTag
+tags: $:/tags/TextEditor/Snippet
+caption: 依標籤篩選的條目列表
+
+<<list-links "[tag[task]sort[title]]">>
diff --git a/languages/zh-Hant/Snippets/MacroDefinition.tid b/languages/zh-Hant/Snippets/MacroDefinition.tid
new file mode 100644
index 000000000..e2e60d79c
--- /dev/null
+++ b/languages/zh-Hant/Snippets/MacroDefinition.tid
@@ -0,0 +1,7 @@
+title: $:/language/Snippets/MacroDefinition
+tags: $:/tags/TextEditor/Snippet
+caption: 巨集的定義
+
+\define macroName(param1:"預設值",param2)
+巨集的內容
+\end
diff --git a/languages/zh-Hant/Snippets/Table 4x3.tid b/languages/zh-Hant/Snippets/Table 4x3.tid
new file mode 100644
index 000000000..b1b7b0ea7
--- /dev/null
+++ b/languages/zh-Hant/Snippets/Table 4x3.tid	
@@ -0,0 +1,8 @@
+title: $:/language/Snippets/Table4x3
+tags: $:/tags/TextEditor/Snippet
+caption: 4 x 3 的表格
+
+|! | !一 | !二 | !三 | !四 |
+|! 1| | | | |
+|! 2| | | | |
+|! 3 | | | | |
diff --git a/languages/zh-Hant/Snippets/TableOfContents.tid b/languages/zh-Hant/Snippets/TableOfContents.tid
new file mode 100644
index 000000000..b14d733d4
--- /dev/null
+++ b/languages/zh-Hant/Snippets/TableOfContents.tid
@@ -0,0 +1,9 @@
+title: $:/language/Snippets/TableOfContents
+tags: $:/tags/TextEditor/Snippet
+caption: 目錄
+
+<div class="tc-table-of-contents">
+
+<<toc-selective-expandable 'TableOfContents'>>
+
+</div>
\ No newline at end of file
diff --git a/languages/zh-Hant/ThemeTweaks.multids b/languages/zh-Hant/ThemeTweaks.multids
new file mode 100644
index 000000000..a7a661e69
--- /dev/null
+++ b/languages/zh-Hant/ThemeTweaks.multids
@@ -0,0 +1,41 @@
+title: $:/language/ThemeTweaks/
+
+ThemeTweaks: 主題調整
+ThemeTweaks/Hint: 您可以調整 ''Vanilla'' 佈景主題的某些樣貌。
+Options: 選項
+Options/SidebarLayout: 側邊欄佈局
+Options/SidebarLayout/Fixed-Fluid: 固定故事，浮動側邊欄
+Options/SidebarLayout/Fluid-Fixed: 浮動故事，固定側邊欄
+Options/StickyTitles: 置頂標題
+Options/StickyTitles/Hint: 導致條目名稱"黏著"於瀏覽器視窗的頂部。<br>注意︰此功能無法運作於 Chrome，且於 Firefox 中會導致一些佈局問題
+Options/CodeWrapping: 在代碼區塊中折行
+Settings: 設定
+Settings/FontFamily: 字型
+Settings/CodeFontFamily: 代碼字型
+Settings/BackgroundImage: 頁面背景圖像
+Settings/BackgroundImageAttachment: 頁面背景圖像附屬
+Settings/BackgroundImageAttachment/Scroll: 隨條目捲動
+Settings/BackgroundImageAttachment/Fixed: 固定於視窗
+Settings/BackgroundImageSize: 頁面背景圖像大小
+Settings/BackgroundImageSize/Auto: 自動
+Settings/BackgroundImageSize/Cover: 覆蓋
+Settings/BackgroundImageSize/Contain: 包含
+Metrics: 大小
+Metrics/FontSize: 字體大小
+Metrics/LineHeight: 行高
+Metrics/BodyFontSize: 條目本文的字體大小
+Metrics/BodyLineHeight: 條目本文的行高
+Metrics/StoryLeft: 故事左側位置
+Metrics/StoryLeft/Hint: 故事河（條目區）的左邊緣與頁面左端的間距
+Metrics/StoryTop: 故事頂端位置
+Metrics/StoryTop/Hint: 故事河（條目區）的上邊緣與頁面頂端的間距
+Metrics/StoryRight: 故事右側位置
+Metrics/StoryRight/Hint: 側邊欄的左邊緣與頁面左端的間距
+Metrics/StoryWidth: 故事的寬度
+Metrics/StoryWidth/Hint: 故事河的整體寬度
+Metrics/TiddlerWidth: 條目寬度
+Metrics/TiddlerWidth/Hint: 在故事河內
+Metrics/SidebarBreakpoint: 側邊欄中斷點
+Metrics/SidebarBreakpoint/Hint: 故事河和側邊欄會並排顯示的最小頁面寬度
+Metrics/SidebarWidth: 側邊欄寬度
+Metrics/SidebarWidth/Hint: 在浮動-固定佈局中，側邊欄的寬度
diff --git a/licenses/copyright.md b/license.md
similarity index 100%
rename from licenses/copyright.md
rename to license.md
diff --git a/licenses/cla-individual.md b/licenses/cla-individual.md
index a2d314211..1210fd405 100644
--- a/licenses/cla-individual.md
+++ b/licenses/cla-individual.md
@@ -262,3 +262,39 @@ Santiago Pelufo, @spelufo, 2015/12/18
 Matthew Lauber, @mklauber, 2015/11/13
 
 Matthew DeAbreu, @mdeabreu, 2016/01/05
+
+Cameron Fischer, @flibbles, 2016/01/08
+
+Jim, @ARRRRGH, 2016/01/11
+
+Koke Laast, @Koke24, 2016/01/27
+
+Thomas Elmiger, @telmiger, 2016/02/02
+
+Richard Rath @rcrath 2016/02/12
+
+Eric Drechsel @edrex 2016/02/15
+
+Tomasz Pijanowski @zakrec 2016/02/21
+
+@FND 2016/02/27
+
+Cengizhan Kurt, @webninjasi, 2016/03/03
+
+Knut Franke, @nome, 2016/03/20
+
+Pau Deluca, @PauDeLuca, 2016/04/11
+
+Brent Maxwell, @brentmaxwell, 2016/05/20
+
+Thomas Herlea, @maxthomax, 2016/06/09
+
+Segey Shishkin, @serj_aleks, 2016/07/28
+
+Przemek Wesołek, @jest, 2016/08/05
+
+Doron Tzur, @DoronTzur 2016/08/16
+
+Hans Christian Haase, @hchaase, 2016/08/11
+
+steve schneider, @stevesunypoly, 2016/08/26
diff --git a/package.json b/package.json
index 40d1b0158..3f723eff2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "tiddlywiki",
   "preferGlobal": "true",
-  "version": "5.1.10-prerelease",
+  "version": "5.1.14-prerelease",
   "author": "Jeremy Ruston <jeremy@jermolene.com>",
   "description": "a non-linear personal web notebook",
   "contributors": [
diff --git a/plugins/tiddlywiki/bibtex/deserializer.js b/plugins/tiddlywiki/bibtex/deserializer.js
new file mode 100644
index 000000000..dc30402fb
--- /dev/null
+++ b/plugins/tiddlywiki/bibtex/deserializer.js
@@ -0,0 +1,49 @@
+/*\
+title: $:/plugins/tiddlywiki/excel-utils/deserializer.js
+type: application/javascript
+module-type: tiddlerdeserializer
+
+XLSX file deserializer
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+var bibtexParse = require("$:/plugins/tiddlywiki/bibtex/bibtexParse.js");
+
+/*
+Parse an XLSX file into tiddlers
+*/
+exports["application/x-bibtex"] = function(text,fields) {
+	var data,
+		results = [];
+	// Parse the text
+	try {
+		data = bibtexParse.toJSON(text)
+	} catch(ex) {
+		data = ex.toString();
+	}
+	if(typeof data === "string") {
+		return [{
+			title: "BibTeX import error: " + data,
+		}];
+	}
+	// Convert each entry
+	$tw.utils.each(data,function(entry) {
+		var fields = {
+			title: entry.citationKey,
+			"bibtex-entry-type": entry.entryType
+		};
+		$tw.utils.each(entry.entryTags,function(value,name) {
+			fields["bibtex-" + name] = value;
+		});
+		results.push(fields);
+	});
+	// Return the output tiddlers
+	return results;
+};
+
+})();
diff --git a/plugins/tiddlywiki/bibtex/doc/readme.tid b/plugins/tiddlywiki/bibtex/doc/readme.tid
new file mode 100644
index 000000000..619733d51
--- /dev/null
+++ b/plugins/tiddlywiki/bibtex/doc/readme.tid
@@ -0,0 +1,13 @@
+title: $:/plugins/tiddlywiki/bibtex/readme
+
+The BibTeX plugin provides a deserializer that can convert bibliographic entries in `.bib` files into individual tiddlers.
+
+You can use it in the browser by dragging and dropping a `.bib` file into the TiddlyWiki window. Under Node.js, use the `--load` command to load a `.bib` file.
+
+The conversion is as follows:
+
+* `title` comes from citationKey
+* `bibtex-entry-type` comes from entryType
+* all `entryTags` are assigned to fields with the prefix `bibtex-`
+
+The BibTeX plugin is based on the library [[bibtexParseJs by Henrik Muehe and Mikola Lysenko|https://github.com/ORCID/bibtexParseJs]].
diff --git a/plugins/tiddlywiki/bibtex/files/LICENSE b/plugins/tiddlywiki/bibtex/files/LICENSE
new file mode 100755
index 000000000..a881203f6
--- /dev/null
+++ b/plugins/tiddlywiki/bibtex/files/LICENSE
@@ -0,0 +1,23 @@
+
+The MIT License (MIT)
+Copyright (c) 2013 ORCID, Inc.
+
+Copyright (c) 2010 Henrik Muehe
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/plugins/tiddlywiki/bibtex/files/README.md b/plugins/tiddlywiki/bibtex/files/README.md
new file mode 100755
index 000000000..be17cc103
--- /dev/null
+++ b/plugins/tiddlywiki/bibtex/files/README.md
@@ -0,0 +1,47 @@
+bibtexParseJs
+=============
+A JavaScript library that parses BibTeX parser. Forked from 
+[bibtex-parser](https://github.com/mikolalysenko/bibtex-parser).
+
+
+## Using in Browser
+Include bibtexParse.js and call 
+
+```
+bibtexParse.toJSON('@article{sample1,title={sample title}}');
+```
+
+## Using in [Node.js](http://nodejs.org/)
+Install     ```npm install bibtex-parse-js```
+
+```
+var bibtexParse = require('bibtex-parse-js');
+
+var sample = bibtexParse.toJSON('@article{sample1,title={sample title}}');
+
+console.log(sample);
+``` 
+
+**Returns** A parsed bibtex file as a JSON Array Object
+
+```
+[ { citationKey: 'SAMPLE1',
+    entryType: 'ARTICLE',
+    entryTags: { TITLE: 'sample title' } } ]
+```
+
+## Contributing
+   Contributions are welcome. Please make sure the unit test(test/runTest.js) reflects the
+   changes and completes successfully. 
+
+#### Travis CI
+See the latest build and results at [https://travis-ci.org/ORCID/bibtexParseJs](https://travis-ci.org/ORCID/bibtexParseJs)
+
+## Credits
+(c) 2010 Henrik Muehe.  MIT License 
+[visit](https://code.google.com/p/bibtex-js/)
+
+
+CommonJS port maintained by Mikola Lysenko 
+[visit](https://github.com/mikolalysenko/bibtex-parser)
+
diff --git a/plugins/tiddlywiki/bibtex/files/bibtexParse.js b/plugins/tiddlywiki/bibtex/files/bibtexParse.js
new file mode 100755
index 000000000..2e276f9ac
--- /dev/null
+++ b/plugins/tiddlywiki/bibtex/files/bibtexParse.js
@@ -0,0 +1,342 @@
+/* start bibtexParse 0.0.22 */
+
+//Original work by Henrik Muehe (c) 2010
+//
+//CommonJS port by Mikola Lysenko 2013
+//
+//Port to Browser lib by ORCID / RCPETERS
+//
+//Issues:
+//no comment handling within strings
+//no string concatenation
+//no variable values yet
+//Grammar implemented here:
+//bibtex -> (string | preamble | comment | entry)*;
+//string -> '@STRING' '{' key_equals_value '}';
+//preamble -> '@PREAMBLE' '{' value '}';
+//comment -> '@COMMENT' '{' value '}';
+//entry -> '@' key '{' key ',' key_value_list '}';
+//key_value_list -> key_equals_value (',' key_equals_value)*;
+//key_equals_value -> key '=' value;
+//value -> value_quotes | value_braces | key;
+//value_quotes -> '"' .*? '"'; // not quite
+//value_braces -> '{' .*? '"'; // not quite
+(function(exports) {
+
+    function BibtexParser() {
+        
+        this.months = ["jan", "feb", "mar", "apr", "may", "jun", "jul", "aug", "sep", "oct", "nov", "dec"];
+        this.notKey = [',','{','}',' ','='];
+        this.pos = 0;
+        this.input = "";
+        this.entries = new Array();
+
+        this.currentEntry = "";
+
+        this.setInput = function(t) {
+            this.input = t;
+        };
+
+        this.getEntries = function() {
+            return this.entries;
+        };
+
+        this.isWhitespace = function(s) {
+            return (s == ' ' || s == '\r' || s == '\t' || s == '\n');
+        };
+
+        this.match = function(s, canCommentOut) {
+            if (canCommentOut == undefined || canCommentOut == null)
+                canCommentOut = true;
+            this.skipWhitespace(canCommentOut);
+            if (this.input.substring(this.pos, this.pos + s.length) == s) {
+                this.pos += s.length;
+            } else {
+                throw "Token mismatch, expected " + s + ", found "
+                        + this.input.substring(this.pos);
+            };
+            this.skipWhitespace(canCommentOut);
+        };
+
+        this.tryMatch = function(s, canCommentOut) {
+            if (canCommentOut == undefined || canCommentOut == null)
+                canCommentOut = true;
+            this.skipWhitespace(canCommentOut);
+            if (this.input.substring(this.pos, this.pos + s.length) == s) {
+                return true;
+            } else {
+                return false;
+            };
+            this.skipWhitespace(canCommentOut);
+        };
+
+        /* when search for a match all text can be ignored, not just white space */
+        this.matchAt = function() {
+            while (this.input.length > this.pos && this.input[this.pos] != '@') {
+                this.pos++;
+            };
+
+            if (this.input[this.pos] == '@') {
+                return true;
+            };
+            return false;
+        };
+
+        this.skipWhitespace = function(canCommentOut) {
+            while (this.isWhitespace(this.input[this.pos])) {
+                this.pos++;
+            };
+            if (this.input[this.pos] == "%" && canCommentOut == true) {
+                while (this.input[this.pos] != "\n") {
+                    this.pos++;
+                };
+                this.skipWhitespace(canCommentOut);
+            };
+        };
+
+        this.value_braces = function() {
+            var bracecount = 0;
+            this.match("{", false);
+            var start = this.pos;
+            var escaped = false;
+            while (true) {
+                if (!escaped) {
+                    if (this.input[this.pos] == '}') {
+                        if (bracecount > 0) {
+                            bracecount--;
+                        } else {
+                            var end = this.pos;
+                            this.match("}", false);
+                            return this.input.substring(start, end);
+                        };
+                    } else if (this.input[this.pos] == '{') {
+                        bracecount++;
+                    } else if (this.pos >= this.input.length - 1) {
+                        throw "Unterminated value";
+                    };
+                };
+                if (this.input[this.pos] == '\\' && escaped == false)
+                    escaped = true;
+                else
+                    escaped = false;
+                this.pos++;
+            };
+        };
+
+        this.value_comment = function() {
+            var str = '';
+            var brcktCnt = 0;
+            while (!(this.tryMatch("}", false) && brcktCnt == 0)) {
+                str = str + this.input[this.pos];
+                if (this.input[this.pos] == '{')
+                    brcktCnt++;
+                if (this.input[this.pos] == '}')
+                    brcktCnt--;
+                if (this.pos >= this.input.length - 1) {
+                    throw "Unterminated value:" + this.input.substring(start);
+                };
+                this.pos++;
+            };
+            return str;
+        };
+
+        this.value_quotes = function() {
+            this.match('"', false);
+            var start = this.pos;
+            var escaped = false;
+            while (true) {
+                if (!escaped) {
+                    if (this.input[this.pos] == '"') {
+                        var end = this.pos;
+                        this.match('"', false);
+                        return this.input.substring(start, end);
+                    } else if (this.pos >= this.input.length - 1) {
+                        throw "Unterminated value:" + this.input.substring(start);
+                    };
+                }
+                if (this.input[this.pos] == '\\' && escaped == false)
+                    escaped = true;
+                else
+                    escaped = false;
+                this.pos++;
+            };
+        };
+
+        this.single_value = function() {
+            var start = this.pos;
+            if (this.tryMatch("{")) {
+                return this.value_braces();
+            } else if (this.tryMatch('"')) {
+                return this.value_quotes();
+            } else {
+                var k = this.key();
+                if (k.match("^[0-9]+$"))
+                    return k;
+                else if (this.months.indexOf(k.toLowerCase()) >= 0)
+                    return k.toLowerCase();
+                else
+                    throw "Value expected:" + this.input.substring(start) + ' for key: ' + k;
+            
+            };
+        };
+
+        this.value = function() {
+            var values = [];
+            values.push(this.single_value());
+            while (this.tryMatch("#")) {
+                this.match("#");
+                values.push(this.single_value());
+            };
+            return values.join("");
+        };
+
+        this.key = function(optional) {
+            var start = this.pos;
+            while (true) {
+                if (this.pos >= this.input.length) {
+                    throw "Runaway key";
+                };
+                                // а-яА-Я is Cyrillic
+                //console.log(this.input[this.pos]);
+                if (this.notKey.indexOf(this.input[this.pos]) >= 0) {
+                    if (optional && this.input[this.pos] != ',') {
+                        this.pos = start;
+                        return null;
+                    };
+                    return this.input.substring(start, this.pos);
+                } else {
+                    this.pos++;
+                    
+                };
+            };
+        };
+
+        this.key_equals_value = function() {
+            var key = this.key();
+            if (this.tryMatch("=")) {
+                this.match("=");
+                var val = this.value();
+                return [ key, val ];
+            } else {
+                throw "... = value expected, equals sign missing:"
+                        + this.input.substring(this.pos);
+            };
+        };
+
+        this.key_value_list = function() {
+            var kv = this.key_equals_value();
+            this.currentEntry['entryTags'] = {};
+            this.currentEntry['entryTags'][kv[0]] = kv[1];
+            while (this.tryMatch(",")) {
+                this.match(",");
+                // fixes problems with commas at the end of a list
+                if (this.tryMatch("}")) {
+                    break;
+                }
+                ;
+                kv = this.key_equals_value();
+                this.currentEntry['entryTags'][kv[0]] = kv[1];
+            };
+        };
+
+        this.entry_body = function(d) {
+            this.currentEntry = {};
+            this.currentEntry['citationKey'] = this.key(true);
+            this.currentEntry['entryType'] = d.substring(1);
+            if (this.currentEntry['citationKey'] != null) {            
+                this.match(",");
+            }
+            this.key_value_list();
+            this.entries.push(this.currentEntry);
+        };
+
+        this.directive = function() {
+            this.match("@");
+            return "@" + this.key();
+        };
+
+        this.preamble = function() {
+            this.currentEntry = {};
+            this.currentEntry['entryType'] = 'PREAMBLE';
+            this.currentEntry['entry'] = this.value_comment();
+            this.entries.push(this.currentEntry);
+        };
+
+        this.comment = function() {
+            this.currentEntry = {};
+            this.currentEntry['entryType'] = 'COMMENT';
+            this.currentEntry['entry'] = this.value_comment();
+            this.entries.push(this.currentEntry);
+        };
+
+        this.entry = function(d) {
+            this.entry_body(d);
+        };
+
+        this.alernativeCitationKey = function () {
+            this.entries.forEach(function (entry) {
+                if (!entry.citationKey && entry.entryTags) {
+                    entry.citationKey = '';
+                    if (entry.entryTags.author) {
+                        entry.citationKey += entry.entryTags.author.split(',')[0] += ', ';
+                    }
+                    entry.citationKey += entry.entryTags.year;
+                }
+            });
+        }
+
+        this.bibtex = function() {
+            while (this.matchAt()) {
+                var d = this.directive();
+                this.match("{");
+                if (d == "@STRING") {
+                    this.string();
+                } else if (d == "@PREAMBLE") {
+                    this.preamble();
+                } else if (d == "@COMMENT") {
+                    this.comment();
+                } else {
+                    this.entry(d);
+                }
+                this.match("}");
+            };
+
+            this.alernativeCitationKey();
+        };
+    };
+    
+    exports.toJSON = function(bibtex) {
+        var b = new BibtexParser();
+        b.setInput(bibtex);
+        b.bibtex();
+        return b.entries;
+    };
+
+    /* added during hackathon don't hate on me */
+    exports.toBibtex = function(json) {
+        var out = '';
+        for ( var i in json) {
+            out += "@" + json[i].entryType;
+            out += '{';
+            if (json[i].citationKey)
+                out += json[i].citationKey + ', ';
+            if (json[i].entry)
+                out += json[i].entry ;
+            if (json[i].entryTags) {
+                var tags = '';
+                for (var jdx in json[i].entryTags) {
+                    if (tags.length != 0)
+                        tags += ', ';
+                    tags += jdx + '= {' + json[i].entryTags[jdx] + '}';
+                }
+                out += tags;
+            }
+            out += '}\n\n';
+        }
+        return out;
+        
+    };
+
+})(typeof exports === 'undefined' ? this['bibtexParse'] = {} : exports);
+
+/* end bibtexParse */
diff --git a/plugins/tiddlywiki/bibtex/files/tiddlywiki.files b/plugins/tiddlywiki/bibtex/files/tiddlywiki.files
new file mode 100644
index 000000000..f7a502441
--- /dev/null
+++ b/plugins/tiddlywiki/bibtex/files/tiddlywiki.files
@@ -0,0 +1,18 @@
+{
+	"tiddlers": [
+		{
+			"file": "bibtexParse.js",
+			"fields": {
+				"type": "application/javascript",
+				"title": "$:/plugins/tiddlywiki/bibtex/bibtexParse.js",
+				"module-type": "library"
+			}
+		},{
+			"file": "LICENSE",
+			"fields": {
+				"type": "text/plain",
+				"title": "$:/plugins/tiddlywiki/bibtex/license"
+			}
+		}
+	]
+}
diff --git a/plugins/tiddlywiki/bibtex/plugin.info b/plugins/tiddlywiki/bibtex/plugin.info
new file mode 100644
index 000000000..4b88be21e
--- /dev/null
+++ b/plugins/tiddlywiki/bibtex/plugin.info
@@ -0,0 +1,7 @@
+{
+	"title": "$:/plugins/tiddlywiki/bibtex",
+	"description": "BibTeX importer",
+	"author": "Henrik Muehe and Mikola Lysenko, adapted by Jeremy Ruston",
+	"plugin-type": "plugin",
+	"list": "readme license"
+}
diff --git a/plugins/tiddlywiki/bibtex/samples/first-jabref-bibtex-db.bib b/plugins/tiddlywiki/bibtex/samples/first-jabref-bibtex-db.bib
new file mode 100644
index 000000000..115113ce7
--- /dev/null
+++ b/plugins/tiddlywiki/bibtex/samples/first-jabref-bibtex-db.bib
@@ -0,0 +1,929 @@
+% Encoding: UTF-8
+
+@InProceedings{Dalgaard2001,
+  author     = {Dalgaard, Rune},
+  title      = {Hypertext and the Scholarly Archive: Intertexts, Paratexts and Metatexts at Work},
+  booktitle  = {Proceedings of the 12th {ACM} Conference on Hypertext and Hypermedia},
+  series     = {{HYPERTEXT} '01},
+  pages      = {175--184},
+  publisher  = {{ACM}},
+  abstract   = {With the Web, hypertext has become the paradigmatic rhetorical structure of a global and distributed archive. This paper argues that the scholarly archive is going though a process of hypertextualization that is not adequately accounted for in theories on hypertext. A methodological approach based on Gerard Genettes theory of transtextuality is proposed for a study of the hypertextualized archive. This involves a rejection of the reductionist opposition of hypertext and the fixed linear text, in favor of a study of the intertexts, paratexts and metatexts that work at the interface between texts and archive. I refer to this as second-order textuality.},
+  date       = {2001},
+  doi        = {10.1145/504216.504262},
+  isbn       = {978-1-58113-420-9},
+  keywords   = {criticism, hypertext rhetoric, intertextuality, metatext, navigation, paratext, scholarly and scientific communication, textuality, theory, web},
+  location   = {New York, {NY}, {USA}},
+  shorttitle = {Hypertext and the Scholarly Archive},
+  url        = {http://doi.acm.org/10.1145/504216.504262},
+  urldate    = {2016-10-17},
+}
+
+@InProceedings{Stoyanova2015,
+  author     = {Stoyanova, Silvia and Johnston, Ben},
+  title      = {Remediating Giacomo Leopardi's Zibaldone: Hypertextual Semantic Networks in the Scholarly Archive},
+  booktitle  = {Proceedings of the Third {AIUCD} Annual Conference on Humanities and Their Methods in the Digital Ecosystem},
+  series     = {{AIUCD} '14},
+  pages      = {9:1--9:8},
+  publisher  = {{ACM}},
+  abstract   = {The project of remediating Giacomo Leopardi's Zibaldone addresses the manuscript's hypertextual dimension of cross-references between related passages and their allocation to thematic indexes, which Leopardi wrote with the intention to mediate his research notes into scholarly publications. The project objective is to actualize the author's design for harvesting the Zibaldone's intra-textual semantic networks and reconstruct its inter-textual bibliographic networks by building a digital research platform, which would enable users to comprehensively mine the text's structural complexity. The {XML} encoding in {TEI} P5 allows to process the Zibaldone in custom-selected layers of its encoded elements for the exploration of their interrelations through statistical charts, histograms, network visualizations. In its future development, the platform would expand to an interactive space, where users could add their own annotations to the text and contribute to the site's editorial apparatus. The project has been a collaboration between Princeton University and the Trier Center for Digital Humanities, and its website is currently hosted at http://zibaldone.princeton.edu.},
+  date       = {2015},
+  doi        = {10.1145/2802612.2802634},
+  isbn       = {978-1-4503-3295-8},
+  keywords   = {fragmentary genre, Giacomo Leopardi, hypertext, note-taking, scholarly digital editions, semantic networks, Zibaldone},
+  location   = {New York, {NY}, {USA}},
+  shorttitle = {Remediating Giacomo Leopardi's Zibaldone},
+  url        = {http://doi.acm.org/10.1145/2802612.2802634},
+  urldate    = {2016-10-17},
+}
+
+@Article{Rowan2016,
+  author     = {Rowan, Kyle Edward},
+  title      = {Not Quite a Sunset: a hypertext opera},
+  date       = {2016},
+  shorttitle = {Not Quite a Sunset},
+  url        = {http://escholarship.org/uc/item/9830g5pn.pdf},
+  urldate    = {2016-10-17},
+}
+
+@Article{Janez2016,
+  author       = {Jáñez, Álvaro and Rosales, Javier},
+  title        = {Novices' need for exploration: Effects of goal specificity on hypertext navigation and comprehension},
+  volume       = {60},
+  pages        = {121--130},
+  date         = {2016},
+  journaltitle = {Computers in Human Behavior},
+  shorttitle   = {Novices' need for exploration},
+  url          = {http://www.sciencedirect.com/science/article/pii/S0747563216301169},
+  urldate      = {2016-10-17},
+}
+
+@Book{Bernstein2016,
+  title     = {Getting Started With Hypertext Narrative},
+  publisher = {Eastgate Systems, Inc},
+  author    = {Bernstein, Mark},
+  date      = {2016},
+}
+
+@Article{Shang2016,
+  author       = {Shang, Hui-Fang},
+  title        = {Online metacognitive strategies, hypermedia annotations, and motivation on hypertext comprehension},
+  volume       = {19},
+  number       = {3},
+  pages        = {321--334},
+  date         = {2016},
+  file         = {[PDF] ifets.info:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/992U6NNG/Shang - 2016 - Online metacognitive strategies, hypermedia annota.pdf:application/pdf},
+  journaltitle = {Educational Technology \& Society},
+  url          = {http://www.jstor.org/stable/pdf/jeductechsoci.19.3.321.pdf},
+  urldate      = {2016-10-17},
+}
+
+@Article{Li2016,
+  author       = {Li, Liang-Yi and Tseng, Shu-Ting and Chen, Gwo-Dong},
+  title        = {Effect of hypertext highlighting on browsing, reading, and navigational performance},
+  volume       = {54},
+  pages        = {318--325},
+  date         = {2016},
+  journaltitle = {Computers in Human Behavior},
+  url          = {http://www.sciencedirect.com/science/article/pii/S074756321530090X},
+  urldate      = {2016-10-17},
+}
+
+@Article{Blustein2016,
+  author       = {Blustein, Jamie and Herder, Eelco and Rubart, Jessica and Ashman, Helen},
+  title        = {27 th {ACM} International Conference on Hypertext and Social Media},
+  pages        = {1},
+  date         = {2016},
+  issue        = {Winter},
+  journaltitle = {{ACM} {SIGWEB} Newsletter},
+  url          = {http://dl.acm.org/citation.cfm?id=2857660},
+  urldate      = {2016-10-17},
+}
+
+@Article{Blustein2016a,
+  author       = {Blustein, James and Graff, Ann-Barbara},
+  title        = {6 alt. hypertext: An Early Social Medium},
+  pages        = {119},
+  date         = {2016},
+  journaltitle = {Social Media Archeology and Poetics},
+  shorttitle   = {6 alt. hypertext},
+  url          = {https://books.google.com/books?hl=en&lr=&id=dPjdDAAAQBAJ&oi=fnd&pg=PA119&dq=hypertext&ots=fEESfFDhtn&sig=ygSkDRTvC9QETpNnVxJM4Ay-L9s},
+  urldate      = {2016-10-17},
+}
+
+@Article{Shang2016a,
+  author       = {Shang, Hui-Fang},
+  title        = {Exploring demographic and motivational factors associated with hypertext reading by English as a foreign language ({EFL}) students},
+  volume       = {35},
+  number       = {7},
+  pages        = {559--571},
+  date         = {2016},
+  journaltitle = {Behaviour \& Information Technology},
+  url          = {http://www.tandfonline.com/doi/abs/10.1080/0144929X.2015.1094827},
+  urldate      = {2016-10-17},
+}
+
+@Article{Hargood2016,
+  author  = {Hargood, Charlie and Hunt, Verity and Weal, Mark and Millard, David},
+  title   = {Patterns of sculptural hypertext in location based narratives},
+  date    = {2016},
+  file    = {[PDF] soton.ac.uk:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/NSARWFGB/Hargood et al. - 2016 - Patterns of sculptural hypertext in location based.pdf:application/pdf},
+  url     = {http://eprints.soton.ac.uk/390748/},
+  urldate = {2016-10-17},
+}
+
+@Article{Conradty2016,
+  author       = {Conradty, Cathérine and Bogner, Franz X.},
+  title        = {Hypertext or Textbook: Effects on Motivation and Gain in Knowledge},
+  volume       = {6},
+  number       = {3},
+  pages        = {29},
+  date         = {2016},
+  journaltitle = {Education Sciences},
+  shorttitle   = {Hypertext or Textbook},
+  url          = {http://www.mdpi.com/2227-7102/6/3/29/htm},
+  urldate      = {2016-10-17},
+}
+
+@Thesis{Fitzpatrick2016,
+  author  = {Fitzpatrick, Philip J.},
+  title   = {Applied Hypertext Theory in a Demonstration of a Non-Sequential Audio Narrative},
+  date    = {2016},
+  type    = {phdthesis},
+  url     = {https://suny-dspace.longsight.com/handle/1951/66527},
+  urldate = {2016-10-17},
+}
+
+@Article{Finnemann2016,
+  author       = {Finnemann, Niels Ole},
+  title        = {Hypertext configurations: Genres in networked digital media},
+  date         = {2016},
+  file         = {[DOC] ku.dk:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/DSGTA9J3/Finnemann - 2016 - Hypertext configurations Genres in networked digi.doc:application/msword},
+  journaltitle = {Journal of the Association for Information Science and Technology},
+  shorttitle   = {Hypertext configurations},
+  url          = {http://onlinelibrary.wiley.com/doi/10.1002/asi.23709/full},
+  urldate      = {2016-10-17},
+}
+
+@Article{Atkinson2016,
+  author       = {Atkinson, Paul},
+  title        = {Digital ethnographies},
+  volume       = {16},
+  number       = {2},
+  pages        = {236--241},
+  date         = {2016},
+  journaltitle = {Qualitative Research},
+  url          = {http://qrj.sagepub.com/content/16/2/236.short},
+  urldate      = {2016-10-17},
+}
+
+@Article{Bakshi2016,
+  author       = {Bakshi, Divya},
+  title        = {Hypertext and Feminisms: Voicing the Silence (d)},
+  volume       = {3},
+  number       = {3},
+  date         = {2016},
+  journaltitle = {Anglisticum Journal},
+  shorttitle   = {Hypertext and Feminisms},
+  url          = {http://anglisticum.mk/index.php/Anglisticum/article/view/625},
+  urldate      = {2016-10-17},
+}
+
+@InCollection{Maier2016,
+  author    = {Maier, Carmen Daniela},
+  title     = {Hypertext and Hypermedia},
+  booktitle = {International Encyclopedia of Mass Media and Society},
+  publisher = {: {SAGE} Publications},
+  date      = {2016},
+  url       = {http://www.forskningsdatabasen.dk/en/catalog/2261443119},
+  urldate   = {2016-10-17},
+}
+
+@Article{Suresh2016a,
+  author       = {Suresh, Mayur},
+  title        = {The file as hypertext},
+  pages        = {97},
+  date         = {2016},
+  journaltitle = {Law, Memory, Violence: Uncovering the Counter-Archive},
+  url          = {https://books.google.com/books?hl=en&lr=&id=TmmaCwAAQBAJ&oi=fnd&pg=PA97&dq=hypertext&ots=nzLjpgq0h2&sig=jzOnpGgDes0pcu_Cx0P9zYU4Kxs},
+  urldate      = {2016-10-17},
+}
+
+@Thesis{Rafiq2008,
+  author      = {Rafiq, Omar},
+  title       = {Improving the Accessibility of {TiddlyWiki}},
+  date        = {2008},
+  institution = {University of Leeds, School of Computer Studies},
+  type        = {phdthesis},
+}
+
+@Thesis{Lauw2008,
+  author      = {Lauw, Madelaine L.},
+  title       = {{TiddlyGraph}: Graph Drawing Tool for {TiddlyWiki}},
+  date        = {2008},
+  institution = {University of Leeds, School of Computer Studies},
+  shorttitle  = {{TiddlyGraph}},
+  type        = {phdthesis},
+}
+
+@Thesis{Rutherford2009,
+  author      = {Rutherford, Jayne},
+  title       = {Graphical Input for {TiddlyWiki}},
+  date        = {2009},
+  institution = {University of Leeds, School of Computer Studies},
+  type        = {phdthesis},
+}
+
+@Thesis{Rafiq2008a,
+  author      = {Rafiq, Omar},
+  title       = {Improving the Accessibility of {TiddlyWiki}},
+  date        = {2008},
+  institution = {University of Leeds, School of Computer Studies},
+  type        = {phdthesis},
+}
+
+@Thesis{Lauw2008a,
+  author      = {Lauw, Madelaine L.},
+  title       = {{TiddlyGraph}: Graph Drawing Tool for {TiddlyWiki}},
+  date        = {2008},
+  institution = {University of Leeds, School of Computer Studies},
+  shorttitle  = {{TiddlyGraph}},
+  type        = {phdthesis},
+}
+
+@Article{TRUNG,
+  author  = {{TRUNG}, {DANG} {DINH}},
+  title   = {{TiddlyWiki} client and server modification for scholarly digital libraries},
+  url     = {http://wing.comp.nus.edu.sg/publications/theses/2008/dangDinhTrungDang_HYP.pdf},
+  urldate = {2016-10-17},
+}
+
+@Thesis{Rutherford2009a,
+  author      = {Rutherford, Jayne},
+  title       = {Graphical Input for {TiddlyWiki}},
+  date        = {2009},
+  institution = {University of Leeds, School of Computer Studies},
+  type        = {phdthesis},
+}
+
+@Article{Bakoa,
+  author  = {Bakó, Mária and Aszalós, László},
+  title   = {Learning environments in {eBook} format},
+  file    = {[PDF] icvl.eu:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/3X4IZ2DH/Bakó and Aszalós - Learning environments in eBook format.pdf:application/pdf},
+  url     = {http://www.icvl.eu/2011/disc/structura/icvl/documente/pdf/tech/ICVL_Technologies_paper08.pdf},
+  urldate = {2016-10-17},
+}
+
+@InProceedings{Solis2009,
+  author    = {Solís, Carlos and Ali, Nour and Babar, Muhammad Ali},
+  title     = {A spatial hypertext wiki for architectural knowledge management},
+  booktitle = {Wikis for Software Engineering, 2009. {WIKIS}4SE'09. {ICSE} Workshop on},
+  pages     = {36--46},
+  publisher = {{IEEE}},
+  date      = {2009},
+  file      = {[PDF] ul.ie:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/7X4QZPUT/Solís et al. - 2009 - A spatial hypertext wiki for architectural knowled.pdf:application/pdf},
+  url       = {http://ieeexplore.ieee.org/xpls/abs_all.jsp?arnumber=5069995},
+  urldate   = {2016-10-17},
+}
+
+@InCollection{Burry2005b,
+  author    = {Burry, Jane and Burrow, Andrew and Amor, Robert and Burry, Mark},
+  title     = {Shared design space},
+  booktitle = {Computer Aided Architectural Design Futures 2005},
+  publisher = {Springer},
+  pages     = {217--226},
+  date      = {2005},
+  file      = {[PDF] architexturez.net:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/A223SNFN/Burry et al. - 2005 - Shared design space.pdf:application/pdf},
+  url       = {http://link.springer.com/chapter/10.1007/1-4020-3698-1_20},
+  urldate   = {2016-10-17},
+}
+
+@Article{Jipsen2006b,
+  author       = {Jipsen, Peter},
+  title        = {{ASciencePad}–a {TiddlyWiki} suitable for scientific notes},
+  date         = {2006},
+  journaltitle = {Accessed via http://math. chapman. edu/∼ jipsen/asciencepad/asciencepad. html (7 January 2007)},
+}
+
+@Book{Bagnoli2006b,
+  title     = {Tiddlywiki in science education},
+  publisher = {{ITHET}},
+  author    = {Bagnoli, Franco and Jipsen, Peter and Sterbini, Andrea},
+  date      = {2006},
+  url       = {http://www.academia.edu/download/44779373/TiddlyWiki_in_Science_Education20160415-24634-dvo6mu.pdf},
+  urldate   = {2016-10-17},
+}
+
+@InProceedings{Yang2008b,
+  author    = {Yang, Chia-Han and Wu, Ming-Ying and Lin, Chien-Min and Yang, Don-Lin},
+  title     = {Implementation of Wiki-based knowledge management systems for small research groups},
+  booktitle = {2008 Eighth International Conference on Intelligent Systems Design and Applications},
+  volume    = {2},
+  pages     = {346--349},
+  publisher = {{IEEE}},
+  date      = {2008},
+  file      = {[PDF] mirlabs.net:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/EVE2GP2R/Yang et al. - 2008 - Implementation of Wiki-based knowledge management .pdf:application/pdf},
+  url       = {http://ieeexplore.ieee.org/xpls/abs_all.jsp?arnumber=4696356},
+  urldate   = {2016-10-17},
+}
+
+@Book{Ruston2004a,
+  title  = {{TiddlyWiki}},
+  author = {Ruston, Jeremy},
+  date   = {2004},
+}
+
+@Article{Gobbo2006b,
+  author       = {Gobbo, Federico and Lanzarone, Gaetano Aurelio},
+  title        = {A wiki-based active learning system; how to enhance learning material in epistemology of computer science and computer ethics},
+  date         = {2006},
+  file         = {[PDF] researchgate.net:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/A5SIBRAA/Gobbo and Lanzarone - 2006 - A wiki-based active learning system\; how to enhanc.pdf:application/pdf},
+  journaltitle = {Current Developments in Technology-Assisted Education},
+  url          = {https://www.researchgate.net/profile/Federico_Gobbo/publication/216111828_A_wiki-based_active_learning_system_how_to_enhance_learning_material_in_epistemology_of_computer_science_and_computer_ethics/links/09e4150a67b1073482000000.pdf},
+  urldate      = {2016-10-17},
+}
+
+@Article{Kopchok2008b,
+  author       = {Kopchok, Katie},
+  title        = {Interlibrary loan the Wiki way: an effective and free interlibrary loan procedures and communications tool},
+  volume       = {18},
+  number       = {1},
+  pages        = {67--77},
+  date         = {2008},
+  journaltitle = {Journal of Interlibrary Loan, Document Delivery \& Electronic Reserve},
+  shorttitle   = {Interlibrary loan the Wiki way},
+  url          = {http://www.tandfonline.com/doi/abs/10.1300/J474v18n01_08},
+  urldate      = {2016-10-17},
+}
+
+@InProceedings{Dang2008b,
+  author    = {Dang, Dinh-Trung and Tan, Yee Fan and Kan, Min-Yen},
+  title     = {Towards a Webpage-based bibliographic manager},
+  booktitle = {International Conference on Asian Digital Libraries},
+  pages     = {313--316},
+  publisher = {Springer},
+  date      = {2008},
+  file      = {[PDF] nus.edu.sg:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/X466UZP3/Dang et al. - 2008 - Towards a Webpage-based bibliographic manager.pdf:application/pdf},
+  url       = {http://link.springer.com/chapter/10.1007/978-3-540-89533-6_33},
+  urldate   = {2016-10-17},
+}
+
+@InProceedings{Barker2008e,
+  author    = {Barker, P. G.},
+  title     = {Using Wikis for Knowledge Management},
+  booktitle = {Proceedings of the {ED}-{MEDIA} 2008 World Conference on Educational Multimedia, Hypermedia and Telecommunications},
+  pages     = {3604--3613},
+  date      = {2008},
+  url       = {https://www.editlib.org/p/28886/proceeding_28886.pdf},
+  urldate   = {2016-10-17},
+}
+
+@InProceedings{Marchese2009b,
+  author    = {Marchese, Francis T.},
+  title     = {Asynchronous collaborative visualization on a stick},
+  booktitle = {Proceedings of Vis 2009 (Atlantic City, {NJ}), Conference {DVD}},
+  publisher = {{IEEE} Computer Society Washington, {DC}},
+  date      = {2009},
+  file      = {[PDF] researchgate.net:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/ZM78BHSJ/Marchese - 2009 - Asynchronous collaborative visualization on a stic.pdf:application/pdf},
+  url       = {https://www.researchgate.net/profile/Francis_Marchese/publication/228366401_Asynchronous_Collaborative_Visualization_on_a_Stick/links/09e4150c32bfec2345000000.pdf},
+  urldate   = {2016-10-17},
+}
+
+@Book{DeCiccio2007b,
+  title      = {Developing a Flexible Information Repository: A Case Study Using {TiddlyWiki} for a Knowledge Management System},
+  publisher  = {{ProQuest}},
+  author     = {{DeCiccio}, Michael},
+  date       = {2007},
+  shorttitle = {Developing a Flexible Information Repository},
+}
+
+@Book{Wilson2007d,
+  title     = {{TiddlyWiki} 2.1. 3.},
+  publisher = {{UNIV} {SHEFFIELD} {DEPT} {INFORMATION} {STUDIES} {UNIV} {SHEFFIELD}, {WESTERN} {BANK}, {SHEFFIELD} S10 2TN, S {YORKS}, {ENGLAND}},
+  author    = {Wilson, T. D.},
+  volume    = {12},
+  number    = {3},
+  date      = {2007},
+}
+
+@Thesis{Rafiq2008b,
+  author      = {Rafiq, Omar},
+  title       = {Improving the Accessibility of {TiddlyWiki}},
+  date        = {2008},
+  institution = {University of Leeds, School of Computer Studies},
+  type        = {phdthesis},
+}
+
+@Thesis{Lauw2008b,
+  author      = {Lauw, Madelaine L.},
+  title       = {{TiddlyGraph}: Graph Drawing Tool for {TiddlyWiki}},
+  date        = {2008},
+  institution = {University of Leeds, School of Computer Studies},
+  shorttitle  = {{TiddlyGraph}},
+  type        = {phdthesis},
+}
+
+@Article{Wilson2007e,
+  author       = {Wilson, Tom D.},
+  title        = {Review of: {TiddlyWiki} 2.1. 3. Osmosoft. com, 2007},
+  volume       = {12},
+  number       = {3},
+  pages        = {review--no},
+  date         = {2007},
+  journaltitle = {Information research},
+  shorttitle   = {Review of},
+  url          = {http://www.diva-portal.org/smash/record.jsf?pid=diva2:870314},
+  urldate      = {2016-10-17},
+}
+
+@Thesis{Rutherford2009b,
+  author      = {Rutherford, Jayne},
+  title       = {Graphical Input for {TiddlyWiki}},
+  date        = {2009},
+  institution = {University of Leeds, School of Computer Studies},
+  type        = {phdthesis},
+}
+
+@InProceedings{Montaner2013b,
+  author     = {Montaner, David and Garcıa-Garcıa, Francisco},
+  title      = {{TiddlyWikiR}: an R package for dynamic report writing.},
+  booktitle  = {The R User Conference, {useR}! 2013 July 10-12 2013 University of Castilla-La Mancha, Albacete, Spain},
+  volume     = {10},
+  pages      = {126},
+  date       = {2013},
+  shorttitle = {{TiddlyWikiR}},
+  url        = {https://www.researchgate.net/profile/Selcuk_Korkmaz/publication/273333674_bbRVM_an_R_package_for_Ensemble_Classification_Approaches_of_Relevance_Vector_Machines/links/54fed6cf0cf2741b69f1787b.pdf#page=126},
+  urldate    = {2016-10-17},
+}
+
+@InProceedings{Dickinson2008b,
+  author    = {Dickinson, Anne},
+  title     = {Is the e-Learning Object “Create Interactive Accessible e-Learning” Accessible?},
+  booktitle = {Proceedings of the 3rd International Conference on e-Learning: {ICEL}},
+  pages     = {133},
+  publisher = {Academic Conferences Limited},
+  date      = {2008},
+}
+
+@Article{Palmer2009,
+  author        = {Palmer, Joy},
+  title         = {Archives 2.0: if we build it, will they come?},
+  number        = {60},
+  __markedentry = {[steve:]},
+  date          = {2009},
+  journaltitle  = {Ariadne},
+  shorttitle    = {Archives 2.0},
+  url           = {http://www.ariadne.ac.uk/issue60/palmer},
+  urldate       = {2016-10-17},
+}
+
+@Article{Grannum2011,
+  author        = {Grannum, Guy and Theimer, Kate},
+  title         = {Harnessing User Knowledge: The National Archives Your Archives Wiki},
+  pages         = {116--127},
+  __markedentry = {[steve:]},
+  date          = {2011},
+  journaltitle  = {A Different Kind of Web: New Connections Between Archives and Our Users},
+  shorttitle    = {Harnessing User Knowledge},
+}
+
+@Article{Frumkin2005,
+  author        = {Frumkin, Jeremy},
+  title         = {The wiki and the digital library},
+  volume        = {21},
+  number        = {1},
+  pages         = {18--22},
+  __markedentry = {[steve:]},
+  date          = {2005},
+  journaltitle  = {{OCLC} Systems \& Services: International digital library perspectives},
+  url           = {http://www.emeraldinsight.com/doi/full/10.1108/10650750510578109},
+  urldate       = {2016-10-17},
+}
+
+@Article{Flinn2010,
+  author        = {Flinn, Andrew},
+  title         = {Independent Community Archives and Community-Generated Content ‘Writing, Saving and Sharing our Histories’},
+  volume        = {16},
+  number        = {1},
+  pages         = {39--51},
+  __markedentry = {[steve:]},
+  date          = {2010},
+  journaltitle  = {Convergence: The International Journal of Research into New Media Technologies},
+  url           = {http://con.sagepub.com/content/16/1/39.short},
+  urldate       = {2016-10-17},
+}
+
+@Article{Wagner2004,
+  author        = {Wagner, Christian},
+  title         = {Wiki: A technology for conversational knowledge management and group collaboration},
+  volume        = {13},
+  number        = {1},
+  pages         = {58},
+  __markedentry = {[steve:]},
+  date          = {2004},
+  file          = {[PDF] hksyu.edu:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/C7TZN8FR/Wagner - 2004 - Wiki A technology for conversational knowledge ma.pdf:application/pdf},
+  journaltitle  = {The Communications of the Association for Information Systems},
+  shorttitle    = {Wiki},
+  url           = {http://aisel.aisnet.org/cgi/viewcontent.cgi?article=3238&context=cais},
+  urldate       = {2016-10-17},
+}
+
+@InProceedings{Munteanu2006,
+  author        = {Munteanu, Cosmin and Zhang, Yuecheng and Baecker, Ron and Penn, Gerald},
+  title         = {Wiki-like editing of imperfect computer-generated webcast transcripts},
+  booktitle     = {Proc. Demo track of {ACM} Conf. on Computer Supported Cooperative Work–{CSCW}},
+  pages         = {83--84},
+  publisher     = {Citeseer},
+  __markedentry = {[steve:]},
+  date          = {2006},
+  file          = {[PDF] psu.edu:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/I22V3CTX/Munteanu et al. - 2006 - Wiki-like editing of imperfect computer-generated .pdf:application/pdf},
+  url           = {http://citeseerx.ist.psu.edu/viewdoc/download?doi=10.1.1.129.3559&rep=rep1&type=pdf},
+  urldate       = {2016-10-17},
+}
+
+@Article{Unit2010,
+  author        = {Unit, Economist Intelligence},
+  title         = {Democracy index 2010},
+  __markedentry = {[steve:]},
+  date          = {2010},
+  url           = {http://ictlogy.net/bibliography/reports/projects.php?idp=1853},
+  urldate       = {2016-10-17},
+}
+
+@Article{Cunningham2002,
+  author        = {Cunningham, Ward and {others}},
+  title         = {What is wiki},
+  __markedentry = {[steve:]},
+  date          = {2002},
+  journaltitle  = {{WikiWikiWeb}. http://www. wiki. org/wiki. cgi},
+}
+
+@Article{Regli2010,
+  author        = {Regli, William C. and Kopena, Joseph B. and Grauer, Michael and Simpson, Timothy W. and Stone, Robert B. and Lewis, Kemper and Bohm, Matt R. and Wilkie, David and Piecyk, Martin and Osecki, Jordan},
+  title         = {Semantics for digital engineering archives supporting engineering design education},
+  volume        = {31},
+  number        = {1},
+  pages         = {37--50},
+  __markedentry = {[steve:]},
+  date          = {2010},
+  file          = {[PDF] aaai.org:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/5K858ZWC/Regli et al. - 2010 - Semantics for digital engineering archives support.pdf:application/pdf},
+  journaltitle  = {{AI} Magazine},
+  url           = {http://www.aaai.org/ojs/index.php/aimagazine/article/viewArticle/2282},
+  urldate       = {2016-10-17},
+}
+
+@Article{Harris2004,
+  author        = {Harris, Roger W.},
+  title         = {Information and communication technologies for poverty alleviation},
+  __markedentry = {[steve:]},
+  date          = {2004},
+  url           = {http://ictlogy.net/bibliography/reports/projects.php?idp=1271},
+  urldate       = {2016-10-17},
+}
+
+@Article{Wiki1996,
+  author        = {Wiki, {ASIS}{\textbackslash}\&T-{ESC}},
+  title         = {Information literacy},
+  __markedentry = {[steve:]},
+  date          = {1996},
+  url           = {https://www.asis.org/Chapters/Student/esc/?tag=information-literacy},
+  urldate       = {2016-10-17},
+}
+
+@Article{Parker2007,
+  author        = {Parker, Kevin R. and Chao, Joseph T.},
+  title         = {Wiki as a teaching tool},
+  volume        = {3},
+  number        = {1},
+  pages         = {57--72},
+  __markedentry = {[steve:]},
+  date          = {2007},
+  file          = {[PDF] wikieducator.org:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/NBDH2ICS/Parker and Chao - 2007 - Wiki as a teaching tool.pdf:application/pdf},
+  journaltitle  = {Interdisciplinary journal of knowledge and learning objects},
+  url           = {http://wikieducator.org/images/5/58/Wikiasateachingtool.pdf},
+  urldate       = {2016-10-17},
+}
+
+@Article{Haddad2002,
+  author        = {Haddad, Wadi D. and Draxler, Alexandra},
+  title         = {Technologies for Education: Potential, Parameters, and Prospects},
+  __markedentry = {[steve:]},
+  date          = {2002},
+  shorttitle    = {Technologies for Education},
+  url           = {http://ictlogy.net/bibliography/reports/projects.php?idp=515},
+  urldate       = {2016-10-17},
+}
+
+@Article{Desilets2005,
+  author        = {Désilets, Alain and Paquet, Sébastien},
+  title         = {Wiki as a tool for web-based collaborative story telling in primary school: A case study},
+  __markedentry = {[steve:]},
+  date          = {2005},
+  shorttitle    = {Wiki as a tool for web-based collaborative story telling in primary school},
+  url           = {http://nparc.cisti-icist.nrc-cnrc.gc.ca/npsi/ctrl?action=rtdoc&an=8913987},
+  urldate       = {2016-10-17},
+}
+
+@Article{Giles2007,
+  author        = {Giles, Jim},
+  title         = {Key biology databases go wiki},
+  volume        = {445},
+  number        = {7129},
+  pages         = {691--691},
+  __markedentry = {[steve:]},
+  date          = {2007},
+  journaltitle  = {Nature},
+  url           = {http://www.nature.com/nature/journal/v445/n7129/full/445691a.html},
+  urldate       = {2016-10-17},
+}
+
+@Article{Kennedy2009,
+  author        = {Kennedy, Gregor and Dalgarno, Barney and Bennett, Sue and Gray, Kathleen and Waycott, Jenny and Judd, Terry and Bishop, Andrea and Maton, Karl and Krause, Kerri-Lee and Chang, Rosemary},
+  title         = {Educating the net generation. A handbook of findings for practice and policy},
+  __markedentry = {[steve:]},
+  date          = {2009},
+  url           = {http://ictlogy.net/bibliography/reports/projects.php?idp=1450},
+  urldate       = {2016-10-17},
+}
+
+@Article{Sciadas2005,
+  author        = {Sciadas, George},
+  title         = {From the digital divide to digital opportunities},
+  __markedentry = {[steve:]},
+  date          = {2005},
+  url           = {http://ictlogy.net/bibliography/reports/projects.php?idp=239},
+  urldate       = {2016-10-17},
+}
+
+@Book{Web2000,
+  title         = {Wiki Web},
+  author        = {Web, Wiki and {DE}, {WIKIPEDI} and {JPG}, {WIKI}},
+  __markedentry = {[steve:]},
+  date          = {2000},
+}
+
+@Article{Varfolomeyev2012,
+  author        = {Varfolomeyev, Aleksey and Ivanovs, Aleksandrs},
+  title         = {Wiki Technologies for Semantic Publication of Old Russian Charters},
+  pages         = {405--407},
+  __markedentry = {[steve:]},
+  date          = {2012},
+  journaltitle  = {Digital Humanities},
+  url           = {http://www.dh2012.uni-hamburg.de/conference/programme/abstracts/wiki-technologies-for-semantic-publication-of-old-russian-charters.1.html},
+  urldate       = {2016-10-17},
+}
+
+@InProceedings{Buffa2006,
+  author        = {Buffa, Michel and Gandon, Fabien},
+  title         = {{SweetWiki}: semantic web enabled technologies in Wiki},
+  booktitle     = {Proceedings of the 2006 international symposium on Wikis},
+  pages         = {69--78},
+  publisher     = {{ACM}},
+  __markedentry = {[steve:]},
+  date          = {2006},
+  file          = {[PDF] inria.fr:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/KFGFBGWE/Buffa and Gandon - 2006 - SweetWiki semantic web enabled technologies in Wi.pdf:application/pdf},
+  shorttitle    = {{SweetWiki}},
+  url           = {http://dl.acm.org/citation.cfm?id=1149469},
+  urldate       = {2016-10-17},
+}
+
+@InProceedings{Barker2008,
+  author    = {Barker, Philip},
+  title     = {Using wikis and weblogs to enhance human performance},
+  booktitle = {Proceedings of World Conference on E-Learning in Corporate, Government, Healthcare, and Higher Education},
+  pages     = {581--589},
+  date      = {2008},
+  url       = {https://www.editlib.org/index.cfm/files/paper_29665.pdf?fuseaction=Reader.DownloadFullText&paper_id=29665},
+  urldate   = {2016-10-17},
+}
+
+@InProceedings{Burry2005,
+  author    = {Burry, Jane and Burrow, Andrew and Amor, Robert and Burry, Mark},
+  title     = {Shared design space. The contribution of augmented wiki hypertext to design collaboration.},
+  booktitle = {{CAAD} Futures 2005},
+  publisher = {Springer},
+  date      = {2005},
+  url       = {https://researchbank.rmit.edu.au/view/rmit:1820},
+  urldate   = {2016-10-17},
+}
+
+@InProceedings{Notari2006,
+  author     = {Notari, Michele},
+  title      = {How to use a Wiki in education:'Wiki based effective constructive learning'},
+  booktitle  = {Proceedings of the 2006 international symposium on Wikis},
+  pages      = {131--132},
+  publisher  = {{ACM}},
+  date       = {2006},
+  file       = {[PDF] drake.edu:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/9D8KADJZ/Notari - 2006 - How to use a Wiki in education'Wiki based effecti.pdf:application/pdf},
+  shorttitle = {How to use a Wiki in education},
+  url        = {http://dl.acm.org/citation.cfm?id=1149479},
+  urldate    = {2016-10-17},
+}
+
+@InProceedings{Burrow2004,
+  author     = {Burrow, Andrew Lincoln},
+  title      = {Negotiating access within Wiki: a system to construct and maintain a taxonomy of access rules},
+  booktitle  = {Proceedings of the fifteenth {ACM} conference on Hypertext and hypermedia},
+  pages      = {77--86},
+  publisher  = {{ACM}},
+  date       = {2004},
+  shorttitle = {Negotiating access within Wiki},
+  url        = {http://dl.acm.org/citation.cfm?id=1012831},
+  urldate    = {2016-10-17},
+}
+
+@InProceedings{Solis2010,
+  author    = {Solis, Carlos and Ali, Nour},
+  title     = {Distributed requirements elicitation using a spatial hypertext wiki},
+  booktitle = {2010 5th {IEEE} International Conference on Global Software Engineering},
+  pages     = {237--246},
+  publisher = {{IEEE}},
+  date      = {2010},
+  file      = {[PDF] ul.ie:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/FR2DGIKF/Solis and Ali - 2010 - Distributed requirements elicitation using a spati.pdf:application/pdf},
+  url       = {http://ieeexplore.ieee.org/xpls/abs_all.jsp?arnumber=5581514},
+  urldate   = {2016-10-17},
+}
+
+@InProceedings{Solis2008,
+  author    = {Solís, Carlos and Ali, Nour},
+  title     = {{ShyWiki}-a spatial hypertext wiki},
+  booktitle = {Proceedings of the 4th International Symposium on Wikis},
+  pages     = {10},
+  publisher = {{ACM}},
+  date      = {2008},
+  file      = {[PDF] psu.edu:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/ZR4GMI8R/Solís and Ali - 2008 - ShyWiki-a spatial hypertext wiki.pdf:application/pdf},
+  url       = {http://dl.acm.org/citation.cfm?id=1822272},
+  urldate   = {2016-10-17},
+}
+
+@Article{Sauer2005,
+  author       = {Sauer, Igor M. and Bialek, Dominik and Efimova, Ekaterina and Schwartlander, Ruth and Pless, Gesine and Neuhaus, Peter},
+  title        = {“Blogs” and “wikis” are valuable software tools for communication within research groups},
+  volume       = {29},
+  number       = {1},
+  pages        = {82--83},
+  date         = {2005},
+  journaltitle = {Artificial organs},
+  url          = {http://onlinelibrary.wiley.com/doi/10.1111/j.1525-1594.2004.29005.x/full},
+  urldate      = {2016-10-17},
+}
+
+@Article{TREnTIn2009,
+  author       = {{TREnTIn}, Guglielmo},
+  title        = {Using a wiki to evaluate individual contribution to a collaborative learning project},
+  volume       = {25},
+  number       = {1},
+  pages        = {43--55},
+  date         = {2009},
+  file         = {[PDF] semanticscholar.org:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/IF24EBKI/TREnTIn - 2009 - Using a wiki to evaluate individual contribution t.pdf:application/pdf},
+  journaltitle = {Journal of computer assisted learning},
+  url          = {http://onlinelibrary.wiley.com/doi/10.1111/j.1365-2729.2008.00276.x/full},
+  urldate      = {2016-10-17},
+}
+
+@Article{Skiba2005,
+  author       = {Skiba, Diane J.},
+  title        = {Do your students wiki?},
+  volume       = {26},
+  number       = {2},
+  pages        = {120},
+  date         = {2005},
+  journaltitle = {Nursing education perspectives},
+  url          = {http://search.proquest.com/openview/460686aff56fe55ba2bc3cd9a3fc27aa/1?pq-origsite=gscholar},
+  urldate      = {2016-10-17},
+}
+
+@InProceedings{Millard2006,
+  author     = {Millard, David E. and Ross, Martin},
+  title      = {Web 2.0: hypertext by any other name?},
+  booktitle  = {Proceedings of the seventeenth conference on Hypertext and hypermedia},
+  pages      = {27--30},
+  publisher  = {{ACM}},
+  date       = {2006},
+  file       = {[PDF] soton.ac.uk:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/ZGXUB4IM/Millard and Ross - 2006 - Web 2.0 hypertext by any other name.pdf:application/pdf},
+  shorttitle = {Web 2.0},
+  url        = {http://dl.acm.org/citation.cfm?id=1149947},
+  urldate    = {2016-10-17},
+}
+
+@InProceedings{Aronsson2002,
+  author    = {Aronsson, Lars},
+  title     = {Operation of a Large Scale, General Purpose Wiki Website.},
+  booktitle = {Elpub},
+  date      = {2002},
+  file      = {[PDF] architexturez.net:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/4VUK34H6/Aronsson - 2002 - Operation of a Large Scale, General Purpose Wiki W.pdf:application/pdf},
+  url       = {http://elpub.architexturez.net/system/files/pdf/02-03.content_0.pdf},
+  urldate   = {2016-10-17},
+}
+
+@InProceedings{Solis2010a,
+  author    = {Solis, Carlos and Ali, Nour},
+  title     = {A spatial hypertext wiki for knowledge management},
+  booktitle = {Collaborative Technologies and Systems ({CTS}), 2010 International Symposium on},
+  pages     = {225--234},
+  publisher = {{IEEE}},
+  date      = {2010},
+  file      = {[PDF] ul.ie:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/6B2BWZ6F/Solis and Ali - 2010 - A spatial hypertext wiki for knowledge management.pdf:application/pdf},
+  url       = {http://ieeexplore.ieee.org/xpls/abs_all.jsp?arnumber=5478505},
+  urldate   = {2016-10-17},
+}
+
+@InProceedings{Morris2007,
+  author     = {Morris, Joseph C.},
+  title      = {{DistriWiki}:: a distributed peer-to-peer wiki network},
+  booktitle  = {Proceedings of the 2007 international symposium on Wikis},
+  pages      = {69--74},
+  publisher  = {{ACM}},
+  date       = {2007},
+  file       = {[PDF] psu.edu:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/5P2FCHHM/Morris - 2007 - DistriWiki a distributed peer-to-peer wiki netwo.pdf:application/pdf},
+  shorttitle = {{DistriWiki}},
+  url        = {http://dl.acm.org/citation.cfm?id=1296959},
+  urldate    = {2016-10-17},
+}
+
+@InProceedings{Solis2011,
+  author    = {Solis, Carlos and Ali, Nour},
+  title     = {An experience using a spatial hypertext Wiki},
+  booktitle = {Proceedings of the 22nd {ACM} conference on Hypertext and hypermedia},
+  pages     = {133--142},
+  publisher = {{ACM}},
+  date      = {2011},
+  file      = {[PDF] ul.ie:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/G2FJIIVS/Solis and Ali - 2011 - An experience using a spatial hypertext Wiki.pdf:application/pdf},
+  url       = {http://dl.acm.org/citation.cfm?id=1995986},
+  urldate   = {2016-10-17},
+}
+
+@InProceedings{Zhang2006,
+  author     = {Zhang, Yuejiao},
+  title      = {Wiki means more: hyperreading in Wikipedia},
+  booktitle  = {Proceedings of the seventeenth conference on Hypertext and hypermedia},
+  pages      = {23--26},
+  publisher  = {{ACM}},
+  date       = {2006},
+  shorttitle = {Wiki means more},
+  url        = {http://dl.acm.org/citation.cfm?id=1149946},
+  urldate    = {2016-10-17},
+}
+
+@Article{Solis2011a,
+  author       = {Solis, Carlos and Ali, Nour},
+  title        = {A Semantic Wiki Based on Spatial Hypertext.},
+  volume       = {17},
+  number       = {7},
+  pages        = {1043--1059},
+  date         = {2011},
+  file         = {[PDF] brighton.ac.uk:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/QATARD72/Solis and Ali - 2011 - A Semantic Wiki Based on Spatial Hypertext..pdf:application/pdf},
+  journaltitle = {J. {UCS}},
+  url          = {http://jucs.org/jucs_17_7/a_semantic_wiki_based/jucs_17_07_1043_1059_solis.pdf},
+  urldate      = {2016-10-17},
+}
+
+@InProceedings{Schaffert2006,
+  author     = {Schaffert, Sebastian},
+  title      = {{IkeWiki}: A semantic wiki for collaborative knowledge management},
+  booktitle  = {15th {IEEE} International Workshops on Enabling Technologies: Infrastructure for Collaborative Enterprises ({WETICE}'06)},
+  pages      = {388--396},
+  publisher  = {{IEEE}},
+  date       = {2006},
+  file       = {[PDF] psu.edu:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/AGSE8WEV/Schaffert - 2006 - IkeWiki A semantic wiki for collaborative knowled.pdf:application/pdf},
+  shorttitle = {{IkeWiki}},
+  url        = {http://ieeexplore.ieee.org/xpls/abs_all.jsp?arnumber=4092241},
+  urldate    = {2016-10-17},
+}
+
+@InProceedings{Cunningham2006,
+  author     = {Cunningham, Ward},
+  title      = {Design Principles of Wiki: How can so little do so much?},
+  booktitle  = {Int. Sym. Wikis},
+  pages      = {13--14},
+  date       = {2006},
+  shorttitle = {Design Principles of Wiki},
+  url        = {https://pdfs.semanticscholar.org/2713/89a35bb3c98101d65dd70ba79c3b188615c5.pdf},
+  urldate    = {2016-10-17},
+}
+
+@Article{Nixon2006,
+  author       = {Nixon, Lyndon {JB} and Simperl, Elena Paslaru Bontas},
+  title        = {Makna and {MultiMakna}: towards semantic and multimedia capability in wikis for the emerging web},
+  volume       = {2006},
+  date         = {2006},
+  journaltitle = {Proc. Semantics},
+  shorttitle   = {Makna and {MultiMakna}},
+  url          = {http://www.academia.edu/download/1909725/4quz0v7pkwwyigy.pdf},
+  urldate      = {2016-10-17},
+}
+
+@Article{Truman2016,
+  author        = {Truman, Gail},
+  title         = {Web Archiving Environmental Scan},
+  __markedentry = {[steve:6]},
+  abstract      = {Version of Record},
+  date          = {2016},
+  file          = {Full Text PDF:/Users/steve/Library/Application Support/Firefox/Profiles/7uhyoij2.default/zotero/storage/PADARME2/Truman - 2016 - Web Archiving Environmental Scan.pdf:application/pdf},
+  langid        = {american},
+  owner         = {steve},
+  rights        = {open},
+  timestamp     = {2016-10-18},
+  url           = {https://dash.harvard.edu/handle/1/25658314},
+  urldate       = {2016-10-18},
+}
+
diff --git a/plugins/tiddlywiki/bibtex/samples/tiddlywiki.files b/plugins/tiddlywiki/bibtex/samples/tiddlywiki.files
new file mode 100644
index 000000000..cff7acd09
--- /dev/null
+++ b/plugins/tiddlywiki/bibtex/samples/tiddlywiki.files
@@ -0,0 +1,3 @@
+{
+	"tiddlers": []
+}
\ No newline at end of file
diff --git a/plugins/tiddlywiki/blog/templates/html-page/page.tid b/plugins/tiddlywiki/blog/templates/html-page/page.tid
index 78a2ee3c8..4aab9653e 100644
--- a/plugins/tiddlywiki/blog/templates/html-page/page.tid
+++ b/plugins/tiddlywiki/blog/templates/html-page/page.tid
@@ -13,10 +13,11 @@ title: $:/plugins/tiddlywiki/blog/templates/html-page/page
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <meta name="apple-mobile-web-app-capable" content="yes" />
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
+<meta name="mobile-web-app-capable" content="yes"/>
 <meta name="format-detection" content="telephone=no">
 <link id="faviconLink" rel="shortcut icon" href="favicon.ico">
 <link rel="stylesheet" href="static.css">
-<title>`<$view field="caption"><$view field="title"/></$view>: {{$:/core/wiki/title}}`</title>
+<title>`<$transclude field="caption"><$view field="title"/></$transclude>: {{$:/core/wiki/title}}`</title>
 </head>
 <body class="tc-body">
 `{{$:/StaticBanner||$:/core/templates/html-tiddler}}`
diff --git a/plugins/tiddlywiki/blog/templates/html-page/post.tid b/plugins/tiddlywiki/blog/templates/html-page/post.tid
index 913fe7d2e..b4d631f82 100644
--- a/plugins/tiddlywiki/blog/templates/html-page/post.tid
+++ b/plugins/tiddlywiki/blog/templates/html-page/post.tid
@@ -13,10 +13,11 @@ title: $:/plugins/tiddlywiki/blog/templates/html-page/post
 <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 <meta name="apple-mobile-web-app-capable" content="yes" />
 <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
+<meta name="mobile-web-app-capable" content="yes"/>
 <meta name="format-detection" content="telephone=no">
 <link id="faviconLink" rel="shortcut icon" href="../favicon.ico">
 <link rel="stylesheet" href="../static.css">
-<title>`<$view field="caption"><$view field="title"/></$view>: {{$:/core/wiki/title}}`</title>
+<title>`<$transclude field="caption"><$view field="title"/></$transclude>: {{$:/core/wiki/title}}`</title>
 </head>
 <body class="tc-body">
 `{{$:/StaticBanner||$:/core/templates/html-tiddler}}`
diff --git a/plugins/tiddlywiki/codemirror/EditorTypeMappings.multids b/plugins/tiddlywiki/codemirror/EditorTypeMappings.multids
old mode 100644
new mode 100755
index 1579da613..c3bbcd35d
--- a/plugins/tiddlywiki/codemirror/EditorTypeMappings.multids
+++ b/plugins/tiddlywiki/codemirror/EditorTypeMappings.multids
@@ -7,4 +7,5 @@ text/css: codemirror
 text/html: codemirror
 text/plain: codemirror
 text/vnd.tiddlywiki: codemirror
+text/x-markdown: codemirror
 text/x-tiddlywiki: codemirror
diff --git a/plugins/tiddlywiki/codemirror/config.tid b/plugins/tiddlywiki/codemirror/config.tid
new file mode 100755
index 000000000..03e2a73f7
--- /dev/null
+++ b/plugins/tiddlywiki/codemirror/config.tid
@@ -0,0 +1,25 @@
+title: $:/config/CodeMirror
+type: application/json
+
+{
+  "require": [
+      "$:/plugins/tiddlywiki/codemirror/addon/dialog/dialog.js",
+      "$:/plugins/tiddlywiki/codemirror/addon/search/searchcursor.js",
+      "$:/plugins/tiddlywiki/codemirror/addon/edit/matchbrackets.js",
+      "$:/plugins/tiddlywiki/codemirror/addon/mode/multiplex.js",
+      "$:/plugins/tiddlywiki/codemirror/mode/css/css.js",
+      "$:/plugins/tiddlywiki/codemirror/mode/htmlembedded/htmlembedded.js",
+      "$:/plugins/tiddlywiki/codemirror/mode/htmlmixed/htmlmixed.js",
+      "$:/plugins/tiddlywiki/codemirror/mode/javascript/javascript.js",
+      "$:/plugins/tiddlywiki/codemirror/mode/markdown/markdown.js",
+      "$:/plugins/tiddlywiki/codemirror/mode/meta.js",
+      "$:/plugins/tiddlywiki/codemirror/mode/tiddlywiki/tiddlywiki.js",
+      "$:/plugins/tiddlywiki/codemirror/mode/xml/xml.js",
+      "$:/plugins/tiddlywiki/codemirror/keymap/vim.js",
+      "$:/plugins/tiddlywiki/codemirror/keymap/emacs.js"
+  ],
+  "configuration": {
+      "matchBrackets": true,
+      "showCursorWhenSelecting": true
+  }
+}
\ No newline at end of file
diff --git a/plugins/tiddlywiki/codemirror/edit-codemirror.js b/plugins/tiddlywiki/codemirror/edit-codemirror.js
old mode 100644
new mode 100755
index 5d40c165a..a8e79928d
--- a/plugins/tiddlywiki/codemirror/edit-codemirror.js
+++ b/plugins/tiddlywiki/codemirror/edit-codemirror.js
@@ -1,22 +1,9 @@
 /*\
-title: $:/core/modules/widgets/edit-codemirror.js
+title: $:/plugins/tiddlywiki/codemirror/edit-codemirror.js
 type: application/javascript
 module-type: widget
 
-Codemirror-based text editor widget
-
-Config options "$:/config/CodeMirror" e.g. to allow vim key bindings
- {
-	"require": [
-		"$:/plugins/tiddlywiki/codemirror/addon/dialog/dialog.js",
-		"$:/plugins/tiddlywiki/codemirror/addon/search/searchcursor.js",
-		"$:/plugins/tiddlywiki/codemirror/keymap/vim.js"
-	],
-	"configuration": {
-			"keyMap": "vim",
-			"showCursorWhenSelecting": true
-	}
-}
+Edit-codemirror widget
 
 \*/
 (function(){
@@ -25,188 +12,9 @@ Config options "$:/config/CodeMirror" e.g. to allow vim key bindings
 /*global $tw: false */
 "use strict";
 
-var CODEMIRROR_OPTIONS = "$:/config/CodeMirror";
+var editTextWidgetFactory = require("$:/core/modules/editor/factory.js").editTextWidgetFactory,
+	CodeMirrorEngine = require("$:/plugins/tiddlywiki/codemirror/engine.js").CodeMirrorEngine;
 
-// Install CodeMirror
-if($tw.browser && !window.CodeMirror) {
-	window.CodeMirror = require("$:/plugins/tiddlywiki/codemirror/lib/codemirror.js");
-	// Install required CodeMirror plugins
-	var configOptions = $tw.wiki.getTiddlerData(CODEMIRROR_OPTIONS,{}),
-		req = configOptions.require;
-	if(req) {
-		if($tw.utils.isArray(req)) {
-			for(var index=0; index<req.length; index++) {
-				require(req[index]);
-			}
-		} else {
-			require(req);
-		}
-	}
-}
-
-var MIN_TEXT_AREA_HEIGHT = 100; // Minimum height of textareas in pixels
-
-var Widget = require("$:/core/modules/widgets/widget.js").widget;
-
-var EditCodeMirrorWidget = function(parseTreeNode,options) {
-	this.initialise(parseTreeNode,options);
-};
-
-/*
-Inherit from the base widget class
-*/
-EditCodeMirrorWidget.prototype = new Widget();
-
-/*
-Render this widget into the DOM
-*/
-EditCodeMirrorWidget.prototype.render = function(parent,nextSibling) {
-	var self = this;
-	// Save the parent dom node
-	this.parentDomNode = parent;
-	// Compute our attributes
-	this.computeAttributes();
-	// Execute our logic
-	this.execute();
-	// Get the configuration options for the CodeMirror object
-	var config = $tw.wiki.getTiddlerData(CODEMIRROR_OPTIONS,{}).configuration || {},
-		editInfo = this.getEditInfo();
-	if(!("lineWrapping" in config)) {
-		config.lineWrapping = true;
-	}
-	if(!("lineNumbers" in config)) {
-		config.lineNumbers = true;
-	}
-	config.mode = editInfo.type;
-	config.value = editInfo.value;
-	// Create the CodeMirror instance
-	var cm = window.CodeMirror(function(domNode) {
-		parent.insertBefore(domNode,nextSibling);
-		self.domNodes.push(domNode);
-	},config);
-	// Set up a change event handler
-	cm.on("change",function() {
-		self.saveChanges(cm.getValue());
-	});
-	this.codeMirrorInstance = cm;
-};
-
-/*
-Get the tiddler being edited and current value
-*/
-EditCodeMirrorWidget.prototype.getEditInfo = function() {
-	// Get the edit value
-	var self = this,
-		value,
-		type = "text/plain",
-		update;
-	if(this.editIndex) {
-		value = this.wiki.extractTiddlerDataItem(this.editTitle,this.editIndex,this.editDefault);
-		update = function(value) {
-			var data = self.wiki.getTiddlerData(self.editTitle,{});
-			if(data[self.editIndex] !== value) {
-				data[self.editIndex] = value;
-				self.wiki.setTiddlerData(self.editTitle,data);
-			}
-		};
-	} else {
-		// Get the current tiddler and the field name
-		var tiddler = this.wiki.getTiddler(this.editTitle);
-		if(tiddler) {
-			// If we've got a tiddler, the value to display is the field string value
-			value = tiddler.getFieldString(this.editField);
-			if(this.editField === "text") {
-				type = tiddler.fields.type || "text/vnd.tiddlywiki";
-			}
-		} else {
-			// Otherwise, we need to construct a default value for the editor
-			switch(this.editField) {
-				case "text":
-					value = "Type the text for the tiddler '" + this.editTitle + "'";
-					type = "text/vnd.tiddlywiki";
-					break;
-				case "title":
-					value = this.editTitle;
-					break;
-				default:
-					value = "";
-					break;
-			}
-			if(this.editDefault !== undefined) {
-				value = this.editDefault;
-			}
-		}
-		update = function(value) {
-			var tiddler = self.wiki.getTiddler(self.editTitle),
-				updateFields = {
-					title: self.editTitle
-				};
-			updateFields[self.editField] = value;
-			self.wiki.addTiddler(new $tw.Tiddler(self.wiki.getCreationFields(),tiddler,updateFields,self.wiki.getModificationFields()));
-		};
-	}
-	if(this.editType) {
-		type = this.editType;
-	}
-	return {value: value || "", type: type, update: update};
-};
-
-/*
-Compute the internal state of the widget
-*/
-EditCodeMirrorWidget.prototype.execute = function() {
-	// Get our parameters
-	this.editTitle = this.getAttribute("tiddler",this.getVariable("currentTiddler"));
-	this.editField = this.getAttribute("field","text");
-	this.editIndex = this.getAttribute("index");
-	this.editDefault = this.getAttribute("default");
-	this.editType = this.getAttribute("type");
-};
-
-/*
-Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering
-*/
-EditCodeMirrorWidget.prototype.refresh = function(changedTiddlers) {
-	var changedAttributes = this.computeAttributes();
-	// Completely rerender if any of our attributes have changed
-	if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index) {
-		this.refreshSelf();
-		return true;
-	} else if(changedTiddlers[this.editTitle]) {
-		var editInfo = this.getEditInfo();
-		this.updateEditor(editInfo.value,editInfo.type);
-		return true;
-	}
-	return false;
-};
-
-/*
-Update the editor with new text and type. This method is separate from updateEditorDomNode()
-so that subclasses can override updateEditor() and still use updateEditorDomNode()
-*/
-EditCodeMirrorWidget.prototype.updateEditor = function(text,type) {
-	this.updateEditorDomNode(text);
-	this.codeMirrorInstance.setOption("mode",type);
-};
-
-/*
-Update the editor dom node with new text
-*/
-EditCodeMirrorWidget.prototype.updateEditorDomNode = function(text) {
-	if(this.codeMirrorInstance) {
-		if(!this.codeMirrorInstance.hasFocus()) {
-			this.codeMirrorInstance.setValue(text);
-		}
-	}
-};
-
-EditCodeMirrorWidget.prototype.saveChanges = function(text) {
-	var editInfo = this.getEditInfo();
-	if(text !== editInfo.value) {
-		editInfo.update(text);
-	}
-};
-
-exports["edit-codemirror"] = EditCodeMirrorWidget;
+exports["edit-codemirror"] = editTextWidgetFactory(CodeMirrorEngine,CodeMirrorEngine);
 
 })();
diff --git a/plugins/tiddlywiki/codemirror/engine.js b/plugins/tiddlywiki/codemirror/engine.js
new file mode 100755
index 000000000..bec85f5d5
--- /dev/null
+++ b/plugins/tiddlywiki/codemirror/engine.js
@@ -0,0 +1,157 @@
+/*\
+title: $:/plugins/tiddlywiki/codemirror/engine.js
+type: application/javascript
+module-type: library
+
+Text editor engine based on a CodeMirror instance
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+var CODEMIRROR_OPTIONS = "$:/config/CodeMirror",
+	HEIGHT_VALUE_TITLE = "$:/config/TextEditor/EditorHeight/Height"
+
+// Install CodeMirror
+if($tw.browser && !window.CodeMirror) {
+	window.CodeMirror = require("$:/plugins/tiddlywiki/codemirror/lib/codemirror.js");
+	// Install required CodeMirror plugins
+	var configOptions = $tw.wiki.getTiddlerData(CODEMIRROR_OPTIONS,{}),
+		req = configOptions.require;
+	if(req) {
+		if($tw.utils.isArray(req)) {
+			for(var index=0; index<req.length; index++) {
+				require(req[index]);
+			}
+		} else {
+			require(req);
+		}
+	}
+}
+
+function CodeMirrorEngine(options) {
+	// Save our options
+	var self = this;
+	options = options || {};
+	this.widget = options.widget;
+	this.value = options.value;
+	this.parentNode = options.parentNode;
+	this.nextSibling = options.nextSibling;
+	// Create the wrapper DIV
+	this.domNode = this.widget.document.createElement("div");
+	if(this.widget.editClass) {
+		this.domNode.className = this.widget.editClass;
+	}
+	this.domNode.style.display = "inline-block";
+	this.parentNode.insertBefore(this.domNode,this.nextSibling);
+	this.widget.domNodes.push(this.domNode);
+	// Get the configuration options for the CodeMirror object
+	var config = $tw.wiki.getTiddlerData(CODEMIRROR_OPTIONS,{}).configuration || {};
+	if(!("lineWrapping" in config)) {
+		config.lineWrapping = true;
+	}
+	if(!("lineNumbers" in config)) {
+		config.lineNumbers = true;
+	}
+	config.mode = options.type;
+	config.value = options.value;
+	// Create the CodeMirror instance
+	this.cm = window.CodeMirror(function(cmDomNode) {
+		// Note that this is a synchronous callback that is called before the constructor returns
+		self.domNode.appendChild(cmDomNode);
+	},config);
+	// Set up a change event handler
+	this.cm.on("change",function() {
+		self.widget.saveChanges(self.getText());
+	});
+	this.cm.on("drop",function(cm,event) {
+		event.stopPropagation(); // Otherwise TW's dropzone widget sees the drop event
+		return false;
+	});
+	this.cm.on("keydown",function(cm,event) {
+		return self.widget.handleKeydownEvent.call(self.widget,event);
+	});
+}
+
+/*
+Set the text of the engine if it doesn't currently have focus
+*/
+CodeMirrorEngine.prototype.setText = function(text,type) {
+	this.cm.setOption("mode",type);
+	if(!this.cm.hasFocus()) {
+		this.cm.setValue(text);
+	}
+};
+
+/*
+Get the text of the engine
+*/
+CodeMirrorEngine.prototype.getText = function() {
+	return this.cm.getValue();
+};
+
+/*
+Fix the height of textarea to fit content
+*/
+CodeMirrorEngine.prototype.fixHeight = function() {
+	if(this.widget.editAutoHeight) {
+		// Resize to fit
+		this.cm.setSize(null,null);
+	} else {
+		var fixedHeight = parseInt(this.widget.wiki.getTiddlerText(HEIGHT_VALUE_TITLE,"400px"),10);
+		fixedHeight = Math.max(fixedHeight,20);
+		this.cm.setSize(null,fixedHeight);
+	}
+};
+
+/*
+Focus the engine node
+*/
+CodeMirrorEngine.prototype.focus  = function() {
+	this.cm.focus();
+}
+
+/*
+Create a blank structure representing a text operation
+*/
+CodeMirrorEngine.prototype.createTextOperation = function() {
+	var selections = this.cm.listSelections();
+	if(selections.length > 0) {
+		var anchorPos = this.cm.indexFromPos(selections[0].anchor),
+			headPos = this.cm.indexFromPos(selections[0].head);
+	}
+	var operation = {
+		text: this.cm.getValue(),
+		selStart: Math.min(anchorPos,headPos),
+		selEnd: Math.max(anchorPos,headPos),
+		cutStart: null,
+		cutEnd: null,
+		replacement: null,
+		newSelStart: null,
+		newSelEnd: null
+	};
+	operation.selection = operation.text.substring(operation.selStart,operation.selEnd);
+	return operation;
+};
+
+/*
+Execute a text operation
+*/
+CodeMirrorEngine.prototype.executeTextOperation = function(operation) {
+	// Perform the required changes to the text area and the underlying tiddler
+	var newText = operation.text;
+	if(operation.replacement !== null) {
+		this.cm.replaceRange(operation.replacement,this.cm.posFromIndex(operation.cutStart),this.cm.posFromIndex(operation.cutEnd));
+		this.cm.setSelection(this.cm.posFromIndex(operation.newSelStart),this.cm.posFromIndex(operation.newSelEnd));
+		newText = operation.text.substring(0,operation.cutStart) + operation.replacement + operation.text.substring(operation.cutEnd);
+	}
+	this.cm.focus();
+	return newText;
+};
+
+exports.CodeMirrorEngine = CodeMirrorEngine;
+
+})();
diff --git a/plugins/tiddlywiki/codemirror/files/addon/dialog/dialog.css b/plugins/tiddlywiki/codemirror/files/addon/dialog/dialog.css
old mode 100644
new mode 100755
index 2e7c0fc9b..677c07838
--- a/plugins/tiddlywiki/codemirror/files/addon/dialog/dialog.css
+++ b/plugins/tiddlywiki/codemirror/files/addon/dialog/dialog.css
@@ -1,11 +1,11 @@
 .CodeMirror-dialog {
   position: absolute;
   left: 0; right: 0;
-  background: white;
+  background: inherit;
   z-index: 15;
   padding: .1em .8em;
   overflow: hidden;
-  color: #333;
+  color: inherit;
 }
 
 .CodeMirror-dialog-top {
diff --git a/plugins/tiddlywiki/codemirror/files/addon/dialog/dialog.js b/plugins/tiddlywiki/codemirror/files/addon/dialog/dialog.js
old mode 100644
new mode 100755
index 586b7370d..f10bb5bf1
--- a/plugins/tiddlywiki/codemirror/files/addon/dialog/dialog.js
+++ b/plugins/tiddlywiki/codemirror/files/addon/dialog/dialog.js
@@ -1,3 +1,6 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 // Open simple dialogs on top of an editor. Relies on dialog.css.
 
 (function(mod) {
@@ -12,11 +15,11 @@
     var wrap = cm.getWrapperElement();
     var dialog;
     dialog = wrap.appendChild(document.createElement("div"));
-    if (bottom) {
+    if (bottom)
       dialog.className = "CodeMirror-dialog CodeMirror-dialog-bottom";
-    } else {
+    else
       dialog.className = "CodeMirror-dialog CodeMirror-dialog-top";
-    }
+
     if (typeof template == "string") {
       dialog.innerHTML = template;
     } else { // Assuming it's a detached DOM element.
@@ -32,40 +35,61 @@
   }
 
   CodeMirror.defineExtension("openDialog", function(template, callback, options) {
+    if (!options) options = {};
+
     closeNotification(this, null);
-    var dialog = dialogDiv(this, template, options && options.bottom);
+
+    var dialog = dialogDiv(this, template, options.bottom);
     var closed = false, me = this;
-    function close() {
-      if (closed) return;
-      closed = true;
-      dialog.parentNode.removeChild(dialog);
+    function close(newVal) {
+      if (typeof newVal == 'string') {
+        inp.value = newVal;
+      } else {
+        if (closed) return;
+        closed = true;
+        dialog.parentNode.removeChild(dialog);
+        me.focus();
+
+        if (options.onClose) options.onClose(dialog);
+      }
     }
+
     var inp = dialog.getElementsByTagName("input")[0], button;
     if (inp) {
-      if (options && options.value) inp.value = options.value;
+      inp.focus();
+
+      if (options.value) {
+        inp.value = options.value;
+        if (options.selectValueOnOpen !== false) {
+          inp.select();
+        }
+      }
+
+      if (options.onInput)
+        CodeMirror.on(inp, "input", function(e) { options.onInput(e, inp.value, close);});
+      if (options.onKeyUp)
+        CodeMirror.on(inp, "keyup", function(e) {options.onKeyUp(e, inp.value, close);});
+
       CodeMirror.on(inp, "keydown", function(e) {
         if (options && options.onKeyDown && options.onKeyDown(e, inp.value, close)) { return; }
-        if (e.keyCode == 13 || e.keyCode == 27) {
+        if (e.keyCode == 27 || (options.closeOnEnter !== false && e.keyCode == 13)) {
           inp.blur();
           CodeMirror.e_stop(e);
           close();
-          me.focus();
-          if (e.keyCode == 13) callback(inp.value);
         }
+        if (e.keyCode == 13) callback(inp.value, e);
       });
-      if (options && options.onKeyUp) {
-        CodeMirror.on(inp, "keyup", function(e) {options.onKeyUp(e, inp.value, close);});
-      }
-      if (options && options.value) inp.value = options.value;
-      inp.focus();
-      CodeMirror.on(inp, "blur", close);
+
+      if (options.closeOnBlur !== false) CodeMirror.on(inp, "blur", close);
     } else if (button = dialog.getElementsByTagName("button")[0]) {
       CodeMirror.on(button, "click", function() {
         close();
         me.focus();
       });
+
+      if (options.closeOnBlur !== false) CodeMirror.on(button, "blur", close);
+
       button.focus();
-      CodeMirror.on(button, "blur", close);
     }
     return close;
   });
@@ -110,8 +134,8 @@
   CodeMirror.defineExtension("openNotification", function(template, options) {
     closeNotification(this, close);
     var dialog = dialogDiv(this, template, options && options.bottom);
-    var duration = options && (options.duration === undefined ? 5000 : options.duration);
     var closed = false, doneTimer;
+    var duration = options && typeof options.duration !== "undefined" ? options.duration : 5000;
 
     function close() {
       if (closed) return;
@@ -124,7 +148,10 @@
       CodeMirror.e_preventDefault(e);
       close();
     });
+
     if (duration)
-      doneTimer = setTimeout(close, options.duration);
+      doneTimer = setTimeout(close, duration);
+
+    return close;
   });
 });
diff --git a/plugins/tiddlywiki/codemirror/files/addon/edit/matchbrackets.js b/plugins/tiddlywiki/codemirror/files/addon/edit/matchbrackets.js
old mode 100644
new mode 100755
index dcdde81df..70e1ae18c
--- a/plugins/tiddlywiki/codemirror/files/addon/edit/matchbrackets.js
+++ b/plugins/tiddlywiki/codemirror/files/addon/edit/matchbrackets.js
@@ -1,3 +1,6 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
     mod(require("../../lib/codemirror"));
@@ -78,7 +81,7 @@
     if (marks.length) {
       // Kludge to work around the IE bug from issue #1193, where text
       // input stops going to the textare whever this fires.
-      if (ie_lt8 && cm.state.focused) cm.display.input.focus();
+      if (ie_lt8 && cm.state.focused) cm.focus();
 
       var clear = function() {
         cm.operation(function() {
diff --git a/plugins/tiddlywiki/codemirror/files/addon/mode/multiplex.js b/plugins/tiddlywiki/codemirror/files/addon/mode/multiplex.js
new file mode 100755
index 000000000..3d8b34c45
--- /dev/null
+++ b/plugins/tiddlywiki/codemirror/files/addon/mode/multiplex.js
@@ -0,0 +1,123 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.multiplexingMode = function(outer /*, others */) {
+  // Others should be {open, close, mode [, delimStyle] [, innerStyle]} objects
+  var others = Array.prototype.slice.call(arguments, 1);
+
+  function indexOf(string, pattern, from, returnEnd) {
+    if (typeof pattern == "string") {
+      var found = string.indexOf(pattern, from);
+      return returnEnd && found > -1 ? found + pattern.length : found;
+    }
+    var m = pattern.exec(from ? string.slice(from) : string);
+    return m ? m.index + from + (returnEnd ? m[0].length : 0) : -1;
+  }
+
+  return {
+    startState: function() {
+      return {
+        outer: CodeMirror.startState(outer),
+        innerActive: null,
+        inner: null
+      };
+    },
+
+    copyState: function(state) {
+      return {
+        outer: CodeMirror.copyState(outer, state.outer),
+        innerActive: state.innerActive,
+        inner: state.innerActive && CodeMirror.copyState(state.innerActive.mode, state.inner)
+      };
+    },
+
+    token: function(stream, state) {
+      if (!state.innerActive) {
+        var cutOff = Infinity, oldContent = stream.string;
+        for (var i = 0; i < others.length; ++i) {
+          var other = others[i];
+          var found = indexOf(oldContent, other.open, stream.pos);
+          if (found == stream.pos) {
+            if (!other.parseDelimiters) stream.match(other.open);
+            state.innerActive = other;
+            state.inner = CodeMirror.startState(other.mode, outer.indent ? outer.indent(state.outer, "") : 0);
+            return other.delimStyle && (other.delimStyle + " " + other.delimStyle + "-open");
+          } else if (found != -1 && found < cutOff) {
+            cutOff = found;
+          }
+        }
+        if (cutOff != Infinity) stream.string = oldContent.slice(0, cutOff);
+        var outerToken = outer.token(stream, state.outer);
+        if (cutOff != Infinity) stream.string = oldContent;
+        return outerToken;
+      } else {
+        var curInner = state.innerActive, oldContent = stream.string;
+        if (!curInner.close && stream.sol()) {
+          state.innerActive = state.inner = null;
+          return this.token(stream, state);
+        }
+        var found = curInner.close ? indexOf(oldContent, curInner.close, stream.pos, curInner.parseDelimiters) : -1;
+        if (found == stream.pos && !curInner.parseDelimiters) {
+          stream.match(curInner.close);
+          state.innerActive = state.inner = null;
+          return curInner.delimStyle && (curInner.delimStyle + " " + curInner.delimStyle + "-close");
+        }
+        if (found > -1) stream.string = oldContent.slice(0, found);
+        var innerToken = curInner.mode.token(stream, state.inner);
+        if (found > -1) stream.string = oldContent;
+
+        if (found == stream.pos && curInner.parseDelimiters)
+          state.innerActive = state.inner = null;
+
+        if (curInner.innerStyle) {
+          if (innerToken) innerToken = innerToken + " " + curInner.innerStyle;
+          else innerToken = curInner.innerStyle;
+        }
+
+        return innerToken;
+      }
+    },
+
+    indent: function(state, textAfter) {
+      var mode = state.innerActive ? state.innerActive.mode : outer;
+      if (!mode.indent) return CodeMirror.Pass;
+      return mode.indent(state.innerActive ? state.inner : state.outer, textAfter);
+    },
+
+    blankLine: function(state) {
+      var mode = state.innerActive ? state.innerActive.mode : outer;
+      if (mode.blankLine) {
+        mode.blankLine(state.innerActive ? state.inner : state.outer);
+      }
+      if (!state.innerActive) {
+        for (var i = 0; i < others.length; ++i) {
+          var other = others[i];
+          if (other.open === "\n") {
+            state.innerActive = other;
+            state.inner = CodeMirror.startState(other.mode, mode.indent ? mode.indent(state.outer, "") : 0);
+          }
+        }
+      } else if (state.innerActive.close === "\n") {
+        state.innerActive = state.inner = null;
+      }
+    },
+
+    electricChars: outer.electricChars,
+
+    innerMode: function(state) {
+      return state.inner ? {state: state.inner, mode: state.innerActive.mode} : {state: state.outer, mode: outer};
+    }
+  };
+};
+
+});
diff --git a/plugins/tiddlywiki/codemirror/files/addon/search/searchcursor.js b/plugins/tiddlywiki/codemirror/files/addon/search/searchcursor.js
old mode 100644
new mode 100755
index 899f44c4a..b70242ee4
--- a/plugins/tiddlywiki/codemirror/files/addon/search/searchcursor.js
+++ b/plugins/tiddlywiki/codemirror/files/addon/search/searchcursor.js
@@ -1,3 +1,6 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
     mod(require("../../lib/codemirror"));
@@ -104,7 +107,7 @@
             var from = Pos(pos.line, cut);
             for (var ln = pos.line + 1, i = 1; i < last; ++i, ++ln)
               if (target[i] != fold(doc.getLine(ln))) return;
-            if (doc.getLine(ln).slice(0, origTarget[last].length) != target[last]) return;
+            if (fold(doc.getLine(ln).slice(0, origTarget[last].length)) != target[last]) return;
             return {from: from, to: Pos(ln, origTarget[last].length)};
           }
         };
@@ -145,10 +148,10 @@
     from: function() {if (this.atOccurrence) return this.pos.from;},
     to: function() {if (this.atOccurrence) return this.pos.to;},
 
-    replace: function(newText) {
+    replace: function(newText, origin) {
       if (!this.atOccurrence) return;
       var lines = CodeMirror.splitLines(newText);
-      this.doc.replaceRange(lines, this.pos.from, this.pos.to);
+      this.doc.replaceRange(lines, this.pos.from, this.pos.to, origin);
       this.pos.to = Pos(this.pos.from.line + lines.length - 1,
                         lines[lines.length - 1].length + (lines.length == 1 ? this.pos.from.ch : 0));
     }
@@ -174,9 +177,9 @@
   });
 
   CodeMirror.defineExtension("selectMatches", function(query, caseFold) {
-    var ranges = [], next;
+    var ranges = [];
     var cur = this.getSearchCursor(query, this.getCursor("from"), caseFold);
-    while (next = cur.findNext()) {
+    while (cur.findNext()) {
       if (CodeMirror.cmpPos(cur.to(), this.getCursor("to")) > 0) break;
       ranges.push({anchor: cur.from(), head: cur.to()});
     }
diff --git a/plugins/tiddlywiki/codemirror/files/codemirror.css b/plugins/tiddlywiki/codemirror/files/codemirror.css
old mode 100644
new mode 100755
index 098a317a2..1cf66a9fa
--- a/plugins/tiddlywiki/codemirror/files/codemirror.css
+++ b/plugins/tiddlywiki/codemirror/files/codemirror.css
@@ -4,10 +4,7 @@
   /* Set height, width, borders, and global font properties here */
   font-family: monospace;
   height: 300px;
-}
-.CodeMirror-scroll {
-  /* Set scrolling behaviour here */
-  overflow: auto;
+  color: black;
 }
 
 /* PADDING */
@@ -36,28 +33,60 @@
   min-width: 20px;
   text-align: right;
   color: #999;
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
+  white-space: nowrap;
 }
 
+.CodeMirror-guttermarker { color: black; }
+.CodeMirror-guttermarker-subtle { color: #999; }
+
 /* CURSOR */
 
-.CodeMirror div.CodeMirror-cursor {
+.CodeMirror-cursor {
   border-left: 1px solid black;
+  border-right: none;
+  width: 0;
 }
 /* Shown when moving in bi-directional text */
 .CodeMirror div.CodeMirror-secondarycursor {
   border-left: 1px solid silver;
 }
-.CodeMirror.cm-keymap-fat-cursor div.CodeMirror-cursor {
+.cm-fat-cursor .CodeMirror-cursor {
   width: auto;
   border: 0;
   background: #7e7;
 }
-/* Can style cursor different in overwrite (non-insert) mode */
-div.CodeMirror-overwrite div.CodeMirror-cursor {}
+.cm-fat-cursor div.CodeMirror-cursors {
+  z-index: 1;
+}
 
-.cm-tab { display: inline-block; }
+.cm-animate-fat-cursor {
+  width: auto;
+  border: 0;
+  -webkit-animation: blink 1.06s steps(1) infinite;
+  -moz-animation: blink 1.06s steps(1) infinite;
+  animation: blink 1.06s steps(1) infinite;
+  background-color: #7e7;
+}
+@-moz-keyframes blink {
+  0% {}
+  50% { background-color: transparent; }
+  100% {}
+}
+@-webkit-keyframes blink {
+  0% {}
+  50% { background-color: transparent; }
+  100% {}
+}
+@keyframes blink {
+  0% {}
+  50% { background-color: transparent; }
+  100% {}
+}
+
+/* Can style cursor different in overwrite (non-insert) mode */
+.CodeMirror-overwrite .CodeMirror-cursor {}
+
+.cm-tab { display: inline-block; text-decoration: inherit; }
 
 .CodeMirror-ruler {
   border-left: 1px solid #ccc;
@@ -66,6 +95,15 @@ div.CodeMirror-overwrite div.CodeMirror-cursor {}
 
 /* DEFAULT THEME */
 
+.cm-s-default .cm-header {color: blue;}
+.cm-s-default .cm-quote {color: #090;}
+.cm-negative {color: #d44;}
+.cm-positive {color: #292;}
+.cm-header, .cm-strong {font-weight: bold;}
+.cm-em {font-style: italic;}
+.cm-link {text-decoration: underline;}
+.cm-strikethrough {text-decoration: line-through;}
+
 .cm-s-default .cm-keyword {color: #708;}
 .cm-s-default .cm-atom {color: #219;}
 .cm-s-default .cm-number {color: #164;}
@@ -85,22 +123,19 @@ div.CodeMirror-overwrite div.CodeMirror-cursor {}
 .cm-s-default .cm-bracket {color: #997;}
 .cm-s-default .cm-tag {color: #170;}
 .cm-s-default .cm-attribute {color: #00c;}
-.cm-s-default .cm-header {color: blue;}
-.cm-s-default .cm-quote {color: #090;}
 .cm-s-default .cm-hr {color: #999;}
 .cm-s-default .cm-link {color: #00c;}
 
-.cm-negative {color: #d44;}
-.cm-positive {color: #292;}
-.cm-header, .cm-strong {font-weight: bold;}
-.cm-em {font-style: italic;}
-.cm-link {text-decoration: underline;}
-
 .cm-s-default .cm-error {color: #f00;}
 .cm-invalidchar {color: #f00;}
 
+.CodeMirror-composing { border-bottom: 2px solid; }
+
+/* Default styles for common addons */
+
 div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
 div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
+.CodeMirror-matchingtag { background: rgba(255, 150, 0, .3); }
 .CodeMirror-activeline-background {background: #e8f2ff;}
 
 /* STOP */
@@ -109,14 +144,13 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
    the editor. You probably shouldn't touch them. */
 
 .CodeMirror {
-  line-height: 1;
   position: relative;
   overflow: hidden;
   background: white;
-  color: black;
 }
 
 .CodeMirror-scroll {
+  overflow: scroll !important; /* Things will break if this is overridden */
   /* 30px is the magic margin used to hide the element's real scrollbars */
   /* See overflow: hidden in .CodeMirror */
   margin-bottom: -30px; margin-right: -30px;
@@ -124,18 +158,14 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
   height: 100%;
   outline: none; /* Prevent dragging from highlighting the element */
   position: relative;
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
 }
 .CodeMirror-sizer {
   position: relative;
   border-right: 30px solid transparent;
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
 }
 
 /* The fake, visible scrollbars. Used to force redraw during scrolling
-   before actuall scrolling happens, thus preventing shaking and
+   before actual scrolling happens, thus preventing shaking and
    flickering artifacts. */
 .CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler, .CodeMirror-gutter-filler {
   position: absolute;
@@ -161,29 +191,44 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 
 .CodeMirror-gutters {
   position: absolute; left: 0; top: 0;
-  padding-bottom: 30px;
+  min-height: 100%;
   z-index: 3;
 }
 .CodeMirror-gutter {
   white-space: normal;
   height: 100%;
-  -moz-box-sizing: content-box;
-  box-sizing: content-box;
-  padding-bottom: 30px;
-  margin-bottom: -32px;
   display: inline-block;
+  vertical-align: top;
+  margin-bottom: -30px;
   /* Hack to make IE7 behave */
   *zoom:1;
   *display:inline;
 }
+.CodeMirror-gutter-wrapper {
+  position: absolute;
+  z-index: 4;
+  background: none !important;
+  border: none !important;
+}
+.CodeMirror-gutter-background {
+  position: absolute;
+  top: 0; bottom: 0;
+  z-index: 4;
+}
 .CodeMirror-gutter-elt {
   position: absolute;
   cursor: default;
   z-index: 4;
 }
+.CodeMirror-gutter-wrapper {
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  user-select: none;
+}
 
 .CodeMirror-lines {
   cursor: text;
+  min-height: 1px; /* prevents collapsing before first draw */
 }
 .CodeMirror pre {
   /* Reset some styles that the rest of the page might have set */
@@ -200,6 +245,9 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
   z-index: 2;
   position: relative;
   overflow: visible;
+  -webkit-tap-highlight-color: transparent;
+  -webkit-font-variant-ligatures: none;
+  font-variant-ligatures: none;
 }
 .CodeMirror-wrap pre {
   word-wrap: break-word;
@@ -221,8 +269,18 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
 
 .CodeMirror-widget {}
 
-.CodeMirror-wrap .CodeMirror-scroll {
-  overflow-x: hidden;
+.CodeMirror-code {
+  outline: none;
+}
+
+/* Force content-box sizing for the elements where we expect it */
+.CodeMirror-scroll,
+.CodeMirror-sizer,
+.CodeMirror-gutter,
+.CodeMirror-gutters,
+.CodeMirror-linenumber {
+  -moz-box-sizing: content-box;
+  box-sizing: content-box;
 }
 
 .CodeMirror-measure {
@@ -232,19 +290,19 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
   overflow: hidden;
   visibility: hidden;
 }
-.CodeMirror-measure pre { position: static; }
 
-.CodeMirror div.CodeMirror-cursor {
-  position: absolute;
-  border-right: none;
-  width: 0;
-}
+.CodeMirror-cursor { position: absolute; }
+.CodeMirror-measure pre { position: static; }
 
 div.CodeMirror-cursors {
   visibility: hidden;
   position: relative;
-  z-index: 1;
+  z-index: 3;
 }
+div.CodeMirror-dragcursors {
+  visibility: visible;
+}
+
 .CodeMirror-focused div.CodeMirror-cursors {
   visibility: visible;
 }
@@ -252,6 +310,8 @@ div.CodeMirror-cursors {
 .CodeMirror-selected { background: #d9d9d9; }
 .CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }
 .CodeMirror-crosshair { cursor: crosshair; }
+.CodeMirror-line::selection, .CodeMirror-line > span::selection, .CodeMirror-line > span > span::selection { background: #d7d4f0; }
+.CodeMirror-line::-moz-selection, .CodeMirror-line > span::-moz-selection, .CodeMirror-line > span > span::-moz-selection { background: #d7d4f0; }
 
 .cm-searching {
   background: #ffa;
@@ -270,3 +330,9 @@ div.CodeMirror-cursors {
     visibility: hidden;
   }
 }
+
+/* See issue #2901 */
+.cm-tab-wrap-hack:after { content: ''; }
+
+/* Help users use markselection to safely style text background */
+span.CodeMirror-selectedtext { background: none; }
diff --git a/plugins/tiddlywiki/codemirror/files/codemirror.js b/plugins/tiddlywiki/codemirror/files/codemirror.js
old mode 100644
new mode 100755
index 4a843d3f6..ec49e3a33
--- a/plugins/tiddlywiki/codemirror/files/codemirror.js
+++ b/plugins/tiddlywiki/codemirror/files/codemirror.js
@@ -1,3 +1,6 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 // This is CodeMirror (http://codemirror.net), a code editor
 // implemented in JavaScript on top of the browser's DOM.
 //
@@ -10,7 +13,7 @@
   else if (typeof define == "function" && define.amd) // AMD
     return define([], mod);
   else // Plain browser env
-    this.CodeMirror = mod();
+    (this || window).CodeMirror = mod();
 })(function() {
   "use strict";
 
@@ -18,36 +21,34 @@
 
   // Kludges for bugs and behavior differences that can't be feature
   // detected are enabled based on userAgent etc sniffing.
+  var userAgent = navigator.userAgent;
+  var platform = navigator.platform;
 
-  var gecko = /gecko\/\d/i.test(navigator.userAgent);
-  // ie_uptoN means Internet Explorer version N or lower
-  var ie_upto10 = /MSIE \d/.test(navigator.userAgent);
-  var ie_upto7 = ie_upto10 && (document.documentMode == null || document.documentMode < 8);
-  var ie_upto8 = ie_upto10 && (document.documentMode == null || document.documentMode < 9);
-  var ie_upto9 = ie_upto10 && (document.documentMode == null || document.documentMode < 10);
-  var ie_11up = /Trident\/([7-9]|\d{2,})\./.test(navigator.userAgent);
+  var gecko = /gecko\/\d/i.test(userAgent);
+  var ie_upto10 = /MSIE \d/.test(userAgent);
+  var ie_11up = /Trident\/(?:[7-9]|\d{2,})\..*rv:(\d+)/.exec(userAgent);
   var ie = ie_upto10 || ie_11up;
-  var webkit = /WebKit\//.test(navigator.userAgent);
-  var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(navigator.userAgent);
-  var chrome = /Chrome\//.test(navigator.userAgent);
-  var presto = /Opera\//.test(navigator.userAgent);
+  var ie_version = ie && (ie_upto10 ? document.documentMode || 6 : ie_11up[1]);
+  var webkit = /WebKit\//.test(userAgent);
+  var qtwebkit = webkit && /Qt\/\d+\.\d+/.test(userAgent);
+  var chrome = /Chrome\//.test(userAgent);
+  var presto = /Opera\//.test(userAgent);
   var safari = /Apple Computer/.test(navigator.vendor);
-  var khtml = /KHTML\//.test(navigator.userAgent);
-  var mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(navigator.userAgent);
-  var phantom = /PhantomJS/.test(navigator.userAgent);
+  var mac_geMountainLion = /Mac OS X 1\d\D([8-9]|\d\d)\D/.test(userAgent);
+  var phantom = /PhantomJS/.test(userAgent);
 
-  var ios = /AppleWebKit/.test(navigator.userAgent) && /Mobile\/\w+/.test(navigator.userAgent);
+  var ios = /AppleWebKit/.test(userAgent) && /Mobile\/\w+/.test(userAgent);
   // This is woefully incomplete. Suggestions for alternative methods welcome.
-  var mobile = ios || /Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(navigator.userAgent);
-  var mac = ios || /Mac/.test(navigator.platform);
-  var windows = /win/i.test(navigator.platform);
+  var mobile = ios || /Android|webOS|BlackBerry|Opera Mini|Opera Mobi|IEMobile/i.test(userAgent);
+  var mac = ios || /Mac/.test(platform);
+  var windows = /win/i.test(platform);
 
-  var presto_version = presto && navigator.userAgent.match(/Version\/(\d*\.\d*)/);
+  var presto_version = presto && userAgent.match(/Version\/(\d*\.\d*)/);
   if (presto_version) presto_version = Number(presto_version[1]);
   if (presto_version && presto_version >= 15) { presto = false; webkit = true; }
   // Some browsers use the wrong event properties to signal cmd/ctrl on OS X
   var flipCtrlCmd = mac && (qtwebkit || presto && (presto_version == null || presto_version < 12.11));
-  var captureRightClick = gecko || (ie && !ie_upto8);
+  var captureRightClick = gecko || (ie && ie_version >= 9);
 
   // Optimize some code when these features are not used.
   var sawReadOnlySpans = false, sawCollapsedSpans = false;
@@ -60,55 +61,70 @@
   function CodeMirror(place, options) {
     if (!(this instanceof CodeMirror)) return new CodeMirror(place, options);
 
-    this.options = options = options || {};
+    this.options = options = options ? copyObj(options) : {};
     // Determine effective options based on given values and defaults.
     copyObj(defaults, options, false);
     setGuttersForLineNumbers(options);
 
     var doc = options.value;
-    if (typeof doc == "string") doc = new Doc(doc, options.mode);
+    if (typeof doc == "string") doc = new Doc(doc, options.mode, null, options.lineSeparator);
     this.doc = doc;
 
-    var display = this.display = new Display(place, doc);
+    var input = new CodeMirror.inputStyles[options.inputStyle](this);
+    var display = this.display = new Display(place, doc, input);
     display.wrapper.CodeMirror = this;
     updateGutters(this);
     themeChanged(this);
     if (options.lineWrapping)
       this.display.wrapper.className += " CodeMirror-wrap";
-    if (options.autofocus && !mobile) focusInput(this);
+    if (options.autofocus && !mobile) display.input.focus();
+    initScrollbars(this);
 
     this.state = {
       keyMaps: [],  // stores maps added by addKeyMap
       overlays: [], // highlighting overlays, as added by addOverlay
       modeGen: 0,   // bumped when mode/overlay changes, used to invalidate highlighting info
-      overwrite: false, focused: false,
+      overwrite: false,
+      delayingBlurEvent: false,
+      focused: false,
       suppressEdits: false, // used to disable editing during key handlers when in readOnly mode
-      pasteIncoming: false, cutIncoming: false, // help recognize paste/cut edits in readInput
+      pasteIncoming: false, cutIncoming: false, // help recognize paste/cut edits in input.poll
+      selectingText: false,
       draggingText: false,
-      highlight: new Delayed() // stores highlight worker timeout
+      highlight: new Delayed(), // stores highlight worker timeout
+      keySeq: null,  // Unfinished key sequence
+      specialChars: null
     };
 
+    var cm = this;
+
     // Override magic textarea content restore that IE sometimes does
     // on our hidden textarea on reload
-    if (ie_upto10) setTimeout(bind(resetInput, this, true), 20);
+    if (ie && ie_version < 11) setTimeout(function() { cm.display.input.reset(true); }, 20);
 
     registerEventHandlers(this);
     ensureGlobalHandlers();
 
-    var cm = this;
-    runInOp(this, function() {
-      cm.curOp.forceUpdate = true;
-      attachDoc(cm, doc);
+    startOperation(this);
+    this.curOp.forceUpdate = true;
+    attachDoc(this, doc);
 
-      if ((options.autofocus && !mobile) || activeElt() == display.input)
-        setTimeout(bind(onFocus, cm), 20);
-      else
-        onBlur(cm);
+    if ((options.autofocus && !mobile) || cm.hasFocus())
+      setTimeout(bind(onFocus, this), 20);
+    else
+      onBlur(this);
 
-      for (var opt in optionHandlers) if (optionHandlers.hasOwnProperty(opt))
-        optionHandlers[opt](cm, options[opt], Init);
-      for (var i = 0; i < initHooks.length; ++i) initHooks[i](cm);
-    });
+    for (var opt in optionHandlers) if (optionHandlers.hasOwnProperty(opt))
+      optionHandlers[opt](this, options[opt], Init);
+    maybeUpdateLineNumberWidth(this);
+    if (options.finishInit) options.finishInit(this);
+    for (var i = 0; i < initHooks.length; ++i) initHooks[i](this);
+    endOperation(this);
+    // Suppress optimizelegibility in Webkit, since it breaks text
+    // measuring on line wrapping boundaries.
+    if (webkit && options.lineWrapping &&
+        getComputedStyle(display.lineDiv).textRendering == "optimizelegibility")
+      display.lineDiv.style.textRendering = "auto";
   }
 
   // DISPLAY CONSTRUCTOR
@@ -117,32 +133,17 @@
   // and content drawing. It holds references to DOM nodes and
   // display-related state.
 
-  function Display(place, doc) {
+  function Display(place, doc, input) {
     var d = this;
+    this.input = input;
 
-    // The semihidden textarea that is focused when the editor is
-    // focused, and receives input.
-    var input = d.input = elt("textarea", null, null, "position: absolute; padding: 0; width: 1px; height: 1em; outline: none");
-    // The textarea is kept positioned near the cursor to prevent the
-    // fact that it'll be scrolled into view on input from scrolling
-    // our fake cursor out of view. On webkit, when wrap=off, paste is
-    // very slow. So make the area wide instead.
-    if (webkit) input.style.width = "1000px";
-    else input.setAttribute("wrap", "off");
-    // If border: 0; -- iOS fails to open keyboard (issue #1287)
-    if (ios) input.style.border = "1px solid black";
-    input.setAttribute("autocorrect", "off"); input.setAttribute("autocapitalize", "off"); input.setAttribute("spellcheck", "false");
-
-    // Wraps and hides input textarea
-    d.inputDiv = elt("div", [input], null, "overflow: hidden; position: relative; width: 3px; height: 0px;");
-    // The fake scrollbar elements.
-    d.scrollbarH = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar");
-    d.scrollbarV = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar");
     // Covers bottom-right square when both scrollbars are present.
     d.scrollbarFiller = elt("div", null, "CodeMirror-scrollbar-filler");
+    d.scrollbarFiller.setAttribute("cm-not-content", "true");
     // Covers bottom of gutter when coverGutterNextToScrollbar is on
     // and h scrollbar is present.
     d.gutterFiller = elt("div", null, "CodeMirror-gutter-filler");
+    d.gutterFiller.setAttribute("cm-not-content", "true");
     // Will contain the actual code, positioned to cover the viewport.
     d.lineDiv = elt("div", null, "CodeMirror-code");
     // Elements are added to these to represent selection and cursors.
@@ -159,10 +160,11 @@
     d.mover = elt("div", [elt("div", [d.lineSpace], "CodeMirror-lines")], null, "position: relative");
     // Set to the height of the document, allowing scrolling.
     d.sizer = elt("div", [d.mover], "CodeMirror-sizer");
+    d.sizerWidth = null;
     // Behavior of elts with overflow: auto and padding is
     // inconsistent across browsers. This is used to ensure the
     // scrollable area is big enough.
-    d.heightForcer = elt("div", null, null, "position: absolute; height: " + scrollerCutOff + "px; width: 1px;");
+    d.heightForcer = elt("div", null, null, "position: absolute; height: " + scrollerGap + "px; width: 1px;");
     // Will contain the gutters, if any.
     d.gutters = elt("div", null, "CodeMirror-gutters");
     d.lineGutter = null;
@@ -170,56 +172,44 @@
     d.scroller = elt("div", [d.sizer, d.heightForcer, d.gutters], "CodeMirror-scroll");
     d.scroller.setAttribute("tabIndex", "-1");
     // The element in which the editor lives.
-    d.wrapper = elt("div", [d.inputDiv, d.scrollbarH, d.scrollbarV,
-                            d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror");
+    d.wrapper = elt("div", [d.scrollbarFiller, d.gutterFiller, d.scroller], "CodeMirror");
 
     // Work around IE7 z-index bug (not perfect, hence IE7 not really being supported)
-    if (ie_upto7) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0; }
-    // Needed to hide big blue blinking cursor on Mobile Safari
-    if (ios) input.style.width = "0px";
-    if (!webkit) d.scroller.draggable = true;
-    // Needed to handle Tab key in KHTML
-    if (khtml) { d.inputDiv.style.height = "1px"; d.inputDiv.style.position = "absolute"; }
-    // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
-    if (ie_upto7) d.scrollbarH.style.minHeight = d.scrollbarV.style.minWidth = "18px";
+    if (ie && ie_version < 8) { d.gutters.style.zIndex = -1; d.scroller.style.paddingRight = 0; }
+    if (!webkit && !(gecko && mobile)) d.scroller.draggable = true;
 
-    if (place.appendChild) place.appendChild(d.wrapper);
-    else place(d.wrapper);
+    if (place) {
+      if (place.appendChild) place.appendChild(d.wrapper);
+      else place(d.wrapper);
+    }
 
     // Current rendered range (may be bigger than the view window).
     d.viewFrom = d.viewTo = doc.first;
+    d.reportedViewFrom = d.reportedViewTo = doc.first;
     // Information about the rendered lines.
     d.view = [];
+    d.renderedView = null;
     // Holds info about a single rendered line when it was rendered
     // for measurement, while not in view.
     d.externalMeasured = null;
     // Empty space (in pixels) above the view
     d.viewOffset = 0;
-    d.lastSizeC = 0;
+    d.lastWrapHeight = d.lastWrapWidth = 0;
     d.updateLineNumbers = null;
 
+    d.nativeBarWidth = d.barHeight = d.barWidth = 0;
+    d.scrollbarsClipped = false;
+
     // Used to only resize the line number gutter when necessary (when
     // the amount of lines crosses a boundary that makes its width change)
     d.lineNumWidth = d.lineNumInnerWidth = d.lineNumChars = null;
-    // See readInput and resetInput
-    d.prevInput = "";
     // Set to true when a non-horizontal-scrolling line widget is
     // added. As an optimization, line widget aligning is skipped when
     // this is false.
     d.alignWidgets = false;
-    // Flag that indicates whether we expect input to appear real soon
-    // now (after some event like 'keypress' or 'input') and are
-    // polling intensively.
-    d.pollingFast = false;
-    // Self-resetting timeout for the poller
-    d.poll = new Delayed();
 
     d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null;
 
-    // Tracks when resetInput has punted to just putting a short
-    // string into the textarea instead of the full selection.
-    d.inaccurateSelection = false;
-
     // Tracks the maximum line length so that the horizontal scrollbar
     // can be kept static when scrolling.
     d.maxLine = null;
@@ -235,6 +225,10 @@
     // Used to track whether anything happened since the context menu
     // was opened.
     d.selForContextMenu = null;
+
+    d.activeTouch = null;
+
+    input.init(d);
   }
 
   // STATE UPDATES
@@ -261,6 +255,7 @@
     if (cm.options.lineWrapping) {
       addClass(cm.display.wrapper, "CodeMirror-wrap");
       cm.display.sizer.style.minWidth = "";
+      cm.display.sizerWidth = null;
     } else {
       rmClass(cm.display.wrapper, "CodeMirror-wrap");
       findMaxLine(cm);
@@ -300,12 +295,6 @@
     });
   }
 
-  function keyMapChanged(cm) {
-    var map = keyMap[cm.options.keyMap], style = map.style;
-    cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-keymap-\S+/g, "") +
-      (style ? " cm-keymap-" + style : "");
-  }
-
   function themeChanged(cm) {
     cm.display.wrapper.className = cm.display.wrapper.className.replace(/\s*cm-s-\S+/g, "") +
       cm.options.theme.replace(/(^|\s)\s*/g, " cm-s-");
@@ -338,7 +327,6 @@
   function updateGutterSpace(cm) {
     var width = cm.display.gutters.offsetWidth;
     cm.display.sizer.style.marginLeft = width + "px";
-    cm.display.scrollbarH.style.left = cm.options.fixedGutter ? width + "px" : 0;
   }
 
   // Compute the character length of a line, taking into account
@@ -394,89 +382,203 @@
   // Prepare DOM reads needed to update the scrollbars. Done in one
   // shot to minimize update/measure roundtrips.
   function measureForScrollbars(cm) {
-    var scroll = cm.display.scroller;
+    var d = cm.display, gutterW = d.gutters.offsetWidth;
+    var docH = Math.round(cm.doc.height + paddingVert(cm.display));
     return {
-      clientHeight: scroll.clientHeight,
-      barHeight: cm.display.scrollbarV.clientHeight,
-      scrollWidth: scroll.scrollWidth, clientWidth: scroll.clientWidth,
-      barWidth: cm.display.scrollbarH.clientWidth,
-      docHeight: Math.round(cm.doc.height + paddingVert(cm.display))
+      clientHeight: d.scroller.clientHeight,
+      viewHeight: d.wrapper.clientHeight,
+      scrollWidth: d.scroller.scrollWidth, clientWidth: d.scroller.clientWidth,
+      viewWidth: d.wrapper.clientWidth,
+      barLeft: cm.options.fixedGutter ? gutterW : 0,
+      docHeight: docH,
+      scrollHeight: docH + scrollGap(cm) + d.barHeight,
+      nativeBarWidth: d.nativeBarWidth,
+      gutterWidth: gutterW
     };
   }
 
+  function NativeScrollbars(place, scroll, cm) {
+    this.cm = cm;
+    var vert = this.vert = elt("div", [elt("div", null, null, "min-width: 1px")], "CodeMirror-vscrollbar");
+    var horiz = this.horiz = elt("div", [elt("div", null, null, "height: 100%; min-height: 1px")], "CodeMirror-hscrollbar");
+    place(vert); place(horiz);
+
+    on(vert, "scroll", function() {
+      if (vert.clientHeight) scroll(vert.scrollTop, "vertical");
+    });
+    on(horiz, "scroll", function() {
+      if (horiz.clientWidth) scroll(horiz.scrollLeft, "horizontal");
+    });
+
+    this.checkedZeroWidth = false;
+    // Need to set a minimum width to see the scrollbar on IE7 (but must not set it on IE8).
+    if (ie && ie_version < 8) this.horiz.style.minHeight = this.vert.style.minWidth = "18px";
+  }
+
+  NativeScrollbars.prototype = copyObj({
+    update: function(measure) {
+      var needsH = measure.scrollWidth > measure.clientWidth + 1;
+      var needsV = measure.scrollHeight > measure.clientHeight + 1;
+      var sWidth = measure.nativeBarWidth;
+
+      if (needsV) {
+        this.vert.style.display = "block";
+        this.vert.style.bottom = needsH ? sWidth + "px" : "0";
+        var totalHeight = measure.viewHeight - (needsH ? sWidth : 0);
+        // A bug in IE8 can cause this value to be negative, so guard it.
+        this.vert.firstChild.style.height =
+          Math.max(0, measure.scrollHeight - measure.clientHeight + totalHeight) + "px";
+      } else {
+        this.vert.style.display = "";
+        this.vert.firstChild.style.height = "0";
+      }
+
+      if (needsH) {
+        this.horiz.style.display = "block";
+        this.horiz.style.right = needsV ? sWidth + "px" : "0";
+        this.horiz.style.left = measure.barLeft + "px";
+        var totalWidth = measure.viewWidth - measure.barLeft - (needsV ? sWidth : 0);
+        this.horiz.firstChild.style.width =
+          (measure.scrollWidth - measure.clientWidth + totalWidth) + "px";
+      } else {
+        this.horiz.style.display = "";
+        this.horiz.firstChild.style.width = "0";
+      }
+
+      if (!this.checkedZeroWidth && measure.clientHeight > 0) {
+        if (sWidth == 0) this.zeroWidthHack();
+        this.checkedZeroWidth = true;
+      }
+
+      return {right: needsV ? sWidth : 0, bottom: needsH ? sWidth : 0};
+    },
+    setScrollLeft: function(pos) {
+      if (this.horiz.scrollLeft != pos) this.horiz.scrollLeft = pos;
+      if (this.disableHoriz) this.enableZeroWidthBar(this.horiz, this.disableHoriz);
+    },
+    setScrollTop: function(pos) {
+      if (this.vert.scrollTop != pos) this.vert.scrollTop = pos;
+      if (this.disableVert) this.enableZeroWidthBar(this.vert, this.disableVert);
+    },
+    zeroWidthHack: function() {
+      var w = mac && !mac_geMountainLion ? "12px" : "18px";
+      this.horiz.style.height = this.vert.style.width = w;
+      this.horiz.style.pointerEvents = this.vert.style.pointerEvents = "none";
+      this.disableHoriz = new Delayed;
+      this.disableVert = new Delayed;
+    },
+    enableZeroWidthBar: function(bar, delay) {
+      bar.style.pointerEvents = "auto";
+      function maybeDisable() {
+        // To find out whether the scrollbar is still visible, we
+        // check whether the element under the pixel in the bottom
+        // left corner of the scrollbar box is the scrollbar box
+        // itself (when the bar is still visible) or its filler child
+        // (when the bar is hidden). If it is still visible, we keep
+        // it enabled, if it's hidden, we disable pointer events.
+        var box = bar.getBoundingClientRect();
+        var elt = document.elementFromPoint(box.left + 1, box.bottom - 1);
+        if (elt != bar) bar.style.pointerEvents = "none";
+        else delay.set(1000, maybeDisable);
+      }
+      delay.set(1000, maybeDisable);
+    },
+    clear: function() {
+      var parent = this.horiz.parentNode;
+      parent.removeChild(this.horiz);
+      parent.removeChild(this.vert);
+    }
+  }, NativeScrollbars.prototype);
+
+  function NullScrollbars() {}
+
+  NullScrollbars.prototype = copyObj({
+    update: function() { return {bottom: 0, right: 0}; },
+    setScrollLeft: function() {},
+    setScrollTop: function() {},
+    clear: function() {}
+  }, NullScrollbars.prototype);
+
+  CodeMirror.scrollbarModel = {"native": NativeScrollbars, "null": NullScrollbars};
+
+  function initScrollbars(cm) {
+    if (cm.display.scrollbars) {
+      cm.display.scrollbars.clear();
+      if (cm.display.scrollbars.addClass)
+        rmClass(cm.display.wrapper, cm.display.scrollbars.addClass);
+    }
+
+    cm.display.scrollbars = new CodeMirror.scrollbarModel[cm.options.scrollbarStyle](function(node) {
+      cm.display.wrapper.insertBefore(node, cm.display.scrollbarFiller);
+      // Prevent clicks in the scrollbars from killing focus
+      on(node, "mousedown", function() {
+        if (cm.state.focused) setTimeout(function() { cm.display.input.focus(); }, 0);
+      });
+      node.setAttribute("cm-not-content", "true");
+    }, function(pos, axis) {
+      if (axis == "horizontal") setScrollLeft(cm, pos);
+      else setScrollTop(cm, pos);
+    }, cm);
+    if (cm.display.scrollbars.addClass)
+      addClass(cm.display.wrapper, cm.display.scrollbars.addClass);
+  }
+
+  function updateScrollbars(cm, measure) {
+    if (!measure) measure = measureForScrollbars(cm);
+    var startWidth = cm.display.barWidth, startHeight = cm.display.barHeight;
+    updateScrollbarsInner(cm, measure);
+    for (var i = 0; i < 4 && startWidth != cm.display.barWidth || startHeight != cm.display.barHeight; i++) {
+      if (startWidth != cm.display.barWidth && cm.options.lineWrapping)
+        updateHeightsInViewport(cm);
+      updateScrollbarsInner(cm, measureForScrollbars(cm));
+      startWidth = cm.display.barWidth; startHeight = cm.display.barHeight;
+    }
+  }
+
   // Re-synchronize the fake scrollbars with the actual size of the
   // content.
-  function updateScrollbars(cm, measure) {
-    if (!measure) measure = measureForScrollbars(cm);
+  function updateScrollbarsInner(cm, measure) {
     var d = cm.display;
-    var scrollHeight = measure.docHeight + scrollerCutOff;
-    var needsH = measure.scrollWidth > measure.clientWidth;
-    var needsV = scrollHeight > measure.clientHeight;
-    if (needsV) {
-      d.scrollbarV.style.display = "block";
-      d.scrollbarV.style.bottom = needsH ? scrollbarWidth(d.measure) + "px" : "0";
-      // A bug in IE8 can cause this value to be negative, so guard it.
-      d.scrollbarV.firstChild.style.height =
-        Math.max(0, scrollHeight - measure.clientHeight + (measure.barHeight || d.scrollbarV.clientHeight)) + "px";
-    } else {
-      d.scrollbarV.style.display = "";
-      d.scrollbarV.firstChild.style.height = "0";
-    }
-    if (needsH) {
-      d.scrollbarH.style.display = "block";
-      d.scrollbarH.style.right = needsV ? scrollbarWidth(d.measure) + "px" : "0";
-      d.scrollbarH.firstChild.style.width =
-        (measure.scrollWidth - measure.clientWidth + (measure.barWidth || d.scrollbarH.clientWidth)) + "px";
-    } else {
-      d.scrollbarH.style.display = "";
-      d.scrollbarH.firstChild.style.width = "0";
-    }
-    if (needsH && needsV) {
-      d.scrollbarFiller.style.display = "block";
-      d.scrollbarFiller.style.height = d.scrollbarFiller.style.width = scrollbarWidth(d.measure) + "px";
-    } else d.scrollbarFiller.style.display = "";
-    if (needsH && cm.options.coverGutterNextToScrollbar && cm.options.fixedGutter) {
-      d.gutterFiller.style.display = "block";
-      d.gutterFiller.style.height = scrollbarWidth(d.measure) + "px";
-      d.gutterFiller.style.width = d.gutters.offsetWidth + "px";
-    } else d.gutterFiller.style.display = "";
+    var sizes = d.scrollbars.update(measure);
 
-    if (!cm.state.checkedOverlayScrollbar && measure.clientHeight > 0) {
-      if (scrollbarWidth(d.measure) === 0) {
-        var w = mac && !mac_geMountainLion ? "12px" : "18px";
-        d.scrollbarV.style.minWidth = d.scrollbarH.style.minHeight = w;
-        var barMouseDown = function(e) {
-          if (e_target(e) != d.scrollbarV && e_target(e) != d.scrollbarH)
-            operation(cm, onMouseDown)(e);
-        };
-        on(d.scrollbarV, "mousedown", barMouseDown);
-        on(d.scrollbarH, "mousedown", barMouseDown);
-      }
-      cm.state.checkedOverlayScrollbar = true;
-    }
+    d.sizer.style.paddingRight = (d.barWidth = sizes.right) + "px";
+    d.sizer.style.paddingBottom = (d.barHeight = sizes.bottom) + "px";
+    d.heightForcer.style.borderBottom = sizes.bottom + "px solid transparent"
+
+    if (sizes.right && sizes.bottom) {
+      d.scrollbarFiller.style.display = "block";
+      d.scrollbarFiller.style.height = sizes.bottom + "px";
+      d.scrollbarFiller.style.width = sizes.right + "px";
+    } else d.scrollbarFiller.style.display = "";
+    if (sizes.bottom && cm.options.coverGutterNextToScrollbar && cm.options.fixedGutter) {
+      d.gutterFiller.style.display = "block";
+      d.gutterFiller.style.height = sizes.bottom + "px";
+      d.gutterFiller.style.width = measure.gutterWidth + "px";
+    } else d.gutterFiller.style.display = "";
   }
 
   // Compute the lines that are visible in a given viewport (defaults
-  // the the current scroll position). viewPort may contain top,
+  // the the current scroll position). viewport may contain top,
   // height, and ensure (see op.scrollToPos) properties.
-  function visibleLines(display, doc, viewPort) {
-    var top = viewPort && viewPort.top != null ? viewPort.top : display.scroller.scrollTop;
+  function visibleLines(display, doc, viewport) {
+    var top = viewport && viewport.top != null ? Math.max(0, viewport.top) : display.scroller.scrollTop;
     top = Math.floor(top - paddingTop(display));
-    var bottom = viewPort && viewPort.bottom != null ? viewPort.bottom : top + display.wrapper.clientHeight;
+    var bottom = viewport && viewport.bottom != null ? viewport.bottom : top + display.wrapper.clientHeight;
 
     var from = lineAtHeight(doc, top), to = lineAtHeight(doc, bottom);
     // Ensure is a {from: {line, ch}, to: {line, ch}} object, and
     // forces those lines into the viewport (if possible).
-    if (viewPort && viewPort.ensure) {
-      var ensureFrom = viewPort.ensure.from.line, ensureTo = viewPort.ensure.to.line;
-      if (ensureFrom < from)
-        return {from: ensureFrom,
-                to: lineAtHeight(doc, heightAtLine(getLine(doc, ensureFrom)) + display.wrapper.clientHeight)};
-      if (Math.min(ensureTo, doc.lastLine()) >= to)
-        return {from: lineAtHeight(doc, heightAtLine(getLine(doc, ensureTo)) - display.wrapper.clientHeight),
-                to: ensureTo};
+    if (viewport && viewport.ensure) {
+      var ensureFrom = viewport.ensure.from.line, ensureTo = viewport.ensure.to.line;
+      if (ensureFrom < from) {
+        from = ensureFrom;
+        to = lineAtHeight(doc, heightAtLine(getLine(doc, ensureFrom)) + display.wrapper.clientHeight);
+      } else if (Math.min(ensureTo, doc.lastLine()) >= to) {
+        from = lineAtHeight(doc, heightAtLine(getLine(doc, ensureTo)) - display.wrapper.clientHeight);
+        to = ensureTo;
+      }
     }
-    return {from: from, to: to};
+    return {from: from, to: Math.max(to, from + 1)};
   }
 
   // LINE NUMBERS
@@ -510,7 +612,7 @@
                                                  "CodeMirror-linenumber CodeMirror-gutter-elt"));
       var innerW = test.firstChild.offsetWidth, padding = test.offsetWidth - innerW;
       display.lineGutter.style.width = "";
-      display.lineNumInnerWidth = Math.max(innerW, display.lineGutter.offsetWidth - padding);
+      display.lineNumInnerWidth = Math.max(innerW, display.lineGutter.offsetWidth - padding) + 1;
       display.lineNumWidth = display.lineNumInnerWidth + padding;
       display.lineNumChars = display.lineNumInnerWidth ? last.length : -1;
       display.lineGutter.style.width = display.lineNumWidth + "px";
@@ -533,78 +635,68 @@
 
   // DISPLAY DRAWING
 
-  // Updates the display, selection, and scrollbars, using the
-  // information in display.view to find out which nodes are no longer
-  // up-to-date. Tries to bail out early when no changes are needed,
-  // unless forced is true.
-  // Returns true if an actual update happened, false otherwise.
-  function updateDisplay(cm, viewPort, forced) {
-    var oldFrom = cm.display.viewFrom, oldTo = cm.display.viewTo, updated;
-    var visible = visibleLines(cm.display, cm.doc, viewPort);
-    for (var first = true;; first = false) {
-      var oldWidth = cm.display.scroller.clientWidth;
-      if (!updateDisplayInner(cm, visible, forced)) break;
-      updated = true;
+  function DisplayUpdate(cm, viewport, force) {
+    var display = cm.display;
 
-      // If the max line changed since it was last measured, measure it,
-      // and ensure the document's width matches it.
-      if (cm.display.maxLineChanged && !cm.options.lineWrapping)
-        adjustContentWidth(cm);
+    this.viewport = viewport;
+    // Store some values that we'll need later (but don't want to force a relayout for)
+    this.visible = visibleLines(display, cm.doc, viewport);
+    this.editorIsHidden = !display.wrapper.offsetWidth;
+    this.wrapperHeight = display.wrapper.clientHeight;
+    this.wrapperWidth = display.wrapper.clientWidth;
+    this.oldDisplayWidth = displayWidth(cm);
+    this.force = force;
+    this.dims = getDimensions(cm);
+    this.events = [];
+  }
 
-      var barMeasure = measureForScrollbars(cm);
-      updateSelection(cm);
-      setDocumentHeight(cm, barMeasure);
-      updateScrollbars(cm, barMeasure);
-      if (webkit && cm.options.lineWrapping)
-        checkForWebkitWidthBug(cm, barMeasure); // (Issue #2420)
-      if (first && cm.options.lineWrapping && oldWidth != cm.display.scroller.clientWidth) {
-        forced = true;
-        continue;
-      }
-      forced = false;
+  DisplayUpdate.prototype.signal = function(emitter, type) {
+    if (hasHandler(emitter, type))
+      this.events.push(arguments);
+  };
+  DisplayUpdate.prototype.finish = function() {
+    for (var i = 0; i < this.events.length; i++)
+      signal.apply(null, this.events[i]);
+  };
 
-      // Clip forced viewport to actual scrollable area.
-      if (viewPort && viewPort.top != null)
-        viewPort = {top: Math.min(barMeasure.docHeight - scrollerCutOff - barMeasure.clientHeight, viewPort.top)};
-      // Updated line heights might result in the drawn area not
-      // actually covering the viewport. Keep looping until it does.
-      visible = visibleLines(cm.display, cm.doc, viewPort);
-      if (visible.from >= cm.display.viewFrom && visible.to <= cm.display.viewTo)
-        break;
+  function maybeClipScrollbars(cm) {
+    var display = cm.display;
+    if (!display.scrollbarsClipped && display.scroller.offsetWidth) {
+      display.nativeBarWidth = display.scroller.offsetWidth - display.scroller.clientWidth;
+      display.heightForcer.style.height = scrollGap(cm) + "px";
+      display.sizer.style.marginBottom = -display.nativeBarWidth + "px";
+      display.sizer.style.borderRightWidth = scrollGap(cm) + "px";
+      display.scrollbarsClipped = true;
     }
-
-    cm.display.updateLineNumbers = null;
-    if (updated) {
-      signalLater(cm, "update", cm);
-      if (cm.display.viewFrom != oldFrom || cm.display.viewTo != oldTo)
-        signalLater(cm, "viewportChange", cm, cm.display.viewFrom, cm.display.viewTo);
-    }
-    return updated;
   }
 
   // Does the actual updating of the line display. Bails out
   // (returning false) when there is nothing to be done and forced is
   // false.
-  function updateDisplayInner(cm, visible, forced) {
+  function updateDisplayIfNeeded(cm, update) {
     var display = cm.display, doc = cm.doc;
-    if (!display.wrapper.offsetWidth) {
+
+    if (update.editorIsHidden) {
       resetView(cm);
-      return;
+      return false;
     }
 
     // Bail out if the visible area is already rendered and nothing changed.
-    if (!forced && visible.from >= display.viewFrom && visible.to <= display.viewTo &&
-        countDirtyView(cm) == 0)
-      return;
+    if (!update.force &&
+        update.visible.from >= display.viewFrom && update.visible.to <= display.viewTo &&
+        (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo) &&
+        display.renderedView == display.view && countDirtyView(cm) == 0)
+      return false;
 
-    if (maybeUpdateLineNumberWidth(cm))
+    if (maybeUpdateLineNumberWidth(cm)) {
       resetView(cm);
-    var dims = getDimensions(cm);
+      update.dims = getDimensions(cm);
+    }
 
     // Compute a suitable new viewport (from & to)
     var end = doc.first + doc.size;
-    var from = Math.max(visible.from - cm.options.viewportMargin, doc.first);
-    var to = Math.min(end, visible.to + cm.options.viewportMargin);
+    var from = Math.max(update.visible.from - cm.options.viewportMargin, doc.first);
+    var to = Math.min(end, update.visible.to + cm.options.viewportMargin);
     if (display.viewFrom < from && from - display.viewFrom < 20) from = Math.max(doc.first, display.viewFrom);
     if (display.viewTo > to && display.viewTo - to < 20) to = Math.min(end, display.viewTo);
     if (sawCollapsedSpans) {
@@ -613,7 +705,7 @@
     }
 
     var different = from != display.viewFrom || to != display.viewTo ||
-      display.lastSizeC != display.wrapper.clientHeight;
+      display.lastWrapHeight != update.wrapperHeight || display.lastWrapWidth != update.wrapperWidth;
     adjustView(cm, from, to);
 
     display.viewOffset = heightAtLine(getLine(cm.doc, display.viewFrom));
@@ -621,57 +713,84 @@
     cm.display.mover.style.top = display.viewOffset + "px";
 
     var toUpdate = countDirtyView(cm);
-    if (!different && toUpdate == 0 && !forced) return;
+    if (!different && toUpdate == 0 && !update.force && display.renderedView == display.view &&
+        (display.updateLineNumbers == null || display.updateLineNumbers >= display.viewTo))
+      return false;
 
     // For big changes, we hide the enclosing element during the
     // update, since that speeds up the operations on most browsers.
     var focused = activeElt();
     if (toUpdate > 4) display.lineDiv.style.display = "none";
-    patchDisplay(cm, display.updateLineNumbers, dims);
+    patchDisplay(cm, display.updateLineNumbers, update.dims);
     if (toUpdate > 4) display.lineDiv.style.display = "";
+    display.renderedView = display.view;
     // There might have been a widget with a focused element that got
     // hidden or updated, if so re-focus it.
     if (focused && activeElt() != focused && focused.offsetHeight) focused.focus();
 
     // Prevent selection and cursors from interfering with the scroll
-    // width.
+    // width and height.
     removeChildren(display.cursorDiv);
     removeChildren(display.selectionDiv);
+    display.gutters.style.height = display.sizer.style.minHeight = 0;
 
     if (different) {
-      display.lastSizeC = display.wrapper.clientHeight;
+      display.lastWrapHeight = update.wrapperHeight;
+      display.lastWrapWidth = update.wrapperWidth;
       startWorker(cm, 400);
     }
 
-    updateHeightsInViewport(cm);
+    display.updateLineNumbers = null;
 
     return true;
   }
 
-  function adjustContentWidth(cm) {
-    var display = cm.display;
-    var width = measureChar(cm, display.maxLine, display.maxLine.text.length).left;
-    display.maxLineChanged = false;
-    var minWidth = Math.max(0, width + 3);
-    var maxScrollLeft = Math.max(0, display.sizer.offsetLeft + minWidth + scrollerCutOff - display.scroller.clientWidth);
-    display.sizer.style.minWidth = minWidth + "px";
-    if (maxScrollLeft < cm.doc.scrollLeft)
-      setScrollLeft(cm, Math.min(display.scroller.scrollLeft, maxScrollLeft), true);
+  function postUpdateDisplay(cm, update) {
+    var viewport = update.viewport;
+
+    for (var first = true;; first = false) {
+      if (!first || !cm.options.lineWrapping || update.oldDisplayWidth == displayWidth(cm)) {
+        // Clip forced viewport to actual scrollable area.
+        if (viewport && viewport.top != null)
+          viewport = {top: Math.min(cm.doc.height + paddingVert(cm.display) - displayHeight(cm), viewport.top)};
+        // Updated line heights might result in the drawn area not
+        // actually covering the viewport. Keep looping until it does.
+        update.visible = visibleLines(cm.display, cm.doc, viewport);
+        if (update.visible.from >= cm.display.viewFrom && update.visible.to <= cm.display.viewTo)
+          break;
+      }
+      if (!updateDisplayIfNeeded(cm, update)) break;
+      updateHeightsInViewport(cm);
+      var barMeasure = measureForScrollbars(cm);
+      updateSelection(cm);
+      updateScrollbars(cm, barMeasure);
+      setDocumentHeight(cm, barMeasure);
+    }
+
+    update.signal(cm, "update", cm);
+    if (cm.display.viewFrom != cm.display.reportedViewFrom || cm.display.viewTo != cm.display.reportedViewTo) {
+      update.signal(cm, "viewportChange", cm, cm.display.viewFrom, cm.display.viewTo);
+      cm.display.reportedViewFrom = cm.display.viewFrom; cm.display.reportedViewTo = cm.display.viewTo;
+    }
+  }
+
+  function updateDisplaySimple(cm, viewport) {
+    var update = new DisplayUpdate(cm, viewport);
+    if (updateDisplayIfNeeded(cm, update)) {
+      updateHeightsInViewport(cm);
+      postUpdateDisplay(cm, update);
+      var barMeasure = measureForScrollbars(cm);
+      updateSelection(cm);
+      updateScrollbars(cm, barMeasure);
+      setDocumentHeight(cm, barMeasure);
+      update.finish();
+    }
   }
 
   function setDocumentHeight(cm, measure) {
-    cm.display.sizer.style.minHeight = cm.display.heightForcer.style.top = measure.docHeight + "px";
-    cm.display.gutters.style.height = Math.max(measure.docHeight, measure.clientHeight - scrollerCutOff) + "px";
-  }
-
-
-  function checkForWebkitWidthBug(cm, measure) {
-    // Work around Webkit bug where it sometimes reserves space for a
-    // non-existing phantom scrollbar in the scroller (Issue #2420)
-    if (cm.display.sizer.offsetWidth + cm.display.gutters.offsetWidth < cm.display.scroller.clientWidth - 1) {
-      cm.display.sizer.style.minHeight = cm.display.heightForcer.style.top = "0px";
-      cm.display.gutters.style.height = measure.docHeight + "px";
-    }
+    cm.display.sizer.style.minHeight = measure.docHeight + "px";
+    cm.display.heightForcer.style.top = measure.docHeight + "px";
+    cm.display.gutters.style.height = (measure.docHeight + cm.display.barHeight + scrollGap(cm)) + "px";
   }
 
   // Read the actual heights of the rendered lines, and update their
@@ -682,7 +801,7 @@
     for (var i = 0; i < display.view.length; i++) {
       var cur = display.view[i], height;
       if (cur.hidden) continue;
-      if (ie_upto7) {
+      if (ie && ie_version < 8) {
         var bot = cur.node.offsetTop + cur.node.offsetHeight;
         height = bot - prevBottom;
         prevBottom = bot;
@@ -705,16 +824,17 @@
   // given line.
   function updateWidgetHeight(line) {
     if (line.widgets) for (var i = 0; i < line.widgets.length; ++i)
-      line.widgets[i].height = line.widgets[i].node.offsetHeight;
+      line.widgets[i].height = line.widgets[i].node.parentNode.offsetHeight;
   }
 
   // Do a bulk-read of the DOM positions and sizes needed to draw the
   // view, so that we don't interleave reading and writing to the DOM.
   function getDimensions(cm) {
     var d = cm.display, left = {}, width = {};
+    var gutterLeft = d.gutters.clientLeft;
     for (var n = d.gutters.firstChild, i = 0; n; n = n.nextSibling, ++i) {
-      left[cm.options.gutters[i]] = n.offsetLeft;
-      width[cm.options.gutters[i]] = n.offsetWidth;
+      left[cm.options.gutters[i]] = n.offsetLeft + n.clientLeft + gutterLeft;
+      width[cm.options.gutters[i]] = n.clientWidth;
     }
     return {fixedPos: compensateForHScroll(d),
             gutterTotalWidth: d.gutters.offsetWidth,
@@ -747,7 +867,7 @@
     for (var i = 0; i < view.length; i++) {
       var lineView = view[i];
       if (lineView.hidden) {
-      } else if (!lineView.node) { // Not drawn yet
+      } else if (!lineView.node || lineView.node.parentNode != container) { // Not drawn yet
         var node = buildLineElement(cm, lineView, lineN, dims);
         container.insertBefore(node, cur);
       } else { // Already drawn
@@ -778,7 +898,7 @@
       if (type == "text") updateLineText(cm, lineView);
       else if (type == "gutter") updateLineGutter(cm, lineView, lineN, dims);
       else if (type == "class") updateLineClasses(lineView);
-      else if (type == "widget") updateLineWidgets(lineView, dims);
+      else if (type == "widget") updateLineWidgets(cm, lineView, dims);
     }
     lineView.changes = null;
   }
@@ -791,7 +911,7 @@
       if (lineView.text.parentNode)
         lineView.text.parentNode.replaceChild(lineView.node, lineView.text);
       lineView.node.appendChild(lineView.text);
-      if (ie_upto7) lineView.node.style.zIndex = 2;
+      if (ie && ie_version < 8) lineView.node.style.zIndex = 2;
     }
     return lineView.node;
   }
@@ -853,13 +973,26 @@
       lineView.node.removeChild(lineView.gutter);
       lineView.gutter = null;
     }
+    if (lineView.gutterBackground) {
+      lineView.node.removeChild(lineView.gutterBackground);
+      lineView.gutterBackground = null;
+    }
+    if (lineView.line.gutterClass) {
+      var wrap = ensureLineWrapped(lineView);
+      lineView.gutterBackground = elt("div", null, "CodeMirror-gutter-background " + lineView.line.gutterClass,
+                                      "left: " + (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) +
+                                      "px; width: " + dims.gutterTotalWidth + "px");
+      wrap.insertBefore(lineView.gutterBackground, lineView.text);
+    }
     var markers = lineView.line.gutterMarkers;
     if (cm.options.lineNumbers || markers) {
       var wrap = ensureLineWrapped(lineView);
-      var gutterWrap = lineView.gutter =
-        wrap.insertBefore(elt("div", null, "CodeMirror-gutter-wrapper", "position: absolute; left: " +
-                              (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px"),
-                          lineView.text);
+      var gutterWrap = lineView.gutter = elt("div", null, "CodeMirror-gutter-wrapper", "left: " +
+                                             (cm.options.fixedGutter ? dims.fixedPos : -dims.gutterTotalWidth) + "px");
+      cm.display.input.setUneditable(gutterWrap);
+      wrap.insertBefore(gutterWrap, lineView.text);
+      if (lineView.line.gutterClass)
+        gutterWrap.className += " " + lineView.line.gutterClass;
       if (cm.options.lineNumbers && (!markers || !markers["CodeMirror-linenumbers"]))
         lineView.lineNumber = gutterWrap.appendChild(
           elt("div", lineNumberFor(cm.options, lineN),
@@ -875,14 +1008,14 @@
     }
   }
 
-  function updateLineWidgets(lineView, dims) {
+  function updateLineWidgets(cm, lineView, dims) {
     if (lineView.alignable) lineView.alignable = null;
     for (var node = lineView.node.firstChild, next; node; node = next) {
       var next = node.nextSibling;
       if (node.className == "CodeMirror-linewidget")
         lineView.node.removeChild(node);
     }
-    insertLineWidgets(lineView, dims);
+    insertLineWidgets(cm, lineView, dims);
   }
 
   // Build a line's DOM representation from scratch
@@ -894,25 +1027,26 @@
 
     updateLineClasses(lineView);
     updateLineGutter(cm, lineView, lineN, dims);
-    insertLineWidgets(lineView, dims);
+    insertLineWidgets(cm, lineView, dims);
     return lineView.node;
   }
 
   // A lineView may contain multiple logical lines (when merged by
   // collapsed spans). The widgets for all of them need to be drawn.
-  function insertLineWidgets(lineView, dims) {
-    insertLineWidgetsFor(lineView.line, lineView, dims, true);
+  function insertLineWidgets(cm, lineView, dims) {
+    insertLineWidgetsFor(cm, lineView.line, lineView, dims, true);
     if (lineView.rest) for (var i = 0; i < lineView.rest.length; i++)
-      insertLineWidgetsFor(lineView.rest[i], lineView, dims, false);
+      insertLineWidgetsFor(cm, lineView.rest[i], lineView, dims, false);
   }
 
-  function insertLineWidgetsFor(line, lineView, dims, allowAbove) {
+  function insertLineWidgetsFor(cm, line, lineView, dims, allowAbove) {
     if (!line.widgets) return;
     var wrap = ensureLineWrapped(lineView);
     for (var i = 0, ws = line.widgets; i < ws.length; ++i) {
       var widget = ws[i], node = elt("div", [widget.node], "CodeMirror-linewidget");
-      if (!widget.handleMouseEvents) node.ignoreEvents = true;
+      if (!widget.handleMouseEvents) node.setAttribute("cm-ignore-events", "true");
       positionLineWidget(widget, node, lineView, dims);
+      cm.display.input.setUneditable(node);
       if (allowAbove && widget.above)
         wrap.insertBefore(node, lineView.gutter || lineView.text);
       else
@@ -955,6 +1089,922 @@
   function maxPos(a, b) { return cmp(a, b) < 0 ? b : a; }
   function minPos(a, b) { return cmp(a, b) < 0 ? a : b; }
 
+  // INPUT HANDLING
+
+  function ensureFocus(cm) {
+    if (!cm.state.focused) { cm.display.input.focus(); onFocus(cm); }
+  }
+
+  // This will be set to an array of strings when copying, so that,
+  // when pasting, we know what kind of selections the copied text
+  // was made out of.
+  var lastCopied = null;
+
+  function applyTextInput(cm, inserted, deleted, sel, origin) {
+    var doc = cm.doc;
+    cm.display.shift = false;
+    if (!sel) sel = doc.sel;
+
+    var paste = cm.state.pasteIncoming || origin == "paste";
+    var textLines = doc.splitLines(inserted), multiPaste = null;
+    // When pasing N lines into N selections, insert one line per selection
+    if (paste && sel.ranges.length > 1) {
+      if (lastCopied && lastCopied.join("\n") == inserted) {
+        if (sel.ranges.length % lastCopied.length == 0) {
+          multiPaste = [];
+          for (var i = 0; i < lastCopied.length; i++)
+            multiPaste.push(doc.splitLines(lastCopied[i]));
+        }
+      } else if (textLines.length == sel.ranges.length) {
+        multiPaste = map(textLines, function(l) { return [l]; });
+      }
+    }
+
+    // Normal behavior is to insert the new text into every selection
+    for (var i = sel.ranges.length - 1; i >= 0; i--) {
+      var range = sel.ranges[i];
+      var from = range.from(), to = range.to();
+      if (range.empty()) {
+        if (deleted && deleted > 0) // Handle deletion
+          from = Pos(from.line, from.ch - deleted);
+        else if (cm.state.overwrite && !paste) // Handle overwrite
+          to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length));
+      }
+      var updateInput = cm.curOp.updateInput;
+      var changeEvent = {from: from, to: to, text: multiPaste ? multiPaste[i % multiPaste.length] : textLines,
+                         origin: origin || (paste ? "paste" : cm.state.cutIncoming ? "cut" : "+input")};
+      makeChange(cm.doc, changeEvent);
+      signalLater(cm, "inputRead", cm, changeEvent);
+    }
+    if (inserted && !paste)
+      triggerElectric(cm, inserted);
+
+    ensureCursorVisible(cm);
+    cm.curOp.updateInput = updateInput;
+    cm.curOp.typing = true;
+    cm.state.pasteIncoming = cm.state.cutIncoming = false;
+  }
+
+  function handlePaste(e, cm) {
+    var pasted = e.clipboardData && e.clipboardData.getData("text/plain");
+    if (pasted) {
+      e.preventDefault();
+      if (!cm.isReadOnly() && !cm.options.disableInput)
+        runInOp(cm, function() { applyTextInput(cm, pasted, 0, null, "paste"); });
+      return true;
+    }
+  }
+
+  function triggerElectric(cm, inserted) {
+    // When an 'electric' character is inserted, immediately trigger a reindent
+    if (!cm.options.electricChars || !cm.options.smartIndent) return;
+    var sel = cm.doc.sel;
+
+    for (var i = sel.ranges.length - 1; i >= 0; i--) {
+      var range = sel.ranges[i];
+      if (range.head.ch > 100 || (i && sel.ranges[i - 1].head.line == range.head.line)) continue;
+      var mode = cm.getModeAt(range.head);
+      var indented = false;
+      if (mode.electricChars) {
+        for (var j = 0; j < mode.electricChars.length; j++)
+          if (inserted.indexOf(mode.electricChars.charAt(j)) > -1) {
+            indented = indentLine(cm, range.head.line, "smart");
+            break;
+          }
+      } else if (mode.electricInput) {
+        if (mode.electricInput.test(getLine(cm.doc, range.head.line).text.slice(0, range.head.ch)))
+          indented = indentLine(cm, range.head.line, "smart");
+      }
+      if (indented) signalLater(cm, "electricInput", cm, range.head.line);
+    }
+  }
+
+  function copyableRanges(cm) {
+    var text = [], ranges = [];
+    for (var i = 0; i < cm.doc.sel.ranges.length; i++) {
+      var line = cm.doc.sel.ranges[i].head.line;
+      var lineRange = {anchor: Pos(line, 0), head: Pos(line + 1, 0)};
+      ranges.push(lineRange);
+      text.push(cm.getRange(lineRange.anchor, lineRange.head));
+    }
+    return {text: text, ranges: ranges};
+  }
+
+  function disableBrowserMagic(field) {
+    field.setAttribute("autocorrect", "off");
+    field.setAttribute("autocapitalize", "off");
+    field.setAttribute("spellcheck", "false");
+  }
+
+  // TEXTAREA INPUT STYLE
+
+  function TextareaInput(cm) {
+    this.cm = cm;
+    // See input.poll and input.reset
+    this.prevInput = "";
+
+    // Flag that indicates whether we expect input to appear real soon
+    // now (after some event like 'keypress' or 'input') and are
+    // polling intensively.
+    this.pollingFast = false;
+    // Self-resetting timeout for the poller
+    this.polling = new Delayed();
+    // Tracks when input.reset has punted to just putting a short
+    // string into the textarea instead of the full selection.
+    this.inaccurateSelection = false;
+    // Used to work around IE issue with selection being forgotten when focus moves away from textarea
+    this.hasSelection = false;
+    this.composing = null;
+  };
+
+  function hiddenTextarea() {
+    var te = elt("textarea", null, null, "position: absolute; padding: 0; width: 1px; height: 1em; outline: none");
+    var div = elt("div", [te], null, "overflow: hidden; position: relative; width: 3px; height: 0px;");
+    // The textarea is kept positioned near the cursor to prevent the
+    // fact that it'll be scrolled into view on input from scrolling
+    // our fake cursor out of view. On webkit, when wrap=off, paste is
+    // very slow. So make the area wide instead.
+    if (webkit) te.style.width = "1000px";
+    else te.setAttribute("wrap", "off");
+    // If border: 0; -- iOS fails to open keyboard (issue #1287)
+    if (ios) te.style.border = "1px solid black";
+    disableBrowserMagic(te);
+    return div;
+  }
+
+  TextareaInput.prototype = copyObj({
+    init: function(display) {
+      var input = this, cm = this.cm;
+
+      // Wraps and hides input textarea
+      var div = this.wrapper = hiddenTextarea();
+      // The semihidden textarea that is focused when the editor is
+      // focused, and receives input.
+      var te = this.textarea = div.firstChild;
+      display.wrapper.insertBefore(div, display.wrapper.firstChild);
+
+      // Needed to hide big blue blinking cursor on Mobile Safari (doesn't seem to work in iOS 8 anymore)
+      if (ios) te.style.width = "0px";
+
+      on(te, "input", function() {
+        if (ie && ie_version >= 9 && input.hasSelection) input.hasSelection = null;
+        input.poll();
+      });
+
+      on(te, "paste", function(e) {
+        if (signalDOMEvent(cm, e) || handlePaste(e, cm)) return
+
+        cm.state.pasteIncoming = true;
+        input.fastPoll();
+      });
+
+      function prepareCopyCut(e) {
+        if (signalDOMEvent(cm, e)) return
+        if (cm.somethingSelected()) {
+          lastCopied = cm.getSelections();
+          if (input.inaccurateSelection) {
+            input.prevInput = "";
+            input.inaccurateSelection = false;
+            te.value = lastCopied.join("\n");
+            selectInput(te);
+          }
+        } else if (!cm.options.lineWiseCopyCut) {
+          return;
+        } else {
+          var ranges = copyableRanges(cm);
+          lastCopied = ranges.text;
+          if (e.type == "cut") {
+            cm.setSelections(ranges.ranges, null, sel_dontScroll);
+          } else {
+            input.prevInput = "";
+            te.value = ranges.text.join("\n");
+            selectInput(te);
+          }
+        }
+        if (e.type == "cut") cm.state.cutIncoming = true;
+      }
+      on(te, "cut", prepareCopyCut);
+      on(te, "copy", prepareCopyCut);
+
+      on(display.scroller, "paste", function(e) {
+        if (eventInWidget(display, e) || signalDOMEvent(cm, e)) return;
+        cm.state.pasteIncoming = true;
+        input.focus();
+      });
+
+      // Prevent normal selection in the editor (we handle our own)
+      on(display.lineSpace, "selectstart", function(e) {
+        if (!eventInWidget(display, e)) e_preventDefault(e);
+      });
+
+      on(te, "compositionstart", function() {
+        var start = cm.getCursor("from");
+        if (input.composing) input.composing.range.clear()
+        input.composing = {
+          start: start,
+          range: cm.markText(start, cm.getCursor("to"), {className: "CodeMirror-composing"})
+        };
+      });
+      on(te, "compositionend", function() {
+        if (input.composing) {
+          input.poll();
+          input.composing.range.clear();
+          input.composing = null;
+        }
+      });
+    },
+
+    prepareSelection: function() {
+      // Redraw the selection and/or cursor
+      var cm = this.cm, display = cm.display, doc = cm.doc;
+      var result = prepareSelection(cm);
+
+      // Move the hidden textarea near the cursor to prevent scrolling artifacts
+      if (cm.options.moveInputWithCursor) {
+        var headPos = cursorCoords(cm, doc.sel.primary().head, "div");
+        var wrapOff = display.wrapper.getBoundingClientRect(), lineOff = display.lineDiv.getBoundingClientRect();
+        result.teTop = Math.max(0, Math.min(display.wrapper.clientHeight - 10,
+                                            headPos.top + lineOff.top - wrapOff.top));
+        result.teLeft = Math.max(0, Math.min(display.wrapper.clientWidth - 10,
+                                             headPos.left + lineOff.left - wrapOff.left));
+      }
+
+      return result;
+    },
+
+    showSelection: function(drawn) {
+      var cm = this.cm, display = cm.display;
+      removeChildrenAndAdd(display.cursorDiv, drawn.cursors);
+      removeChildrenAndAdd(display.selectionDiv, drawn.selection);
+      if (drawn.teTop != null) {
+        this.wrapper.style.top = drawn.teTop + "px";
+        this.wrapper.style.left = drawn.teLeft + "px";
+      }
+    },
+
+    // Reset the input to correspond to the selection (or to be empty,
+    // when not typing and nothing is selected)
+    reset: function(typing) {
+      if (this.contextMenuPending) return;
+      var minimal, selected, cm = this.cm, doc = cm.doc;
+      if (cm.somethingSelected()) {
+        this.prevInput = "";
+        var range = doc.sel.primary();
+        minimal = hasCopyEvent &&
+          (range.to().line - range.from().line > 100 || (selected = cm.getSelection()).length > 1000);
+        var content = minimal ? "-" : selected || cm.getSelection();
+        this.textarea.value = content;
+        if (cm.state.focused) selectInput(this.textarea);
+        if (ie && ie_version >= 9) this.hasSelection = content;
+      } else if (!typing) {
+        this.prevInput = this.textarea.value = "";
+        if (ie && ie_version >= 9) this.hasSelection = null;
+      }
+      this.inaccurateSelection = minimal;
+    },
+
+    getField: function() { return this.textarea; },
+
+    supportsTouch: function() { return false; },
+
+    focus: function() {
+      if (this.cm.options.readOnly != "nocursor" && (!mobile || activeElt() != this.textarea)) {
+        try { this.textarea.focus(); }
+        catch (e) {} // IE8 will throw if the textarea is display: none or not in DOM
+      }
+    },
+
+    blur: function() { this.textarea.blur(); },
+
+    resetPosition: function() {
+      this.wrapper.style.top = this.wrapper.style.left = 0;
+    },
+
+    receivedFocus: function() { this.slowPoll(); },
+
+    // Poll for input changes, using the normal rate of polling. This
+    // runs as long as the editor is focused.
+    slowPoll: function() {
+      var input = this;
+      if (input.pollingFast) return;
+      input.polling.set(this.cm.options.pollInterval, function() {
+        input.poll();
+        if (input.cm.state.focused) input.slowPoll();
+      });
+    },
+
+    // When an event has just come in that is likely to add or change
+    // something in the input textarea, we poll faster, to ensure that
+    // the change appears on the screen quickly.
+    fastPoll: function() {
+      var missed = false, input = this;
+      input.pollingFast = true;
+      function p() {
+        var changed = input.poll();
+        if (!changed && !missed) {missed = true; input.polling.set(60, p);}
+        else {input.pollingFast = false; input.slowPoll();}
+      }
+      input.polling.set(20, p);
+    },
+
+    // Read input from the textarea, and update the document to match.
+    // When something is selected, it is present in the textarea, and
+    // selected (unless it is huge, in which case a placeholder is
+    // used). When nothing is selected, the cursor sits after previously
+    // seen text (can be empty), which is stored in prevInput (we must
+    // not reset the textarea when typing, because that breaks IME).
+    poll: function() {
+      var cm = this.cm, input = this.textarea, prevInput = this.prevInput;
+      // Since this is called a *lot*, try to bail out as cheaply as
+      // possible when it is clear that nothing happened. hasSelection
+      // will be the case when there is a lot of text in the textarea,
+      // in which case reading its value would be expensive.
+      if (this.contextMenuPending || !cm.state.focused ||
+          (hasSelection(input) && !prevInput && !this.composing) ||
+          cm.isReadOnly() || cm.options.disableInput || cm.state.keySeq)
+        return false;
+
+      var text = input.value;
+      // If nothing changed, bail.
+      if (text == prevInput && !cm.somethingSelected()) return false;
+      // Work around nonsensical selection resetting in IE9/10, and
+      // inexplicable appearance of private area unicode characters on
+      // some key combos in Mac (#2689).
+      if (ie && ie_version >= 9 && this.hasSelection === text ||
+          mac && /[\uf700-\uf7ff]/.test(text)) {
+        cm.display.input.reset();
+        return false;
+      }
+
+      if (cm.doc.sel == cm.display.selForContextMenu) {
+        var first = text.charCodeAt(0);
+        if (first == 0x200b && !prevInput) prevInput = "\u200b";
+        if (first == 0x21da) { this.reset(); return this.cm.execCommand("undo"); }
+      }
+      // Find the part of the input that is actually new
+      var same = 0, l = Math.min(prevInput.length, text.length);
+      while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) ++same;
+
+      var self = this;
+      runInOp(cm, function() {
+        applyTextInput(cm, text.slice(same), prevInput.length - same,
+                       null, self.composing ? "*compose" : null);
+
+        // Don't leave long text in the textarea, since it makes further polling slow
+        if (text.length > 1000 || text.indexOf("\n") > -1) input.value = self.prevInput = "";
+        else self.prevInput = text;
+
+        if (self.composing) {
+          self.composing.range.clear();
+          self.composing.range = cm.markText(self.composing.start, cm.getCursor("to"),
+                                             {className: "CodeMirror-composing"});
+        }
+      });
+      return true;
+    },
+
+    ensurePolled: function() {
+      if (this.pollingFast && this.poll()) this.pollingFast = false;
+    },
+
+    onKeyPress: function() {
+      if (ie && ie_version >= 9) this.hasSelection = null;
+      this.fastPoll();
+    },
+
+    onContextMenu: function(e) {
+      var input = this, cm = input.cm, display = cm.display, te = input.textarea;
+      var pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop;
+      if (!pos || presto) return; // Opera is difficult.
+
+      // Reset the current text selection only if the click is done outside of the selection
+      // and 'resetSelectionOnContextMenu' option is true.
+      var reset = cm.options.resetSelectionOnContextMenu;
+      if (reset && cm.doc.sel.contains(pos) == -1)
+        operation(cm, setSelection)(cm.doc, simpleSelection(pos), sel_dontScroll);
+
+      var oldCSS = te.style.cssText, oldWrapperCSS = input.wrapper.style.cssText;
+      input.wrapper.style.cssText = "position: absolute"
+      var wrapperBox = input.wrapper.getBoundingClientRect()
+      te.style.cssText = "position: absolute; width: 30px; height: 30px; top: " + (e.clientY - wrapperBox.top - 5) +
+        "px; left: " + (e.clientX - wrapperBox.left - 5) + "px; z-index: 1000; background: " +
+        (ie ? "rgba(255, 255, 255, .05)" : "transparent") +
+        "; outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);";
+      if (webkit) var oldScrollY = window.scrollY; // Work around Chrome issue (#2712)
+      display.input.focus();
+      if (webkit) window.scrollTo(null, oldScrollY);
+      display.input.reset();
+      // Adds "Select all" to context menu in FF
+      if (!cm.somethingSelected()) te.value = input.prevInput = " ";
+      input.contextMenuPending = true;
+      display.selForContextMenu = cm.doc.sel;
+      clearTimeout(display.detectingSelectAll);
+
+      // Select-all will be greyed out if there's nothing to select, so
+      // this adds a zero-width space so that we can later check whether
+      // it got selected.
+      function prepareSelectAllHack() {
+        if (te.selectionStart != null) {
+          var selected = cm.somethingSelected();
+          var extval = "\u200b" + (selected ? te.value : "");
+          te.value = "\u21da"; // Used to catch context-menu undo
+          te.value = extval;
+          input.prevInput = selected ? "" : "\u200b";
+          te.selectionStart = 1; te.selectionEnd = extval.length;
+          // Re-set this, in case some other handler touched the
+          // selection in the meantime.
+          display.selForContextMenu = cm.doc.sel;
+        }
+      }
+      function rehide() {
+        input.contextMenuPending = false;
+        input.wrapper.style.cssText = oldWrapperCSS
+        te.style.cssText = oldCSS;
+        if (ie && ie_version < 9) display.scrollbars.setScrollTop(display.scroller.scrollTop = scrollPos);
+
+        // Try to detect the user choosing select-all
+        if (te.selectionStart != null) {
+          if (!ie || (ie && ie_version < 9)) prepareSelectAllHack();
+          var i = 0, poll = function() {
+            if (display.selForContextMenu == cm.doc.sel && te.selectionStart == 0 &&
+                te.selectionEnd > 0 && input.prevInput == "\u200b")
+              operation(cm, commands.selectAll)(cm);
+            else if (i++ < 10) display.detectingSelectAll = setTimeout(poll, 500);
+            else display.input.reset();
+          };
+          display.detectingSelectAll = setTimeout(poll, 200);
+        }
+      }
+
+      if (ie && ie_version >= 9) prepareSelectAllHack();
+      if (captureRightClick) {
+        e_stop(e);
+        var mouseup = function() {
+          off(window, "mouseup", mouseup);
+          setTimeout(rehide, 20);
+        };
+        on(window, "mouseup", mouseup);
+      } else {
+        setTimeout(rehide, 50);
+      }
+    },
+
+    readOnlyChanged: function(val) {
+      if (!val) this.reset();
+    },
+
+    setUneditable: nothing,
+
+    needsContentAttribute: false
+  }, TextareaInput.prototype);
+
+  // CONTENTEDITABLE INPUT STYLE
+
+  function ContentEditableInput(cm) {
+    this.cm = cm;
+    this.lastAnchorNode = this.lastAnchorOffset = this.lastFocusNode = this.lastFocusOffset = null;
+    this.polling = new Delayed();
+    this.gracePeriod = false;
+  }
+
+  ContentEditableInput.prototype = copyObj({
+    init: function(display) {
+      var input = this, cm = input.cm;
+      var div = input.div = display.lineDiv;
+      disableBrowserMagic(div);
+
+      on(div, "paste", function(e) {
+        if (!signalDOMEvent(cm, e)) handlePaste(e, cm);
+      })
+
+      on(div, "compositionstart", function(e) {
+        var data = e.data;
+        input.composing = {sel: cm.doc.sel, data: data, startData: data};
+        if (!data) return;
+        var prim = cm.doc.sel.primary();
+        var line = cm.getLine(prim.head.line);
+        var found = line.indexOf(data, Math.max(0, prim.head.ch - data.length));
+        if (found > -1 && found <= prim.head.ch)
+          input.composing.sel = simpleSelection(Pos(prim.head.line, found),
+                                                Pos(prim.head.line, found + data.length));
+      });
+      on(div, "compositionupdate", function(e) {
+        input.composing.data = e.data;
+      });
+      on(div, "compositionend", function(e) {
+        var ours = input.composing;
+        if (!ours) return;
+        if (e.data != ours.startData && !/\u200b/.test(e.data))
+          ours.data = e.data;
+        // Need a small delay to prevent other code (input event,
+        // selection polling) from doing damage when fired right after
+        // compositionend.
+        setTimeout(function() {
+          if (!ours.handled)
+            input.applyComposition(ours);
+          if (input.composing == ours)
+            input.composing = null;
+        }, 50);
+      });
+
+      on(div, "touchstart", function() {
+        input.forceCompositionEnd();
+      });
+
+      on(div, "input", function() {
+        if (input.composing) return;
+        if (cm.isReadOnly() || !input.pollContent())
+          runInOp(input.cm, function() {regChange(cm);});
+      });
+
+      function onCopyCut(e) {
+        if (signalDOMEvent(cm, e)) return
+        if (cm.somethingSelected()) {
+          lastCopied = cm.getSelections();
+          if (e.type == "cut") cm.replaceSelection("", null, "cut");
+        } else if (!cm.options.lineWiseCopyCut) {
+          return;
+        } else {
+          var ranges = copyableRanges(cm);
+          lastCopied = ranges.text;
+          if (e.type == "cut") {
+            cm.operation(function() {
+              cm.setSelections(ranges.ranges, 0, sel_dontScroll);
+              cm.replaceSelection("", null, "cut");
+            });
+          }
+        }
+        // iOS exposes the clipboard API, but seems to discard content inserted into it
+        if (e.clipboardData && !ios) {
+          e.preventDefault();
+          e.clipboardData.clearData();
+          e.clipboardData.setData("text/plain", lastCopied.join("\n"));
+        } else {
+          // Old-fashioned briefly-focus-a-textarea hack
+          var kludge = hiddenTextarea(), te = kludge.firstChild;
+          cm.display.lineSpace.insertBefore(kludge, cm.display.lineSpace.firstChild);
+          te.value = lastCopied.join("\n");
+          var hadFocus = document.activeElement;
+          selectInput(te);
+          setTimeout(function() {
+            cm.display.lineSpace.removeChild(kludge);
+            hadFocus.focus();
+          }, 50);
+        }
+      }
+      on(div, "copy", onCopyCut);
+      on(div, "cut", onCopyCut);
+    },
+
+    prepareSelection: function() {
+      var result = prepareSelection(this.cm, false);
+      result.focus = this.cm.state.focused;
+      return result;
+    },
+
+    showSelection: function(info) {
+      if (!info || !this.cm.display.view.length) return;
+      if (info.focus) this.showPrimarySelection();
+      this.showMultipleSelections(info);
+    },
+
+    showPrimarySelection: function() {
+      var sel = window.getSelection(), prim = this.cm.doc.sel.primary();
+      var curAnchor = domToPos(this.cm, sel.anchorNode, sel.anchorOffset);
+      var curFocus = domToPos(this.cm, sel.focusNode, sel.focusOffset);
+      if (curAnchor && !curAnchor.bad && curFocus && !curFocus.bad &&
+          cmp(minPos(curAnchor, curFocus), prim.from()) == 0 &&
+          cmp(maxPos(curAnchor, curFocus), prim.to()) == 0)
+        return;
+
+      var start = posToDOM(this.cm, prim.from());
+      var end = posToDOM(this.cm, prim.to());
+      if (!start && !end) return;
+
+      var view = this.cm.display.view;
+      var old = sel.rangeCount && sel.getRangeAt(0);
+      if (!start) {
+        start = {node: view[0].measure.map[2], offset: 0};
+      } else if (!end) { // FIXME dangerously hacky
+        var measure = view[view.length - 1].measure;
+        var map = measure.maps ? measure.maps[measure.maps.length - 1] : measure.map;
+        end = {node: map[map.length - 1], offset: map[map.length - 2] - map[map.length - 3]};
+      }
+
+      try { var rng = range(start.node, start.offset, end.offset, end.node); }
+      catch(e) {} // Our model of the DOM might be outdated, in which case the range we try to set can be impossible
+      if (rng) {
+        if (!gecko && this.cm.state.focused) {
+          sel.collapse(start.node, start.offset);
+          if (!rng.collapsed) sel.addRange(rng);
+        } else {
+          sel.removeAllRanges();
+          sel.addRange(rng);
+        }
+        if (old && sel.anchorNode == null) sel.addRange(old);
+        else if (gecko) this.startGracePeriod();
+      }
+      this.rememberSelection();
+    },
+
+    startGracePeriod: function() {
+      var input = this;
+      clearTimeout(this.gracePeriod);
+      this.gracePeriod = setTimeout(function() {
+        input.gracePeriod = false;
+        if (input.selectionChanged())
+          input.cm.operation(function() { input.cm.curOp.selectionChanged = true; });
+      }, 20);
+    },
+
+    showMultipleSelections: function(info) {
+      removeChildrenAndAdd(this.cm.display.cursorDiv, info.cursors);
+      removeChildrenAndAdd(this.cm.display.selectionDiv, info.selection);
+    },
+
+    rememberSelection: function() {
+      var sel = window.getSelection();
+      this.lastAnchorNode = sel.anchorNode; this.lastAnchorOffset = sel.anchorOffset;
+      this.lastFocusNode = sel.focusNode; this.lastFocusOffset = sel.focusOffset;
+    },
+
+    selectionInEditor: function() {
+      var sel = window.getSelection();
+      if (!sel.rangeCount) return false;
+      var node = sel.getRangeAt(0).commonAncestorContainer;
+      return contains(this.div, node);
+    },
+
+    focus: function() {
+      if (this.cm.options.readOnly != "nocursor") this.div.focus();
+    },
+    blur: function() { this.div.blur(); },
+    getField: function() { return this.div; },
+
+    supportsTouch: function() { return true; },
+
+    receivedFocus: function() {
+      var input = this;
+      if (this.selectionInEditor())
+        this.pollSelection();
+      else
+        runInOp(this.cm, function() { input.cm.curOp.selectionChanged = true; });
+
+      function poll() {
+        if (input.cm.state.focused) {
+          input.pollSelection();
+          input.polling.set(input.cm.options.pollInterval, poll);
+        }
+      }
+      this.polling.set(this.cm.options.pollInterval, poll);
+    },
+
+    selectionChanged: function() {
+      var sel = window.getSelection();
+      return sel.anchorNode != this.lastAnchorNode || sel.anchorOffset != this.lastAnchorOffset ||
+        sel.focusNode != this.lastFocusNode || sel.focusOffset != this.lastFocusOffset;
+    },
+
+    pollSelection: function() {
+      if (!this.composing && !this.gracePeriod && this.selectionChanged()) {
+        var sel = window.getSelection(), cm = this.cm;
+        this.rememberSelection();
+        var anchor = domToPos(cm, sel.anchorNode, sel.anchorOffset);
+        var head = domToPos(cm, sel.focusNode, sel.focusOffset);
+        if (anchor && head) runInOp(cm, function() {
+          setSelection(cm.doc, simpleSelection(anchor, head), sel_dontScroll);
+          if (anchor.bad || head.bad) cm.curOp.selectionChanged = true;
+        });
+      }
+    },
+
+    pollContent: function() {
+      var cm = this.cm, display = cm.display, sel = cm.doc.sel.primary();
+      var from = sel.from(), to = sel.to();
+      if (from.line < display.viewFrom || to.line > display.viewTo - 1) return false;
+
+      var fromIndex;
+      if (from.line == display.viewFrom || (fromIndex = findViewIndex(cm, from.line)) == 0) {
+        var fromLine = lineNo(display.view[0].line);
+        var fromNode = display.view[0].node;
+      } else {
+        var fromLine = lineNo(display.view[fromIndex].line);
+        var fromNode = display.view[fromIndex - 1].node.nextSibling;
+      }
+      var toIndex = findViewIndex(cm, to.line);
+      if (toIndex == display.view.length - 1) {
+        var toLine = display.viewTo - 1;
+        var toNode = display.lineDiv.lastChild;
+      } else {
+        var toLine = lineNo(display.view[toIndex + 1].line) - 1;
+        var toNode = display.view[toIndex + 1].node.previousSibling;
+      }
+
+      var newText = cm.doc.splitLines(domTextBetween(cm, fromNode, toNode, fromLine, toLine));
+      var oldText = getBetween(cm.doc, Pos(fromLine, 0), Pos(toLine, getLine(cm.doc, toLine).text.length));
+      while (newText.length > 1 && oldText.length > 1) {
+        if (lst(newText) == lst(oldText)) { newText.pop(); oldText.pop(); toLine--; }
+        else if (newText[0] == oldText[0]) { newText.shift(); oldText.shift(); fromLine++; }
+        else break;
+      }
+
+      var cutFront = 0, cutEnd = 0;
+      var newTop = newText[0], oldTop = oldText[0], maxCutFront = Math.min(newTop.length, oldTop.length);
+      while (cutFront < maxCutFront && newTop.charCodeAt(cutFront) == oldTop.charCodeAt(cutFront))
+        ++cutFront;
+      var newBot = lst(newText), oldBot = lst(oldText);
+      var maxCutEnd = Math.min(newBot.length - (newText.length == 1 ? cutFront : 0),
+                               oldBot.length - (oldText.length == 1 ? cutFront : 0));
+      while (cutEnd < maxCutEnd &&
+             newBot.charCodeAt(newBot.length - cutEnd - 1) == oldBot.charCodeAt(oldBot.length - cutEnd - 1))
+        ++cutEnd;
+
+      newText[newText.length - 1] = newBot.slice(0, newBot.length - cutEnd);
+      newText[0] = newText[0].slice(cutFront);
+
+      var chFrom = Pos(fromLine, cutFront);
+      var chTo = Pos(toLine, oldText.length ? lst(oldText).length - cutEnd : 0);
+      if (newText.length > 1 || newText[0] || cmp(chFrom, chTo)) {
+        replaceRange(cm.doc, newText, chFrom, chTo, "+input");
+        return true;
+      }
+    },
+
+    ensurePolled: function() {
+      this.forceCompositionEnd();
+    },
+    reset: function() {
+      this.forceCompositionEnd();
+    },
+    forceCompositionEnd: function() {
+      if (!this.composing || this.composing.handled) return;
+      this.applyComposition(this.composing);
+      this.composing.handled = true;
+      this.div.blur();
+      this.div.focus();
+    },
+    applyComposition: function(composing) {
+      if (this.cm.isReadOnly())
+        operation(this.cm, regChange)(this.cm)
+      else if (composing.data && composing.data != composing.startData)
+        operation(this.cm, applyTextInput)(this.cm, composing.data, 0, composing.sel);
+    },
+
+    setUneditable: function(node) {
+      node.contentEditable = "false"
+    },
+
+    onKeyPress: function(e) {
+      e.preventDefault();
+      if (!this.cm.isReadOnly())
+        operation(this.cm, applyTextInput)(this.cm, String.fromCharCode(e.charCode == null ? e.keyCode : e.charCode), 0);
+    },
+
+    readOnlyChanged: function(val) {
+      this.div.contentEditable = String(val != "nocursor")
+    },
+
+    onContextMenu: nothing,
+    resetPosition: nothing,
+
+    needsContentAttribute: true
+  }, ContentEditableInput.prototype);
+
+  function posToDOM(cm, pos) {
+    var view = findViewForLine(cm, pos.line);
+    if (!view || view.hidden) return null;
+    var line = getLine(cm.doc, pos.line);
+    var info = mapFromLineView(view, line, pos.line);
+
+    var order = getOrder(line), side = "left";
+    if (order) {
+      var partPos = getBidiPartAt(order, pos.ch);
+      side = partPos % 2 ? "right" : "left";
+    }
+    var result = nodeAndOffsetInLineMap(info.map, pos.ch, side);
+    result.offset = result.collapse == "right" ? result.end : result.start;
+    return result;
+  }
+
+  function badPos(pos, bad) { if (bad) pos.bad = true; return pos; }
+
+  function domToPos(cm, node, offset) {
+    var lineNode;
+    if (node == cm.display.lineDiv) {
+      lineNode = cm.display.lineDiv.childNodes[offset];
+      if (!lineNode) return badPos(cm.clipPos(Pos(cm.display.viewTo - 1)), true);
+      node = null; offset = 0;
+    } else {
+      for (lineNode = node;; lineNode = lineNode.parentNode) {
+        if (!lineNode || lineNode == cm.display.lineDiv) return null;
+        if (lineNode.parentNode && lineNode.parentNode == cm.display.lineDiv) break;
+      }
+    }
+    for (var i = 0; i < cm.display.view.length; i++) {
+      var lineView = cm.display.view[i];
+      if (lineView.node == lineNode)
+        return locateNodeInLineView(lineView, node, offset);
+    }
+  }
+
+  function locateNodeInLineView(lineView, node, offset) {
+    var wrapper = lineView.text.firstChild, bad = false;
+    if (!node || !contains(wrapper, node)) return badPos(Pos(lineNo(lineView.line), 0), true);
+    if (node == wrapper) {
+      bad = true;
+      node = wrapper.childNodes[offset];
+      offset = 0;
+      if (!node) {
+        var line = lineView.rest ? lst(lineView.rest) : lineView.line;
+        return badPos(Pos(lineNo(line), line.text.length), bad);
+      }
+    }
+
+    var textNode = node.nodeType == 3 ? node : null, topNode = node;
+    if (!textNode && node.childNodes.length == 1 && node.firstChild.nodeType == 3) {
+      textNode = node.firstChild;
+      if (offset) offset = textNode.nodeValue.length;
+    }
+    while (topNode.parentNode != wrapper) topNode = topNode.parentNode;
+    var measure = lineView.measure, maps = measure.maps;
+
+    function find(textNode, topNode, offset) {
+      for (var i = -1; i < (maps ? maps.length : 0); i++) {
+        var map = i < 0 ? measure.map : maps[i];
+        for (var j = 0; j < map.length; j += 3) {
+          var curNode = map[j + 2];
+          if (curNode == textNode || curNode == topNode) {
+            var line = lineNo(i < 0 ? lineView.line : lineView.rest[i]);
+            var ch = map[j] + offset;
+            if (offset < 0 || curNode != textNode) ch = map[j + (offset ? 1 : 0)];
+            return Pos(line, ch);
+          }
+        }
+      }
+    }
+    var found = find(textNode, topNode, offset);
+    if (found) return badPos(found, bad);
+
+    // FIXME this is all really shaky. might handle the few cases it needs to handle, but likely to cause problems
+    for (var after = topNode.nextSibling, dist = textNode ? textNode.nodeValue.length - offset : 0; after; after = after.nextSibling) {
+      found = find(after, after.firstChild, 0);
+      if (found)
+        return badPos(Pos(found.line, found.ch - dist), bad);
+      else
+        dist += after.textContent.length;
+    }
+    for (var before = topNode.previousSibling, dist = offset; before; before = before.previousSibling) {
+      found = find(before, before.firstChild, -1);
+      if (found)
+        return badPos(Pos(found.line, found.ch + dist), bad);
+      else
+        dist += after.textContent.length;
+    }
+  }
+
+  function domTextBetween(cm, from, to, fromLine, toLine) {
+    var text = "", closing = false, lineSep = cm.doc.lineSeparator();
+    function recognizeMarker(id) { return function(marker) { return marker.id == id; }; }
+    function walk(node) {
+      if (node.nodeType == 1) {
+        var cmText = node.getAttribute("cm-text");
+        if (cmText != null) {
+          if (cmText == "") cmText = node.textContent.replace(/\u200b/g, "");
+          text += cmText;
+          return;
+        }
+        var markerID = node.getAttribute("cm-marker"), range;
+        if (markerID) {
+          var found = cm.findMarks(Pos(fromLine, 0), Pos(toLine + 1, 0), recognizeMarker(+markerID));
+          if (found.length && (range = found[0].find()))
+            text += getBetween(cm.doc, range.from, range.to).join(lineSep);
+          return;
+        }
+        if (node.getAttribute("contenteditable") == "false") return;
+        for (var i = 0; i < node.childNodes.length; i++)
+          walk(node.childNodes[i]);
+        if (/^(pre|div|p)$/i.test(node.nodeName))
+          closing = true;
+      } else if (node.nodeType == 3) {
+        var val = node.nodeValue;
+        if (!val) return;
+        if (closing) {
+          text += lineSep;
+          closing = false;
+        }
+        text += val;
+      }
+    }
+    for (;;) {
+      walk(from);
+      if (from == to) break;
+      from = from.nextSibling;
+    }
+    return text;
+  }
+
+  CodeMirror.inputStyles = {"textarea": TextareaInput, "contenteditable": ContentEditableInput};
+
   // SELECTION / CURSOR
 
   // Selection objects are immutable. A new one is created every time
@@ -1111,7 +2161,7 @@
 
   // Give beforeSelectionChange handlers a change to influence a
   // selection update.
-  function filterSelectionChange(doc, sel) {
+  function filterSelectionChange(doc, sel, options) {
     var obj = {
       ranges: sel.ranges,
       update: function(ranges) {
@@ -1119,7 +2169,8 @@
         for (var i = 0; i < ranges.length; i++)
           this.ranges[i] = new Range(clipPos(doc, ranges[i].anchor),
                                      clipPos(doc, ranges[i].head));
-      }
+      },
+      origin: options && options.origin
     };
     signal(doc, "beforeSelectionChange", doc, obj);
     if (doc.cm) signal(doc.cm, "beforeSelectionChange", doc.cm, obj);
@@ -1145,9 +2196,10 @@
 
   function setSelectionNoUndo(doc, sel, options) {
     if (hasHandler(doc, "beforeSelectionChange") || doc.cm && hasHandler(doc.cm, "beforeSelectionChange"))
-      sel = filterSelectionChange(doc, sel);
+      sel = filterSelectionChange(doc, sel, options);
 
-    var bias = cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1;
+    var bias = options && options.bias ||
+      (cmp(sel.primary().head, doc.sel.primary().head) < 0 ? -1 : 1);
     setSelectionInner(doc, skipAtomicInSelection(doc, sel, bias, true));
 
     if (!(options && options.scroll === false) && doc.cm)
@@ -1178,8 +2230,9 @@
     var out;
     for (var i = 0; i < sel.ranges.length; i++) {
       var range = sel.ranges[i];
-      var newAnchor = skipAtomic(doc, range.anchor, bias, mayClear);
-      var newHead = skipAtomic(doc, range.head, bias, mayClear);
+      var old = sel.ranges.length == doc.sel.ranges.length && doc.sel.ranges[i];
+      var newAnchor = skipAtomic(doc, range.anchor, old && old.anchor, bias, mayClear);
+      var newHead = skipAtomic(doc, range.head, old && old.head, bias, mayClear);
       if (out || newAnchor != range.anchor || newHead != range.head) {
         if (!out) out = sel.ranges.slice(0, i);
         out[i] = new Range(newAnchor, newHead);
@@ -1188,93 +2241,91 @@
     return out ? normalizeSelection(out, sel.primIndex) : sel;
   }
 
-  // Ensure a given position is not inside an atomic range.
-  function skipAtomic(doc, pos, bias, mayClear) {
-    var flipped = false, curPos = pos;
-    var dir = bias || 1;
-    doc.cantEdit = false;
-    search: for (;;) {
-      var line = getLine(doc, curPos.line);
-      if (line.markedSpans) {
-        for (var i = 0; i < line.markedSpans.length; ++i) {
-          var sp = line.markedSpans[i], m = sp.marker;
-          if ((sp.from == null || (m.inclusiveLeft ? sp.from <= curPos.ch : sp.from < curPos.ch)) &&
-              (sp.to == null || (m.inclusiveRight ? sp.to >= curPos.ch : sp.to > curPos.ch))) {
-            if (mayClear) {
-              signal(m, "beforeCursorEnter");
-              if (m.explicitlyCleared) {
-                if (!line.markedSpans) break;
-                else {--i; continue;}
-              }
-            }
-            if (!m.atomic) continue;
-            var newPos = m.find(dir < 0 ? -1 : 1);
-            if (cmp(newPos, curPos) == 0) {
-              newPos.ch += dir;
-              if (newPos.ch < 0) {
-                if (newPos.line > doc.first) newPos = clipPos(doc, Pos(newPos.line - 1));
-                else newPos = null;
-              } else if (newPos.ch > line.text.length) {
-                if (newPos.line < doc.first + doc.size - 1) newPos = Pos(newPos.line + 1, 0);
-                else newPos = null;
-              }
-              if (!newPos) {
-                if (flipped) {
-                  // Driven in a corner -- no valid cursor position found at all
-                  // -- try again *with* clearing, if we didn't already
-                  if (!mayClear) return skipAtomic(doc, pos, bias, true);
-                  // Otherwise, turn off editing until further notice, and return the start of the doc
-                  doc.cantEdit = true;
-                  return Pos(doc.first, 0);
-                }
-                flipped = true; newPos = pos; dir = -dir;
-              }
-            }
-            curPos = newPos;
-            continue search;
+  function skipAtomicInner(doc, pos, oldPos, dir, mayClear) {
+    var line = getLine(doc, pos.line);
+    if (line.markedSpans) for (var i = 0; i < line.markedSpans.length; ++i) {
+      var sp = line.markedSpans[i], m = sp.marker;
+      if ((sp.from == null || (m.inclusiveLeft ? sp.from <= pos.ch : sp.from < pos.ch)) &&
+          (sp.to == null || (m.inclusiveRight ? sp.to >= pos.ch : sp.to > pos.ch))) {
+        if (mayClear) {
+          signal(m, "beforeCursorEnter");
+          if (m.explicitlyCleared) {
+            if (!line.markedSpans) break;
+            else {--i; continue;}
           }
         }
+        if (!m.atomic) continue;
+
+        if (oldPos) {
+          var near = m.find(dir < 0 ? 1 : -1), diff;
+          if (dir < 0 ? m.inclusiveRight : m.inclusiveLeft)
+            near = movePos(doc, near, -dir, near && near.line == pos.line ? line : null);
+          if (near && near.line == pos.line && (diff = cmp(near, oldPos)) && (dir < 0 ? diff < 0 : diff > 0))
+            return skipAtomicInner(doc, near, pos, dir, mayClear);
+        }
+
+        var far = m.find(dir < 0 ? -1 : 1);
+        if (dir < 0 ? m.inclusiveLeft : m.inclusiveRight)
+          far = movePos(doc, far, dir, far.line == pos.line ? line : null);
+        return far ? skipAtomicInner(doc, far, pos, dir, mayClear) : null;
       }
-      return curPos;
+    }
+    return pos;
+  }
+
+  // Ensure a given position is not inside an atomic range.
+  function skipAtomic(doc, pos, oldPos, bias, mayClear) {
+    var dir = bias || 1;
+    var found = skipAtomicInner(doc, pos, oldPos, dir, mayClear) ||
+        (!mayClear && skipAtomicInner(doc, pos, oldPos, dir, true)) ||
+        skipAtomicInner(doc, pos, oldPos, -dir, mayClear) ||
+        (!mayClear && skipAtomicInner(doc, pos, oldPos, -dir, true));
+    if (!found) {
+      doc.cantEdit = true;
+      return Pos(doc.first, 0);
+    }
+    return found;
+  }
+
+  function movePos(doc, pos, dir, line) {
+    if (dir < 0 && pos.ch == 0) {
+      if (pos.line > doc.first) return clipPos(doc, Pos(pos.line - 1));
+      else return null;
+    } else if (dir > 0 && pos.ch == (line || getLine(doc, pos.line)).text.length) {
+      if (pos.line < doc.first + doc.size - 1) return Pos(pos.line + 1, 0);
+      else return null;
+    } else {
+      return new Pos(pos.line, pos.ch + dir);
     }
   }
 
   // SELECTION DRAWING
 
-  // Redraw the selection and/or cursor
   function updateSelection(cm) {
-    var display = cm.display, doc = cm.doc;
-    var curFragment = document.createDocumentFragment();
-    var selFragment = document.createDocumentFragment();
+    cm.display.input.showSelection(cm.display.input.prepareSelection());
+  }
+
+  function prepareSelection(cm, primary) {
+    var doc = cm.doc, result = {};
+    var curFragment = result.cursors = document.createDocumentFragment();
+    var selFragment = result.selection = document.createDocumentFragment();
 
     for (var i = 0; i < doc.sel.ranges.length; i++) {
+      if (primary === false && i == doc.sel.primIndex) continue;
       var range = doc.sel.ranges[i];
+      if (range.from().line >= cm.display.viewTo || range.to().line < cm.display.viewFrom) continue;
       var collapsed = range.empty();
       if (collapsed || cm.options.showCursorWhenSelecting)
-        drawSelectionCursor(cm, range, curFragment);
+        drawSelectionCursor(cm, range.head, curFragment);
       if (!collapsed)
         drawSelectionRange(cm, range, selFragment);
     }
-
-    // Move the hidden textarea near the cursor to prevent scrolling artifacts
-    if (cm.options.moveInputWithCursor) {
-      var headPos = cursorCoords(cm, doc.sel.primary().head, "div");
-      var wrapOff = display.wrapper.getBoundingClientRect(), lineOff = display.lineDiv.getBoundingClientRect();
-      var top = Math.max(0, Math.min(display.wrapper.clientHeight - 10,
-                                     headPos.top + lineOff.top - wrapOff.top));
-      var left = Math.max(0, Math.min(display.wrapper.clientWidth - 10,
-                                      headPos.left + lineOff.left - wrapOff.left));
-      display.inputDiv.style.top = top + "px";
-      display.inputDiv.style.left = left + "px";
-    }
-
-    removeChildrenAndAdd(display.cursorDiv, curFragment);
-    removeChildrenAndAdd(display.selectionDiv, selFragment);
+    return result;
   }
 
   // Draws a cursor for the given range
-  function drawSelectionCursor(cm, range, output) {
-    var pos = cursorCoords(cm, range.head, "div");
+  function drawSelectionCursor(cm, head, output) {
+    var pos = cursorCoords(cm, head, "div", null, null, !cm.options.singleCursorHeightPerLine);
 
     var cursor = output.appendChild(elt("div", "\u00a0", "CodeMirror-cursor"));
     cursor.style.left = pos.left + "px";
@@ -1295,7 +2346,8 @@
   function drawSelectionRange(cm, range, output) {
     var display = cm.display, doc = cm.doc;
     var fragment = document.createDocumentFragment();
-    var padding = paddingH(cm.display), leftSide = padding.left, rightSide = display.lineSpace.offsetWidth - padding.right;
+    var padding = paddingH(cm.display), leftSide = padding.left;
+    var rightSide = Math.max(display.sizerWidth, displayWidth(cm) - display.sizer.offsetLeft) - padding.right;
 
     function add(left, top, width, bottom) {
       if (top < 0) top = 0;
@@ -1376,6 +2428,8 @@
       display.blinker = setInterval(function() {
         display.cursorDiv.style.visibility = (on = !on) ? "" : "hidden";
       }, cm.options.cursorBlinkRate);
+    else if (cm.options.cursorBlinkRate < 0)
+      display.cursorDiv.style.visibility = "hidden";
   }
 
   // HIGHLIGHT WORKER
@@ -1391,21 +2445,24 @@
     if (doc.frontier >= cm.display.viewTo) return;
     var end = +new Date + cm.options.workTime;
     var state = copyState(doc.mode, getStateBefore(cm, doc.frontier));
+    var changedLines = [];
 
-    runInOp(cm, function() {
     doc.iter(doc.frontier, Math.min(doc.first + doc.size, cm.display.viewTo + 500), function(line) {
       if (doc.frontier >= cm.display.viewFrom) { // Visible
-        var oldStyles = line.styles;
-        var highlighted = highlightLine(cm, line, state, true);
+        var oldStyles = line.styles, tooLong = line.text.length > cm.options.maxHighlightLength;
+        var highlighted = highlightLine(cm, line, tooLong ? copyState(doc.mode, state) : state, true);
         line.styles = highlighted.styles;
-        if (highlighted.classes) line.styleClasses = highlighted.classes;
-        else if (line.styleClasses) line.styleClasses = null;
-        var ischange = !oldStyles || oldStyles.length != line.styles.length;
+        var oldCls = line.styleClasses, newCls = highlighted.classes;
+        if (newCls) line.styleClasses = newCls;
+        else if (oldCls) line.styleClasses = null;
+        var ischange = !oldStyles || oldStyles.length != line.styles.length ||
+          oldCls != newCls && (!oldCls || !newCls || oldCls.bgClass != newCls.bgClass || oldCls.textClass != newCls.textClass);
         for (var i = 0; !ischange && i < oldStyles.length; ++i) ischange = oldStyles[i] != line.styles[i];
-        if (ischange) regLineChange(cm, doc.frontier, "text");
-        line.stateAfter = copyState(doc.mode, state);
+        if (ischange) changedLines.push(doc.frontier);
+        line.stateAfter = tooLong ? state : copyState(doc.mode, state);
       } else {
-        processLine(cm, line.text, state);
+        if (line.text.length <= cm.options.maxHighlightLength)
+          processLine(cm, line.text, state);
         line.stateAfter = doc.frontier % 5 == 0 ? copyState(doc.mode, state) : null;
       }
       ++doc.frontier;
@@ -1414,6 +2471,9 @@
         return true;
       }
     });
+    if (changedLines.length) runInOp(cm, function() {
+      for (var i = 0; i < changedLines.length; i++)
+        regLineChange(cm, changedLines[i], "text");
     });
   }
 
@@ -1467,13 +2527,21 @@
     return data;
   }
 
+  function scrollGap(cm) { return scrollerGap - cm.display.nativeBarWidth; }
+  function displayWidth(cm) {
+    return cm.display.scroller.clientWidth - scrollGap(cm) - cm.display.barWidth;
+  }
+  function displayHeight(cm) {
+    return cm.display.scroller.clientHeight - scrollGap(cm) - cm.display.barHeight;
+  }
+
   // Ensure the lineView.wrapping.heights array is populated. This is
   // an array of bottom offsets for the lines that make up a drawn
   // line. When lineWrapping is on, there might be more than one
   // height.
   function ensureLineHeights(cm, lineView, rect) {
     var wrapping = cm.options.lineWrapping;
-    var curWidth = wrapping && cm.display.scroller.clientWidth;
+    var curWidth = wrapping && displayWidth(cm);
     if (!lineView.measure.heights || wrapping && lineView.measure.width != curWidth) {
       var heights = lineView.measure.heights = [];
       if (wrapping) {
@@ -1539,10 +2607,12 @@
   function prepareMeasureForLine(cm, line) {
     var lineN = lineNo(line);
     var view = findViewForLine(cm, lineN);
-    if (view && !view.text)
+    if (view && !view.text) {
       view = null;
-    else if (view && view.changes)
+    } else if (view && view.changes) {
       updateLineForChanges(cm, view, lineN, getDimensions(cm));
+      cm.curOp.forceUpdate = true;
+    }
     if (!view)
       view = updateExternalMeasurement(cm, line);
 
@@ -1556,7 +2626,7 @@
 
   // Given a prepared measurement object, measures the position of an
   // actual character (or fetches it from the cache).
-  function measureCharPrepared(cm, prepared, ch, bias) {
+  function measureCharPrepared(cm, prepared, ch, bias, varHeight) {
     if (prepared.before) ch = -1;
     var key = ch + (bias || ""), found;
     if (prepared.cache.hasOwnProperty(key)) {
@@ -1571,14 +2641,14 @@
       found = measureCharInner(cm, prepared, ch, bias);
       if (!found.bogus) prepared.cache[key] = found;
     }
-    return {left: found.left, right: found.right, top: found.top, bottom: found.bottom};
+    return {left: found.left, right: found.right,
+            top: varHeight ? found.rtop : found.top,
+            bottom: varHeight ? found.rbottom : found.bottom};
   }
 
   var nullRect = {left: 0, right: 0, top: 0, bottom: 0};
 
-  function measureCharInner(cm, prepared, ch, bias) {
-    var map = prepared.map;
-
+  function nodeAndOffsetInLineMap(map, ch, bias) {
     var node, start, end, collapse;
     // First, search the line map for the text node corresponding to,
     // or closest to, the target character.
@@ -1612,22 +2682,35 @@
         break;
       }
     }
+    return {node: node, start: start, end: end, collapse: collapse, coverStart: mStart, coverEnd: mEnd};
+  }
+
+  function measureCharInner(cm, prepared, ch, bias) {
+    var place = nodeAndOffsetInLineMap(prepared.map, ch, bias);
+    var node = place.node, start = place.start, end = place.end, collapse = place.collapse;
 
     var rect;
     if (node.nodeType == 3) { // If it is a text node, use a range to retrieve the coordinates.
-      while (start && isExtendingChar(prepared.line.text.charAt(mStart + start))) --start;
-      while (mStart + end < mEnd && isExtendingChar(prepared.line.text.charAt(mStart + end))) ++end;
-      if (ie_upto8 && start == 0 && end == mEnd - mStart) {
-        rect = node.parentNode.getBoundingClientRect();
-      } else if (ie && cm.options.lineWrapping) {
-        var rects = range(node, start, end).getClientRects();
-        if (rects.length)
-          rect = rects[bias == "right" ? rects.length - 1 : 0];
-        else
-          rect = nullRect;
-      } else {
-        rect = range(node, start, end).getBoundingClientRect() || nullRect;
+      for (var i = 0; i < 4; i++) { // Retry a maximum of 4 times when nonsense rectangles are returned
+        while (start && isExtendingChar(prepared.line.text.charAt(place.coverStart + start))) --start;
+        while (place.coverStart + end < place.coverEnd && isExtendingChar(prepared.line.text.charAt(place.coverStart + end))) ++end;
+        if (ie && ie_version < 9 && start == 0 && end == place.coverEnd - place.coverStart) {
+          rect = node.parentNode.getBoundingClientRect();
+        } else if (ie && cm.options.lineWrapping) {
+          var rects = range(node, start, end).getClientRects();
+          if (rects.length)
+            rect = rects[bias == "right" ? rects.length - 1 : 0];
+          else
+            rect = nullRect;
+        } else {
+          rect = range(node, start, end).getBoundingClientRect() || nullRect;
+        }
+        if (rect.left || rect.right || start == 0) break;
+        end = start;
+        start = start - 1;
+        collapse = "right";
       }
+      if (ie && ie_version < 11) rect = maybeUpdateRectForZooming(cm.display.measure, rect);
     } else { // If it is a widget, simply get the box for the whole widget.
       if (start > 0) collapse = bias = "right";
       var rects;
@@ -1636,7 +2719,7 @@
       else
         rect = node.getBoundingClientRect();
     }
-    if (ie_upto8 && !start && (!rect || !rect.left && !rect.right)) {
+    if (ie && ie_version < 9 && !start && (!rect || !rect.left && !rect.right)) {
       var rSpan = node.parentNode.getClientRects()[0];
       if (rSpan)
         rect = {left: rSpan.left, right: rSpan.left + charWidth(cm.display), top: rSpan.top, bottom: rSpan.bottom};
@@ -1644,18 +2727,33 @@
         rect = nullRect;
     }
 
-    var top, bot = (rect.bottom + rect.top) / 2 - prepared.rect.top;
+    var rtop = rect.top - prepared.rect.top, rbot = rect.bottom - prepared.rect.top;
+    var mid = (rtop + rbot) / 2;
     var heights = prepared.view.measure.heights;
     for (var i = 0; i < heights.length - 1; i++)
-      if (bot < heights[i]) break;
-    top = i ? heights[i - 1] : 0; bot = heights[i];
+      if (mid < heights[i]) break;
+    var top = i ? heights[i - 1] : 0, bot = heights[i];
     var result = {left: (collapse == "right" ? rect.right : rect.left) - prepared.rect.left,
                   right: (collapse == "left" ? rect.left : rect.right) - prepared.rect.left,
                   top: top, bottom: bot};
     if (!rect.left && !rect.right) result.bogus = true;
+    if (!cm.options.singleCursorHeightPerLine) { result.rtop = rtop; result.rbottom = rbot; }
+
     return result;
   }
 
+  // Work around problem with bounding client rects on ranges being
+  // returned incorrectly when zoomed on IE10 and below.
+  function maybeUpdateRectForZooming(measure, rect) {
+    if (!window.screen || screen.logicalXDPI == null ||
+        screen.logicalXDPI == screen.deviceXDPI || !hasBadZoomedRects(measure))
+      return rect;
+    var scaleX = screen.logicalXDPI / screen.deviceXDPI;
+    var scaleY = screen.logicalYDPI / screen.deviceYDPI;
+    return {left: rect.left * scaleX, right: rect.right * scaleX,
+            top: rect.top * scaleY, bottom: rect.bottom * scaleY};
+  }
+
   function clearLineMeasurementCacheFor(lineView) {
     if (lineView.measure) {
       lineView.measure.cache = {};
@@ -1684,7 +2782,8 @@
 
   // Converts a {top, bottom, left, right} box from line-local
   // coordinates into another coordinate system. Context may be one of
-  // "line", "div" (display.lineDiv), "local"/null (editor), or "page".
+  // "line", "div" (display.lineDiv), "local"/null (editor), "window",
+  // or "page".
   function intoCoordSystem(cm, lineObj, rect, context) {
     if (lineObj.widgets) for (var i = 0; i < lineObj.widgets.length; ++i) if (lineObj.widgets[i].above) {
       var size = widgetHeight(lineObj.widgets[i]);
@@ -1732,11 +2831,11 @@
   // Returns a box for a given cursor position, which may have an
   // 'other' property containing the position of the secondary cursor
   // on a bidi boundary.
-  function cursorCoords(cm, pos, context, lineObj, preparedMeasure) {
+  function cursorCoords(cm, pos, context, lineObj, preparedMeasure, varHeight) {
     lineObj = lineObj || getLine(cm.doc, pos.line);
     if (!preparedMeasure) preparedMeasure = prepareMeasureForLine(cm, lineObj);
     function get(ch, right) {
-      var m = measureCharPrepared(cm, preparedMeasure, ch, right ? "right" : "left");
+      var m = measureCharPrepared(cm, preparedMeasure, ch, right ? "right" : "left", varHeight);
       if (right) m.left = m.right; else m.right = m.left;
       return intoCoordSystem(cm, lineObj, m, context);
     }
@@ -1888,10 +2987,13 @@
   // error-prone). Instead, display updates are batched and then all
   // combined and executed at once.
 
+  var operationGroup = null;
+
   var nextOpId = 0;
   // Start a new operation.
   function startOperation(cm) {
     cm.curOp = {
+      cm: cm,
       viewChanged: false,      // Flag that indicates that lines might need to be redrawn
       startHeight: cm.doc.height, // Used to detect need to update scrollbar
       forceUpdate: false,      // Used to force a redraw
@@ -1899,55 +3001,160 @@
       typing: false,           // Whether this reset should be careful to leave existing text (for compositing)
       changeObjs: null,        // Accumulated changes, for firing change events
       cursorActivityHandlers: null, // Set of handlers to fire cursorActivity on
+      cursorActivityCalled: 0, // Tracks which cursorActivity handlers have been called already
       selectionChanged: false, // Whether the selection needs to be redrawn
       updateMaxLine: false,    // Set when the widest line needs to be determined anew
       scrollLeft: null, scrollTop: null, // Intermediate scroll position, not pushed to DOM yet
       scrollToPos: null,       // Used to scroll to a specific position
+      focus: false,
       id: ++nextOpId           // Unique ID
     };
-    if (!delayedCallbackDepth++) delayedCallbacks = [];
+    if (operationGroup) {
+      operationGroup.ops.push(cm.curOp);
+    } else {
+      cm.curOp.ownsGroup = operationGroup = {
+        ops: [cm.curOp],
+        delayedCallbacks: []
+      };
+    }
+  }
+
+  function fireCallbacksForOps(group) {
+    // Calls delayed callbacks and cursorActivity handlers until no
+    // new ones appear
+    var callbacks = group.delayedCallbacks, i = 0;
+    do {
+      for (; i < callbacks.length; i++)
+        callbacks[i].call(null);
+      for (var j = 0; j < group.ops.length; j++) {
+        var op = group.ops[j];
+        if (op.cursorActivityHandlers)
+          while (op.cursorActivityCalled < op.cursorActivityHandlers.length)
+            op.cursorActivityHandlers[op.cursorActivityCalled++].call(null, op.cm);
+      }
+    } while (i < callbacks.length);
   }
 
   // Finish an operation, updating the display and signalling delayed events
   function endOperation(cm) {
-    var op = cm.curOp, doc = cm.doc, display = cm.display;
-    cm.curOp = null;
+    var op = cm.curOp, group = op.ownsGroup;
+    if (!group) return;
 
+    try { fireCallbacksForOps(group); }
+    finally {
+      operationGroup = null;
+      for (var i = 0; i < group.ops.length; i++)
+        group.ops[i].cm.curOp = null;
+      endOperations(group);
+    }
+  }
+
+  // The DOM updates done when an operation finishes are batched so
+  // that the minimum number of relayouts are required.
+  function endOperations(group) {
+    var ops = group.ops;
+    for (var i = 0; i < ops.length; i++) // Read DOM
+      endOperation_R1(ops[i]);
+    for (var i = 0; i < ops.length; i++) // Write DOM (maybe)
+      endOperation_W1(ops[i]);
+    for (var i = 0; i < ops.length; i++) // Read DOM
+      endOperation_R2(ops[i]);
+    for (var i = 0; i < ops.length; i++) // Write DOM (maybe)
+      endOperation_W2(ops[i]);
+    for (var i = 0; i < ops.length; i++) // Read DOM
+      endOperation_finish(ops[i]);
+  }
+
+  function endOperation_R1(op) {
+    var cm = op.cm, display = cm.display;
+    maybeClipScrollbars(cm);
     if (op.updateMaxLine) findMaxLine(cm);
 
-    // If it looks like an update might be needed, call updateDisplay
-    if (op.viewChanged || op.forceUpdate || op.scrollTop != null ||
-        op.scrollToPos && (op.scrollToPos.from.line < display.viewFrom ||
-                           op.scrollToPos.to.line >= display.viewTo) ||
-        display.maxLineChanged && cm.options.lineWrapping) {
-      var updated = updateDisplay(cm, {top: op.scrollTop, ensure: op.scrollToPos}, op.forceUpdate);
-      if (cm.display.scroller.offsetHeight) cm.doc.scrollTop = cm.display.scroller.scrollTop;
-    }
-    // If no update was run, but the selection changed, redraw that.
-    if (!updated && op.selectionChanged) updateSelection(cm);
-    if (!updated && op.startHeight != cm.doc.height) updateScrollbars(cm);
+    op.mustUpdate = op.viewChanged || op.forceUpdate || op.scrollTop != null ||
+      op.scrollToPos && (op.scrollToPos.from.line < display.viewFrom ||
+                         op.scrollToPos.to.line >= display.viewTo) ||
+      display.maxLineChanged && cm.options.lineWrapping;
+    op.update = op.mustUpdate &&
+      new DisplayUpdate(cm, op.mustUpdate && {top: op.scrollTop, ensure: op.scrollToPos}, op.forceUpdate);
+  }
 
-    // Propagate the scroll position to the actual DOM scroller
-    if (op.scrollTop != null && display.scroller.scrollTop != op.scrollTop) {
-      var top = Math.max(0, Math.min(display.scroller.scrollHeight - display.scroller.clientHeight, op.scrollTop));
-      display.scroller.scrollTop = display.scrollbarV.scrollTop = doc.scrollTop = top;
+  function endOperation_W1(op) {
+    op.updatedDisplay = op.mustUpdate && updateDisplayIfNeeded(op.cm, op.update);
+  }
+
+  function endOperation_R2(op) {
+    var cm = op.cm, display = cm.display;
+    if (op.updatedDisplay) updateHeightsInViewport(cm);
+
+    op.barMeasure = measureForScrollbars(cm);
+
+    // If the max line changed since it was last measured, measure it,
+    // and ensure the document's width matches it.
+    // updateDisplay_W2 will use these properties to do the actual resizing
+    if (display.maxLineChanged && !cm.options.lineWrapping) {
+      op.adjustWidthTo = measureChar(cm, display.maxLine, display.maxLine.text.length).left + 3;
+      cm.display.sizerWidth = op.adjustWidthTo;
+      op.barMeasure.scrollWidth =
+        Math.max(display.scroller.clientWidth, display.sizer.offsetLeft + op.adjustWidthTo + scrollGap(cm) + cm.display.barWidth);
+      op.maxScrollLeft = Math.max(0, display.sizer.offsetLeft + op.adjustWidthTo - displayWidth(cm));
     }
-    if (op.scrollLeft != null && display.scroller.scrollLeft != op.scrollLeft) {
-      var left = Math.max(0, Math.min(display.scroller.scrollWidth - display.scroller.clientWidth, op.scrollLeft));
-      display.scroller.scrollLeft = display.scrollbarH.scrollLeft = doc.scrollLeft = left;
-      alignHorizontally(cm);
-    }
-    // If we need to scroll a specific position into view, do so.
-    if (op.scrollToPos) {
-      var coords = scrollPosIntoView(cm, clipPos(cm.doc, op.scrollToPos.from),
-                                     clipPos(cm.doc, op.scrollToPos.to), op.scrollToPos.margin);
-      if (op.scrollToPos.isCursor && cm.state.focused) maybeScrollWindow(cm, coords);
+
+    if (op.updatedDisplay || op.selectionChanged)
+      op.preparedSelection = display.input.prepareSelection();
+  }
+
+  function endOperation_W2(op) {
+    var cm = op.cm;
+
+    if (op.adjustWidthTo != null) {
+      cm.display.sizer.style.minWidth = op.adjustWidthTo + "px";
+      if (op.maxScrollLeft < cm.doc.scrollLeft)
+        setScrollLeft(cm, Math.min(cm.display.scroller.scrollLeft, op.maxScrollLeft), true);
+      cm.display.maxLineChanged = false;
     }
 
+    if (op.preparedSelection)
+      cm.display.input.showSelection(op.preparedSelection);
+    if (op.updatedDisplay || op.startHeight != cm.doc.height)
+      updateScrollbars(cm, op.barMeasure);
+    if (op.updatedDisplay)
+      setDocumentHeight(cm, op.barMeasure);
+
     if (op.selectionChanged) restartBlink(cm);
 
     if (cm.state.focused && op.updateInput)
-      resetInput(cm, op.typing);
+      cm.display.input.reset(op.typing);
+    if (op.focus && op.focus == activeElt() && (!document.hasFocus || document.hasFocus()))
+      ensureFocus(op.cm);
+  }
+
+  function endOperation_finish(op) {
+    var cm = op.cm, display = cm.display, doc = cm.doc;
+
+    if (op.updatedDisplay) postUpdateDisplay(cm, op.update);
+
+    // Abort mouse wheel delta measurement, when scrolling explicitly
+    if (display.wheelStartX != null && (op.scrollTop != null || op.scrollLeft != null || op.scrollToPos))
+      display.wheelStartX = display.wheelStartY = null;
+
+    // Propagate the scroll position to the actual DOM scroller
+    if (op.scrollTop != null && (display.scroller.scrollTop != op.scrollTop || op.forceScroll)) {
+      doc.scrollTop = Math.max(0, Math.min(display.scroller.scrollHeight - display.scroller.clientHeight, op.scrollTop));
+      display.scrollbars.setScrollTop(doc.scrollTop);
+      display.scroller.scrollTop = doc.scrollTop;
+    }
+    if (op.scrollLeft != null && (display.scroller.scrollLeft != op.scrollLeft || op.forceScroll)) {
+      doc.scrollLeft = Math.max(0, Math.min(display.scroller.scrollWidth - display.scroller.clientWidth, op.scrollLeft));
+      display.scrollbars.setScrollLeft(doc.scrollLeft);
+      display.scroller.scrollLeft = doc.scrollLeft;
+      alignHorizontally(cm);
+    }
+    // If we need to scroll a specific position into view, do so.
+    if (op.scrollToPos) {
+      var coords = scrollPosIntoView(cm, clipPos(doc, op.scrollToPos.from),
+                                     clipPos(doc, op.scrollToPos.to), op.scrollToPos.margin);
+      if (op.scrollToPos.isCursor && cm.state.focused) maybeScrollWindow(cm, coords);
+    }
 
     // Fire events for markers that are hidden/unidden by editing or
     // undoing
@@ -1957,18 +3164,14 @@
     if (unhidden) for (var i = 0; i < unhidden.length; ++i)
       if (unhidden[i].lines.length) signal(unhidden[i], "unhide");
 
-    var delayed;
-    if (!--delayedCallbackDepth) {
-      delayed = delayedCallbacks;
-      delayedCallbacks = null;
-    }
+    if (display.wrapper.offsetHeight)
+      doc.scrollTop = cm.display.scroller.scrollTop;
+
     // Fire change events, and delayed event handlers
     if (op.changeObjs)
       signal(cm, "changes", cm, op.changeObjs);
-    if (delayed) for (var i = 0; i < delayed.length; ++i) delayed[i]();
-    if (op.cursorActivityHandlers)
-      for (var i = 0; i < op.cursorActivityHandlers.length; i++)
-        op.cursorActivityHandlers[i](cm);
+    if (op.update)
+      op.update.finish();
   }
 
   // Run the given function in an operation
@@ -2194,152 +3397,6 @@
     return dirty;
   }
 
-  // INPUT HANDLING
-
-  // Poll for input changes, using the normal rate of polling. This
-  // runs as long as the editor is focused.
-  function slowPoll(cm) {
-    if (cm.display.pollingFast) return;
-    cm.display.poll.set(cm.options.pollInterval, function() {
-      readInput(cm);
-      if (cm.state.focused) slowPoll(cm);
-    });
-  }
-
-  // When an event has just come in that is likely to add or change
-  // something in the input textarea, we poll faster, to ensure that
-  // the change appears on the screen quickly.
-  function fastPoll(cm) {
-    var missed = false;
-    cm.display.pollingFast = true;
-    function p() {
-      var changed = readInput(cm);
-      if (!changed && !missed) {missed = true; cm.display.poll.set(60, p);}
-      else {cm.display.pollingFast = false; slowPoll(cm);}
-    }
-    cm.display.poll.set(20, p);
-  }
-
-  // Read input from the textarea, and update the document to match.
-  // When something is selected, it is present in the textarea, and
-  // selected (unless it is huge, in which case a placeholder is
-  // used). When nothing is selected, the cursor sits after previously
-  // seen text (can be empty), which is stored in prevInput (we must
-  // not reset the textarea when typing, because that breaks IME).
-  function readInput(cm) {
-    var input = cm.display.input, prevInput = cm.display.prevInput, doc = cm.doc;
-    // Since this is called a *lot*, try to bail out as cheaply as
-    // possible when it is clear that nothing happened. hasSelection
-    // will be the case when there is a lot of text in the textarea,
-    // in which case reading its value would be expensive.
-    if (!cm.state.focused || (hasSelection(input) && !prevInput) || isReadOnly(cm) || cm.options.disableInput)
-      return false;
-    // See paste handler for more on the fakedLastChar kludge
-    if (cm.state.pasteIncoming && cm.state.fakedLastChar) {
-      input.value = input.value.substring(0, input.value.length - 1);
-      cm.state.fakedLastChar = false;
-    }
-    var text = input.value;
-    // If nothing changed, bail.
-    if (text == prevInput && !cm.somethingSelected()) return false;
-    // Work around nonsensical selection resetting in IE9/10
-    if (ie && !ie_upto8 && cm.display.inputHasSelection === text) {
-      resetInput(cm);
-      return false;
-    }
-
-    var withOp = !cm.curOp;
-    if (withOp) startOperation(cm);
-    cm.display.shift = false;
-
-    if (text.charCodeAt(0) == 0x200b && doc.sel == cm.display.selForContextMenu && !prevInput)
-      prevInput = "\u200b";
-    // Find the part of the input that is actually new
-    var same = 0, l = Math.min(prevInput.length, text.length);
-    while (same < l && prevInput.charCodeAt(same) == text.charCodeAt(same)) ++same;
-    var inserted = text.slice(same), textLines = splitLines(inserted);
-
-    // When pasing N lines into N selections, insert one line per selection
-    var multiPaste = cm.state.pasteIncoming && textLines.length > 1 && doc.sel.ranges.length == textLines.length;
-
-    // Normal behavior is to insert the new text into every selection
-    for (var i = doc.sel.ranges.length - 1; i >= 0; i--) {
-      var range = doc.sel.ranges[i];
-      var from = range.from(), to = range.to();
-      // Handle deletion
-      if (same < prevInput.length)
-        from = Pos(from.line, from.ch - (prevInput.length - same));
-      // Handle overwrite
-      else if (cm.state.overwrite && range.empty() && !cm.state.pasteIncoming)
-        to = Pos(to.line, Math.min(getLine(doc, to.line).text.length, to.ch + lst(textLines).length));
-      var updateInput = cm.curOp.updateInput;
-      var changeEvent = {from: from, to: to, text: multiPaste ? [textLines[i]] : textLines,
-                         origin: cm.state.pasteIncoming ? "paste" : cm.state.cutIncoming ? "cut" : "+input"};
-      makeChange(cm.doc, changeEvent);
-      signalLater(cm, "inputRead", cm, changeEvent);
-      // When an 'electric' character is inserted, immediately trigger a reindent
-      if (inserted && !cm.state.pasteIncoming && cm.options.electricChars &&
-          cm.options.smartIndent && range.head.ch < 100 &&
-          (!i || doc.sel.ranges[i - 1].head.line != range.head.line)) {
-        var mode = cm.getModeAt(range.head);
-        if (mode.electricChars) {
-          for (var j = 0; j < mode.electricChars.length; j++)
-            if (inserted.indexOf(mode.electricChars.charAt(j)) > -1) {
-              indentLine(cm, range.head.line, "smart");
-              break;
-            }
-        } else if (mode.electricInput) {
-          var end = changeEnd(changeEvent);
-          if (mode.electricInput.test(getLine(doc, end.line).text.slice(0, end.ch)))
-            indentLine(cm, range.head.line, "smart");
-        }
-      }
-    }
-    ensureCursorVisible(cm);
-    cm.curOp.updateInput = updateInput;
-    cm.curOp.typing = true;
-
-    // Don't leave long text in the textarea, since it makes further polling slow
-    if (text.length > 1000 || text.indexOf("\n") > -1) input.value = cm.display.prevInput = "";
-    else cm.display.prevInput = text;
-    if (withOp) endOperation(cm);
-    cm.state.pasteIncoming = cm.state.cutIncoming = false;
-    return true;
-  }
-
-  // Reset the input to correspond to the selection (or to be empty,
-  // when not typing and nothing is selected)
-  function resetInput(cm, typing) {
-    var minimal, selected, doc = cm.doc;
-    if (cm.somethingSelected()) {
-      cm.display.prevInput = "";
-      var range = doc.sel.primary();
-      minimal = hasCopyEvent &&
-        (range.to().line - range.from().line > 100 || (selected = cm.getSelection()).length > 1000);
-      var content = minimal ? "-" : selected || cm.getSelection();
-      cm.display.input.value = content;
-      if (cm.state.focused) selectInput(cm.display.input);
-      if (ie && !ie_upto8) cm.display.inputHasSelection = content;
-    } else if (!typing) {
-      cm.display.prevInput = cm.display.input.value = "";
-      if (ie && !ie_upto8) cm.display.inputHasSelection = null;
-    }
-    cm.display.inaccurateSelection = minimal;
-  }
-
-  function focusInput(cm) {
-    if (cm.options.readOnly != "nocursor" && (!mobile || activeElt() != cm.display.input))
-      cm.display.input.focus();
-  }
-
-  function ensureFocus(cm) {
-    if (!cm.state.focused) { focusInput(cm); onFocus(cm); }
-  }
-
-  function isReadOnly(cm) {
-    return cm.options.readOnly || cm.doc.cantEdit;
-  }
-
   // EVENT HANDLERS
 
   // Attach the necessary event handlers when initializing the editor
@@ -2347,26 +3404,75 @@
     var d = cm.display;
     on(d.scroller, "mousedown", operation(cm, onMouseDown));
     // Older IE's will not fire a second mousedown for a double click
-    if (ie_upto10)
+    if (ie && ie_version < 11)
       on(d.scroller, "dblclick", operation(cm, function(e) {
         if (signalDOMEvent(cm, e)) return;
         var pos = posFromMouse(cm, e);
         if (!pos || clickInGutter(cm, e) || eventInWidget(cm.display, e)) return;
         e_preventDefault(e);
-        var word = findWordAt(cm, pos);
+        var word = cm.findWordAt(pos);
         extendSelection(cm.doc, word.anchor, word.head);
       }));
     else
       on(d.scroller, "dblclick", function(e) { signalDOMEvent(cm, e) || e_preventDefault(e); });
-    // Prevent normal selection in the editor (we handle our own)
-    on(d.lineSpace, "selectstart", function(e) {
-      if (!eventInWidget(d, e)) e_preventDefault(e);
-    });
     // Some browsers fire contextmenu *after* opening the menu, at
     // which point we can't mess with it anymore. Context menu is
     // handled in onMouseDown for these browsers.
     if (!captureRightClick) on(d.scroller, "contextmenu", function(e) {onContextMenu(cm, e);});
 
+    // Used to suppress mouse event handling when a touch happens
+    var touchFinished, prevTouch = {end: 0};
+    function finishTouch() {
+      if (d.activeTouch) {
+        touchFinished = setTimeout(function() {d.activeTouch = null;}, 1000);
+        prevTouch = d.activeTouch;
+        prevTouch.end = +new Date;
+      }
+    };
+    function isMouseLikeTouchEvent(e) {
+      if (e.touches.length != 1) return false;
+      var touch = e.touches[0];
+      return touch.radiusX <= 1 && touch.radiusY <= 1;
+    }
+    function farAway(touch, other) {
+      if (other.left == null) return true;
+      var dx = other.left - touch.left, dy = other.top - touch.top;
+      return dx * dx + dy * dy > 20 * 20;
+    }
+    on(d.scroller, "touchstart", function(e) {
+      if (!signalDOMEvent(cm, e) && !isMouseLikeTouchEvent(e)) {
+        clearTimeout(touchFinished);
+        var now = +new Date;
+        d.activeTouch = {start: now, moved: false,
+                         prev: now - prevTouch.end <= 300 ? prevTouch : null};
+        if (e.touches.length == 1) {
+          d.activeTouch.left = e.touches[0].pageX;
+          d.activeTouch.top = e.touches[0].pageY;
+        }
+      }
+    });
+    on(d.scroller, "touchmove", function() {
+      if (d.activeTouch) d.activeTouch.moved = true;
+    });
+    on(d.scroller, "touchend", function(e) {
+      var touch = d.activeTouch;
+      if (touch && !eventInWidget(d, e) && touch.left != null &&
+          !touch.moved && new Date - touch.start < 300) {
+        var pos = cm.coordsChar(d.activeTouch, "page"), range;
+        if (!touch.prev || farAway(touch, touch.prev)) // Single tap
+          range = new Range(pos, pos);
+        else if (!touch.prev.prev || farAway(touch, touch.prev.prev)) // Double tap
+          range = cm.findWordAt(pos);
+        else // Triple tap
+          range = new Range(Pos(pos.line, 0), clipPos(cm.doc, Pos(pos.line + 1, 0)));
+        cm.setSelection(range.anchor, range.head);
+        cm.focus();
+        e_preventDefault(e);
+      }
+      finishTouch();
+    });
+    on(d.scroller, "touchcancel", finishTouch);
+
     // Sync scrolling between fake scrollbars and real scrollable
     // area, ensure viewport is updated when scrolling.
     on(d.scroller, "scroll", function() {
@@ -2376,105 +3482,51 @@
         signal(cm, "scroll", cm);
       }
     });
-    on(d.scrollbarV, "scroll", function() {
-      if (d.scroller.clientHeight) setScrollTop(cm, d.scrollbarV.scrollTop);
-    });
-    on(d.scrollbarH, "scroll", function() {
-      if (d.scroller.clientHeight) setScrollLeft(cm, d.scrollbarH.scrollLeft);
-    });
 
     // Listen to wheel events in order to try and update the viewport on time.
     on(d.scroller, "mousewheel", function(e){onScrollWheel(cm, e);});
     on(d.scroller, "DOMMouseScroll", function(e){onScrollWheel(cm, e);});
 
-    // Prevent clicks in the scrollbars from killing focus
-    function reFocus() { if (cm.state.focused) setTimeout(bind(focusInput, cm), 0); }
-    on(d.scrollbarH, "mousedown", reFocus);
-    on(d.scrollbarV, "mousedown", reFocus);
     // Prevent wrapper from ever scrolling
     on(d.wrapper, "scroll", function() { d.wrapper.scrollTop = d.wrapper.scrollLeft = 0; });
 
-    on(d.input, "keyup", operation(cm, onKeyUp));
-    on(d.input, "input", function() {
-      if (ie && !ie_upto8 && cm.display.inputHasSelection) cm.display.inputHasSelection = null;
-      fastPoll(cm);
-    });
-    on(d.input, "keydown", operation(cm, onKeyDown));
-    on(d.input, "keypress", operation(cm, onKeyPress));
-    on(d.input, "focus", bind(onFocus, cm));
-    on(d.input, "blur", bind(onBlur, cm));
+    d.dragFunctions = {
+      enter: function(e) {if (!signalDOMEvent(cm, e)) e_stop(e);},
+      over: function(e) {if (!signalDOMEvent(cm, e)) { onDragOver(cm, e); e_stop(e); }},
+      start: function(e){onDragStart(cm, e);},
+      drop: operation(cm, onDrop),
+      leave: function(e) {if (!signalDOMEvent(cm, e)) { clearDragCursor(cm); }}
+    };
 
-    function drag_(e) {
-      if (!signalDOMEvent(cm, e)) e_stop(e);
-    }
-    if (cm.options.dragDrop) {
-      on(d.scroller, "dragstart", function(e){onDragStart(cm, e);});
-      on(d.scroller, "dragenter", drag_);
-      on(d.scroller, "dragover", drag_);
-      on(d.scroller, "drop", operation(cm, onDrop));
-    }
-    on(d.scroller, "paste", function(e) {
-      if (eventInWidget(d, e)) return;
-      cm.state.pasteIncoming = true;
-      focusInput(cm);
-      fastPoll(cm);
-    });
-    on(d.input, "paste", function() {
-      // Workaround for webkit bug https://bugs.webkit.org/show_bug.cgi?id=90206
-      // Add a char to the end of textarea before paste occur so that
-      // selection doesn't span to the end of textarea.
-      if (webkit && !cm.state.fakedLastChar && !(new Date - cm.state.lastMiddleDown < 200)) {
-        var start = d.input.selectionStart, end = d.input.selectionEnd;
-        d.input.value += "$";
-        d.input.selectionStart = start;
-        d.input.selectionEnd = end;
-        cm.state.fakedLastChar = true;
-      }
-      cm.state.pasteIncoming = true;
-      fastPoll(cm);
-    });
+    var inp = d.input.getField();
+    on(inp, "keyup", function(e) { onKeyUp.call(cm, e); });
+    on(inp, "keydown", operation(cm, onKeyDown));
+    on(inp, "keypress", operation(cm, onKeyPress));
+    on(inp, "focus", bind(onFocus, cm));
+    on(inp, "blur", bind(onBlur, cm));
+  }
 
-    function prepareCopyCut(e) {
-      if (cm.somethingSelected()) {
-        if (d.inaccurateSelection) {
-          d.prevInput = "";
-          d.inaccurateSelection = false;
-          d.input.value = cm.getSelection();
-          selectInput(d.input);
-        }
-      } else {
-        var text = "", ranges = [];
-        for (var i = 0; i < cm.doc.sel.ranges.length; i++) {
-          var line = cm.doc.sel.ranges[i].head.line;
-          var lineRange = {anchor: Pos(line, 0), head: Pos(line + 1, 0)};
-          ranges.push(lineRange);
-          text += cm.getRange(lineRange.anchor, lineRange.head);
-        }
-        if (e.type == "cut") {
-          cm.setSelections(ranges, null, sel_dontScroll);
-        } else {
-          d.prevInput = "";
-          d.input.value = text;
-          selectInput(d.input);
-        }
-      }
-      if (e.type == "cut") cm.state.cutIncoming = true;
+  function dragDropChanged(cm, value, old) {
+    var wasOn = old && old != CodeMirror.Init;
+    if (!value != !wasOn) {
+      var funcs = cm.display.dragFunctions;
+      var toggle = value ? on : off;
+      toggle(cm.display.scroller, "dragstart", funcs.start);
+      toggle(cm.display.scroller, "dragenter", funcs.enter);
+      toggle(cm.display.scroller, "dragover", funcs.over);
+      toggle(cm.display.scroller, "dragleave", funcs.leave);
+      toggle(cm.display.scroller, "drop", funcs.drop);
     }
-    on(d.input, "cut", prepareCopyCut);
-    on(d.input, "copy", prepareCopyCut);
-
-    // Needed to handle Tab key in KHTML
-    if (khtml) on(d.sizer, "mouseup", function() {
-      if (activeElt() == d.input) d.input.blur();
-      focusInput(cm);
-    });
   }
 
   // Called when the window resizes
   function onResize(cm) {
-    // Might be a text scaling operation, clear size caches.
     var d = cm.display;
+    if (d.lastWrapHeight == d.wrapper.clientHeight && d.lastWrapWidth == d.wrapper.clientWidth)
+      return;
+    // Might be a text scaling operation, clear size caches.
     d.cachedCharWidth = d.cachedTextHeight = d.cachedPaddingH = null;
+    d.scrollbarsClipped = false;
     cm.setSize();
   }
 
@@ -2483,7 +3535,9 @@
   // Return true when the given mouse event happened in a widget
   function eventInWidget(display, e) {
     for (var n = e_target(e); n != display.wrapper; n = n.parentNode) {
-      if (!n || n.ignoreEvents || n.parentNode == display.sizer && n != display.mover) return true;
+      if (!n || (n.nodeType == 1 && n.getAttribute("cm-ignore-events") == "true") ||
+          (n.parentNode == display.sizer && n != display.mover))
+        return true;
     }
   }
 
@@ -2494,11 +3548,8 @@
   // coordinates beyond the right of the text.
   function posFromMouse(cm, e, liberal, forRect) {
     var display = cm.display;
-    if (!liberal) {
-      var target = e_target(e);
-      if (target == display.scrollbarH || target == display.scrollbarV ||
-          target == display.scrollbarFiller || target == display.gutterFiller) return null;
-    }
+    if (!liberal && e_target(e).getAttribute("cm-not-content") == "true") return null;
+
     var x, y, space = display.lineSpace.getBoundingClientRect();
     // Fails unpredictably on IE[67] when mouse is dragged around quickly.
     try { x = e.clientX - space.left; y = e.clientY - space.top; }
@@ -2517,8 +3568,8 @@
   // middle-click-paste. Or it might be a click on something we should
   // not interfere with, such as a scrollbar or widget.
   function onMouseDown(e) {
-    if (signalDOMEvent(this, e)) return;
     var cm = this, display = cm.display;
+    if (signalDOMEvent(cm, e) || display.activeTouch && display.input.supportsTouch()) return;
     display.shift = e.shiftKey;
 
     if (eventInWidget(display, e)) {
@@ -2536,7 +3587,10 @@
 
     switch (e_button(e)) {
     case 1:
-      if (start)
+      // #3261: make sure, that we're not starting a second selection
+      if (cm.state.selectingText)
+        cm.state.selectingText(e);
+      else if (start)
         leftButtonDown(cm, e, start);
       else if (e_target(e) == display.scroller)
         e_preventDefault(e);
@@ -2544,18 +3598,20 @@
     case 2:
       if (webkit) cm.state.lastMiddleDown = +new Date;
       if (start) extendSelection(cm.doc, start);
-      setTimeout(bind(focusInput, cm), 20);
+      setTimeout(function() {display.input.focus();}, 20);
       e_preventDefault(e);
       break;
     case 3:
       if (captureRightClick) onContextMenu(cm, e);
+      else delayBlurEvent(cm);
       break;
     }
   }
 
   var lastClick, lastDoubleClick;
   function leftButtonDown(cm, e, start) {
-    setTimeout(bind(ensureFocus, cm), 0);
+    if (ie) setTimeout(bind(ensureFocus, cm), 0);
+    else cm.curOp.focus = activeElt();
 
     var now = +new Date, type;
     if (lastDoubleClick && lastDoubleClick.time > now - 400 && cmp(lastDoubleClick.pos, start) == 0) {
@@ -2568,18 +3624,20 @@
       lastClick = {time: now, pos: start};
     }
 
-    var sel = cm.doc.sel, addNew = mac ? e.metaKey : e.ctrlKey;
-    if (cm.options.dragDrop && dragAndDrop && !addNew && !isReadOnly(cm) &&
-        type == "single" && sel.contains(start) > -1 && sel.somethingSelected())
-      leftButtonStartDrag(cm, e, start);
+    var sel = cm.doc.sel, modifier = mac ? e.metaKey : e.ctrlKey, contained;
+    if (cm.options.dragDrop && dragAndDrop && !cm.isReadOnly() &&
+        type == "single" && (contained = sel.contains(start)) > -1 &&
+        (cmp((contained = sel.ranges[contained]).from(), start) < 0 || start.xRel > 0) &&
+        (cmp(contained.to(), start) > 0 || start.xRel < 0))
+      leftButtonStartDrag(cm, e, start, modifier);
     else
-      leftButtonSelect(cm, e, start, type, addNew);
+      leftButtonSelect(cm, e, start, type, modifier);
   }
 
   // Start a text drag. When it ends, see if any dragging actually
   // happen, and treat as a click if it didn't.
-  function leftButtonStartDrag(cm, e, start) {
-    var display = cm.display;
+  function leftButtonStartDrag(cm, e, start, modifier) {
+    var display = cm.display, startTime = +new Date;
     var dragEnd = operation(cm, function(e2) {
       if (webkit) display.scroller.draggable = false;
       cm.state.draggingText = false;
@@ -2587,11 +3645,13 @@
       off(display.scroller, "drop", dragEnd);
       if (Math.abs(e.clientX - e2.clientX) + Math.abs(e.clientY - e2.clientY) < 10) {
         e_preventDefault(e2);
-        extendSelection(cm.doc, start);
-        focusInput(cm);
-        // Work around unexplainable focus problem in IE9 (#2127)
-        if (ie_upto10 && !ie_upto8)
-          setTimeout(function() {document.body.focus(); focusInput(cm);}, 20);
+        if (!modifier && +new Date - 200 < startTime)
+          extendSelection(cm.doc, start);
+        // Work around unexplainable focus problem in IE9 (#2127) and Chrome (#3081)
+        if (webkit || ie && ie_version == 9)
+          setTimeout(function() {document.body.focus(); display.input.focus();}, 20);
+        else
+          display.input.focus();
       }
     });
     // Let the drag handler handle this.
@@ -2608,15 +3668,16 @@
     var display = cm.display, doc = cm.doc;
     e_preventDefault(e);
 
-    var ourRange, ourIndex, startSel = doc.sel;
+    var ourRange, ourIndex, startSel = doc.sel, ranges = startSel.ranges;
     if (addNew && !e.shiftKey) {
       ourIndex = doc.sel.contains(start);
       if (ourIndex > -1)
-        ourRange = doc.sel.ranges[ourIndex];
+        ourRange = ranges[ourIndex];
       else
         ourRange = new Range(start, start);
     } else {
       ourRange = doc.sel.primary();
+      ourIndex = doc.sel.primIndex;
     }
 
     if (e.altKey) {
@@ -2625,7 +3686,7 @@
       start = posFromMouse(cm, e, true, true);
       ourIndex = -1;
     } else if (type == "double") {
-      var word = findWordAt(cm, start);
+      var word = cm.findWordAt(start);
       if (cm.display.shift || doc.extend)
         ourRange = extendRange(doc, ourRange, word.anchor, word.head);
       else
@@ -2644,12 +3705,16 @@
       ourIndex = 0;
       setSelection(doc, new Selection([ourRange], 0), sel_mouse);
       startSel = doc.sel;
-    } else if (ourIndex > -1) {
-      replaceOneSelection(doc, ourIndex, ourRange, sel_mouse);
-    } else {
-      ourIndex = doc.sel.ranges.length;
-      setSelection(doc, normalizeSelection(doc.sel.ranges.concat([ourRange]), ourIndex),
+    } else if (ourIndex == -1) {
+      ourIndex = ranges.length;
+      setSelection(doc, normalizeSelection(ranges.concat([ourRange]), ourIndex),
                    {scroll: false, origin: "*mouse"});
+    } else if (ranges.length > 1 && ranges[ourIndex].empty() && type == "single" && !e.shiftKey) {
+      setSelection(doc, normalizeSelection(ranges.slice(0, ourIndex).concat(ranges.slice(ourIndex + 1)), 0),
+                   {scroll: false, origin: "*mouse"});
+      startSel = doc.sel;
+    } else {
+      replaceOneSelection(doc, ourIndex, ourRange, sel_mouse);
     }
 
     var lastPos = start;
@@ -2679,7 +3744,7 @@
         var anchor = oldRange.anchor, head = pos;
         if (type != "single") {
           if (type == "double")
-            var range = findWordAt(cm, pos);
+            var range = cm.findWordAt(pos);
           else
             var range = new Range(Pos(pos.line, 0), clipPos(doc, Pos(pos.line + 1, 0)));
           if (cmp(range.anchor, anchor) > 0) {
@@ -2708,7 +3773,7 @@
       var cur = posFromMouse(cm, e, true, type == "rect");
       if (!cur) return;
       if (cmp(cur, lastPos) != 0) {
-        ensureFocus(cm);
+        cm.curOp.focus = activeElt();
         extendTo(cur);
         var visible = visibleLines(display, doc);
         if (cur.line >= visible.to || cur.line < visible.from)
@@ -2724,26 +3789,28 @@
     }
 
     function done(e) {
+      cm.state.selectingText = false;
       counter = Infinity;
       e_preventDefault(e);
-      focusInput(cm);
+      display.input.focus();
       off(document, "mousemove", move);
       off(document, "mouseup", up);
       doc.history.lastSelOrigin = null;
     }
 
     var move = operation(cm, function(e) {
-      if ((ie && !ie_upto9) ?  !e.buttons : !e_button(e)) done(e);
+      if (!e_button(e)) done(e);
       else extend(e);
     });
     var up = operation(cm, done);
+    cm.state.selectingText = up;
     on(document, "mousemove", move);
     on(document, "mouseup", up);
   }
 
   // Determines whether an event happened in the gutter, and fires the
   // handlers for the corresponding event.
-  function gutterEvent(cm, e, type, prevent, signalfn) {
+  function gutterEvent(cm, e, type, prevent) {
     try { var mX = e.clientX, mY = e.clientY; }
     catch(e) { return false; }
     if (mX >= Math.floor(cm.display.gutters.getBoundingClientRect().right)) return false;
@@ -2760,14 +3827,14 @@
       if (g && g.getBoundingClientRect().right >= mX) {
         var line = lineAtHeight(cm.doc, mY);
         var gutter = cm.options.gutters[i];
-        signalfn(cm, type, cm, line, gutter, e);
+        signal(cm, type, cm, line, gutter, e);
         return e_defaultPrevented(e);
       }
     }
   }
 
   function clickInGutter(cm, e) {
-    return gutterEvent(cm, e, "gutterClick", true, signalLater);
+    return gutterEvent(cm, e, "gutterClick", true);
   }
 
   // Kludge to work around strange IE behavior where it'll sometimes
@@ -2776,23 +3843,32 @@
 
   function onDrop(e) {
     var cm = this;
+    clearDragCursor(cm);
     if (signalDOMEvent(cm, e) || eventInWidget(cm.display, e))
       return;
     e_preventDefault(e);
     if (ie) lastDrop = +new Date;
     var pos = posFromMouse(cm, e, true), files = e.dataTransfer.files;
-    if (!pos || isReadOnly(cm)) return;
+    if (!pos || cm.isReadOnly()) return;
     // Might be a file drop, in which case we simply extract the text
     // and insert it.
     if (files && files.length && window.FileReader && window.File) {
       var n = files.length, text = Array(n), read = 0;
       var loadFile = function(file, i) {
+        if (cm.options.allowDropFileTypes &&
+            indexOf(cm.options.allowDropFileTypes, file.type) == -1)
+          return;
+
         var reader = new FileReader;
         reader.onload = operation(cm, function() {
-          text[i] = reader.result;
+          var content = reader.result;
+          if (/[\x00-\x08\x0e-\x1f]{2}/.test(content)) content = "";
+          text[i] = content;
           if (++read == n) {
             pos = clipPos(cm.doc, pos);
-            var change = {from: pos, to: pos, text: splitLines(text.join("\n")), origin: "paste"};
+            var change = {from: pos, to: pos,
+                          text: cm.doc.splitLines(text.join(cm.doc.lineSeparator())),
+                          origin: "paste"};
             makeChange(cm.doc, change);
             setSelectionReplaceHistory(cm.doc, simpleSelection(pos, changeEnd(change)));
           }
@@ -2805,18 +3881,19 @@
       if (cm.state.draggingText && cm.doc.sel.contains(pos) > -1) {
         cm.state.draggingText(e);
         // Ensure the editor is re-focused
-        setTimeout(bind(focusInput, cm), 20);
+        setTimeout(function() {cm.display.input.focus();}, 20);
         return;
       }
       try {
         var text = e.dataTransfer.getData("Text");
         if (text) {
-          var selected = cm.state.draggingText && cm.listSelections();
+          if (cm.state.draggingText && !(mac ? e.altKey : e.ctrlKey))
+            var selected = cm.listSelections();
           setSelectionNoUndo(cm.doc, simpleSelection(pos, pos));
           if (selected) for (var i = 0; i < selected.length; ++i)
             replaceRange(cm.doc, "", selected[i].anchor, selected[i].head, "drag");
           cm.replaceSelection(text, "around", "paste");
-          focusInput(cm);
+          cm.display.input.focus();
         }
       }
       catch(e){}
@@ -2845,6 +3922,25 @@
     }
   }
 
+  function onDragOver(cm, e) {
+    var pos = posFromMouse(cm, e);
+    if (!pos) return;
+    var frag = document.createDocumentFragment();
+    drawSelectionCursor(cm, pos, frag);
+    if (!cm.display.dragCursor) {
+      cm.display.dragCursor = elt("div", null, "CodeMirror-cursors CodeMirror-dragcursors");
+      cm.display.lineSpace.insertBefore(cm.display.dragCursor, cm.display.cursorDiv);
+    }
+    removeChildrenAndAdd(cm.display.dragCursor, frag);
+  }
+
+  function clearDragCursor(cm) {
+    if (cm.display.dragCursor) {
+      cm.display.lineSpace.removeChild(cm.display.dragCursor);
+      cm.display.dragCursor = null;
+    }
+  }
+
   // SCROLL EVENTS
 
   // Sync the scrollable area and scrollbars, ensure the viewport
@@ -2852,10 +3948,10 @@
   function setScrollTop(cm, val) {
     if (Math.abs(cm.doc.scrollTop - val) < 2) return;
     cm.doc.scrollTop = val;
-    if (!gecko) updateDisplay(cm, {top: val});
+    if (!gecko) updateDisplaySimple(cm, {top: val});
     if (cm.display.scroller.scrollTop != val) cm.display.scroller.scrollTop = val;
-    if (cm.display.scrollbarV.scrollTop != val) cm.display.scrollbarV.scrollTop = val;
-    if (gecko) updateDisplay(cm);
+    cm.display.scrollbars.setScrollTop(val);
+    if (gecko) updateDisplaySimple(cm);
     startWorker(cm, 100);
   }
   // Sync scroller and scrollbar, ensure the gutter elements are
@@ -2866,7 +3962,7 @@
     cm.doc.scrollLeft = val;
     alignHorizontally(cm);
     if (cm.display.scroller.scrollLeft != val) cm.display.scroller.scrollLeft = val;
-    if (cm.display.scrollbarH.scrollLeft != val) cm.display.scrollbarH.scrollLeft = val;
+    cm.display.scrollbars.setScrollLeft(val);
   }
 
   // Since the delta values reported on mouse wheel events are
@@ -2890,16 +3986,28 @@
   else if (chrome) wheelPixelsPerUnit = -.7;
   else if (safari) wheelPixelsPerUnit = -1/3;
 
-  function onScrollWheel(cm, e) {
+  var wheelEventDelta = function(e) {
     var dx = e.wheelDeltaX, dy = e.wheelDeltaY;
     if (dx == null && e.detail && e.axis == e.HORIZONTAL_AXIS) dx = e.detail;
     if (dy == null && e.detail && e.axis == e.VERTICAL_AXIS) dy = e.detail;
     else if (dy == null) dy = e.wheelDelta;
+    return {x: dx, y: dy};
+  };
+  CodeMirror.wheelEventPixels = function(e) {
+    var delta = wheelEventDelta(e);
+    delta.x *= wheelPixelsPerUnit;
+    delta.y *= wheelPixelsPerUnit;
+    return delta;
+  };
+
+  function onScrollWheel(cm, e) {
+    var delta = wheelEventDelta(e), dx = delta.x, dy = delta.y;
 
     var display = cm.display, scroll = display.scroller;
     // Quit if there's nothing to scroll here
-    if (!(dx && scroll.scrollWidth > scroll.clientWidth ||
-          dy && scroll.scrollHeight > scroll.clientHeight)) return;
+    var canScrollX = scroll.scrollWidth > scroll.clientWidth;
+    var canScrollY = scroll.scrollHeight > scroll.clientHeight;
+    if (!(dx && canScrollX || dy && canScrollY)) return;
 
     // Webkit browsers on OS X abort momentum scrolls when the target
     // of the scroll event is removed from the scrollable element.
@@ -2923,10 +4031,15 @@
     // scrolling entirely here. It'll be slightly off from native, but
     // better than glitching out.
     if (dx && !gecko && !presto && wheelPixelsPerUnit != null) {
-      if (dy)
+      if (dy && canScrollY)
         setScrollTop(cm, Math.max(0, Math.min(scroll.scrollTop + dy * wheelPixelsPerUnit, scroll.scrollHeight - scroll.clientHeight)));
       setScrollLeft(cm, Math.max(0, Math.min(scroll.scrollLeft + dx * wheelPixelsPerUnit, scroll.scrollWidth - scroll.clientWidth)));
-      e_preventDefault(e);
+      // Only prevent default scrolling if vertical scrolling is
+      // actually possible. Otherwise, it causes vertical scroll
+      // jitter on OSX trackpads when deltaX is small and deltaY
+      // is large (issue #3579)
+      if (!dy || (dy && canScrollY))
+        e_preventDefault(e);
       display.wheelStartX = null; // Abort measurement, if in progress
       return;
     }
@@ -2938,7 +4051,7 @@
       var top = cm.doc.scrollTop, bot = top + display.wrapper.clientHeight;
       if (pixels < 0) top = Math.max(0, top + pixels - 50);
       else bot = Math.min(cm.doc.height, bot + pixels + 50);
-      updateDisplay(cm, {top: top, bottom: bot});
+      updateDisplaySimple(cm, {top: top, bottom: bot});
     }
 
     if (wheelSamples < 20) {
@@ -2972,10 +4085,10 @@
     }
     // Ensure previous input has been read, so that the handler sees a
     // consistent view of the document
-    if (cm.display.pollingFast && readInput(cm)) cm.display.pollingFast = false;
+    cm.display.input.ensurePolled();
     var prevShift = cm.display.shift, done = false;
     try {
-      if (isReadOnly(cm)) cm.state.suppressEdits = true;
+      if (cm.isReadOnly()) cm.state.suppressEdits = true;
       if (dropShift) cm.display.shift = false;
       done = bound(cm) != Pass;
     } finally {
@@ -2985,71 +4098,79 @@
     return done;
   }
 
-  // Collect the currently active keymaps.
-  function allKeyMaps(cm) {
-    var maps = cm.state.keyMaps.slice(0);
-    if (cm.options.extraKeys) maps.push(cm.options.extraKeys);
-    maps.push(cm.options.keyMap);
-    return maps;
+  function lookupKeyForEditor(cm, name, handle) {
+    for (var i = 0; i < cm.state.keyMaps.length; i++) {
+      var result = lookupKey(name, cm.state.keyMaps[i], handle, cm);
+      if (result) return result;
+    }
+    return (cm.options.extraKeys && lookupKey(name, cm.options.extraKeys, handle, cm))
+      || lookupKey(name, cm.options.keyMap, handle, cm);
+  }
+
+  var stopSeq = new Delayed;
+  function dispatchKey(cm, name, e, handle) {
+    var seq = cm.state.keySeq;
+    if (seq) {
+      if (isModifierKey(name)) return "handled";
+      stopSeq.set(50, function() {
+        if (cm.state.keySeq == seq) {
+          cm.state.keySeq = null;
+          cm.display.input.reset();
+        }
+      });
+      name = seq + " " + name;
+    }
+    var result = lookupKeyForEditor(cm, name, handle);
+
+    if (result == "multi")
+      cm.state.keySeq = name;
+    if (result == "handled")
+      signalLater(cm, "keyHandled", cm, name, e);
+
+    if (result == "handled" || result == "multi") {
+      e_preventDefault(e);
+      restartBlink(cm);
+    }
+
+    if (seq && !result && /\'$/.test(name)) {
+      e_preventDefault(e);
+      return true;
+    }
+    return !!result;
   }
 
-  var maybeTransition;
   // Handle a key from the keydown event.
   function handleKeyBinding(cm, e) {
-    // Handle automatic keymap transitions
-    var startMap = getKeyMap(cm.options.keyMap), next = startMap.auto;
-    clearTimeout(maybeTransition);
-    if (next && !isModifierKey(e)) maybeTransition = setTimeout(function() {
-      if (getKeyMap(cm.options.keyMap) == startMap) {
-        cm.options.keyMap = (next.call ? next.call(null, cm) : next);
-        keyMapChanged(cm);
-      }
-    }, 50);
-
-    var name = keyName(e, true), handled = false;
+    var name = keyName(e, true);
     if (!name) return false;
-    var keymaps = allKeyMaps(cm);
 
-    if (e.shiftKey) {
+    if (e.shiftKey && !cm.state.keySeq) {
       // First try to resolve full name (including 'Shift-'). Failing
       // that, see if there is a cursor-motion command (starting with
       // 'go') bound to the keyname without 'Shift-'.
-      handled = lookupKey("Shift-" + name, keymaps, function(b) {return doHandleBinding(cm, b, true);})
-             || lookupKey(name, keymaps, function(b) {
-                  if (typeof b == "string" ? /^go[A-Z]/.test(b) : b.motion)
-                    return doHandleBinding(cm, b);
-                });
+      return dispatchKey(cm, "Shift-" + name, e, function(b) {return doHandleBinding(cm, b, true);})
+          || dispatchKey(cm, name, e, function(b) {
+               if (typeof b == "string" ? /^go[A-Z]/.test(b) : b.motion)
+                 return doHandleBinding(cm, b);
+             });
     } else {
-      handled = lookupKey(name, keymaps, function(b) { return doHandleBinding(cm, b); });
+      return dispatchKey(cm, name, e, function(b) { return doHandleBinding(cm, b); });
     }
-
-    if (handled) {
-      e_preventDefault(e);
-      restartBlink(cm);
-      signalLater(cm, "keyHandled", cm, name, e);
-    }
-    return handled;
   }
 
   // Handle a key from the keypress event
   function handleCharBinding(cm, e, ch) {
-    var handled = lookupKey("'" + ch + "'", allKeyMaps(cm),
-                            function(b) { return doHandleBinding(cm, b, true); });
-    if (handled) {
-      e_preventDefault(e);
-      restartBlink(cm);
-      signalLater(cm, "keyHandled", cm, "'" + ch + "'", e);
-    }
-    return handled;
+    return dispatchKey(cm, "'" + ch + "'", e,
+                       function(b) { return doHandleBinding(cm, b, true); });
   }
 
   var lastStoppedKey = null;
   function onKeyDown(e) {
     var cm = this;
-    ensureFocus(cm);
+    cm.curOp.focus = activeElt();
     if (signalDOMEvent(cm, e)) return;
     // IE does strange things with escape.
-    if (ie_upto10 && e.keyCode == 27) e.returnValue = false;
+    if (ie && ie_version < 11 && e.keyCode == 27) e.returnValue = false;
     var code = e.keyCode;
     cm.display.shift = code == 16 || e.shiftKey;
     var handled = handleKeyBinding(cm, e);
@@ -3081,42 +4202,55 @@
   }
 
   function onKeyUp(e) {
-    if (signalDOMEvent(this, e)) return;
     if (e.keyCode == 16) this.doc.sel.shift = false;
+    signalDOMEvent(this, e);
   }
 
   function onKeyPress(e) {
     var cm = this;
-    if (signalDOMEvent(cm, e)) return;
+    if (eventInWidget(cm.display, e) || signalDOMEvent(cm, e) || e.ctrlKey && !e.altKey || mac && e.metaKey) return;
     var keyCode = e.keyCode, charCode = e.charCode;
     if (presto && keyCode == lastStoppedKey) {lastStoppedKey = null; e_preventDefault(e); return;}
-    if (((presto && (!e.which || e.which < 10)) || khtml) && handleKeyBinding(cm, e)) return;
+    if ((presto && (!e.which || e.which < 10)) && handleKeyBinding(cm, e)) return;
     var ch = String.fromCharCode(charCode == null ? keyCode : charCode);
     if (handleCharBinding(cm, e, ch)) return;
-    if (ie && !ie_upto8) cm.display.inputHasSelection = null;
-    fastPoll(cm);
+    cm.display.input.onKeyPress(e);
   }
 
   // FOCUS/BLUR EVENTS
 
+  function delayBlurEvent(cm) {
+    cm.state.delayingBlurEvent = true;
+    setTimeout(function() {
+      if (cm.state.delayingBlurEvent) {
+        cm.state.delayingBlurEvent = false;
+        onBlur(cm);
+      }
+    }, 100);
+  }
+
   function onFocus(cm) {
+    if (cm.state.delayingBlurEvent) cm.state.delayingBlurEvent = false;
+
     if (cm.options.readOnly == "nocursor") return;
     if (!cm.state.focused) {
       signal(cm, "focus", cm);
       cm.state.focused = true;
       addClass(cm.display.wrapper, "CodeMirror-focused");
-      // The prevInput test prevents this from firing when a context
-      // menu is closed (since the resetInput would kill the
+      // This test prevents this from firing when a context
+      // menu is closed (since the input reset would kill the
       // select-all detection hack)
       if (!cm.curOp && cm.display.selForContextMenu != cm.doc.sel) {
-        resetInput(cm);
-        if (webkit) setTimeout(bind(resetInput, cm, true), 0); // Issue #1730
+        cm.display.input.reset();
+        if (webkit) setTimeout(function() { cm.display.input.reset(true); }, 20); // Issue #1730
       }
+      cm.display.input.receivedFocus();
     }
-    slowPoll(cm);
     restartBlink(cm);
   }
   function onBlur(cm) {
+    if (cm.state.delayingBlurEvent) return;
+
     if (cm.state.focused) {
       signal(cm, "blur", cm);
       cm.state.focused = false;
@@ -3132,78 +4266,14 @@
   // textarea (making it as unobtrusive as possible) to let the
   // right-click take effect on it.
   function onContextMenu(cm, e) {
+    if (eventInWidget(cm.display, e) || contextMenuInGutter(cm, e)) return;
     if (signalDOMEvent(cm, e, "contextmenu")) return;
-    var display = cm.display;
-    if (eventInWidget(display, e) || contextMenuInGutter(cm, e)) return;
-
-    var pos = posFromMouse(cm, e), scrollPos = display.scroller.scrollTop;
-    if (!pos || presto) return; // Opera is difficult.
-
-    // Reset the current text selection only if the click is done outside of the selection
-    // and 'resetSelectionOnContextMenu' option is true.
-    var reset = cm.options.resetSelectionOnContextMenu;
-    if (reset && cm.doc.sel.contains(pos) == -1)
-      operation(cm, setSelection)(cm.doc, simpleSelection(pos), sel_dontScroll);
-
-    var oldCSS = display.input.style.cssText;
-    display.inputDiv.style.position = "absolute";
-    display.input.style.cssText = "position: fixed; width: 30px; height: 30px; top: " + (e.clientY - 5) +
-      "px; left: " + (e.clientX - 5) + "px; z-index: 1000; background: " +
-      (ie ? "rgba(255, 255, 255, .05)" : "transparent") +
-      "; outline: none; border-width: 0; outline: none; overflow: hidden; opacity: .05; filter: alpha(opacity=5);";
-    focusInput(cm);
-    resetInput(cm);
-    // Adds "Select all" to context menu in FF
-    if (!cm.somethingSelected()) display.input.value = display.prevInput = " ";
-    display.selForContextMenu = cm.doc.sel;
-    clearTimeout(display.detectingSelectAll);
-
-    // Select-all will be greyed out if there's nothing to select, so
-    // this adds a zero-width space so that we can later check whether
-    // it got selected.
-    function prepareSelectAllHack() {
-      if (display.input.selectionStart != null) {
-        var selected = cm.somethingSelected();
-        var extval = display.input.value = "\u200b" + (selected ? display.input.value : "");
-        display.prevInput = selected ? "" : "\u200b";
-        display.input.selectionStart = 1; display.input.selectionEnd = extval.length;
-      }
-    }
-    function rehide() {
-      display.inputDiv.style.position = "relative";
-      display.input.style.cssText = oldCSS;
-      if (ie_upto8) display.scrollbarV.scrollTop = display.scroller.scrollTop = scrollPos;
-      slowPoll(cm);
-
-      // Try to detect the user choosing select-all
-      if (display.input.selectionStart != null) {
-        if (!ie || ie_upto8) prepareSelectAllHack();
-        var i = 0, poll = function() {
-          if (display.selForContextMenu == cm.doc.sel && display.input.selectionStart == 0)
-            operation(cm, commands.selectAll)(cm);
-          else if (i++ < 10) display.detectingSelectAll = setTimeout(poll, 500);
-          else resetInput(cm);
-        };
-        display.detectingSelectAll = setTimeout(poll, 200);
-      }
-    }
-
-    if (ie && !ie_upto8) prepareSelectAllHack();
-    if (captureRightClick) {
-      e_stop(e);
-      var mouseup = function() {
-        off(window, "mouseup", mouseup);
-        setTimeout(rehide, 20);
-      };
-      on(window, "mouseup", mouseup);
-    } else {
-      setTimeout(rehide, 50);
-    }
+    cm.display.input.onContextMenu(e);
   }
 
   function contextMenuInGutter(cm, e) {
     if (!hasHandler(cm, "gutterContextMenu")) return false;
-    return gutterEvent(cm, e, "gutterContextMenu", false, signal);
+    return gutterEvent(cm, e, "gutterContextMenu", false);
   }
 
   // UPDATING
@@ -3378,9 +4448,9 @@
 
       antiChanges.push(historyChangeFromChange(doc, change));
 
-      var after = i ? computeSelAfterChange(doc, change, null) : lst(source);
+      var after = i ? computeSelAfterChange(doc, change) : lst(source);
       makeChangeSingleDoc(doc, change, after, mergeOldSpans(doc, change));
-      if (!i && doc.cm) doc.cm.scrollIntoView(change);
+      if (!i && doc.cm) doc.cm.scrollIntoView({from: change.from, to: changeEnd(change)});
       var rebased = [];
 
       // Propagate to the linked documents
@@ -3437,7 +4507,7 @@
 
     change.removed = getBetween(doc, change.from, change.to);
 
-    if (!selAfter) selAfter = computeSelAfterChange(doc, change, null);
+    if (!selAfter) selAfter = computeSelAfterChange(doc, change);
     if (doc.cm) makeChangeSingleDocInEditor(doc.cm, change, spans);
     else updateDoc(doc, change, spans);
     setSelectionNoUndo(doc, selAfter, sel_dontScroll);
@@ -3483,7 +4553,9 @@
 
     var lendiff = change.text.length - (to.line - from.line) - 1;
     // Remember that these lines changed, for updating the display
-    if (from.line == to.line && change.text.length == 1 && !isWholeLineUpdate(cm.doc, change))
+    if (change.full)
+      regChange(cm);
+    else if (from.line == to.line && change.text.length == 1 && !isWholeLineUpdate(cm.doc, change))
       regLineChange(cm, from.line, "text");
     else
       regChange(cm, from.line, to.line + 1, lendiff);
@@ -3505,7 +4577,7 @@
   function replaceRange(doc, code, from, to, origin) {
     if (!to) to = from;
     if (cmp(to, from) < 0) { var tmp = to; to = from; from = tmp; }
-    if (typeof code == "string") code = splitLines(code);
+    if (typeof code == "string") code = doc.splitLines(code);
     makeChange(doc, {from: from, to: to, text: code, origin: origin});
   }
 
@@ -3514,13 +4586,15 @@
   // If an editor sits on the top or bottom of the window, partially
   // scrolled out of view, this ensures that the cursor is visible.
   function maybeScrollWindow(cm, coords) {
+    if (signalDOMEvent(cm, "scrollCursorIntoView")) return;
+
     var display = cm.display, box = display.sizer.getBoundingClientRect(), doScroll = null;
     if (coords.top + box.top < 0) doScroll = true;
     else if (coords.bottom + box.top > (window.innerHeight || document.documentElement.clientHeight)) doScroll = false;
     if (doScroll != null && !phantom) {
       var scrollNode = elt("div", "\u200b", null, "position: absolute; top: " +
                            (coords.top - display.viewOffset - paddingTop(cm.display)) + "px; height: " +
-                           (coords.bottom - coords.top + scrollerCutOff) + "px; left: " +
+                           (coords.bottom - coords.top + scrollGap(cm) + display.barHeight) + "px; left: " +
                            coords.left + "px; width: 2px;");
       cm.display.lineSpace.appendChild(scrollNode);
       scrollNode.scrollIntoView(doScroll);
@@ -3533,7 +4607,7 @@
   // measured, the position of something may 'drift' during drawing).
   function scrollPosIntoView(cm, pos, end, margin) {
     if (margin == null) margin = 0;
-    for (;;) {
+    for (var limit = 0; limit < 5; limit++) {
       var changed = false, coords = cursorCoords(cm, pos);
       var endCoords = !end || end == pos ? coords : cursorCoords(cm, end);
       var scrollPos = calculateScrollPos(cm, Math.min(coords.left, endCoords.left),
@@ -3549,8 +4623,9 @@
         setScrollLeft(cm, scrollPos.scrollLeft);
         if (Math.abs(cm.doc.scrollLeft - startLeft) > 1) changed = true;
       }
-      if (!changed) return coords;
+      if (!changed) break;
     }
+    return coords;
   }
 
   // Scroll a given set of coordinates into view (immediately).
@@ -3568,7 +4643,8 @@
     var display = cm.display, snapMargin = textHeight(cm.display);
     if (y1 < 0) y1 = 0;
     var screentop = cm.curOp && cm.curOp.scrollTop != null ? cm.curOp.scrollTop : display.scroller.scrollTop;
-    var screen = display.scroller.clientHeight - scrollerCutOff, result = {};
+    var screen = displayHeight(cm), result = {};
+    if (y2 - y1 > screen) y2 = y1 + screen;
     var docBottom = cm.doc.height + paddingVert(display);
     var atTop = y1 < snapMargin, atBottom = y2 > docBottom - snapMargin;
     if (y1 < screentop) {
@@ -3579,16 +4655,15 @@
     }
 
     var screenleft = cm.curOp && cm.curOp.scrollLeft != null ? cm.curOp.scrollLeft : display.scroller.scrollLeft;
-    var screenw = display.scroller.clientWidth - scrollerCutOff;
-    x1 += display.gutters.offsetWidth; x2 += display.gutters.offsetWidth;
-    var gutterw = display.gutters.offsetWidth;
-    var atLeft = x1 < gutterw + 10;
-    if (x1 < screenleft + gutterw || atLeft) {
-      if (atLeft) x1 = 0;
-      result.scrollLeft = Math.max(0, x1 - 10 - gutterw);
-    } else if (x2 > screenw + screenleft - 3) {
-      result.scrollLeft = x2 + 10 - screenw;
-    }
+    var screenw = displayWidth(cm) - (cm.options.fixedGutter ? display.gutters.offsetWidth : 0);
+    var tooWide = x2 - x1 > screenw;
+    if (tooWide) x2 = x1 + screenw;
+    if (x1 < 10)
+      result.scrollLeft = 0;
+    else if (x1 < screenleft)
+      result.scrollLeft = Math.max(0, x1 - (tooWide ? 0 : 10));
+    else if (x2 > screenw + screenleft - 3)
+      result.scrollLeft = x2 + (tooWide ? 0 : 10) - screenw;
     return result;
   }
 
@@ -3644,7 +4719,7 @@
     if (how == "smart") {
       // Fall back to "prev" when the mode doesn't have an indentation
       // method.
-      if (!cm.doc.mode.indent) how = "prev";
+      if (!doc.mode.indent) how = "prev";
       else state = getStateBefore(cm, n);
     }
 
@@ -3656,8 +4731,8 @@
       indentation = 0;
       how = "not";
     } else if (how == "smart") {
-      indentation = cm.doc.mode.indent(state, line.text.slice(curSpaceString.length), line.text);
-      if (indentation == Pass) {
+      indentation = doc.mode.indent(state, line.text.slice(curSpaceString.length), line.text);
+      if (indentation == Pass || indentation > 150) {
         if (!aggressive) return;
         how = "prev";
       }
@@ -3680,7 +4755,9 @@
     if (pos < indentation) indentString += spaceStr(indentation - pos);
 
     if (indentString != curSpaceString) {
-      replaceRange(cm.doc, indentString, Pos(n, 0), Pos(n, curSpaceString.length), "+input");
+      replaceRange(doc, indentString, Pos(n, 0), Pos(n, curSpaceString.length), "+input");
+      line.stateAfter = null;
+      return true;
     } else {
       // Ensure that, if the cursor was in the whitespace at the start
       // of the line, it is moved to the end of that space.
@@ -3693,18 +4770,17 @@
         }
       }
     }
-    line.stateAfter = null;
   }
 
   // Utility for applying a change to a line by handle or number,
   // returning the number and optionally registering the line as
   // changed.
-  function changeLine(cm, handle, changeType, op) {
-    var no = handle, line = handle, doc = cm.doc;
+  function changeLine(doc, handle, changeType, op) {
+    var no = handle, line = handle;
     if (typeof handle == "number") line = getLine(doc, clipLine(doc, handle));
     else no = lineNo(handle);
     if (no == null) return null;
-    if (op(line, no)) regLineChange(cm, no, changeType);
+    if (op(line, no) && doc.cm) regLineChange(doc.cm, no, changeType);
     return line;
   }
 
@@ -3745,10 +4821,9 @@
   function findPosH(doc, pos, dir, unit, visually) {
     var line = pos.line, ch = pos.ch, origDir = dir;
     var lineObj = getLine(doc, line);
-    var possible = true;
     function findNextLine() {
       var l = line + dir;
-      if (l < doc.first || l >= doc.first + doc.size) return (possible = false);
+      if (l < doc.first || l >= doc.first + doc.size) return false
       line = l;
       return lineObj = getLine(doc, l);
     }
@@ -3758,14 +4833,16 @@
         if (!boundToLine && findNextLine()) {
           if (visually) ch = (dir < 0 ? lineRight : lineLeft)(lineObj);
           else ch = dir < 0 ? lineObj.text.length : 0;
-        } else return (possible = false);
+        } else return false
       } else ch = next;
       return true;
     }
 
-    if (unit == "char") moveOnce();
-    else if (unit == "column") moveOnce(true);
-    else if (unit == "word" || unit == "group") {
+    if (unit == "char") {
+      moveOnce()
+    } else if (unit == "column") {
+      moveOnce(true)
+    } else if (unit == "word" || unit == "group") {
       var sawType = null, group = unit == "group";
       var helper = doc.cm && doc.cm.getHelper(pos, "wordChars");
       for (var first = true;; first = false) {
@@ -3785,8 +4862,8 @@
         if (dir > 0 && !moveOnce(!first)) break;
       }
     }
-    var result = skipAtomic(doc, Pos(line, ch), origDir, true);
-    if (!possible) result.hitSide = true;
+    var result = skipAtomic(doc, Pos(line, ch), pos, origDir, true);
+    if (!cmp(pos, result)) result.hitSide = true;
     return result;
   }
 
@@ -3810,24 +4887,6 @@
     return target;
   }
 
-  // Find the word at the given position (as returned by coordsChar).
-  function findWordAt(cm, pos) {
-    var doc = cm.doc, line = getLine(doc, pos.line).text;
-    var start = pos.ch, end = pos.ch;
-    if (line) {
-      var helper = cm.getHelper(pos, "wordChars");
-      if ((pos.xRel < 0 || end == line.length) && start) --start; else ++end;
-      var startChar = line.charAt(start);
-      var check = isWordChar(startChar, helper)
-        ? function(ch) { return isWordChar(ch, helper); }
-        : /\s/.test(startChar) ? function(ch) {return /\s/.test(ch);}
-        : function(ch) {return !/\s/.test(ch) && !isWordChar(ch);};
-      while (start > 0 && check(line.charAt(start - 1))) --start;
-      while (end < line.length && check(line.charAt(end))) ++end;
-    }
-    return new Range(Pos(pos.line, start), Pos(pos.line, end));
-  }
-
   // EDITOR METHODS
 
   // The publicly visible API. Note that methodOp(f) means
@@ -3840,7 +4899,7 @@
 
   CodeMirror.prototype = {
     constructor: CodeMirror,
-    focus: function(){window.focus(); focusInput(this); fastPoll(this);},
+    focus: function(){window.focus(); this.display.input.focus();},
 
     setOption: function(option, value) {
       var options = this.options, old = options[option];
@@ -3854,12 +4913,12 @@
     getDoc: function() {return this.doc;},
 
     addKeyMap: function(map, bottom) {
-      this.state.keyMaps[bottom ? "push" : "unshift"](map);
+      this.state.keyMaps[bottom ? "push" : "unshift"](getKeyMap(map));
     },
     removeKeyMap: function(map) {
       var maps = this.state.keyMaps;
       for (var i = 0; i < maps.length; ++i)
-        if (maps[i] == map || (typeof maps[i] != "string" && maps[i].name == map)) {
+        if (maps[i] == map || maps[i].name == map) {
           maps.splice(i, 1);
           return true;
         }
@@ -3897,11 +4956,14 @@
       for (var i = 0; i < ranges.length; i++) {
         var range = ranges[i];
         if (!range.empty()) {
-          var start = Math.max(end, range.from().line);
-          var to = range.to();
+          var from = range.from(), to = range.to();
+          var start = Math.max(end, from.line);
           end = Math.min(this.lastLine(), to.line - (to.ch ? 0 : 1)) + 1;
           for (var j = start; j < end; ++j)
             indentLine(this, j, how);
+          var newRanges = this.doc.sel.ranges;
+          if (from.ch == 0 && ranges.length == newRanges.length && newRanges[i].from().ch > 0)
+            replaceOneSelection(this.doc, i, new Range(from, newRanges[i].to()), sel_dontScroll);
         } else if (range.head.line > end) {
           indentLine(this, range.head.line, how, true);
           end = range.head.line;
@@ -3913,20 +4975,11 @@
     // Fetch the parser token for a given character. Useful for hacks
     // that want to inspect the mode state (say, for completion).
     getTokenAt: function(pos, precise) {
-      var doc = this.doc;
-      pos = clipPos(doc, pos);
-      var state = getStateBefore(this, pos.line, precise), mode = this.doc.mode;
-      var line = getLine(doc, pos.line);
-      var stream = new StringStream(line.text, this.options.tabSize);
-      while (stream.pos < pos.ch && !stream.eol()) {
-        stream.start = stream.pos;
-        var style = readToken(mode, stream, state);
-      }
-      return {start: stream.start,
-              end: stream.pos,
-              string: stream.current(),
-              type: style || null,
-              state: state};
+      return takeToken(this, pos, precise);
+    },
+
+    getLineTokens: function(line, precise) {
+      return takeToken(this, Pos(line), precise, true);
     },
 
     getTokenTypeAt: function(pos) {
@@ -3957,7 +5010,7 @@
 
     getHelpers: function(pos, type) {
       var found = [];
-      if (!helpers.hasOwnProperty(type)) return helpers;
+      if (!helpers.hasOwnProperty(type)) return found;
       var help = helpers[type], mode = this.getModeAt(pos);
       if (typeof mode[type] == "string") {
         if (help[mode[type]]) found.push(help[mode[type]]);
@@ -4007,10 +5060,15 @@
       return lineAtHeight(this.doc, height + this.display.viewOffset);
     },
     heightAtLine: function(line, mode) {
-      var end = false, last = this.doc.first + this.doc.size - 1;
-      if (line < this.doc.first) line = this.doc.first;
-      else if (line > last) { line = last; end = true; }
-      var lineObj = getLine(this.doc, line);
+      var end = false, lineObj;
+      if (typeof line == "number") {
+        var last = this.doc.first + this.doc.size - 1;
+        if (line < this.doc.first) line = this.doc.first;
+        else if (line > last) { line = last; end = true; }
+        lineObj = getLine(this.doc, line);
+      } else {
+        lineObj = line;
+      }
       return intoCoordSystem(this, lineObj, {top: 0, left: 0}, mode || "page").top +
         (end ? this.doc.height - heightAtLine(lineObj) : 0);
     },
@@ -4019,7 +5077,7 @@
     defaultCharWidth: function() { return charWidth(this.display); },
 
     setGutterMarker: methodOp(function(line, gutterID, value) {
-      return changeLine(this, line, "gutter", function(line) {
+      return changeLine(this.doc, line, "gutter", function(line) {
         var markers = line.gutterMarkers || (line.gutterMarkers = {});
         markers[gutterID] = value;
         if (!value && isEmpty(markers)) line.gutterMarkers = null;
@@ -4039,38 +5097,6 @@
       });
     }),
 
-    addLineClass: methodOp(function(handle, where, cls) {
-      return changeLine(this, handle, "class", function(line) {
-        var prop = where == "text" ? "textClass" : where == "background" ? "bgClass" : "wrapClass";
-        if (!line[prop]) line[prop] = cls;
-        else if (new RegExp("(?:^|\\s)" + cls + "(?:$|\\s)").test(line[prop])) return false;
-        else line[prop] += " " + cls;
-        return true;
-      });
-    }),
-
-    removeLineClass: methodOp(function(handle, where, cls) {
-      return changeLine(this, handle, "class", function(line) {
-        var prop = where == "text" ? "textClass" : where == "background" ? "bgClass" : "wrapClass";
-        var cur = line[prop];
-        if (!cur) return false;
-        else if (cls == null) line[prop] = null;
-        else {
-          var found = cur.match(new RegExp("(?:^|\\s+)" + cls + "(?:$|\\s+)"));
-          if (!found) return false;
-          var end = found.index + found[0].length;
-          line[prop] = cur.slice(0, found.index) + (!found.index || end == cur.length ? "" : " ") + cur.slice(end) || null;
-        }
-        return true;
-      });
-    }),
-
-    addLineWidget: methodOp(function(handle, node, options) {
-      return addLineWidget(this, handle, node, options);
-    }),
-
-    removeLineWidget: function(widget) { widget.clear(); },
-
     lineInfo: function(line) {
       if (typeof line == "number") {
         if (!isLine(this.doc, line)) return null;
@@ -4093,6 +5119,8 @@
       pos = cursorCoords(this, clipPos(this.doc, pos));
       var top = pos.bottom, left = pos.left;
       node.style.position = "absolute";
+      node.setAttribute("cm-ignore-events", "true");
+      this.display.input.setUneditable(node);
       display.sizer.appendChild(node);
       if (vert == "over") {
         top = pos.top;
@@ -4123,13 +5151,15 @@
 
     triggerOnKeyDown: methodOp(onKeyDown),
     triggerOnKeyPress: methodOp(onKeyPress),
-    triggerOnKeyUp: methodOp(onKeyUp),
+    triggerOnKeyUp: onKeyUp,
 
     execCommand: function(cmd) {
       if (commands.hasOwnProperty(cmd))
-        return commands[cmd](this);
+        return commands[cmd].call(null, this);
     },
 
+    triggerElectric: methodOp(function(text) { triggerElectric(this, text); }),
+
     findPosH: function(from, amount, unit, visually) {
       var dir = 1;
       if (amount < 0) { dir = -1; amount = -amount; }
@@ -4192,6 +5222,24 @@
         doc.sel.ranges[i].goalColumn = goals[i];
     }),
 
+    // Find the word at the given position (as returned by coordsChar).
+    findWordAt: function(pos) {
+      var doc = this.doc, line = getLine(doc, pos.line).text;
+      var start = pos.ch, end = pos.ch;
+      if (line) {
+        var helper = this.getHelper(pos, "wordChars");
+        if ((pos.xRel < 0 || end == line.length) && start) --start; else ++end;
+        var startChar = line.charAt(start);
+        var check = isWordChar(startChar, helper)
+          ? function(ch) { return isWordChar(ch, helper); }
+          : /\s/.test(startChar) ? function(ch) {return /\s/.test(ch);}
+          : function(ch) {return !/\s/.test(ch) && !isWordChar(ch);};
+        while (start > 0 && check(line.charAt(start - 1))) --start;
+        while (end < line.length && check(line.charAt(end))) ++end;
+      }
+      return new Range(Pos(pos.line, start), Pos(pos.line, end));
+    },
+
     toggleOverwrite: function(value) {
       if (value != null && value == this.state.overwrite) return;
       if (this.state.overwrite = !this.state.overwrite)
@@ -4201,7 +5249,8 @@
 
       signal(this, "overwriteToggle", this, this.state.overwrite);
     },
-    hasFocus: function() { return activeElt() == this.display.input; },
+    hasFocus: function() { return this.display.input.getField() == activeElt(); },
+    isReadOnly: function() { return !!(this.options.readOnly || this.doc.cantEdit); },
 
     scrollTo: methodOp(function(x, y) {
       if (x != null || y != null) resolveScrollToPos(this);
@@ -4209,10 +5258,11 @@
       if (y != null) this.curOp.scrollTop = y;
     }),
     getScrollInfo: function() {
-      var scroller = this.display.scroller, co = scrollerCutOff;
+      var scroller = this.display.scroller;
       return {left: scroller.scrollLeft, top: scroller.scrollTop,
-              height: scroller.scrollHeight - co, width: scroller.scrollWidth - co,
-              clientHeight: scroller.clientHeight - co, clientWidth: scroller.clientWidth - co};
+              height: scroller.scrollHeight - scrollGap(this) - this.display.barHeight,
+              width: scroller.scrollWidth - scrollGap(this) - this.display.barWidth,
+              clientHeight: displayHeight(this), clientWidth: displayWidth(this)};
     },
 
     scrollIntoView: methodOp(function(range, margin) {
@@ -4240,14 +5290,21 @@
     }),
 
     setSize: methodOp(function(width, height) {
+      var cm = this;
       function interpret(val) {
         return typeof val == "number" || /^\d+$/.test(String(val)) ? val + "px" : val;
       }
-      if (width != null) this.display.wrapper.style.width = interpret(width);
-      if (height != null) this.display.wrapper.style.height = interpret(height);
-      if (this.options.lineWrapping) clearLineMeasurementCache(this);
-      this.curOp.forceUpdate = true;
-      signal(this, "refresh", this);
+      if (width != null) cm.display.wrapper.style.width = interpret(width);
+      if (height != null) cm.display.wrapper.style.height = interpret(height);
+      if (cm.options.lineWrapping) clearLineMeasurementCache(this);
+      var lineNo = cm.display.viewFrom;
+      cm.doc.iter(lineNo, cm.display.viewTo, function(line) {
+        if (line.widgets) for (var i = 0; i < line.widgets.length; i++)
+          if (line.widgets[i].noHScroll) { regLineChange(cm, lineNo, "widget"); break; }
+        ++lineNo;
+      });
+      cm.curOp.forceUpdate = true;
+      signal(cm, "refresh", this);
     }),
 
     operation: function(f){return runInOp(this, f);},
@@ -4269,13 +5326,14 @@
       old.cm = null;
       attachDoc(this, doc);
       clearCaches(this);
-      resetInput(this);
+      this.display.input.reset();
       this.scrollTo(doc.scrollLeft, doc.scrollTop);
+      this.curOp.forceScroll = true;
       signalLater(this, "swapDoc", this, old);
       return old;
     }),
 
-    getInputField: function(){return this.display.input;},
+    getInputField: function(){return this.display.input.getField();},
     getWrapperElement: function(){return this.display.wrapper;},
     getScrollerElement: function(){return this.display.scroller;},
     getGutterElement: function(){return this.display.gutters;}
@@ -4316,12 +5374,31 @@
     clearCaches(cm);
     regChange(cm);
   }, true);
-  option("specialChars", /[\t\u0000-\u0019\u00ad\u200b\u2028\u2029\ufeff]/g, function(cm, val) {
-    cm.options.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g");
-    cm.refresh();
-  }, true);
+  option("lineSeparator", null, function(cm, val) {
+    cm.doc.lineSep = val;
+    if (!val) return;
+    var newBreaks = [], lineNo = cm.doc.first;
+    cm.doc.iter(function(line) {
+      for (var pos = 0;;) {
+        var found = line.text.indexOf(val, pos);
+        if (found == -1) break;
+        pos = found + val.length;
+        newBreaks.push(Pos(lineNo, found));
+      }
+      lineNo++;
+    });
+    for (var i = newBreaks.length - 1; i >= 0; i--)
+      replaceRange(cm.doc, val, newBreaks[i], Pos(newBreaks[i].line, newBreaks[i].ch + val.length))
+  });
+  option("specialChars", /[\t\u0000-\u0019\u00ad\u200b-\u200f\u2028\u2029\ufeff]/g, function(cm, val, old) {
+    cm.state.specialChars = new RegExp(val.source + (val.test("\t") ? "" : "|\t"), "g");
+    if (old != CodeMirror.Init) cm.refresh();
+  });
   option("specialCharPlaceholder", defaultSpecialCharPlaceholder, function(cm) {cm.refresh();}, true);
   option("electricChars", true);
+  option("inputStyle", mobile ? "contenteditable" : "textarea", function() {
+    throw new Error("inputStyle can not (yet) be changed in a running editor"); // FIXME
+  }, true);
   option("rtlMoveVisually", !windows);
   option("wholeLineUpdateBefore", true);
 
@@ -4329,7 +5406,12 @@
     themeChanged(cm);
     guttersChanged(cm);
   }, true);
-  option("keyMap", "default", keyMapChanged);
+  option("keyMap", "default", function(cm, val, old) {
+    var next = getKeyMap(val);
+    var prev = old != CodeMirror.Init && getKeyMap(old);
+    if (prev && prev.detach) prev.detach(cm, next);
+    if (next.attach) next.attach(cm, prev || null);
+  });
   option("extraKeys", null);
 
   option("lineWrapping", false, wrappingChanged, true);
@@ -4341,7 +5423,13 @@
     cm.display.gutters.style.left = val ? compensateForHScroll(cm.display) + "px" : "0";
     cm.refresh();
   }, true);
-  option("coverGutterNextToScrollbar", false, updateScrollbars, true);
+  option("coverGutterNextToScrollbar", false, function(cm) {updateScrollbars(cm);}, true);
+  option("scrollbarStyle", "native", function(cm) {
+    initScrollbars(cm);
+    updateScrollbars(cm);
+    cm.display.scrollbars.setScrollTop(cm.doc.scrollTop);
+    cm.display.scrollbars.setScrollLeft(cm.doc.scrollLeft);
+  }, true);
   option("lineNumbers", false, function(cm) {
     setGuttersForLineNumbers(cm.options);
     guttersChanged(cm);
@@ -4351,6 +5439,7 @@
   option("showCursorWhenSelecting", false, updateSelection, true);
 
   option("resetSelectionOnContextMenu", true);
+  option("lineWiseCopyCut", true);
 
   option("readOnly", false, function(cm, val) {
     if (val == "nocursor") {
@@ -4359,15 +5448,17 @@
       cm.display.disabled = true;
     } else {
       cm.display.disabled = false;
-      if (!val) resetInput(cm);
     }
+    cm.display.input.readOnlyChanged(val)
   });
-  option("disableInput", false, function(cm, val) {if (!val) resetInput(cm);}, true);
-  option("dragDrop", true);
+  option("disableInput", false, function(cm, val) {if (!val) cm.display.input.reset();}, true);
+  option("dragDrop", true, dragDropChanged);
+  option("allowDropFileTypes", null);
 
   option("cursorBlinkRate", 530);
   option("cursorScrollMargin", 0);
-  option("cursorHeight", 1);
+  option("cursorHeight", 1, updateSelection, true);
+  option("singleCursorHeightPerLine", true, updateSelection, true);
   option("workTime", 100);
   option("workDelay", 100);
   option("flattenSpans", true, resetModeState, true);
@@ -4378,11 +5469,11 @@
   option("viewportMargin", 10, function(cm){cm.refresh();}, true);
   option("maxHighlightLength", 10000, resetModeState, true);
   option("moveInputWithCursor", true, function(cm, val) {
-    if (!val) cm.display.inputDiv.style.top = cm.display.inputDiv.style.left = 0;
+    if (!val) cm.display.input.resetPosition();
   });
 
   option("tabindex", null, function(cm, val) {
-    cm.display.input.tabIndex = val || "";
+    cm.display.input.getField().tabIndex = val || "";
   });
   option("autofocus", null);
 
@@ -4396,10 +5487,8 @@
   // load a mode. (Preferred mechanism is the require/define calls.)
   CodeMirror.defineMode = function(name, mode) {
     if (!CodeMirror.defaults.mode && name != "null") CodeMirror.defaults.mode = name;
-    if (arguments.length > 2) {
-      mode.dependencies = [];
-      for (var i = 2; i < arguments.length; ++i) mode.dependencies.push(arguments[i]);
-    }
+    if (arguments.length > 2)
+      mode.dependencies = Array.prototype.slice.call(arguments, 2);
     modes[name] = mode;
   };
 
@@ -4550,6 +5639,20 @@
         return {from: Pos(range.from().line, 0), to: range.from()};
       });
     },
+    delWrappedLineLeft: function(cm) {
+      deleteNearSelection(cm, function(range) {
+        var top = cm.charCoords(range.head, "div").top + 5;
+        var leftPos = cm.coordsChar({left: 0, top: top}, "div");
+        return {from: leftPos, to: range.from()};
+      });
+    },
+    delWrappedLineRight: function(cm) {
+      deleteNearSelection(cm, function(range) {
+        var top = cm.charCoords(range.head, "div").top + 5;
+        var rightPos = cm.coordsChar({left: cm.display.lineDiv.offsetWidth + 100, top: top}, "div");
+        return {from: range.from(), to: rightPos };
+      });
+    },
     undo: function(cm) {cm.undo();},
     redo: function(cm) {cm.redo();},
     undoSelection: function(cm) {cm.undoSelection();},
@@ -4557,23 +5660,17 @@
     goDocStart: function(cm) {cm.extendSelection(Pos(cm.firstLine(), 0));},
     goDocEnd: function(cm) {cm.extendSelection(Pos(cm.lastLine()));},
     goLineStart: function(cm) {
-      cm.extendSelectionsBy(function(range) { return lineStart(cm, range.head.line); }, sel_move);
+      cm.extendSelectionsBy(function(range) { return lineStart(cm, range.head.line); },
+                            {origin: "+move", bias: 1});
     },
     goLineStartSmart: function(cm) {
       cm.extendSelectionsBy(function(range) {
-        var start = lineStart(cm, range.head.line);
-        var line = cm.getLineHandle(start.line);
-        var order = getOrder(line);
-        if (!order || order[0].level == 0) {
-          var firstNonWS = Math.max(0, line.text.search(/\S/));
-          var inWS = range.head.line == start.line && range.head.ch <= firstNonWS && range.head.ch;
-          return Pos(start.line, inWS ? 0 : firstNonWS);
-        }
-        return start;
-      }, sel_move);
+        return lineStartSmart(cm, range.head);
+      }, {origin: "+move", bias: 1});
     },
     goLineEnd: function(cm) {
-      cm.extendSelectionsBy(function(range) { return lineEnd(cm, range.head.line); }, sel_move);
+      cm.extendSelectionsBy(function(range) { return lineEnd(cm, range.head.line); },
+                            {origin: "+move", bias: -1});
     },
     goLineRight: function(cm) {
       cm.extendSelectionsBy(function(range) {
@@ -4587,6 +5684,14 @@
         return cm.coordsChar({left: 0, top: top}, "div");
       }, sel_move);
     },
+    goLineLeftSmart: function(cm) {
+      cm.extendSelectionsBy(function(range) {
+        var top = cm.charCoords(range.head, "div").top + 5;
+        var pos = cm.coordsChar({left: 0, top: top}, "div");
+        if (pos.ch < cm.getLine(pos.line).search(/\S/)) return lineStartSmart(cm, range.head);
+        return pos;
+      }, sel_move);
+    },
     goLineUp: function(cm) {cm.moveV(-1, "line");},
     goLineDown: function(cm) {cm.moveV(1, "line");},
     goPageUp: function(cm) {cm.moveV(-1, "page");},
@@ -4636,7 +5741,8 @@
             } else if (cur.line > cm.doc.first) {
               var prev = getLine(cm.doc, cur.line - 1).text;
               if (prev)
-                cm.replaceRange(line.charAt(0) + "\n" + prev.charAt(prev.length - 1),
+                cm.replaceRange(line.charAt(0) + cm.doc.lineSeparator() +
+                                prev.charAt(prev.length - 1),
                                 Pos(cur.line - 1, prev.length - 1), Pos(cur.line, 1), "+transpose");
             }
           }
@@ -4650,18 +5756,20 @@
         var len = cm.listSelections().length;
         for (var i = 0; i < len; i++) {
           var range = cm.listSelections()[i];
-          cm.replaceRange("\n", range.anchor, range.head, "+input");
+          cm.replaceRange(cm.doc.lineSeparator(), range.anchor, range.head, "+input");
           cm.indentLine(range.from().line + 1, null, true);
-          ensureCursorVisible(cm);
         }
+        ensureCursorVisible(cm);
       });
     },
     toggleOverwrite: function(cm) {cm.toggleOverwrite();}
   };
 
+
   // STANDARD KEYMAPS
 
   var keyMap = CodeMirror.keyMap = {};
+
   keyMap.basic = {
     "Left": "goCharLeft", "Right": "goCharRight", "Up": "goLineUp", "Down": "goLineDown",
     "End": "goLineEnd", "Home": "goLineStartSmart", "PageUp": "goPageUp", "PageDown": "goPageDown",
@@ -4675,7 +5783,7 @@
   // are simply ignored.
   keyMap.pcDefault = {
     "Ctrl-A": "selectAll", "Ctrl-D": "deleteLine", "Ctrl-Z": "undo", "Shift-Ctrl-Z": "redo", "Ctrl-Y": "redo",
-    "Ctrl-Home": "goDocStart", "Ctrl-Up": "goDocStart", "Ctrl-End": "goDocEnd", "Ctrl-Down": "goDocEnd",
+    "Ctrl-Home": "goDocStart", "Ctrl-End": "goDocEnd", "Ctrl-Up": "goLineUp", "Ctrl-Down": "goLineDown",
     "Ctrl-Left": "goGroupLeft", "Ctrl-Right": "goGroupRight", "Alt-Left": "goLineStart", "Alt-Right": "goLineEnd",
     "Ctrl-Backspace": "delGroupBefore", "Ctrl-Delete": "delGroupAfter", "Ctrl-S": "save", "Ctrl-F": "find",
     "Ctrl-G": "findNext", "Shift-Ctrl-G": "findPrev", "Shift-Ctrl-F": "replace", "Shift-Ctrl-R": "replaceAll",
@@ -4683,16 +5791,6 @@
     "Ctrl-U": "undoSelection", "Shift-Ctrl-U": "redoSelection", "Alt-U": "redoSelection",
     fallthrough: "basic"
   };
-  keyMap.macDefault = {
-    "Cmd-A": "selectAll", "Cmd-D": "deleteLine", "Cmd-Z": "undo", "Shift-Cmd-Z": "redo", "Cmd-Y": "redo",
-    "Cmd-Up": "goDocStart", "Cmd-End": "goDocEnd", "Cmd-Down": "goDocEnd", "Alt-Left": "goGroupLeft",
-    "Alt-Right": "goGroupRight", "Cmd-Left": "goLineStart", "Cmd-Right": "goLineEnd", "Alt-Backspace": "delGroupBefore",
-    "Ctrl-Alt-Backspace": "delGroupAfter", "Alt-Delete": "delGroupAfter", "Cmd-S": "save", "Cmd-F": "find",
-    "Cmd-G": "findNext", "Shift-Cmd-G": "findPrev", "Cmd-Alt-F": "replace", "Shift-Cmd-Alt-F": "replaceAll",
-    "Cmd-[": "indentLess", "Cmd-]": "indentMore", "Cmd-Backspace": "delLineLeft",
-    "Cmd-U": "undoSelection", "Shift-Cmd-U": "redoSelection",
-    fallthrough: ["basic", "emacsy"]
-  };
   // Very basic readline/emacs-style bindings, which are standard on Mac.
   keyMap.emacsy = {
     "Ctrl-F": "goCharRight", "Ctrl-B": "goCharLeft", "Ctrl-P": "goLineUp", "Ctrl-N": "goLineDown",
@@ -4700,70 +5798,117 @@
     "Ctrl-V": "goPageDown", "Shift-Ctrl-V": "goPageUp", "Ctrl-D": "delCharAfter", "Ctrl-H": "delCharBefore",
     "Alt-D": "delWordAfter", "Alt-Backspace": "delWordBefore", "Ctrl-K": "killLine", "Ctrl-T": "transposeChars"
   };
+  keyMap.macDefault = {
+    "Cmd-A": "selectAll", "Cmd-D": "deleteLine", "Cmd-Z": "undo", "Shift-Cmd-Z": "redo", "Cmd-Y": "redo",
+    "Cmd-Home": "goDocStart", "Cmd-Up": "goDocStart", "Cmd-End": "goDocEnd", "Cmd-Down": "goDocEnd", "Alt-Left": "goGroupLeft",
+    "Alt-Right": "goGroupRight", "Cmd-Left": "goLineLeft", "Cmd-Right": "goLineRight", "Alt-Backspace": "delGroupBefore",
+    "Ctrl-Alt-Backspace": "delGroupAfter", "Alt-Delete": "delGroupAfter", "Cmd-S": "save", "Cmd-F": "find",
+    "Cmd-G": "findNext", "Shift-Cmd-G": "findPrev", "Cmd-Alt-F": "replace", "Shift-Cmd-Alt-F": "replaceAll",
+    "Cmd-[": "indentLess", "Cmd-]": "indentMore", "Cmd-Backspace": "delWrappedLineLeft", "Cmd-Delete": "delWrappedLineRight",
+    "Cmd-U": "undoSelection", "Shift-Cmd-U": "redoSelection", "Ctrl-Up": "goDocStart", "Ctrl-Down": "goDocEnd",
+    fallthrough: ["basic", "emacsy"]
+  };
   keyMap["default"] = mac ? keyMap.macDefault : keyMap.pcDefault;
 
   // KEYMAP DISPATCH
 
-  function getKeyMap(val) {
-    if (typeof val == "string") return keyMap[val];
-    else return val;
+  function normalizeKeyName(name) {
+    var parts = name.split(/-(?!$)/), name = parts[parts.length - 1];
+    var alt, ctrl, shift, cmd;
+    for (var i = 0; i < parts.length - 1; i++) {
+      var mod = parts[i];
+      if (/^(cmd|meta|m)$/i.test(mod)) cmd = true;
+      else if (/^a(lt)?$/i.test(mod)) alt = true;
+      else if (/^(c|ctrl|control)$/i.test(mod)) ctrl = true;
+      else if (/^s(hift)$/i.test(mod)) shift = true;
+      else throw new Error("Unrecognized modifier name: " + mod);
+    }
+    if (alt) name = "Alt-" + name;
+    if (ctrl) name = "Ctrl-" + name;
+    if (cmd) name = "Cmd-" + name;
+    if (shift) name = "Shift-" + name;
+    return name;
   }
 
-  // Given an array of keymaps and a key name, call handle on any
-  // bindings found, until that returns a truthy value, at which point
-  // we consider the key handled. Implements things like binding a key
-  // to false stopping further handling and keymap fallthrough.
-  var lookupKey = CodeMirror.lookupKey = function(name, maps, handle) {
-    function lookup(map) {
-      map = getKeyMap(map);
-      var found = map[name];
-      if (found === false) return "stop";
-      if (found != null && handle(found)) return true;
-      if (map.nofallthrough) return "stop";
+  // This is a kludge to keep keymaps mostly working as raw objects
+  // (backwards compatibility) while at the same time support features
+  // like normalization and multi-stroke key bindings. It compiles a
+  // new normalized keymap, and then updates the old object to reflect
+  // this.
+  CodeMirror.normalizeKeyMap = function(keymap) {
+    var copy = {};
+    for (var keyname in keymap) if (keymap.hasOwnProperty(keyname)) {
+      var value = keymap[keyname];
+      if (/^(name|fallthrough|(de|at)tach)$/.test(keyname)) continue;
+      if (value == "...") { delete keymap[keyname]; continue; }
 
-      var fallthrough = map.fallthrough;
-      if (fallthrough == null) return false;
-      if (Object.prototype.toString.call(fallthrough) != "[object Array]")
-        return lookup(fallthrough);
-      for (var i = 0; i < fallthrough.length; ++i) {
-        var done = lookup(fallthrough[i]);
-        if (done) return done;
+      var keys = map(keyname.split(" "), normalizeKeyName);
+      for (var i = 0; i < keys.length; i++) {
+        var val, name;
+        if (i == keys.length - 1) {
+          name = keys.join(" ");
+          val = value;
+        } else {
+          name = keys.slice(0, i + 1).join(" ");
+          val = "...";
+        }
+        var prev = copy[name];
+        if (!prev) copy[name] = val;
+        else if (prev != val) throw new Error("Inconsistent bindings for " + name);
       }
-      return false;
+      delete keymap[keyname];
     }
+    for (var prop in copy) keymap[prop] = copy[prop];
+    return keymap;
+  };
 
-    for (var i = 0; i < maps.length; ++i) {
-      var done = lookup(maps[i]);
-      if (done) return done != "stop";
+  var lookupKey = CodeMirror.lookupKey = function(key, map, handle, context) {
+    map = getKeyMap(map);
+    var found = map.call ? map.call(key, context) : map[key];
+    if (found === false) return "nothing";
+    if (found === "...") return "multi";
+    if (found != null && handle(found)) return "handled";
+
+    if (map.fallthrough) {
+      if (Object.prototype.toString.call(map.fallthrough) != "[object Array]")
+        return lookupKey(key, map.fallthrough, handle, context);
+      for (var i = 0; i < map.fallthrough.length; i++) {
+        var result = lookupKey(key, map.fallthrough[i], handle, context);
+        if (result) return result;
+      }
     }
   };
 
   // Modifier key presses don't count as 'real' key presses for the
   // purpose of keymap fallthrough.
-  var isModifierKey = CodeMirror.isModifierKey = function(event) {
-    var name = keyNames[event.keyCode];
+  var isModifierKey = CodeMirror.isModifierKey = function(value) {
+    var name = typeof value == "string" ? value : keyNames[value.keyCode];
     return name == "Ctrl" || name == "Alt" || name == "Shift" || name == "Mod";
   };
 
   // Look up the name of a key as indicated by an event object.
   var keyName = CodeMirror.keyName = function(event, noShift) {
     if (presto && event.keyCode == 34 && event["char"]) return false;
-    var name = keyNames[event.keyCode];
+    var base = keyNames[event.keyCode], name = base;
     if (name == null || event.altGraphKey) return false;
-    if (event.altKey) name = "Alt-" + name;
-    if (flipCtrlCmd ? event.metaKey : event.ctrlKey) name = "Ctrl-" + name;
-    if (flipCtrlCmd ? event.ctrlKey : event.metaKey) name = "Cmd-" + name;
-    if (!noShift && event.shiftKey) name = "Shift-" + name;
+    if (event.altKey && base != "Alt") name = "Alt-" + name;
+    if ((flipCtrlCmd ? event.metaKey : event.ctrlKey) && base != "Ctrl") name = "Ctrl-" + name;
+    if ((flipCtrlCmd ? event.ctrlKey : event.metaKey) && base != "Cmd") name = "Cmd-" + name;
+    if (!noShift && event.shiftKey && base != "Shift") name = "Shift-" + name;
     return name;
   };
 
+  function getKeyMap(val) {
+    return typeof val == "string" ? keyMap[val] : val;
+  }
+
   // FROMTEXTAREA
 
   CodeMirror.fromTextArea = function(textarea, options) {
-    if (!options) options = {};
+    options = options ? copyObj(options) : {};
     options.value = textarea.value;
-    if (!options.tabindex && textarea.tabindex)
-      options.tabindex = textarea.tabindex;
+    if (!options.tabindex && textarea.tabIndex)
+      options.tabindex = textarea.tabIndex;
     if (!options.placeholder && textarea.placeholder)
       options.placeholder = textarea.placeholder;
     // Set autofocus to true if this textarea is focused, or if it has
@@ -4791,22 +5936,26 @@
       }
     }
 
+    options.finishInit = function(cm) {
+      cm.save = save;
+      cm.getTextArea = function() { return textarea; };
+      cm.toTextArea = function() {
+        cm.toTextArea = isNaN; // Prevent this from being ran twice
+        save();
+        textarea.parentNode.removeChild(cm.getWrapperElement());
+        textarea.style.display = "";
+        if (textarea.form) {
+          off(textarea.form, "submit", save);
+          if (typeof textarea.form.submit == "function")
+            textarea.form.submit = realSubmit;
+        }
+      };
+    };
+
     textarea.style.display = "none";
     var cm = CodeMirror(function(node) {
       textarea.parentNode.insertBefore(node, textarea.nextSibling);
     }, options);
-    cm.save = save;
-    cm.getTextArea = function() { return textarea; };
-    cm.toTextArea = function() {
-      save();
-      textarea.parentNode.removeChild(cm.getWrapperElement());
-      textarea.style.display = "";
-      if (textarea.form) {
-        off(textarea.form, "submit", save);
-        if (typeof textarea.form.submit == "function")
-          textarea.form.submit = realSubmit;
-      }
-    };
     return cm;
   };
 
@@ -4899,10 +6048,13 @@
   // marker continues beyond the start/end of the line. Markers have
   // links back to the lines they currently touch.
 
+  var nextMarkerId = 0;
+
   var TextMarker = CodeMirror.TextMarker = function(doc, type) {
     this.lines = [];
     this.type = type;
     this.doc = doc;
+    this.id = ++nextMarkerId;
   };
   eventMixin(TextMarker);
 
@@ -5034,7 +6186,7 @@
       // Showing up as a widget implies collapsed (widget replaces text)
       marker.collapsed = true;
       marker.widgetNode = elt("span", [marker.replacedWith], "CodeMirror-widget");
-      if (!options.handleMouseEvents) marker.widgetNode.ignoreEvents = true;
+      if (!options.handleMouseEvents) marker.widgetNode.setAttribute("cm-ignore-events", "true");
       if (options.insertLeft) marker.widgetNode.insertLeft = true;
     }
     if (marker.collapsed) {
@@ -5078,7 +6230,7 @@
       if (updateMaxLine) cm.curOp.updateMaxLine = true;
       if (marker.collapsed)
         regChange(cm, from.line, to.line + 1);
-      else if (marker.className || marker.title || marker.startStyle || marker.endStyle)
+      else if (marker.className || marker.title || marker.startStyle || marker.endStyle || marker.css)
         for (var i = from.line; i <= to.line; i++) regLineChange(cm, i, "text");
       if (marker.atomic) reCheckSelection(cm.doc);
       signalLater(cm, "markerAdded", cm, marker);
@@ -5218,6 +6370,7 @@
   // spans partially within the change. Returns an array of span
   // arrays with one element for each line in (after) the change.
   function stretchSpansOverChange(doc, change) {
+    if (change.full) return null;
     var oldFirst = isLine(doc, change.from.line) && getLine(doc, change.from.line).markedSpans;
     var oldLast = isLine(doc, change.to.line) && getLine(doc, change.to.line).markedSpans;
     if (!oldFirst && !oldLast) return null;
@@ -5405,8 +6558,8 @@
       var fromCmp = cmp(found.from, from) || extraLeft(sp.marker) - extraLeft(marker);
       var toCmp = cmp(found.to, to) || extraRight(sp.marker) - extraRight(marker);
       if (fromCmp >= 0 && toCmp <= 0 || fromCmp <= 0 && toCmp >= 0) continue;
-      if (fromCmp <= 0 && (cmp(found.to, from) || extraRight(sp.marker) - extraLeft(marker)) > 0 ||
-          fromCmp >= 0 && (cmp(found.from, to) || extraLeft(sp.marker) - extraRight(marker)) < 0)
+      if (fromCmp <= 0 && (cmp(found.to, from) > 0 || (sp.marker.inclusiveRight && marker.inclusiveLeft)) ||
+          fromCmp >= 0 && (cmp(found.from, to) < 0 || (sp.marker.inclusiveLeft && marker.inclusiveRight)))
         return true;
     }
   }
@@ -5485,10 +6638,10 @@
 
   // Line widgets are block elements displayed above or below a line.
 
-  var LineWidget = CodeMirror.LineWidget = function(cm, node, options) {
+  var LineWidget = CodeMirror.LineWidget = function(doc, node, options) {
     if (options) for (var opt in options) if (options.hasOwnProperty(opt))
       this[opt] = options[opt];
-    this.cm = cm;
+    this.doc = doc;
     this.node = node;
   };
   eventMixin(LineWidget);
@@ -5499,46 +6652,55 @@
   }
 
   LineWidget.prototype.clear = function() {
-    var cm = this.cm, ws = this.line.widgets, line = this.line, no = lineNo(line);
+    var cm = this.doc.cm, ws = this.line.widgets, line = this.line, no = lineNo(line);
     if (no == null || !ws) return;
     for (var i = 0; i < ws.length; ++i) if (ws[i] == this) ws.splice(i--, 1);
     if (!ws.length) line.widgets = null;
     var height = widgetHeight(this);
-    runInOp(cm, function() {
+    updateLineHeight(line, Math.max(0, line.height - height));
+    if (cm) runInOp(cm, function() {
       adjustScrollWhenAboveVisible(cm, line, -height);
       regLineChange(cm, no, "widget");
-      updateLineHeight(line, Math.max(0, line.height - height));
     });
   };
   LineWidget.prototype.changed = function() {
-    var oldH = this.height, cm = this.cm, line = this.line;
+    var oldH = this.height, cm = this.doc.cm, line = this.line;
     this.height = null;
     var diff = widgetHeight(this) - oldH;
     if (!diff) return;
-    runInOp(cm, function() {
+    updateLineHeight(line, line.height + diff);
+    if (cm) runInOp(cm, function() {
       cm.curOp.forceUpdate = true;
       adjustScrollWhenAboveVisible(cm, line, diff);
-      updateLineHeight(line, line.height + diff);
     });
   };
 
   function widgetHeight(widget) {
     if (widget.height != null) return widget.height;
-    if (!contains(document.body, widget.node))
-      removeChildrenAndAdd(widget.cm.display.measure, elt("div", [widget.node], null, "position: relative"));
-    return widget.height = widget.node.offsetHeight;
+    var cm = widget.doc.cm;
+    if (!cm) return 0;
+    if (!contains(document.body, widget.node)) {
+      var parentStyle = "position: relative;";
+      if (widget.coverGutter)
+        parentStyle += "margin-left: -" + cm.display.gutters.offsetWidth + "px;";
+      if (widget.noHScroll)
+        parentStyle += "width: " + cm.display.wrapper.clientWidth + "px;";
+      removeChildrenAndAdd(cm.display.measure, elt("div", [widget.node], null, parentStyle));
+    }
+    return widget.height = widget.node.parentNode.offsetHeight;
   }
 
-  function addLineWidget(cm, handle, node, options) {
-    var widget = new LineWidget(cm, node, options);
-    if (widget.noHScroll) cm.display.alignWidgets = true;
-    changeLine(cm, handle, "widget", function(line) {
+  function addLineWidget(doc, handle, node, options) {
+    var widget = new LineWidget(doc, node, options);
+    var cm = doc.cm;
+    if (cm && widget.noHScroll) cm.display.alignWidgets = true;
+    changeLine(doc, handle, "widget", function(line) {
       var widgets = line.widgets || (line.widgets = []);
       if (widget.insertAt == null) widgets.push(widget);
       else widgets.splice(Math.min(widgets.length - 1, Math.max(0, widget.insertAt)), 0, widget);
       widget.line = line;
-      if (!lineIsHidden(cm.doc, line)) {
-        var aboveVisible = heightAtLine(line) < cm.doc.scrollTop;
+      if (cm && !lineIsHidden(doc, line)) {
+        var aboveVisible = heightAtLine(line) < doc.scrollTop;
         updateLineHeight(line, line.height + widgetHeight(widget));
         if (aboveVisible) addToScrollPos(cm, null, widget.height);
         cm.curOp.forceUpdate = true;
@@ -5601,20 +6763,44 @@
     if (inner.mode.blankLine) return inner.mode.blankLine(inner.state);
   }
 
-  function readToken(mode, stream, state) {
+  function readToken(mode, stream, state, inner) {
     for (var i = 0; i < 10; i++) {
+      if (inner) inner[0] = CodeMirror.innerMode(mode, state).mode;
       var style = mode.token(stream, state);
       if (stream.pos > stream.start) return style;
     }
     throw new Error("Mode " + mode.name + " failed to advance stream.");
   }
 
+  // Utility for getTokenAt and getLineTokens
+  function takeToken(cm, pos, precise, asArray) {
+    function getObj(copy) {
+      return {start: stream.start, end: stream.pos,
+              string: stream.current(),
+              type: style || null,
+              state: copy ? copyState(doc.mode, state) : state};
+    }
+
+    var doc = cm.doc, mode = doc.mode, style;
+    pos = clipPos(doc, pos);
+    var line = getLine(doc, pos.line), state = getStateBefore(cm, pos.line, precise);
+    var stream = new StringStream(line.text, cm.options.tabSize), tokens;
+    if (asArray) tokens = [];
+    while ((asArray || stream.pos < pos.ch) && !stream.eol()) {
+      stream.start = stream.pos;
+      style = readToken(mode, stream, state);
+      if (asArray) tokens.push(getObj(true));
+    }
+    return asArray ? tokens : getObj();
+  }
+
   // Run the given mode's parser over a line, calling f for each token.
   function runMode(cm, text, mode, state, f, lineClasses, forceToEnd) {
     var flattenSpans = mode.flattenSpans;
     if (flattenSpans == null) flattenSpans = cm.options.flattenSpans;
     var curStart = 0, curStyle = null;
     var stream = new StringStream(text, cm.options.tabSize), style;
+    var inner = cm.options.addModeClass && [null];
     if (text == "") extractLineClasses(callBlankLine(mode, state), lineClasses);
     while (!stream.eol()) {
       if (stream.pos > cm.options.maxHighlightLength) {
@@ -5623,15 +6809,18 @@
         stream.pos = text.length;
         style = null;
       } else {
-        style = extractLineClasses(readToken(mode, stream, state), lineClasses);
+        style = extractLineClasses(readToken(mode, stream, state, inner), lineClasses);
       }
-      if (cm.options.addModeClass) {
-        var mName = CodeMirror.innerMode(mode, state).mode.name;
+      if (inner) {
+        var mName = inner[0].name;
         if (mName) style = "m-" + (style ? mName + " " + style : mName);
       }
       if (!flattenSpans || curStyle != style) {
-        if (curStart < stream.start) f(stream.start, curStyle);
-        curStart = stream.start; curStyle = style;
+        while (curStart < stream.start) {
+          curStart = Math.min(stream.start, curStart + 50000);
+          f(curStart, curStyle);
+        }
+        curStyle = style;
       }
       stream.start = stream.pos;
     }
@@ -5685,12 +6874,15 @@
     return {styles: st, classes: lineClasses.bgClass || lineClasses.textClass ? lineClasses : null};
   }
 
-  function getLineStyles(cm, line) {
+  function getLineStyles(cm, line, updateFrontier) {
     if (!line.styles || line.styles[0] != cm.state.modeGen) {
-      var result = highlightLine(cm, line, line.stateAfter = getStateBefore(cm, lineNo(line)));
+      var state = getStateBefore(cm, lineNo(line));
+      var result = highlightLine(cm, line, line.text.length > cm.options.maxHighlightLength ? copyState(cm.doc.mode, state) : state);
+      line.stateAfter = state;
       line.styles = result.styles;
       if (result.classes) line.styleClasses = result.classes;
       else if (line.styleClasses) line.styleClasses = null;
+      if (updateFrontier === cm.doc.frontier) cm.doc.frontier++;
     }
     return line.styles;
   }
@@ -5703,7 +6895,7 @@
     var stream = new StringStream(text, cm.options.tabSize);
     stream.start = stream.pos = startAt || 0;
     if (text == "") callBlankLine(mode, state);
-    while (!stream.eol() && stream.pos <= cm.options.maxHighlightLength) {
+    while (!stream.eol()) {
       readToken(mode, stream, state);
       stream.start = stream.pos;
     }
@@ -5730,7 +6922,9 @@
     // is needed on Webkit to be able to get line-level bounding
     // rectangles for it (in measureChar).
     var content = elt("span", null, null, webkit ? "padding-right: .1px" : null);
-    var builder = {pre: elt("pre", [content]), content: content, col: 0, pos: 0, cm: cm};
+    var builder = {pre: elt("pre", [content], "CodeMirror-line"), content: content,
+                   col: 0, pos: 0, cm: cm,
+                   splitSpaces: (ie || webkit) && cm.getOption("lineWrapping")};
     lineView.measure = {};
 
     // Iterate over the logical lines that make up this visual line.
@@ -5740,12 +6934,11 @@
       builder.addToken = buildToken;
       // Optionally wire in some hacks into the token-rendering
       // algorithm, to deal with browser quirks.
-      if ((ie || webkit) && cm.getOption("lineWrapping"))
-        builder.addToken = buildTokenSplitSpaces(builder.addToken);
       if (hasBadBidiRects(cm.display.measure) && (order = getOrder(line)))
         builder.addToken = buildTokenBadBidi(builder.addToken, order);
       builder.map = [];
-      insertLineContent(line, builder, getLineStyles(cm, line));
+      var allowFrontierUpdate = lineView != cm.display.externalMeasured && lineNo(line);
+      insertLineContent(line, builder, getLineStyles(cm, line, allowFrontierUpdate));
       if (line.styleClasses) {
         if (line.styleClasses.bgClass)
           builder.bgClass = joinClasses(line.styleClasses.bgClass, builder.bgClass || "");
@@ -5767,26 +6960,35 @@
       }
     }
 
+    // See issue #2901
+    if (webkit && /\bcm-tab\b/.test(builder.content.lastChild.className))
+      builder.content.className = "cm-tab-wrap-hack";
+
     signal(cm, "renderLine", cm, lineView.line, builder.pre);
+    if (builder.pre.className)
+      builder.textClass = joinClasses(builder.pre.className, builder.textClass || "");
+
     return builder;
   }
 
   function defaultSpecialCharPlaceholder(ch) {
     var token = elt("span", "\u2022", "cm-invalidchar");
     token.title = "\\u" + ch.charCodeAt(0).toString(16);
+    token.setAttribute("aria-label", token.title);
     return token;
   }
 
   // Build up the DOM representation for a single token, and add it to
   // the line map. Takes care to render special characters separately.
-  function buildToken(builder, text, style, startStyle, endStyle, title) {
+  function buildToken(builder, text, style, startStyle, endStyle, title, css) {
     if (!text) return;
-    var special = builder.cm.options.specialChars, mustWrap = false;
+    var displayText = builder.splitSpaces ? text.replace(/ {3,}/g, splitSpaces) : text;
+    var special = builder.cm.state.specialChars, mustWrap = false;
     if (!special.test(text)) {
       builder.col += text.length;
-      var content = document.createTextNode(text);
+      var content = document.createTextNode(displayText);
       builder.map.push(builder.pos, builder.pos + text.length, content);
-      if (ie_upto8) mustWrap = true;
+      if (ie && ie_version < 9) mustWrap = true;
       builder.pos += text.length;
     } else {
       var content = document.createDocumentFragment(), pos = 0;
@@ -5795,8 +6997,8 @@
         var m = special.exec(text);
         var skipped = m ? m.index - pos : text.length - pos;
         if (skipped) {
-          var txt = document.createTextNode(text.slice(pos, pos + skipped));
-          if (ie_upto8) content.appendChild(elt("span", [txt]));
+          var txt = document.createTextNode(displayText.slice(pos, pos + skipped));
+          if (ie && ie_version < 9) content.appendChild(elt("span", [txt]));
           else content.appendChild(txt);
           builder.map.push(builder.pos, builder.pos + skipped, txt);
           builder.col += skipped;
@@ -5807,10 +7009,17 @@
         if (m[0] == "\t") {
           var tabSize = builder.cm.options.tabSize, tabWidth = tabSize - builder.col % tabSize;
           var txt = content.appendChild(elt("span", spaceStr(tabWidth), "cm-tab"));
+          txt.setAttribute("role", "presentation");
+          txt.setAttribute("cm-text", "\t");
           builder.col += tabWidth;
+        } else if (m[0] == "\r" || m[0] == "\n") {
+          var txt = content.appendChild(elt("span", m[0] == "\r" ? "\u240d" : "\u2424", "cm-invalidchar"));
+          txt.setAttribute("cm-text", m[0]);
+          builder.col += 1;
         } else {
           var txt = builder.cm.options.specialCharPlaceholder(m[0]);
-          if (ie_upto8) content.appendChild(elt("span", [txt]));
+          txt.setAttribute("cm-text", m[0]);
+          if (ie && ie_version < 9) content.appendChild(elt("span", [txt]));
           else content.appendChild(txt);
           builder.col += 1;
         }
@@ -5818,33 +7027,28 @@
         builder.pos++;
       }
     }
-    if (style || startStyle || endStyle || mustWrap) {
+    if (style || startStyle || endStyle || mustWrap || css) {
       var fullStyle = style || "";
       if (startStyle) fullStyle += startStyle;
       if (endStyle) fullStyle += endStyle;
-      var token = elt("span", [content], fullStyle);
+      var token = elt("span", [content], fullStyle, css);
       if (title) token.title = title;
       return builder.content.appendChild(token);
     }
     builder.content.appendChild(content);
   }
 
-  function buildTokenSplitSpaces(inner) {
-    function split(old) {
-      var out = " ";
-      for (var i = 0; i < old.length - 2; ++i) out += i % 2 ? " " : "\u00a0";
-      out += " ";
-      return out;
-    }
-    return function(builder, text, style, startStyle, endStyle, title) {
-      inner(builder, text.replace(/ {3,}/g, split), style, startStyle, endStyle, title);
-    };
+  function splitSpaces(old) {
+    var out = " ";
+    for (var i = 0; i < old.length - 2; ++i) out += i % 2 ? " " : "\u00a0";
+    out += " ";
+    return out;
   }
 
   // Work around nonsense dimensions being reported for stretches of
   // right-to-left text.
   function buildTokenBadBidi(inner, order) {
-    return function(builder, text, style, startStyle, endStyle, title) {
+    return function(builder, text, style, startStyle, endStyle, title, css) {
       style = style ? style + " cm-force-border" : "cm-force-border";
       var start = builder.pos, end = start + text.length;
       for (;;) {
@@ -5853,8 +7057,8 @@
           var part = order[i];
           if (part.to > start && part.from <= start) break;
         }
-        if (part.to >= end) return inner(builder, text, style, startStyle, endStyle, title);
-        inner(builder, text.slice(0, part.to - start), style, startStyle, null, title);
+        if (part.to >= end) return inner(builder, text, style, startStyle, endStyle, title, css);
+        inner(builder, text.slice(0, part.to - start), style, startStyle, null, title, css);
         startStyle = null;
         text = text.slice(part.to - start);
         start = part.to;
@@ -5864,8 +7068,14 @@
 
   function buildCollapsedSpan(builder, size, marker, ignoreWidget) {
     var widget = !ignoreWidget && marker.widgetNode;
+    if (widget) builder.map.push(builder.pos, builder.pos + size, widget);
+    if (!ignoreWidget && builder.cm.display.input.needsContentAttribute) {
+      if (!widget)
+        widget = builder.content.appendChild(document.createElement("span"));
+      widget.setAttribute("cm-marker", marker.id);
+    }
     if (widget) {
-      builder.map.push(builder.pos, builder.pos + size, widget);
+      builder.cm.display.input.setUneditable(widget);
       builder.content.appendChild(widget);
     }
     builder.pos += size;
@@ -5881,35 +7091,44 @@
       return;
     }
 
-    var len = allText.length, pos = 0, i = 1, text = "", style;
+    var len = allText.length, pos = 0, i = 1, text = "", style, css;
     var nextChange = 0, spanStyle, spanEndStyle, spanStartStyle, title, collapsed;
     for (;;) {
       if (nextChange == pos) { // Update current marker set
-        spanStyle = spanEndStyle = spanStartStyle = title = "";
+        spanStyle = spanEndStyle = spanStartStyle = title = css = "";
         collapsed = null; nextChange = Infinity;
-        var foundBookmarks = [];
+        var foundBookmarks = [], endStyles
         for (var j = 0; j < spans.length; ++j) {
           var sp = spans[j], m = sp.marker;
-          if (sp.from <= pos && (sp.to == null || sp.to > pos)) {
-            if (sp.to != null && nextChange > sp.to) { nextChange = sp.to; spanEndStyle = ""; }
+          if (m.type == "bookmark" && sp.from == pos && m.widgetNode) {
+            foundBookmarks.push(m);
+          } else if (sp.from <= pos && (sp.to == null || sp.to > pos || m.collapsed && sp.to == pos && sp.from == pos)) {
+            if (sp.to != null && sp.to != pos && nextChange > sp.to) {
+              nextChange = sp.to;
+              spanEndStyle = "";
+            }
             if (m.className) spanStyle += " " + m.className;
+            if (m.css) css = (css ? css + ";" : "") + m.css;
             if (m.startStyle && sp.from == pos) spanStartStyle += " " + m.startStyle;
-            if (m.endStyle && sp.to == nextChange) spanEndStyle += " " + m.endStyle;
+            if (m.endStyle && sp.to == nextChange) (endStyles || (endStyles = [])).push(m.endStyle, sp.to)
             if (m.title && !title) title = m.title;
             if (m.collapsed && (!collapsed || compareCollapsedMarkers(collapsed.marker, m) < 0))
               collapsed = sp;
           } else if (sp.from > pos && nextChange > sp.from) {
             nextChange = sp.from;
           }
-          if (m.type == "bookmark" && sp.from == pos && m.widgetNode) foundBookmarks.push(m);
         }
+        if (endStyles) for (var j = 0; j < endStyles.length; j += 2)
+          if (endStyles[j + 1] == nextChange) spanEndStyle += " " + endStyles[j]
+
+        if (!collapsed || collapsed.from == pos) for (var j = 0; j < foundBookmarks.length; ++j)
+          buildCollapsedSpan(builder, 0, foundBookmarks[j]);
         if (collapsed && (collapsed.from || 0) == pos) {
           buildCollapsedSpan(builder, (collapsed.to == null ? len + 1 : collapsed.to) - pos,
                              collapsed.marker, collapsed.from == null);
           if (collapsed.to == null) return;
+          if (collapsed.to == pos) collapsed = false;
         }
-        if (!collapsed && foundBookmarks.length) for (var j = 0; j < foundBookmarks.length; ++j)
-          buildCollapsedSpan(builder, 0, foundBookmarks[j]);
       }
       if (pos >= len) break;
 
@@ -5920,7 +7139,7 @@
           if (!collapsed) {
             var tokenText = end > upto ? text.slice(0, upto - pos) : text;
             builder.addToken(builder, tokenText, style ? style + spanStyle : spanStyle,
-                             spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : "", title);
+                             spanStartStyle, pos + tokenText.length == nextChange ? spanEndStyle : "", title, css);
           }
           if (end >= upto) {text = text.slice(upto - pos); pos = upto; break;}
           pos = end;
@@ -5949,17 +7168,24 @@
       updateLine(line, text, spans, estimateHeight);
       signalLater(line, "change", line, change);
     }
+    function linesFor(start, end) {
+      for (var i = start, result = []; i < end; ++i)
+        result.push(new Line(text[i], spansFor(i), estimateHeight));
+      return result;
+    }
 
     var from = change.from, to = change.to, text = change.text;
     var firstLine = getLine(doc, from.line), lastLine = getLine(doc, to.line);
     var lastText = lst(text), lastSpans = spansFor(text.length - 1), nlines = to.line - from.line;
 
     // Adjust the line structure
-    if (isWholeLineUpdate(doc, change)) {
+    if (change.full) {
+      doc.insert(0, linesFor(0, text.length));
+      doc.remove(text.length, doc.size - text.length);
+    } else if (isWholeLineUpdate(doc, change)) {
       // This is a whole-line replace. Treated specially to make
       // sure line objects move the way they are supposed to.
-      for (var i = 0, added = []; i < text.length - 1; ++i)
-        added.push(new Line(text[i], spansFor(i), estimateHeight));
+      var added = linesFor(0, text.length - 1);
       update(lastLine, lastLine.text, lastSpans);
       if (nlines) doc.remove(from.line, nlines);
       if (added.length) doc.insert(from.line, added);
@@ -5967,8 +7193,7 @@
       if (text.length == 1) {
         update(firstLine, firstLine.text.slice(0, from.ch) + lastText + firstLine.text.slice(to.ch), lastSpans);
       } else {
-        for (var added = [], i = 1; i < text.length - 1; ++i)
-          added.push(new Line(text[i], spansFor(i), estimateHeight));
+        var added = linesFor(1, text.length - 1);
         added.push(new Line(lastText + firstLine.text.slice(to.ch), lastSpans, estimateHeight));
         update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));
         doc.insert(from.line + 1, added);
@@ -5979,8 +7204,7 @@
     } else {
       update(firstLine, firstLine.text.slice(0, from.ch) + text[0], spansFor(0));
       update(lastLine, lastText + lastLine.text.slice(to.ch), lastSpans);
-      for (var i = 1, added = []; i < text.length - 1; ++i)
-        added.push(new Line(text[i], spansFor(i), estimateHeight));
+      var added = linesFor(1, text.length - 1);
       if (nlines > 1) doc.remove(from.line + 1, nlines - 1);
       doc.insert(from.line + 1, added);
     }
@@ -6140,8 +7364,8 @@
   };
 
   var nextDocId = 0;
-  var Doc = CodeMirror.Doc = function(text, mode, firstLine) {
-    if (!(this instanceof Doc)) return new Doc(text, mode, firstLine);
+  var Doc = CodeMirror.Doc = function(text, mode, firstLine, lineSep) {
+    if (!(this instanceof Doc)) return new Doc(text, mode, firstLine, lineSep);
     if (firstLine == null) firstLine = 0;
 
     BranchChunk.call(this, [new LeafChunk([new Line("", null)])]);
@@ -6155,8 +7379,10 @@
     this.history = new History(null);
     this.id = ++nextDocId;
     this.modeOption = mode;
+    this.lineSep = lineSep;
+    this.extend = false;
 
-    if (typeof text == "string") text = splitLines(text);
+    if (typeof text == "string") text = this.splitLines(text);
     updateDoc(this, {from: start, to: start, text: text});
     setSelection(this, simpleSelection(start), sel_dontScroll);
   };
@@ -6186,12 +7412,12 @@
     getValue: function(lineSep) {
       var lines = getLines(this, this.first, this.first + this.size);
       if (lineSep === false) return lines;
-      return lines.join(lineSep || "\n");
+      return lines.join(lineSep || this.lineSeparator());
     },
     setValue: docMethodOp(function(code) {
       var top = Pos(this.first, 0), last = this.first + this.size - 1;
       makeChange(this, {from: top, to: Pos(last, getLine(this, last).text.length),
-                        text: splitLines(code), origin: "setValue"}, true);
+                        text: this.splitLines(code), origin: "setValue", full: true}, true);
       setSelection(this, simpleSelection(top));
     }),
     replaceRange: function(code, from, to, origin) {
@@ -6202,7 +7428,7 @@
     getRange: function(from, to, lineSep) {
       var lines = getBetween(this, clipPos(this, from), clipPos(this, to));
       if (lineSep === false) return lines;
-      return lines.join(lineSep || "\n");
+      return lines.join(lineSep || this.lineSeparator());
     },
 
     getLine: function(line) {var l = this.getLineHandle(line); return l && l.text;},
@@ -6242,10 +7468,11 @@
       extendSelection(this, clipPos(this, head), other && clipPos(this, other), options);
     }),
     extendSelections: docMethodOp(function(heads, options) {
-      extendSelections(this, clipPosArray(this, heads, options));
+      extendSelections(this, clipPosArray(this, heads), options);
     }),
     extendSelectionsBy: docMethodOp(function(f, options) {
-      extendSelections(this, map(this.sel.ranges, f), options);
+      var heads = map(this.sel.ranges, f);
+      extendSelections(this, clipPosArray(this, heads), options);
     }),
     setSelections: docMethodOp(function(ranges, primary, options) {
       if (!ranges.length) return;
@@ -6268,13 +7495,13 @@
         lines = lines ? lines.concat(sel) : sel;
       }
       if (lineSep === false) return lines;
-      else return lines.join(lineSep || "\n");
+      else return lines.join(lineSep || this.lineSeparator());
     },
     getSelections: function(lineSep) {
       var parts = [], ranges = this.sel.ranges;
       for (var i = 0; i < ranges.length; i++) {
         var sel = getBetween(this, ranges[i].from(), ranges[i].to());
-        if (lineSep !== false) sel = sel.join(lineSep || "\n");
+        if (lineSep !== false) sel = sel.join(lineSep || this.lineSeparator());
         parts[i] = sel;
       }
       return parts;
@@ -6289,7 +7516,7 @@
       var changes = [], sel = this.sel;
       for (var i = 0; i < sel.ranges.length; i++) {
         var range = sel.ranges[i];
-        changes[i] = {from: range.from(), to: range.to(), text: splitLines(code[i]), origin: origin};
+        changes[i] = {from: range.from(), to: range.to(), text: this.splitLines(code[i]), origin: origin};
       }
       var newSel = collapse && collapse != "end" && computeReplacedSel(this, changes, collapse);
       for (var i = changes.length - 1; i >= 0; i--)
@@ -6318,7 +7545,7 @@
     },
     changeGeneration: function(forceSplit) {
       if (forceSplit)
-        this.history.lastOp = this.history.lastOrigin = null;
+        this.history.lastOp = this.history.lastSelOp = this.history.lastOrigin = null;
       return this.history.generation;
     },
     isClean: function (gen) {
@@ -6335,13 +7562,48 @@
       hist.undone = copyHistoryArray(histData.undone.slice(0), null, true);
     },
 
+    addLineClass: docMethodOp(function(handle, where, cls) {
+      return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function(line) {
+        var prop = where == "text" ? "textClass"
+                 : where == "background" ? "bgClass"
+                 : where == "gutter" ? "gutterClass" : "wrapClass";
+        if (!line[prop]) line[prop] = cls;
+        else if (classTest(cls).test(line[prop])) return false;
+        else line[prop] += " " + cls;
+        return true;
+      });
+    }),
+    removeLineClass: docMethodOp(function(handle, where, cls) {
+      return changeLine(this, handle, where == "gutter" ? "gutter" : "class", function(line) {
+        var prop = where == "text" ? "textClass"
+                 : where == "background" ? "bgClass"
+                 : where == "gutter" ? "gutterClass" : "wrapClass";
+        var cur = line[prop];
+        if (!cur) return false;
+        else if (cls == null) line[prop] = null;
+        else {
+          var found = cur.match(classTest(cls));
+          if (!found) return false;
+          var end = found.index + found[0].length;
+          line[prop] = cur.slice(0, found.index) + (!found.index || end == cur.length ? "" : " ") + cur.slice(end) || null;
+        }
+        return true;
+      });
+    }),
+
+    addLineWidget: docMethodOp(function(handle, node, options) {
+      return addLineWidget(this, handle, node, options);
+    }),
+    removeLineWidget: function(widget) { widget.clear(); },
+
     markText: function(from, to, options) {
-      return markText(this, clipPos(this, from), clipPos(this, to), options, "range");
+      return markText(this, clipPos(this, from), clipPos(this, to), options, options && options.type || "range");
     },
     setBookmark: function(pos, options) {
       var realOpts = {replacedWith: options && (options.nodeType == null ? options.widget : options),
                       insertLeft: options && options.insertLeft,
-                      clearWhenEmpty: false, shared: options && options.shared};
+                      clearWhenEmpty: false, shared: options && options.shared,
+                      handleMouseEvents: options && options.handleMouseEvents};
       pos = clipPos(this, pos);
       return markText(this, pos, pos, realOpts, "bookmark");
     },
@@ -6363,9 +7625,9 @@
         var spans = line.markedSpans;
         if (spans) for (var i = 0; i < spans.length; i++) {
           var span = spans[i];
-          if (!(lineNo == from.line && from.ch > span.to ||
-                span.from == null && lineNo != from.line||
-                lineNo == to.line && span.from > to.ch) &&
+          if (!(span.to != null && lineNo == from.line && from.ch > span.to ||
+                span.from == null && lineNo != from.line ||
+                span.from != null && lineNo == to.line && span.from > to.ch) &&
               (!filter || filter(span.marker)))
             found.push(span.marker.parent || span.marker);
         }
@@ -6404,7 +7666,8 @@
     },
 
     copy: function(copyHistory) {
-      var doc = new Doc(getLines(this, this.first, this.first + this.size), this.modeOption, this.first);
+      var doc = new Doc(getLines(this, this.first, this.first + this.size),
+                        this.modeOption, this.first, this.lineSep);
       doc.scrollTop = this.scrollTop; doc.scrollLeft = this.scrollLeft;
       doc.sel = this.sel;
       doc.extend = false;
@@ -6420,7 +7683,7 @@
       var from = this.first, to = this.first + this.size;
       if (options.from != null && options.from > from) from = options.from;
       if (options.to != null && options.to < to) to = options.to;
-      var copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from);
+      var copy = new Doc(getLines(this, from, to), options.mode || this.modeOption, from, this.lineSep);
       if (options.sharedHist) copy.history = this.history;
       (this.linked || (this.linked = [])).push({doc: copy, sharedHist: options.sharedHist});
       copy.linked = [{doc: this, isParent: true, sharedHist: options.sharedHist}];
@@ -6449,14 +7712,20 @@
     iterLinkedDocs: function(f) {linkedDocs(this, f);},
 
     getMode: function() {return this.mode;},
-    getEditor: function() {return this.cm;}
+    getEditor: function() {return this.cm;},
+
+    splitLines: function(str) {
+      if (this.lineSep) return str.split(this.lineSep);
+      return splitLinesAuto(str);
+    },
+    lineSeparator: function() { return this.lineSep || "\n"; }
   });
 
   // Public alias.
   Doc.prototype.eachLine = Doc.prototype.iter;
 
   // Set up methods on CodeMirror's prototype to redirect to the editor's document.
-  var dontDelegate = "iter insert remove copy getEditor".split(" ");
+  var dontDelegate = "iter insert remove copy getEditor constructor".split(" ");
   for (var prop in Doc.prototype) if (Doc.prototype.hasOwnProperty(prop) && indexOf(dontDelegate, prop) < 0)
     CodeMirror.prototype[prop] = (function(method) {
       return function() {return method.apply(this.doc, arguments);};
@@ -6610,7 +7879,7 @@
     // Used to track when changes can be merged into a single undo
     // event
     this.lastModTime = this.lastSelTime = 0;
-    this.lastOp = null;
+    this.lastOp = this.lastSelOp = null;
     this.lastOrigin = this.lastSelOrigin = null;
     // Used by the isClean() method
     this.generation = this.maxGeneration = startGen || 1;
@@ -6688,7 +7957,7 @@
     hist.done.push(selAfter);
     hist.generation = ++hist.maxGeneration;
     hist.lastModTime = hist.lastSelTime = time;
-    hist.lastOp = opId;
+    hist.lastOp = hist.lastSelOp = opId;
     hist.lastOrigin = hist.lastSelOrigin = change.origin;
 
     if (!last) signal(doc, "historyAdded");
@@ -6714,7 +7983,7 @@
     // the current, or the origins don't allow matching. Origins
     // starting with * are always merged, those starting with + are
     // merged when similar and close together in time.
-    if (opId == hist.lastOp ||
+    if (opId == hist.lastSelOp ||
         (origin && hist.lastSelOrigin == origin &&
          (hist.lastModTime == hist.lastSelTime && hist.lastOrigin == origin ||
           selectionEventCanBeMerged(doc, origin, lst(hist.done), sel))))
@@ -6724,7 +7993,7 @@
 
     hist.lastSelTime = +new Date;
     hist.lastSelOrigin = origin;
-    hist.lastOp = opId;
+    hist.lastSelOp = opId;
     if (options && options.clearRedo !== false)
       clearSelectionEvents(hist.undone);
   }
@@ -6889,26 +8158,34 @@
     }
   };
 
+  var noHandlers = []
+  function getHandlers(emitter, type, copy) {
+    var arr = emitter._handlers && emitter._handlers[type]
+    if (copy) return arr && arr.length > 0 ? arr.slice() : noHandlers
+    else return arr || noHandlers
+  }
+
   var off = CodeMirror.off = function(emitter, type, f) {
     if (emitter.removeEventListener)
       emitter.removeEventListener(type, f, false);
     else if (emitter.detachEvent)
       emitter.detachEvent("on" + type, f);
     else {
-      var arr = emitter._handlers && emitter._handlers[type];
-      if (!arr) return;
-      for (var i = 0; i < arr.length; ++i)
-        if (arr[i] == f) { arr.splice(i, 1); break; }
+      var handlers = getHandlers(emitter, type, false)
+      for (var i = 0; i < handlers.length; ++i)
+        if (handlers[i] == f) { handlers.splice(i, 1); break; }
     }
   };
 
   var signal = CodeMirror.signal = function(emitter, type /*, values...*/) {
-    var arr = emitter._handlers && emitter._handlers[type];
-    if (!arr) return;
+    var handlers = getHandlers(emitter, type, true)
+    if (!handlers.length) return;
     var args = Array.prototype.slice.call(arguments, 2);
-    for (var i = 0; i < arr.length; ++i) arr[i].apply(null, args);
+    for (var i = 0; i < handlers.length; ++i) handlers[i].apply(null, args);
   };
 
+  var orphanDelayedCallbacks = null;
+
   // Often, we want to signal events at a point where we are in the
   // middle of some work, but don't want the handler to start calling
   // other methods on the editor, which might be in an inconsistent
@@ -6916,25 +8193,26 @@
   // signalLater looks whether there are any handlers, and schedules
   // them to be executed when the last operation ends, or, if no
   // operation is active, when a timeout fires.
-  var delayedCallbacks, delayedCallbackDepth = 0;
   function signalLater(emitter, type /*, values...*/) {
-    var arr = emitter._handlers && emitter._handlers[type];
-    if (!arr) return;
-    var args = Array.prototype.slice.call(arguments, 2);
-    if (!delayedCallbacks) {
-      ++delayedCallbackDepth;
-      delayedCallbacks = [];
-      setTimeout(fireDelayed, 0);
+    var arr = getHandlers(emitter, type, false)
+    if (!arr.length) return;
+    var args = Array.prototype.slice.call(arguments, 2), list;
+    if (operationGroup) {
+      list = operationGroup.delayedCallbacks;
+    } else if (orphanDelayedCallbacks) {
+      list = orphanDelayedCallbacks;
+    } else {
+      list = orphanDelayedCallbacks = [];
+      setTimeout(fireOrphanDelayed, 0);
     }
     function bnd(f) {return function(){f.apply(null, args);};};
     for (var i = 0; i < arr.length; ++i)
-      delayedCallbacks.push(bnd(arr[i]));
+      list.push(bnd(arr[i]));
   }
 
-  function fireDelayed() {
-    --delayedCallbackDepth;
-    var delayed = delayedCallbacks;
-    delayedCallbacks = null;
+  function fireOrphanDelayed() {
+    var delayed = orphanDelayedCallbacks;
+    orphanDelayedCallbacks = null;
     for (var i = 0; i < delayed.length; ++i) delayed[i]();
   }
 
@@ -6942,6 +8220,8 @@
   // registering a (non-DOM) handler on the editor for the event name,
   // and preventDefault-ing the event in that handler.
   function signalDOMEvent(cm, e, override) {
+    if (typeof e == "string")
+      e = {type: e, preventDefault: function() { this.defaultPrevented = true; }};
     signal(cm, override || e.type, cm, e);
     return e_defaultPrevented(e) || e.codemirrorIgnore;
   }
@@ -6955,8 +8235,7 @@
   }
 
   function hasHandler(emitter, type) {
-    var arr = emitter._handlers && emitter._handlers[type];
-    return arr && arr.length > 0;
+    return getHandlers(emitter, type).length > 0
   }
 
   // Add on and off methods to a constructor's prototype, to make
@@ -6969,7 +8248,7 @@
   // MISC UTILITIES
 
   // Number of pixels added to scroller and sizer to hide scrollbar
-  var scrollerCutOff = 30;
+  var scrollerGap = 30;
 
   // Returned or thrown by various protocols to signal 'I'm not
   // handling this'.
@@ -7003,7 +8282,7 @@
 
   // The inverse of countColumn -- find the offset that corresponds to
   // a particular column.
-  function findColumn(string, goal, tabSize) {
+  var findColumn = CodeMirror.findColumn = function(string, goal, tabSize) {
     for (var pos = 0, col = 0;;) {
       var nextTab = string.indexOf("\t", pos);
       if (nextTab == -1) nextTab = string.length;
@@ -7037,22 +8316,21 @@
       if (array[i] == elt) return i;
     return -1;
   }
-  if ([].indexOf) indexOf = function(array, elt) { return array.indexOf(elt); };
   function map(array, f) {
     var out = [];
     for (var i = 0; i < array.length; i++) out[i] = f(array[i], i);
     return out;
   }
-  if ([].map) map = function(array, f) { return array.map(f); };
+
+  function nothing() {}
 
   function createObj(base, props) {
     var inst;
     if (Object.create) {
       inst = Object.create(base);
     } else {
-      var ctor = function() {};
-      ctor.prototype = base;
-      inst = new ctor();
+      nothing.prototype = base;
+      inst = new nothing();
     }
     if (props) copyObj(props, inst);
     return inst;
@@ -7071,7 +8349,7 @@
     return function(){return f.apply(null, args);};
   }
 
-  var nonASCIISingleCaseWordChar = /[\u00df\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/;
+  var nonASCIISingleCaseWordChar = /[\u00df\u0587\u0590-\u05f4\u0600-\u06ff\u3040-\u309f\u30a0-\u30ff\u3400-\u4db5\u4e00-\u9fcc\uac00-\ud7af]/;
   var isWordCharBasic = CodeMirror.isWordChar = function(ch) {
     return /\w/.test(ch) || ch > "\x80" &&
       (ch.toUpperCase() != ch.toLowerCase() || nonASCIISingleCaseWordChar.test(ch));
@@ -7107,15 +8385,16 @@
   }
 
   var range;
-  if (document.createRange) range = function(node, start, end) {
+  if (document.createRange) range = function(node, start, end, endNode) {
     var r = document.createRange();
-    r.setEnd(node, end);
+    r.setEnd(endNode || node, end);
     r.setStart(node, start);
     return r;
   };
   else range = function(node, start, end) {
     var r = document.body.createTextRange();
-    r.moveToElementText(node.parentNode);
+    try { r.moveToElementText(node.parentNode); }
+    catch(e) { return r; }
     r.collapse(true);
     r.moveEnd("character", end);
     r.moveStart("character", start);
@@ -7132,29 +8411,43 @@
     return removeChildren(parent).appendChild(e);
   }
 
-  function contains(parent, child) {
+  var contains = CodeMirror.contains = function(parent, child) {
+    if (child.nodeType == 3) // Android browser always returns false when child is a textnode
+      child = child.parentNode;
     if (parent.contains)
       return parent.contains(child);
-    while (child = child.parentNode)
+    do {
+      if (child.nodeType == 11) child = child.host;
       if (child == parent) return true;
-  }
+    } while (child = child.parentNode);
+  };
 
-  function activeElt() { return document.activeElement; }
+  function activeElt() {
+    var activeElement = document.activeElement;
+    while (activeElement && activeElement.root && activeElement.root.activeElement)
+      activeElement = activeElement.root.activeElement;
+    return activeElement;
+  }
   // Older versions of IE throws unspecified error when touching
   // document.activeElement in some cases (during loading, in iframe)
-  if (ie_upto10) activeElt = function() {
+  if (ie && ie_version < 11) activeElt = function() {
     try { return document.activeElement; }
     catch(e) { return document.body; }
   };
 
-  function classTest(cls) { return new RegExp("\\b" + cls + "\\b\\s*"); }
-  function rmClass(node, cls) {
-    var test = classTest(cls);
-    if (test.test(node.className)) node.className = node.className.replace(test, "");
-  }
-  function addClass(node, cls) {
-    if (!classTest(cls).test(node.className)) node.className += " " + cls;
-  }
+  function classTest(cls) { return new RegExp("(^|\\s)" + cls + "(?:$|\\s)\\s*"); }
+  var rmClass = CodeMirror.rmClass = function(node, cls) {
+    var current = node.className;
+    var match = classTest(cls).exec(current);
+    if (match) {
+      var after = current.slice(match.index + match[0].length);
+      node.className = current.slice(0, match.index) + (after ? match[1] + after : "");
+    }
+  };
+  var addClass = CodeMirror.addClass = function(node, cls) {
+    var current = node.className;
+    if (!classTest(cls).test(current)) node.className += (current ? " " : "") + cls;
+  };
   function joinClasses(a, b) {
     var as = a.split(" ");
     for (var i = 0; i < as.length; i++)
@@ -7189,7 +8482,6 @@
     on(window, "resize", function() {
       if (resizeTimer == null) resizeTimer = setTimeout(function() {
         resizeTimer = null;
-        knownScrollbarWidth = null;
         forEachCodeMirror(onResize);
       }, 100);
     });
@@ -7205,31 +8497,23 @@
   var dragAndDrop = function() {
     // There is *some* kind of drag-and-drop support in IE6-8, but I
     // couldn't get it to work yet.
-    if (ie_upto8) return false;
+    if (ie && ie_version < 9) return false;
     var div = elt('div');
     return "draggable" in div || "dragDrop" in div;
   }();
 
-  var knownScrollbarWidth;
-  function scrollbarWidth(measure) {
-    if (knownScrollbarWidth != null) return knownScrollbarWidth;
-    var test = elt("div", null, null, "width: 50px; height: 50px; overflow-x: scroll");
-    removeChildrenAndAdd(measure, test);
-    if (test.offsetWidth)
-      knownScrollbarWidth = test.offsetHeight - test.clientHeight;
-    return knownScrollbarWidth || 0;
-  }
-
   var zwspSupported;
   function zeroWidthElement(measure) {
     if (zwspSupported == null) {
       var test = elt("span", "\u200b");
       removeChildrenAndAdd(measure, elt("span", [test, document.createTextNode("x")]));
       if (measure.firstChild.offsetHeight != 0)
-        zwspSupported = test.offsetWidth <= 1 && test.offsetHeight > 2 && !ie_upto7;
+        zwspSupported = test.offsetWidth <= 1 && test.offsetHeight > 2 && !(ie && ie_version < 8);
     }
-    if (zwspSupported) return elt("span", "\u200b");
-    else return elt("span", "\u00a0", null, "display: inline-block; width: 1px; margin-right: -1px");
+    var node = zwspSupported ? elt("span", "\u200b") :
+      elt("span", "\u00a0", null, "display: inline-block; width: 1px; margin-right: -1px");
+    node.setAttribute("cm-text", "");
+    return node;
   }
 
   // Feature-detect IE's crummy client rect reporting for bidi text
@@ -7238,14 +8522,14 @@
     if (badBidiRects != null) return badBidiRects;
     var txt = removeChildrenAndAdd(measure, document.createTextNode("A\u062eA"));
     var r0 = range(txt, 0, 1).getBoundingClientRect();
-    if (r0.left == r0.right) return false;
+    if (!r0 || r0.left == r0.right) return false; // Safari returns null in some cases (#2780)
     var r1 = range(txt, 1, 2).getBoundingClientRect();
     return badBidiRects = (r1.right - r0.right < 3);
   }
 
   // See if "".split is the broken IE version, if so, provide an
   // alternative way to split lines.
-  var splitLines = CodeMirror.splitLines = "\n\nb".split(/\n/).length != 3 ? function(string) {
+  var splitLinesAuto = CodeMirror.splitLines = "\n\nb".split(/\n/).length != 3 ? function(string) {
     var pos = 0, result = [], l = string.length;
     while (pos <= l) {
       var nl = string.indexOf("\n", pos);
@@ -7280,16 +8564,27 @@
     return typeof e.oncopy == "function";
   })();
 
+  var badZoomedRects = null;
+  function hasBadZoomedRects(measure) {
+    if (badZoomedRects != null) return badZoomedRects;
+    var node = removeChildrenAndAdd(measure, elt("span", "x"));
+    var normal = node.getBoundingClientRect();
+    var fromRange = range(node, 0, 1).getBoundingClientRect();
+    return badZoomedRects = Math.abs(normal.left - fromRange.left) > 1;
+  }
+
   // KEY NAMES
 
-  var keyNames = {3: "Enter", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt",
-                  19: "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End",
-                  36: "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "PrintScrn", 45: "Insert",
-                  46: "Delete", 59: ";", 61: "=", 91: "Mod", 92: "Mod", 93: "Mod", 107: "=", 109: "-", 127: "Delete",
-                  173: "-", 186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\",
-                  221: "]", 222: "'", 63232: "Up", 63233: "Down", 63234: "Left", 63235: "Right", 63272: "Delete",
-                  63273: "Home", 63275: "End", 63276: "PageUp", 63277: "PageDown", 63302: "Insert"};
-  CodeMirror.keyNames = keyNames;
+  var keyNames = CodeMirror.keyNames = {
+    3: "Enter", 8: "Backspace", 9: "Tab", 13: "Enter", 16: "Shift", 17: "Ctrl", 18: "Alt",
+    19: "Pause", 20: "CapsLock", 27: "Esc", 32: "Space", 33: "PageUp", 34: "PageDown", 35: "End",
+    36: "Home", 37: "Left", 38: "Up", 39: "Right", 40: "Down", 44: "PrintScrn", 45: "Insert",
+    46: "Delete", 59: ";", 61: "=", 91: "Mod", 92: "Mod", 93: "Mod",
+    106: "*", 107: "=", 109: "-", 110: ".", 111: "/", 127: "Delete",
+    173: "-", 186: ";", 187: "=", 188: ",", 189: "-", 190: ".", 191: "/", 192: "`", 219: "[", 220: "\\",
+    221: "]", 222: "'", 63232: "Up", 63233: "Down", 63234: "Left", 63235: "Right", 63272: "Delete",
+    63273: "Home", 63275: "End", 63276: "PageUp", 63277: "PageDown", 63302: "Insert"
+  };
   (function() {
     // Number keys
     for (var i = 0; i < 10; i++) keyNames[i + 48] = keyNames[i + 96] = String(i);
@@ -7342,6 +8637,17 @@
     var ch = !order ? line.text.length : order[0].level % 2 ? lineLeft(line) : lineRight(line);
     return Pos(lineN == null ? lineNo(line) : lineN, ch);
   }
+  function lineStartSmart(cm, pos) {
+    var start = lineStart(cm, pos.line);
+    var line = getLine(cm.doc, start.line);
+    var order = getOrder(line);
+    if (!order || order[0].level == 0) {
+      var firstNonWS = Math.max(0, line.text.search(/\S/));
+      var inWS = pos.line == start.line && pos.ch <= firstNonWS && pos.ch;
+      return Pos(start.line, inWS ? 0 : firstNonWS);
+    }
+    return start;
+  }
 
   function compareBidiLevel(order, a, b) {
     var linedir = order[0].level;
@@ -7572,6 +8878,8 @@
         lst(order).to -= m[0].length;
         order.push(new BidiSpan(0, len - m[0].length, len));
       }
+      if (order[0].level == 2)
+        order.unshift(new BidiSpan(1, order[0].to, order[0].to));
       if (order[0].level != lst(order).level)
         order.push(new BidiSpan(order[0].level, len, len));
 
@@ -7581,7 +8889,7 @@
 
   // THE END
 
-  CodeMirror.version = "4.1.1";
+  CodeMirror.version = "5.13.2";
 
   return CodeMirror;
 });
diff --git a/plugins/tiddlywiki/codemirror/files/keymap/emacs.js b/plugins/tiddlywiki/codemirror/files/keymap/emacs.js
old mode 100644
new mode 100755
index 7cecf1f62..3eec1e576
--- a/plugins/tiddlywiki/codemirror/files/keymap/emacs.js
+++ b/plugins/tiddlywiki/codemirror/files/keymap/emacs.js
@@ -1,3 +1,6 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 (function(mod) {
   if (typeof exports == "object" && typeof module == "object") // CommonJS
     mod(require("../lib/codemirror"));
@@ -129,8 +132,8 @@
     };
   }
 
-  function findEnd(cm, by, dir) {
-    var pos = cm.getCursor(), prefix = getPrefix(cm);
+  function findEnd(cm, pos, by, dir) {
+    var prefix = getPrefix(cm);
     if (prefix < 0) { dir = -dir; prefix = -prefix; }
     for (var i = 0; i < prefix; ++i) {
       var newPos = by(cm, pos, dir);
@@ -142,14 +145,31 @@
 
   function move(by, dir) {
     var f = function(cm) {
-      cm.extendSelection(findEnd(cm, by, dir));
+      cm.extendSelection(findEnd(cm, cm.getCursor(), by, dir));
     };
     f.motion = true;
     return f;
   }
 
   function killTo(cm, by, dir) {
-    kill(cm, cm.getCursor(), findEnd(cm, by, dir), true);
+    var selections = cm.listSelections(), cursor;
+    var i = selections.length;
+    while (i--) {
+      cursor = selections[i].head;
+      kill(cm, cursor, findEnd(cm, cursor, by, dir), true);
+    }
+  }
+
+  function killRegion(cm) {
+    if (cm.somethingSelected()) {
+      var selections = cm.listSelections(), selection;
+      var i = selections.length;
+      while (i--) {
+        selection = selections[i];
+        kill(cm, selection.anchor, selection.head);
+      }
+      return true;
+    }
   }
 
   function addPrefix(cm, digit) {
@@ -253,7 +273,7 @@
 
   // Actual keymap
 
-  var keyMap = CodeMirror.keyMap.emacs = {
+  var keyMap = CodeMirror.keyMap.emacs = CodeMirror.normalizeKeyMap({
     "Ctrl-W": function(cm) {kill(cm, cm.getCursor("start"), cm.getCursor("end"));},
     "Ctrl-K": repeated(function(cm) {
       var start = cm.getCursor(), end = cm.clipPos(Pos(start.line));
@@ -280,9 +300,9 @@
     "Ctrl-F": move(byChar, 1), "Ctrl-B": move(byChar, -1),
     "Right": move(byChar, 1), "Left": move(byChar, -1),
     "Ctrl-D": function(cm) { killTo(cm, byChar, 1); },
-    "Delete": function(cm) { killTo(cm, byChar, 1); },
+    "Delete": function(cm) { killRegion(cm) || killTo(cm, byChar, 1); },
     "Ctrl-H": function(cm) { killTo(cm, byChar, -1); },
-    "Backspace": function(cm) { killTo(cm, byChar, -1); },
+    "Backspace": function(cm) { killRegion(cm) || killTo(cm, byChar, -1); },
 
     "Alt-F": move(byWord, 1), "Alt-B": move(byWord, -1),
     "Alt-D": function(cm) { killTo(cm, byWord, 1); },
@@ -306,7 +326,8 @@
     "Ctrl-Alt-F": move(byExpr, 1), "Ctrl-Alt-B": move(byExpr, -1),
 
     "Shift-Ctrl-Alt-2": function(cm) {
-      cm.setSelection(findEnd(cm, byExpr, 1), cm.getCursor());
+      var cursor = cm.getCursor();
+      cm.setSelection(findEnd(cm, cursor, byExpr, 1), cursor);
     },
     "Ctrl-Alt-T": function(cm) {
       var leftStart = byExpr(cm, cm.getCursor(), -1), leftEnd = byExpr(cm, leftStart, 1);
@@ -350,43 +371,35 @@
     "Alt-/": "autocomplete",
     "Ctrl-J": "newlineAndIndent", "Enter": false, "Tab": "indentAuto",
 
-    "Alt-G": function(cm) {cm.setOption("keyMap", "emacs-Alt-G");},
-    "Ctrl-X": function(cm) {cm.setOption("keyMap", "emacs-Ctrl-X");},
-    "Ctrl-Q": function(cm) {cm.setOption("keyMap", "emacs-Ctrl-Q");},
-    "Ctrl-U": addPrefixMap
-  };
-
-  CodeMirror.keyMap["emacs-Ctrl-X"] = {
-    "Tab": function(cm) {
-      cm.indentSelection(getPrefix(cm, true) || cm.getOption("indentUnit"));
-    },
-    "Ctrl-X": function(cm) {
-      cm.setSelection(cm.getCursor("head"), cm.getCursor("anchor"));
-    },
-
-    "Ctrl-S": "save", "Ctrl-W": "save", "S": "saveAll", "F": "open", "U": repeated("undo"), "K": "close",
-    "Delete": function(cm) { kill(cm, cm.getCursor(), bySentence(cm, cm.getCursor(), 1), true); },
-    auto: "emacs", nofallthrough: true, disableInput: true
-  };
-
-  CodeMirror.keyMap["emacs-Alt-G"] = {
-    "G": function(cm) {
+    "Alt-G G": function(cm) {
       var prefix = getPrefix(cm, true);
       if (prefix != null && prefix > 0) return cm.setCursor(prefix - 1);
 
       getInput(cm, "Goto line", function(str) {
         var num;
-        if (str && !isNaN(num = Number(str)) && num == num|0 && num > 0)
+        if (str && !isNaN(num = Number(str)) && num == (num|0) && num > 0)
           cm.setCursor(num - 1);
       });
     },
-    auto: "emacs", nofallthrough: true, disableInput: true
-  };
 
-  CodeMirror.keyMap["emacs-Ctrl-Q"] = {
-    "Tab": repeated("insertTab"),
-    auto: "emacs", nofallthrough: true
-  };
+    "Ctrl-X Tab": function(cm) {
+      cm.indentSelection(getPrefix(cm, true) || cm.getOption("indentUnit"));
+    },
+    "Ctrl-X Ctrl-X": function(cm) {
+      cm.setSelection(cm.getCursor("head"), cm.getCursor("anchor"));
+    },
+    "Ctrl-X Ctrl-S": "save",
+    "Ctrl-X Ctrl-W": "save",
+    "Ctrl-X S": "saveAll",
+    "Ctrl-X F": "open",
+    "Ctrl-X U": repeated("undo"),
+    "Ctrl-X K": "close",
+    "Ctrl-X Delete": function(cm) { kill(cm, cm.getCursor(), bySentence(cm, cm.getCursor(), 1), true); },
+    "Ctrl-X H": "selectAll",
+
+    "Ctrl-Q Tab": repeated("insertTab"),
+    "Ctrl-U": addPrefixMap
+  });
 
   var prefixMap = {"Ctrl-G": clearPrefix};
   function regPrefix(d) {
diff --git a/plugins/tiddlywiki/codemirror/files/keymap/extra.js b/plugins/tiddlywiki/codemirror/files/keymap/extra.js
deleted file mode 100644
index 18dd5a979..000000000
--- a/plugins/tiddlywiki/codemirror/files/keymap/extra.js
+++ /dev/null
@@ -1,43 +0,0 @@
-// A number of additional default bindings that are too obscure to
-// include in the core codemirror.js file.
-
-(function() {
-  "use strict";
-
-  var Pos = CodeMirror.Pos;
-
-  function moveLines(cm, start, end, dist) {
-    if (!dist || start > end) return 0;
-
-    var from = cm.clipPos(Pos(start, 0)), to = cm.clipPos(Pos(end));
-    var text = cm.getRange(from, to);
-
-    if (start <= cm.firstLine())
-      cm.replaceRange("", from, Pos(to.line + 1, 0));
-    else
-      cm.replaceRange("", Pos(from.line - 1), to);
-    var target = from.line + dist;
-    if (target <= cm.firstLine()) {
-      cm.replaceRange(text + "\n", Pos(target, 0));
-      return cm.firstLine() - from.line;
-    } else {
-      var targetPos = cm.clipPos(Pos(target - 1));
-      cm.replaceRange("\n" + text, targetPos);
-      return targetPos.line + 1 - from.line;
-    }
-  }
-
-  function moveSelectedLines(cm, dist) {
-    var head = cm.getCursor("head"), anchor = cm.getCursor("anchor");
-    cm.operation(function() {
-      var moved = moveLines(cm, Math.min(head.line, anchor.line), Math.max(head.line, anchor.line), dist);
-      cm.setSelection(Pos(anchor.line + moved, anchor.ch), Pos(head.line + moved, head.ch));
-    });
-  }
-
-  CodeMirror.commands.moveLinesUp = function(cm) { moveSelectedLines(cm, -1); };
-  CodeMirror.commands.moveLinesDown = function(cm) { moveSelectedLines(cm, 1); };
-
-  CodeMirror.keyMap["default"]["Alt-Up"] = "moveLinesUp";
-  CodeMirror.keyMap["default"]["Alt-Down"] = "moveLinesDown";
-})();
diff --git a/plugins/tiddlywiki/codemirror/files/keymap/sublime.js b/plugins/tiddlywiki/codemirror/files/keymap/sublime.js
old mode 100644
new mode 100755
index eea46347f..49db3b871
--- a/plugins/tiddlywiki/codemirror/files/keymap/sublime.js
+++ b/plugins/tiddlywiki/codemirror/files/keymap/sublime.js
@@ -1,3 +1,6 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 // A rough approximation of Sublime Text's keybindings
 // Depends on addon/search/searchcursor.js and optionally addon/dialog/dialogs.js
 
@@ -14,7 +17,8 @@
   var map = CodeMirror.keyMap.sublime = {fallthrough: "default"};
   var cmds = CodeMirror.commands;
   var Pos = CodeMirror.Pos;
-  var ctrl = CodeMirror.keyMap["default"] == CodeMirror.keyMap.pcDefault ? "Ctrl-" : "Cmd-";
+  var mac = CodeMirror.keyMap["default"] == CodeMirror.keyMap.macDefault;
+  var ctrl = mac ? "Cmd-" : "Ctrl-";
 
   // This is not exactly Sublime's algorithm. I couldn't make heads or tails of that.
   function findPosSubword(doc, start, dir) {
@@ -51,7 +55,9 @@
   cmds[map["Alt-Left"] = "goSubwordLeft"] = function(cm) { moveSubword(cm, -1); };
   cmds[map["Alt-Right"] = "goSubwordRight"] = function(cm) { moveSubword(cm, 1); };
 
-  cmds[map[ctrl + "Up"] = "scrollLineUp"] = function(cm) {
+  var scrollLineCombo = mac ? "Ctrl-Alt-" : "Ctrl-";
+
+  cmds[map[scrollLineCombo + "Up"] = "scrollLineUp"] = function(cm) {
     var info = cm.getScrollInfo();
     if (!cm.somethingSelected()) {
       var visibleBottomLine = cm.lineAtHeight(info.top + info.clientHeight, "local");
@@ -60,7 +66,7 @@
     }
     cm.scrollTo(null, info.top - cm.defaultTextHeight());
   };
-  cmds[map[ctrl + "Down"] = "scrollLineDown"] = function(cm) {
+  cmds[map[scrollLineCombo + "Down"] = "scrollLineDown"] = function(cm) {
     var info = cm.getScrollInfo();
     if (!cm.somethingSelected()) {
       var visibleTopLine = cm.lineAtHeight(info.top, "local")+1;
@@ -99,9 +105,10 @@
     cm.setSelections(extended);
   };
 
-  map["Shift-" + ctrl + "K"] = "deleteLine";
+  map["Shift-Ctrl-K"] = "deleteLine";
 
   function insertLine(cm, above) {
+    if (cm.isReadOnly()) return CodeMirror.Pass
     cm.operation(function() {
       var len = cm.listSelections().length, newSelection = [], last = -1;
       for (var i = 0; i < len; i++) {
@@ -117,9 +124,9 @@
     });
   }
 
-  cmds[map[ctrl + "Enter"] = "insertLineAfter"] = function(cm) { insertLine(cm, false); };
+  cmds[map[ctrl + "Enter"] = "insertLineAfter"] = function(cm) { return insertLine(cm, false); };
 
-  cmds[map["Shift-" + ctrl + "Enter"] = "insertLineBefore"] = function(cm) { insertLine(cm, true); };
+  cmds[map["Shift-" + ctrl + "Enter"] = "insertLineBefore"] = function(cm) { return insertLine(cm, true); };
 
   function wordAt(cm, pos) {
     var start = pos.ch, end = start, line = cm.getLine(pos.line);
@@ -183,10 +190,16 @@
     });
   };
 
-  cmds[map["Shift-" + ctrl + "Up"] = "swapLineUp"] = function(cm) {
-    var ranges = cm.listSelections(), linesToMove = [], at = cm.firstLine() - 1;
+  var swapLineCombo = mac ? "Cmd-Ctrl-" : "Shift-Ctrl-";
+
+  cmds[map[swapLineCombo + "Up"] = "swapLineUp"] = function(cm) {
+    if (cm.isReadOnly()) return CodeMirror.Pass
+    var ranges = cm.listSelections(), linesToMove = [], at = cm.firstLine() - 1, newSels = [];
     for (var i = 0; i < ranges.length; i++) {
       var range = ranges[i], from = range.from().line - 1, to = range.to().line;
+      newSels.push({anchor: Pos(range.anchor.line - 1, range.anchor.ch),
+                    head: Pos(range.head.line - 1, range.head.ch)});
+      if (range.to().ch == 0 && !range.empty()) --to;
       if (from > at) linesToMove.push(from, to);
       else if (linesToMove.length) linesToMove[linesToMove.length - 1] = to;
       at = to;
@@ -196,24 +209,22 @@
         var from = linesToMove[i], to = linesToMove[i + 1];
         var line = cm.getLine(from);
         cm.replaceRange("", Pos(from, 0), Pos(from + 1, 0), "+swapLine");
-        if (to > cm.lastLine()) {
+        if (to > cm.lastLine())
           cm.replaceRange("\n" + line, Pos(cm.lastLine()), null, "+swapLine");
-          var sels = cm.listSelections(), last = sels[sels.length - 1];
-          var head = last.head.line == to ? Pos(to - 1) : last.head;
-          var anchor = last.anchor.line == to ? Pos(to - 1) : last.anchor;
-          cm.setSelections(sels.slice(0, sels.length - 1).concat([{head: head, anchor: anchor}]));
-        } else {
+        else
           cm.replaceRange(line + "\n", Pos(to, 0), null, "+swapLine");
-        }
       }
+      cm.setSelections(newSels);
       cm.scrollIntoView();
     });
   };
 
-  cmds[map["Shift-" + ctrl + "Down"] = "swapLineDown"] = function(cm) {
+  cmds[map[swapLineCombo + "Down"] = "swapLineDown"] = function(cm) {
+    if (cm.isReadOnly()) return CodeMirror.Pass
     var ranges = cm.listSelections(), linesToMove = [], at = cm.lastLine() + 1;
     for (var i = ranges.length - 1; i >= 0; i--) {
       var range = ranges[i], from = range.to().line + 1, to = range.from().line;
+      if (range.to().ch == 0 && !range.empty()) from--;
       if (from < at) linesToMove.push(from, to);
       else if (linesToMove.length) linesToMove[linesToMove.length - 1] = to;
       at = to;
@@ -232,7 +243,9 @@
     });
   };
 
-  map[ctrl + "/"] = "toggleComment";
+  cmds[map[ctrl + "/"] = "toggleCommentIndented"] = function(cm) {
+    cm.toggleComment({ indent: true });
+  }
 
   cmds[map[ctrl + "J"] = "joinLines"] = function(cm) {
     var ranges = cm.listSelections(), joined = [];
@@ -279,6 +292,7 @@
   map[ctrl + "T"] = "transposeChars";
 
   function sortLines(cm, caseSensitive) {
+    if (cm.isReadOnly()) return CodeMirror.Pass
     var ranges = cm.listSelections(), toSort = [], selected;
     for (var i = 0; i < ranges.length; i++) {
       var range = ranges[i];
@@ -380,9 +394,7 @@
 
   map["Alt-Q"] = "wrapLines";
 
-  var mapK = CodeMirror.keyMap["sublime-Ctrl-K"] = {auto: "sublime", nofallthrough: true};
-
-  map[ctrl + "K"] = function(cm) {cm.setOption("keyMap", "sublime-Ctrl-K");};
+  var cK = ctrl + "K ";
 
   function modifyWordOrSelection(cm, mod) {
     cm.operation(function() {
@@ -403,9 +415,30 @@
     });
   }
 
-  mapK[ctrl + "Backspace"] = "delLineLeft";
+  map[cK + ctrl + "Backspace"] = "delLineLeft";
 
-  cmds[mapK[ctrl + "K"] = "delLineRight"] = function(cm) {
+  cmds[map["Backspace"] = "smartBackspace"] = function(cm) {
+    if (cm.somethingSelected()) return CodeMirror.Pass;
+
+    var cursor = cm.getCursor();
+    var toStartOfLine = cm.getRange({line: cursor.line, ch: 0}, cursor);
+    var column = CodeMirror.countColumn(toStartOfLine, null, cm.getOption("tabSize"));
+    var indentUnit = cm.getOption("indentUnit");
+
+    if (toStartOfLine && !/\S/.test(toStartOfLine) && column % indentUnit == 0) {
+      var prevIndent = new Pos(cursor.line,
+        CodeMirror.findColumn(toStartOfLine, column - indentUnit, indentUnit));
+
+      // If no smart delete is happening (due to tab sizing) just do a regular delete
+      if (prevIndent.ch == cursor.ch) return CodeMirror.Pass;
+
+      return cm.replaceRange("", prevIndent, cursor, "+delete");
+    } else {
+      return CodeMirror.Pass;
+    }
+  };
+
+  cmds[map[cK + ctrl + "K"] = "delLineRight"] = function(cm) {
     cm.operation(function() {
       var ranges = cm.listSelections();
       for (var i = ranges.length - 1; i >= 0; i--)
@@ -414,22 +447,22 @@
     });
   };
 
-  cmds[mapK[ctrl + "U"] = "upcaseAtCursor"] = function(cm) {
+  cmds[map[cK + ctrl + "U"] = "upcaseAtCursor"] = function(cm) {
     modifyWordOrSelection(cm, function(str) { return str.toUpperCase(); });
   };
-  cmds[mapK[ctrl + "L"] = "downcaseAtCursor"] = function(cm) {
+  cmds[map[cK + ctrl + "L"] = "downcaseAtCursor"] = function(cm) {
     modifyWordOrSelection(cm, function(str) { return str.toLowerCase(); });
   };
 
-  cmds[mapK[ctrl + "Space"] = "setSublimeMark"] = function(cm) {
+  cmds[map[cK + ctrl + "Space"] = "setSublimeMark"] = function(cm) {
     if (cm.state.sublimeMark) cm.state.sublimeMark.clear();
     cm.state.sublimeMark = cm.setBookmark(cm.getCursor());
   };
-  cmds[mapK[ctrl + "A"] = "selectToSublimeMark"] = function(cm) {
+  cmds[map[cK + ctrl + "A"] = "selectToSublimeMark"] = function(cm) {
     var found = cm.state.sublimeMark && cm.state.sublimeMark.find();
     if (found) cm.setSelection(cm.getCursor(), found);
   };
-  cmds[mapK[ctrl + "W"] = "deleteToSublimeMark"] = function(cm) {
+  cmds[map[cK + ctrl + "W"] = "deleteToSublimeMark"] = function(cm) {
     var found = cm.state.sublimeMark && cm.state.sublimeMark.find();
     if (found) {
       var from = cm.getCursor(), to = found;
@@ -438,7 +471,7 @@
       cm.replaceRange("", from, to);
     }
   };
-  cmds[mapK[ctrl + "X"] = "swapWithSublimeMark"] = function(cm) {
+  cmds[map[cK + ctrl + "X"] = "swapWithSublimeMark"] = function(cm) {
     var found = cm.state.sublimeMark && cm.state.sublimeMark.find();
     if (found) {
       cm.state.sublimeMark.clear();
@@ -446,13 +479,13 @@
       cm.setCursor(found);
     }
   };
-  cmds[mapK[ctrl + "Y"] = "sublimeYank"] = function(cm) {
+  cmds[map[cK + ctrl + "Y"] = "sublimeYank"] = function(cm) {
     if (cm.state.sublimeKilled != null)
       cm.replaceSelection(cm.state.sublimeKilled, null, "paste");
   };
 
-  mapK[ctrl + "G"] = "clearBookmarks";
-  cmds[mapK[ctrl + "C"] = "showInCenter"] = function(cm) {
+  map[cK + ctrl + "G"] = "clearBookmarks";
+  cmds[map[cK + ctrl + "C"] = "showInCenter"] = function(cm) {
     var pos = cm.cursorCoords(null, "local");
     cm.scrollTo(null, (pos.top + pos.bottom) / 2 - cm.getScrollInfo().clientHeight / 2);
   };
@@ -478,7 +511,7 @@
     });
   };
 
-  function findAndGoTo(cm, forward) {
+  function getTarget(cm) {
     var from = cm.getCursor("from"), to = cm.getCursor("to");
     if (CodeMirror.cmpPos(from, to) == 0) {
       var word = wordAt(cm, from);
@@ -486,9 +519,14 @@
       from = word.from;
       to = word.to;
     }
+    return {from: from, to: to, query: cm.getRange(from, to), word: word};
+  }
 
-    var query = cm.getRange(from, to);
-    var cur = cm.getSearchCursor(query, forward ? to : from);
+  function findAndGoTo(cm, forward) {
+    var target = getTarget(cm);
+    if (!target) return;
+    var query = target.query;
+    var cur = cm.getSearchCursor(query, forward ? target.to : target.from);
 
     if (forward ? cur.findNext() : cur.findPrevious()) {
       cm.setSelection(cur.from(), cur.to());
@@ -497,16 +535,29 @@
                                               : cm.clipPos(Pos(cm.lastLine())));
       if (forward ? cur.findNext() : cur.findPrevious())
         cm.setSelection(cur.from(), cur.to());
-      else if (word)
-        cm.setSelection(from, to);
+      else if (target.word)
+        cm.setSelection(target.from, target.to);
     }
   };
   cmds[map[ctrl + "F3"] = "findUnder"] = function(cm) { findAndGoTo(cm, true); };
   cmds[map["Shift-" + ctrl + "F3"] = "findUnderPrevious"] = function(cm) { findAndGoTo(cm,false); };
+  cmds[map["Alt-F3"] = "findAllUnder"] = function(cm) {
+    var target = getTarget(cm);
+    if (!target) return;
+    var cur = cm.getSearchCursor(target.query);
+    var matches = [];
+    var primaryIndex = -1;
+    while (cur.findNext()) {
+      matches.push({anchor: cur.from(), head: cur.to()});
+      if (cur.from().line <= target.from.line && cur.from().ch <= target.from.ch)
+        primaryIndex++;
+    }
+    cm.setSelections(matches, primaryIndex);
+  };
 
   map["Shift-" + ctrl + "["] = "fold";
   map["Shift-" + ctrl + "]"] = "unfold";
-  mapK[ctrl + "0"] = mapK[ctrl + "j"] = "unfoldAll";
+  map[cK + ctrl + "0"] = map[cK + ctrl + "j"] = "unfoldAll";
 
   map[ctrl + "I"] = "findIncremental";
   map["Shift-" + ctrl + "I"] = "findIncrementalReverse";
@@ -514,4 +565,5 @@
   map["F3"] = "findNext";
   map["Shift-F3"] = "findPrev";
 
+  CodeMirror.normalizeKeyMap(map);
 });
diff --git a/plugins/tiddlywiki/codemirror/files/keymap/vim.js b/plugins/tiddlywiki/codemirror/files/keymap/vim.js
old mode 100644
new mode 100755
index c78d76af9..5ed2d9bf7
--- a/plugins/tiddlywiki/codemirror/files/keymap/vim.js
+++ b/plugins/tiddlywiki/codemirror/files/keymap/vim.js
@@ -1,41 +1,18 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 /**
  * Supported keybindings:
+ *   Too many to list. Refer to defaultKeyMap below.
  *
- *   Motion:
- *   h, j, k, l
- *   gj, gk
- *   e, E, w, W, b, B, ge, gE
- *   f<character>, F<character>, t<character>, T<character>
- *   $, ^, 0, -, +, _
- *   gg, G
- *   %
- *   '<character>, `<character>
- *
- *   Operator:
- *   d, y, c
- *   dd, yy, cc
- *   g~, g~g~
- *   >, <, >>, <<
- *
- *   Operator-Motion:
- *   x, X, D, Y, C, ~
- *
- *   Action:
- *   a, i, s, A, I, S, o, O
- *   zz, z., z<CR>, zt, zb, z-
- *   J
- *   u, Ctrl-r
- *   m<character>
- *   r<character>
- *
- *   Modes:
- *   ESC - leave insert mode, visual mode, and clear input state.
- *   Ctrl-[, Ctrl-c - same as ESC.
+ * Supported Ex commands:
+ *   Refer to defaultExCommandMap below.
  *
  * Registers: unnamed, -, a-z, A-Z, 0-9
  *   (Does not respect the special case for number registers when delete
  *    operator is made with these commands: %, (, ),  , /, ?, n, N, {, } )
  *   TODO: Implement the remaining registers.
+ *
  * Marks: a-z, A-Z, and 0-9
  *   TODO: Implement the remaining special marks. They have more complex
  *       behavior.
@@ -54,6 +31,7 @@
  *  6. Motion, operator, and action implementations
  *  7. Helper functions for the key handler, motions, operators, and actions
  *  8. Set up Vim to work as a keymap for CodeMirror.
+ *  9. Ex command implementations.
  */
 
 (function(mod) {
@@ -69,315 +47,280 @@
   var defaultKeymap = [
     // Key to key mapping. This goes first to make it possible to override
     // existing mappings.
-    { keys: ['<Left>'], type: 'keyToKey', toKeys: ['h'] },
-    { keys: ['<Right>'], type: 'keyToKey', toKeys: ['l'] },
-    { keys: ['<Up>'], type: 'keyToKey', toKeys: ['k'] },
-    { keys: ['<Down>'], type: 'keyToKey', toKeys: ['j'] },
-    { keys: ['<Space>'], type: 'keyToKey', toKeys: ['l'] },
-    { keys: ['<BS>'], type: 'keyToKey', toKeys: ['h'] },
-    { keys: ['<C-Space>'], type: 'keyToKey', toKeys: ['W'] },
-    { keys: ['<C-BS>'], type: 'keyToKey', toKeys: ['B'] },
-    { keys: ['<S-Space>'], type: 'keyToKey', toKeys: ['w'] },
-    { keys: ['<S-BS>'], type: 'keyToKey', toKeys: ['b'] },
-    { keys: ['<C-n>'], type: 'keyToKey', toKeys: ['j'] },
-    { keys: ['<C-p>'], type: 'keyToKey', toKeys: ['k'] },
-    { keys: ['<C-[>'], type: 'keyToKey', toKeys: ['<Esc>'] },
-    { keys: ['<C-c>'], type: 'keyToKey', toKeys: ['<Esc>'] },
-    { keys: ['s'], type: 'keyToKey', toKeys: ['c', 'l'], context: 'normal' },
-    { keys: ['s'], type: 'keyToKey', toKeys: ['x', 'i'], context: 'visual'},
-    { keys: ['S'], type: 'keyToKey', toKeys: ['c', 'c'], context: 'normal' },
-    { keys: ['S'], type: 'keyToKey', toKeys: ['d', 'c', 'c'], context: 'visual' },
-    { keys: ['<Home>'], type: 'keyToKey', toKeys: ['0'] },
-    { keys: ['<End>'], type: 'keyToKey', toKeys: ['$'] },
-    { keys: ['<PageUp>'], type: 'keyToKey', toKeys: ['<C-b>'] },
-    { keys: ['<PageDown>'], type: 'keyToKey', toKeys: ['<C-f>'] },
-    { keys: ['<CR>'], type: 'keyToKey', toKeys: ['j', '^'], context: 'normal' },
+    { keys: '<Left>', type: 'keyToKey', toKeys: 'h' },
+    { keys: '<Right>', type: 'keyToKey', toKeys: 'l' },
+    { keys: '<Up>', type: 'keyToKey', toKeys: 'k' },
+    { keys: '<Down>', type: 'keyToKey', toKeys: 'j' },
+    { keys: '<Space>', type: 'keyToKey', toKeys: 'l' },
+    { keys: '<BS>', type: 'keyToKey', toKeys: 'h', context: 'normal'},
+    { keys: '<C-Space>', type: 'keyToKey', toKeys: 'W' },
+    { keys: '<C-BS>', type: 'keyToKey', toKeys: 'B', context: 'normal' },
+    { keys: '<S-Space>', type: 'keyToKey', toKeys: 'w' },
+    { keys: '<S-BS>', type: 'keyToKey', toKeys: 'b', context: 'normal' },
+    { keys: '<C-n>', type: 'keyToKey', toKeys: 'j' },
+    { keys: '<C-p>', type: 'keyToKey', toKeys: 'k' },
+    { keys: '<C-[>', type: 'keyToKey', toKeys: '<Esc>' },
+    { keys: '<C-c>', type: 'keyToKey', toKeys: '<Esc>' },
+    { keys: '<C-[>', type: 'keyToKey', toKeys: '<Esc>', context: 'insert' },
+    { keys: '<C-c>', type: 'keyToKey', toKeys: '<Esc>', context: 'insert' },
+    { keys: 's', type: 'keyToKey', toKeys: 'cl', context: 'normal' },
+    { keys: 's', type: 'keyToKey', toKeys: 'c', context: 'visual'},
+    { keys: 'S', type: 'keyToKey', toKeys: 'cc', context: 'normal' },
+    { keys: 'S', type: 'keyToKey', toKeys: 'VdO', context: 'visual' },
+    { keys: '<Home>', type: 'keyToKey', toKeys: '0' },
+    { keys: '<End>', type: 'keyToKey', toKeys: '$' },
+    { keys: '<PageUp>', type: 'keyToKey', toKeys: '<C-b>' },
+    { keys: '<PageDown>', type: 'keyToKey', toKeys: '<C-f>' },
+    { keys: '<CR>', type: 'keyToKey', toKeys: 'j^', context: 'normal' },
     // Motions
-    { keys: ['H'], type: 'motion',
-        motion: 'moveToTopLine',
-        motionArgs: { linewise: true, toJumplist: true }},
-    { keys: ['M'], type: 'motion',
-        motion: 'moveToMiddleLine',
-        motionArgs: { linewise: true, toJumplist: true }},
-    { keys: ['L'], type: 'motion',
-        motion: 'moveToBottomLine',
-        motionArgs: { linewise: true, toJumplist: true }},
-    { keys: ['h'], type: 'motion',
-        motion: 'moveByCharacters',
-        motionArgs: { forward: false }},
-    { keys: ['l'], type: 'motion',
-        motion: 'moveByCharacters',
-        motionArgs: { forward: true }},
-    { keys: ['j'], type: 'motion',
-        motion: 'moveByLines',
-        motionArgs: { forward: true, linewise: true }},
-    { keys: ['k'], type: 'motion',
-        motion: 'moveByLines',
-        motionArgs: { forward: false, linewise: true }},
-    { keys: ['g','j'], type: 'motion',
-        motion: 'moveByDisplayLines',
-        motionArgs: { forward: true }},
-    { keys: ['g','k'], type: 'motion',
-        motion: 'moveByDisplayLines',
-        motionArgs: { forward: false }},
-    { keys: ['w'], type: 'motion',
-        motion: 'moveByWords',
-        motionArgs: { forward: true, wordEnd: false }},
-    { keys: ['W'], type: 'motion',
-        motion: 'moveByWords',
-        motionArgs: { forward: true, wordEnd: false, bigWord: true }},
-    { keys: ['e'], type: 'motion',
-        motion: 'moveByWords',
-        motionArgs: { forward: true, wordEnd: true, inclusive: true }},
-    { keys: ['E'], type: 'motion',
-        motion: 'moveByWords',
-        motionArgs: { forward: true, wordEnd: true, bigWord: true,
-            inclusive: true }},
-    { keys: ['b'], type: 'motion',
-        motion: 'moveByWords',
-        motionArgs: { forward: false, wordEnd: false }},
-    { keys: ['B'], type: 'motion',
-        motion: 'moveByWords',
-        motionArgs: { forward: false, wordEnd: false, bigWord: true }},
-    { keys: ['g', 'e'], type: 'motion',
-        motion: 'moveByWords',
-        motionArgs: { forward: false, wordEnd: true, inclusive: true }},
-    { keys: ['g', 'E'], type: 'motion',
-        motion: 'moveByWords',
-        motionArgs: { forward: false, wordEnd: true, bigWord: true,
-            inclusive: true }},
-    { keys: ['{'], type: 'motion', motion: 'moveByParagraph',
-        motionArgs: { forward: false, toJumplist: true }},
-    { keys: ['}'], type: 'motion', motion: 'moveByParagraph',
-        motionArgs: { forward: true, toJumplist: true }},
-    { keys: ['<C-f>'], type: 'motion',
-        motion: 'moveByPage', motionArgs: { forward: true }},
-    { keys: ['<C-b>'], type: 'motion',
-        motion: 'moveByPage', motionArgs: { forward: false }},
-    { keys: ['<C-d>'], type: 'motion',
-        motion: 'moveByScroll',
-        motionArgs: { forward: true, explicitRepeat: true }},
-    { keys: ['<C-u>'], type: 'motion',
-        motion: 'moveByScroll',
-        motionArgs: { forward: false, explicitRepeat: true }},
-    { keys: ['g', 'g'], type: 'motion',
-        motion: 'moveToLineOrEdgeOfDocument',
-        motionArgs: { forward: false, explicitRepeat: true, linewise: true, toJumplist: true }},
-    { keys: ['G'], type: 'motion',
-        motion: 'moveToLineOrEdgeOfDocument',
-        motionArgs: { forward: true, explicitRepeat: true, linewise: true, toJumplist: true }},
-    { keys: ['0'], type: 'motion', motion: 'moveToStartOfLine' },
-    { keys: ['^'], type: 'motion',
-        motion: 'moveToFirstNonWhiteSpaceCharacter' },
-    { keys: ['+'], type: 'motion',
-        motion: 'moveByLines',
-        motionArgs: { forward: true, toFirstChar:true }},
-    { keys: ['-'], type: 'motion',
-        motion: 'moveByLines',
-        motionArgs: { forward: false, toFirstChar:true }},
-    { keys: ['_'], type: 'motion',
-        motion: 'moveByLines',
-        motionArgs: { forward: true, toFirstChar:true, repeatOffset:-1 }},
-    { keys: ['$'], type: 'motion',
-        motion: 'moveToEol',
-        motionArgs: { inclusive: true }},
-    { keys: ['%'], type: 'motion',
-        motion: 'moveToMatchedSymbol',
-        motionArgs: { inclusive: true, toJumplist: true }},
-    { keys: ['f', 'character'], type: 'motion',
-        motion: 'moveToCharacter',
-        motionArgs: { forward: true , inclusive: true }},
-    { keys: ['F', 'character'], type: 'motion',
-        motion: 'moveToCharacter',
-        motionArgs: { forward: false }},
-    { keys: ['t', 'character'], type: 'motion',
-        motion: 'moveTillCharacter',
-        motionArgs: { forward: true, inclusive: true }},
-    { keys: ['T', 'character'], type: 'motion',
-        motion: 'moveTillCharacter',
-        motionArgs: { forward: false }},
-    { keys: [';'], type: 'motion', motion: 'repeatLastCharacterSearch',
-        motionArgs: { forward: true }},
-    { keys: [','], type: 'motion', motion: 'repeatLastCharacterSearch',
-        motionArgs: { forward: false }},
-    { keys: ['\'', 'character'], type: 'motion', motion: 'goToMark',
-        motionArgs: {toJumplist: true, linewise: true}},
-    { keys: ['`', 'character'], type: 'motion', motion: 'goToMark',
-        motionArgs: {toJumplist: true}},
-    { keys: [']', '`'], type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true } },
-    { keys: ['[', '`'], type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false } },
-    { keys: [']', '\''], type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true, linewise: true } },
-    { keys: ['[', '\''], type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false, linewise: true } },
+    { keys: 'H', type: 'motion', motion: 'moveToTopLine', motionArgs: { linewise: true, toJumplist: true }},
+    { keys: 'M', type: 'motion', motion: 'moveToMiddleLine', motionArgs: { linewise: true, toJumplist: true }},
+    { keys: 'L', type: 'motion', motion: 'moveToBottomLine', motionArgs: { linewise: true, toJumplist: true }},
+    { keys: 'h', type: 'motion', motion: 'moveByCharacters', motionArgs: { forward: false }},
+    { keys: 'l', type: 'motion', motion: 'moveByCharacters', motionArgs: { forward: true }},
+    { keys: 'j', type: 'motion', motion: 'moveByLines', motionArgs: { forward: true, linewise: true }},
+    { keys: 'k', type: 'motion', motion: 'moveByLines', motionArgs: { forward: false, linewise: true }},
+    { keys: 'gj', type: 'motion', motion: 'moveByDisplayLines', motionArgs: { forward: true }},
+    { keys: 'gk', type: 'motion', motion: 'moveByDisplayLines', motionArgs: { forward: false }},
+    { keys: 'w', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: false }},
+    { keys: 'W', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: false, bigWord: true }},
+    { keys: 'e', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: true, inclusive: true }},
+    { keys: 'E', type: 'motion', motion: 'moveByWords', motionArgs: { forward: true, wordEnd: true, bigWord: true, inclusive: true }},
+    { keys: 'b', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false }},
+    { keys: 'B', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false, bigWord: true }},
+    { keys: 'ge', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: true, inclusive: true }},
+    { keys: 'gE', type: 'motion', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: true, bigWord: true, inclusive: true }},
+    { keys: '{', type: 'motion', motion: 'moveByParagraph', motionArgs: { forward: false, toJumplist: true }},
+    { keys: '}', type: 'motion', motion: 'moveByParagraph', motionArgs: { forward: true, toJumplist: true }},
+    { keys: '<C-f>', type: 'motion', motion: 'moveByPage', motionArgs: { forward: true }},
+    { keys: '<C-b>', type: 'motion', motion: 'moveByPage', motionArgs: { forward: false }},
+    { keys: '<C-d>', type: 'motion', motion: 'moveByScroll', motionArgs: { forward: true, explicitRepeat: true }},
+    { keys: '<C-u>', type: 'motion', motion: 'moveByScroll', motionArgs: { forward: false, explicitRepeat: true }},
+    { keys: 'gg', type: 'motion', motion: 'moveToLineOrEdgeOfDocument', motionArgs: { forward: false, explicitRepeat: true, linewise: true, toJumplist: true }},
+    { keys: 'G', type: 'motion', motion: 'moveToLineOrEdgeOfDocument', motionArgs: { forward: true, explicitRepeat: true, linewise: true, toJumplist: true }},
+    { keys: '0', type: 'motion', motion: 'moveToStartOfLine' },
+    { keys: '^', type: 'motion', motion: 'moveToFirstNonWhiteSpaceCharacter' },
+    { keys: '+', type: 'motion', motion: 'moveByLines', motionArgs: { forward: true, toFirstChar:true }},
+    { keys: '-', type: 'motion', motion: 'moveByLines', motionArgs: { forward: false, toFirstChar:true }},
+    { keys: '_', type: 'motion', motion: 'moveByLines', motionArgs: { forward: true, toFirstChar:true, repeatOffset:-1 }},
+    { keys: '$', type: 'motion', motion: 'moveToEol', motionArgs: { inclusive: true }},
+    { keys: '%', type: 'motion', motion: 'moveToMatchedSymbol', motionArgs: { inclusive: true, toJumplist: true }},
+    { keys: 'f<character>', type: 'motion', motion: 'moveToCharacter', motionArgs: { forward: true , inclusive: true }},
+    { keys: 'F<character>', type: 'motion', motion: 'moveToCharacter', motionArgs: { forward: false }},
+    { keys: 't<character>', type: 'motion', motion: 'moveTillCharacter', motionArgs: { forward: true, inclusive: true }},
+    { keys: 'T<character>', type: 'motion', motion: 'moveTillCharacter', motionArgs: { forward: false }},
+    { keys: ';', type: 'motion', motion: 'repeatLastCharacterSearch', motionArgs: { forward: true }},
+    { keys: ',', type: 'motion', motion: 'repeatLastCharacterSearch', motionArgs: { forward: false }},
+    { keys: '\'<character>', type: 'motion', motion: 'goToMark', motionArgs: {toJumplist: true, linewise: true}},
+    { keys: '`<character>', type: 'motion', motion: 'goToMark', motionArgs: {toJumplist: true}},
+    { keys: ']`', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true } },
+    { keys: '[`', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false } },
+    { keys: ']\'', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: true, linewise: true } },
+    { keys: '[\'', type: 'motion', motion: 'jumpToMark', motionArgs: { forward: false, linewise: true } },
     // the next two aren't motions but must come before more general motion declarations
-    { keys: [']', 'p'], type: 'action', action: 'paste', isEdit: true,
-        actionArgs: { after: true, isEdit: true, matchIndent: true}},
-    { keys: ['[', 'p'], type: 'action', action: 'paste', isEdit: true,
-        actionArgs: { after: false, isEdit: true, matchIndent: true}},
-    { keys: [']', 'character'], type: 'motion',
-        motion: 'moveToSymbol',
-        motionArgs: { forward: true, toJumplist: true}},
-    { keys: ['[', 'character'], type: 'motion',
-        motion: 'moveToSymbol',
-        motionArgs: { forward: false, toJumplist: true}},
-    { keys: ['|'], type: 'motion',
-        motion: 'moveToColumn',
-        motionArgs: { }},
-    { keys: ['o'], type: 'motion', motion: 'moveToOtherHighlightedEnd', motionArgs: { },context:'visual'},
+    { keys: ']p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: true, isEdit: true, matchIndent: true}},
+    { keys: '[p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: false, isEdit: true, matchIndent: true}},
+    { keys: ']<character>', type: 'motion', motion: 'moveToSymbol', motionArgs: { forward: true, toJumplist: true}},
+    { keys: '[<character>', type: 'motion', motion: 'moveToSymbol', motionArgs: { forward: false, toJumplist: true}},
+    { keys: '|', type: 'motion', motion: 'moveToColumn'},
+    { keys: 'o', type: 'motion', motion: 'moveToOtherHighlightedEnd', context:'visual'},
+    { keys: 'O', type: 'motion', motion: 'moveToOtherHighlightedEnd', motionArgs: {sameLine: true}, context:'visual'},
     // Operators
-    { keys: ['d'], type: 'operator', operator: 'delete' },
-    { keys: ['y'], type: 'operator', operator: 'yank' },
-    { keys: ['c'], type: 'operator', operator: 'change' },
-    { keys: ['>'], type: 'operator', operator: 'indent',
-        operatorArgs: { indentRight: true }},
-    { keys: ['<'], type: 'operator', operator: 'indent',
-        operatorArgs: { indentRight: false }},
-    { keys: ['g', '~'], type: 'operator', operator: 'swapcase' },
-    { keys: ['n'], type: 'motion', motion: 'findNext',
-        motionArgs: { forward: true, toJumplist: true }},
-    { keys: ['N'], type: 'motion', motion: 'findNext',
-        motionArgs: { forward: false, toJumplist: true }},
+    { keys: 'd', type: 'operator', operator: 'delete' },
+    { keys: 'y', type: 'operator', operator: 'yank' },
+    { keys: 'c', type: 'operator', operator: 'change' },
+    { keys: '>', type: 'operator', operator: 'indent', operatorArgs: { indentRight: true }},
+    { keys: '<', type: 'operator', operator: 'indent', operatorArgs: { indentRight: false }},
+    { keys: 'g~', type: 'operator', operator: 'changeCase' },
+    { keys: 'gu', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: true}, isEdit: true },
+    { keys: 'gU', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: false}, isEdit: true },
+    { keys: 'n', type: 'motion', motion: 'findNext', motionArgs: { forward: true, toJumplist: true }},
+    { keys: 'N', type: 'motion', motion: 'findNext', motionArgs: { forward: false, toJumplist: true }},
     // Operator-Motion dual commands
-    { keys: ['x'], type: 'operatorMotion', operator: 'delete',
-        motion: 'moveByCharacters', motionArgs: { forward: true },
-        operatorMotionArgs: { visualLine: false }},
-    { keys: ['X'], type: 'operatorMotion', operator: 'delete',
-        motion: 'moveByCharacters', motionArgs: { forward: false },
-        operatorMotionArgs: { visualLine: true }},
-    { keys: ['D'], type: 'operatorMotion', operator: 'delete',
-      motion: 'moveToEol', motionArgs: { inclusive: true },
-        operatorMotionArgs: { visualLine: true }},
-    { keys: ['Y'], type: 'operatorMotion', operator: 'yank',
-        motion: 'moveToEol', motionArgs: { inclusive: true },
-        operatorMotionArgs: { visualLine: true }},
-    { keys: ['C'], type: 'operatorMotion',
-        operator: 'change',
-        motion: 'moveToEol', motionArgs: { inclusive: true },
-        operatorMotionArgs: { visualLine: true }},
-    { keys: ['~'], type: 'operatorMotion',
-        operator: 'swapcase', operatorArgs: { shouldMoveCursor: true },
-        motion: 'moveByCharacters', motionArgs: { forward: true }},
+    { keys: 'x', type: 'operatorMotion', operator: 'delete', motion: 'moveByCharacters', motionArgs: { forward: true }, operatorMotionArgs: { visualLine: false }},
+    { keys: 'X', type: 'operatorMotion', operator: 'delete', motion: 'moveByCharacters', motionArgs: { forward: false }, operatorMotionArgs: { visualLine: true }},
+    { keys: 'D', type: 'operatorMotion', operator: 'delete', motion: 'moveToEol', motionArgs: { inclusive: true }, context: 'normal'},
+    { keys: 'D', type: 'operator', operator: 'delete', operatorArgs: { linewise: true }, context: 'visual'},
+    { keys: 'Y', type: 'operatorMotion', operator: 'yank', motion: 'moveToEol', motionArgs: { inclusive: true }, context: 'normal'},
+    { keys: 'Y', type: 'operator', operator: 'yank', operatorArgs: { linewise: true }, context: 'visual'},
+    { keys: 'C', type: 'operatorMotion', operator: 'change', motion: 'moveToEol', motionArgs: { inclusive: true }, context: 'normal'},
+    { keys: 'C', type: 'operator', operator: 'change', operatorArgs: { linewise: true }, context: 'visual'},
+    { keys: '~', type: 'operatorMotion', operator: 'changeCase', motion: 'moveByCharacters', motionArgs: { forward: true }, operatorArgs: { shouldMoveCursor: true }, context: 'normal'},
+    { keys: '~', type: 'operator', operator: 'changeCase', context: 'visual'},
+    { keys: '<C-w>', type: 'operatorMotion', operator: 'delete', motion: 'moveByWords', motionArgs: { forward: false, wordEnd: false }, context: 'insert' },
     // Actions
-    { keys: ['<C-i>'], type: 'action', action: 'jumpListWalk',
-        actionArgs: { forward: true }},
-    { keys: ['<C-o>'], type: 'action', action: 'jumpListWalk',
-        actionArgs: { forward: false }},
-    { keys: ['<C-e>'], type: 'action',
-        action: 'scroll',
-        actionArgs: { forward: true, linewise: true }},
-    { keys: ['<C-y>'], type: 'action',
-        action: 'scroll',
-        actionArgs: { forward: false, linewise: true }},
-    { keys: ['a'], type: 'action', action: 'enterInsertMode', isEdit: true,
-        actionArgs: { insertAt: 'charAfter' }},
-    { keys: ['A'], type: 'action', action: 'enterInsertMode', isEdit: true,
-        actionArgs: { insertAt: 'eol' }},
-    { keys: ['i'], type: 'action', action: 'enterInsertMode', isEdit: true,
-        actionArgs: { insertAt: 'inplace' }},
-    { keys: ['I'], type: 'action', action: 'enterInsertMode', isEdit: true,
-        actionArgs: { insertAt: 'firstNonBlank' }},
-    { keys: ['o'], type: 'action', action: 'newLineAndEnterInsertMode',
-        isEdit: true, interlaceInsertRepeat: true,
-        actionArgs: { after: true }},
-    { keys: ['O'], type: 'action', action: 'newLineAndEnterInsertMode',
-        isEdit: true, interlaceInsertRepeat: true,
-        actionArgs: { after: false }},
-    { keys: ['v'], type: 'action', action: 'toggleVisualMode' },
-    { keys: ['V'], type: 'action', action: 'toggleVisualMode',
-        actionArgs: { linewise: true }},
-    { keys: ['g', 'v'], type: 'action', action: 'reselectLastSelection' },
-    { keys: ['J'], type: 'action', action: 'joinLines', isEdit: true },
-    { keys: ['p'], type: 'action', action: 'paste', isEdit: true,
-        actionArgs: { after: true, isEdit: true }},
-    { keys: ['P'], type: 'action', action: 'paste', isEdit: true,
-        actionArgs: { after: false, isEdit: true }},
-    { keys: ['r', 'character'], type: 'action', action: 'replace', isEdit: true },
-    { keys: ['@', 'character'], type: 'action', action: 'replayMacro' },
-    { keys: ['q', 'character'], type: 'action', action: 'enterMacroRecordMode' },
+    { keys: '<C-i>', type: 'action', action: 'jumpListWalk', actionArgs: { forward: true }},
+    { keys: '<C-o>', type: 'action', action: 'jumpListWalk', actionArgs: { forward: false }},
+    { keys: '<C-e>', type: 'action', action: 'scroll', actionArgs: { forward: true, linewise: true }},
+    { keys: '<C-y>', type: 'action', action: 'scroll', actionArgs: { forward: false, linewise: true }},
+    { keys: 'a', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'charAfter' }, context: 'normal' },
+    { keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'eol' }, context: 'normal' },
+    { keys: 'A', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'endOfSelectedArea' }, context: 'visual' },
+    { keys: 'i', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'inplace' }, context: 'normal' },
+    { keys: 'I', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'firstNonBlank'}, context: 'normal' },
+    { keys: 'I', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { insertAt: 'startOfSelectedArea' }, context: 'visual' },
+    { keys: 'o', type: 'action', action: 'newLineAndEnterInsertMode', isEdit: true, interlaceInsertRepeat: true, actionArgs: { after: true }, context: 'normal' },
+    { keys: 'O', type: 'action', action: 'newLineAndEnterInsertMode', isEdit: true, interlaceInsertRepeat: true, actionArgs: { after: false }, context: 'normal' },
+    { keys: 'v', type: 'action', action: 'toggleVisualMode' },
+    { keys: 'V', type: 'action', action: 'toggleVisualMode', actionArgs: { linewise: true }},
+    { keys: '<C-v>', type: 'action', action: 'toggleVisualMode', actionArgs: { blockwise: true }},
+    { keys: '<C-q>', type: 'action', action: 'toggleVisualMode', actionArgs: { blockwise: true }},
+    { keys: 'gv', type: 'action', action: 'reselectLastSelection' },
+    { keys: 'J', type: 'action', action: 'joinLines', isEdit: true },
+    { keys: 'p', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: true, isEdit: true }},
+    { keys: 'P', type: 'action', action: 'paste', isEdit: true, actionArgs: { after: false, isEdit: true }},
+    { keys: 'r<character>', type: 'action', action: 'replace', isEdit: true },
+    { keys: '@<character>', type: 'action', action: 'replayMacro' },
+    { keys: 'q<character>', type: 'action', action: 'enterMacroRecordMode' },
     // Handle Replace-mode as a special case of insert mode.
-    { keys: ['R'], type: 'action', action: 'enterInsertMode', isEdit: true,
-        actionArgs: { replace: true }},
-    { keys: ['u'], type: 'action', action: 'undo' },
-    { keys: ['u'], type: 'action', action: 'changeCase', actionArgs: {toLower: true}, context: 'visual', isEdit: true },
-    { keys: ['U'],type: 'action', action: 'changeCase', actionArgs: {toLower: false}, context: 'visual', isEdit: true },
-    { keys: ['<C-r>'], type: 'action', action: 'redo' },
-    { keys: ['m', 'character'], type: 'action', action: 'setMark' },
-    { keys: ['"', 'character'], type: 'action', action: 'setRegister' },
-    { keys: ['z', 'z'], type: 'action', action: 'scrollToCursor',
-        actionArgs: { position: 'center' }},
-    { keys: ['z', '.'], type: 'action', action: 'scrollToCursor',
-        actionArgs: { position: 'center' },
-        motion: 'moveToFirstNonWhiteSpaceCharacter' },
-    { keys: ['z', 't'], type: 'action', action: 'scrollToCursor',
-        actionArgs: { position: 'top' }},
-    { keys: ['z', '<CR>'], type: 'action', action: 'scrollToCursor',
-        actionArgs: { position: 'top' },
-        motion: 'moveToFirstNonWhiteSpaceCharacter' },
-    { keys: ['z', '-'], type: 'action', action: 'scrollToCursor',
-        actionArgs: { position: 'bottom' }},
-    { keys: ['z', 'b'], type: 'action', action: 'scrollToCursor',
-        actionArgs: { position: 'bottom' },
-        motion: 'moveToFirstNonWhiteSpaceCharacter' },
-    { keys: ['.'], type: 'action', action: 'repeatLastEdit' },
-    { keys: ['<C-a>'], type: 'action', action: 'incrementNumberToken',
-        isEdit: true,
-        actionArgs: {increase: true, backtrack: false}},
-    { keys: ['<C-x>'], type: 'action', action: 'incrementNumberToken',
-        isEdit: true,
-        actionArgs: {increase: false, backtrack: false}},
+    { keys: 'R', type: 'action', action: 'enterInsertMode', isEdit: true, actionArgs: { replace: true }},
+    { keys: 'u', type: 'action', action: 'undo', context: 'normal' },
+    { keys: 'u', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: true}, context: 'visual', isEdit: true },
+    { keys: 'U', type: 'operator', operator: 'changeCase', operatorArgs: {toLower: false}, context: 'visual', isEdit: true },
+    { keys: '<C-r>', type: 'action', action: 'redo' },
+    { keys: 'm<character>', type: 'action', action: 'setMark' },
+    { keys: '"<character>', type: 'action', action: 'setRegister' },
+    { keys: 'zz', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'center' }},
+    { keys: 'z.', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'center' }, motion: 'moveToFirstNonWhiteSpaceCharacter' },
+    { keys: 'zt', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'top' }},
+    { keys: 'z<CR>', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'top' }, motion: 'moveToFirstNonWhiteSpaceCharacter' },
+    { keys: 'z-', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'bottom' }},
+    { keys: 'zb', type: 'action', action: 'scrollToCursor', actionArgs: { position: 'bottom' }, motion: 'moveToFirstNonWhiteSpaceCharacter' },
+    { keys: '.', type: 'action', action: 'repeatLastEdit' },
+    { keys: '<C-a>', type: 'action', action: 'incrementNumberToken', isEdit: true, actionArgs: {increase: true, backtrack: false}},
+    { keys: '<C-x>', type: 'action', action: 'incrementNumberToken', isEdit: true, actionArgs: {increase: false, backtrack: false}},
     // Text object motions
-    { keys: ['a', 'character'], type: 'motion',
-        motion: 'textObjectManipulation' },
-    { keys: ['i', 'character'], type: 'motion',
-        motion: 'textObjectManipulation',
-        motionArgs: { textObjectInner: true }},
+    { keys: 'a<character>', type: 'motion', motion: 'textObjectManipulation' },
+    { keys: 'i<character>', type: 'motion', motion: 'textObjectManipulation', motionArgs: { textObjectInner: true }},
     // Search
-    { keys: ['/'], type: 'search',
-        searchArgs: { forward: true, querySrc: 'prompt', toJumplist: true }},
-    { keys: ['?'], type: 'search',
-        searchArgs: { forward: false, querySrc: 'prompt', toJumplist: true }},
-    { keys: ['*'], type: 'search',
-        searchArgs: { forward: true, querySrc: 'wordUnderCursor', wholeWordOnly: true, toJumplist: true }},
-    { keys: ['#'], type: 'search',
-        searchArgs: { forward: false, querySrc: 'wordUnderCursor', wholeWordOnly: true, toJumplist: true }},
-    { keys: ['g', '*'], type: 'search', searchArgs: { forward: true, querySrc: 'wordUnderCursor', toJumplist: true }},
-    { keys: ['g', '#'], type: 'search', searchArgs: { forward: false, querySrc: 'wordUnderCursor', toJumplist: true }},
+    { keys: '/', type: 'search', searchArgs: { forward: true, querySrc: 'prompt', toJumplist: true }},
+    { keys: '?', type: 'search', searchArgs: { forward: false, querySrc: 'prompt', toJumplist: true }},
+    { keys: '*', type: 'search', searchArgs: { forward: true, querySrc: 'wordUnderCursor', wholeWordOnly: true, toJumplist: true }},
+    { keys: '#', type: 'search', searchArgs: { forward: false, querySrc: 'wordUnderCursor', wholeWordOnly: true, toJumplist: true }},
+    { keys: 'g*', type: 'search', searchArgs: { forward: true, querySrc: 'wordUnderCursor', toJumplist: true }},
+    { keys: 'g#', type: 'search', searchArgs: { forward: false, querySrc: 'wordUnderCursor', toJumplist: true }},
     // Ex command
-    { keys: [':'], type: 'ex' }
+    { keys: ':', type: 'ex' }
+  ];
+
+  /**
+   * Ex commands
+   * Care must be taken when adding to the default Ex command map. For any
+   * pair of commands that have a shared prefix, at least one of their
+   * shortNames must not match the prefix of the other command.
+   */
+  var defaultExCommandMap = [
+    { name: 'colorscheme', shortName: 'colo' },
+    { name: 'map' },
+    { name: 'imap', shortName: 'im' },
+    { name: 'nmap', shortName: 'nm' },
+    { name: 'vmap', shortName: 'vm' },
+    { name: 'unmap' },
+    { name: 'write', shortName: 'w' },
+    { name: 'undo', shortName: 'u' },
+    { name: 'redo', shortName: 'red' },
+    { name: 'set', shortName: 'se' },
+    { name: 'set', shortName: 'se' },
+    { name: 'setlocal', shortName: 'setl' },
+    { name: 'setglobal', shortName: 'setg' },
+    { name: 'sort', shortName: 'sor' },
+    { name: 'substitute', shortName: 's', possiblyAsync: true },
+    { name: 'nohlsearch', shortName: 'noh' },
+    { name: 'delmarks', shortName: 'delm' },
+    { name: 'registers', shortName: 'reg', excludeFromCommandHistory: true },
+    { name: 'global', shortName: 'g' }
   ];
 
   var Pos = CodeMirror.Pos;
 
   var Vim = function() {
-    CodeMirror.defineOption('vimMode', false, function(cm, val) {
-      if (val) {
-        cm.setOption('keyMap', 'vim');
-        cm.setOption('disableInput', true);
-        CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
-        cm.on('beforeSelectionChange', beforeSelectionChange);
-        cm.on('cursorActivity', onCursorActivity);
-        maybeInitVimState(cm);
-        CodeMirror.on(cm.getInputField(), 'paste', getOnPasteFn(cm));
-      } else if (cm.state.vim) {
-        cm.setOption('keyMap', 'default');
-        cm.setOption('disableInput', false);
-        cm.off('beforeSelectionChange', beforeSelectionChange);
-        cm.off('cursorActivity', onCursorActivity);
-        CodeMirror.off(cm.getInputField(), 'paste', getOnPasteFn(cm));
-        cm.state.vim = null;
-      }
-    });
-    function beforeSelectionChange(cm, obj) {
-      var vim = cm.state.vim;
-      if (vim.insertMode || vim.exMode) return;
-
-      var head = obj.ranges[0].head;
-      var anchor = obj.ranges[0].anchor;
-      if (head.ch && head.ch == cm.doc.getLine(head.line).length) {
-        var pos = Pos(head.line, head.ch - 1);
-        obj.update([{anchor: cursorEqual(head, anchor) ? pos : anchor,
-                     head: pos}]);
-      }
+    function enterVimMode(cm) {
+      cm.setOption('disableInput', true);
+      cm.setOption('showCursorWhenSelecting', false);
+      CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
+      cm.on('cursorActivity', onCursorActivity);
+      maybeInitVimState(cm);
+      CodeMirror.on(cm.getInputField(), 'paste', getOnPasteFn(cm));
     }
+
+    function leaveVimMode(cm) {
+      cm.setOption('disableInput', false);
+      cm.off('cursorActivity', onCursorActivity);
+      CodeMirror.off(cm.getInputField(), 'paste', getOnPasteFn(cm));
+      cm.state.vim = null;
+    }
+
+    function detachVimMap(cm, next) {
+      if (this == CodeMirror.keyMap.vim)
+        CodeMirror.rmClass(cm.getWrapperElement(), "cm-fat-cursor");
+
+      if (!next || next.attach != attachVimMap)
+        leaveVimMode(cm, false);
+    }
+    function attachVimMap(cm, prev) {
+      if (this == CodeMirror.keyMap.vim)
+        CodeMirror.addClass(cm.getWrapperElement(), "cm-fat-cursor");
+
+      if (!prev || prev.attach != attachVimMap)
+        enterVimMode(cm);
+    }
+
+    // Deprecated, simply setting the keymap works again.
+    CodeMirror.defineOption('vimMode', false, function(cm, val, prev) {
+      if (val && cm.getOption("keyMap") != "vim")
+        cm.setOption("keyMap", "vim");
+      else if (!val && prev != CodeMirror.Init && /^vim/.test(cm.getOption("keyMap")))
+        cm.setOption("keyMap", "default");
+    });
+
+    function cmKey(key, cm) {
+      if (!cm) { return undefined; }
+      var vimKey = cmKeyToVimKey(key);
+      if (!vimKey) {
+        return false;
+      }
+      var cmd = CodeMirror.Vim.findKey(cm, vimKey);
+      if (typeof cmd == 'function') {
+        CodeMirror.signal(cm, 'vim-keypress', vimKey);
+      }
+      return cmd;
+    }
+
+    var modifiers = {'Shift': 'S', 'Ctrl': 'C', 'Alt': 'A', 'Cmd': 'D', 'Mod': 'A'};
+    var specialKeys = {Enter:'CR',Backspace:'BS',Delete:'Del'};
+    function cmKeyToVimKey(key) {
+      if (key.charAt(0) == '\'') {
+        // Keypress character binding of format "'a'"
+        return key.charAt(1);
+      }
+      var pieces = key.split(/-(?!$)/);
+      var lastPiece = pieces[pieces.length - 1];
+      if (pieces.length == 1 && pieces[0].length == 1) {
+        // No-modifier bindings use literal character bindings above. Skip.
+        return false;
+      } else if (pieces.length == 2 && pieces[0] == 'Shift' && lastPiece.length == 1) {
+        // Ignore Shift+char bindings as they should be handled by literal character.
+        return false;
+      }
+      var hasCharacter = false;
+      for (var i = 0; i < pieces.length; i++) {
+        var piece = pieces[i];
+        if (piece in modifiers) { pieces[i] = modifiers[piece]; }
+        else { hasCharacter = true; }
+        if (piece in specialKeys) { pieces[i] = specialKeys[piece]; }
+      }
+      if (!hasCharacter) {
+        // Vim does not support modifier only keys.
+        return false;
+      }
+      // TODO: Current bindings expect the character to be lower case, but
+      // it looks like vim key notation uses upper case.
+      if (isUpperCase(lastPiece)) {
+        pieces[pieces.length - 1] = lastPiece.toLowerCase();
+      }
+      return '<' + pieces.join('-') + '>';
+    }
+
     function getOnPasteFn(cm) {
       var vim = cm.state.vim;
       if (!vim.onPasteFn) {
@@ -392,7 +335,11 @@
     }
 
     var numberRegex = /[\d]/;
-    var wordRegexp = [(/\w/), (/[^\w\s]/)], bigWordRegexp = [(/\S/)];
+    var wordCharTest = [CodeMirror.isWordChar, function(ch) {
+      return ch && !CodeMirror.isWordChar(ch) && !/\s/.test(ch);
+    }], bigWordCharTest = [function(ch) {
+      return /\S/.test(ch);
+    }];
     function makeKeyRange(start, size) {
       var keys = [];
       for (var i = start; i < start + size; i++) {
@@ -403,11 +350,8 @@
     var upperCaseAlphabet = makeKeyRange(65, 26);
     var lowerCaseAlphabet = makeKeyRange(97, 26);
     var numbers = makeKeyRange(48, 10);
-    var specialSymbols = '~`!@#$%^&*()_-+=[{}]\\|/?.,<>:;"\''.split('');
-    var specialKeys = ['Left', 'Right', 'Up', 'Down', 'Space', 'Backspace',
-        'Esc', 'Home', 'End', 'PageUp', 'PageDown', 'Enter'];
     var validMarks = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['<', '>']);
-    var validRegisters = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['-', '"', '.', ':']);
+    var validRegisters = [].concat(upperCaseAlphabet, lowerCaseAlphabet, numbers, ['-', '"', '.', ':', '/']);
 
     function isLine(cm, line) {
       return line >= cm.firstLine() && line <= cm.lastLine();
@@ -437,18 +381,30 @@
     }
 
     var options = {};
-    function defineOption(name, defaultValue, type) {
-      if (defaultValue === undefined) { throw Error('defaultValue is required'); }
+    function defineOption(name, defaultValue, type, aliases, callback) {
+      if (defaultValue === undefined && !callback) {
+        throw Error('defaultValue is required unless callback is provided');
+      }
       if (!type) { type = 'string'; }
       options[name] = {
         type: type,
-        defaultValue: defaultValue
+        defaultValue: defaultValue,
+        callback: callback
       };
-      setOption(name, defaultValue);
+      if (aliases) {
+        for (var i = 0; i < aliases.length; i++) {
+          options[aliases[i]] = options[name];
+        }
+      }
+      if (defaultValue) {
+        setOption(name, defaultValue);
+      }
     }
 
-    function setOption(name, value) {
+    function setOption(name, value, cm, cfg) {
       var option = options[name];
+      cfg = cfg || {};
+      var scope = cfg.scope;
       if (!option) {
         throw Error('Unknown option: ' + name);
       }
@@ -460,17 +416,60 @@
           value = true;
         }
       }
-      option.value = option.type == 'boolean' ? !!value : value;
+      if (option.callback) {
+        if (scope !== 'local') {
+          option.callback(value, undefined);
+        }
+        if (scope !== 'global' && cm) {
+          option.callback(value, cm);
+        }
+      } else {
+        if (scope !== 'local') {
+          option.value = option.type == 'boolean' ? !!value : value;
+        }
+        if (scope !== 'global' && cm) {
+          cm.state.vim.options[name] = {value: value};
+        }
+      }
     }
 
-    function getOption(name) {
+    function getOption(name, cm, cfg) {
       var option = options[name];
+      cfg = cfg || {};
+      var scope = cfg.scope;
       if (!option) {
         throw Error('Unknown option: ' + name);
       }
-      return option.value;
+      if (option.callback) {
+        var local = cm && option.callback(undefined, cm);
+        if (scope !== 'global' && local !== undefined) {
+          return local;
+        }
+        if (scope !== 'local') {
+          return option.callback();
+        }
+        return;
+      } else {
+        var local = (scope !== 'global') && (cm && cm.state.vim.options[name]);
+        return (local || (scope !== 'local') && option || {}).value;
+      }
     }
 
+    defineOption('filetype', undefined, 'string', ['ft'], function(name, cm) {
+      // Option is local. Do nothing for global.
+      if (cm === undefined) {
+        return;
+      }
+      // The 'filetype' option proxies to the CodeMirror 'mode' option.
+      if (name === undefined) {
+        var mode = cm.getOption('mode');
+        return mode == 'null' ? '' : mode;
+      } else {
+        var mode = name == '' ? 'null' : name;
+        cm.setOption('mode', mode);
+      }
+    });
+
     var createCircularJumpList = function() {
       var size = 100;
       var pointer = -1;
@@ -567,7 +566,9 @@
     MacroModeState.prototype = {
       exitMacroRecordMode: function() {
         var macroModeState = vimGlobalState.macroModeState;
-        macroModeState.onRecordingDone(); // close dialog
+        if (macroModeState.onRecordingDone) {
+          macroModeState.onRecordingDone(); // close dialog
+        }
         macroModeState.onRecordingDone = undefined;
         macroModeState.isRecording = false;
       },
@@ -577,8 +578,10 @@
         if (register) {
           register.clear();
           this.latestRegister = registerName;
-          this.onRecordingDone = cm.openDialog(
-              '(recording)['+registerName+']', null, {bottom:true});
+          if (cm.openDialog) {
+            this.onRecordingDone = cm.openDialog(
+                '(recording)['+registerName+']', null, {bottom:true});
+          }
           this.isRecording = true;
         }
       }
@@ -607,6 +610,8 @@
           // executed in between.
           lastMotion: null,
           marks: {},
+          // Mark for rendering fake cursor for visual mode.
+          fakeCursor: null,
           insertMode: false,
           // Repeat count for changes made in insert mode, triggered by key
           // sequences like 3,i. Only exists when insertMode is true.
@@ -614,7 +619,12 @@
           visualMode: false,
           // If we are in visual line mode. No effect if visualMode is false.
           visualLine: false,
-          lastSelection: null
+          visualBlock: false,
+          lastSelection: null,
+          lastPastedText: null,
+          sel: {},
+          // Buffer-local/window-local values of vim options.
+          options: {}
         };
       }
       return cm.state.vim;
@@ -632,7 +642,11 @@
         macroModeState: new MacroModeState,
         // Recording latest f, t, F or T motion command.
         lastChararacterSearch: {increment:0, forward:true, selectedCharacter:''},
-        registerController: new RegisterController({})
+        registerController: new RegisterController({}),
+        // search history buffer
+        searchHistoryController: new HistoryController({}),
+        // ex Command history buffer
+        exCommandHistoryController : new HistoryController({})
       };
       for (var optionName in options) {
         var option = options[optionName];
@@ -640,6 +654,7 @@
       }
     }
 
+    var lastInsertModeKeyTimer;
     var vimApi= {
       buildKeyMap: function() {
         // TODO: Convert keymap into dictionary format for fast lookup.
@@ -660,79 +675,185 @@
       // Testing hook.
       maybeInitVimState_: maybeInitVimState,
 
+      suppressErrorLogging: false,
+
       InsertModeKey: InsertModeKey,
       map: function(lhs, rhs, ctx) {
         // Add user defined key bindings.
         exCommandDispatcher.map(lhs, rhs, ctx);
       },
+      unmap: function(lhs, ctx) {
+        exCommandDispatcher.unmap(lhs, ctx);
+      },
+      // TODO: Expose setOption and getOption as instance methods. Need to decide how to namespace
+      // them, or somehow make them work with the existing CodeMirror setOption/getOption API.
       setOption: setOption,
       getOption: getOption,
       defineOption: defineOption,
       defineEx: function(name, prefix, func){
-        if (name.indexOf(prefix) !== 0) {
+        if (!prefix) {
+          prefix = name;
+        } else if (name.indexOf(prefix) !== 0) {
           throw new Error('(Vim.defineEx) "'+prefix+'" is not a prefix of "'+name+'", command not registered');
         }
         exCommands[name]=func;
         exCommandDispatcher.commandMap_[prefix]={name:name, shortName:prefix, type:'api'};
       },
-      // This is the outermost function called by CodeMirror, after keys have
-      // been mapped to their Vim equivalents.
-      handleKey: function(cm, key) {
-        var command;
+      handleKey: function (cm, key, origin) {
+        var command = this.findKey(cm, key, origin);
+        if (typeof command === 'function') {
+          return command();
+        }
+      },
+      /**
+       * This is the outermost function called by CodeMirror, after keys have
+       * been mapped to their Vim equivalents.
+       *
+       * Finds a command based on the key (and cached keys if there is a
+       * multi-key sequence). Returns `undefined` if no key is matched, a noop
+       * function if a partial match is found (multi-key), and a function to
+       * execute the bound command if a a key is matched. The function always
+       * returns true.
+       */
+      findKey: function(cm, key, origin) {
         var vim = maybeInitVimState(cm);
-        var macroModeState = vimGlobalState.macroModeState;
-        if (macroModeState.isRecording) {
-          if (key == 'q') {
-            macroModeState.exitMacroRecordMode();
-            vim.inputState = new InputState();
-            return;
-          }
-        }
-        if (key == '<Esc>') {
-          // Clear input state and get back to normal mode.
-          vim.inputState = new InputState();
-          if (vim.visualMode) {
-            exitVisualMode(cm);
-          }
-          return;
-        }
-        // Enter visual mode when the mouse selects text.
-        if (!vim.visualMode &&
-            !cursorEqual(cm.getCursor('head'), cm.getCursor('anchor'))) {
-          vim.visualMode = true;
-          vim.visualLine = false;
-          CodeMirror.signal(cm, "vim-mode-change", {mode: "visual"});
-          cm.on('mousedown', exitVisualMode);
-        }
-        if (key != '0' || (key == '0' && vim.inputState.getRepeat() === 0)) {
-          // Have to special case 0 since it's both a motion and a number.
-          command = commandDispatcher.matchCommand(key, defaultKeymap, vim);
-        }
-        if (!command) {
-          if (isNumber(key)) {
-            // Increment count unless count is 0 and key is 0.
-            vim.inputState.pushRepeatDigit(key);
-          }
+        function handleMacroRecording() {
+          var macroModeState = vimGlobalState.macroModeState;
           if (macroModeState.isRecording) {
-            logKey(macroModeState, key);
+            if (key == 'q') {
+              macroModeState.exitMacroRecordMode();
+              clearInputState(cm);
+              return true;
+            }
+            if (origin != 'mapping') {
+              logKey(macroModeState, key);
+            }
           }
-          return;
         }
-        if (command.type == 'keyToKey') {
+        function handleEsc() {
+          if (key == '<Esc>') {
+            // Clear input state and get back to normal mode.
+            clearInputState(cm);
+            if (vim.visualMode) {
+              exitVisualMode(cm);
+            } else if (vim.insertMode) {
+              exitInsertMode(cm);
+            }
+            return true;
+          }
+        }
+        function doKeyToKey(keys) {
           // TODO: prevent infinite recursion.
-          for (var i = 0; i < command.toKeys.length; i++) {
-            this.handleKey(cm, command.toKeys[i]);
+          var match;
+          while (keys) {
+            // Pull off one command key, which is either a single character
+            // or a special sequence wrapped in '<' and '>', e.g. '<Space>'.
+            match = (/<\w+-.+?>|<\w+>|./).exec(keys);
+            key = match[0];
+            keys = keys.substring(match.index + key.length);
+            CodeMirror.Vim.handleKey(cm, key, 'mapping');
           }
+        }
+
+        function handleKeyInsertMode() {
+          if (handleEsc()) { return true; }
+          var keys = vim.inputState.keyBuffer = vim.inputState.keyBuffer + key;
+          var keysAreChars = key.length == 1;
+          var match = commandDispatcher.matchCommand(keys, defaultKeymap, vim.inputState, 'insert');
+          // Need to check all key substrings in insert mode.
+          while (keys.length > 1 && match.type != 'full') {
+            var keys = vim.inputState.keyBuffer = keys.slice(1);
+            var thisMatch = commandDispatcher.matchCommand(keys, defaultKeymap, vim.inputState, 'insert');
+            if (thisMatch.type != 'none') { match = thisMatch; }
+          }
+          if (match.type == 'none') { clearInputState(cm); return false; }
+          else if (match.type == 'partial') {
+            if (lastInsertModeKeyTimer) { window.clearTimeout(lastInsertModeKeyTimer); }
+            lastInsertModeKeyTimer = window.setTimeout(
+              function() { if (vim.insertMode && vim.inputState.keyBuffer) { clearInputState(cm); } },
+              getOption('insertModeEscKeysTimeout'));
+            return !keysAreChars;
+          }
+
+          if (lastInsertModeKeyTimer) { window.clearTimeout(lastInsertModeKeyTimer); }
+          if (keysAreChars) {
+            var here = cm.getCursor();
+            cm.replaceRange('', offsetCursor(here, 0, -(keys.length - 1)), here, '+input');
+          }
+          clearInputState(cm);
+          return match.command;
+        }
+
+        function handleKeyNonInsertMode() {
+          if (handleMacroRecording() || handleEsc()) { return true; };
+
+          var keys = vim.inputState.keyBuffer = vim.inputState.keyBuffer + key;
+          if (/^[1-9]\d*$/.test(keys)) { return true; }
+
+          var keysMatcher = /^(\d*)(.*)$/.exec(keys);
+          if (!keysMatcher) { clearInputState(cm); return false; }
+          var context = vim.visualMode ? 'visual' :
+                                         'normal';
+          var match = commandDispatcher.matchCommand(keysMatcher[2] || keysMatcher[1], defaultKeymap, vim.inputState, context);
+          if (match.type == 'none') { clearInputState(cm); return false; }
+          else if (match.type == 'partial') { return true; }
+
+          vim.inputState.keyBuffer = '';
+          var keysMatcher = /^(\d*)(.*)$/.exec(keys);
+          if (keysMatcher[1] && keysMatcher[1] != '0') {
+            vim.inputState.pushRepeatDigit(keysMatcher[1]);
+          }
+          return match.command;
+        }
+
+        var command;
+        if (vim.insertMode) { command = handleKeyInsertMode(); }
+        else { command = handleKeyNonInsertMode(); }
+        if (command === false) {
+          return undefined;
+        } else if (command === true) {
+          // TODO: Look into using CodeMirror's multi-key handling.
+          // Return no-op since we are caching the key. Counts as handled, but
+          // don't want act on it just yet.
+          return function() {};
         } else {
-          if (macroModeState.isRecording) {
-            logKey(macroModeState, key);
-          }
-          commandDispatcher.processCommand(cm, vim, command);
+          return function() {
+            return cm.operation(function() {
+              cm.curOp.isVimOp = true;
+              try {
+                if (command.type == 'keyToKey') {
+                  doKeyToKey(command.toKeys);
+                } else {
+                  commandDispatcher.processCommand(cm, vim, command);
+                }
+              } catch (e) {
+                // clear VIM state in case it's in a bad state.
+                cm.state.vim = undefined;
+                maybeInitVimState(cm);
+                if (!CodeMirror.Vim.suppressErrorLogging) {
+                  console['log'](e);
+                }
+                throw e;
+              }
+              return true;
+            });
+          };
         }
       },
       handleEx: function(cm, input) {
         exCommandDispatcher.processCommand(cm, input);
-      }
+      },
+
+      defineMotion: defineMotion,
+      defineAction: defineAction,
+      defineOperator: defineOperator,
+      mapCommand: mapCommand,
+      _mapCommand: _mapCommand,
+
+      defineRegister: defineRegister,
+
+      exitVisualMode: exitVisualMode,
+      exitInsertMode: exitInsertMode
     };
 
     // Represents the current input state.
@@ -768,23 +889,30 @@
       return repeat;
     };
 
+    function clearInputState(cm, reason) {
+      cm.state.vim.inputState = new InputState();
+      CodeMirror.signal(cm, 'vim-command-done', reason);
+    }
+
     /*
      * Register stores information about copy and paste registers.  Besides
      * text, a register must store whether it is linewise (i.e., when it is
      * pasted, should it insert itself into a new line, or should the text be
      * inserted at the cursor position.)
      */
-    function Register(text, linewise) {
+    function Register(text, linewise, blockwise) {
       this.clear();
       this.keyBuffer = [text || ''];
       this.insertModeChanges = [];
       this.searchQueries = [];
       this.linewise = !!linewise;
+      this.blockwise = !!blockwise;
     }
     Register.prototype = {
-      setText: function(text, linewise) {
+      setText: function(text, linewise, blockwise) {
         this.keyBuffer = [text || ''];
         this.linewise = !!linewise;
+        this.blockwise = !!blockwise;
       },
       pushText: function(text, linewise) {
         // if this register has ever been set to linewise, use linewise.
@@ -813,6 +941,25 @@
       }
     };
 
+    /**
+     * Defines an external register.
+     *
+     * The name should be a single character that will be used to reference the register.
+     * The register should support setText, pushText, clear, and toString(). See Register
+     * for a reference implementation.
+     */
+    function defineRegister(name, register) {
+      var registers = vimGlobalState.registerController.registers[name];
+      if (!name || name.length != 1) {
+        throw Error('Register name must be 1 character');
+      }
+      if (registers[name]) {
+        throw Error('Register already defined ' + name);
+      }
+      registers[name] = register;
+      validRegisters.push(name);
+    }
+
     /*
      * vim registers allow you to keep many independent copy and paste buffers.
      * See http://usevim.com/2012/04/13/registers/ for an introduction.
@@ -826,9 +973,10 @@
       this.unnamedRegister = registers['"'] = new Register();
       registers['.'] = new Register();
       registers[':'] = new Register();
+      registers['/'] = new Register();
     }
     RegisterController.prototype = {
-      pushText: function(registerName, operator, text, linewise) {
+      pushText: function(registerName, operator, text, linewise, blockwise) {
         if (linewise && text.charAt(0) == '\n') {
           text = text.slice(1) + '\n';
         }
@@ -845,7 +993,7 @@
           switch (operator) {
             case 'yank':
               // The 0 register contains the text from the most recent yank.
-              this.registers['0'] = new Register(text, linewise);
+              this.registers['0'] = new Register(text, linewise, blockwise);
               break;
             case 'delete':
             case 'change':
@@ -861,7 +1009,7 @@
               break;
           }
           // Make sure the unnamed register is set to what just happened
-          this.unnamedRegister.setText(text, linewise);
+          this.unnamedRegister.setText(text, linewise, blockwise);
           return;
         }
 
@@ -870,7 +1018,7 @@
         if (append) {
           register.pushText(text, linewise);
         } else {
-          register.setText(text, linewise);
+          register.setText(text, linewise, blockwise);
         }
         // The unnamed register always has the same value as the last used
         // register.
@@ -897,85 +1045,65 @@
         }
       }
     };
-
+    function HistoryController() {
+        this.historyBuffer = [];
+        this.iterator;
+        this.initialPrefix = null;
+    }
+    HistoryController.prototype = {
+      // the input argument here acts a user entered prefix for a small time
+      // until we start autocompletion in which case it is the autocompleted.
+      nextMatch: function (input, up) {
+        var historyBuffer = this.historyBuffer;
+        var dir = up ? -1 : 1;
+        if (this.initialPrefix === null) this.initialPrefix = input;
+        for (var i = this.iterator + dir; up ? i >= 0 : i < historyBuffer.length; i+= dir) {
+          var element = historyBuffer[i];
+          for (var j = 0; j <= element.length; j++) {
+            if (this.initialPrefix == element.substring(0, j)) {
+              this.iterator = i;
+              return element;
+            }
+          }
+        }
+        // should return the user input in case we reach the end of buffer.
+        if (i >= historyBuffer.length) {
+          this.iterator = historyBuffer.length;
+          return this.initialPrefix;
+        }
+        // return the last autocompleted query or exCommand as it is.
+        if (i < 0 ) return input;
+      },
+      pushInput: function(input) {
+        var index = this.historyBuffer.indexOf(input);
+        if (index > -1) this.historyBuffer.splice(index, 1);
+        if (input.length) this.historyBuffer.push(input);
+      },
+      reset: function() {
+        this.initialPrefix = null;
+        this.iterator = this.historyBuffer.length;
+      }
+    };
     var commandDispatcher = {
-      matchCommand: function(key, keyMap, vim) {
-        var inputState = vim.inputState;
-        var keys = inputState.keyBuffer.concat(key);
-        var matchedCommands = [];
-        var selectedCharacter;
-        for (var i = 0; i < keyMap.length; i++) {
-          var command = keyMap[i];
-          if (matchKeysPartial(keys, command.keys)) {
-            if (inputState.operator && command.type == 'action') {
-              // Ignore matched action commands after an operator. Operators
-              // only operate on motions. This check is really for text
-              // objects since aW, a[ etcs conflicts with a.
-              continue;
-            }
-            // Match commands that take <character> as an argument.
-            if (command.keys[keys.length - 1] == 'character') {
-              selectedCharacter = keys[keys.length - 1];
-              if (selectedCharacter.length>1){
-                switch(selectedCharacter){
-                  case '<CR>':
-                    selectedCharacter='\n';
-                    break;
-                  case '<Space>':
-                    selectedCharacter=' ';
-                    break;
-                  default:
-                    continue;
-                }
-              }
-            }
-            // Add the command to the list of matched commands. Choose the best
-            // command later.
-            matchedCommands.push(command);
-          }
+      matchCommand: function(keys, keyMap, inputState, context) {
+        var matches = commandMatches(keys, keyMap, context, inputState);
+        if (!matches.full && !matches.partial) {
+          return {type: 'none'};
+        } else if (!matches.full && matches.partial) {
+          return {type: 'partial'};
         }
 
-        // Returns the command if it is a full match, or null if not.
-        function getFullyMatchedCommandOrNull(command) {
-          if (keys.length < command.keys.length) {
-            // Matches part of a multi-key command. Buffer and wait for next
-            // stroke.
-            inputState.keyBuffer.push(key);
-            return null;
-          } else {
-            if (command.keys[keys.length - 1] == 'character') {
-              inputState.selectedCharacter = selectedCharacter;
-            }
-            // Clear the buffer since a full match was found.
-            inputState.keyBuffer = [];
-            return command;
+        var bestMatch;
+        for (var i = 0; i < matches.full.length; i++) {
+          var match = matches.full[i];
+          if (!bestMatch) {
+            bestMatch = match;
           }
         }
-
-        if (!matchedCommands.length) {
-          // Clear the buffer since there were no matches.
-          inputState.keyBuffer = [];
-          return null;
-        } else if (matchedCommands.length == 1) {
-          return getFullyMatchedCommandOrNull(matchedCommands[0]);
-        } else {
-          // Find the best match in the list of matchedCommands.
-          var context = vim.visualMode ? 'visual' : 'normal';
-          var bestMatch; // Default to first in the list.
-          for (var i = 0; i < matchedCommands.length; i++) {
-            var current = matchedCommands[i];
-            if (current.context == context) {
-              bestMatch = current;
-              break;
-            } else if (!bestMatch && !current.context) {
-              // Only set an imperfect match to best match if no best match is
-              // set and the imperfect match is not restricted to another
-              // context.
-              bestMatch = current;
-            }
-          }
-          return getFullyMatchedCommandOrNull(bestMatch);
+        if (bestMatch.keys.slice(-11) == '<character>') {
+          inputState.selectedCharacter = lastChar(keys);
         }
+        return {type: 'full', command: bestMatch};
       },
       processCommand: function(cm, vim, command) {
         vim.inputState.repeatOverride = command.repeatOverride;
@@ -1020,7 +1148,7 @@
             return;
           } else {
             // 2 different operators in a row doesn't make sense.
-            vim.inputState = new InputState();
+            clearInputState(cm);
           }
         }
         inputState.operator = command.operator;
@@ -1065,7 +1193,7 @@
         actionArgs.repeat = repeat || 1;
         actionArgs.repeatIsExplicit = repeatIsExplicit;
         actionArgs.registerName = inputState.registerName;
-        vim.inputState = new InputState();
+        clearInputState(cm);
         vim.lastMotion = null;
         if (command.isEdit) {
           this.recordLastEdit(vim, inputState, command);
@@ -1084,10 +1212,13 @@
         var originalQuery = getSearchState(cm).getQuery();
         var originalScrollPos = cm.getScrollInfo();
         function handleQuery(query, ignoreCase, smartCase) {
+          vimGlobalState.searchHistoryController.pushInput(query);
+          vimGlobalState.searchHistoryController.reset();
           try {
             updateSearchQuery(cm, query, ignoreCase, smartCase);
           } catch (e) {
             showConfirm(cm, 'Invalid regex: ' + query);
+            clearInputState(cm);
             return;
           }
           commandDispatcher.processMotion(cm, vim, {
@@ -1104,7 +1235,16 @@
             logSearchQuery(macroModeState, query);
           }
         }
-        function onPromptKeyUp(_e, query) {
+        function onPromptKeyUp(e, query, close) {
+          var keyName = CodeMirror.keyName(e), up;
+          if (keyName == 'Up' || keyName == 'Down') {
+            up = keyName == 'Up' ? true : false;
+            query = vimGlobalState.searchHistoryController.nextMatch(query, up) || '';
+            close(query);
+          } else {
+            if ( keyName != 'Left' && keyName != 'Right' && keyName != 'Ctrl' && keyName != 'Alt' && keyName != 'Shift')
+              vimGlobalState.searchHistoryController.reset();
+          }
           var parsedQuery;
           try {
             parsedQuery = updateSearchQuery(cm, query,
@@ -1119,16 +1259,23 @@
             cm.scrollTo(originalScrollPos.left, originalScrollPos.top);
           }
         }
-        function onPromptKeyDown(e, _query, close) {
+        function onPromptKeyDown(e, query, close) {
           var keyName = CodeMirror.keyName(e);
-          if (keyName == 'Esc' || keyName == 'Ctrl-C' || keyName == 'Ctrl-[') {
+          if (keyName == 'Esc' || keyName == 'Ctrl-C' || keyName == 'Ctrl-[' ||
+              (keyName == 'Backspace' && query == '')) {
+            vimGlobalState.searchHistoryController.pushInput(query);
+            vimGlobalState.searchHistoryController.reset();
             updateSearchQuery(cm, originalQuery);
             clearSearchHighlight(cm);
             cm.scrollTo(originalScrollPos.left, originalScrollPos.top);
-
             CodeMirror.e_stop(e);
+            clearInputState(cm);
             close();
             cm.focus();
+          } else if (keyName == 'Ctrl-U') {
+            // Ctrl-U clears input.
+            CodeMirror.e_stop(e);
+            close('');
           }
         }
         switch (command.searchArgs.querySrc) {
@@ -1183,15 +1330,33 @@
         function onPromptClose(input) {
           // Give the prompt some time to close so that if processCommand shows
           // an error, the elements don't overlap.
+          vimGlobalState.exCommandHistoryController.pushInput(input);
+          vimGlobalState.exCommandHistoryController.reset();
           exCommandDispatcher.processCommand(cm, input);
         }
-        function onPromptKeyDown(e, _input, close) {
-          var keyName = CodeMirror.keyName(e);
-          if (keyName == 'Esc' || keyName == 'Ctrl-C' || keyName == 'Ctrl-[') {
+        function onPromptKeyDown(e, input, close) {
+          var keyName = CodeMirror.keyName(e), up;
+          if (keyName == 'Esc' || keyName == 'Ctrl-C' || keyName == 'Ctrl-[' ||
+              (keyName == 'Backspace' && input == '')) {
+            vimGlobalState.exCommandHistoryController.pushInput(input);
+            vimGlobalState.exCommandHistoryController.reset();
             CodeMirror.e_stop(e);
+            clearInputState(cm);
             close();
             cm.focus();
           }
+          if (keyName == 'Up' || keyName == 'Down') {
+            up = keyName == 'Up' ? true : false;
+            input = vimGlobalState.exCommandHistoryController.nextMatch(input, up) || '';
+            close(input);
+          } else if (keyName == 'Ctrl-U') {
+            // Ctrl-U clears input.
+            CodeMirror.e_stop(e);
+            close('');
+          } else {
+            if ( keyName != 'Left' && keyName != 'Right' && keyName != 'Ctrl' && keyName != 'Alt' && keyName != 'Shift')
+              vimGlobalState.exCommandHistoryController.reset();
+          }
         }
         if (command.type == 'keyToEx') {
           // Handle user defined Ex to Ex mappings
@@ -1215,13 +1380,13 @@
         var operator = inputState.operator;
         var operatorArgs = inputState.operatorArgs || {};
         var registerName = inputState.registerName;
-        var selectionEnd = copyCursor(cm.getCursor('head'));
-        var selectionStart = copyCursor(cm.getCursor('anchor'));
-        // The difference between cur and selection cursors are that cur is
-        // being operated on and ignores that there is a selection.
-        var curStart = copyCursor(selectionEnd);
-        var curOriginal = copyCursor(curStart);
-        var curEnd;
+        var sel = vim.sel;
+        // TODO: Make sure cm and vim selections are identical outside visual mode.
+        var origHead = copyCursor(vim.visualMode ? clipCursorToContent(cm, sel.head): cm.getCursor('head'));
+        var origAnchor = copyCursor(vim.visualMode ? clipCursorToContent(cm, sel.anchor) : cm.getCursor('anchor'));
+        var oldHead = copyCursor(origHead);
+        var oldAnchor = copyCursor(origAnchor);
+        var newHead, newAnchor;
         var repeat;
         if (operator) {
           this.recordLastEdit(vim, inputState);
@@ -1246,9 +1411,9 @@
               inputState.selectedCharacter;
         }
         motionArgs.repeat = repeat;
-        vim.inputState = new InputState();
+        clearInputState(cm);
         if (motion) {
-          var motionResult = motions[motion](cm, motionArgs, vim);
+          var motionResult = motions[motion](cm, origHead, motionArgs, vim);
           vim.lastMotion = motions[motion];
           if (!motionResult) {
             return;
@@ -1261,115 +1426,140 @@
               recordJumpPosition(cm, cachedCursor, motionResult);
               delete jumpList.cachedCursor;
             } else {
-              recordJumpPosition(cm, curOriginal, motionResult);
+              recordJumpPosition(cm, origHead, motionResult);
             }
           }
           if (motionResult instanceof Array) {
-            curStart = motionResult[0];
-            curEnd = motionResult[1];
+            newAnchor = motionResult[0];
+            newHead = motionResult[1];
           } else {
-            curEnd = motionResult;
+            newHead = motionResult;
           }
           // TODO: Handle null returns from motion commands better.
-          if (!curEnd) {
-            curEnd = Pos(curStart.line, curStart.ch);
+          if (!newHead) {
+            newHead = copyCursor(origHead);
           }
           if (vim.visualMode) {
-            // Check if the selection crossed over itself. Will need to shift
-            // the start point if that happened.
-            if (cursorIsBefore(selectionStart, selectionEnd) &&
-                (cursorEqual(selectionStart, curEnd) ||
-                    cursorIsBefore(curEnd, selectionStart))) {
-              // The end of the selection has moved from after the start to
-              // before the start. We will shift the start right by 1.
-              selectionStart.ch += 1;
-            } else if (cursorIsBefore(selectionEnd, selectionStart) &&
-                (cursorEqual(selectionStart, curEnd) ||
-                    cursorIsBefore(selectionStart, curEnd))) {
-              // The opposite happened. We will shift the start left by 1.
-              selectionStart.ch -= 1;
+            if (!(vim.visualBlock && newHead.ch === Infinity)) {
+              newHead = clipCursorToContent(cm, newHead, vim.visualBlock);
             }
-            selectionEnd = curEnd;
-            selectionStart = (motionResult instanceof Array) ? curStart : selectionStart;
-            if (vim.visualLine) {
-              if (cursorIsBefore(selectionStart, selectionEnd)) {
-                selectionStart.ch = 0;
-
-                var lastLine = cm.lastLine();
-                if (selectionEnd.line > lastLine) {
-                  selectionEnd.line = lastLine;
-                }
-                selectionEnd.ch = lineLength(cm, selectionEnd.line);
-              } else {
-                selectionEnd.ch = 0;
-                selectionStart.ch = lineLength(cm, selectionStart.line);
-              }
+            if (newAnchor) {
+              newAnchor = clipCursorToContent(cm, newAnchor, true);
             }
-            cm.setSelection(selectionStart, selectionEnd);
+            newAnchor = newAnchor || oldAnchor;
+            sel.anchor = newAnchor;
+            sel.head = newHead;
+            updateCmSelection(cm);
             updateMark(cm, vim, '<',
-                cursorIsBefore(selectionStart, selectionEnd) ? selectionStart
-                    : selectionEnd);
+                cursorIsBefore(newAnchor, newHead) ? newAnchor
+                    : newHead);
             updateMark(cm, vim, '>',
-                cursorIsBefore(selectionStart, selectionEnd) ? selectionEnd
-                    : selectionStart);
+                cursorIsBefore(newAnchor, newHead) ? newHead
+                    : newAnchor);
           } else if (!operator) {
-            curEnd = clipCursorToContent(cm, curEnd);
-            cm.setCursor(curEnd.line, curEnd.ch);
+            newHead = clipCursorToContent(cm, newHead);
+            cm.setCursor(newHead.line, newHead.ch);
           }
         }
-
         if (operator) {
-          var inverted = false;
-          vim.lastMotion = null;
-          operatorArgs.repeat = repeat; // Indent in visual mode needs this.
-          if (vim.visualMode) {
-            curStart = selectionStart;
-            curEnd = selectionEnd;
-            motionArgs.inclusive = true;
-          }
-          // Swap start and end if motion was backward.
-          if (curEnd && cursorIsBefore(curEnd, curStart)) {
-            var tmp = curStart;
-            curStart = curEnd;
-            curEnd = tmp;
-            inverted = true;
-          } else if (!curEnd) {
-            curEnd = copyCursor(curStart);
-          }
-          if (motionArgs.inclusive && !(vim.visualMode && inverted)) {
-            // Move the selection end one to the right to include the last
-            // character.
-            curEnd.ch++;
-          }
-          if (operatorArgs.selOffset) {
+          if (operatorArgs.lastSel) {
             // Replaying a visual mode operation
-            curEnd.line = curStart.line + operatorArgs.selOffset.line;
-            if (operatorArgs.selOffset.line) {curEnd.ch = operatorArgs.selOffset.ch; }
-            else { curEnd.ch = curStart.ch + operatorArgs.selOffset.ch; }
+            newAnchor = oldAnchor;
+            var lastSel = operatorArgs.lastSel;
+            var lineOffset = Math.abs(lastSel.head.line - lastSel.anchor.line);
+            var chOffset = Math.abs(lastSel.head.ch - lastSel.anchor.ch);
+            if (lastSel.visualLine) {
+              // Linewise Visual mode: The same number of lines.
+              newHead = Pos(oldAnchor.line + lineOffset, oldAnchor.ch);
+            } else if (lastSel.visualBlock) {
+              // Blockwise Visual mode: The same number of lines and columns.
+              newHead = Pos(oldAnchor.line + lineOffset, oldAnchor.ch + chOffset);
+            } else if (lastSel.head.line == lastSel.anchor.line) {
+              // Normal Visual mode within one line: The same number of characters.
+              newHead = Pos(oldAnchor.line, oldAnchor.ch + chOffset);
+            } else {
+              // Normal Visual mode with several lines: The same number of lines, in the
+              // last line the same number of characters as in the last line the last time.
+              newHead = Pos(oldAnchor.line + lineOffset, oldAnchor.ch);
+            }
+            vim.visualMode = true;
+            vim.visualLine = lastSel.visualLine;
+            vim.visualBlock = lastSel.visualBlock;
+            sel = vim.sel = {
+              anchor: newAnchor,
+              head: newHead
+            };
+            updateCmSelection(cm);
           } else if (vim.visualMode) {
-            var selOffset = Pos();
-            selOffset.line = curEnd.line - curStart.line;
-            if (selOffset.line) { selOffset.ch = curEnd.ch; }
-            else { selOffset.ch = curEnd.ch - curStart.ch; }
-            operatorArgs.selOffset = selOffset;
+            operatorArgs.lastSel = {
+              anchor: copyCursor(sel.anchor),
+              head: copyCursor(sel.head),
+              visualBlock: vim.visualBlock,
+              visualLine: vim.visualLine
+            };
           }
-          var linewise = motionArgs.linewise ||
-              (vim.visualMode && vim.visualLine) ||
-              operatorArgs.linewise;
-          if (linewise) {
-            // Expand selection to entire line.
-            expandSelectionToLine(cm, curStart, curEnd);
-          } else if (motionArgs.forward) {
-            // Clip to trailing newlines only if the motion goes forward.
-            clipToLine(cm, curStart, curEnd);
+          var curStart, curEnd, linewise, mode;
+          var cmSel;
+          if (vim.visualMode) {
+            // Init visual op
+            curStart = cursorMin(sel.head, sel.anchor);
+            curEnd = cursorMax(sel.head, sel.anchor);
+            linewise = vim.visualLine || operatorArgs.linewise;
+            mode = vim.visualBlock ? 'block' :
+                   linewise ? 'line' :
+                   'char';
+            cmSel = makeCmSelection(cm, {
+              anchor: curStart,
+              head: curEnd
+            }, mode);
+            if (linewise) {
+              var ranges = cmSel.ranges;
+              if (mode == 'block') {
+                // Linewise operators in visual block mode extend to end of line
+                for (var i = 0; i < ranges.length; i++) {
+                  ranges[i].head.ch = lineLength(cm, ranges[i].head.line);
+                }
+              } else if (mode == 'line') {
+                ranges[0].head = Pos(ranges[0].head.line + 1, 0);
+              }
+            }
+          } else {
+            // Init motion op
+            curStart = copyCursor(newAnchor || oldAnchor);
+            curEnd = copyCursor(newHead || oldHead);
+            if (cursorIsBefore(curEnd, curStart)) {
+              var tmp = curStart;
+              curStart = curEnd;
+              curEnd = tmp;
+            }
+            linewise = motionArgs.linewise || operatorArgs.linewise;
+            if (linewise) {
+              // Expand selection to entire line.
+              expandSelectionToLine(cm, curStart, curEnd);
+            } else if (motionArgs.forward) {
+              // Clip to trailing newlines only if the motion goes forward.
+              clipToLine(cm, curStart, curEnd);
+            }
+            mode = 'char';
+            var exclusive = !motionArgs.inclusive || linewise;
+            cmSel = makeCmSelection(cm, {
+              anchor: curStart,
+              head: curEnd
+            }, mode, exclusive);
           }
+          cm.setSelections(cmSel.ranges, cmSel.primary);
+          vim.lastMotion = null;
+          operatorArgs.repeat = repeat; // For indent in visual mode.
           operatorArgs.registerName = registerName;
           // Keep track of linewise as it affects how paste and change behave.
           operatorArgs.linewise = linewise;
-          operators[operator](cm, operatorArgs, vim, curStart,
-              curEnd, curOriginal);
+          var operatorMoveTo = operators[operator](
+            cm, operatorArgs, cmSel.ranges, oldAnchor, newHead);
           if (vim.visualMode) {
-            exitVisualMode(cm);
+            exitVisualMode(cm, operatorMoveTo != null);
+          }
+          if (operatorMoveTo) {
+            cm.setCursor(operatorMoveTo);
           }
         }
       },
@@ -1389,7 +1579,7 @@
      */
     // All of the functions below return Cursor objects.
     var motions = {
-      moveToTopLine: function(cm, motionArgs) {
+      moveToTopLine: function(cm, _head, motionArgs) {
         var line = getUserVisibleLines(cm).top + motionArgs.repeat -1;
         return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
       },
@@ -1398,17 +1588,17 @@
         var line = Math.floor((range.top + range.bottom) * 0.5);
         return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
       },
-      moveToBottomLine: function(cm, motionArgs) {
+      moveToBottomLine: function(cm, _head, motionArgs) {
         var line = getUserVisibleLines(cm).bottom - motionArgs.repeat +1;
         return Pos(line, findFirstNonWhiteSpaceCharacter(cm.getLine(line)));
       },
-      expandToLine: function(cm, motionArgs) {
+      expandToLine: function(_cm, head, motionArgs) {
         // Expands forward to end of line, and then to next line if repeat is
         // >1. Does not handle backward motion!
-        var cur = cm.getCursor();
+        var cur = head;
         return Pos(cur.line + motionArgs.repeat - 1, Infinity);
       },
-      findNext: function(cm, motionArgs) {
+      findNext: function(cm, _head, motionArgs) {
         var state = getSearchState(cm);
         var query = state.getQuery();
         if (!query) {
@@ -1420,7 +1610,7 @@
         highlightSearchMatches(cm, query);
         return findNext(cm, prev/** prev */, query, motionArgs.repeat);
       },
-      goToMark: function(cm, motionArgs, vim) {
+      goToMark: function(cm, _head, motionArgs, vim) {
         var mark = vim.marks[motionArgs.selectedCharacter];
         if (mark) {
           var pos = mark.find();
@@ -1428,18 +1618,19 @@
         }
         return null;
       },
-      moveToOtherHighlightedEnd: function(cm) {
-        var curEnd = copyCursor(cm.getCursor('head'));
-        var curStart = copyCursor(cm.getCursor('anchor'));
-        if (cursorIsBefore(curStart, curEnd)) {
-           curEnd.ch += 1;
-        } else if (cursorIsBefore(curEnd, curStart)) {
-           curStart.ch -= 1;
+      moveToOtherHighlightedEnd: function(cm, _head, motionArgs, vim) {
+        if (vim.visualBlock && motionArgs.sameLine) {
+          var sel = vim.sel;
+          return [
+            clipCursorToContent(cm, Pos(sel.anchor.line, sel.head.ch)),
+            clipCursorToContent(cm, Pos(sel.head.line, sel.anchor.ch))
+          ];
+        } else {
+          return ([vim.sel.head, vim.sel.anchor]);
         }
-        return ([curEnd,curStart]);
       },
-      jumpToMark: function(cm, motionArgs, vim) {
-        var best = cm.getCursor();
+      jumpToMark: function(cm, head, motionArgs, vim) {
+        var best = head;
         for (var i = 0; i < motionArgs.repeat; i++) {
           var cursor = best;
           for (var key in vim.marks) {
@@ -1459,8 +1650,8 @@
 
             var equal = cursorEqual(cursor, best);
             var between = (motionArgs.forward) ?
-              cusrorIsBetween(cursor, mark, best) :
-              cusrorIsBetween(best, mark, cursor);
+              cursorIsBetween(cursor, mark, best) :
+              cursorIsBetween(best, mark, cursor);
 
             if (equal || between) {
               best = mark;
@@ -1476,14 +1667,14 @@
         }
         return best;
       },
-      moveByCharacters: function(cm, motionArgs) {
-        var cur = cm.getCursor();
+      moveByCharacters: function(_cm, head, motionArgs) {
+        var cur = head;
         var repeat = motionArgs.repeat;
         var ch = motionArgs.forward ? cur.ch + repeat : cur.ch - repeat;
         return Pos(cur.line, ch);
       },
-      moveByLines: function(cm, motionArgs, vim) {
-        var cur = cm.getCursor();
+      moveByLines: function(cm, head, motionArgs, vim) {
+        var cur = head;
         var endCh = cur.ch;
         // Depending what our last motion was, we may want to do different
         // things. If our last motion was moving vertically, we want to
@@ -1505,11 +1696,12 @@
         var line = motionArgs.forward ? cur.line + repeat : cur.line - repeat;
         var first = cm.firstLine();
         var last = cm.lastLine();
-        // Vim cancels linewise motions that start on an edge and move beyond
-        // that edge. It does not cancel motions that do not start on an edge.
-        if ((line < first && cur.line == first) ||
-            (line > last && cur.line == last)) {
-          return;
+        // Vim go to line begin or line end when cursor at first/last line and
+        // move to previous/next line is triggered.
+        if (line < first && cur.line == first){
+          return this.moveToStartOfLine(cm, head, motionArgs, vim);
+        }else if (line > last && cur.line == last){
+            return this.moveToEol(cm, head, motionArgs, vim);
         }
         if (motionArgs.toFirstChar){
           endCh=findFirstNonWhiteSpaceCharacter(cm.getLine(line));
@@ -1518,8 +1710,8 @@
         vim.lastHSPos = cm.charCoords(Pos(line, endCh),'div').left;
         return Pos(line, endCh);
       },
-      moveByDisplayLines: function(cm, motionArgs, vim) {
-        var cur = cm.getCursor();
+      moveByDisplayLines: function(cm, head, motionArgs, vim) {
+        var cur = head;
         switch (vim.lastMotion) {
           case this.moveByDisplayLines:
           case this.moveByScroll:
@@ -1546,40 +1738,28 @@
         vim.lastHPos = res.ch;
         return res;
       },
-      moveByPage: function(cm, motionArgs) {
+      moveByPage: function(cm, head, motionArgs) {
         // CodeMirror only exposes functions that move the cursor page down, so
         // doing this bad hack to move the cursor and move it back. evalInput
         // will move the cursor to where it should be in the end.
-        var curStart = cm.getCursor();
+        var curStart = head;
         var repeat = motionArgs.repeat;
         return cm.findPosV(curStart, (motionArgs.forward ? repeat : -repeat), 'page');
       },
-      moveByParagraph: function(cm, motionArgs) {
-        var line = cm.getCursor().line;
-        var repeat = motionArgs.repeat;
-        var inc = motionArgs.forward ? 1 : -1;
-        for (var i = 0; i < repeat; i++) {
-          if ((!motionArgs.forward && line === cm.firstLine() ) ||
-              (motionArgs.forward && line == cm.lastLine())) {
-            break;
-          }
-          line += inc;
-          while (line !== cm.firstLine() && line != cm.lastLine() && cm.getLine(line)) {
-            line += inc;
-          }
-        }
-        return Pos(line, 0);
+      moveByParagraph: function(cm, head, motionArgs) {
+        var dir = motionArgs.forward ? 1 : -1;
+        return findParagraph(cm, head, motionArgs.repeat, dir);
       },
-      moveByScroll: function(cm, motionArgs, vim) {
+      moveByScroll: function(cm, head, motionArgs, vim) {
         var scrollbox = cm.getScrollInfo();
         var curEnd = null;
         var repeat = motionArgs.repeat;
         if (!repeat) {
           repeat = scrollbox.clientHeight / (2 * cm.defaultTextHeight());
         }
-        var orig = cm.charCoords(cm.getCursor(), 'local');
+        var orig = cm.charCoords(head, 'local');
         motionArgs.repeat = repeat;
-        var curEnd = motions.moveByDisplayLines(cm, motionArgs, vim);
+        var curEnd = motions.moveByDisplayLines(cm, head, motionArgs, vim);
         if (!curEnd) {
           return null;
         }
@@ -1587,11 +1767,11 @@
         cm.scrollTo(null, scrollbox.top + dest.top - orig.top);
         return curEnd;
       },
-      moveByWords: function(cm, motionArgs) {
-        return moveToWord(cm, motionArgs.repeat, !!motionArgs.forward,
+      moveByWords: function(cm, head, motionArgs) {
+        return moveToWord(cm, head, motionArgs.repeat, !!motionArgs.forward,
             !!motionArgs.wordEnd, !!motionArgs.bigWord);
       },
-      moveTillCharacter: function(cm, motionArgs) {
+      moveTillCharacter: function(cm, _head, motionArgs) {
         var repeat = motionArgs.repeat;
         var curEnd = moveToCharacter(cm, repeat, motionArgs.forward,
             motionArgs.selectedCharacter);
@@ -1601,26 +1781,26 @@
         curEnd.ch += increment;
         return curEnd;
       },
-      moveToCharacter: function(cm, motionArgs) {
+      moveToCharacter: function(cm, head, motionArgs) {
         var repeat = motionArgs.repeat;
         recordLastCharacterSearch(0, motionArgs);
         return moveToCharacter(cm, repeat, motionArgs.forward,
-            motionArgs.selectedCharacter) || cm.getCursor();
+            motionArgs.selectedCharacter) || head;
       },
-      moveToSymbol: function(cm, motionArgs) {
+      moveToSymbol: function(cm, head, motionArgs) {
         var repeat = motionArgs.repeat;
         return findSymbol(cm, repeat, motionArgs.forward,
-            motionArgs.selectedCharacter) || cm.getCursor();
+            motionArgs.selectedCharacter) || head;
       },
-      moveToColumn: function(cm, motionArgs, vim) {
+      moveToColumn: function(cm, head, motionArgs, vim) {
         var repeat = motionArgs.repeat;
         // repeat is equivalent to which column we want to move to!
         vim.lastHPos = repeat - 1;
-        vim.lastHSPos = cm.charCoords(cm.getCursor(),'div').left;
+        vim.lastHSPos = cm.charCoords(head,'div').left;
         return moveToColumn(cm, repeat);
       },
-      moveToEol: function(cm, motionArgs, vim) {
-        var cur = cm.getCursor();
+      moveToEol: function(cm, head, motionArgs, vim) {
+        var cur = head;
         vim.lastHPos = Infinity;
         var retval= Pos(cur.line + motionArgs.repeat - 1, Infinity);
         var end=cm.clipPos(retval);
@@ -1628,15 +1808,15 @@
         vim.lastHSPos = cm.charCoords(end,'div').left;
         return retval;
       },
-      moveToFirstNonWhiteSpaceCharacter: function(cm) {
+      moveToFirstNonWhiteSpaceCharacter: function(cm, head) {
         // Go to the start of the line where the text begins, or the end for
         // whitespace-only lines
-        var cursor = cm.getCursor();
+        var cursor = head;
         return Pos(cursor.line,
                    findFirstNonWhiteSpaceCharacter(cm.getLine(cursor.line)));
       },
-      moveToMatchedSymbol: function(cm) {
-        var cursor = cm.getCursor();
+      moveToMatchedSymbol: function(cm, head) {
+        var cursor = head;
         var line = cursor.line;
         var ch = cursor.ch;
         var lineText = cm.getLine(line);
@@ -1657,11 +1837,10 @@
           return cursor;
         }
       },
-      moveToStartOfLine: function(cm) {
-        var cursor = cm.getCursor();
-        return Pos(cursor.line, 0);
+      moveToStartOfLine: function(_cm, head) {
+        return Pos(head.line, 0);
       },
-      moveToLineOrEdgeOfDocument: function(cm, motionArgs) {
+      moveToLineOrEdgeOfDocument: function(cm, _head, motionArgs) {
         var lineNum = motionArgs.forward ? cm.lastLine() : cm.firstLine();
         if (motionArgs.repeatIsExplicit) {
           lineNum = motionArgs.repeat - cm.getOption('firstLineNumber');
@@ -1669,7 +1848,7 @@
         return Pos(lineNum,
                    findFirstNonWhiteSpaceCharacter(cm.getLine(lineNum)));
       },
-      textObjectManipulation: function(cm, motionArgs) {
+      textObjectManipulation: function(cm, head, motionArgs, vim) {
         // TODO: lots of possible exceptions that can be thrown here. Try da(
         //     outside of a () block.
 
@@ -1698,24 +1877,38 @@
 
         var tmp;
         if (mirroredPairs[character]) {
-          tmp = selectCompanionObject(cm, character, inclusive);
+          tmp = selectCompanionObject(cm, head, character, inclusive);
         } else if (selfPaired[character]) {
-          tmp = findBeginningAndEnd(cm, character, inclusive);
+          tmp = findBeginningAndEnd(cm, head, character, inclusive);
         } else if (character === 'W') {
           tmp = expandWordUnderCursor(cm, inclusive, true /** forward */,
                                                      true /** bigWord */);
         } else if (character === 'w') {
           tmp = expandWordUnderCursor(cm, inclusive, true /** forward */,
                                                      false /** bigWord */);
+        } else if (character === 'p') {
+          tmp = findParagraph(cm, head, motionArgs.repeat, 0, inclusive);
+          motionArgs.linewise = true;
+          if (vim.visualMode) {
+            if (!vim.visualLine) { vim.visualLine = true; }
+          } else {
+            var operatorArgs = vim.inputState.operatorArgs;
+            if (operatorArgs) { operatorArgs.linewise = true; }
+            tmp.end.line--;
+          }
         } else {
           // No text object defined for this, don't move.
           return null;
         }
 
-        return [tmp.start, tmp.end];
+        if (!cm.state.vim.visualMode) {
+          return [tmp.start, tmp.end];
+        } else {
+          return expandSelection(cm, tmp.start, tmp.end);
+        }
       },
 
-      repeatLastCharacterSearch: function(cm, motionArgs) {
+      repeatLastCharacterSearch: function(cm, head, motionArgs) {
         var lastSearch = vimGlobalState.lastChararacterSearch;
         var repeat = motionArgs.repeat;
         var forward = motionArgs.forward === lastSearch.forward;
@@ -1725,65 +1918,120 @@
         var curEnd = moveToCharacter(cm, repeat, forward, lastSearch.selectedCharacter);
         if (!curEnd) {
           cm.moveH(increment, 'char');
-          return cm.getCursor();
+          return head;
         }
         curEnd.ch += increment;
         return curEnd;
       }
     };
 
+    function defineMotion(name, fn) {
+      motions[name] = fn;
+    }
+
+    function fillArray(val, times) {
+      var arr = [];
+      for (var i = 0; i < times; i++) {
+        arr.push(val);
+      }
+      return arr;
+    }
+    /**
+     * An operator acts on a text selection. It receives the list of selections
+     * as input. The corresponding CodeMirror selection is guaranteed to
+    * match the input selection.
+     */
     var operators = {
-      change: function(cm, operatorArgs, _vim, curStart, curEnd) {
-        vimGlobalState.registerController.pushText(
-            operatorArgs.registerName, 'change', cm.getRange(curStart, curEnd),
-            operatorArgs.linewise);
-        if (operatorArgs.linewise) {
-          // Push the next line back down, if there is a next line.
-          var replacement = curEnd.line > cm.lastLine() ? '' : '\n';
-          cm.replaceRange(replacement, curStart, curEnd);
-          cm.indentLine(curStart.line, 'smart');
-          // null ch so setCursor moves to end of line.
-          curStart.ch = null;
-        } else {
-          // Exclude trailing whitespace if the range is not all whitespace.
-          var text = cm.getRange(curStart, curEnd);
-          if (!isWhiteSpaceString(text)) {
+      change: function(cm, args, ranges) {
+        var finalHead, text;
+        var vim = cm.state.vim;
+        vimGlobalState.macroModeState.lastInsertModeChanges.inVisualBlock = vim.visualBlock;
+        if (!vim.visualMode) {
+          var anchor = ranges[0].anchor,
+              head = ranges[0].head;
+          text = cm.getRange(anchor, head);
+          var lastState = vim.lastEditInputState || {};
+          if (lastState.motion == "moveByWords" && !isWhiteSpaceString(text)) {
+            // Exclude trailing whitespace if the range is not all whitespace.
             var match = (/\s+$/).exec(text);
-            if (match) {
-              curEnd = offsetCursor(curEnd, 0, - match[0].length);
+            if (match && lastState.motionArgs && lastState.motionArgs.forward) {
+              head = offsetCursor(head, 0, - match[0].length);
+              text = text.slice(0, - match[0].length);
             }
           }
-          cm.replaceRange('', curStart, curEnd);
-        }
-        actions.enterInsertMode(cm, {}, cm.state.vim);
-        cm.setCursor(curStart);
-      },
-      // delete is a javascript keyword.
-      'delete': function(cm, operatorArgs, _vim, curStart, curEnd) {
-        // If the ending line is past the last line, inclusive, instead of
-        // including the trailing \n, include the \n before the starting line
-        if (operatorArgs.linewise &&
-            curEnd.line > cm.lastLine() && curStart.line > cm.firstLine()) {
-          curStart.line--;
-          curStart.ch = lineLength(cm, curStart.line);
+          var prevLineEnd = new Pos(anchor.line - 1, Number.MAX_VALUE);
+          var wasLastLine = cm.firstLine() == cm.lastLine();
+          if (head.line > cm.lastLine() && args.linewise && !wasLastLine) {
+            cm.replaceRange('', prevLineEnd, head);
+          } else {
+            cm.replaceRange('', anchor, head);
+          }
+          if (args.linewise) {
+            // Push the next line back down, if there is a next line.
+            if (!wasLastLine) {
+              cm.setCursor(prevLineEnd);
+              CodeMirror.commands.newlineAndIndent(cm);
+            }
+            // make sure cursor ends up at the end of the line.
+            anchor.ch = Number.MAX_VALUE;
+          }
+          finalHead = anchor;
+        } else {
+          text = cm.getSelection();
+          var replacement = fillArray('', ranges.length);
+          cm.replaceSelections(replacement);
+          finalHead = cursorMin(ranges[0].head, ranges[0].anchor);
         }
         vimGlobalState.registerController.pushText(
-            operatorArgs.registerName, 'delete', cm.getRange(curStart, curEnd),
-            operatorArgs.linewise);
-        cm.replaceRange('', curStart, curEnd);
-        if (operatorArgs.linewise) {
-          cm.setCursor(motions.moveToFirstNonWhiteSpaceCharacter(cm));
-        } else {
-          cm.setCursor(curStart);
-        }
+            args.registerName, 'change', text,
+            args.linewise, ranges.length > 1);
+        actions.enterInsertMode(cm, {head: finalHead}, cm.state.vim);
       },
-      indent: function(cm, operatorArgs, vim, curStart, curEnd) {
-        var startLine = curStart.line;
-        var endLine = curEnd.line;
+      // delete is a javascript keyword.
+      'delete': function(cm, args, ranges) {
+        var finalHead, text;
+        var vim = cm.state.vim;
+        if (!vim.visualBlock) {
+          var anchor = ranges[0].anchor,
+              head = ranges[0].head;
+          if (args.linewise &&
+              head.line != cm.firstLine() &&
+              anchor.line == cm.lastLine() &&
+              anchor.line == head.line - 1) {
+            // Special case for dd on last line (and first line).
+            if (anchor.line == cm.firstLine()) {
+              anchor.ch = 0;
+            } else {
+              anchor = Pos(anchor.line - 1, lineLength(cm, anchor.line - 1));
+            }
+          }
+          text = cm.getRange(anchor, head);
+          cm.replaceRange('', anchor, head);
+          finalHead = anchor;
+          if (args.linewise) {
+            finalHead = motions.moveToFirstNonWhiteSpaceCharacter(cm, anchor);
+          }
+        } else {
+          text = cm.getSelection();
+          var replacement = fillArray('', ranges.length);
+          cm.replaceSelections(replacement);
+          finalHead = ranges[0].anchor;
+        }
+        vimGlobalState.registerController.pushText(
+            args.registerName, 'delete', text,
+            args.linewise, vim.visualBlock);
+        return clipCursorToContent(cm, finalHead);
+      },
+      indent: function(cm, args, ranges) {
+        var vim = cm.state.vim;
+        var startLine = ranges[0].anchor.line;
+        var endLine = vim.visualBlock ?
+          ranges[ranges.length - 1].anchor.line :
+          ranges[0].head.line;
         // In visual mode, n> shifts the selection right n times, instead of
         // shifting n lines right once.
-        var repeat = (vim.visualMode) ? operatorArgs.repeat : 1;
-        if (operatorArgs.linewise) {
+        var repeat = (vim.visualMode) ? args.repeat : 1;
+        if (args.linewise) {
           // The only way to delete a newline is to delete until the start of
           // the next line, so in linewise mode evalInput will include the next
           // line. We don't want this in indent, so we go back a line.
@@ -1791,33 +2039,59 @@
         }
         for (var i = startLine; i <= endLine; i++) {
           for (var j = 0; j < repeat; j++) {
-            cm.indentLine(i, operatorArgs.indentRight);
+            cm.indentLine(i, args.indentRight);
           }
         }
-        cm.setCursor(curStart);
-        cm.setCursor(motions.moveToFirstNonWhiteSpaceCharacter(cm));
+        return motions.moveToFirstNonWhiteSpaceCharacter(cm, ranges[0].anchor);
       },
-      swapcase: function(cm, operatorArgs, _vim, curStart, curEnd, curOriginal) {
-        var toSwap = cm.getRange(curStart, curEnd);
-        var swapped = '';
-        for (var i = 0; i < toSwap.length; i++) {
-          var character = toSwap.charAt(i);
-          swapped += isUpperCase(character) ? character.toLowerCase() :
-              character.toUpperCase();
+      changeCase: function(cm, args, ranges, oldAnchor, newHead) {
+        var selections = cm.getSelections();
+        var swapped = [];
+        var toLower = args.toLower;
+        for (var j = 0; j < selections.length; j++) {
+          var toSwap = selections[j];
+          var text = '';
+          if (toLower === true) {
+            text = toSwap.toLowerCase();
+          } else if (toLower === false) {
+            text = toSwap.toUpperCase();
+          } else {
+            for (var i = 0; i < toSwap.length; i++) {
+              var character = toSwap.charAt(i);
+              text += isUpperCase(character) ? character.toLowerCase() :
+                  character.toUpperCase();
+            }
+          }
+          swapped.push(text);
         }
-        cm.replaceRange(swapped, curStart, curEnd);
-        if (!operatorArgs.shouldMoveCursor) {
-          cm.setCursor(curOriginal);
+        cm.replaceSelections(swapped);
+        if (args.shouldMoveCursor){
+          return newHead;
+        } else if (!cm.state.vim.visualMode && args.linewise && ranges[0].anchor.line + 1 == ranges[0].head.line) {
+          return motions.moveToFirstNonWhiteSpaceCharacter(cm, oldAnchor);
+        } else if (args.linewise){
+          return oldAnchor;
+        } else {
+          return cursorMin(ranges[0].anchor, ranges[0].head);
         }
       },
-      yank: function(cm, operatorArgs, _vim, curStart, curEnd, curOriginal) {
+      yank: function(cm, args, ranges, oldAnchor) {
+        var vim = cm.state.vim;
+        var text = cm.getSelection();
+        var endPos = vim.visualMode
+          ? cursorMin(vim.sel.anchor, vim.sel.head, ranges[0].head, ranges[0].anchor)
+          : oldAnchor;
         vimGlobalState.registerController.pushText(
-            operatorArgs.registerName, 'yank',
-            cm.getRange(curStart, curEnd), operatorArgs.linewise);
-        cm.setCursor(curOriginal);
+            args.registerName, 'yank',
+            text, args.linewise, vim.visualBlock);
+        return endPos;
       }
     };
 
+    function defineOperator(name, fn) {
+      operators[name] = fn;
+    }
+
     var actions = {
       jumpListWalk: function(cm, actionArgs, vim) {
         if (vim.visualMode) {
@@ -1878,9 +2152,7 @@
         switch (actionArgs.position) {
           case 'center': y = y - (height / 2) + lineHeight;
             break;
-          case 'bottom': y = y - height + lineHeight*1.4;
-            break;
-          case 'top': y = y + lineHeight*0.4;
+          case 'bottom': y = y - height + lineHeight;
             break;
         }
         cm.scrollTo(null, y);
@@ -1906,14 +2178,45 @@
         vim.insertMode = true;
         vim.insertModeRepeat = actionArgs && actionArgs.repeat || 1;
         var insertAt = (actionArgs) ? actionArgs.insertAt : null;
+        var sel = vim.sel;
+        var head = actionArgs.head || cm.getCursor('head');
+        var height = cm.listSelections().length;
         if (insertAt == 'eol') {
-          var cursor = cm.getCursor();
-          cursor = Pos(cursor.line, lineLength(cm, cursor.line));
-          cm.setCursor(cursor);
+          head = Pos(head.line, lineLength(cm, head.line));
         } else if (insertAt == 'charAfter') {
-          cm.setCursor(offsetCursor(cm.getCursor(), 0, 1));
+          head = offsetCursor(head, 0, 1);
         } else if (insertAt == 'firstNonBlank') {
-          cm.setCursor(motions.moveToFirstNonWhiteSpaceCharacter(cm));
+          head = motions.moveToFirstNonWhiteSpaceCharacter(cm, head);
+        } else if (insertAt == 'startOfSelectedArea') {
+          if (!vim.visualBlock) {
+            if (sel.head.line < sel.anchor.line) {
+              head = sel.head;
+            } else {
+              head = Pos(sel.anchor.line, 0);
+            }
+          } else {
+            head = Pos(
+                Math.min(sel.head.line, sel.anchor.line),
+                Math.min(sel.head.ch, sel.anchor.ch));
+            height = Math.abs(sel.head.line - sel.anchor.line) + 1;
+          }
+        } else if (insertAt == 'endOfSelectedArea') {
+          if (!vim.visualBlock) {
+            if (sel.head.line >= sel.anchor.line) {
+              head = offsetCursor(sel.head, 0, 1);
+            } else {
+              head = Pos(sel.anchor.line, 0);
+            }
+          } else {
+            head = Pos(
+                Math.min(sel.head.line, sel.anchor.line),
+                Math.max(sel.head.ch + 1, sel.anchor.ch));
+            height = Math.abs(sel.head.line - sel.anchor.line) + 1;
+          }
+        } else if (insertAt == 'inplace') {
+          if (vim.visualMode){
+            return;
+          }
         }
         cm.setOption('keyMap', 'vim-insert');
         cm.setOption('disableInput', false);
@@ -1931,79 +2234,71 @@
           cm.on('change', onChange);
           CodeMirror.on(cm.getInputField(), 'keydown', onKeyEventTargetKeyDown);
         }
+        if (vim.visualMode) {
+          exitVisualMode(cm);
+        }
+        selectForInsert(cm, head, height);
       },
       toggleVisualMode: function(cm, actionArgs, vim) {
         var repeat = actionArgs.repeat;
-        var curStart = cm.getCursor();
-        var curEnd;
+        var anchor = cm.getCursor();
+        var head;
         // TODO: The repeat should actually select number of characters/lines
         //     equal to the repeat times the size of the previous visual
         //     operation.
         if (!vim.visualMode) {
-          cm.on('mousedown', exitVisualMode);
+          // Entering visual mode
           vim.visualMode = true;
           vim.visualLine = !!actionArgs.linewise;
-          if (vim.visualLine) {
-            curStart.ch = 0;
-            curEnd = clipCursorToContent(
-              cm, Pos(curStart.line + repeat - 1, lineLength(cm, curStart.line)),
+          vim.visualBlock = !!actionArgs.blockwise;
+          head = clipCursorToContent(
+              cm, Pos(anchor.line, anchor.ch + repeat - 1),
               true /** includeLineBreak */);
-          } else {
-            curEnd = clipCursorToContent(
-              cm, Pos(curStart.line, curStart.ch + repeat),
-              true /** includeLineBreak */);
-          }
-          // Make the initial selection.
-          if (!actionArgs.repeatIsExplicit && !vim.visualLine) {
-            // This is a strange case. Here the implicit repeat is 1. The
-            // following commands lets the cursor hover over the 1 character
-            // selection.
-            cm.setCursor(curEnd);
-            cm.setSelection(curEnd, curStart);
-          } else {
-            cm.setSelection(curStart, curEnd);
-          }
-          CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: vim.visualLine ? "linewise" : ""});
+          vim.sel = {
+            anchor: anchor,
+            head: head
+          };
+          CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: vim.visualLine ? "linewise" : vim.visualBlock ? "blockwise" : ""});
+          updateCmSelection(cm);
+          updateMark(cm, vim, '<', cursorMin(anchor, head));
+          updateMark(cm, vim, '>', cursorMax(anchor, head));
+        } else if (vim.visualLine ^ actionArgs.linewise ||
+            vim.visualBlock ^ actionArgs.blockwise) {
+          // Toggling between modes
+          vim.visualLine = !!actionArgs.linewise;
+          vim.visualBlock = !!actionArgs.blockwise;
+          CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: vim.visualLine ? "linewise" : vim.visualBlock ? "blockwise" : ""});
+          updateCmSelection(cm);
         } else {
-          curStart = cm.getCursor('anchor');
-          curEnd = cm.getCursor('head');
-          if (!vim.visualLine && actionArgs.linewise) {
-            // Shift-V pressed in characterwise visual mode. Switch to linewise
-            // visual mode instead of exiting visual mode.
-            vim.visualLine = true;
-            curStart.ch = cursorIsBefore(curStart, curEnd) ? 0 :
-                lineLength(cm, curStart.line);
-            curEnd.ch = cursorIsBefore(curStart, curEnd) ?
-                lineLength(cm, curEnd.line) : 0;
-            cm.setSelection(curStart, curEnd);
-            CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: "linewise"});
-          } else if (vim.visualLine && !actionArgs.linewise) {
-            // v pressed in linewise visual mode. Switch to characterwise visual
-            // mode instead of exiting visual mode.
-            vim.visualLine = false;
-            CodeMirror.signal(cm, "vim-mode-change", {mode: "visual"});
-          } else {
-            exitVisualMode(cm);
-          }
+          exitVisualMode(cm);
         }
-        updateMark(cm, vim, '<', cursorIsBefore(curStart, curEnd) ? curStart
-            : curEnd);
-        updateMark(cm, vim, '>', cursorIsBefore(curStart, curEnd) ? curEnd
-            : curStart);
       },
       reselectLastSelection: function(cm, _actionArgs, vim) {
-        if (vim.lastSelection) {
-          var lastSelection = vim.lastSelection;
-          cm.setSelection(lastSelection.curStart, lastSelection.curEnd);
-          if (lastSelection.visualLine) {
-            vim.visualMode = true;
-            vim.visualLine = true;
+        var lastSelection = vim.lastSelection;
+        if (vim.visualMode) {
+          updateLastSelection(cm, vim);
+        }
+        if (lastSelection) {
+          var anchor = lastSelection.anchorMark.find();
+          var head = lastSelection.headMark.find();
+          if (!anchor || !head) {
+            // If the marks have been destroyed due to edits, do nothing.
+            return;
           }
-          else {
-            vim.visualMode = true;
-            vim.visualLine = false;
-          }
-          CodeMirror.signal(cm, "vim-mode-change", {mode: "visual", subMode: vim.visualLine ? "linewise" : ""});
+          vim.sel = {
+            anchor: anchor,
+            head: head
+          };
+          vim.visualMode = true;
+          vim.visualLine = lastSelection.visualLine;
+          vim.visualBlock = lastSelection.visualBlock;
+          updateCmSelection(cm);
+          updateMark(cm, vim, '<', cursorMin(anchor, head));
+          updateMark(cm, vim, '>', cursorMax(anchor, head));
+          CodeMirror.signal(cm, 'vim-mode-change', {
+            mode: 'visual',
+            subMode: vim.visualLine ? 'linewise' :
+                     vim.visualBlock ? 'blockwise' : ''});
         }
       },
       joinLines: function(cm, actionArgs, vim) {
@@ -2011,6 +2306,11 @@
         if (vim.visualMode) {
           curStart = cm.getCursor('anchor');
           curEnd = cm.getCursor('head');
+          if (cursorIsBefore(curEnd, curStart)) {
+            var tmp = curEnd;
+            curEnd = curStart;
+            curStart = tmp;
+          }
           curEnd.ch = lineLength(cm, curEnd.line) - 1;
         } else {
           // Repeat is the number of lines to join. Minimum 2 lines.
@@ -2020,18 +2320,19 @@
                                                Infinity));
         }
         var finalCh = 0;
-        cm.operation(function() {
-          for (var i = curStart.line; i < curEnd.line; i++) {
-            finalCh = lineLength(cm, curStart.line);
-            var tmp = Pos(curStart.line + 1,
-                          lineLength(cm, curStart.line + 1));
-            var text = cm.getRange(curStart, tmp);
-            text = text.replace(/\n\s*/g, ' ');
-            cm.replaceRange(text, curStart, tmp);
-          }
-          var curFinalPos = Pos(curStart.line, finalCh);
-          cm.setCursor(curFinalPos);
-        });
+        for (var i = curStart.line; i < curEnd.line; i++) {
+          finalCh = lineLength(cm, curStart.line);
+          var tmp = Pos(curStart.line + 1,
+                        lineLength(cm, curStart.line + 1));
+          var text = cm.getRange(curStart, tmp);
+          text = text.replace(/\n\s*/g, ' ');
+          cm.replaceRange(text, curStart, tmp);
+        }
+        var curFinalPos = Pos(curStart.line, finalCh);
+        if (vim.visualMode) {
+          exitVisualMode(cm, false);
+        }
+        cm.setCursor(curFinalPos);
       },
       newLineAndEnterInsertMode: function(cm, actionArgs, vim) {
         vim.insertMode = true;
@@ -2051,7 +2352,7 @@
         }
         this.enterInsertMode(cm, { repeat: actionArgs.repeat }, vim);
       },
-      paste: function(cm, actionArgs) {
+      paste: function(cm, actionArgs, vim) {
         var cur = copyCursor(cm.getCursor());
         var register = vimGlobalState.registerController.getRegister(
             actionArgs.registerName);
@@ -2060,11 +2361,12 @@
           return;
         }
         if (actionArgs.matchIndent) {
-          // length that considers tabs and cm.options.tabSize
+          var tabSize = cm.getOption("tabSize");
+          // length that considers tabs and tabSize
           var whitespaceLength = function(str) {
             var tabs = (str.split("\t").length - 1);
             var spaces = (str.split(" ").length - 1);
-            return tabs * cm.options.tabSize + spaces * 1;
+            return tabs * tabSize + spaces * 1;
           };
           var currentLine = cm.getLine(cm.getCursor().line);
           var indent = whitespaceLength(currentLine.match(/^\s*/)[0]);
@@ -2077,8 +2379,8 @@
             if (newIndent < 0) {
               return "";
             }
-            else if (cm.options.indentWithTabs) {
-              var quotient = Math.floor(newIndent / cm.options.tabSize);
+            else if (cm.getOption("indentWithTabs")) {
+              var quotient = Math.floor(newIndent / tabSize);
               return Array(quotient + 1).join('\t');
             }
             else {
@@ -2091,8 +2393,11 @@
           var text = Array(actionArgs.repeat + 1).join(text);
         }
         var linewise = register.linewise;
+        var blockwise = register.blockwise;
         if (linewise) {
-          if (actionArgs.after) {
+          if(vim.visualMode) {
+            text = vim.visualLine ? text.slice(0, -1) : '\n' + text.slice(0, text.length - 1) + '\n';
+          } else if (actionArgs.after) {
             // Move the newline at the end to the start instead, and paste just
             // before the newline character of the line we are on right now.
             text = '\n' + text.slice(0, text.length - 1);
@@ -2101,26 +2406,96 @@
             cur.ch = 0;
           }
         } else {
+          if (blockwise) {
+            text = text.split('\n');
+            for (var i = 0; i < text.length; i++) {
+              text[i] = (text[i] == '') ? ' ' : text[i];
+            }
+          }
           cur.ch += actionArgs.after ? 1 : 0;
         }
-        cm.replaceRange(text, cur);
-        // Now fine tune the cursor to where we want it.
         var curPosFinal;
         var idx;
-        if (linewise && actionArgs.after) {
-          curPosFinal = Pos(
-            cur.line + 1,
-            findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line + 1)));
-        } else if (linewise && !actionArgs.after) {
-          curPosFinal = Pos(
-            cur.line,
-            findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line)));
-        } else if (!linewise && actionArgs.after) {
-          idx = cm.indexFromPos(cur);
-          curPosFinal = cm.posFromIndex(idx + text.length - 1);
+        if (vim.visualMode) {
+          //  save the pasted text for reselection if the need arises
+          vim.lastPastedText = text;
+          var lastSelectionCurEnd;
+          var selectedArea = getSelectedAreaRange(cm, vim);
+          var selectionStart = selectedArea[0];
+          var selectionEnd = selectedArea[1];
+          var selectedText = cm.getSelection();
+          var selections = cm.listSelections();
+          var emptyStrings = new Array(selections.length).join('1').split('1');
+          // save the curEnd marker before it get cleared due to cm.replaceRange.
+          if (vim.lastSelection) {
+            lastSelectionCurEnd = vim.lastSelection.headMark.find();
+          }
+          // push the previously selected text to unnamed register
+          vimGlobalState.registerController.unnamedRegister.setText(selectedText);
+          if (blockwise) {
+            // first delete the selected text
+            cm.replaceSelections(emptyStrings);
+            // Set new selections as per the block length of the yanked text
+            selectionEnd = Pos(selectionStart.line + text.length-1, selectionStart.ch);
+            cm.setCursor(selectionStart);
+            selectBlock(cm, selectionEnd);
+            cm.replaceSelections(text);
+            curPosFinal = selectionStart;
+          } else if (vim.visualBlock) {
+            cm.replaceSelections(emptyStrings);
+            cm.setCursor(selectionStart);
+            cm.replaceRange(text, selectionStart, selectionStart);
+            curPosFinal = selectionStart;
+          } else {
+            cm.replaceRange(text, selectionStart, selectionEnd);
+            curPosFinal = cm.posFromIndex(cm.indexFromPos(selectionStart) + text.length - 1);
+          }
+          // restore the the curEnd marker
+          if(lastSelectionCurEnd) {
+            vim.lastSelection.headMark = cm.setBookmark(lastSelectionCurEnd);
+          }
+          if (linewise) {
+            curPosFinal.ch=0;
+          }
         } else {
-          idx = cm.indexFromPos(cur);
-          curPosFinal = cm.posFromIndex(idx + text.length);
+          if (blockwise) {
+            cm.setCursor(cur);
+            for (var i = 0; i < text.length; i++) {
+              var line = cur.line+i;
+              if (line > cm.lastLine()) {
+                cm.replaceRange('\n',  Pos(line, 0));
+              }
+              var lastCh = lineLength(cm, line);
+              if (lastCh < cur.ch) {
+                extendLineToColumn(cm, line, cur.ch);
+              }
+            }
+            cm.setCursor(cur);
+            selectBlock(cm, Pos(cur.line + text.length-1, cur.ch));
+            cm.replaceSelections(text);
+            curPosFinal = cur;
+          } else {
+            cm.replaceRange(text, cur);
+            // Now fine tune the cursor to where we want it.
+            if (linewise && actionArgs.after) {
+              curPosFinal = Pos(
+              cur.line + 1,
+              findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line + 1)));
+            } else if (linewise && !actionArgs.after) {
+              curPosFinal = Pos(
+                cur.line,
+                findFirstNonWhiteSpaceCharacter(cm.getLine(cur.line)));
+            } else if (!linewise && actionArgs.after) {
+              idx = cm.indexFromPos(cur);
+              curPosFinal = cm.posFromIndex(idx + text.length - 1);
+            } else {
+              idx = cm.indexFromPos(cur);
+              curPosFinal = cm.posFromIndex(idx + text.length);
+            }
+          }
+        }
+        if (vim.visualMode) {
+          exitVisualMode(cm, false);
         }
         cm.setCursor(curPosFinal);
       },
@@ -2145,13 +2520,11 @@
         var curStart = cm.getCursor();
         var replaceTo;
         var curEnd;
-        if (vim.visualMode){
-          curStart=cm.getCursor('start');
-          curEnd=cm.getCursor('end');
-          // workaround to catch the character under the cursor
-          //  existing workaround doesn't cover actions
-          curEnd=cm.clipPos(Pos(curEnd.line, curEnd.ch+1));
-        }else{
+        var selections = cm.listSelections();
+        if (vim.visualMode) {
+          curStart = cm.getCursor('start');
+          curEnd = cm.getCursor('end');
+        } else {
           var line = cm.getLine(curStart.line);
           replaceTo = curStart.ch + actionArgs.repeat;
           if (replaceTo > line.length) {
@@ -2159,19 +2532,29 @@
           }
           curEnd = Pos(curStart.line, replaceTo);
         }
-        if (replaceWith=='\n'){
+        if (replaceWith=='\n') {
           if (!vim.visualMode) cm.replaceRange('', curStart, curEnd);
           // special case, where vim help says to replace by just one line-break
           (CodeMirror.commands.newlineAndIndentContinueComment || CodeMirror.commands.newlineAndIndent)(cm);
-        }else {
-          var replaceWithStr=cm.getRange(curStart, curEnd);
+        } else {
+          var replaceWithStr = cm.getRange(curStart, curEnd);
           //replace all characters in range by selected, but keep linebreaks
-          replaceWithStr=replaceWithStr.replace(/[^\n]/g,replaceWith);
-          cm.replaceRange(replaceWithStr, curStart, curEnd);
-          if (vim.visualMode){
+          replaceWithStr = replaceWithStr.replace(/[^\n]/g, replaceWith);
+          if (vim.visualBlock) {
+            // Tabs are split in visua block before replacing
+            var spaces = new Array(cm.getOption("tabSize")+1).join(' ');
+            replaceWithStr = cm.getSelection();
+            replaceWithStr = replaceWithStr.replace(/\t/g, spaces).replace(/[^\n]/g, replaceWith).split('\n');
+            cm.replaceSelections(replaceWithStr);
+          } else {
+            cm.replaceRange(replaceWithStr, curStart, curEnd);
+          }
+          if (vim.visualMode) {
+            curStart = cursorIsBefore(selections[0].anchor, selections[0].head) ?
+                         selections[0].anchor : selections[0].head;
             cm.setCursor(curStart);
-            exitVisualMode(cm);
-          }else{
+            exitVisualMode(cm, false);
+          } else {
             cm.setCursor(offsetCursor(curEnd, 0, -1));
           }
         }
@@ -2215,24 +2598,13 @@
         }
         repeatLastEdit(cm, vim, repeat, false /** repeatForInsert */);
       },
-      changeCase: function(cm, actionArgs, vim) {
-        var selectedAreaRange = getSelectedAreaRange(cm, vim);
-        var selectionStart = selectedAreaRange[0];
-        var selectionEnd = selectedAreaRange[1];
-        var toLower = actionArgs.toLower;
-        if (cursorIsBefore(selectionEnd, selectionStart)) {
-          var tmp = selectionStart;
-          selectionStart = selectionEnd;
-          selectionEnd = tmp;
-        } else {
-          selectionEnd = cm.clipPos(Pos(selectionEnd.line, selectionEnd.ch+1));
-        }
-        var text = cm.getRange(selectionStart, selectionEnd);
-        cm.replaceRange(toLower ? text.toLowerCase() : text.toUpperCase(), selectionStart, selectionEnd);
-        cm.setCursor(selectionStart);
-      }
+      exitInsertMode: exitInsertMode
     };
 
+    function defineAction(name, fn) {
+      actions[name] = fn;
+    }
+
     /*
      * Below are miscellaneous utility functions used by vim.js
      */
@@ -2258,16 +2630,66 @@
       return ret;
     }
     function offsetCursor(cur, offsetLine, offsetCh) {
+      if (typeof offsetLine === 'object') {
+        offsetCh = offsetLine.ch;
+        offsetLine = offsetLine.line;
+      }
       return Pos(cur.line + offsetLine, cur.ch + offsetCh);
     }
-    function matchKeysPartial(pressed, mapped) {
-      for (var i = 0; i < pressed.length; i++) {
-        // 'character' means any character. For mark, register commads, etc.
-        if (pressed[i] != mapped[i] && mapped[i] != 'character') {
-          return false;
+    function getOffset(anchor, head) {
+      return {
+        line: head.line - anchor.line,
+        ch: head.line - anchor.line
+      };
+    }
+    function commandMatches(keys, keyMap, context, inputState) {
+      // Partial matches are not applied. They inform the key handler
+      // that the current key sequence is a subsequence of a valid key
+      // sequence, so that the key buffer is not cleared.
+      var match, partial = [], full = [];
+      for (var i = 0; i < keyMap.length; i++) {
+        var command = keyMap[i];
+        if (context == 'insert' && command.context != 'insert' ||
+            command.context && command.context != context ||
+            inputState.operator && command.type == 'action' ||
+            !(match = commandMatch(keys, command.keys))) { continue; }
+        if (match == 'partial') { partial.push(command); }
+        if (match == 'full') { full.push(command); }
+      }
+      return {
+        partial: partial.length && partial,
+        full: full.length && full
+      };
+    }
+    function commandMatch(pressed, mapped) {
+      if (mapped.slice(-11) == '<character>') {
+        // Last character matches anything.
+        var prefixLen = mapped.length - 11;
+        var pressedPrefix = pressed.slice(0, prefixLen);
+        var mappedPrefix = mapped.slice(0, prefixLen);
+        return pressedPrefix == mappedPrefix && pressed.length > prefixLen ? 'full' :
+               mappedPrefix.indexOf(pressedPrefix) == 0 ? 'partial' : false;
+      } else {
+        return pressed == mapped ? 'full' :
+               mapped.indexOf(pressed) == 0 ? 'partial' : false;
+      }
+    }
+    function lastChar(keys) {
+      var match = /^.*(<[\w\-]+>)$/.exec(keys);
+      var selectedCharacter = match ? match[1] : keys.slice(-1);
+      if (selectedCharacter.length > 1){
+        switch(selectedCharacter){
+          case '<CR>':
+            selectedCharacter='\n';
+            break;
+          case '<Space>':
+            selectedCharacter=' ';
+            break;
+          default:
+            break;
         }
       }
-      return true;
+      return selectedCharacter;
     }
     function repeatFn(cm, fn, repeat) {
       return function() {
@@ -2291,7 +2713,19 @@
       }
       return false;
     }
-    function cusrorIsBetween(cur1, cur2, cur3) {
+    function cursorMin(cur1, cur2) {
+      if (arguments.length > 2) {
+        cur2 = cursorMin.apply(undefined, Array.prototype.slice.call(arguments, 1));
+      }
+      return cursorIsBefore(cur1, cur2) ? cur1 : cur2;
+    }
+    function cursorMax(cur1, cur2) {
+      if (arguments.length > 2) {
+        cur2 = cursorMax.apply(undefined, Array.prototype.slice.call(arguments, 1));
+      }
+      return cursorIsBefore(cur1, cur2) ? cur2 : cur1;
+    }
+    function cursorIsBetween(cur1, cur2, cur3) {
       // returns true if cur2 is between cur1 and cur3.
       var cur1before2 = cursorIsBefore(cur1, cur2);
       var cur2before3 = cursorIsBefore(cur2, cur3);
@@ -2300,9 +2734,6 @@
     function lineLength(cm, lineNum) {
       return cm.getLine(lineNum).length;
     }
-    function reverse(s){
-      return s.split('').reverse().join('');
-    }
     function trim(s) {
       if (s.trim) {
         return s.trim();
@@ -2312,41 +2743,254 @@
     function escapeRegex(s) {
       return s.replace(/([.?*+$\[\]\/\\(){}|\-])/g, '\\$1');
     }
-    function getSelectedAreaRange(cm, vim) {
-      var selectionStart = cm.getCursor('anchor');
-      var selectionEnd = cm.getCursor('head');
-      var lastSelection = vim.lastSelection;
-      if (!vim.visualMode) {
-        var line = lastSelection.curEnd.line - lastSelection.curStart.line;
-        var ch = line ? lastSelection.curEnd.ch : lastSelection.curEnd.ch - lastSelection.curStart.ch;
-        selectionEnd = {line: selectionEnd.line + line, ch: line ? selectionEnd.ch : ch + selectionEnd.ch};
-        if (lastSelection.visualLine) {
-          return [{line: selectionStart.line, ch: 0}, {line: selectionEnd.line, ch: lineLength(cm, selectionEnd.line)}];
-        }
-      } else {
-        exitVisualMode(cm);
+    function extendLineToColumn(cm, lineNum, column) {
+      var endCh = lineLength(cm, lineNum);
+      var spaces = new Array(column-endCh+1).join(' ');
+      cm.setCursor(Pos(lineNum, endCh));
+      cm.replaceRange(spaces, cm.getCursor());
+    }
+    // This functions selects a rectangular block
+    // of text with selectionEnd as any of its corner
+    // Height of block:
+    // Difference in selectionEnd.line and first/last selection.line
+    // Width of the block:
+    // Distance between selectionEnd.ch and any(first considered here) selection.ch
+    function selectBlock(cm, selectionEnd) {
+      var selections = [], ranges = cm.listSelections();
+      var head = copyCursor(cm.clipPos(selectionEnd));
+      var isClipped = !cursorEqual(selectionEnd, head);
+      var curHead = cm.getCursor('head');
+      var primIndex = getIndex(ranges, curHead);
+      var wasClipped = cursorEqual(ranges[primIndex].head, ranges[primIndex].anchor);
+      var max = ranges.length - 1;
+      var index = max - primIndex > primIndex ? max : 0;
+      var base = ranges[index].anchor;
+
+      var firstLine = Math.min(base.line, head.line);
+      var lastLine = Math.max(base.line, head.line);
+      var baseCh = base.ch, headCh = head.ch;
+
+      var dir = ranges[index].head.ch - baseCh;
+      var newDir = headCh - baseCh;
+      if (dir > 0 && newDir <= 0) {
+        baseCh++;
+        if (!isClipped) { headCh--; }
+      } else if (dir < 0 && newDir >= 0) {
+        baseCh--;
+        if (!wasClipped) { headCh++; }
+      } else if (dir < 0 && newDir == -1) {
+        baseCh--;
+        headCh++;
       }
-      return [selectionStart, selectionEnd];
+      for (var line = firstLine; line <= lastLine; line++) {
+        var range = {anchor: new Pos(line, baseCh), head: new Pos(line, headCh)};
+        selections.push(range);
+      }
+      primIndex = head.line == lastLine ? selections.length - 1 : 0;
+      cm.setSelections(selections);
+      selectionEnd.ch = headCh;
+      base.ch = baseCh;
+      return base;
+    }
+    function selectForInsert(cm, head, height) {
+      var sel = [];
+      for (var i = 0; i < height; i++) {
+        var lineHead = offsetCursor(head, i, 0);
+        sel.push({anchor: lineHead, head: lineHead});
+      }
+      cm.setSelections(sel, 0);
+    }
+    // getIndex returns the index of the cursor in the selections.
+    function getIndex(ranges, cursor, end) {
+      for (var i = 0; i < ranges.length; i++) {
+        var atAnchor = end != 'head' && cursorEqual(ranges[i].anchor, cursor);
+        var atHead = end != 'anchor' && cursorEqual(ranges[i].head, cursor);
+        if (atAnchor || atHead) {
+          return i;
+        }
+      }
+      return -1;
+    }
+    function getSelectedAreaRange(cm, vim) {
+      var lastSelection = vim.lastSelection;
+      var getCurrentSelectedAreaRange = function() {
+        var selections = cm.listSelections();
+        var start =  selections[0];
+        var end = selections[selections.length-1];
+        var selectionStart = cursorIsBefore(start.anchor, start.head) ? start.anchor : start.head;
+        var selectionEnd = cursorIsBefore(end.anchor, end.head) ? end.head : end.anchor;
+        return [selectionStart, selectionEnd];
+      };
+      var getLastSelectedAreaRange = function() {
+        var selectionStart = cm.getCursor();
+        var selectionEnd = cm.getCursor();
+        var block = lastSelection.visualBlock;
+        if (block) {
+          var width = block.width;
+          var height = block.height;
+          selectionEnd = Pos(selectionStart.line + height, selectionStart.ch + width);
+          var selections = [];
+          // selectBlock creates a 'proper' rectangular block.
+          // We do not want that in all cases, so we manually set selections.
+          for (var i = selectionStart.line; i < selectionEnd.line; i++) {
+            var anchor = Pos(i, selectionStart.ch);
+            var head = Pos(i, selectionEnd.ch);
+            var range = {anchor: anchor, head: head};
+            selections.push(range);
+          }
+          cm.setSelections(selections);
+        } else {
+          var start = lastSelection.anchorMark.find();
+          var end = lastSelection.headMark.find();
+          var line = end.line - start.line;
+          var ch = end.ch - start.ch;
+          selectionEnd = {line: selectionEnd.line + line, ch: line ? selectionEnd.ch : ch + selectionEnd.ch};
+          if (lastSelection.visualLine) {
+            selectionStart = Pos(selectionStart.line, 0);
+            selectionEnd = Pos(selectionEnd.line, lineLength(cm, selectionEnd.line));
+          }
+          cm.setSelection(selectionStart, selectionEnd);
+        }
+        return [selectionStart, selectionEnd];
+      };
+      if (!vim.visualMode) {
+      // In case of replaying the action.
+        return getLastSelectedAreaRange();
+      } else {
+        return getCurrentSelectedAreaRange();
+      }
+    }
+    // Updates the previous selection with the current selection's values. This
+    // should only be called in visual mode.
+    function updateLastSelection(cm, vim) {
+      var anchor = vim.sel.anchor;
+      var head = vim.sel.head;
+      // To accommodate the effect of lastPastedText in the last selection
+      if (vim.lastPastedText) {
+        head = cm.posFromIndex(cm.indexFromPos(anchor) + vim.lastPastedText.length);
+        vim.lastPastedText = null;
+      }
+      vim.lastSelection = {'anchorMark': cm.setBookmark(anchor),
+                           'headMark': cm.setBookmark(head),
+                           'anchor': copyCursor(anchor),
+                           'head': copyCursor(head),
+                           'visualMode': vim.visualMode,
+                           'visualLine': vim.visualLine,
+                           'visualBlock': vim.visualBlock};
+    }
+    function expandSelection(cm, start, end) {
+      var sel = cm.state.vim.sel;
+      var head = sel.head;
+      var anchor = sel.anchor;
+      var tmp;
+      if (cursorIsBefore(end, start)) {
+        tmp = end;
+        end = start;
+        start = tmp;
+      }
+      if (cursorIsBefore(head, anchor)) {
+        head = cursorMin(start, head);
+        anchor = cursorMax(anchor, end);
+      } else {
+        anchor = cursorMin(start, anchor);
+        head = cursorMax(head, end);
+        head = offsetCursor(head, 0, -1);
+        if (head.ch == -1 && head.line != cm.firstLine()) {
+          head = Pos(head.line - 1, lineLength(cm, head.line - 1));
+        }
+      }
+      return [anchor, head];
+    }
+    /**
+     * Updates the CodeMirror selection to match the provided vim selection.
+     * If no arguments are given, it uses the current vim selection state.
+     */
+    function updateCmSelection(cm, sel, mode) {
+      var vim = cm.state.vim;
+      sel = sel || vim.sel;
+      var mode = mode ||
+        vim.visualLine ? 'line' : vim.visualBlock ? 'block' : 'char';
+      var cmSel = makeCmSelection(cm, sel, mode);
+      cm.setSelections(cmSel.ranges, cmSel.primary);
+      updateFakeCursor(cm);
+    }
+    function makeCmSelection(cm, sel, mode, exclusive) {
+      var head = copyCursor(sel.head);
+      var anchor = copyCursor(sel.anchor);
+      if (mode == 'char') {
+        var headOffset = !exclusive && !cursorIsBefore(sel.head, sel.anchor) ? 1 : 0;
+        var anchorOffset = cursorIsBefore(sel.head, sel.anchor) ? 1 : 0;
+        head = offsetCursor(sel.head, 0, headOffset);
+        anchor = offsetCursor(sel.anchor, 0, anchorOffset);
+        return {
+          ranges: [{anchor: anchor, head: head}],
+          primary: 0
+        };
+      } else if (mode == 'line') {
+        if (!cursorIsBefore(sel.head, sel.anchor)) {
+          anchor.ch = 0;
+
+          var lastLine = cm.lastLine();
+          if (head.line > lastLine) {
+            head.line = lastLine;
+          }
+          head.ch = lineLength(cm, head.line);
+        } else {
+          head.ch = 0;
+          anchor.ch = lineLength(cm, anchor.line);
+        }
+        return {
+          ranges: [{anchor: anchor, head: head}],
+          primary: 0
+        };
+      } else if (mode == 'block') {
+        var top = Math.min(anchor.line, head.line),
+            left = Math.min(anchor.ch, head.ch),
+            bottom = Math.max(anchor.line, head.line),
+            right = Math.max(anchor.ch, head.ch) + 1;
+        var height = bottom - top + 1;
+        var primary = head.line == top ? 0 : height - 1;
+        var ranges = [];
+        for (var i = 0; i < height; i++) {
+          ranges.push({
+            anchor: Pos(top + i, left),
+            head: Pos(top + i, right)
+          });
+        }
+        return {
+          ranges: ranges,
+          primary: primary
+        };
+      }
+    }
+    function getHead(cm) {
+      var cur = cm.getCursor('head');
+      if (cm.getSelection().length == 1) {
+        // Small corner case when only 1 character is selected. The "real"
+        // head is the left of head and anchor.
+        cur = cursorMin(cur, cm.getCursor('anchor'));
+      }
+      return cur;
     }
 
-    function exitVisualMode(cm) {
-      cm.off('mousedown', exitVisualMode);
+    /**
+     * If moveHead is set to false, the CodeMirror selection will not be
+     * touched. The caller assumes the responsibility of putting the cursor
+    * in the right place.
+     */
+    function exitVisualMode(cm, moveHead) {
       var vim = cm.state.vim;
-      // can't use selection state here because yank has already reset its cursor
-      vim.lastSelection = {'curStart': vim.marks['<'].find(),
-        'curEnd': vim.marks['>'].find(), 'visualMode': vim.visualMode,
-        'visualLine': vim.visualLine};
+      if (moveHead !== false) {
+        cm.setCursor(clipCursorToContent(cm, vim.sel.head));
+      }
+      updateLastSelection(cm, vim);
       vim.visualMode = false;
       vim.visualLine = false;
-      var selectionStart = cm.getCursor('anchor');
-      var selectionEnd = cm.getCursor('head');
-      if (!cursorEqual(selectionStart, selectionEnd)) {
-        // Clear the selection and set the cursor only if the selection has not
-        // already been cleared. Otherwise we risk moving the cursor somewhere
-        // it's not supposed to be.
-        cm.setCursor(clipCursorToContent(cm, selectionEnd));
-      }
+      vim.visualBlock = false;
       CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
+      if (vim.fakeCursor) {
+        vim.fakeCursor.clear();
+      }
     }
 
     // Remove any trailing newlines from the selection. For
@@ -2397,65 +3041,44 @@
     }
 
     function expandWordUnderCursor(cm, inclusive, _forward, bigWord, noSymbol) {
-      var cur = cm.getCursor();
+      var cur = getHead(cm);
       var line = cm.getLine(cur.line);
       var idx = cur.ch;
 
       // Seek to first word or non-whitespace character, depending on if
       // noSymbol is true.
-      var textAfterIdx = line.substring(idx);
-      var firstMatchedChar;
-      if (noSymbol) {
-        firstMatchedChar = textAfterIdx.search(/\w/);
-      } else {
-        firstMatchedChar = textAfterIdx.search(/\S/);
+      var test = noSymbol ? wordCharTest[0] : bigWordCharTest [0];
+      while (!test(line.charAt(idx))) {
+        idx++;
+        if (idx >= line.length) { return null; }
       }
-      if (firstMatchedChar == -1) {
-        return null;
-      }
-      idx += firstMatchedChar;
-      textAfterIdx = line.substring(idx);
-      var textBeforeIdx = line.substring(0, idx);
 
-      var matchRegex;
-      // Greedy matchers for the "word" we are trying to expand.
       if (bigWord) {
-        matchRegex = /^\S+/;
+        test = bigWordCharTest[0];
       } else {
-        if ((/\w/).test(line.charAt(idx))) {
-          matchRegex = /^\w+/;
-        } else {
-          matchRegex = /^[^\w\s]+/;
+        test = wordCharTest[0];
+        if (!test(line.charAt(idx))) {
+          test = wordCharTest[1];
         }
       }
 
-      var wordAfterRegex = matchRegex.exec(textAfterIdx);
-      var wordStart = idx;
-      var wordEnd = idx + wordAfterRegex[0].length;
-      // TODO: Find a better way to do this. It will be slow on very long lines.
-      var revTextBeforeIdx = reverse(textBeforeIdx);
-      var wordBeforeRegex = matchRegex.exec(revTextBeforeIdx);
-      if (wordBeforeRegex) {
-        wordStart -= wordBeforeRegex[0].length;
-      }
+      var end = idx, start = idx;
+      while (test(line.charAt(end)) && end < line.length) { end++; }
+      while (test(line.charAt(start)) && start >= 0) { start--; }
+      start++;
 
       if (inclusive) {
-        // If present, trim all whitespace after word.
-        // Otherwise, trim all whitespace before word.
-        var textAfterWordEnd = line.substring(wordEnd);
-        var whitespacesAfterWord = textAfterWordEnd.match(/^\s*/)[0].length;
-        if (whitespacesAfterWord > 0) {
-          wordEnd += whitespacesAfterWord;
-        } else {
-          var revTrim = revTextBeforeIdx.length - wordStart;
-          var textBeforeWordStart = revTextBeforeIdx.substring(revTrim);
-          var whitespacesBeforeWord = textBeforeWordStart.match(/^\s*/)[0].length;
-          wordStart -= whitespacesBeforeWord;
+        // If present, include all whitespace after word.
+        // Otherwise, include all whitespace before word, except indentation.
+        var wordEnd = end;
+        while (/\s/.test(line.charAt(end)) && end < line.length) { end++; }
+        if (wordEnd == end) {
+          var wordStart = start;
+          while (/\s/.test(line.charAt(start - 1)) && start > 0) { start--; }
+          if (!start) { start = wordStart; }
         }
       }
-
-      return { start: Pos(cur.line, wordStart),
-               end: Pos(cur.line, wordEnd) };
+      return { start: Pos(cur.line, start), end: Pos(cur.line, end) };
     }
 
     function recordJumpPosition(cm, oldCur, newCur) {
@@ -2591,7 +3214,7 @@
       return cur;
     }
 
-    /*
+    /**
      * Returns the boundaries of the next word. If the cursor in the middle of
      * the word, then returns the boundaries of the current word, starting at
      * the cursor. If the cursor is at the start/end of a word, and we are going
@@ -2613,7 +3236,7 @@
       var pos = cur.ch;
       var line = cm.getLine(lineNum);
       var dir = forward ? 1 : -1;
-      var regexps = bigWord ? bigWordRegexp : wordRegexp;
+      var charTests = bigWord ? bigWordCharTest: wordCharTest;
 
       if (emptyLineIsWord && line == '') {
         lineNum += dir;
@@ -2633,11 +3256,11 @@
         // Find bounds of next word.
         while (pos != stop) {
           var foundWord = false;
-          for (var i = 0; i < regexps.length && !foundWord; ++i) {
-            if (regexps[i].test(line.charAt(pos))) {
+          for (var i = 0; i < charTests.length && !foundWord; ++i) {
+            if (charTests[i](line.charAt(pos))) {
               wordStart = pos;
               // Advance to end of word.
-              while (pos != stop && regexps[i].test(line.charAt(pos))) {
+              while (pos != stop && charTests[i](line.charAt(pos))) {
                 pos += dir;
               }
               wordEnd = pos;
@@ -2672,6 +3295,7 @@
 
     /**
      * @param {CodeMirror} cm CodeMirror object.
+     * @param {Pos} cur The position to start from.
      * @param {int} repeat Number of words to move past.
      * @param {boolean} forward True to search forward. False to search
      *     backward.
@@ -2681,8 +3305,7 @@
      *     False if only alphabet characters count as part of the word.
      * @return {Cursor} The position the cursor should move to.
      */
-    function moveToWord(cm, repeat, forward, wordEnd, bigWord) {
-      var cur = cm.getCursor();
+    function moveToWord(cm, cur, repeat, forward, wordEnd, bigWord) {
       var curStart = copyCursor(cur);
       var words = [];
       if (forward && !wordEnd || !forward && wordEnd) {
@@ -2780,10 +3403,58 @@
       return idx;
     }
 
+    function findParagraph(cm, head, repeat, dir, inclusive) {
+      var line = head.line;
+      var min = cm.firstLine();
+      var max = cm.lastLine();
+      var start, end, i = line;
+      function isEmpty(i) { return !cm.getLine(i); }
+      function isBoundary(i, dir, any) {
+        if (any) { return isEmpty(i) != isEmpty(i + dir); }
+        return !isEmpty(i) && isEmpty(i + dir);
+      }
+      if (dir) {
+        while (min <= i && i <= max && repeat > 0) {
+          if (isBoundary(i, dir)) { repeat--; }
+          i += dir;
+        }
+        return new Pos(i, 0);
+      }
+
+      var vim = cm.state.vim;
+      if (vim.visualLine && isBoundary(line, 1, true)) {
+        var anchor = vim.sel.anchor;
+        if (isBoundary(anchor.line, -1, true)) {
+          if (!inclusive || anchor.line != line) {
+            line += 1;
+          }
+        }
+      }
+      var startState = isEmpty(line);
+      for (i = line; i <= max && repeat; i++) {
+        if (isBoundary(i, 1, true)) {
+          if (!inclusive || isEmpty(i) != startState) {
+            repeat--;
+          }
+        }
+      }
+      end = new Pos(i, 0);
+      // select boundary before paragraph for the last one
+      if (i > max && !startState) { startState = true; }
+      else { inclusive = false; }
+      for (i = line; i > min; i--) {
+        if (!inclusive || isEmpty(i) == startState || i == line) {
+          if (isBoundary(i, -1, true)) { break; }
+        }
+      }
+      start = new Pos(i, 0);
+      return { start: start, end: end };
+    }
+
     // TODO: perhaps this finagling of start and end positions belonds
     // in codmirror/replaceRange?
-    function selectCompanionObject(cm, symb, inclusive) {
-      var cur = cm.getCursor(), start, end;
+    function selectCompanionObject(cm, head, symb, inclusive) {
+      var cur = head, start, end;
 
       var bracketRegexp = ({
         '(': /[()]/, ')': /[()]/,
@@ -2827,8 +3498,8 @@
     // Takes in a symbol and a cursor and tries to simulate text objects that
     // have identical opening and closing symbols
     // TODO support across multiple lines
-    function findBeginningAndEnd(cm, symb, inclusive) {
-      var cur = copyCursor(cm.getCursor());
+    function findBeginningAndEnd(cm, head, symb, inclusive) {
+      var cur = copyCursor(head);
       var line = cm.getLine(cur.line);
       var chars = line.split('');
       var start, end, i, len;
@@ -2906,6 +3577,12 @@
       },
       setReversed: function(reversed) {
         vimGlobalState.isReversed = reversed;
+      },
+      getScrollbarAnnotate: function() {
+        return this.annotate;
+      },
+      setScrollbarAnnotate: function(annotate) {
+        this.annotate = annotate;
       }
     };
     function getSearchState(cm) {
@@ -2915,12 +3592,25 @@
     function dialog(cm, template, shortText, onClose, options) {
       if (cm.openDialog) {
         cm.openDialog(template, onClose, { bottom: true, value: options.value,
-            onKeyDown: options.onKeyDown, onKeyUp: options.onKeyUp });
+            onKeyDown: options.onKeyDown, onKeyUp: options.onKeyUp,
+            selectValueOnOpen: false});
       }
       else {
         onClose(prompt(shortText, ''));
       }
     }
+    function splitBySlash(argString) {
+      var slashes = findUnescapedSlashes(argString) || [];
+      if (!slashes.length) return [];
+      var tokens = [];
+      // in case of strings like foo/bar
+      if (slashes[0] !== 0) return;
+      for (var i = 0; i < slashes.length; i++) {
+        if (typeof slashes[i] == 'number')
+          tokens.push(argString.substring(slashes[i] + 1, slashes[i+1]));
+      }
+      return tokens;
+    }
 
     function findUnescapedSlashes(str) {
       var escapeNextChar = false;
@@ -2977,13 +3667,17 @@
     // Translates the replace part of a search and replace from ex (vim) syntax into
     // javascript form.  Similar to translateRegex, but additionally fixes back references
     // (translates '\[0..9]' to '$[0..9]') and follows different rules for escaping '$'.
+    var charUnescapes = {'\\n': '\n', '\\r': '\r', '\\t': '\t'};
     function translateRegexReplace(str) {
       var escapeNextChar = false;
       var out = [];
       for (var i = -1; i < str.length; i++) {
         var c = str.charAt(i) || '';
         var n = str.charAt(i+1) || '';
-        if (escapeNextChar) {
+        if (charUnescapes[c + n]) {
+          out.push(charUnescapes[c+n]);
+          i++;
+        } else if (escapeNextChar) {
           // At any point in the loop, escapeNextChar is true if the previous
           // character was a '\' and was not escaped.
           out.push(c);
@@ -3011,6 +3705,7 @@
     }
 
     // Unescape \ and / in the replace part, for PCRE mode.
+    var unescapes = {'\\/': '/', '\\\\': '\\', '\\n': '\n', '\\r': '\r', '\\t': '\t'};
     function unescapeRegexReplace(str) {
       var stream = new CodeMirror.StringStream(str);
       var output = [];
@@ -3019,13 +3714,15 @@
         while (stream.peek() && stream.peek() != '\\') {
           output.push(stream.next());
         }
-        if (stream.match('\\/', true)) {
-          // \/ => /
-          output.push('/');
-        } else if (stream.match('\\\\', true)) {
-          // \\ => \
-          output.push('\\');
-        } else {
+        var matched = false;
+        for (var matcher in unescapes) {
+          if (stream.match(matcher, true)) {
+            matched = true;
+            output.push(unescapes[matcher]);
+            break;
+          }
+        }
+        if (!matched) {
           // Don't change anything
           output.push(stream.next());
         }
@@ -3044,6 +3741,9 @@
      *   through to the Regex object.
      */
     function parseQuery(query, ignoreCase, smartCase) {
+      // First update the last search register
+      var lastSearchRegister = vimGlobalState.registerController.getRegister('/');
+      lastSearchRegister.setText(query);
       // Check if the query is already a regex.
       if (query instanceof RegExp) { return query; }
       // First try to extract regex + flags from the input. If no flags found,
@@ -3169,14 +3869,21 @@
       };
     }
     function highlightSearchMatches(cm, query) {
-      var overlay = getSearchState(cm).getOverlay();
+      var searchState = getSearchState(cm);
+      var overlay = searchState.getOverlay();
       if (!overlay || query != overlay.query) {
         if (overlay) {
           cm.removeOverlay(overlay);
         }
         overlay = searchOverlay(query);
         cm.addOverlay(overlay);
-        getSearchState(cm).setOverlay(overlay);
+        if (cm.showMatchesOnScrollbar) {
+          if (searchState.getScrollbarAnnotate()) {
+            searchState.getScrollbarAnnotate().clear();
+          }
+          searchState.setScrollbarAnnotate(cm.showMatchesOnScrollbar(query));
+        }
+        searchState.setOverlay(overlay);
       }
     }
     function findNext(cm, prev, query, repeat) {
@@ -3201,8 +3908,13 @@
       });
     }
     function clearSearchHighlight(cm) {
+      var state = getSearchState(cm);
       cm.removeOverlay(getSearchState(cm).getOverlay());
-      getSearchState(cm).setOverlay(null);
+      state.setOverlay(null);
+      if (state.getScrollbarAnnotate()) {
+        state.getScrollbarAnnotate().clear();
+        state.setScrollbarAnnotate(null);
+      }
     }
     /**
      * Check if pos is in the specified range, INCLUSIVE.
@@ -3240,30 +3952,18 @@
       return {top: from.line, bottom: to.line};
     }
 
-    // Ex command handling
-    // Care must be taken when adding to the default Ex command map. For any
-    // pair of commands that have a shared prefix, at least one of their
-    // shortNames must not match the prefix of the other command.
-    var defaultExCommandMap = [
-      { name: 'map' },
-      { name: 'nmap', shortName: 'nm' },
-      { name: 'vmap', shortName: 'vm' },
-      { name: 'unmap' },
-      { name: 'write', shortName: 'w' },
-      { name: 'undo', shortName: 'u' },
-      { name: 'redo', shortName: 'red' },
-      { name: 'set', shortName: 'set' },
-      { name: 'sort', shortName: 'sor' },
-      { name: 'substitute', shortName: 's' },
-      { name: 'nohlsearch', shortName: 'noh' },
-      { name: 'delmarks', shortName: 'delm' },
-      { name: 'registers', shortName: 'reg', excludeFromCommandHistory: true }
-    ];
-    Vim.ExCommandDispatcher = function() {
+    var ExCommandDispatcher = function() {
       this.buildCommandMap_();
     };
-    Vim.ExCommandDispatcher.prototype = {
-      processCommand: function(cm, input) {
+    ExCommandDispatcher.prototype = {
+      processCommand: function(cm, input, opt_params) {
+        var that = this;
+        cm.operation(function () {
+          cm.curOp.isVimOp = true;
+          that._processCommand(cm, input, opt_params);
+        });
+      },
+      _processCommand: function(cm, input, opt_params) {
         var vim = cm.state.vim;
         var commandHistoryRegister = vimGlobalState.registerController.getRegister(':');
         var previousCommand = commandHistoryRegister.toString();
@@ -3273,7 +3973,7 @@
         var inputStream = new CodeMirror.StringStream(input);
         // update ": with the latest command whether valid or invalid
         commandHistoryRegister.setText(input);
-        var params = {};
+        var params = opt_params || {};
         params.input = input;
         try {
           this.parseInput_(cm, inputStream, params);
@@ -3281,6 +3981,7 @@
           showConfirm(cm, e);
           throw e;
         }
+        var command;
         var commandName;
         if (!params.commandName) {
           // If only a line range is defined, move to the line.
@@ -3288,7 +3989,7 @@
             commandName = 'move';
           }
         } else {
-          var command = this.matchCommand_(params.commandName);
+          command = this.matchCommand_(params.commandName);
           if (command) {
             commandName = command.name;
             if (command.excludeFromCommandHistory) {
@@ -3298,7 +3999,7 @@
             if (command.type == 'exToKey') {
               // Handle Ex to Key mapping.
               for (var i = 0; i < command.toKeys.length; i++) {
-                CodeMirror.Vim.handleKey(cm, command.toKeys[i]);
+                CodeMirror.Vim.handleKey(cm, command.toKeys[i], 'mapping');
               }
               return;
             } else if (command.type == 'exToEx') {
@@ -3314,6 +4015,12 @@
         }
         try {
           exCommands[commandName](cm, params);
+          // Possibly asynchronous commands (e.g. substitute, which might have a
+          // user confirmation), are responsible for calling the callback when
+          // done. All others have it taken care of for them here.
+          if ((!command || !command.possiblyAsync) && params.callback) {
+            params.callback();
+          }
         } catch(e) {
           showConfirm(cm, e);
           throw e;
@@ -3416,7 +4123,7 @@
             this.commandMap_[commandName] = {
               name: commandName,
               type: 'exToKey',
-              toKeys: parseKeyString(rhs),
+              toKeys: rhs,
               user: true
             };
           }
@@ -3424,7 +4131,7 @@
           if (rhs != ':' && rhs.charAt(0) == ':') {
             // Key to Ex mapping.
             var mapping = {
-              keys: parseKeyString(lhs),
+              keys: lhs,
               type: 'keyToEx',
               exArgs: { input: rhs.substring(1) },
               user: true};
@@ -3433,9 +4140,9 @@
           } else {
             // Key to key mapping
             var mapping = {
-              keys: parseKeyString(lhs),
+              keys: lhs,
               type: 'keyToKey',
-              toKeys: parseKeyString(rhs),
+              toKeys: rhs,
               user: true
             };
             if (ctx) { mapping.context = ctx; }
@@ -3444,15 +4151,6 @@
         }
       },
       unmap: function(lhs, ctx) {
-        var arrayEquals = function(a, b) {
-          if (a === b) return true;
-          if (a == null || b == null) return true;
-          if (a.length != b.length) return false;
-          for (var i = 0; i < a.length; i++) {
-            if (a[i] !== b[i]) return false;
-          }
-          return true;
-        };
         if (lhs != ':' && lhs.charAt(0) == ':') {
           // Ex to Ex or Ex to key mapping
           if (ctx) { throw Error('Mode not supported for ex mappings'); }
@@ -3463,9 +4161,9 @@
           }
         } else {
           // Key to Ex or key to key mapping
-          var keys = parseKeyString(lhs);
+          var keys = lhs;
           for (var i = 0; i < defaultKeymap.length; i++) {
-            if (arrayEquals(keys, defaultKeymap[i].keys)
+            if (keys == defaultKeymap[i].keys
                 && defaultKeymap[i].context === ctx
                 && defaultKeymap[i].user) {
               defaultKeymap.splice(i, 1);
@@ -3477,22 +4175,14 @@
       }
     };
 
-    // Converts a key string sequence of the form a<C-w>bd<Left> into Vim's
-    // keymap representation.
-    function parseKeyString(str) {
-      var key, match;
-      var keys = [];
-      while (str) {
-        match = (/<\w+-.+?>|<\w+>|./).exec(str);
-        if (match === null)break;
-        key = match[0];
-        str = str.substring(match.index + key.length);
-        keys.push(key);
-      }
-      return keys;
-    }
-
     var exCommands = {
+      colorscheme: function(cm, params) {
+        if (!params.args || params.args.length < 1) {
+          showConfirm(cm, cm.getOption('theme'));
+          return;
+        }
+        cm.setOption('theme', params.args[0]);
+      },
       map: function(cm, params, ctx) {
         var mapArgs = params.args;
         if (!mapArgs || mapArgs.length < 2) {
@@ -3503,6 +4193,7 @@
         }
         exCommandDispatcher.map(mapArgs[0], mapArgs[1], ctx);
       },
+      imap: function(cm, params) { this.map(cm, params, 'insert'); },
       nmap: function(cm, params) { this.map(cm, params, 'normal'); },
       vmap: function(cm, params) { this.map(cm, params, 'visual'); },
       unmap: function(cm, params, ctx) {
@@ -3525,6 +4216,9 @@
       },
       set: function(cm, params) {
         var setArgs = params.args;
+        // Options passed through to the setOption/getOption calls. May be passed in by the
+        // local/global versions of the set command
+        var setCfg = params.setCfg || {};
         if (!setArgs || setArgs.length < 1) {
           if (cm) {
             showConfirm(cm, 'Invalid mapping: ' + params.input);
@@ -3548,24 +4242,35 @@
           optionName = optionName.substring(2);
           value = false;
         }
+
         var optionIsBoolean = options[optionName] && options[optionName].type == 'boolean';
         if (optionIsBoolean && value == undefined) {
           // Calling set with a boolean option sets it to true.
           value = true;
         }
-        if (!optionIsBoolean && !value || forceGet) {
-          var oldValue = getOption(optionName);
-          // If no value is provided, then we assume this is a get.
+        // If no value is provided, then we assume this is a get.
+        if (!optionIsBoolean && value === undefined || forceGet) {
+          var oldValue = getOption(optionName, cm, setCfg);
           if (oldValue === true || oldValue === false) {
             showConfirm(cm, ' ' + (oldValue ? '' : 'no') + optionName);
           } else {
             showConfirm(cm, '  ' + optionName + '=' + oldValue);
           }
         } else {
-          setOption(optionName, value);
+          setOption(optionName, value, cm, setCfg);
         }
       },
-      registers: function(cm,params) {
+      setlocal: function (cm, params) {
+        // setCfg is passed through to setOption
+        params.setCfg = {scope: 'local'};
+        this.set(cm, params);
+      },
+      setglobal: function (cm, params) {
+        // setCfg is passed through to setOption
+        params.setCfg = {scope: 'global'};
+        this.set(cm, params);
+      },
+      registers: function(cm, params) {
         var regArgs = params.args;
         var registers = vimGlobalState.registerController.registers;
         var regInfo = '----------Registers----------<br><br>';
@@ -3609,7 +4314,7 @@
               if (decimal + hex + octal > 1) { return 'Invalid arguments'; }
               number = decimal && 'decimal' || hex && 'hex' || octal && 'octal';
             }
-            if (args.eatSpace() && args.match(/\/.*\//)) { 'patterns not supported'; }
+            if (args.match(/\/.*\//)) { return 'patterns not supported'; }
           }
         }
         var err = parseArgs();
@@ -3665,26 +4370,78 @@
         }
         cm.replaceRange(text.join('\n'), curStart, curEnd);
       },
+      global: function(cm, params) {
+        // a global command is of the form
+        // :[range]g/pattern/[cmd]
+        // argString holds the string /pattern/[cmd]
+        var argString = params.argString;
+        if (!argString) {
+          showConfirm(cm, 'Regular Expression missing from global');
+          return;
+        }
+        // range is specified here
+        var lineStart = (params.line !== undefined) ? params.line : cm.firstLine();
+        var lineEnd = params.lineEnd || params.line || cm.lastLine();
+        // get the tokens from argString
+        var tokens = splitBySlash(argString);
+        var regexPart = argString, cmd;
+        if (tokens.length) {
+          regexPart = tokens[0];
+          cmd = tokens.slice(1, tokens.length).join('/');
+        }
+        if (regexPart) {
+          // If regex part is empty, then use the previous query. Otherwise
+          // use the regex part as the new query.
+          try {
+           updateSearchQuery(cm, regexPart, true /** ignoreCase */,
+             true /** smartCase */);
+          } catch (e) {
+           showConfirm(cm, 'Invalid regex: ' + regexPart);
+           return;
+          }
+        }
+        // now that we have the regexPart, search for regex matches in the
+        // specified range of lines
+        var query = getSearchState(cm).getQuery();
+        var matchedLines = [], content = '';
+        for (var i = lineStart; i <= lineEnd; i++) {
+          var matched = query.test(cm.getLine(i));
+          if (matched) {
+            matchedLines.push(i+1);
+            content+= cm.getLine(i) + '<br>';
+          }
+        }
+        // if there is no [cmd], just display the list of matched lines
+        if (!cmd) {
+          showConfirm(cm, content);
+          return;
+        }
+        var index = 0;
+        var nextCommand = function() {
+          if (index < matchedLines.length) {
+            var command = matchedLines[index] + cmd;
+            exCommandDispatcher.processCommand(cm, command, {
+              callback: nextCommand
+            });
+          }
+          index++;
+        };
+        nextCommand();
+      },
       substitute: function(cm, params) {
         if (!cm.getSearchCursor) {
           throw new Error('Search feature not available. Requires searchcursor.js or ' +
               'any other getSearchCursor implementation.');
         }
         var argString = params.argString;
-        var slashes = argString ? findUnescapedSlashes(argString) : [];
-        var replacePart = '';
-        if (slashes.length) {
-          if (slashes[0] !== 0) {
-            showConfirm(cm, 'Substitutions should be of the form ' +
-                ':s/pattern/replace/');
-            return;
-          }
-          var regexPart = argString.substring(slashes[0] + 1, slashes[1]);
-          var flagsPart;
-          var count;
-          var confirm = false; // Whether to confirm each replace.
-          if (slashes[1]) {
-            replacePart = argString.substring(slashes[1] + 1, slashes[2]);
+        var tokens = argString ? splitBySlash(argString) : [];
+        var regexPart, replacePart = '', trailing, flagsPart, count;
+        var confirm = false; // Whether to confirm each replace.
+        var global = false; // True to replace all instances on a line, false to replace only 1.
+        if (tokens.length) {
+          regexPart = tokens[0];
+          replacePart = tokens[1];
+          if (replacePart !== undefined) {
             if (getOption('pcre')) {
               replacePart = unescapeRegexReplace(replacePart);
             } else {
@@ -3692,18 +4449,31 @@
             }
             vimGlobalState.lastSubstituteReplacePart = replacePart;
           }
-          if (slashes[2]) {
-            // After the 3rd slash, we can have flags followed by a space followed
-            // by count.
-            var trailing = argString.substring(slashes[2] + 1).split(' ');
-            flagsPart = trailing[0];
-            count = parseInt(trailing[1]);
+          trailing = tokens[2] ? tokens[2].split(' ') : [];
+        } else {
+          // either the argString is empty or its of the form ' hello/world'
+          // actually splitBySlash returns a list of tokens
+          // only if the string starts with a '/'
+          if (argString && argString.length) {
+            showConfirm(cm, 'Substitutions should be of the form ' +
+                ':s/pattern/replace/');
+            return;
           }
+        }
+        // After the 3rd slash, we can have flags followed by a space followed
+        // by count.
+        if (trailing) {
+          flagsPart = trailing[0];
+          count = parseInt(trailing[1]);
           if (flagsPart) {
             if (flagsPart.indexOf('c') != -1) {
               confirm = true;
               flagsPart.replace('c', '');
             }
+            if (flagsPart.indexOf('g') != -1) {
+              global = true;
+              flagsPart.replace('g', '');
+            }
             regexPart = regexPart + '/' + flagsPart;
           }
         }
@@ -3727,13 +4497,16 @@
         var query = state.getQuery();
         var lineStart = (params.line !== undefined) ? params.line : cm.getCursor().line;
         var lineEnd = params.lineEnd || lineStart;
+        if (lineStart == cm.firstLine() && lineEnd == cm.lastLine()) {
+          lineEnd = Infinity;
+        }
         if (count) {
           lineStart = lineEnd;
           lineEnd = lineStart + count - 1;
         }
         var startPos = clipCursorToContent(cm, Pos(lineStart, 0));
         var cursor = cm.getSearchCursor(query, startPos);
-        doReplace(cm, confirm, lineStart, lineEnd, cursor, query, replacePart);
+        doReplace(cm, confirm, global, lineStart, lineEnd, cursor, query, replacePart, params.callback);
       },
       redo: CodeMirror.commands.redo,
       undo: CodeMirror.commands.undo,
@@ -3812,7 +4585,7 @@
       }
     };
 
-    var exCommandDispatcher = new Vim.ExCommandDispatcher();
+    var exCommandDispatcher = new ExCommandDispatcher();
 
     /**
     * @param {CodeMirror} cm CodeMirror instance we are in.
@@ -3822,9 +4595,10 @@
     * @param {RegExp} query Query for performing matches with.
     * @param {string} replaceWith Text to replace matches with. May contain $1,
     *     $2, etc for replacing captured groups using Javascript replace.
+    * @param {function()} callback A callback for when the replace is done.
     */
-    function doReplace(cm, confirm, lineStart, lineEnd, searchCursor, query,
-        replaceWith) {
+    function doReplace(cm, confirm, global, lineStart, lineEnd, searchCursor, query,
+        replaceWith, callback) {
       // Set up all the functions.
       cm.state.vim.exMode = true;
       var done = false;
@@ -3844,17 +4618,20 @@
         searchCursor.replace(newText);
       }
       function next() {
-        var found = searchCursor.findNext();
-        if (!found) {
-          done = true;
-        } else if (isInRange(searchCursor.from(), lineStart, lineEnd)) {
+        // The below only loops to skip over multiple occurrences on the same
+        // line when 'global' is not true.
+        while(searchCursor.findNext() &&
+              isInRange(searchCursor.from(), lineStart, lineEnd)) {
+          if (!global && lastPos && searchCursor.from().line == lastPos.line) {
+            continue;
+          }
           cm.scrollIntoView(searchCursor.from(), 30);
           cm.setSelection(searchCursor.from(), searchCursor.to());
           lastPos = searchCursor.from();
           done = false;
-        } else {
-          done = true;
+          return;
         }
+        done = true;
       }
       function stop(close) {
         if (close) { close(); }
@@ -3865,6 +4642,7 @@
           vim.exMode = false;
           vim.lastHPos = vim.lastHSPos = lastPos.ch;
         }
+        if (callback) { callback(); }
       }
       function onPromptKeyDown(e, _value, close) {
         // Swallow all keys.
@@ -3876,7 +4654,13 @@
           case 'N':
             next(); break;
           case 'A':
-            cm.operation(replaceAll); break;
+            // replaceAll contains a call to close of its own. We don't want it
+            // to fire too early or multiple times.
+            var savedCallback = callback;
+            callback = undefined;
+            cm.operation(replaceAll);
+            callback = savedCallback;
+            break;
           case 'L':
             replace();
             // fall through and exit.
@@ -3888,6 +4672,7 @@
             break;
         }
         if (done) { stop(close); }
+        return true;
       }
 
       // Actually do replace.
@@ -3898,6 +4683,7 @@
       }
       if (!confirm) {
         replaceAll();
+        if (callback) { callback(); };
         return;
       }
       showPrompt(cm, {
@@ -3906,71 +4692,43 @@
       });
     }
 
-    // Register Vim with CodeMirror
-    function buildVimKeyMap() {
-      /**
-       * Handle the raw key event from CodeMirror. Translate the
-       * Shift + key modifier to the resulting letter, while preserving other
-       * modifers.
-       */
-      function cmKeyToVimKey(key, modifier) {
-        var vimKey = key;
-        if (isUpperCase(vimKey) && modifier == 'Ctrl') {
-            vimKey = vimKey.toLowerCase();
-        }
-        if (modifier) {
-          // Vim will parse modifier+key combination as a single key.
-          vimKey = modifier.charAt(0) + '-' + vimKey;
-        }
-        var specialKey = ({Enter:'CR',Backspace:'BS',Delete:'Del'})[vimKey];
-        vimKey = specialKey ? specialKey : vimKey;
-        vimKey = vimKey.length > 1 ? '<'+ vimKey + '>' : vimKey;
-        return vimKey;
-      }
-
-      // Closure to bind CodeMirror, key, modifier.
-      function keyMapper(vimKey) {
-        return function(cm) {
-          CodeMirror.Vim.handleKey(cm, vimKey);
-        };
-      }
-
-      var cmToVimKeymap = {
-        'nofallthrough': true,
-        'style': 'fat-cursor'
-      };
-      function bindKeys(keys, modifier) {
-        for (var i = 0; i < keys.length; i++) {
-          var key = keys[i];
-          if (!modifier && key.length == 1) {
-            // Wrap all keys without modifiers with '' to identify them by their
-            // key characters instead of key identifiers.
-            key = "'" + key + "'";
-          }
-          var vimKey = cmKeyToVimKey(keys[i], modifier);
-          var cmKey = modifier ? modifier + '-' + key : key;
-          cmToVimKeymap[cmKey] = keyMapper(vimKey);
-        }
-      }
-      bindKeys(upperCaseAlphabet);
-      bindKeys(lowerCaseAlphabet);
-      bindKeys(upperCaseAlphabet, 'Ctrl');
-      bindKeys(specialSymbols);
-      bindKeys(specialSymbols, 'Ctrl');
-      bindKeys(numbers);
-      bindKeys(numbers, 'Ctrl');
-      bindKeys(specialKeys);
-      bindKeys(specialKeys, 'Ctrl');
-      return cmToVimKeymap;
-    }
-    CodeMirror.keyMap.vim = buildVimKeyMap();
+    CodeMirror.keyMap.vim = {
+      attach: attachVimMap,
+      detach: detachVimMap,
+      call: cmKey
+    };
 
     function exitInsertMode(cm) {
       var vim = cm.state.vim;
       var macroModeState = vimGlobalState.macroModeState;
       var insertModeChangeRegister = vimGlobalState.registerController.getRegister('.');
       var isPlaying = macroModeState.isPlaying;
+      var lastChange = macroModeState.lastInsertModeChanges;
+      // In case of visual block, the insertModeChanges are not saved as a
+      // single word, so we convert them to a single word
+      // so as to update the ". register as expected in real vim.
+      var text = [];
       if (!isPlaying) {
+        var selLength = lastChange.inVisualBlock ? vim.lastSelection.visualBlock.height : 1;
+        var changes = lastChange.changes;
+        var text = [];
+        var i = 0;
+        // In case of multiple selections in blockwise visual,
+        // the inserted text, for example: 'f<Backspace>oo', is stored as
+        // 'f', 'f', InsertModeKey 'o', 'o', 'o', 'o'. (if you have a block with 2 lines).
+        // We push the contents of the changes array as per the following:
+        // 1. In case of InsertModeKey, just increment by 1.
+        // 2. In case of a character, jump by selLength (2 in the example).
+        while (i < changes.length) {
+          // This loop will convert 'ff<bs>oooo' to 'f<bs>oo'.
+          text.push(changes[i]);
+          if (changes[i] instanceof InsertModeKey) {
+             i++;
+          } else {
+             i+= selLength;
+          }
+        }
+        lastChange.changes = text;
         cm.off('change', onChange);
         CodeMirror.off(cm.getInputField(), 'keydown', onKeyEventTargetKeyDown);
       }
@@ -3987,19 +4745,33 @@
       cm.setOption('disableInput', true);
       cm.toggleOverwrite(false); // exit replace mode if we were in it.
       // update the ". register before exiting insert mode
-      insertModeChangeRegister.setText(macroModeState.lastInsertModeChanges.changes.join(''));
+      insertModeChangeRegister.setText(lastChange.changes.join(''));
       CodeMirror.signal(cm, "vim-mode-change", {mode: "normal"});
       if (macroModeState.isRecording) {
         logInsertModeChange(macroModeState);
       }
     }
 
+    function _mapCommand(command) {
+      defaultKeymap.unshift(command);
+    }
+
+    function mapCommand(keys, type, name, args, extra) {
+      var command = {keys: keys, type: type};
+      command[type] = name;
+      command[type + "Args"] = args;
+      for (var key in extra)
+        command[key] = extra[key];
+      _mapCommand(command);
+    }
+
+    // The timeout in milliseconds for the two-character ESC keymap should be
+    // adjusted according to your typing speed to prevent false positives.
+    defineOption('insertModeEscKeysTimeout', 200, 'number');
+
     CodeMirror.keyMap['vim-insert'] = {
       // TODO: override navigation keys so that Esc will cancel automatic
       // indentation from o, O, i_<CR>
-      'Esc': exitInsertMode,
-      'Ctrl-[': exitInsertMode,
-      'Ctrl-C': exitInsertMode,
       'Ctrl-N': 'autocomplete',
       'Ctrl-P': 'autocomplete',
       'Enter': function(cm) {
@@ -4007,16 +4779,30 @@
             CodeMirror.commands.newlineAndIndent;
         fn(cm);
       },
-      fallthrough: ['default']
+      fallthrough: ['default'],
+      attach: attachVimMap,
+      detach: detachVimMap,
+      call: cmKey
     };
 
     CodeMirror.keyMap['vim-replace'] = {
       'Backspace': 'goCharLeft',
-      fallthrough: ['vim-insert']
+      fallthrough: ['vim-insert'],
+      attach: attachVimMap,
+      detach: detachVimMap,
+      call: cmKey
     };
 
     function executeMacroRegister(cm, vim, macroModeState, registerName) {
       var register = vimGlobalState.registerController.getRegister(registerName);
+      if (registerName == ':') {
+        // Read-only register containing last Ex command.
+        if (register.keyBuffer[0]) {
+          exCommandDispatcher.processCommand(cm, register.keyBuffer[0]);
+        }
+        macroModeState.isPlaying = false;
+        return;
+      }
       var keyBuffer = register.keyBuffer;
       var imc = 0;
       macroModeState.isPlaying = true;
@@ -4030,10 +4816,12 @@
           match = (/<\w+-.+?>|<\w+>|./).exec(text);
           key = match[0];
           text = text.substring(match.index + key.length);
-          CodeMirror.Vim.handleKey(cm, key);
+          CodeMirror.Vim.handleKey(cm, key, 'macro');
           if (vim.insertMode) {
-            repeatInsertModeChanges(
-                cm, register.insertModeChanges[imc++].changes, 1);
+            var changes = register.insertModeChanges[imc++].changes;
+            vimGlobalState.macroModeState.lastInsertModeChanges.changes =
+                changes;
+            repeatInsertModeChanges(cm, changes, 1);
             exitInsertMode(cm);
           }
         }
@@ -4054,7 +4842,7 @@
       if (macroModeState.isPlaying) { return; }
       var registerName = macroModeState.latestRegister;
       var register = vimGlobalState.registerController.getRegister(registerName);
-      if (register) {
+      if (register && register.pushInsertModeChanges) {
         register.pushInsertModeChanges(macroModeState.lastInsertModeChanges);
       }
     }
@@ -4063,7 +4851,7 @@
       if (macroModeState.isPlaying) { return; }
       var registerName = macroModeState.latestRegister;
       var register = vimGlobalState.registerController.getRegister(registerName);
-      if (register) {
+      if (register && register.pushSearchQuery) {
         register.pushSearchQuery(query);
       }
     }
@@ -4105,9 +4893,49 @@
           // Cursor moved outside the context of an edit. Reset the change.
           lastChange.changes = [];
         }
-      } else if (cm.doc.history.lastSelOrigin == '*mouse') {
-        // Reset lastHPos if mouse click was done in normal mode.
-        vim.lastHPos = cm.doc.getCursor().ch;
+      } else if (!cm.curOp.isVimOp) {
+        handleExternalSelection(cm, vim);
+      }
+      if (vim.visualMode) {
+        updateFakeCursor(cm);
+      }
+    }
+    function updateFakeCursor(cm) {
+      var vim = cm.state.vim;
+      var from = clipCursorToContent(cm, copyCursor(vim.sel.head));
+      var to = offsetCursor(from, 0, 1);
+      if (vim.fakeCursor) {
+        vim.fakeCursor.clear();
+      }
+      vim.fakeCursor = cm.markText(from, to, {className: 'cm-animate-fat-cursor'});
+    }
+    function handleExternalSelection(cm, vim) {
+      var anchor = cm.getCursor('anchor');
+      var head = cm.getCursor('head');
+      // Enter or exit visual mode to match mouse selection.
+      if (vim.visualMode && !cm.somethingSelected()) {
+        exitVisualMode(cm, false);
+      } else if (!vim.visualMode && !vim.insertMode && cm.somethingSelected()) {
+        vim.visualMode = true;
+        vim.visualLine = false;
+        CodeMirror.signal(cm, "vim-mode-change", {mode: "visual"});
+      }
+      if (vim.visualMode) {
+        // Bind CodeMirror selection model to vim selection model.
+        // Mouse selections are considered visual characterwise.
+        var headOffset = !cursorIsBefore(head, anchor) ? -1 : 0;
+        var anchorOffset = cursorIsBefore(head, anchor) ? -1 : 0;
+        head = offsetCursor(head, 0, headOffset);
+        anchor = offsetCursor(anchor, 0, anchorOffset);
+        vim.sel = {
+          anchor: anchor,
+          head: head
+        };
+        updateMark(cm, vim, '<', cursorMin(head, anchor));
+        updateMark(cm, vim, '>', cursorMax(head, anchor));
+      } else if (!vim.insertMode) {
+        // Reset lastHPos if selection was modified by something outside of vim mode e.g. by mouse.
+        vim.lastHPos = cm.getCursor().ch;
       }
     }
 
@@ -4125,12 +4953,13 @@
       var macroModeState = vimGlobalState.macroModeState;
       var lastChange = macroModeState.lastInsertModeChanges;
       var keyName = CodeMirror.keyName(e);
+      if (!keyName) { return; }
       function onKeyFound() {
         lastChange.changes.push(new InsertModeKey(keyName));
         return true;
       }
       if (keyName.indexOf('Delete') != -1 || keyName.indexOf('Backspace') != -1) {
-        CodeMirror.lookupKey(keyName, ['vim-insert'], onKeyFound);
+        CodeMirror.lookupKey(keyName, 'vim-insert', onKeyFound);
       }
     }
 
@@ -4161,11 +4990,7 @@
           // insert mode changes. Will conform to that behavior.
           repeat = !vim.lastEditActionCommand ? 1 : repeat;
           var changeObject = macroModeState.lastInsertModeChanges;
-          // This isn't strictly necessary, but since lastInsertModeChanges is
-          // supposed to be immutable during replay, this helps catch bugs.
-          macroModeState.lastInsertModeChanges = {};
           repeatInsertModeChanges(cm, changeObject.changes, repeat);
-          macroModeState.lastInsertModeChanges = changeObject;
         }
       }
       vim.inputState = vim.lastEditInputState;
@@ -4203,17 +5028,34 @@
         }
         return true;
       }
+      var head = cm.getCursor('head');
+      var inVisualBlock = vimGlobalState.macroModeState.lastInsertModeChanges.inVisualBlock;
+      if (inVisualBlock) {
+        // Set up block selection again for repeating the changes.
+        var vim = cm.state.vim;
+        var lastSel = vim.lastSelection;
+        var offset = getOffset(lastSel.anchor, lastSel.head);
+        selectForInsert(cm, head, offset.line + 1);
+        repeat = cm.listSelections().length;
+        cm.setCursor(head);
+      }
       for (var i = 0; i < repeat; i++) {
+        if (inVisualBlock) {
+          cm.setCursor(offsetCursor(head, i, 0));
+        }
         for (var j = 0; j < changes.length; j++) {
           var change = changes[j];
           if (change instanceof InsertModeKey) {
-            CodeMirror.lookupKey(change.keyName, ['vim-insert'], keyHandler);
+            CodeMirror.lookupKey(change.keyName, 'vim-insert', keyHandler);
           } else {
             var cur = cm.getCursor();
             cm.replaceRange(change, cur, cur);
           }
         }
       }
+      if (inVisualBlock) {
+        cm.setCursor(offsetCursor(head, 0, 1));
+      }
     }
 
     resetVimGlobalState();
diff --git a/plugins/tiddlywiki/codemirror/files/mode/css/css.js b/plugins/tiddlywiki/codemirror/files/mode/css/css.js
new file mode 100755
index 000000000..e9656e3dc
--- /dev/null
+++ b/plugins/tiddlywiki/codemirror/files/mode/css/css.js
@@ -0,0 +1,825 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("css", function(config, parserConfig) {
+  var inline = parserConfig.inline
+  if (!parserConfig.propertyKeywords) parserConfig = CodeMirror.resolveMode("text/css");
+
+  var indentUnit = config.indentUnit,
+      tokenHooks = parserConfig.tokenHooks,
+      documentTypes = parserConfig.documentTypes || {},
+      mediaTypes = parserConfig.mediaTypes || {},
+      mediaFeatures = parserConfig.mediaFeatures || {},
+      mediaValueKeywords = parserConfig.mediaValueKeywords || {},
+      propertyKeywords = parserConfig.propertyKeywords || {},
+      nonStandardPropertyKeywords = parserConfig.nonStandardPropertyKeywords || {},
+      fontProperties = parserConfig.fontProperties || {},
+      counterDescriptors = parserConfig.counterDescriptors || {},
+      colorKeywords = parserConfig.colorKeywords || {},
+      valueKeywords = parserConfig.valueKeywords || {},
+      allowNested = parserConfig.allowNested,
+      supportsAtComponent = parserConfig.supportsAtComponent === true;
+
+  var type, override;
+  function ret(style, tp) { type = tp; return style; }
+
+  // Tokenizers
+
+  function tokenBase(stream, state) {
+    var ch = stream.next();
+    if (tokenHooks[ch]) {
+      var result = tokenHooks[ch](stream, state);
+      if (result !== false) return result;
+    }
+    if (ch == "@") {
+      stream.eatWhile(/[\w\\\-]/);
+      return ret("def", stream.current());
+    } else if (ch == "=" || (ch == "~" || ch == "|") && stream.eat("=")) {
+      return ret(null, "compare");
+    } else if (ch == "\"" || ch == "'") {
+      state.tokenize = tokenString(ch);
+      return state.tokenize(stream, state);
+    } else if (ch == "#") {
+      stream.eatWhile(/[\w\\\-]/);
+      return ret("atom", "hash");
+    } else if (ch == "!") {
+      stream.match(/^\s*\w*/);
+      return ret("keyword", "important");
+    } else if (/\d/.test(ch) || ch == "." && stream.eat(/\d/)) {
+      stream.eatWhile(/[\w.%]/);
+      return ret("number", "unit");
+    } else if (ch === "-") {
+      if (/[\d.]/.test(stream.peek())) {
+        stream.eatWhile(/[\w.%]/);
+        return ret("number", "unit");
+      } else if (stream.match(/^-[\w\\\-]+/)) {
+        stream.eatWhile(/[\w\\\-]/);
+        if (stream.match(/^\s*:/, false))
+          return ret("variable-2", "variable-definition");
+        return ret("variable-2", "variable");
+      } else if (stream.match(/^\w+-/)) {
+        return ret("meta", "meta");
+      }
+    } else if (/[,+>*\/]/.test(ch)) {
+      return ret(null, "select-op");
+    } else if (ch == "." && stream.match(/^-?[_a-z][_a-z0-9-]*/i)) {
+      return ret("qualifier", "qualifier");
+    } else if (/[:;{}\[\]\(\)]/.test(ch)) {
+      return ret(null, ch);
+    } else if ((ch == "u" && stream.match(/rl(-prefix)?\(/)) ||
+               (ch == "d" && stream.match("omain(")) ||
+               (ch == "r" && stream.match("egexp("))) {
+      stream.backUp(1);
+      state.tokenize = tokenParenthesized;
+      return ret("property", "word");
+    } else if (/[\w\\\-]/.test(ch)) {
+      stream.eatWhile(/[\w\\\-]/);
+      return ret("property", "word");
+    } else {
+      return ret(null, null);
+    }
+  }
+
+  function tokenString(quote) {
+    return function(stream, state) {
+      var escaped = false, ch;
+      while ((ch = stream.next()) != null) {
+        if (ch == quote && !escaped) {
+          if (quote == ")") stream.backUp(1);
+          break;
+        }
+        escaped = !escaped && ch == "\\";
+      }
+      if (ch == quote || !escaped && quote != ")") state.tokenize = null;
+      return ret("string", "string");
+    };
+  }
+
+  function tokenParenthesized(stream, state) {
+    stream.next(); // Must be '('
+    if (!stream.match(/\s*[\"\')]/, false))
+      state.tokenize = tokenString(")");
+    else
+      state.tokenize = null;
+    return ret(null, "(");
+  }
+
+  // Context management
+
+  function Context(type, indent, prev) {
+    this.type = type;
+    this.indent = indent;
+    this.prev = prev;
+  }
+
+  function pushContext(state, stream, type, indent) {
+    state.context = new Context(type, stream.indentation() + (indent === false ? 0 : indentUnit), state.context);
+    return type;
+  }
+
+  function popContext(state) {
+    if (state.context.prev)
+      state.context = state.context.prev;
+    return state.context.type;
+  }
+
+  function pass(type, stream, state) {
+    return states[state.context.type](type, stream, state);
+  }
+  function popAndPass(type, stream, state, n) {
+    for (var i = n || 1; i > 0; i--)
+      state.context = state.context.prev;
+    return pass(type, stream, state);
+  }
+
+  // Parser
+
+  function wordAsValue(stream) {
+    var word = stream.current().toLowerCase();
+    if (valueKeywords.hasOwnProperty(word))
+      override = "atom";
+    else if (colorKeywords.hasOwnProperty(word))
+      override = "keyword";
+    else
+      override = "variable";
+  }
+
+  var states = {};
+
+  states.top = function(type, stream, state) {
+    if (type == "{") {
+      return pushContext(state, stream, "block");
+    } else if (type == "}" && state.context.prev) {
+      return popContext(state);
+    } else if (supportsAtComponent && /@component/.test(type)) {
+      return pushContext(state, stream, "atComponentBlock");
+    } else if (/^@(-moz-)?document$/.test(type)) {
+      return pushContext(state, stream, "documentTypes");
+    } else if (/^@(media|supports|(-moz-)?document|import)$/.test(type)) {
+      return pushContext(state, stream, "atBlock");
+    } else if (/^@(font-face|counter-style)/.test(type)) {
+      state.stateArg = type;
+      return "restricted_atBlock_before";
+    } else if (/^@(-(moz|ms|o|webkit)-)?keyframes$/.test(type)) {
+      return "keyframes";
+    } else if (type && type.charAt(0) == "@") {
+      return pushContext(state, stream, "at");
+    } else if (type == "hash") {
+      override = "builtin";
+    } else if (type == "word") {
+      override = "tag";
+    } else if (type == "variable-definition") {
+      return "maybeprop";
+    } else if (type == "interpolation") {
+      return pushContext(state, stream, "interpolation");
+    } else if (type == ":") {
+      return "pseudo";
+    } else if (allowNested && type == "(") {
+      return pushContext(state, stream, "parens");
+    }
+    return state.context.type;
+  };
+
+  states.block = function(type, stream, state) {
+    if (type == "word") {
+      var word = stream.current().toLowerCase();
+      if (propertyKeywords.hasOwnProperty(word)) {
+        override = "property";
+        return "maybeprop";
+      } else if (nonStandardPropertyKeywords.hasOwnProperty(word)) {
+        override = "string-2";
+        return "maybeprop";
+      } else if (allowNested) {
+        override = stream.match(/^\s*:(?:\s|$)/, false) ? "property" : "tag";
+        return "block";
+      } else {
+        override += " error";
+        return "maybeprop";
+      }
+    } else if (type == "meta") {
+      return "block";
+    } else if (!allowNested && (type == "hash" || type == "qualifier")) {
+      override = "error";
+      return "block";
+    } else {
+      return states.top(type, stream, state);
+    }
+  };
+
+  states.maybeprop = function(type, stream, state) {
+    if (type == ":") return pushContext(state, stream, "prop");
+    return pass(type, stream, state);
+  };
+
+  states.prop = function(type, stream, state) {
+    if (type == ";") return popContext(state);
+    if (type == "{" && allowNested) return pushContext(state, stream, "propBlock");
+    if (type == "}" || type == "{") return popAndPass(type, stream, state);
+    if (type == "(") return pushContext(state, stream, "parens");
+
+    if (type == "hash" && !/^#([0-9a-fA-f]{3,4}|[0-9a-fA-f]{6}|[0-9a-fA-f]{8})$/.test(stream.current())) {
+      override += " error";
+    } else if (type == "word") {
+      wordAsValue(stream);
+    } else if (type == "interpolation") {
+      return pushContext(state, stream, "interpolation");
+    }
+    return "prop";
+  };
+
+  states.propBlock = function(type, _stream, state) {
+    if (type == "}") return popContext(state);
+    if (type == "word") { override = "property"; return "maybeprop"; }
+    return state.context.type;
+  };
+
+  states.parens = function(type, stream, state) {
+    if (type == "{" || type == "}") return popAndPass(type, stream, state);
+    if (type == ")") return popContext(state);
+    if (type == "(") return pushContext(state, stream, "parens");
+    if (type == "interpolation") return pushContext(state, stream, "interpolation");
+    if (type == "word") wordAsValue(stream);
+    return "parens";
+  };
+
+  states.pseudo = function(type, stream, state) {
+    if (type == "word") {
+      override = "variable-3";
+      return state.context.type;
+    }
+    return pass(type, stream, state);
+  };
+
+  states.documentTypes = function(type, stream, state) {
+    if (type == "word" && documentTypes.hasOwnProperty(stream.current())) {
+      override = "tag";
+      return state.context.type;
+    } else {
+      return states.atBlock(type, stream, state);
+    }
+  };
+
+  states.atBlock = function(type, stream, state) {
+    if (type == "(") return pushContext(state, stream, "atBlock_parens");
+    if (type == "}" || type == ";") return popAndPass(type, stream, state);
+    if (type == "{") return popContext(state) && pushContext(state, stream, allowNested ? "block" : "top");
+
+    if (type == "interpolation") return pushContext(state, stream, "interpolation");
+
+    if (type == "word") {
+      var word = stream.current().toLowerCase();
+      if (word == "only" || word == "not" || word == "and" || word == "or")
+        override = "keyword";
+      else if (mediaTypes.hasOwnProperty(word))
+        override = "attribute";
+      else if (mediaFeatures.hasOwnProperty(word))
+        override = "property";
+      else if (mediaValueKeywords.hasOwnProperty(word))
+        override = "keyword";
+      else if (propertyKeywords.hasOwnProperty(word))
+        override = "property";
+      else if (nonStandardPropertyKeywords.hasOwnProperty(word))
+        override = "string-2";
+      else if (valueKeywords.hasOwnProperty(word))
+        override = "atom";
+      else if (colorKeywords.hasOwnProperty(word))
+        override = "keyword";
+      else
+        override = "error";
+    }
+    return state.context.type;
+  };
+
+  states.atComponentBlock = function(type, stream, state) {
+    if (type == "}")
+      return popAndPass(type, stream, state);
+    if (type == "{")
+      return popContext(state) && pushContext(state, stream, allowNested ? "block" : "top", false);
+    if (type == "word")
+      override = "error";
+    return state.context.type;
+  };
+
+  states.atBlock_parens = function(type, stream, state) {
+    if (type == ")") return popContext(state);
+    if (type == "{" || type == "}") return popAndPass(type, stream, state, 2);
+    return states.atBlock(type, stream, state);
+  };
+
+  states.restricted_atBlock_before = function(type, stream, state) {
+    if (type == "{")
+      return pushContext(state, stream, "restricted_atBlock");
+    if (type == "word" && state.stateArg == "@counter-style") {
+      override = "variable";
+      return "restricted_atBlock_before";
+    }
+    return pass(type, stream, state);
+  };
+
+  states.restricted_atBlock = function(type, stream, state) {
+    if (type == "}") {
+      state.stateArg = null;
+      return popContext(state);
+    }
+    if (type == "word") {
+      if ((state.stateArg == "@font-face" && !fontProperties.hasOwnProperty(stream.current().toLowerCase())) ||
+          (state.stateArg == "@counter-style" && !counterDescriptors.hasOwnProperty(stream.current().toLowerCase())))
+        override = "error";
+      else
+        override = "property";
+      return "maybeprop";
+    }
+    return "restricted_atBlock";
+  };
+
+  states.keyframes = function(type, stream, state) {
+    if (type == "word") { override = "variable"; return "keyframes"; }
+    if (type == "{") return pushContext(state, stream, "top");
+    return pass(type, stream, state);
+  };
+
+  states.at = function(type, stream, state) {
+    if (type == ";") return popContext(state);
+    if (type == "{" || type == "}") return popAndPass(type, stream, state);
+    if (type == "word") override = "tag";
+    else if (type == "hash") override = "builtin";
+    return "at";
+  };
+
+  states.interpolation = function(type, stream, state) {
+    if (type == "}") return popContext(state);
+    if (type == "{" || type == ";") return popAndPass(type, stream, state);
+    if (type == "word") override = "variable";
+    else if (type != "variable" && type != "(" && type != ")") override = "error";
+    return "interpolation";
+  };
+
+  return {
+    startState: function(base) {
+      return {tokenize: null,
+              state: inline ? "block" : "top",
+              stateArg: null,
+              context: new Context(inline ? "block" : "top", base || 0, null)};
+    },
+
+    token: function(stream, state) {
+      if (!state.tokenize && stream.eatSpace()) return null;
+      var style = (state.tokenize || tokenBase)(stream, state);
+      if (style && typeof style == "object") {
+        type = style[1];
+        style = style[0];
+      }
+      override = style;
+      state.state = states[state.state](type, stream, state);
+      return override;
+    },
+
+    indent: function(state, textAfter) {
+      var cx = state.context, ch = textAfter && textAfter.charAt(0);
+      var indent = cx.indent;
+      if (cx.type == "prop" && (ch == "}" || ch == ")")) cx = cx.prev;
+      if (cx.prev) {
+        if (ch == "}" && (cx.type == "block" || cx.type == "top" ||
+                          cx.type == "interpolation" || cx.type == "restricted_atBlock")) {
+          // Resume indentation from parent context.
+          cx = cx.prev;
+          indent = cx.indent;
+        } else if (ch == ")" && (cx.type == "parens" || cx.type == "atBlock_parens") ||
+            ch == "{" && (cx.type == "at" || cx.type == "atBlock")) {
+          // Dedent relative to current context.
+          indent = Math.max(0, cx.indent - indentUnit);
+          cx = cx.prev;
+        }
+      }
+      return indent;
+    },
+
+    electricChars: "}",
+    blockCommentStart: "/*",
+    blockCommentEnd: "*/",
+    fold: "brace"
+  };
+});
+
+  function keySet(array) {
+    var keys = {};
+    for (var i = 0; i < array.length; ++i) {
+      keys[array[i]] = true;
+    }
+    return keys;
+  }
+
+  var documentTypes_ = [
+    "domain", "regexp", "url", "url-prefix"
+  ], documentTypes = keySet(documentTypes_);
+
+  var mediaTypes_ = [
+    "all", "aural", "braille", "handheld", "print", "projection", "screen",
+    "tty", "tv", "embossed"
+  ], mediaTypes = keySet(mediaTypes_);
+
+  var mediaFeatures_ = [
+    "width", "min-width", "max-width", "height", "min-height", "max-height",
+    "device-width", "min-device-width", "max-device-width", "device-height",
+    "min-device-height", "max-device-height", "aspect-ratio",
+    "min-aspect-ratio", "max-aspect-ratio", "device-aspect-ratio",
+    "min-device-aspect-ratio", "max-device-aspect-ratio", "color", "min-color",
+    "max-color", "color-index", "min-color-index", "max-color-index",
+    "monochrome", "min-monochrome", "max-monochrome", "resolution",
+    "min-resolution", "max-resolution", "scan", "grid", "orientation",
+    "device-pixel-ratio", "min-device-pixel-ratio", "max-device-pixel-ratio",
+    "pointer", "any-pointer", "hover", "any-hover"
+  ], mediaFeatures = keySet(mediaFeatures_);
+
+  var mediaValueKeywords_ = [
+    "landscape", "portrait", "none", "coarse", "fine", "on-demand", "hover",
+    "interlace", "progressive"
+  ], mediaValueKeywords = keySet(mediaValueKeywords_);
+
+  var propertyKeywords_ = [
+    "align-content", "align-items", "align-self", "alignment-adjust",
+    "alignment-baseline", "anchor-point", "animation", "animation-delay",
+    "animation-direction", "animation-duration", "animation-fill-mode",
+    "animation-iteration-count", "animation-name", "animation-play-state",
+    "animation-timing-function", "appearance", "azimuth", "backface-visibility",
+    "background", "background-attachment", "background-blend-mode", "background-clip",
+    "background-color", "background-image", "background-origin", "background-position",
+    "background-repeat", "background-size", "baseline-shift", "binding",
+    "bleed", "bookmark-label", "bookmark-level", "bookmark-state",
+    "bookmark-target", "border", "border-bottom", "border-bottom-color",
+    "border-bottom-left-radius", "border-bottom-right-radius",
+    "border-bottom-style", "border-bottom-width", "border-collapse",
+    "border-color", "border-image", "border-image-outset",
+    "border-image-repeat", "border-image-slice", "border-image-source",
+    "border-image-width", "border-left", "border-left-color",
+    "border-left-style", "border-left-width", "border-radius", "border-right",
+    "border-right-color", "border-right-style", "border-right-width",
+    "border-spacing", "border-style", "border-top", "border-top-color",
+    "border-top-left-radius", "border-top-right-radius", "border-top-style",
+    "border-top-width", "border-width", "bottom", "box-decoration-break",
+    "box-shadow", "box-sizing", "break-after", "break-before", "break-inside",
+    "caption-side", "clear", "clip", "color", "color-profile", "column-count",
+    "column-fill", "column-gap", "column-rule", "column-rule-color",
+    "column-rule-style", "column-rule-width", "column-span", "column-width",
+    "columns", "content", "counter-increment", "counter-reset", "crop", "cue",
+    "cue-after", "cue-before", "cursor", "direction", "display",
+    "dominant-baseline", "drop-initial-after-adjust",
+    "drop-initial-after-align", "drop-initial-before-adjust",
+    "drop-initial-before-align", "drop-initial-size", "drop-initial-value",
+    "elevation", "empty-cells", "fit", "fit-position", "flex", "flex-basis",
+    "flex-direction", "flex-flow", "flex-grow", "flex-shrink", "flex-wrap",
+    "float", "float-offset", "flow-from", "flow-into", "font", "font-feature-settings",
+    "font-family", "font-kerning", "font-language-override", "font-size", "font-size-adjust",
+    "font-stretch", "font-style", "font-synthesis", "font-variant",
+    "font-variant-alternates", "font-variant-caps", "font-variant-east-asian",
+    "font-variant-ligatures", "font-variant-numeric", "font-variant-position",
+    "font-weight", "grid", "grid-area", "grid-auto-columns", "grid-auto-flow",
+    "grid-auto-position", "grid-auto-rows", "grid-column", "grid-column-end",
+    "grid-column-start", "grid-row", "grid-row-end", "grid-row-start",
+    "grid-template", "grid-template-areas", "grid-template-columns",
+    "grid-template-rows", "hanging-punctuation", "height", "hyphens",
+    "icon", "image-orientation", "image-rendering", "image-resolution",
+    "inline-box-align", "justify-content", "left", "letter-spacing",
+    "line-break", "line-height", "line-stacking", "line-stacking-ruby",
+    "line-stacking-shift", "line-stacking-strategy", "list-style",
+    "list-style-image", "list-style-position", "list-style-type", "margin",
+    "margin-bottom", "margin-left", "margin-right", "margin-top",
+    "marker-offset", "marks", "marquee-direction", "marquee-loop",
+    "marquee-play-count", "marquee-speed", "marquee-style", "max-height",
+    "max-width", "min-height", "min-width", "move-to", "nav-down", "nav-index",
+    "nav-left", "nav-right", "nav-up", "object-fit", "object-position",
+    "opacity", "order", "orphans", "outline",
+    "outline-color", "outline-offset", "outline-style", "outline-width",
+    "overflow", "overflow-style", "overflow-wrap", "overflow-x", "overflow-y",
+    "padding", "padding-bottom", "padding-left", "padding-right", "padding-top",
+    "page", "page-break-after", "page-break-before", "page-break-inside",
+    "page-policy", "pause", "pause-after", "pause-before", "perspective",
+    "perspective-origin", "pitch", "pitch-range", "play-during", "position",
+    "presentation-level", "punctuation-trim", "quotes", "region-break-after",
+    "region-break-before", "region-break-inside", "region-fragment",
+    "rendering-intent", "resize", "rest", "rest-after", "rest-before", "richness",
+    "right", "rotation", "rotation-point", "ruby-align", "ruby-overhang",
+    "ruby-position", "ruby-span", "shape-image-threshold", "shape-inside", "shape-margin",
+    "shape-outside", "size", "speak", "speak-as", "speak-header",
+    "speak-numeral", "speak-punctuation", "speech-rate", "stress", "string-set",
+    "tab-size", "table-layout", "target", "target-name", "target-new",
+    "target-position", "text-align", "text-align-last", "text-decoration",
+    "text-decoration-color", "text-decoration-line", "text-decoration-skip",
+    "text-decoration-style", "text-emphasis", "text-emphasis-color",
+    "text-emphasis-position", "text-emphasis-style", "text-height",
+    "text-indent", "text-justify", "text-outline", "text-overflow", "text-shadow",
+    "text-size-adjust", "text-space-collapse", "text-transform", "text-underline-position",
+    "text-wrap", "top", "transform", "transform-origin", "transform-style",
+    "transition", "transition-delay", "transition-duration",
+    "transition-property", "transition-timing-function", "unicode-bidi",
+    "vertical-align", "visibility", "voice-balance", "voice-duration",
+    "voice-family", "voice-pitch", "voice-range", "voice-rate", "voice-stress",
+    "voice-volume", "volume", "white-space", "widows", "width", "word-break",
+    "word-spacing", "word-wrap", "z-index",
+    // SVG-specific
+    "clip-path", "clip-rule", "mask", "enable-background", "filter", "flood-color",
+    "flood-opacity", "lighting-color", "stop-color", "stop-opacity", "pointer-events",
+    "color-interpolation", "color-interpolation-filters",
+    "color-rendering", "fill", "fill-opacity", "fill-rule", "image-rendering",
+    "marker", "marker-end", "marker-mid", "marker-start", "shape-rendering", "stroke",
+    "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin",
+    "stroke-miterlimit", "stroke-opacity", "stroke-width", "text-rendering",
+    "baseline-shift", "dominant-baseline", "glyph-orientation-horizontal",
+    "glyph-orientation-vertical", "text-anchor", "writing-mode"
+  ], propertyKeywords = keySet(propertyKeywords_);
+
+  var nonStandardPropertyKeywords_ = [
+    "scrollbar-arrow-color", "scrollbar-base-color", "scrollbar-dark-shadow-color",
+    "scrollbar-face-color", "scrollbar-highlight-color", "scrollbar-shadow-color",
+    "scrollbar-3d-light-color", "scrollbar-track-color", "shape-inside",
+    "searchfield-cancel-button", "searchfield-decoration", "searchfield-results-button",
+    "searchfield-results-decoration", "zoom"
+  ], nonStandardPropertyKeywords = keySet(nonStandardPropertyKeywords_);
+
+  var fontProperties_ = [
+    "font-family", "src", "unicode-range", "font-variant", "font-feature-settings",
+    "font-stretch", "font-weight", "font-style"
+  ], fontProperties = keySet(fontProperties_);
+
+  var counterDescriptors_ = [
+    "additive-symbols", "fallback", "negative", "pad", "prefix", "range",
+    "speak-as", "suffix", "symbols", "system"
+  ], counterDescriptors = keySet(counterDescriptors_);
+
+  var colorKeywords_ = [
+    "aliceblue", "antiquewhite", "aqua", "aquamarine", "azure", "beige",
+    "bisque", "black", "blanchedalmond", "blue", "blueviolet", "brown",
+    "burlywood", "cadetblue", "chartreuse", "chocolate", "coral", "cornflowerblue",
+    "cornsilk", "crimson", "cyan", "darkblue", "darkcyan", "darkgoldenrod",
+    "darkgray", "darkgreen", "darkkhaki", "darkmagenta", "darkolivegreen",
+    "darkorange", "darkorchid", "darkred", "darksalmon", "darkseagreen",
+    "darkslateblue", "darkslategray", "darkturquoise", "darkviolet",
+    "deeppink", "deepskyblue", "dimgray", "dodgerblue", "firebrick",
+    "floralwhite", "forestgreen", "fuchsia", "gainsboro", "ghostwhite",
+    "gold", "goldenrod", "gray", "grey", "green", "greenyellow", "honeydew",
+    "hotpink", "indianred", "indigo", "ivory", "khaki", "lavender",
+    "lavenderblush", "lawngreen", "lemonchiffon", "lightblue", "lightcoral",
+    "lightcyan", "lightgoldenrodyellow", "lightgray", "lightgreen", "lightpink",
+    "lightsalmon", "lightseagreen", "lightskyblue", "lightslategray",
+    "lightsteelblue", "lightyellow", "lime", "limegreen", "linen", "magenta",
+    "maroon", "mediumaquamarine", "mediumblue", "mediumorchid", "mediumpurple",
+    "mediumseagreen", "mediumslateblue", "mediumspringgreen", "mediumturquoise",
+    "mediumvioletred", "midnightblue", "mintcream", "mistyrose", "moccasin",
+    "navajowhite", "navy", "oldlace", "olive", "olivedrab", "orange", "orangered",
+    "orchid", "palegoldenrod", "palegreen", "paleturquoise", "palevioletred",
+    "papayawhip", "peachpuff", "peru", "pink", "plum", "powderblue",
+    "purple", "rebeccapurple", "red", "rosybrown", "royalblue", "saddlebrown",
+    "salmon", "sandybrown", "seagreen", "seashell", "sienna", "silver", "skyblue",
+    "slateblue", "slategray", "snow", "springgreen", "steelblue", "tan",
+    "teal", "thistle", "tomato", "turquoise", "violet", "wheat", "white",
+    "whitesmoke", "yellow", "yellowgreen"
+  ], colorKeywords = keySet(colorKeywords_);
+
+  var valueKeywords_ = [
+    "above", "absolute", "activeborder", "additive", "activecaption", "afar",
+    "after-white-space", "ahead", "alias", "all", "all-scroll", "alphabetic", "alternate",
+    "always", "amharic", "amharic-abegede", "antialiased", "appworkspace",
+    "arabic-indic", "armenian", "asterisks", "attr", "auto", "avoid", "avoid-column", "avoid-page",
+    "avoid-region", "background", "backwards", "baseline", "below", "bidi-override", "binary",
+    "bengali", "blink", "block", "block-axis", "bold", "bolder", "border", "border-box",
+    "both", "bottom", "break", "break-all", "break-word", "bullets", "button", "button-bevel",
+    "buttonface", "buttonhighlight", "buttonshadow", "buttontext", "calc", "cambodian",
+    "capitalize", "caps-lock-indicator", "caption", "captiontext", "caret",
+    "cell", "center", "checkbox", "circle", "cjk-decimal", "cjk-earthly-branch",
+    "cjk-heavenly-stem", "cjk-ideographic", "clear", "clip", "close-quote",
+    "col-resize", "collapse", "color", "color-burn", "color-dodge", "column", "column-reverse",
+    "compact", "condensed", "contain", "content",
+    "content-box", "context-menu", "continuous", "copy", "counter", "counters", "cover", "crop",
+    "cross", "crosshair", "currentcolor", "cursive", "cyclic", "darken", "dashed", "decimal",
+    "decimal-leading-zero", "default", "default-button", "destination-atop",
+    "destination-in", "destination-out", "destination-over", "devanagari", "difference",
+    "disc", "discard", "disclosure-closed", "disclosure-open", "document",
+    "dot-dash", "dot-dot-dash",
+    "dotted", "double", "down", "e-resize", "ease", "ease-in", "ease-in-out", "ease-out",
+    "element", "ellipse", "ellipsis", "embed", "end", "ethiopic", "ethiopic-abegede",
+    "ethiopic-abegede-am-et", "ethiopic-abegede-gez", "ethiopic-abegede-ti-er",
+    "ethiopic-abegede-ti-et", "ethiopic-halehame-aa-er",
+    "ethiopic-halehame-aa-et", "ethiopic-halehame-am-et",
+    "ethiopic-halehame-gez", "ethiopic-halehame-om-et",
+    "ethiopic-halehame-sid-et", "ethiopic-halehame-so-et",
+    "ethiopic-halehame-ti-er", "ethiopic-halehame-ti-et", "ethiopic-halehame-tig",
+    "ethiopic-numeric", "ew-resize", "exclusion", "expanded", "extends", "extra-condensed",
+    "extra-expanded", "fantasy", "fast", "fill", "fixed", "flat", "flex", "flex-end", "flex-start", "footnotes",
+    "forwards", "from", "geometricPrecision", "georgian", "graytext", "groove",
+    "gujarati", "gurmukhi", "hand", "hangul", "hangul-consonant", "hard-light", "hebrew",
+    "help", "hidden", "hide", "higher", "highlight", "highlighttext",
+    "hiragana", "hiragana-iroha", "horizontal", "hsl", "hsla", "hue", "icon", "ignore",
+    "inactiveborder", "inactivecaption", "inactivecaptiontext", "infinite",
+    "infobackground", "infotext", "inherit", "initial", "inline", "inline-axis",
+    "inline-block", "inline-flex", "inline-table", "inset", "inside", "intrinsic", "invert",
+    "italic", "japanese-formal", "japanese-informal", "justify", "kannada",
+    "katakana", "katakana-iroha", "keep-all", "khmer",
+    "korean-hangul-formal", "korean-hanja-formal", "korean-hanja-informal",
+    "landscape", "lao", "large", "larger", "left", "level", "lighter", "lighten",
+    "line-through", "linear", "linear-gradient", "lines", "list-item", "listbox", "listitem",
+    "local", "logical", "loud", "lower", "lower-alpha", "lower-armenian",
+    "lower-greek", "lower-hexadecimal", "lower-latin", "lower-norwegian",
+    "lower-roman", "lowercase", "ltr", "luminosity", "malayalam", "match", "matrix", "matrix3d",
+    "media-controls-background", "media-current-time-display",
+    "media-fullscreen-button", "media-mute-button", "media-play-button",
+    "media-return-to-realtime-button", "media-rewind-button",
+    "media-seek-back-button", "media-seek-forward-button", "media-slider",
+    "media-sliderthumb", "media-time-remaining-display", "media-volume-slider",
+    "media-volume-slider-container", "media-volume-sliderthumb", "medium",
+    "menu", "menulist", "menulist-button", "menulist-text",
+    "menulist-textfield", "menutext", "message-box", "middle", "min-intrinsic",
+    "mix", "mongolian", "monospace", "move", "multiple", "multiply", "myanmar", "n-resize",
+    "narrower", "ne-resize", "nesw-resize", "no-close-quote", "no-drop",
+    "no-open-quote", "no-repeat", "none", "normal", "not-allowed", "nowrap",
+    "ns-resize", "numbers", "numeric", "nw-resize", "nwse-resize", "oblique", "octal", "open-quote",
+    "optimizeLegibility", "optimizeSpeed", "oriya", "oromo", "outset",
+    "outside", "outside-shape", "overlay", "overline", "padding", "padding-box",
+    "painted", "page", "paused", "persian", "perspective", "plus-darker", "plus-lighter",
+    "pointer", "polygon", "portrait", "pre", "pre-line", "pre-wrap", "preserve-3d",
+    "progress", "push-button", "radial-gradient", "radio", "read-only",
+    "read-write", "read-write-plaintext-only", "rectangle", "region",
+    "relative", "repeat", "repeating-linear-gradient",
+    "repeating-radial-gradient", "repeat-x", "repeat-y", "reset", "reverse",
+    "rgb", "rgba", "ridge", "right", "rotate", "rotate3d", "rotateX", "rotateY",
+    "rotateZ", "round", "row", "row-resize", "row-reverse", "rtl", "run-in", "running",
+    "s-resize", "sans-serif", "saturation", "scale", "scale3d", "scaleX", "scaleY", "scaleZ", "screen",
+    "scroll", "scrollbar", "se-resize", "searchfield",
+    "searchfield-cancel-button", "searchfield-decoration",
+    "searchfield-results-button", "searchfield-results-decoration",
+    "semi-condensed", "semi-expanded", "separate", "serif", "show", "sidama",
+    "simp-chinese-formal", "simp-chinese-informal", "single",
+    "skew", "skewX", "skewY", "skip-white-space", "slide", "slider-horizontal",
+    "slider-vertical", "sliderthumb-horizontal", "sliderthumb-vertical", "slow",
+    "small", "small-caps", "small-caption", "smaller", "soft-light", "solid", "somali",
+    "source-atop", "source-in", "source-out", "source-over", "space", "space-around", "space-between", "spell-out", "square",
+    "square-button", "start", "static", "status-bar", "stretch", "stroke", "sub",
+    "subpixel-antialiased", "super", "sw-resize", "symbolic", "symbols", "table",
+    "table-caption", "table-cell", "table-column", "table-column-group",
+    "table-footer-group", "table-header-group", "table-row", "table-row-group",
+    "tamil",
+    "telugu", "text", "text-bottom", "text-top", "textarea", "textfield", "thai",
+    "thick", "thin", "threeddarkshadow", "threedface", "threedhighlight",
+    "threedlightshadow", "threedshadow", "tibetan", "tigre", "tigrinya-er",
+    "tigrinya-er-abegede", "tigrinya-et", "tigrinya-et-abegede", "to", "top",
+    "trad-chinese-formal", "trad-chinese-informal",
+    "translate", "translate3d", "translateX", "translateY", "translateZ",
+    "transparent", "ultra-condensed", "ultra-expanded", "underline", "up",
+    "upper-alpha", "upper-armenian", "upper-greek", "upper-hexadecimal",
+    "upper-latin", "upper-norwegian", "upper-roman", "uppercase", "urdu", "url",
+    "var", "vertical", "vertical-text", "visible", "visibleFill", "visiblePainted",
+    "visibleStroke", "visual", "w-resize", "wait", "wave", "wider",
+    "window", "windowframe", "windowtext", "words", "wrap", "wrap-reverse", "x-large", "x-small", "xor",
+    "xx-large", "xx-small"
+  ], valueKeywords = keySet(valueKeywords_);
+
+  var allWords = documentTypes_.concat(mediaTypes_).concat(mediaFeatures_).concat(mediaValueKeywords_)
+    .concat(propertyKeywords_).concat(nonStandardPropertyKeywords_).concat(colorKeywords_)
+    .concat(valueKeywords_);
+  CodeMirror.registerHelper("hintWords", "css", allWords);
+
+  function tokenCComment(stream, state) {
+    var maybeEnd = false, ch;
+    while ((ch = stream.next()) != null) {
+      if (maybeEnd && ch == "/") {
+        state.tokenize = null;
+        break;
+      }
+      maybeEnd = (ch == "*");
+    }
+    return ["comment", "comment"];
+  }
+
+  CodeMirror.defineMIME("text/css", {
+    documentTypes: documentTypes,
+    mediaTypes: mediaTypes,
+    mediaFeatures: mediaFeatures,
+    mediaValueKeywords: mediaValueKeywords,
+    propertyKeywords: propertyKeywords,
+    nonStandardPropertyKeywords: nonStandardPropertyKeywords,
+    fontProperties: fontProperties,
+    counterDescriptors: counterDescriptors,
+    colorKeywords: colorKeywords,
+    valueKeywords: valueKeywords,
+    tokenHooks: {
+      "/": function(stream, state) {
+        if (!stream.eat("*")) return false;
+        state.tokenize = tokenCComment;
+        return tokenCComment(stream, state);
+      }
+    },
+    name: "css"
+  });
+
+  CodeMirror.defineMIME("text/x-scss", {
+    mediaTypes: mediaTypes,
+    mediaFeatures: mediaFeatures,
+    mediaValueKeywords: mediaValueKeywords,
+    propertyKeywords: propertyKeywords,
+    nonStandardPropertyKeywords: nonStandardPropertyKeywords,
+    colorKeywords: colorKeywords,
+    valueKeywords: valueKeywords,
+    fontProperties: fontProperties,
+    allowNested: true,
+    tokenHooks: {
+      "/": function(stream, state) {
+        if (stream.eat("/")) {
+          stream.skipToEnd();
+          return ["comment", "comment"];
+        } else if (stream.eat("*")) {
+          state.tokenize = tokenCComment;
+          return tokenCComment(stream, state);
+        } else {
+          return ["operator", "operator"];
+        }
+      },
+      ":": function(stream) {
+        if (stream.match(/\s*\{/))
+          return [null, "{"];
+        return false;
+      },
+      "$": function(stream) {
+        stream.match(/^[\w-]+/);
+        if (stream.match(/^\s*:/, false))
+          return ["variable-2", "variable-definition"];
+        return ["variable-2", "variable"];
+      },
+      "#": function(stream) {
+        if (!stream.eat("{")) return false;
+        return [null, "interpolation"];
+      }
+    },
+    name: "css",
+    helperType: "scss"
+  });
+
+  CodeMirror.defineMIME("text/x-less", {
+    mediaTypes: mediaTypes,
+    mediaFeatures: mediaFeatures,
+    mediaValueKeywords: mediaValueKeywords,
+    propertyKeywords: propertyKeywords,
+    nonStandardPropertyKeywords: nonStandardPropertyKeywords,
+    colorKeywords: colorKeywords,
+    valueKeywords: valueKeywords,
+    fontProperties: fontProperties,
+    allowNested: true,
+    tokenHooks: {
+      "/": function(stream, state) {
+        if (stream.eat("/")) {
+          stream.skipToEnd();
+          return ["comment", "comment"];
+        } else if (stream.eat("*")) {
+          state.tokenize = tokenCComment;
+          return tokenCComment(stream, state);
+        } else {
+          return ["operator", "operator"];
+        }
+      },
+      "@": function(stream) {
+        if (stream.eat("{")) return [null, "interpolation"];
+        if (stream.match(/^(charset|document|font-face|import|(-(moz|ms|o|webkit)-)?keyframes|media|namespace|page|supports)\b/, false)) return false;
+        stream.eatWhile(/[\w\\\-]/);
+        if (stream.match(/^\s*:/, false))
+          return ["variable-2", "variable-definition"];
+        return ["variable-2", "variable"];
+      },
+      "&": function() {
+        return ["atom", "atom"];
+      }
+    },
+    name: "css",
+    helperType: "less"
+  });
+
+  CodeMirror.defineMIME("text/x-gss", {
+    documentTypes: documentTypes,
+    mediaTypes: mediaTypes,
+    mediaFeatures: mediaFeatures,
+    propertyKeywords: propertyKeywords,
+    nonStandardPropertyKeywords: nonStandardPropertyKeywords,
+    fontProperties: fontProperties,
+    counterDescriptors: counterDescriptors,
+    colorKeywords: colorKeywords,
+    valueKeywords: valueKeywords,
+    supportsAtComponent: true,
+    tokenHooks: {
+      "/": function(stream, state) {
+        if (!stream.eat("*")) return false;
+        state.tokenize = tokenCComment;
+        return tokenCComment(stream, state);
+      }
+    },
+    name: "css",
+    helperType: "gss"
+  });
+
+});
diff --git a/plugins/tiddlywiki/codemirror/files/mode/htmlembedded/htmlembedded.js b/plugins/tiddlywiki/codemirror/files/mode/htmlembedded/htmlembedded.js
new file mode 100755
index 000000000..464dc57f8
--- /dev/null
+++ b/plugins/tiddlywiki/codemirror/files/mode/htmlembedded/htmlembedded.js
@@ -0,0 +1,28 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../htmlmixed/htmlmixed"),
+        require("../../addon/mode/multiplex"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../htmlmixed/htmlmixed",
+            "../../addon/mode/multiplex"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.defineMode("htmlembedded", function(config, parserConfig) {
+    return CodeMirror.multiplexingMode(CodeMirror.getMode(config, "htmlmixed"), {
+      open: parserConfig.open || parserConfig.scriptStartRegex || "<%",
+      close: parserConfig.close || parserConfig.scriptEndRegex || "%>",
+      mode: CodeMirror.getMode(config, parserConfig.scriptingModeSpec)
+    });
+  }, "htmlmixed");
+
+  CodeMirror.defineMIME("application/x-ejs", {name: "htmlembedded", scriptingModeSpec:"javascript"});
+  CodeMirror.defineMIME("application/x-aspx", {name: "htmlembedded", scriptingModeSpec:"text/x-csharp"});
+  CodeMirror.defineMIME("application/x-jsp", {name: "htmlembedded", scriptingModeSpec:"text/x-java"});
+  CodeMirror.defineMIME("application/x-erb", {name: "htmlembedded", scriptingModeSpec:"ruby"});
+});
diff --git a/plugins/tiddlywiki/codemirror/files/mode/htmlmixed/htmlmixed.js b/plugins/tiddlywiki/codemirror/files/mode/htmlmixed/htmlmixed.js
new file mode 100755
index 000000000..6574fbd56
--- /dev/null
+++ b/plugins/tiddlywiki/codemirror/files/mode/htmlmixed/htmlmixed.js
@@ -0,0 +1,152 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../xml/xml"), require("../javascript/javascript"), require("../css/css"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../xml/xml", "../javascript/javascript", "../css/css"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  var defaultTags = {
+    script: [
+      ["lang", /(javascript|babel)/i, "javascript"],
+      ["type", /^(?:text|application)\/(?:x-)?(?:java|ecma)script$|^$/i, "javascript"],
+      ["type", /./, "text/plain"],
+      [null, null, "javascript"]
+    ],
+    style:  [
+      ["lang", /^css$/i, "css"],
+      ["type", /^(text\/)?(x-)?(stylesheet|css)$/i, "css"],
+      ["type", /./, "text/plain"],
+      [null, null, "css"]
+    ]
+  };
+
+  function maybeBackup(stream, pat, style) {
+    var cur = stream.current(), close = cur.search(pat);
+    if (close > -1) {
+      stream.backUp(cur.length - close);
+    } else if (cur.match(/<\/?$/)) {
+      stream.backUp(cur.length);
+      if (!stream.match(pat, false)) stream.match(cur);
+    }
+    return style;
+  }
+
+  var attrRegexpCache = {};
+  function getAttrRegexp(attr) {
+    var regexp = attrRegexpCache[attr];
+    if (regexp) return regexp;
+    return attrRegexpCache[attr] = new RegExp("\\s+" + attr + "\\s*=\\s*('|\")?([^'\"]+)('|\")?\\s*");
+  }
+
+  function getAttrValue(text, attr) {
+    var match = text.match(getAttrRegexp(attr))
+    return match ? match[2] : ""
+  }
+
+  function getTagRegexp(tagName, anchored) {
+    return new RegExp((anchored ? "^" : "") + "<\/\s*" + tagName + "\s*>", "i");
+  }
+
+  function addTags(from, to) {
+    for (var tag in from) {
+      var dest = to[tag] || (to[tag] = []);
+      var source = from[tag];
+      for (var i = source.length - 1; i >= 0; i--)
+        dest.unshift(source[i])
+    }
+  }
+
+  function findMatchingMode(tagInfo, tagText) {
+    for (var i = 0; i < tagInfo.length; i++) {
+      var spec = tagInfo[i];
+      if (!spec[0] || spec[1].test(getAttrValue(tagText, spec[0]))) return spec[2];
+    }
+  }
+
+  CodeMirror.defineMode("htmlmixed", function (config, parserConfig) {
+    var htmlMode = CodeMirror.getMode(config, {
+      name: "xml",
+      htmlMode: true,
+      multilineTagIndentFactor: parserConfig.multilineTagIndentFactor,
+      multilineTagIndentPastTag: parserConfig.multilineTagIndentPastTag
+    });
+
+    var tags = {};
+    var configTags = parserConfig && parserConfig.tags, configScript = parserConfig && parserConfig.scriptTypes;
+    addTags(defaultTags, tags);
+    if (configTags) addTags(configTags, tags);
+    if (configScript) for (var i = configScript.length - 1; i >= 0; i--)
+      tags.script.unshift(["type", configScript[i].matches, configScript[i].mode])
+
+    function html(stream, state) {
+      var style = htmlMode.token(stream, state.htmlState), tag = /\btag\b/.test(style), tagName
+      if (tag && !/[<>\s\/]/.test(stream.current()) &&
+          (tagName = state.htmlState.tagName && state.htmlState.tagName.toLowerCase()) &&
+          tags.hasOwnProperty(tagName)) {
+        state.inTag = tagName + " "
+      } else if (state.inTag && tag && />$/.test(stream.current())) {
+        var inTag = /^([\S]+) (.*)/.exec(state.inTag)
+        state.inTag = null
+        var modeSpec = stream.current() == ">" && findMatchingMode(tags[inTag[1]], inTag[2])
+        var mode = CodeMirror.getMode(config, modeSpec)
+        var endTagA = getTagRegexp(inTag[1], true), endTag = getTagRegexp(inTag[1], false);
+        state.token = function (stream, state) {
+          if (stream.match(endTagA, false)) {
+            state.token = html;
+            state.localState = state.localMode = null;
+            return null;
+          }
+          return maybeBackup(stream, endTag, state.localMode.token(stream, state.localState));
+        };
+        state.localMode = mode;
+        state.localState = CodeMirror.startState(mode, htmlMode.indent(state.htmlState, ""));
+      } else if (state.inTag) {
+        state.inTag += stream.current()
+        if (stream.eol()) state.inTag += " "
+      }
+      return style;
+    };
+
+    return {
+      startState: function () {
+        var state = htmlMode.startState();
+        return {token: html, inTag: null, localMode: null, localState: null, htmlState: state};
+      },
+
+      copyState: function (state) {
+        var local;
+        if (state.localState) {
+          local = CodeMirror.copyState(state.localMode, state.localState);
+        }
+        return {token: state.token, inTag: state.inTag,
+                localMode: state.localMode, localState: local,
+                htmlState: CodeMirror.copyState(htmlMode, state.htmlState)};
+      },
+
+      token: function (stream, state) {
+        return state.token(stream, state);
+      },
+
+      indent: function (state, textAfter) {
+        if (!state.localMode || /^\s*<\//.test(textAfter))
+          return htmlMode.indent(state.htmlState, textAfter);
+        else if (state.localMode.indent)
+          return state.localMode.indent(state.localState, textAfter);
+        else
+          return CodeMirror.Pass;
+      },
+
+      innerMode: function (state) {
+        return {state: state.localState || state.htmlState, mode: state.localMode || htmlMode};
+      }
+    };
+  }, "xml", "javascript", "css");
+
+  CodeMirror.defineMIME("text/html", "htmlmixed");
+});
diff --git a/plugins/tiddlywiki/codemirror/files/mode/javascript/javascript.js b/plugins/tiddlywiki/codemirror/files/mode/javascript/javascript.js
old mode 100644
new mode 100755
index e71908934..fa5721d5d
--- a/plugins/tiddlywiki/codemirror/files/mode/javascript/javascript.js
+++ b/plugins/tiddlywiki/codemirror/files/mode/javascript/javascript.js
@@ -1,3 +1,6 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
 // TODO actually recognize syntax of TypeScript constructs
 
 (function(mod) {
@@ -10,12 +13,18 @@
 })(function(CodeMirror) {
 "use strict";
 
+function expressionAllowed(stream, state, backUp) {
+  return /^(?:operator|sof|keyword c|case|new|[\[{}\(,;:]|=>)$/.test(state.lastType) ||
+    (state.lastType == "quasi" && /\{\s*$/.test(stream.string.slice(0, stream.pos - (backUp || 0))))
+}
+
 CodeMirror.defineMode("javascript", function(config, parserConfig) {
   var indentUnit = config.indentUnit;
   var statementIndent = parserConfig.statementIndent;
   var jsonldMode = parserConfig.jsonld;
   var jsonMode = parserConfig.json || jsonldMode;
   var isTS = parserConfig.typescript;
+  var wordRE = parserConfig.wordCharacters || /[\w$\xa1-\uffff]/;
 
   // Tokenizer
 
@@ -26,13 +35,13 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
 
     var jsKeywords = {
       "if": kw("if"), "while": A, "with": A, "else": B, "do": B, "try": B, "finally": B,
-      "return": C, "break": C, "continue": C, "new": C, "delete": C, "throw": C, "debugger": C,
+      "return": C, "break": C, "continue": C, "new": kw("new"), "delete": C, "throw": C, "debugger": C,
       "var": kw("var"), "const": kw("var"), "let": kw("var"),
       "function": kw("function"), "catch": kw("catch"),
       "for": kw("for"), "switch": kw("switch"), "case": kw("case"), "default": kw("default"),
       "in": operator, "typeof": operator, "instanceof": operator,
       "true": atom, "false": atom, "null": atom, "undefined": atom, "NaN": atom, "Infinity": atom,
-      "this": kw("this"), "module": kw("module"), "class": kw("class"), "super": kw("atom"),
+      "this": kw("this"), "class": kw("class"), "super": kw("atom"),
       "yield": C, "export": kw("export"), "import": kw("import"), "extends": C
     };
 
@@ -41,18 +50,23 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       var type = {type: "variable", style: "variable-3"};
       var tsKeywords = {
         // object-like things
-        "interface": kw("interface"),
-        "extends": kw("extends"),
-        "constructor": kw("constructor"),
+        "interface": kw("class"),
+        "implements": C,
+        "namespace": C,
+        "module": kw("module"),
+        "enum": kw("module"),
 
         // scope modifiers
-        "public": kw("public"),
-        "private": kw("private"),
-        "protected": kw("protected"),
-        "static": kw("static"),
+        "public": kw("modifier"),
+        "private": kw("modifier"),
+        "protected": kw("modifier"),
+        "abstract": kw("modifier"),
+
+        // operators
+        "as": operator,
 
         // types
-        "string": type, "number": type, "bool": type, "any": type
+        "string": type, "number": type, "boolean": type, "any": type
       };
 
       for (var attr in tsKeywords) {
@@ -101,6 +115,12 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     } else if (ch == "0" && stream.eat(/x/i)) {
       stream.eatWhile(/[\da-f]/i);
       return ret("number", "number");
+    } else if (ch == "0" && stream.eat(/o/i)) {
+      stream.eatWhile(/[0-7]/i);
+      return ret("number", "number");
+    } else if (ch == "0" && stream.eat(/b/i)) {
+      stream.eatWhile(/[01]/i);
+      return ret("number", "number");
     } else if (/\d/.test(ch)) {
       stream.match(/^\d*(?:\.\d*)?(?:[eE][+\-]?\d+)?/);
       return ret("number", "number");
@@ -111,10 +131,9 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       } else if (stream.eat("/")) {
         stream.skipToEnd();
         return ret("comment", "comment");
-      } else if (state.lastType == "operator" || state.lastType == "keyword c" ||
-               state.lastType == "sof" || /^[\[{}\(,;:]$/.test(state.lastType)) {
+      } else if (expressionAllowed(stream, state, 1)) {
         readRegexp(stream);
-        stream.eatWhile(/[gimy]/); // 'y' is "sticky" option in Mozilla
+        stream.match(/^\b(([gimyu])(?![gimyu]*\2))+\b/);
         return ret("regexp", "string-2");
       } else {
         stream.eatWhile(isOperatorChar);
@@ -129,8 +148,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     } else if (isOperatorChar.test(ch)) {
       stream.eatWhile(isOperatorChar);
       return ret("operator", "operator", stream.current());
-    } else {
-      stream.eatWhile(/[\w\$_]/);
+    } else if (wordRE.test(ch)) {
+      stream.eatWhile(wordRE);
       var word = stream.current(), known = keywords.propertyIsEnumerable(word) && keywords[word];
       return (known && state.lastType != ".") ? ret(known.type, known.style, word) :
                      ret("variable", "variable", word);
@@ -199,8 +218,10 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         if (--depth == 0) break;
       } else if (bracket >= 3 && bracket < 6) {
         ++depth;
-      } else if (/[$\w]/.test(ch)) {
+      } else if (wordRE.test(ch)) {
         sawSomething = true;
+      } else if (/["'\/]/.test(ch)) {
+        return;
       } else if (sawSomething && !depth) {
         ++pos;
         break;
@@ -235,7 +256,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     var cc = state.cc;
     // Communicate our context to the combinators.
     // (Less wasteful than consing up a hundred closures on every call.)
-    cx.state = state; cx.stream = stream; cx.marked = null, cx.cc = cc;
+    cx.state = state; cx.stream = stream; cx.marked = null, cx.cc = cc; cx.style = style;
 
     if (!state.lexical.hasOwnProperty("align"))
       state.lexical.align = true;
@@ -269,8 +290,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return false;
     }
     var state = cx.state;
+    cx.marked = "def";
     if (state.context) {
-      cx.marked = "def";
       if (inList(state.localVars)) return;
       state.localVars = {name: varname, next: state.localVars};
     } else {
@@ -295,6 +316,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     var result = function() {
       var state = cx.state, indent = state.indented;
       if (state.lexical.type == "stat") indent = state.lexical.indented;
+      else for (var outer = state.lexical; outer && outer.type == ")" && outer.align; outer = outer.prev)
+        indent = outer.indented;
       state.lexical = new JSLexical(indent, cx.stream.column(), type, null, state.lexical, info);
     };
     result.lex = true;
@@ -339,10 +362,10 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "default") return cont(expect(":"));
     if (type == "catch") return cont(pushlex("form"), pushcontext, expect("("), funarg, expect(")"),
                                      statement, poplex, popcontext);
-    if (type == "module") return cont(pushlex("form"), pushcontext, afterModule, popcontext, poplex);
-    if (type == "class") return cont(pushlex("form"), className, objlit, poplex);
-    if (type == "export") return cont(pushlex("form"), afterExport, poplex);
-    if (type == "import") return cont(pushlex("form"), afterImport, poplex);
+    if (type == "class") return cont(pushlex("form"), className, poplex);
+    if (type == "export") return cont(pushlex("stat"), afterExport, poplex);
+    if (type == "import") return cont(pushlex("stat"), afterImport, poplex);
+    if (type == "module") return cont(pushlex("form"), pattern, pushlex("}"), expect("{"), block, poplex, poplex)
     return pass(pushlex("stat"), expression, expect(";"), poplex);
   }
   function expression(type) {
@@ -366,7 +389,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "operator" || type == "spread") return cont(noComma ? expressionNoComma : expression);
     if (type == "[") return cont(pushlex("]"), arrayLiteral, poplex, maybeop);
     if (type == "{") return contCommasep(objprop, "}", null, maybeop);
-    if (type == "quasi") { return pass(quasi, maybeop); }
+    if (type == "quasi") return pass(quasi, maybeop);
+    if (type == "new") return cont(maybeTarget(noComma));
     return cont();
   }
   function maybeexpression(type) {
@@ -385,7 +409,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function maybeoperatorNoComma(type, value, noComma) {
     var me = noComma == false ? maybeoperatorComma : maybeoperatorNoComma;
     var expr = noComma == false ? expression : expressionNoComma;
-    if (value == "=>") return cont(pushcontext, noComma ? arrowBodyNoComma : arrowBody, popcontext);
+    if (type == "=>") return cont(pushcontext, noComma ? arrowBodyNoComma : arrowBody, popcontext);
     if (type == "operator") {
       if (/\+\+|--/.test(value)) return cont(me);
       if (value == "?") return cont(expression, expect(":"), expr);
@@ -411,13 +435,23 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
   function arrowBody(type) {
     findFatArrow(cx.stream, cx.state);
-    if (type == "{") return pass(statement);
-    return pass(expression);
+    return pass(type == "{" ? statement : expression);
   }
   function arrowBodyNoComma(type) {
     findFatArrow(cx.stream, cx.state);
-    if (type == "{") return pass(statement);
-    return pass(expressionNoComma);
+    return pass(type == "{" ? statement : expressionNoComma);
+  }
+  function maybeTarget(noComma) {
+    return function(type) {
+      if (type == ".") return cont(noComma ? targetNoComma : target);
+      else return pass(noComma ? expressionNoComma : expression);
+    };
+  }
+  function target(_, value) {
+    if (value == "target") { cx.marked = "keyword"; return cont(maybeoperatorComma); }
+  }
+  function targetNoComma(_, value) {
+    if (value == "target") { cx.marked = "keyword"; return cont(maybeoperatorNoComma); }
   }
   function maybelabel(type) {
     if (type == ":") return cont(poplex, statement);
@@ -427,15 +461,22 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "variable") {cx.marked = "property"; return cont();}
   }
   function objprop(type, value) {
-    if (type == "variable") {
+    if (type == "variable" || cx.style == "keyword") {
       cx.marked = "property";
       if (value == "get" || value == "set") return cont(getterSetter);
+      return cont(afterprop);
     } else if (type == "number" || type == "string") {
-      cx.marked = jsonldMode ? "property" : (type + " property");
+      cx.marked = jsonldMode ? "property" : (cx.style + " property");
+      return cont(afterprop);
+    } else if (type == "jsonld-keyword") {
+      return cont(afterprop);
+    } else if (type == "modifier") {
+      return cont(objprop)
     } else if (type == "[") {
       return cont(expression, expect("]"), afterprop);
+    } else if (type == "spread") {
+      return cont(expression);
     }
-    if (atomicTypes.hasOwnProperty(type)) return cont(afterprop);
   }
   function getterSetter(type) {
     if (type != "variable") return pass(afterprop);
@@ -473,14 +514,19 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function maybetype(type) {
     if (isTS && type == ":") return cont(typedef);
   }
+  function maybedefault(_, value) {
+    if (value == "=") return cont(expressionNoComma);
+  }
   function typedef(type) {
-    if (type == "variable"){cx.marked = "variable-3"; return cont();}
+    if (type == "variable") {cx.marked = "variable-3"; return cont();}
   }
   function vardef() {
     return pass(pattern, maybetype, maybeAssign, vardefCont);
   }
   function pattern(type, value) {
+    if (type == "modifier") return cont(pattern)
     if (type == "variable") { register(value); return cont(); }
+    if (type == "spread") return cont(pattern);
     if (type == "[") return contCommasep(pattern, "]");
     if (type == "{") return contCommasep(proppattern, "}");
   }
@@ -490,6 +536,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       return cont(maybeAssign);
     }
     if (type == "variable") cx.marked = "property";
+    if (type == "spread") return cont(pattern);
+    if (type == "}") return pass();
     return cont(expect(":"), pattern, maybeAssign);
   }
   function maybeAssign(_type, value) {
@@ -529,20 +577,36 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
   function funarg(type) {
     if (type == "spread") return cont(funarg);
-    return pass(pattern, maybetype);
+    return pass(pattern, maybetype, maybedefault);
   }
   function className(type, value) {
     if (type == "variable") {register(value); return cont(classNameAfter);}
   }
-  function classNameAfter(_type, value) {
-    if (value == "extends") return cont(expression);
+  function classNameAfter(type, value) {
+    if (value == "extends") return cont(expression, classNameAfter);
+    if (type == "{") return cont(pushlex("}"), classBody, poplex);
   }
-  function objlit(type) {
-    if (type == "{") return contCommasep(objprop, "}");
+  function classBody(type, value) {
+    if (type == "variable" || cx.style == "keyword") {
+      if (value == "static") {
+        cx.marked = "keyword";
+        return cont(classBody);
+      }
+      cx.marked = "property";
+      if (value == "get" || value == "set") return cont(classGetterSetter, functiondef, classBody);
+      return cont(functiondef, classBody);
+    }
+    if (value == "*") {
+      cx.marked = "keyword";
+      return cont(classBody);
+    }
+    if (type == ";") return cont(classBody);
+    if (type == "}") return cont();
   }
-  function afterModule(type, value) {
-    if (type == "string") return cont(statement);
-    if (type == "variable") { register(value); return cont(maybeFrom); }
+  function classGetterSetter(type) {
+    if (type != "variable") return pass();
+    cx.marked = "property";
+    return cont();
   }
   function afterExport(_type, value) {
     if (value == "*") { cx.marked = "keyword"; return cont(maybeFrom, expect(";")); }
@@ -556,7 +620,11 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   function importSpec(type, value) {
     if (type == "{") return contCommasep(importSpec, "}");
     if (type == "variable") register(value);
-    return cont();
+    if (value == "*") cx.marked = "keyword";
+    return cont(maybeAs);
+  }
+  function maybeAs(_type, value) {
+    if (value == "as") { cx.marked = "keyword"; return cont(importSpec); }
   }
   function maybeFrom(_type, value) {
     if (value == "from") { cx.marked = "keyword"; return cont(expression); }
@@ -567,7 +635,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
   }
   function maybeArrayComprehension(type) {
     if (type == "for") return pass(comprehension, expect("]"));
-    if (type == ",") return cont(commasep(expressionNoComma, "]"));
+    if (type == ",") return cont(commasep(maybeexpressionNoComma, "]"));
     return pass(commasep(expressionNoComma, "]"));
   }
   function comprehension(type) {
@@ -575,6 +643,12 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
     if (type == "if") return cont(expression, comprehension);
   }
 
+  function isContinuedStatement(state, textAfter) {
+    return state.lastType == "operator" || state.lastType == "," ||
+      isOperatorChar.test(textAfter.charAt(0)) ||
+      /[,.]/.test(textAfter.charAt(0));
+  }
+
   // Interface
 
   return {
@@ -586,7 +660,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
         lexical: new JSLexical((basecolumn || 0) - indentUnit, 0, "block", false),
         localVars: parserConfig.localVars,
         context: parserConfig.localVars && {vars: parserConfig.localVars},
-        indented: 0
+        indented: basecolumn || 0
       };
       if (parserConfig.globalVars && typeof parserConfig.globalVars == "object")
         state.globalVars = parserConfig.globalVars;
@@ -626,30 +700,38 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
       else if (type == "form" && firstChar == "{") return lexical.indented;
       else if (type == "form") return lexical.indented + indentUnit;
       else if (type == "stat")
-        return lexical.indented + (state.lastType == "operator" || state.lastType == "," ? statementIndent || indentUnit : 0);
+        return lexical.indented + (isContinuedStatement(state, textAfter) ? statementIndent || indentUnit : 0);
       else if (lexical.info == "switch" && !closing && parserConfig.doubleIndentSwitch != false)
         return lexical.indented + (/^(?:case|default)\b/.test(textAfter) ? indentUnit : 2 * indentUnit);
       else if (lexical.align) return lexical.column + (closing ? 0 : 1);
       else return lexical.indented + (closing ? 0 : indentUnit);
     },
 
-    electricChars: ":{}",
+    electricInput: /^\s*(?:case .*?:|default:|\{|\})$/,
     blockCommentStart: jsonMode ? null : "/*",
     blockCommentEnd: jsonMode ? null : "*/",
     lineComment: jsonMode ? null : "//",
     fold: "brace",
+    closeBrackets: "()[]{}''\"\"``",
 
     helperType: jsonMode ? "json" : "javascript",
     jsonldMode: jsonldMode,
-    jsonMode: jsonMode
+    jsonMode: jsonMode,
+
+    expressionAllowed: expressionAllowed,
+    skipExpression: function(state) {
+      var top = state.cc[state.cc.length - 1]
+      if (top == expression || top == expressionNoComma) state.cc.pop()
+    }
   };
 });
 
-CodeMirror.registerHelper("wordChars", "javascript", /[\\w$]/);
+CodeMirror.registerHelper("wordChars", "javascript", /[\w$]/);
 
 CodeMirror.defineMIME("text/javascript", "javascript");
 CodeMirror.defineMIME("text/ecmascript", "javascript");
 CodeMirror.defineMIME("application/javascript", "javascript");
+CodeMirror.defineMIME("application/x-javascript", "javascript");
 CodeMirror.defineMIME("application/ecmascript", "javascript");
 CodeMirror.defineMIME("application/json", {name: "javascript", json: true});
 CodeMirror.defineMIME("application/x-json", {name: "javascript", json: true});
diff --git a/plugins/tiddlywiki/codemirror/files/mode/markdown/markdown.js b/plugins/tiddlywiki/codemirror/files/mode/markdown/markdown.js
new file mode 100755
index 000000000..a6942b39c
--- /dev/null
+++ b/plugins/tiddlywiki/codemirror/files/mode/markdown/markdown.js
@@ -0,0 +1,807 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"), require("../xml/xml"), require("../meta"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror", "../xml/xml", "../meta"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("markdown", function(cmCfg, modeCfg) {
+
+  var htmlMode = CodeMirror.getMode(cmCfg, "text/html");
+  var htmlModeMissing = htmlMode.name == "null"
+
+  function getMode(name) {
+    if (CodeMirror.findModeByName) {
+      var found = CodeMirror.findModeByName(name);
+      if (found) name = found.mime || found.mimes[0];
+    }
+    var mode = CodeMirror.getMode(cmCfg, name);
+    return mode.name == "null" ? null : mode;
+  }
+
+  // Should characters that affect highlighting be highlighted separate?
+  // Does not include characters that will be output (such as `1.` and `-` for lists)
+  if (modeCfg.highlightFormatting === undefined)
+    modeCfg.highlightFormatting = false;
+
+  // Maximum number of nested blockquotes. Set to 0 for infinite nesting.
+  // Excess `>` will emit `error` token.
+  if (modeCfg.maxBlockquoteDepth === undefined)
+    modeCfg.maxBlockquoteDepth = 0;
+
+  // Should underscores in words open/close em/strong?
+  if (modeCfg.underscoresBreakWords === undefined)
+    modeCfg.underscoresBreakWords = true;
+
+  // Use `fencedCodeBlocks` to configure fenced code blocks. false to
+  // disable, string to specify a precise regexp that the fence should
+  // match, and true to allow three or more backticks or tildes (as
+  // per CommonMark).
+
+  // Turn on task lists? ("- [ ] " and "- [x] ")
+  if (modeCfg.taskLists === undefined) modeCfg.taskLists = false;
+
+  // Turn on strikethrough syntax
+  if (modeCfg.strikethrough === undefined)
+    modeCfg.strikethrough = false;
+
+  // Allow token types to be overridden by user-provided token types.
+  if (modeCfg.tokenTypeOverrides === undefined)
+    modeCfg.tokenTypeOverrides = {};
+
+  var tokenTypes = {
+    header: "header",
+    code: "comment",
+    quote: "quote",
+    list1: "variable-2",
+    list2: "variable-3",
+    list3: "keyword",
+    hr: "hr",
+    image: "tag",
+    formatting: "formatting",
+    linkInline: "link",
+    linkEmail: "link",
+    linkText: "link",
+    linkHref: "string",
+    em: "em",
+    strong: "strong",
+    strikethrough: "strikethrough"
+  };
+
+  for (var tokenType in tokenTypes) {
+    if (tokenTypes.hasOwnProperty(tokenType) && modeCfg.tokenTypeOverrides[tokenType]) {
+      tokenTypes[tokenType] = modeCfg.tokenTypeOverrides[tokenType];
+    }
+  }
+
+  var hrRE = /^([*\-_])(?:\s*\1){2,}\s*$/
+  ,   ulRE = /^[*\-+]\s+/
+  ,   olRE = /^[0-9]+([.)])\s+/
+  ,   taskListRE = /^\[(x| )\](?=\s)/ // Must follow ulRE or olRE
+  ,   atxHeaderRE = modeCfg.allowAtxHeaderWithoutSpace ? /^(#+)/ : /^(#+)(?: |$)/
+  ,   setextHeaderRE = /^ *(?:\={1,}|-{1,})\s*$/
+  ,   textRE = /^[^#!\[\]*_\\<>` "'(~]+/
+  ,   fencedCodeRE = new RegExp("^(" + (modeCfg.fencedCodeBlocks === true ? "~~~+|```+" : modeCfg.fencedCodeBlocks) +
+                                ")[ \\t]*([\\w+#]*)");
+
+  function switchInline(stream, state, f) {
+    state.f = state.inline = f;
+    return f(stream, state);
+  }
+
+  function switchBlock(stream, state, f) {
+    state.f = state.block = f;
+    return f(stream, state);
+  }
+
+  function lineIsEmpty(line) {
+    return !line || !/\S/.test(line.string)
+  }
+
+  // Blocks
+
+  function blankLine(state) {
+    // Reset linkTitle state
+    state.linkTitle = false;
+    // Reset EM state
+    state.em = false;
+    // Reset STRONG state
+    state.strong = false;
+    // Reset strikethrough state
+    state.strikethrough = false;
+    // Reset state.quote
+    state.quote = 0;
+    // Reset state.indentedCode
+    state.indentedCode = false;
+    if (htmlModeMissing && state.f == htmlBlock) {
+      state.f = inlineNormal;
+      state.block = blockNormal;
+    }
+    // Reset state.trailingSpace
+    state.trailingSpace = 0;
+    state.trailingSpaceNewLine = false;
+    // Mark this line as blank
+    state.prevLine = state.thisLine
+    state.thisLine = null
+    return null;
+  }
+
+  function blockNormal(stream, state) {
+
+    var sol = stream.sol();
+
+    var prevLineIsList = state.list !== false,
+        prevLineIsIndentedCode = state.indentedCode;
+
+    state.indentedCode = false;
+
+    if (prevLineIsList) {
+      if (state.indentationDiff >= 0) { // Continued list
+        if (state.indentationDiff < 4) { // Only adjust indentation if *not* a code block
+          state.indentation -= state.indentationDiff;
+        }
+        state.list = null;
+      } else if (state.indentation > 0) {
+        state.list = null;
+      } else { // No longer a list
+        state.list = false;
+      }
+    }
+
+    var match = null;
+    if (state.indentationDiff >= 4) {
+      stream.skipToEnd();
+      if (prevLineIsIndentedCode || lineIsEmpty(state.prevLine)) {
+        state.indentation -= 4;
+        state.indentedCode = true;
+        return tokenTypes.code;
+      } else {
+        return null;
+      }
+    } else if (stream.eatSpace()) {
+      return null;
+    } else if ((match = stream.match(atxHeaderRE)) && match[1].length <= 6) {
+      state.header = match[1].length;
+      if (modeCfg.highlightFormatting) state.formatting = "header";
+      state.f = state.inline;
+      return getType(state);
+    } else if (!lineIsEmpty(state.prevLine) && !state.quote && !prevLineIsList &&
+               !prevLineIsIndentedCode && (match = stream.match(setextHeaderRE))) {
+      state.header = match[0].charAt(0) == '=' ? 1 : 2;
+      if (modeCfg.highlightFormatting) state.formatting = "header";
+      state.f = state.inline;
+      return getType(state);
+    } else if (stream.eat('>')) {
+      state.quote = sol ? 1 : state.quote + 1;
+      if (modeCfg.highlightFormatting) state.formatting = "quote";
+      stream.eatSpace();
+      return getType(state);
+    } else if (stream.peek() === '[') {
+      return switchInline(stream, state, footnoteLink);
+    } else if (stream.match(hrRE, true)) {
+      state.hr = true;
+      return tokenTypes.hr;
+    } else if ((lineIsEmpty(state.prevLine) || prevLineIsList) && (stream.match(ulRE, false) || stream.match(olRE, false))) {
+      var listType = null;
+      if (stream.match(ulRE, true)) {
+        listType = 'ul';
+      } else {
+        stream.match(olRE, true);
+        listType = 'ol';
+      }
+      state.indentation = stream.column() + stream.current().length;
+      state.list = true;
+
+      // While this list item's marker's indentation
+      // is less than the deepest list item's content's indentation,
+      // pop the deepest list item indentation off the stack.
+      while (state.listStack && stream.column() < state.listStack[state.listStack.length - 1]) {
+        state.listStack.pop();
+      }
+
+      // Add this list item's content's indentation to the stack
+      state.listStack.push(state.indentation);
+
+      if (modeCfg.taskLists && stream.match(taskListRE, false)) {
+        state.taskList = true;
+      }
+      state.f = state.inline;
+      if (modeCfg.highlightFormatting) state.formatting = ["list", "list-" + listType];
+      return getType(state);
+    } else if (modeCfg.fencedCodeBlocks && (match = stream.match(fencedCodeRE, true))) {
+      state.fencedChars = match[1]
+      // try switching mode
+      state.localMode = getMode(match[2]);
+      if (state.localMode) state.localState = state.localMode.startState();
+      state.f = state.block = local;
+      if (modeCfg.highlightFormatting) state.formatting = "code-block";
+      state.code = -1
+      return getType(state);
+    }
+
+    return switchInline(stream, state, state.inline);
+  }
+
+  function htmlBlock(stream, state) {
+    var style = htmlMode.token(stream, state.htmlState);
+    if (!htmlModeMissing) {
+      var inner = CodeMirror.innerMode(htmlMode, state.htmlState)
+      if ((inner.mode.name == "xml" && inner.state.tagStart === null &&
+           (!inner.state.context && inner.state.tokenize.isInText)) ||
+          (state.md_inside && stream.current().indexOf(">") > -1)) {
+        state.f = inlineNormal;
+        state.block = blockNormal;
+        state.htmlState = null;
+      }
+    }
+    return style;
+  }
+
+  function local(stream, state) {
+    if (state.fencedChars && stream.match(state.fencedChars, false)) {
+      state.localMode = state.localState = null;
+      state.f = state.block = leavingLocal;
+      return null;
+    } else if (state.localMode) {
+      return state.localMode.token(stream, state.localState);
+    } else {
+      stream.skipToEnd();
+      return tokenTypes.code;
+    }
+  }
+
+  function leavingLocal(stream, state) {
+    stream.match(state.fencedChars);
+    state.block = blockNormal;
+    state.f = inlineNormal;
+    state.fencedChars = null;
+    if (modeCfg.highlightFormatting) state.formatting = "code-block";
+    state.code = 1
+    var returnType = getType(state);
+    state.code = 0
+    return returnType;
+  }
+
+  // Inline
+  function getType(state) {
+    var styles = [];
+
+    if (state.formatting) {
+      styles.push(tokenTypes.formatting);
+
+      if (typeof state.formatting === "string") state.formatting = [state.formatting];
+
+      for (var i = 0; i < state.formatting.length; i++) {
+        styles.push(tokenTypes.formatting + "-" + state.formatting[i]);
+
+        if (state.formatting[i] === "header") {
+          styles.push(tokenTypes.formatting + "-" + state.formatting[i] + "-" + state.header);
+        }
+
+        // Add `formatting-quote` and `formatting-quote-#` for blockquotes
+        // Add `error` instead if the maximum blockquote nesting depth is passed
+        if (state.formatting[i] === "quote") {
+          if (!modeCfg.maxBlockquoteDepth || modeCfg.maxBlockquoteDepth >= state.quote) {
+            styles.push(tokenTypes.formatting + "-" + state.formatting[i] + "-" + state.quote);
+          } else {
+            styles.push("error");
+          }
+        }
+      }
+    }
+
+    if (state.taskOpen) {
+      styles.push("meta");
+      return styles.length ? styles.join(' ') : null;
+    }
+    if (state.taskClosed) {
+      styles.push("property");
+      return styles.length ? styles.join(' ') : null;
+    }
+
+    if (state.linkHref) {
+      styles.push(tokenTypes.linkHref, "url");
+    } else { // Only apply inline styles to non-url text
+      if (state.strong) { styles.push(tokenTypes.strong); }
+      if (state.em) { styles.push(tokenTypes.em); }
+      if (state.strikethrough) { styles.push(tokenTypes.strikethrough); }
+      if (state.linkText) { styles.push(tokenTypes.linkText); }
+      if (state.code) { styles.push(tokenTypes.code); }
+    }
+
+    if (state.header) { styles.push(tokenTypes.header, tokenTypes.header + "-" + state.header); }
+
+    if (state.quote) {
+      styles.push(tokenTypes.quote);
+
+      // Add `quote-#` where the maximum for `#` is modeCfg.maxBlockquoteDepth
+      if (!modeCfg.maxBlockquoteDepth || modeCfg.maxBlockquoteDepth >= state.quote) {
+        styles.push(tokenTypes.quote + "-" + state.quote);
+      } else {
+        styles.push(tokenTypes.quote + "-" + modeCfg.maxBlockquoteDepth);
+      }
+    }
+
+    if (state.list !== false) {
+      var listMod = (state.listStack.length - 1) % 3;
+      if (!listMod) {
+        styles.push(tokenTypes.list1);
+      } else if (listMod === 1) {
+        styles.push(tokenTypes.list2);
+      } else {
+        styles.push(tokenTypes.list3);
+      }
+    }
+
+    if (state.trailingSpaceNewLine) {
+      styles.push("trailing-space-new-line");
+    } else if (state.trailingSpace) {
+      styles.push("trailing-space-" + (state.trailingSpace % 2 ? "a" : "b"));
+    }
+
+    return styles.length ? styles.join(' ') : null;
+  }
+
+  function handleText(stream, state) {
+    if (stream.match(textRE, true)) {
+      return getType(state);
+    }
+    return undefined;
+  }
+
+  function inlineNormal(stream, state) {
+    var style = state.text(stream, state);
+    if (typeof style !== 'undefined')
+      return style;
+
+    if (state.list) { // List marker (*, +, -, 1., etc)
+      state.list = null;
+      return getType(state);
+    }
+
+    if (state.taskList) {
+      var taskOpen = stream.match(taskListRE, true)[1] !== "x";
+      if (taskOpen) state.taskOpen = true;
+      else state.taskClosed = true;
+      if (modeCfg.highlightFormatting) state.formatting = "task";
+      state.taskList = false;
+      return getType(state);
+    }
+
+    state.taskOpen = false;
+    state.taskClosed = false;
+
+    if (state.header && stream.match(/^#+$/, true)) {
+      if (modeCfg.highlightFormatting) state.formatting = "header";
+      return getType(state);
+    }
+
+    // Get sol() value now, before character is consumed
+    var sol = stream.sol();
+
+    var ch = stream.next();
+
+    // Matches link titles present on next line
+    if (state.linkTitle) {
+      state.linkTitle = false;
+      var matchCh = ch;
+      if (ch === '(') {
+        matchCh = ')';
+      }
+      matchCh = (matchCh+'').replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1");
+      var regex = '^\\s*(?:[^' + matchCh + '\\\\]+|\\\\\\\\|\\\\.)' + matchCh;
+      if (stream.match(new RegExp(regex), true)) {
+        return tokenTypes.linkHref;
+      }
+    }
+
+    // If this block is changed, it may need to be updated in GFM mode
+    if (ch === '`') {
+      var previousFormatting = state.formatting;
+      if (modeCfg.highlightFormatting) state.formatting = "code";
+      stream.eatWhile('`');
+      var count = stream.current().length
+      if (state.code == 0) {
+        state.code = count
+        return getType(state)
+      } else if (count == state.code) { // Must be exact
+        var t = getType(state)
+        state.code = 0
+        return t
+      } else {
+        state.formatting = previousFormatting
+        return getType(state)
+      }
+    } else if (state.code) {
+      return getType(state);
+    }
+
+    if (ch === '\\') {
+      stream.next();
+      if (modeCfg.highlightFormatting) {
+        var type = getType(state);
+        var formattingEscape = tokenTypes.formatting + "-escape";
+        return type ? type + " " + formattingEscape : formattingEscape;
+      }
+    }
+
+    if (ch === '!' && stream.match(/\[[^\]]*\] ?(?:\(|\[)/, false)) {
+      stream.match(/\[[^\]]*\]/);
+      state.inline = state.f = linkHref;
+      return tokenTypes.image;
+    }
+
+    if (ch === '[' && stream.match(/.*\](\(.*\)| ?\[.*\])/, false)) {
+      state.linkText = true;
+      if (modeCfg.highlightFormatting) state.formatting = "link";
+      return getType(state);
+    }
+
+    if (ch === ']' && state.linkText && stream.match(/\(.*\)| ?\[.*\]/, false)) {
+      if (modeCfg.highlightFormatting) state.formatting = "link";
+      var type = getType(state);
+      state.linkText = false;
+      state.inline = state.f = linkHref;
+      return type;
+    }
+
+    if (ch === '<' && stream.match(/^(https?|ftps?):\/\/(?:[^\\>]|\\.)+>/, false)) {
+      state.f = state.inline = linkInline;
+      if (modeCfg.highlightFormatting) state.formatting = "link";
+      var type = getType(state);
+      if (type){
+        type += " ";
+      } else {
+        type = "";
+      }
+      return type + tokenTypes.linkInline;
+    }
+
+    if (ch === '<' && stream.match(/^[^> \\]+@(?:[^\\>]|\\.)+>/, false)) {
+      state.f = state.inline = linkInline;
+      if (modeCfg.highlightFormatting) state.formatting = "link";
+      var type = getType(state);
+      if (type){
+        type += " ";
+      } else {
+        type = "";
+      }
+      return type + tokenTypes.linkEmail;
+    }
+
+    if (ch === '<' && stream.match(/^(!--|\w)/, false)) {
+      var end = stream.string.indexOf(">", stream.pos);
+      if (end != -1) {
+        var atts = stream.string.substring(stream.start, end);
+        if (/markdown\s*=\s*('|"){0,1}1('|"){0,1}/.test(atts)) state.md_inside = true;
+      }
+      stream.backUp(1);
+      state.htmlState = CodeMirror.startState(htmlMode);
+      return switchBlock(stream, state, htmlBlock);
+    }
+
+    if (ch === '<' && stream.match(/^\/\w*?>/)) {
+      state.md_inside = false;
+      return "tag";
+    }
+
+    var ignoreUnderscore = false;
+    if (!modeCfg.underscoresBreakWords) {
+      if (ch === '_' && stream.peek() !== '_' && stream.match(/(\w)/, false)) {
+        var prevPos = stream.pos - 2;
+        if (prevPos >= 0) {
+          var prevCh = stream.string.charAt(prevPos);
+          if (prevCh !== '_' && prevCh.match(/(\w)/, false)) {
+            ignoreUnderscore = true;
+          }
+        }
+      }
+    }
+    if (ch === '*' || (ch === '_' && !ignoreUnderscore)) {
+      if (sol && stream.peek() === ' ') {
+        // Do nothing, surrounded by newline and space
+      } else if (state.strong === ch && stream.eat(ch)) { // Remove STRONG
+        if (modeCfg.highlightFormatting) state.formatting = "strong";
+        var t = getType(state);
+        state.strong = false;
+        return t;
+      } else if (!state.strong && stream.eat(ch)) { // Add STRONG
+        state.strong = ch;
+        if (modeCfg.highlightFormatting) state.formatting = "strong";
+        return getType(state);
+      } else if (state.em === ch) { // Remove EM
+        if (modeCfg.highlightFormatting) state.formatting = "em";
+        var t = getType(state);
+        state.em = false;
+        return t;
+      } else if (!state.em) { // Add EM
+        state.em = ch;
+        if (modeCfg.highlightFormatting) state.formatting = "em";
+        return getType(state);
+      }
+    } else if (ch === ' ') {
+      if (stream.eat('*') || stream.eat('_')) { // Probably surrounded by spaces
+        if (stream.peek() === ' ') { // Surrounded by spaces, ignore
+          return getType(state);
+        } else { // Not surrounded by spaces, back up pointer
+          stream.backUp(1);
+        }
+      }
+    }
+
+    if (modeCfg.strikethrough) {
+      if (ch === '~' && stream.eatWhile(ch)) {
+        if (state.strikethrough) {// Remove strikethrough
+          if (modeCfg.highlightFormatting) state.formatting = "strikethrough";
+          var t = getType(state);
+          state.strikethrough = false;
+          return t;
+        } else if (stream.match(/^[^\s]/, false)) {// Add strikethrough
+          state.strikethrough = true;
+          if (modeCfg.highlightFormatting) state.formatting = "strikethrough";
+          return getType(state);
+        }
+      } else if (ch === ' ') {
+        if (stream.match(/^~~/, true)) { // Probably surrounded by space
+          if (stream.peek() === ' ') { // Surrounded by spaces, ignore
+            return getType(state);
+          } else { // Not surrounded by spaces, back up pointer
+            stream.backUp(2);
+          }
+        }
+      }
+    }
+
+    if (ch === ' ') {
+      if (stream.match(/ +$/, false)) {
+        state.trailingSpace++;
+      } else if (state.trailingSpace) {
+        state.trailingSpaceNewLine = true;
+      }
+    }
+
+    return getType(state);
+  }
+
+  function linkInline(stream, state) {
+    var ch = stream.next();
+
+    if (ch === ">") {
+      state.f = state.inline = inlineNormal;
+      if (modeCfg.highlightFormatting) state.formatting = "link";
+      var type = getType(state);
+      if (type){
+        type += " ";
+      } else {
+        type = "";
+      }
+      return type + tokenTypes.linkInline;
+    }
+
+    stream.match(/^[^>]+/, true);
+
+    return tokenTypes.linkInline;
+  }
+
+  function linkHref(stream, state) {
+    // Check if space, and return NULL if so (to avoid marking the space)
+    if(stream.eatSpace()){
+      return null;
+    }
+    var ch = stream.next();
+    if (ch === '(' || ch === '[') {
+      state.f = state.inline = getLinkHrefInside(ch === "(" ? ")" : "]");
+      if (modeCfg.highlightFormatting) state.formatting = "link-string";
+      state.linkHref = true;
+      return getType(state);
+    }
+    return 'error';
+  }
+
+  function getLinkHrefInside(endChar) {
+    return function(stream, state) {
+      var ch = stream.next();
+
+      if (ch === endChar) {
+        state.f = state.inline = inlineNormal;
+        if (modeCfg.highlightFormatting) state.formatting = "link-string";
+        var returnState = getType(state);
+        state.linkHref = false;
+        return returnState;
+      }
+
+      if (stream.match(inlineRE(endChar), true)) {
+        stream.backUp(1);
+      }
+
+      state.linkHref = true;
+      return getType(state);
+    };
+  }
+
+  function footnoteLink(stream, state) {
+    if (stream.match(/^([^\]\\]|\\.)*\]:/, false)) {
+      state.f = footnoteLinkInside;
+      stream.next(); // Consume [
+      if (modeCfg.highlightFormatting) state.formatting = "link";
+      state.linkText = true;
+      return getType(state);
+    }
+    return switchInline(stream, state, inlineNormal);
+  }
+
+  function footnoteLinkInside(stream, state) {
+    if (stream.match(/^\]:/, true)) {
+      state.f = state.inline = footnoteUrl;
+      if (modeCfg.highlightFormatting) state.formatting = "link";
+      var returnType = getType(state);
+      state.linkText = false;
+      return returnType;
+    }
+
+    stream.match(/^([^\]\\]|\\.)+/, true);
+
+    return tokenTypes.linkText;
+  }
+
+  function footnoteUrl(stream, state) {
+    // Check if space, and return NULL if so (to avoid marking the space)
+    if(stream.eatSpace()){
+      return null;
+    }
+    // Match URL
+    stream.match(/^[^\s]+/, true);
+    // Check for link title
+    if (stream.peek() === undefined) { // End of line, set flag to check next line
+      state.linkTitle = true;
+    } else { // More content on line, check if link title
+      stream.match(/^(?:\s+(?:"(?:[^"\\]|\\\\|\\.)+"|'(?:[^'\\]|\\\\|\\.)+'|\((?:[^)\\]|\\\\|\\.)+\)))?/, true);
+    }
+    state.f = state.inline = inlineNormal;
+    return tokenTypes.linkHref + " url";
+  }
+
+  var savedInlineRE = [];
+  function inlineRE(endChar) {
+    if (!savedInlineRE[endChar]) {
+      // Escape endChar for RegExp (taken from http://stackoverflow.com/a/494122/526741)
+      endChar = (endChar+'').replace(/([.?*+^$[\]\\(){}|-])/g, "\\$1");
+      // Match any non-endChar, escaped character, as well as the closing
+      // endChar.
+      savedInlineRE[endChar] = new RegExp('^(?:[^\\\\]|\\\\.)*?(' + endChar + ')');
+    }
+    return savedInlineRE[endChar];
+  }
+
+  var mode = {
+    startState: function() {
+      return {
+        f: blockNormal,
+
+        prevLine: null,
+        thisLine: null,
+
+        block: blockNormal,
+        htmlState: null,
+        indentation: 0,
+
+        inline: inlineNormal,
+        text: handleText,
+
+        formatting: false,
+        linkText: false,
+        linkHref: false,
+        linkTitle: false,
+        code: 0,
+        em: false,
+        strong: false,
+        header: 0,
+        hr: false,
+        taskList: false,
+        list: false,
+        listStack: [],
+        quote: 0,
+        trailingSpace: 0,
+        trailingSpaceNewLine: false,
+        strikethrough: false,
+        fencedChars: null
+      };
+    },
+
+    copyState: function(s) {
+      return {
+        f: s.f,
+
+        prevLine: s.prevLine,
+        thisLine: s.thisLine,
+
+        block: s.block,
+        htmlState: s.htmlState && CodeMirror.copyState(htmlMode, s.htmlState),
+        indentation: s.indentation,
+
+        localMode: s.localMode,
+        localState: s.localMode ? CodeMirror.copyState(s.localMode, s.localState) : null,
+
+        inline: s.inline,
+        text: s.text,
+        formatting: false,
+        linkTitle: s.linkTitle,
+        code: s.code,
+        em: s.em,
+        strong: s.strong,
+        strikethrough: s.strikethrough,
+        header: s.header,
+        hr: s.hr,
+        taskList: s.taskList,
+        list: s.list,
+        listStack: s.listStack.slice(0),
+        quote: s.quote,
+        indentedCode: s.indentedCode,
+        trailingSpace: s.trailingSpace,
+        trailingSpaceNewLine: s.trailingSpaceNewLine,
+        md_inside: s.md_inside,
+        fencedChars: s.fencedChars
+      };
+    },
+
+    token: function(stream, state) {
+
+      // Reset state.formatting
+      state.formatting = false;
+
+      if (stream != state.thisLine) {
+        var forceBlankLine = state.header || state.hr;
+
+        // Reset state.header and state.hr
+        state.header = 0;
+        state.hr = false;
+
+        if (stream.match(/^\s*$/, true) || forceBlankLine) {
+          blankLine(state);
+          if (!forceBlankLine) return null
+          state.prevLine = null
+        }
+
+        state.prevLine = state.thisLine
+        state.thisLine = stream
+
+        // Reset state.taskList
+        state.taskList = false;
+
+        // Reset state.trailingSpace
+        state.trailingSpace = 0;
+        state.trailingSpaceNewLine = false;
+
+        state.f = state.block;
+        var indentation = stream.match(/^\s*/, true)[0].replace(/\t/g, '    ').length;
+        state.indentationDiff = Math.min(indentation - state.indentation, 4);
+        state.indentation = state.indentation + state.indentationDiff;
+        if (indentation > 0) return null;
+      }
+      return state.f(stream, state);
+    },
+
+    innerMode: function(state) {
+      if (state.block == htmlBlock) return {state: state.htmlState, mode: htmlMode};
+      if (state.localState) return {state: state.localState, mode: state.localMode};
+      return {state: state, mode: mode};
+    },
+
+    blankLine: blankLine,
+
+    getType: getType,
+
+    fold: "markdown"
+  };
+  return mode;
+}, "xml");
+
+CodeMirror.defineMIME("text/x-markdown", "markdown");
+
+});
diff --git a/plugins/tiddlywiki/codemirror/files/mode/meta.js b/plugins/tiddlywiki/codemirror/files/mode/meta.js
new file mode 100755
index 000000000..3cb9de21e
--- /dev/null
+++ b/plugins/tiddlywiki/codemirror/files/mode/meta.js
@@ -0,0 +1,203 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+  "use strict";
+
+  CodeMirror.modeInfo = [
+    {name: "APL", mime: "text/apl", mode: "apl", ext: ["dyalog", "apl"]},
+    {name: "PGP", mimes: ["application/pgp", "application/pgp-keys", "application/pgp-signature"], mode: "asciiarmor", ext: ["pgp"]},
+    {name: "ASN.1", mime: "text/x-ttcn-asn", mode: "asn.1", ext: ["asn", "asn1"]},
+    {name: "Asterisk", mime: "text/x-asterisk", mode: "asterisk", file: /^extensions\.conf$/i},
+    {name: "Brainfuck", mime: "text/x-brainfuck", mode: "brainfuck", ext: ["b", "bf"]},
+    {name: "C", mime: "text/x-csrc", mode: "clike", ext: ["c", "h"]},
+    {name: "C++", mime: "text/x-c++src", mode: "clike", ext: ["cpp", "c++", "cc", "cxx", "hpp", "h++", "hh", "hxx"], alias: ["cpp"]},
+    {name: "Cobol", mime: "text/x-cobol", mode: "cobol", ext: ["cob", "cpy"]},
+    {name: "C#", mime: "text/x-csharp", mode: "clike", ext: ["cs"], alias: ["csharp"]},
+    {name: "Clojure", mime: "text/x-clojure", mode: "clojure", ext: ["clj", "cljc", "cljx"]},
+    {name: "ClojureScript", mime: "text/x-clojurescript", mode: "clojure", ext: ["cljs"]},
+    {name: "Closure Stylesheets (GSS)", mime: "text/x-gss", mode: "css", ext: ["gss"]},
+    {name: "CMake", mime: "text/x-cmake", mode: "cmake", ext: ["cmake", "cmake.in"], file: /^CMakeLists.txt$/},
+    {name: "CoffeeScript", mime: "text/x-coffeescript", mode: "coffeescript", ext: ["coffee"], alias: ["coffee", "coffee-script"]},
+    {name: "Common Lisp", mime: "text/x-common-lisp", mode: "commonlisp", ext: ["cl", "lisp", "el"], alias: ["lisp"]},
+    {name: "Cypher", mime: "application/x-cypher-query", mode: "cypher", ext: ["cyp", "cypher"]},
+    {name: "Cython", mime: "text/x-cython", mode: "python", ext: ["pyx", "pxd", "pxi"]},
+    {name: "Crystal", mime: "text/x-crystal", mode: "crystal", ext: ["cr"]},
+    {name: "CSS", mime: "text/css", mode: "css", ext: ["css"]},
+    {name: "CQL", mime: "text/x-cassandra", mode: "sql", ext: ["cql"]},
+    {name: "D", mime: "text/x-d", mode: "d", ext: ["d"]},
+    {name: "Dart", mimes: ["application/dart", "text/x-dart"], mode: "dart", ext: ["dart"]},
+    {name: "diff", mime: "text/x-diff", mode: "diff", ext: ["diff", "patch"]},
+    {name: "Django", mime: "text/x-django", mode: "django"},
+    {name: "Dockerfile", mime: "text/x-dockerfile", mode: "dockerfile", file: /^Dockerfile$/},
+    {name: "DTD", mime: "application/xml-dtd", mode: "dtd", ext: ["dtd"]},
+    {name: "Dylan", mime: "text/x-dylan", mode: "dylan", ext: ["dylan", "dyl", "intr"]},
+    {name: "EBNF", mime: "text/x-ebnf", mode: "ebnf"},
+    {name: "ECL", mime: "text/x-ecl", mode: "ecl", ext: ["ecl"]},
+    {name: "edn", mime: "application/edn", mode: "clojure", ext: ["edn"]},
+    {name: "Eiffel", mime: "text/x-eiffel", mode: "eiffel", ext: ["e"]},
+    {name: "Elm", mime: "text/x-elm", mode: "elm", ext: ["elm"]},
+    {name: "Embedded Javascript", mime: "application/x-ejs", mode: "htmlembedded", ext: ["ejs"]},
+    {name: "Embedded Ruby", mime: "application/x-erb", mode: "htmlembedded", ext: ["erb"]},
+    {name: "Erlang", mime: "text/x-erlang", mode: "erlang", ext: ["erl"]},
+    {name: "Factor", mime: "text/x-factor", mode: "factor", ext: ["factor"]},
+    {name: "FCL", mime: "text/x-fcl", mode: "fcl"},
+    {name: "Forth", mime: "text/x-forth", mode: "forth", ext: ["forth", "fth", "4th"]},
+    {name: "Fortran", mime: "text/x-fortran", mode: "fortran", ext: ["f", "for", "f77", "f90"]},
+    {name: "F#", mime: "text/x-fsharp", mode: "mllike", ext: ["fs"], alias: ["fsharp"]},
+    {name: "Gas", mime: "text/x-gas", mode: "gas", ext: ["s"]},
+    {name: "Gherkin", mime: "text/x-feature", mode: "gherkin", ext: ["feature"]},
+    {name: "GitHub Flavored Markdown", mime: "text/x-gfm", mode: "gfm", file: /^(readme|contributing|history).md$/i},
+    {name: "Go", mime: "text/x-go", mode: "go", ext: ["go"]},
+    {name: "Groovy", mime: "text/x-groovy", mode: "groovy", ext: ["groovy", "gradle"]},
+    {name: "HAML", mime: "text/x-haml", mode: "haml", ext: ["haml"]},
+    {name: "Haskell", mime: "text/x-haskell", mode: "haskell", ext: ["hs"]},
+    {name: "Haskell (Literate)", mime: "text/x-literate-haskell", mode: "haskell-literate", ext: ["lhs"]},
+    {name: "Haxe", mime: "text/x-haxe", mode: "haxe", ext: ["hx"]},
+    {name: "HXML", mime: "text/x-hxml", mode: "haxe", ext: ["hxml"]},
+    {name: "ASP.NET", mime: "application/x-aspx", mode: "htmlembedded", ext: ["aspx"], alias: ["asp", "aspx"]},
+    {name: "HTML", mime: "text/html", mode: "htmlmixed", ext: ["html", "htm"], alias: ["xhtml"]},
+    {name: "HTTP", mime: "message/http", mode: "http"},
+    {name: "IDL", mime: "text/x-idl", mode: "idl", ext: ["pro"]},
+    {name: "Jade", mime: "text/x-jade", mode: "jade", ext: ["jade"]},
+    {name: "Java", mime: "text/x-java", mode: "clike", ext: ["java"]},
+    {name: "Java Server Pages", mime: "application/x-jsp", mode: "htmlembedded", ext: ["jsp"], alias: ["jsp"]},
+    {name: "JavaScript", mimes: ["text/javascript", "text/ecmascript", "application/javascript", "application/x-javascript", "application/ecmascript"],
+     mode: "javascript", ext: ["js"], alias: ["ecmascript", "js", "node"]},
+    {name: "JSON", mimes: ["application/json", "application/x-json"], mode: "javascript", ext: ["json", "map"], alias: ["json5"]},
+    {name: "JSON-LD", mime: "application/ld+json", mode: "javascript", ext: ["jsonld"], alias: ["jsonld"]},
+    {name: "JSX", mime: "text/jsx", mode: "jsx", ext: ["jsx"]},
+    {name: "Jinja2", mime: "null", mode: "jinja2"},
+    {name: "Julia", mime: "text/x-julia", mode: "julia", ext: ["jl"]},
+    {name: "Kotlin", mime: "text/x-kotlin", mode: "clike", ext: ["kt"]},
+    {name: "LESS", mime: "text/x-less", mode: "css", ext: ["less"]},
+    {name: "LiveScript", mime: "text/x-livescript", mode: "livescript", ext: ["ls"], alias: ["ls"]},
+    {name: "Lua", mime: "text/x-lua", mode: "lua", ext: ["lua"]},
+    {name: "Markdown", mime: "text/x-markdown", mode: "markdown", ext: ["markdown", "md", "mkd"]},
+    {name: "mIRC", mime: "text/mirc", mode: "mirc"},
+    {name: "MariaDB SQL", mime: "text/x-mariadb", mode: "sql"},
+    {name: "Mathematica", mime: "text/x-mathematica", mode: "mathematica", ext: ["m", "nb"]},
+    {name: "Modelica", mime: "text/x-modelica", mode: "modelica", ext: ["mo"]},
+    {name: "MUMPS", mime: "text/x-mumps", mode: "mumps", ext: ["mps"]},
+    {name: "MS SQL", mime: "text/x-mssql", mode: "sql"},
+    {name: "MySQL", mime: "text/x-mysql", mode: "sql"},
+    {name: "Nginx", mime: "text/x-nginx-conf", mode: "nginx", file: /nginx.*\.conf$/i},
+    {name: "NSIS", mime: "text/x-nsis", mode: "nsis", ext: ["nsh", "nsi"]},
+    {name: "NTriples", mime: "text/n-triples", mode: "ntriples", ext: ["nt"]},
+    {name: "Objective C", mime: "text/x-objectivec", mode: "clike", ext: ["m", "mm"]},
+    {name: "OCaml", mime: "text/x-ocaml", mode: "mllike", ext: ["ml", "mli", "mll", "mly"]},
+    {name: "Octave", mime: "text/x-octave", mode: "octave", ext: ["m"]},
+    {name: "Oz", mime: "text/x-oz", mode: "oz", ext: ["oz"]},
+    {name: "Pascal", mime: "text/x-pascal", mode: "pascal", ext: ["p", "pas"]},
+    {name: "PEG.js", mime: "null", mode: "pegjs", ext: ["jsonld"]},
+    {name: "Perl", mime: "text/x-perl", mode: "perl", ext: ["pl", "pm"]},
+    {name: "PHP", mime: "application/x-httpd-php", mode: "php", ext: ["php", "php3", "php4", "php5", "phtml"]},
+    {name: "Pig", mime: "text/x-pig", mode: "pig", ext: ["pig"]},
+    {name: "Plain Text", mime: "text/plain", mode: "null", ext: ["txt", "text", "conf", "def", "list", "log"]},
+    {name: "PLSQL", mime: "text/x-plsql", mode: "sql", ext: ["pls"]},
+    {name: "Properties files", mime: "text/x-properties", mode: "properties", ext: ["properties", "ini", "in"], alias: ["ini", "properties"]},
+    {name: "ProtoBuf", mime: "text/x-protobuf", mode: "protobuf", ext: ["proto"]},
+    {name: "Python", mime: "text/x-python", mode: "python", ext: ["py", "pyw"]},
+    {name: "Puppet", mime: "text/x-puppet", mode: "puppet", ext: ["pp"]},
+    {name: "Q", mime: "text/x-q", mode: "q", ext: ["q"]},
+    {name: "R", mime: "text/x-rsrc", mode: "r", ext: ["r"], alias: ["rscript"]},
+    {name: "reStructuredText", mime: "text/x-rst", mode: "rst", ext: ["rst"], alias: ["rst"]},
+    {name: "RPM Changes", mime: "text/x-rpm-changes", mode: "rpm"},
+    {name: "RPM Spec", mime: "text/x-rpm-spec", mode: "rpm", ext: ["spec"]},
+    {name: "Ruby", mime: "text/x-ruby", mode: "ruby", ext: ["rb"], alias: ["jruby", "macruby", "rake", "rb", "rbx"]},
+    {name: "Rust", mime: "text/x-rustsrc", mode: "rust", ext: ["rs"]},
+    {name: "Sass", mime: "text/x-sass", mode: "sass", ext: ["sass"]},
+    {name: "Scala", mime: "text/x-scala", mode: "clike", ext: ["scala"]},
+    {name: "Scheme", mime: "text/x-scheme", mode: "scheme", ext: ["scm", "ss"]},
+    {name: "SCSS", mime: "text/x-scss", mode: "css", ext: ["scss"]},
+    {name: "Shell", mime: "text/x-sh", mode: "shell", ext: ["sh", "ksh", "bash"], alias: ["bash", "sh", "zsh"], file: /^PKGBUILD$/},
+    {name: "Sieve", mime: "application/sieve", mode: "sieve", ext: ["siv", "sieve"]},
+    {name: "Slim", mimes: ["text/x-slim", "application/x-slim"], mode: "slim", ext: ["slim"]},
+    {name: "Smalltalk", mime: "text/x-stsrc", mode: "smalltalk", ext: ["st"]},
+    {name: "Smarty", mime: "text/x-smarty", mode: "smarty", ext: ["tpl"]},
+    {name: "Solr", mime: "text/x-solr", mode: "solr"},
+    {name: "Soy", mime: "text/x-soy", mode: "soy", ext: ["soy"], alias: ["closure template"]},
+    {name: "SPARQL", mime: "application/sparql-query", mode: "sparql", ext: ["rq", "sparql"], alias: ["sparul"]},
+    {name: "Spreadsheet", mime: "text/x-spreadsheet", mode: "spreadsheet", alias: ["excel", "formula"]},
+    {name: "SQL", mime: "text/x-sql", mode: "sql", ext: ["sql"]},
+    {name: "Squirrel", mime: "text/x-squirrel", mode: "clike", ext: ["nut"]},
+    {name: "Swift", mime: "text/x-swift", mode: "swift", ext: ["swift"]},
+    {name: "sTeX", mime: "text/x-stex", mode: "stex"},
+    {name: "LaTeX", mime: "text/x-latex", mode: "stex", ext: ["text", "ltx"], alias: ["tex"]},
+    {name: "SystemVerilog", mime: "text/x-systemverilog", mode: "verilog", ext: ["v"]},
+    {name: "Tcl", mime: "text/x-tcl", mode: "tcl", ext: ["tcl"]},
+    {name: "Textile", mime: "text/x-textile", mode: "textile", ext: ["textile"]},
+    {name: "TiddlyWiki ", mime: "text/x-tiddlywiki", mode: "tiddlywiki"},
+    {name: "Tiki wiki", mime: "text/tiki", mode: "tiki"},
+    {name: "TOML", mime: "text/x-toml", mode: "toml", ext: ["toml"]},
+    {name: "Tornado", mime: "text/x-tornado", mode: "tornado"},
+    {name: "troff", mime: "text/troff", mode: "troff", ext: ["1", "2", "3", "4", "5", "6", "7", "8", "9"]},
+    {name: "TTCN", mime: "text/x-ttcn", mode: "ttcn", ext: ["ttcn", "ttcn3", "ttcnpp"]},
+    {name: "TTCN_CFG", mime: "text/x-ttcn-cfg", mode: "ttcn-cfg", ext: ["cfg"]},
+    {name: "Turtle", mime: "text/turtle", mode: "turtle", ext: ["ttl"]},
+    {name: "TypeScript", mime: "application/typescript", mode: "javascript", ext: ["ts"], alias: ["ts"]},
+    {name: "Twig", mime: "text/x-twig", mode: "twig"},
+    {name: "VB.NET", mime: "text/x-vb", mode: "vb", ext: ["vb"]},
+    {name: "VBScript", mime: "text/vbscript", mode: "vbscript", ext: ["vbs"]},
+    {name: "Velocity", mime: "text/velocity", mode: "velocity", ext: ["vtl"]},
+    {name: "Verilog", mime: "text/x-verilog", mode: "verilog", ext: ["v"]},
+    {name: "VHDL", mime: "text/x-vhdl", mode: "vhdl", ext: ["vhd", "vhdl"]},
+    {name: "XML", mimes: ["application/xml", "text/xml"], mode: "xml", ext: ["xml", "xsl", "xsd"], alias: ["rss", "wsdl", "xsd"]},
+    {name: "XQuery", mime: "application/xquery", mode: "xquery", ext: ["xy", "xquery"]},
+    {name: "YAML", mime: "text/x-yaml", mode: "yaml", ext: ["yaml", "yml"], alias: ["yml"]},
+    {name: "Z80", mime: "text/x-z80", mode: "z80", ext: ["z80"]},
+    {name: "mscgen", mime: "text/x-mscgen", mode: "mscgen", ext: ["mscgen", "mscin", "msc"]},
+    {name: "xu", mime: "text/x-xu", mode: "mscgen", ext: ["xu"]},
+    {name: "msgenny", mime: "text/x-msgenny", mode: "mscgen", ext: ["msgenny"]}
+  ];
+  // Ensure all modes have a mime property for backwards compatibility
+  for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
+    var info = CodeMirror.modeInfo[i];
+    if (info.mimes) info.mime = info.mimes[0];
+  }
+
+  CodeMirror.findModeByMIME = function(mime) {
+    mime = mime.toLowerCase();
+    for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
+      var info = CodeMirror.modeInfo[i];
+      if (info.mime == mime) return info;
+      if (info.mimes) for (var j = 0; j < info.mimes.length; j++)
+        if (info.mimes[j] == mime) return info;
+    }
+  };
+
+  CodeMirror.findModeByExtension = function(ext) {
+    for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
+      var info = CodeMirror.modeInfo[i];
+      if (info.ext) for (var j = 0; j < info.ext.length; j++)
+        if (info.ext[j] == ext) return info;
+    }
+  };
+
+  CodeMirror.findModeByFileName = function(filename) {
+    for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
+      var info = CodeMirror.modeInfo[i];
+      if (info.file && info.file.test(filename)) return info;
+    }
+    var dot = filename.lastIndexOf(".");
+    var ext = dot > -1 && filename.substring(dot + 1, filename.length);
+    if (ext) return CodeMirror.findModeByExtension(ext);
+  };
+
+  CodeMirror.findModeByName = function(name) {
+    name = name.toLowerCase();
+    for (var i = 0; i < CodeMirror.modeInfo.length; i++) {
+      var info = CodeMirror.modeInfo[i];
+      if (info.name.toLowerCase() == name) return info;
+      if (info.alias) for (var j = 0; j < info.alias.length; j++)
+        if (info.alias[j].toLowerCase() == name) return info;
+    }
+  };
+});
diff --git a/plugins/tiddlywiki/codemirror/files/mode/tiddlywiki/tiddlywiki.css b/plugins/tiddlywiki/codemirror/files/mode/tiddlywiki/tiddlywiki.css
new file mode 100755
index 000000000..9a69b639f
--- /dev/null
+++ b/plugins/tiddlywiki/codemirror/files/mode/tiddlywiki/tiddlywiki.css
@@ -0,0 +1,14 @@
+span.cm-underlined {
+  text-decoration: underline;
+}
+span.cm-strikethrough {
+  text-decoration: line-through;
+}
+span.cm-brace {
+  color: #170;
+  font-weight: bold;
+}
+span.cm-table {
+  color: blue;
+  font-weight: bold;
+}
diff --git a/plugins/tiddlywiki/codemirror/files/mode/tiddlywiki/tiddlywiki.js b/plugins/tiddlywiki/codemirror/files/mode/tiddlywiki/tiddlywiki.js
new file mode 100755
index 000000000..1df01647a
--- /dev/null
+++ b/plugins/tiddlywiki/codemirror/files/mode/tiddlywiki/tiddlywiki.js
@@ -0,0 +1,358 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+/***
+    |''Name''|tiddlywiki.js|
+    |''Description''|Enables TiddlyWikiy syntax highlighting using CodeMirror|
+    |''Author''|PMario|
+    |''Version''|0.1.7|
+    |''Status''|''stable''|
+    |''Source''|[[GitHub|https://github.com/pmario/CodeMirror2/blob/tw-syntax/mode/tiddlywiki]]|
+    |''Documentation''|http://codemirror.tiddlyspace.com/|
+    |''License''|[[MIT License|http://www.opensource.org/licenses/mit-license.php]]|
+    |''CoreVersion''|2.5.0|
+    |''Requires''|codemirror.js|
+    |''Keywords''|syntax highlighting color code mirror codemirror|
+    ! Info
+    CoreVersion parameter is needed for TiddlyWiki only!
+***/
+//{{{
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+CodeMirror.defineMode("tiddlywiki", function () {
+  // Tokenizer
+  var textwords = {};
+
+  var keywords = function () {
+    function kw(type) {
+      return { type: type, style: "macro"};
+    }
+    return {
+      "allTags": kw('allTags'), "closeAll": kw('closeAll'), "list": kw('list'),
+      "newJournal": kw('newJournal'), "newTiddler": kw('newTiddler'),
+      "permaview": kw('permaview'), "saveChanges": kw('saveChanges'),
+      "search": kw('search'), "slider": kw('slider'),   "tabs": kw('tabs'),
+      "tag": kw('tag'), "tagging": kw('tagging'),       "tags": kw('tags'),
+      "tiddler": kw('tiddler'), "timeline": kw('timeline'),
+      "today": kw('today'), "version": kw('version'),   "option": kw('option'),
+
+      "with": kw('with'),
+      "filter": kw('filter')
+    };
+  }();
+
+  var isSpaceName = /[\w_\-]/i,
+  reHR = /^\-\-\-\-+$/,                                 // <hr>
+  reWikiCommentStart = /^\/\*\*\*$/,            // /***
+  reWikiCommentStop = /^\*\*\*\/$/,             // ***/
+  reBlockQuote = /^<<<$/,
+
+  reJsCodeStart = /^\/\/\{\{\{$/,                       // //{{{ js block start
+  reJsCodeStop = /^\/\/\}\}\}$/,                        // //}}} js stop
+  reXmlCodeStart = /^<!--\{\{\{-->$/,           // xml block start
+  reXmlCodeStop = /^<!--\}\}\}-->$/,            // xml stop
+
+  reCodeBlockStart = /^\{\{\{$/,                        // {{{ TW text div block start
+  reCodeBlockStop = /^\}\}\}$/,                 // }}} TW text stop
+
+  reUntilCodeStop = /.*?\}\}\}/;
+
+  function chain(stream, state, f) {
+    state.tokenize = f;
+    return f(stream, state);
+  }
+
+  function jsTokenBase(stream, state) {
+    var sol = stream.sol(), ch;
+
+    state.block = false;        // indicates the start of a code block.
+
+    ch = stream.peek();         // don't eat, to make matching simpler
+
+    // check start of  blocks
+    if (sol && /[<\/\*{}\-]/.test(ch)) {
+      if (stream.match(reCodeBlockStart)) {
+        state.block = true;
+        return chain(stream, state, twTokenCode);
+      }
+      if (stream.match(reBlockQuote)) {
+        return 'quote';
+      }
+      if (stream.match(reWikiCommentStart) || stream.match(reWikiCommentStop)) {
+        return 'comment';
+      }
+      if (stream.match(reJsCodeStart) || stream.match(reJsCodeStop) || stream.match(reXmlCodeStart) || stream.match(reXmlCodeStop)) {
+        return 'comment';
+      }
+      if (stream.match(reHR)) {
+        return 'hr';
+      }
+    } // sol
+    ch = stream.next();
+
+    if (sol && /[\/\*!#;:>|]/.test(ch)) {
+      if (ch == "!") { // tw header
+        stream.skipToEnd();
+        return "header";
+      }
+      if (ch == "*") { // tw list
+        stream.eatWhile('*');
+        return "comment";
+      }
+      if (ch == "#") { // tw numbered list
+        stream.eatWhile('#');
+        return "comment";
+      }
+      if (ch == ";") { // definition list, term
+        stream.eatWhile(';');
+        return "comment";
+      }
+      if (ch == ":") { // definition list, description
+        stream.eatWhile(':');
+        return "comment";
+      }
+      if (ch == ">") { // single line quote
+        stream.eatWhile(">");
+        return "quote";
+      }
+      if (ch == '|') {
+        return 'header';
+      }
+    }
+
+    if (ch == '{' && stream.match(/\{\{/)) {
+      return chain(stream, state, twTokenCode);
+    }
+
+    // rudimentary html:// file:// link matching. TW knows much more ...
+    if (/[hf]/i.test(ch)) {
+      if (/[ti]/i.test(stream.peek()) && stream.match(/\b(ttps?|tp|ile):\/\/[\-A-Z0-9+&@#\/%?=~_|$!:,.;]*[A-Z0-9+&@#\/%=~_|$]/i)) {
+        return "link";
+      }
+    }
+    // just a little string indicator, don't want to have the whole string covered
+    if (ch == '"') {
+      return 'string';
+    }
+    if (ch == '~') {    // _no_ CamelCase indicator should be bold
+      return 'brace';
+    }
+    if (/[\[\]]/.test(ch)) { // check for [[..]]
+      if (stream.peek() == ch) {
+        stream.next();
+        return 'brace';
+      }
+    }
+    if (ch == "@") {    // check for space link. TODO fix @@...@@ highlighting
+      stream.eatWhile(isSpaceName);
+      return "link";
+    }
+    if (/\d/.test(ch)) {        // numbers
+      stream.eatWhile(/\d/);
+      return "number";
+    }
+    if (ch == "/") { // tw invisible comment
+      if (stream.eat("%")) {
+        return chain(stream, state, twTokenComment);
+      }
+      else if (stream.eat("/")) { //
+        return chain(stream, state, twTokenEm);
+      }
+    }
+    if (ch == "_") { // tw underline
+      if (stream.eat("_")) {
+        return chain(stream, state, twTokenUnderline);
+      }
+    }
+    // strikethrough and mdash handling
+    if (ch == "-") {
+      if (stream.eat("-")) {
+        // if strikethrough looks ugly, change CSS.
+        if (stream.peek() != ' ')
+          return chain(stream, state, twTokenStrike);
+        // mdash
+        if (stream.peek() == ' ')
+          return 'brace';
+      }
+    }
+    if (ch == "'") { // tw bold
+      if (stream.eat("'")) {
+        return chain(stream, state, twTokenStrong);
+      }
+    }
+    if (ch == "<") { // tw macro
+      if (stream.eat("<")) {
+        return chain(stream, state, twTokenMacro);
+      }
+    }
+    else {
+      return null;
+    }
+
+    // core macro handling
+    stream.eatWhile(/[\w\$_]/);
+    var word = stream.current(),
+    known = textwords.propertyIsEnumerable(word) && textwords[word];
+
+    return known ? known.style : null;
+  } // jsTokenBase()
+
+  // tw invisible comment
+  function twTokenComment(stream, state) {
+    var maybeEnd = false,
+    ch;
+    while (ch = stream.next()) {
+      if (ch == "/" && maybeEnd) {
+        state.tokenize = jsTokenBase;
+        break;
+      }
+      maybeEnd = (ch == "%");
+    }
+    return "comment";
+  }
+
+  // tw strong / bold
+  function twTokenStrong(stream, state) {
+    var maybeEnd = false,
+    ch;
+    while (ch = stream.next()) {
+      if (ch == "'" && maybeEnd) {
+        state.tokenize = jsTokenBase;
+        break;
+      }
+      maybeEnd = (ch == "'");
+    }
+    return "strong";
+  }
+
+  // tw code
+  function twTokenCode(stream, state) {
+    var sb = state.block;
+
+    if (sb && stream.current()) {
+      return "comment";
+    }
+
+    if (!sb && stream.match(reUntilCodeStop)) {
+      state.tokenize = jsTokenBase;
+      return "comment";
+    }
+
+    if (sb && stream.sol() && stream.match(reCodeBlockStop)) {
+      state.tokenize = jsTokenBase;
+      return "comment";
+    }
+
+    stream.next();
+    return "comment";
+  }
+
+  // tw em / italic
+  function twTokenEm(stream, state) {
+    var maybeEnd = false,
+    ch;
+    while (ch = stream.next()) {
+      if (ch == "/" && maybeEnd) {
+        state.tokenize = jsTokenBase;
+        break;
+      }
+      maybeEnd = (ch == "/");
+    }
+    return "em";
+  }
+
+  // tw underlined text
+  function twTokenUnderline(stream, state) {
+    var maybeEnd = false,
+    ch;
+    while (ch = stream.next()) {
+      if (ch == "_" && maybeEnd) {
+        state.tokenize = jsTokenBase;
+        break;
+      }
+      maybeEnd = (ch == "_");
+    }
+    return "underlined";
+  }
+
+  // tw strike through text looks ugly
+  // change CSS if needed
+  function twTokenStrike(stream, state) {
+    var maybeEnd = false, ch;
+
+    while (ch = stream.next()) {
+      if (ch == "-" && maybeEnd) {
+        state.tokenize = jsTokenBase;
+        break;
+      }
+      maybeEnd = (ch == "-");
+    }
+    return "strikethrough";
+  }
+
+  // macro
+  function twTokenMacro(stream, state) {
+    var ch, word, known;
+
+    if (stream.current() == '<<') {
+      return 'macro';
+    }
+
+    ch = stream.next();
+    if (!ch) {
+      state.tokenize = jsTokenBase;
+      return null;
+    }
+    if (ch == ">") {
+      if (stream.peek() == '>') {
+        stream.next();
+        state.tokenize = jsTokenBase;
+        return "macro";
+      }
+    }
+
+    stream.eatWhile(/[\w\$_]/);
+    word = stream.current();
+    known = keywords.propertyIsEnumerable(word) && keywords[word];
+
+    if (known) {
+      return known.style, word;
+    }
+    else {
+      return null, word;
+    }
+  }
+
+  // Interface
+  return {
+    startState: function () {
+      return {
+        tokenize: jsTokenBase,
+        indented: 0,
+        level: 0
+      };
+    },
+
+    token: function (stream, state) {
+      if (stream.eatSpace()) return null;
+      var style = state.tokenize(stream, state);
+      return style;
+    },
+
+    electricChars: ""
+  };
+});
+
+CodeMirror.defineMIME("text/x-tiddlywiki", "tiddlywiki");
+});
+
+//}}}
diff --git a/plugins/tiddlywiki/codemirror/files/mode/xml/xml.js b/plugins/tiddlywiki/codemirror/files/mode/xml/xml.js
new file mode 100755
index 000000000..f987a3a3c
--- /dev/null
+++ b/plugins/tiddlywiki/codemirror/files/mode/xml/xml.js
@@ -0,0 +1,394 @@
+// CodeMirror, copyright (c) by Marijn Haverbeke and others
+// Distributed under an MIT license: http://codemirror.net/LICENSE
+
+(function(mod) {
+  if (typeof exports == "object" && typeof module == "object") // CommonJS
+    mod(require("../../lib/codemirror"));
+  else if (typeof define == "function" && define.amd) // AMD
+    define(["../../lib/codemirror"], mod);
+  else // Plain browser env
+    mod(CodeMirror);
+})(function(CodeMirror) {
+"use strict";
+
+var htmlConfig = {
+  autoSelfClosers: {'area': true, 'base': true, 'br': true, 'col': true, 'command': true,
+                    'embed': true, 'frame': true, 'hr': true, 'img': true, 'input': true,
+                    'keygen': true, 'link': true, 'meta': true, 'param': true, 'source': true,
+                    'track': true, 'wbr': true, 'menuitem': true},
+  implicitlyClosed: {'dd': true, 'li': true, 'optgroup': true, 'option': true, 'p': true,
+                     'rp': true, 'rt': true, 'tbody': true, 'td': true, 'tfoot': true,
+                     'th': true, 'tr': true},
+  contextGrabbers: {
+    'dd': {'dd': true, 'dt': true},
+    'dt': {'dd': true, 'dt': true},
+    'li': {'li': true},
+    'option': {'option': true, 'optgroup': true},
+    'optgroup': {'optgroup': true},
+    'p': {'address': true, 'article': true, 'aside': true, 'blockquote': true, 'dir': true,
+          'div': true, 'dl': true, 'fieldset': true, 'footer': true, 'form': true,
+          'h1': true, 'h2': true, 'h3': true, 'h4': true, 'h5': true, 'h6': true,
+          'header': true, 'hgroup': true, 'hr': true, 'menu': true, 'nav': true, 'ol': true,
+          'p': true, 'pre': true, 'section': true, 'table': true, 'ul': true},
+    'rp': {'rp': true, 'rt': true},
+    'rt': {'rp': true, 'rt': true},
+    'tbody': {'tbody': true, 'tfoot': true},
+    'td': {'td': true, 'th': true},
+    'tfoot': {'tbody': true},
+    'th': {'td': true, 'th': true},
+    'thead': {'tbody': true, 'tfoot': true},
+    'tr': {'tr': true}
+  },
+  doNotIndent: {"pre": true},
+  allowUnquoted: true,
+  allowMissing: true,
+  caseFold: true
+}
+
+var xmlConfig = {
+  autoSelfClosers: {},
+  implicitlyClosed: {},
+  contextGrabbers: {},
+  doNotIndent: {},
+  allowUnquoted: false,
+  allowMissing: false,
+  caseFold: false
+}
+
+CodeMirror.defineMode("xml", function(editorConf, config_) {
+  var indentUnit = editorConf.indentUnit
+  var config = {}
+  var defaults = config_.htmlMode ? htmlConfig : xmlConfig
+  for (var prop in defaults) config[prop] = defaults[prop]
+  for (var prop in config_) config[prop] = config_[prop]
+
+  // Return variables for tokenizers
+  var type, setStyle;
+
+  function inText(stream, state) {
+    function chain(parser) {
+      state.tokenize = parser;
+      return parser(stream, state);
+    }
+
+    var ch = stream.next();
+    if (ch == "<") {
+      if (stream.eat("!")) {
+        if (stream.eat("[")) {
+          if (stream.match("CDATA[")) return chain(inBlock("atom", "]]>"));
+          else return null;
+        } else if (stream.match("--")) {
+          return chain(inBlock("comment", "-->"));
+        } else if (stream.match("DOCTYPE", true, true)) {
+          stream.eatWhile(/[\w\._\-]/);
+          return chain(doctype(1));
+        } else {
+          return null;
+        }
+      } else if (stream.eat("?")) {
+        stream.eatWhile(/[\w\._\-]/);
+        state.tokenize = inBlock("meta", "?>");
+        return "meta";
+      } else {
+        type = stream.eat("/") ? "closeTag" : "openTag";
+        state.tokenize = inTag;
+        return "tag bracket";
+      }
+    } else if (ch == "&") {
+      var ok;
+      if (stream.eat("#")) {
+        if (stream.eat("x")) {
+          ok = stream.eatWhile(/[a-fA-F\d]/) && stream.eat(";");
+        } else {
+          ok = stream.eatWhile(/[\d]/) && stream.eat(";");
+        }
+      } else {
+        ok = stream.eatWhile(/[\w\.\-:]/) && stream.eat(";");
+      }
+      return ok ? "atom" : "error";
+    } else {
+      stream.eatWhile(/[^&<]/);
+      return null;
+    }
+  }
+  inText.isInText = true;
+
+  function inTag(stream, state) {
+    var ch = stream.next();
+    if (ch == ">" || (ch == "/" && stream.eat(">"))) {
+      state.tokenize = inText;
+      type = ch == ">" ? "endTag" : "selfcloseTag";
+      return "tag bracket";
+    } else if (ch == "=") {
+      type = "equals";
+      return null;
+    } else if (ch == "<") {
+      state.tokenize = inText;
+      state.state = baseState;
+      state.tagName = state.tagStart = null;
+      var next = state.tokenize(stream, state);
+      return next ? next + " tag error" : "tag error";
+    } else if (/[\'\"]/.test(ch)) {
+      state.tokenize = inAttribute(ch);
+      state.stringStartCol = stream.column();
+      return state.tokenize(stream, state);
+    } else {
+      stream.match(/^[^\s\u00a0=<>\"\']*[^\s\u00a0=<>\"\'\/]/);
+      return "word";
+    }
+  }
+
+  function inAttribute(quote) {
+    var closure = function(stream, state) {
+      while (!stream.eol()) {
+        if (stream.next() == quote) {
+          state.tokenize = inTag;
+          break;
+        }
+      }
+      return "string";
+    };
+    closure.isInAttribute = true;
+    return closure;
+  }
+
+  function inBlock(style, terminator) {
+    return function(stream, state) {
+      while (!stream.eol()) {
+        if (stream.match(terminator)) {
+          state.tokenize = inText;
+          break;
+        }
+        stream.next();
+      }
+      return style;
+    };
+  }
+  function doctype(depth) {
+    return function(stream, state) {
+      var ch;
+      while ((ch = stream.next()) != null) {
+        if (ch == "<") {
+          state.tokenize = doctype(depth + 1);
+          return state.tokenize(stream, state);
+        } else if (ch == ">") {
+          if (depth == 1) {
+            state.tokenize = inText;
+            break;
+          } else {
+            state.tokenize = doctype(depth - 1);
+            return state.tokenize(stream, state);
+          }
+        }
+      }
+      return "meta";
+    };
+  }
+
+  function Context(state, tagName, startOfLine) {
+    this.prev = state.context;
+    this.tagName = tagName;
+    this.indent = state.indented;
+    this.startOfLine = startOfLine;
+    if (config.doNotIndent.hasOwnProperty(tagName) || (state.context && state.context.noIndent))
+      this.noIndent = true;
+  }
+  function popContext(state) {
+    if (state.context) state.context = state.context.prev;
+  }
+  function maybePopContext(state, nextTagName) {
+    var parentTagName;
+    while (true) {
+      if (!state.context) {
+        return;
+      }
+      parentTagName = state.context.tagName;
+      if (!config.contextGrabbers.hasOwnProperty(parentTagName) ||
+          !config.contextGrabbers[parentTagName].hasOwnProperty(nextTagName)) {
+        return;
+      }
+      popContext(state);
+    }
+  }
+
+  function baseState(type, stream, state) {
+    if (type == "openTag") {
+      state.tagStart = stream.column();
+      return tagNameState;
+    } else if (type == "closeTag") {
+      return closeTagNameState;
+    } else {
+      return baseState;
+    }
+  }
+  function tagNameState(type, stream, state) {
+    if (type == "word") {
+      state.tagName = stream.current();
+      setStyle = "tag";
+      return attrState;
+    } else {
+      setStyle = "error";
+      return tagNameState;
+    }
+  }
+  function closeTagNameState(type, stream, state) {
+    if (type == "word") {
+      var tagName = stream.current();
+      if (state.context && state.context.tagName != tagName &&
+          config.implicitlyClosed.hasOwnProperty(state.context.tagName))
+        popContext(state);
+      if ((state.context && state.context.tagName == tagName) || config.matchClosing === false) {
+        setStyle = "tag";
+        return closeState;
+      } else {
+        setStyle = "tag error";
+        return closeStateErr;
+      }
+    } else {
+      setStyle = "error";
+      return closeStateErr;
+    }
+  }
+
+  function closeState(type, _stream, state) {
+    if (type != "endTag") {
+      setStyle = "error";
+      return closeState;
+    }
+    popContext(state);
+    return baseState;
+  }
+  function closeStateErr(type, stream, state) {
+    setStyle = "error";
+    return closeState(type, stream, state);
+  }
+
+  function attrState(type, _stream, state) {
+    if (type == "word") {
+      setStyle = "attribute";
+      return attrEqState;
+    } else if (type == "endTag" || type == "selfcloseTag") {
+      var tagName = state.tagName, tagStart = state.tagStart;
+      state.tagName = state.tagStart = null;
+      if (type == "selfcloseTag" ||
+          config.autoSelfClosers.hasOwnProperty(tagName)) {
+        maybePopContext(state, tagName);
+      } else {
+        maybePopContext(state, tagName);
+        state.context = new Context(state, tagName, tagStart == state.indented);
+      }
+      return baseState;
+    }
+    setStyle = "error";
+    return attrState;
+  }
+  function attrEqState(type, stream, state) {
+    if (type == "equals") return attrValueState;
+    if (!config.allowMissing) setStyle = "error";
+    return attrState(type, stream, state);
+  }
+  function attrValueState(type, stream, state) {
+    if (type == "string") return attrContinuedState;
+    if (type == "word" && config.allowUnquoted) {setStyle = "string"; return attrState;}
+    setStyle = "error";
+    return attrState(type, stream, state);
+  }
+  function attrContinuedState(type, stream, state) {
+    if (type == "string") return attrContinuedState;
+    return attrState(type, stream, state);
+  }
+
+  return {
+    startState: function(baseIndent) {
+      var state = {tokenize: inText,
+                   state: baseState,
+                   indented: baseIndent || 0,
+                   tagName: null, tagStart: null,
+                   context: null}
+      if (baseIndent != null) state.baseIndent = baseIndent
+      return state
+    },
+
+    token: function(stream, state) {
+      if (!state.tagName && stream.sol())
+        state.indented = stream.indentation();
+
+      if (stream.eatSpace()) return null;
+      type = null;
+      var style = state.tokenize(stream, state);
+      if ((style || type) && style != "comment") {
+        setStyle = null;
+        state.state = state.state(type || style, stream, state);
+        if (setStyle)
+          style = setStyle == "error" ? style + " error" : setStyle;
+      }
+      return style;
+    },
+
+    indent: function(state, textAfter, fullLine) {
+      var context = state.context;
+      // Indent multi-line strings (e.g. css).
+      if (state.tokenize.isInAttribute) {
+        if (state.tagStart == state.indented)
+          return state.stringStartCol + 1;
+        else
+          return state.indented + indentUnit;
+      }
+      if (context && context.noIndent) return CodeMirror.Pass;
+      if (state.tokenize != inTag && state.tokenize != inText)
+        return fullLine ? fullLine.match(/^(\s*)/)[0].length : 0;
+      // Indent the starts of attribute names.
+      if (state.tagName) {
+        if (config.multilineTagIndentPastTag !== false)
+          return state.tagStart + state.tagName.length + 2;
+        else
+          return state.tagStart + indentUnit * (config.multilineTagIndentFactor || 1);
+      }
+      if (config.alignCDATA && /<!\[CDATA\[/.test(textAfter)) return 0;
+      var tagAfter = textAfter && /^<(\/)?([\w_:\.-]*)/.exec(textAfter);
+      if (tagAfter && tagAfter[1]) { // Closing tag spotted
+        while (context) {
+          if (context.tagName == tagAfter[2]) {
+            context = context.prev;
+            break;
+          } else if (config.implicitlyClosed.hasOwnProperty(context.tagName)) {
+            context = context.prev;
+          } else {
+            break;
+          }
+        }
+      } else if (tagAfter) { // Opening tag spotted
+        while (context) {
+          var grabbers = config.contextGrabbers[context.tagName];
+          if (grabbers && grabbers.hasOwnProperty(tagAfter[2]))
+            context = context.prev;
+          else
+            break;
+        }
+      }
+      while (context && context.prev && !context.startOfLine)
+        context = context.prev;
+      if (context) return context.indent + indentUnit;
+      else return state.baseIndent || 0;
+    },
+
+    electricInput: /<\/[\s\w:]+>$/,
+    blockCommentStart: "<!--",
+    blockCommentEnd: "-->",
+
+    configuration: config.htmlMode ? "html" : "xml",
+    helperType: config.htmlMode ? "html" : "xml",
+
+    skipAttribute: function(state) {
+      if (state.state == attrValueState)
+        state.state = attrState
+    }
+  };
+});
+
+CodeMirror.defineMIME("text/xml", "xml");
+CodeMirror.defineMIME("application/xml", "xml");
+if (!CodeMirror.mimeModes.hasOwnProperty("text/html"))
+  CodeMirror.defineMIME("text/html", {name: "xml", htmlMode: true});
+
+});
diff --git a/plugins/tiddlywiki/codemirror/files/tiddlywiki.files b/plugins/tiddlywiki/codemirror/files/tiddlywiki.files
old mode 100644
new mode 100755
index bad0677f6..27f27d7e9
--- a/plugins/tiddlywiki/codemirror/files/tiddlywiki.files
+++ b/plugins/tiddlywiki/codemirror/files/tiddlywiki.files
@@ -35,6 +35,13 @@
 				"title": "$:/plugins/tiddlywiki/codemirror/addon/edit/matchbrackets.js",
 				"module-type": "library"
 			}
+		},{
+			"file": "addon/mode/multiplex.js",
+			"fields": {
+				"type": "application/javascript",
+				"title": "$:/plugins/tiddlywiki/codemirror/addon/mode/multiplex.js",
+				"module-type": "library"
+			}
 		},{
 			"file": "addon/search/searchcursor.js",
 			"fields": {
@@ -42,6 +49,27 @@
 				"title": "$:/plugins/tiddlywiki/codemirror/addon/search/searchcursor.js",
 				"module-type": "library"
 			}
+		},{
+			"file": "mode/css/css.js",
+			"fields": {
+				"type": "application/javascript",
+				"title": "$:/plugins/tiddlywiki/codemirror/mode/css/css.js",
+				"module-type": "library"
+			}
+		},{
+			"file": "mode/htmlembedded/htmlembedded.js",
+			"fields": {
+				"type": "application/javascript",
+				"title": "$:/plugins/tiddlywiki/codemirror/mode/htmlembedded/htmlembedded.js",
+				"module-type": "library"
+			}
+		},{
+			"file": "mode/htmlmixed/htmlmixed.js",
+			"fields": {
+				"type": "application/javascript",
+				"title": "$:/plugins/tiddlywiki/codemirror/mode/htmlmixed/htmlmixed.js",
+				"module-type": "library"
+			}
 		},{
 			"file": "mode/javascript/javascript.js",
 			"fields": {
@@ -49,6 +77,41 @@
 				"title": "$:/plugins/tiddlywiki/codemirror/mode/javascript/javascript.js",
 				"module-type": "library"
 			}
+		},{
+			"file": "mode/markdown/markdown.js",
+			"fields": {
+				"type": "application/javascript",
+				"title": "$:/plugins/tiddlywiki/codemirror/mode/markdown/markdown.js",
+				"module-type": "library"
+			}
+		},{
+			"file": "mode/meta.js",
+			"fields": {
+				"type": "application/javascript",
+				"title": "$:/plugins/tiddlywiki/codemirror/mode/meta.js",
+				"module-type": "library"
+			}
+		},{
+			"file": "mode/tiddlywiki/tiddlywiki.css",
+			"fields": {
+				"type": "text/css",
+				"title": "$:/plugins/tiddlywiki/codemirror/mode/tiddlywiki/tiddlywiki.css",
+				"tags": "[[$:/tags/Stylesheet]]"
+			}
+		},{
+			"file": "mode/tiddlywiki/tiddlywiki.js",
+			"fields": {
+				"type": "application/javascript",
+				"title": "$:/plugins/tiddlywiki/codemirror/mode/tiddlywiki/tiddlywiki.js",
+				"module-type": "library"
+			}
+		},{
+			"file": "mode/xml/xml.js",
+			"fields": {
+				"type": "application/javascript",
+				"title": "$:/plugins/tiddlywiki/codemirror/mode/xml/xml.js",
+				"module-type": "library"
+			}
 		},{
 			"file": "keymap/vim.js",
 			"fields": {
diff --git a/plugins/tiddlywiki/codemirror/plugin.info b/plugins/tiddlywiki/codemirror/plugin.info
old mode 100644
new mode 100755
diff --git a/plugins/tiddlywiki/codemirror/readme.tid b/plugins/tiddlywiki/codemirror/readme.tid
old mode 100644
new mode 100755
index a99b63d6a..a8c46456f
--- a/plugins/tiddlywiki/codemirror/readme.tid
+++ b/plugins/tiddlywiki/codemirror/readme.tid
@@ -8,3 +8,5 @@ This plugin provides an enhanced text editor component based on [[CodeMirror|htt
 * Auto-completion
 
 [[Source code|https://github.com/Jermolene/TiddlyWiki5/blob/master/plugins/tiddlywiki/codemirror]]
+
+Based on ~CodeMirror version 5.13.2
diff --git a/plugins/tiddlywiki/codemirror/styles.tid b/plugins/tiddlywiki/codemirror/styles.tid
old mode 100644
new mode 100755
diff --git a/plugins/tiddlywiki/codemirror/usage.tid b/plugins/tiddlywiki/codemirror/usage.tid
old mode 100644
new mode 100755
diff --git a/plugins/tiddlywiki/evernote/docs.tid b/plugins/tiddlywiki/evernote/docs.tid
new file mode 100644
index 000000000..d3fd38334
--- /dev/null
+++ b/plugins/tiddlywiki/evernote/docs.tid
@@ -0,0 +1,4 @@
+title: $:/plugins/tiddlywiki/evernote/docs
+
+! Introduction
+
diff --git a/plugins/tiddlywiki/evernote/modules/enex-deserializer.js b/plugins/tiddlywiki/evernote/modules/enex-deserializer.js
new file mode 100644
index 000000000..cffd4f4ab
--- /dev/null
+++ b/plugins/tiddlywiki/evernote/modules/enex-deserializer.js
@@ -0,0 +1,80 @@
+/*\
+title: $:/plugins/tiddlywiki/evernote/modules/enex-deserializer.js
+type: application/javascript
+module-type: tiddlerdeserializer
+
+ENEX file deserializer
+
+For details see: https://blog.evernote.com/tech/2013/08/08/evernote-export-format-enex/
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+// DOMParser = require("$:/plugins/tiddlywiki/xmldom/dom-parser").DOMParser;
+
+/*
+Parse an ENEX file into tiddlers
+*/
+exports["application/enex+xml"] = function(text,fields) {
+	// Collect output tiddlers in an array
+	var results = [];
+	// Parse the XML document
+	var parser = new DOMParser(),
+		doc = parser.parseFromString(text,"application/xml");
+	// Output a report tiddler with information about the import
+	var enex = doc.querySelector("en-export");
+	results.push({
+		title: "Evernote Import Report",
+		text: "Evernote file imported on " + enex.getAttribute("export-date") + " from " + enex.getAttribute("application") + " (" + enex.getAttribute("version") + ")"
+	})
+	// Get all the "note" nodes
+	var noteNodes = doc.querySelectorAll("note");
+	$tw.utils.each(noteNodes,function(noteNode) {
+		var result = {
+			title: getTextContent(noteNode,"title"),
+			type: "text/html",
+			tags: [],
+			text: getTextContent(noteNode,"content"),
+			modified: convertDate(getTextContent(noteNode,"created")),
+			created:  convertDate(getTextContent(noteNode,"created"))
+
+		};
+		$tw.utils.each(noteNode.querySelectorAll("tag"),function(tagNode) {
+			result.tags.push(tagNode.textContent);
+		});
+		// If there's an update date, set modifiy date accordingly
+		var update = getTextContent(noteNode,"updated");
+		if(update) {
+			result.modified = convertDate(update);
+		}
+		$tw.utils.each(noteNode.querySelectorAll("note-attributes>*"),function(attrNode) {
+			result[attrNode.tagName] = attrNode.textContent;
+		});
+		results.push(result);
+		$tw.utils.each(noteNode.querySelectorAll("resources"),function(resourceNode) {
+			results.push({
+				title: getTextContent(resourceNode,"resource-attributes>file-name"),
+				type: getTextContent(resourceNode,"mime"),
+				width: getTextContent(resourceNode,"width"),
+				height: getTextContent(resourceNode,"height"),
+				text: getTextContent(resourceNode,"data")
+			});
+		});
+	});
+	// Return the output tiddlers
+	return results;
+};
+
+function getTextContent(node,selector) {
+	return (node.querySelector(selector) || {}).textContent;
+}
+
+function convertDate(isoDate) {
+	return (isoDate || "").replace("T","").replace("Z","") + "000"
+}
+
+})();
diff --git a/plugins/tiddlywiki/evernote/plugin.info b/plugins/tiddlywiki/evernote/plugin.info
new file mode 100644
index 000000000..baf35156e
--- /dev/null
+++ b/plugins/tiddlywiki/evernote/plugin.info
@@ -0,0 +1,7 @@
+{
+	"title": "$:/plugins/tiddlywiki/evernote",
+	"description": "Evernote migration tools",
+	"author": "JeremyRuston",
+	"core-version": ">=5.0.0",
+	"list": "readme docs"
+}
diff --git a/plugins/tiddlywiki/evernote/readme.tid b/plugins/tiddlywiki/evernote/readme.tid
new file mode 100644
index 000000000..fd946fd52
--- /dev/null
+++ b/plugins/tiddlywiki/evernote/readme.tid
@@ -0,0 +1,11 @@
+title: $:/plugins/tiddlywiki/evernote/readme
+
+This plugin contains tool to assist migration of content from Evernote ENEX files.
+
+!! Instructions
+
+# Download or save your ENEX file from Evernote
+# Rename the file to have an `.enex` extension
+# Drag the file into the TiddlyWiki browser window
+## Alternatively, click the "Import" button in the "Tools" sidebar tab
+# Review and accept the converted tiddlers
diff --git a/plugins/tiddlywiki/evernote/samples/sample-enex-with-image.xml.enex b/plugins/tiddlywiki/evernote/samples/sample-enex-with-image.xml.enex
new file mode 100755
index 000000000..b3e3e3918
--- /dev/null
+++ b/plugins/tiddlywiki/evernote/samples/sample-enex-with-image.xml.enex
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE en-export SYSTEM "http://xml.evernote.com/pub/evernote-export3.dtd">
+<en-export export-date="20130730T205637Z" application="Evernote" version="Evernote Mac">
+    <note>
+        <title>Test Note for Export</title>
+        <content>
+            <![CDATA[<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+            <!DOCTYPE en-note SYSTEM "http://xml.evernote.com/pub/enml2.dtd">
+            <en-note style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;">
+                Hello, World.
+                <div>
+                    <br/>
+                </div>
+                <div>
+                    <en-media alt="" type="image/jpeg" hash="dd7b6d285d09ec054e8cd6a3814ce093"/>
+                </div>
+                <div>
+                    <br/>
+                </div>
+            </en-note>
+            ]]>
+        </content>
+        <created>20130730T205204Z</created>
+        <updated>20130730T205624Z</updated>
+        <tag>fake-tag</tag>
+        <note-attributes>
+            <latitude>33.88394692352314</latitude>
+            <longitude>-117.9191355110099</longitude>
+            <altitude>96</altitude>
+            <author>Brett Kelly</author>
+        </note-attributes>
+        <resource>
+            <data encoding="base64">/9j/4AAQSkZJRgABAQEASABIAAD/4gxYSUNDX1BST0ZJTEUAAQEAAAxITGlubwIQAABtbnRyUkdCIFhZWiAHzgACAAkABgAxAABhY3NwTVNGVAAAAABJRUMgc1JHQgAAAAAAAAAAAAAAAAAA9tYAAQAAAADTLUhQICAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABFjcHJ0AAABUAAAADNkZXNjAAABhAAAAGx3dHB0AAAB8AAAABRia3B0AAACBAAAABRyWFlaAAACGAAAABRnWFlaAAACLAAAABRiWFlaAAACQAAAABRkbW5kAAACVAAAAHBkbWRkAAACxAAAAIh2dWVkAAADTAAAAIZ2aWV3AAAD1AAAACRsdW1pAAAD+AAAABRtZWFzAAAEDAAAACR0ZWNoAAAEMAAAAAxyVFJDAAAEPAAACAxnVFJDAAAEPAAACAxiVFJDAAAEPAAACAx0ZXh0AAAAAENvcHlyaWdodCAoYykgMTk5OCBIZXdsZXR0LVBhY2thcmQgQ29tcGFueQAAZGVzYwAAAAAAAAASc1JHQiBJRUM2MTk2Ni0yLjEAAAAAAAAAAAAAABJzUkdCIElFQzYxOTY2LTIuMQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAWFlaIAAAAAAAAPNRAAEAAAABFsxYWVogAAAAAAAAAAAAAAAAAAAAAFhZWiAAAAAAAABvogAAOPUAAAOQWFlaIAAAAAAAAGKZAAC3hQAAGNpYWVogAAAAAAAAJKAAAA+EAAC2z2Rlc2MAAAAAAAAAFklFQyBodHRwOi8vd3d3LmllYy5jaAAAAAAAAAAAAAAAFklFQyBodHRwOi8vd3d3LmllYy5jaAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABkZXNjAAAAAAAAAC5JRUMgNjE5NjYtMi4xIERlZmF1bHQgUkdCIGNvbG91ciBzcGFjZSAtIHNSR0IAAAAAAAAAAAAAAC5JRUMgNjE5NjYtMi4xIERlZmF1bHQgUkdCIGNvbG91ciBzcGFjZSAtIHNSR0IAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZGVzYwAAAAAAAAAsUmVmZXJlbmNlIFZpZXdpbmcgQ29uZGl0aW9uIGluIElFQzYxOTY2LTIuMQAAAAAAAAAAAAAALFJlZmVyZW5jZSBWaWV3aW5nIENvbmRpdGlvbiBpbiBJRUM2MTk2Ni0yLjEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHZpZXcAAAAAABOk/gAUXy4AEM8UAAPtzAAEEwsAA1yeAAAAAVhZWiAAAAAAAEwJVgBQAAAAVx/nbWVhcwAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAo8AAAACc2lnIAAAAABDUlQgY3VydgAAAAAAAAQAAAAABQAKAA8AFAAZAB4AIwAoAC0AMgA3ADsAQABFAEoATwBUAFkAXgBjAGgAbQByAHcAfACBAIYAiwCQAJUAmgCfAKQAqQCuALIAtwC8AMEAxgDLANAA1QDbAOAA5QDrAPAA9gD7AQEBBwENARMBGQEfASUBKwEyATgBPgFFAUwBUgFZAWABZwFuAXUBfAGDAYsBkgGaAaEBqQGxAbkBwQHJAdEB2QHhAekB8gH6AgMCDAIUAh0CJgIvAjgCQQJLAlQCXQJnAnECegKEAo4CmAKiAqwCtgLBAssC1QLgAusC9QMAAwsDFgMhAy0DOANDA08DWgNmA3IDfgOKA5YDogOuA7oDxwPTA+AD7AP5BAYEEwQgBC0EOwRIBFUEYwRxBH4EjASaBKgEtgTEBNME4QTwBP4FDQUcBSsFOgVJBVgFZwV3BYYFlgWmBbUFxQXVBeUF9gYGBhYGJwY3BkgGWQZqBnsGjAadBq8GwAbRBuMG9QcHBxkHKwc9B08HYQd0B4YHmQesB78H0gflB/gICwgfCDIIRghaCG4IggiWCKoIvgjSCOcI+wkQCSUJOglPCWQJeQmPCaQJugnPCeUJ+woRCicKPQpUCmoKgQqYCq4KxQrcCvMLCwsiCzkLUQtpC4ALmAuwC8gL4Qv5DBIMKgxDDFwMdQyODKcMwAzZDPMNDQ0mDUANWg10DY4NqQ3DDd4N+A4TDi4OSQ5kDn8Omw62DtIO7g8JDyUPQQ9eD3oPlg+zD88P7BAJECYQQxBhEH4QmxC5ENcQ9RETETERTxFtEYwRqhHJEegSBxImEkUSZBKEEqMSwxLjEwMTIxNDE2MTgxOkE8UT5RQGFCcUSRRqFIsUrRTOFPAVEhU0FVYVeBWbFb0V4BYDFiYWSRZsFo8WshbWFvoXHRdBF2UXiReuF9IX9xgbGEAYZRiKGK8Y1Rj6GSAZRRlrGZEZtxndGgQaKhpRGncanhrFGuwbFBs7G2MbihuyG9ocAhwqHFIcexyjHMwc9R0eHUcdcB2ZHcMd7B4WHkAeah6UHr4e6R8THz4faR+UH78f6iAVIEEgbCCYIMQg8CEcIUghdSGhIc4h+yInIlUigiKvIt0jCiM4I2YjlCPCI/AkHyRNJHwkqyTaJQklOCVoJZclxyX3JicmVyaHJrcm6CcYJ0kneierJ9woDSg/KHEooijUKQYpOClrKZ0p0CoCKjUqaCqbKs8rAis2K2krnSvRLAUsOSxuLKIs1y0MLUEtdi2rLeEuFi5MLoIuty7uLyQvWi+RL8cv/jA1MGwwpDDbMRIxSjGCMbox8jIqMmMymzLUMw0zRjN/M7gz8TQrNGU0njTYNRM1TTWHNcI1/TY3NnI2rjbpNyQ3YDecN9c4FDhQOIw4yDkFOUI5fzm8Ofk6Njp0OrI67zstO2s7qjvoPCc8ZTykPOM9Ij1hPaE94D4gPmA+oD7gPyE/YT+iP+JAI0BkQKZA50EpQWpBrEHuQjBCckK1QvdDOkN9Q8BEA0RHRIpEzkUSRVVFmkXeRiJGZ0arRvBHNUd7R8BIBUhLSJFI10kdSWNJqUnwSjdKfUrESwxLU0uaS+JMKkxyTLpNAk1KTZNN3E4lTm5Ot08AT0lPk0/dUCdQcVC7UQZRUFGbUeZSMVJ8UsdTE1NfU6pT9lRCVI9U21UoVXVVwlYPVlxWqVb3V0RXklfgWC9YfVjLWRpZaVm4WgdaVlqmWvVbRVuVW+VcNVyGXNZdJ114XcleGl5sXr1fD19hX7NgBWBXYKpg/GFPYaJh9WJJYpxi8GNDY5dj62RAZJRk6WU9ZZJl52Y9ZpJm6Gc9Z5Nn6Wg/aJZo7GlDaZpp8WpIap9q92tPa6dr/2xXbK9tCG1gbbluEm5rbsRvHm94b9FwK3CGcOBxOnGVcfByS3KmcwFzXXO4dBR0cHTMdSh1hXXhdj52m3b4d1Z3s3gReG54zHkqeYl553pGeqV7BHtje8J8IXyBfOF9QX2hfgF+Yn7CfyN/hH/lgEeAqIEKgWuBzYIwgpKC9INXg7qEHYSAhOOFR4Wrhg6GcobXhzuHn4gEiGmIzokziZmJ/opkisqLMIuWi/yMY4zKjTGNmI3/jmaOzo82j56QBpBukNaRP5GokhGSepLjk02TtpQglIqU9JVflcmWNJaflwqXdZfgmEyYuJkkmZCZ/JpomtWbQpuvnByciZz3nWSd0p5Anq6fHZ+Ln/qgaaDYoUehtqImopajBqN2o+akVqTHpTilqaYapoum/adup+CoUqjEqTepqaocqo+rAqt1q+msXKzQrUStuK4trqGvFq+LsACwdbDqsWCx1rJLssKzOLOutCW0nLUTtYq2AbZ5tvC3aLfguFm40blKucK6O7q1uy67p7whvJu9Fb2Pvgq+hL7/v3q/9cBwwOzBZ8Hjwl/C28NYw9TEUcTOxUvFyMZGxsPHQce/yD3IvMk6ybnKOMq3yzbLtsw1zLXNNc21zjbOts83z7jQOdC60TzRvtI/0sHTRNPG1EnUy9VO1dHWVdbY11zX4Nhk2OjZbNnx2nba+9uA3AXcit0Q3ZbeHN6i3ynfr+A24L3hROHM4lPi2+Nj4+vkc+T85YTmDeaW5x/nqegy6LzpRunQ6lvq5etw6/vshu0R7ZzuKO6070DvzPBY8OXxcvH/8ozzGfOn9DT0wvVQ9d72bfb794r4Gfio+Tj5x/pX+uf7d/wH/Jj9Kf26/kv+3P9t////2wBDAAMCAgMCAgMDAwMEAwMEBQgFBQQEBQoHBwYIDAoMDAsKCwsNDhIQDQ4RDgsLEBYQERMUFRUVDA8XGBYUGBIUFRT/2wBDAQMEBAUEBQkFBQkUDQsNFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBQUFBT/wAARCACHAPADAREAAhEBAxEB/8QAHQAAAgIDAQEBAAAAAAAAAAAABQYEBwIDCAEACf/EAD4QAAIBAwMCBAQEBQIEBgMAAAECAwQFEQYSIQAxBxMiQQgUUWEVIzJxFkJSgaGRsSTB0fAlM2KCkuEXNHL/xAAbAQACAwEBAQAAAAAAAAAAAAADBAECBQAGB//EADYRAAEEAAQCCQQCAgIDAQEAAAEAAgMRBBIhMUFRBRMiYXGBkaHwFLHB0TLhI/EVQiQzUgay/9oADAMBAAIRAxEAPwAnQ2O6NCCiTMpOOPf3yMHnqDLGOKUEUhGgR22WW6OqKFVMZ5mfbj+2eegOlYEZsLyUw0+201KCbyJGYYbDdhnoJcXjRXDcp7SNp4hxWajl+UjVps919+f+fQPpy/8Akjde1uyI2XxWnkXzZqaJ2ZjgjgHnqrsE3gVAxWmyzl17XVJMsb+Xu9WAO/PbHVxhmDQoZxBOyKWvX1XFGokUOB6iQeBn26o7Dt4K7ZuYRsavaqgAdds3G4oPv0EQUUXrQs01fPHMy5DDuRjkcdX6kFV6xS5b1NPEvlROshOCwOQPv1wjGxXZ+IR+xGVqUNK4KkZ59j0u5rQaCICSLKKEAjggjqC1da17liVi7AAd+c9Q1pXErA3GlAOZR9DkdMZDyVMwUGWvpN2Ywuf36IA4bqpIWMlfI6jYq4z3z1OULrK8hlqnP6CxH0PUEBdZUiOeVxhgI/ux6oQOCtfNetGc+qVcHrlyjTSxEbDIAc9x1FFSozxxIRtm++Aee/8A99QbPBRS9mgoptokc7sHkt0A5hsiaFao7ZSCoUQTbCf79WDnqMrVFudMkib1ljlCNt246uBn4Kp7OyAVdanzIEoJxjBAxngnnoxjNaIYIG6jGrp3ll3qwUHOD2/2+o6GI3BELmlaZ66FG5U7Pc7gcHH+D0QRuVC4IJdbnFKyOjPJtVmYs36Txxn7gnGe3RWMI3VHUUIDL5ylmCF+MZxnjkdNEaIVKFW3aQ7zTzRkL6SRzg5+vXCMcQuOimLpWpIEyXdaeAKSpZcHP02j27dZvXgaZVqGInUOWccBtaSyz3GkqI4AHklmiIXaBn9R7fv7dcX3sCFAbXEFc9eAHijX+O3jZq1ko6am0/Qw74HbdsEQZkUtz+pydwx/y6al/wAMY1VOrzEEjddJPoeCOLKJAc4I2McfbI6XGId3oZw7eSyp9ETlBsNPGRlhyxyOr/UBDOH5KfHo24U9PuZ6fcTnaGAJHcDkf94HXfUNKr1BC3/gtTA6eYIB7lQQT/t/v1PWAqDEQidDbxK6DzIogPYHHVS9SGE8UU/h6niAd6xGc5OTx/z6r1h5K3VgblErTFFGRiYSY4x3UdVslEoAIu0qYKhvT9Pr1IaqErAmQ54JAHBzj+/VqCjVR6h5mG3kj2z7dEFcENyhyU7ucEHnuR1a0OiVlDbog+XYBe+B7+3VS48FcNC9mRWYqjMVXnAbHVBXFXPcsqOSo3NhigzjOO3VtFXULOtinkxtf98+/XWOKnVaHhmIHmSH/wBvUZgpynivYaeR5AACTwPoB+5Pt1UuVgOa5P8AFH4hL1W61jl0pHGlBa5XWnrZWJSqYHEh2DGY2AwN2eOcAkdZL8cQezsvW4foZxjzSDU+39q7NDeIFJ4kWmOtpC1JVFQtRRM+Wp5Ppn3HurY5XnggjrQhxDJm2N1gYvBS4N+R+3Ap3paWV5BulYe+/sQP+89MBwSNFfPTCHeGOSxPBXAxzz12ddlQWrpAzJI0ihhz2/SOeP8ATqwf3KCK4qq9b+M2n7DqOj0rZfO1VrCtnSkittv4ihmcgKJ5+VTB5IUMwUE4HVTMG7owiLk6VVPTQQKlXLBU1kWBM8GRG0mBuKg87c5xnPA+vRWucdUE5Roh9XVUNNCy7G2jC8HJ7/XowDkMvaoMVZQ5O9SykhiF74x7Z49+ucHnYrmvZxQ66VtCaktHGrFmAU44OeOfqfr+/t1zGP4lc6SPgEzw6YZBvkr98JXBBIUgY7AcZ6xevvYLZLFXPxOVS6Z8DNTVttqh5zQCnwBwRIwjOP8A5n/TosTnOeAQhvaA2wqc+A3T8FNoLVN1cfm1l0jpAUGcRRwKdp+nqk6cxDiHAKhbm8l1MssVOlGzTyvvyCFBwox2wfpwOlxZQzQU2CSokYtF69oyPNbjP746tYG6HROy20q1kgbz6lQyEkhyQQM/4GOuzDgFXK7iVsqAKuBk9SntvD9vf/PBx9+uD6KqWohbrS0iRytMXyMlQe/HHXF/BRkRanoYt4BcEYAB4JJ67MoyhG6SCGGPKg5xzhfv11qaUpIUXBVR/b69+ptdXJfM7xtxnaQcY5wepVbXhqDnOAT9weuUWvRJkgnAPfPUrrX25ZAFIHP1HPUKVmgWLJwpP7dcptZsyKScDB5HU0otaJargkL11KM1LQtbmT1DPsPp1GVTnS54o6imsPh7f6uDbFM9JJTwu5x+bIhVF+5OT2/f26TxDxGw960cDH1s7B3gr8vodU1dffYrdS/KUgDsVnrnKKoByzs38q45P1HselPp25S4r1H18hfkbQHerA0X4iXTQniZTUlBWC8UldTBZ3ppAkcyZ4aEgfqHcbu/I7E9AylkZkacpB+WuneJ5Wwv7QIv/Ss+3/EbcB8xXUV7+XpYECyQXVdpjQSIsg3A8NyWwQc7SfbHRmSykgOKz5MPhspLW7eITenxDVWo6G4UkFwtkN2oXkhdIqxUWSRCwZQx5XIRmyR7MOAAervnmaB2d+NfhBZg8MXHtXV6WqIqvHDU/iFVVFrq65rPSyTtHMYGfzhGD2LFuM/+nGcAE8Y6mWSRjf5X6D7K2GhilkytaG+591fvw8+Gds05p646vSHNdK0lvts5GWhjPE8xxnDSbtn1C7+fV1GEzPdb1HSnVw1FD4k+KsgwosLRxqGxzjHYDI/063bXl8oKE1dEgLEKDnGQB2P7H7dEDkMt5INGkwqJ8hyP6lHcfT9+i3oqZVBuGX8wSrh1JKso9W3A/wBT1YHkoIVoyODIH8rew5JKZ9+3368vdaWvR2VXHxQ25b34H6gpkhjV2SORgVwwCOGHHbB2+/vjnokJIfYVX6tpU38BetKWxVt60vVVafL3aSOsogwIMM8QKyxHPYsrZBHfYPc4DmLjLmh6Cw0u2qmOnDLGsSsEBI3AHHPGf36yrKKCsU09b68tM6PGp59JIz/bPRhI4DdUIC002lLWWyBJIBkhi3b+3VxM4qpjbyW+CxUSgboZTk5w3YH/ALPVxI4qhY1b/wANp0y5i8tAMZ3EAAdWEh5qpYOSjm42qNZPKZZ2Gc+S4YN+xGRnnscdEsqmQIVe7oYggpZjGrsEBbIaPIPbtzkA4P8ArjPVszW/yVgwu2CXv4wvlJU00jSxtJjAaRCqsfbcvurHPP8AKSRnk9QJYyr9S7dF4vFvy1ikrrK8ETMolRSS8ee5XIwwUkcfqAYcfXg9p2co6l3JMCa7tvks3y8jlYvNIg9TMvOSF7+3bn+/RLF0ChFhAulPt19oLpualnWXaAxwDnaezY+mRg/Q98dWQi08kQnmWniWVtxjPYqCwP8Ap1YFRSF1+pKSihFQokqoj6h5A3bhkBgD2yMg4Pf27jqwHNRR4KFctZU6OYKcGSd4xLAwQlJAT/Y8YJIHOFcd1x1YC9SVBB2WVq1NR31UGySllaJpmhlIygVgHHH9OQf2Ofr1BBGygg8UYkptu7229UK6lQXxY6jglOi9ITRrHSX2oenkq2YOI2K5QFf5CTgKc889sDOPiSA4yDdoteh6PH/U7O09lxZrPRtPWa51FX3KZKaknqHipVmpG/WrFWCSA4JjCjCkqSCGGR10M1QNDbvxH2PPn5LWnia6d7n1R5j7Vy/tDqO0W2kpKWWjjuQmplHydwlqQgjTJ3qibchd5ONvbs3UvlLyQa13CXDGNDXNvTY38+bqHcaBrhbLnVT1odIYmddz4eZlDZDYHHYkZPseeeLQgRloA39ktOXTBxc7+0sXOOqrRaMAz1VaklZNtQr+ZPM0i5J7ehlIHcbift1qucO13fhZbmmwAiOkKuopDWgVrcy+R5rIWaPGQXIAJ5UHj/PfpLEMDiNE/gpzE4676LtLUPiPdvDzTlitFqpoquCG1UjGPBJDvEsm5iSc7ixIOB3xxjlro+ON0YJ0WZ0pLIZ3O3spJb4htU+Yiw0MM20sJgijGT2xx7DrZMDK1WGJ3ngk7Vfj3rK4VRWOVKCNhtEQU/TBJPHRo4GVzQnzPJ5JKfxV1YlTLKbnIsjbVPlseAOOOejGIUhh7uaIW3xz1Rb3y1c1Rg4/NG/++DnoXU3wV+tcF1L4cfEno3UiW6G5XOntdfNGxnSRWSNHBPux4yPbnrys2DljJoWF6dmIikA7VHvVrVlRpDVdGaY3e11tPUgp5TVCgOMYIHsc5x2PfpMZmG6Rqvv9FwTrvQFf4C68r4op1NsnImo5ptzo8KkMFDLyhUALn1Y2qQMcHXixIlFOQ3xlosLqzwf+Iy26ko6e26wmjtF6iXY87uDE2Nu1ncEghlZG8xcqdwLbc5Kk2Gc05mbKrXXougqA07U/mQzJPHt3b4nDLj9xkdux9+kbKsQplvoYw0YBERcZCAj1f9epbR3UOtZ1txorOk0lZVJCgPJkPb7H6H9+jAa0h6pK1DrmzeW8sKmr9G0tSu0UijuMgN/kqf7dEALd9FYC9AuePEHx4prS0TUk8lZPIpPkxgSyOuTn7Ecngsc988dWFuOWtEwGBgs7qv6r4kL1Np2eKlesQtiOalVgXHcIVIHJxjgEHHGDwOhmIXqUdr2gWG6pEq/Fa+Xe2qsdcFETjBVt2ARuyQzKBjPIOOxPGD0bq42uoqvWvItqLWjx61tYIxGKtJaCVChG4pI5QgDHHpOcHAxj2JwOoMcbiaNFUD3NoubaNWf4nLxp+/vFWwCtt6n0SCVlWM57vgenLZOcYXB4I56uImu7j8+WqF9acEZuHxf2gLEUpmmdsgSsqOITnkK8YB245wB3xwDkdcMO66BXdYzVPlg+JWtrKCWrSWaKk2KZf1BkJY+tVJBZORlsk98rkdEMD2jslDzsJ1C0w/EcdQ7qWPTtU8RYpJvkWOSAbifM8svl0YHtyOc85OFHxyR/ycm2Bjz2QgGpviGpDLBa0mp6ZxIGajSYHeck7k53Bh3yWG08fQmY43u1tc8xsNEapp054kS36/UtDbKq3W2roT5kj1ReDzMqORlcSEoSCFzuH+Z7cTS8nRDLY3nKAn2/+O+n9L2+htN41DSSXKWVVijhm3SKecI+DnB4G76HnsepbM+S8rUF2HYwgkqv/F3Udn1/pWkvdApr2o2nhHkyg+TVBVDDIPdQRkc4yM98DJxDXMkcHaflbuCAyaa8lRtrlsAtc9PeYo57nKzPToacfzKd7MAeH9tw5PH0z0jI+QOuLbitiKONzMs1Wb+eKEHw2kgghhcp5rKwhjMhHBO/nJweOMAgds5A6Zbi8xtKP6PLRSG3PwnudXpW81H4eIa+KKSRoqfcTNFtA9IHGUxnC443d+nm4oB7bOmizn4N2QkDtapZ8VNN1GmtN6IuMDD5istyrURlmP6Nvlkftl/f6DtjprBTNldI13A6JbGwdS2Nw4jVe2bRFXX1M1oo4nkuE1DRwxQQ49VTLGjMpJzyS+M4wOPbqXyteM18T9ygNhc1+XuH2BXR3jzV0VJrepjo6ymC06QwCRVWVmSOJEChmDAgFTyPYdbnR0Z6kWF53pGQGUniqor9VVpMZMtOvlnMapTRDH9wv29+tYQN+FZJldf9BKVZVyV0hV3dxncCzbj0wGgbIVkqA8IX+UlT9ByOrKbWlCCBGIgGzkMeuoLljKiQRx7qNUEgyuSSSPtzjrOBvYpolTrVBEK2NoElES5VQZO2MZIxx1Dia1XDfRW5DfIdWaWFi1EGmgmmMsdRSzKksbHC+YuRsz9RwD79+sabD27OzdbUGJLRkfsVXkfhhqrw8xNHVO9nLEQ1lOytEycjacE7CRnKk++M4x0vJi60IorTZD1mrTYRzTfjXUWb/gqi3JO6jy446GqEbDngo4bkd+GznJBx0XQtu0LKb1Gq32fxfrZZ3juFS9POpYRNNK1Oq+k4VZW9JYHAIJGO4YgEdRkDhpStdbgqRV+Ol7UxRRUvzc4jIaWcs5Vs+rDgkSD/AOI5wPr1R+n/AG0VmtH/AM6pW1F4qX+/1hoTdpDFK5iZY9wihZsMu7AYg+kj9iSftRjGVncFdz3A5WlS6vTs1Jaxdq6X5R8tIccyMWByrkEHaBu4+pOO/QTN2sjQjiAhnWPNKt7lFNQLGoFTWQSbfLgM7LGVBymGGOQSQM5BU88gEvtc141FUksuVaaEy/Ls9JWo00kGQtOjOFZSTIjZA2sByc8cHAweruYx2hVRpqFLstNUy0n4U0iVTV0I8jJQyM4OSqBs5yATx3PHJIzV2TNbRqu2FHipaWq/2WkuEUNUa5BsHqSQy7SwMn6c/p7kOBuAyOc4gZH046KxDm9lEqGx1dv1DR+XRXO2xKwkmuNDOKiKrQ5KErGM8rggM+QOO/UGUMFsdajqySA4K1rHo8rqBFElJto8/wDiFFRlXZZE9DuoU7SwOGP1H7YUlxVtGiaiwxzapJv094r7tPTUENO9JS7sNGERp0ydwV1BI2jB2sx/ScccdTG4FtuVZGuzlreC2z6DWzWmSsrnkE02UpSZCAWB9IIxxjP6ic4I4yORnEBzsrEX6UtZneh9op72EuUs1e1VRQHzIqYkKssajAJIztIIxgqPu3bEunAAYOKhkDrLzw90jV1TXXC8yXPfIzxFn9IYiIq39e05JHJxnk889NtIaA290kQ5zsys7QniDUWnQr2igiWaecPXRliki75B+YqoM+WBnd7tuJJyR1nYuPO7M7bZamElLAQ0a7oNYtB6z1VKop9ZWizyO5ApKeb8+NT3J3qGyAe/sPp0rJNhIBZhLu87e2i0IYsVNtMG93H9orovSz6c1mabXt5vckRXZBcYbgGjeM5GYshs889xjHQppmSsDsOxo5itfNTDDJHI5uJebqgb0SzrHQutNKI91tVNda9bay1H8R26R/IcL3MvO5S4IyjDHcc8E6WHxGHlOWRwAP8A1I18uGnNZsuGxOHdmaCa1sfL8QrT8U5KTxEtmirzC0dMt0o6eSaGMpiFmbkY9gN2P3Hb26xorgkkZytbE7PqI438DXvSSNDatvV8+ICz1tkqKi3UEF0dadDujpkhhBCxkY2yeYkOMYJJlY54GN5kMTIcjwLNd5s/al5+SaR8rng00X4UE8XvW9Hfa+apq7VQU4lZn2qgfOSckYAIIJ79+e/Xo48M+IZWvK8lLO2UkloS9cKuzSxPFJT0/l4JVoMo+cHAJyemmtlGoOqU7G1JdevtojxFSO0a9yZeT/jovb5qunJDZmozCHaORX3Y2q5PH16k5tguAWuMUomZ2qC8QBIG3BB9s46guNbLl8sZqadmi8xVTBXfyMH/AG6QBopkiwt9vluFMcNSeYhJUebEcZ98kd/26McjuOqpq1HhBPFSqVHysrqNqMDjP1UH26po41upsjZG9N+Id0sEgWpaStKAqDE4CH6gjbkjsO/QZcLHLwR4sW+I7ppshsWr6/8AEbrpm1UA2AtLDTGn28ElmkDqpP0OD9cHGDlz4BgGVrj5H8LXw/SUhOZwHmPymJvDzw3nuL1X4ldKCnC+qlE0cu1yeM7huA7YB9R4yBkdZRwWJaKY72WuOkMOaL2C/HT0Qys8ONIR1EYt9dVXCaVxHHC4SJDzn1FRkj7BT35+nVRhMRVyOoDuVz0jh77DAT4qPr3Q9q07ZIxRxPTVCfnS72Yuv3ZVGEXAOMHOOT0Mt6s6FHjkM4OYAUqloWuV+dpK/atLE4lEMSDG0MO2DuxjjPGP9OjveyMdkaoTWvm/kdE8Ut+0HVxUhlAM0B2YWIeakeR6crgryoIJGc/QdKN+pJNaX6FOl2F0rWvUJP19ZqrS2q4rxY7aRaKtjLLOwVkaT/0twAzIwGCQCcAHkdO4d4ezK91OCRxUfVyZ2N7J9FC1BYbTXeW7yUtwhqFD0R8pEaHcynDAcr/Nknjtxk4DUUtsdpR4paVgBFGwdvnNNdnvlFqWG6ebJM18tsQjWpa3iCojfaxCTqCd7rsYEgFXABP6ulJQ9ha69Hd+nl3ceYTUeVzXNA1G2mvn3rXZ71eaWg+T+XgeWQcNE4jhY44O5FC7f2PB9x1EjGh+66OR5ZQCYfCieczfi1SsEvzG2GGWuqyhKHJ9O8naq4z3wccZ6HiqAyouFBJzFa6FKObV2oK93QvBNsZo12xlwMiMPsBdhuzjJxtJHBA6o9xELaRGNBncaXniHqAVEtBaUvlJQpTOBJFKCxq5XU/lrGo3NnscDH7Y6Hh2E28Nv9I2KeCRHmA9fRIHiTVVNrq6yg8qnnpI4IklpbWymCkJONrFiXQnIOB9ewz03hmh/bPvx/BSOKcWEx6VWw2Hrqh2lKumtuolWW2otPGEE0m30t6du5izAxnnBKgE8dz0SXM6O83ggwFrJBmGnz0W+011bapRZ7NbI46qmqHaCZpGKzITgLjgkFTnAJ7++OqPyvGd53CvG58bskY1B0Vp0vhxpvXdFBWx0tJWXqNdrwyxiOORsfoVlfcQCO6lv36yHSTQktBIC3GxwTAPLQT8+bqRpbwVsuqxWW2Oeo03cYTlrf8AMOy7v6kL7yR+2Djqr8RIwhxOYc6H9e6gxROblDC09x/YKZ7nom56TgistDUK0NUvy1RNDUOZ/KKkE4MYUnOCAx/bHWeXiQlztx3f2teIgABo053r9t1z1fYrn4aamvenaqgq66CjZIYvLhMsYRwGUK6jGct277vb3O+yMYuNkwIBO+vEdywXukwr5ImsLmDbTge/4VcOh9DXDS9joNT6hqXobnaaeooLfSVEDbafCmIzkrkDaGdRnADMHLenHT2CiE0hcBoT6rFx0pjYGOPaArw5Ku7vbzS1EsiCMwRv5TLEwzESASpUndwdw5Axjr27H3oV4d7K1QqoZQQSw3DgL0VCUSadioDInkrzhUxj7/v1Qq4Q6SoJkVIkMj5woK8nqCrBa0LqjRvApYHPqODzn6dVvvUqVTrVW2XypmRFI9Ssx/x7dIZmvFhHIINFNElRa0pZDQ3qd4GIeGGpYh0fHqww4PSzTIT2268wmJAyrjdpyKHTXCv1AkZklqDCqEJNJgAgcY/x00MkWyVdnfut1qBpGIZlkilUqqBtzAn/AKdGJvVDqkWV0DrFM3mOF2qz8hD++eO/XFwJoKQCnzQFFp61VJrLgqzNDuL005ABb3dSTyePfrIxQxUlxxGu9bGFZBGesk1rgmG7eIWi75NbaegVLdLEzSzyiPEjg8bSexUk59J/bHSUOFxUJeZXXy5eSZlnwspb1YrmmHVVxpdVaLM1FSFYogsZkjiO+VudqbzktxyMk/v1l4hrmPAcVtYNzSCRquaL9YYJrhK813qqD8xmEgdo1DYwEA4yx9yce+CTjo8MpAoNsq8sepJdSg6Zr5IaiqjpLhQyoshM719PLOu7kHCRgZyd3AHcfq56NL2yOsbXp+UvGS28hv1V16M8QoNRWSC2yRU1NDUFqaukmj8uOnRf0sx3ZBBxye2ACMgdZE+EdG7ODfJbEGLbI3JXjyVaXzRdJpvxDpLBWGe5LX7nE7IYFplbKuWLAkwsrDK5IycjYcY0IpnSwmRumX56/NVnSQNjlDHa37f0o6VUdoulFqGgp0uE1HMlFUh3aN5MgvSShyTu3RgrxwHRcYyOiWXgxuNXqPyPXXwVMoZUgFgaH8H09wmOyXSgsmoqmmjhmrYZGzP8quWXzF9OQRsVTkg4zngnHHSj43PivZNMkbHKWgXf5UbVWiZdL1dvrrbWtZqetZEmFQ6qAC4ILjGxQfYHJPJwAeuw87ZLZILrZWxEBip8Zq1vv+mobL+EVVPWNdKirrfMnrXqNrRsP5fKbaFHpbBwD7k4xgccpfmaRQGymSIR5HA2SdU0PfKOXW9wqbXaZ6m+U8fydvigjYJ58oO6Z2JJTCDJJC4XdjJPQMhEIaXU06nwHDv/AGmM4dMXAW4aDxPHu8eSoCsqaa46wrIKozU8Ty7qqZGlZy24hX2n9Tk8hjk5IGOOtwAthBGp4bLCeQ6U5tLOu6+ehtT6rmjpaqR4pjs3fLu2Tn+bL7hzjnggg8cZ6i39QCRqFxawy006JpotLml1FSuaaSvNJh6hmnUKYxkui7iS7FCTg+kfc9IumBYRdXtp84p9uHLZBpdb68OXeaWFTW19vuFLZbbNLSUQ8yuS7RnmqgRVcwCQAF2AIXGcEnnt1dpa5hkdrwI77q/BQ4OY4RtNDUg8xV1atvRdbVXB460070VYajAcOxaUFQybpARnIbGOFyMY46yJA0aA2tuEucLcKKtHxW8ItcXGCzVGk77S26WZBPUW2Rw3zEeARjHqVjjBK9wSe46HE+KHWdlg7cwhfUl7w2J+UtOt7HuvdVv/APibVNv03X1upUpdPw08scNDQpUS1lTcDuJkMO5dxkOclmOM57DA6dM8OXMw6cyK8tPwtT/mRh8jJWDK3YNN9+7uJ4k69yM3PxFraquihqqOQzUSIKWPyfy5ICyqA4bO2VELbivIPmA+ZGzKPWYWOPqWuYdDz3v9E/LXy/FYl8073yDUknTbU7eXzRVTrrTc1s1FU0tKhlFMXjiwQzSQq2IzgZ7RlF79k614pQW2SsiVnaoJcS0V9UJIvK8poxkiQYJP0H36KZGtANoIabqkNqWrqJMoJFDDjbyOuzNcoAUWfUdxSMIJChB/oAPQyxu6uCVGRrjVEHyjIzN6Wxhifp/r1FtGimkbqTXysiyVkDQgFvKmK7g2c4x/06y+siGyfeHn+RRm2CnCJJU0VFPTFTuSEshye+ehuk4NcbUtbrZaCFvq9N0z1lNFbLktIsw83bXEtHGo9sgf6DqW4pwaS9vorHC5nAMNXzTMthOmLIGtN9pbhcJonjep81IEjVhg7UPqJOcc9L9cJ3VI0gJsYZ8DbiNnmq6jsl6tUEop6+B4zktlwwOe5z9etMPjes3qZRsFlQ2C7S5aWqoyjHO2Wckk/UY5z1YyMBXDCyu2HujMVFWQI26K2NFs8tQW34HvnI9+huc07Eo4ws3IeqtbS+uILRa4aFahJ33F2DTDdtHcqp9RwPbAGB3zyMWeFz3WBqtqImFoDimvUHhf/F2kZNQ0lN8nRqrSmpkiYhvfcGJ2nP1B+/WFIHQOzHfxW7BM3Ef4z9lzzU6LhtVzb5ysekqadXmhRE8tiMehH53Pu9gAO+SVHWm3EmRtZbCUdhxG7+WqeKQwVVPQT22y0sOqbewelqapwsUrqSWO3ABC/wBWQC2BknpIEsJLiS06ad6acBIAGtAcOai+Idcuq7THJqAVVPq4U4Cy3KoEssrgGQxKcbVQbSxCjAAHYnros2HfcX8ONfnvUyZJo6eKeNv67kp6ottwW5SVVwpI5WuBqYqymePdU0dRH+cG3A43q2drrwySr3JBDUb2llM2FVroRt78RzCWkjcHnMNTd6ag7+3DuKM2W92up0NLfairSqqKOpezq4p9pk2FcKGHpctGy7mKZHl5zyehvY4SiIAgEZvDf8jTVFY4GLrXVY0Hz+lsv0t71RdqG3wSmloZYBs85923IG5AShPmBTwVXgqQD7EEBjjzO4o2IEsuVvD8orfaaK13i0LFLVmC3wbIqSlADeo7QzyScZAz68c9vY9CiIc15dWp+UAjTNLXsDL0HyyUpXPVFTb7HqCjsltanlqd0stwmqJHxHnG9RkAuSBhtoX37Ly22Nsj2F5scq+eaTdK6Njwxu/G/fx5KudKWuvuVVKtqpZpQkxlQq7YkCIBiUkktznA7/q59hq4h7GNBfy+UsuNj5HUwWmfTWsajR9RVxXvSlRR0c+yIvtELNJ7Asc5z32jGMgYA7qSwMxABhksjhum4ZjhiesZofJMlYkN6o5LlQU6V25s0tK9SrIHHMhYEn0KBnLD15wM9zmEmN2SQ1zNcP2fZaYAlHWRi+Qvjx8h78FnT2C6V9uqqemqYq+ihqWmtqOCgpqgFmIzyQG3tlT9eehGdgIzCiRR7witw8jmEMNgG29x/u9lbPw+ab1Ffr6UraKO30/lpVl6nmFCCAVPsMGMY/8A7b6joM5iNBjrr7KWvkiYXTNq/wDX9rZ8VHizBa9Z1KB0qKWKmWGmtxUx+U+HTzVbguF9GQCdrFCDg9a0WEBY2Vo7Xv8A67l4+eZzHEDVc60fi5dbnSn8YuMrV0Z82nuETMkkUQQK0Y28FchW2nj0nGD0xPhw8HI3X0Swme49o7K+paatvVFBdUMNWtREPNRJGZpTtAySTwSAP+x1htx+JgwDAxrswNWaOgO/Mgj0Wm7BOmk64EFp4DwQO66ksVtu1HR3mW2yeXHFG4kYqAg2gAHGCOOT2PGejdK4rETsH0Dnh7b1btZ4Hn3JeKKOKXLiMpGiWr9fdKW62VUlHSNflr5XSnuSTNF8tCrD9Q25DA8EnOQO/Rx0h0hLNCAcgYO00i859duNc0J+FwzGOd/LNsQf4jv71GsOmJtQmOWy1cci1cmyKYTkBB77sj2/br00nSEDYjK/QN3018EGLoyWUB0ZGvemH+AKyCkVp6qknr4pADSiMOmw5/MWX3PGcEdYTenoXSENa7JV5tteVcFqt6ImjbmcQTy/NoBNY6u3Xupo5o4aUNmRqgSL5LKQSvPO3PbnHJ6ad0rA7DiZhs8uPmlfoJvqOrc2u/hX4VdteKVpVSOrTPBRmT/b79aQutWpHrm3p9lMW8CZtkdxJ2ngyZUEn7Z6kGtcqg4k3V6LdLWOkayzSq8RONyuTn+3RBR0Ck4hpFkqfbKeOujzGobd27DPVHOrdFY+N4RqK3+hImZQr4xA7/qI7cH/AJdB69jdzsiZY3aKTJQ/Kgotpp22pyclcffIP16uJQ7UOVXsa3QBAjNXl/Jq6FHVScPTsQB9mJ4/59H0q2lA6x7dHi/BWr4XWGWdJJPwZZ5Ij5hiki3uucYxJg+W/A+mQfft0F76F2mGkO4K5fEOuulq8MILbWU8kVXXcrBFJN5aJ7tKzcMQoJxyTz+/XlMVIZJdCvTYCMNaXkbBc3a58PrZSUdsMtwaOtqEenNRCAk1Q5GfOcKATgNgD9Kgjkk56aw+IktxaNFGIhjAFnX5qk6XReoKSpP4tY/4kjpIt6V0GZQiA4TzVDYG3OBGB6j/AO4nQ+riIGR2XuKROGlBOZt+CYtO3S06to4KLU1NTXaOneoklrJh5bKzqE2Ace52kgYGMKPfpDExyw2/DOIBrQfdaGHfFN/jnaDvr+FatR4OVcliUCkbeQJ4WLGTKNTmIhs/d35P9IPt1gHHkHTTn43f4W39LGeyTqP1VFKFL4YzWHTsFAUkdKWaav2K/l73aoJIA9typTj36a/5Aukz91e1ftA/4/KzL5+6bK+w3NauopaR4zXzKKelkjQK0eWP5gBO0bV284HIHbJ6SZM3c7cU4+F1UFpuem3scMFqjE12qJEE1wutQ3f6AcjC9yeNx4AwAT0T6hshLzpWgCozDPjbl3vcpR1/bpdP6Cus07qkFTzSqIWldjtwP0DIADFieQAPqenMG7rZ2gbjdK45gjgdeypOy12pLVW0608nzUEMonXz6UxDG3jbx6VyBhcft9/UPEDgS8VfI2vLMdI00FbEvjDpWTS00Op45btdmRt6UsY8tR2O5v0rk555zg9wD1iHBTOlHUaDmfmq2WYyHqqm7R5BZ+HXhTYddM93stRdrbFMhWoikV1LK2WUqWyWzz3wec7QMAAxeMnhqKTK6vP581R8NhMPMOtYXAK5tF+ENZRSCkpopnpQ3r8/kREDAYN7ggc9Yj5HTm+K1w+LCs0Oit3UGorD4NaMhqJKm3SW+TaLjUyFWXazbTkZB2hh7Z/myB3618HC1rgHHU+a8jjMU6dxcdguOfiAuZ1K1SGtFTR0uGqaOVomVal8DDRszYdNm31gKT7huCHmYgukjLXdxBPDn815rFlFDKR32knSnhTftb0tge5yxUNHNLNBDII1LptUOqEDGd/OAfp1EmNiglljw7bcACbujffrt3KYsK6WiDTTY+BXPTW001PBJqamiWoo6ZrdSWyCMQOVYHDsYz+ZLgZ3ZyBnrzjcVhcQzK+UnL46UefKytFsXUavbrtW3+yql8Uda2XV9009aKOwWmnpaqkigkMVbLM9JPkrnfwcLwShzz79emwrDDFJM1uXL3fyG/vzSL3iRwPd41wTXpLT1u1dVQada6i33q30DxG61NOUp2CMAFdVJJJ7k8f56zX4hjmNfM3KHO0o3wvX9o4b1pEY3A3Ry/aArNEWajSKrtDGJmVDTVJMbu59LMxAIUj2I4456yXY4Pk6pxJrXTX0HMLQ+mMUYeCB+/Hkl+kqb7FFHSfOzeRM6LUytEYvKHfhhkds/wBupcYJHEuoHgLu/EbqjJcQym5jXHSq80C1Ixs1t1nWV5N0uc4RI6hZ8I9PxgkLwWHAxj+Xp7CnrZMPFGMrRvpqHd3cVSao2yPccznUAb4f0qmltMtNUyxtNho22lge3X0EOBFrzJk02RiPSTSJlbtEzkkEY/0IJ79BMwHBVzA7AInR+HlzqQwNS1OseTI80ZC9vbB6A/GRM1UhhcT2VlcbBeNLmGV5FqKfH64AfT+/06tFiIsRYGhVHsLN0bhrDHpWkqmejmrVrZsUsayNXrFsVlkdz6PLyCoAwQT/AKYmKj66QgHQen7taEDg2MHjfff+lEodXPc6CooWoZBXu5lSrFQQRGB6UZDkd+dwP26digmbKJjJ2AKy17goMssRjLAy3c79qTvouhpK808VQsTV245ilZGQEAthd7AEkZAGRk9uplmka+q0OxHFWhia5t3ryXRnhfJTW+meuutRHQ6Sp1VzNLHMGWUcqgVmDcYOUAPvngdJ4ktjYG32vx82Wvho3yu7IsKl/EvxjnuvifcqW5XCuu9BtJo6OCPIEf0IyMZzjAGAMjHPCMeHfLEJG0DepJXoTIzDv6oixQ0H5W672Wa76WqbxUyfJXzzDJHUKQPMQndsViScDnPYEjA4G7q0L2xvDBq1VnYZWF50KAUXiJqrRpggNgFzpiR8pTAny2ViPUxwFB9RySMAZPdh04/D4XEmw/KUkyfEwCi2xwT9Z7dada3imNy018pHvWJ6uQeWHl2s6yFjgDJZtv8A95OHiS7BxukjmBA+f7Wq2Vkv/tion7/Nld1i1zDBqQ2+qLVFOiRwyKqEYYfqDcYAw3Y4xgHrBjdiRcjgDEaANj8rPlmHWUHU7dPFRadNXO6z01VHTvU+THUPMjArFGmDw2cDvn+3Wp9EC0kaH8KzOkJWUGnQWgV1/gahl+bfy0jiUpLM0hBODyvtwzMOBzwfpnpl/RrmUBrxKgdKSEHMaS+fGHw7uVVV214qSWgAD7KeIMZQEAWMfuWGT2AbBxk9P/8AFAMzEVWvekB0q/No+z+0E8UKrTnippSst1HJT/i00jPTpGSu0hio2qndR6lG4YO0/bpEh2EmEjWEN4ngmoJxiG9S913suT7pHre8Tz2+ke0VMVJM0MdfEjgso42tGMk4I+hGR3I62WHCsaHvvUXX6VntxMhMbaIaasfPwhtg8DLheLnJNqerVad38yWloAFjnfOAAcgY7nBA+mQDnokvSccTAMONeZ4K0PR73SZpTQ7l0h4ZeAl08N/xzU9LcaiWxRU8NSltA3zzY3iRVRsAhSEbAGcMeDtwcky/8i0NcAHDytFkI6Oc4MJIPsfn9onq34m7xQ2mZ6fTplpbe3li7UlOIoUUgZSRXxsZVYZ5b6ZU9c2To95bCJQXnYDfy58VivfPTpMprjfzRc6eJniQfEGlr6mYGSKsMNVNbnjEMK1hkKyJCoOWXbsbdkHczHHTcHWQShrNAbvTSq0J5G0k57ZAfnHbvXl+uj6nqNN2WOevuktDRCikrK6USVSeUSYEALekBDsPcekdJFzWMfiX9n/+SDufyFd4Jc2MEmvUH8IrDqq826vuVZNHTV1Q0dOJSCWkoWRgA8IUhV5QAsQeGPSBbHI1rWuLd64A6cfLZXEkjHOcRe3l4JRufiVU3eoussay3O+VCyQLKB/+uhB3lc8DIzg9aEXRTYgwO7MYonvPC/NLSYkvcXO3Onh4KJpbwnrNdafoLhZoqIBnZHWrfazbVILFlztHOefcZ6LjOmY+j53xYknht39x38lfD4WSWO2Eb8SivhrpC/W+uue8ebebM3y9bb/MAmlhOVVlz/5g5HqHAGCegdJYjD4iNpZ/63jMHcAdz4d6ZgidHK412mmiO78piu2t6qKju1JI9Pca2ljigp0hi8uaZiPzfzBx5iHHpH9PWPB0fGXxyNBa1xJNmwOWnI8zzWnNiHxh1kEigPz5jkEtaH1xc7dJS2uqo5KiGWItEvIkUMf1FicA5+o7dauP6PhlDp43UQdeXhX6Wdhcc9hayQWOA8VD1Zqiiu2lKineKOmuxlKLLDGG3ncMo7jnt29s9NYPDSw4htaxjXXQ7b+qWdPFLEQRTkhVkVYr+S5UTIMiTYV3KB9ffr17S3dZPZuyFKpo6OlpjUiWomlGApK5UP37DoTi4mq0QzrpVJsotWisIQTJSw+lZRUR7y33AHST4MutWeFIgN6E0PVFJL4YLhWRW6OOsjhpmrpTTMcGBeSQGPBGeR0r1ZyAuNHYXz8kYi3EM1G+nLzUX+KrKGtsUFTHX0ldIk1XBJSuktMwLL5RfOGBBydoxwOlThJsj3BvaF6356f2nDJGHNboRppSEalmjhvtRSW6eKGBPQqoPRjHsetzBu6zDte4EeO6y5mBsrgrG+Gq6WY+IFPa9Rq8a3NPl6eXyg6iUAsqEgblLAEBx2baDkMSCYl4ALGjWrTWFAzeKffGrxIivdRFa6CiuK6etzLNJUQ07OYhydsvbP8AUefpxgdePha+Qk5gL2BPPiF9ByRYZgblJI3IHLgkOi0LZLzDT6k0/PUSVsmHjd5d8jqBg5BGAxzwvYY6u7ESw/8Ajy7D58KuMNFOPqIibX3iLqC9vY7VLPRU70lVTOwtcpIlqJS/pSXPOxSBgcbv24L2CbFG5zTqefADu/ay8e+SQNIFDlxtR9E+LAtNe9vvOKmpfb8/POpjcxh8uBuJwOCoUAYUH3JbpqfA9aA6LQcOKWhxhiJEmq6AtfiXatX+G1VWU1v81amvmjqFJIWMRAbCSQBuyy+jjgAZySOvJYvDDCvEcrtDQ9eCclxfWNzNHP2VGQaqeXxKhpE1bT2W0VG1ZHoWIMlWqlUSQMcA4z6uwwBgHq2Mw+bAucYC9zdgdg29xX23WJHKBiA3OGg71xPff+lbVx8TLXqC23U6duVLUVcW2mhjqQIEr5EAzEedwfjg8BgRg9ePw0GO6PnifOHNFakdotaTueBHuFpSTxytJjIPdsCeXilrWGrrV4kT/gdp0XU2+eGmRJKued4U80Efk4HGFJJ3Hvg9eywM+L6NqaefrGHWtyBRNg8uQSGI6jGZmsjpw8hfL+1DsXhXQWuggqbtUzWit+bVHlSo3oICwDFc/qYgcHHBx9Onn/8A6VmJ6xuEbmptixWvAHkL3QIui25A6Q5TfPSk/wChqfS38U0tZoY101JQVLJVNOxdaidCShIkwTjJwRgcdedwHSXSLnfT9M0XSAFtAWPTSvE6J4QwMbnwuwNHU/79FUPxQ3U+Gmvqmg03M1sWZWqXo6ksYVYkhl3A4VgfZxjt269ngYDM0iYWAaBFX+/ynMRiMgY6MkEjXke8cFUdqv8Aqq0zpqmn1TT3eKJizRSvuVlwAVZF7e3uf3PT8keGf/45iLSUqJp2Hrw665n7hdk13jBQ6j8JdKXOnqZqGYkx1kcX/lhlKb4efc5DRtjB5XIyCMKLCvYJIhV1oSao60f2oxsoe4S8D8IVFeJHitS1doo6RKx46OtqGnCoxZyD7uMZ5I/m56xcB0XO7EPml7T2gC+dctuCQnxLXRiNhoHVImvLlYrnHRVagQVVTKzzww07tUU20hEIBwu1hyNv05563+j4MTCC3NYG2tDnr3pXEGOSnA0T3JBW5rRXammo6qR5kl3RzQ5DqMfXuP79egMRkic2Rulag7JJrHDXakwUWpPwu7RSK8q+dKJah1yZXXOeTn1bj3+o6zZML10RFDQUOQ/VIgeWOsFTbBruig1Tc5I7cKSnnhZKijwZE2g+oAgZBIJAPYbuokwk7MM1vWWee138vyRLZn60t0PBOb6guVPq6S+WCxxpaXjLfLIhjhVPJCq0hGAWGBx7/XrzYw0LsKMLipTnvfc3d6dyPnd1plhb2fbbimWz+It41BRwySw0Md1mgmjZ6d9nZcICSMleMgDPbrLm6MgwryGudkBG/edf7WnDiZZ27C6Ptslyov8AX2O3RT6gahrHhfzUlpqVFljbbjluBkk5+/Wm3DRYiQswmZt6USaOvLf9JUTPawddR47a/Puq/v2qCa+WRd9RLUOrO+/JdFHCnjgfYfTr0mGwnYDToBfkT83We+TPbhuVvm1zUVilHpaKnVtscE0iZG9+Cw9uPsOht6PYzUOJ5juHBX+oJ0yj090s1VddW8qJsSrFkrx3H/Trda6OrBSeVuzrXlPXXSKZlp4RGx9exFxn789ELowLcVGRh2JUx/NqrrSxQ3CK4SyU6zMKZWTYx/XGSwALp7+3PVHPDWk1Q+ey4xaaJykvtBp+41pt89Zbaia1zUk84qFkFTC3DRkbdqsRjOPpkdZL+tfVCxYrmPHuTbHNZeXTQ2p82jqt7JQTU+ng1vlp3qIauGtRhMInVHyvBG3d3HOft0szFuhBL37nYjmmTFnADGab770oceyWqggqaqnio0Xy2icjIT+UjjJbrXsNbmYDZ1SpyvcA86DTyQGp1PBoq52640TvU1MFUs6SxjiN42DLw3B7Dj36daXP3CVZGHOpp2XS90FN+HSXOilkp6fUdAtdGyqyqhYdlRs4I9+/p28nrwuLZ1UxY3UA6eHzRfUuj5hiIM/Eij4gb+e6B/DNpSWu8Rqqhq6eaanWGRkljwkbOsZaNioOe4AyO24HkdMTZZwxpO6zwZMI2R7eGlpQ8QKm43rxNea3LRVSLWtPiV/Jgp2ib81DsBOVOCV/Uff3zoN6uKNzJNDtprvtyH6SAL5nNdEb468xvaz0u2iNV36BL2lHJNQb6rc6MQQOQdzgZXGWwT9OOegyNxUTLiunafKR4nYWR3+WrHv/AEugfiLt1JB4V6Fvlqij/CJKeaKogqIz8vKrHeRKigkDH6WwecduSKwQNfhXWDnHI0bvh7eSx8bI4zuuq9qVBeEty0fcqytttBarXDb5aVqupuF4INbO3oKwFpX27VbO3y13MDyTjrC6bZj2wslkcc7TVNuq2ugPudFXBiLMQBpXGr8NfxuiPyGmtB3xponoqOskna40/nSmCOmIwvlLw3mrIMgJ7EKeM56Sb9Z0pBTiSAMrtLJ433EHirBuHwsmY778q7u++SfLBqG7eJN0q7nSUN2u7b0TEEXzRkLRhgT5YJ3Y4wduMY6yn4OaJn07DZO++lGq10TrJGydoaD+u5aLb4a6n8Q5rizaOvVzoaSo2GW6mK3RSy7sNHG8sihlAxkrkZwD1vMweJwzWfTFsZLaOt+Z7+XJKuMUjj1gLgNtKVx+HPw/XfRbUUkT2SwxsweotryPVspY4y020x78YAAJU54PGemsLg5zMZcU8PdVA1qPCxX5Q3ZGsywtoXZ70L+JVtP0lRc79dKV6uko/LiqfMpjIYgXA3kdycsD+w7HqQZZZurhNEnnS9Nheriw4fiACK8VyDfvD6qtV/Nw07R21bVUR7pKZgytUZwWwucYx9go3dbkOMbJH1eJLsw2PJIz4NzZOsw4GUj1/pdJab+Hqn8XPAixPZblBoq6W+qlgrzDTmrDetZImRQ6ckEjGfqM8DqI5o6cX9vWj4LNxkL87WVlsA93f871otvwFIwn/EdfT3KrWLyz8pZ0EpYEnDh6hghwcdj9uqmZpNMbQvYLO+jF252/ctVx+AmWa7tdovEOtoAHiZIZrArjK+5AqFGOPp9+iMnjbF1TmWNeOuvkpdhA51hwvwSJqD4AtSR1rfhmtbHIzs+2WotNXTO7fqKHbvXkH2JH+nTbMdG0U5pI8lzcC7/6BC21nwC61vl0FXU600jRKEXPlirdV2r2UeUM8ck8d+qQ4uKFnVgE+nFDGDkAokIovwRVNMKWoPiVpW3VMMbxytT0VTsmB4IcjjH2PPv0mcTYc12oJsWdq5IrcBKNvt/ag3f4KLzWUFJT2nxTtAtECqPlanz8NKwAYgx5UA44zk4+vRo8VE1zpJIwXHjQuvNEOCkDcgOnfzS/qn4W/Eezimt9UdN3eniiHl1VsvBYohTGTD5ayk5J5APv1DDA15kYSCdToOfO6QThZntDeSp6+NW6UplstzlgiCIit86tVBgZ/UBNAhx9M9ONwzZZDM0G9dq/BS7oXs7Lj9/0hiaLkulwR7deLTWxEqzxQy1k2cHnLRUxA/setBr8rKeCDzofkq7ISQdr+dy8GhNQmpEEYqJ0jY+TFT0NTJtbdkcGMHv79d1kJG2p31H7Vjhzy181b8/w4utPGk+utPGpALKflqhiy+y+kntz2HWSMU1pOVpryTbujXu3cPRRV+Fy4zVMFZ/FthPkSAkCCuG44/SSIiAB0Q41oY5mU6+ChvR8jdA4e6kT/DhqNrYsFBfdKvVEg76Y1yNIe20D5XqseKiDiXgkev5Q3dHSmhp6rOD4W9ZCGF/xSx00yxnBqWrkQnOCcmlxnn36h2KgcTd14f2qN6OnG1eqmUHww3rS4qmnl07PNLH+VIupkjELFvzPS6LuBwOOCegzYpswGvsiNwUzbsWeGuykVPgvdRE0EbWA1CxghzqCj8qQnOMeskYIOcnqI8U9go6ev6V/oTR7JJRJ/h/1PUWmWCGC1VbsqCGE1tK0KAEZBIb1HPOSftnoDp7k6wus+f6RzhHBha1uvfSP6M8H/Eqg0tcaC76dSK3rT+bSrR3SKrAlVm3GNB64wUwAmSOCBjI6jFmGdgLX24bWKNcidinejnyYSQteKaRrrx4ELX4aamqLBcoJEZaOpiYSRlW25AzncBgngYI6xXgtNjdesLGzMMbhoVZepvh4bXusdQ6z0w1LLYtTU1KtdRPKIzbLijYaZfSdyFCWGfZipIHbbkxJxGHjcwatOt8l4xrHYKdzXHf3XP3ih4aSaW1etJcoZKWrpUf8+SNZN8Z5BwQQ6sMENyCDx9B0Ez42lg2PD9FaE0ccxEjTpz/YV7+Bms7F4t6Lm8NdRV4okhhP4fdLYjUklNu2KP1Mcglf0nIIHforC/DEHYG96JB/XNZ2JYJgXt3020Hl3pW1N8Hdtsuqre91mt0NDa7bFRVFFDaJ83BgWAqjM85DStnJYcfYdJYnFYmOJ8TXkPJsO0rwriEOHAxzubICMvEa358iplJ4Yab0vHb4rror+NI6LL01cFqGqYMjODT1EqQSxgnAHmdgOD7BikYC4tcWl1XYFHvsA1z2TTsAS0AtDq79fQ191aFJq60U+nZKaroBarWAcUNRYZLfFCuP0NFDEyOAOchmxj+bqcjnO7Js9xB/SLlbGNqHgsrbd7hVW+d9E6pr5rXRoogjsAhkW3pncIlhEWVU4I2HgZGQBwGM72O/yDXvHzZALInih7FNvhnrrXVRdKun1UkddA8gkt7T0UVJU0jYbh/LjCOpyhV8Kw9ec8dHM7CBl0Pt5XqEu/C5LINj3/tc8X40utNU6is73J55bhSvDVFmaVUZgBvG8kHBwP7DGO3WM1z21JWxtexcyLqzFzFLnC/+Dd60ZJJSW3UtbEsDEGAqWQMMYxhuASOMj6YHXpY+kop+1LECTxXn5cDJBo159/2ulfgg1Fcqam1RYb7ew1DFRLM8iDJRkfAYEZO8bu/JzjPSWKyulHVNyhyAQ7qszzZadPnlqugJrFaZEo2Or5ayKmTanzNUkdRKhGDGZSqnBz/VkZ7jpYscLr8qBNpq0C1NpbIIKaMW+sqrfBHk+VR1nn7e5wCQ3p5JAHv9sDodm0TMDuLQPUlyvlKz0ltuNwWWHJWomaJCD/UdzcjkjlVz/vYHXVXa1hF5Vptes6unZGr7zcRJEjf8NWCLyQOOTKgC474Gd2Tg9SSeCkxsOgbuiX8WXEzUSU1qhqy5GxqeUlsAZJU7xtyO/qIxx9CbC90MsYLt3z0WFy1PcYrcfmlipWTDRIk0sWFHsSrK5/m4HGPfuepA1BVQ1pJr7IHdLzA9ykqEub0FYsS73t7vV7VweN2wuCMgndknPuMDq+U3YGi5pGUB2qXqq5UqU1TLc9Sm7w7QHpbvb53gjxySUWNCO3IPAyTheOrhjr/irF7dku6gWwVCs1DR0attB3tp+vnCrtONq4YYAweFU5xyfczY3jcfZCMrOakWm+3G6UNdT0FXWSVYcRKyadEcMa4C+YH8uNiG4Yl3JwPbBBsWgb/dUzXqFoorQtMF829XGncsoMchljPGOPTEPtnJ/v3ymCTsAnnZRpaP0lpgqPzvxGvrDt2kyNUuhUnsCxUH+30PVXEg6ivRVG3ZP3U6nht9PG80dLVeUp2yZ81VX9vzNpY8Hk9h1QWTpqpJrc1871Am1lpilqFje2NPh9olVRIoP/qUhiBznsf36nI48vVcSauz6I5bL89SsCW0edASSFiY+g444iQkE8HOAcAdCINm/v8A2rUK1v0RWfUNxyI5K+fDkskYoauXaMYyc4XjI446jK47fhDtg33UmlqL5VVkeKaoq6YqSqS21oV3ADsTKzcHP8o642BenqFQZPlrTdtYXCzITWV+mbf5OW8ypqZYAFwThsx7VHbkuD+/bojIi8Wftf2VHFgNAH1/a4z8eZaPTGpq/U1n1Jp2uobg5ertFru0c8tJUnjzYEL72RyMvHghSdwwDxrRYbrmBj204caoEd/I96q7EmJ2aNxIPPge5DfDr4srno9Ujprx8rFyj0s5ZfMGOBgqVYZJ4IPf6dVf0bIwkt18D/f9Iv1bJQBK3b1V82m/2/4l/D4x0dsqv4ks0MjR17QSx084Z12U7bgF7tKRIvCbR/VjpaWHqBmPZN6bbeq6Kan5btp33357eC52tOpqa0a4rKCWCa33K3saCrp5vTKm187MYxjIA+mCMfXpwsljjbI06HXRDD4nyFjh3LqDR/xhLpvRcdPdKGr1NMi7kpYaYsYSODtO8kngn0jJC46z3NkJDI8tHgef48bVjBG63kkHmOIVv6I1PZPHPSlTLY6n8O1FSDmnpKqdMqDlSoLLn64OCDkEDuZZhdKcNefA8/Mcku+V0TtDbTzr5rzQ612eguYMTR1NTBEm6aCGWeaZHO7aSiznIJycYwMnnjHXfTsvMT+lf6iRg7P4/SJ1GhdNy06tPa6qpk2hJGqKWoZto4bCM5PbsSxU7uAeggNY7TTz/Sl0krxrR8gtlJYtP6Sp55bPaxaalI5koVkqp/JLtGQpkSNiccgt6eATxkdWMhvKXXz5+pH5Qg0u1r0ql+ell1xqPSOs5LRd6aWkudsrPl6lWmUhZkbaSOACOXIJ7jnjgdaM2Fi6sPjOh7vunIsY8yZZNSrQ8UKei1GxvNJJHVUNSWMM6ksUYMA0eAB+kgc5OcnIGMdY8IdC7La1psszASEI+FzUdz0L4svVVMsC6cNO9LWSVNaIUEMhwQGGCSADgICxbacjHGtiHxGHP/2Gwo6rDZFK5xjH8fLyXUVY9/r9N3C6aO1TXa1paKRpHoZUzU+SvO5A4YTMmSDjB4XgdUgm6yQx1ld5fKS8sQjAc8aHvKrC1fEdR6yu4pZ77W0twowA9sqKZqQr2GTH5Cf0rwDjkkDjPTzoZWtogHy/tBBiuxp5p8tmuqqWZDV3r8ThYb1X5WlqZI1IYnJOGAbA53enHfkZCY2HR4GiuHOGrL90PHiJT2mM08NNaKRYi3kD5MF4mJABDOCy8DPpA3E4ye/VhEy7IUFz60KwrdX6kuyCOS9u0jOB5a06SJId6jABUgYzyOc8DHHNhDEN1XO8baJcu2sbnQxVVFFUQUDtkN+AUMVNPyf1H5c7kI7gkfb3PRBG0jOBfjqqhxvKUiXddbVF2pbjBfdQyVEZw1JWTLUxyL3HmGNopwnvjcf0jjCgdHDmN7O3h8pULHHUe6s/w71hJp2gqKO/Nf7Yks0aJNVy1F3p1Dn/AMxZJD5kaE8YZCqheWPBCkjM/aYQfQFFacujhXqpOs7hVwyLW0moqWpoZH8z8hjSylcDLLIqIsq42gctnvggE9KN3o6JyrGgQK361vN+kWne8NXyxkTFkeKdlBBILtsIxz2wPv34uQ0cFwBPFRNP3Sku9I6morqiadc+Xb6S5JKhKg5OAD7/AGHJx0s9pbwHnlTTTe9+6k/hMsj+bHRXCvpQm1oLjbauVigAzgvKCpPp/VnPAxkdULztt4UrCMaE6+ZRIXh91OJdIW2SkSMHe8VOPKwcbWiMxYe2GOQM+x4Ixr/3+eikt5NWxrqbXVS1Us01thaIKPLqKSFEHOOAquQOf5x346m8woanwKgx1qRp4qv9b+N9RSVwq7fVU08iKUMlVUuqzlSfTt8xl2kYIyp7fv08yBrx2x7f0kJJMn8T7pbp/iE1rcIxs1jNS+oloLXFTsVQnC5Kx5CKP5lHOCDnuS/SQNNZL8Sf2hid7tc2vktyeKN9uEUSLV6h1NBIxhmEUrZBHG0BAByQxyce/boZhiHIfO9HbI/TKMw+clvteoK6zor1PhJFW7SWD16xVeEYZzl+xPA+2e3VHBrtpq9kUF9dqIpgpfHmktskFDavCO3UlaEOYkoKRUiOSW4jgwTxk4Ofse/VTFIQc0tjzQv8dgNjNqZD8RHiPVVNO1Boq009MkwjYpSjdET337k9OPfC+/6u3Qxh4mHV6v23bM90xxeKfjJqlUeSu0vbkZwN09bUkgYwTtWLjH0znoRZh2aAnyARBFJvk90jeKngfqrxfNFW3PVmh6C50e6NHpKWrimSM4yskzDDLnnBB5ORycdMYfGRYYFoa5wPP9IUmGlk3AHzmkiP4a9YCR4E8QNERPAzCOoatqy29SAQVEOAVLAHPbIz0c4rC7ljvRDbBiNAOHerU8BPBbWHhdqKG7V2orDfaKOjEAFBLUyFsOrRs7yKowrAMCc84OcDBXxHSELzmjJu/nzgrswsjRkkGnv5fNValRpKmp2CY8vy2WMNhfRkeo70bdjjAJzj7dZnXWd06G0NB8+yXdR63tWlaPyLle/+JPpio460zM5C+n9RON2MjcR3OM8dXiuQggGu5c9oZYNearu9+PWp7fRTpYVhtQQrLLUvURzPEpGBwYgMMMHsGHHTjMOzN2j7f2gSE5brbv8AwqA1FbrbrzxAu95vmrI7RPXAVtdc6SnkrDI54JKRsqF+FzwO/ODkdbLJXRRBmTN3aBIuDHuPaDdO8ohX3rTuh9M1lmtWv7vq0xnzaVYrTFDTws3JLebMHUNuYHaCf356DkOJcHviDPP9D8ohl6hpbHJf490hXPVXzSzt8pNJPJH+XG9OzKeR6iccLnLZB+nTEeHykCxXigOmLySQr6+DzW97tfixpWGijukNI9STXyinqFpJqcxuHjOEK5YFdh42sAdwA6Tnj6p/W2NO8X84IzZOtiMTgV0FrPwlu+rLlHWtoWasrEeXyKtr81NPTg4YKrxOxC8DILAZHbkjrPZiXMvqzV91hGLI3AB5270qUvhHrrTxkFMs1tood0i09wuiV0Oc5JXc0cokwe7S7RnjGBlv65h0ePTT9hC+nB1YfysKyr1hTQrXfwz81DEymT8KSNpG9Yw3lTbFydpP6we+Mk9XbiIXg271099VUwSMIAHola3a1t90EUyR1UNRUBmBqUgpKmNuVZGgL4jcEHgnd39u9nnLYHtZHqFZjCav30+6PWbRGpNWTySwXelttryDIt0qY0kUHADKGZeNpBLBTgkAcnPQuvbXNWdEWkc/C07XfSlLYrdUVz6ttNxrQVHkUTTVE0jHIC/rwF+p2jIzj2HQw8EUB9lNOJshJlxr6GntNNVXCCZajJSOOV2p0QHkHaX3AY9+Pb3PVqJNBWuhaDpLZbHbZqma4UtnhaXczAzOZOOCF3cMArnnnnnHbolyE81QhjRySRWeO1s07DJ8vC1xMwcQPtVQ8ZBxIAhIyTjvj/PRxC929JZ07G/xtKNP46rG0gttphpJQmHlTYZH45LZj2sSTwcDA9uo+kOmYrvrxwbSg1vidqq60Dwrca2EeVGo+YqvVGO6kbQcjg8ZHYcdEGGj3QTjJHDQpamrfxCuElxv86LKW2NEjB1kAJyccdhjgfT9+jCNrRoEsZnPPacUWn1UtK+YqqSoqYnjaVZYRuwwUhQxJA425I/x1TqmndE+oI1BU5tVwVFbXyvb6YMsQhK1OZG8z6qcYHftwOffqnVigLRPqLJdSKRa807FWxyO8NNKCHkWjimhzJ/KWEe0N2+vHVDE6q3RRiWXZ08L/CnSeKttutQk1LbKqVCpYyTzsFDHJBKh/UOOMg9+cY6EYMuhKN9a1x0BX02u2ld5IlWlq1hM6RSQq6sSOGDAewGMEA5PuOeq5APBWOKDuNHwU2g1LWVFropHnqqiOpzJiGXCHjBRo8oD+knliP8AYVIFkKwnGUZjv820XprTSVldDUXi6UtPCdsFPRtuduDjZKWUoCc+gjA+vPUZxppqrEiyMxr5xUemrrhcqmkS2QXO8VlURgVdb5ccQ9QyUaVlIPuBntng9c5zGjtUAO7+lVryayEknmVtpr/HcvnYRQ2+3KxShmjpkO4yqT7srKeBt5XHJyCcEQbFVrxRGyMcTZA4fNFFt+lLfWlZkeGR5Sk6sIvIjH6jwkYUbfUQcgsSO4HfnTuG6oyOJ2oPzyW6Gu1JRSFaS8y1tOYSKiOKsmpsjBAA4IxkDIPfBwRhT1QiJwtza8kQySNOj79R6aIxX6m1v8uYKu/VMvnEKlM1SxJ4GQzrtBH6e4PQgyDcN240idZKBRd5a/pLwqBRT1EslDI9Mkkh+aqIIZHiZeDzvLyAZGCx4zwMADpiw6hf3S/XMaTeviPlpcuVr/8AGYFpxG43rHO1TkMAZCVkXZjaCXUEAlv84Ya/skuKVe5mcZD3a+K10+m6+uqqqYt+IxI7JURpIyk5T9ILsDnIByW7jqTM0ADZVa3MSbv1T54f6p0jYqgretKJVyksq1kkjTTRvuALqjsyAjnhcD344ISnZM/Vj/Lb55rQgmw7dHNo89/9eS6N0ZqSwX/TStTw/JwQSqYoqqN2JJ9ODtY98DjOB/tiyBzHUdVph4fTmndOCz3GnqflbFUU9JTINyColnVGY/zBEzg5IGCQPfnt0G9VUvjLbebUuRdTB/Me8U7KgGxBPUEZHcAtuI/uG7d+jZXnn7IIkw+1ey8v1w1NEtNVVFFBJA8gignhq0dgxOFbDRIQxPHfCjOM+9nBwALl0TsOSWtP3Qila73H5Oop4jW3BSwqBDOlGIypZWVW2Nu7Ec4BIzxgZGL4EoznxN0NehKj32WwLbl/iWikFPLk/wDHSJVLJ/MMgQnJyFJJAzuPJPPRGZw7s7oZkYRQII5UVR+o6b4d6GepFXda+01IQ5kszVkMyPtO5kXyfKB5+mD9M89a0b8WQNMw76/2s+QwC6NHutURqLxqXQ1zSk0ZWSX6zEb0rtQUKpVOdxzvCOcqRgqVKcH1JuGTtQ4UTjO/snkNvnP2KU+oIFMN+IU+s8dK+9U1P+HUFJQVtVsy1ND5OCcli20jdj1MDnOSM9uQ/T5Cc5ulR2JN0NCqvrHrbzcGqKyomrY3YbJ3kACHgscd8HjtyMdOhzWNpuhSZdm3Kj3ASyVUsrSyNJksTxuJxgc/T7dSwigFFhf/2Q==</data>
+            <mime>image/jpeg</mime>
+            <width>1280</width>
+            <height>720</height>
+            <resource-attributes>
+                <file-name>snapshot-DAE9FC15-88E3-46CF-B744-DA9B1B56EB57.jpg</file-name>
+            </resource-attributes>
+        </resource>
+    </note>
+</en-export>
+
diff --git a/plugins/tiddlywiki/evernote/samples/sample-enex.xml.enex b/plugins/tiddlywiki/evernote/samples/sample-enex.xml.enex
new file mode 100755
index 000000000..b67767679
--- /dev/null
+++ b/plugins/tiddlywiki/evernote/samples/sample-enex.xml.enex
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE en-export SYSTEM "http://xml.evernote.com/pub/evernote-export3.dtd">
+<en-export export-date="20130730T205637Z" application="Evernote" version="Evernote Mac">
+    <note>
+        <title>Test Note for Export</title>
+        <content>
+            <![CDATA[<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+            <!DOCTYPE en-note SYSTEM "http://xml.evernote.com/pub/enml2.dtd">
+            <en-note style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;">
+                Hello, World.
+                <div>
+                    <br/>
+                </div>
+                <div>
+                    <en-media alt="" type="image/jpeg" hash="dd7b6d285d09ec054e8cd6a3814ce093"/>
+                </div>
+                <div>
+                    <br/>
+                </div>
+            </en-note>
+            ]]>
+        </content>
+        <created>20130730T205204Z</created>
+        <updated>20130730T205624Z</updated>
+        <tag>fake-tag</tag>
+        <note-attributes>
+            <latitude>33.88394692352314</latitude>
+            <longitude>-117.9191355110099</longitude>
+            <altitude>96</altitude>
+            <author>Brett Kelly</author>
+        </note-attributes>
+        <resource>
+            <data encoding="base64">/9j/4AAQSkZJRgABAQAAAQABAAD/4gxYSUNDX1BST0ZJTEUAAQEAAAxITGlubwIQAABtbnRyUkdCIFhZ
+            WiAHzgACAAkABgAxAABhY3NwTVNGVAAAAABJRUMgc1JHQgAAAAAAAAAAAAAAAAAA9tYAAQAAAADTLUhQ
+            <!-- ... -->
+            kfeIGT/+uufk8DpM0gyVjGfmzkgetesnUoTHJ+5Cxn86zmv4/wB75EW+QHAPUH/P9Ky+s1rtrr/wfvOm
+            dBSamnq/xPKp/hpLKmS7x4OBjgn6elee6v4OuLJirRSHb/FtyG9s9u1fR0+oTiIRvGq7W4bpisfUGk1C
+            GVWtkIyM57n1rfDY+uqigtU76ffZkUsA6iajHZ6v/P8A4B//2Q==</data>
+            <mime>image/jpeg</mime>
+            <width>1280</width>
+            <height>720</height>
+            <resource-attributes>
+                <file-name>snapshot-DAE9FC15-88E3-46CF-B744-DA9B1B56EB57.jpg</file-name>
+            </resource-attributes>
+        </resource>
+    </note>
+</en-export>
+
diff --git a/plugins/tiddlywiki/evernote/samples/tiddlywiki.files b/plugins/tiddlywiki/evernote/samples/tiddlywiki.files
new file mode 100644
index 000000000..cff7acd09
--- /dev/null
+++ b/plugins/tiddlywiki/evernote/samples/tiddlywiki.files
@@ -0,0 +1,3 @@
+{
+	"tiddlers": []
+}
\ No newline at end of file
diff --git a/plugins/tiddlywiki/filesystem/filesystemadaptor.js b/plugins/tiddlywiki/filesystem/filesystemadaptor.js
index ce06dc3ee..acbd6faf6 100644
--- a/plugins/tiddlywiki/filesystem/filesystemadaptor.js
+++ b/plugins/tiddlywiki/filesystem/filesystemadaptor.js
@@ -24,6 +24,11 @@ function FileSystemAdaptor(options) {
 	$tw.utils.createDirectory($tw.boot.wikiTiddlersPath);
 }
 
+FileSystemAdaptor.prototype.isReady = function() {
+	// The file system adaptor is always ready
+	return true;
+};
+
 FileSystemAdaptor.prototype.getTiddlerInfo = function(tiddler) {
 	return {};
 };
@@ -32,27 +37,19 @@ $tw.config.typeInfo = {
 	"text/vnd.tiddlywiki": {
 		fileType: "application/x-tiddler",
 		extension: ".tid"
-	},
-	"image/jpeg" : {
-		hasMetaFile: true
 	}
 };
 
-$tw.config.typeTemplates = {
-	"application/x-tiddler": "$:/core/templates/tid-tiddler"
-};
-
 FileSystemAdaptor.prototype.getTiddlerFileInfo = function(tiddler,callback) {
 	// See if we've already got information about this file
 	var self = this,
 		title = tiddler.fields.title,
 		fileInfo = $tw.boot.files[title];
 	// Get information about how to save tiddlers of this type
-	var type = tiddler.fields.type || "text/vnd.tiddlywiki",
-		typeInfo = $tw.config.typeInfo[type];
-	if(!typeInfo) {
-		typeInfo = $tw.config.typeInfo["text/vnd.tiddlywiki"];
-	}
+	var type = tiddler.fields.type || "text/vnd.tiddlywiki";
+	var typeInfo = $tw.config.typeInfo[type] ||
+		$tw.config.contentTypeInfo[type] ||
+		$tw.config.typeInfo["text/vnd.tiddlywiki"];
 	var extension = typeInfo.extension || "";
 	if(!fileInfo) {
 		// If not, we'll need to generate it
@@ -87,18 +84,55 @@ Transliterate string from cyrillic russian to latin
 	}).join("");
 };
 
+/*
+Given a list of filters, apply every one in turn to source, and return the first result of the first filter with non-empty result.
+*/
+FileSystemAdaptor.prototype.findFirstFilter = function(filters,source) {
+	var numFilters = filters.length;
+	for(var i=0; i<numFilters; i++) {
+		var result = this.wiki.filterTiddlers(filters[i],null,source);
+		if(result.length > 0) {
+			return result[0];
+		}
+	}
+};
+
+/*
+Add file extension to a file path if it doesn't already exist.
+*/
+FileSystemAdaptor.addFileExtension = function(file,extension) {
+	return $tw.utils.strEndsWith(file,extension) ? file : file + extension;
+};
+
+
 /*
 Given a tiddler title and an array of existing filenames, generate a new legal filename for the title, case insensitively avoiding the array of existing filenames
 */
 FileSystemAdaptor.prototype.generateTiddlerFilename = function(title,extension,existingFilenames) {
-	// First remove any of the characters that are illegal in Windows filenames
-	var baseFilename = transliterate(title.replace(/<|>|\:|\"|\/|\\|\||\?|\*|\^|\s/g,"_"));
+	var baseFilename;
+	// Check whether the user has configured a tiddler -> pathname mapping
+	var pathNameFilters = this.wiki.getTiddlerText("$:/config/FileSystemPaths");
+	if(pathNameFilters) {
+		var source = this.wiki.makeTiddlerIterator([title]);
+		var result = this.findFirstFilter(pathNameFilters.split("\n"),source);
+		if(result) {
+			// interpret "/" as path separator
+			baseFilename = result.replace(/\//g,path.sep);
+		}
+	}
+	if(!baseFilename) {
+		// no mapping configured, or it did not match this tiddler
+		// in this case, we fall back to legacy behaviour
+		baseFilename = title.replace(/\//g,"_");
+	}
+	// Remove any of the characters that are illegal in Windows filenames
+	var baseFilename = transliterate(baseFilename.replace(/<|>|\:|\"|\\|\||\?|\*|\^|\s/g,"_"));
 	// Truncate the filename if it is too long
 	if(baseFilename.length > 200) {
 		baseFilename = baseFilename.substr(0,200);
 	}
 	// Start with the base filename plus the extension
-	var filename = baseFilename + extension,
+	var filename = FileSystemAdaptor.addFileExtension(baseFilename,extension),
 		count = 1;
 	// Add a discriminator if we're clashing with an existing filename while
 	// handling case-insensitive filesystems (NTFS, FAT/FAT32, etc.)
@@ -114,38 +148,44 @@ Save a tiddler and invoke the callback with (err,adaptorInfo,revision)
 FileSystemAdaptor.prototype.saveTiddler = function(tiddler,callback) {
 	var self = this;
 	this.getTiddlerFileInfo(tiddler,function(err,fileInfo) {
-		var template, content, encoding,
+		var template, content, encoding, filepath,
 			_finish = function() {
 				callback(null, {}, 0);
 			};
 		if(err) {
 			return callback(err);
 		}
+		var error = $tw.utils.createDirectory(path.dirname(fileInfo.filepath));
+		if(error) {
+			return callback(error);
+		}
 		var typeInfo = $tw.config.contentTypeInfo[fileInfo.type];
 		if(fileInfo.hasMetaFile || typeInfo.encoding === "base64") {
 			// Save the tiddler as a separate body and meta file
-			fs.writeFile(fileInfo.filepath,tiddler.fields.text,{encoding: typeInfo.encoding},function(err) {
+			filepath = fileInfo.filepath;
+			fs.writeFile(filepath,tiddler.fields.text,{encoding: typeInfo.encoding},function(err) {
 				if(err) {
 					return callback(err);
 				}
 				content = self.wiki.renderTiddler("text/plain","$:/core/templates/tiddler-metadata",{variables: {currentTiddler: tiddler.fields.title}});
-				fs.writeFile(fileInfo.filepath + ".meta",content,{encoding: "utf8"},function (err) {
+				filepath = FileSystemAdaptor.addFileExtension(fileInfo.filepath,".meta");
+				fs.writeFile(filepath,content,{encoding: "utf8"},function (err) {
 					if(err) {
 						return callback(err);
 					}
-					self.logger.log("Saved file",fileInfo.filepath);
+					self.logger.log("Saved file",filepath);
 					_finish();
 				});
 			});
 		} else {
 			// Save the tiddler as a self contained templated file
-			template = $tw.config.typeTemplates[fileInfo.type];
-			content = self.wiki.renderTiddler("text/plain",template,{variables: {currentTiddler: tiddler.fields.title}});
-			fs.writeFile(fileInfo.filepath,content,{encoding: "utf8"},function (err) {
+			content = self.wiki.renderTiddler("text/plain","$:/core/templates/tid-tiddler",{variables: {currentTiddler: tiddler.fields.title}});
+			filepath = FileSystemAdaptor.addFileExtension(fileInfo.filepath,".tid");
+			fs.writeFile(filepath,content,{encoding: "utf8"},function (err) {
 				if(err) {
 					return callback(err);
 				}
-				self.logger.log("Saved file",fileInfo.filepath);
+				self.logger.log("Saved file",filepath);
 				_finish();
 			});
 		}
@@ -177,14 +217,14 @@ FileSystemAdaptor.prototype.deleteTiddler = function(title,callback,options) {
 			self.logger.log("Deleted file",fileInfo.filepath);
 			// Delete the metafile if present
 			if(fileInfo.hasMetaFile) {
-				fs.unlink(fileInfo.filepath + ".meta",function(err) {
+				fs.unlink(FileSystemAdaptor.addFileExtension(fileInfo.filepath,".meta"),function(err) {
 					if(err) {
 						return callback(err);
 					}
-					callback(null);
+					$tw.utils.deleteEmptyDirs(path.dirname(fileInfo.filepath),callback);
 				});
 			} else {
-				callback(null);
+				$tw.utils.deleteEmptyDirs(path.dirname(fileInfo.filepath),callback);
 			}
 		});
 	} else {
diff --git a/plugins/tiddlywiki/highlight/TypeMappings.multids b/plugins/tiddlywiki/highlight/TypeMappings.multids
new file mode 100644
index 000000000..0bf0ef87e
--- /dev/null
+++ b/plugins/tiddlywiki/highlight/TypeMappings.multids
@@ -0,0 +1,9 @@
+title: $:/config/HighlightPlugin/TypeMappings/
+
+text/plain:
+application/javascript: javascript
+application/json: json
+text/css: css
+text/html: html
+image/svg+xml: xml
+text/x-markdown: markdown
diff --git a/plugins/tiddlywiki/highlight/highlightblock.js b/plugins/tiddlywiki/highlight/highlightblock.js
index a2187e8d7..80bd93fbb 100644
--- a/plugins/tiddlywiki/highlight/highlightblock.js
+++ b/plugins/tiddlywiki/highlight/highlightblock.js
@@ -12,6 +12,8 @@ Wraps up the fenced code blocks parser for highlight and use in TiddlyWiki5
 /*global $tw: false */
 "use strict";
 
+var TYPE_MAPPINGS_BASE = "$:/config/HighlightPlugin/TypeMappings/";
+
 var CodeBlockWidget = require("$:/core/modules/widgets/codeblock.js").codeblock;
 
 var hljs = require("$:/plugins/tiddlywiki/highlight/highlight.js");
@@ -19,16 +21,17 @@ var hljs = require("$:/plugins/tiddlywiki/highlight/highlight.js");
 hljs.configure({tabReplace: "    "});	
 
 CodeBlockWidget.prototype.postRender = function() {
-	var domNode = this.domNodes[0];
-	if($tw.browser && this.document !== $tw.fakeDocument && this.language) {
-		domNode.className = this.language.toLowerCase();
-		hljs.highlightBlock(domNode);
-	} else if(!$tw.browser && this.language && this.language.indexOf("/") === -1 ){
+	var domNode = this.domNodes[0],
+		language = this.language,
+		tiddler = this.wiki.getTiddler(TYPE_MAPPINGS_BASE + language);
+	if(tiddler) {
+		language = tiddler.fields.text || "";
+	}
+	if(language) {
 		try {
-			domNode.className = this.language.toLowerCase() + " hljs";
-			domNode.children[0].innerHTML = hljs.fixMarkup(hljs.highlight(this.language, this.getAttribute("code")).value);
-		}
-		catch(err) {
+			domNode.className = language.toLowerCase() + " hljs";
+			hljs.highlightBlock(domNode);
+		} catch(err) {
 			// Can't easily tell if a language is registered or not in the packed version of hightlight.js,
 			// so we silently fail and the codeblock remains unchanged
 		}
diff --git a/plugins/tiddlywiki/highlight/readme.tid b/plugins/tiddlywiki/highlight/readme.tid
index 2b645432a..59001fc85 100644
--- a/plugins/tiddlywiki/highlight/readme.tid
+++ b/plugins/tiddlywiki/highlight/readme.tid
@@ -45,3 +45,4 @@ The plugin includes support for the following languages (referred to as "brushes
 * sql
 * xml
 
+You can also specify the language as a MIME content type (eg `text/html` or `text/css`). The mapping is accomplished via mapping tiddlers whose titles start with `$:/config/HighlightPlugin/TypeMappings/`.
diff --git a/plugins/tiddlywiki/internals/editpreviews/parse-tree.tid b/plugins/tiddlywiki/internals/editpreviews/parse-tree.tid
new file mode 100644
index 000000000..aafa30ecf
--- /dev/null
+++ b/plugins/tiddlywiki/internals/editpreviews/parse-tree.tid
@@ -0,0 +1,16 @@
+title: $:/plugins/tiddlywiki/internals/EditTemplate/body/preview/parse-tree
+tags: $:/tags/EditPreview
+list-after: $:/core/ui/EditTemplate/body/preview/output
+caption: parse tree
+
+\define preview(mode)
+<$wikify name="preview-text" text={{!!text}} type={{!!type}} mode="$mode$" output="parsetree">
+<pre>
+<code>
+<$text text=<<preview-text>>/>
+</code>
+</pre>
+</$wikify>
+\end
+
+{{||$:/plugins/tiddlywiki/internals/EditTemplate/body/preview/shared}}
diff --git a/plugins/tiddlywiki/internals/editpreviews/raw.tid b/plugins/tiddlywiki/internals/editpreviews/raw.tid
new file mode 100644
index 000000000..13d5e99ec
--- /dev/null
+++ b/plugins/tiddlywiki/internals/editpreviews/raw.tid
@@ -0,0 +1,6 @@
+title: $:/plugins/tiddlywiki/internals/EditTemplate/body/preview/raw
+tags: $:/tags/EditPreview
+caption: raw HTML
+list-after: $:/plugins/tiddlywiki/internals/EditTemplate/body/preview/widget-tree
+
+<pre><code><$view field="text" format="htmlwikified" /></code></pre>
diff --git a/plugins/tiddlywiki/internals/editpreviews/shared.tid b/plugins/tiddlywiki/internals/editpreviews/shared.tid
new file mode 100644
index 000000000..3f3eb6d48
--- /dev/null
+++ b/plugins/tiddlywiki/internals/editpreviews/shared.tid
@@ -0,0 +1,25 @@
+title: $:/plugins/tiddlywiki/internals/EditTemplate/body/preview/shared
+
+\define body()
+
+Mode: <$select tiddler="$(tv-mode-configuration)$" default="block">
+<option value="inline">Inline</option>
+<option value="block">Block</option>
+</$select>
+
+<$macrocall $name="preview" mode={{$(tv-mode-configuration)$}}/>
+\end
+
+<div class="tc-internal-tree-preview-wrapper">
+
+<div class="tc-internal-tree-preview">
+
+<$vars tv-mode-configuration=<<qualify "$:/state/internals/preview/mode">>>
+
+<<body>>
+
+</$vars>
+
+</div>
+
+</div>
diff --git a/plugins/tiddlywiki/internals/editpreviews/widget-tree.tid b/plugins/tiddlywiki/internals/editpreviews/widget-tree.tid
new file mode 100644
index 000000000..457ca7e96
--- /dev/null
+++ b/plugins/tiddlywiki/internals/editpreviews/widget-tree.tid
@@ -0,0 +1,16 @@
+title: $:/plugins/tiddlywiki/internals/EditTemplate/body/preview/widget-tree
+tags: $:/tags/EditPreview
+caption: widget tree
+list-after: $:/plugins/tiddlywiki/internals/EditTemplate/body/preview/parse-tree
+
+\define preview(mode)
+<$wikify name="preview-text" text={{!!text}} type={{!!type}} mode="$mode$" output="widgettree">
+<pre>
+<code>
+<$text text=<<preview-text>>/>
+</code>
+</pre>
+</$wikify>
+\end
+
+{{||$:/plugins/tiddlywiki/internals/EditTemplate/body/preview/shared}}
diff --git a/plugins/tiddlywiki/internals/plugin.info b/plugins/tiddlywiki/internals/plugin.info
new file mode 100644
index 000000000..78634903c
--- /dev/null
+++ b/plugins/tiddlywiki/internals/plugin.info
@@ -0,0 +1,7 @@
+{
+	"title": "$:/plugins/tiddlywiki/internals",
+	"description": "Tools for exploring the internals of TiddlyWiki",
+	"author": "JeremyRuston",
+	"core-version": ">=5.0.0",
+	"list": "readme"
+}
diff --git a/plugins/tiddlywiki/internals/readme.tid b/plugins/tiddlywiki/internals/readme.tid
new file mode 100644
index 000000000..fb85875ac
--- /dev/null
+++ b/plugins/tiddlywiki/internals/readme.tid
@@ -0,0 +1,10 @@
+title: $:/plugins/tiddlywiki/internals/readme
+
+This plugin adds features to help explore the internals of TiddlyWiki:
+
+* New preview panes showing:
+** the parse tree
+** the widget tree
+** the raw HTML output
+
+The first two include a dropdown for choosing block vs. inline parsing mode.
diff --git a/plugins/tiddlywiki/internals/styles.tid b/plugins/tiddlywiki/internals/styles.tid
new file mode 100644
index 000000000..73f3f068d
--- /dev/null
+++ b/plugins/tiddlywiki/internals/styles.tid
@@ -0,0 +1,4 @@
+title: $:/plugins/tiddlywiki/internals/styles
+tags: $:/tags/Stylesheet
+
+\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline macrocallblock
diff --git a/plugins/tiddlywiki/jszip/readme.tid b/plugins/tiddlywiki/jszip/readme.tid
index a641e5b1e..f3068f743 100644
--- a/plugins/tiddlywiki/jszip/readme.tid
+++ b/plugins/tiddlywiki/jszip/readme.tid
@@ -1,3 +1,3 @@
-title: $:/plugins/tiddlywiki/async/readme
+title: $:/plugins/tiddlywiki/jszip/readme
 
 This plugin packages [[JSZip|https://stuk.github.io/jszip/]] for use by other plugins. It does not provide any end-user visible features.
diff --git a/plugins/tiddlywiki/katex/files/README.md b/plugins/tiddlywiki/katex/files/README.md
index 35a309cae..31cf658d8 100644
--- a/plugins/tiddlywiki/katex/files/README.md
+++ b/plugins/tiddlywiki/katex/files/README.md
@@ -1,5 +1,7 @@
 # [<img src="https://khan.github.io/KaTeX/katex-logo.svg" width="130" alt="KaTeX">](https://khan.github.io/KaTeX/) [![Build Status](https://travis-ci.org/Khan/KaTeX.svg?branch=master)](https://travis-ci.org/Khan/KaTeX)
 
+[![Join the chat at https://gitter.im/Khan/KaTeX](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/Khan/KaTeX?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 KaTeX is a fast, easy-to-use JavaScript library for TeX math rendering on the web.
 
  * **Fast:** KaTeX renders its math synchronously and doesn't need to reflow the page. See how it compares to a competitor in [this speed test](http://jsperf.com/katex-vs-mathjax/).
@@ -14,8 +16,8 @@ KaTeX supports all major browsers, including Chrome, Safari, Firefox, Opera, and
 You can [download KaTeX](https://github.com/khan/katex/releases) and host it on your server or include the `katex.min.js` and `katex.min.css` files on your page directly from a CDN:
 
 ```html
-<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/KaTeX/0.3.0/katex.min.css">
-<script src="//cdnjs.cloudflare.com/ajax/libs/KaTeX/0.3.0/katex.min.js"></script>
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.5.1/katex.min.css">
+<script src="https://cdnjs.cloudflare.com/ajax/libs/KaTeX/0.5.1/katex.min.js"></script>
 ```
 
 #### In-browser rendering
diff --git a/plugins/tiddlywiki/katex/files/katex.min.css b/plugins/tiddlywiki/katex/files/katex.min.css
index 408409dca..47dd09dab 100644
--- a/plugins/tiddlywiki/katex/files/katex.min.css
+++ b/plugins/tiddlywiki/katex/files/katex.min.css
@@ -1 +1 @@
-@font-face{font-family:KaTeX_AMS;src:url(fonts/KaTeX_AMS-Regular.eot);src:url(fonts/KaTeX_AMS-Regular.eot#iefix) format('embedded-opentype'),url(fonts/KaTeX_AMS-Regular.woff2) format('woff2'),url(fonts/KaTeX_AMS-Regular.woff) format('woff'),url(fonts/KaTeX_AMS-Regular.ttf) format('ttf');font-weight:400;font-style:normal}@font-face{font-family:KaTeX_Caligraphic;src:url(fonts/KaTeX_Caligraphic-Bold.eot);src:url(fonts/KaTeX_Caligraphic-Bold.eot#iefix) format('embedded-opentype'),url(fonts/KaTeX_Caligraphic-Bold.woff2) format('woff2'),url(fonts/KaTeX_Caligraphic-Bold.woff) format('woff'),url(fonts/KaTeX_Caligraphic-Bold.ttf) format('ttf');font-weight:700;font-style:normal}@font-face{font-family:KaTeX_Caligraphic;src:url(fonts/KaTeX_Caligraphic-Regular.eot);src:url(fonts/KaTeX_Caligraphic-Regular.eot#iefix) format('embedded-opentype'),url(fonts/KaTeX_Caligraphic-Regular.woff2) format('woff2'),url(fonts/KaTeX_Caligraphic-Regular.woff) format('woff'),url(fonts/KaTeX_Caligraphic-Regular.ttf) format('ttf');font-weight:400;font-style:normal}@font-face{font-family:KaTeX_Fraktur;src:url(fonts/KaTeX_Fraktur-Bold.eot);src:url(fonts/KaTeX_Fraktur-Bold.eot#iefix) format('embedded-opentype'),url(fonts/KaTeX_Fraktur-Bold.woff2) format('woff2'),url(fonts/KaTeX_Fraktur-Bold.woff) format('woff'),url(fonts/KaTeX_Fraktur-Bold.ttf) format('ttf');font-weight:700;font-style:normal}@font-face{font-family:KaTeX_Fraktur;src:url(fonts/KaTeX_Fraktur-Regular.eot);src:url(fonts/KaTeX_Fraktur-Regular.eot#iefix) format('embedded-opentype'),url(fonts/KaTeX_Fraktur-Regular.woff2) format('woff2'),url(fonts/KaTeX_Fraktur-Regular.woff) format('woff'),url(fonts/KaTeX_Fraktur-Regular.ttf) format('ttf');font-weight:400;font-style:normal}@font-face{font-family:KaTeX_Main;src:url(fonts/KaTeX_Main-Bold.eot);src:url(fonts/KaTeX_Main-Bold.eot#iefix) format('embedded-opentype'),url(fonts/KaTeX_Main-Bold.woff2) format('woff2'),url(fonts/KaTeX_Main-Bold.woff) format('woff'),url(fonts/KaTeX_Main-Bold.ttf) format('ttf');font-weight:700;font-style:normal}@font-face{font-family:KaTeX_Main;src:url(fonts/KaTeX_Main-Italic.eot);src:url(fonts/KaTeX_Main-Italic.eot#iefix) format('embedded-opentype'),url(fonts/KaTeX_Main-Italic.woff2) format('woff2'),url(fonts/KaTeX_Main-Italic.woff) format('woff'),url(fonts/KaTeX_Main-Italic.ttf) format('ttf');font-weight:400;font-style:italic}@font-face{font-family:KaTeX_Main;src:url(fonts/KaTeX_Main-Regular.eot);src:url(fonts/KaTeX_Main-Regular.eot#iefix) format('embedded-opentype'),url(fonts/KaTeX_Main-Regular.woff2) format('woff2'),url(fonts/KaTeX_Main-Regular.woff) format('woff'),url(fonts/KaTeX_Main-Regular.ttf) format('ttf');font-weight:400;font-style:normal}@font-face{font-family:KaTeX_Math;src:url(fonts/KaTeX_Math-Italic.eot);src:url(fonts/KaTeX_Math-Italic.eot#iefix) format('embedded-opentype'),url(fonts/KaTeX_Math-Italic.woff2) format('woff2'),url(fonts/KaTeX_Math-Italic.woff) format('woff'),url(fonts/KaTeX_Math-Italic.ttf) format('ttf');font-weight:400;font-style:italic}@font-face{font-family:KaTeX_SansSerif;src:url(fonts/KaTeX_SansSerif-Regular.eot);src:url(fonts/KaTeX_SansSerif-Regular.eot#iefix) format('embedded-opentype'),url(fonts/KaTeX_SansSerif-Regular.woff2) format('woff2'),url(fonts/KaTeX_SansSerif-Regular.woff) format('woff'),url(fonts/KaTeX_SansSerif-Regular.ttf) format('ttf');font-weight:400;font-style:normal}@font-face{font-family:KaTeX_Script;src:url(fonts/KaTeX_Script-Regular.eot);src:url(fonts/KaTeX_Script-Regular.eot#iefix) format('embedded-opentype'),url(fonts/KaTeX_Script-Regular.woff2) format('woff2'),url(fonts/KaTeX_Script-Regular.woff) format('woff'),url(fonts/KaTeX_Script-Regular.ttf) format('ttf');font-weight:400;font-style:normal}@font-face{font-family:KaTeX_Size1;src:url(fonts/KaTeX_Size1-Regular.eot);src:url(fonts/KaTeX_Size1-Regular.eot#iefix) format('embedded-opentype'),url(fonts/KaTeX_Size1-Regular.woff2) format('woff2'),url(fonts/KaTeX_Size1-Regular.woff) format('woff'),url(fonts/KaTeX_Size1-Regular.ttf) format('ttf');font-weight:400;font-style:normal}@font-face{font-family:KaTeX_Size2;src:url(fonts/KaTeX_Size2-Regular.eot);src:url(fonts/KaTeX_Size2-Regular.eot#iefix) format('embedded-opentype'),url(fonts/KaTeX_Size2-Regular.woff2) format('woff2'),url(fonts/KaTeX_Size2-Regular.woff) format('woff'),url(fonts/KaTeX_Size2-Regular.ttf) format('ttf');font-weight:400;font-style:normal}@font-face{font-family:KaTeX_Size3;src:url(fonts/KaTeX_Size3-Regular.eot);src:url(fonts/KaTeX_Size3-Regular.eot#iefix) format('embedded-opentype'),url(fonts/KaTeX_Size3-Regular.woff2) format('woff2'),url(fonts/KaTeX_Size3-Regular.woff) format('woff'),url(fonts/KaTeX_Size3-Regular.ttf) format('ttf');font-weight:400;font-style:normal}@font-face{font-family:KaTeX_Size4;src:url(fonts/KaTeX_Size4-Regular.eot);src:url(fonts/KaTeX_Size4-Regular.eot#iefix) format('embedded-opentype'),url(fonts/KaTeX_Size4-Regular.woff2) format('woff2'),url(fonts/KaTeX_Size4-Regular.woff) format('woff'),url(fonts/KaTeX_Size4-Regular.ttf) format('ttf');font-weight:400;font-style:normal}@font-face{font-family:KaTeX_Typewriter;src:url(fonts/KaTeX_Typewriter-Regular.eot);src:url(fonts/KaTeX_Typewriter-Regular.eot#iefix) format('embedded-opentype'),url(fonts/KaTeX_Typewriter-Regular.woff2) format('woff2'),url(fonts/KaTeX_Typewriter-Regular.woff) format('woff'),url(fonts/KaTeX_Typewriter-Regular.ttf) format('ttf');font-weight:400;font-style:normal}.katex-display{display:block;margin:1em 0;text-align:center}.katex-display>.katex{display:inline-block}.katex{font:400 1.21em KaTeX_Main;line-height:1.2;white-space:nowrap;text-indent:0}.katex .katex-html{display:inline-block}.katex .katex-mathml{position:absolute;clip:rect(1px,1px,1px,1px);padding:0;border:0;height:1px;width:1px;overflow:hidden}.katex .base,.katex .strut{display:inline-block}.katex .mathit{font-family:KaTeX_Math;font-style:italic}.katex .mathbf{font-family:KaTeX_Main;font-weight:700}.katex .amsrm,.katex .mathbb{font-family:KaTeX_AMS}.katex .mathcal{font-family:KaTeX_Caligraphic}.katex .mathfrak{font-family:KaTeX_Fraktur}.katex .mathtt{font-family:KaTeX_Typewriter}.katex .mathscr{font-family:KaTeX_Script}.katex .mathsf{font-family:KaTeX_SansSerif}.katex .mainit{font-family:KaTeX_Main;font-style:italic}.katex .textstyle>.mord+.mop{margin-left:.16667em}.katex .textstyle>.mord+.mbin{margin-left:.22222em}.katex .textstyle>.mord+.mrel{margin-left:.27778em}.katex .textstyle>.mop+.mop,.katex .textstyle>.mop+.mord,.katex .textstyle>.mord+.minner{margin-left:.16667em}.katex .textstyle>.mop+.mrel{margin-left:.27778em}.katex .textstyle>.mop+.minner{margin-left:.16667em}.katex .textstyle>.mbin+.minner,.katex .textstyle>.mbin+.mop,.katex .textstyle>.mbin+.mopen,.katex .textstyle>.mbin+.mord{margin-left:.22222em}.katex .textstyle>.mrel+.minner,.katex .textstyle>.mrel+.mop,.katex .textstyle>.mrel+.mopen,.katex .textstyle>.mrel+.mord{margin-left:.27778em}.katex .textstyle>.mclose+.mop{margin-left:.16667em}.katex .textstyle>.mclose+.mbin{margin-left:.22222em}.katex .textstyle>.mclose+.mrel{margin-left:.27778em}.katex .textstyle>.mclose+.minner,.katex .textstyle>.minner+.mop,.katex .textstyle>.minner+.mord,.katex .textstyle>.mpunct+.mclose,.katex .textstyle>.mpunct+.minner,.katex .textstyle>.mpunct+.mop,.katex .textstyle>.mpunct+.mopen,.katex .textstyle>.mpunct+.mord,.katex .textstyle>.mpunct+.mpunct,.katex .textstyle>.mpunct+.mrel{margin-left:.16667em}.katex .textstyle>.minner+.mbin{margin-left:.22222em}.katex .textstyle>.minner+.mrel{margin-left:.27778em}.katex .mclose+.mop,.katex .minner+.mop,.katex .mop+.mop,.katex .mop+.mord,.katex .mord+.mop,.katex .textstyle>.minner+.minner,.katex .textstyle>.minner+.mopen,.katex .textstyle>.minner+.mpunct{margin-left:.16667em}.katex .reset-textstyle.textstyle{font-size:1em}.katex .reset-textstyle.scriptstyle{font-size:.7em}.katex .reset-textstyle.scriptscriptstyle{font-size:.5em}.katex .reset-scriptstyle.textstyle{font-size:1.42857em}.katex .reset-scriptstyle.scriptstyle{font-size:1em}.katex .reset-scriptstyle.scriptscriptstyle{font-size:.71429em}.katex .reset-scriptscriptstyle.textstyle{font-size:2em}.katex .reset-scriptscriptstyle.scriptstyle{font-size:1.4em}.katex .reset-scriptscriptstyle.scriptscriptstyle{font-size:1em}.katex .style-wrap{position:relative}.katex .vlist{display:inline-block}.katex .vlist>span{display:block;height:0;position:relative}.katex .vlist>span>span{display:inline-block}.katex .vlist .baseline-fix{display:inline-table;table-layout:fixed}.katex .msupsub{text-align:left}.katex .mfrac>span>span{text-align:center}.katex .mfrac .frac-line{width:100%}.katex .mfrac .frac-line:before{border-bottom-style:solid;border-bottom-width:1px;content:"";display:block}.katex .mfrac .frac-line:after{border-bottom-style:solid;border-bottom-width:.04em;content:"";display:block;margin-top:-1px}.katex .mspace{display:inline-block}.katex .mspace.negativethinspace{margin-left:-.16667em}.katex .mspace.thinspace{width:.16667em}.katex .mspace.mediumspace{width:.22222em}.katex .mspace.thickspace{width:.27778em}.katex .mspace.enspace{width:.5em}.katex .mspace.quad{width:1em}.katex .mspace.qquad{width:2em}.katex .llap,.katex .rlap{width:0;position:relative}.katex .llap>.inner,.katex .rlap>.inner{position:absolute}.katex .llap>.fix,.katex .rlap>.fix{display:inline-block}.katex .llap>.inner{right:0}.katex .rlap>.inner{left:0}.katex .katex-logo .a{font-size:.75em;margin-left:-.32em;position:relative;top:-.2em}.katex .katex-logo .t{margin-left:-.23em}.katex .katex-logo .e{margin-left:-.1667em;position:relative;top:.2155em}.katex .katex-logo .x{margin-left:-.125em}.katex .rule{display:inline-block;border-style:solid;position:relative}.katex .overline .overline-line{width:100%}.katex .overline .overline-line:before{border-bottom-style:solid;border-bottom-width:1px;content:"";display:block}.katex .overline .overline-line:after{border-bottom-style:solid;border-bottom-width:.04em;content:"";display:block;margin-top:-1px}.katex .sqrt>.sqrt-sign{position:relative}.katex .sqrt .sqrt-line{width:100%}.katex .sqrt .sqrt-line:before{border-bottom-style:solid;border-bottom-width:1px;content:"";display:block}.katex .sqrt .sqrt-line:after{border-bottom-style:solid;border-bottom-width:.04em;content:"";display:block;margin-top:-1px}.katex .sqrt>.root{margin-left:.27777778em;margin-right:-.55555556em}.katex .fontsize-ensurer,.katex .sizing{display:inline-block}.katex .fontsize-ensurer.reset-size1.size1,.katex .sizing.reset-size1.size1{font-size:1em}.katex .fontsize-ensurer.reset-size1.size2,.katex .sizing.reset-size1.size2{font-size:1.4em}.katex .fontsize-ensurer.reset-size1.size3,.katex .sizing.reset-size1.size3{font-size:1.6em}.katex .fontsize-ensurer.reset-size1.size4,.katex .sizing.reset-size1.size4{font-size:1.8em}.katex .fontsize-ensurer.reset-size1.size5,.katex .sizing.reset-size1.size5{font-size:2em}.katex .fontsize-ensurer.reset-size1.size6,.katex .sizing.reset-size1.size6{font-size:2.4em}.katex .fontsize-ensurer.reset-size1.size7,.katex .sizing.reset-size1.size7{font-size:2.88em}.katex .fontsize-ensurer.reset-size1.size8,.katex .sizing.reset-size1.size8{font-size:3.46em}.katex .fontsize-ensurer.reset-size1.size9,.katex .sizing.reset-size1.size9{font-size:4.14em}.katex .fontsize-ensurer.reset-size1.size10,.katex .sizing.reset-size1.size10{font-size:4.98em}.katex .fontsize-ensurer.reset-size2.size1,.katex .sizing.reset-size2.size1{font-size:.71428571em}.katex .fontsize-ensurer.reset-size2.size2,.katex .sizing.reset-size2.size2{font-size:1em}.katex .fontsize-ensurer.reset-size2.size3,.katex .sizing.reset-size2.size3{font-size:1.14285714em}.katex .fontsize-ensurer.reset-size2.size4,.katex .sizing.reset-size2.size4{font-size:1.28571429em}.katex .fontsize-ensurer.reset-size2.size5,.katex .sizing.reset-size2.size5{font-size:1.42857143em}.katex .fontsize-ensurer.reset-size2.size6,.katex .sizing.reset-size2.size6{font-size:1.71428571em}.katex .fontsize-ensurer.reset-size2.size7,.katex .sizing.reset-size2.size7{font-size:2.05714286em}.katex .fontsize-ensurer.reset-size2.size8,.katex .sizing.reset-size2.size8{font-size:2.47142857em}.katex .fontsize-ensurer.reset-size2.size9,.katex .sizing.reset-size2.size9{font-size:2.95714286em}.katex .fontsize-ensurer.reset-size2.size10,.katex .sizing.reset-size2.size10{font-size:3.55714286em}.katex .fontsize-ensurer.reset-size3.size1,.katex .sizing.reset-size3.size1{font-size:.625em}.katex .fontsize-ensurer.reset-size3.size2,.katex .sizing.reset-size3.size2{font-size:.875em}.katex .fontsize-ensurer.reset-size3.size3,.katex .sizing.reset-size3.size3{font-size:1em}.katex .fontsize-ensurer.reset-size3.size4,.katex .sizing.reset-size3.size4{font-size:1.125em}.katex .fontsize-ensurer.reset-size3.size5,.katex .sizing.reset-size3.size5{font-size:1.25em}.katex .fontsize-ensurer.reset-size3.size6,.katex .sizing.reset-size3.size6{font-size:1.5em}.katex .fontsize-ensurer.reset-size3.size7,.katex .sizing.reset-size3.size7{font-size:1.8em}.katex .fontsize-ensurer.reset-size3.size8,.katex .sizing.reset-size3.size8{font-size:2.1625em}.katex .fontsize-ensurer.reset-size3.size9,.katex .sizing.reset-size3.size9{font-size:2.5875em}.katex .fontsize-ensurer.reset-size3.size10,.katex .sizing.reset-size3.size10{font-size:3.1125em}.katex .fontsize-ensurer.reset-size4.size1,.katex .sizing.reset-size4.size1{font-size:.55555556em}.katex .fontsize-ensurer.reset-size4.size2,.katex .sizing.reset-size4.size2{font-size:.77777778em}.katex .fontsize-ensurer.reset-size4.size3,.katex .sizing.reset-size4.size3{font-size:.88888889em}.katex .fontsize-ensurer.reset-size4.size4,.katex .sizing.reset-size4.size4{font-size:1em}.katex .fontsize-ensurer.reset-size4.size5,.katex .sizing.reset-size4.size5{font-size:1.11111111em}.katex .fontsize-ensurer.reset-size4.size6,.katex .sizing.reset-size4.size6{font-size:1.33333333em}.katex .fontsize-ensurer.reset-size4.size7,.katex .sizing.reset-size4.size7{font-size:1.6em}.katex .fontsize-ensurer.reset-size4.size8,.katex .sizing.reset-size4.size8{font-size:1.92222222em}.katex .fontsize-ensurer.reset-size4.size9,.katex .sizing.reset-size4.size9{font-size:2.3em}.katex .fontsize-ensurer.reset-size4.size10,.katex .sizing.reset-size4.size10{font-size:2.76666667em}.katex .fontsize-ensurer.reset-size5.size1,.katex .sizing.reset-size5.size1{font-size:.5em}.katex .fontsize-ensurer.reset-size5.size2,.katex .sizing.reset-size5.size2{font-size:.7em}.katex .fontsize-ensurer.reset-size5.size3,.katex .sizing.reset-size5.size3{font-size:.8em}.katex .fontsize-ensurer.reset-size5.size4,.katex .sizing.reset-size5.size4{font-size:.9em}.katex .fontsize-ensurer.reset-size5.size5,.katex .sizing.reset-size5.size5{font-size:1em}.katex .fontsize-ensurer.reset-size5.size6,.katex .sizing.reset-size5.size6{font-size:1.2em}.katex .fontsize-ensurer.reset-size5.size7,.katex .sizing.reset-size5.size7{font-size:1.44em}.katex .fontsize-ensurer.reset-size5.size8,.katex .sizing.reset-size5.size8{font-size:1.73em}.katex .fontsize-ensurer.reset-size5.size9,.katex .sizing.reset-size5.size9{font-size:2.07em}.katex .fontsize-ensurer.reset-size5.size10,.katex .sizing.reset-size5.size10{font-size:2.49em}.katex .fontsize-ensurer.reset-size6.size1,.katex .sizing.reset-size6.size1{font-size:.41666667em}.katex .fontsize-ensurer.reset-size6.size2,.katex .sizing.reset-size6.size2{font-size:.58333333em}.katex .fontsize-ensurer.reset-size6.size3,.katex .sizing.reset-size6.size3{font-size:.66666667em}.katex .fontsize-ensurer.reset-size6.size4,.katex .sizing.reset-size6.size4{font-size:.75em}.katex .fontsize-ensurer.reset-size6.size5,.katex .sizing.reset-size6.size5{font-size:.83333333em}.katex .fontsize-ensurer.reset-size6.size6,.katex .sizing.reset-size6.size6{font-size:1em}.katex .fontsize-ensurer.reset-size6.size7,.katex .sizing.reset-size6.size7{font-size:1.2em}.katex .fontsize-ensurer.reset-size6.size8,.katex .sizing.reset-size6.size8{font-size:1.44166667em}.katex .fontsize-ensurer.reset-size6.size9,.katex .sizing.reset-size6.size9{font-size:1.725em}.katex .fontsize-ensurer.reset-size6.size10,.katex .sizing.reset-size6.size10{font-size:2.075em}.katex .fontsize-ensurer.reset-size7.size1,.katex .sizing.reset-size7.size1{font-size:.34722222em}.katex .fontsize-ensurer.reset-size7.size2,.katex .sizing.reset-size7.size2{font-size:.48611111em}.katex .fontsize-ensurer.reset-size7.size3,.katex .sizing.reset-size7.size3{font-size:.55555556em}.katex .fontsize-ensurer.reset-size7.size4,.katex .sizing.reset-size7.size4{font-size:.625em}.katex .fontsize-ensurer.reset-size7.size5,.katex .sizing.reset-size7.size5{font-size:.69444444em}.katex .fontsize-ensurer.reset-size7.size6,.katex .sizing.reset-size7.size6{font-size:.83333333em}.katex .fontsize-ensurer.reset-size7.size7,.katex .sizing.reset-size7.size7{font-size:1em}.katex .fontsize-ensurer.reset-size7.size8,.katex .sizing.reset-size7.size8{font-size:1.20138889em}.katex .fontsize-ensurer.reset-size7.size9,.katex .sizing.reset-size7.size9{font-size:1.4375em}.katex .fontsize-ensurer.reset-size7.size10,.katex .sizing.reset-size7.size10{font-size:1.72916667em}.katex .fontsize-ensurer.reset-size8.size1,.katex .sizing.reset-size8.size1{font-size:.28901734em}.katex .fontsize-ensurer.reset-size8.size2,.katex .sizing.reset-size8.size2{font-size:.40462428em}.katex .fontsize-ensurer.reset-size8.size3,.katex .sizing.reset-size8.size3{font-size:.46242775em}.katex .fontsize-ensurer.reset-size8.size4,.katex .sizing.reset-size8.size4{font-size:.52023121em}.katex .fontsize-ensurer.reset-size8.size5,.katex .sizing.reset-size8.size5{font-size:.57803468em}.katex .fontsize-ensurer.reset-size8.size6,.katex .sizing.reset-size8.size6{font-size:.69364162em}.katex .fontsize-ensurer.reset-size8.size7,.katex .sizing.reset-size8.size7{font-size:.83236994em}.katex .fontsize-ensurer.reset-size8.size8,.katex .sizing.reset-size8.size8{font-size:1em}.katex .fontsize-ensurer.reset-size8.size9,.katex .sizing.reset-size8.size9{font-size:1.19653179em}.katex .fontsize-ensurer.reset-size8.size10,.katex .sizing.reset-size8.size10{font-size:1.43930636em}.katex .fontsize-ensurer.reset-size9.size1,.katex .sizing.reset-size9.size1{font-size:.24154589em}.katex .fontsize-ensurer.reset-size9.size2,.katex .sizing.reset-size9.size2{font-size:.33816425em}.katex .fontsize-ensurer.reset-size9.size3,.katex .sizing.reset-size9.size3{font-size:.38647343em}.katex .fontsize-ensurer.reset-size9.size4,.katex .sizing.reset-size9.size4{font-size:.43478261em}.katex .fontsize-ensurer.reset-size9.size5,.katex .sizing.reset-size9.size5{font-size:.48309179em}.katex .fontsize-ensurer.reset-size9.size6,.katex .sizing.reset-size9.size6{font-size:.57971014em}.katex .fontsize-ensurer.reset-size9.size7,.katex .sizing.reset-size9.size7{font-size:.69565217em}.katex .fontsize-ensurer.reset-size9.size8,.katex .sizing.reset-size9.size8{font-size:.83574879em}.katex .fontsize-ensurer.reset-size9.size9,.katex .sizing.reset-size9.size9{font-size:1em}.katex .fontsize-ensurer.reset-size9.size10,.katex .sizing.reset-size9.size10{font-size:1.20289855em}.katex .fontsize-ensurer.reset-size10.size1,.katex .sizing.reset-size10.size1{font-size:.20080321em}.katex .fontsize-ensurer.reset-size10.size2,.katex .sizing.reset-size10.size2{font-size:.2811245em}.katex .fontsize-ensurer.reset-size10.size3,.katex .sizing.reset-size10.size3{font-size:.32128514em}.katex .fontsize-ensurer.reset-size10.size4,.katex .sizing.reset-size10.size4{font-size:.36144578em}.katex .fontsize-ensurer.reset-size10.size5,.katex .sizing.reset-size10.size5{font-size:.40160643em}.katex .fontsize-ensurer.reset-size10.size6,.katex .sizing.reset-size10.size6{font-size:.48192771em}.katex .fontsize-ensurer.reset-size10.size7,.katex .sizing.reset-size10.size7{font-size:.57831325em}.katex .fontsize-ensurer.reset-size10.size8,.katex .sizing.reset-size10.size8{font-size:.69477912em}.katex .fontsize-ensurer.reset-size10.size9,.katex .sizing.reset-size10.size9{font-size:.8313253em}.katex .fontsize-ensurer.reset-size10.size10,.katex .sizing.reset-size10.size10{font-size:1em}.katex .delimsizing.size1{font-family:KaTeX_Size1}.katex .delimsizing.size2{font-family:KaTeX_Size2}.katex .delimsizing.size3{font-family:KaTeX_Size3}.katex .delimsizing.size4{font-family:KaTeX_Size4}.katex .delimsizing.mult .delim-size1>span{font-family:KaTeX_Size1}.katex .delimsizing.mult .delim-size4>span{font-family:KaTeX_Size4}.katex .nulldelimiter{display:inline-block;width:.12em}.katex .op-symbol{position:relative}.katex .op-symbol.small-op{font-family:KaTeX_Size1}.katex .op-symbol.large-op{font-family:KaTeX_Size2}.katex .accent>.vlist>span,.katex .op-limits>.vlist>span{text-align:center}.katex .accent .accent-body>span{width:0}.katex .accent .accent-body.accent-vec>span{position:relative;left:.326em}.katex .mtable .vertical-separator{display:inline-block;margin:0 -.025em;border-right:.05em solid #000}.katex .mtable .arraycolsep{display:inline-block}.katex .mtable .col-align-c>.vlist{text-align:center}.katex .mtable .col-align-l>.vlist{text-align:left}.katex .mtable .col-align-r>.vlist{text-align:right}
\ No newline at end of file
+@font-face{font-family:KaTeX_AMS;src:url(fonts/KaTeX_AMS-Regular.eot);src:url(fonts/KaTeX_AMS-Regular.eot#iefix) format('embedded-opentype'),url(fonts/KaTeX_AMS-Regular.woff2) format('woff2'),url(fonts/KaTeX_AMS-Regular.woff) format('woff'),url(fonts/KaTeX_AMS-Regular.ttf) format('ttf');font-weight:400;font-style:normal}@font-face{font-family:KaTeX_Caligraphic;src:url(fonts/KaTeX_Caligraphic-Bold.eot);src:url(fonts/KaTeX_Caligraphic-Bold.eot#iefix) format('embedded-opentype'),url(fonts/KaTeX_Caligraphic-Bold.woff2) format('woff2'),url(fonts/KaTeX_Caligraphic-Bold.woff) format('woff'),url(fonts/KaTeX_Caligraphic-Bold.ttf) format('ttf');font-weight:700;font-style:normal}@font-face{font-family:KaTeX_Caligraphic;src:url(fonts/KaTeX_Caligraphic-Regular.eot);src:url(fonts/KaTeX_Caligraphic-Regular.eot#iefix) format('embedded-opentype'),url(fonts/KaTeX_Caligraphic-Regular.woff2) format('woff2'),url(fonts/KaTeX_Caligraphic-Regular.woff) format('woff'),url(fonts/KaTeX_Caligraphic-Regular.ttf) format('ttf');font-weight:400;font-style:normal}@font-face{font-family:KaTeX_Fraktur;src:url(fonts/KaTeX_Fraktur-Bold.eot);src:url(fonts/KaTeX_Fraktur-Bold.eot#iefix) format('embedded-opentype'),url(fonts/KaTeX_Fraktur-Bold.woff2) format('woff2'),url(fonts/KaTeX_Fraktur-Bold.woff) format('woff'),url(fonts/KaTeX_Fraktur-Bold.ttf) format('ttf');font-weight:700;font-style:normal}@font-face{font-family:KaTeX_Fraktur;src:url(fonts/KaTeX_Fraktur-Regular.eot);src:url(fonts/KaTeX_Fraktur-Regular.eot#iefix) format('embedded-opentype'),url(fonts/KaTeX_Fraktur-Regular.woff2) format('woff2'),url(fonts/KaTeX_Fraktur-Regular.woff) format('woff'),url(fonts/KaTeX_Fraktur-Regular.ttf) format('ttf');font-weight:400;font-style:normal}@font-face{font-family:KaTeX_Main;src:url(fonts/KaTeX_Main-Bold.eot);src:url(fonts/KaTeX_Main-Bold.eot#iefix) format('embedded-opentype'),url(fonts/KaTeX_Main-Bold.woff2) format('woff2'),url(fonts/KaTeX_Main-Bold.woff) format('woff'),url(fonts/KaTeX_Main-Bold.ttf) format('ttf');font-weight:700;font-style:normal}@font-face{font-family:KaTeX_Main;src:url(fonts/KaTeX_Main-Italic.eot);src:url(fonts/KaTeX_Main-Italic.eot#iefix) format('embedded-opentype'),url(fonts/KaTeX_Main-Italic.woff2) format('woff2'),url(fonts/KaTeX_Main-Italic.woff) format('woff'),url(fonts/KaTeX_Main-Italic.ttf) format('ttf');font-weight:400;font-style:italic}@font-face{font-family:KaTeX_Main;src:url(fonts/KaTeX_Main-Regular.eot);src:url(fonts/KaTeX_Main-Regular.eot#iefix) format('embedded-opentype'),url(fonts/KaTeX_Main-Regular.woff2) format('woff2'),url(fonts/KaTeX_Main-Regular.woff) format('woff'),url(fonts/KaTeX_Main-Regular.ttf) format('ttf');font-weight:400;font-style:normal}@font-face{font-family:KaTeX_Math;src:url(fonts/KaTeX_Math-Italic.eot);src:url(fonts/KaTeX_Math-Italic.eot#iefix) format('embedded-opentype'),url(fonts/KaTeX_Math-Italic.woff2) format('woff2'),url(fonts/KaTeX_Math-Italic.woff) format('woff'),url(fonts/KaTeX_Math-Italic.ttf) format('ttf');font-weight:400;font-style:italic}@font-face{font-family:KaTeX_SansSerif;src:url(fonts/KaTeX_SansSerif-Regular.eot);src:url(fonts/KaTeX_SansSerif-Regular.eot#iefix) format('embedded-opentype'),url(fonts/KaTeX_SansSerif-Regular.woff2) format('woff2'),url(fonts/KaTeX_SansSerif-Regular.woff) format('woff'),url(fonts/KaTeX_SansSerif-Regular.ttf) format('ttf');font-weight:400;font-style:normal}@font-face{font-family:KaTeX_Script;src:url(fonts/KaTeX_Script-Regular.eot);src:url(fonts/KaTeX_Script-Regular.eot#iefix) format('embedded-opentype'),url(fonts/KaTeX_Script-Regular.woff2) format('woff2'),url(fonts/KaTeX_Script-Regular.woff) format('woff'),url(fonts/KaTeX_Script-Regular.ttf) format('ttf');font-weight:400;font-style:normal}@font-face{font-family:KaTeX_Size1;src:url(fonts/KaTeX_Size1-Regular.eot);src:url(fonts/KaTeX_Size1-Regular.eot#iefix) format('embedded-opentype'),url(fonts/KaTeX_Size1-Regular.woff2) format('woff2'),url(fonts/KaTeX_Size1-Regular.woff) format('woff'),url(fonts/KaTeX_Size1-Regular.ttf) format('ttf');font-weight:400;font-style:normal}@font-face{font-family:KaTeX_Size2;src:url(fonts/KaTeX_Size2-Regular.eot);src:url(fonts/KaTeX_Size2-Regular.eot#iefix) format('embedded-opentype'),url(fonts/KaTeX_Size2-Regular.woff2) format('woff2'),url(fonts/KaTeX_Size2-Regular.woff) format('woff'),url(fonts/KaTeX_Size2-Regular.ttf) format('ttf');font-weight:400;font-style:normal}@font-face{font-family:KaTeX_Size3;src:url(fonts/KaTeX_Size3-Regular.eot);src:url(fonts/KaTeX_Size3-Regular.eot#iefix) format('embedded-opentype'),url(fonts/KaTeX_Size3-Regular.woff2) format('woff2'),url(fonts/KaTeX_Size3-Regular.woff) format('woff'),url(fonts/KaTeX_Size3-Regular.ttf) format('ttf');font-weight:400;font-style:normal}@font-face{font-family:KaTeX_Size4;src:url(fonts/KaTeX_Size4-Regular.eot);src:url(fonts/KaTeX_Size4-Regular.eot#iefix) format('embedded-opentype'),url(fonts/KaTeX_Size4-Regular.woff2) format('woff2'),url(fonts/KaTeX_Size4-Regular.woff) format('woff'),url(fonts/KaTeX_Size4-Regular.ttf) format('ttf');font-weight:400;font-style:normal}@font-face{font-family:KaTeX_Typewriter;src:url(fonts/KaTeX_Typewriter-Regular.eot);src:url(fonts/KaTeX_Typewriter-Regular.eot#iefix) format('embedded-opentype'),url(fonts/KaTeX_Typewriter-Regular.woff2) format('woff2'),url(fonts/KaTeX_Typewriter-Regular.woff) format('woff'),url(fonts/KaTeX_Typewriter-Regular.ttf) format('ttf');font-weight:400;font-style:normal}.katex-display{display:block;margin:1em 0;text-align:center}.katex-display>.katex{display:inline-block;text-align:initial}.katex{font:400 1.21em KaTeX_Main;line-height:1.2;white-space:nowrap;text-indent:0}.katex .katex-html{display:inline-block}.katex .katex-mathml{position:absolute;clip:rect(1px,1px,1px,1px);padding:0;border:0;height:1px;width:1px;overflow:hidden}.katex .base,.katex .strut{display:inline-block}.katex .mathit{font-family:KaTeX_Math;font-style:italic}.katex .mathbf{font-family:KaTeX_Main;font-weight:700}.katex .amsrm,.katex .mathbb{font-family:KaTeX_AMS}.katex .mathcal{font-family:KaTeX_Caligraphic}.katex .mathfrak{font-family:KaTeX_Fraktur}.katex .mathtt{font-family:KaTeX_Typewriter}.katex .mathscr{font-family:KaTeX_Script}.katex .mathsf{font-family:KaTeX_SansSerif}.katex .mainit{font-family:KaTeX_Main;font-style:italic}.katex .textstyle>.mord+.mop{margin-left:.16667em}.katex .textstyle>.mord+.mbin{margin-left:.22222em}.katex .textstyle>.mord+.mrel{margin-left:.27778em}.katex .textstyle>.mop+.mop,.katex .textstyle>.mop+.mord,.katex .textstyle>.mord+.minner{margin-left:.16667em}.katex .textstyle>.mop+.mrel{margin-left:.27778em}.katex .textstyle>.mop+.minner{margin-left:.16667em}.katex .textstyle>.mbin+.minner,.katex .textstyle>.mbin+.mop,.katex .textstyle>.mbin+.mopen,.katex .textstyle>.mbin+.mord{margin-left:.22222em}.katex .textstyle>.mrel+.minner,.katex .textstyle>.mrel+.mop,.katex .textstyle>.mrel+.mopen,.katex .textstyle>.mrel+.mord{margin-left:.27778em}.katex .textstyle>.mclose+.mop{margin-left:.16667em}.katex .textstyle>.mclose+.mbin{margin-left:.22222em}.katex .textstyle>.mclose+.mrel{margin-left:.27778em}.katex .textstyle>.mclose+.minner,.katex .textstyle>.minner+.mop,.katex .textstyle>.minner+.mord,.katex .textstyle>.mpunct+.mclose,.katex .textstyle>.mpunct+.minner,.katex .textstyle>.mpunct+.mop,.katex .textstyle>.mpunct+.mopen,.katex .textstyle>.mpunct+.mord,.katex .textstyle>.mpunct+.mpunct,.katex .textstyle>.mpunct+.mrel{margin-left:.16667em}.katex .textstyle>.minner+.mbin{margin-left:.22222em}.katex .textstyle>.minner+.mrel{margin-left:.27778em}.katex .mclose+.mop,.katex .minner+.mop,.katex .mop+.mop,.katex .mop+.mord,.katex .mord+.mop,.katex .textstyle>.minner+.minner,.katex .textstyle>.minner+.mopen,.katex .textstyle>.minner+.mpunct{margin-left:.16667em}.katex .reset-textstyle.textstyle{font-size:1em}.katex .reset-textstyle.scriptstyle{font-size:.7em}.katex .reset-textstyle.scriptscriptstyle{font-size:.5em}.katex .reset-scriptstyle.textstyle{font-size:1.42857em}.katex .reset-scriptstyle.scriptstyle{font-size:1em}.katex .reset-scriptstyle.scriptscriptstyle{font-size:.71429em}.katex .reset-scriptscriptstyle.textstyle{font-size:2em}.katex .reset-scriptscriptstyle.scriptstyle{font-size:1.4em}.katex .reset-scriptscriptstyle.scriptscriptstyle{font-size:1em}.katex .style-wrap{position:relative}.katex .vlist{display:inline-block}.katex .vlist>span{display:block;height:0;position:relative}.katex .vlist>span>span{display:inline-block}.katex .vlist .baseline-fix{display:inline-table;table-layout:fixed}.katex .msupsub{text-align:left}.katex .mfrac>span>span{text-align:center}.katex .mfrac .frac-line{width:100%}.katex .mfrac .frac-line:before{border-bottom-style:solid;border-bottom-width:1px;content:"";display:block}.katex .mfrac .frac-line:after{border-bottom-style:solid;border-bottom-width:.04em;content:"";display:block;margin-top:-1px}.katex .mspace{display:inline-block}.katex .mspace.negativethinspace{margin-left:-.16667em}.katex .mspace.thinspace{width:.16667em}.katex .mspace.mediumspace{width:.22222em}.katex .mspace.thickspace{width:.27778em}.katex .mspace.enspace{width:.5em}.katex .mspace.quad{width:1em}.katex .mspace.qquad{width:2em}.katex .llap,.katex .rlap{width:0;position:relative}.katex .llap>.inner,.katex .rlap>.inner{position:absolute}.katex .llap>.fix,.katex .rlap>.fix{display:inline-block}.katex .llap>.inner{right:0}.katex .rlap>.inner{left:0}.katex .katex-logo .a{font-size:.75em;margin-left:-.32em;position:relative;top:-.2em}.katex .katex-logo .t{margin-left:-.23em}.katex .katex-logo .e{margin-left:-.1667em;position:relative;top:.2155em}.katex .katex-logo .x{margin-left:-.125em}.katex .rule{display:inline-block;border:0 solid;position:relative}.katex .overline .overline-line,.katex .underline .underline-line{width:100%}.katex .overline .overline-line:before,.katex .underline .underline-line:before{border-bottom-style:solid;border-bottom-width:1px;content:"";display:block}.katex .overline .overline-line:after,.katex .underline .underline-line:after{border-bottom-style:solid;border-bottom-width:.04em;content:"";display:block;margin-top:-1px}.katex .sqrt>.sqrt-sign{position:relative}.katex .sqrt .sqrt-line{width:100%}.katex .sqrt .sqrt-line:before{border-bottom-style:solid;border-bottom-width:1px;content:"";display:block}.katex .sqrt .sqrt-line:after{border-bottom-style:solid;border-bottom-width:.04em;content:"";display:block;margin-top:-1px}.katex .sqrt>.root{margin-left:.27777778em;margin-right:-.55555556em}.katex .fontsize-ensurer,.katex .sizing{display:inline-block}.katex .fontsize-ensurer.reset-size1.size1,.katex .sizing.reset-size1.size1{font-size:1em}.katex .fontsize-ensurer.reset-size1.size2,.katex .sizing.reset-size1.size2{font-size:1.4em}.katex .fontsize-ensurer.reset-size1.size3,.katex .sizing.reset-size1.size3{font-size:1.6em}.katex .fontsize-ensurer.reset-size1.size4,.katex .sizing.reset-size1.size4{font-size:1.8em}.katex .fontsize-ensurer.reset-size1.size5,.katex .sizing.reset-size1.size5{font-size:2em}.katex .fontsize-ensurer.reset-size1.size6,.katex .sizing.reset-size1.size6{font-size:2.4em}.katex .fontsize-ensurer.reset-size1.size7,.katex .sizing.reset-size1.size7{font-size:2.88em}.katex .fontsize-ensurer.reset-size1.size8,.katex .sizing.reset-size1.size8{font-size:3.46em}.katex .fontsize-ensurer.reset-size1.size9,.katex .sizing.reset-size1.size9{font-size:4.14em}.katex .fontsize-ensurer.reset-size1.size10,.katex .sizing.reset-size1.size10{font-size:4.98em}.katex .fontsize-ensurer.reset-size2.size1,.katex .sizing.reset-size2.size1{font-size:.71428571em}.katex .fontsize-ensurer.reset-size2.size2,.katex .sizing.reset-size2.size2{font-size:1em}.katex .fontsize-ensurer.reset-size2.size3,.katex .sizing.reset-size2.size3{font-size:1.14285714em}.katex .fontsize-ensurer.reset-size2.size4,.katex .sizing.reset-size2.size4{font-size:1.28571429em}.katex .fontsize-ensurer.reset-size2.size5,.katex .sizing.reset-size2.size5{font-size:1.42857143em}.katex .fontsize-ensurer.reset-size2.size6,.katex .sizing.reset-size2.size6{font-size:1.71428571em}.katex .fontsize-ensurer.reset-size2.size7,.katex .sizing.reset-size2.size7{font-size:2.05714286em}.katex .fontsize-ensurer.reset-size2.size8,.katex .sizing.reset-size2.size8{font-size:2.47142857em}.katex .fontsize-ensurer.reset-size2.size9,.katex .sizing.reset-size2.size9{font-size:2.95714286em}.katex .fontsize-ensurer.reset-size2.size10,.katex .sizing.reset-size2.size10{font-size:3.55714286em}.katex .fontsize-ensurer.reset-size3.size1,.katex .sizing.reset-size3.size1{font-size:.625em}.katex .fontsize-ensurer.reset-size3.size2,.katex .sizing.reset-size3.size2{font-size:.875em}.katex .fontsize-ensurer.reset-size3.size3,.katex .sizing.reset-size3.size3{font-size:1em}.katex .fontsize-ensurer.reset-size3.size4,.katex .sizing.reset-size3.size4{font-size:1.125em}.katex .fontsize-ensurer.reset-size3.size5,.katex .sizing.reset-size3.size5{font-size:1.25em}.katex .fontsize-ensurer.reset-size3.size6,.katex .sizing.reset-size3.size6{font-size:1.5em}.katex .fontsize-ensurer.reset-size3.size7,.katex .sizing.reset-size3.size7{font-size:1.8em}.katex .fontsize-ensurer.reset-size3.size8,.katex .sizing.reset-size3.size8{font-size:2.1625em}.katex .fontsize-ensurer.reset-size3.size9,.katex .sizing.reset-size3.size9{font-size:2.5875em}.katex .fontsize-ensurer.reset-size3.size10,.katex .sizing.reset-size3.size10{font-size:3.1125em}.katex .fontsize-ensurer.reset-size4.size1,.katex .sizing.reset-size4.size1{font-size:.55555556em}.katex .fontsize-ensurer.reset-size4.size2,.katex .sizing.reset-size4.size2{font-size:.77777778em}.katex .fontsize-ensurer.reset-size4.size3,.katex .sizing.reset-size4.size3{font-size:.88888889em}.katex .fontsize-ensurer.reset-size4.size4,.katex .sizing.reset-size4.size4{font-size:1em}.katex .fontsize-ensurer.reset-size4.size5,.katex .sizing.reset-size4.size5{font-size:1.11111111em}.katex .fontsize-ensurer.reset-size4.size6,.katex .sizing.reset-size4.size6{font-size:1.33333333em}.katex .fontsize-ensurer.reset-size4.size7,.katex .sizing.reset-size4.size7{font-size:1.6em}.katex .fontsize-ensurer.reset-size4.size8,.katex .sizing.reset-size4.size8{font-size:1.92222222em}.katex .fontsize-ensurer.reset-size4.size9,.katex .sizing.reset-size4.size9{font-size:2.3em}.katex .fontsize-ensurer.reset-size4.size10,.katex .sizing.reset-size4.size10{font-size:2.76666667em}.katex .fontsize-ensurer.reset-size5.size1,.katex .sizing.reset-size5.size1{font-size:.5em}.katex .fontsize-ensurer.reset-size5.size2,.katex .sizing.reset-size5.size2{font-size:.7em}.katex .fontsize-ensurer.reset-size5.size3,.katex .sizing.reset-size5.size3{font-size:.8em}.katex .fontsize-ensurer.reset-size5.size4,.katex .sizing.reset-size5.size4{font-size:.9em}.katex .fontsize-ensurer.reset-size5.size5,.katex .sizing.reset-size5.size5{font-size:1em}.katex .fontsize-ensurer.reset-size5.size6,.katex .sizing.reset-size5.size6{font-size:1.2em}.katex .fontsize-ensurer.reset-size5.size7,.katex .sizing.reset-size5.size7{font-size:1.44em}.katex .fontsize-ensurer.reset-size5.size8,.katex .sizing.reset-size5.size8{font-size:1.73em}.katex .fontsize-ensurer.reset-size5.size9,.katex .sizing.reset-size5.size9{font-size:2.07em}.katex .fontsize-ensurer.reset-size5.size10,.katex .sizing.reset-size5.size10{font-size:2.49em}.katex .fontsize-ensurer.reset-size6.size1,.katex .sizing.reset-size6.size1{font-size:.41666667em}.katex .fontsize-ensurer.reset-size6.size2,.katex .sizing.reset-size6.size2{font-size:.58333333em}.katex .fontsize-ensurer.reset-size6.size3,.katex .sizing.reset-size6.size3{font-size:.66666667em}.katex .fontsize-ensurer.reset-size6.size4,.katex .sizing.reset-size6.size4{font-size:.75em}.katex .fontsize-ensurer.reset-size6.size5,.katex .sizing.reset-size6.size5{font-size:.83333333em}.katex .fontsize-ensurer.reset-size6.size6,.katex .sizing.reset-size6.size6{font-size:1em}.katex .fontsize-ensurer.reset-size6.size7,.katex .sizing.reset-size6.size7{font-size:1.2em}.katex .fontsize-ensurer.reset-size6.size8,.katex .sizing.reset-size6.size8{font-size:1.44166667em}.katex .fontsize-ensurer.reset-size6.size9,.katex .sizing.reset-size6.size9{font-size:1.725em}.katex .fontsize-ensurer.reset-size6.size10,.katex .sizing.reset-size6.size10{font-size:2.075em}.katex .fontsize-ensurer.reset-size7.size1,.katex .sizing.reset-size7.size1{font-size:.34722222em}.katex .fontsize-ensurer.reset-size7.size2,.katex .sizing.reset-size7.size2{font-size:.48611111em}.katex .fontsize-ensurer.reset-size7.size3,.katex .sizing.reset-size7.size3{font-size:.55555556em}.katex .fontsize-ensurer.reset-size7.size4,.katex .sizing.reset-size7.size4{font-size:.625em}.katex .fontsize-ensurer.reset-size7.size5,.katex .sizing.reset-size7.size5{font-size:.69444444em}.katex .fontsize-ensurer.reset-size7.size6,.katex .sizing.reset-size7.size6{font-size:.83333333em}.katex .fontsize-ensurer.reset-size7.size7,.katex .sizing.reset-size7.size7{font-size:1em}.katex .fontsize-ensurer.reset-size7.size8,.katex .sizing.reset-size7.size8{font-size:1.20138889em}.katex .fontsize-ensurer.reset-size7.size9,.katex .sizing.reset-size7.size9{font-size:1.4375em}.katex .fontsize-ensurer.reset-size7.size10,.katex .sizing.reset-size7.size10{font-size:1.72916667em}.katex .fontsize-ensurer.reset-size8.size1,.katex .sizing.reset-size8.size1{font-size:.28901734em}.katex .fontsize-ensurer.reset-size8.size2,.katex .sizing.reset-size8.size2{font-size:.40462428em}.katex .fontsize-ensurer.reset-size8.size3,.katex .sizing.reset-size8.size3{font-size:.46242775em}.katex .fontsize-ensurer.reset-size8.size4,.katex .sizing.reset-size8.size4{font-size:.52023121em}.katex .fontsize-ensurer.reset-size8.size5,.katex .sizing.reset-size8.size5{font-size:.57803468em}.katex .fontsize-ensurer.reset-size8.size6,.katex .sizing.reset-size8.size6{font-size:.69364162em}.katex .fontsize-ensurer.reset-size8.size7,.katex .sizing.reset-size8.size7{font-size:.83236994em}.katex .fontsize-ensurer.reset-size8.size8,.katex .sizing.reset-size8.size8{font-size:1em}.katex .fontsize-ensurer.reset-size8.size9,.katex .sizing.reset-size8.size9{font-size:1.19653179em}.katex .fontsize-ensurer.reset-size8.size10,.katex .sizing.reset-size8.size10{font-size:1.43930636em}.katex .fontsize-ensurer.reset-size9.size1,.katex .sizing.reset-size9.size1{font-size:.24154589em}.katex .fontsize-ensurer.reset-size9.size2,.katex .sizing.reset-size9.size2{font-size:.33816425em}.katex .fontsize-ensurer.reset-size9.size3,.katex .sizing.reset-size9.size3{font-size:.38647343em}.katex .fontsize-ensurer.reset-size9.size4,.katex .sizing.reset-size9.size4{font-size:.43478261em}.katex .fontsize-ensurer.reset-size9.size5,.katex .sizing.reset-size9.size5{font-size:.48309179em}.katex .fontsize-ensurer.reset-size9.size6,.katex .sizing.reset-size9.size6{font-size:.57971014em}.katex .fontsize-ensurer.reset-size9.size7,.katex .sizing.reset-size9.size7{font-size:.69565217em}.katex .fontsize-ensurer.reset-size9.size8,.katex .sizing.reset-size9.size8{font-size:.83574879em}.katex .fontsize-ensurer.reset-size9.size9,.katex .sizing.reset-size9.size9{font-size:1em}.katex .fontsize-ensurer.reset-size9.size10,.katex .sizing.reset-size9.size10{font-size:1.20289855em}.katex .fontsize-ensurer.reset-size10.size1,.katex .sizing.reset-size10.size1{font-size:.20080321em}.katex .fontsize-ensurer.reset-size10.size2,.katex .sizing.reset-size10.size2{font-size:.2811245em}.katex .fontsize-ensurer.reset-size10.size3,.katex .sizing.reset-size10.size3{font-size:.32128514em}.katex .fontsize-ensurer.reset-size10.size4,.katex .sizing.reset-size10.size4{font-size:.36144578em}.katex .fontsize-ensurer.reset-size10.size5,.katex .sizing.reset-size10.size5{font-size:.40160643em}.katex .fontsize-ensurer.reset-size10.size6,.katex .sizing.reset-size10.size6{font-size:.48192771em}.katex .fontsize-ensurer.reset-size10.size7,.katex .sizing.reset-size10.size7{font-size:.57831325em}.katex .fontsize-ensurer.reset-size10.size8,.katex .sizing.reset-size10.size8{font-size:.69477912em}.katex .fontsize-ensurer.reset-size10.size9,.katex .sizing.reset-size10.size9{font-size:.8313253em}.katex .fontsize-ensurer.reset-size10.size10,.katex .sizing.reset-size10.size10{font-size:1em}.katex .delimsizing.size1{font-family:KaTeX_Size1}.katex .delimsizing.size2{font-family:KaTeX_Size2}.katex .delimsizing.size3{font-family:KaTeX_Size3}.katex .delimsizing.size4{font-family:KaTeX_Size4}.katex .delimsizing.mult .delim-size1>span{font-family:KaTeX_Size1}.katex .delimsizing.mult .delim-size4>span{font-family:KaTeX_Size4}.katex .nulldelimiter{display:inline-block;width:.12em}.katex .op-symbol{position:relative}.katex .op-symbol.small-op{font-family:KaTeX_Size1}.katex .op-symbol.large-op{font-family:KaTeX_Size2}.katex .accent>.vlist>span,.katex .op-limits>.vlist>span{text-align:center}.katex .accent .accent-body>span{width:0}.katex .accent .accent-body.accent-vec>span{position:relative;left:.326em}.katex .mtable .vertical-separator{display:inline-block;margin:0 -.025em;border-right:.05em solid #000}.katex .mtable .arraycolsep{display:inline-block}.katex .mtable .col-align-c>.vlist{text-align:center}.katex .mtable .col-align-l>.vlist{text-align:left}.katex .mtable .col-align-r>.vlist{text-align:right}
\ No newline at end of file
diff --git a/plugins/tiddlywiki/katex/files/katex.min.js b/plugins/tiddlywiki/katex/files/katex.min.js
index 863b1e8ab..67be5b71c 100644
--- a/plugins/tiddlywiki/katex/files/katex.min.js
+++ b/plugins/tiddlywiki/katex/files/katex.min.js
@@ -1,6 +1,5 @@
-(function(e){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=e()}else if(typeof define==="function"&&define.amd){define([],e)}else{var t;if(typeof window!=="undefined"){t=window}else if(typeof global!=="undefined"){t=global}else if(typeof self!=="undefined"){t=self}else{t=this}t.katex=e()}})(function(){var e,t,i;return function h(e,t,i){function a(l,s){if(!t[l]){if(!e[l]){var p=typeof require=="function"&&require;if(!s&&p)return p(l,!0);if(r)return r(l,!0);var c=new Error("Cannot find module '"+l+"'");throw c.code="MODULE_NOT_FOUND",c}var n=t[l]={exports:{}};e[l][0].call(n.exports,function(t){var i=e[l][1][t];return a(i?i:t)},n,n.exports,h,e,t,i)}return t[l].exports}var r=typeof require=="function"&&require;for(var l=0;l<i.length;l++)a(i[l]);return a}({1:[function(e,t,i){var h=e("./src/ParseError");var a=e("./src/Settings");var r=e("./src/buildTree");var l=e("./src/parseTree");var s=e("./src/utils");var p=function(e,t,i){s.clearNode(t);var h=new a(i);var p=l(e,h);var c=r(p,e,h).toNode();t.appendChild(c)};if(typeof document!=="undefined"){if(document.compatMode!=="CSS1Compat"){typeof console!=="undefined"&&console.warn("Warning: KaTeX doesn't work in quirks mode. Make sure your "+"website has a suitable doctype.");p=function(){throw new h("KaTeX doesn't work in quirks mode.")}}}var c=function(e,t){var i=new a(t);var h=l(e,i);return r(h,e,i).toMarkup()};var n=function(e,t){var i=new a(t);return l(e,i)};t.exports={render:p,renderToString:c,__parse:n,ParseError:h}},{"./src/ParseError":5,"./src/Settings":7,"./src/buildTree":12,"./src/parseTree":21,"./src/utils":23}],2:[function(e,t,i){"use strict";function h(e){if(!e.__matchAtRelocatable){var t=e.source+"|()";var i="g"+(e.ignoreCase?"i":"")+(e.multiline?"m":"")+(e.unicode?"u":"");e.__matchAtRelocatable=new RegExp(t,i)}return e.__matchAtRelocatable}function a(e,t,i){if(e.global||e.sticky){throw new Error("matchAt(...): Only non-global regexes are supported")}var a=h(e);a.lastIndex=i;var r=a.exec(t);if(r[r.length-1]==null){r.length=r.length-1;return r}else{return null}}t.exports=a},{}],3:[function(e,t,i){var h=e("match-at");var a=e("./ParseError");function r(e){this._input=e}function l(e,t,i){this.text=e;this.data=t;this.position=i}var s=[/[/|@.""`0-9a-zA-Z]/,/[*+-]/,/[=<>:]/,/[,;]/,/['\^_{}]/,/[(\[]/,/[)\]?!]/,/~/,/&/,/\\\\/];var p=[/[a-zA-Z0-9`!@*()-=+\[\]'";:?\/.,]/,/[{}]/,/~/,/&/,/\\\\/];var c=/\s*/;var n=/ +|\\  +/;var o=/\\(?:[a-zA-Z]+|.)/;r.prototype._innerLex=function(e,t,i){var r=this._input;var s;if(i){s=h(c,r,e)[0];e+=s.length}else{s=h(n,r,e);if(s!==null){return new l(" ",null,e+s[0].length)}}if(e===r.length){return new l("EOF",null,e)}var p;if(p=h(o,r,e)){return new l(p[0],null,e+p[0].length)}else{for(var g=0;g<t.length;g++){var d=t[g];if(p=h(d,r,e)){return new l(p[0],null,e+p[0].length)}}}throw new a("Unexpected character: '"+r[e]+"'",this,e)};var g=/#[a-z0-9]+|[a-z]+/i;r.prototype._innerLexColor=function(e){var t=this._input;var i=h(c,t,e)[0];e+=i.length;var r;if(r=h(g,t,e)){return new l(r[0],null,e+r[0].length)}else{throw new a("Invalid color",this,e)}};var d=/(-?)\s*(\d+(?:\.\d*)?|\.\d+)\s*([a-z]{2})/;r.prototype._innerLexSize=function(e){var t=this._input;var i=h(c,t,e)[0];e+=i.length;var r;if(r=h(d,t,e)){var s=r[3];if(s!=="em"&&s!=="ex"){throw new a("Invalid unit: '"+s+"'",this,e)}return new l(r[0],{number:+(r[1]+r[2]),unit:s},e+r[0].length)}throw new a("Invalid size",this,e)};r.prototype._innerLexWhitespace=function(e){var t=this._input;var i=h(c,t,e)[0];e+=i.length;return new l(i[0],null,e)};r.prototype.lex=function(e,t){if(t==="math"){return this._innerLex(e,s,true)}else if(t==="text"){return this._innerLex(e,p,false)}else if(t==="color"){return this._innerLexColor(e)}else if(t==="size"){return this._innerLexSize(e)}else if(t==="whitespace"){return this._innerLexWhitespace(e)}};t.exports=r},{"./ParseError":5,"match-at":2}],4:[function(e,t,i){function h(e){this.style=e.style;this.color=e.color;this.size=e.size;this.phantom=e.phantom;this.font=e.font;if(e.parentStyle===undefined){this.parentStyle=e.style}else{this.parentStyle=e.parentStyle}if(e.parentSize===undefined){this.parentSize=e.size}else{this.parentSize=e.parentSize}}h.prototype.extend=function(e){var t={style:this.style,size:this.size,color:this.color,parentStyle:this.style,parentSize:this.size,phantom:this.phantom,font:this.font};for(var i in e){if(e.hasOwnProperty(i)){t[i]=e[i]}}return new h(t)};h.prototype.withStyle=function(e){return this.extend({style:e})};h.prototype.withSize=function(e){return this.extend({size:e})};h.prototype.withColor=function(e){return this.extend({color:e})};h.prototype.withPhantom=function(){return this.extend({phantom:true})};h.prototype.withFont=function(e){return this.extend({font:e})};h.prototype.reset=function(){return this.extend({})};var a={"katex-blue":"#6495ed","katex-orange":"#ffa500","katex-pink":"#ff00af","katex-red":"#df0030","katex-green":"#28ae7b","katex-gray":"gray","katex-purple":"#9d38bd","katex-blueA":"#c7e9f1","katex-blueB":"#9cdceb","katex-blueC":"#58c4dd","katex-blueD":"#29abca","katex-blueE":"#1c758a","katex-tealA":"#acead7","katex-tealB":"#76ddc0","katex-tealC":"#5cd0b3","katex-tealD":"#55c1a7","katex-tealE":"#49a88f","katex-greenA":"#c9e2ae","katex-greenB":"#a6cf8c","katex-greenC":"#83c167","katex-greenD":"#77b05d","katex-greenE":"#699c52","katex-goldA":"#f7c797","katex-goldB":"#f9b775","katex-goldC":"#f0ac5f","katex-goldD":"#e1a158","katex-goldE":"#c78d46","katex-redA":"#f7a1a3","katex-redB":"#ff8080","katex-redC":"#fc6255","katex-redD":"#e65a4c","katex-redE":"#cf5044","katex-maroonA":"#ecabc1","katex-maroonB":"#ec92ab","katex-maroonC":"#c55f73","katex-maroonD":"#a24d61","katex-maroonE":"#94424f","katex-purpleA":"#caa3e8","katex-purpleB":"#b189c6","katex-purpleC":"#9a72ac","katex-purpleD":"#715582","katex-purpleE":"#644172","katex-mintA":"#f5f9e8","katex-mintB":"#edf2df","katex-mintC":"#e0e5cc","katex-grayA":"#fdfdfd","katex-grayB":"#f7f7f7","katex-grayC":"#eeeeee","katex-grayD":"#dddddd","katex-grayE":"#cccccc","katex-grayF":"#aaaaaa","katex-grayG":"#999999","katex-grayH":"#555555","katex-grayI":"#333333","katex-kaBlue":"#314453","katex-kaGreen":"#639b24"};h.prototype.getColor=function(){if(this.phantom){return"transparent"}else{return a[this.color]||this.color}};t.exports=h},{}],5:[function(e,t,i){function h(e,t,i){var a="KaTeX parse error: "+e;if(t!==undefined&&i!==undefined){a+=" at position "+i+": ";var r=t._input;r=r.slice(0,i)+"\u0332"+r.slice(i);var l=Math.max(0,i-15);var s=i+15;a+=r.slice(l,s)}var p=new Error(a);p.name="ParseError";p.__proto__=h.prototype;p.position=i;return p}h.prototype.__proto__=Error.prototype;t.exports=h},{}],6:[function(e,t,i){var h=e("./functions");var a=e("./environments");var r=e("./Lexer");var l=e("./symbols");var s=e("./utils");var p=e("./parseData");var c=e("./ParseError");function n(e,t){this.lexer=new r(e);this.settings=t}var o=p.ParseNode;var g=p.ParseResult;function d(e,t){this.result=e;this.isFunction=t}n.prototype.expect=function(e,t){if(e.text!==t){throw new c("Expected '"+t+"', got '"+e.text+"'",this.lexer,e.position)}};n.prototype.parse=function(e){var t=this.parseInput(0,"math");return t.result};n.prototype.parseInput=function(e,t){var i=this.parseExpression(e,t,false);this.expect(i.peek,"EOF");return i};var w=["}","\\end","\\right","&","\\\\","\\cr"];n.prototype.parseExpression=function(e,t,i,h){var a=[];var r=null;while(true){r=this.lexer.lex(e,t);if(w.indexOf(r.text)!==-1){break}if(h&&r.text===h){break}var l=this.parseAtom(e,t);if(!l){if(!this.settings.throwOnError&&r.text[0]==="\\"){var s=this.handleUnsupportedCmd(r.text,t);a.push(s);e=r.position;continue}break}if(i&&l.result.type==="infix"){break}a.push(l.result);e=l.position}var p=new g(this.handleInfixNodes(a,t),e);p.peek=r;return p};n.prototype.handleInfixNodes=function(e,t){var i=-1;var a;var r;for(var l=0;l<e.length;l++){var s=e[l];if(s.type==="infix"){if(i!==-1){throw new c("only one infix operator per group",this.lexer,-1)}i=l;r=s.value.replaceWith;a=h.funcs[r]}}if(i!==-1){var p,n;var g=e.slice(0,i);var d=e.slice(i+1);if(g.length===1&&g[0].type==="ordgroup"){p=g[0]}else{p=new o("ordgroup",g,t)}if(d.length===1&&d[0].type==="ordgroup"){n=d[0]}else{n=new o("ordgroup",d,t)}var w=a.handler(r,p,n);return[new o(w.type,w,t)]}else{return e}};var u=1;n.prototype.handleSupSubscript=function(e,t,i,a){var r=this.parseGroup(e,t);if(!r){var l=this.lexer.lex(e,t);if(!this.settings.throwOnError&&l.text[0]==="\\"){return new g(this.handleUnsupportedCmd(l.text,t),l.position)}else{throw new c("Expected group after '"+i+"'",this.lexer,e)}}else if(r.isFunction){var s=h.funcs[r.result.result].greediness;if(s>u){return this.parseFunction(e,t)}else{throw new c("Got function '"+r.result.result+"' with no arguments "+"as "+a,this.lexer,e)}}else{return r.result}};n.prototype.handleUnsupportedCmd=function(e,t){var i=[];for(var h=0;h<e.length;h++){i.push(new o("textord",e[h],"text"))}var a=new o("text",{body:i,type:"text"},t);var r=new o("color",{color:this.settings.errorColor,value:[a],type:"color"},t);return r};n.prototype.parseAtom=function(e,t){var i=this.parseImplicitGroup(e,t);if(t==="text"){return i}var h;if(!i){h=e;i=undefined}else{h=i.position}var a;var r;var l;while(true){var s=this.lexer.lex(h,t);if(s.text==="\\limits"||s.text==="\\nolimits"){if(!i||i.result.type!=="op"){throw new c("Limit controls must follow a math operator",this.lexer,h)}else{var p=s.text==="\\limits";i.result.value.limits=p;i.result.value.alwaysHandleSupSub=true;h=s.position}}else if(s.text==="^"){if(a){throw new c("Double superscript",this.lexer,h)}l=this.handleSupSubscript(s.position,t,s.text,"superscript");h=l.position;a=l.result}else if(s.text==="_"){if(r){throw new c("Double subscript",this.lexer,h)}l=this.handleSupSubscript(s.position,t,s.text,"subscript");h=l.position;r=l.result}else if(s.text==="'"){var n=new o("textord","\\prime",t);var d=[n];h=s.position;while((s=this.lexer.lex(h,t)).text==="'"){d.push(n);h=s.position}a=new o("ordgroup",d,t)}else{break}}if(a||r){return new g(new o("supsub",{base:i&&i.result,sup:a,sub:r},t),h)}else{return i}};var k=["\\tiny","\\scriptsize","\\footnotesize","\\small","\\normalsize","\\large","\\Large","\\LARGE","\\huge","\\Huge"];var m=["\\displaystyle","\\textstyle","\\scriptstyle","\\scriptscriptstyle"];n.prototype.parseImplicitGroup=function(e,t){var i=this.parseSymbol(e,t);if(!i||!i.result){return this.parseFunction(e,t)}var h=i.result.result;var r;if(h==="\\left"){var l=this.parseFunction(e,t);r=this.parseExpression(l.position,t,false);this.expect(r.peek,"\\right");var p=this.parseFunction(r.position,t);return new g(new o("leftright",{body:r.result,left:l.result.value.value,right:p.result.value.value},t),p.position)}else if(h==="\\begin"){var n=this.parseFunction(e,t);var d=n.result.value.name;if(!a.hasOwnProperty(d)){throw new c("No such environment: "+d,this.lexer,n.result.value.namepos)}var w=a[d];var u=[null,t,d];var f=this.parseArguments(n.position,t,"\\begin{"+d+"}",w,u);u[0]=f;var v=w.handler.apply(this,u);var y=this.lexer.lex(v.position,t);this.expect(y,"\\end");var x=this.parseFunction(v.position,t);if(x.result.value.name!==d){throw new c("Mismatch: \\begin{"+d+"} matched "+"by \\end{"+x.result.value.name+"}",this.lexer,x.namepos)}v.position=x.position;return v}else if(s.contains(k,h)){r=this.parseExpression(i.result.position,t,false);return new g(new o("sizing",{size:"size"+(s.indexOf(k,h)+1),value:r.result},t),r.position)}else if(s.contains(m,h)){r=this.parseExpression(i.result.position,t,true);return new g(new o("styling",{style:h.slice(1,h.length-5),value:r.result},t),r.position)}else{return this.parseFunction(e,t)}};n.prototype.parseFunction=function(e,t){var i=this.parseGroup(e,t);if(i){if(i.isFunction){var a=i.result.result;var r=h.funcs[a];if(t==="text"&&!r.allowedInText){throw new c("Can't use function '"+a+"' in text mode",this.lexer,i.position)}var l=[a];var s=this.parseArguments(i.result.position,t,a,r,l);var p=h.funcs[a].handler.apply(this,l);return new g(new o(p.type,p,t),s)}else{return i.result}}else{return null}};n.prototype.parseArguments=function(e,t,i,a,r){var l=a.numArgs+a.numOptionalArgs;if(l===0){return e}var s=e;var p=a.greediness;var n=[s];for(var o=0;o<l;o++){var w=a.argTypes&&a.argTypes[o];var u;if(o<a.numOptionalArgs){if(w){u=this.parseSpecialGroup(s,w,t,true)}else{u=this.parseOptionalGroup(s,t)}if(!u){r.push(null);n.push(s);continue}}else{if(w){u=this.parseSpecialGroup(s,w,t)}else{u=this.parseGroup(s,t)}if(!u){var k=this.lexer.lex(s,t);if(!this.settings.throwOnError&&k.text[0]==="\\"){u=new d(new g(this.handleUnsupportedCmd(k.text,t),k.position),false)}else{throw new c("Expected group after '"+i+"'",this.lexer,e)}}}var m;if(u.isFunction){var f=h.funcs[u.result.result].greediness;if(f>p){m=this.parseFunction(s,t)}else{throw new c("Got function '"+u.result.result+"' as "+"argument to '"+i+"'",this.lexer,u.result.position-1)}}else{m=u.result}r.push(m.result);n.push(m.position);s=m.position}r.push(n);return s};n.prototype.parseSpecialGroup=function(e,t,i,h){if(t==="original"){t=i}if(t==="color"||t==="size"){var a=this.lexer.lex(e,i);if(h&&a.text!=="["){return null}this.expect(a,h?"[":"{");var r=this.lexer.lex(a.position,t);var l;if(t==="color"){l=r.text}else{l=r.data}var s=this.lexer.lex(r.position,i);this.expect(s,h?"]":"}");return new d(new g(new o(t,l,i),s.position),false)}else if(t==="text"){var p=this.lexer.lex(e,"whitespace");e=p.position}if(h){return this.parseOptionalGroup(e,t)}else{return this.parseGroup(e,t)}};n.prototype.parseGroup=function(e,t){var i=this.lexer.lex(e,t);if(i.text==="{"){var h=this.parseExpression(i.position,t,false);var a=this.lexer.lex(h.position,t);this.expect(a,"}");return new d(new g(new o("ordgroup",h.result,t),a.position),false)}else{return this.parseSymbol(e,t)}};n.prototype.parseOptionalGroup=function(e,t){var i=this.lexer.lex(e,t);if(i.text==="["){var h=this.parseExpression(i.position,t,false,"]");var a=this.lexer.lex(h.position,t);this.expect(a,"]");return new d(new g(new o("ordgroup",h.result,t),a.position),false)}else{return null}};n.prototype.parseSymbol=function(e,t){var i=this.lexer.lex(e,t);if(h.funcs[i.text]){return new d(new g(i.text,i.position),true)}else if(l[t][i.text]){return new d(new g(new o(l[t][i.text].group,i.text,t),i.position),false)}else{return null}};n.prototype.ParseNode=o;t.exports=n},{"./Lexer":3,"./ParseError":5,"./environments":15,"./functions":18,"./parseData":20,"./symbols":22,"./utils":23}],7:[function(e,t,i){function h(e,t){return e===undefined?t:e}function a(e){e=e||{};this.displayMode=h(e.displayMode,false);this.throwOnError=h(e.throwOnError,true);this.errorColor=h(e.errorColor,"#cc0000")}t.exports=a},{}],8:[function(e,t,i){function h(e,t,i,h){this.id=e;this.size=t;this.cramped=h;this.sizeMultiplier=i}h.prototype.sup=function(){return w[u[this.id]]};h.prototype.sub=function(){return w[k[this.id]]};h.prototype.fracNum=function(){return w[m[this.id]]};h.prototype.fracDen=function(){return w[f[this.id]]};h.prototype.cramp=function(){return w[v[this.id]]};h.prototype.cls=function(){return g[this.size]+(this.cramped?" cramped":" uncramped")};h.prototype.reset=function(){return d[this.size]};var a=0;var r=1;var l=2;var s=3;var p=4;var c=5;var n=6;var o=7;var g=["displaystyle textstyle","textstyle","scriptstyle","scriptscriptstyle"];var d=["reset-textstyle","reset-textstyle","reset-scriptstyle","reset-scriptscriptstyle"];var w=[new h(a,0,1,false),new h(r,0,1,true),new h(l,1,1,false),new h(s,1,1,true),new h(p,2,.7,false),new h(c,2,.7,true),new h(n,3,.5,false),new h(o,3,.5,true)];var u=[p,c,p,c,n,o,n,o];var k=[c,c,c,c,o,o,o,o];var m=[l,s,p,c,n,o,n,o];var f=[s,s,c,c,o,o,o,o];var v=[r,r,s,s,c,c,o,o];t.exports={DISPLAY:w[a],TEXT:w[l],SCRIPT:w[p],SCRIPTSCRIPT:w[n]}},{}],9:[function(e,t,i){var h=e("./domTree");var a=e("./fontMetrics");var r=e("./symbols");var l=e("./utils");var s=["\\Gamma","\\Delta","\\Theta","\\Lambda","\\Xi","\\Pi","\\Sigma","\\Upsilon","\\Phi","\\Psi","\\Omega"];var p=["\u0131","\u0237"];var c=function(e,t,i,l,s){if(r[i][e]&&r[i][e].replace){e=r[i][e].replace}var p=a.getCharacterMetrics(e,t);var c;if(p){c=new h.symbolNode(e,p.height,p.depth,p.italic,p.skew,s)}else{typeof console!=="undefined"&&console.warn("No character metrics for '"+e+"' in style '"+t+"'");c=new h.symbolNode(e,0,0,0,0,s)}if(l){c.style.color=l}return c};var n=function(e,t,i,h){if(e==="\\"||r[t][e].font==="main"){return c(e,"Main-Regular",t,i,h)}else{return c(e,"AMS-Regular",t,i,h.concat(["amsrm"]))}};var o=function(e,t,i,h,a){if(a==="mathord"){return g(e,t,i,h)}else if(a==="textord"){return c(e,"Main-Regular",t,i,h.concat(["mathrm"]))}else{throw new Error("unexpected type: "+a+" in mathDefault")}};var g=function(e,t,i,h){if(/[0-9]/.test(e.charAt(0))||l.contains(p,e)||l.contains(s,e)){return c(e,"Main-Italic",t,i,h.concat(["mainit"]))}else{return c(e,"Math-Italic",t,i,h.concat(["mathit"]))}};var d=function(e,t,i){var h=e.mode;var s=e.value;if(r[h][s]&&r[h][s].replace){s=r[h][s].replace}var n=["mord"];var d=t.getColor();var w=t.font;if(w){if(w==="mathit"||l.contains(p,s)){return g(s,h,d,n)}else{var u=x[w].fontName;if(a.getCharacterMetrics(s,u)){return c(s,u,h,d,n.concat([w]))}else{return o(s,h,d,n,i)}}}else{return o(s,h,d,n,i)}};var w=function(e){var t=0;var i=0;var h=0;if(e.children){for(var a=0;a<e.children.length;a++){if(e.children[a].height>t){t=e.children[a].height}if(e.children[a].depth>i){i=e.children[a].depth}if(e.children[a].maxFontSize>h){h=e.children[a].maxFontSize}}}e.height=t;e.depth=i;e.maxFontSize=h};var u=function(e,t,i){var a=new h.span(e,t);w(a);if(i){a.style.color=i}return a};var k=function(e){var t=new h.documentFragment(e);w(t);return t};var m=function(e,t){var i=u([],[new h.symbolNode("\u200b")]);i.style.fontSize=t/e.style.sizeMultiplier+"em";var a=u(["fontsize-ensurer","reset-"+e.size,"size5"],[i]);return a};var f=function(e,t,i,a){var r;var l;var s;if(t==="individualShift"){var p=e;e=[p[0]];r=-p[0].shift-p[0].elem.depth;l=r;for(s=1;s<p.length;s++){var c=-p[s].shift-l-p[s].elem.depth;var n=c-(p[s-1].elem.height+p[s-1].elem.depth);l=l+c;e.push({type:"kern",size:n});e.push(p[s])}}else if(t==="top"){var o=i;for(s=0;s<e.length;s++){if(e[s].type==="kern"){o-=e[s].size}else{o-=e[s].elem.height+e[s].elem.depth}}r=o}else if(t==="bottom"){r=-i}else if(t==="shift"){r=-e[0].elem.depth-i}else if(t==="firstBaseline"){r=-e[0].elem.depth}else{r=0}var g=0;for(s=0;s<e.length;s++){if(e[s].type==="elem"){g=Math.max(g,e[s].elem.maxFontSize)}}var d=m(a,g);var w=[];l=r;for(s=0;s<e.length;s++){if(e[s].type==="kern"){l+=e[s].size}else{var k=e[s].elem;var f=-k.depth-l;l+=k.height+k.depth;var v=u([],[d,k]);v.height-=f;v.depth+=f;v.style.top=f+"em";w.push(v)}}var y=u(["baseline-fix"],[d,new h.symbolNode("\u200b")]);w.push(y);var x=u(["vlist"],w);x.height=Math.max(l,x.height);x.depth=Math.max(-r,x.depth);return x};var v={size1:.5,size2:.7,size3:.8,size4:.9,size5:1,size6:1.2,size7:1.44,size8:1.73,size9:2.07,size10:2.49};var y={"\\qquad":{size:"2em",className:"qquad"},"\\quad":{size:"1em",className:"quad"},"\\enspace":{size:"0.5em",className:"enspace"},"\\;":{size:"0.277778em",className:"thickspace"},"\\:":{size:"0.22222em",className:"mediumspace"},"\\,":{size:"0.16667em",className:"thinspace"},"\\!":{size:"-0.16667em",className:"negativethinspace"}};var x={mathbf:{variant:"bold",fontName:"Main-Bold"},mathrm:{variant:"normal",fontName:"Main-Regular"},mathbb:{variant:"double-struck",fontName:"AMS-Regular"},mathcal:{variant:"script",fontName:"Caligraphic-Regular"},mathfrak:{variant:"fraktur",fontName:"Fraktur-Regular"},mathscr:{variant:"script",fontName:"Script-Regular"},mathsf:{variant:"sans-serif",fontName:"SansSerif-Regular"},mathtt:{variant:"monospace",fontName:"Typewriter-Regular"}};t.exports={fontMap:x,makeSymbol:c,mathsym:n,makeSpan:u,makeFragment:k,makeVList:f,makeOrd:d,sizingMultiplier:v,spacingFunctions:y}},{"./domTree":14,"./fontMetrics":16,"./symbols":22,"./utils":23}],10:[function(e,t,i){var h=e("./ParseError");var a=e("./Style");var r=e("./buildCommon");var l=e("./delimiter");var s=e("./domTree");var p=e("./fontMetrics");var c=e("./utils");var n=r.makeSpan;var o=function(e,t,i){var h=[];for(var a=0;a<e.length;a++){var r=e[a];h.push(v(r,t,i));i=r}return h};var g={mathord:"mord",textord:"mord",bin:"mbin",rel:"mrel",text:"mord",open:"mopen",close:"mclose",inner:"minner",genfrac:"mord",array:"mord",spacing:"mord",punct:"mpunct",ordgroup:"mord",op:"mop",katex:"mord",overline:"mord",rule:"mord",leftright:"minner",sqrt:"mord",accent:"mord"};var d=function(e){if(e==null){return g.mathord}else if(e.type==="supsub"){return d(e.value.base)}else if(e.type==="llap"||e.type==="rlap"){return d(e.value)}else if(e.type==="color"){return d(e.value.value)}else if(e.type==="sizing"){return d(e.value.value)}else if(e.type==="styling"){return d(e.value.value)}else if(e.type==="delimsizing"){return g[e.value.delimType]}else{return g[e.type]}};var w=function(e,t){if(!e){return false}else if(e.type==="op"){return e.value.limits&&(t.style.size===a.DISPLAY.size||e.value.alwaysHandleSupSub)}else if(e.type==="accent"){return k(e.value.base)}else{return null}};var u=function(e){if(!e){return false}else if(e.type==="ordgroup"){if(e.value.length===1){return u(e.value[0])}else{return e}}else if(e.type==="color"){if(e.value.value.length===1){return u(e.value.value[0])}else{return e}}else{return e}};var k=function(e){var t=u(e);return t.type==="mathord"||t.type==="textord"||t.type==="bin"||t.type==="rel"||t.type==="inner"||t.type==="open"||t.type==="close"||t.type==="punct"};var m=function(e){return n(["sizing","reset-"+e.size,"size5",e.style.reset(),a.TEXT.cls(),"nulldelimiter"])};var f={mathord:function(e,t,i){return r.makeOrd(e,t,"mathord")},textord:function(e,t,i){return r.makeOrd(e,t,"textord")},bin:function(e,t,i){var h="mbin";var a=i;while(a&&a.type==="color"){var l=a.value.value;a=l[l.length-1]}if(!i||c.contains(["mbin","mopen","mrel","mop","mpunct"],d(a))){e.type="textord";h="mord"}return r.mathsym(e.value,e.mode,t.getColor(),[h])},rel:function(e,t,i){return r.mathsym(e.value,e.mode,t.getColor(),["mrel"])},open:function(e,t,i){return r.mathsym(e.value,e.mode,t.getColor(),["mopen"])},close:function(e,t,i){return r.mathsym(e.value,e.mode,t.getColor(),["mclose"])},inner:function(e,t,i){return r.mathsym(e.value,e.mode,t.getColor(),["minner"])},punct:function(e,t,i){return r.mathsym(e.value,e.mode,t.getColor(),["mpunct"])},ordgroup:function(e,t,i){return n(["mord",t.style.cls()],o(e.value,t.reset()))},text:function(e,t,i){return n(["text","mord",t.style.cls()],o(e.value.body,t.reset()))},color:function(e,t,i){var h=o(e.value.value,t.withColor(e.value.color),i);return new r.makeFragment(h)},supsub:function(e,t,i){if(w(e.value.base,t)){return f[e.value.base.type](e,t,i)}var h=v(e.value.base,t.reset());var l,c,o,g;if(e.value.sup){o=v(e.value.sup,t.withStyle(t.style.sup()));l=n([t.style.reset(),t.style.sup().cls()],[o])}if(e.value.sub){g=v(e.value.sub,t.withStyle(t.style.sub()));c=n([t.style.reset(),t.style.sub().cls()],[g])}var u,m;if(k(e.value.base)){u=0;m=0}else{u=h.height-p.metrics.supDrop;m=h.depth+p.metrics.subDrop}var y;if(t.style===a.DISPLAY){y=p.metrics.sup1}else if(t.style.cramped){y=p.metrics.sup3}else{y=p.metrics.sup2}var x=a.TEXT.sizeMultiplier*t.style.sizeMultiplier;var b=.5/p.metrics.ptPerEm/x+"em";var z;if(!e.value.sup){m=Math.max(m,p.metrics.sub1,g.height-.8*p.metrics.xHeight);z=r.makeVList([{type:"elem",elem:c}],"shift",m,t);z.children[0].style.marginRight=b;if(h instanceof s.symbolNode){z.children[0].style.marginLeft=-h.italic+"em"}}else if(!e.value.sub){u=Math.max(u,y,o.depth+.25*p.metrics.xHeight);z=r.makeVList([{type:"elem",elem:l}],"shift",-u,t);z.children[0].style.marginRight=b}else{u=Math.max(u,y,o.depth+.25*p.metrics.xHeight);m=Math.max(m,p.metrics.sub2);var S=p.metrics.defaultRuleThickness;if(u-o.depth-(g.height-m)<4*S){m=4*S-(u-o.depth)+g.height;var M=.8*p.metrics.xHeight-(u-o.depth);if(M>0){u+=M;m-=M}}z=r.makeVList([{type:"elem",elem:c,shift:m},{type:"elem",elem:l,shift:-u}],"individualShift",null,t);if(h instanceof s.symbolNode){z.children[0].style.marginLeft=-h.italic+"em"}z.children[0].style.marginRight=b;z.children[1].style.marginRight=b}return n([d(e.value.base)],[h,z])},genfrac:function(e,t,i){var h=t.style;if(e.value.size==="display"){h=a.DISPLAY}else if(e.value.size==="text"){h=a.TEXT}var s=h.fracNum();var c=h.fracDen();var o=v(e.value.numer,t.withStyle(s));var g=n([h.reset(),s.cls()],[o]);var d=v(e.value.denom,t.withStyle(c));var w=n([h.reset(),c.cls()],[d]);var u;if(e.value.hasBarLine){u=p.metrics.defaultRuleThickness/t.style.sizeMultiplier}else{u=0}var k;var f;var y;if(h.size===a.DISPLAY.size){k=p.metrics.num1;if(u>0){f=3*u}else{f=7*p.metrics.defaultRuleThickness}y=p.metrics.denom1}else{if(u>0){k=p.metrics.num2;f=u}else{k=p.metrics.num3;f=3*p.metrics.defaultRuleThickness}y=p.metrics.denom2}var x;if(u===0){var b=k-o.depth-(d.height-y);if(b<f){k+=.5*(f-b);y+=.5*(f-b)}x=r.makeVList([{type:"elem",elem:w,shift:y},{type:"elem",elem:g,shift:-k}],"individualShift",null,t)}else{var z=p.metrics.axisHeight;if(k-o.depth-(z+.5*u)<f){k+=f-(k-o.depth-(z+.5*u))}if(z-.5*u-(d.height-y)<f){y+=f-(z-.5*u-(d.height-y))}var S=n([t.style.reset(),a.TEXT.cls(),"frac-line"]);S.height=u;var M=-(z-.5*u);x=r.makeVList([{type:"elem",elem:w,shift:y},{type:"elem",elem:S,shift:M},{type:"elem",elem:g,shift:-k}],"individualShift",null,t)}x.height*=h.sizeMultiplier/t.style.sizeMultiplier;x.depth*=h.sizeMultiplier/t.style.sizeMultiplier;var q;if(h.size===a.DISPLAY.size){q=p.metrics.delim1}else{q=p.metrics.getDelim2(h)}var A,T;if(e.value.leftDelim==null){A=m(t)}else{A=l.customSizedDelim(e.value.leftDelim,q,true,t.withStyle(h),e.mode)}if(e.value.rightDelim==null){T=m(t)}else{T=l.customSizedDelim(e.value.rightDelim,q,true,t.withStyle(h),e.mode)}return n(["mord",t.style.reset(),h.cls()],[A,n(["mfrac"],[x]),T],t.getColor())},array:function(e,t,i){var a,l;var s=e.value.body.length;var o=0;var g=new Array(s);var d=1/p.metrics.ptPerEm;var w=5*d;var u=12*d;var k=c.deflt(e.value.arraystretch,1);var m=k*u;var f=.7*m;var y=.3*m;var x=0;for(a=0;a<e.value.body.length;++a){var b=e.value.body[a];var z=f;var S=y;if(o<b.length){o=b.length}var M=new Array(b.length);for(l=0;l<b.length;++l){var q=v(b[l],t);if(S<q.depth){S=q.depth}if(z<q.height){z=q.height}M[l]=q}var A=0;if(e.value.rowGaps[a]){A=e.value.rowGaps[a].value;switch(A.unit){case"em":A=A.number;break;case"ex":A=A.number*p.metrics.emPerEx;break;default:console.error("Can't handle unit "+A.unit);A=0}if(A>0){A+=y;if(S<A){S=A}A=0}}M.height=z;M.depth=S;x+=z;M.pos=x;x+=S+A;g[a]=M}var T=x/2+p.metrics.axisHeight;var N=e.value.cols||[];var C=[];var R;var E;for(l=0,E=0;l<o||E<N.length;++l,++E){var P=N[E]||{};var D=true;while(P.type==="separator"){if(!D){R=n(["arraycolsep"],[]);R.style.width=p.metrics.doubleRuleSep+"em";C.push(R)}if(P.separator==="|"){var L=n(["vertical-separator"],[]);L.style.height=x+"em";L.style.verticalAlign=-(x-T)+"em";C.push(L)}else{throw new h("Invalid separator type: "+P.separator)}E++;P=N[E]||{};D=false}if(l>=o){continue}var O;if(l>0||e.value.hskipBeforeAndAfter){O=c.deflt(P.pregap,w);if(O!==0){R=n(["arraycolsep"],[]);R.style.width=O+"em";C.push(R)}}var I=[];for(a=0;a<s;++a){var B=g[a];var F=B[l];if(!F){continue}var _=B.pos-T;F.depth=B.depth;F.height=B.height;I.push({type:"elem",elem:F,shift:_})}I=r.makeVList(I,"individualShift",null,t);I=n(["col-align-"+(P.align||"c")],[I]);C.push(I);if(l<o-1||e.value.hskipBeforeAndAfter){O=c.deflt(P.postgap,w);if(O!==0){R=n(["arraycolsep"],[]);R.style.width=O+"em";C.push(R)}}}g=n(["mtable"],C);return n(["mord"],[g],t.getColor())},spacing:function(e,t,i){if(e.value==="\\ "||e.value==="\\space"||e.value===" "||e.value==="~"){return n(["mord","mspace"],[r.mathsym(e.value,e.mode)])}else{return n(["mord","mspace",r.spacingFunctions[e.value].className])}},llap:function(e,t,i){var h=n(["inner"],[v(e.value.body,t.reset())]);var a=n(["fix"],[]);return n(["llap",t.style.cls()],[h,a])},rlap:function(e,t,i){var h=n(["inner"],[v(e.value.body,t.reset())]);var a=n(["fix"],[]);return n(["rlap",t.style.cls()],[h,a])},op:function(e,t,i){var h;var l;var s=false;if(e.type==="supsub"){h=e.value.sup;l=e.value.sub;e=e.value.base;s=true}var o=["\\smallint"];var g=false;if(t.style.size===a.DISPLAY.size&&e.value.symbol&&!c.contains(o,e.value.body)){g=true}var d;var w=0;var u=0;if(e.value.symbol){var k=g?"Size2-Regular":"Size1-Regular";d=r.makeSymbol(e.value.body,k,"math",t.getColor(),["op-symbol",g?"large-op":"small-op","mop"]);w=(d.height-d.depth)/2-p.metrics.axisHeight*t.style.sizeMultiplier;u=d.italic}else{var m=[];for(var f=1;f<e.value.body.length;f++){m.push(r.mathsym(e.value.body[f],e.mode))}d=n(["mop"],m,t.getColor())}if(s){d=n([],[d]);var y,x,b,z;if(h){var S=v(h,t.withStyle(t.style.sup()));y=n([t.style.reset(),t.style.sup().cls()],[S]);x=Math.max(p.metrics.bigOpSpacing1,p.metrics.bigOpSpacing3-S.depth)}if(l){var M=v(l,t.withStyle(t.style.sub()));b=n([t.style.reset(),t.style.sub().cls()],[M]);z=Math.max(p.metrics.bigOpSpacing2,p.metrics.bigOpSpacing4-M.height)}var q,A,T;if(!h){A=d.height-w;q=r.makeVList([{type:"kern",size:p.metrics.bigOpSpacing5},{type:"elem",elem:b},{type:"kern",size:z},{type:"elem",elem:d}],"top",A,t);q.children[0].style.marginLeft=-u+"em"}else if(!l){T=d.depth+w;q=r.makeVList([{type:"elem",elem:d},{type:"kern",size:x},{type:"elem",elem:y},{type:"kern",size:p.metrics.bigOpSpacing5}],"bottom",T,t);q.children[1].style.marginLeft=u+"em"}else if(!h&&!l){return d}else{T=p.metrics.bigOpSpacing5+b.height+b.depth+z+d.depth+w;q=r.makeVList([{type:"kern",size:p.metrics.bigOpSpacing5},{type:"elem",elem:b},{type:"kern",size:z},{type:"elem",elem:d},{type:"kern",size:x},{type:"elem",elem:y},{type:"kern",size:p.metrics.bigOpSpacing5}],"bottom",T,t);q.children[0].style.marginLeft=-u+"em";q.children[2].style.marginLeft=u+"em"}return n(["mop","op-limits"],[q])}else{if(e.value.symbol){d.style.top=w+"em"}return d}},katex:function(e,t,i){var h=n(["k"],[r.mathsym("K",e.mode)]);var a=n(["a"],[r.mathsym("A",e.mode)]);a.height=(a.height+.2)*.75;a.depth=(a.height-.2)*.75;var l=n(["t"],[r.mathsym("T",e.mode)]);var s=n(["e"],[r.mathsym("E",e.mode)]);s.height=s.height-.2155;s.depth=s.depth+.2155;var p=n(["x"],[r.mathsym("X",e.mode)]);return n(["katex-logo","mord"],[h,a,l,s,p],t.getColor())},overline:function(e,t,i){var h=v(e.value.body,t.withStyle(t.style.cramp()));var l=p.metrics.defaultRuleThickness/t.style.sizeMultiplier;var s=n([t.style.reset(),a.TEXT.cls(),"overline-line"]);s.height=l;s.maxFontSize=1;var c=r.makeVList([{type:"elem",elem:h},{type:"kern",size:3*l},{type:"elem",elem:s},{type:"kern",size:l}],"firstBaseline",null,t);return n(["overline","mord"],[c],t.getColor())},sqrt:function(e,t,i){var h=v(e.value.body,t.withStyle(t.style.cramp()));var s=p.metrics.defaultRuleThickness/t.style.sizeMultiplier;var c=n([t.style.reset(),a.TEXT.cls(),"sqrt-line"],[],t.getColor());c.height=s;c.maxFontSize=1;var o=s;if(t.style.id<a.TEXT.id){o=p.metrics.xHeight}var g=s+o/4;var d=(h.height+h.depth)*t.style.sizeMultiplier;var w=d+g+s;var u=n(["sqrt-sign"],[l.customSizedDelim("\\surd",w,false,t,e.mode)],t.getColor());var k=u.height+u.depth-s;if(k>h.height+h.depth+g){g=(g+k-h.height-h.depth)/2}var m=-(h.height+g+s)+u.height;u.style.top=m+"em";u.height-=m;u.depth+=m;var f;if(h.height===0&&h.depth===0){f=n()}else{f=r.makeVList([{type:"elem",elem:h},{type:"kern",size:g},{type:"elem",elem:c},{type:"kern",size:s}],"firstBaseline",null,t)}if(!e.value.index){return n(["sqrt","mord"],[u,f])}else{var y=v(e.value.index,t.withStyle(a.SCRIPTSCRIPT));var x=n([t.style.reset(),a.SCRIPTSCRIPT.cls()],[y]);var b=Math.max(u.height,f.height);var z=Math.max(u.depth,f.depth);var S=.6*(b-z);var M=r.makeVList([{type:"elem",elem:x}],"shift",-S,t);var q=n(["root"],[M]);return n(["sqrt","mord"],[q,u,f])}},sizing:function(e,t,i){var h=o(e.value.value,t.withSize(e.value.size),i);var a=n(["mord"],[n(["sizing","reset-"+t.size,e.value.size,t.style.cls()],h)]);var l=r.sizingMultiplier[e.value.size];a.maxFontSize=l*t.style.sizeMultiplier;
-return a},styling:function(e,t,i){var h={display:a.DISPLAY,text:a.TEXT,script:a.SCRIPT,scriptscript:a.SCRIPTSCRIPT};var r=h[e.value.style];var l=o(e.value.value,t.withStyle(r),i);return n([t.style.reset(),r.cls()],l)},font:function(e,t,i){var h=e.value.font;return v(e.value.body,t.withFont(h),i)},delimsizing:function(e,t,i){var h=e.value.value;if(h==="."){return n([g[e.value.delimType]])}return n([g[e.value.delimType]],[l.sizedDelim(h,e.value.size,t,e.mode)])},leftright:function(e,t,i){var h=o(e.value.body,t.reset());var a=0;var r=0;for(var s=0;s<h.length;s++){a=Math.max(h[s].height,a);r=Math.max(h[s].depth,r)}a*=t.style.sizeMultiplier;r*=t.style.sizeMultiplier;var p;if(e.value.left==="."){p=m(t)}else{p=l.leftRightDelim(e.value.left,a,r,t,e.mode)}h.unshift(p);var c;if(e.value.right==="."){c=m(t)}else{c=l.leftRightDelim(e.value.right,a,r,t,e.mode)}h.push(c);return n(["minner",t.style.cls()],h,t.getColor())},rule:function(e,t,i){var h=n(["mord","rule"],[],t.getColor());var a=0;if(e.value.shift){a=e.value.shift.number;if(e.value.shift.unit==="ex"){a*=p.metrics.xHeight}}var r=e.value.width.number;if(e.value.width.unit==="ex"){r*=p.metrics.xHeight}var l=e.value.height.number;if(e.value.height.unit==="ex"){l*=p.metrics.xHeight}a/=t.style.sizeMultiplier;r/=t.style.sizeMultiplier;l/=t.style.sizeMultiplier;h.style.borderRightWidth=r+"em";h.style.borderTopWidth=l+"em";h.style.bottom=a+"em";h.width=r;h.height=l+a;h.depth=-a;return h},accent:function(e,t,i){var h=e.value.base;var a;if(e.type==="supsub"){var l=e;e=l.value.base;h=e.value.base;l.value.base=h;a=v(l,t.reset(),i)}var s=v(h,t.withStyle(t.style.cramp()));var c;if(k(h)){var o=u(h);var g=v(o,t.withStyle(t.style.cramp()));c=g.skew}else{c=0}var d=Math.min(s.height,p.metrics.xHeight);var w=r.makeSymbol(e.value.accent,"Main-Regular","math",t.getColor());w.italic=0;var m=e.value.accent==="\\vec"?"accent-vec":null;var f=n(["accent-body",m],[n([],[w])]);f=r.makeVList([{type:"elem",elem:s},{type:"kern",size:-d},{type:"elem",elem:f}],"firstBaseline",null,t);f.children[1].style.marginLeft=2*c+"em";var y=n(["mord","accent"],[f]);if(a){a.children[0]=y;a.height=Math.max(y.height,a.height);a.classes[0]="mord";return a}else{return y}},phantom:function(e,t,i){var h=o(e.value.value,t.withPhantom(),i);return new r.makeFragment(h)}};var v=function(e,t,i){if(!e){return n()}if(f[e.type]){var a=f[e.type](e,t,i);var l;if(t.style!==t.parentStyle){l=t.style.sizeMultiplier/t.parentStyle.sizeMultiplier;a.height*=l;a.depth*=l}if(t.size!==t.parentSize){l=r.sizingMultiplier[t.size]/r.sizingMultiplier[t.parentSize];a.height*=l;a.depth*=l}return a}else{throw new h("Got group of unknown type: '"+e.type+"'")}};var y=function(e,t){e=JSON.parse(JSON.stringify(e));var i=o(e,t);var h=n(["base",t.style.cls()],i);var a=n(["strut"]);var r=n(["strut","bottom"]);a.style.height=h.height+"em";r.style.height=h.height+h.depth+"em";r.style.verticalAlign=-h.depth+"em";var l=n(["katex-html"],[a,r,h]);l.setAttribute("aria-hidden","true");return l};t.exports=y},{"./ParseError":5,"./Style":8,"./buildCommon":9,"./delimiter":13,"./domTree":14,"./fontMetrics":16,"./utils":23}],11:[function(e,t,i){var h=e("./buildCommon");var a=e("./fontMetrics");var r=e("./mathMLTree");var l=e("./ParseError");var s=e("./symbols");var p=e("./utils");var c=h.makeSpan;var n=h.fontMap;var o=function(e,t){if(s[t][e]&&s[t][e].replace){e=s[t][e].replace}return new r.TextNode(e)};var g=function(e,t){var i=t.font;if(!i){return null}var h=e.mode;if(i==="mathit"){return"italic"}var r=e.value;if(p.contains(["\\imath","\\jmath"],r)){return null}if(s[h][r]&&s[h][r].replace){r=s[h][r].replace}var l=n[i].fontName;if(a.getCharacterMetrics(r,l)){return n[t.font].variant}return null};var d={mathord:function(e,t){var i=new r.MathNode("mi",[o(e.value,e.mode)]);var h=g(e,t);if(h){i.setAttribute("mathvariant",h)}return i},textord:function(e,t){var i=o(e.value,e.mode);var h=g(e,t)||"normal";var a;if(/[0-9]/.test(e.value)){a=new r.MathNode("mn",[i]);if(t.font){a.setAttribute("mathvariant",h)}}else{a=new r.MathNode("mi",[i]);a.setAttribute("mathvariant",h)}return a},bin:function(e){var t=new r.MathNode("mo",[o(e.value,e.mode)]);return t},rel:function(e){var t=new r.MathNode("mo",[o(e.value,e.mode)]);return t},open:function(e){var t=new r.MathNode("mo",[o(e.value,e.mode)]);return t},close:function(e){var t=new r.MathNode("mo",[o(e.value,e.mode)]);return t},inner:function(e){var t=new r.MathNode("mo",[o(e.value,e.mode)]);return t},punct:function(e){var t=new r.MathNode("mo",[o(e.value,e.mode)]);t.setAttribute("separator","true");return t},ordgroup:function(e,t){var i=w(e.value,t);var h=new r.MathNode("mrow",i);return h},text:function(e,t){var i=w(e.value.body,t);var h=new r.MathNode("mtext",i);return h},color:function(e,t){var i=w(e.value.value,t);var h=new r.MathNode("mstyle",i);h.setAttribute("mathcolor",e.value.color);return h},supsub:function(e,t){var i=[u(e.value.base,t)];if(e.value.sub){i.push(u(e.value.sub,t))}if(e.value.sup){i.push(u(e.value.sup,t))}var h;if(!e.value.sub){h="msup"}else if(!e.value.sup){h="msub"}else{h="msubsup"}var a=new r.MathNode(h,i);return a},genfrac:function(e,t){var i=new r.MathNode("mfrac",[u(e.value.numer,t),u(e.value.denom,t)]);if(!e.value.hasBarLine){i.setAttribute("linethickness","0px")}if(e.value.leftDelim!=null||e.value.rightDelim!=null){var h=[];if(e.value.leftDelim!=null){var a=new r.MathNode("mo",[new r.TextNode(e.value.leftDelim)]);a.setAttribute("fence","true");h.push(a)}h.push(i);if(e.value.rightDelim!=null){var l=new r.MathNode("mo",[new r.TextNode(e.value.rightDelim)]);l.setAttribute("fence","true");h.push(l)}var s=new r.MathNode("mrow",h);return s}return i},array:function(e,t){return new r.MathNode("mtable",e.value.body.map(function(e){return new r.MathNode("mtr",e.map(function(e){return new r.MathNode("mtd",[u(e,t)])}))}))},sqrt:function(e,t){var i;if(e.value.index){i=new r.MathNode("mroot",[u(e.value.body,t),u(e.value.index,t)])}else{i=new r.MathNode("msqrt",[u(e.value.body,t)])}return i},leftright:function(e,t){var i=w(e.value.body,t);if(e.value.left!=="."){var h=new r.MathNode("mo",[o(e.value.left,e.mode)]);h.setAttribute("fence","true");i.unshift(h)}if(e.value.right!=="."){var a=new r.MathNode("mo",[o(e.value.right,e.mode)]);a.setAttribute("fence","true");i.push(a)}var l=new r.MathNode("mrow",i);return l},accent:function(e,t){var i=new r.MathNode("mo",[o(e.value.accent,e.mode)]);var h=new r.MathNode("mover",[u(e.value.base,t),i]);h.setAttribute("accent","true");return h},spacing:function(e){var t;if(e.value==="\\ "||e.value==="\\space"||e.value===" "||e.value==="~"){t=new r.MathNode("mtext",[new r.TextNode("\xa0")])}else{t=new r.MathNode("mspace");t.setAttribute("width",h.spacingFunctions[e.value].size)}return t},op:function(e){var t;if(e.value.symbol){t=new r.MathNode("mo",[o(e.value.body,e.mode)])}else{t=new r.MathNode("mi",[new r.TextNode(e.value.body.slice(1))])}return t},katex:function(e){var t=new r.MathNode("mtext",[new r.TextNode("KaTeX")]);return t},font:function(e,t){var i=e.value.font;return u(e.value.body,t.withFont(i))},delimsizing:function(e){var t=[];if(e.value.value!=="."){t.push(o(e.value.value,e.mode))}var i=new r.MathNode("mo",t);if(e.value.delimType==="open"||e.value.delimType==="close"){i.setAttribute("fence","true")}else{i.setAttribute("fence","false")}return i},styling:function(e,t){var i=w(e.value.value,t);var h=new r.MathNode("mstyle",i);var a={display:["0","true"],text:["0","false"],script:["1","false"],scriptscript:["2","false"]};var l=a[e.value.style];h.setAttribute("scriptlevel",l[0]);h.setAttribute("displaystyle",l[1]);return h},sizing:function(e,t){var i=w(e.value.value,t);var a=new r.MathNode("mstyle",i);a.setAttribute("mathsize",h.sizingMultiplier[e.value.size]+"em");return a},overline:function(e,t){var i=new r.MathNode("mo",[new r.TextNode("\u203e")]);i.setAttribute("stretchy","true");var h=new r.MathNode("mover",[u(e.value.body,t),i]);h.setAttribute("accent","true");return h},rule:function(e){var t=new r.MathNode("mrow");return t},llap:function(e,t){var i=new r.MathNode("mpadded",[u(e.value.body,t)]);i.setAttribute("lspace","-1width");i.setAttribute("width","0px");return i},rlap:function(e,t){var i=new r.MathNode("mpadded",[u(e.value.body,t)]);i.setAttribute("width","0px");return i},phantom:function(e,t,i){var h=w(e.value.value,t);return new r.MathNode("mphantom",h)}};var w=function(e,t){var i=[];for(var h=0;h<e.length;h++){var a=e[h];i.push(u(a,t))}return i};var u=function(e,t){if(!e){return new r.MathNode("mrow")}if(d[e.type]){return d[e.type](e,t)}else{throw new l("Got group of unknown type: '"+e.type+"'")}};var k=function(e,t,i){var h=w(e,i);var a=new r.MathNode("mrow",h);var l=new r.MathNode("annotation",[new r.TextNode(t)]);l.setAttribute("encoding","application/x-tex");var s=new r.MathNode("semantics",[a,l]);var p=new r.MathNode("math",[s]);return c(["katex-mathml"],[p])};t.exports=k},{"./ParseError":5,"./buildCommon":9,"./fontMetrics":16,"./mathMLTree":19,"./symbols":22,"./utils":23}],12:[function(e,t,i){var h=e("./buildHTML");var a=e("./buildMathML");var r=e("./buildCommon");var l=e("./Options");var s=e("./Settings");var p=e("./Style");var c=r.makeSpan;var n=function(e,t,i){i=i||new s({});var r=p.TEXT;if(i.displayMode){r=p.DISPLAY}var n=new l({style:r,size:"size5"});var o=a(e,t,n);var g=h(e,n);var d=c(["katex"],[o,g]);if(i.displayMode){return c(["katex-display"],[d])}else{return d}};t.exports=n},{"./Options":4,"./Settings":7,"./Style":8,"./buildCommon":9,"./buildHTML":10,"./buildMathML":11}],13:[function(e,t,i){var h=e("./ParseError");var a=e("./Style");var r=e("./buildCommon");var l=e("./fontMetrics");var s=e("./symbols");var p=e("./utils");var c=r.makeSpan;var n=function(e,t){if(s.math[e]&&s.math[e].replace){return l.getCharacterMetrics(s.math[e].replace,t)}else{return l.getCharacterMetrics(e,t)}};var o=function(e,t,i){return r.makeSymbol(e,"Size"+t+"-Regular",i)};var g=function(e,t,i){var h=c(["style-wrap",i.style.reset(),t.cls()],[e]);var a=t.sizeMultiplier/i.style.sizeMultiplier;h.height*=a;h.depth*=a;h.maxFontSize=t.sizeMultiplier;return h};var d=function(e,t,i,h,a){var s=r.makeSymbol(e,"Main-Regular",a);var p=g(s,t,h);if(i){var c=(1-h.style.sizeMultiplier/t.sizeMultiplier)*l.metrics.axisHeight;p.style.top=c+"em";p.height-=c;p.depth+=c}return p};var w=function(e,t,i,h,r){var s=o(e,t,r);var p=g(c(["delimsizing","size"+t],[s],h.getColor()),a.TEXT,h);if(i){var n=(1-h.style.sizeMultiplier)*l.metrics.axisHeight;p.style.top=n+"em";p.height-=n;p.depth+=n}return p};var u=function(e,t,i){var h;if(t==="Size1-Regular"){h="delim-size1"}else if(t==="Size4-Regular"){h="delim-size4"}var a=c(["delimsizinginner",h],[c([],[r.makeSymbol(e,t,i)])]);return{type:"elem",elem:a}};var k=function(e,t,i,h,s){var p,o,d,w;p=d=w=e;o=null;var k="Size1-Regular";if(e==="\\uparrow"){d=w="\u23d0"}else if(e==="\\Uparrow"){d=w="\u2016"}else if(e==="\\downarrow"){p=d="\u23d0"}else if(e==="\\Downarrow"){p=d="\u2016"}else if(e==="\\updownarrow"){p="\\uparrow";d="\u23d0";w="\\downarrow"}else if(e==="\\Updownarrow"){p="\\Uparrow";d="\u2016";w="\\Downarrow"}else if(e==="["||e==="\\lbrack"){p="\u23a1";d="\u23a2";w="\u23a3";k="Size4-Regular"}else if(e==="]"||e==="\\rbrack"){p="\u23a4";d="\u23a5";w="\u23a6";k="Size4-Regular"}else if(e==="\\lfloor"){d=p="\u23a2";w="\u23a3";k="Size4-Regular"}else if(e==="\\lceil"){p="\u23a1";d=w="\u23a2";k="Size4-Regular"}else if(e==="\\rfloor"){d=p="\u23a5";w="\u23a6";k="Size4-Regular"}else if(e==="\\rceil"){p="\u23a4";d=w="\u23a5";k="Size4-Regular"}else if(e==="("){p="\u239b";d="\u239c";w="\u239d";k="Size4-Regular"}else if(e===")"){p="\u239e";d="\u239f";w="\u23a0";k="Size4-Regular"}else if(e==="\\{"||e==="\\lbrace"){p="\u23a7";o="\u23a8";w="\u23a9";d="\u23aa";k="Size4-Regular"}else if(e==="\\}"||e==="\\rbrace"){p="\u23ab";o="\u23ac";w="\u23ad";d="\u23aa";k="Size4-Regular"}else if(e==="\\lgroup"){p="\u23a7";w="\u23a9";d="\u23aa";k="Size4-Regular"}else if(e==="\\rgroup"){p="\u23ab";w="\u23ad";d="\u23aa";k="Size4-Regular"}else if(e==="\\lmoustache"){p="\u23a7";w="\u23ad";d="\u23aa";k="Size4-Regular"}else if(e==="\\rmoustache"){p="\u23ab";w="\u23a9";d="\u23aa";k="Size4-Regular"}else if(e==="\\surd"){p="\ue001";w="\u23b7";d="\ue000";k="Size4-Regular"}var m=n(p,k);var f=m.height+m.depth;var v=n(d,k);var y=v.height+v.depth;var x=n(w,k);var b=x.height+x.depth;var z=0;var S=1;if(o!==null){var M=n(o,k);z=M.height+M.depth;S=2}var q=f+b+z;var A=Math.ceil((t-q)/(S*y));var T=q+A*S*y;var N=l.metrics.axisHeight;if(i){N*=h.style.sizeMultiplier}var C=T/2-N;var R=[];R.push(u(w,k,s));var E;if(o===null){for(E=0;E<A;E++){R.push(u(d,k,s))}}else{for(E=0;E<A;E++){R.push(u(d,k,s))}R.push(u(o,k,s));for(E=0;E<A;E++){R.push(u(d,k,s))}}R.push(u(p,k,s));var P=r.makeVList(R,"bottom",C,h);return g(c(["delimsizing","mult"],[P],h.getColor()),a.TEXT,h)};var m=["(",")","[","\\lbrack","]","\\rbrack","\\{","\\lbrace","\\}","\\rbrace","\\lfloor","\\rfloor","\\lceil","\\rceil","\\surd"];var f=["\\uparrow","\\downarrow","\\updownarrow","\\Uparrow","\\Downarrow","\\Updownarrow","|","\\|","\\vert","\\Vert","\\lvert","\\rvert","\\lVert","\\rVert","\\lgroup","\\rgroup","\\lmoustache","\\rmoustache"];var v=["<",">","\\langle","\\rangle","/","\\backslash"];var y=[0,1.2,1.8,2.4,3];var x=function(e,t,i,a){if(e==="<"){e="\\langle"}else if(e===">"){e="\\rangle"}if(p.contains(m,e)||p.contains(v,e)){return w(e,t,false,i,a)}else if(p.contains(f,e)){return k(e,y[t],false,i,a)}else{throw new h("Illegal delimiter: '"+e+"'")}};var b=[{type:"small",style:a.SCRIPTSCRIPT},{type:"small",style:a.SCRIPT},{type:"small",style:a.TEXT},{type:"large",size:1},{type:"large",size:2},{type:"large",size:3},{type:"large",size:4}];var z=[{type:"small",style:a.SCRIPTSCRIPT},{type:"small",style:a.SCRIPT},{type:"small",style:a.TEXT},{type:"stack"}];var S=[{type:"small",style:a.SCRIPTSCRIPT},{type:"small",style:a.SCRIPT},{type:"small",style:a.TEXT},{type:"large",size:1},{type:"large",size:2},{type:"large",size:3},{type:"large",size:4},{type:"stack"}];var M=function(e){if(e.type==="small"){return"Main-Regular"}else if(e.type==="large"){return"Size"+e.size+"-Regular"}else if(e.type==="stack"){return"Size4-Regular"}};var q=function(e,t,i,h){var a=Math.min(2,3-h.style.size);for(var r=a;r<i.length;r++){if(i[r].type==="stack"){break}var l=n(e,M(i[r]));var s=l.height+l.depth;if(i[r].type==="small"){s*=i[r].style.sizeMultiplier}if(s>t){return i[r]}}return i[i.length-1]};var A=function(e,t,i,h,a){if(e==="<"){e="\\langle"}else if(e===">"){e="\\rangle"}var r;if(p.contains(v,e)){r=b}else if(p.contains(m,e)){r=S}else{r=z}var l=q(e,t,r,h);if(l.type==="small"){return d(e,l.style,i,h,a)}else if(l.type==="large"){return w(e,l.size,i,h,a)}else if(l.type==="stack"){return k(e,t,i,h,a)}};var T=function(e,t,i,h,a){var r=l.metrics.axisHeight*h.style.sizeMultiplier;var s=901;var p=5/l.metrics.ptPerEm;var c=Math.max(t-r,i+r);var n=Math.max(c/500*s,2*c-p);return A(e,n,true,h,a)};t.exports={sizedDelim:x,customSizedDelim:A,leftRightDelim:T}},{"./ParseError":5,"./Style":8,"./buildCommon":9,"./fontMetrics":16,"./symbols":22,"./utils":23}],14:[function(e,t,i){var h=e("./utils");var a=function(e){e=e.slice();for(var t=e.length-1;t>=0;t--){if(!e[t]){e.splice(t,1)}}return e.join(" ")};function r(e,t,i,h,a,r){this.classes=e||[];this.children=t||[];this.height=i||0;this.depth=h||0;this.maxFontSize=a||0;this.style=r||{};this.attributes={}}r.prototype.setAttribute=function(e,t){this.attributes[e]=t};r.prototype.toNode=function(){var e=document.createElement("span");e.className=a(this.classes);for(var t in this.style){if(Object.prototype.hasOwnProperty.call(this.style,t)){e.style[t]=this.style[t]}}for(var i in this.attributes){if(Object.prototype.hasOwnProperty.call(this.attributes,i)){e.setAttribute(i,this.attributes[i])}}for(var h=0;h<this.children.length;h++){e.appendChild(this.children[h].toNode())}return e};r.prototype.toMarkup=function(){var e="<span";if(this.classes.length){e+=' class="';e+=h.escape(a(this.classes));e+='"'}var t="";for(var i in this.style){if(this.style.hasOwnProperty(i)){t+=h.hyphenate(i)+":"+this.style[i]+";"}}if(t){e+=' style="'+h.escape(t)+'"'}for(var r in this.attributes){if(Object.prototype.hasOwnProperty.call(this.attributes,r)){e+=" "+r+'="';e+=h.escape(this.attributes[r]);e+='"'}}e+=">";for(var l=0;l<this.children.length;l++){e+=this.children[l].toMarkup()}e+="</span>";return e};function l(e,t,i,h){this.children=e||[];this.height=t||0;this.depth=i||0;this.maxFontSize=h||0}l.prototype.toNode=function(){var e=document.createDocumentFragment();for(var t=0;t<this.children.length;t++){e.appendChild(this.children[t].toNode())}return e};l.prototype.toMarkup=function(){var e="";for(var t=0;t<this.children.length;t++){e+=this.children[t].toMarkup()}return e};function s(e,t,i,h,a,r,l){this.value=e||"";this.height=t||0;this.depth=i||0;this.italic=h||0;this.skew=a||0;this.classes=r||[];this.style=l||{};this.maxFontSize=0}s.prototype.toNode=function(){var e=document.createTextNode(this.value);var t=null;if(this.italic>0){t=document.createElement("span");t.style.marginRight=this.italic+"em"}if(this.classes.length>0){t=t||document.createElement("span");t.className=a(this.classes)}for(var i in this.style){if(this.style.hasOwnProperty(i)){t=t||document.createElement("span");t.style[i]=this.style[i]}}if(t){t.appendChild(e);return t}else{return e}};s.prototype.toMarkup=function(){var e=false;var t="<span";if(this.classes.length){e=true;t+=' class="';t+=h.escape(a(this.classes));t+='"'}var i="";if(this.italic>0){i+="margin-right:"+this.italic+"em;"}for(var r in this.style){if(this.style.hasOwnProperty(r)){i+=h.hyphenate(r)+":"+this.style[r]+";"}}if(i){e=true;t+=' style="'+h.escape(i)+'"'}var l=h.escape(this.value);if(e){t+=">";t+=l;t+="</span>";return t}else{return l}};t.exports={span:r,documentFragment:l,symbolNode:s}},{"./utils":23}],15:[function(e,t,i){var h=e("./fontMetrics");var a=e("./parseData");var r=e("./ParseError");var l=a.ParseNode;var s=a.ParseResult;function p(e,t,i,h){var a=[],p=[a],c=[];while(true){var n=e.parseExpression(t,i,false,null);a.push(new l("ordgroup",n.result,i));t=n.position;var o=n.peek.text;if(o==="&"){t=n.peek.position}else if(o==="\\end"){break}else if(o==="\\\\"||o==="\\cr"){var g=e.parseFunction(t,i);c.push(g.result.value.size);t=g.position;a=[];p.push(a)}else{throw new r("Expected & or \\\\ or \\end",e.lexer,n.peek.position)}}h.body=p;h.rowGaps=c;return new s(new l(h.type,h,i),t)}var c=[{names:["array"],numArgs:1,handler:function(e,t,i,h,a){var l=this;h=h.value.map?h.value:[h];var s=h.map(function(e){var t=e.value;if("lcr".indexOf(t)!==-1){return{type:"align",align:t}}else if(t==="|"){return{type:"separator",separator:"|"}}throw new r("Unknown column alignment: "+e.value,l.lexer,a[1])});var c={type:"array",cols:s,hskipBeforeAndAfter:true};c=p(l,e,t,c);return c}},{names:["matrix","pmatrix","bmatrix","Bmatrix","vmatrix","Vmatrix"],handler:function(e,t,i){var h={matrix:null,pmatrix:["(",")"],bmatrix:["[","]"],Bmatrix:["\\{","\\}"],vmatrix:["|","|"],Vmatrix:["\\Vert","\\Vert"]}[i];var a={type:"array",hskipBeforeAndAfter:false};a=p(this,e,t,a);if(h){a.result=new l("leftright",{body:[a.result],left:h[0],right:h[1]},t)}return a}},{names:["cases"],handler:function(e,t,i){var a={type:"array",arraystretch:1.2,cols:[{type:"align",align:"l",pregap:0,postgap:h.metrics.quad},{type:"align",align:"l",pregap:0,postgap:0}]};a=p(this,e,t,a);a.result=new l("leftright",{body:[a.result],left:"\\{",right:"."},t);return a}}];t.exports=function(){var e={};for(var t=0;t<c.length;++t){var i=c[t];i.greediness=1;i.allowedInText=!!i.allowedInText;i.numArgs=i.numArgs||0;i.numOptionalArgs=i.numOptionalArgs||0;for(var h=0;h<i.names.length;++h){e[i.names[h]]=i}}return e}()},{"./ParseError":5,"./fontMetrics":16,"./parseData":20}],16:[function(e,t,i){var h=e("./Style");var a=.025;var r=0;var l=0;var s=0;var p=.431;var c=1;var n=0;var o=.677;var g=.394;var d=.444;var w=.686;var u=.345;var k=.413;var m=.363;var f=.289;var v=.15;var y=.247;var x=.386;var b=.05;var z=2.39;var S=1.01;var M=.81;var q=.71;var A=.25;var T=0;var N=0;var C=0;var R=0;var E=.431;var P=1;var D=0;var L=.04;var O=.111;var I=.166;var B=.2;var F=.6;var _=.1;var V=10;var G=2/V;var H={xHeight:p,quad:c,num1:o,num2:g,num3:d,denom1:w,denom2:u,sup1:k,sup2:m,sup3:f,sub1:v,sub2:y,supDrop:x,subDrop:b,axisHeight:A,defaultRuleThickness:L,bigOpSpacing1:O,bigOpSpacing2:I,bigOpSpacing3:B,bigOpSpacing4:F,bigOpSpacing5:_,ptPerEm:V,emPerEx:p/c,doubleRuleSep:G,delim1:z,getDelim2:function(e){if(e.size===h.TEXT.size){return S}else if(e.size===h.SCRIPT.size){return M}else if(e.size===h.SCRIPTSCRIPT.size){return q}throw new Error("Unexpected style size: "+e.size)}};var X=e("./fontMetricsData");var U=function(e,t){return X[t][e.charCodeAt(0)]};t.exports={metrics:H,getCharacterMetrics:U}},{"./Style":8,"./fontMetricsData":17}],17:[function(e,t,i){t.exports={"AMS-Regular":{65:{depth:0,height:.68889,italic:0,skew:0},66:{depth:0,height:.68889,italic:0,skew:0},67:{depth:0,height:.68889,italic:0,skew:0},68:{depth:0,height:.68889,italic:0,skew:0},69:{depth:0,height:.68889,italic:0,skew:0},70:{depth:0,height:.68889,italic:0,skew:0},71:{depth:0,height:.68889,italic:0,skew:0},72:{depth:0,height:.68889,italic:0,skew:0},73:{depth:0,height:.68889,italic:0,skew:0},74:{depth:.16667,height:.68889,italic:0,skew:0},75:{depth:0,height:.68889,italic:0,skew:0},76:{depth:0,height:.68889,italic:0,skew:0},77:{depth:0,height:.68889,italic:0,skew:0},78:{depth:0,height:.68889,italic:0,skew:0},79:{depth:.16667,height:.68889,italic:0,skew:0},80:{depth:0,height:.68889,italic:0,skew:0},81:{depth:.16667,height:.68889,italic:0,skew:0},82:{depth:0,height:.68889,italic:0,skew:0},83:{depth:0,height:.68889,italic:0,skew:0},84:{depth:0,height:.68889,italic:0,skew:0},85:{depth:0,height:.68889,italic:0,skew:0},86:{depth:0,height:.68889,italic:0,skew:0},87:{depth:0,height:.68889,italic:0,skew:0},88:{depth:0,height:.68889,italic:0,skew:0},89:{depth:0,height:.68889,italic:0,skew:0},90:{depth:0,height:.68889,italic:0,skew:0},107:{depth:0,height:.68889,italic:0,skew:0},165:{depth:0,height:.675,italic:.025,skew:0},174:{depth:.15559,height:.69224,italic:0,skew:0},240:{depth:0,height:.68889,italic:0,skew:0},295:{depth:0,height:.68889,italic:0,skew:0},710:{depth:0,height:.825,italic:0,skew:0},732:{depth:0,height:.9,italic:0,skew:0},770:{depth:0,height:.825,italic:0,skew:0},771:{depth:0,height:.9,italic:0,skew:0},989:{depth:.08167,height:.58167,italic:0,skew:0},1008:{depth:0,height:.43056,italic:.04028,skew:0},8245:{depth:0,height:.54986,italic:0,skew:0},8463:{depth:0,height:.68889,italic:0,skew:0},8487:{depth:0,height:.68889,italic:0,skew:0},8498:{depth:0,height:.68889,italic:0,skew:0},8502:{depth:0,height:.68889,italic:0,skew:0},8503:{depth:0,height:.68889,italic:0,skew:0},8504:{depth:0,height:.68889,italic:0,skew:0},8513:{depth:0,height:.68889,italic:0,skew:0},8592:{depth:-.03598,height:.46402,italic:0,skew:0},8594:{depth:-.03598,height:.46402,italic:0,skew:0},8602:{depth:-.13313,height:.36687,italic:0,skew:0},8603:{depth:-.13313,height:.36687,italic:0,skew:0},8606:{depth:.01354,height:.52239,italic:0,skew:0},8608:{depth:.01354,height:.52239,italic:0,skew:0},8610:{depth:.01354,height:.52239,italic:0,skew:0},8611:{depth:.01354,height:.52239,italic:0,skew:0},8619:{depth:0,height:.54986,italic:0,skew:0},8620:{depth:0,height:.54986,italic:0,skew:0},8621:{depth:-.13313,height:.37788,italic:0,skew:0},8622:{depth:-.13313,height:.36687,italic:0,skew:0},8624:{depth:0,height:.69224,italic:0,skew:0},8625:{depth:0,height:.69224,italic:0,skew:0},8630:{depth:0,height:.43056,italic:0,skew:0},8631:{depth:0,height:.43056,italic:0,skew:0},8634:{depth:.08198,height:.58198,italic:0,skew:0},8635:{depth:.08198,height:.58198,italic:0,skew:0},8638:{depth:.19444,height:.69224,italic:0,skew:0},8639:{depth:.19444,height:.69224,italic:0,skew:0},8642:{depth:.19444,height:.69224,italic:0,skew:0},8643:{depth:.19444,height:.69224,italic:0,skew:0},8644:{depth:.1808,height:.675,italic:0,skew:0},8646:{depth:.1808,height:.675,italic:0,skew:0},8647:{depth:.1808,height:.675,italic:0,skew:0},8648:{depth:.19444,height:.69224,italic:0,skew:0},8649:{depth:.1808,height:.675,italic:0,skew:0},8650:{depth:.19444,height:.69224,italic:0,skew:0},8651:{depth:.01354,height:.52239,italic:0,skew:0},8652:{depth:.01354,height:.52239,italic:0,skew:0},8653:{depth:-.13313,height:.36687,italic:0,skew:0},8654:{depth:-.13313,height:.36687,italic:0,skew:0},8655:{depth:-.13313,height:.36687,italic:0,skew:0},8666:{depth:.13667,height:.63667,italic:0,skew:0},8667:{depth:.13667,height:.63667,italic:0,skew:0},8669:{depth:-.13313,height:.37788,italic:0,skew:0},8672:{depth:-.064,height:.437,italic:0,skew:0},8674:{depth:-.064,height:.437,italic:0,skew:0},8705:{depth:0,height:.825,italic:0,skew:0},8708:{depth:0,height:.68889,italic:0,skew:0},8709:{depth:.08167,height:.58167,italic:0,skew:0},8717:{depth:0,height:.43056,italic:0,skew:0},8722:{depth:-.03598,height:.46402,italic:0,skew:0},8724:{depth:.08198,height:.69224,italic:0,skew:0},8726:{depth:.08167,height:.58167,italic:0,skew:0},8733:{depth:0,height:.69224,italic:0,skew:0},8736:{depth:0,height:.69224,italic:0,skew:0},8737:{depth:0,height:.69224,italic:0,skew:0},8738:{depth:.03517,height:.52239,italic:0,skew:0},8739:{depth:.08167,height:.58167,italic:0,skew:0},8740:{depth:.25142,height:.74111,italic:0,skew:0},8741:{depth:.08167,height:.58167,italic:0,skew:0},8742:{depth:.25142,height:.74111,italic:0,skew:0},8756:{depth:0,height:.69224,italic:0,skew:0},8757:{depth:0,height:.69224,italic:0,skew:0},8764:{depth:-.13313,height:.36687,italic:0,skew:0},8765:{depth:-.13313,height:.37788,italic:0,skew:0},8769:{depth:-.13313,height:.36687,italic:0,skew:0},8770:{depth:-.03625,height:.46375,italic:0,skew:0},8774:{depth:.30274,height:.79383,italic:0,skew:0},8776:{depth:-.01688,height:.48312,italic:0,skew:0},8778:{depth:.08167,height:.58167,italic:0,skew:0},8782:{depth:.06062,height:.54986,italic:0,skew:0},8783:{depth:.06062,height:.54986,italic:0,skew:0},8785:{depth:.08198,height:.58198,italic:0,skew:0},8786:{depth:.08198,height:.58198,italic:0,skew:0},8787:{depth:.08198,height:.58198,italic:0,skew:0},8790:{depth:0,height:.69224,italic:0,skew:0},8791:{depth:.22958,height:.72958,italic:0,skew:0},8796:{depth:.08198,height:.91667,italic:0,skew:0},8806:{depth:.25583,height:.75583,italic:0,skew:0},8807:{depth:.25583,height:.75583,italic:0,skew:0},8808:{depth:.25142,height:.75726,italic:0,skew:0},8809:{depth:.25142,height:.75726,italic:0,skew:0},8812:{depth:.25583,height:.75583,italic:0,skew:0},8814:{depth:.20576,height:.70576,italic:0,skew:0},8815:{depth:.20576,height:.70576,italic:0,skew:0},8816:{depth:.30274,height:.79383,italic:0,skew:0},8817:{depth:.30274,height:.79383,italic:0,skew:0},8818:{depth:.22958,height:.72958,italic:0,skew:0},8819:{depth:.22958,height:.72958,italic:0,skew:0},8822:{depth:.1808,height:.675,italic:0,skew:0},8823:{depth:.1808,height:.675,italic:0,skew:0},8828:{depth:.13667,height:.63667,italic:0,skew:0},8829:{depth:.13667,height:.63667,italic:0,skew:0},8830:{depth:.22958,height:.72958,italic:0,skew:0},8831:{depth:.22958,height:.72958,italic:0,skew:0},8832:{depth:.20576,height:.70576,italic:0,skew:0},8833:{depth:.20576,height:.70576,italic:0,skew:0},8840:{depth:.30274,height:.79383,italic:0,skew:0},8841:{depth:.30274,height:.79383,italic:0,skew:0},8842:{depth:.13597,height:.63597,italic:0,skew:0},8843:{depth:.13597,height:.63597,italic:0,skew:0},8847:{depth:.03517,height:.54986,italic:0,skew:0},8848:{depth:.03517,height:.54986,italic:0,skew:0},8858:{depth:.08198,height:.58198,italic:0,skew:0},8859:{depth:.08198,height:.58198,italic:0,skew:0},8861:{depth:.08198,height:.58198,italic:0,skew:0},8862:{depth:0,height:.675,italic:0,skew:0},8863:{depth:0,height:.675,italic:0,skew:0},8864:{depth:0,height:.675,italic:0,skew:0},8865:{depth:0,height:.675,italic:0,skew:0},8872:{depth:0,height:.69224,italic:0,skew:0},8873:{depth:0,height:.69224,italic:0,skew:0},8874:{depth:0,height:.69224,italic:0,skew:0},8876:{depth:0,height:.68889,italic:0,skew:0},8877:{depth:0,height:.68889,italic:0,skew:0},8878:{depth:0,height:.68889,italic:0,skew:0},8879:{depth:0,height:.68889,italic:0,skew:0},8882:{depth:.03517,height:.54986,italic:0,skew:0},8883:{depth:.03517,height:.54986,italic:0,skew:0},8884:{depth:.13667,height:.63667,italic:0,skew:0},8885:{depth:.13667,height:.63667,italic:0,skew:0},8888:{depth:0,height:.54986,italic:0,skew:0},8890:{depth:.19444,height:.43056,italic:0,skew:0},8891:{depth:.19444,height:.69224,italic:0,skew:0},8892:{depth:.19444,height:.69224,italic:0,skew:0},8901:{depth:0,height:.54986,italic:0,skew:0},8903:{depth:.08167,height:.58167,italic:0,skew:0},8905:{depth:.08167,height:.58167,italic:0,skew:0},8906:{depth:.08167,height:.58167,italic:0,skew:0},8907:{depth:0,height:.69224,italic:0,skew:0},8908:{depth:0,height:.69224,italic:0,skew:0},8909:{depth:-.03598,height:.46402,italic:0,skew:0},8910:{depth:0,height:.54986,italic:0,skew:0},8911:{depth:0,height:.54986,italic:0,skew:0},8912:{depth:.03517,height:.54986,italic:0,skew:0},8913:{depth:.03517,height:.54986,italic:0,skew:0},8914:{depth:0,height:.54986,italic:0,skew:0},8915:{depth:0,height:.54986,italic:0,skew:0},8916:{depth:0,height:.69224,italic:0,skew:0},8918:{depth:.0391,height:.5391,italic:0,skew:0},8919:{depth:.0391,height:.5391,italic:0,skew:0},8920:{depth:.03517,height:.54986,italic:0,skew:0},8921:{depth:.03517,height:.54986,italic:0,skew:0},8922:{depth:.38569,height:.88569,italic:0,skew:0},8923:{depth:.38569,height:.88569,italic:0,skew:0},8926:{depth:.13667,height:.63667,italic:0,skew:0},8927:{depth:.13667,height:.63667,italic:0,skew:0},8928:{depth:.30274,height:.79383,italic:0,skew:0},8929:{depth:.30274,height:.79383,italic:0,skew:0},8934:{depth:.23222,height:.74111,italic:0,skew:0},8935:{depth:.23222,height:.74111,italic:0,skew:0},8936:{depth:.23222,height:.74111,italic:0,skew:0},8937:{depth:.23222,height:.74111,italic:0,skew:0},8938:{depth:.20576,height:.70576,italic:0,skew:0},8939:{depth:.20576,height:.70576,italic:0,skew:0},8940:{depth:.30274,height:.79383,italic:0,skew:0},8941:{depth:.30274,height:.79383,italic:0,skew:0},8994:{depth:.19444,height:.69224,italic:0,skew:0},8995:{depth:.19444,height:.69224,italic:0,skew:0},9416:{depth:.15559,height:.69224,italic:0,skew:0},9484:{depth:0,height:.69224,italic:0,skew:0},9488:{depth:0,height:.69224,italic:0,skew:0},9492:{depth:0,height:.37788,italic:0,skew:0},9496:{depth:0,height:.37788,italic:0,skew:0},9585:{depth:.19444,height:.68889,italic:0,skew:0},9586:{depth:.19444,height:.74111,italic:0,skew:0},9632:{depth:0,height:.675,italic:0,skew:0},9633:{depth:0,height:.675,italic:0,skew:0},9650:{depth:0,height:.54986,italic:0,skew:0},9651:{depth:0,height:.54986,italic:0,skew:0},9654:{depth:.03517,height:.54986,italic:0,skew:0},9660:{depth:0,height:.54986,italic:0,skew:0},9661:{depth:0,height:.54986,italic:0,skew:0},9664:{depth:.03517,height:.54986,italic:0,skew:0},9674:{depth:.11111,height:.69224,italic:0,skew:0},9733:{depth:.19444,height:.69224,italic:0,skew:0},10003:{depth:0,height:.69224,italic:0,skew:0},10016:{depth:0,height:.69224,italic:0,skew:0},10731:{depth:.11111,height:.69224,italic:0,skew:0},10846:{depth:.19444,height:.75583,italic:0,skew:0},10877:{depth:.13667,height:.63667,italic:0,skew:0},10878:{depth:.13667,height:.63667,italic:0,skew:0},10885:{depth:.25583,height:.75583,italic:0,skew:0},10886:{depth:.25583,height:.75583,italic:0,skew:0},10887:{depth:.13597,height:.63597,italic:0,skew:0},10888:{depth:.13597,height:.63597,italic:0,skew:0},10889:{depth:.26167,height:.75726,italic:0,skew:0},10890:{depth:.26167,height:.75726,italic:0,skew:0},10891:{depth:.48256,height:.98256,italic:0,skew:0},10892:{depth:.48256,height:.98256,italic:0,skew:0},10901:{depth:.13667,height:.63667,italic:0,skew:0},10902:{depth:.13667,height:.63667,italic:0,skew:0},10933:{depth:.25142,height:.75726,italic:0,skew:0},10934:{depth:.25142,height:.75726,italic:0,skew:0},10935:{depth:.26167,height:.75726,italic:0,skew:0},10936:{depth:.26167,height:.75726,italic:0,skew:0},10937:{depth:.26167,
-height:.75726,italic:0,skew:0},10938:{depth:.26167,height:.75726,italic:0,skew:0},10949:{depth:.25583,height:.75583,italic:0,skew:0},10950:{depth:.25583,height:.75583,italic:0,skew:0},10955:{depth:.28481,height:.79383,italic:0,skew:0},10956:{depth:.28481,height:.79383,italic:0,skew:0},57350:{depth:.08167,height:.58167,italic:0,skew:0},57351:{depth:.08167,height:.58167,italic:0,skew:0},57352:{depth:.08167,height:.58167,italic:0,skew:0},57353:{depth:0,height:.43056,italic:.04028,skew:0},57356:{depth:.25142,height:.75726,italic:0,skew:0},57357:{depth:.25142,height:.75726,italic:0,skew:0},57358:{depth:.41951,height:.91951,italic:0,skew:0},57359:{depth:.30274,height:.79383,italic:0,skew:0},57360:{depth:.30274,height:.79383,italic:0,skew:0},57361:{depth:.41951,height:.91951,italic:0,skew:0},57366:{depth:.25142,height:.75726,italic:0,skew:0},57367:{depth:.25142,height:.75726,italic:0,skew:0},57368:{depth:.25142,height:.75726,italic:0,skew:0},57369:{depth:.25142,height:.75726,italic:0,skew:0},57370:{depth:.13597,height:.63597,italic:0,skew:0},57371:{depth:.13597,height:.63597,italic:0,skew:0}},"Caligraphic-Regular":{48:{depth:0,height:.43056,italic:0,skew:0},49:{depth:0,height:.43056,italic:0,skew:0},50:{depth:0,height:.43056,italic:0,skew:0},51:{depth:.19444,height:.43056,italic:0,skew:0},52:{depth:.19444,height:.43056,italic:0,skew:0},53:{depth:.19444,height:.43056,italic:0,skew:0},54:{depth:0,height:.64444,italic:0,skew:0},55:{depth:.19444,height:.43056,italic:0,skew:0},56:{depth:0,height:.64444,italic:0,skew:0},57:{depth:.19444,height:.43056,italic:0,skew:0},65:{depth:0,height:.68333,italic:0,skew:.19445},66:{depth:0,height:.68333,italic:.03041,skew:.13889},67:{depth:0,height:.68333,italic:.05834,skew:.13889},68:{depth:0,height:.68333,italic:.02778,skew:.08334},69:{depth:0,height:.68333,italic:.08944,skew:.11111},70:{depth:0,height:.68333,italic:.09931,skew:.11111},71:{depth:.09722,height:.68333,italic:.0593,skew:.11111},72:{depth:0,height:.68333,italic:.00965,skew:.11111},73:{depth:0,height:.68333,italic:.07382,skew:0},74:{depth:.09722,height:.68333,italic:.18472,skew:.16667},75:{depth:0,height:.68333,italic:.01445,skew:.05556},76:{depth:0,height:.68333,italic:0,skew:.13889},77:{depth:0,height:.68333,italic:0,skew:.13889},78:{depth:0,height:.68333,italic:.14736,skew:.08334},79:{depth:0,height:.68333,italic:.02778,skew:.11111},80:{depth:0,height:.68333,italic:.08222,skew:.08334},81:{depth:.09722,height:.68333,italic:0,skew:.11111},82:{depth:0,height:.68333,italic:0,skew:.08334},83:{depth:0,height:.68333,italic:.075,skew:.13889},84:{depth:0,height:.68333,italic:.25417,skew:0},85:{depth:0,height:.68333,italic:.09931,skew:.08334},86:{depth:0,height:.68333,italic:.08222,skew:0},87:{depth:0,height:.68333,italic:.08222,skew:.08334},88:{depth:0,height:.68333,italic:.14643,skew:.13889},89:{depth:.09722,height:.68333,italic:.08222,skew:.08334},90:{depth:0,height:.68333,italic:.07944,skew:.13889}},"Fraktur-Regular":{33:{depth:0,height:.69141,italic:0,skew:0},34:{depth:0,height:.69141,italic:0,skew:0},38:{depth:0,height:.69141,italic:0,skew:0},39:{depth:0,height:.69141,italic:0,skew:0},40:{depth:.24982,height:.74947,italic:0,skew:0},41:{depth:.24982,height:.74947,italic:0,skew:0},42:{depth:0,height:.62119,italic:0,skew:0},43:{depth:.08319,height:.58283,italic:0,skew:0},44:{depth:0,height:.10803,italic:0,skew:0},45:{depth:.08319,height:.58283,italic:0,skew:0},46:{depth:0,height:.10803,italic:0,skew:0},47:{depth:.24982,height:.74947,italic:0,skew:0},48:{depth:0,height:.47534,italic:0,skew:0},49:{depth:0,height:.47534,italic:0,skew:0},50:{depth:0,height:.47534,italic:0,skew:0},51:{depth:.18906,height:.47534,italic:0,skew:0},52:{depth:.18906,height:.47534,italic:0,skew:0},53:{depth:.18906,height:.47534,italic:0,skew:0},54:{depth:0,height:.69141,italic:0,skew:0},55:{depth:.18906,height:.47534,italic:0,skew:0},56:{depth:0,height:.69141,italic:0,skew:0},57:{depth:.18906,height:.47534,italic:0,skew:0},58:{depth:0,height:.47534,italic:0,skew:0},59:{depth:.12604,height:.47534,italic:0,skew:0},61:{depth:-.13099,height:.36866,italic:0,skew:0},63:{depth:0,height:.69141,italic:0,skew:0},65:{depth:0,height:.69141,italic:0,skew:0},66:{depth:0,height:.69141,italic:0,skew:0},67:{depth:0,height:.69141,italic:0,skew:0},68:{depth:0,height:.69141,italic:0,skew:0},69:{depth:0,height:.69141,italic:0,skew:0},70:{depth:.12604,height:.69141,italic:0,skew:0},71:{depth:0,height:.69141,italic:0,skew:0},72:{depth:.06302,height:.69141,italic:0,skew:0},73:{depth:0,height:.69141,italic:0,skew:0},74:{depth:.12604,height:.69141,italic:0,skew:0},75:{depth:0,height:.69141,italic:0,skew:0},76:{depth:0,height:.69141,italic:0,skew:0},77:{depth:0,height:.69141,italic:0,skew:0},78:{depth:0,height:.69141,italic:0,skew:0},79:{depth:0,height:.69141,italic:0,skew:0},80:{depth:.18906,height:.69141,italic:0,skew:0},81:{depth:.03781,height:.69141,italic:0,skew:0},82:{depth:0,height:.69141,italic:0,skew:0},83:{depth:0,height:.69141,italic:0,skew:0},84:{depth:0,height:.69141,italic:0,skew:0},85:{depth:0,height:.69141,italic:0,skew:0},86:{depth:0,height:.69141,italic:0,skew:0},87:{depth:0,height:.69141,italic:0,skew:0},88:{depth:0,height:.69141,italic:0,skew:0},89:{depth:.18906,height:.69141,italic:0,skew:0},90:{depth:.12604,height:.69141,italic:0,skew:0},91:{depth:.24982,height:.74947,italic:0,skew:0},93:{depth:.24982,height:.74947,italic:0,skew:0},94:{depth:0,height:.69141,italic:0,skew:0},97:{depth:0,height:.47534,italic:0,skew:0},98:{depth:0,height:.69141,italic:0,skew:0},99:{depth:0,height:.47534,italic:0,skew:0},100:{depth:0,height:.62119,italic:0,skew:0},101:{depth:0,height:.47534,italic:0,skew:0},102:{depth:.18906,height:.69141,italic:0,skew:0},103:{depth:.18906,height:.47534,italic:0,skew:0},104:{depth:.18906,height:.69141,italic:0,skew:0},105:{depth:0,height:.69141,italic:0,skew:0},106:{depth:0,height:.69141,italic:0,skew:0},107:{depth:0,height:.69141,italic:0,skew:0},108:{depth:0,height:.69141,italic:0,skew:0},109:{depth:0,height:.47534,italic:0,skew:0},110:{depth:0,height:.47534,italic:0,skew:0},111:{depth:0,height:.47534,italic:0,skew:0},112:{depth:.18906,height:.52396,italic:0,skew:0},113:{depth:.18906,height:.47534,italic:0,skew:0},114:{depth:0,height:.47534,italic:0,skew:0},115:{depth:0,height:.47534,italic:0,skew:0},116:{depth:0,height:.62119,italic:0,skew:0},117:{depth:0,height:.47534,italic:0,skew:0},118:{depth:0,height:.52396,italic:0,skew:0},119:{depth:0,height:.52396,italic:0,skew:0},120:{depth:.18906,height:.47534,italic:0,skew:0},121:{depth:.18906,height:.47534,italic:0,skew:0},122:{depth:.18906,height:.47534,italic:0,skew:0},8216:{depth:0,height:.69141,italic:0,skew:0},8217:{depth:0,height:.69141,italic:0,skew:0},58112:{depth:0,height:.62119,italic:0,skew:0},58113:{depth:0,height:.62119,italic:0,skew:0},58114:{depth:.18906,height:.69141,italic:0,skew:0},58115:{depth:.18906,height:.69141,italic:0,skew:0},58116:{depth:.18906,height:.47534,italic:0,skew:0},58117:{depth:0,height:.69141,italic:0,skew:0},58118:{depth:0,height:.62119,italic:0,skew:0},58119:{depth:0,height:.47534,italic:0,skew:0}},"Main-Bold":{33:{depth:0,height:.69444,italic:0,skew:0},34:{depth:0,height:.69444,italic:0,skew:0},35:{depth:.19444,height:.69444,italic:0,skew:0},36:{depth:.05556,height:.75,italic:0,skew:0},37:{depth:.05556,height:.75,italic:0,skew:0},38:{depth:0,height:.69444,italic:0,skew:0},39:{depth:0,height:.69444,italic:0,skew:0},40:{depth:.25,height:.75,italic:0,skew:0},41:{depth:.25,height:.75,italic:0,skew:0},42:{depth:0,height:.75,italic:0,skew:0},43:{depth:.13333,height:.63333,italic:0,skew:0},44:{depth:.19444,height:.15556,italic:0,skew:0},45:{depth:0,height:.44444,italic:0,skew:0},46:{depth:0,height:.15556,italic:0,skew:0},47:{depth:.25,height:.75,italic:0,skew:0},48:{depth:0,height:.64444,italic:0,skew:0},49:{depth:0,height:.64444,italic:0,skew:0},50:{depth:0,height:.64444,italic:0,skew:0},51:{depth:0,height:.64444,italic:0,skew:0},52:{depth:0,height:.64444,italic:0,skew:0},53:{depth:0,height:.64444,italic:0,skew:0},54:{depth:0,height:.64444,italic:0,skew:0},55:{depth:0,height:.64444,italic:0,skew:0},56:{depth:0,height:.64444,italic:0,skew:0},57:{depth:0,height:.64444,italic:0,skew:0},58:{depth:0,height:.44444,italic:0,skew:0},59:{depth:.19444,height:.44444,italic:0,skew:0},60:{depth:.08556,height:.58556,italic:0,skew:0},61:{depth:-.10889,height:.39111,italic:0,skew:0},62:{depth:.08556,height:.58556,italic:0,skew:0},63:{depth:0,height:.69444,italic:0,skew:0},64:{depth:0,height:.69444,italic:0,skew:0},65:{depth:0,height:.68611,italic:0,skew:0},66:{depth:0,height:.68611,italic:0,skew:0},67:{depth:0,height:.68611,italic:0,skew:0},68:{depth:0,height:.68611,italic:0,skew:0},69:{depth:0,height:.68611,italic:0,skew:0},70:{depth:0,height:.68611,italic:0,skew:0},71:{depth:0,height:.68611,italic:0,skew:0},72:{depth:0,height:.68611,italic:0,skew:0},73:{depth:0,height:.68611,italic:0,skew:0},74:{depth:0,height:.68611,italic:0,skew:0},75:{depth:0,height:.68611,italic:0,skew:0},76:{depth:0,height:.68611,italic:0,skew:0},77:{depth:0,height:.68611,italic:0,skew:0},78:{depth:0,height:.68611,italic:0,skew:0},79:{depth:0,height:.68611,italic:0,skew:0},80:{depth:0,height:.68611,italic:0,skew:0},81:{depth:.19444,height:.68611,italic:0,skew:0},82:{depth:0,height:.68611,italic:0,skew:0},83:{depth:0,height:.68611,italic:0,skew:0},84:{depth:0,height:.68611,italic:0,skew:0},85:{depth:0,height:.68611,italic:0,skew:0},86:{depth:0,height:.68611,italic:.01597,skew:0},87:{depth:0,height:.68611,italic:.01597,skew:0},88:{depth:0,height:.68611,italic:0,skew:0},89:{depth:0,height:.68611,italic:.02875,skew:0},90:{depth:0,height:.68611,italic:0,skew:0},91:{depth:.25,height:.75,italic:0,skew:0},92:{depth:.25,height:.75,italic:0,skew:0},93:{depth:.25,height:.75,italic:0,skew:0},94:{depth:0,height:.69444,italic:0,skew:0},95:{depth:.31,height:.13444,italic:.03194,skew:0},96:{depth:0,height:.69444,italic:0,skew:0},97:{depth:0,height:.44444,italic:0,skew:0},98:{depth:0,height:.69444,italic:0,skew:0},99:{depth:0,height:.44444,italic:0,skew:0},100:{depth:0,height:.69444,italic:0,skew:0},101:{depth:0,height:.44444,italic:0,skew:0},102:{depth:0,height:.69444,italic:.10903,skew:0},103:{depth:.19444,height:.44444,italic:.01597,skew:0},104:{depth:0,height:.69444,italic:0,skew:0},105:{depth:0,height:.69444,italic:0,skew:0},106:{depth:.19444,height:.69444,italic:0,skew:0},107:{depth:0,height:.69444,italic:0,skew:0},108:{depth:0,height:.69444,italic:0,skew:0},109:{depth:0,height:.44444,italic:0,skew:0},110:{depth:0,height:.44444,italic:0,skew:0},111:{depth:0,height:.44444,italic:0,skew:0},112:{depth:.19444,height:.44444,italic:0,skew:0},113:{depth:.19444,height:.44444,italic:0,skew:0},114:{depth:0,height:.44444,italic:0,skew:0},115:{depth:0,height:.44444,italic:0,skew:0},116:{depth:0,height:.63492,italic:0,skew:0},117:{depth:0,height:.44444,italic:0,skew:0},118:{depth:0,height:.44444,italic:.01597,skew:0},119:{depth:0,height:.44444,italic:.01597,skew:0},120:{depth:0,height:.44444,italic:0,skew:0},121:{depth:.19444,height:.44444,italic:.01597,skew:0},122:{depth:0,height:.44444,italic:0,skew:0},123:{depth:.25,height:.75,italic:0,skew:0},124:{depth:.25,height:.75,italic:0,skew:0},125:{depth:.25,height:.75,italic:0,skew:0},126:{depth:.35,height:.34444,italic:0,skew:0},168:{depth:0,height:.69444,italic:0,skew:0},172:{depth:0,height:.44444,italic:0,skew:0},175:{depth:0,height:.59611,italic:0,skew:0},176:{depth:0,height:.69444,italic:0,skew:0},177:{depth:.13333,height:.63333,italic:0,skew:0},180:{depth:0,height:.69444,italic:0,skew:0},215:{depth:.13333,height:.63333,italic:0,skew:0},247:{depth:.13333,height:.63333,italic:0,skew:0},305:{depth:0,height:.44444,italic:0,skew:0},567:{depth:.19444,height:.44444,italic:0,skew:0},710:{depth:0,height:.69444,italic:0,skew:0},711:{depth:0,height:.63194,italic:0,skew:0},713:{depth:0,height:.59611,italic:0,skew:0},714:{depth:0,height:.69444,italic:0,skew:0},715:{depth:0,height:.69444,italic:0,skew:0},728:{depth:0,height:.69444,italic:0,skew:0},729:{depth:0,height:.69444,italic:0,skew:0},730:{depth:0,height:.69444,italic:0,skew:0},732:{depth:0,height:.69444,italic:0,skew:0},768:{depth:0,height:.69444,italic:0,skew:0},769:{depth:0,height:.69444,italic:0,skew:0},770:{depth:0,height:.69444,italic:0,skew:0},771:{depth:0,height:.69444,italic:0,skew:0},772:{depth:0,height:.59611,italic:0,skew:0},774:{depth:0,height:.69444,italic:0,skew:0},775:{depth:0,height:.69444,italic:0,skew:0},776:{depth:0,height:.69444,italic:0,skew:0},778:{depth:0,height:.69444,italic:0,skew:0},779:{depth:0,height:.69444,italic:0,skew:0},780:{depth:0,height:.63194,italic:0,skew:0},824:{depth:.19444,height:.69444,italic:0,skew:0},915:{depth:0,height:.68611,italic:0,skew:0},916:{depth:0,height:.68611,italic:0,skew:0},920:{depth:0,height:.68611,italic:0,skew:0},923:{depth:0,height:.68611,italic:0,skew:0},926:{depth:0,height:.68611,italic:0,skew:0},928:{depth:0,height:.68611,italic:0,skew:0},931:{depth:0,height:.68611,italic:0,skew:0},933:{depth:0,height:.68611,italic:0,skew:0},934:{depth:0,height:.68611,italic:0,skew:0},936:{depth:0,height:.68611,italic:0,skew:0},937:{depth:0,height:.68611,italic:0,skew:0},8211:{depth:0,height:.44444,italic:.03194,skew:0},8212:{depth:0,height:.44444,italic:.03194,skew:0},8216:{depth:0,height:.69444,italic:0,skew:0},8217:{depth:0,height:.69444,italic:0,skew:0},8220:{depth:0,height:.69444,italic:0,skew:0},8221:{depth:0,height:.69444,italic:0,skew:0},8224:{depth:.19444,height:.69444,italic:0,skew:0},8225:{depth:.19444,height:.69444,italic:0,skew:0},8242:{depth:0,height:.55556,italic:0,skew:0},8407:{depth:0,height:.72444,italic:.15486,skew:0},8463:{depth:0,height:.69444,italic:0,skew:0},8465:{depth:0,height:.69444,italic:0,skew:0},8467:{depth:0,height:.69444,italic:0,skew:0},8472:{depth:.19444,height:.44444,italic:0,skew:0},8476:{depth:0,height:.69444,italic:0,skew:0},8501:{depth:0,height:.69444,italic:0,skew:0},8592:{depth:-.10889,height:.39111,italic:0,skew:0},8593:{depth:.19444,height:.69444,italic:0,skew:0},8594:{depth:-.10889,height:.39111,italic:0,skew:0},8595:{depth:.19444,height:.69444,italic:0,skew:0},8596:{depth:-.10889,height:.39111,italic:0,skew:0},8597:{depth:.25,height:.75,italic:0,skew:0},8598:{depth:.19444,height:.69444,italic:0,skew:0},8599:{depth:.19444,height:.69444,italic:0,skew:0},8600:{depth:.19444,height:.69444,italic:0,skew:0},8601:{depth:.19444,height:.69444,italic:0,skew:0},8636:{depth:-.10889,height:.39111,italic:0,skew:0},8637:{depth:-.10889,height:.39111,italic:0,skew:0},8640:{depth:-.10889,height:.39111,italic:0,skew:0},8641:{depth:-.10889,height:.39111,italic:0,skew:0},8656:{depth:-.10889,height:.39111,italic:0,skew:0},8657:{depth:.19444,height:.69444,italic:0,skew:0},8658:{depth:-.10889,height:.39111,italic:0,skew:0},8659:{depth:.19444,height:.69444,italic:0,skew:0},8660:{depth:-.10889,height:.39111,italic:0,skew:0},8661:{depth:.25,height:.75,italic:0,skew:0},8704:{depth:0,height:.69444,italic:0,skew:0},8706:{depth:0,height:.69444,italic:.06389,skew:0},8707:{depth:0,height:.69444,italic:0,skew:0},8709:{depth:.05556,height:.75,italic:0,skew:0},8711:{depth:0,height:.68611,italic:0,skew:0},8712:{depth:.08556,height:.58556,italic:0,skew:0},8715:{depth:.08556,height:.58556,italic:0,skew:0},8722:{depth:.13333,height:.63333,italic:0,skew:0},8723:{depth:.13333,height:.63333,italic:0,skew:0},8725:{depth:.25,height:.75,italic:0,skew:0},8726:{depth:.25,height:.75,italic:0,skew:0},8727:{depth:-.02778,height:.47222,italic:0,skew:0},8728:{depth:-.02639,height:.47361,italic:0,skew:0},8729:{depth:-.02639,height:.47361,italic:0,skew:0},8730:{depth:.18,height:.82,italic:0,skew:0},8733:{depth:0,height:.44444,italic:0,skew:0},8734:{depth:0,height:.44444,italic:0,skew:0},8736:{depth:0,height:.69224,italic:0,skew:0},8739:{depth:.25,height:.75,italic:0,skew:0},8741:{depth:.25,height:.75,italic:0,skew:0},8743:{depth:0,height:.55556,italic:0,skew:0},8744:{depth:0,height:.55556,italic:0,skew:0},8745:{depth:0,height:.55556,italic:0,skew:0},8746:{depth:0,height:.55556,italic:0,skew:0},8747:{depth:.19444,height:.69444,italic:.12778,skew:0},8764:{depth:-.10889,height:.39111,italic:0,skew:0},8768:{depth:.19444,height:.69444,italic:0,skew:0},8771:{depth:.00222,height:.50222,italic:0,skew:0},8776:{depth:.02444,height:.52444,italic:0,skew:0},8781:{depth:.00222,height:.50222,italic:0,skew:0},8801:{depth:.00222,height:.50222,italic:0,skew:0},8804:{depth:.19667,height:.69667,italic:0,skew:0},8805:{depth:.19667,height:.69667,italic:0,skew:0},8810:{depth:.08556,height:.58556,italic:0,skew:0},8811:{depth:.08556,height:.58556,italic:0,skew:0},8826:{depth:.08556,height:.58556,italic:0,skew:0},8827:{depth:.08556,height:.58556,italic:0,skew:0},8834:{depth:.08556,height:.58556,italic:0,skew:0},8835:{depth:.08556,height:.58556,italic:0,skew:0},8838:{depth:.19667,height:.69667,italic:0,skew:0},8839:{depth:.19667,height:.69667,italic:0,skew:0},8846:{depth:0,height:.55556,italic:0,skew:0},8849:{depth:.19667,height:.69667,italic:0,skew:0},8850:{depth:.19667,height:.69667,italic:0,skew:0},8851:{depth:0,height:.55556,italic:0,skew:0},8852:{depth:0,height:.55556,italic:0,skew:0},8853:{depth:.13333,height:.63333,italic:0,skew:0},8854:{depth:.13333,height:.63333,italic:0,skew:0},8855:{depth:.13333,height:.63333,italic:0,skew:0},8856:{depth:.13333,height:.63333,italic:0,skew:0},8857:{depth:.13333,height:.63333,italic:0,skew:0},8866:{depth:0,height:.69444,italic:0,skew:0},8867:{depth:0,height:.69444,italic:0,skew:0},8868:{depth:0,height:.69444,italic:0,skew:0},8869:{depth:0,height:.69444,italic:0,skew:0},8900:{depth:-.02639,height:.47361,italic:0,skew:0},8901:{depth:-.02639,height:.47361,italic:0,skew:0},8902:{depth:-.02778,height:.47222,italic:0,skew:0},8968:{depth:.25,height:.75,italic:0,skew:0},8969:{depth:.25,height:.75,italic:0,skew:0},8970:{depth:.25,height:.75,italic:0,skew:0},8971:{depth:.25,height:.75,italic:0,skew:0},8994:{depth:-.13889,height:.36111,italic:0,skew:0},8995:{depth:-.13889,height:.36111,italic:0,skew:0},9651:{depth:.19444,height:.69444,italic:0,skew:0},9657:{depth:-.02778,height:.47222,italic:0,skew:0},9661:{depth:.19444,height:.69444,italic:0,skew:0},9667:{depth:-.02778,height:.47222,italic:0,skew:0},9711:{depth:.19444,height:.69444,italic:0,skew:0},9824:{depth:.12963,height:.69444,italic:0,skew:0},9825:{depth:.12963,height:.69444,italic:0,skew:0},9826:{depth:.12963,height:.69444,italic:0,skew:0},9827:{depth:.12963,height:.69444,italic:0,skew:0},9837:{depth:0,height:.75,italic:0,skew:0},9838:{depth:.19444,height:.69444,italic:0,skew:0},9839:{depth:.19444,height:.69444,italic:0,skew:0},10216:{depth:.25,height:.75,italic:0,skew:0},10217:{depth:.25,height:.75,italic:0,skew:0},10815:{depth:0,height:.68611,italic:0,skew:0},10927:{depth:.19667,height:.69667,italic:0,skew:0},10928:{depth:.19667,height:.69667,italic:0,skew:0}},"Main-Italic":{33:{depth:0,height:.69444,italic:.12417,skew:0},34:{depth:0,height:.69444,italic:.06961,skew:0},35:{depth:.19444,height:.69444,italic:.06616,skew:0},37:{depth:.05556,height:.75,italic:.13639,skew:0},38:{depth:0,height:.69444,italic:.09694,skew:0},39:{depth:0,height:.69444,italic:.12417,skew:0},40:{depth:.25,height:.75,italic:.16194,skew:0},41:{depth:.25,height:.75,italic:.03694,skew:0},42:{depth:0,height:.75,italic:.14917,skew:0},43:{depth:.05667,height:.56167,italic:.03694,skew:0},44:{depth:.19444,height:.10556,italic:0,skew:0},45:{depth:0,height:.43056,italic:.02826,skew:0},46:{depth:0,height:.10556,italic:0,skew:0},47:{depth:.25,height:.75,italic:.16194,skew:0},48:{depth:0,height:.64444,italic:.13556,skew:0},49:{depth:0,height:.64444,italic:.13556,skew:0},50:{depth:0,height:.64444,italic:.13556,skew:0},51:{depth:0,height:.64444,italic:.13556,skew:0},52:{depth:.19444,height:.64444,italic:.13556,skew:0},53:{depth:0,height:.64444,italic:.13556,skew:0},54:{depth:0,height:.64444,italic:.13556,skew:0},55:{depth:.19444,height:.64444,italic:.13556,skew:0},56:{depth:0,height:.64444,italic:.13556,skew:0},57:{depth:0,height:.64444,italic:.13556,skew:0},58:{depth:0,height:.43056,italic:.0582,skew:0},59:{depth:.19444,height:.43056,italic:.0582,skew:0},61:{depth:-.13313,height:.36687,italic:.06616,skew:0},63:{depth:0,height:.69444,italic:.1225,skew:0},64:{depth:0,height:.69444,italic:.09597,skew:0},65:{depth:0,height:.68333,italic:0,skew:0},66:{depth:0,height:.68333,italic:.10257,skew:0},67:{depth:0,height:.68333,italic:.14528,skew:0},68:{depth:0,height:.68333,italic:.09403,skew:0},69:{depth:0,height:.68333,italic:.12028,skew:0},70:{depth:0,height:.68333,italic:.13305,skew:0},71:{depth:0,height:.68333,italic:.08722,skew:0},72:{depth:0,height:.68333,italic:.16389,skew:0},73:{depth:0,height:.68333,italic:.15806,skew:0},74:{depth:0,height:.68333,italic:.14028,skew:0},75:{depth:0,height:.68333,italic:.14528,skew:0},76:{depth:0,height:.68333,italic:0,skew:0},77:{depth:0,height:.68333,italic:.16389,skew:0},78:{depth:0,height:.68333,italic:.16389,skew:0},79:{depth:0,height:.68333,italic:.09403,skew:0},80:{depth:0,height:.68333,italic:.10257,skew:0},81:{depth:.19444,height:.68333,italic:.09403,skew:0},82:{depth:0,height:.68333,italic:.03868,skew:0},83:{depth:0,height:.68333,italic:.11972,skew:0},84:{depth:0,height:.68333,italic:.13305,skew:0},85:{depth:0,height:.68333,italic:.16389,skew:0},86:{depth:0,height:.68333,italic:.18361,skew:0},87:{depth:0,height:.68333,italic:.18361,skew:0},88:{depth:0,height:.68333,italic:.15806,skew:0},89:{depth:0,height:.68333,italic:.19383,skew:0},90:{depth:0,height:.68333,italic:.14528,skew:0},91:{depth:.25,height:.75,italic:.1875,skew:0},93:{depth:.25,height:.75,italic:.10528,skew:0},94:{depth:0,height:.69444,italic:.06646,skew:0},95:{depth:.31,height:.12056,italic:.09208,skew:0},97:{depth:0,height:.43056,italic:.07671,skew:0},98:{depth:0,height:.69444,italic:.06312,skew:0},99:{depth:0,height:.43056,italic:.05653,skew:0},100:{depth:0,height:.69444,italic:.10333,skew:0},101:{depth:0,height:.43056,italic:.07514,skew:0},102:{depth:.19444,height:.69444,italic:.21194,skew:0},103:{depth:.19444,height:.43056,italic:.08847,skew:0},104:{depth:0,height:.69444,italic:.07671,skew:0},105:{depth:0,height:.65536,italic:.1019,skew:0},106:{depth:.19444,height:.65536,italic:.14467,skew:0},107:{depth:0,height:.69444,italic:.10764,skew:0},108:{depth:0,height:.69444,italic:.10333,skew:0},109:{depth:0,height:.43056,italic:.07671,skew:0},110:{depth:0,height:.43056,italic:.07671,skew:0},111:{depth:0,height:.43056,italic:.06312,skew:0},112:{depth:.19444,height:.43056,italic:.06312,skew:0},113:{depth:.19444,height:.43056,italic:.08847,skew:0},114:{depth:0,height:.43056,italic:.10764,skew:0},115:{depth:0,height:.43056,italic:.08208,skew:0},116:{depth:0,height:.61508,italic:.09486,skew:0},117:{depth:0,height:.43056,italic:.07671,skew:0},118:{depth:0,height:.43056,italic:.10764,skew:0},119:{depth:0,height:.43056,italic:.10764,skew:0},120:{depth:0,height:.43056,italic:.12042,skew:0},121:{depth:.19444,height:.43056,italic:.08847,skew:0},122:{depth:0,height:.43056,italic:.12292,skew:0},126:{depth:.35,height:.31786,italic:.11585,skew:0},163:{depth:0,height:.69444,italic:0,skew:0},305:{depth:0,height:.43056,italic:0,skew:.02778},567:{depth:.19444,height:.43056,italic:0,skew:.08334},768:{depth:0,height:.69444,italic:0,skew:0},769:{depth:0,height:.69444,italic:.09694,skew:0},770:{depth:0,height:.69444,italic:.06646,skew:0},771:{depth:0,height:.66786,italic:.11585,skew:0},772:{depth:0,height:.56167,italic:.10333,skew:0},774:{depth:0,height:.69444,italic:.10806,skew:0},775:{depth:0,height:.66786,italic:.11752,skew:0},776:{depth:0,height:.66786,italic:.10474,skew:0},778:{depth:0,height:.69444,italic:0,skew:0},779:{depth:0,height:.69444,italic:.1225,skew:0},780:{depth:0,height:.62847,italic:.08295,skew:0},915:{depth:0,height:.68333,italic:.13305,skew:0},916:{depth:0,height:.68333,italic:0,skew:0},920:{depth:0,height:.68333,italic:.09403,skew:0},923:{depth:0,height:.68333,italic:0,skew:0},926:{depth:0,height:.68333,italic:.15294,skew:0},928:{depth:0,height:.68333,italic:.16389,skew:0},931:{depth:0,height:.68333,italic:.12028,skew:0},933:{depth:0,height:.68333,italic:.11111,skew:0},934:{depth:0,height:.68333,italic:.05986,skew:0},936:{depth:0,height:.68333,italic:.11111,skew:0},937:{depth:0,height:.68333,italic:.10257,skew:0},8211:{depth:0,height:.43056,italic:.09208,skew:0},8212:{depth:0,height:.43056,italic:.09208,skew:0},8216:{depth:0,height:.69444,italic:.12417,skew:0},8217:{depth:0,height:.69444,italic:.12417,skew:0},8220:{depth:0,height:.69444,italic:.1685,skew:0},8221:{depth:0,height:.69444,italic:.06961,skew:0},8463:{depth:0,height:.68889,italic:0,skew:0}},"Main-Regular":{32:{depth:0,height:0,italic:0,skew:0},33:{depth:0,height:.69444,italic:0,skew:0},34:{depth:0,height:.69444,italic:0,skew:0},35:{depth:.19444,height:.69444,italic:0,skew:0},36:{depth:.05556,height:.75,italic:0,skew:0},37:{depth:.05556,height:.75,italic:0,skew:0},38:{depth:0,height:.69444,italic:0,skew:0},39:{depth:0,height:.69444,italic:0,skew:0},40:{depth:.25,height:.75,italic:0,skew:0},41:{depth:.25,height:.75,italic:0,skew:0},42:{depth:0,height:.75,italic:0,skew:0},43:{depth:.08333,height:.58333,italic:0,skew:0},44:{depth:.19444,height:.10556,italic:0,skew:0},45:{depth:0,height:.43056,italic:0,skew:0},46:{depth:0,height:.10556,italic:0,skew:0},47:{depth:.25,height:.75,italic:0,skew:0},48:{depth:0,height:.64444,italic:0,skew:0},49:{depth:0,height:.64444,italic:0,skew:0},50:{depth:0,height:.64444,italic:0,skew:0},51:{depth:0,height:.64444,italic:0,skew:0},52:{depth:0,height:.64444,italic:0,skew:0},53:{depth:0,height:.64444,italic:0,skew:0},54:{depth:0,height:.64444,italic:0,skew:0},55:{depth:0,height:.64444,italic:0,skew:0},56:{depth:0,height:.64444,italic:0,skew:0},57:{depth:0,height:.64444,italic:0,skew:0},58:{depth:0,height:.43056,italic:0,skew:0},59:{depth:.19444,height:.43056,italic:0,skew:0},60:{depth:.0391,height:.5391,italic:0,skew:0},61:{depth:-.13313,height:.36687,italic:0,skew:0},62:{depth:.0391,height:.5391,italic:0,skew:0},63:{depth:0,height:.69444,italic:0,skew:0},64:{depth:0,height:.69444,italic:0,skew:0},65:{depth:0,height:.68333,italic:0,skew:0},66:{depth:0,height:.68333,italic:0,skew:0},67:{depth:0,height:.68333,italic:0,skew:0},68:{depth:0,height:.68333,italic:0,skew:0},69:{depth:0,height:.68333,italic:0,skew:0},70:{depth:0,height:.68333,italic:0,skew:0},71:{depth:0,height:.68333,italic:0,skew:0},72:{depth:0,height:.68333,italic:0,skew:0},73:{depth:0,height:.68333,italic:0,skew:0},74:{depth:0,height:.68333,italic:0,skew:0},75:{depth:0,height:.68333,italic:0,skew:0},76:{depth:0,height:.68333,italic:0,skew:0},77:{depth:0,height:.68333,italic:0,skew:0},78:{depth:0,height:.68333,italic:0,skew:0},79:{depth:0,height:.68333,italic:0,skew:0},80:{depth:0,height:.68333,italic:0,skew:0},81:{depth:.19444,height:.68333,italic:0,skew:0},82:{depth:0,height:.68333,italic:0,skew:0},83:{depth:0,height:.68333,italic:0,skew:0},84:{depth:0,height:.68333,italic:0,skew:0},85:{depth:0,height:.68333,italic:0,skew:0},86:{depth:0,height:.68333,italic:.01389,skew:0},87:{depth:0,height:.68333,italic:.01389,skew:0},88:{depth:0,height:.68333,italic:0,skew:0},89:{depth:0,height:.68333,italic:.025,skew:0},90:{depth:0,height:.68333,italic:0,skew:0},91:{depth:.25,height:.75,italic:0,skew:0},92:{depth:.25,height:.75,italic:0,skew:0},93:{depth:.25,height:.75,italic:0,skew:0},94:{depth:0,height:.69444,italic:0,skew:0},95:{depth:.31,height:.12056,italic:.02778,skew:0},96:{depth:0,height:.69444,italic:0,skew:0},97:{depth:0,height:.43056,italic:0,skew:0},98:{depth:0,height:.69444,italic:0,skew:0},99:{depth:0,height:.43056,italic:0,skew:0},100:{depth:0,height:.69444,italic:0,skew:0},101:{depth:0,height:.43056,italic:0,skew:0},102:{depth:0,height:.69444,italic:.07778,skew:0},103:{depth:.19444,height:.43056,italic:.01389,skew:0},104:{depth:0,height:.69444,italic:0,skew:0},105:{depth:0,height:.66786,italic:0,skew:0},106:{depth:.19444,height:.66786,italic:0,skew:0},107:{depth:0,height:.69444,italic:0,skew:0},108:{depth:0,height:.69444,italic:0,skew:0},109:{depth:0,height:.43056,italic:0,skew:0},110:{depth:0,height:.43056,italic:0,skew:0},111:{depth:0,height:.43056,italic:0,skew:0},112:{depth:.19444,height:.43056,italic:0,skew:0},113:{depth:.19444,height:.43056,italic:0,skew:0},114:{depth:0,height:.43056,italic:0,skew:0},115:{depth:0,height:.43056,italic:0,skew:0},116:{depth:0,height:.61508,italic:0,skew:0},117:{depth:0,height:.43056,italic:0,skew:0},118:{depth:0,height:.43056,italic:.01389,skew:0},119:{depth:0,height:.43056,italic:.01389,skew:0},120:{depth:0,height:.43056,italic:0,skew:0},121:{depth:.19444,height:.43056,italic:.01389,skew:0},122:{depth:0,height:.43056,italic:0,skew:0},123:{depth:.25,height:.75,italic:0,skew:0},124:{depth:.25,height:.75,italic:0,skew:0},125:{depth:.25,height:.75,italic:0,skew:0},126:{depth:.35,height:.31786,italic:0,skew:0},160:{depth:0,height:0,italic:0,skew:0},168:{depth:0,height:.66786,italic:0,skew:0},172:{depth:0,height:.43056,italic:0,skew:0},175:{depth:0,height:.56778,italic:0,skew:0},176:{depth:0,height:.69444,italic:0,skew:0},177:{depth:.08333,height:.58333,italic:0,skew:0},180:{depth:0,height:.69444,italic:0,skew:0},215:{depth:.08333,height:.58333,italic:0,skew:0},247:{depth:.08333,height:.58333,italic:0,skew:0},305:{depth:0,height:.43056,italic:0,skew:0},567:{depth:.19444,height:.43056,italic:0,skew:0},710:{depth:0,height:.69444,italic:0,skew:0},711:{depth:0,height:.62847,italic:0,skew:0},713:{depth:0,height:.56778,italic:0,skew:0},714:{depth:0,height:.69444,italic:0,skew:0},715:{depth:0,height:.69444,italic:0,skew:0},728:{depth:0,height:.69444,italic:0,skew:0},729:{depth:0,height:.66786,italic:0,skew:0},730:{depth:0,height:.69444,italic:0,skew:0},732:{depth:0,height:.66786,italic:0,skew:0},768:{depth:0,height:.69444,italic:0,skew:0},769:{depth:0,height:.69444,italic:0,skew:0},770:{depth:0,height:.69444,italic:0,skew:0},771:{depth:0,height:.66786,italic:0,skew:0},772:{depth:0,height:.56778,italic:0,skew:0},774:{depth:0,height:.69444,italic:0,skew:0},775:{depth:0,height:.66786,italic:0,skew:0},776:{depth:0,height:.66786,italic:0,skew:0},778:{depth:0,height:.69444,italic:0,skew:0},779:{depth:0,height:.69444,italic:0,skew:0},780:{depth:0,height:.62847,italic:0,skew:0},824:{depth:.19444,height:.69444,italic:0,skew:0},915:{depth:0,height:.68333,italic:0,skew:0},916:{depth:0,height:.68333,italic:0,skew:0},920:{depth:0,height:.68333,italic:0,skew:0},923:{depth:0,height:.68333,italic:0,skew:0},926:{depth:0,height:.68333,italic:0,skew:0},928:{depth:0,height:.68333,italic:0,skew:0},931:{depth:0,height:.68333,italic:0,skew:0},933:{depth:0,height:.68333,italic:0,skew:0},934:{depth:0,height:.68333,italic:0,skew:0},936:{depth:0,height:.68333,italic:0,skew:0},937:{depth:0,height:.68333,italic:0,skew:0},8211:{depth:0,height:.43056,italic:.02778,skew:0},8212:{depth:0,height:.43056,italic:.02778,skew:0},8216:{depth:0,height:.69444,italic:0,skew:0},8217:{depth:0,height:.69444,italic:0,skew:0},8220:{depth:0,height:.69444,italic:0,skew:0},8221:{depth:0,height:.69444,italic:0,skew:0},8224:{depth:.19444,height:.69444,italic:0,skew:0},8225:{depth:.19444,height:.69444,italic:0,skew:0},8230:{depth:0,height:.12,italic:0,skew:0},8242:{depth:0,height:.55556,italic:0,skew:0},8407:{depth:0,height:.71444,italic:.15382,skew:0},8463:{depth:0,height:.68889,italic:0,skew:0},8465:{depth:0,height:.69444,italic:0,skew:0},8467:{depth:0,height:.69444,italic:0,skew:.11111},8472:{depth:.19444,height:.43056,italic:0,skew:.11111},8476:{depth:0,height:.69444,italic:0,skew:0},8501:{depth:0,height:.69444,italic:0,skew:0},8592:{depth:-.13313,height:.36687,italic:0,skew:0},8593:{depth:.19444,height:.69444,italic:0,skew:0},8594:{depth:-.13313,height:.36687,italic:0,skew:0},8595:{depth:.19444,height:.69444,italic:0,skew:0},8596:{depth:-.13313,height:.36687,italic:0,skew:0},8597:{depth:.25,height:.75,italic:0,skew:0},8598:{depth:.19444,height:.69444,italic:0,skew:0},8599:{depth:.19444,height:.69444,italic:0,skew:0},8600:{depth:.19444,height:.69444,italic:0,skew:0},8601:{depth:.19444,height:.69444,italic:0,skew:0},8614:{depth:.011,
-height:.511,italic:0,skew:0},8617:{depth:.011,height:.511,italic:0,skew:0},8618:{depth:.011,height:.511,italic:0,skew:0},8636:{depth:-.13313,height:.36687,italic:0,skew:0},8637:{depth:-.13313,height:.36687,italic:0,skew:0},8640:{depth:-.13313,height:.36687,italic:0,skew:0},8641:{depth:-.13313,height:.36687,italic:0,skew:0},8652:{depth:.011,height:.671,italic:0,skew:0},8656:{depth:-.13313,height:.36687,italic:0,skew:0},8657:{depth:.19444,height:.69444,italic:0,skew:0},8658:{depth:-.13313,height:.36687,italic:0,skew:0},8659:{depth:.19444,height:.69444,italic:0,skew:0},8660:{depth:-.13313,height:.36687,italic:0,skew:0},8661:{depth:.25,height:.75,italic:0,skew:0},8704:{depth:0,height:.69444,italic:0,skew:0},8706:{depth:0,height:.69444,italic:.05556,skew:.08334},8707:{depth:0,height:.69444,italic:0,skew:0},8709:{depth:.05556,height:.75,italic:0,skew:0},8711:{depth:0,height:.68333,italic:0,skew:0},8712:{depth:.0391,height:.5391,italic:0,skew:0},8715:{depth:.0391,height:.5391,italic:0,skew:0},8722:{depth:.08333,height:.58333,italic:0,skew:0},8723:{depth:.08333,height:.58333,italic:0,skew:0},8725:{depth:.25,height:.75,italic:0,skew:0},8726:{depth:.25,height:.75,italic:0,skew:0},8727:{depth:-.03472,height:.46528,italic:0,skew:0},8728:{depth:-.05555,height:.44445,italic:0,skew:0},8729:{depth:-.05555,height:.44445,italic:0,skew:0},8730:{depth:.2,height:.8,italic:0,skew:0},8733:{depth:0,height:.43056,italic:0,skew:0},8734:{depth:0,height:.43056,italic:0,skew:0},8736:{depth:0,height:.69224,italic:0,skew:0},8739:{depth:.25,height:.75,italic:0,skew:0},8741:{depth:.25,height:.75,italic:0,skew:0},8743:{depth:0,height:.55556,italic:0,skew:0},8744:{depth:0,height:.55556,italic:0,skew:0},8745:{depth:0,height:.55556,italic:0,skew:0},8746:{depth:0,height:.55556,italic:0,skew:0},8747:{depth:.19444,height:.69444,italic:.11111,skew:0},8764:{depth:-.13313,height:.36687,italic:0,skew:0},8768:{depth:.19444,height:.69444,italic:0,skew:0},8771:{depth:-.03625,height:.46375,italic:0,skew:0},8773:{depth:-.022,height:.589,italic:0,skew:0},8776:{depth:-.01688,height:.48312,italic:0,skew:0},8781:{depth:-.03625,height:.46375,italic:0,skew:0},8784:{depth:-.133,height:.67,italic:0,skew:0},8800:{depth:.215,height:.716,italic:0,skew:0},8801:{depth:-.03625,height:.46375,italic:0,skew:0},8804:{depth:.13597,height:.63597,italic:0,skew:0},8805:{depth:.13597,height:.63597,italic:0,skew:0},8810:{depth:.0391,height:.5391,italic:0,skew:0},8811:{depth:.0391,height:.5391,italic:0,skew:0},8826:{depth:.0391,height:.5391,italic:0,skew:0},8827:{depth:.0391,height:.5391,italic:0,skew:0},8834:{depth:.0391,height:.5391,italic:0,skew:0},8835:{depth:.0391,height:.5391,italic:0,skew:0},8838:{depth:.13597,height:.63597,italic:0,skew:0},8839:{depth:.13597,height:.63597,italic:0,skew:0},8846:{depth:0,height:.55556,italic:0,skew:0},8849:{depth:.13597,height:.63597,italic:0,skew:0},8850:{depth:.13597,height:.63597,italic:0,skew:0},8851:{depth:0,height:.55556,italic:0,skew:0},8852:{depth:0,height:.55556,italic:0,skew:0},8853:{depth:.08333,height:.58333,italic:0,skew:0},8854:{depth:.08333,height:.58333,italic:0,skew:0},8855:{depth:.08333,height:.58333,italic:0,skew:0},8856:{depth:.08333,height:.58333,italic:0,skew:0},8857:{depth:.08333,height:.58333,italic:0,skew:0},8866:{depth:0,height:.69444,italic:0,skew:0},8867:{depth:0,height:.69444,italic:0,skew:0},8868:{depth:0,height:.69444,italic:0,skew:0},8869:{depth:0,height:.69444,italic:0,skew:0},8872:{depth:.249,height:.75,italic:0,skew:0},8900:{depth:-.05555,height:.44445,italic:0,skew:0},8901:{depth:-.05555,height:.44445,italic:0,skew:0},8902:{depth:-.03472,height:.46528,italic:0,skew:0},8904:{depth:.005,height:.505,italic:0,skew:0},8942:{depth:.03,height:.9,italic:0,skew:0},8943:{depth:-.19,height:.31,italic:0,skew:0},8945:{depth:-.1,height:.82,italic:0,skew:0},8968:{depth:.25,height:.75,italic:0,skew:0},8969:{depth:.25,height:.75,italic:0,skew:0},8970:{depth:.25,height:.75,italic:0,skew:0},8971:{depth:.25,height:.75,italic:0,skew:0},8994:{depth:-.14236,height:.35764,italic:0,skew:0},8995:{depth:-.14236,height:.35764,italic:0,skew:0},9136:{depth:.244,height:.744,italic:0,skew:0},9137:{depth:.244,height:.744,italic:0,skew:0},9651:{depth:.19444,height:.69444,italic:0,skew:0},9657:{depth:-.03472,height:.46528,italic:0,skew:0},9661:{depth:.19444,height:.69444,italic:0,skew:0},9667:{depth:-.03472,height:.46528,italic:0,skew:0},9711:{depth:.19444,height:.69444,italic:0,skew:0},9824:{depth:.12963,height:.69444,italic:0,skew:0},9825:{depth:.12963,height:.69444,italic:0,skew:0},9826:{depth:.12963,height:.69444,italic:0,skew:0},9827:{depth:.12963,height:.69444,italic:0,skew:0},9837:{depth:0,height:.75,italic:0,skew:0},9838:{depth:.19444,height:.69444,italic:0,skew:0},9839:{depth:.19444,height:.69444,italic:0,skew:0},10216:{depth:.25,height:.75,italic:0,skew:0},10217:{depth:.25,height:.75,italic:0,skew:0},10222:{depth:.244,height:.744,italic:0,skew:0},10223:{depth:.244,height:.744,italic:0,skew:0},10229:{depth:.011,height:.511,italic:0,skew:0},10230:{depth:.011,height:.511,italic:0,skew:0},10231:{depth:.011,height:.511,italic:0,skew:0},10232:{depth:.024,height:.525,italic:0,skew:0},10233:{depth:.024,height:.525,italic:0,skew:0},10234:{depth:.024,height:.525,italic:0,skew:0},10236:{depth:.011,height:.511,italic:0,skew:0},10815:{depth:0,height:.68333,italic:0,skew:0},10927:{depth:.13597,height:.63597,italic:0,skew:0},10928:{depth:.13597,height:.63597,italic:0,skew:0}},"Math-BoldItalic":{47:{depth:.19444,height:.69444,italic:0,skew:0},65:{depth:0,height:.68611,italic:0,skew:0},66:{depth:0,height:.68611,italic:.04835,skew:0},67:{depth:0,height:.68611,italic:.06979,skew:0},68:{depth:0,height:.68611,italic:.03194,skew:0},69:{depth:0,height:.68611,italic:.05451,skew:0},70:{depth:0,height:.68611,italic:.15972,skew:0},71:{depth:0,height:.68611,italic:0,skew:0},72:{depth:0,height:.68611,italic:.08229,skew:0},73:{depth:0,height:.68611,italic:.07778,skew:0},74:{depth:0,height:.68611,italic:.10069,skew:0},75:{depth:0,height:.68611,italic:.06979,skew:0},76:{depth:0,height:.68611,italic:0,skew:0},77:{depth:0,height:.68611,italic:.11424,skew:0},78:{depth:0,height:.68611,italic:.11424,skew:0},79:{depth:0,height:.68611,italic:.03194,skew:0},80:{depth:0,height:.68611,italic:.15972,skew:0},81:{depth:.19444,height:.68611,italic:0,skew:0},82:{depth:0,height:.68611,italic:.00421,skew:0},83:{depth:0,height:.68611,italic:.05382,skew:0},84:{depth:0,height:.68611,italic:.15972,skew:0},85:{depth:0,height:.68611,italic:.11424,skew:0},86:{depth:0,height:.68611,italic:.25555,skew:0},87:{depth:0,height:.68611,italic:.15972,skew:0},88:{depth:0,height:.68611,italic:.07778,skew:0},89:{depth:0,height:.68611,italic:.25555,skew:0},90:{depth:0,height:.68611,italic:.06979,skew:0},97:{depth:0,height:.44444,italic:0,skew:0},98:{depth:0,height:.69444,italic:0,skew:0},99:{depth:0,height:.44444,italic:0,skew:0},100:{depth:0,height:.69444,italic:0,skew:0},101:{depth:0,height:.44444,italic:0,skew:0},102:{depth:.19444,height:.69444,italic:.11042,skew:0},103:{depth:.19444,height:.44444,italic:.03704,skew:0},104:{depth:0,height:.69444,italic:0,skew:0},105:{depth:0,height:.69326,italic:0,skew:0},106:{depth:.19444,height:.69326,italic:.0622,skew:0},107:{depth:0,height:.69444,italic:.01852,skew:0},108:{depth:0,height:.69444,italic:.0088,skew:0},109:{depth:0,height:.44444,italic:0,skew:0},110:{depth:0,height:.44444,italic:0,skew:0},111:{depth:0,height:.44444,italic:0,skew:0},112:{depth:.19444,height:.44444,italic:0,skew:0},113:{depth:.19444,height:.44444,italic:.03704,skew:0},114:{depth:0,height:.44444,italic:.03194,skew:0},115:{depth:0,height:.44444,italic:0,skew:0},116:{depth:0,height:.63492,italic:0,skew:0},117:{depth:0,height:.44444,italic:0,skew:0},118:{depth:0,height:.44444,italic:.03704,skew:0},119:{depth:0,height:.44444,italic:.02778,skew:0},120:{depth:0,height:.44444,italic:0,skew:0},121:{depth:.19444,height:.44444,italic:.03704,skew:0},122:{depth:0,height:.44444,italic:.04213,skew:0},915:{depth:0,height:.68611,italic:.15972,skew:0},916:{depth:0,height:.68611,italic:0,skew:0},920:{depth:0,height:.68611,italic:.03194,skew:0},923:{depth:0,height:.68611,italic:0,skew:0},926:{depth:0,height:.68611,italic:.07458,skew:0},928:{depth:0,height:.68611,italic:.08229,skew:0},931:{depth:0,height:.68611,italic:.05451,skew:0},933:{depth:0,height:.68611,italic:.15972,skew:0},934:{depth:0,height:.68611,italic:0,skew:0},936:{depth:0,height:.68611,italic:.11653,skew:0},937:{depth:0,height:.68611,italic:.04835,skew:0},945:{depth:0,height:.44444,italic:0,skew:0},946:{depth:.19444,height:.69444,italic:.03403,skew:0},947:{depth:.19444,height:.44444,italic:.06389,skew:0},948:{depth:0,height:.69444,italic:.03819,skew:0},949:{depth:0,height:.44444,italic:0,skew:0},950:{depth:.19444,height:.69444,italic:.06215,skew:0},951:{depth:.19444,height:.44444,italic:.03704,skew:0},952:{depth:0,height:.69444,italic:.03194,skew:0},953:{depth:0,height:.44444,italic:0,skew:0},954:{depth:0,height:.44444,italic:0,skew:0},955:{depth:0,height:.69444,italic:0,skew:0},956:{depth:.19444,height:.44444,italic:0,skew:0},957:{depth:0,height:.44444,italic:.06898,skew:0},958:{depth:.19444,height:.69444,italic:.03021,skew:0},959:{depth:0,height:.44444,italic:0,skew:0},960:{depth:0,height:.44444,italic:.03704,skew:0},961:{depth:.19444,height:.44444,italic:0,skew:0},962:{depth:.09722,height:.44444,italic:.07917,skew:0},963:{depth:0,height:.44444,italic:.03704,skew:0},964:{depth:0,height:.44444,italic:.13472,skew:0},965:{depth:0,height:.44444,italic:.03704,skew:0},966:{depth:.19444,height:.44444,italic:0,skew:0},967:{depth:.19444,height:.44444,italic:0,skew:0},968:{depth:.19444,height:.69444,italic:.03704,skew:0},969:{depth:0,height:.44444,italic:.03704,skew:0},977:{depth:0,height:.69444,italic:0,skew:0},981:{depth:.19444,height:.69444,italic:0,skew:0},982:{depth:0,height:.44444,italic:.03194,skew:0},1009:{depth:.19444,height:.44444,italic:0,skew:0},1013:{depth:0,height:.44444,italic:0,skew:0}},"Math-Italic":{47:{depth:.19444,height:.69444,italic:0,skew:0},65:{depth:0,height:.68333,italic:0,skew:.13889},66:{depth:0,height:.68333,italic:.05017,skew:.08334},67:{depth:0,height:.68333,italic:.07153,skew:.08334},68:{depth:0,height:.68333,italic:.02778,skew:.05556},69:{depth:0,height:.68333,italic:.05764,skew:.08334},70:{depth:0,height:.68333,italic:.13889,skew:.08334},71:{depth:0,height:.68333,italic:0,skew:.08334},72:{depth:0,height:.68333,italic:.08125,skew:.05556},73:{depth:0,height:.68333,italic:.07847,skew:.11111},74:{depth:0,height:.68333,italic:.09618,skew:.16667},75:{depth:0,height:.68333,italic:.07153,skew:.05556},76:{depth:0,height:.68333,italic:0,skew:.02778},77:{depth:0,height:.68333,italic:.10903,skew:.08334},78:{depth:0,height:.68333,italic:.10903,skew:.08334},79:{depth:0,height:.68333,italic:.02778,skew:.08334},80:{depth:0,height:.68333,italic:.13889,skew:.08334},81:{depth:.19444,height:.68333,italic:0,skew:.08334},82:{depth:0,height:.68333,italic:.00773,skew:.08334},83:{depth:0,height:.68333,italic:.05764,skew:.08334},84:{depth:0,height:.68333,italic:.13889,skew:.08334},85:{depth:0,height:.68333,italic:.10903,skew:.02778},86:{depth:0,height:.68333,italic:.22222,skew:0},87:{depth:0,height:.68333,italic:.13889,skew:0},88:{depth:0,height:.68333,italic:.07847,skew:.08334},89:{depth:0,height:.68333,italic:.22222,skew:0},90:{depth:0,height:.68333,italic:.07153,skew:.08334},97:{depth:0,height:.43056,italic:0,skew:0},98:{depth:0,height:.69444,italic:0,skew:0},99:{depth:0,height:.43056,italic:0,skew:.05556},100:{depth:0,height:.69444,italic:0,skew:.16667},101:{depth:0,height:.43056,italic:0,skew:.05556},102:{depth:.19444,height:.69444,italic:.10764,skew:.16667},103:{depth:.19444,height:.43056,italic:.03588,skew:.02778},104:{depth:0,height:.69444,italic:0,skew:0},105:{depth:0,height:.65952,italic:0,skew:0},106:{depth:.19444,height:.65952,italic:.05724,skew:0},107:{depth:0,height:.69444,italic:.03148,skew:0},108:{depth:0,height:.69444,italic:.01968,skew:.08334},109:{depth:0,height:.43056,italic:0,skew:0},110:{depth:0,height:.43056,italic:0,skew:0},111:{depth:0,height:.43056,italic:0,skew:.05556},112:{depth:.19444,height:.43056,italic:0,skew:.08334},113:{depth:.19444,height:.43056,italic:.03588,skew:.08334},114:{depth:0,height:.43056,italic:.02778,skew:.05556},115:{depth:0,height:.43056,italic:0,skew:.05556},116:{depth:0,height:.61508,italic:0,skew:.08334},117:{depth:0,height:.43056,italic:0,skew:.02778},118:{depth:0,height:.43056,italic:.03588,skew:.02778},119:{depth:0,height:.43056,italic:.02691,skew:.08334},120:{depth:0,height:.43056,italic:0,skew:.02778},121:{depth:.19444,height:.43056,italic:.03588,skew:.05556},122:{depth:0,height:.43056,italic:.04398,skew:.05556},915:{depth:0,height:.68333,italic:.13889,skew:.08334},916:{depth:0,height:.68333,italic:0,skew:.16667},920:{depth:0,height:.68333,italic:.02778,skew:.08334},923:{depth:0,height:.68333,italic:0,skew:.16667},926:{depth:0,height:.68333,italic:.07569,skew:.08334},928:{depth:0,height:.68333,italic:.08125,skew:.05556},931:{depth:0,height:.68333,italic:.05764,skew:.08334},933:{depth:0,height:.68333,italic:.13889,skew:.05556},934:{depth:0,height:.68333,italic:0,skew:.08334},936:{depth:0,height:.68333,italic:.11,skew:.05556},937:{depth:0,height:.68333,italic:.05017,skew:.08334},945:{depth:0,height:.43056,italic:.0037,skew:.02778},946:{depth:.19444,height:.69444,italic:.05278,skew:.08334},947:{depth:.19444,height:.43056,italic:.05556,skew:0},948:{depth:0,height:.69444,italic:.03785,skew:.05556},949:{depth:0,height:.43056,italic:0,skew:.08334},950:{depth:.19444,height:.69444,italic:.07378,skew:.08334},951:{depth:.19444,height:.43056,italic:.03588,skew:.05556},952:{depth:0,height:.69444,italic:.02778,skew:.08334},953:{depth:0,height:.43056,italic:0,skew:.05556},954:{depth:0,height:.43056,italic:0,skew:0},955:{depth:0,height:.69444,italic:0,skew:0},956:{depth:.19444,height:.43056,italic:0,skew:.02778},957:{depth:0,height:.43056,italic:.06366,skew:.02778},958:{depth:.19444,height:.69444,italic:.04601,skew:.11111},959:{depth:0,height:.43056,italic:0,skew:.05556},960:{depth:0,height:.43056,italic:.03588,skew:0},961:{depth:.19444,height:.43056,italic:0,skew:.08334},962:{depth:.09722,height:.43056,italic:.07986,skew:.08334},963:{depth:0,height:.43056,italic:.03588,skew:0},964:{depth:0,height:.43056,italic:.1132,skew:.02778},965:{depth:0,height:.43056,italic:.03588,skew:.02778},966:{depth:.19444,height:.43056,italic:0,skew:.08334},967:{depth:.19444,height:.43056,italic:0,skew:.05556},968:{depth:.19444,height:.69444,italic:.03588,skew:.11111},969:{depth:0,height:.43056,italic:.03588,skew:0},977:{depth:0,height:.69444,italic:0,skew:.08334},981:{depth:.19444,height:.69444,italic:0,skew:.08334},982:{depth:0,height:.43056,italic:.02778,skew:0},1009:{depth:.19444,height:.43056,italic:0,skew:.08334},1013:{depth:0,height:.43056,italic:0,skew:.05556}},"Math-Regular":{65:{depth:0,height:.68333,italic:0,skew:.13889},66:{depth:0,height:.68333,italic:.05017,skew:.08334},67:{depth:0,height:.68333,italic:.07153,skew:.08334},68:{depth:0,height:.68333,italic:.02778,skew:.05556},69:{depth:0,height:.68333,italic:.05764,skew:.08334},70:{depth:0,height:.68333,italic:.13889,skew:.08334},71:{depth:0,height:.68333,italic:0,skew:.08334},72:{depth:0,height:.68333,italic:.08125,skew:.05556},73:{depth:0,height:.68333,italic:.07847,skew:.11111},74:{depth:0,height:.68333,italic:.09618,skew:.16667},75:{depth:0,height:.68333,italic:.07153,skew:.05556},76:{depth:0,height:.68333,italic:0,skew:.02778},77:{depth:0,height:.68333,italic:.10903,skew:.08334},78:{depth:0,height:.68333,italic:.10903,skew:.08334},79:{depth:0,height:.68333,italic:.02778,skew:.08334},80:{depth:0,height:.68333,italic:.13889,skew:.08334},81:{depth:.19444,height:.68333,italic:0,skew:.08334},82:{depth:0,height:.68333,italic:.00773,skew:.08334},83:{depth:0,height:.68333,italic:.05764,skew:.08334},84:{depth:0,height:.68333,italic:.13889,skew:.08334},85:{depth:0,height:.68333,italic:.10903,skew:.02778},86:{depth:0,height:.68333,italic:.22222,skew:0},87:{depth:0,height:.68333,italic:.13889,skew:0},88:{depth:0,height:.68333,italic:.07847,skew:.08334},89:{depth:0,height:.68333,italic:.22222,skew:0},90:{depth:0,height:.68333,italic:.07153,skew:.08334},97:{depth:0,height:.43056,italic:0,skew:0},98:{depth:0,height:.69444,italic:0,skew:0},99:{depth:0,height:.43056,italic:0,skew:.05556},100:{depth:0,height:.69444,italic:0,skew:.16667},101:{depth:0,height:.43056,italic:0,skew:.05556},102:{depth:.19444,height:.69444,italic:.10764,skew:.16667},103:{depth:.19444,height:.43056,italic:.03588,skew:.02778},104:{depth:0,height:.69444,italic:0,skew:0},105:{depth:0,height:.65952,italic:0,skew:0},106:{depth:.19444,height:.65952,italic:.05724,skew:0},107:{depth:0,height:.69444,italic:.03148,skew:0},108:{depth:0,height:.69444,italic:.01968,skew:.08334},109:{depth:0,height:.43056,italic:0,skew:0},110:{depth:0,height:.43056,italic:0,skew:0},111:{depth:0,height:.43056,italic:0,skew:.05556},112:{depth:.19444,height:.43056,italic:0,skew:.08334},113:{depth:.19444,height:.43056,italic:.03588,skew:.08334},114:{depth:0,height:.43056,italic:.02778,skew:.05556},115:{depth:0,height:.43056,italic:0,skew:.05556},116:{depth:0,height:.61508,italic:0,skew:.08334},117:{depth:0,height:.43056,italic:0,skew:.02778},118:{depth:0,height:.43056,italic:.03588,skew:.02778},119:{depth:0,height:.43056,italic:.02691,skew:.08334},120:{depth:0,height:.43056,italic:0,skew:.02778},121:{depth:.19444,height:.43056,italic:.03588,skew:.05556},122:{depth:0,height:.43056,italic:.04398,skew:.05556},915:{depth:0,height:.68333,italic:.13889,skew:.08334},916:{depth:0,height:.68333,italic:0,skew:.16667},920:{depth:0,height:.68333,italic:.02778,skew:.08334},923:{depth:0,height:.68333,italic:0,skew:.16667},926:{depth:0,height:.68333,italic:.07569,skew:.08334},928:{depth:0,height:.68333,italic:.08125,skew:.05556},931:{depth:0,height:.68333,italic:.05764,skew:.08334},933:{depth:0,height:.68333,italic:.13889,skew:.05556},934:{depth:0,height:.68333,italic:0,skew:.08334},936:{depth:0,height:.68333,italic:.11,skew:.05556},937:{depth:0,height:.68333,italic:.05017,skew:.08334},945:{depth:0,height:.43056,italic:.0037,skew:.02778},946:{depth:.19444,height:.69444,italic:.05278,skew:.08334},947:{depth:.19444,height:.43056,italic:.05556,skew:0},948:{depth:0,height:.69444,italic:.03785,skew:.05556},949:{depth:0,height:.43056,italic:0,skew:.08334},950:{depth:.19444,height:.69444,italic:.07378,skew:.08334},951:{depth:.19444,height:.43056,italic:.03588,skew:.05556},952:{depth:0,height:.69444,italic:.02778,skew:.08334},953:{depth:0,height:.43056,italic:0,skew:.05556},954:{depth:0,height:.43056,italic:0,skew:0},955:{depth:0,height:.69444,italic:0,skew:0},956:{depth:.19444,height:.43056,italic:0,skew:.02778},957:{depth:0,height:.43056,italic:.06366,skew:.02778},958:{depth:.19444,height:.69444,italic:.04601,skew:.11111},959:{depth:0,height:.43056,italic:0,skew:.05556},960:{depth:0,height:.43056,italic:.03588,skew:0},961:{depth:.19444,height:.43056,italic:0,skew:.08334},962:{depth:.09722,height:.43056,italic:.07986,skew:.08334},963:{depth:0,height:.43056,italic:.03588,skew:0},964:{depth:0,height:.43056,italic:.1132,skew:.02778},965:{depth:0,height:.43056,italic:.03588,skew:.02778},966:{depth:.19444,height:.43056,italic:0,skew:.08334},967:{depth:.19444,height:.43056,italic:0,skew:.05556},968:{depth:.19444,height:.69444,italic:.03588,skew:.11111},969:{depth:0,height:.43056,italic:.03588,skew:0},977:{depth:0,height:.69444,italic:0,skew:.08334},981:{depth:.19444,height:.69444,italic:0,skew:.08334},982:{depth:0,height:.43056,italic:.02778,skew:0},1009:{depth:.19444,height:.43056,italic:0,skew:.08334},1013:{depth:0,height:.43056,italic:0,skew:.05556}},"SansSerif-Regular":{33:{depth:0,height:.69444,italic:0,skew:0},34:{depth:0,height:.69444,italic:0,skew:0},35:{depth:.19444,height:.69444,italic:0,skew:0},36:{depth:.05556,height:.75,italic:0,skew:0},37:{depth:.05556,height:.75,italic:0,skew:0},38:{depth:0,height:.69444,italic:0,skew:0},39:{depth:0,height:.69444,italic:0,skew:0},40:{depth:.25,height:.75,italic:0,skew:0},41:{depth:.25,height:.75,italic:0,skew:0},42:{depth:0,height:.75,italic:0,skew:0},43:{depth:.08333,height:.58333,italic:0,skew:0},44:{depth:.125,height:.08333,italic:0,skew:0},45:{depth:0,height:.44444,italic:0,skew:0},46:{depth:0,height:.08333,italic:0,skew:0},47:{depth:.25,height:.75,italic:0,skew:0},48:{depth:0,height:.65556,italic:0,skew:0},49:{depth:0,height:.65556,italic:0,skew:0},50:{depth:0,height:.65556,italic:0,skew:0},51:{depth:0,height:.65556,italic:0,skew:0},52:{depth:0,height:.65556,italic:0,skew:0},53:{depth:0,height:.65556,italic:0,skew:0},54:{depth:0,height:.65556,italic:0,skew:0},55:{depth:0,height:.65556,italic:0,skew:0},56:{depth:0,height:.65556,italic:0,skew:0},57:{depth:0,height:.65556,italic:0,skew:0},58:{depth:0,height:.44444,italic:0,skew:0},59:{depth:.125,height:.44444,italic:0,skew:0},61:{depth:-.13,height:.37,italic:0,skew:0},63:{depth:0,height:.69444,italic:0,skew:0},64:{depth:0,height:.69444,italic:0,skew:0},65:{depth:0,height:.69444,italic:0,skew:0},66:{depth:0,height:.69444,italic:0,skew:0},67:{depth:0,height:.69444,italic:0,skew:0},68:{depth:0,height:.69444,italic:0,skew:0},69:{depth:0,height:.69444,italic:0,skew:0},70:{depth:0,height:.69444,italic:0,skew:0},71:{depth:0,height:.69444,italic:0,skew:0},72:{depth:0,height:.69444,italic:0,skew:0},73:{depth:0,height:.69444,italic:0,skew:0},74:{depth:0,height:.69444,italic:0,skew:0},75:{depth:0,height:.69444,italic:0,skew:0},76:{depth:0,height:.69444,italic:0,skew:0},77:{depth:0,height:.69444,italic:0,skew:0},78:{depth:0,height:.69444,italic:0,skew:0},79:{depth:0,height:.69444,italic:0,skew:0},80:{depth:0,height:.69444,italic:0,skew:0},81:{depth:.125,height:.69444,italic:0,skew:0},82:{depth:0,height:.69444,italic:0,skew:0},83:{depth:0,height:.69444,italic:0,skew:0},84:{depth:0,height:.69444,italic:0,skew:0},85:{depth:0,height:.69444,italic:0,skew:0},86:{depth:0,height:.69444,italic:.01389,skew:0},87:{depth:0,height:.69444,italic:.01389,skew:0},88:{depth:0,height:.69444,italic:0,skew:0},89:{depth:0,height:.69444,italic:.025,skew:0},90:{depth:0,height:.69444,italic:0,skew:0},91:{depth:.25,height:.75,italic:0,skew:0},93:{depth:.25,height:.75,italic:0,skew:0},94:{depth:0,height:.69444,italic:0,skew:0},95:{depth:.35,height:.09444,italic:.02778,skew:0},97:{depth:0,height:.44444,italic:0,skew:0},98:{depth:0,height:.69444,italic:0,skew:0},99:{depth:0,height:.44444,italic:0,skew:0},100:{depth:0,height:.69444,italic:0,skew:0},101:{depth:0,height:.44444,italic:0,skew:0},102:{depth:0,height:.69444,italic:.06944,skew:0},103:{depth:.19444,height:.44444,italic:.01389,skew:0},104:{depth:0,height:.69444,italic:0,skew:0},105:{depth:0,height:.67937,italic:0,skew:0},106:{depth:.19444,height:.67937,italic:0,skew:0},107:{depth:0,height:.69444,italic:0,skew:0},108:{depth:0,height:.69444,italic:0,skew:0},109:{depth:0,height:.44444,italic:0,skew:0},110:{depth:0,height:.44444,italic:0,skew:0},111:{depth:0,height:.44444,italic:0,skew:0},112:{depth:.19444,height:.44444,italic:0,skew:0},113:{depth:.19444,height:.44444,italic:0,skew:0},114:{depth:0,height:.44444,italic:.01389,skew:0},115:{depth:0,height:.44444,italic:0,skew:0},116:{depth:0,height:.57143,italic:0,skew:0},117:{depth:0,height:.44444,italic:0,skew:0},118:{depth:0,height:.44444,italic:.01389,skew:0},119:{depth:0,height:.44444,italic:.01389,skew:0},120:{depth:0,height:.44444,italic:0,skew:0},121:{depth:.19444,height:.44444,italic:.01389,skew:0},122:{depth:0,height:.44444,italic:0,skew:0},126:{depth:.35,height:.32659,italic:0,skew:0},305:{depth:0,height:.44444,italic:0,skew:0},567:{depth:.19444,height:.44444,italic:0,skew:0},768:{depth:0,height:.69444,italic:0,skew:0},769:{depth:0,height:.69444,italic:0,skew:0},770:{depth:0,height:.69444,italic:0,skew:0},771:{depth:0,height:.67659,italic:0,skew:0},772:{depth:0,height:.60889,italic:0,skew:0},774:{depth:0,height:.69444,italic:0,skew:0},775:{depth:0,height:.67937,italic:0,skew:0},776:{depth:0,height:.67937,italic:0,skew:0},778:{depth:0,height:.69444,italic:0,skew:0},779:{depth:0,height:.69444,italic:0,skew:0},780:{depth:0,height:.63194,italic:0,skew:0},915:{depth:0,height:.69444,italic:0,skew:0},916:{depth:0,height:.69444,italic:0,skew:0},920:{depth:0,height:.69444,italic:0,skew:0},923:{depth:0,height:.69444,italic:0,skew:0},926:{depth:0,height:.69444,italic:0,skew:0},928:{depth:0,height:.69444,italic:0,skew:0},931:{depth:0,height:.69444,italic:0,skew:0},933:{depth:0,height:.69444,italic:0,skew:0},934:{depth:0,height:.69444,italic:0,skew:0},936:{depth:0,height:.69444,italic:0,skew:0},937:{depth:0,height:.69444,italic:0,skew:0},8211:{depth:0,height:.44444,italic:.02778,skew:0},8212:{depth:0,height:.44444,italic:.02778,skew:0},8216:{depth:0,height:.69444,italic:0,skew:0},8217:{depth:0,height:.69444,italic:0,skew:0},8220:{depth:0,height:.69444,italic:0,skew:0},8221:{depth:0,height:.69444,italic:0,skew:0}},"Script-Regular":{65:{depth:0,height:.7,italic:.22925,skew:0},66:{depth:0,height:.7,italic:.04087,skew:0},67:{depth:0,height:.7,italic:.1689,skew:0},68:{depth:0,height:.7,italic:.09371,skew:0},69:{depth:0,height:.7,italic:.18583,skew:0},70:{depth:0,height:.7,italic:.13634,skew:0},71:{depth:0,height:.7,italic:.17322,skew:0},72:{depth:0,height:.7,italic:.29694,skew:0},73:{depth:0,height:.7,italic:.19189,skew:0},74:{depth:.27778,height:.7,italic:.19189,skew:0},75:{depth:0,height:.7,italic:.31259,skew:0},76:{depth:0,height:.7,italic:.19189,skew:0},77:{depth:0,height:.7,italic:.15981,skew:0},78:{depth:0,height:.7,italic:.3525,skew:0},79:{depth:0,height:.7,italic:.08078,skew:0},80:{depth:0,height:.7,italic:.08078,skew:0},81:{depth:0,height:.7,italic:.03305,skew:0},82:{depth:0,height:.7,italic:.06259,skew:0},83:{depth:0,height:.7,italic:.19189,skew:0},84:{depth:0,height:.7,italic:.29087,skew:0},85:{depth:0,height:.7,italic:.25815,skew:0},86:{depth:0,height:.7,italic:.27523,skew:0},87:{depth:0,height:.7,italic:.27523,skew:0},88:{depth:0,height:.7,italic:.26006,skew:0},89:{depth:0,height:.7,italic:.2939,skew:0},90:{depth:0,height:.7,italic:.24037,skew:0}},"Size1-Regular":{40:{depth:.35001,height:.85,italic:0,skew:0},41:{depth:.35001,height:.85,italic:0,skew:0},47:{depth:.35001,height:.85,italic:0,skew:0},91:{depth:.35001,height:.85,italic:0,skew:0},92:{depth:.35001,height:.85,italic:0,skew:0},93:{depth:.35001,height:.85,italic:0,skew:0},123:{depth:.35001,height:.85,italic:0,skew:0},125:{depth:.35001,height:.85,italic:0,skew:0},710:{depth:0,height:.72222,italic:0,skew:0},732:{depth:0,height:.72222,italic:0,skew:0},770:{depth:0,height:.72222,italic:0,skew:0},771:{depth:0,height:.72222,italic:0,skew:0},8214:{depth:-99e-5,height:.601,italic:0,skew:0},8593:{depth:1e-5,height:.6,italic:0,skew:0},8595:{depth:1e-5,height:.6,italic:0,skew:0},8657:{depth:1e-5,height:.6,italic:0,skew:0},8659:{depth:1e-5,height:.6,italic:0,skew:0},8719:{depth:.25001,height:.75,italic:0,skew:0},8720:{depth:.25001,height:.75,italic:0,skew:0},8721:{depth:.25001,height:.75,italic:0,skew:0},8730:{depth:.35001,height:.85,italic:0,skew:0},8739:{depth:-.00599,height:.606,italic:0,skew:0},8741:{depth:-.00599,height:.606,italic:0,skew:0},8747:{depth:.30612,height:.805,italic:.19445,skew:0},8748:{depth:.306,height:.805,italic:.19445,skew:0},8749:{depth:.306,height:.805,italic:.19445,skew:0},8750:{depth:.30612,height:.805,italic:.19445,skew:0},8896:{depth:.25001,height:.75,italic:0,skew:0},8897:{depth:.25001,height:.75,italic:0,skew:0},8898:{depth:.25001,height:.75,italic:0,skew:0},8899:{depth:.25001,height:.75,italic:0,skew:0},8968:{depth:.35001,height:.85,italic:0,skew:0},8969:{depth:.35001,height:.85,italic:0,skew:0},8970:{depth:.35001,height:.85,italic:0,skew:0},8971:{depth:.35001,height:.85,italic:0,skew:0},9168:{depth:-99e-5,height:.601,italic:0,skew:0},10216:{depth:.35001,height:.85,italic:0,skew:0},10217:{depth:.35001,height:.85,italic:0,skew:0},10752:{depth:.25001,height:.75,italic:0,skew:0},10753:{depth:.25001,height:.75,italic:0,skew:0},10754:{depth:.25001,height:.75,italic:0,skew:0},10756:{depth:.25001,height:.75,italic:0,skew:0},10758:{depth:.25001,height:.75,italic:0,skew:0}},"Size2-Regular":{40:{depth:.65002,height:1.15,italic:0,skew:0},41:{depth:.65002,height:1.15,italic:0,skew:0},47:{depth:.65002,height:1.15,italic:0,skew:0},91:{depth:.65002,height:1.15,italic:0,skew:0},92:{depth:.65002,height:1.15,italic:0,skew:0},93:{depth:.65002,height:1.15,italic:0,skew:0},123:{depth:.65002,height:1.15,italic:0,skew:0},125:{depth:.65002,height:1.15,italic:0,skew:0},710:{depth:0,height:.75,italic:0,skew:0},732:{depth:0,height:.75,italic:0,skew:0},770:{depth:0,height:.75,italic:0,skew:0},771:{depth:0,height:.75,italic:0,skew:0},8719:{depth:.55001,height:1.05,italic:0,skew:0},8720:{depth:.55001,height:1.05,italic:0,skew:0},8721:{depth:.55001,height:1.05,italic:0,skew:0},8730:{depth:.65002,height:1.15,italic:0,skew:0},8747:{depth:.86225,height:1.36,italic:.44445,skew:0},8748:{depth:.862,height:1.36,italic:.44445,skew:0},8749:{depth:.862,height:1.36,italic:.44445,skew:0},8750:{depth:.86225,height:1.36,italic:.44445,skew:0},8896:{depth:.55001,height:1.05,italic:0,skew:0},8897:{depth:.55001,height:1.05,italic:0,skew:0},8898:{depth:.55001,height:1.05,italic:0,skew:0},8899:{depth:.55001,height:1.05,italic:0,skew:0},8968:{depth:.65002,height:1.15,italic:0,skew:0},8969:{depth:.65002,height:1.15,italic:0,skew:0},8970:{depth:.65002,height:1.15,italic:0,skew:0},8971:{depth:.65002,height:1.15,italic:0,skew:0},10216:{depth:.65002,height:1.15,italic:0,skew:0},10217:{depth:.65002,height:1.15,italic:0,skew:0},10752:{depth:.55001,height:1.05,italic:0,skew:0},10753:{depth:.55001,height:1.05,italic:0,skew:0},10754:{depth:.55001,height:1.05,italic:0,skew:0},10756:{depth:.55001,height:1.05,italic:0,skew:0},10758:{depth:.55001,height:1.05,italic:0,skew:0}},"Size3-Regular":{40:{depth:.95003,height:1.45,italic:0,skew:0},41:{depth:.95003,height:1.45,italic:0,skew:0},47:{depth:.95003,height:1.45,italic:0,skew:0},91:{depth:.95003,height:1.45,italic:0,skew:0},92:{depth:.95003,height:1.45,italic:0,skew:0},93:{depth:.95003,height:1.45,italic:0,skew:0},123:{depth:.95003,height:1.45,italic:0,skew:0},125:{depth:.95003,height:1.45,italic:0,skew:0},710:{depth:0,height:.75,italic:0,skew:0},732:{depth:0,height:.75,italic:0,skew:0},770:{depth:0,height:.75,italic:0,skew:0},771:{depth:0,height:.75,italic:0,skew:0},8730:{depth:.95003,height:1.45,italic:0,skew:0},8968:{depth:.95003,height:1.45,italic:0,skew:0},8969:{depth:.95003,height:1.45,italic:0,skew:0},8970:{depth:.95003,height:1.45,italic:0,skew:0},8971:{depth:.95003,height:1.45,italic:0,skew:0},10216:{depth:.95003,height:1.45,italic:0,skew:0},10217:{depth:.95003,height:1.45,italic:0,skew:0}},"Size4-Regular":{40:{depth:1.25003,height:1.75,italic:0,skew:0},41:{depth:1.25003,height:1.75,italic:0,skew:0},47:{depth:1.25003,height:1.75,italic:0,skew:0},91:{depth:1.25003,height:1.75,italic:0,skew:0},92:{depth:1.25003,height:1.75,italic:0,skew:0},93:{depth:1.25003,height:1.75,italic:0,skew:0},123:{depth:1.25003,height:1.75,italic:0,skew:0},125:{depth:1.25003,height:1.75,italic:0,skew:0},710:{depth:0,height:.825,italic:0,skew:0},732:{depth:0,height:.825,italic:0,skew:0},770:{depth:0,height:.825,italic:0,skew:0},771:{depth:0,height:.825,italic:0,skew:0},8730:{depth:1.25003,height:1.75,italic:0,skew:0},8968:{depth:1.25003,height:1.75,italic:0,skew:0},8969:{depth:1.25003,height:1.75,italic:0,skew:0},8970:{depth:1.25003,height:1.75,italic:0,skew:0},8971:{depth:1.25003,height:1.75,italic:0,skew:0},9115:{depth:.64502,height:1.155,italic:0,skew:0},9116:{depth:1e-5,height:.6,italic:0,skew:0},9117:{depth:.64502,height:1.155,italic:0,skew:0},9118:{depth:.64502,height:1.155,italic:0,skew:0},9119:{depth:1e-5,height:.6,italic:0,skew:0},9120:{depth:.64502,height:1.155,italic:0,skew:0},9121:{depth:.64502,height:1.155,italic:0,skew:0},9122:{depth:-99e-5,height:.601,italic:0,skew:0},9123:{depth:.64502,height:1.155,italic:0,skew:0},9124:{depth:.64502,height:1.155,italic:0,skew:0},9125:{depth:-99e-5,height:.601,italic:0,
-skew:0},9126:{depth:.64502,height:1.155,italic:0,skew:0},9127:{depth:1e-5,height:.9,italic:0,skew:0},9128:{depth:.65002,height:1.15,italic:0,skew:0},9129:{depth:.90001,height:0,italic:0,skew:0},9130:{depth:0,height:.3,italic:0,skew:0},9131:{depth:1e-5,height:.9,italic:0,skew:0},9132:{depth:.65002,height:1.15,italic:0,skew:0},9133:{depth:.90001,height:0,italic:0,skew:0},9143:{depth:.88502,height:.915,italic:0,skew:0},10216:{depth:1.25003,height:1.75,italic:0,skew:0},10217:{depth:1.25003,height:1.75,italic:0,skew:0},57344:{depth:-.00499,height:.605,italic:0,skew:0},57345:{depth:-.00499,height:.605,italic:0,skew:0},57680:{depth:0,height:.12,italic:0,skew:0},57681:{depth:0,height:.12,italic:0,skew:0},57682:{depth:0,height:.12,italic:0,skew:0},57683:{depth:0,height:.12,italic:0,skew:0}},"Typewriter-Regular":{33:{depth:0,height:.61111,italic:0,skew:0},34:{depth:0,height:.61111,italic:0,skew:0},35:{depth:0,height:.61111,italic:0,skew:0},36:{depth:.08333,height:.69444,italic:0,skew:0},37:{depth:.08333,height:.69444,italic:0,skew:0},38:{depth:0,height:.61111,italic:0,skew:0},39:{depth:0,height:.61111,italic:0,skew:0},40:{depth:.08333,height:.69444,italic:0,skew:0},41:{depth:.08333,height:.69444,italic:0,skew:0},42:{depth:0,height:.52083,italic:0,skew:0},43:{depth:-.08056,height:.53055,italic:0,skew:0},44:{depth:.13889,height:.125,italic:0,skew:0},45:{depth:-.08056,height:.53055,italic:0,skew:0},46:{depth:0,height:.125,italic:0,skew:0},47:{depth:.08333,height:.69444,italic:0,skew:0},48:{depth:0,height:.61111,italic:0,skew:0},49:{depth:0,height:.61111,italic:0,skew:0},50:{depth:0,height:.61111,italic:0,skew:0},51:{depth:0,height:.61111,italic:0,skew:0},52:{depth:0,height:.61111,italic:0,skew:0},53:{depth:0,height:.61111,italic:0,skew:0},54:{depth:0,height:.61111,italic:0,skew:0},55:{depth:0,height:.61111,italic:0,skew:0},56:{depth:0,height:.61111,italic:0,skew:0},57:{depth:0,height:.61111,italic:0,skew:0},58:{depth:0,height:.43056,italic:0,skew:0},59:{depth:.13889,height:.43056,italic:0,skew:0},60:{depth:-.05556,height:.55556,italic:0,skew:0},61:{depth:-.19549,height:.41562,italic:0,skew:0},62:{depth:-.05556,height:.55556,italic:0,skew:0},63:{depth:0,height:.61111,italic:0,skew:0},64:{depth:0,height:.61111,italic:0,skew:0},65:{depth:0,height:.61111,italic:0,skew:0},66:{depth:0,height:.61111,italic:0,skew:0},67:{depth:0,height:.61111,italic:0,skew:0},68:{depth:0,height:.61111,italic:0,skew:0},69:{depth:0,height:.61111,italic:0,skew:0},70:{depth:0,height:.61111,italic:0,skew:0},71:{depth:0,height:.61111,italic:0,skew:0},72:{depth:0,height:.61111,italic:0,skew:0},73:{depth:0,height:.61111,italic:0,skew:0},74:{depth:0,height:.61111,italic:0,skew:0},75:{depth:0,height:.61111,italic:0,skew:0},76:{depth:0,height:.61111,italic:0,skew:0},77:{depth:0,height:.61111,italic:0,skew:0},78:{depth:0,height:.61111,italic:0,skew:0},79:{depth:0,height:.61111,italic:0,skew:0},80:{depth:0,height:.61111,italic:0,skew:0},81:{depth:.13889,height:.61111,italic:0,skew:0},82:{depth:0,height:.61111,italic:0,skew:0},83:{depth:0,height:.61111,italic:0,skew:0},84:{depth:0,height:.61111,italic:0,skew:0},85:{depth:0,height:.61111,italic:0,skew:0},86:{depth:0,height:.61111,italic:0,skew:0},87:{depth:0,height:.61111,italic:0,skew:0},88:{depth:0,height:.61111,italic:0,skew:0},89:{depth:0,height:.61111,italic:0,skew:0},90:{depth:0,height:.61111,italic:0,skew:0},91:{depth:.08333,height:.69444,italic:0,skew:0},92:{depth:.08333,height:.69444,italic:0,skew:0},93:{depth:.08333,height:.69444,italic:0,skew:0},94:{depth:0,height:.61111,italic:0,skew:0},95:{depth:.09514,height:0,italic:0,skew:0},96:{depth:0,height:.61111,italic:0,skew:0},97:{depth:0,height:.43056,italic:0,skew:0},98:{depth:0,height:.61111,italic:0,skew:0},99:{depth:0,height:.43056,italic:0,skew:0},100:{depth:0,height:.61111,italic:0,skew:0},101:{depth:0,height:.43056,italic:0,skew:0},102:{depth:0,height:.61111,italic:0,skew:0},103:{depth:.22222,height:.43056,italic:0,skew:0},104:{depth:0,height:.61111,italic:0,skew:0},105:{depth:0,height:.61111,italic:0,skew:0},106:{depth:.22222,height:.61111,italic:0,skew:0},107:{depth:0,height:.61111,italic:0,skew:0},108:{depth:0,height:.61111,italic:0,skew:0},109:{depth:0,height:.43056,italic:0,skew:0},110:{depth:0,height:.43056,italic:0,skew:0},111:{depth:0,height:.43056,italic:0,skew:0},112:{depth:.22222,height:.43056,italic:0,skew:0},113:{depth:.22222,height:.43056,italic:0,skew:0},114:{depth:0,height:.43056,italic:0,skew:0},115:{depth:0,height:.43056,italic:0,skew:0},116:{depth:0,height:.55358,italic:0,skew:0},117:{depth:0,height:.43056,italic:0,skew:0},118:{depth:0,height:.43056,italic:0,skew:0},119:{depth:0,height:.43056,italic:0,skew:0},120:{depth:0,height:.43056,italic:0,skew:0},121:{depth:.22222,height:.43056,italic:0,skew:0},122:{depth:0,height:.43056,italic:0,skew:0},123:{depth:.08333,height:.69444,italic:0,skew:0},124:{depth:.08333,height:.69444,italic:0,skew:0},125:{depth:.08333,height:.69444,italic:0,skew:0},126:{depth:0,height:.61111,italic:0,skew:0},127:{depth:0,height:.61111,italic:0,skew:0},305:{depth:0,height:.43056,italic:0,skew:0},567:{depth:.22222,height:.43056,italic:0,skew:0},768:{depth:0,height:.61111,italic:0,skew:0},769:{depth:0,height:.61111,italic:0,skew:0},770:{depth:0,height:.61111,italic:0,skew:0},771:{depth:0,height:.61111,italic:0,skew:0},772:{depth:0,height:.56555,italic:0,skew:0},774:{depth:0,height:.61111,italic:0,skew:0},776:{depth:0,height:.61111,italic:0,skew:0},778:{depth:0,height:.61111,italic:0,skew:0},780:{depth:0,height:.56597,italic:0,skew:0},915:{depth:0,height:.61111,italic:0,skew:0},916:{depth:0,height:.61111,italic:0,skew:0},920:{depth:0,height:.61111,italic:0,skew:0},923:{depth:0,height:.61111,italic:0,skew:0},926:{depth:0,height:.61111,italic:0,skew:0},928:{depth:0,height:.61111,italic:0,skew:0},931:{depth:0,height:.61111,italic:0,skew:0},933:{depth:0,height:.61111,italic:0,skew:0},934:{depth:0,height:.61111,italic:0,skew:0},936:{depth:0,height:.61111,italic:0,skew:0},937:{depth:0,height:.61111,italic:0,skew:0},2018:{depth:0,height:.61111,italic:0,skew:0},2019:{depth:0,height:.61111,italic:0,skew:0},8242:{depth:0,height:.61111,italic:0,skew:0}}}},{}],18:[function(e,t,i){var h=e("./utils");var a=e("./ParseError");var r={"\\sqrt":{numArgs:1,numOptionalArgs:1,handler:function(e,t,i,h){return{type:"sqrt",body:i,index:t}}},"\\text":{numArgs:1,argTypes:["text"],greediness:2,handler:function(e,t){var i;if(t.type==="ordgroup"){i=t.value}else{i=[t]}return{type:"text",body:i}}},"\\color":{numArgs:2,allowedInText:true,greediness:3,argTypes:["color","original"],handler:function(e,t,i){var h;if(i.type==="ordgroup"){h=i.value}else{h=[i]}return{type:"color",color:t.value,value:h}}},"\\overline":{numArgs:1,handler:function(e,t){return{type:"overline",body:t}}},"\\rule":{numArgs:2,numOptionalArgs:1,argTypes:["size","size","size"],handler:function(e,t,i,h){return{type:"rule",shift:t&&t.value,width:i.value,height:h.value}}},"\\KaTeX":{numArgs:0,handler:function(e){return{type:"katex"}}},"\\phantom":{numArgs:1,handler:function(e,t){var i;if(t.type==="ordgroup"){i=t.value}else{i=[t]}return{type:"phantom",value:i}}}};var l={"\\bigl":{type:"open",size:1},"\\Bigl":{type:"open",size:2},"\\biggl":{type:"open",size:3},"\\Biggl":{type:"open",size:4},"\\bigr":{type:"close",size:1},"\\Bigr":{type:"close",size:2},"\\biggr":{type:"close",size:3},"\\Biggr":{type:"close",size:4},"\\bigm":{type:"rel",size:1},"\\Bigm":{type:"rel",size:2},"\\biggm":{type:"rel",size:3},"\\Biggm":{type:"rel",size:4},"\\big":{type:"textord",size:1},"\\Big":{type:"textord",size:2},"\\bigg":{type:"textord",size:3},"\\Bigg":{type:"textord",size:4}};var s=["(",")","[","\\lbrack","]","\\rbrack","\\{","\\lbrace","\\}","\\rbrace","\\lfloor","\\rfloor","\\lceil","\\rceil","<",">","\\langle","\\rangle","\\lvert","\\rvert","\\lVert","\\rVert","\\lgroup","\\rgroup","\\lmoustache","\\rmoustache","/","\\backslash","|","\\vert","\\|","\\Vert","\\uparrow","\\Uparrow","\\downarrow","\\Downarrow","\\updownarrow","\\Updownarrow","."];var p={"\\Bbb":"\\mathbb","\\bold":"\\mathbf","\\frak":"\\mathfrak"};var c=[{funcs:["\\blue","\\orange","\\pink","\\red","\\green","\\gray","\\purple","\\blueA","\\blueB","\\blueC","\\blueD","\\blueE","\\tealA","\\tealB","\\tealC","\\tealD","\\tealE","\\greenA","\\greenB","\\greenC","\\greenD","\\greenE","\\goldA","\\goldB","\\goldC","\\goldD","\\goldE","\\redA","\\redB","\\redC","\\redD","\\redE","\\maroonA","\\maroonB","\\maroonC","\\maroonD","\\maroonE","\\purpleA","\\purpleB","\\purpleC","\\purpleD","\\purpleE","\\mintA","\\mintB","\\mintC","\\grayA","\\grayB","\\grayC","\\grayD","\\grayE","\\grayF","\\grayG","\\grayH","\\grayI","\\kaBlue","\\kaGreen"],data:{numArgs:1,allowedInText:true,greediness:3,handler:function(e,t){var i;if(t.type==="ordgroup"){i=t.value}else{i=[t]}return{type:"color",color:"katex-"+e.slice(1),value:i}}}},{funcs:["\\arcsin","\\arccos","\\arctan","\\arg","\\cos","\\cosh","\\cot","\\coth","\\csc","\\deg","\\dim","\\exp","\\hom","\\ker","\\lg","\\ln","\\log","\\sec","\\sin","\\sinh","\\tan","\\tanh"],data:{numArgs:0,handler:function(e){return{type:"op",limits:false,symbol:false,body:e}}}},{funcs:["\\det","\\gcd","\\inf","\\lim","\\liminf","\\limsup","\\max","\\min","\\Pr","\\sup"],data:{numArgs:0,handler:function(e){return{type:"op",limits:true,symbol:false,body:e}}}},{funcs:["\\int","\\iint","\\iiint","\\oint"],data:{numArgs:0,handler:function(e){return{type:"op",limits:false,symbol:true,body:e}}}},{funcs:["\\coprod","\\bigvee","\\bigwedge","\\biguplus","\\bigcap","\\bigcup","\\intop","\\prod","\\sum","\\bigotimes","\\bigoplus","\\bigodot","\\bigsqcup","\\smallint"],data:{numArgs:0,handler:function(e){return{type:"op",limits:true,symbol:true,body:e}}}},{funcs:["\\dfrac","\\frac","\\tfrac","\\dbinom","\\binom","\\tbinom"],data:{numArgs:2,greediness:2,handler:function(e,t,i){var h;var a=null;var r=null;var l="auto";switch(e){case"\\dfrac":case"\\frac":case"\\tfrac":h=true;break;case"\\dbinom":case"\\binom":case"\\tbinom":h=false;a="(";r=")";break;default:throw new Error("Unrecognized genfrac command")}switch(e){case"\\dfrac":case"\\dbinom":l="display";break;case"\\tfrac":case"\\tbinom":l="text";break}return{type:"genfrac",numer:t,denom:i,hasBarLine:h,leftDelim:a,rightDelim:r,size:l}}}},{funcs:["\\llap","\\rlap"],data:{numArgs:1,allowedInText:true,handler:function(e,t){return{type:e.slice(1),body:t}}}},{funcs:["\\bigl","\\Bigl","\\biggl","\\Biggl","\\bigr","\\Bigr","\\biggr","\\Biggr","\\bigm","\\Bigm","\\biggm","\\Biggm","\\big","\\Big","\\bigg","\\Bigg","\\left","\\right"],data:{numArgs:1,handler:function(e,t,i){if(!h.contains(s,t.value)){throw new a("Invalid delimiter: '"+t.value+"' after '"+e+"'",this.lexer,i[1])}if(e==="\\left"||e==="\\right"){return{type:"leftright",value:t.value}}else{return{type:"delimsizing",size:l[e].size,delimType:l[e].type,value:t.value}}}}},{funcs:["\\tiny","\\scriptsize","\\footnotesize","\\small","\\normalsize","\\large","\\Large","\\LARGE","\\huge","\\Huge"],data:{numArgs:0}},{funcs:["\\displaystyle","\\textstyle","\\scriptstyle","\\scriptscriptstyle"],data:{numArgs:0}},{funcs:["\\mathrm","\\mathit","\\mathbf","\\mathbb","\\mathcal","\\mathfrak","\\mathscr","\\mathsf","\\mathtt","\\Bbb","\\bold","\\frak"],data:{numArgs:1,handler:function(e,t){if(e in p){e=p[e]}return{type:"font",font:e.slice(1),body:t}}}},{funcs:["\\acute","\\grave","\\ddot","\\tilde","\\bar","\\breve","\\check","\\hat","\\vec","\\dot"],data:{numArgs:1,handler:function(e,t){return{type:"accent",accent:e,base:t}}}},{funcs:["\\over","\\choose"],data:{numArgs:0,handler:function(e){var t;switch(e){case"\\over":t="\\frac";break;case"\\choose":t="\\binom";break;default:throw new Error("Unrecognized infix genfrac command")}return{type:"infix",replaceWith:t}}}},{funcs:["\\\\","\\cr"],data:{numArgs:0,numOptionalArgs:1,argTypes:["size"],handler:function(e,t){return{type:"cr",size:t}}}},{funcs:["\\begin","\\end"],data:{numArgs:1,argTypes:["text"],handler:function(e,t,i){if(t.type!=="ordgroup"){throw new a("Invalid environment name",this.lexer,i[1])}var h="";for(var r=0;r<t.value.length;++r){h+=t.value[r].value}return{type:"environment",name:h,namepos:i[1]}}}}];var n=function(e,t){for(var i=0;i<e.length;i++){r[e[i]]=t}};for(var o=0;o<c.length;o++){n(c[o].funcs,c[o].data)}for(var g in r){if(r.hasOwnProperty(g)){var d=r[g];r[g]={numArgs:d.numArgs,argTypes:d.argTypes,greediness:d.greediness===undefined?1:d.greediness,allowedInText:d.allowedInText?d.allowedInText:false,numOptionalArgs:d.numOptionalArgs===undefined?0:d.numOptionalArgs,handler:d.handler}}}t.exports={funcs:r}},{"./ParseError":5,"./utils":23}],19:[function(e,t,i){var h=e("./utils");function a(e,t){this.type=e;this.attributes={};this.children=t||[]}a.prototype.setAttribute=function(e,t){this.attributes[e]=t};a.prototype.toNode=function(){var e=document.createElementNS("http://www.w3.org/1998/Math/MathML",this.type);for(var t in this.attributes){if(Object.prototype.hasOwnProperty.call(this.attributes,t)){e.setAttribute(t,this.attributes[t])}}for(var i=0;i<this.children.length;i++){e.appendChild(this.children[i].toNode())}return e};a.prototype.toMarkup=function(){var e="<"+this.type;for(var t in this.attributes){if(Object.prototype.hasOwnProperty.call(this.attributes,t)){e+=" "+t+'="';e+=h.escape(this.attributes[t]);e+='"'}}e+=">";for(var i=0;i<this.children.length;i++){e+=this.children[i].toMarkup()}e+="</"+this.type+">";return e};function r(e){this.text=e}r.prototype.toNode=function(){return document.createTextNode(this.text)};r.prototype.toMarkup=function(){return h.escape(this.text)};t.exports={MathNode:a,TextNode:r}},{"./utils":23}],20:[function(e,t,i){function h(e,t,i){this.type=e;this.value=t;this.mode=i}function a(e,t,i){this.result=e;this.position=t}t.exports={ParseNode:h,ParseResult:a}},{}],21:[function(e,t,i){var h=e("./Parser");var a=function(e,t){var i=new h(e,t);return i.parse()};t.exports=a},{"./Parser":6}],22:[function(e,t,i){var h={math:{"\\equiv":{font:"main",group:"rel",replace:"\u2261"},"\\prec":{font:"main",group:"rel",replace:"\u227a"},"\\succ":{font:"main",group:"rel",replace:"\u227b"},"\\sim":{font:"main",group:"rel",replace:"\u223c"},"\\perp":{font:"main",group:"rel",replace:"\u22a5"},"\\preceq":{font:"main",group:"rel",replace:"\u2aaf"},"\\succeq":{font:"main",group:"rel",replace:"\u2ab0"},"\\simeq":{font:"main",group:"rel",replace:"\u2243"},"\\mid":{font:"main",group:"rel",replace:"\u2223"},"\\ll":{font:"main",group:"rel",replace:"\u226a"},"\\gg":{font:"main",group:"rel",replace:"\u226b"},"\\asymp":{font:"main",group:"rel",replace:"\u224d"},"\\parallel":{font:"main",group:"rel",replace:"\u2225"},"\\bowtie":{font:"main",group:"rel",replace:"\u22c8"},"\\smile":{font:"main",group:"rel",replace:"\u2323"},"\\sqsubseteq":{font:"main",group:"rel",replace:"\u2291"},"\\sqsupseteq":{font:"main",group:"rel",replace:"\u2292"},"\\doteq":{font:"main",group:"rel",replace:"\u2250"},"\\frown":{font:"main",group:"rel",replace:"\u2322"},"\\ni":{font:"main",group:"rel",replace:"\u220b"},"\\propto":{font:"main",group:"rel",replace:"\u221d"},"\\vdash":{font:"main",group:"rel",replace:"\u22a2"},"\\dashv":{font:"main",group:"rel",replace:"\u22a3"},"\\owns":{font:"main",group:"rel",replace:"\u220b"},"\\ldotp":{font:"main",group:"punct",replace:"."},"\\cdotp":{font:"main",group:"punct",replace:"\u22c5"},"\\#":{font:"main",group:"textord",replace:"#"},"\\&":{font:"main",group:"textord",replace:"&"},"\\aleph":{font:"main",group:"textord",replace:"\u2135"},"\\forall":{font:"main",group:"textord",replace:"\u2200"},"\\hbar":{font:"main",group:"textord",replace:"\u210f"},"\\exists":{font:"main",group:"textord",replace:"\u2203"},"\\nabla":{font:"main",group:"textord",replace:"\u2207"},"\\flat":{font:"main",group:"textord",replace:"\u266d"},"\\ell":{font:"main",group:"textord",replace:"\u2113"},"\\natural":{font:"main",group:"textord",replace:"\u266e"},"\\clubsuit":{font:"main",group:"textord",replace:"\u2663"},"\\wp":{font:"main",group:"textord",replace:"\u2118"},"\\sharp":{font:"main",group:"textord",replace:"\u266f"},"\\diamondsuit":{font:"main",group:"textord",replace:"\u2662"},"\\Re":{font:"main",group:"textord",replace:"\u211c"},"\\heartsuit":{font:"main",group:"textord",replace:"\u2661"},"\\Im":{font:"main",group:"textord",replace:"\u2111"},"\\spadesuit":{font:"main",group:"textord",replace:"\u2660"},"\\dag":{font:"main",group:"textord",replace:"\u2020"},"\\ddag":{font:"main",group:"textord",replace:"\u2021"},"\\rmoustache":{font:"main",group:"close",replace:"\u23b1"},"\\lmoustache":{font:"main",group:"open",replace:"\u23b0"},"\\rgroup":{font:"main",group:"close",replace:"\u27ef"},"\\lgroup":{font:"main",group:"open",replace:"\u27ee"},"\\mp":{font:"main",group:"bin",replace:"\u2213"},"\\ominus":{font:"main",group:"bin",replace:"\u2296"},"\\uplus":{font:"main",group:"bin",replace:"\u228e"},"\\sqcap":{font:"main",group:"bin",replace:"\u2293"},"\\ast":{font:"main",group:"bin",replace:"\u2217"},"\\sqcup":{font:"main",group:"bin",replace:"\u2294"},"\\bigcirc":{font:"main",group:"bin",replace:"\u25ef"},"\\bullet":{font:"main",group:"bin",replace:"\u2219"},"\\ddagger":{font:"main",group:"bin",replace:"\u2021"},"\\wr":{font:"main",group:"bin",replace:"\u2240"},"\\amalg":{font:"main",group:"bin",replace:"\u2a3f"},"\\longleftarrow":{font:"main",group:"rel",replace:"\u27f5"},"\\Leftarrow":{font:"main",group:"rel",replace:"\u21d0"},"\\Longleftarrow":{font:"main",group:"rel",replace:"\u27f8"},"\\longrightarrow":{font:"main",group:"rel",replace:"\u27f6"},"\\Rightarrow":{font:"main",group:"rel",replace:"\u21d2"},"\\Longrightarrow":{font:"main",group:"rel",replace:"\u27f9"},"\\leftrightarrow":{font:"main",group:"rel",replace:"\u2194"},"\\longleftrightarrow":{font:"main",group:"rel",replace:"\u27f7"},"\\Leftrightarrow":{font:"main",group:"rel",replace:"\u21d4"},"\\Longleftrightarrow":{font:"main",group:"rel",replace:"\u27fa"},"\\mapsto":{font:"main",group:"rel",replace:"\u21a6"},"\\longmapsto":{font:"main",group:"rel",replace:"\u27fc"},"\\nearrow":{font:"main",group:"rel",replace:"\u2197"},"\\hookleftarrow":{font:"main",group:"rel",replace:"\u21a9"},"\\hookrightarrow":{font:"main",group:"rel",replace:"\u21aa"},"\\searrow":{font:"main",group:"rel",replace:"\u2198"},"\\leftharpoonup":{font:"main",group:"rel",replace:"\u21bc"},"\\rightharpoonup":{font:"main",group:"rel",replace:"\u21c0"},"\\swarrow":{font:"main",group:"rel",replace:"\u2199"},"\\leftharpoondown":{font:"main",group:"rel",replace:"\u21bd"},"\\rightharpoondown":{font:"main",group:"rel",replace:"\u21c1"},"\\nwarrow":{font:"main",group:"rel",replace:"\u2196"},"\\rightleftharpoons":{font:"main",group:"rel",replace:"\u21cc"},"\\nless":{font:"ams",group:"rel",replace:"\u226e"},"\\nleqslant":{font:"ams",group:"rel",replace:"\ue010"},"\\nleqq":{font:"ams",group:"rel",replace:"\ue011"},"\\lneq":{font:"ams",group:"rel",replace:"\u2a87"},"\\lneqq":{font:"ams",group:"rel",replace:"\u2268"},"\\lvertneqq":{font:"ams",group:"rel",replace:"\ue00c"},"\\lnsim":{font:"ams",group:"rel",replace:"\u22e6"},"\\lnapprox":{font:"ams",group:"rel",replace:"\u2a89"},"\\nprec":{font:"ams",group:"rel",replace:"\u2280"},"\\npreceq":{font:"ams",group:"rel",replace:"\u22e0"},"\\precnsim":{font:"ams",group:"rel",replace:"\u22e8"},"\\precnapprox":{font:"ams",group:"rel",replace:"\u2ab9"},"\\nsim":{font:"ams",group:"rel",replace:"\u2241"},"\\nshortmid":{font:"ams",group:"rel",replace:"\ue006"},"\\nmid":{font:"ams",group:"rel",replace:"\u2224"},"\\nvdash":{font:"ams",group:"rel",replace:"\u22ac"},"\\nvDash":{font:"ams",group:"rel",replace:"\u22ad"},"\\ntriangleleft":{font:"ams",group:"rel",replace:"\u22ea"},"\\ntrianglelefteq":{font:"ams",group:"rel",replace:"\u22ec"},"\\subsetneq":{font:"ams",group:"rel",replace:"\u228a"},"\\varsubsetneq":{font:"ams",group:"rel",replace:"\ue01a"},"\\subsetneqq":{font:"ams",group:"rel",replace:"\u2acb"},"\\varsubsetneqq":{font:"ams",group:"rel",replace:"\ue017"},"\\ngtr":{font:"ams",group:"rel",replace:"\u226f"},"\\ngeqslant":{font:"ams",group:"rel",replace:"\ue00f"},"\\ngeqq":{font:"ams",group:"rel",replace:"\ue00e"},"\\gneq":{font:"ams",group:"rel",replace:"\u2a88"},"\\gneqq":{font:"ams",group:"rel",replace:"\u2269"},"\\gvertneqq":{font:"ams",group:"rel",replace:"\ue00d"},"\\gnsim":{font:"ams",group:"rel",replace:"\u22e7"},"\\gnapprox":{font:"ams",group:"rel",replace:"\u2a8a"},"\\nsucc":{font:"ams",group:"rel",replace:"\u2281"},"\\nsucceq":{font:"ams",group:"rel",replace:"\u22e1"},"\\succnsim":{font:"ams",group:"rel",replace:"\u22e9"},"\\succnapprox":{font:"ams",group:"rel",replace:"\u2aba"},"\\ncong":{font:"ams",group:"rel",replace:"\u2246"},"\\nshortparallel":{font:"ams",group:"rel",replace:"\ue007"},"\\nparallel":{font:"ams",group:"rel",replace:"\u2226"},"\\nVDash":{font:"ams",group:"rel",replace:"\u22af"},"\\ntriangleright":{font:"ams",group:"rel",replace:"\u22eb"},"\\ntrianglerighteq":{font:"ams",group:"rel",replace:"\u22ed"},"\\nsupseteqq":{font:"ams",group:"rel",replace:"\ue018"},"\\supsetneq":{font:"ams",group:"rel",replace:"\u228b"},"\\varsupsetneq":{font:"ams",group:"rel",replace:"\ue01b"},"\\supsetneqq":{font:"ams",group:"rel",replace:"\u2acc"},"\\varsupsetneqq":{font:"ams",group:"rel",replace:"\ue019"},"\\nVdash":{font:"ams",group:"rel",replace:"\u22ae"},"\\precneqq":{font:"ams",group:"rel",replace:"\u2ab5"},"\\succneqq":{font:"ams",group:"rel",replace:"\u2ab6"},"\\nsubseteqq":{font:"ams",group:"rel",replace:"\ue016"},"\\unlhd":{font:"ams",group:"bin",replace:"\u22b4"},"\\unrhd":{font:"ams",group:"bin",replace:"\u22b5"},"\\nleftarrow":{font:"ams",group:"rel",replace:"\u219a"},"\\nrightarrow":{font:"ams",group:"rel",replace:"\u219b"},"\\nLeftarrow":{font:"ams",group:"rel",replace:"\u21cd"},"\\nRightarrow":{font:"ams",group:"rel",replace:"\u21cf"},"\\nleftrightarrow":{font:"ams",group:"rel",replace:"\u21ae"},"\\nLeftrightarrow":{font:"ams",group:"rel",replace:"\u21ce"},"\\vartriangle":{font:"ams",group:"rel",replace:"\u25b3"},"\\hslash":{font:"ams",group:"textord",replace:"\u210f"},"\\triangledown":{font:"ams",group:"textord",replace:"\u25bd"},"\\lozenge":{font:"ams",group:"textord",replace:"\u25ca"},"\\circledS":{font:"ams",group:"textord",replace:"\u24c8"},"\\circledR":{font:"ams",group:"textord",replace:"\xae"},"\\measuredangle":{font:"ams",group:"textord",replace:"\u2221"},"\\nexists":{font:"ams",group:"textord",replace:"\u2204"},"\\mho":{font:"ams",group:"textord",replace:"\u2127"},"\\Finv":{font:"ams",group:"textord",replace:"\u2132"},"\\Game":{font:"ams",group:"textord",replace:"\u2141"},"\\Bbbk":{font:"ams",group:"textord",replace:"k"},"\\backprime":{font:"ams",group:"textord",replace:"\u2035"},"\\blacktriangle":{font:"ams",group:"textord",replace:"\u25b2"},"\\blacktriangledown":{font:"ams",group:"textord",replace:"\u25bc"},"\\blacksquare":{font:"ams",group:"textord",replace:"\u25a0"},"\\blacklozenge":{font:"ams",group:"textord",replace:"\u29eb"},"\\bigstar":{font:"ams",group:"textord",replace:"\u2605"},"\\sphericalangle":{font:"ams",group:"textord",replace:"\u2222"},"\\complement":{font:"ams",group:"textord",replace:"\u2201"},"\\eth":{font:"ams",group:"textord",replace:"\xf0"},"\\diagup":{font:"ams",group:"textord",replace:"\u2571"},"\\diagdown":{font:"ams",group:"textord",replace:"\u2572"},"\\square":{font:"ams",group:"textord",replace:"\u25a1"},"\\Box":{font:"ams",group:"textord",replace:"\u25a1"},"\\Diamond":{font:"ams",group:"textord",replace:"\u25ca"},"\\yen":{font:"ams",group:"textord",replace:"\xa5"},"\\checkmark":{font:"ams",group:"textord",replace:"\u2713"},"\\beth":{font:"ams",group:"textord",replace:"\u2136"},"\\daleth":{font:"ams",group:"textord",replace:"\u2138"},"\\gimel":{font:"ams",group:"textord",replace:"\u2137"},"\\digamma":{font:"ams",group:"textord",replace:"\u03dd"},"\\varkappa":{font:"ams",group:"textord",replace:"\u03f0"},"\\ulcorner":{font:"ams",group:"open",replace:"\u250c"},"\\urcorner":{font:"ams",group:"close",replace:"\u2510"},"\\llcorner":{font:"ams",group:"open",replace:"\u2514"},"\\lrcorner":{font:"ams",group:"close",replace:"\u2518"},"\\leqq":{font:"ams",group:"rel",replace:"\u2266"},"\\leqslant":{font:"ams",group:"rel",replace:"\u2a7d"},"\\eqslantless":{font:"ams",group:"rel",replace:"\u2a95"},"\\lesssim":{font:"ams",group:"rel",replace:"\u2272"},"\\lessapprox":{font:"ams",group:"rel",replace:"\u2a85"},"\\approxeq":{font:"ams",group:"rel",replace:"\u224a"},"\\lessdot":{font:"ams",group:"bin",replace:"\u22d6"},"\\lll":{font:"ams",group:"rel",replace:"\u22d8"},"\\lessgtr":{font:"ams",group:"rel",replace:"\u2276"},"\\lesseqgtr":{font:"ams",group:"rel",replace:"\u22da"},"\\lesseqqgtr":{font:"ams",group:"rel",replace:"\u2a8b"},"\\doteqdot":{font:"ams",group:"rel",replace:"\u2251"},"\\risingdotseq":{font:"ams",group:"rel",replace:"\u2253"},"\\fallingdotseq":{font:"ams",group:"rel",replace:"\u2252"},"\\backsim":{font:"ams",group:"rel",replace:"\u223d"},"\\backsimeq":{font:"ams",group:"rel",replace:"\u22cd"},"\\subseteqq":{font:"ams",group:"rel",replace:"\u2ac5"},"\\Subset":{font:"ams",group:"rel",replace:"\u22d0"},"\\sqsubset":{font:"ams",group:"rel",replace:"\u228f"},"\\preccurlyeq":{font:"ams",group:"rel",replace:"\u227c"},"\\curlyeqprec":{font:"ams",group:"rel",replace:"\u22de"},"\\precsim":{font:"ams",group:"rel",replace:"\u227e"},"\\precapprox":{font:"ams",group:"rel",replace:"\u2ab7"},"\\vartriangleleft":{font:"ams",group:"rel",replace:"\u22b2"},"\\trianglelefteq":{font:"ams",group:"rel",replace:"\u22b4"},"\\vDash":{font:"ams",group:"rel",replace:"\u22a8"},"\\Vvdash":{font:"ams",group:"rel",replace:"\u22aa"},"\\smallsmile":{font:"ams",group:"rel",replace:"\u2323"},"\\smallfrown":{font:"ams",group:"rel",replace:"\u2322"},"\\bumpeq":{font:"ams",group:"rel",replace:"\u224f"},"\\Bumpeq":{font:"ams",group:"rel",replace:"\u224e"},"\\geqq":{font:"ams",group:"rel",replace:"\u2267"},"\\geqslant":{font:"ams",group:"rel",replace:"\u2a7e"},"\\eqslantgtr":{font:"ams",group:"rel",replace:"\u2a96"},"\\gtrsim":{font:"ams",group:"rel",replace:"\u2273"},"\\gtrapprox":{font:"ams",group:"rel",replace:"\u2a86"},"\\gtrdot":{font:"ams",group:"bin",replace:"\u22d7"},"\\ggg":{font:"ams",group:"rel",replace:"\u22d9"},"\\gtrless":{font:"ams",group:"rel",replace:"\u2277"},"\\gtreqless":{font:"ams",group:"rel",replace:"\u22db"},"\\gtreqqless":{font:"ams",group:"rel",replace:"\u2a8c"},"\\eqcirc":{font:"ams",group:"rel",replace:"\u2256"},"\\circeq":{font:"ams",group:"rel",replace:"\u2257"},"\\triangleq":{font:"ams",group:"rel",replace:"\u225c"},"\\thicksim":{font:"ams",group:"rel",replace:"\u223c"},"\\thickapprox":{font:"ams",group:"rel",replace:"\u2248"},"\\supseteqq":{font:"ams",group:"rel",replace:"\u2ac6"},"\\Supset":{font:"ams",group:"rel",replace:"\u22d1"},"\\sqsupset":{font:"ams",group:"rel",replace:"\u2290"},"\\succcurlyeq":{font:"ams",group:"rel",replace:"\u227d"},"\\curlyeqsucc":{font:"ams",group:"rel",replace:"\u22df"},"\\succsim":{font:"ams",group:"rel",replace:"\u227f"},"\\succapprox":{font:"ams",group:"rel",replace:"\u2ab8"},"\\vartriangleright":{font:"ams",group:"rel",replace:"\u22b3"},"\\trianglerighteq":{font:"ams",group:"rel",replace:"\u22b5"},"\\Vdash":{font:"ams",group:"rel",replace:"\u22a9"},"\\shortmid":{font:"ams",group:"rel",replace:"\u2223"},"\\shortparallel":{font:"ams",group:"rel",replace:"\u2225"},"\\between":{font:"ams",group:"rel",replace:"\u226c"},"\\pitchfork":{font:"ams",group:"rel",replace:"\u22d4"},"\\varpropto":{font:"ams",group:"rel",replace:"\u221d"},"\\blacktriangleleft":{font:"ams",group:"rel",replace:"\u25c0"},"\\therefore":{font:"ams",group:"rel",replace:"\u2234"},"\\backepsilon":{font:"ams",group:"rel",replace:"\u220d"},"\\blacktriangleright":{font:"ams",group:"rel",replace:"\u25b6"},"\\because":{font:"ams",group:"rel",replace:"\u2235"},"\\llless":{font:"ams",group:"rel",replace:"\u22d8"},"\\gggtr":{font:"ams",group:"rel",replace:"\u22d9"},"\\lhd":{font:"ams",group:"bin",replace:"\u22b2"},"\\rhd":{font:"ams",group:"bin",replace:"\u22b3"},"\\eqsim":{font:"ams",group:"rel",replace:"\u2242"},"\\Join":{font:"main",group:"rel",replace:"\u22c8"},"\\Doteq":{font:"ams",group:"rel",replace:"\u2251"},"\\dotplus":{font:"ams",group:"bin",replace:"\u2214"},"\\smallsetminus":{font:"ams",group:"bin",replace:"\u2216"},"\\Cap":{font:"ams",group:"bin",replace:"\u22d2"},"\\Cup":{font:"ams",group:"bin",replace:"\u22d3"},"\\doublebarwedge":{font:"ams",group:"bin",replace:"\u2a5e"},"\\boxminus":{font:"ams",group:"bin",replace:"\u229f"},"\\boxplus":{font:"ams",group:"bin",replace:"\u229e"},"\\divideontimes":{font:"ams",group:"bin",replace:"\u22c7"},"\\ltimes":{font:"ams",group:"bin",replace:"\u22c9"},"\\rtimes":{font:"ams",group:"bin",replace:"\u22ca"},"\\leftthreetimes":{font:"ams",group:"bin",replace:"\u22cb"},"\\rightthreetimes":{font:"ams",group:"bin",replace:"\u22cc"},"\\curlywedge":{font:"ams",group:"bin",replace:"\u22cf"},"\\curlyvee":{font:"ams",group:"bin",replace:"\u22ce"},"\\circleddash":{font:"ams",group:"bin",replace:"\u229d"},"\\circledast":{font:"ams",group:"bin",replace:"\u229b"},"\\centerdot":{font:"ams",group:"bin",replace:"\u22c5"},"\\intercal":{font:"ams",group:"bin",replace:"\u22ba"},"\\doublecap":{font:"ams",group:"bin",replace:"\u22d2"},"\\doublecup":{font:"ams",group:"bin",replace:"\u22d3"},"\\boxtimes":{font:"ams",group:"bin",replace:"\u22a0"},"\\dashrightarrow":{font:"ams",group:"rel",replace:"\u21e2"},"\\dashleftarrow":{font:"ams",group:"rel",replace:"\u21e0"},"\\leftleftarrows":{font:"ams",group:"rel",replace:"\u21c7"},"\\leftrightarrows":{font:"ams",group:"rel",replace:"\u21c6"},"\\Lleftarrow":{font:"ams",group:"rel",replace:"\u21da"},"\\twoheadleftarrow":{font:"ams",group:"rel",replace:"\u219e"},"\\leftarrowtail":{font:"ams",group:"rel",replace:"\u21a2"},"\\looparrowleft":{font:"ams",group:"rel",replace:"\u21ab"},"\\leftrightharpoons":{font:"ams",group:"rel",replace:"\u21cb"},"\\curvearrowleft":{font:"ams",group:"rel",replace:"\u21b6"},"\\circlearrowleft":{font:"ams",group:"rel",replace:"\u21ba"},"\\Lsh":{font:"ams",group:"rel",replace:"\u21b0"},"\\upuparrows":{font:"ams",group:"rel",replace:"\u21c8"},"\\upharpoonleft":{font:"ams",group:"rel",replace:"\u21bf"},"\\downharpoonleft":{font:"ams",group:"rel",replace:"\u21c3"},"\\multimap":{font:"ams",group:"rel",replace:"\u22b8"},"\\leftrightsquigarrow":{font:"ams",group:"rel",replace:"\u21ad"},"\\rightrightarrows":{font:"ams",group:"rel",replace:"\u21c9"},"\\rightleftarrows":{font:"ams",group:"rel",replace:"\u21c4"},"\\twoheadrightarrow":{font:"ams",group:"rel",replace:"\u21a0"},"\\rightarrowtail":{font:"ams",group:"rel",replace:"\u21a3"},"\\looparrowright":{font:"ams",group:"rel",replace:"\u21ac"},"\\curvearrowright":{font:"ams",group:"rel",replace:"\u21b7"},"\\circlearrowright":{font:"ams",group:"rel",replace:"\u21bb"},"\\Rsh":{font:"ams",group:"rel",replace:"\u21b1"},"\\downdownarrows":{font:"ams",group:"rel",replace:"\u21ca"},"\\upharpoonright":{font:"ams",group:"rel",replace:"\u21be"},"\\downharpoonright":{font:"ams",group:"rel",replace:"\u21c2"},"\\rightsquigarrow":{font:"ams",group:"rel",replace:"\u21dd"},"\\leadsto":{font:"ams",group:"rel",replace:"\u21dd"},"\\Rrightarrow":{font:"ams",group:"rel",replace:"\u21db"},"\\restriction":{font:"ams",group:"rel",replace:"\u21be"},"`":{font:"main",group:"textord",replace:"\u2018"},"\\$":{font:"main",group:"textord",replace:"$"},"\\%":{font:"main",group:"textord",replace:"%"},"\\_":{font:"main",group:"textord",replace:"_"},"\\angle":{font:"main",group:"textord",replace:"\u2220"},"\\infty":{font:"main",group:"textord",replace:"\u221e"},"\\prime":{font:"main",group:"textord",replace:"\u2032"},"\\triangle":{font:"main",group:"textord",replace:"\u25b3"},"\\Gamma":{font:"main",group:"textord",replace:"\u0393"},"\\Delta":{font:"main",group:"textord",replace:"\u0394"},"\\Theta":{font:"main",group:"textord",replace:"\u0398"},"\\Lambda":{font:"main",group:"textord",replace:"\u039b"},"\\Xi":{font:"main",group:"textord",replace:"\u039e"},"\\Pi":{font:"main",group:"textord",replace:"\u03a0"},"\\Sigma":{font:"main",group:"textord",replace:"\u03a3"},"\\Upsilon":{font:"main",
-group:"textord",replace:"\u03a5"},"\\Phi":{font:"main",group:"textord",replace:"\u03a6"},"\\Psi":{font:"main",group:"textord",replace:"\u03a8"},"\\Omega":{font:"main",group:"textord",replace:"\u03a9"},"\\neg":{font:"main",group:"textord",replace:"\xac"},"\\lnot":{font:"main",group:"textord",replace:"\xac"},"\\top":{font:"main",group:"textord",replace:"\u22a4"},"\\bot":{font:"main",group:"textord",replace:"\u22a5"},"\\emptyset":{font:"main",group:"textord",replace:"\u2205"},"\\varnothing":{font:"ams",group:"textord",replace:"\u2205"},"\\alpha":{font:"main",group:"mathord",replace:"\u03b1"},"\\beta":{font:"main",group:"mathord",replace:"\u03b2"},"\\gamma":{font:"main",group:"mathord",replace:"\u03b3"},"\\delta":{font:"main",group:"mathord",replace:"\u03b4"},"\\epsilon":{font:"main",group:"mathord",replace:"\u03f5"},"\\zeta":{font:"main",group:"mathord",replace:"\u03b6"},"\\eta":{font:"main",group:"mathord",replace:"\u03b7"},"\\theta":{font:"main",group:"mathord",replace:"\u03b8"},"\\iota":{font:"main",group:"mathord",replace:"\u03b9"},"\\kappa":{font:"main",group:"mathord",replace:"\u03ba"},"\\lambda":{font:"main",group:"mathord",replace:"\u03bb"},"\\mu":{font:"main",group:"mathord",replace:"\u03bc"},"\\nu":{font:"main",group:"mathord",replace:"\u03bd"},"\\xi":{font:"main",group:"mathord",replace:"\u03be"},"\\omicron":{font:"main",group:"mathord",replace:"o"},"\\pi":{font:"main",group:"mathord",replace:"\u03c0"},"\\rho":{font:"main",group:"mathord",replace:"\u03c1"},"\\sigma":{font:"main",group:"mathord",replace:"\u03c3"},"\\tau":{font:"main",group:"mathord",replace:"\u03c4"},"\\upsilon":{font:"main",group:"mathord",replace:"\u03c5"},"\\phi":{font:"main",group:"mathord",replace:"\u03d5"},"\\chi":{font:"main",group:"mathord",replace:"\u03c7"},"\\psi":{font:"main",group:"mathord",replace:"\u03c8"},"\\omega":{font:"main",group:"mathord",replace:"\u03c9"},"\\varepsilon":{font:"main",group:"mathord",replace:"\u03b5"},"\\vartheta":{font:"main",group:"mathord",replace:"\u03d1"},"\\varpi":{font:"main",group:"mathord",replace:"\u03d6"},"\\varrho":{font:"main",group:"mathord",replace:"\u03f1"},"\\varsigma":{font:"main",group:"mathord",replace:"\u03c2"},"\\varphi":{font:"main",group:"mathord",replace:"\u03c6"},"*":{font:"main",group:"bin",replace:"\u2217"},"+":{font:"main",group:"bin"},"-":{font:"main",group:"bin",replace:"\u2212"},"\\cdot":{font:"main",group:"bin",replace:"\u22c5"},"\\circ":{font:"main",group:"bin",replace:"\u2218"},"\\div":{font:"main",group:"bin",replace:"\xf7"},"\\pm":{font:"main",group:"bin",replace:"\xb1"},"\\times":{font:"main",group:"bin",replace:"\xd7"},"\\cap":{font:"main",group:"bin",replace:"\u2229"},"\\cup":{font:"main",group:"bin",replace:"\u222a"},"\\setminus":{font:"main",group:"bin",replace:"\u2216"},"\\land":{font:"main",group:"bin",replace:"\u2227"},"\\lor":{font:"main",group:"bin",replace:"\u2228"},"\\wedge":{font:"main",group:"bin",replace:"\u2227"},"\\vee":{font:"main",group:"bin",replace:"\u2228"},"\\surd":{font:"main",group:"textord",replace:"\u221a"},"(":{font:"main",group:"open"},"[":{font:"main",group:"open"},"\\langle":{font:"main",group:"open",replace:"\u27e8"},"\\lvert":{font:"main",group:"open",replace:"\u2223"},"\\lVert":{font:"main",group:"open",replace:"\u2225"},")":{font:"main",group:"close"},"]":{font:"main",group:"close"},"?":{font:"main",group:"close"},"!":{font:"main",group:"close"},"\\rangle":{font:"main",group:"close",replace:"\u27e9"},"\\rvert":{font:"main",group:"close",replace:"\u2223"},"\\rVert":{font:"main",group:"close",replace:"\u2225"},"=":{font:"main",group:"rel"},"<":{font:"main",group:"rel"},">":{font:"main",group:"rel"},":":{font:"main",group:"rel"},"\\approx":{font:"main",group:"rel",replace:"\u2248"},"\\cong":{font:"main",group:"rel",replace:"\u2245"},"\\ge":{font:"main",group:"rel",replace:"\u2265"},"\\geq":{font:"main",group:"rel",replace:"\u2265"},"\\gets":{font:"main",group:"rel",replace:"\u2190"},"\\in":{font:"main",group:"rel",replace:"\u2208"},"\\notin":{font:"main",group:"rel",replace:"\u2209"},"\\subset":{font:"main",group:"rel",replace:"\u2282"},"\\supset":{font:"main",group:"rel",replace:"\u2283"},"\\subseteq":{font:"main",group:"rel",replace:"\u2286"},"\\supseteq":{font:"main",group:"rel",replace:"\u2287"},"\\nsubseteq":{font:"ams",group:"rel",replace:"\u2288"},"\\nsupseteq":{font:"ams",group:"rel",replace:"\u2289"},"\\models":{font:"main",group:"rel",replace:"\u22a8"},"\\leftarrow":{font:"main",group:"rel",replace:"\u2190"},"\\le":{font:"main",group:"rel",replace:"\u2264"},"\\leq":{font:"main",group:"rel",replace:"\u2264"},"\\ne":{font:"main",group:"rel",replace:"\u2260"},"\\neq":{font:"main",group:"rel",replace:"\u2260"},"\\rightarrow":{font:"main",group:"rel",replace:"\u2192"},"\\to":{font:"main",group:"rel",replace:"\u2192"},"\\ngeq":{font:"ams",group:"rel",replace:"\u2271"},"\\nleq":{font:"ams",group:"rel",replace:"\u2270"},"\\!":{font:"main",group:"spacing"},"\\ ":{font:"main",group:"spacing",replace:"\xa0"},"~":{font:"main",group:"spacing",replace:"\xa0"},"\\,":{font:"main",group:"spacing"},"\\:":{font:"main",group:"spacing"},"\\;":{font:"main",group:"spacing"},"\\enspace":{font:"main",group:"spacing"},"\\qquad":{font:"main",group:"spacing"},"\\quad":{font:"main",group:"spacing"},"\\space":{font:"main",group:"spacing",replace:"\xa0"},",":{font:"main",group:"punct"},";":{font:"main",group:"punct"},"\\colon":{font:"main",group:"punct",replace:":"},"\\barwedge":{font:"ams",group:"bin",replace:"\u22bc"},"\\veebar":{font:"ams",group:"bin",replace:"\u22bb"},"\\odot":{font:"main",group:"bin",replace:"\u2299"},"\\oplus":{font:"main",group:"bin",replace:"\u2295"},"\\otimes":{font:"main",group:"bin",replace:"\u2297"},"\\partial":{font:"main",group:"textord",replace:"\u2202"},"\\oslash":{font:"main",group:"bin",replace:"\u2298"},"\\circledcirc":{font:"ams",group:"bin",replace:"\u229a"},"\\boxdot":{font:"ams",group:"bin",replace:"\u22a1"},"\\bigtriangleup":{font:"main",group:"bin",replace:"\u25b3"},"\\bigtriangledown":{font:"main",group:"bin",replace:"\u25bd"},"\\dagger":{font:"main",group:"bin",replace:"\u2020"},"\\diamond":{font:"main",group:"bin",replace:"\u22c4"},"\\star":{font:"main",group:"bin",replace:"\u22c6"},"\\triangleleft":{font:"main",group:"bin",replace:"\u25c3"},"\\triangleright":{font:"main",group:"bin",replace:"\u25b9"},"\\{":{font:"main",group:"open",replace:"{"},"\\}":{font:"main",group:"close",replace:"}"},"\\lbrace":{font:"main",group:"open",replace:"{"},"\\rbrace":{font:"main",group:"close",replace:"}"},"\\lbrack":{font:"main",group:"open",replace:"["},"\\rbrack":{font:"main",group:"close",replace:"]"},"\\lfloor":{font:"main",group:"open",replace:"\u230a"},"\\rfloor":{font:"main",group:"close",replace:"\u230b"},"\\lceil":{font:"main",group:"open",replace:"\u2308"},"\\rceil":{font:"main",group:"close",replace:"\u2309"},"\\backslash":{font:"main",group:"textord",replace:"\\"},"|":{font:"main",group:"textord",replace:"\u2223"},"\\vert":{font:"main",group:"textord",replace:"\u2223"},"\\|":{font:"main",group:"textord",replace:"\u2225"},"\\Vert":{font:"main",group:"textord",replace:"\u2225"},"\\uparrow":{font:"main",group:"rel",replace:"\u2191"},"\\Uparrow":{font:"main",group:"rel",replace:"\u21d1"},"\\downarrow":{font:"main",group:"rel",replace:"\u2193"},"\\Downarrow":{font:"main",group:"rel",replace:"\u21d3"},"\\updownarrow":{font:"main",group:"rel",replace:"\u2195"},"\\Updownarrow":{font:"main",group:"rel",replace:"\u21d5"},"\\coprod":{font:"math",group:"op",replace:"\u2210"},"\\bigvee":{font:"math",group:"op",replace:"\u22c1"},"\\bigwedge":{font:"math",group:"op",replace:"\u22c0"},"\\biguplus":{font:"math",group:"op",replace:"\u2a04"},"\\bigcap":{font:"math",group:"op",replace:"\u22c2"},"\\bigcup":{font:"math",group:"op",replace:"\u22c3"},"\\int":{font:"math",group:"op",replace:"\u222b"},"\\intop":{font:"math",group:"op",replace:"\u222b"},"\\iint":{font:"math",group:"op",replace:"\u222c"},"\\iiint":{font:"math",group:"op",replace:"\u222d"},"\\prod":{font:"math",group:"op",replace:"\u220f"},"\\sum":{font:"math",group:"op",replace:"\u2211"},"\\bigotimes":{font:"math",group:"op",replace:"\u2a02"},"\\bigoplus":{font:"math",group:"op",replace:"\u2a01"},"\\bigodot":{font:"math",group:"op",replace:"\u2a00"},"\\oint":{font:"math",group:"op",replace:"\u222e"},"\\bigsqcup":{font:"math",group:"op",replace:"\u2a06"},"\\smallint":{font:"math",group:"op",replace:"\u222b"},"\\ldots":{font:"main",group:"inner",replace:"\u2026"},"\\cdots":{font:"main",group:"inner",replace:"\u22ef"},"\\ddots":{font:"main",group:"inner",replace:"\u22f1"},"\\vdots":{font:"main",group:"textord",replace:"\u22ee"},"\\acute":{font:"main",group:"accent",replace:"\xb4"},"\\grave":{font:"main",group:"accent",replace:"`"},"\\ddot":{font:"main",group:"accent",replace:"\xa8"},"\\tilde":{font:"main",group:"accent",replace:"~"},"\\bar":{font:"main",group:"accent",replace:"\xaf"},"\\breve":{font:"main",group:"accent",replace:"\u02d8"},"\\check":{font:"main",group:"accent",replace:"\u02c7"},"\\hat":{font:"main",group:"accent",replace:"^"},"\\vec":{font:"main",group:"accent",replace:"\u20d7"},"\\dot":{font:"main",group:"accent",replace:"\u02d9"},"\\imath":{font:"main",group:"mathord",replace:"\u0131"},"\\jmath":{font:"main",group:"mathord",replace:"\u0237"}},text:{"\\ ":{font:"main",group:"spacing",replace:"\xa0"}," ":{font:"main",group:"spacing",replace:"\xa0"},"~":{font:"main",group:"spacing",replace:"\xa0"}}};var a='0123456789/@."';for(var r=0;r<a.length;r++){var l=a.charAt(r);h.math[l]={font:"main",group:"textord"}}var s="0123456789`!@*()-=+[]'\";:?/.,";for(var r=0;r<s.length;r++){var l=s.charAt(r);h.text[l]={font:"main",group:"textord"}}var p="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";for(var r=0;r<p.length;r++){var l=p.charAt(r);h.math[l]={font:"main",group:"mathord"};h.text[l]={font:"main",group:"textord"}}t.exports=h},{}],23:[function(e,t,i){var h=Array.prototype.indexOf;var a=function(e,t){if(e==null){return-1}if(h&&e.indexOf===h){return e.indexOf(t)}var i=0,a=e.length;for(;i<a;i++){if(e[i]===t){return i}}return-1};var r=function(e,t){return a(e,t)!==-1};var l=function(e,t){return e===undefined?t:e};var s=/([A-Z])/g;var p=function(e){return e.replace(s,"-$1").toLowerCase()};var c={"&":"&amp;",">":"&gt;","<":"&lt;",'"':"&quot;","'":"&#x27;"};var n=/[&><"']/g;function o(e){return c[e]}function g(e){return(""+e).replace(n,o)}var d;if(typeof document!=="undefined"){var w=document.createElement("span");if("textContent"in w){d=function(e,t){e.textContent=t}}else{d=function(e,t){e.innerText=t}}}function u(e){d(e,"")}t.exports={contains:r,deflt:l,escape:g,hyphenate:p,indexOf:a,setTextContent:d,clearNode:u}},{}]},{},[1])(1)});
+(function(e){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=e()}else if(typeof define==="function"&&define.amd){define([],e)}else{var t;if(typeof window!=="undefined"){t=window}else if(typeof global!=="undefined"){t=global}else if(typeof self!=="undefined"){t=self}else{t=this}t.katex=e()}})(function(){var e,t,r;return function a(e,t,r){function i(s,l){if(!t[s]){if(!e[s]){var o=typeof require=="function"&&require;if(!l&&o)return o(s,!0);if(n)return n(s,!0);var u=new Error("Cannot find module '"+s+"'");throw u.code="MODULE_NOT_FOUND",u}var p=t[s]={exports:{}};e[s][0].call(p.exports,function(t){var r=e[s][1][t];return i(r?r:t)},p,p.exports,a,e,t,r)}return t[s].exports}var n=typeof require=="function"&&require;for(var s=0;s<r.length;s++)i(r[s]);return i}({1:[function(e,t,r){var a=e("./src/ParseError");var i=e("./src/Settings");var n=e("./src/buildTree");var s=e("./src/parseTree");var l=e("./src/utils");var o=function(e,t,r){l.clearNode(t);var a=new i(r);var o=s(e,a);var u=n(o,e,a).toNode();t.appendChild(u)};if(typeof document!=="undefined"){if(document.compatMode!=="CSS1Compat"){typeof console!=="undefined"&&console.warn("Warning: KaTeX doesn't work in quirks mode. Make sure your "+"website has a suitable doctype.");o=function(){throw new a("KaTeX doesn't work in quirks mode.")}}}var u=function(e,t){var r=new i(t);var a=s(e,r);return n(a,e,r).toMarkup()};var p=function(e,t){var r=new i(t);return s(e,r)};t.exports={render:o,renderToString:u,__parse:p,ParseError:a}},{"./src/ParseError":5,"./src/Settings":7,"./src/buildTree":12,"./src/parseTree":21,"./src/utils":23}],2:[function(e,t,r){"use strict";function a(e){if(!e.__matchAtRelocatable){var t=e.source+"|()";var r="g"+(e.ignoreCase?"i":"")+(e.multiline?"m":"")+(e.unicode?"u":"");e.__matchAtRelocatable=new RegExp(t,r)}return e.__matchAtRelocatable}function i(e,t,r){if(e.global||e.sticky){throw new Error("matchAt(...): Only non-global regexes are supported")}var i=a(e);i.lastIndex=r;var n=i.exec(t);if(n[n.length-1]==null){n.length=n.length-1;return n}else{return null}}t.exports=i},{}],3:[function(e,t,r){var a=e("match-at");var i=e("./ParseError");function n(e){this._input=e}function s(e,t,r){this.text=e;this.data=t;this.position=r}var l=new RegExp("([ \r\n	]+)|("+"---?"+"|[!-\\[\\]-\u2027\u202a-\ud7ff\uf900-\uffff]"+"|[\ud800-\udbff][\udc00-\udfff]"+"|\\\\(?:[a-zA-Z]+|[^\ud800-\udfff])"+")");var o=/\s*/;n.prototype._innerLex=function(e,t){var r=this._input;if(e===r.length){return new s("EOF",null,e)}var n=a(l,r,e);if(n===null){throw new i("Unexpected character: '"+r[e]+"'",this,e)}else if(n[2]){return new s(n[2],null,e+n[2].length)}else if(t){return this._innerLex(e+n[1].length,true)}else{return new s(" ",null,e+n[1].length)}};var u=/#[a-z0-9]+|[a-z]+/i;n.prototype._innerLexColor=function(e){var t=this._input;var r=a(o,t,e)[0];e+=r.length;var n;if(n=a(u,t,e)){return new s(n[0],null,e+n[0].length)}else{throw new i("Invalid color",this,e)}};var p=/(-?)\s*(\d+(?:\.\d*)?|\.\d+)\s*([a-z]{2})/;n.prototype._innerLexSize=function(e){var t=this._input;var r=a(o,t,e)[0];e+=r.length;var n;if(n=a(p,t,e)){var l=n[3];if(l!=="em"&&l!=="ex"){throw new i("Invalid unit: '"+l+"'",this,e)}return new s(n[0],{number:+(n[1]+n[2]),unit:l},e+n[0].length)}throw new i("Invalid size",this,e)};n.prototype._innerLexWhitespace=function(e){var t=this._input;var r=a(o,t,e)[0];e+=r.length;return new s(r[0],null,e)};n.prototype.lex=function(e,t){if(t==="math"){return this._innerLex(e,true)}else if(t==="text"){return this._innerLex(e,false)}else if(t==="color"){return this._innerLexColor(e)}else if(t==="size"){return this._innerLexSize(e)}else if(t==="whitespace"){return this._innerLexWhitespace(e)}};t.exports=n},{"./ParseError":5,"match-at":2}],4:[function(e,t,r){function a(e){this.style=e.style;this.color=e.color;this.size=e.size;this.phantom=e.phantom;this.font=e.font;if(e.parentStyle===undefined){this.parentStyle=e.style}else{this.parentStyle=e.parentStyle}if(e.parentSize===undefined){this.parentSize=e.size}else{this.parentSize=e.parentSize}}a.prototype.extend=function(e){var t={style:this.style,size:this.size,color:this.color,parentStyle:this.style,parentSize:this.size,phantom:this.phantom,font:this.font};for(var r in e){if(e.hasOwnProperty(r)){t[r]=e[r]}}return new a(t)};a.prototype.withStyle=function(e){return this.extend({style:e})};a.prototype.withSize=function(e){return this.extend({size:e})};a.prototype.withColor=function(e){return this.extend({color:e})};a.prototype.withPhantom=function(){return this.extend({phantom:true})};a.prototype.withFont=function(e){return this.extend({font:e})};a.prototype.reset=function(){return this.extend({})};var i={"katex-blue":"#6495ed","katex-orange":"#ffa500","katex-pink":"#ff00af","katex-red":"#df0030","katex-green":"#28ae7b","katex-gray":"gray","katex-purple":"#9d38bd","katex-blueA":"#c7e9f1","katex-blueB":"#9cdceb","katex-blueC":"#58c4dd","katex-blueD":"#29abca","katex-blueE":"#1c758a","katex-tealA":"#acead7","katex-tealB":"#76ddc0","katex-tealC":"#5cd0b3","katex-tealD":"#55c1a7","katex-tealE":"#49a88f","katex-greenA":"#c9e2ae","katex-greenB":"#a6cf8c","katex-greenC":"#83c167","katex-greenD":"#77b05d","katex-greenE":"#699c52","katex-goldA":"#f7c797","katex-goldB":"#f9b775","katex-goldC":"#f0ac5f","katex-goldD":"#e1a158","katex-goldE":"#c78d46","katex-redA":"#f7a1a3","katex-redB":"#ff8080","katex-redC":"#fc6255","katex-redD":"#e65a4c","katex-redE":"#cf5044","katex-maroonA":"#ecabc1","katex-maroonB":"#ec92ab","katex-maroonC":"#c55f73","katex-maroonD":"#a24d61","katex-maroonE":"#94424f","katex-purpleA":"#caa3e8","katex-purpleB":"#b189c6","katex-purpleC":"#9a72ac","katex-purpleD":"#715582","katex-purpleE":"#644172","katex-mintA":"#f5f9e8","katex-mintB":"#edf2df","katex-mintC":"#e0e5cc","katex-grayA":"#fdfdfd","katex-grayB":"#f7f7f7","katex-grayC":"#eeeeee","katex-grayD":"#dddddd","katex-grayE":"#cccccc","katex-grayF":"#aaaaaa","katex-grayG":"#999999","katex-grayH":"#555555","katex-grayI":"#333333","katex-kaBlue":"#314453","katex-kaGreen":"#639b24"};a.prototype.getColor=function(){if(this.phantom){return"transparent"}else{return i[this.color]||this.color}};t.exports=a},{}],5:[function(e,t,r){function a(e,t,r){var i="KaTeX parse error: "+e;if(t!==undefined&&r!==undefined){i+=" at position "+r+": ";var n=t._input;n=n.slice(0,r)+"\u0332"+n.slice(r);var s=Math.max(0,r-15);var l=r+15;i+=n.slice(s,l)}var o=new Error(i);o.name="ParseError";o.__proto__=a.prototype;o.position=r;return o}a.prototype.__proto__=Error.prototype;t.exports=a},{}],6:[function(e,t,r){var a=e("./functions");var i=e("./environments");var n=e("./Lexer");var s=e("./symbols");var l=e("./utils");var o=e("./parseData");var u=e("./ParseError");function p(e,t){this.lexer=new n(e);this.settings=t}var h=o.ParseNode;function c(e,t){this.result=e;this.isFunction=t}p.prototype.expect=function(e,t){if(this.nextToken.text!==e){throw new u("Expected '"+e+"', got '"+this.nextToken.text+"'",this.lexer,this.nextToken.position)}if(t!==false){this.consume()}};p.prototype.consume=function(){this.pos=this.nextToken.position;this.nextToken=this.lexer.lex(this.pos,this.mode)};p.prototype.parse=function(){this.mode="math";this.pos=0;this.nextToken=this.lexer.lex(this.pos,this.mode);var e=this.parseInput();return e};p.prototype.parseInput=function(){var e=this.parseExpression(false);this.expect("EOF",false);return e};var v=["}","\\end","\\right","&","\\\\","\\cr"];p.prototype.parseExpression=function(e,t){var r=[];while(true){var a=this.nextToken;var i=this.pos;if(v.indexOf(a.text)!==-1){break}if(t&&a.text===t){break}var n=this.parseAtom();if(!n){if(!this.settings.throwOnError&&a.text[0]==="\\"){var s=this.handleUnsupportedCmd();r.push(s);i=a.position;continue}break}if(e&&n.type==="infix"){this.pos=i;this.nextToken=a;break}r.push(n)}return this.handleInfixNodes(r)};p.prototype.handleInfixNodes=function(e){var t=-1;var r;for(var a=0;a<e.length;a++){var i=e[a];if(i.type==="infix"){if(t!==-1){throw new u("only one infix operator per group",this.lexer,-1)}t=a;r=i.value.replaceWith}}if(t!==-1){var n;var s;var l=e.slice(0,t);var o=e.slice(t+1);if(l.length===1&&l[0].type==="ordgroup"){n=l[0]}else{n=new h("ordgroup",l,this.mode)}if(o.length===1&&o[0].type==="ordgroup"){s=o[0]}else{s=new h("ordgroup",o,this.mode)}var p=this.callFunction(r,[n,s],null);return[new h(p.type,p,this.mode)]}else{return e}};var m=1;p.prototype.handleSupSubscript=function(e){var t=this.nextToken.text;var r=this.pos;this.consume();var i=this.parseGroup();if(!i){if(!this.settings.throwOnError&&this.nextToken.text[0]==="\\"){return this.handleUnsupportedCmd()}else{throw new u("Expected group after '"+t+"'",this.lexer,r+1)}}else if(i.isFunction){var n=a[i.result].greediness;if(n>m){return this.parseFunction(i)}else{throw new u("Got function '"+i.result+"' with no arguments "+"as "+e,this.lexer,r+1)}}else{return i.result}};p.prototype.handleUnsupportedCmd=function(){var e=this.nextToken.text;var t=[];for(var r=0;r<e.length;r++){t.push(new h("textord",e[r],"text"))}var a=new h("text",{body:t,type:"text"},this.mode);var i=new h("color",{color:this.settings.errorColor,value:[a],type:"color"},this.mode);this.consume();return i};p.prototype.parseAtom=function(){var e=this.parseImplicitGroup();if(this.mode==="text"){return e}var t;var r;while(true){var a=this.nextToken;if(a.text==="\\limits"||a.text==="\\nolimits"){if(!e||e.type!=="op"){throw new u("Limit controls must follow a math operator",this.lexer,this.pos)}else{var i=a.text==="\\limits";e.value.limits=i;e.value.alwaysHandleSupSub=true}this.consume()}else if(a.text==="^"){if(t){throw new u("Double superscript",this.lexer,this.pos)}t=this.handleSupSubscript("superscript")}else if(a.text==="_"){if(r){throw new u("Double subscript",this.lexer,this.pos)}r=this.handleSupSubscript("subscript")}else if(a.text==="'"){var n=new h("textord","\\prime",this.mode);var s=[n];this.consume();while(this.nextToken.text==="'"){s.push(n);this.consume()}t=new h("ordgroup",s,this.mode)}else{break}}if(t||r){return new h("supsub",{base:e,sup:t,sub:r},this.mode)}else{return e}};var f=["\\tiny","\\scriptsize","\\footnotesize","\\small","\\normalsize","\\large","\\Large","\\LARGE","\\huge","\\Huge"];var d=["\\displaystyle","\\textstyle","\\scriptstyle","\\scriptscriptstyle"];p.prototype.parseImplicitGroup=function(){var e=this.parseSymbol();if(e==null){return this.parseFunction()}var t=e.result;var r;if(t==="\\left"){var a=this.parseFunction(e);r=this.parseExpression(false);this.expect("\\right",false);var n=this.parseFunction();return new h("leftright",{body:r,left:a.value.value,right:n.value.value},this.mode)}else if(t==="\\begin"){var s=this.parseFunction(e);var o=s.value.name;if(!i.hasOwnProperty(o)){throw new u("No such environment: "+o,this.lexer,s.value.namepos)}var p=i[o];var c=this.parseArguments("\\begin{"+o+"}",p);var v={mode:this.mode,envName:o,parser:this,lexer:this.lexer,positions:c.pop()};var m=p.handler(v,c);this.expect("\\end",false);var g=this.parseFunction();if(g.value.name!==o){throw new u("Mismatch: \\begin{"+o+"} matched "+"by \\end{"+g.value.name+"}",this.lexer)}m.position=g.position;return m}else if(l.contains(f,t)){r=this.parseExpression(false);return new h("sizing",{size:"size"+(l.indexOf(f,t)+1),value:r},this.mode)}else if(l.contains(d,t)){r=this.parseExpression(true);return new h("styling",{style:t.slice(1,t.length-5),value:r},this.mode)}else{return this.parseFunction(e)}};p.prototype.parseFunction=function(e){if(!e){e=this.parseGroup()}if(e){if(e.isFunction){var t=e.result;var r=a[t];if(this.mode==="text"&&!r.allowedInText){throw new u("Can't use function '"+t+"' in text mode",this.lexer,e.position)}var i=this.parseArguments(t,r);var n=this.callFunction(t,i,i.pop());return new h(n.type,n,this.mode)}else{return e.result}}else{return null}};p.prototype.callFunction=function(e,t,r){var i={funcName:e,parser:this,lexer:this.lexer,positions:r};return a[e].handler(i,t)};p.prototype.parseArguments=function(e,t){var r=t.numArgs+t.numOptionalArgs;if(r===0){return[[this.pos]]}var i=t.greediness;var n=[this.pos];var s=[];for(var l=0;l<r;l++){var o=t.argTypes&&t.argTypes[l];var p;if(l<t.numOptionalArgs){if(o){p=this.parseSpecialGroup(o,true)}else{p=this.parseOptionalGroup()}if(!p){s.push(null);n.push(this.pos);continue}}else{if(o){p=this.parseSpecialGroup(o)}else{p=this.parseGroup()}if(!p){if(!this.settings.throwOnError&&this.nextToken.text[0]==="\\"){p=new c(this.handleUnsupportedCmd(this.nextToken.text),false)}else{throw new u("Expected group after '"+e+"'",this.lexer,this.pos)}}}var h;if(p.isFunction){var v=a[p.result].greediness;if(v>i){h=this.parseFunction(p)}else{throw new u("Got function '"+p.result+"' as "+"argument to '"+e+"'",this.lexer,this.pos-1)}}else{h=p.result}s.push(h);n.push(this.pos)}s.push(n);return s};p.prototype.parseSpecialGroup=function(e,t){var r=this.mode;if(e==="original"){e=r}if(e==="color"||e==="size"){var a=this.nextToken;if(t&&a.text!=="["){return null}this.mode=e;this.expect(t?"[":"{");var i=this.nextToken;this.mode=r;var n;if(e==="color"){n=i.text}else{n=i.data}this.consume();this.expect(t?"]":"}");return new c(new h(e,n,r),false)}else if(e==="text"){var s=this.lexer.lex(this.pos,"whitespace");this.pos=s.position}this.mode=e;this.nextToken=this.lexer.lex(this.pos,e);var l;if(t){l=this.parseOptionalGroup()}else{l=this.parseGroup()}this.mode=r;this.nextToken=this.lexer.lex(this.pos,r);return l};p.prototype.parseGroup=function(){if(this.nextToken.text==="{"){this.consume();var e=this.parseExpression(false);this.expect("}");return new c(new h("ordgroup",e,this.mode),false)}else{return this.parseSymbol()}};p.prototype.parseOptionalGroup=function(){if(this.nextToken.text==="["){this.consume();var e=this.parseExpression(false,"]");this.expect("]");return new c(new h("ordgroup",e,this.mode),false)}else{return null}};p.prototype.parseSymbol=function(){var e=this.nextToken;if(a[e.text]){this.consume();return new c(e.text,true)}else if(s[this.mode][e.text]){this.consume();return new c(new h(s[this.mode][e.text].group,e.text,this.mode),false)}else{return null}};p.prototype.ParseNode=h;t.exports=p},{"./Lexer":3,"./ParseError":5,"./environments":15,"./functions":18,"./parseData":20,"./symbols":22,"./utils":23}],7:[function(e,t,r){function a(e,t){return e===undefined?t:e}function i(e){e=e||{};this.displayMode=a(e.displayMode,false);this.throwOnError=a(e.throwOnError,true);this.errorColor=a(e.errorColor,"#cc0000")}t.exports=i},{}],8:[function(e,t,r){function a(e,t,r,a){this.id=e;this.size=t;this.cramped=a;this.sizeMultiplier=r}a.prototype.sup=function(){return m[f[this.id]]};a.prototype.sub=function(){return m[d[this.id]]};a.prototype.fracNum=function(){return m[g[this.id]]};a.prototype.fracDen=function(){return m[y[this.id]]};a.prototype.cramp=function(){return m[b[this.id]]};a.prototype.cls=function(){return c[this.size]+(this.cramped?" cramped":" uncramped")};a.prototype.reset=function(){return v[this.size]};var i=0;var n=1;var s=2;var l=3;var o=4;var u=5;var p=6;var h=7;var c=["displaystyle textstyle","textstyle","scriptstyle","scriptscriptstyle"];var v=["reset-textstyle","reset-textstyle","reset-scriptstyle","reset-scriptscriptstyle"];var m=[new a(i,0,1,false),new a(n,0,1,true),new a(s,1,1,false),new a(l,1,1,true),new a(o,2,.7,false),new a(u,2,.7,true),new a(p,3,.5,false),new a(h,3,.5,true)];var f=[o,u,o,u,p,h,p,h];var d=[u,u,u,u,h,h,h,h];var g=[s,l,o,u,p,h,p,h];var y=[l,l,u,u,h,h,h,h];var b=[n,n,l,l,u,u,h,h];t.exports={DISPLAY:m[i],TEXT:m[s],SCRIPT:m[o],SCRIPTSCRIPT:m[p]}},{}],9:[function(e,t,r){var a=e("./domTree");var i=e("./fontMetrics");var n=e("./symbols");var s=e("./utils");var l=["\\Gamma","\\Delta","\\Theta","\\Lambda","\\Xi","\\Pi","\\Sigma","\\Upsilon","\\Phi","\\Psi","\\Omega"];var o=["\u0131","\u0237"];var u=function(e,t,r,s,l){if(n[r][e]&&n[r][e].replace){e=n[r][e].replace}var o=i.getCharacterMetrics(e,t);var u;if(o){u=new a.symbolNode(e,o.height,o.depth,o.italic,o.skew,l)}else{typeof console!=="undefined"&&console.warn("No character metrics for '"+e+"' in style '"+t+"'");u=new a.symbolNode(e,0,0,0,0,l)}if(s){u.style.color=s}return u};var p=function(e,t,r,a){if(e==="\\"||n[t][e].font==="main"){return u(e,"Main-Regular",t,r,a)}else{return u(e,"AMS-Regular",t,r,a.concat(["amsrm"]))}};var h=function(e,t,r,a,i){if(i==="mathord"){return c(e,t,r,a)}else if(i==="textord"){return u(e,"Main-Regular",t,r,a.concat(["mathrm"]))}else{throw new Error("unexpected type: "+i+" in mathDefault")}};var c=function(e,t,r,a){if(/[0-9]/.test(e.charAt(0))||s.contains(o,e)||s.contains(l,e)){return u(e,"Main-Italic",t,r,a.concat(["mainit"]))}else{return u(e,"Math-Italic",t,r,a.concat(["mathit"]))}};var v=function(e,t,r){var a=e.mode;var l=e.value;if(n[a][l]&&n[a][l].replace){l=n[a][l].replace}var p=["mord"];var v=t.getColor();var m=t.font;if(m){if(m==="mathit"||s.contains(o,l)){return c(l,a,v,p)}else{var f=w[m].fontName;if(i.getCharacterMetrics(l,f)){return u(l,f,a,v,p.concat([m]))}else{return h(l,a,v,p,r)}}}else{return h(l,a,v,p,r)}};var m=function(e){var t=0;var r=0;var a=0;if(e.children){for(var i=0;i<e.children.length;i++){if(e.children[i].height>t){t=e.children[i].height}if(e.children[i].depth>r){r=e.children[i].depth}if(e.children[i].maxFontSize>a){a=e.children[i].maxFontSize}}}e.height=t;e.depth=r;e.maxFontSize=a};var f=function(e,t,r){var i=new a.span(e,t);m(i);if(r){i.style.color=r}return i};var d=function(e){var t=new a.documentFragment(e);m(t);return t};var g=function(e,t){var r=f([],[new a.symbolNode("\u200b")]);r.style.fontSize=t/e.style.sizeMultiplier+"em";var i=f(["fontsize-ensurer","reset-"+e.size,"size5"],[r]);return i};var y=function(e,t,r,i){var n;var s;var l;if(t==="individualShift"){var o=e;e=[o[0]];n=-o[0].shift-o[0].elem.depth;s=n;for(l=1;l<o.length;l++){var u=-o[l].shift-s-o[l].elem.depth;var p=u-(o[l-1].elem.height+o[l-1].elem.depth);s=s+u;e.push({type:"kern",size:p});e.push(o[l])}}else if(t==="top"){var h=r;for(l=0;l<e.length;l++){if(e[l].type==="kern"){h-=e[l].size}else{h-=e[l].elem.height+e[l].elem.depth}}n=h}else if(t==="bottom"){n=-r}else if(t==="shift"){n=-e[0].elem.depth-r}else if(t==="firstBaseline"){n=-e[0].elem.depth}else{n=0}var c=0;for(l=0;l<e.length;l++){if(e[l].type==="elem"){c=Math.max(c,e[l].elem.maxFontSize)}}var v=g(i,c);var m=[];s=n;for(l=0;l<e.length;l++){if(e[l].type==="kern"){s+=e[l].size}else{var d=e[l].elem;var y=-d.depth-s;s+=d.height+d.depth;var b=f([],[v,d]);b.height-=y;b.depth+=y;b.style.top=y+"em";m.push(b)}}var x=f(["baseline-fix"],[v,new a.symbolNode("\u200b")]);m.push(x);var w=f(["vlist"],m);w.height=Math.max(s,w.height);w.depth=Math.max(-n,w.depth);return w};var b={size1:.5,size2:.7,size3:.8,size4:.9,size5:1,size6:1.2,size7:1.44,size8:1.73,size9:2.07,size10:2.49};var x={"\\qquad":{size:"2em",className:"qquad"},"\\quad":{size:"1em",className:"quad"},"\\enspace":{size:"0.5em",className:"enspace"},"\\;":{size:"0.277778em",className:"thickspace"},"\\:":{size:"0.22222em",className:"mediumspace"},"\\,":{size:"0.16667em",className:"thinspace"},"\\!":{size:"-0.16667em",className:"negativethinspace"}};var w={mathbf:{variant:"bold",fontName:"Main-Bold"},mathrm:{variant:"normal",fontName:"Main-Regular"},mathbb:{variant:"double-struck",fontName:"AMS-Regular"},mathcal:{variant:"script",fontName:"Caligraphic-Regular"},mathfrak:{variant:"fraktur",fontName:"Fraktur-Regular"},mathscr:{variant:"script",fontName:"Script-Regular"},mathsf:{variant:"sans-serif",fontName:"SansSerif-Regular"},mathtt:{variant:"monospace",fontName:"Typewriter-Regular"}};t.exports={fontMap:w,makeSymbol:u,mathsym:p,makeSpan:f,makeFragment:d,makeVList:y,makeOrd:v,sizingMultiplier:b,spacingFunctions:x}},{"./domTree":14,"./fontMetrics":16,"./symbols":22,"./utils":23}],10:[function(e,t,r){var a=e("./ParseError");var i=e("./Style");var n=e("./buildCommon");var s=e("./delimiter");var l=e("./domTree");var o=e("./fontMetrics");var u=e("./utils");var p=n.makeSpan;var h=function(e,t,r){var a=[];for(var i=0;i<e.length;i++){var n=e[i];a.push(b(n,t,r));r=n}return a};var c={mathord:"mord",textord:"mord",bin:"mbin",rel:"mrel",text:"mord",open:"mopen",close:"mclose",inner:"minner",genfrac:"mord",array:"mord",spacing:"mord",punct:"mpunct",ordgroup:"mord",op:"mop",katex:"mord",overline:"mord",underline:"mord",rule:"mord",leftright:"minner",sqrt:"mord",accent:"mord"};var v=function(e){if(e==null){return c.mathord}else if(e.type==="supsub"){return v(e.value.base)}else if(e.type==="llap"||e.type==="rlap"){return v(e.value)}else if(e.type==="color"){return v(e.value.value)}else if(e.type==="sizing"){return v(e.value.value)}else if(e.type==="styling"){return v(e.value.value)}else if(e.type==="delimsizing"){return c[e.value.delimType]}else{return c[e.type]}};var m=function(e,t){if(!e){return false}else if(e.type==="op"){return e.value.limits&&(t.style.size===i.DISPLAY.size||e.value.alwaysHandleSupSub)}else if(e.type==="accent"){return d(e.value.base)}else{return null}};var f=function(e){if(!e){return false}else if(e.type==="ordgroup"){if(e.value.length===1){return f(e.value[0])}else{return e}}else if(e.type==="color"){if(e.value.value.length===1){return f(e.value.value[0])}else{return e}}else{return e}};var d=function(e){var t=f(e);return t.type==="mathord"||t.type==="textord"||t.type==="bin"||t.type==="rel"||t.type==="inner"||t.type==="open"||t.type==="close"||t.type==="punct"};var g=function(e){return p(["sizing","reset-"+e.size,"size5",e.style.reset(),i.TEXT.cls(),"nulldelimiter"])};var y={};y.mathord=function(e,t,r){return n.makeOrd(e,t,"mathord")};y.textord=function(e,t,r){return n.makeOrd(e,t,"textord")};y.bin=function(e,t,r){var a="mbin";var i=r;while(i&&i.type==="color"){var s=i.value.value;i=s[s.length-1]}if(!r||u.contains(["mbin","mopen","mrel","mop","mpunct"],v(i))){e.type="textord";a="mord"}return n.mathsym(e.value,e.mode,t.getColor(),[a])};y.rel=function(e,t,r){return n.mathsym(e.value,e.mode,t.getColor(),["mrel"])};y.open=function(e,t,r){return n.mathsym(e.value,e.mode,t.getColor(),["mopen"])};y.close=function(e,t,r){return n.mathsym(e.value,e.mode,t.getColor(),["mclose"])};y.inner=function(e,t,r){return n.mathsym(e.value,e.mode,t.getColor(),["minner"])};y.punct=function(e,t,r){return n.mathsym(e.value,e.mode,t.getColor(),["mpunct"])};y.ordgroup=function(e,t,r){return p(["mord",t.style.cls()],h(e.value,t.reset()))};y.text=function(e,t,r){return p(["text","mord",t.style.cls()],h(e.value.body,t.reset()))};y.color=function(e,t,r){var a=h(e.value.value,t.withColor(e.value.color),r);return new n.makeFragment(a)};y.supsub=function(e,t,r){if(m(e.value.base,t)){return y[e.value.base.type](e,t,r)}var a=b(e.value.base,t.reset());var s;var u;var h;var c;if(e.value.sup){h=b(e.value.sup,t.withStyle(t.style.sup()));s=p([t.style.reset(),t.style.sup().cls()],[h])}if(e.value.sub){c=b(e.value.sub,t.withStyle(t.style.sub()));u=p([t.style.reset(),t.style.sub().cls()],[c])}var f;var g;if(d(e.value.base)){f=0;g=0}else{f=a.height-o.metrics.supDrop;g=a.depth+o.metrics.subDrop}var x;if(t.style===i.DISPLAY){x=o.metrics.sup1}else if(t.style.cramped){x=o.metrics.sup3}else{x=o.metrics.sup2}var w=i.TEXT.sizeMultiplier*t.style.sizeMultiplier;var k=.5/o.metrics.ptPerEm/w+"em";var z;if(!e.value.sup){g=Math.max(g,o.metrics.sub1,c.height-.8*o.metrics.xHeight);z=n.makeVList([{type:"elem",elem:u}],"shift",g,t);z.children[0].style.marginRight=k;if(a instanceof l.symbolNode){z.children[0].style.marginLeft=-a.italic+"em"}}else if(!e.value.sub){f=Math.max(f,x,h.depth+.25*o.metrics.xHeight);z=n.makeVList([{type:"elem",elem:s}],"shift",-f,t);z.children[0].style.marginRight=k}else{f=Math.max(f,x,h.depth+.25*o.metrics.xHeight);g=Math.max(g,o.metrics.sub2);var S=o.metrics.defaultRuleThickness;if(f-h.depth-(c.height-g)<4*S){g=4*S-(f-h.depth)+c.height;var M=.8*o.metrics.xHeight-(f-h.depth);if(M>0){f+=M;g-=M}}z=n.makeVList([{type:"elem",elem:u,shift:g},{type:"elem",elem:s,shift:-f}],"individualShift",null,t);if(a instanceof l.symbolNode){z.children[0].style.marginLeft=-a.italic+"em"}z.children[0].style.marginRight=k;z.children[1].style.marginRight=k}return p([v(e.value.base)],[a,z])};y.genfrac=function(e,t,r){var a=t.style;if(e.value.size==="display"){a=i.DISPLAY}else if(e.value.size==="text"){a=i.TEXT}var l=a.fracNum();var u=a.fracDen();var h=b(e.value.numer,t.withStyle(l));var c=p([a.reset(),l.cls()],[h]);var v=b(e.value.denom,t.withStyle(u));var m=p([a.reset(),u.cls()],[v]);var f;if(e.value.hasBarLine){f=o.metrics.defaultRuleThickness/t.style.sizeMultiplier}else{f=0}var d;var y;var x;if(a.size===i.DISPLAY.size){d=o.metrics.num1;if(f>0){y=3*f}else{y=7*o.metrics.defaultRuleThickness}x=o.metrics.denom1}else{if(f>0){d=o.metrics.num2;y=f}else{d=o.metrics.num3;y=3*o.metrics.defaultRuleThickness}x=o.metrics.denom2}var w;if(f===0){var k=d-h.depth-(v.height-x);if(k<y){d+=.5*(y-k);x+=.5*(y-k)}w=n.makeVList([{type:"elem",elem:m,shift:x},{type:"elem",elem:c,shift:-d}],"individualShift",null,t)}else{var z=o.metrics.axisHeight;if(d-h.depth-(z+.5*f)<y){d+=y-(d-h.depth-(z+.5*f))}if(z-.5*f-(v.height-x)<y){x+=y-(z-.5*f-(v.height-x))}var S=p([t.style.reset(),i.TEXT.cls(),"frac-line"]);S.height=f;var M=-(z-.5*f);w=n.makeVList([{type:"elem",elem:m,shift:x},{type:"elem",elem:S,shift:M},{type:"elem",elem:c,shift:-d}],"individualShift",null,t)}w.height*=a.sizeMultiplier/t.style.sizeMultiplier;w.depth*=a.sizeMultiplier/t.style.sizeMultiplier;var T;if(a.size===i.DISPLAY.size){T=o.metrics.delim1}else{T=o.metrics.getDelim2(a)}var N;var q;if(e.value.leftDelim==null){N=g(t)}else{N=s.customSizedDelim(e.value.leftDelim,T,true,t.withStyle(a),e.mode)}if(e.value.rightDelim==null){q=g(t)}else{q=s.customSizedDelim(e.value.rightDelim,T,true,t.withStyle(a),e.mode)}return p(["mord",t.style.reset(),a.cls()],[N,p(["mfrac"],[w]),q],t.getColor())};y.array=function(e,t,r){var i;var s;var l=e.value.body.length;var h=0;var c=new Array(l);var v=1/o.metrics.ptPerEm;var m=5*v;var f=12*v;var d=u.deflt(e.value.arraystretch,1);var g=d*f;var y=.7*g;var x=.3*g;var w=0;for(i=0;i<e.value.body.length;++i){var k=e.value.body[i];var z=y;var S=x;if(h<k.length){h=k.length}var M=new Array(k.length);for(s=0;s<k.length;++s){var T=b(k[s],t);if(S<T.depth){S=T.depth}if(z<T.height){z=T.height}M[s]=T}var N=0;if(e.value.rowGaps[i]){N=e.value.rowGaps[i].value;switch(N.unit){case"em":N=N.number;break;case"ex":N=N.number*o.metrics.emPerEx;break;default:console.error("Can't handle unit "+N.unit);N=0}if(N>0){N+=x;if(S<N){S=N}N=0}}M.height=z;M.depth=S;w+=z;M.pos=w;w+=S+N;c[i]=M}var q=w/2+o.metrics.axisHeight;var A=e.value.cols||[];var C=[];var R;var E;for(s=0,E=0;s<h||E<A.length;++s,++E){var P=A[E]||{};var D=true;while(P.type==="separator"){if(!D){R=p(["arraycolsep"],[]);R.style.width=o.metrics.doubleRuleSep+"em";C.push(R)}if(P.separator==="|"){var L=p(["vertical-separator"],[]);L.style.height=w+"em";L.style.verticalAlign=-(w-q)+"em";C.push(L)}else{throw new a("Invalid separator type: "+P.separator)}E++;P=A[E]||{};D=false}if(s>=h){continue}var O;if(s>0||e.value.hskipBeforeAndAfter){O=u.deflt(P.pregap,m);if(O!==0){R=p(["arraycolsep"],[]);R.style.width=O+"em";C.push(R)}}var I=[];for(i=0;i<l;++i){var B=c[i];var F=B[s];if(!F){continue}var _=B.pos-q;F.depth=B.depth;F.height=B.height;I.push({type:"elem",elem:F,shift:_})}I=n.makeVList(I,"individualShift",null,t);I=p(["col-align-"+(P.align||"c")],[I]);C.push(I);if(s<h-1||e.value.hskipBeforeAndAfter){O=u.deflt(P.postgap,m);if(O!==0){R=p(["arraycolsep"],[]);R.style.width=O+"em";C.push(R)}}}c=p(["mtable"],C);return p(["mord"],[c],t.getColor())};y.spacing=function(e,t,r){if(e.value==="\\ "||e.value==="\\space"||e.value===" "||e.value==="~"){return p(["mord","mspace"],[n.mathsym(e.value,e.mode)])}else{return p(["mord","mspace",n.spacingFunctions[e.value].className])}};y.llap=function(e,t,r){var a=p(["inner"],[b(e.value.body,t.reset())]);var i=p(["fix"],[]);return p(["llap",t.style.cls()],[a,i])};y.rlap=function(e,t,r){var a=p(["inner"],[b(e.value.body,t.reset())]);var i=p(["fix"],[]);return p(["rlap",t.style.cls()],[a,i])};y.op=function(e,t,r){var a;var s;var l=false;if(e.type==="supsub"){a=e.value.sup;s=e.value.sub;e=e.value.base;l=true}var h=["\\smallint"];var c=false;if(t.style.size===i.DISPLAY.size&&e.value.symbol&&!u.contains(h,e.value.body)){c=true}var v;var m=0;var f=0;if(e.value.symbol){var d=c?"Size2-Regular":"Size1-Regular";v=n.makeSymbol(e.value.body,d,"math",t.getColor(),["op-symbol",c?"large-op":"small-op","mop"]);m=(v.height-v.depth)/2-o.metrics.axisHeight*t.style.sizeMultiplier;f=v.italic}else{var g=[];for(var y=1;y<e.value.body.length;y++){g.push(n.mathsym(e.value.body[y],e.mode))}v=p(["mop"],g,t.getColor())}if(l){v=p([],[v]);var x;var w;var k;var z;if(a){var S=b(a,t.withStyle(t.style.sup()));x=p([t.style.reset(),t.style.sup().cls()],[S]);w=Math.max(o.metrics.bigOpSpacing1,o.metrics.bigOpSpacing3-S.depth)}if(s){var M=b(s,t.withStyle(t.style.sub()));k=p([t.style.reset(),t.style.sub().cls()],[M]);z=Math.max(o.metrics.bigOpSpacing2,o.metrics.bigOpSpacing4-M.height)}var T;var N;var q;if(!a){N=v.height-m;T=n.makeVList([{type:"kern",size:o.metrics.bigOpSpacing5},{type:"elem",elem:k},{type:"kern",size:z},{type:"elem",elem:v}],"top",N,t);T.children[0].style.marginLeft=-f+"em"}else if(!s){q=v.depth+m;T=n.makeVList([{type:"elem",elem:v},{type:"kern",size:w},{type:"elem",elem:x},{type:"kern",size:o.metrics.bigOpSpacing5}],"bottom",q,t);T.children[1].style.marginLeft=f+"em"}else if(!a&&!s){return v}else{q=o.metrics.bigOpSpacing5+k.height+k.depth+z+v.depth+m;T=n.makeVList([{type:"kern",size:o.metrics.bigOpSpacing5},{type:"elem",elem:k},{type:"kern",size:z},{type:"elem",elem:v},{type:"kern",size:w},{type:"elem",elem:x},{type:"kern",size:o.metrics.bigOpSpacing5}],"bottom",q,t);T.children[0].style.marginLeft=-f+"em";T.children[2].style.marginLeft=f+"em"}return p(["mop","op-limits"],[T])}else{if(e.value.symbol){v.style.top=m+"em"}return v}};y.katex=function(e,t,r){var a=p(["k"],[n.mathsym("K",e.mode)]);var i=p(["a"],[n.mathsym("A",e.mode)]);i.height=(i.height+.2)*.75;i.depth=(i.height-.2)*.75;var s=p(["t"],[n.mathsym("T",e.mode)]);var l=p(["e"],[n.mathsym("E",e.mode)]);l.height=l.height-.2155;l.depth=l.depth+.2155;var o=p(["x"],[n.mathsym("X",e.mode)]);return p(["katex-logo","mord"],[a,i,s,l,o],t.getColor())};y.overline=function(e,t,r){var a=b(e.value.body,t.withStyle(t.style.cramp()));var s=o.metrics.defaultRuleThickness/t.style.sizeMultiplier;var l=p([t.style.reset(),i.TEXT.cls(),"overline-line"]);l.height=s;l.maxFontSize=1;var u=n.makeVList([{type:"elem",elem:a},{type:"kern",size:3*s},{type:"elem",elem:l},{type:"kern",size:s}],"firstBaseline",null,t);return p(["overline","mord"],[u],t.getColor())};y.underline=function(e,t,r){var a=b(e.value.body,t);var s=o.metrics.defaultRuleThickness/t.style.sizeMultiplier;var l=p([t.style.reset(),i.TEXT.cls(),"underline-line"]);l.height=s;l.maxFontSize=1;var u=n.makeVList([{type:"kern",size:s},{type:"elem",elem:l},{type:"kern",size:3*s},{type:"elem",elem:a}],"top",a.height,t);return p(["underline","mord"],[u],t.getColor())};y.sqrt=function(e,t,r){var a=b(e.value.body,t.withStyle(t.style.cramp()));var l=o.metrics.defaultRuleThickness/t.style.sizeMultiplier;var u=p([t.style.reset(),i.TEXT.cls(),"sqrt-line"],[],t.getColor());u.height=l;u.maxFontSize=1;var h=l;if(t.style.id<i.TEXT.id){h=o.metrics.xHeight}var c=l+h/4;var v=(a.height+a.depth)*t.style.sizeMultiplier;var m=v+c+l;var f=p(["sqrt-sign"],[s.customSizedDelim("\\surd",m,false,t,e.mode)],t.getColor());var d=f.height+f.depth-l;if(d>a.height+a.depth+c){c=(c+d-a.height-a.depth)/2}var g=-(a.height+c+l)+f.height;f.style.top=g+"em";f.height-=g;f.depth+=g;var y;if(a.height===0&&a.depth===0){y=p()}else{y=n.makeVList([{type:"elem",elem:a},{type:"kern",size:c},{type:"elem",elem:u},{type:"kern",size:l}],"firstBaseline",null,t)}if(!e.value.index){return p(["sqrt","mord"],[f,y])}else{var x=b(e.value.index,t.withStyle(i.SCRIPTSCRIPT));var w=p([t.style.reset(),i.SCRIPTSCRIPT.cls()],[x]);var k=Math.max(f.height,y.height);var z=Math.max(f.depth,y.depth);var S=.6*(k-z);var M=n.makeVList([{type:"elem",elem:w}],"shift",-S,t);var T=p(["root"],[M]);return p(["sqrt","mord"],[T,f,y]);
+
+}};y.sizing=function(e,t,r){var a=h(e.value.value,t.withSize(e.value.size),r);var i=p(["mord"],[p(["sizing","reset-"+t.size,e.value.size,t.style.cls()],a)]);var s=n.sizingMultiplier[e.value.size];i.maxFontSize=s*t.style.sizeMultiplier;return i};y.styling=function(e,t,r){var a={display:i.DISPLAY,text:i.TEXT,script:i.SCRIPT,scriptscript:i.SCRIPTSCRIPT};var n=a[e.value.style];var s=h(e.value.value,t.withStyle(n),r);return p([t.style.reset(),n.cls()],s)};y.font=function(e,t,r){var a=e.value.font;return b(e.value.body,t.withFont(a),r)};y.delimsizing=function(e,t,r){var a=e.value.value;if(a==="."){return p([c[e.value.delimType]])}return p([c[e.value.delimType]],[s.sizedDelim(a,e.value.size,t,e.mode)])};y.leftright=function(e,t,r){var a=h(e.value.body,t.reset());var i=0;var n=0;for(var l=0;l<a.length;l++){i=Math.max(a[l].height,i);n=Math.max(a[l].depth,n)}i*=t.style.sizeMultiplier;n*=t.style.sizeMultiplier;var o;if(e.value.left==="."){o=g(t)}else{o=s.leftRightDelim(e.value.left,i,n,t,e.mode)}a.unshift(o);var u;if(e.value.right==="."){u=g(t)}else{u=s.leftRightDelim(e.value.right,i,n,t,e.mode)}a.push(u);return p(["minner",t.style.cls()],a,t.getColor())};y.rule=function(e,t,r){var a=p(["mord","rule"],[],t.getColor());var i=0;if(e.value.shift){i=e.value.shift.number;if(e.value.shift.unit==="ex"){i*=o.metrics.xHeight}}var n=e.value.width.number;if(e.value.width.unit==="ex"){n*=o.metrics.xHeight}var s=e.value.height.number;if(e.value.height.unit==="ex"){s*=o.metrics.xHeight}i/=t.style.sizeMultiplier;n/=t.style.sizeMultiplier;s/=t.style.sizeMultiplier;a.style.borderRightWidth=n+"em";a.style.borderTopWidth=s+"em";a.style.bottom=i+"em";a.width=n;a.height=s+i;a.depth=-i;return a};y.accent=function(e,t,r){var a=e.value.base;var i;if(e.type==="supsub"){var s=e;e=s.value.base;a=e.value.base;s.value.base=a;i=b(s,t.reset(),r)}var l=b(a,t.withStyle(t.style.cramp()));var u;if(d(a)){var h=f(a);var c=b(h,t.withStyle(t.style.cramp()));u=c.skew}else{u=0}var v=Math.min(l.height,o.metrics.xHeight);var m=n.makeSymbol(e.value.accent,"Main-Regular","math",t.getColor());m.italic=0;var g=e.value.accent==="\\vec"?"accent-vec":null;var y=p(["accent-body",g],[p([],[m])]);y=n.makeVList([{type:"elem",elem:l},{type:"kern",size:-v},{type:"elem",elem:y}],"firstBaseline",null,t);y.children[1].style.marginLeft=2*u+"em";var x=p(["mord","accent"],[y]);if(i){i.children[0]=x;i.height=Math.max(x.height,i.height);i.classes[0]="mord";return i}else{return x}};y.phantom=function(e,t,r){var a=h(e.value.value,t.withPhantom(),r);return new n.makeFragment(a)};var b=function(e,t,r){if(!e){return p()}if(y[e.type]){var i=y[e.type](e,t,r);var s;if(t.style!==t.parentStyle){s=t.style.sizeMultiplier/t.parentStyle.sizeMultiplier;i.height*=s;i.depth*=s}if(t.size!==t.parentSize){s=n.sizingMultiplier[t.size]/n.sizingMultiplier[t.parentSize];i.height*=s;i.depth*=s}return i}else{throw new a("Got group of unknown type: '"+e.type+"'")}};var x=function(e,t){e=JSON.parse(JSON.stringify(e));var r=h(e,t);var a=p(["base",t.style.cls()],r);var i=p(["strut"]);var n=p(["strut","bottom"]);i.style.height=a.height+"em";n.style.height=a.height+a.depth+"em";n.style.verticalAlign=-a.depth+"em";var s=p(["katex-html"],[i,n,a]);s.setAttribute("aria-hidden","true");return s};t.exports=x},{"./ParseError":5,"./Style":8,"./buildCommon":9,"./delimiter":13,"./domTree":14,"./fontMetrics":16,"./utils":23}],11:[function(e,t,r){var a=e("./buildCommon");var i=e("./fontMetrics");var n=e("./mathMLTree");var s=e("./ParseError");var l=e("./symbols");var o=e("./utils");var u=a.makeSpan;var p=a.fontMap;var h=function(e,t){if(l[t][e]&&l[t][e].replace){e=l[t][e].replace}return new n.TextNode(e)};var c=function(e,t){var r=t.font;if(!r){return null}var a=e.mode;if(r==="mathit"){return"italic"}var n=e.value;if(o.contains(["\\imath","\\jmath"],n)){return null}if(l[a][n]&&l[a][n].replace){n=l[a][n].replace}var s=p[r].fontName;if(i.getCharacterMetrics(n,s)){return p[t.font].variant}return null};var v={};v.mathord=function(e,t){var r=new n.MathNode("mi",[h(e.value,e.mode)]);var a=c(e,t);if(a){r.setAttribute("mathvariant",a)}return r};v.textord=function(e,t){var r=h(e.value,e.mode);var a=c(e,t)||"normal";var i;if(/[0-9]/.test(e.value)){i=new n.MathNode("mn",[r]);if(t.font){i.setAttribute("mathvariant",a)}}else{i=new n.MathNode("mi",[r]);i.setAttribute("mathvariant",a)}return i};v.bin=function(e){var t=new n.MathNode("mo",[h(e.value,e.mode)]);return t};v.rel=function(e){var t=new n.MathNode("mo",[h(e.value,e.mode)]);return t};v.open=function(e){var t=new n.MathNode("mo",[h(e.value,e.mode)]);return t};v.close=function(e){var t=new n.MathNode("mo",[h(e.value,e.mode)]);return t};v.inner=function(e){var t=new n.MathNode("mo",[h(e.value,e.mode)]);return t};v.punct=function(e){var t=new n.MathNode("mo",[h(e.value,e.mode)]);t.setAttribute("separator","true");return t};v.ordgroup=function(e,t){var r=m(e.value,t);var a=new n.MathNode("mrow",r);return a};v.text=function(e,t){var r=m(e.value.body,t);var a=new n.MathNode("mtext",r);return a};v.color=function(e,t){var r=m(e.value.value,t);var a=new n.MathNode("mstyle",r);a.setAttribute("mathcolor",e.value.color);return a};v.supsub=function(e,t){var r=[f(e.value.base,t)];if(e.value.sub){r.push(f(e.value.sub,t))}if(e.value.sup){r.push(f(e.value.sup,t))}var a;if(!e.value.sub){a="msup"}else if(!e.value.sup){a="msub"}else{a="msubsup"}var i=new n.MathNode(a,r);return i};v.genfrac=function(e,t){var r=new n.MathNode("mfrac",[f(e.value.numer,t),f(e.value.denom,t)]);if(!e.value.hasBarLine){r.setAttribute("linethickness","0px")}if(e.value.leftDelim!=null||e.value.rightDelim!=null){var a=[];if(e.value.leftDelim!=null){var i=new n.MathNode("mo",[new n.TextNode(e.value.leftDelim)]);i.setAttribute("fence","true");a.push(i)}a.push(r);if(e.value.rightDelim!=null){var s=new n.MathNode("mo",[new n.TextNode(e.value.rightDelim)]);s.setAttribute("fence","true");a.push(s)}var l=new n.MathNode("mrow",a);return l}return r};v.array=function(e,t){return new n.MathNode("mtable",e.value.body.map(function(e){return new n.MathNode("mtr",e.map(function(e){return new n.MathNode("mtd",[f(e,t)])}))}))};v.sqrt=function(e,t){var r;if(e.value.index){r=new n.MathNode("mroot",[f(e.value.body,t),f(e.value.index,t)])}else{r=new n.MathNode("msqrt",[f(e.value.body,t)])}return r};v.leftright=function(e,t){var r=m(e.value.body,t);if(e.value.left!=="."){var a=new n.MathNode("mo",[h(e.value.left,e.mode)]);a.setAttribute("fence","true");r.unshift(a)}if(e.value.right!=="."){var i=new n.MathNode("mo",[h(e.value.right,e.mode)]);i.setAttribute("fence","true");r.push(i)}var s=new n.MathNode("mrow",r);return s};v.accent=function(e,t){var r=new n.MathNode("mo",[h(e.value.accent,e.mode)]);var a=new n.MathNode("mover",[f(e.value.base,t),r]);a.setAttribute("accent","true");return a};v.spacing=function(e){var t;if(e.value==="\\ "||e.value==="\\space"||e.value===" "||e.value==="~"){t=new n.MathNode("mtext",[new n.TextNode("\xa0")])}else{t=new n.MathNode("mspace");t.setAttribute("width",a.spacingFunctions[e.value].size)}return t};v.op=function(e){var t;if(e.value.symbol){t=new n.MathNode("mo",[h(e.value.body,e.mode)])}else{t=new n.MathNode("mi",[new n.TextNode(e.value.body.slice(1))])}return t};v.katex=function(e){var t=new n.MathNode("mtext",[new n.TextNode("KaTeX")]);return t};v.font=function(e,t){var r=e.value.font;return f(e.value.body,t.withFont(r))};v.delimsizing=function(e){var t=[];if(e.value.value!=="."){t.push(h(e.value.value,e.mode))}var r=new n.MathNode("mo",t);if(e.value.delimType==="open"||e.value.delimType==="close"){r.setAttribute("fence","true")}else{r.setAttribute("fence","false")}return r};v.styling=function(e,t){var r=m(e.value.value,t);var a=new n.MathNode("mstyle",r);var i={display:["0","true"],text:["0","false"],script:["1","false"],scriptscript:["2","false"]};var s=i[e.value.style];a.setAttribute("scriptlevel",s[0]);a.setAttribute("displaystyle",s[1]);return a};v.sizing=function(e,t){var r=m(e.value.value,t);var i=new n.MathNode("mstyle",r);i.setAttribute("mathsize",a.sizingMultiplier[e.value.size]+"em");return i};v.overline=function(e,t){var r=new n.MathNode("mo",[new n.TextNode("\u203e")]);r.setAttribute("stretchy","true");var a=new n.MathNode("mover",[f(e.value.body,t),r]);a.setAttribute("accent","true");return a};v.underline=function(e,t){var r=new n.MathNode("mo",[new n.TextNode("\u203e")]);r.setAttribute("stretchy","true");var a=new n.MathNode("munder",[f(e.value.body,t),r]);a.setAttribute("accentunder","true");return a};v.rule=function(e){var t=new n.MathNode("mrow");return t};v.llap=function(e,t){var r=new n.MathNode("mpadded",[f(e.value.body,t)]);r.setAttribute("lspace","-1width");r.setAttribute("width","0px");return r};v.rlap=function(e,t){var r=new n.MathNode("mpadded",[f(e.value.body,t)]);r.setAttribute("width","0px");return r};v.phantom=function(e,t,r){var a=m(e.value.value,t);return new n.MathNode("mphantom",a)};var m=function(e,t){var r=[];for(var a=0;a<e.length;a++){var i=e[a];r.push(f(i,t))}return r};var f=function(e,t){if(!e){return new n.MathNode("mrow")}if(v[e.type]){return v[e.type](e,t)}else{throw new s("Got group of unknown type: '"+e.type+"'")}};var d=function(e,t,r){var a=m(e,r);var i=new n.MathNode("mrow",a);var s=new n.MathNode("annotation",[new n.TextNode(t)]);s.setAttribute("encoding","application/x-tex");var l=new n.MathNode("semantics",[i,s]);var o=new n.MathNode("math",[l]);return u(["katex-mathml"],[o])};t.exports=d},{"./ParseError":5,"./buildCommon":9,"./fontMetrics":16,"./mathMLTree":19,"./symbols":22,"./utils":23}],12:[function(e,t,r){var a=e("./buildHTML");var i=e("./buildMathML");var n=e("./buildCommon");var s=e("./Options");var l=e("./Settings");var o=e("./Style");var u=n.makeSpan;var p=function(e,t,r){r=r||new l({});var n=o.TEXT;if(r.displayMode){n=o.DISPLAY}var p=new s({style:n,size:"size5"});var h=i(e,t,p);var c=a(e,p);var v=u(["katex"],[h,c]);if(r.displayMode){return u(["katex-display"],[v])}else{return v}};t.exports=p},{"./Options":4,"./Settings":7,"./Style":8,"./buildCommon":9,"./buildHTML":10,"./buildMathML":11}],13:[function(e,t,r){var a=e("./ParseError");var i=e("./Style");var n=e("./buildCommon");var s=e("./fontMetrics");var l=e("./symbols");var o=e("./utils");var u=n.makeSpan;var p=function(e,t){if(l.math[e]&&l.math[e].replace){return s.getCharacterMetrics(l.math[e].replace,t)}else{return s.getCharacterMetrics(e,t)}};var h=function(e,t,r){return n.makeSymbol(e,"Size"+t+"-Regular",r)};var c=function(e,t,r){var a=u(["style-wrap",r.style.reset(),t.cls()],[e]);var i=t.sizeMultiplier/r.style.sizeMultiplier;a.height*=i;a.depth*=i;a.maxFontSize=t.sizeMultiplier;return a};var v=function(e,t,r,a,i){var l=n.makeSymbol(e,"Main-Regular",i);var o=c(l,t,a);if(r){var u=(1-a.style.sizeMultiplier/t.sizeMultiplier)*s.metrics.axisHeight;o.style.top=u+"em";o.height-=u;o.depth+=u}return o};var m=function(e,t,r,a,n){var l=h(e,t,n);var o=c(u(["delimsizing","size"+t],[l],a.getColor()),i.TEXT,a);if(r){var p=(1-a.style.sizeMultiplier)*s.metrics.axisHeight;o.style.top=p+"em";o.height-=p;o.depth+=p}return o};var f=function(e,t,r){var a;if(t==="Size1-Regular"){a="delim-size1"}else if(t==="Size4-Regular"){a="delim-size4"}var i=u(["delimsizinginner",a],[u([],[n.makeSymbol(e,t,r)])]);return{type:"elem",elem:i}};var d=function(e,t,r,a,l){var o;var h;var v;var m;o=v=m=e;h=null;var d="Size1-Regular";if(e==="\\uparrow"){v=m="\u23d0"}else if(e==="\\Uparrow"){v=m="\u2016"}else if(e==="\\downarrow"){o=v="\u23d0"}else if(e==="\\Downarrow"){o=v="\u2016"}else if(e==="\\updownarrow"){o="\\uparrow";v="\u23d0";m="\\downarrow"}else if(e==="\\Updownarrow"){o="\\Uparrow";v="\u2016";m="\\Downarrow"}else if(e==="["||e==="\\lbrack"){o="\u23a1";v="\u23a2";m="\u23a3";d="Size4-Regular"}else if(e==="]"||e==="\\rbrack"){o="\u23a4";v="\u23a5";m="\u23a6";d="Size4-Regular"}else if(e==="\\lfloor"){v=o="\u23a2";m="\u23a3";d="Size4-Regular"}else if(e==="\\lceil"){o="\u23a1";v=m="\u23a2";d="Size4-Regular"}else if(e==="\\rfloor"){v=o="\u23a5";m="\u23a6";d="Size4-Regular"}else if(e==="\\rceil"){o="\u23a4";v=m="\u23a5";d="Size4-Regular"}else if(e==="("){o="\u239b";v="\u239c";m="\u239d";d="Size4-Regular"}else if(e===")"){o="\u239e";v="\u239f";m="\u23a0";d="Size4-Regular"}else if(e==="\\{"||e==="\\lbrace"){o="\u23a7";h="\u23a8";m="\u23a9";v="\u23aa";d="Size4-Regular"}else if(e==="\\}"||e==="\\rbrace"){o="\u23ab";h="\u23ac";m="\u23ad";v="\u23aa";d="Size4-Regular"}else if(e==="\\lgroup"){o="\u23a7";m="\u23a9";v="\u23aa";d="Size4-Regular"}else if(e==="\\rgroup"){o="\u23ab";m="\u23ad";v="\u23aa";d="Size4-Regular"}else if(e==="\\lmoustache"){o="\u23a7";m="\u23ad";v="\u23aa";d="Size4-Regular"}else if(e==="\\rmoustache"){o="\u23ab";m="\u23a9";v="\u23aa";d="Size4-Regular"}else if(e==="\\surd"){o="\ue001";m="\u23b7";v="\ue000";d="Size4-Regular"}var g=p(o,d);var y=g.height+g.depth;var b=p(v,d);var x=b.height+b.depth;var w=p(m,d);var k=w.height+w.depth;var z=0;var S=1;if(h!==null){var M=p(h,d);z=M.height+M.depth;S=2}var T=y+k+z;var N=Math.ceil((t-T)/(S*x));var q=T+N*S*x;var A=s.metrics.axisHeight;if(r){A*=a.style.sizeMultiplier}var C=q/2-A;var R=[];R.push(f(m,d,l));var E;if(h===null){for(E=0;E<N;E++){R.push(f(v,d,l))}}else{for(E=0;E<N;E++){R.push(f(v,d,l))}R.push(f(h,d,l));for(E=0;E<N;E++){R.push(f(v,d,l))}}R.push(f(o,d,l));var P=n.makeVList(R,"bottom",C,a);return c(u(["delimsizing","mult"],[P],a.getColor()),i.TEXT,a)};var g=["(",")","[","\\lbrack","]","\\rbrack","\\{","\\lbrace","\\}","\\rbrace","\\lfloor","\\rfloor","\\lceil","\\rceil","\\surd"];var y=["\\uparrow","\\downarrow","\\updownarrow","\\Uparrow","\\Downarrow","\\Updownarrow","|","\\|","\\vert","\\Vert","\\lvert","\\rvert","\\lVert","\\rVert","\\lgroup","\\rgroup","\\lmoustache","\\rmoustache"];var b=["<",">","\\langle","\\rangle","/","\\backslash","\\lt","\\gt"];var x=[0,1.2,1.8,2.4,3];var w=function(e,t,r,i){if(e==="<"||e==="\\lt"){e="\\langle"}else if(e===">"||e==="\\gt"){e="\\rangle"}if(o.contains(g,e)||o.contains(b,e)){return m(e,t,false,r,i)}else if(o.contains(y,e)){return d(e,x[t],false,r,i)}else{throw new a("Illegal delimiter: '"+e+"'")}};var k=[{type:"small",style:i.SCRIPTSCRIPT},{type:"small",style:i.SCRIPT},{type:"small",style:i.TEXT},{type:"large",size:1},{type:"large",size:2},{type:"large",size:3},{type:"large",size:4}];var z=[{type:"small",style:i.SCRIPTSCRIPT},{type:"small",style:i.SCRIPT},{type:"small",style:i.TEXT},{type:"stack"}];var S=[{type:"small",style:i.SCRIPTSCRIPT},{type:"small",style:i.SCRIPT},{type:"small",style:i.TEXT},{type:"large",size:1},{type:"large",size:2},{type:"large",size:3},{type:"large",size:4},{type:"stack"}];var M=function(e){if(e.type==="small"){return"Main-Regular"}else if(e.type==="large"){return"Size"+e.size+"-Regular"}else if(e.type==="stack"){return"Size4-Regular"}};var T=function(e,t,r,a){var i=Math.min(2,3-a.style.size);for(var n=i;n<r.length;n++){if(r[n].type==="stack"){break}var s=p(e,M(r[n]));var l=s.height+s.depth;if(r[n].type==="small"){l*=r[n].style.sizeMultiplier}if(l>t){return r[n]}}return r[r.length-1]};var N=function(e,t,r,a,i){if(e==="<"||e==="\\lt"){e="\\langle"}else if(e===">"||e==="\\gt"){e="\\rangle"}var n;if(o.contains(b,e)){n=k}else if(o.contains(g,e)){n=S}else{n=z}var s=T(e,t,n,a);if(s.type==="small"){return v(e,s.style,r,a,i)}else if(s.type==="large"){return m(e,s.size,r,a,i)}else if(s.type==="stack"){return d(e,t,r,a,i)}};var q=function(e,t,r,a,i){var n=s.metrics.axisHeight*a.style.sizeMultiplier;var l=901;var o=5/s.metrics.ptPerEm;var u=Math.max(t-n,r+n);var p=Math.max(u/500*l,2*u-o);return N(e,p,true,a,i)};t.exports={sizedDelim:w,customSizedDelim:N,leftRightDelim:q}},{"./ParseError":5,"./Style":8,"./buildCommon":9,"./fontMetrics":16,"./symbols":22,"./utils":23}],14:[function(e,t,r){var a=e("./utils");var i=function(e){e=e.slice();for(var t=e.length-1;t>=0;t--){if(!e[t]){e.splice(t,1)}}return e.join(" ")};function n(e,t,r,a,i,n){this.classes=e||[];this.children=t||[];this.height=r||0;this.depth=a||0;this.maxFontSize=i||0;this.style=n||{};this.attributes={}}n.prototype.setAttribute=function(e,t){this.attributes[e]=t};n.prototype.toNode=function(){var e=document.createElement("span");e.className=i(this.classes);for(var t in this.style){if(Object.prototype.hasOwnProperty.call(this.style,t)){e.style[t]=this.style[t]}}for(var r in this.attributes){if(Object.prototype.hasOwnProperty.call(this.attributes,r)){e.setAttribute(r,this.attributes[r])}}for(var a=0;a<this.children.length;a++){e.appendChild(this.children[a].toNode())}return e};n.prototype.toMarkup=function(){var e="<span";if(this.classes.length){e+=' class="';e+=a.escape(i(this.classes));e+='"'}var t="";for(var r in this.style){if(this.style.hasOwnProperty(r)){t+=a.hyphenate(r)+":"+this.style[r]+";"}}if(t){e+=' style="'+a.escape(t)+'"'}for(var n in this.attributes){if(Object.prototype.hasOwnProperty.call(this.attributes,n)){e+=" "+n+'="';e+=a.escape(this.attributes[n]);e+='"'}}e+=">";for(var s=0;s<this.children.length;s++){e+=this.children[s].toMarkup()}e+="</span>";return e};function s(e,t,r,a){this.children=e||[];this.height=t||0;this.depth=r||0;this.maxFontSize=a||0}s.prototype.toNode=function(){var e=document.createDocumentFragment();for(var t=0;t<this.children.length;t++){e.appendChild(this.children[t].toNode())}return e};s.prototype.toMarkup=function(){var e="";for(var t=0;t<this.children.length;t++){e+=this.children[t].toMarkup()}return e};function l(e,t,r,a,i,n,s){this.value=e||"";this.height=t||0;this.depth=r||0;this.italic=a||0;this.skew=i||0;this.classes=n||[];this.style=s||{};this.maxFontSize=0}l.prototype.toNode=function(){var e=document.createTextNode(this.value);var t=null;if(this.italic>0){t=document.createElement("span");t.style.marginRight=this.italic+"em"}if(this.classes.length>0){t=t||document.createElement("span");t.className=i(this.classes)}for(var r in this.style){if(this.style.hasOwnProperty(r)){t=t||document.createElement("span");t.style[r]=this.style[r]}}if(t){t.appendChild(e);return t}else{return e}};l.prototype.toMarkup=function(){var e=false;var t="<span";if(this.classes.length){e=true;t+=' class="';t+=a.escape(i(this.classes));t+='"'}var r="";if(this.italic>0){r+="margin-right:"+this.italic+"em;"}for(var n in this.style){if(this.style.hasOwnProperty(n)){r+=a.hyphenate(n)+":"+this.style[n]+";"}}if(r){e=true;t+=' style="'+a.escape(r)+'"'}var s=a.escape(this.value);if(e){t+=">";t+=s;t+="</span>";return t}else{return s}};t.exports={span:n,documentFragment:s,symbolNode:l}},{"./utils":23}],15:[function(e,t,r){var a=e("./fontMetrics");var i=e("./parseData");var n=e("./ParseError");var s=i.ParseNode;function l(e,t){var r=[];var a=[r];var i=[];while(true){var l=e.parseExpression(false,null);r.push(new s("ordgroup",l,e.mode));var o=e.nextToken.text;if(o==="&"){e.consume()}else if(o==="\\end"){break}else if(o==="\\\\"||o==="\\cr"){var u=e.parseFunction();i.push(u.value.size);r=[];a.push(r)}else{var p=Math.min(e.pos+1,e.lexer._input.length);throw new n("Expected & or \\\\ or \\end",e.lexer,p)}}t.body=a;t.rowGaps=i;return new s(t.type,t,e.mode)}function o(e,r,a){if(typeof e==="string"){e=[e]}if(typeof r==="number"){r={numArgs:r}}var i={numArgs:r.numArgs||0,argTypes:r.argTypes,greediness:1,allowedInText:!!r.allowedInText,numOptionalArgs:r.numOptionalArgs||0,handler:a};for(var n=0;n<e.length;++n){t.exports[e[n]]=i}}o("array",{numArgs:1},function(e,t){var r=t[0];r=r.value.map?r.value:[r];var a=r.map(function(t){var r=t.value;if("lcr".indexOf(r)!==-1){return{type:"align",align:r}}else if(r==="|"){return{type:"separator",separator:"|"}}throw new n("Unknown column alignment: "+t.value,e.lexer,e.positions[1])});var i={type:"array",cols:a,hskipBeforeAndAfter:true};i=l(e.parser,i);return i});o(["matrix","pmatrix","bmatrix","Bmatrix","vmatrix","Vmatrix"],{},function(e){var t={matrix:null,pmatrix:["(",")"],bmatrix:["[","]"],Bmatrix:["\\{","\\}"],vmatrix:["|","|"],Vmatrix:["\\Vert","\\Vert"]}[e.envName];var r={type:"array",hskipBeforeAndAfter:false};r=l(e.parser,r);if(t){r=new s("leftright",{body:[r],left:t[0],right:t[1]},e.mode)}return r});o("cases",{},function(e){var t={type:"array",arraystretch:1.2,cols:[{type:"align",align:"l",pregap:0,postgap:a.metrics.quad},{type:"align",align:"l",pregap:0,postgap:0}]};t=l(e.parser,t);t=new s("leftright",{body:[t],left:"\\{",right:"."},e.mode);return t});o("aligned",{},function(e){var t={type:"array",cols:[]};t=l(e.parser,t);var r=new s("ordgroup",[],e.mode);var a=0;t.value.body.forEach(function(e){var t;for(t=1;t<e.length;t+=2){e[t].value.unshift(r)}if(a<e.length){a=e.length}});for(var i=0;i<a;++i){var n="r";var o=0;if(i%2===1){n="l"}else if(i>0){o=2}t.value.cols[i]={type:"align",align:n,pregap:o,postgap:0}}return t})},{"./ParseError":5,"./fontMetrics":16,"./parseData":20}],16:[function(e,t,r){var a=e("./Style");var i=.025;var n=0;var s=0;var l=0;var o=.431;var u=1;var p=0;var h=.677;var c=.394;var v=.444;var m=.686;var f=.345;var d=.413;var g=.363;var y=.289;var b=.15;var x=.247;var w=.386;var k=.05;var z=2.39;var S=1.01;var M=.81;var T=.71;var N=.25;var q=0;var A=0;var C=0;var R=0;var E=.431;var P=1;var D=0;var L=.04;var O=.111;var I=.166;var B=.2;var F=.6;var _=.1;var V=10;var G=2/V;var H={xHeight:o,quad:u,num1:h,num2:c,num3:v,denom1:m,denom2:f,sup1:d,sup2:g,sup3:y,sub1:b,sub2:x,supDrop:w,subDrop:k,axisHeight:N,defaultRuleThickness:L,bigOpSpacing1:O,bigOpSpacing2:I,bigOpSpacing3:B,bigOpSpacing4:F,bigOpSpacing5:_,ptPerEm:V,emPerEx:o/u,doubleRuleSep:G,delim1:z,getDelim2:function(e){if(e.size===a.TEXT.size){return S}else if(e.size===a.SCRIPT.size){return M}else if(e.size===a.SCRIPTSCRIPT.size){return T}throw new Error("Unexpected style size: "+e.size)}};var X=e("./fontMetricsData");var U=function(e,t){var r=X[t][e.charCodeAt(0)];if(r){return{depth:r[0],height:r[1],italic:r[2],skew:r[3],width:r[4]}}};t.exports={metrics:H,getCharacterMetrics:U}},{"./Style":8,"./fontMetricsData":17}],17:[function(e,t,r){t.exports={"AMS-Regular":{65:[0,.68889,0,0],66:[0,.68889,0,0],67:[0,.68889,0,0],68:[0,.68889,0,0],69:[0,.68889,0,0],70:[0,.68889,0,0],71:[0,.68889,0,0],72:[0,.68889,0,0],73:[0,.68889,0,0],74:[.16667,.68889,0,0],75:[0,.68889,0,0],76:[0,.68889,0,0],77:[0,.68889,0,0],78:[0,.68889,0,0],79:[.16667,.68889,0,0],80:[0,.68889,0,0],81:[.16667,.68889,0,0],82:[0,.68889,0,0],83:[0,.68889,0,0],84:[0,.68889,0,0],85:[0,.68889,0,0],86:[0,.68889,0,0],87:[0,.68889,0,0],88:[0,.68889,0,0],89:[0,.68889,0,0],90:[0,.68889,0,0],107:[0,.68889,0,0],165:[0,.675,.025,0],174:[.15559,.69224,0,0],240:[0,.68889,0,0],295:[0,.68889,0,0],710:[0,.825,0,0],732:[0,.9,0,0],770:[0,.825,0,0],771:[0,.9,0,0],989:[.08167,.58167,0,0],1008:[0,.43056,.04028,0],8245:[0,.54986,0,0],8463:[0,.68889,0,0],8487:[0,.68889,0,0],8498:[0,.68889,0,0],8502:[0,.68889,0,0],8503:[0,.68889,0,0],8504:[0,.68889,0,0],8513:[0,.68889,0,0],8592:[-.03598,.46402,0,0],8594:[-.03598,.46402,0,0],8602:[-.13313,.36687,0,0],8603:[-.13313,.36687,0,0],8606:[.01354,.52239,0,0],8608:[.01354,.52239,0,0],8610:[.01354,.52239,0,0],8611:[.01354,.52239,0,0],8619:[0,.54986,0,0],8620:[0,.54986,0,0],8621:[-.13313,.37788,0,0],8622:[-.13313,.36687,0,0],8624:[0,.69224,0,0],8625:[0,.69224,0,0],8630:[0,.43056,0,0],8631:[0,.43056,0,0],8634:[.08198,.58198,0,0],8635:[.08198,.58198,0,0],8638:[.19444,.69224,0,0],8639:[.19444,.69224,0,0],8642:[.19444,.69224,0,0],8643:[.19444,.69224,0,0],8644:[.1808,.675,0,0],8646:[.1808,.675,0,0],8647:[.1808,.675,0,0],8648:[.19444,.69224,0,0],8649:[.1808,.675,0,0],8650:[.19444,.69224,0,0],8651:[.01354,.52239,0,0],8652:[.01354,.52239,0,0],8653:[-.13313,.36687,0,0],8654:[-.13313,.36687,0,0],8655:[-.13313,.36687,0,0],8666:[.13667,.63667,0,0],8667:[.13667,.63667,0,0],8669:[-.13313,.37788,0,0],8672:[-.064,.437,0,0],8674:[-.064,.437,0,0],8705:[0,.825,0,0],8708:[0,.68889,0,0],8709:[.08167,.58167,0,0],8717:[0,.43056,0,0],8722:[-.03598,.46402,0,0],8724:[.08198,.69224,0,0],8726:[.08167,.58167,0,0],8733:[0,.69224,0,0],8736:[0,.69224,0,0],8737:[0,.69224,0,0],8738:[.03517,.52239,0,0],8739:[.08167,.58167,0,0],8740:[.25142,.74111,0,0],8741:[.08167,.58167,0,0],8742:[.25142,.74111,0,0],8756:[0,.69224,0,0],8757:[0,.69224,0,0],8764:[-.13313,.36687,0,0],8765:[-.13313,.37788,0,0],8769:[-.13313,.36687,0,0],8770:[-.03625,.46375,0,0],8774:[.30274,.79383,0,0],8776:[-.01688,.48312,0,0],8778:[.08167,.58167,0,0],8782:[.06062,.54986,0,0],8783:[.06062,.54986,0,0],8785:[.08198,.58198,0,0],8786:[.08198,.58198,0,0],8787:[.08198,.58198,0,0],8790:[0,.69224,0,0],8791:[.22958,.72958,0,0],8796:[.08198,.91667,0,0],8806:[.25583,.75583,0,0],8807:[.25583,.75583,0,0],8808:[.25142,.75726,0,0],8809:[.25142,.75726,0,0],8812:[.25583,.75583,0,0],8814:[.20576,.70576,0,0],8815:[.20576,.70576,0,0],8816:[.30274,.79383,0,0],8817:[.30274,.79383,0,0],8818:[.22958,.72958,0,0],8819:[.22958,.72958,0,0],8822:[.1808,.675,0,0],8823:[.1808,.675,0,0],8828:[.13667,.63667,0,0],8829:[.13667,.63667,0,0],8830:[.22958,.72958,0,0],8831:[.22958,.72958,0,0],8832:[.20576,.70576,0,0],8833:[.20576,.70576,0,0],8840:[.30274,.79383,0,0],8841:[.30274,.79383,0,0],8842:[.13597,.63597,0,0],8843:[.13597,.63597,0,0],8847:[.03517,.54986,0,0],8848:[.03517,.54986,0,0],8858:[.08198,.58198,0,0],8859:[.08198,.58198,0,0],8861:[.08198,.58198,0,0],8862:[0,.675,0,0],8863:[0,.675,0,0],8864:[0,.675,0,0],8865:[0,.675,0,0],8872:[0,.69224,0,0],8873:[0,.69224,0,0],8874:[0,.69224,0,0],8876:[0,.68889,0,0],8877:[0,.68889,0,0],8878:[0,.68889,0,0],8879:[0,.68889,0,0],8882:[.03517,.54986,0,0],8883:[.03517,.54986,0,0],8884:[.13667,.63667,0,0],8885:[.13667,.63667,0,0],8888:[0,.54986,0,0],8890:[.19444,.43056,0,0],8891:[.19444,.69224,0,0],8892:[.19444,.69224,0,0],8901:[0,.54986,0,0],8903:[.08167,.58167,0,0],8905:[.08167,.58167,0,0],8906:[.08167,.58167,0,0],8907:[0,.69224,0,0],8908:[0,.69224,0,0],8909:[-.03598,.46402,0,0],8910:[0,.54986,0,0],8911:[0,.54986,0,0],8912:[.03517,.54986,0,0],8913:[.03517,.54986,0,0],8914:[0,.54986,0,0],8915:[0,.54986,0,0],8916:[0,.69224,0,0],8918:[.0391,.5391,0,0],8919:[.0391,.5391,0,0],8920:[.03517,.54986,0,0],8921:[.03517,.54986,0,0],8922:[.38569,.88569,0,0],8923:[.38569,.88569,0,0],8926:[.13667,.63667,0,0],8927:[.13667,.63667,0,0],8928:[.30274,.79383,0,0],8929:[.30274,.79383,0,0],8934:[.23222,.74111,0,0],8935:[.23222,.74111,0,0],8936:[.23222,.74111,0,0],8937:[.23222,.74111,0,0],8938:[.20576,.70576,0,0],8939:[.20576,.70576,0,0],8940:[.30274,.79383,0,0],8941:[.30274,.79383,0,0],8994:[.19444,.69224,0,0],8995:[.19444,.69224,0,0],9416:[.15559,.69224,0,0],9484:[0,.69224,0,0],9488:[0,.69224,0,0],9492:[0,.37788,0,0],9496:[0,.37788,0,0],9585:[.19444,.68889,0,0],9586:[.19444,.74111,0,0],9632:[0,.675,0,0],9633:[0,.675,0,0],9650:[0,.54986,0,0],9651:[0,.54986,0,0],9654:[.03517,.54986,0,0],9660:[0,.54986,0,0],9661:[0,.54986,0,0],9664:[.03517,.54986,0,0],9674:[.11111,.69224,0,0],9733:[.19444,.69224,0,0],10003:[0,.69224,0,0],10016:[0,.69224,0,0],10731:[.11111,.69224,0,0],10846:[.19444,.75583,0,0],10877:[.13667,.63667,0,0],10878:[.13667,.63667,0,0],10885:[.25583,.75583,0,0],10886:[.25583,.75583,0,0],10887:[.13597,.63597,0,0],10888:[.13597,.63597,0,0],10889:[.26167,.75726,0,0],10890:[.26167,.75726,0,0],10891:[.48256,.98256,0,0],10892:[.48256,.98256,0,0],10901:[.13667,.63667,0,0],10902:[.13667,.63667,0,0],10933:[.25142,.75726,0,0],10934:[.25142,.75726,0,0],10935:[.26167,.75726,0,0],10936:[.26167,.75726,0,0],10937:[.26167,.75726,0,0],10938:[.26167,.75726,0,0],10949:[.25583,.75583,0,0],10950:[.25583,.75583,0,0],10955:[.28481,.79383,0,0],10956:[.28481,.79383,0,0],57350:[.08167,.58167,0,0],57351:[.08167,.58167,0,0],57352:[.08167,.58167,0,0],57353:[0,.43056,.04028,0],57356:[.25142,.75726,0,0],57357:[.25142,.75726,0,0],57358:[.41951,.91951,0,0],57359:[.30274,.79383,0,0],57360:[.30274,.79383,0,0],57361:[.41951,.91951,0,0],57366:[.25142,.75726,0,0],57367:[.25142,.75726,0,0],57368:[.25142,.75726,0,0],57369:[.25142,.75726,0,0],57370:[.13597,.63597,0,0],57371:[.13597,.63597,0,0]},"Caligraphic-Regular":{48:[0,.43056,0,0],49:[0,.43056,0,0],50:[0,.43056,0,0],51:[.19444,.43056,0,0],52:[.19444,.43056,0,0],53:[.19444,.43056,0,0],54:[0,.64444,0,0],55:[.19444,.43056,0,0],56:[0,.64444,0,0],57:[.19444,.43056,0,0],65:[0,.68333,0,.19445],66:[0,.68333,.03041,.13889],67:[0,.68333,.05834,.13889],68:[0,.68333,.02778,.08334],69:[0,.68333,.08944,.11111],70:[0,.68333,.09931,.11111],71:[.09722,.68333,.0593,.11111],72:[0,.68333,.00965,.11111],73:[0,.68333,.07382,0],74:[.09722,.68333,.18472,.16667],75:[0,.68333,.01445,.05556],76:[0,.68333,0,.13889],77:[0,.68333,0,.13889],78:[0,.68333,.14736,.08334],79:[0,.68333,.02778,.11111],80:[0,.68333,.08222,.08334],81:[.09722,.68333,0,.11111],82:[0,.68333,0,.08334],83:[0,.68333,.075,.13889],84:[0,.68333,.25417,0],85:[0,.68333,.09931,.08334],86:[0,.68333,.08222,0],87:[0,.68333,.08222,.08334],88:[0,.68333,.14643,.13889],89:[.09722,.68333,.08222,.08334],90:[0,.68333,.07944,.13889]},"Fraktur-Regular":{33:[0,.69141,0,0],34:[0,.69141,0,0],38:[0,.69141,0,0],39:[0,.69141,0,0],40:[.24982,.74947,0,0],41:[.24982,.74947,0,0],42:[0,.62119,0,0],43:[.08319,.58283,0,0],44:[0,.10803,0,0],45:[.08319,.58283,0,0],46:[0,.10803,0,0],47:[.24982,.74947,0,0],48:[0,.47534,0,0],49:[0,.47534,0,0],50:[0,.47534,0,0],51:[.18906,.47534,0,0],52:[.18906,.47534,0,0],53:[.18906,.47534,0,0],54:[0,.69141,0,0],55:[.18906,.47534,0,0],56:[0,.69141,0,0],57:[.18906,.47534,0,0],58:[0,.47534,0,0],59:[.12604,.47534,0,0],61:[-.13099,.36866,0,0],63:[0,.69141,0,0],65:[0,.69141,0,0],66:[0,.69141,0,0],67:[0,.69141,0,0],68:[0,.69141,0,0],69:[0,.69141,0,0],70:[.12604,.69141,0,0],71:[0,.69141,0,0],72:[.06302,.69141,0,0],73:[0,.69141,0,0],74:[.12604,.69141,0,0],75:[0,.69141,0,0],76:[0,.69141,0,0],77:[0,.69141,0,0],78:[0,.69141,0,0],79:[0,.69141,0,0],80:[.18906,.69141,0,0],81:[.03781,.69141,0,0],82:[0,.69141,0,0],83:[0,.69141,0,0],84:[0,.69141,0,0],85:[0,.69141,0,0],86:[0,.69141,0,0],87:[0,.69141,0,0],88:[0,.69141,0,0],89:[.18906,.69141,0,0],90:[.12604,.69141,0,0],91:[.24982,.74947,0,0],93:[.24982,.74947,0,0],94:[0,.69141,0,0],97:[0,.47534,0,0],98:[0,.69141,0,0],99:[0,.47534,0,0],100:[0,.62119,0,0],101:[0,.47534,0,0],102:[.18906,.69141,0,0],103:[.18906,.47534,0,0],104:[.18906,.69141,0,0],105:[0,.69141,0,0],106:[0,.69141,0,0],107:[0,.69141,0,0],108:[0,.69141,0,0],109:[0,.47534,0,0],110:[0,.47534,0,0],111:[0,.47534,0,0],112:[.18906,.52396,0,0],113:[.18906,.47534,0,0],114:[0,.47534,0,0],115:[0,.47534,0,0],116:[0,.62119,0,0],117:[0,.47534,0,0],118:[0,.52396,0,0],119:[0,.52396,0,0],120:[.18906,.47534,0,0],121:[.18906,.47534,0,0],122:[.18906,.47534,0,0],8216:[0,.69141,0,0],8217:[0,.69141,0,0],58112:[0,.62119,0,0],58113:[0,.62119,0,0],58114:[.18906,.69141,0,0],58115:[.18906,.69141,0,0],58116:[.18906,.47534,0,0],58117:[0,.69141,0,0],58118:[0,.62119,0,0],58119:[0,.47534,0,0]},"Main-Bold":{33:[0,.69444,0,0],34:[0,.69444,0,0],35:[.19444,.69444,0,0],36:[.05556,.75,0,0],37:[.05556,.75,0,0],38:[0,.69444,0,0],39:[0,.69444,0,0],40:[.25,.75,0,0],41:[.25,.75,0,0],42:[0,.75,0,0],43:[.13333,.63333,0,0],44:[.19444,.15556,0,0],45:[0,.44444,0,0],46:[0,.15556,0,0],47:[.25,.75,0,0],48:[0,.64444,0,0],49:[0,.64444,0,0],50:[0,.64444,0,0],51:[0,.64444,0,0],52:[0,.64444,0,0],53:[0,.64444,0,0],54:[0,.64444,0,0],55:[0,.64444,0,0],56:[0,.64444,0,0],57:[0,.64444,0,0],58:[0,.44444,0,0],59:[.19444,.44444,0,0],60:[.08556,.58556,0,0],61:[-.10889,.39111,0,0],62:[.08556,.58556,0,0],63:[0,.69444,0,0],64:[0,.69444,0,0],65:[0,.68611,0,0],66:[0,.68611,0,0],67:[0,.68611,0,0],68:[0,.68611,0,0],69:[0,.68611,0,0],70:[0,.68611,0,0],71:[0,.68611,0,0],72:[0,.68611,0,0],73:[0,.68611,0,0],74:[0,.68611,0,0],75:[0,.68611,0,0],76:[0,.68611,0,0],77:[0,.68611,0,0],78:[0,.68611,0,0],79:[0,.68611,0,0],80:[0,.68611,0,0],81:[.19444,.68611,0,0],82:[0,.68611,0,0],83:[0,.68611,0,0],84:[0,.68611,0,0],85:[0,.68611,0,0],86:[0,.68611,.01597,0],87:[0,.68611,.01597,0],88:[0,.68611,0,0],89:[0,.68611,.02875,0],90:[0,.68611,0,0],91:[.25,.75,0,0],92:[.25,.75,0,0],93:[.25,.75,0,0],94:[0,.69444,0,0],95:[.31,.13444,.03194,0],96:[0,.69444,0,0],97:[0,.44444,0,0],98:[0,.69444,0,0],99:[0,.44444,0,0],100:[0,.69444,0,0],101:[0,.44444,0,0],102:[0,.69444,.10903,0],103:[.19444,.44444,.01597,0],104:[0,.69444,0,0],105:[0,.69444,0,0],106:[.19444,.69444,0,0],107:[0,.69444,0,0],108:[0,.69444,0,0],109:[0,.44444,0,0],
+110:[0,.44444,0,0],111:[0,.44444,0,0],112:[.19444,.44444,0,0],113:[.19444,.44444,0,0],114:[0,.44444,0,0],115:[0,.44444,0,0],116:[0,.63492,0,0],117:[0,.44444,0,0],118:[0,.44444,.01597,0],119:[0,.44444,.01597,0],120:[0,.44444,0,0],121:[.19444,.44444,.01597,0],122:[0,.44444,0,0],123:[.25,.75,0,0],124:[.25,.75,0,0],125:[.25,.75,0,0],126:[.35,.34444,0,0],168:[0,.69444,0,0],172:[0,.44444,0,0],175:[0,.59611,0,0],176:[0,.69444,0,0],177:[.13333,.63333,0,0],180:[0,.69444,0,0],215:[.13333,.63333,0,0],247:[.13333,.63333,0,0],305:[0,.44444,0,0],567:[.19444,.44444,0,0],710:[0,.69444,0,0],711:[0,.63194,0,0],713:[0,.59611,0,0],714:[0,.69444,0,0],715:[0,.69444,0,0],728:[0,.69444,0,0],729:[0,.69444,0,0],730:[0,.69444,0,0],732:[0,.69444,0,0],768:[0,.69444,0,0],769:[0,.69444,0,0],770:[0,.69444,0,0],771:[0,.69444,0,0],772:[0,.59611,0,0],774:[0,.69444,0,0],775:[0,.69444,0,0],776:[0,.69444,0,0],778:[0,.69444,0,0],779:[0,.69444,0,0],780:[0,.63194,0,0],824:[.19444,.69444,0,0],915:[0,.68611,0,0],916:[0,.68611,0,0],920:[0,.68611,0,0],923:[0,.68611,0,0],926:[0,.68611,0,0],928:[0,.68611,0,0],931:[0,.68611,0,0],933:[0,.68611,0,0],934:[0,.68611,0,0],936:[0,.68611,0,0],937:[0,.68611,0,0],8211:[0,.44444,.03194,0],8212:[0,.44444,.03194,0],8216:[0,.69444,0,0],8217:[0,.69444,0,0],8220:[0,.69444,0,0],8221:[0,.69444,0,0],8224:[.19444,.69444,0,0],8225:[.19444,.69444,0,0],8242:[0,.55556,0,0],8407:[0,.72444,.15486,0],8463:[0,.69444,0,0],8465:[0,.69444,0,0],8467:[0,.69444,0,0],8472:[.19444,.44444,0,0],8476:[0,.69444,0,0],8501:[0,.69444,0,0],8592:[-.10889,.39111,0,0],8593:[.19444,.69444,0,0],8594:[-.10889,.39111,0,0],8595:[.19444,.69444,0,0],8596:[-.10889,.39111,0,0],8597:[.25,.75,0,0],8598:[.19444,.69444,0,0],8599:[.19444,.69444,0,0],8600:[.19444,.69444,0,0],8601:[.19444,.69444,0,0],8636:[-.10889,.39111,0,0],8637:[-.10889,.39111,0,0],8640:[-.10889,.39111,0,0],8641:[-.10889,.39111,0,0],8656:[-.10889,.39111,0,0],8657:[.19444,.69444,0,0],8658:[-.10889,.39111,0,0],8659:[.19444,.69444,0,0],8660:[-.10889,.39111,0,0],8661:[.25,.75,0,0],8704:[0,.69444,0,0],8706:[0,.69444,.06389,0],8707:[0,.69444,0,0],8709:[.05556,.75,0,0],8711:[0,.68611,0,0],8712:[.08556,.58556,0,0],8715:[.08556,.58556,0,0],8722:[.13333,.63333,0,0],8723:[.13333,.63333,0,0],8725:[.25,.75,0,0],8726:[.25,.75,0,0],8727:[-.02778,.47222,0,0],8728:[-.02639,.47361,0,0],8729:[-.02639,.47361,0,0],8730:[.18,.82,0,0],8733:[0,.44444,0,0],8734:[0,.44444,0,0],8736:[0,.69224,0,0],8739:[.25,.75,0,0],8741:[.25,.75,0,0],8743:[0,.55556,0,0],8744:[0,.55556,0,0],8745:[0,.55556,0,0],8746:[0,.55556,0,0],8747:[.19444,.69444,.12778,0],8764:[-.10889,.39111,0,0],8768:[.19444,.69444,0,0],8771:[.00222,.50222,0,0],8776:[.02444,.52444,0,0],8781:[.00222,.50222,0,0],8801:[.00222,.50222,0,0],8804:[.19667,.69667,0,0],8805:[.19667,.69667,0,0],8810:[.08556,.58556,0,0],8811:[.08556,.58556,0,0],8826:[.08556,.58556,0,0],8827:[.08556,.58556,0,0],8834:[.08556,.58556,0,0],8835:[.08556,.58556,0,0],8838:[.19667,.69667,0,0],8839:[.19667,.69667,0,0],8846:[0,.55556,0,0],8849:[.19667,.69667,0,0],8850:[.19667,.69667,0,0],8851:[0,.55556,0,0],8852:[0,.55556,0,0],8853:[.13333,.63333,0,0],8854:[.13333,.63333,0,0],8855:[.13333,.63333,0,0],8856:[.13333,.63333,0,0],8857:[.13333,.63333,0,0],8866:[0,.69444,0,0],8867:[0,.69444,0,0],8868:[0,.69444,0,0],8869:[0,.69444,0,0],8900:[-.02639,.47361,0,0],8901:[-.02639,.47361,0,0],8902:[-.02778,.47222,0,0],8968:[.25,.75,0,0],8969:[.25,.75,0,0],8970:[.25,.75,0,0],8971:[.25,.75,0,0],8994:[-.13889,.36111,0,0],8995:[-.13889,.36111,0,0],9651:[.19444,.69444,0,0],9657:[-.02778,.47222,0,0],9661:[.19444,.69444,0,0],9667:[-.02778,.47222,0,0],9711:[.19444,.69444,0,0],9824:[.12963,.69444,0,0],9825:[.12963,.69444,0,0],9826:[.12963,.69444,0,0],9827:[.12963,.69444,0,0],9837:[0,.75,0,0],9838:[.19444,.69444,0,0],9839:[.19444,.69444,0,0],10216:[.25,.75,0,0],10217:[.25,.75,0,0],10815:[0,.68611,0,0],10927:[.19667,.69667,0,0],10928:[.19667,.69667,0,0]},"Main-Italic":{33:[0,.69444,.12417,0],34:[0,.69444,.06961,0],35:[.19444,.69444,.06616,0],37:[.05556,.75,.13639,0],38:[0,.69444,.09694,0],39:[0,.69444,.12417,0],40:[.25,.75,.16194,0],41:[.25,.75,.03694,0],42:[0,.75,.14917,0],43:[.05667,.56167,.03694,0],44:[.19444,.10556,0,0],45:[0,.43056,.02826,0],46:[0,.10556,0,0],47:[.25,.75,.16194,0],48:[0,.64444,.13556,0],49:[0,.64444,.13556,0],50:[0,.64444,.13556,0],51:[0,.64444,.13556,0],52:[.19444,.64444,.13556,0],53:[0,.64444,.13556,0],54:[0,.64444,.13556,0],55:[.19444,.64444,.13556,0],56:[0,.64444,.13556,0],57:[0,.64444,.13556,0],58:[0,.43056,.0582,0],59:[.19444,.43056,.0582,0],61:[-.13313,.36687,.06616,0],63:[0,.69444,.1225,0],64:[0,.69444,.09597,0],65:[0,.68333,0,0],66:[0,.68333,.10257,0],67:[0,.68333,.14528,0],68:[0,.68333,.09403,0],69:[0,.68333,.12028,0],70:[0,.68333,.13305,0],71:[0,.68333,.08722,0],72:[0,.68333,.16389,0],73:[0,.68333,.15806,0],74:[0,.68333,.14028,0],75:[0,.68333,.14528,0],76:[0,.68333,0,0],77:[0,.68333,.16389,0],78:[0,.68333,.16389,0],79:[0,.68333,.09403,0],80:[0,.68333,.10257,0],81:[.19444,.68333,.09403,0],82:[0,.68333,.03868,0],83:[0,.68333,.11972,0],84:[0,.68333,.13305,0],85:[0,.68333,.16389,0],86:[0,.68333,.18361,0],87:[0,.68333,.18361,0],88:[0,.68333,.15806,0],89:[0,.68333,.19383,0],90:[0,.68333,.14528,0],91:[.25,.75,.1875,0],93:[.25,.75,.10528,0],94:[0,.69444,.06646,0],95:[.31,.12056,.09208,0],97:[0,.43056,.07671,0],98:[0,.69444,.06312,0],99:[0,.43056,.05653,0],100:[0,.69444,.10333,0],101:[0,.43056,.07514,0],102:[.19444,.69444,.21194,0],103:[.19444,.43056,.08847,0],104:[0,.69444,.07671,0],105:[0,.65536,.1019,0],106:[.19444,.65536,.14467,0],107:[0,.69444,.10764,0],108:[0,.69444,.10333,0],109:[0,.43056,.07671,0],110:[0,.43056,.07671,0],111:[0,.43056,.06312,0],112:[.19444,.43056,.06312,0],113:[.19444,.43056,.08847,0],114:[0,.43056,.10764,0],115:[0,.43056,.08208,0],116:[0,.61508,.09486,0],117:[0,.43056,.07671,0],118:[0,.43056,.10764,0],119:[0,.43056,.10764,0],120:[0,.43056,.12042,0],121:[.19444,.43056,.08847,0],122:[0,.43056,.12292,0],126:[.35,.31786,.11585,0],163:[0,.69444,0,0],305:[0,.43056,0,.02778],567:[.19444,.43056,0,.08334],768:[0,.69444,0,0],769:[0,.69444,.09694,0],770:[0,.69444,.06646,0],771:[0,.66786,.11585,0],772:[0,.56167,.10333,0],774:[0,.69444,.10806,0],775:[0,.66786,.11752,0],776:[0,.66786,.10474,0],778:[0,.69444,0,0],779:[0,.69444,.1225,0],780:[0,.62847,.08295,0],915:[0,.68333,.13305,0],916:[0,.68333,0,0],920:[0,.68333,.09403,0],923:[0,.68333,0,0],926:[0,.68333,.15294,0],928:[0,.68333,.16389,0],931:[0,.68333,.12028,0],933:[0,.68333,.11111,0],934:[0,.68333,.05986,0],936:[0,.68333,.11111,0],937:[0,.68333,.10257,0],8211:[0,.43056,.09208,0],8212:[0,.43056,.09208,0],8216:[0,.69444,.12417,0],8217:[0,.69444,.12417,0],8220:[0,.69444,.1685,0],8221:[0,.69444,.06961,0],8463:[0,.68889,0,0]},"Main-Regular":{32:[0,0,0,0],33:[0,.69444,0,0],34:[0,.69444,0,0],35:[.19444,.69444,0,0],36:[.05556,.75,0,0],37:[.05556,.75,0,0],38:[0,.69444,0,0],39:[0,.69444,0,0],40:[.25,.75,0,0],41:[.25,.75,0,0],42:[0,.75,0,0],43:[.08333,.58333,0,0],44:[.19444,.10556,0,0],45:[0,.43056,0,0],46:[0,.10556,0,0],47:[.25,.75,0,0],48:[0,.64444,0,0],49:[0,.64444,0,0],50:[0,.64444,0,0],51:[0,.64444,0,0],52:[0,.64444,0,0],53:[0,.64444,0,0],54:[0,.64444,0,0],55:[0,.64444,0,0],56:[0,.64444,0,0],57:[0,.64444,0,0],58:[0,.43056,0,0],59:[.19444,.43056,0,0],60:[.0391,.5391,0,0],61:[-.13313,.36687,0,0],62:[.0391,.5391,0,0],63:[0,.69444,0,0],64:[0,.69444,0,0],65:[0,.68333,0,0],66:[0,.68333,0,0],67:[0,.68333,0,0],68:[0,.68333,0,0],69:[0,.68333,0,0],70:[0,.68333,0,0],71:[0,.68333,0,0],72:[0,.68333,0,0],73:[0,.68333,0,0],74:[0,.68333,0,0],75:[0,.68333,0,0],76:[0,.68333,0,0],77:[0,.68333,0,0],78:[0,.68333,0,0],79:[0,.68333,0,0],80:[0,.68333,0,0],81:[.19444,.68333,0,0],82:[0,.68333,0,0],83:[0,.68333,0,0],84:[0,.68333,0,0],85:[0,.68333,0,0],86:[0,.68333,.01389,0],87:[0,.68333,.01389,0],88:[0,.68333,0,0],89:[0,.68333,.025,0],90:[0,.68333,0,0],91:[.25,.75,0,0],92:[.25,.75,0,0],93:[.25,.75,0,0],94:[0,.69444,0,0],95:[.31,.12056,.02778,0],96:[0,.69444,0,0],97:[0,.43056,0,0],98:[0,.69444,0,0],99:[0,.43056,0,0],100:[0,.69444,0,0],101:[0,.43056,0,0],102:[0,.69444,.07778,0],103:[.19444,.43056,.01389,0],104:[0,.69444,0,0],105:[0,.66786,0,0],106:[.19444,.66786,0,0],107:[0,.69444,0,0],108:[0,.69444,0,0],109:[0,.43056,0,0],110:[0,.43056,0,0],111:[0,.43056,0,0],112:[.19444,.43056,0,0],113:[.19444,.43056,0,0],114:[0,.43056,0,0],115:[0,.43056,0,0],116:[0,.61508,0,0],117:[0,.43056,0,0],118:[0,.43056,.01389,0],119:[0,.43056,.01389,0],120:[0,.43056,0,0],121:[.19444,.43056,.01389,0],122:[0,.43056,0,0],123:[.25,.75,0,0],124:[.25,.75,0,0],125:[.25,.75,0,0],126:[.35,.31786,0,0],160:[0,0,0,0],168:[0,.66786,0,0],172:[0,.43056,0,0],175:[0,.56778,0,0],176:[0,.69444,0,0],177:[.08333,.58333,0,0],180:[0,.69444,0,0],215:[.08333,.58333,0,0],247:[.08333,.58333,0,0],305:[0,.43056,0,0],567:[.19444,.43056,0,0],710:[0,.69444,0,0],711:[0,.62847,0,0],713:[0,.56778,0,0],714:[0,.69444,0,0],715:[0,.69444,0,0],728:[0,.69444,0,0],729:[0,.66786,0,0],730:[0,.69444,0,0],732:[0,.66786,0,0],768:[0,.69444,0,0],769:[0,.69444,0,0],770:[0,.69444,0,0],771:[0,.66786,0,0],772:[0,.56778,0,0],774:[0,.69444,0,0],775:[0,.66786,0,0],776:[0,.66786,0,0],778:[0,.69444,0,0],779:[0,.69444,0,0],780:[0,.62847,0,0],824:[.19444,.69444,0,0],915:[0,.68333,0,0],916:[0,.68333,0,0],920:[0,.68333,0,0],923:[0,.68333,0,0],926:[0,.68333,0,0],928:[0,.68333,0,0],931:[0,.68333,0,0],933:[0,.68333,0,0],934:[0,.68333,0,0],936:[0,.68333,0,0],937:[0,.68333,0,0],8211:[0,.43056,.02778,0],8212:[0,.43056,.02778,0],8216:[0,.69444,0,0],8217:[0,.69444,0,0],8220:[0,.69444,0,0],8221:[0,.69444,0,0],8224:[.19444,.69444,0,0],8225:[.19444,.69444,0,0],8230:[0,.12,0,0],8242:[0,.55556,0,0],8407:[0,.71444,.15382,0],8463:[0,.68889,0,0],8465:[0,.69444,0,0],8467:[0,.69444,0,.11111],8472:[.19444,.43056,0,.11111],8476:[0,.69444,0,0],8501:[0,.69444,0,0],8592:[-.13313,.36687,0,0],8593:[.19444,.69444,0,0],8594:[-.13313,.36687,0,0],8595:[.19444,.69444,0,0],8596:[-.13313,.36687,0,0],8597:[.25,.75,0,0],8598:[.19444,.69444,0,0],8599:[.19444,.69444,0,0],8600:[.19444,.69444,0,0],8601:[.19444,.69444,0,0],8614:[.011,.511,0,0],8617:[.011,.511,0,0],8618:[.011,.511,0,0],8636:[-.13313,.36687,0,0],8637:[-.13313,.36687,0,0],8640:[-.13313,.36687,0,0],8641:[-.13313,.36687,0,0],8652:[.011,.671,0,0],8656:[-.13313,.36687,0,0],8657:[.19444,.69444,0,0],8658:[-.13313,.36687,0,0],8659:[.19444,.69444,0,0],8660:[-.13313,.36687,0,0],8661:[.25,.75,0,0],8704:[0,.69444,0,0],8706:[0,.69444,.05556,.08334],8707:[0,.69444,0,0],8709:[.05556,.75,0,0],8711:[0,.68333,0,0],8712:[.0391,.5391,0,0],8715:[.0391,.5391,0,0],8722:[.08333,.58333,0,0],8723:[.08333,.58333,0,0],8725:[.25,.75,0,0],8726:[.25,.75,0,0],8727:[-.03472,.46528,0,0],8728:[-.05555,.44445,0,0],8729:[-.05555,.44445,0,0],8730:[.2,.8,0,0],8733:[0,.43056,0,0],8734:[0,.43056,0,0],8736:[0,.69224,0,0],8739:[.25,.75,0,0],8741:[.25,.75,0,0],8743:[0,.55556,0,0],8744:[0,.55556,0,0],8745:[0,.55556,0,0],8746:[0,.55556,0,0],8747:[.19444,.69444,.11111,0],8764:[-.13313,.36687,0,0],8768:[.19444,.69444,0,0],8771:[-.03625,.46375,0,0],8773:[-.022,.589,0,0],8776:[-.01688,.48312,0,0],8781:[-.03625,.46375,0,0],8784:[-.133,.67,0,0],8800:[.215,.716,0,0],8801:[-.03625,.46375,0,0],8804:[.13597,.63597,0,0],8805:[.13597,.63597,0,0],8810:[.0391,.5391,0,0],8811:[.0391,.5391,0,0],8826:[.0391,.5391,0,0],8827:[.0391,.5391,0,0],8834:[.0391,.5391,0,0],8835:[.0391,.5391,0,0],8838:[.13597,.63597,0,0],8839:[.13597,.63597,0,0],8846:[0,.55556,0,0],8849:[.13597,.63597,0,0],8850:[.13597,.63597,0,0],8851:[0,.55556,0,0],8852:[0,.55556,0,0],8853:[.08333,.58333,0,0],8854:[.08333,.58333,0,0],8855:[.08333,.58333,0,0],8856:[.08333,.58333,0,0],8857:[.08333,.58333,0,0],8866:[0,.69444,0,0],8867:[0,.69444,0,0],8868:[0,.69444,0,0],8869:[0,.69444,0,0],8872:[.249,.75,0,0],8900:[-.05555,.44445,0,0],8901:[-.05555,.44445,0,0],8902:[-.03472,.46528,0,0],8904:[.005,.505,0,0],8942:[.03,.9,0,0],8943:[-.19,.31,0,0],8945:[-.1,.82,0,0],8968:[.25,.75,0,0],8969:[.25,.75,0,0],8970:[.25,.75,0,0],8971:[.25,.75,0,0],8994:[-.14236,.35764,0,0],8995:[-.14236,.35764,0,0],9136:[.244,.744,0,0],9137:[.244,.744,0,0],9651:[.19444,.69444,0,0],9657:[-.03472,.46528,0,0],9661:[.19444,.69444,0,0],9667:[-.03472,.46528,0,0],9711:[.19444,.69444,0,0],9824:[.12963,.69444,0,0],9825:[.12963,.69444,0,0],9826:[.12963,.69444,0,0],9827:[.12963,.69444,0,0],9837:[0,.75,0,0],9838:[.19444,.69444,0,0],9839:[.19444,.69444,0,0],10216:[.25,.75,0,0],10217:[.25,.75,0,0],10222:[.244,.744,0,0],10223:[.244,.744,0,0],10229:[.011,.511,0,0],10230:[.011,.511,0,0],10231:[.011,.511,0,0],10232:[.024,.525,0,0],10233:[.024,.525,0,0],10234:[.024,.525,0,0],10236:[.011,.511,0,0],10815:[0,.68333,0,0],10927:[.13597,.63597,0,0],10928:[.13597,.63597,0,0]},"Math-BoldItalic":{47:[.19444,.69444,0,0],65:[0,.68611,0,0],66:[0,.68611,.04835,0],67:[0,.68611,.06979,0],68:[0,.68611,.03194,0],69:[0,.68611,.05451,0],70:[0,.68611,.15972,0],71:[0,.68611,0,0],72:[0,.68611,.08229,0],73:[0,.68611,.07778,0],74:[0,.68611,.10069,0],75:[0,.68611,.06979,0],76:[0,.68611,0,0],77:[0,.68611,.11424,0],78:[0,.68611,.11424,0],79:[0,.68611,.03194,0],80:[0,.68611,.15972,0],81:[.19444,.68611,0,0],82:[0,.68611,.00421,0],83:[0,.68611,.05382,0],84:[0,.68611,.15972,0],85:[0,.68611,.11424,0],86:[0,.68611,.25555,0],87:[0,.68611,.15972,0],88:[0,.68611,.07778,0],89:[0,.68611,.25555,0],90:[0,.68611,.06979,0],97:[0,.44444,0,0],98:[0,.69444,0,0],99:[0,.44444,0,0],100:[0,.69444,0,0],101:[0,.44444,0,0],102:[.19444,.69444,.11042,0],103:[.19444,.44444,.03704,0],104:[0,.69444,0,0],105:[0,.69326,0,0],106:[.19444,.69326,.0622,0],107:[0,.69444,.01852,0],108:[0,.69444,.0088,0],109:[0,.44444,0,0],110:[0,.44444,0,0],111:[0,.44444,0,0],112:[.19444,.44444,0,0],113:[.19444,.44444,.03704,0],114:[0,.44444,.03194,0],115:[0,.44444,0,0],116:[0,.63492,0,0],117:[0,.44444,0,0],118:[0,.44444,.03704,0],119:[0,.44444,.02778,0],120:[0,.44444,0,0],121:[.19444,.44444,.03704,0],122:[0,.44444,.04213,0],915:[0,.68611,.15972,0],916:[0,.68611,0,0],920:[0,.68611,.03194,0],923:[0,.68611,0,0],926:[0,.68611,.07458,0],928:[0,.68611,.08229,0],931:[0,.68611,.05451,0],933:[0,.68611,.15972,0],934:[0,.68611,0,0],936:[0,.68611,.11653,0],937:[0,.68611,.04835,0],945:[0,.44444,0,0],946:[.19444,.69444,.03403,0],947:[.19444,.44444,.06389,0],948:[0,.69444,.03819,0],949:[0,.44444,0,0],950:[.19444,.69444,.06215,0],951:[.19444,.44444,.03704,0],952:[0,.69444,.03194,0],953:[0,.44444,0,0],954:[0,.44444,0,0],955:[0,.69444,0,0],956:[.19444,.44444,0,0],957:[0,.44444,.06898,0],958:[.19444,.69444,.03021,0],959:[0,.44444,0,0],960:[0,.44444,.03704,0],961:[.19444,.44444,0,0],962:[.09722,.44444,.07917,0],963:[0,.44444,.03704,0],964:[0,.44444,.13472,0],965:[0,.44444,.03704,0],966:[.19444,.44444,0,0],967:[.19444,.44444,0,0],968:[.19444,.69444,.03704,0],969:[0,.44444,.03704,0],977:[0,.69444,0,0],981:[.19444,.69444,0,0],982:[0,.44444,.03194,0],1009:[.19444,.44444,0,0],1013:[0,.44444,0,0]},"Math-Italic":{47:[.19444,.69444,0,0],65:[0,.68333,0,.13889],66:[0,.68333,.05017,.08334],67:[0,.68333,.07153,.08334],68:[0,.68333,.02778,.05556],69:[0,.68333,.05764,.08334],70:[0,.68333,.13889,.08334],71:[0,.68333,0,.08334],72:[0,.68333,.08125,.05556],73:[0,.68333,.07847,.11111],74:[0,.68333,.09618,.16667],75:[0,.68333,.07153,.05556],76:[0,.68333,0,.02778],77:[0,.68333,.10903,.08334],78:[0,.68333,.10903,.08334],79:[0,.68333,.02778,.08334],80:[0,.68333,.13889,.08334],81:[.19444,.68333,0,.08334],82:[0,.68333,.00773,.08334],83:[0,.68333,.05764,.08334],84:[0,.68333,.13889,.08334],85:[0,.68333,.10903,.02778],86:[0,.68333,.22222,0],87:[0,.68333,.13889,0],88:[0,.68333,.07847,.08334],89:[0,.68333,.22222,0],90:[0,.68333,.07153,.08334],97:[0,.43056,0,0],98:[0,.69444,0,0],99:[0,.43056,0,.05556],100:[0,.69444,0,.16667],101:[0,.43056,0,.05556],102:[.19444,.69444,.10764,.16667],103:[.19444,.43056,.03588,.02778],104:[0,.69444,0,0],105:[0,.65952,0,0],106:[.19444,.65952,.05724,0],107:[0,.69444,.03148,0],108:[0,.69444,.01968,.08334],109:[0,.43056,0,0],110:[0,.43056,0,0],111:[0,.43056,0,.05556],112:[.19444,.43056,0,.08334],113:[.19444,.43056,.03588,.08334],114:[0,.43056,.02778,.05556],115:[0,.43056,0,.05556],116:[0,.61508,0,.08334],117:[0,.43056,0,.02778],118:[0,.43056,.03588,.02778],119:[0,.43056,.02691,.08334],120:[0,.43056,0,.02778],121:[.19444,.43056,.03588,.05556],122:[0,.43056,.04398,.05556],915:[0,.68333,.13889,.08334],916:[0,.68333,0,.16667],920:[0,.68333,.02778,.08334],923:[0,.68333,0,.16667],926:[0,.68333,.07569,.08334],928:[0,.68333,.08125,.05556],931:[0,.68333,.05764,.08334],933:[0,.68333,.13889,.05556],934:[0,.68333,0,.08334],936:[0,.68333,.11,.05556],937:[0,.68333,.05017,.08334],945:[0,.43056,.0037,.02778],946:[.19444,.69444,.05278,.08334],947:[.19444,.43056,.05556,0],948:[0,.69444,.03785,.05556],949:[0,.43056,0,.08334],950:[.19444,.69444,.07378,.08334],951:[.19444,.43056,.03588,.05556],952:[0,.69444,.02778,.08334],953:[0,.43056,0,.05556],954:[0,.43056,0,0],955:[0,.69444,0,0],956:[.19444,.43056,0,.02778],957:[0,.43056,.06366,.02778],958:[.19444,.69444,.04601,.11111],959:[0,.43056,0,.05556],960:[0,.43056,.03588,0],961:[.19444,.43056,0,.08334],962:[.09722,.43056,.07986,.08334],963:[0,.43056,.03588,0],964:[0,.43056,.1132,.02778],965:[0,.43056,.03588,.02778],966:[.19444,.43056,0,.08334],967:[.19444,.43056,0,.05556],968:[.19444,.69444,.03588,.11111],969:[0,.43056,.03588,0],977:[0,.69444,0,.08334],981:[.19444,.69444,0,.08334],982:[0,.43056,.02778,0],1009:[.19444,.43056,0,.08334],1013:[0,.43056,0,.05556]},"Math-Regular":{65:[0,.68333,0,.13889],66:[0,.68333,.05017,.08334],67:[0,.68333,.07153,.08334],68:[0,.68333,.02778,.05556],69:[0,.68333,.05764,.08334],70:[0,.68333,.13889,.08334],71:[0,.68333,0,.08334],72:[0,.68333,.08125,.05556],73:[0,.68333,.07847,.11111],74:[0,.68333,.09618,.16667],75:[0,.68333,.07153,.05556],76:[0,.68333,0,.02778],77:[0,.68333,.10903,.08334],78:[0,.68333,.10903,.08334],79:[0,.68333,.02778,.08334],80:[0,.68333,.13889,.08334],81:[.19444,.68333,0,.08334],82:[0,.68333,.00773,.08334],83:[0,.68333,.05764,.08334],84:[0,.68333,.13889,.08334],85:[0,.68333,.10903,.02778],86:[0,.68333,.22222,0],87:[0,.68333,.13889,0],88:[0,.68333,.07847,.08334],89:[0,.68333,.22222,0],90:[0,.68333,.07153,.08334],97:[0,.43056,0,0],98:[0,.69444,0,0],99:[0,.43056,0,.05556],100:[0,.69444,0,.16667],101:[0,.43056,0,.05556],102:[.19444,.69444,.10764,.16667],103:[.19444,.43056,.03588,.02778],104:[0,.69444,0,0],105:[0,.65952,0,0],106:[.19444,.65952,.05724,0],107:[0,.69444,.03148,0],108:[0,.69444,.01968,.08334],109:[0,.43056,0,0],110:[0,.43056,0,0],111:[0,.43056,0,.05556],112:[.19444,.43056,0,.08334],113:[.19444,.43056,.03588,.08334],114:[0,.43056,.02778,.05556],115:[0,.43056,0,.05556],116:[0,.61508,0,.08334],117:[0,.43056,0,.02778],118:[0,.43056,.03588,.02778],119:[0,.43056,.02691,.08334],120:[0,.43056,0,.02778],121:[.19444,.43056,.03588,.05556],122:[0,.43056,.04398,.05556],915:[0,.68333,.13889,.08334],916:[0,.68333,0,.16667],920:[0,.68333,.02778,.08334],923:[0,.68333,0,.16667],926:[0,.68333,.07569,.08334],928:[0,.68333,.08125,.05556],931:[0,.68333,.05764,.08334],933:[0,.68333,.13889,.05556],934:[0,.68333,0,.08334],936:[0,.68333,.11,.05556],937:[0,.68333,.05017,.08334],945:[0,.43056,.0037,.02778],946:[.19444,.69444,.05278,.08334],947:[.19444,.43056,.05556,0],948:[0,.69444,.03785,.05556],949:[0,.43056,0,.08334],950:[.19444,.69444,.07378,.08334],951:[.19444,.43056,.03588,.05556],952:[0,.69444,.02778,.08334],953:[0,.43056,0,.05556],954:[0,.43056,0,0],955:[0,.69444,0,0],956:[.19444,.43056,0,.02778],957:[0,.43056,.06366,.02778],958:[.19444,.69444,.04601,.11111],959:[0,.43056,0,.05556],960:[0,.43056,.03588,0],961:[.19444,.43056,0,.08334],962:[.09722,.43056,.07986,.08334],963:[0,.43056,.03588,0],964:[0,.43056,.1132,.02778],965:[0,.43056,.03588,.02778],966:[.19444,.43056,0,.08334],967:[.19444,.43056,0,.05556],968:[.19444,.69444,.03588,.11111],969:[0,.43056,.03588,0],977:[0,.69444,0,.08334],981:[.19444,.69444,0,.08334],982:[0,.43056,.02778,0],1009:[.19444,.43056,0,.08334],1013:[0,.43056,0,.05556]},"SansSerif-Regular":{33:[0,.69444,0,0],34:[0,.69444,0,0],35:[.19444,.69444,0,0],36:[.05556,.75,0,0],37:[.05556,.75,0,0],38:[0,.69444,0,0],39:[0,.69444,0,0],40:[.25,.75,0,0],41:[.25,.75,0,0],42:[0,.75,0,0],43:[.08333,.58333,0,0],44:[.125,.08333,0,0],45:[0,.44444,0,0],46:[0,.08333,0,0],47:[.25,.75,0,0],48:[0,.65556,0,0],49:[0,.65556,0,0],50:[0,.65556,0,0],51:[0,.65556,0,0],52:[0,.65556,0,0],53:[0,.65556,0,0],54:[0,.65556,0,0],55:[0,.65556,0,0],56:[0,.65556,0,0],57:[0,.65556,0,0],58:[0,.44444,0,0],59:[.125,.44444,0,0],61:[-.13,.37,0,0],63:[0,.69444,0,0],64:[0,.69444,0,0],65:[0,.69444,0,0],66:[0,.69444,0,0],67:[0,.69444,0,0],68:[0,.69444,0,0],69:[0,.69444,0,0],70:[0,.69444,0,0],71:[0,.69444,0,0],72:[0,.69444,0,0],73:[0,.69444,0,0],74:[0,.69444,0,0],75:[0,.69444,0,0],76:[0,.69444,0,0],77:[0,.69444,0,0],78:[0,.69444,0,0],79:[0,.69444,0,0],80:[0,.69444,0,0],81:[.125,.69444,0,0],82:[0,.69444,0,0],83:[0,.69444,0,0],84:[0,.69444,0,0],85:[0,.69444,0,0],86:[0,.69444,.01389,0],87:[0,.69444,.01389,0],88:[0,.69444,0,0],89:[0,.69444,.025,0],90:[0,.69444,0,0],91:[.25,.75,0,0],93:[.25,.75,0,0],94:[0,.69444,0,0],95:[.35,.09444,.02778,0],97:[0,.44444,0,0],98:[0,.69444,0,0],99:[0,.44444,0,0],100:[0,.69444,0,0],101:[0,.44444,0,0],102:[0,.69444,.06944,0],103:[.19444,.44444,.01389,0],104:[0,.69444,0,0],105:[0,.67937,0,0],106:[.19444,.67937,0,0],107:[0,.69444,0,0],108:[0,.69444,0,0],109:[0,.44444,0,0],110:[0,.44444,0,0],111:[0,.44444,0,0],112:[.19444,.44444,0,0],113:[.19444,.44444,0,0],114:[0,.44444,.01389,0],115:[0,.44444,0,0],116:[0,.57143,0,0],117:[0,.44444,0,0],118:[0,.44444,.01389,0],119:[0,.44444,.01389,0],120:[0,.44444,0,0],121:[.19444,.44444,.01389,0],122:[0,.44444,0,0],126:[.35,.32659,0,0],305:[0,.44444,0,0],567:[.19444,.44444,0,0],768:[0,.69444,0,0],769:[0,.69444,0,0],770:[0,.69444,0,0],771:[0,.67659,0,0],772:[0,.60889,0,0],774:[0,.69444,0,0],775:[0,.67937,0,0],776:[0,.67937,0,0],778:[0,.69444,0,0],779:[0,.69444,0,0],780:[0,.63194,0,0],915:[0,.69444,0,0],916:[0,.69444,0,0],920:[0,.69444,0,0],923:[0,.69444,0,0],926:[0,.69444,0,0],928:[0,.69444,0,0],931:[0,.69444,0,0],933:[0,.69444,0,0],934:[0,.69444,0,0],936:[0,.69444,0,0],937:[0,.69444,0,0],8211:[0,.44444,.02778,0],8212:[0,.44444,.02778,0],8216:[0,.69444,0,0],8217:[0,.69444,0,0],8220:[0,.69444,0,0],8221:[0,.69444,0,0]},"Script-Regular":{65:[0,.7,.22925,0],66:[0,.7,.04087,0],67:[0,.7,.1689,0],68:[0,.7,.09371,0],69:[0,.7,.18583,0],70:[0,.7,.13634,0],71:[0,.7,.17322,0],72:[0,.7,.29694,0],73:[0,.7,.19189,0],74:[.27778,.7,.19189,0],75:[0,.7,.31259,0],76:[0,.7,.19189,0],77:[0,.7,.15981,0],78:[0,.7,.3525,0],79:[0,.7,.08078,0],80:[0,.7,.08078,0],81:[0,.7,.03305,0],82:[0,.7,.06259,0],83:[0,.7,.19189,0],84:[0,.7,.29087,0],85:[0,.7,.25815,0],86:[0,.7,.27523,0],87:[0,.7,.27523,0],88:[0,.7,.26006,0],89:[0,.7,.2939,0],90:[0,.7,.24037,0]},"Size1-Regular":{40:[.35001,.85,0,0],41:[.35001,.85,0,0],47:[.35001,.85,0,0],91:[.35001,.85,0,0],92:[.35001,.85,0,0],93:[.35001,.85,0,0],123:[.35001,.85,0,0],125:[.35001,.85,0,0],710:[0,.72222,0,0],732:[0,.72222,0,0],770:[0,.72222,0,0],771:[0,.72222,0,0],8214:[-99e-5,.601,0,0],8593:[1e-5,.6,0,0],8595:[1e-5,.6,0,0],8657:[1e-5,.6,0,0],8659:[1e-5,.6,0,0],8719:[.25001,.75,0,0],8720:[.25001,.75,0,0],8721:[.25001,.75,0,0],8730:[.35001,.85,0,0],8739:[-.00599,.606,0,0],8741:[-.00599,.606,0,0],8747:[.30612,.805,.19445,0],8748:[.306,.805,.19445,0],8749:[.306,.805,.19445,0],8750:[.30612,.805,.19445,0],8896:[.25001,.75,0,0],8897:[.25001,.75,0,0],8898:[.25001,.75,0,0],8899:[.25001,.75,0,0],8968:[.35001,.85,0,0],8969:[.35001,.85,0,0],8970:[.35001,.85,0,0],8971:[.35001,.85,0,0],9168:[-99e-5,.601,0,0],10216:[.35001,.85,0,0],10217:[.35001,.85,0,0],10752:[.25001,.75,0,0],10753:[.25001,.75,0,0],10754:[.25001,.75,0,0],10756:[.25001,.75,0,0],10758:[.25001,.75,0,0]},"Size2-Regular":{40:[.65002,1.15,0,0],41:[.65002,1.15,0,0],47:[.65002,1.15,0,0],91:[.65002,1.15,0,0],92:[.65002,1.15,0,0],93:[.65002,1.15,0,0],123:[.65002,1.15,0,0],125:[.65002,1.15,0,0],710:[0,.75,0,0],732:[0,.75,0,0],770:[0,.75,0,0],771:[0,.75,0,0],8719:[.55001,1.05,0,0],8720:[.55001,1.05,0,0],8721:[.55001,1.05,0,0],8730:[.65002,1.15,0,0],8747:[.86225,1.36,.44445,0],8748:[.862,1.36,.44445,0],8749:[.862,1.36,.44445,0],8750:[.86225,1.36,.44445,0],8896:[.55001,1.05,0,0],8897:[.55001,1.05,0,0],8898:[.55001,1.05,0,0],8899:[.55001,1.05,0,0],8968:[.65002,1.15,0,0],8969:[.65002,1.15,0,0],8970:[.65002,1.15,0,0],8971:[.65002,1.15,0,0],10216:[.65002,1.15,0,0],10217:[.65002,1.15,0,0],10752:[.55001,1.05,0,0],10753:[.55001,1.05,0,0],10754:[.55001,1.05,0,0],10756:[.55001,1.05,0,0],10758:[.55001,1.05,0,0]},"Size3-Regular":{40:[.95003,1.45,0,0],41:[.95003,1.45,0,0],47:[.95003,1.45,0,0],91:[.95003,1.45,0,0],92:[.95003,1.45,0,0],93:[.95003,1.45,0,0],123:[.95003,1.45,0,0],125:[.95003,1.45,0,0],710:[0,.75,0,0],732:[0,.75,0,0],770:[0,.75,0,0],771:[0,.75,0,0],8730:[.95003,1.45,0,0],8968:[.95003,1.45,0,0],8969:[.95003,1.45,0,0],8970:[.95003,1.45,0,0],8971:[.95003,1.45,0,0],10216:[.95003,1.45,0,0],10217:[.95003,1.45,0,0]},"Size4-Regular":{40:[1.25003,1.75,0,0],41:[1.25003,1.75,0,0],47:[1.25003,1.75,0,0],91:[1.25003,1.75,0,0],92:[1.25003,1.75,0,0],93:[1.25003,1.75,0,0],123:[1.25003,1.75,0,0],125:[1.25003,1.75,0,0],710:[0,.825,0,0],732:[0,.825,0,0],770:[0,.825,0,0],771:[0,.825,0,0],8730:[1.25003,1.75,0,0],8968:[1.25003,1.75,0,0],8969:[1.25003,1.75,0,0],8970:[1.25003,1.75,0,0],8971:[1.25003,1.75,0,0],9115:[.64502,1.155,0,0],9116:[1e-5,.6,0,0],9117:[.64502,1.155,0,0],9118:[.64502,1.155,0,0],9119:[1e-5,.6,0,0],9120:[.64502,1.155,0,0],9121:[.64502,1.155,0,0],9122:[-99e-5,.601,0,0],9123:[.64502,1.155,0,0],9124:[.64502,1.155,0,0],9125:[-99e-5,.601,0,0],9126:[.64502,1.155,0,0],9127:[1e-5,.9,0,0],9128:[.65002,1.15,0,0],9129:[.90001,0,0,0],9130:[0,.3,0,0],9131:[1e-5,.9,0,0],9132:[.65002,1.15,0,0],9133:[.90001,0,0,0],9143:[.88502,.915,0,0],10216:[1.25003,1.75,0,0],10217:[1.25003,1.75,0,0],57344:[-.00499,.605,0,0],57345:[-.00499,.605,0,0],57680:[0,.12,0,0],57681:[0,.12,0,0],57682:[0,.12,0,0],57683:[0,.12,0,0]},"Typewriter-Regular":{33:[0,.61111,0,0],34:[0,.61111,0,0],35:[0,.61111,0,0],36:[.08333,.69444,0,0],37:[.08333,.69444,0,0],38:[0,.61111,0,0],39:[0,.61111,0,0],40:[.08333,.69444,0,0],41:[.08333,.69444,0,0],42:[0,.52083,0,0],43:[-.08056,.53055,0,0],44:[.13889,.125,0,0],45:[-.08056,.53055,0,0],46:[0,.125,0,0],47:[.08333,.69444,0,0],48:[0,.61111,0,0],49:[0,.61111,0,0],50:[0,.61111,0,0],51:[0,.61111,0,0],52:[0,.61111,0,0],53:[0,.61111,0,0],54:[0,.61111,0,0],55:[0,.61111,0,0],56:[0,.61111,0,0],57:[0,.61111,0,0],58:[0,.43056,0,0],59:[.13889,.43056,0,0],60:[-.05556,.55556,0,0],61:[-.19549,.41562,0,0],62:[-.05556,.55556,0,0],63:[0,.61111,0,0],64:[0,.61111,0,0],65:[0,.61111,0,0],66:[0,.61111,0,0],67:[0,.61111,0,0],68:[0,.61111,0,0],69:[0,.61111,0,0],70:[0,.61111,0,0],71:[0,.61111,0,0],72:[0,.61111,0,0],73:[0,.61111,0,0],74:[0,.61111,0,0],75:[0,.61111,0,0],76:[0,.61111,0,0],77:[0,.61111,0,0],78:[0,.61111,0,0],79:[0,.61111,0,0],80:[0,.61111,0,0],81:[.13889,.61111,0,0],82:[0,.61111,0,0],83:[0,.61111,0,0],84:[0,.61111,0,0],85:[0,.61111,0,0],86:[0,.61111,0,0],87:[0,.61111,0,0],88:[0,.61111,0,0],89:[0,.61111,0,0],90:[0,.61111,0,0],91:[.08333,.69444,0,0],92:[.08333,.69444,0,0],93:[.08333,.69444,0,0],94:[0,.61111,0,0],95:[.09514,0,0,0],96:[0,.61111,0,0],97:[0,.43056,0,0],98:[0,.61111,0,0],99:[0,.43056,0,0],100:[0,.61111,0,0],101:[0,.43056,0,0],102:[0,.61111,0,0],103:[.22222,.43056,0,0],104:[0,.61111,0,0],105:[0,.61111,0,0],106:[.22222,.61111,0,0],107:[0,.61111,0,0],108:[0,.61111,0,0],109:[0,.43056,0,0],110:[0,.43056,0,0],111:[0,.43056,0,0],112:[.22222,.43056,0,0],113:[.22222,.43056,0,0],114:[0,.43056,0,0],115:[0,.43056,0,0],116:[0,.55358,0,0],117:[0,.43056,0,0],118:[0,.43056,0,0],119:[0,.43056,0,0],120:[0,.43056,0,0],121:[.22222,.43056,0,0],122:[0,.43056,0,0],123:[.08333,.69444,0,0],124:[.08333,.69444,0,0],125:[.08333,.69444,0,0],126:[0,.61111,0,0],127:[0,.61111,0,0],305:[0,.43056,0,0],567:[.22222,.43056,0,0],768:[0,.61111,0,0],769:[0,.61111,0,0],770:[0,.61111,0,0],771:[0,.61111,0,0],772:[0,.56555,0,0],774:[0,.61111,0,0],776:[0,.61111,0,0],778:[0,.61111,0,0],780:[0,.56597,0,0],915:[0,.61111,0,0],916:[0,.61111,0,0],920:[0,.61111,0,0],923:[0,.61111,0,0],926:[0,.61111,0,0],928:[0,.61111,0,0],931:[0,.61111,0,0],933:[0,.61111,0,0],934:[0,.61111,0,0],936:[0,.61111,0,0],937:[0,.61111,0,0],2018:[0,.61111,0,0],2019:[0,.61111,0,0],8242:[0,.61111,0,0]}}},{}],18:[function(e,t,r){var a=e("./utils");var i=e("./ParseError");function n(e,r,a){if(typeof e==="string"){e=[e]}if(typeof r==="number"){r={numArgs:r}}var i={numArgs:r.numArgs,argTypes:r.argTypes,greediness:r.greediness===undefined?1:r.greediness,allowedInText:!!r.allowedInText,numOptionalArgs:r.numOptionalArgs||0,handler:a};for(var n=0;n<e.length;++n){t.exports[e[n]]=i}}n("\\sqrt",{numArgs:1,numOptionalArgs:1},function(e,t){var r=t[0];var a=t[1];return{type:"sqrt",body:a,index:r}});n("\\text",{numArgs:1,argTypes:["text"],greediness:2},function(e,t){var r=t[0];var a;if(r.type==="ordgroup"){a=r.value}else{a=[r]}return{type:"text",body:a}});n("\\color",{numArgs:2,allowedInText:true,greediness:3,argTypes:["color","original"]},function(e,t){var r=t[0];var a=t[1];var i;if(a.type==="ordgroup"){i=a.value}else{i=[a]}return{type:"color",color:r.value,value:i}});n("\\overline",{numArgs:1},function(e,t){var r=t[0];return{type:"overline",body:r}});n("\\underline",{numArgs:1},function(e,t){var r=t[0];return{type:"underline",body:r}});n("\\rule",{numArgs:2,numOptionalArgs:1,argTypes:["size","size","size"]},function(e,t){var r=t[0];var a=t[1];var i=t[2];return{type:"rule",shift:r&&r.value,width:a.value,height:i.value}});n("\\KaTeX",{numArgs:0},function(e){return{type:"katex"}});n("\\phantom",{numArgs:1},function(e,t){var r=t[0];var a;if(r.type==="ordgroup"){a=r.value}else{a=[r]}return{type:"phantom",value:a}});var s={"\\bigl":{type:"open",size:1},"\\Bigl":{type:"open",size:2},"\\biggl":{type:"open",size:3},"\\Biggl":{type:"open",size:4},"\\bigr":{type:"close",size:1},"\\Bigr":{type:"close",size:2},"\\biggr":{type:"close",size:3},"\\Biggr":{type:"close",size:4},"\\bigm":{type:"rel",size:1},"\\Bigm":{type:"rel",size:2},"\\biggm":{type:"rel",size:3},"\\Biggm":{type:"rel",size:4},"\\big":{type:"textord",size:1},"\\Big":{type:"textord",size:2},"\\bigg":{type:"textord",size:3},"\\Bigg":{type:"textord",size:4}};var l=["(",")","[","\\lbrack","]","\\rbrack","\\{","\\lbrace","\\}","\\rbrace","\\lfloor","\\rfloor","\\lceil","\\rceil","<",">","\\langle","\\rangle","\\lt","\\gt","\\lvert","\\rvert","\\lVert","\\rVert","\\lgroup","\\rgroup","\\lmoustache","\\rmoustache","/","\\backslash","|","\\vert","\\|","\\Vert","\\uparrow","\\Uparrow","\\downarrow","\\Downarrow","\\updownarrow","\\Updownarrow","."];var o={"\\Bbb":"\\mathbb","\\bold":"\\mathbf","\\frak":"\\mathfrak"};n(["\\blue","\\orange","\\pink","\\red","\\green","\\gray","\\purple","\\blueA","\\blueB","\\blueC","\\blueD","\\blueE","\\tealA","\\tealB","\\tealC","\\tealD","\\tealE","\\greenA","\\greenB","\\greenC","\\greenD","\\greenE","\\goldA","\\goldB","\\goldC","\\goldD","\\goldE","\\redA","\\redB","\\redC","\\redD","\\redE","\\maroonA","\\maroonB","\\maroonC","\\maroonD","\\maroonE","\\purpleA","\\purpleB","\\purpleC","\\purpleD","\\purpleE","\\mintA","\\mintB","\\mintC","\\grayA","\\grayB","\\grayC","\\grayD","\\grayE","\\grayF","\\grayG","\\grayH","\\grayI","\\kaBlue","\\kaGreen"],{numArgs:1,allowedInText:true,greediness:3},function(e,t){var r=t[0];var a;if(r.type==="ordgroup"){a=r.value}else{a=[r]}return{type:"color",color:"katex-"+e.funcName.slice(1),value:a}});n(["\\arcsin","\\arccos","\\arctan","\\arg","\\cos","\\cosh","\\cot","\\coth","\\csc","\\deg","\\dim","\\exp","\\hom","\\ker","\\lg","\\ln","\\log","\\sec","\\sin","\\sinh","\\tan","\\tanh"],{numArgs:0},function(e){return{type:"op",limits:false,symbol:false,body:e.funcName}});n(["\\det","\\gcd","\\inf","\\lim","\\liminf","\\limsup","\\max","\\min","\\Pr","\\sup"],{numArgs:0},function(e){return{type:"op",limits:true,symbol:false,body:e.funcName}});n(["\\int","\\iint","\\iiint","\\oint"],{numArgs:0},function(e){return{type:"op",limits:false,symbol:true,body:e.funcName}});n(["\\coprod","\\bigvee","\\bigwedge","\\biguplus","\\bigcap","\\bigcup","\\intop","\\prod","\\sum","\\bigotimes","\\bigoplus","\\bigodot","\\bigsqcup","\\smallint"],{
+numArgs:0},function(e){return{type:"op",limits:true,symbol:true,body:e.funcName}});n(["\\dfrac","\\frac","\\tfrac","\\dbinom","\\binom","\\tbinom"],{numArgs:2,greediness:2},function(e,t){var r=t[0];var a=t[1];var i;var n=null;var s=null;var l="auto";switch(e.funcName){case"\\dfrac":case"\\frac":case"\\tfrac":i=true;break;case"\\dbinom":case"\\binom":case"\\tbinom":i=false;n="(";s=")";break;default:throw new Error("Unrecognized genfrac command")}switch(e.funcName){case"\\dfrac":case"\\dbinom":l="display";break;case"\\tfrac":case"\\tbinom":l="text";break}return{type:"genfrac",numer:r,denom:a,hasBarLine:i,leftDelim:n,rightDelim:s,size:l}});n(["\\llap","\\rlap"],{numArgs:1,allowedInText:true},function(e,t){var r=t[0];return{type:e.funcName.slice(1),body:r}});n(["\\bigl","\\Bigl","\\biggl","\\Biggl","\\bigr","\\Bigr","\\biggr","\\Biggr","\\bigm","\\Bigm","\\biggm","\\Biggm","\\big","\\Big","\\bigg","\\Bigg","\\left","\\right"],{numArgs:1},function(e,t){var r=t[0];if(!a.contains(l,r.value)){throw new i("Invalid delimiter: '"+r.value+"' after '"+e.funcName+"'",e.lexer,e.positions[1])}if(e.funcName==="\\left"||e.funcName==="\\right"){return{type:"leftright",value:r.value}}else{return{type:"delimsizing",size:s[e.funcName].size,delimType:s[e.funcName].type,value:r.value}}});n(["\\tiny","\\scriptsize","\\footnotesize","\\small","\\normalsize","\\large","\\Large","\\LARGE","\\huge","\\Huge"],0,null);n(["\\displaystyle","\\textstyle","\\scriptstyle","\\scriptscriptstyle"],0,null);n(["\\mathrm","\\mathit","\\mathbf","\\mathbb","\\mathcal","\\mathfrak","\\mathscr","\\mathsf","\\mathtt","\\Bbb","\\bold","\\frak"],{numArgs:1,greediness:2},function(e,t){var r=t[0];var a=e.funcName;if(a in o){a=o[a]}return{type:"font",font:a.slice(1),body:r}});n(["\\acute","\\grave","\\ddot","\\tilde","\\bar","\\breve","\\check","\\hat","\\vec","\\dot"],{numArgs:1},function(e,t){var r=t[0];return{type:"accent",accent:e.funcName,base:r}});n(["\\over","\\choose"],{numArgs:0},function(e){var t;switch(e.funcName){case"\\over":t="\\frac";break;case"\\choose":t="\\binom";break;default:throw new Error("Unrecognized infix genfrac command")}return{type:"infix",replaceWith:t}});n(["\\\\","\\cr"],{numArgs:0,numOptionalArgs:1,argTypes:["size"]},function(e,t){var r=t[0];return{type:"cr",size:r}});n(["\\begin","\\end"],{numArgs:1,argTypes:["text"]},function(e,t){var r=t[0];if(r.type!=="ordgroup"){throw new i("Invalid environment name",e.lexer,e.positions[1])}var a="";for(var n=0;n<r.value.length;++n){a+=r.value[n].value}return{type:"environment",name:a,namepos:e.positions[1]}})},{"./ParseError":5,"./utils":23}],19:[function(e,t,r){var a=e("./utils");function i(e,t){this.type=e;this.attributes={};this.children=t||[]}i.prototype.setAttribute=function(e,t){this.attributes[e]=t};i.prototype.toNode=function(){var e=document.createElementNS("http://www.w3.org/1998/Math/MathML",this.type);for(var t in this.attributes){if(Object.prototype.hasOwnProperty.call(this.attributes,t)){e.setAttribute(t,this.attributes[t])}}for(var r=0;r<this.children.length;r++){e.appendChild(this.children[r].toNode())}return e};i.prototype.toMarkup=function(){var e="<"+this.type;for(var t in this.attributes){if(Object.prototype.hasOwnProperty.call(this.attributes,t)){e+=" "+t+'="';e+=a.escape(this.attributes[t]);e+='"'}}e+=">";for(var r=0;r<this.children.length;r++){e+=this.children[r].toMarkup()}e+="</"+this.type+">";return e};function n(e){this.text=e}n.prototype.toNode=function(){return document.createTextNode(this.text)};n.prototype.toMarkup=function(){return a.escape(this.text)};t.exports={MathNode:i,TextNode:n}},{"./utils":23}],20:[function(e,t,r){function a(e,t,r){this.type=e;this.value=t;this.mode=r}t.exports={ParseNode:a}},{}],21:[function(e,t,r){var a=e("./Parser");var i=function(e,t){var r=new a(e,t);return r.parse()};t.exports=i},{"./Parser":6}],22:[function(e,t,r){t.exports={math:{},text:{}};function a(e,r,a,i,n){t.exports[e][n]={font:r,group:a,replace:i}}var i="math";var n="text";var s="main";var l="ams";var o="accent";var u="bin";var p="close";var h="inner";var c="mathord";var v="op";var m="open";var f="punct";var d="rel";var g="spacing";var y="textord";a(i,s,d,"\u2261","\\equiv");a(i,s,d,"\u227a","\\prec");a(i,s,d,"\u227b","\\succ");a(i,s,d,"\u223c","\\sim");a(i,s,d,"\u22a5","\\perp");a(i,s,d,"\u2aaf","\\preceq");a(i,s,d,"\u2ab0","\\succeq");a(i,s,d,"\u2243","\\simeq");a(i,s,d,"\u2223","\\mid");a(i,s,d,"\u226a","\\ll");a(i,s,d,"\u226b","\\gg");a(i,s,d,"\u224d","\\asymp");a(i,s,d,"\u2225","\\parallel");a(i,s,d,"\u22c8","\\bowtie");a(i,s,d,"\u2323","\\smile");a(i,s,d,"\u2291","\\sqsubseteq");a(i,s,d,"\u2292","\\sqsupseteq");a(i,s,d,"\u2250","\\doteq");a(i,s,d,"\u2322","\\frown");a(i,s,d,"\u220b","\\ni");a(i,s,d,"\u221d","\\propto");a(i,s,d,"\u22a2","\\vdash");a(i,s,d,"\u22a3","\\dashv");a(i,s,d,"\u220b","\\owns");a(i,s,f,".","\\ldotp");a(i,s,f,"\u22c5","\\cdotp");a(i,s,y,"#","\\#");a(i,s,y,"&","\\&");a(i,s,y,"\u2135","\\aleph");a(i,s,y,"\u2200","\\forall");a(i,s,y,"\u210f","\\hbar");a(i,s,y,"\u2203","\\exists");a(i,s,y,"\u2207","\\nabla");a(i,s,y,"\u266d","\\flat");a(i,s,y,"\u2113","\\ell");a(i,s,y,"\u266e","\\natural");a(i,s,y,"\u2663","\\clubsuit");a(i,s,y,"\u2118","\\wp");a(i,s,y,"\u266f","\\sharp");a(i,s,y,"\u2662","\\diamondsuit");a(i,s,y,"\u211c","\\Re");a(i,s,y,"\u2661","\\heartsuit");a(i,s,y,"\u2111","\\Im");a(i,s,y,"\u2660","\\spadesuit");a(i,s,y,"\u2020","\\dag");a(i,s,y,"\u2021","\\ddag");a(i,s,p,"\u23b1","\\rmoustache");a(i,s,m,"\u23b0","\\lmoustache");a(i,s,p,"\u27ef","\\rgroup");a(i,s,m,"\u27ee","\\lgroup");a(i,s,u,"\u2213","\\mp");a(i,s,u,"\u2296","\\ominus");a(i,s,u,"\u228e","\\uplus");a(i,s,u,"\u2293","\\sqcap");a(i,s,u,"\u2217","\\ast");a(i,s,u,"\u2294","\\sqcup");a(i,s,u,"\u25ef","\\bigcirc");a(i,s,u,"\u2219","\\bullet");a(i,s,u,"\u2021","\\ddagger");a(i,s,u,"\u2240","\\wr");a(i,s,u,"\u2a3f","\\amalg");a(i,s,d,"\u27f5","\\longleftarrow");a(i,s,d,"\u21d0","\\Leftarrow");a(i,s,d,"\u27f8","\\Longleftarrow");a(i,s,d,"\u27f6","\\longrightarrow");a(i,s,d,"\u21d2","\\Rightarrow");a(i,s,d,"\u27f9","\\Longrightarrow");a(i,s,d,"\u2194","\\leftrightarrow");a(i,s,d,"\u27f7","\\longleftrightarrow");a(i,s,d,"\u21d4","\\Leftrightarrow");a(i,s,d,"\u27fa","\\Longleftrightarrow");a(i,s,d,"\u21a6","\\mapsto");a(i,s,d,"\u27fc","\\longmapsto");a(i,s,d,"\u2197","\\nearrow");a(i,s,d,"\u21a9","\\hookleftarrow");a(i,s,d,"\u21aa","\\hookrightarrow");a(i,s,d,"\u2198","\\searrow");a(i,s,d,"\u21bc","\\leftharpoonup");a(i,s,d,"\u21c0","\\rightharpoonup");a(i,s,d,"\u2199","\\swarrow");a(i,s,d,"\u21bd","\\leftharpoondown");a(i,s,d,"\u21c1","\\rightharpoondown");a(i,s,d,"\u2196","\\nwarrow");a(i,s,d,"\u21cc","\\rightleftharpoons");a(i,l,d,"\u226e","\\nless");a(i,l,d,"\ue010","\\nleqslant");a(i,l,d,"\ue011","\\nleqq");a(i,l,d,"\u2a87","\\lneq");a(i,l,d,"\u2268","\\lneqq");a(i,l,d,"\ue00c","\\lvertneqq");a(i,l,d,"\u22e6","\\lnsim");a(i,l,d,"\u2a89","\\lnapprox");a(i,l,d,"\u2280","\\nprec");a(i,l,d,"\u22e0","\\npreceq");a(i,l,d,"\u22e8","\\precnsim");a(i,l,d,"\u2ab9","\\precnapprox");a(i,l,d,"\u2241","\\nsim");a(i,l,d,"\ue006","\\nshortmid");a(i,l,d,"\u2224","\\nmid");a(i,l,d,"\u22ac","\\nvdash");a(i,l,d,"\u22ad","\\nvDash");a(i,l,d,"\u22ea","\\ntriangleleft");a(i,l,d,"\u22ec","\\ntrianglelefteq");a(i,l,d,"\u228a","\\subsetneq");a(i,l,d,"\ue01a","\\varsubsetneq");a(i,l,d,"\u2acb","\\subsetneqq");a(i,l,d,"\ue017","\\varsubsetneqq");a(i,l,d,"\u226f","\\ngtr");a(i,l,d,"\ue00f","\\ngeqslant");a(i,l,d,"\ue00e","\\ngeqq");a(i,l,d,"\u2a88","\\gneq");a(i,l,d,"\u2269","\\gneqq");a(i,l,d,"\ue00d","\\gvertneqq");a(i,l,d,"\u22e7","\\gnsim");a(i,l,d,"\u2a8a","\\gnapprox");a(i,l,d,"\u2281","\\nsucc");a(i,l,d,"\u22e1","\\nsucceq");a(i,l,d,"\u22e9","\\succnsim");a(i,l,d,"\u2aba","\\succnapprox");a(i,l,d,"\u2246","\\ncong");a(i,l,d,"\ue007","\\nshortparallel");a(i,l,d,"\u2226","\\nparallel");a(i,l,d,"\u22af","\\nVDash");a(i,l,d,"\u22eb","\\ntriangleright");a(i,l,d,"\u22ed","\\ntrianglerighteq");a(i,l,d,"\ue018","\\nsupseteqq");a(i,l,d,"\u228b","\\supsetneq");a(i,l,d,"\ue01b","\\varsupsetneq");a(i,l,d,"\u2acc","\\supsetneqq");a(i,l,d,"\ue019","\\varsupsetneqq");a(i,l,d,"\u22ae","\\nVdash");a(i,l,d,"\u2ab5","\\precneqq");a(i,l,d,"\u2ab6","\\succneqq");a(i,l,d,"\ue016","\\nsubseteqq");a(i,l,u,"\u22b4","\\unlhd");a(i,l,u,"\u22b5","\\unrhd");a(i,l,d,"\u219a","\\nleftarrow");a(i,l,d,"\u219b","\\nrightarrow");a(i,l,d,"\u21cd","\\nLeftarrow");a(i,l,d,"\u21cf","\\nRightarrow");a(i,l,d,"\u21ae","\\nleftrightarrow");a(i,l,d,"\u21ce","\\nLeftrightarrow");a(i,l,d,"\u25b3","\\vartriangle");a(i,l,y,"\u210f","\\hslash");a(i,l,y,"\u25bd","\\triangledown");a(i,l,y,"\u25ca","\\lozenge");a(i,l,y,"\u24c8","\\circledS");a(i,l,y,"\xae","\\circledR");a(i,l,y,"\u2221","\\measuredangle");a(i,l,y,"\u2204","\\nexists");a(i,l,y,"\u2127","\\mho");a(i,l,y,"\u2132","\\Finv");a(i,l,y,"\u2141","\\Game");a(i,l,y,"k","\\Bbbk");a(i,l,y,"\u2035","\\backprime");a(i,l,y,"\u25b2","\\blacktriangle");a(i,l,y,"\u25bc","\\blacktriangledown");a(i,l,y,"\u25a0","\\blacksquare");a(i,l,y,"\u29eb","\\blacklozenge");a(i,l,y,"\u2605","\\bigstar");a(i,l,y,"\u2222","\\sphericalangle");a(i,l,y,"\u2201","\\complement");a(i,l,y,"\xf0","\\eth");a(i,l,y,"\u2571","\\diagup");a(i,l,y,"\u2572","\\diagdown");a(i,l,y,"\u25a1","\\square");a(i,l,y,"\u25a1","\\Box");a(i,l,y,"\u25ca","\\Diamond");a(i,l,y,"\xa5","\\yen");a(i,l,y,"\u2713","\\checkmark");a(i,l,y,"\u2136","\\beth");a(i,l,y,"\u2138","\\daleth");a(i,l,y,"\u2137","\\gimel");a(i,l,y,"\u03dd","\\digamma");a(i,l,y,"\u03f0","\\varkappa");a(i,l,m,"\u250c","\\ulcorner");a(i,l,p,"\u2510","\\urcorner");a(i,l,m,"\u2514","\\llcorner");a(i,l,p,"\u2518","\\lrcorner");a(i,l,d,"\u2266","\\leqq");a(i,l,d,"\u2a7d","\\leqslant");a(i,l,d,"\u2a95","\\eqslantless");a(i,l,d,"\u2272","\\lesssim");a(i,l,d,"\u2a85","\\lessapprox");a(i,l,d,"\u224a","\\approxeq");a(i,l,u,"\u22d6","\\lessdot");a(i,l,d,"\u22d8","\\lll");a(i,l,d,"\u2276","\\lessgtr");a(i,l,d,"\u22da","\\lesseqgtr");a(i,l,d,"\u2a8b","\\lesseqqgtr");a(i,l,d,"\u2251","\\doteqdot");a(i,l,d,"\u2253","\\risingdotseq");a(i,l,d,"\u2252","\\fallingdotseq");a(i,l,d,"\u223d","\\backsim");a(i,l,d,"\u22cd","\\backsimeq");a(i,l,d,"\u2ac5","\\subseteqq");a(i,l,d,"\u22d0","\\Subset");a(i,l,d,"\u228f","\\sqsubset");a(i,l,d,"\u227c","\\preccurlyeq");a(i,l,d,"\u22de","\\curlyeqprec");a(i,l,d,"\u227e","\\precsim");a(i,l,d,"\u2ab7","\\precapprox");a(i,l,d,"\u22b2","\\vartriangleleft");a(i,l,d,"\u22b4","\\trianglelefteq");a(i,l,d,"\u22a8","\\vDash");a(i,l,d,"\u22aa","\\Vvdash");a(i,l,d,"\u2323","\\smallsmile");a(i,l,d,"\u2322","\\smallfrown");a(i,l,d,"\u224f","\\bumpeq");a(i,l,d,"\u224e","\\Bumpeq");a(i,l,d,"\u2267","\\geqq");a(i,l,d,"\u2a7e","\\geqslant");a(i,l,d,"\u2a96","\\eqslantgtr");a(i,l,d,"\u2273","\\gtrsim");a(i,l,d,"\u2a86","\\gtrapprox");a(i,l,u,"\u22d7","\\gtrdot");a(i,l,d,"\u22d9","\\ggg");a(i,l,d,"\u2277","\\gtrless");a(i,l,d,"\u22db","\\gtreqless");a(i,l,d,"\u2a8c","\\gtreqqless");a(i,l,d,"\u2256","\\eqcirc");a(i,l,d,"\u2257","\\circeq");a(i,l,d,"\u225c","\\triangleq");a(i,l,d,"\u223c","\\thicksim");a(i,l,d,"\u2248","\\thickapprox");a(i,l,d,"\u2ac6","\\supseteqq");a(i,l,d,"\u22d1","\\Supset");a(i,l,d,"\u2290","\\sqsupset");a(i,l,d,"\u227d","\\succcurlyeq");a(i,l,d,"\u22df","\\curlyeqsucc");a(i,l,d,"\u227f","\\succsim");a(i,l,d,"\u2ab8","\\succapprox");a(i,l,d,"\u22b3","\\vartriangleright");a(i,l,d,"\u22b5","\\trianglerighteq");a(i,l,d,"\u22a9","\\Vdash");a(i,l,d,"\u2223","\\shortmid");a(i,l,d,"\u2225","\\shortparallel");a(i,l,d,"\u226c","\\between");a(i,l,d,"\u22d4","\\pitchfork");a(i,l,d,"\u221d","\\varpropto");a(i,l,d,"\u25c0","\\blacktriangleleft");a(i,l,d,"\u2234","\\therefore");a(i,l,d,"\u220d","\\backepsilon");a(i,l,d,"\u25b6","\\blacktriangleright");a(i,l,d,"\u2235","\\because");a(i,l,d,"\u22d8","\\llless");a(i,l,d,"\u22d9","\\gggtr");a(i,l,u,"\u22b2","\\lhd");a(i,l,u,"\u22b3","\\rhd");a(i,l,d,"\u2242","\\eqsim");a(i,s,d,"\u22c8","\\Join");a(i,l,d,"\u2251","\\Doteq");a(i,l,u,"\u2214","\\dotplus");a(i,l,u,"\u2216","\\smallsetminus");a(i,l,u,"\u22d2","\\Cap");a(i,l,u,"\u22d3","\\Cup");a(i,l,u,"\u2a5e","\\doublebarwedge");a(i,l,u,"\u229f","\\boxminus");a(i,l,u,"\u229e","\\boxplus");a(i,l,u,"\u22c7","\\divideontimes");a(i,l,u,"\u22c9","\\ltimes");a(i,l,u,"\u22ca","\\rtimes");a(i,l,u,"\u22cb","\\leftthreetimes");a(i,l,u,"\u22cc","\\rightthreetimes");a(i,l,u,"\u22cf","\\curlywedge");a(i,l,u,"\u22ce","\\curlyvee");a(i,l,u,"\u229d","\\circleddash");a(i,l,u,"\u229b","\\circledast");a(i,l,u,"\u22c5","\\centerdot");a(i,l,u,"\u22ba","\\intercal");a(i,l,u,"\u22d2","\\doublecap");a(i,l,u,"\u22d3","\\doublecup");a(i,l,u,"\u22a0","\\boxtimes");a(i,l,d,"\u21e2","\\dashrightarrow");a(i,l,d,"\u21e0","\\dashleftarrow");a(i,l,d,"\u21c7","\\leftleftarrows");a(i,l,d,"\u21c6","\\leftrightarrows");a(i,l,d,"\u21da","\\Lleftarrow");a(i,l,d,"\u219e","\\twoheadleftarrow");a(i,l,d,"\u21a2","\\leftarrowtail");a(i,l,d,"\u21ab","\\looparrowleft");a(i,l,d,"\u21cb","\\leftrightharpoons");a(i,l,d,"\u21b6","\\curvearrowleft");a(i,l,d,"\u21ba","\\circlearrowleft");a(i,l,d,"\u21b0","\\Lsh");a(i,l,d,"\u21c8","\\upuparrows");a(i,l,d,"\u21bf","\\upharpoonleft");a(i,l,d,"\u21c3","\\downharpoonleft");a(i,l,d,"\u22b8","\\multimap");a(i,l,d,"\u21ad","\\leftrightsquigarrow");a(i,l,d,"\u21c9","\\rightrightarrows");a(i,l,d,"\u21c4","\\rightleftarrows");a(i,l,d,"\u21a0","\\twoheadrightarrow");a(i,l,d,"\u21a3","\\rightarrowtail");a(i,l,d,"\u21ac","\\looparrowright");a(i,l,d,"\u21b7","\\curvearrowright");a(i,l,d,"\u21bb","\\circlearrowright");a(i,l,d,"\u21b1","\\Rsh");a(i,l,d,"\u21ca","\\downdownarrows");a(i,l,d,"\u21be","\\upharpoonright");a(i,l,d,"\u21c2","\\downharpoonright");a(i,l,d,"\u21dd","\\rightsquigarrow");a(i,l,d,"\u21dd","\\leadsto");a(i,l,d,"\u21db","\\Rrightarrow");a(i,l,d,"\u21be","\\restriction");a(i,s,y,"\u2018","`");a(i,s,y,"$","\\$");a(i,s,y,"%","\\%");a(i,s,y,"_","\\_");a(i,s,y,"\u2220","\\angle");a(i,s,y,"\u221e","\\infty");a(i,s,y,"\u2032","\\prime");a(i,s,y,"\u25b3","\\triangle");a(i,s,y,"\u0393","\\Gamma");a(i,s,y,"\u0394","\\Delta");a(i,s,y,"\u0398","\\Theta");a(i,s,y,"\u039b","\\Lambda");a(i,s,y,"\u039e","\\Xi");a(i,s,y,"\u03a0","\\Pi");a(i,s,y,"\u03a3","\\Sigma");a(i,s,y,"\u03a5","\\Upsilon");a(i,s,y,"\u03a6","\\Phi");a(i,s,y,"\u03a8","\\Psi");a(i,s,y,"\u03a9","\\Omega");a(i,s,y,"\xac","\\neg");a(i,s,y,"\xac","\\lnot");a(i,s,y,"\u22a4","\\top");a(i,s,y,"\u22a5","\\bot");a(i,s,y,"\u2205","\\emptyset");a(i,l,y,"\u2205","\\varnothing");a(i,s,c,"\u03b1","\\alpha");a(i,s,c,"\u03b2","\\beta");a(i,s,c,"\u03b3","\\gamma");a(i,s,c,"\u03b4","\\delta");a(i,s,c,"\u03f5","\\epsilon");a(i,s,c,"\u03b6","\\zeta");a(i,s,c,"\u03b7","\\eta");a(i,s,c,"\u03b8","\\theta");a(i,s,c,"\u03b9","\\iota");a(i,s,c,"\u03ba","\\kappa");a(i,s,c,"\u03bb","\\lambda");a(i,s,c,"\u03bc","\\mu");a(i,s,c,"\u03bd","\\nu");a(i,s,c,"\u03be","\\xi");a(i,s,c,"o","\\omicron");a(i,s,c,"\u03c0","\\pi");a(i,s,c,"\u03c1","\\rho");a(i,s,c,"\u03c3","\\sigma");a(i,s,c,"\u03c4","\\tau");a(i,s,c,"\u03c5","\\upsilon");a(i,s,c,"\u03d5","\\phi");a(i,s,c,"\u03c7","\\chi");a(i,s,c,"\u03c8","\\psi");a(i,s,c,"\u03c9","\\omega");a(i,s,c,"\u03b5","\\varepsilon");a(i,s,c,"\u03d1","\\vartheta");a(i,s,c,"\u03d6","\\varpi");a(i,s,c,"\u03f1","\\varrho");a(i,s,c,"\u03c2","\\varsigma");a(i,s,c,"\u03c6","\\varphi");a(i,s,u,"\u2217","*");a(i,s,u,"+","+");a(i,s,u,"\u2212","-");a(i,s,u,"\u22c5","\\cdot");a(i,s,u,"\u2218","\\circ");a(i,s,u,"\xf7","\\div");a(i,s,u,"\xb1","\\pm");a(i,s,u,"\xd7","\\times");a(i,s,u,"\u2229","\\cap");a(i,s,u,"\u222a","\\cup");a(i,s,u,"\u2216","\\setminus");a(i,s,u,"\u2227","\\land");a(i,s,u,"\u2228","\\lor");a(i,s,u,"\u2227","\\wedge");a(i,s,u,"\u2228","\\vee");a(i,s,y,"\u221a","\\surd");a(i,s,m,"(","(");a(i,s,m,"[","[");a(i,s,m,"\u27e8","\\langle");a(i,s,m,"\u2223","\\lvert");a(i,s,m,"\u2225","\\lVert");a(i,s,p,")",")");a(i,s,p,"]","]");a(i,s,p,"?","?");a(i,s,p,"!","!");a(i,s,p,"\u27e9","\\rangle");a(i,s,p,"\u2223","\\rvert");a(i,s,p,"\u2225","\\rVert");a(i,s,d,"=","=");a(i,s,d,"<","<");a(i,s,d,">",">");a(i,s,d,":",":");a(i,s,d,"\u2248","\\approx");a(i,s,d,"\u2245","\\cong");a(i,s,d,"\u2265","\\ge");a(i,s,d,"\u2265","\\geq");a(i,s,d,"\u2190","\\gets");a(i,s,d,">","\\gt");a(i,s,d,"\u2208","\\in");a(i,s,d,"\u2209","\\notin");a(i,s,d,"\u2282","\\subset");a(i,s,d,"\u2283","\\supset");a(i,s,d,"\u2286","\\subseteq");a(i,s,d,"\u2287","\\supseteq");a(i,l,d,"\u2288","\\nsubseteq");a(i,l,d,"\u2289","\\nsupseteq");a(i,s,d,"\u22a8","\\models");a(i,s,d,"\u2190","\\leftarrow");a(i,s,d,"\u2264","\\le");a(i,s,d,"\u2264","\\leq");a(i,s,d,"<","\\lt");a(i,s,d,"\u2260","\\ne");a(i,s,d,"\u2260","\\neq");a(i,s,d,"\u2192","\\rightarrow");a(i,s,d,"\u2192","\\to");a(i,l,d,"\u2271","\\ngeq");a(i,l,d,"\u2270","\\nleq");a(i,s,g,null,"\\!");a(i,s,g,"\xa0","\\ ");a(i,s,g,"\xa0","~");a(i,s,g,null,"\\,");a(i,s,g,null,"\\:");a(i,s,g,null,"\\;");a(i,s,g,null,"\\enspace");a(i,s,g,null,"\\qquad");a(i,s,g,null,"\\quad");a(i,s,g,"\xa0","\\space");a(i,s,f,",",",");a(i,s,f,";",";");a(i,s,f,":","\\colon");a(i,l,u,"\u22bc","\\barwedge");a(i,l,u,"\u22bb","\\veebar");a(i,s,u,"\u2299","\\odot");a(i,s,u,"\u2295","\\oplus");a(i,s,u,"\u2297","\\otimes");a(i,s,y,"\u2202","\\partial");a(i,s,u,"\u2298","\\oslash");a(i,l,u,"\u229a","\\circledcirc");a(i,l,u,"\u22a1","\\boxdot");a(i,s,u,"\u25b3","\\bigtriangleup");a(i,s,u,"\u25bd","\\bigtriangledown");a(i,s,u,"\u2020","\\dagger");a(i,s,u,"\u22c4","\\diamond");a(i,s,u,"\u22c6","\\star");a(i,s,u,"\u25c3","\\triangleleft");a(i,s,u,"\u25b9","\\triangleright");a(i,s,m,"{","\\{");a(i,s,p,"}","\\}");a(i,s,m,"{","\\lbrace");a(i,s,p,"}","\\rbrace");a(i,s,m,"[","\\lbrack");a(i,s,p,"]","\\rbrack");a(i,s,m,"\u230a","\\lfloor");a(i,s,p,"\u230b","\\rfloor");a(i,s,m,"\u2308","\\lceil");a(i,s,p,"\u2309","\\rceil");a(i,s,y,"\\","\\backslash");a(i,s,y,"\u2223","|");a(i,s,y,"\u2223","\\vert");a(i,s,y,"\u2225","\\|");a(i,s,y,"\u2225","\\Vert");a(i,s,d,"\u2191","\\uparrow");a(i,s,d,"\u21d1","\\Uparrow");a(i,s,d,"\u2193","\\downarrow");a(i,s,d,"\u21d3","\\Downarrow");a(i,s,d,"\u2195","\\updownarrow");a(i,s,d,"\u21d5","\\Updownarrow");a(i,i,v,"\u2210","\\coprod");a(i,i,v,"\u22c1","\\bigvee");a(i,i,v,"\u22c0","\\bigwedge");a(i,i,v,"\u2a04","\\biguplus");a(i,i,v,"\u22c2","\\bigcap");a(i,i,v,"\u22c3","\\bigcup");a(i,i,v,"\u222b","\\int");a(i,i,v,"\u222b","\\intop");a(i,i,v,"\u222c","\\iint");a(i,i,v,"\u222d","\\iiint");a(i,i,v,"\u220f","\\prod");a(i,i,v,"\u2211","\\sum");a(i,i,v,"\u2a02","\\bigotimes");a(i,i,v,"\u2a01","\\bigoplus");a(i,i,v,"\u2a00","\\bigodot");a(i,i,v,"\u222e","\\oint");a(i,i,v,"\u2a06","\\bigsqcup");a(i,i,v,"\u222b","\\smallint");a(i,s,h,"\u2026","\\ldots");a(i,s,h,"\u22ef","\\cdots");a(i,s,h,"\u22f1","\\ddots");a(i,s,y,"\u22ee","\\vdots");a(i,s,o,"\xb4","\\acute");a(i,s,o,"`","\\grave");a(i,s,o,"\xa8","\\ddot");a(i,s,o,"~","\\tilde");a(i,s,o,"\xaf","\\bar");a(i,s,o,"\u02d8","\\breve");a(i,s,o,"\u02c7","\\check");a(i,s,o,"^","\\hat");a(i,s,o,"\u20d7","\\vec");a(i,s,o,"\u02d9","\\dot");a(i,s,c,"\u0131","\\imath");a(i,s,c,"\u0237","\\jmath");a(n,s,g,"\xa0","\\ ");a(n,s,g,"\xa0"," ");a(n,s,g,"\xa0","~");var b;var x;var w='0123456789/@."';for(b=0;b<w.length;b++){x=w.charAt(b);a(i,s,y,x,x)}var k="0123456789`!@*()-=+[]'\";:?/.,";for(b=0;b<k.length;b++){x=k.charAt(b);a(n,s,y,x,x)}var z="abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";for(b=0;b<z.length;b++){x=z.charAt(b);a(i,s,c,x,x);a(n,s,y,x,x)}},{}],23:[function(e,t,r){var a=Array.prototype.indexOf;var i=function(e,t){if(e==null){return-1}if(a&&e.indexOf===a){return e.indexOf(t)}var r=0;var i=e.length;for(;r<i;r++){if(e[r]===t){return r}}return-1};var n=function(e,t){return i(e,t)!==-1};var s=function(e,t){return e===undefined?t:e};var l=/([A-Z])/g;var o=function(e){return e.replace(l,"-$1").toLowerCase()};var u={"&":"&amp;",">":"&gt;","<":"&lt;",'"':"&quot;","'":"&#x27;"};var p=/[&><"']/g;function h(e){return u[e]}function c(e){return(""+e).replace(p,h)}var v;if(typeof document!=="undefined"){var m=document.createElement("span");if("textContent"in m){v=function(e,t){e.textContent=t}}else{v=function(e,t){e.innerText=t}}}function f(e){v(e,"")}t.exports={contains:n,deflt:s,escape:c,hyphenate:o,indexOf:i,setTextContent:v,clearNode:f}},{}]},{},[1])(1)});
\ No newline at end of file
diff --git a/plugins/tiddlywiki/katex/files/katex.without-font-face.min.css b/plugins/tiddlywiki/katex/files/katex.without-font-face.min.css
index 451974934..9c22acb6d 100644
--- a/plugins/tiddlywiki/katex/files/katex.without-font-face.min.css
+++ b/plugins/tiddlywiki/katex/files/katex.without-font-face.min.css
@@ -1 +1 @@
-.katex-display{display:block;margin:1em 0;text-align:center}.katex-display>.katex{display:inline-block}.katex{font:400 1.21em KaTeX_Main;line-height:1.2;white-space:nowrap;text-indent:0}.katex .katex-html{display:inline-block}.katex .katex-mathml{position:absolute;clip:rect(1px,1px,1px,1px);padding:0;border:0;height:1px;width:1px;overflow:hidden}.katex .base,.katex .strut{display:inline-block}.katex .mathit{font-family:KaTeX_Math;font-style:italic}.katex .mathbf{font-family:KaTeX_Main;font-weight:700}.katex .amsrm,.katex .mathbb{font-family:KaTeX_AMS}.katex .mathcal{font-family:KaTeX_Caligraphic}.katex .mathfrak{font-family:KaTeX_Fraktur}.katex .mathtt{font-family:KaTeX_Typewriter}.katex .mathscr{font-family:KaTeX_Script}.katex .mathsf{font-family:KaTeX_SansSerif}.katex .mainit{font-family:KaTeX_Main;font-style:italic}.katex .textstyle>.mord+.mop{margin-left:.16667em}.katex .textstyle>.mord+.mbin{margin-left:.22222em}.katex .textstyle>.mord+.mrel{margin-left:.27778em}.katex .textstyle>.mop+.mop,.katex .textstyle>.mop+.mord,.katex .textstyle>.mord+.minner{margin-left:.16667em}.katex .textstyle>.mop+.mrel{margin-left:.27778em}.katex .textstyle>.mop+.minner{margin-left:.16667em}.katex .textstyle>.mbin+.minner,.katex .textstyle>.mbin+.mop,.katex .textstyle>.mbin+.mopen,.katex .textstyle>.mbin+.mord{margin-left:.22222em}.katex .textstyle>.mrel+.minner,.katex .textstyle>.mrel+.mop,.katex .textstyle>.mrel+.mopen,.katex .textstyle>.mrel+.mord{margin-left:.27778em}.katex .textstyle>.mclose+.mop{margin-left:.16667em}.katex .textstyle>.mclose+.mbin{margin-left:.22222em}.katex .textstyle>.mclose+.mrel{margin-left:.27778em}.katex .textstyle>.mclose+.minner,.katex .textstyle>.minner+.mop,.katex .textstyle>.minner+.mord,.katex .textstyle>.mpunct+.mclose,.katex .textstyle>.mpunct+.minner,.katex .textstyle>.mpunct+.mop,.katex .textstyle>.mpunct+.mopen,.katex .textstyle>.mpunct+.mord,.katex .textstyle>.mpunct+.mpunct,.katex .textstyle>.mpunct+.mrel{margin-left:.16667em}.katex .textstyle>.minner+.mbin{margin-left:.22222em}.katex .textstyle>.minner+.mrel{margin-left:.27778em}.katex .mclose+.mop,.katex .minner+.mop,.katex .mop+.mop,.katex .mop+.mord,.katex .mord+.mop,.katex .textstyle>.minner+.minner,.katex .textstyle>.minner+.mopen,.katex .textstyle>.minner+.mpunct{margin-left:.16667em}.katex .reset-textstyle.textstyle{font-size:1em}.katex .reset-textstyle.scriptstyle{font-size:.7em}.katex .reset-textstyle.scriptscriptstyle{font-size:.5em}.katex .reset-scriptstyle.textstyle{font-size:1.42857em}.katex .reset-scriptstyle.scriptstyle{font-size:1em}.katex .reset-scriptstyle.scriptscriptstyle{font-size:.71429em}.katex .reset-scriptscriptstyle.textstyle{font-size:2em}.katex .reset-scriptscriptstyle.scriptstyle{font-size:1.4em}.katex .reset-scriptscriptstyle.scriptscriptstyle{font-size:1em}.katex .style-wrap{position:relative}.katex .vlist{display:inline-block}.katex .vlist>span{display:block;height:0;position:relative}.katex .vlist>span>span{display:inline-block}.katex .vlist .baseline-fix{display:inline-table;table-layout:fixed}.katex .msupsub{text-align:left}.katex .mfrac>span>span{text-align:center}.katex .mfrac .frac-line{width:100%}.katex .mfrac .frac-line:before{border-bottom-style:solid;border-bottom-width:1px;content:"";display:block}.katex .mfrac .frac-line:after{border-bottom-style:solid;border-bottom-width:.04em;content:"";display:block;margin-top:-1px}.katex .mspace{display:inline-block}.katex .mspace.negativethinspace{margin-left:-.16667em}.katex .mspace.thinspace{width:.16667em}.katex .mspace.mediumspace{width:.22222em}.katex .mspace.thickspace{width:.27778em}.katex .mspace.enspace{width:.5em}.katex .mspace.quad{width:1em}.katex .mspace.qquad{width:2em}.katex .llap,.katex .rlap{width:0;position:relative}.katex .llap>.inner,.katex .rlap>.inner{position:absolute}.katex .llap>.fix,.katex .rlap>.fix{display:inline-block}.katex .llap>.inner{right:0}.katex .rlap>.inner{left:0}.katex .katex-logo .a{font-size:.75em;margin-left:-.32em;position:relative;top:-.2em}.katex .katex-logo .t{margin-left:-.23em}.katex .katex-logo .e{margin-left:-.1667em;position:relative;top:.2155em}.katex .katex-logo .x{margin-left:-.125em}.katex .rule{display:inline-block;border-style:solid;position:relative}.katex .overline .overline-line{width:100%}.katex .overline .overline-line:before{border-bottom-style:solid;border-bottom-width:1px;content:"";display:block}.katex .overline .overline-line:after{border-bottom-style:solid;border-bottom-width:.04em;content:"";display:block;margin-top:-1px}.katex .sqrt>.sqrt-sign{position:relative}.katex .sqrt .sqrt-line{width:100%}.katex .sqrt .sqrt-line:before{border-bottom-style:solid;border-bottom-width:1px;content:"";display:block}.katex .sqrt .sqrt-line:after{border-bottom-style:solid;border-bottom-width:.04em;content:"";display:block;margin-top:-1px}.katex .sqrt>.root{margin-left:.27777778em;margin-right:-.55555556em}.katex .fontsize-ensurer,.katex .sizing{display:inline-block}.katex .fontsize-ensurer.reset-size1.size1,.katex .sizing.reset-size1.size1{font-size:1em}.katex .fontsize-ensurer.reset-size1.size2,.katex .sizing.reset-size1.size2{font-size:1.4em}.katex .fontsize-ensurer.reset-size1.size3,.katex .sizing.reset-size1.size3{font-size:1.6em}.katex .fontsize-ensurer.reset-size1.size4,.katex .sizing.reset-size1.size4{font-size:1.8em}.katex .fontsize-ensurer.reset-size1.size5,.katex .sizing.reset-size1.size5{font-size:2em}.katex .fontsize-ensurer.reset-size1.size6,.katex .sizing.reset-size1.size6{font-size:2.4em}.katex .fontsize-ensurer.reset-size1.size7,.katex .sizing.reset-size1.size7{font-size:2.88em}.katex .fontsize-ensurer.reset-size1.size8,.katex .sizing.reset-size1.size8{font-size:3.46em}.katex .fontsize-ensurer.reset-size1.size9,.katex .sizing.reset-size1.size9{font-size:4.14em}.katex .fontsize-ensurer.reset-size1.size10,.katex .sizing.reset-size1.size10{font-size:4.98em}.katex .fontsize-ensurer.reset-size2.size1,.katex .sizing.reset-size2.size1{font-size:.71428571em}.katex .fontsize-ensurer.reset-size2.size2,.katex .sizing.reset-size2.size2{font-size:1em}.katex .fontsize-ensurer.reset-size2.size3,.katex .sizing.reset-size2.size3{font-size:1.14285714em}.katex .fontsize-ensurer.reset-size2.size4,.katex .sizing.reset-size2.size4{font-size:1.28571429em}.katex .fontsize-ensurer.reset-size2.size5,.katex .sizing.reset-size2.size5{font-size:1.42857143em}.katex .fontsize-ensurer.reset-size2.size6,.katex .sizing.reset-size2.size6{font-size:1.71428571em}.katex .fontsize-ensurer.reset-size2.size7,.katex .sizing.reset-size2.size7{font-size:2.05714286em}.katex .fontsize-ensurer.reset-size2.size8,.katex .sizing.reset-size2.size8{font-size:2.47142857em}.katex .fontsize-ensurer.reset-size2.size9,.katex .sizing.reset-size2.size9{font-size:2.95714286em}.katex .fontsize-ensurer.reset-size2.size10,.katex .sizing.reset-size2.size10{font-size:3.55714286em}.katex .fontsize-ensurer.reset-size3.size1,.katex .sizing.reset-size3.size1{font-size:.625em}.katex .fontsize-ensurer.reset-size3.size2,.katex .sizing.reset-size3.size2{font-size:.875em}.katex .fontsize-ensurer.reset-size3.size3,.katex .sizing.reset-size3.size3{font-size:1em}.katex .fontsize-ensurer.reset-size3.size4,.katex .sizing.reset-size3.size4{font-size:1.125em}.katex .fontsize-ensurer.reset-size3.size5,.katex .sizing.reset-size3.size5{font-size:1.25em}.katex .fontsize-ensurer.reset-size3.size6,.katex .sizing.reset-size3.size6{font-size:1.5em}.katex .fontsize-ensurer.reset-size3.size7,.katex .sizing.reset-size3.size7{font-size:1.8em}.katex .fontsize-ensurer.reset-size3.size8,.katex .sizing.reset-size3.size8{font-size:2.1625em}.katex .fontsize-ensurer.reset-size3.size9,.katex .sizing.reset-size3.size9{font-size:2.5875em}.katex .fontsize-ensurer.reset-size3.size10,.katex .sizing.reset-size3.size10{font-size:3.1125em}.katex .fontsize-ensurer.reset-size4.size1,.katex .sizing.reset-size4.size1{font-size:.55555556em}.katex .fontsize-ensurer.reset-size4.size2,.katex .sizing.reset-size4.size2{font-size:.77777778em}.katex .fontsize-ensurer.reset-size4.size3,.katex .sizing.reset-size4.size3{font-size:.88888889em}.katex .fontsize-ensurer.reset-size4.size4,.katex .sizing.reset-size4.size4{font-size:1em}.katex .fontsize-ensurer.reset-size4.size5,.katex .sizing.reset-size4.size5{font-size:1.11111111em}.katex .fontsize-ensurer.reset-size4.size6,.katex .sizing.reset-size4.size6{font-size:1.33333333em}.katex .fontsize-ensurer.reset-size4.size7,.katex .sizing.reset-size4.size7{font-size:1.6em}.katex .fontsize-ensurer.reset-size4.size8,.katex .sizing.reset-size4.size8{font-size:1.92222222em}.katex .fontsize-ensurer.reset-size4.size9,.katex .sizing.reset-size4.size9{font-size:2.3em}.katex .fontsize-ensurer.reset-size4.size10,.katex .sizing.reset-size4.size10{font-size:2.76666667em}.katex .fontsize-ensurer.reset-size5.size1,.katex .sizing.reset-size5.size1{font-size:.5em}.katex .fontsize-ensurer.reset-size5.size2,.katex .sizing.reset-size5.size2{font-size:.7em}.katex .fontsize-ensurer.reset-size5.size3,.katex .sizing.reset-size5.size3{font-size:.8em}.katex .fontsize-ensurer.reset-size5.size4,.katex .sizing.reset-size5.size4{font-size:.9em}.katex .fontsize-ensurer.reset-size5.size5,.katex .sizing.reset-size5.size5{font-size:1em}.katex .fontsize-ensurer.reset-size5.size6,.katex .sizing.reset-size5.size6{font-size:1.2em}.katex .fontsize-ensurer.reset-size5.size7,.katex .sizing.reset-size5.size7{font-size:1.44em}.katex .fontsize-ensurer.reset-size5.size8,.katex .sizing.reset-size5.size8{font-size:1.73em}.katex .fontsize-ensurer.reset-size5.size9,.katex .sizing.reset-size5.size9{font-size:2.07em}.katex .fontsize-ensurer.reset-size5.size10,.katex .sizing.reset-size5.size10{font-size:2.49em}.katex .fontsize-ensurer.reset-size6.size1,.katex .sizing.reset-size6.size1{font-size:.41666667em}.katex .fontsize-ensurer.reset-size6.size2,.katex .sizing.reset-size6.size2{font-size:.58333333em}.katex .fontsize-ensurer.reset-size6.size3,.katex .sizing.reset-size6.size3{font-size:.66666667em}.katex .fontsize-ensurer.reset-size6.size4,.katex .sizing.reset-size6.size4{font-size:.75em}.katex .fontsize-ensurer.reset-size6.size5,.katex .sizing.reset-size6.size5{font-size:.83333333em}.katex .fontsize-ensurer.reset-size6.size6,.katex .sizing.reset-size6.size6{font-size:1em}.katex .fontsize-ensurer.reset-size6.size7,.katex .sizing.reset-size6.size7{font-size:1.2em}.katex .fontsize-ensurer.reset-size6.size8,.katex .sizing.reset-size6.size8{font-size:1.44166667em}.katex .fontsize-ensurer.reset-size6.size9,.katex .sizing.reset-size6.size9{font-size:1.725em}.katex .fontsize-ensurer.reset-size6.size10,.katex .sizing.reset-size6.size10{font-size:2.075em}.katex .fontsize-ensurer.reset-size7.size1,.katex .sizing.reset-size7.size1{font-size:.34722222em}.katex .fontsize-ensurer.reset-size7.size2,.katex .sizing.reset-size7.size2{font-size:.48611111em}.katex .fontsize-ensurer.reset-size7.size3,.katex .sizing.reset-size7.size3{font-size:.55555556em}.katex .fontsize-ensurer.reset-size7.size4,.katex .sizing.reset-size7.size4{font-size:.625em}.katex .fontsize-ensurer.reset-size7.size5,.katex .sizing.reset-size7.size5{font-size:.69444444em}.katex .fontsize-ensurer.reset-size7.size6,.katex .sizing.reset-size7.size6{font-size:.83333333em}.katex .fontsize-ensurer.reset-size7.size7,.katex .sizing.reset-size7.size7{font-size:1em}.katex .fontsize-ensurer.reset-size7.size8,.katex .sizing.reset-size7.size8{font-size:1.20138889em}.katex .fontsize-ensurer.reset-size7.size9,.katex .sizing.reset-size7.size9{font-size:1.4375em}.katex .fontsize-ensurer.reset-size7.size10,.katex .sizing.reset-size7.size10{font-size:1.72916667em}.katex .fontsize-ensurer.reset-size8.size1,.katex .sizing.reset-size8.size1{font-size:.28901734em}.katex .fontsize-ensurer.reset-size8.size2,.katex .sizing.reset-size8.size2{font-size:.40462428em}.katex .fontsize-ensurer.reset-size8.size3,.katex .sizing.reset-size8.size3{font-size:.46242775em}.katex .fontsize-ensurer.reset-size8.size4,.katex .sizing.reset-size8.size4{font-size:.52023121em}.katex .fontsize-ensurer.reset-size8.size5,.katex .sizing.reset-size8.size5{font-size:.57803468em}.katex .fontsize-ensurer.reset-size8.size6,.katex .sizing.reset-size8.size6{font-size:.69364162em}.katex .fontsize-ensurer.reset-size8.size7,.katex .sizing.reset-size8.size7{font-size:.83236994em}.katex .fontsize-ensurer.reset-size8.size8,.katex .sizing.reset-size8.size8{font-size:1em}.katex .fontsize-ensurer.reset-size8.size9,.katex .sizing.reset-size8.size9{font-size:1.19653179em}.katex .fontsize-ensurer.reset-size8.size10,.katex .sizing.reset-size8.size10{font-size:1.43930636em}.katex .fontsize-ensurer.reset-size9.size1,.katex .sizing.reset-size9.size1{font-size:.24154589em}.katex .fontsize-ensurer.reset-size9.size2,.katex .sizing.reset-size9.size2{font-size:.33816425em}.katex .fontsize-ensurer.reset-size9.size3,.katex .sizing.reset-size9.size3{font-size:.38647343em}.katex .fontsize-ensurer.reset-size9.size4,.katex .sizing.reset-size9.size4{font-size:.43478261em}.katex .fontsize-ensurer.reset-size9.size5,.katex .sizing.reset-size9.size5{font-size:.48309179em}.katex .fontsize-ensurer.reset-size9.size6,.katex .sizing.reset-size9.size6{font-size:.57971014em}.katex .fontsize-ensurer.reset-size9.size7,.katex .sizing.reset-size9.size7{font-size:.69565217em}.katex .fontsize-ensurer.reset-size9.size8,.katex .sizing.reset-size9.size8{font-size:.83574879em}.katex .fontsize-ensurer.reset-size9.size9,.katex .sizing.reset-size9.size9{font-size:1em}.katex .fontsize-ensurer.reset-size9.size10,.katex .sizing.reset-size9.size10{font-size:1.20289855em}.katex .fontsize-ensurer.reset-size10.size1,.katex .sizing.reset-size10.size1{font-size:.20080321em}.katex .fontsize-ensurer.reset-size10.size2,.katex .sizing.reset-size10.size2{font-size:.2811245em}.katex .fontsize-ensurer.reset-size10.size3,.katex .sizing.reset-size10.size3{font-size:.32128514em}.katex .fontsize-ensurer.reset-size10.size4,.katex .sizing.reset-size10.size4{font-size:.36144578em}.katex .fontsize-ensurer.reset-size10.size5,.katex .sizing.reset-size10.size5{font-size:.40160643em}.katex .fontsize-ensurer.reset-size10.size6,.katex .sizing.reset-size10.size6{font-size:.48192771em}.katex .fontsize-ensurer.reset-size10.size7,.katex .sizing.reset-size10.size7{font-size:.57831325em}.katex .fontsize-ensurer.reset-size10.size8,.katex .sizing.reset-size10.size8{font-size:.69477912em}.katex .fontsize-ensurer.reset-size10.size9,.katex .sizing.reset-size10.size9{font-size:.8313253em}.katex .fontsize-ensurer.reset-size10.size10,.katex .sizing.reset-size10.size10{font-size:1em}.katex .delimsizing.size1{font-family:KaTeX_Size1}.katex .delimsizing.size2{font-family:KaTeX_Size2}.katex .delimsizing.size3{font-family:KaTeX_Size3}.katex .delimsizing.size4{font-family:KaTeX_Size4}.katex .delimsizing.mult .delim-size1>span{font-family:KaTeX_Size1}.katex .delimsizing.mult .delim-size4>span{font-family:KaTeX_Size4}.katex .nulldelimiter{display:inline-block;width:.12em}.katex .op-symbol{position:relative}.katex .op-symbol.small-op{font-family:KaTeX_Size1}.katex .op-symbol.large-op{font-family:KaTeX_Size2}.katex .accent>.vlist>span,.katex .op-limits>.vlist>span{text-align:center}.katex .accent .accent-body>span{width:0}.katex .accent .accent-body.accent-vec>span{position:relative;left:.326em}.katex .mtable .vertical-separator{display:inline-block;margin:0 -.025em;border-right:.05em solid #000}.katex .mtable .arraycolsep{display:inline-block}.katex .mtable .col-align-c>.vlist{text-align:center}.katex .mtable .col-align-l>.vlist{text-align:left}.katex .mtable .col-align-r>.vlist{text-align:right}
\ No newline at end of file
+.katex-display{display:block;margin:1em 0;text-align:center}.katex-display>.katex{display:inline-block;text-align:initial}.katex{font:400 1.21em KaTeX_Main;line-height:1.2;white-space:nowrap;text-indent:0}.katex .katex-html{display:inline-block}.katex .katex-mathml{position:absolute;clip:rect(1px,1px,1px,1px);padding:0;border:0;height:1px;width:1px;overflow:hidden}.katex .base,.katex .strut{display:inline-block}.katex .mathit{font-family:KaTeX_Math;font-style:italic}.katex .mathbf{font-family:KaTeX_Main;font-weight:700}.katex .amsrm,.katex .mathbb{font-family:KaTeX_AMS}.katex .mathcal{font-family:KaTeX_Caligraphic}.katex .mathfrak{font-family:KaTeX_Fraktur}.katex .mathtt{font-family:KaTeX_Typewriter}.katex .mathscr{font-family:KaTeX_Script}.katex .mathsf{font-family:KaTeX_SansSerif}.katex .mainit{font-family:KaTeX_Main;font-style:italic}.katex .textstyle>.mord+.mop{margin-left:.16667em}.katex .textstyle>.mord+.mbin{margin-left:.22222em}.katex .textstyle>.mord+.mrel{margin-left:.27778em}.katex .textstyle>.mop+.mop,.katex .textstyle>.mop+.mord,.katex .textstyle>.mord+.minner{margin-left:.16667em}.katex .textstyle>.mop+.mrel{margin-left:.27778em}.katex .textstyle>.mop+.minner{margin-left:.16667em}.katex .textstyle>.mbin+.minner,.katex .textstyle>.mbin+.mop,.katex .textstyle>.mbin+.mopen,.katex .textstyle>.mbin+.mord{margin-left:.22222em}.katex .textstyle>.mrel+.minner,.katex .textstyle>.mrel+.mop,.katex .textstyle>.mrel+.mopen,.katex .textstyle>.mrel+.mord{margin-left:.27778em}.katex .textstyle>.mclose+.mop{margin-left:.16667em}.katex .textstyle>.mclose+.mbin{margin-left:.22222em}.katex .textstyle>.mclose+.mrel{margin-left:.27778em}.katex .textstyle>.mclose+.minner,.katex .textstyle>.minner+.mop,.katex .textstyle>.minner+.mord,.katex .textstyle>.mpunct+.mclose,.katex .textstyle>.mpunct+.minner,.katex .textstyle>.mpunct+.mop,.katex .textstyle>.mpunct+.mopen,.katex .textstyle>.mpunct+.mord,.katex .textstyle>.mpunct+.mpunct,.katex .textstyle>.mpunct+.mrel{margin-left:.16667em}.katex .textstyle>.minner+.mbin{margin-left:.22222em}.katex .textstyle>.minner+.mrel{margin-left:.27778em}.katex .mclose+.mop,.katex .minner+.mop,.katex .mop+.mop,.katex .mop+.mord,.katex .mord+.mop,.katex .textstyle>.minner+.minner,.katex .textstyle>.minner+.mopen,.katex .textstyle>.minner+.mpunct{margin-left:.16667em}.katex .reset-textstyle.textstyle{font-size:1em}.katex .reset-textstyle.scriptstyle{font-size:.7em}.katex .reset-textstyle.scriptscriptstyle{font-size:.5em}.katex .reset-scriptstyle.textstyle{font-size:1.42857em}.katex .reset-scriptstyle.scriptstyle{font-size:1em}.katex .reset-scriptstyle.scriptscriptstyle{font-size:.71429em}.katex .reset-scriptscriptstyle.textstyle{font-size:2em}.katex .reset-scriptscriptstyle.scriptstyle{font-size:1.4em}.katex .reset-scriptscriptstyle.scriptscriptstyle{font-size:1em}.katex .style-wrap{position:relative}.katex .vlist{display:inline-block}.katex .vlist>span{display:block;height:0;position:relative}.katex .vlist>span>span{display:inline-block}.katex .vlist .baseline-fix{display:inline-table;table-layout:fixed}.katex .msupsub{text-align:left}.katex .mfrac>span>span{text-align:center}.katex .mfrac .frac-line{width:100%}.katex .mfrac .frac-line:before{border-bottom-style:solid;border-bottom-width:1px;content:"";display:block}.katex .mfrac .frac-line:after{border-bottom-style:solid;border-bottom-width:.04em;content:"";display:block;margin-top:-1px}.katex .mspace{display:inline-block}.katex .mspace.negativethinspace{margin-left:-.16667em}.katex .mspace.thinspace{width:.16667em}.katex .mspace.mediumspace{width:.22222em}.katex .mspace.thickspace{width:.27778em}.katex .mspace.enspace{width:.5em}.katex .mspace.quad{width:1em}.katex .mspace.qquad{width:2em}.katex .llap,.katex .rlap{width:0;position:relative}.katex .llap>.inner,.katex .rlap>.inner{position:absolute}.katex .llap>.fix,.katex .rlap>.fix{display:inline-block}.katex .llap>.inner{right:0}.katex .rlap>.inner{left:0}.katex .katex-logo .a{font-size:.75em;margin-left:-.32em;position:relative;top:-.2em}.katex .katex-logo .t{margin-left:-.23em}.katex .katex-logo .e{margin-left:-.1667em;position:relative;top:.2155em}.katex .katex-logo .x{margin-left:-.125em}.katex .rule{display:inline-block;border:0 solid;position:relative}.katex .overline .overline-line,.katex .underline .underline-line{width:100%}.katex .overline .overline-line:before,.katex .underline .underline-line:before{border-bottom-style:solid;border-bottom-width:1px;content:"";display:block}.katex .overline .overline-line:after,.katex .underline .underline-line:after{border-bottom-style:solid;border-bottom-width:.04em;content:"";display:block;margin-top:-1px}.katex .sqrt>.sqrt-sign{position:relative}.katex .sqrt .sqrt-line{width:100%}.katex .sqrt .sqrt-line:before{border-bottom-style:solid;border-bottom-width:1px;content:"";display:block}.katex .sqrt .sqrt-line:after{border-bottom-style:solid;border-bottom-width:.04em;content:"";display:block;margin-top:-1px}.katex .sqrt>.root{margin-left:.27777778em;margin-right:-.55555556em}.katex .fontsize-ensurer,.katex .sizing{display:inline-block}.katex .fontsize-ensurer.reset-size1.size1,.katex .sizing.reset-size1.size1{font-size:1em}.katex .fontsize-ensurer.reset-size1.size2,.katex .sizing.reset-size1.size2{font-size:1.4em}.katex .fontsize-ensurer.reset-size1.size3,.katex .sizing.reset-size1.size3{font-size:1.6em}.katex .fontsize-ensurer.reset-size1.size4,.katex .sizing.reset-size1.size4{font-size:1.8em}.katex .fontsize-ensurer.reset-size1.size5,.katex .sizing.reset-size1.size5{font-size:2em}.katex .fontsize-ensurer.reset-size1.size6,.katex .sizing.reset-size1.size6{font-size:2.4em}.katex .fontsize-ensurer.reset-size1.size7,.katex .sizing.reset-size1.size7{font-size:2.88em}.katex .fontsize-ensurer.reset-size1.size8,.katex .sizing.reset-size1.size8{font-size:3.46em}.katex .fontsize-ensurer.reset-size1.size9,.katex .sizing.reset-size1.size9{font-size:4.14em}.katex .fontsize-ensurer.reset-size1.size10,.katex .sizing.reset-size1.size10{font-size:4.98em}.katex .fontsize-ensurer.reset-size2.size1,.katex .sizing.reset-size2.size1{font-size:.71428571em}.katex .fontsize-ensurer.reset-size2.size2,.katex .sizing.reset-size2.size2{font-size:1em}.katex .fontsize-ensurer.reset-size2.size3,.katex .sizing.reset-size2.size3{font-size:1.14285714em}.katex .fontsize-ensurer.reset-size2.size4,.katex .sizing.reset-size2.size4{font-size:1.28571429em}.katex .fontsize-ensurer.reset-size2.size5,.katex .sizing.reset-size2.size5{font-size:1.42857143em}.katex .fontsize-ensurer.reset-size2.size6,.katex .sizing.reset-size2.size6{font-size:1.71428571em}.katex .fontsize-ensurer.reset-size2.size7,.katex .sizing.reset-size2.size7{font-size:2.05714286em}.katex .fontsize-ensurer.reset-size2.size8,.katex .sizing.reset-size2.size8{font-size:2.47142857em}.katex .fontsize-ensurer.reset-size2.size9,.katex .sizing.reset-size2.size9{font-size:2.95714286em}.katex .fontsize-ensurer.reset-size2.size10,.katex .sizing.reset-size2.size10{font-size:3.55714286em}.katex .fontsize-ensurer.reset-size3.size1,.katex .sizing.reset-size3.size1{font-size:.625em}.katex .fontsize-ensurer.reset-size3.size2,.katex .sizing.reset-size3.size2{font-size:.875em}.katex .fontsize-ensurer.reset-size3.size3,.katex .sizing.reset-size3.size3{font-size:1em}.katex .fontsize-ensurer.reset-size3.size4,.katex .sizing.reset-size3.size4{font-size:1.125em}.katex .fontsize-ensurer.reset-size3.size5,.katex .sizing.reset-size3.size5{font-size:1.25em}.katex .fontsize-ensurer.reset-size3.size6,.katex .sizing.reset-size3.size6{font-size:1.5em}.katex .fontsize-ensurer.reset-size3.size7,.katex .sizing.reset-size3.size7{font-size:1.8em}.katex .fontsize-ensurer.reset-size3.size8,.katex .sizing.reset-size3.size8{font-size:2.1625em}.katex .fontsize-ensurer.reset-size3.size9,.katex .sizing.reset-size3.size9{font-size:2.5875em}.katex .fontsize-ensurer.reset-size3.size10,.katex .sizing.reset-size3.size10{font-size:3.1125em}.katex .fontsize-ensurer.reset-size4.size1,.katex .sizing.reset-size4.size1{font-size:.55555556em}.katex .fontsize-ensurer.reset-size4.size2,.katex .sizing.reset-size4.size2{font-size:.77777778em}.katex .fontsize-ensurer.reset-size4.size3,.katex .sizing.reset-size4.size3{font-size:.88888889em}.katex .fontsize-ensurer.reset-size4.size4,.katex .sizing.reset-size4.size4{font-size:1em}.katex .fontsize-ensurer.reset-size4.size5,.katex .sizing.reset-size4.size5{font-size:1.11111111em}.katex .fontsize-ensurer.reset-size4.size6,.katex .sizing.reset-size4.size6{font-size:1.33333333em}.katex .fontsize-ensurer.reset-size4.size7,.katex .sizing.reset-size4.size7{font-size:1.6em}.katex .fontsize-ensurer.reset-size4.size8,.katex .sizing.reset-size4.size8{font-size:1.92222222em}.katex .fontsize-ensurer.reset-size4.size9,.katex .sizing.reset-size4.size9{font-size:2.3em}.katex .fontsize-ensurer.reset-size4.size10,.katex .sizing.reset-size4.size10{font-size:2.76666667em}.katex .fontsize-ensurer.reset-size5.size1,.katex .sizing.reset-size5.size1{font-size:.5em}.katex .fontsize-ensurer.reset-size5.size2,.katex .sizing.reset-size5.size2{font-size:.7em}.katex .fontsize-ensurer.reset-size5.size3,.katex .sizing.reset-size5.size3{font-size:.8em}.katex .fontsize-ensurer.reset-size5.size4,.katex .sizing.reset-size5.size4{font-size:.9em}.katex .fontsize-ensurer.reset-size5.size5,.katex .sizing.reset-size5.size5{font-size:1em}.katex .fontsize-ensurer.reset-size5.size6,.katex .sizing.reset-size5.size6{font-size:1.2em}.katex .fontsize-ensurer.reset-size5.size7,.katex .sizing.reset-size5.size7{font-size:1.44em}.katex .fontsize-ensurer.reset-size5.size8,.katex .sizing.reset-size5.size8{font-size:1.73em}.katex .fontsize-ensurer.reset-size5.size9,.katex .sizing.reset-size5.size9{font-size:2.07em}.katex .fontsize-ensurer.reset-size5.size10,.katex .sizing.reset-size5.size10{font-size:2.49em}.katex .fontsize-ensurer.reset-size6.size1,.katex .sizing.reset-size6.size1{font-size:.41666667em}.katex .fontsize-ensurer.reset-size6.size2,.katex .sizing.reset-size6.size2{font-size:.58333333em}.katex .fontsize-ensurer.reset-size6.size3,.katex .sizing.reset-size6.size3{font-size:.66666667em}.katex .fontsize-ensurer.reset-size6.size4,.katex .sizing.reset-size6.size4{font-size:.75em}.katex .fontsize-ensurer.reset-size6.size5,.katex .sizing.reset-size6.size5{font-size:.83333333em}.katex .fontsize-ensurer.reset-size6.size6,.katex .sizing.reset-size6.size6{font-size:1em}.katex .fontsize-ensurer.reset-size6.size7,.katex .sizing.reset-size6.size7{font-size:1.2em}.katex .fontsize-ensurer.reset-size6.size8,.katex .sizing.reset-size6.size8{font-size:1.44166667em}.katex .fontsize-ensurer.reset-size6.size9,.katex .sizing.reset-size6.size9{font-size:1.725em}.katex .fontsize-ensurer.reset-size6.size10,.katex .sizing.reset-size6.size10{font-size:2.075em}.katex .fontsize-ensurer.reset-size7.size1,.katex .sizing.reset-size7.size1{font-size:.34722222em}.katex .fontsize-ensurer.reset-size7.size2,.katex .sizing.reset-size7.size2{font-size:.48611111em}.katex .fontsize-ensurer.reset-size7.size3,.katex .sizing.reset-size7.size3{font-size:.55555556em}.katex .fontsize-ensurer.reset-size7.size4,.katex .sizing.reset-size7.size4{font-size:.625em}.katex .fontsize-ensurer.reset-size7.size5,.katex .sizing.reset-size7.size5{font-size:.69444444em}.katex .fontsize-ensurer.reset-size7.size6,.katex .sizing.reset-size7.size6{font-size:.83333333em}.katex .fontsize-ensurer.reset-size7.size7,.katex .sizing.reset-size7.size7{font-size:1em}.katex .fontsize-ensurer.reset-size7.size8,.katex .sizing.reset-size7.size8{font-size:1.20138889em}.katex .fontsize-ensurer.reset-size7.size9,.katex .sizing.reset-size7.size9{font-size:1.4375em}.katex .fontsize-ensurer.reset-size7.size10,.katex .sizing.reset-size7.size10{font-size:1.72916667em}.katex .fontsize-ensurer.reset-size8.size1,.katex .sizing.reset-size8.size1{font-size:.28901734em}.katex .fontsize-ensurer.reset-size8.size2,.katex .sizing.reset-size8.size2{font-size:.40462428em}.katex .fontsize-ensurer.reset-size8.size3,.katex .sizing.reset-size8.size3{font-size:.46242775em}.katex .fontsize-ensurer.reset-size8.size4,.katex .sizing.reset-size8.size4{font-size:.52023121em}.katex .fontsize-ensurer.reset-size8.size5,.katex .sizing.reset-size8.size5{font-size:.57803468em}.katex .fontsize-ensurer.reset-size8.size6,.katex .sizing.reset-size8.size6{font-size:.69364162em}.katex .fontsize-ensurer.reset-size8.size7,.katex .sizing.reset-size8.size7{font-size:.83236994em}.katex .fontsize-ensurer.reset-size8.size8,.katex .sizing.reset-size8.size8{font-size:1em}.katex .fontsize-ensurer.reset-size8.size9,.katex .sizing.reset-size8.size9{font-size:1.19653179em}.katex .fontsize-ensurer.reset-size8.size10,.katex .sizing.reset-size8.size10{font-size:1.43930636em}.katex .fontsize-ensurer.reset-size9.size1,.katex .sizing.reset-size9.size1{font-size:.24154589em}.katex .fontsize-ensurer.reset-size9.size2,.katex .sizing.reset-size9.size2{font-size:.33816425em}.katex .fontsize-ensurer.reset-size9.size3,.katex .sizing.reset-size9.size3{font-size:.38647343em}.katex .fontsize-ensurer.reset-size9.size4,.katex .sizing.reset-size9.size4{font-size:.43478261em}.katex .fontsize-ensurer.reset-size9.size5,.katex .sizing.reset-size9.size5{font-size:.48309179em}.katex .fontsize-ensurer.reset-size9.size6,.katex .sizing.reset-size9.size6{font-size:.57971014em}.katex .fontsize-ensurer.reset-size9.size7,.katex .sizing.reset-size9.size7{font-size:.69565217em}.katex .fontsize-ensurer.reset-size9.size8,.katex .sizing.reset-size9.size8{font-size:.83574879em}.katex .fontsize-ensurer.reset-size9.size9,.katex .sizing.reset-size9.size9{font-size:1em}.katex .fontsize-ensurer.reset-size9.size10,.katex .sizing.reset-size9.size10{font-size:1.20289855em}.katex .fontsize-ensurer.reset-size10.size1,.katex .sizing.reset-size10.size1{font-size:.20080321em}.katex .fontsize-ensurer.reset-size10.size2,.katex .sizing.reset-size10.size2{font-size:.2811245em}.katex .fontsize-ensurer.reset-size10.size3,.katex .sizing.reset-size10.size3{font-size:.32128514em}.katex .fontsize-ensurer.reset-size10.size4,.katex .sizing.reset-size10.size4{font-size:.36144578em}.katex .fontsize-ensurer.reset-size10.size5,.katex .sizing.reset-size10.size5{font-size:.40160643em}.katex .fontsize-ensurer.reset-size10.size6,.katex .sizing.reset-size10.size6{font-size:.48192771em}.katex .fontsize-ensurer.reset-size10.size7,.katex .sizing.reset-size10.size7{font-size:.57831325em}.katex .fontsize-ensurer.reset-size10.size8,.katex .sizing.reset-size10.size8{font-size:.69477912em}.katex .fontsize-ensurer.reset-size10.size9,.katex .sizing.reset-size10.size9{font-size:.8313253em}.katex .fontsize-ensurer.reset-size10.size10,.katex .sizing.reset-size10.size10{font-size:1em}.katex .delimsizing.size1{font-family:KaTeX_Size1}.katex .delimsizing.size2{font-family:KaTeX_Size2}.katex .delimsizing.size3{font-family:KaTeX_Size3}.katex .delimsizing.size4{font-family:KaTeX_Size4}.katex .delimsizing.mult .delim-size1>span{font-family:KaTeX_Size1}.katex .delimsizing.mult .delim-size4>span{font-family:KaTeX_Size4}.katex .nulldelimiter{display:inline-block;width:.12em}.katex .op-symbol{position:relative}.katex .op-symbol.small-op{font-family:KaTeX_Size1}.katex .op-symbol.large-op{font-family:KaTeX_Size2}.katex .accent>.vlist>span,.katex .op-limits>.vlist>span{text-align:center}.katex .accent .accent-body>span{width:0}.katex .accent .accent-body.accent-vec>span{position:relative;left:.326em}.katex .mtable .vertical-separator{display:inline-block;margin:0 -.025em;border-right:.05em solid #000}.katex .mtable .arraycolsep{display:inline-block}.katex .mtable .col-align-c>.vlist{text-align:center}.katex .mtable .col-align-l>.vlist{text-align:left}.katex .mtable .col-align-r>.vlist{text-align:right}
\ No newline at end of file
diff --git a/plugins/tiddlywiki/katex/files/tiddlywiki.files b/plugins/tiddlywiki/katex/files/tiddlywiki.files
index 1924dbd09..6af3ec967 100644
--- a/plugins/tiddlywiki/katex/files/tiddlywiki.files
+++ b/plugins/tiddlywiki/katex/files/tiddlywiki.files
@@ -1,126 +1,17 @@
 {
+	"directories": [
+		{
+			"path": "./fonts/",
+			"filesRegExp": "^.*\\.woff$",
+			"isTiddlerFile": false,
+			"fields": {
+				"title": {"source": "filename", "prefix": "$:/plugins/tiddlywiki/katex/fonts/"},
+				"type": "application/font-woff"
+			}
+		}
+	],
 	"tiddlers": [
 		{
-			"file": "fonts/KaTeX_AMS-Regular.woff",
-			"fields": {
-				"type": "application/font-woff",
-				"title": "$:/plugins/tiddlywiki/katex/fonts/KaTeX_AMS-Regular.woff"
-			}
-		},{
-			"file": "fonts/KaTeX_Caligraphic-Bold.woff",
-			"fields": {
-				"type": "application/font-woff",
-				"title": "$:/plugins/tiddlywiki/katex/fonts/KaTeX_Caligraphic-Bold.woff"
-			}
-		},{
-			"file": "fonts/KaTeX_Caligraphic-Regular.woff",
-			"fields": {
-				"type": "application/font-woff",
-				"title": "$:/plugins/tiddlywiki/katex/fonts/KaTeX_Caligraphic-Regular.woff"
-			}
-		},{
-			"file": "fonts/KaTeX_Fraktur-Bold.woff",
-			"fields": {
-				"type": "application/font-woff",
-				"title": "$:/plugins/tiddlywiki/katex/fonts/KaTeX_Fraktur-Bold.woff"
-			}
-		},{
-			"file": "fonts/KaTeX_Fraktur-Regular.woff",
-			"fields": {
-				"type": "application/font-woff",
-				"title": "$:/plugins/tiddlywiki/katex/fonts/KaTeX_Fraktur-Regular.woff"
-			}
-		},{
-			"file": "fonts/KaTeX_Main-Bold.woff",
-			"fields": {
-				"type": "application/font-woff",
-				"title": "$:/plugins/tiddlywiki/katex/fonts/KaTeX_Main-Bold.woff"
-			}
-		},{
-			"file": "fonts/KaTeX_Main-Italic.woff",
-			"fields": {
-				"type": "application/font-woff",
-				"title": "$:/plugins/tiddlywiki/katex/fonts/KaTeX_Main-Italic.woff"
-			}
-		},{
-			"file": "fonts/KaTeX_Main-Regular.woff",
-			"fields": {
-				"type": "application/font-woff",
-				"title": "$:/plugins/tiddlywiki/katex/fonts/KaTeX_Main-Regular.woff"
-			}
-		},{
-			"file": "fonts/KaTeX_Math-BoldItalic.woff",
-			"fields": {
-				"type": "application/font-woff",
-				"title": "$:/plugins/tiddlywiki/katex/fonts/KaTeX_Math-BoldItalic.woff"
-			}
-		},{
-			"file": "fonts/KaTeX_Math-Italic.woff",
-			"fields": {
-				"type": "application/font-woff",
-				"title": "$:/plugins/tiddlywiki/katex/fonts/KaTeX_Math-Italic.woff"
-			}
-		},{
-			"file": "fonts/KaTeX_Math-Regular.woff",
-			"fields": {
-				"type": "application/font-woff",
-				"title": "$:/plugins/tiddlywiki/katex/fonts/KaTeX_Math-Regular.woff"
-			}
-		},{
-			"file": "fonts/KaTeX_SansSerif-Bold.woff",
-			"fields": {
-				"type": "application/font-woff",
-				"title": "$:/plugins/tiddlywiki/katex/fonts/KaTeX_SansSerif-Bold.woff"
-			}
-		},{
-			"file": "fonts/KaTeX_SansSerif-Italic.woff",
-			"fields": {
-				"type": "application/font-woff",
-				"title": "$:/plugins/tiddlywiki/katex/fonts/KaTeX_SansSerif-Italic.woff"
-			}
-		},{
-			"file": "fonts/KaTeX_SansSerif-Regular.woff",
-			"fields": {
-				"type": "application/font-woff",
-				"title": "$:/plugins/tiddlywiki/katex/fonts/KaTeX_SansSerif-Regular.woff"
-			}
-		},{
-			"file": "fonts/KaTeX_Script-Regular.woff",
-			"fields": {
-				"type": "application/font-woff",
-				"title": "$:/plugins/tiddlywiki/katex/fonts/KaTeX_Script-Regular.woff"
-			}
-		},{
-			"file": "fonts/KaTeX_Size1-Regular.woff",
-			"fields": {
-				"type": "application/font-woff",
-				"title": "$:/plugins/tiddlywiki/katex/fonts/KaTeX_Size1-Regular.woff"
-			}
-		},{
-			"file": "fonts/KaTeX_Size2-Regular.woff",
-			"fields": {
-				"type": "application/font-woff",
-				"title": "$:/plugins/tiddlywiki/katex/fonts/KaTeX_Size2-Regular.woff"
-			}
-		},{
-			"file": "fonts/KaTeX_Size3-Regular.woff",
-			"fields": {
-				"type": "application/font-woff",
-				"title": "$:/plugins/tiddlywiki/katex/fonts/KaTeX_Size3-Regular.woff"
-			}
-		},{
-			"file": "fonts/KaTeX_Size4-Regular.woff",
-			"fields": {
-				"type": "application/font-woff",
-				"title": "$:/plugins/tiddlywiki/katex/fonts/KaTeX_Size4-Regular.woff"
-			}
-		},{
-			"file": "fonts/KaTeX_Typewriter-Regular.woff",
-			"fields": {
-				"type": "application/font-woff",
-				"title": "$:/plugins/tiddlywiki/katex/fonts/KaTeX_Typewriter-Regular.woff"
-			}
-		},{
 			"file": "katex.without-font-face.min.css",
 			"fields": {
 				"type": "text/plain",
diff --git a/plugins/tiddlywiki/katex/readme.tid b/plugins/tiddlywiki/katex/readme.tid
index 23091ba78..18a9e6714 100644
--- a/plugins/tiddlywiki/katex/readme.tid
+++ b/plugins/tiddlywiki/katex/readme.tid
@@ -4,6 +4,6 @@ This is a TiddlyWiki plugin for mathematical typesetting based on [[KaTeX from K
 
 It is completely self-contained, and doesn't need an Internet connection in order to work. It works both in the browser and under Node.js.
 
-It is currently based on KaTeX version 0.4.3. See https://github.com/Khan/KaTeX/releases for details of releases.
+It is currently based on KaTeX version 0.6.0. See https://github.com/Khan/KaTeX/releases for details of releases.
 
 [[Source code|https://github.com/Jermolene/TiddlyWiki5/blob/master/plugins/tiddlywiki/katex]]
diff --git a/plugins/tiddlywiki/katex/styles.tid b/plugins/tiddlywiki/katex/styles.tid
index b1a2180a2..2550aa1de 100644
--- a/plugins/tiddlywiki/katex/styles.tid
+++ b/plugins/tiddlywiki/katex/styles.tid
@@ -7,6 +7,12 @@ tags: [[$:/tags/Stylesheet]]
 
 {{$:/plugins/tiddlywiki/katex/katex.min.css}}
 
+/* Force text-rendering  (see https://github.com/Jermolene/TiddlyWiki5/issues/2500) */
+
+.katex {
+    text-rendering: auto;
+}
+
 /* Override font URLs */
 
 @font-face {
diff --git a/plugins/tiddlywiki/markdown/EditorToolbar/bold.tid b/plugins/tiddlywiki/markdown/EditorToolbar/bold.tid
new file mode 100755
index 000000000..74cb4c596
--- /dev/null
+++ b/plugins/tiddlywiki/markdown/EditorToolbar/bold.tid
@@ -0,0 +1,15 @@
+title: $:/plugins/tiddlywiki/markdown/EditorToolbar/bold
+list-after: $:/core/ui/EditorToolbar/bold
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/bold
+caption: {{$:/language/Buttons/Bold/Caption}} (Markdown)
+description: {{$:/language/Buttons/Bold/Hint}}
+condition: [<targetTiddler>type[text/x-markdown]]
+shortcuts: ((bold))
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="wrap-selection"
+	prefix="**"
+	suffix="**"
+/>
diff --git a/plugins/tiddlywiki/markdown/EditorToolbar/heading-1.tid b/plugins/tiddlywiki/markdown/EditorToolbar/heading-1.tid
new file mode 100755
index 000000000..c51bfaccc
--- /dev/null
+++ b/plugins/tiddlywiki/markdown/EditorToolbar/heading-1.tid
@@ -0,0 +1,15 @@
+title: $:/plugins/tiddlywiki/markdown/EditorToolbar/heading-1
+list-after: $:/core/ui/EditorToolbar/heading-1
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/heading-1
+caption: {{$:/language/Buttons/Heading1/Caption}} (Markdown)
+description: {{$:/language/Buttons/Heading1/Hint}}
+condition: [<targetTiddler>type[text/x-markdown]]
+shortcuts: ((heading-1))
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="prefix-lines"
+	character="#"
+	count="1"
+/>
diff --git a/plugins/tiddlywiki/markdown/EditorToolbar/heading-2.tid b/plugins/tiddlywiki/markdown/EditorToolbar/heading-2.tid
new file mode 100755
index 000000000..8a5a86a1c
--- /dev/null
+++ b/plugins/tiddlywiki/markdown/EditorToolbar/heading-2.tid
@@ -0,0 +1,15 @@
+title: $:/plugins/tiddlywiki/markdown/EditorToolbar/heading-2
+list-after: $:/core/ui/EditorToolbar/heading-2
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/heading-2
+caption: {{$:/language/Buttons/Heading2/Caption}} (Markdown)
+description: {{$:/language/Buttons/Heading2/Hint}}
+condition: [<targetTiddler>type[text/x-markdown]]
+shortcuts: ((heading-2))
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="prefix-lines"
+	character="#"
+	count="2"
+/>
diff --git a/plugins/tiddlywiki/markdown/EditorToolbar/heading-3.tid b/plugins/tiddlywiki/markdown/EditorToolbar/heading-3.tid
new file mode 100755
index 000000000..2c1c24034
--- /dev/null
+++ b/plugins/tiddlywiki/markdown/EditorToolbar/heading-3.tid
@@ -0,0 +1,15 @@
+title: $:/plugins/tiddlywiki/markdown/EditorToolbar/heading-3
+list-after: $:/core/ui/EditorToolbar/heading-3
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/heading-3
+caption: {{$:/language/Buttons/Heading3/Caption}} (Markdown)
+description: {{$:/language/Buttons/Heading3/Hint}}
+condition: [<targetTiddler>type[text/x-markdown]]
+shortcuts: ((heading-3))
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="prefix-lines"
+	character="#"
+	count="3"
+/>
diff --git a/plugins/tiddlywiki/markdown/EditorToolbar/heading-4.tid b/plugins/tiddlywiki/markdown/EditorToolbar/heading-4.tid
new file mode 100755
index 000000000..2df2d78f5
--- /dev/null
+++ b/plugins/tiddlywiki/markdown/EditorToolbar/heading-4.tid
@@ -0,0 +1,15 @@
+title: $:/plugins/tiddlywiki/markdown/EditorToolbar/heading-4
+list-after: $:/core/ui/EditorToolbar/heading-4
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/heading-4
+caption: {{$:/language/Buttons/Heading4/Caption}} (Markdown)
+description: {{$:/language/Buttons/Heading4/Hint}}
+condition: [<targetTiddler>type[text/x-markdown]]
+shortcuts: ((heading-4))
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="prefix-lines"
+	character="#"
+	count="4"
+/>
diff --git a/plugins/tiddlywiki/markdown/EditorToolbar/heading-5.tid b/plugins/tiddlywiki/markdown/EditorToolbar/heading-5.tid
new file mode 100755
index 000000000..e1f9447fe
--- /dev/null
+++ b/plugins/tiddlywiki/markdown/EditorToolbar/heading-5.tid
@@ -0,0 +1,15 @@
+title: $:/plugins/tiddlywiki/markdown/EditorToolbar/heading-5
+list-after: $:/core/ui/EditorToolbar/heading-5
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/heading-5
+caption: {{$:/language/Buttons/Heading5/Caption}} (Markdown)
+description: {{$:/language/Buttons/Heading5/Hint}}
+condition: [<targetTiddler>type[text/x-markdown]]
+shortcuts: ((heading-5))
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="prefix-lines"
+	character="#"
+	count="5"
+/>
diff --git a/plugins/tiddlywiki/markdown/EditorToolbar/heading-6.tid b/plugins/tiddlywiki/markdown/EditorToolbar/heading-6.tid
new file mode 100755
index 000000000..34e598066
--- /dev/null
+++ b/plugins/tiddlywiki/markdown/EditorToolbar/heading-6.tid
@@ -0,0 +1,15 @@
+title: $:/plugins/tiddlywiki/markdown/EditorToolbar/heading-6
+list-after: $:/core/ui/EditorToolbar/heading-6
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/heading-6
+caption: {{$:/language/Buttons/Heading6/Caption}} (Markdown)
+description: {{$:/language/Buttons/Heading6/Hint}}
+condition: [<targetTiddler>type[text/x-markdown]]
+shortcuts: ((heading-6))
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="prefix-lines"
+	character="#"
+	count="6"
+/>
diff --git a/plugins/tiddlywiki/markdown/EditorToolbar/italic.tid b/plugins/tiddlywiki/markdown/EditorToolbar/italic.tid
new file mode 100755
index 000000000..921898770
--- /dev/null
+++ b/plugins/tiddlywiki/markdown/EditorToolbar/italic.tid
@@ -0,0 +1,15 @@
+title: $:/plugins/tiddlywiki/markdown/EditorToolbar/italic
+list-after: $:/core/ui/EditorToolbar/italic
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/italic
+caption: {{$:/language/Buttons/Italic/Caption}} (Markdown)
+description: {{$:/language/Buttons/Italic/Hint}}
+condition: [<targetTiddler>type[text/x-markdown]]
+shortcuts: ((italic))
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="wrap-selection"
+	prefix="*"
+	suffix="*"
+/>
diff --git a/plugins/tiddlywiki/markdown/EditorToolbar/list-bullet.tid b/plugins/tiddlywiki/markdown/EditorToolbar/list-bullet.tid
new file mode 100755
index 000000000..166637d03
--- /dev/null
+++ b/plugins/tiddlywiki/markdown/EditorToolbar/list-bullet.tid
@@ -0,0 +1,15 @@
+title: $:/plugins/tiddlywiki/markdown/EditorToolbar/list-bullet
+list-after: $:/core/ui/EditorToolbar/list-bullet
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/list-bullet
+caption: {{$:/language/Buttons/ListBullet/Caption}} (Markdown)
+description: {{$:/language/Buttons/ListBullet/Hint}}
+condition: [<targetTiddler>type[text/x-markdown]]
+shortcuts: ((list-bullet))
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="prefix-lines"
+	character="*"
+	count="1"
+/>
diff --git a/plugins/tiddlywiki/markdown/EditorToolbar/list-number.tid b/plugins/tiddlywiki/markdown/EditorToolbar/list-number.tid
new file mode 100755
index 000000000..ce185b42f
--- /dev/null
+++ b/plugins/tiddlywiki/markdown/EditorToolbar/list-number.tid
@@ -0,0 +1,15 @@
+title: $:/plugins/tiddlywiki/markdown/EditorToolbar/list-number
+list-after: $:/core/ui/EditorToolbar/list-number
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/list-number
+caption: {{$:/language/Buttons/ListNumber/Caption}} (Markdown)
+description: {{$:/language/Buttons/ListNumber/Hint}}
+condition: [<targetTiddler>type[text/x-markdown]]
+shortcuts: ((list-number))
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="prefix-lines"
+	character="1."
+	count="1"
+/>
diff --git a/plugins/tiddlywiki/markdown/EditorToolbar/mono-line.tid b/plugins/tiddlywiki/markdown/EditorToolbar/mono-line.tid
new file mode 100755
index 000000000..c69145e1e
--- /dev/null
+++ b/plugins/tiddlywiki/markdown/EditorToolbar/mono-line.tid
@@ -0,0 +1,15 @@
+title: $:/plugins/tiddlywiki/markdown/EditorToolbar/mono-line
+list-after: $:/core/ui/EditorToolbar/mono-line
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/mono-line
+caption: {{$:/language/Buttons/MonoLine/Caption}} (Markdown)
+description: {{$:/language/Buttons/MonoLine/Hint}}
+condition: [<targetTiddler>type[text/x-markdown]]
+shortcuts: ((mono-line))
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="wrap-selection"
+	prefix="`"
+	suffix="`"
+/>
diff --git a/plugins/tiddlywiki/markdown/EditorToolbar/quote.tid b/plugins/tiddlywiki/markdown/EditorToolbar/quote.tid
new file mode 100755
index 000000000..1471a77ba
--- /dev/null
+++ b/plugins/tiddlywiki/markdown/EditorToolbar/quote.tid
@@ -0,0 +1,15 @@
+title: $:/plugins/tiddlywiki/markdown/EditorToolbar/quote
+list-after: $:/core/ui/EditorToolbar/quote
+tags: $:/tags/EditorToolbar
+icon: $:/core/images/quote
+caption: {{$:/language/Buttons/Quote/Caption}} (Markdown)
+description: {{$:/language/Buttons/Quote/Hint}}
+condition: [<targetTiddler>type[text/x-markdown]]
+shortcuts: ((quote))
+
+<$action-sendmessage
+	$message="tm-edit-text-operation"
+	$param="prefix-lines"
+	character=">"
+	count="1"
+/>
diff --git a/plugins/tiddlywiki/markdown/dialect.tid b/plugins/tiddlywiki/markdown/dialect.tid
old mode 100644
new mode 100755
diff --git a/plugins/tiddlywiki/markdown/docs_type_markdown.tid b/plugins/tiddlywiki/markdown/docs_type_markdown.tid
old mode 100644
new mode 100755
index 0c383e05b..229397ed7
--- a/plugins/tiddlywiki/markdown/docs_type_markdown.tid
+++ b/plugins/tiddlywiki/markdown/docs_type_markdown.tid
@@ -1,3 +1,4 @@
 title: $:/language/Docs/Types/text/x-markdown
 description: Markdown
 name: text/x-markdown
+group: Text
diff --git a/plugins/tiddlywiki/markdown/files/markdown.js b/plugins/tiddlywiki/markdown/files/markdown.js
old mode 100644
new mode 100755
diff --git a/plugins/tiddlywiki/markdown/files/tiddlywiki.files b/plugins/tiddlywiki/markdown/files/tiddlywiki.files
old mode 100644
new mode 100755
diff --git a/plugins/tiddlywiki/markdown/images/new-markdown-button.tid b/plugins/tiddlywiki/markdown/images/new-markdown-button.tid
new file mode 100755
index 000000000..e2d823349
--- /dev/null
+++ b/plugins/tiddlywiki/markdown/images/new-markdown-button.tid
@@ -0,0 +1,10 @@
+title: $:/plugins/tiddlywiki/markdown/images/new-markdown-button
+tags: $:/tags/Image
+
+<svg class="tc-image-new-markdown-button tc-image-button" viewBox="0 0 128 128" width="22pt" height="22pt">
+    <g fill-rule="evenodd">
+        <rect x="80" y="96" width="48" height="16" rx="8"></rect>
+        <rect x="96" y="80" width="16" height="48" rx="8"></rect>
+        <path d="M3.23876972,39.5396716 C3.23876972,35.9653274 6.13586353,33.0691646 9.7141757,33.0691646 L98.1283744,33.0691646 C101.706101,33.0691646 104.60378,35.9646626 104.60378,39.5396716 L104.60378,84.8296213 C104.60378,88.4039654 101.706687,91.3001282 98.1283744,91.3001282 L9.7141757,91.3001282 C6.13644944,91.3001282 3.23876972,88.4046302 3.23876972,84.8296213 L3.23876972,39.5396716 L3.23876972,39.5396716 Z M-2.15298617,39.5396716 L-2.15298617,84.8296213 C-2.15298617,91.3833243 3.15957363,96.6918841 9.7141757,96.6918841 L98.1283744,96.6918841 C104.684083,96.6918841 109.995536,91.382138 109.995536,84.8296213 L109.995536,39.5396716 C109.995536,32.9859686 104.682977,27.6774087 98.1283744,27.6774087 L9.7141757,27.6774087 C3.15846686,27.6774087 -2.15298617,32.9871549 -2.15298617,39.5396716 Z M14.0222815,80.5166164 L14.0222815,43.8526764 L24.8057933,43.8526764 L35.589305,57.3320661 L46.3728168,43.8526764 L57.1563286,43.8526764 L57.1563286,80.5166164 L46.3728168,80.5166164 L46.3728168,59.4887685 L35.589305,72.9681582 L24.8057933,59.4887685 L24.8057933,80.5166164 L14.0222815,80.5166164 Z M81.4192301,80.5166164 L65.2439624,62.723822 L76.0274742,62.723822 L76.0274742,43.8526764 L86.810986,43.8526764 L86.810986,62.723822 L97.5944978,62.723822 L81.4192301,80.5166164 Z"transform="translate(53.921275, 62.184646) rotate(-60.000000) translate(-53.921275, -62.184646) "></path>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/plugins/tiddlywiki/markdown/new-markdown.tid b/plugins/tiddlywiki/markdown/new-markdown.tid
new file mode 100755
index 000000000..688ea9709
--- /dev/null
+++ b/plugins/tiddlywiki/markdown/new-markdown.tid
@@ -0,0 +1,15 @@
+title: $:/plugins/tiddlywiki/markdown/new-markdown-button
+tags: $:/tags/PageControls
+caption: {{$:/plugins/tiddlywiki/markdown/images/new-markdown-button}} {{$:/language/Buttons/NewMarkdown/Caption}}
+description: {{$:/language/Buttons/NewMarkdown/Hint}}
+list-after: $:/core/ui/Buttons/new-tiddler
+
+<$button tooltip={{$:/language/Buttons/NewMarkdown/Hint}} aria-label={{$:/language/Buttons/NewMarkdown/Caption}} class=<<tv-config-toolbar-class>>>
+<$action-sendmessage $message="tm-new-tiddler" type="text/x-markdown"/>
+<$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
+{{$:/plugins/tiddlywiki/markdown/images/new-markdown-button}}
+</$list>
+<$list filter="[<tv-config-toolbar-text>prefix[yes]]">
+<span class="tc-btn-text"><$text text={{$:/language/Buttons/NewMarkdown/Caption}}/></span>
+</$list>
+</$button>
diff --git a/plugins/tiddlywiki/markdown/plugin.info b/plugins/tiddlywiki/markdown/plugin.info
old mode 100644
new mode 100755
diff --git a/plugins/tiddlywiki/markdown/readme.tid b/plugins/tiddlywiki/markdown/readme.tid
old mode 100644
new mode 100755
diff --git a/plugins/tiddlywiki/markdown/usage.tid b/plugins/tiddlywiki/markdown/usage.tid
old mode 100644
new mode 100755
diff --git a/plugins/tiddlywiki/markdown/wrapper.js b/plugins/tiddlywiki/markdown/wrapper.js
old mode 100644
new mode 100755
diff --git a/plugins/tiddlywiki/powered-by-tiddlywiki/banner.tid b/plugins/tiddlywiki/powered-by-tiddlywiki/banner.tid
index 52c877caf..f79e265ff 100644
--- a/plugins/tiddlywiki/powered-by-tiddlywiki/banner.tid
+++ b/plugins/tiddlywiki/powered-by-tiddlywiki/banner.tid
@@ -1,6 +1,6 @@
 title: $:/plugins/tiddlywiki/powered-by-tiddlywiki/banner
 tags: $:/tags/PageTemplate
 
-<a href="http://tiddlywiki.com" target="_blank">
+<a href="http://tiddlywiki.com" target="_blank" rel="noopener noreferrer">
 [img width="160px" class="tc-powered-by-tiddlywiki-banner" [$:/plugins/tiddlywiki/powered-by-tiddlywiki/powered-by-tiddlywiki.svg]]
 </a>
diff --git a/plugins/tiddlywiki/qrcode/MakeContactQR.tid b/plugins/tiddlywiki/qrcode/MakeContactQR.tid
new file mode 100644
index 000000000..5eeb2d231
--- /dev/null
+++ b/plugins/tiddlywiki/qrcode/MakeContactQR.tid
@@ -0,0 +1,27 @@
+title: $:/plugins/tiddlywiki/qrcode/MakeContactQR
+tags: $:/tags/MakeQR
+caption: Contact
+
+\define wifi-url()
+WIFI:wifi name;T:WPA;S:SSID;P:password;
+\end
+
+\define image(firstname,lastname,address,tel,email)
+<img src=<<makeqr text:"""MECARD:N:$lastname$,$firstname$;ADR:$address$;TEL:$tel$;EMAIL:$email$;;""" size:"350">>/>
+\end
+
+! Enter the contact details
+
+First name: <$edit-text tiddler="$:/config/plugins/tiddlywiki/qrcode/contact/firstname" tag="input" default=""/>
+
+Last name: <$edit-text tiddler="$:/config/plugins/tiddlywiki/qrcode/contact/lastname" tag="input" default=""/>
+
+Address: <$edit-text tiddler="$:/config/plugins/tiddlywiki/qrcode/contact/address" tag="input" default=""/>
+
+Telephone: <$edit-text tiddler="$:/config/plugins/tiddlywiki/qrcode/contact/tel" tag="input" default=""/>
+
+Email: <$edit-text tiddler="$:/config/plugins/tiddlywiki/qrcode/contact/email" tag="input" default=""/>
+
+! Here is your QR code
+
+<$macrocall $name="image" firstname={{$:/config/plugins/tiddlywiki/qrcode/contact/firstname}} lastname={{$:/config/plugins/tiddlywiki/qrcode/contact/lastname}} address={{$:/config/plugins/tiddlywiki/qrcode/contact/address}} tel={{$:/config/plugins/tiddlywiki/qrcode/contact/tel}} email={{$:/config/plugins/tiddlywiki/qrcode/contact/email}}/>
diff --git a/plugins/tiddlywiki/qrcode/MakeGenericQR.tid b/plugins/tiddlywiki/qrcode/MakeGenericQR.tid
new file mode 100644
index 000000000..9f0bcc286
--- /dev/null
+++ b/plugins/tiddlywiki/qrcode/MakeGenericQR.tid
@@ -0,0 +1,17 @@
+title: $:/plugins/tiddlywiki/qrcode/MakeGenericQR
+tags: $:/tags/MakeQR
+caption: Generic
+
+\define image(content)
+<img src=<<makeqr text:"""$content$""" size:"350">>/>
+\end
+
+! Enter the details
+
+You can also use this form to encode URLs.
+
+<$edit-text tiddler="$:/config/plugins/tiddlywiki/qrcode/generic" default="" class="tc-edit-texteditor"/>
+
+! Here is your QR code
+
+<$macrocall $name="image" content={{$:/config/plugins/tiddlywiki/qrcode/generic}}/>
diff --git a/plugins/tiddlywiki/qrcode/MakeWifiQR.tid b/plugins/tiddlywiki/qrcode/MakeWifiQR.tid
new file mode 100644
index 000000000..1cc7d1bb6
--- /dev/null
+++ b/plugins/tiddlywiki/qrcode/MakeWifiQR.tid
@@ -0,0 +1,30 @@
+title: $:/plugins/tiddlywiki/qrcode/MakeWifiQR
+tags: $:/tags/MakeQR
+caption: Wifi
+
+\define wifi-url()
+WIFI:wifi name;T:WPA;S:SSID;P:password;
+\end
+
+\define image(network,encryption,ssid,password)
+<img src=<<makeqr text:"""WIFI:$network$;T:$encryption$;S:$ssid$;P:$password$;""" size:"350">>/>
+\end
+
+! Enter the details of your wifi network
+
+Name of wifi network: <$edit-text tiddler="$:/config/plugins/tiddlywiki/qrcode/wifi/network" tag="input" default=""/>
+
+Encryption: <$select tiddler="$:/config/plugins/tiddlywiki/qrcode/wifi/encryption" default="none">
+<option value="none">None</option>
+<option value="WEP">WEP</option>
+<option value="WPA">WPA</option>
+<option value="WPA2">WPA2</option>
+</$select>
+
+SSID: <$edit-text tiddler="$:/config/plugins/tiddlywiki/qrcode/wifi/ssid" tag="input" default=""/>
+
+Password: <$edit-text tiddler="$:/config/plugins/tiddlywiki/qrcode/wifi/password" tag="input" default=""/>
+
+! Here is your QR code
+
+<$macrocall $name="image" network={{$:/config/plugins/tiddlywiki/qrcode/wifi/network}} encryption={{$:/config/plugins/tiddlywiki/qrcode/wifi/encryption}} ssid={{$:/config/plugins/tiddlywiki/qrcode/wifi/ssid}} password={{$:/config/plugins/tiddlywiki/qrcode/wifi/password}}/>
diff --git a/plugins/tiddlywiki/qrcode/ViewToolbarButton/Button.tid b/plugins/tiddlywiki/qrcode/ViewToolbarButton/Button.tid
new file mode 100644
index 000000000..e83391654
--- /dev/null
+++ b/plugins/tiddlywiki/qrcode/ViewToolbarButton/Button.tid
@@ -0,0 +1,53 @@
+title: $:/plugins/tiddlywiki/qrcode/ViewToolbarButton
+tags: $:/tags/ViewToolbar
+caption: {{$:/plugins/tiddlywiki/qrcode/icon}}
+short-caption: QR code
+description: Generate QR code for this tiddler
+
+<span class="tc-popup-keep">
+<$button popup=<<qualify "$:/state/popup/qrcode">> tooltip={{$:/plugins/tiddlywiki/qrcode/ViewToolbarButton!!description}} aria-label={{$:/plugins/tiddlywiki/qrcode/ViewToolbarButton!!short-caption}} class=<<tv-config-toolbar-class>> class=<<tv-config-toolbar-class>> selectedClass="tc-selected">
+<$list filter="[<tv-config-toolbar-icons>prefix[yes]]">
+{{$:/plugins/tiddlywiki/qrcode/icon}}
+</$list>
+<$list filter="[<tv-config-toolbar-text>prefix[yes]]">
+<span class="tc-btn-text"><$text text={{$:/plugins/tiddlywiki/qrcode/ViewToolbarButton!!short-caption}}/></span>
+</$list>
+</$button>
+</span>
+<$reveal state=<<qualify "$:/state/popup/qrcode">> type="popup" position="below" animate="yes">
+
+<div class="tc-drop-down">
+
+{{$:/plugins/tiddlywiki/qrcode/ViewToolbarButton||description}}
+
+<$set name="tv-config-toolbar-icons" value="yes">
+
+<$set name="tv-config-toolbar-text" value="yes">
+
+<$set name="tv-config-toolbar-class" value="tc-btn-invisible">
+
+<$set name="targetTiddler" value=<<currentTiddler>>>
+
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/ViewToolbarButton/QRcode]!has[draft.of]]">
+
+<$button popup=<<qualify "$:/state/popup/qrcode/type">> class="tc-btn-invisible" selectedClass="tc-selected">
+
+<$action-sendmessage $message="tm-modal" $param=<<currentTiddler>> currentTiddler=<<targetTiddler>>/>
+
+<$transclude field="caption" mode="inline"/>
+
+</$button>
+
+</$list>
+
+</$set>
+
+</$set>
+
+</$set>
+
+</$set>
+
+</div>
+
+</$reveal>
diff --git a/plugins/tiddlywiki/qrcode/ViewToolbarButton/Raw.tid b/plugins/tiddlywiki/qrcode/ViewToolbarButton/Raw.tid
new file mode 100644
index 000000000..160089407
--- /dev/null
+++ b/plugins/tiddlywiki/qrcode/ViewToolbarButton/Raw.tid
@@ -0,0 +1,12 @@
+title: $:/plugins/tiddlywiki/qrcode/ViewToolbarButton/Raw
+tags: $:/tags/ViewToolbarButton/QRcode
+caption: Raw content of this tiddler
+subtitle: QR code of raw tiddler content
+
+\define image()
+<img src=<<makeqr text:"""$(content)$""" size:"350">>/>
+\end
+
+<$set name="content" value={{!!text}}>
+<<image>>
+</$set>
diff --git a/plugins/tiddlywiki/qrcode/ViewToolbarButton/Rendered.tid b/plugins/tiddlywiki/qrcode/ViewToolbarButton/Rendered.tid
new file mode 100644
index 000000000..c29f45765
--- /dev/null
+++ b/plugins/tiddlywiki/qrcode/ViewToolbarButton/Rendered.tid
@@ -0,0 +1,12 @@
+title: $:/plugins/tiddlywiki/qrcode/ViewToolbarButton/Rendered
+tags: $:/tags/ViewToolbarButton/QRcode
+caption: Rendered content of this tiddler
+subtitle: QR code of rendered tiddler content
+
+\define image()
+<img src=<<makeqr text:"""$(content)$""" size:"350">>/>
+\end
+
+<$wikify name="content" text={{!!text}} type="text" mode="block" output="formattedtext">
+<<image>>
+</$wikify>
diff --git a/plugins/tiddlywiki/qrcode/ViewToolbarButton/URL.tid b/plugins/tiddlywiki/qrcode/ViewToolbarButton/URL.tid
new file mode 100644
index 000000000..e05a80e84
--- /dev/null
+++ b/plugins/tiddlywiki/qrcode/ViewToolbarButton/URL.tid
@@ -0,0 +1,14 @@
+title: $:/plugins/tiddlywiki/qrcode/ViewToolbarButton/URL
+tags: $:/tags/ViewToolbarButton/QRcode
+caption: URL of this tiddler
+subtitle: QR code of URL of this tiddler
+
+\define image()
+<img src=<<makeqr text:"""$(url)$#$(hash)$""" size:"350">>/>
+\end
+
+<$set name="url" value={{$:/info/url/full}}>
+<$set name="hash" filter="[<currentTiddler>encodeuricomponent[]]" select="0">
+<<image>>
+</$set>
+</$set>
diff --git a/plugins/tiddlywiki/qrcode/ViewToolbarButton/styles.tid b/plugins/tiddlywiki/qrcode/ViewToolbarButton/styles.tid
new file mode 100644
index 000000000..6889bff06
--- /dev/null
+++ b/plugins/tiddlywiki/qrcode/ViewToolbarButton/styles.tid
@@ -0,0 +1,9 @@
+title: $:/plugins/tiddlywiki/qrcode/styles
+tags: [[$:/tags/Stylesheet]]
+
+\rules only filteredtranscludeinline transcludeinline macrodef macrocallinline
+
+.tc-drop-down .tc-qrcode-drop-down img {
+	width: 100%;
+	height: 100%;
+}
diff --git a/plugins/tiddlywiki/qrcode/doc/examples.tid b/plugins/tiddlywiki/qrcode/doc/examples.tid
new file mode 100644
index 000000000..5bd19afa8
--- /dev/null
+++ b/plugins/tiddlywiki/qrcode/doc/examples.tid
@@ -0,0 +1,3 @@
+title: $:/plugins/tiddlywiki/qrcode/examples
+
+<<tabs "[all[shadows+tiddlers]tag[$:/tags/MakeQR]!has[draft.of]]" "$:/plugins/tiddlywiki/qrcode/MakeGenericQR">>
\ No newline at end of file
diff --git a/plugins/tiddlywiki/qrcode/doc/readme.tid b/plugins/tiddlywiki/qrcode/doc/readme.tid
new file mode 100644
index 000000000..89e2427e6
--- /dev/null
+++ b/plugins/tiddlywiki/qrcode/doc/readme.tid
@@ -0,0 +1,13 @@
+title: $:/plugins/tiddlywiki/qrcode/readme
+
+The QR code plugin provides a macro that enables any text to be rendered as a [[QR code|https://en.wikipedia.org/wiki/QR_code]]. QR codes are a type of 2-dimensional bar code that encodes arbitrary data: text, numbers, links. QR code readers are available or built-in for smartphones, making them a convenient means to transfer information between devices
+
+The QR code plugin adds the following features to TiddlyWiki:
+
+* A new [[makeqr Macro]] that renders specified text as a QR code image that can be displayed or printed
+* A new toolbar button that can display several QR code renderings of the content of a tiddler:
+** Raw content
+** Rendered, formatted content
+** URL of tiddler
+
+The QR code plugin is based on the library [[qrcode.js by Zeno Zeng|https://github.com/zenozeng/node-yaqrcode]].
\ No newline at end of file
diff --git a/plugins/tiddlywiki/qrcode/doc/usage.tid b/plugins/tiddlywiki/qrcode/doc/usage.tid
new file mode 100644
index 000000000..fb186c901
--- /dev/null
+++ b/plugins/tiddlywiki/qrcode/doc/usage.tid
@@ -0,0 +1,44 @@
+title: $:/plugins/tiddlywiki/qrcode/usage
+
+! `makeqr` Macro
+
+The <<.def makeqr>> [[macro|Macros]] converts text data into an image of the corresponding QR code. The image is returned as [[base64-encoded data URI|https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/Data_URIs]].
+
+!! Parameters
+
+;text
+: The text to encode
+;size
+: The size of the image in pixels (defaults to 500)
+;errorCorrectLevel
+: Determines the amount of error correction applied to the image; see below (defaults to "M").
+;fallback
+: The fallback image to be returned in case of an error (see below)
+
+The conversion will fail if the text is too long and/or complex and the macro will return the provided fallback image. If no fallback image is provided then an error image is generated.
+
+The error correction level is a [[QR code feature|http://www.qrcode.com/en/about/error_correction.html]]:
+
+<<<
+QR Code has error correction capability to restore data if the code is dirty or damaged. ... Level Q or H may be selected for factory environment where QR Code get dirty, whereas Level L may be selected for clean environment with the large amount of data. Typically, Level M (15%) is most frequently selected.
+<<<
+
+!! Examples
+
+Making a QR code for a simple string of text:
+
+```
+<<makeqr "Hello there!">>
+```
+
+Making a QR code for the URL field of the current tiddler:
+
+```
+<$macrocall $name="makeqr" text={{!!url}}/>
+```
+
+Making a QR code for the URL of the current wiki:
+
+```
+<$macrocall $name="makeqr" text={{$:/info/url/full}}/>
+```
diff --git a/plugins/tiddlywiki/qrcode/files/LICENSE b/plugins/tiddlywiki/qrcode/files/LICENSE
new file mode 100755
index 000000000..3fec150fa
--- /dev/null
+++ b/plugins/tiddlywiki/qrcode/files/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2013 Zeno Zeng
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plugins/tiddlywiki/qrcode/files/README.md b/plugins/tiddlywiki/qrcode/files/README.md
new file mode 100755
index 000000000..8bd65a26b
--- /dev/null
+++ b/plugins/tiddlywiki/qrcode/files/README.md
@@ -0,0 +1,72 @@
+# node-yaqrcode
+
+Yet another node-qrcode Generator!
+
+This is a simple and pure javascript wrapper for the QR Code Generator from the d-project.
+
+No Canvas or Binary needed!
+
+Note:
+
+```
+The word 'QR Code' is registered trademark of
+DENSO WAVE INCORPORATED
+http://www.denso-wave.com/qrcode/faqpatent-e.html
+```
+
+## Overview
+
+- Pure Javascript and could work without any requiments
+
+- Use `RS_BLOCK_TABLE` from http://davidshimjs.github.io/qrcodejs/ to support typeNumber 40
+
+- Use the code from http://davidshimjs.github.io/qrcodejs/ to support UTF-8
+
+- Return a Base64 Data URI like this
+
+```
+data:image/gif;base64,R0lGODdhggCCAIAAAAAAAP///ywAAAAAggCCAAAC/4yPqcvtD6OctNqLs968+w+G4kiW5omm6sq27gvHEUDXto3gCc3wgQ+8+QxCYq13/AGMQ6WwOHk+c0kq0oh13qg6naK71HKl1Vn4ukuSy01ksC1WOoLWBnx+XsDB6zr+nccUdndAVxiYRgFouAYl2ETolcY3WAlYB0WIlmnZCLl16Ib42JlFiQmqqdfJmJpnKEgaq+UYt/eKKysXxVqp+5k1y7kIKowIHErry/tbunvrl9z3vCzVjAqm2GuqthwNrZxNTUocTC0uoXp5yGnePlnMXr2daDdqjzdLPj8GKy9pjBvAXWjSeeI3LmErbgwVIlwYbgovTw0hWnyIsWLGiP+1QKzTxxHhmIZ/cKli8THOPogjE5ZsSYLYQGyu1lFkpvJfr5lmVt4TWNPZTYMgm1nb4M9fQIJMl2osmlOptDLa3HmTR7KprVwObyGL5KzqVFFfuqFTZu6bWZMSwVr4em8gpaSuCm79dNTtxKu60rqsVwvvzng0xfEkqzXwMb5TJQn2qTdvWDNgIwc9BW8YW8FwgZ6Eh7is0aBlJXPezLXV4QqqF9tc3LIc1mRW92XV0Lq0UNizZYNE5rmbX4OY7Z496hNq8NXT3pLG1xv16eKAyZTsSFm4TtFou1t+DNohqr576cql9467Y6pbs7b+DAG7e+1Ah3tfCz+kVOc8zV//fS3Ka6v109ZPqww4VnW2RbXbeRflplV8hEEHjkyTCcieYbs5xVo8/pEnlWKmcSUhckh5+B9+qbnGhnUMEicRB2fV92Jj9DwV0YKYzbiXXxiqZcx6Gmm241r2SbgUeOAQuJyLQ6JXIG4bMsWjV9od1CKNRNJ3gW/3EWiiknXpJBtwOWHgZXr6ZRndcQW6CVOXb0o34XoiuqjXNQdOVuJzkLEIJp08WjXoXQZyF42WUYr3wIMsImgXkvXQpONG+XT1KHtEdfhOiFCKeWRmU+qZEowa+vgpW7fZUySTmIoFIG2yxmbkKoRmGGOEk+IUK6qIUTfedqKaGWlPZDpJJW+6/5lIq4WByofTn0LOqutQ4c3VorXOrfqhsIohKitLCu6aX7AVquotiuDW9lewQHK6qJ3oevreorfiCCmr8WY7L2MaTmPmqecc2iiy97ab45mvHuvquaEuW2e/qGqm3oW5qonjphbKG+h8WLJb5mDNGbsxvx3/hSVdwTU5MowHq9nquKdVHHCK+dLaLJcxm4sazSSiPGGfC667J9GeBhkxwLm6nDDRuhntb4NJ47l0weCW7POdYaobHciaRhuuyLyNbO23XSerXIdDh0Spru4a+nS6Zm/bNNs2Pgx0qQxiS2x2OMPdXcNXRt1ygnHyJzHg2FHM6LNf00sw4p952WTb0//yHbnbciJI+cCX16ootE6rndjgDpqsOcelK5qonBPPczqo+v7Ns8onniyutCn+FpeKra8tVqXcHuR130gbXzfTnx9eo5uMbzK414jzfnCcvSbM3JS2l+v5YGhexqaVK89ut8bgcy+42eJ3/1L5YDtvsfoqPr9n7GzSzSF1Wx8/53W4zl0eqr3rSZYjXNTad7P6CTBstVtR7tqzq7glsE+O6tSYsHW1MY3PdlISmNJI5TtyaZB9QKPbtFp3LmfZiHHT4dcEq9O3Jd2tbliDYHIY1oHvoIhZZ8ua9wAXNxn1bm2F41Bhfgis2XzvZajLmA1JGKsRiYl73VKdE+H0JQj/SrFfVDSY3SojkmRd5Fe4ol4A7VcogTFxVUjz2e8ykEJlheeGl9Lbx5SYw7GVsWjHmhzsMrU19PEqhKGhlhpLd702jgBD6tjj32JYq/Ul8I5q+dEM9yMqqFhwdAHy4hQtliSC0Q+EnLQVheLnJ1OiUGxxlODXitVA3L1ydTD0JJ+ASLILXsyR97nJ8uS2wC6C8E4ZxBz9/FOyB9ZRl3q7YvSEpadbARBWzLylM8Wltd318WfUPKR9UjIiRVZyj50znzerhcoi2bFnMguasYwzJ9F1r5EyrBfGwFbM881ShYWU3prw1skt5tOHvrqWO1cpz4DGU47niaYhCQmdk8lgHKIUrahFL4rRjGp0oxztqEc/CtKQinSkJD1AAQAAOw==
+```
+
+## Usage
+
+```
+npm install yaqrcode
+```
+
+```javascript
+qrcode = require('yaqrcode');
+base64 = qrcode('hello world');
+```
+
+### custom size
+
+```javascript
+qrcode = require('yaqrcode');
+base64 = qrcode('hello world', {
+    size: 500
+});
+```
+
+## License
+
+The MIT License (MIT)
+
+Copyright (c) 2013,2015 Zeno Zeng
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plugins/tiddlywiki/qrcode/files/qrcode.js b/plugins/tiddlywiki/qrcode/files/qrcode.js
new file mode 100755
index 000000000..60c978ee6
--- /dev/null
+++ b/plugins/tiddlywiki/qrcode/files/qrcode.js
@@ -0,0 +1,1587 @@
+//---------------------------------------------------------------------
+//
+// QR Code Generator for JavaScript
+//
+// Copyright (c) 2009 Kazuhiko Arase
+//
+// URL: http://www.d-project.com/
+//
+// Licensed under the MIT license:
+//	http://www.opensource.org/licenses/mit-license.php
+//
+// The word 'QR Code' is registered trademark of
+// DENSO WAVE INCORPORATED
+//	http://www.denso-wave.com/qrcode/faqpatent-e.html
+//
+//---------------------------------------------------------------------
+
+//---------------------------------------------------------------------
+// qrcode
+//---------------------------------------------------------------------
+
+/**
+ * qrcode
+ * @param typeNumber 1 to 40
+ * @param errorCorrectLevel 'L','M','Q','H'
+ */
+var qrcode = function(typeNumber, errorCorrectLevel) {
+
+    var PAD0 = 0xEC;
+    var PAD1 = 0x11;
+
+    var _typeNumber = typeNumber;
+    var _errorCorrectLevel = QRErrorCorrectLevel[errorCorrectLevel];
+    var _modules = null;
+    var _moduleCount = 0;
+    var _dataCache = null;
+    var _dataList = new Array();
+
+    var _this = {};
+
+    var makeImpl = function(test, maskPattern) {
+
+	_moduleCount = _typeNumber * 4 + 17;
+	_modules = function(moduleCount) {
+	    var modules = new Array(moduleCount);
+	    for (var row = 0; row < moduleCount; row += 1) {
+		modules[row] = new Array(moduleCount);
+		for (var col = 0; col < moduleCount; col += 1) {
+		    modules[row][col] = null;
+		}
+	    }
+	    return modules;
+	}(_moduleCount);
+
+	setupPositionProbePattern(0, 0);
+	setupPositionProbePattern(_moduleCount - 7, 0);
+	setupPositionProbePattern(0, _moduleCount - 7);
+	setupPositionAdjustPattern();
+	setupTimingPattern();
+	setupTypeInfo(test, maskPattern);
+
+	if (_typeNumber >= 7) {
+	    setupTypeNumber(test);
+	}
+
+	if (_dataCache == null) {
+	    _dataCache = createData(_typeNumber, _errorCorrectLevel, _dataList);
+	}
+
+	mapData(_dataCache, maskPattern);
+    };
+
+    var setupPositionProbePattern = function(row, col) {
+
+	for (var r = -1; r <= 7; r += 1) {
+
+	    if (row + r <= -1 || _moduleCount <= row + r) continue;
+
+	    for (var c = -1; c <= 7; c += 1) {
+
+		if (col + c <= -1 || _moduleCount <= col + c) continue;
+
+		if ( (0 <= r && r <= 6 && (c == 0 || c == 6) )
+		     || (0 <= c && c <= 6 && (r == 0 || r == 6) )
+		     || (2 <= r && r <= 4 && 2 <= c && c <= 4) ) {
+		    _modules[row + r][col + c] = true;
+		} else {
+		    _modules[row + r][col + c] = false;
+		}
+	    }
+	}
+    };
+
+    var getBestMaskPattern = function() {
+
+	var minLostPoint = 0;
+	var pattern = 0;
+
+	for (var i = 0; i < 8; i += 1) {
+
+	    makeImpl(true, i);
+
+	    var lostPoint = QRUtil.getLostPoint(_this);
+
+	    if (i == 0 || minLostPoint > lostPoint) {
+		minLostPoint = lostPoint;
+		pattern = i;
+	    }
+	}
+
+	return pattern;
+    };
+
+    var setupTimingPattern = function() {
+
+	for (var r = 8; r < _moduleCount - 8; r += 1) {
+	    if (_modules[r][6] != null) {
+		continue;
+	    }
+	    _modules[r][6] = (r % 2 == 0);
+	}
+
+	for (var c = 8; c < _moduleCount - 8; c += 1) {
+	    if (_modules[6][c] != null) {
+		continue;
+	    }
+	    _modules[6][c] = (c % 2 == 0);
+	}
+    };
+
+    var setupPositionAdjustPattern = function() {
+
+	var pos = QRUtil.getPatternPosition(_typeNumber);
+
+	for (var i = 0; i < pos.length; i += 1) {
+
+	    for (var j = 0; j < pos.length; j += 1) {
+
+		var row = pos[i];
+		var col = pos[j];
+
+		if (_modules[row][col] != null) {
+		    continue;
+		}
+
+		for (var r = -2; r <= 2; r += 1) {
+
+		    for (var c = -2; c <= 2; c += 1) {
+
+			if (r == -2 || r == 2 || c == -2 || c == 2
+			    || (r == 0 && c == 0) ) {
+			    _modules[row + r][col + c] = true;
+			} else {
+			    _modules[row + r][col + c] = false;
+			}
+		    }
+		}
+	    }
+	}
+    };
+
+    var setupTypeNumber = function(test) {
+
+	var bits = QRUtil.getBCHTypeNumber(_typeNumber);
+
+	for (var i = 0; i < 18; i += 1) {
+	    var mod = (!test && ( (bits >> i) & 1) == 1);
+	    _modules[Math.floor(i / 3)][i % 3 + _moduleCount - 8 - 3] = mod;
+	}
+
+	for (var i = 0; i < 18; i += 1) {
+	    var mod = (!test && ( (bits >> i) & 1) == 1);
+	    _modules[i % 3 + _moduleCount - 8 - 3][Math.floor(i / 3)] = mod;
+	}
+    };
+
+    var setupTypeInfo = function(test, maskPattern) {
+
+	var data = (_errorCorrectLevel << 3) | maskPattern;
+	var bits = QRUtil.getBCHTypeInfo(data);
+
+	// vertical
+	for (var i = 0; i < 15; i += 1) {
+
+	    var mod = (!test && ( (bits >> i) & 1) == 1);
+
+	    if (i < 6) {
+		_modules[i][8] = mod;
+	    } else if (i < 8) {
+		_modules[i + 1][8] = mod;
+	    } else {
+		_modules[_moduleCount - 15 + i][8] = mod;
+	    }
+	}
+
+	// horizontal
+	for (var i = 0; i < 15; i += 1) {
+
+	    var mod = (!test && ( (bits >> i) & 1) == 1);
+
+	    if (i < 8) {
+		_modules[8][_moduleCount - i - 1] = mod;
+	    } else if (i < 9) {
+		_modules[8][15 - i - 1 + 1] = mod;
+	    } else {
+		_modules[8][15 - i - 1] = mod;
+	    }
+	}
+
+	// fixed module
+	_modules[_moduleCount - 8][8] = (!test);
+    };
+
+    var mapData = function(data, maskPattern) {
+
+	var inc = -1;
+	var row = _moduleCount - 1;
+	var bitIndex = 7;
+	var byteIndex = 0;
+	var maskFunc = QRUtil.getMaskFunction(maskPattern);
+
+	for (var col = _moduleCount - 1; col > 0; col -= 2) {
+
+	    if (col == 6) col -= 1;
+
+	    while (true) {
+
+		for (var c = 0; c < 2; c += 1) {
+
+		    if (_modules[row][col - c] == null) {
+
+			var dark = false;
+
+			if (byteIndex < data.length) {
+			    dark = ( ( (data[byteIndex] >>> bitIndex) & 1) == 1);
+			}
+
+			var mask = maskFunc(row, col - c);
+
+			if (mask) {
+			    dark = !dark;
+			}
+
+			_modules[row][col - c] = dark;
+			bitIndex -= 1;
+
+			if (bitIndex == -1) {
+			    byteIndex += 1;
+			    bitIndex = 7;
+			}
+		    }
+		}
+
+		row += inc;
+
+		if (row < 0 || _moduleCount <= row) {
+		    row -= inc;
+		    inc = -inc;
+		    break;
+		}
+	    }
+	}
+    };
+
+    var createBytes = function(buffer, rsBlocks) {
+
+	var offset = 0;
+
+	var maxDcCount = 0;
+	var maxEcCount = 0;
+
+	var dcdata = new Array(rsBlocks.length);
+	var ecdata = new Array(rsBlocks.length);
+
+	for (var r = 0; r < rsBlocks.length; r += 1) {
+
+	    var dcCount = rsBlocks[r].dataCount;
+	    var ecCount = rsBlocks[r].totalCount - dcCount;
+
+	    maxDcCount = Math.max(maxDcCount, dcCount);
+	    maxEcCount = Math.max(maxEcCount, ecCount);
+
+	    dcdata[r] = new Array(dcCount);
+
+	    for (var i = 0; i < dcdata[r].length; i += 1) {
+		dcdata[r][i] = 0xff & buffer.getBuffer()[i + offset];
+	    }
+	    offset += dcCount;
+
+	    var rsPoly = QRUtil.getErrorCorrectPolynomial(ecCount);
+	    var rawPoly = qrPolynomial(dcdata[r], rsPoly.getLength() - 1);
+
+	    var modPoly = rawPoly.mod(rsPoly);
+	    ecdata[r] = new Array(rsPoly.getLength() - 1);
+	    for (var i = 0; i < ecdata[r].length; i += 1) {
+		var modIndex = i + modPoly.getLength() - ecdata[r].length;
+		ecdata[r][i] = (modIndex >= 0)? modPoly.getAt(modIndex) : 0;
+	    }
+	}
+
+	var totalCodeCount = 0;
+	for (var i = 0; i < rsBlocks.length; i += 1) {
+	    totalCodeCount += rsBlocks[i].totalCount;
+	}
+
+	var data = new Array(totalCodeCount);
+	var index = 0;
+
+	for (var i = 0; i < maxDcCount; i += 1) {
+	    for (var r = 0; r < rsBlocks.length; r += 1) {
+		if (i < dcdata[r].length) {
+		    data[index] = dcdata[r][i];
+		    index += 1;
+		}
+	    }
+	}
+
+	for (var i = 0; i < maxEcCount; i += 1) {
+	    for (var r = 0; r < rsBlocks.length; r += 1) {
+		if (i < ecdata[r].length) {
+		    data[index] = ecdata[r][i];
+		    index += 1;
+		}
+	    }
+	}
+
+	return data;
+    };
+
+    var createData = function(typeNumber, errorCorrectLevel, dataList) {
+
+	var rsBlocks = QRRSBlock.getRSBlocks(typeNumber, errorCorrectLevel);
+
+	var buffer = qrBitBuffer();
+
+	for (var i = 0; i < dataList.length; i += 1) {
+	    var data = dataList[i];
+	    buffer.put(data.getMode(), 4);
+	    buffer.put(data.getLength(), QRUtil.getLengthInBits(data.getMode(), typeNumber) );
+	    data.write(buffer);
+	}
+
+	// calc num max data.
+	var totalDataCount = 0;
+	for (var i = 0; i < rsBlocks.length; i += 1) {
+	    totalDataCount += rsBlocks[i].dataCount;
+	}
+
+	if (buffer.getLengthInBits() > totalDataCount * 8) {
+	    throw new Error('code length overflow. ('
+			    + buffer.getLengthInBits()
+			    + '>'
+			    + totalDataCount * 8
+			    + ')');
+	}
+
+	// end code
+	if (buffer.getLengthInBits() + 4 <= totalDataCount * 8) {
+	    buffer.put(0, 4);
+	}
+
+	// padding
+	while (buffer.getLengthInBits() % 8 != 0) {
+	    buffer.putBit(false);
+	}
+
+	// padding
+	while (true) {
+
+	    if (buffer.getLengthInBits() >= totalDataCount * 8) {
+		break;
+	    }
+	    buffer.put(PAD0, 8);
+
+	    if (buffer.getLengthInBits() >= totalDataCount * 8) {
+		break;
+	    }
+	    buffer.put(PAD1, 8);
+	}
+
+	return createBytes(buffer, rsBlocks);
+    };
+
+    _this.addData = function(data) {
+	var newData = qr8BitByte(data);
+	_dataList.push(newData);
+	_dataCache = null;
+    };
+
+    _this.isDark = function(row, col) {
+	if (row < 0 || _moduleCount <= row || col < 0 || _moduleCount <= col) {
+	    throw new Error(row + ',' + col);
+	}
+	return _modules[row][col];
+    };
+
+    _this.getModuleCount = function() {
+	return _moduleCount;
+    };
+
+    _this.make = function() {
+	makeImpl(false, getBestMaskPattern() );
+    };
+
+    _this.createTableTag = function(cellSize, margin) {
+
+	cellSize = cellSize || 2;
+	margin = (typeof margin == 'undefined')? cellSize * 4 : margin;
+
+	var qrHtml = '';
+
+	qrHtml += '<table style="';
+	qrHtml += ' border-width: 0px; border-style: none;';
+	qrHtml += ' border-collapse: collapse;';
+	qrHtml += ' padding: 0px; margin: ' + margin + 'px;';
+	qrHtml += '">';
+	qrHtml += '<tbody>';
+
+	for (var r = 0; r < _this.getModuleCount(); r += 1) {
+
+	    qrHtml += '<tr>';
+
+	    for (var c = 0; c < _this.getModuleCount(); c += 1) {
+		qrHtml += '<td style="';
+		qrHtml += ' border-width: 0px; border-style: none;';
+		qrHtml += ' border-collapse: collapse;';
+		qrHtml += ' padding: 0px; margin: 0px;';
+		qrHtml += ' width: ' + cellSize + 'px;';
+		qrHtml += ' height: ' + cellSize + 'px;';
+		qrHtml += ' background-color: ';
+		qrHtml += _this.isDark(r, c)? '#000000' : '#ffffff';
+		qrHtml += ';';
+		qrHtml += '"/>';
+	    }
+
+	    qrHtml += '</tr>';
+	}
+
+	qrHtml += '</tbody>';
+	qrHtml += '</table>';
+
+	return qrHtml;
+    };
+
+    _this.createImgTag = function(cellSize, margin, size) {
+
+	cellSize = cellSize || 2;
+	margin = (typeof margin == 'undefined')? cellSize * 4 : margin;
+
+	var min = margin;
+	var max = _this.getModuleCount() * cellSize + margin;
+
+	return createImgTag(size, size, function(x, y) {
+	    if (min <= x && x < max && min <= y && y < max) {
+		var c = Math.floor( (x - min) / cellSize);
+		var r = Math.floor( (y - min) / cellSize);
+		return _this.isDark(r, c)? 0 : 1;
+	    } else {
+		return 1;
+	    }
+	} );
+    };
+
+    return _this;
+};
+
+//---------------------------------------------------------------------
+// qrcode.stringToBytes
+//---------------------------------------------------------------------
+
+qrcode.stringToBytes = function(s) {
+    var bytes = new Array();
+    for (var i = 0; i < s.length; i += 1) {
+	var c = s.charCodeAt(i);
+	bytes.push(c & 0xff);
+    }
+    return bytes;
+};
+
+//---------------------------------------------------------------------
+// qrcode.createStringToBytes
+//---------------------------------------------------------------------
+
+/**
+ * @param unicodeData base64 string of byte array.
+ * [16bit Unicode],[16bit Bytes], ...
+ * @param numChars
+ */
+qrcode.createStringToBytes = function(unicodeData, numChars) {
+
+    // create conversion map.
+
+    var unicodeMap = function() {
+
+	var bin = base64DecodeInputStream(unicodeData);
+	var read = function() {
+	    var b = bin.read();
+	    if (b == -1) throw new Error();
+	    return b;
+	};
+
+	var count = 0;
+	var unicodeMap = {};
+	while (true) {
+	    var b0 = bin.read();
+	    if (b0 == -1) break;
+	    var b1 = read();
+	    var b2 = read();
+	    var b3 = read();
+	    var k = String.fromCharCode( (b0 << 8) | b1);
+	    var v = (b2 << 8) | b3;
+	    unicodeMap[k] = v;
+	    count += 1;
+	}
+	if (count != numChars) {
+	    throw new Error(count + ' != ' + numChars);
+	}
+
+	return unicodeMap;
+    }();
+
+    var unknownChar = '?'.charCodeAt(0);
+
+    return function(s) {
+	var bytes = new Array();
+	for (var i = 0; i < s.length; i += 1) {
+	    var c = s.charCodeAt(i);
+	    if (c < 128) {
+		bytes.push(c);
+	    } else {
+		var b = unicodeMap[s.charAt(i)];
+		if (typeof b == 'number') {
+		    if ( (b & 0xff) == b) {
+			// 1byte
+			bytes.push(b);
+		    } else {
+			// 2bytes
+			bytes.push(b >>> 8);
+			bytes.push(b & 0xff);
+		    }
+		} else {
+		    bytes.push(unknownChar);
+		}
+	    }
+	}
+	return bytes;
+    };
+};
+
+//---------------------------------------------------------------------
+// QRMode
+//---------------------------------------------------------------------
+
+var QRMode = {
+    MODE_NUMBER :		1 << 0,
+    MODE_ALPHA_NUM : 	1 << 1,
+    MODE_8BIT_BYTE : 	1 << 2,
+    MODE_KANJI :		1 << 3
+};
+
+//---------------------------------------------------------------------
+// QRErrorCorrectLevel
+//---------------------------------------------------------------------
+
+var QRErrorCorrectLevel = {
+    L : 1,
+    M : 0,
+    Q : 3,
+    H : 2
+};
+
+//---------------------------------------------------------------------
+// QRMaskPattern
+//---------------------------------------------------------------------
+
+var QRMaskPattern = {
+    PATTERN000 : 0,
+    PATTERN001 : 1,
+    PATTERN010 : 2,
+    PATTERN011 : 3,
+    PATTERN100 : 4,
+    PATTERN101 : 5,
+    PATTERN110 : 6,
+    PATTERN111 : 7
+};
+
+//---------------------------------------------------------------------
+// QRUtil
+//---------------------------------------------------------------------
+
+var QRUtil = function() {
+
+    var PATTERN_POSITION_TABLE = [
+	[],
+	[6, 18],
+	[6, 22],
+	[6, 26],
+	[6, 30],
+	[6, 34],
+	[6, 22, 38],
+	[6, 24, 42],
+	[6, 26, 46],
+	[6, 28, 50],
+	[6, 30, 54],
+	[6, 32, 58],
+	[6, 34, 62],
+	[6, 26, 46, 66],
+	[6, 26, 48, 70],
+	[6, 26, 50, 74],
+	[6, 30, 54, 78],
+	[6, 30, 56, 82],
+	[6, 30, 58, 86],
+	[6, 34, 62, 90],
+	[6, 28, 50, 72, 94],
+	[6, 26, 50, 74, 98],
+	[6, 30, 54, 78, 102],
+	[6, 28, 54, 80, 106],
+	[6, 32, 58, 84, 110],
+	[6, 30, 58, 86, 114],
+	[6, 34, 62, 90, 118],
+	[6, 26, 50, 74, 98, 122],
+	[6, 30, 54, 78, 102, 126],
+	[6, 26, 52, 78, 104, 130],
+	[6, 30, 56, 82, 108, 134],
+	[6, 34, 60, 86, 112, 138],
+	[6, 30, 58, 86, 114, 142],
+	[6, 34, 62, 90, 118, 146],
+	[6, 30, 54, 78, 102, 126, 150],
+	[6, 24, 50, 76, 102, 128, 154],
+	[6, 28, 54, 80, 106, 132, 158],
+	[6, 32, 58, 84, 110, 136, 162],
+	[6, 26, 54, 82, 110, 138, 166],
+	[6, 30, 58, 86, 114, 142, 170]
+    ];
+    var G15 = (1 << 10) | (1 << 8) | (1 << 5) | (1 << 4) | (1 << 2) | (1 << 1) | (1 << 0);
+    var G18 = (1 << 12) | (1 << 11) | (1 << 10) | (1 << 9) | (1 << 8) | (1 << 5) | (1 << 2) | (1 << 0);
+    var G15_MASK = (1 << 14) | (1 << 12) | (1 << 10) | (1 << 4) | (1 << 1);
+
+    var _this = {};
+
+    var getBCHDigit = function(data) {
+	var digit = 0;
+	while (data != 0) {
+	    digit += 1;
+	    data >>>= 1;
+	}
+	return digit;
+    };
+
+    _this.getBCHTypeInfo = function(data) {
+	var d = data << 10;
+	while (getBCHDigit(d) - getBCHDigit(G15) >= 0) {
+	    d ^= (G15 << (getBCHDigit(d) - getBCHDigit(G15) ) );
+	}
+	return ( (data << 10) | d) ^ G15_MASK;
+    };
+
+    _this.getBCHTypeNumber = function(data) {
+	var d = data << 12;
+	while (getBCHDigit(d) - getBCHDigit(G18) >= 0) {
+	    d ^= (G18 << (getBCHDigit(d) - getBCHDigit(G18) ) );
+	}
+	return (data << 12) | d;
+    };
+
+    _this.getPatternPosition = function(typeNumber) {
+	return PATTERN_POSITION_TABLE[typeNumber - 1];
+    };
+
+    _this.getMaskFunction = function(maskPattern) {
+
+	switch (maskPattern) {
+
+	    case QRMaskPattern.PATTERN000 :
+		return function(i, j) { return (i + j) % 2 == 0; };
+	    case QRMaskPattern.PATTERN001 :
+		return function(i, j) { return i % 2 == 0; };
+	    case QRMaskPattern.PATTERN010 :
+		return function(i, j) { return j % 3 == 0; };
+	    case QRMaskPattern.PATTERN011 :
+		return function(i, j) { return (i + j) % 3 == 0; };
+	    case QRMaskPattern.PATTERN100 :
+		return function(i, j) { return (Math.floor(i / 2) + Math.floor(j / 3) ) % 2 == 0; };
+	    case QRMaskPattern.PATTERN101 :
+		return function(i, j) { return (i * j) % 2 + (i * j) % 3 == 0; };
+	    case QRMaskPattern.PATTERN110 :
+		return function(i, j) { return ( (i * j) % 2 + (i * j) % 3) % 2 == 0; };
+	    case QRMaskPattern.PATTERN111 :
+		return function(i, j) { return ( (i * j) % 3 + (i + j) % 2) % 2 == 0; };
+
+		default :
+		throw new Error('bad maskPattern:' + maskPattern);
+	}
+    };
+
+    _this.getErrorCorrectPolynomial = function(errorCorrectLength) {
+	var a = qrPolynomial([1], 0);
+	for (var i = 0; i < errorCorrectLength; i += 1) {
+	    a = a.multiply(qrPolynomial([1, QRMath.gexp(i)], 0) );
+	}
+	return a;
+    };
+
+    _this.getLengthInBits = function(mode, type) {
+
+	if (1 <= type && type < 10) {
+
+	    // 1 - 9
+
+	    switch(mode) {
+		case QRMode.MODE_NUMBER 	: return 10;
+		case QRMode.MODE_ALPHA_NUM 	: return 9;
+		case QRMode.MODE_8BIT_BYTE	: return 8;
+		case QRMode.MODE_KANJI		: return 8;
+		    default :
+		    throw new Error('mode:' + mode);
+	    }
+
+	} else if (type < 27) {
+
+	    // 10 - 26
+
+	    switch(mode) {
+		case QRMode.MODE_NUMBER 	: return 12;
+		case QRMode.MODE_ALPHA_NUM 	: return 11;
+		case QRMode.MODE_8BIT_BYTE	: return 16;
+		case QRMode.MODE_KANJI		: return 10;
+		    default :
+		    throw new Error('mode:' + mode);
+	    }
+
+	} else if (type < 41) {
+
+	    // 27 - 40
+
+	    switch(mode) {
+		case QRMode.MODE_NUMBER 	: return 14;
+		case QRMode.MODE_ALPHA_NUM	: return 13;
+		case QRMode.MODE_8BIT_BYTE	: return 16;
+		case QRMode.MODE_KANJI		: return 12;
+		    default :
+		    throw new Error('mode:' + mode);
+	    }
+
+	} else {
+	    throw new Error('type:' + type);
+	}
+    };
+
+    _this.getLostPoint = function(qrcode) {
+
+	var moduleCount = qrcode.getModuleCount();
+
+	var lostPoint = 0;
+
+	// LEVEL1
+
+	for (var row = 0; row < moduleCount; row += 1) {
+	    for (var col = 0; col < moduleCount; col += 1) {
+
+		var sameCount = 0;
+		var dark = qrcode.isDark(row, col);
+
+		for (var r = -1; r <= 1; r += 1) {
+
+		    if (row + r < 0 || moduleCount <= row + r) {
+			continue;
+		    }
+
+		    for (var c = -1; c <= 1; c += 1) {
+
+			if (col + c < 0 || moduleCount <= col + c) {
+			    continue;
+			}
+
+			if (r == 0 && c == 0) {
+			    continue;
+			}
+
+			if (dark == qrcode.isDark(row + r, col + c) ) {
+			    sameCount += 1;
+			}
+		    }
+		}
+
+		if (sameCount > 5) {
+		    lostPoint += (3 + sameCount - 5);
+		}
+	    }
+	};
+
+	// LEVEL2
+
+	for (var row = 0; row < moduleCount - 1; row += 1) {
+	    for (var col = 0; col < moduleCount - 1; col += 1) {
+		var count = 0;
+		if (qrcode.isDark(row, col) ) count += 1;
+		if (qrcode.isDark(row + 1, col) ) count += 1;
+		if (qrcode.isDark(row, col + 1) ) count += 1;
+		if (qrcode.isDark(row + 1, col + 1) ) count += 1;
+		if (count == 0 || count == 4) {
+		    lostPoint += 3;
+		}
+	    }
+	}
+
+	// LEVEL3
+
+	for (var row = 0; row < moduleCount; row += 1) {
+	    for (var col = 0; col < moduleCount - 6; col += 1) {
+		if (qrcode.isDark(row, col)
+		    && !qrcode.isDark(row, col + 1)
+		    &&  qrcode.isDark(row, col + 2)
+		    &&  qrcode.isDark(row, col + 3)
+		    &&  qrcode.isDark(row, col + 4)
+		    && !qrcode.isDark(row, col + 5)
+		    &&  qrcode.isDark(row, col + 6) ) {
+		    lostPoint += 40;
+		}
+	    }
+	}
+
+	for (var col = 0; col < moduleCount; col += 1) {
+	    for (var row = 0; row < moduleCount - 6; row += 1) {
+		if (qrcode.isDark(row, col)
+		    && !qrcode.isDark(row + 1, col)
+		    &&  qrcode.isDark(row + 2, col)
+		    &&  qrcode.isDark(row + 3, col)
+		    &&  qrcode.isDark(row + 4, col)
+		    && !qrcode.isDark(row + 5, col)
+		    &&  qrcode.isDark(row + 6, col) ) {
+		    lostPoint += 40;
+		}
+	    }
+	}
+
+	// LEVEL4
+
+	var darkCount = 0;
+
+	for (var col = 0; col < moduleCount; col += 1) {
+	    for (var row = 0; row < moduleCount; row += 1) {
+		if (qrcode.isDark(row, col) ) {
+		    darkCount += 1;
+		}
+	    }
+	}
+
+	var ratio = Math.abs(100 * darkCount / moduleCount / moduleCount - 50) / 5;
+	lostPoint += ratio * 10;
+
+	return lostPoint;
+    };
+
+    return _this;
+}();
+
+//---------------------------------------------------------------------
+// QRMath
+//---------------------------------------------------------------------
+
+var QRMath = function() {
+
+    var EXP_TABLE = new Array(256);
+    var LOG_TABLE = new Array(256);
+
+    // initialize tables
+    for (var i = 0; i < 8; i += 1) {
+	EXP_TABLE[i] = 1 << i;
+    }
+    for (var i = 8; i < 256; i += 1) {
+	EXP_TABLE[i] = EXP_TABLE[i - 4]
+	    ^ EXP_TABLE[i - 5]
+	    ^ EXP_TABLE[i - 6]
+	    ^ EXP_TABLE[i - 8];
+    }
+    for (var i = 0; i < 255; i += 1) {
+	LOG_TABLE[EXP_TABLE[i] ] = i;
+    }
+
+    var _this = {};
+
+    _this.glog = function(n) {
+
+	if (n < 1) {
+	    throw new Error('glog(' + n + ')');
+	}
+
+	return LOG_TABLE[n];
+    };
+
+    _this.gexp = function(n) {
+
+	while (n < 0) {
+	    n += 255;
+	}
+
+	while (n >= 256) {
+	    n -= 255;
+	}
+
+	return EXP_TABLE[n];
+    };
+
+    return _this;
+}();
+
+//---------------------------------------------------------------------
+// qrPolynomial
+//---------------------------------------------------------------------
+
+function qrPolynomial(num, shift) {
+
+    if (typeof num.length == 'undefined') {
+	throw new Error(num.length + '/' + shift);
+    }
+
+    var _num = function() {
+	var offset = 0;
+	while (offset < num.length && num[offset] == 0) {
+	    offset += 1;
+	}
+	var _num = new Array(num.length - offset + shift);
+	for (var i = 0; i < num.length - offset; i += 1) {
+	    _num[i] = num[i + offset];
+	}
+	return _num;
+    }();
+
+    var _this = {};
+
+    _this.getAt = function(index) {
+	return _num[index];
+    };
+
+    _this.getLength = function() {
+	return _num.length;
+    };
+
+    _this.multiply = function(e) {
+
+	var num = new Array(_this.getLength() + e.getLength() - 1);
+
+	for (var i = 0; i < _this.getLength(); i += 1) {
+	    for (var j = 0; j < e.getLength(); j += 1) {
+		num[i + j] ^= QRMath.gexp(QRMath.glog(_this.getAt(i) ) + QRMath.glog(e.getAt(j) ) );
+	    }
+	}
+
+	return qrPolynomial(num, 0);
+    };
+
+    _this.mod = function(e) {
+
+	if (_this.getLength() - e.getLength() < 0) {
+	    return _this;
+	}
+
+	var ratio = QRMath.glog(_this.getAt(0) ) - QRMath.glog(e.getAt(0) );
+
+	var num = new Array(_this.getLength() );
+	for (var i = 0; i < _this.getLength(); i += 1) {
+	    num[i] = _this.getAt(i);
+	}
+
+	for (var i = 0; i < e.getLength(); i += 1) {
+	    num[i] ^= QRMath.gexp(QRMath.glog(e.getAt(i) ) + ratio);
+	}
+
+	// recursive call
+	return qrPolynomial(num, 0).mod(e);
+    };
+
+    return _this;
+};
+
+//---------------------------------------------------------------------
+// QRRSBlock
+//---------------------------------------------------------------------
+
+var QRRSBlock = function() {
+
+
+    // [1: [L, M, Q, H], ..]
+    var RS_BLOCK_TABLE=[[1,26,19],[1,26,16],[1,26,13],[1,26,9],[1,44,34],[1,44,28],[1,44,22],[1,44,16],[1,70,55],[1,70,44],[2,35,17],[2,35,13],[1,100,80],[2,50,32],[2,50,24],[4,25,9],[1,134,108],[2,67,43],[2,33,15,2,34,16],[2,33,11,2,34,12],[2,86,68],[4,43,27],[4,43,19],[4,43,15],[2,98,78],[4,49,31],[2,32,14,4,33,15],[4,39,13,1,40,14],[2,121,97],[2,60,38,2,61,39],[4,40,18,2,41,19],[4,40,14,2,41,15],[2,146,116],[3,58,36,2,59,37],[4,36,16,4,37,17],[4,36,12,4,37,13],[2,86,68,2,87,69],[4,69,43,1,70,44],[6,43,19,2,44,20],[6,43,15,2,44,16],[4,101,81],[1,80,50,4,81,51],[4,50,22,4,51,23],[3,36,12,8,37,13],[2,116,92,2,117,93],[6,58,36,2,59,37],[4,46,20,6,47,21],[7,42,14,4,43,15],[4,133,107],[8,59,37,1,60,38],[8,44,20,4,45,21],[12,33,11,4,34,12],[3,145,115,1,146,116],[4,64,40,5,65,41],[11,36,16,5,37,17],[11,36,12,5,37,13],[5,109,87,1,110,88],[5,65,41,5,66,42],[5,54,24,7,55,25],[11,36,12],[5,122,98,1,123,99],[7,73,45,3,74,46],[15,43,19,2,44,20],[3,45,15,13,46,16],[1,135,107,5,136,108],[10,74,46,1,75,47],[1,50,22,15,51,23],[2,42,14,17,43,15],[5,150,120,1,151,121],[9,69,43,4,70,44],[17,50,22,1,51,23],[2,42,14,19,43,15],[3,141,113,4,142,114],[3,70,44,11,71,45],[17,47,21,4,48,22],[9,39,13,16,40,14],[3,135,107,5,136,108],[3,67,41,13,68,42],[15,54,24,5,55,25],[15,43,15,10,44,16],[4,144,116,4,145,117],[17,68,42],[17,50,22,6,51,23],[19,46,16,6,47,17],[2,139,111,7,140,112],[17,74,46],[7,54,24,16,55,25],[34,37,13],[4,151,121,5,152,122],[4,75,47,14,76,48],[11,54,24,14,55,25],[16,45,15,14,46,16],[6,147,117,4,148,118],[6,73,45,14,74,46],[11,54,24,16,55,25],[30,46,16,2,47,17],[8,132,106,4,133,107],[8,75,47,13,76,48],[7,54,24,22,55,25],[22,45,15,13,46,16],[10,142,114,2,143,115],[19,74,46,4,75,47],[28,50,22,6,51,23],[33,46,16,4,47,17],[8,152,122,4,153,123],[22,73,45,3,74,46],[8,53,23,26,54,24],[12,45,15,28,46,16],[3,147,117,10,148,118],[3,73,45,23,74,46],[4,54,24,31,55,25],[11,45,15,31,46,16],[7,146,116,7,147,117],[21,73,45,7,74,46],[1,53,23,37,54,24],[19,45,15,26,46,16],[5,145,115,10,146,116],[19,75,47,10,76,48],[15,54,24,25,55,25],[23,45,15,25,46,16],[13,145,115,3,146,116],[2,74,46,29,75,47],[42,54,24,1,55,25],[23,45,15,28,46,16],[17,145,115],[10,74,46,23,75,47],[10,54,24,35,55,25],[19,45,15,35,46,16],[17,145,115,1,146,116],[14,74,46,21,75,47],[29,54,24,19,55,25],[11,45,15,46,46,16],[13,145,115,6,146,116],[14,74,46,23,75,47],[44,54,24,7,55,25],[59,46,16,1,47,17],[12,151,121,7,152,122],[12,75,47,26,76,48],[39,54,24,14,55,25],[22,45,15,41,46,16],[6,151,121,14,152,122],[6,75,47,34,76,48],[46,54,24,10,55,25],[2,45,15,64,46,16],[17,152,122,4,153,123],[29,74,46,14,75,47],[49,54,24,10,55,25],[24,45,15,46,46,16],[4,152,122,18,153,123],[13,74,46,32,75,47],[48,54,24,14,55,25],[42,45,15,32,46,16],[20,147,117,4,148,118],[40,75,47,7,76,48],[43,54,24,22,55,25],[10,45,15,67,46,16],[19,148,118,6,149,119],[18,75,47,31,76,48],[34,54,24,34,55,25],[20,45,15,61,46,16]];
+
+    var qrRSBlock = function(totalCount, dataCount) {
+	var _this = {};
+	_this.totalCount = totalCount;
+	_this.dataCount = dataCount;
+	return _this;
+    };
+
+    var _this = {};
+
+    var getRsBlockTable = function(typeNumber, errorCorrectLevel) {
+
+	switch(errorCorrectLevel) {
+	    case QRErrorCorrectLevel.L :
+		return RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 0];
+	    case QRErrorCorrectLevel.M :
+		return RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 1];
+	    case QRErrorCorrectLevel.Q :
+		return RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 2];
+	    case QRErrorCorrectLevel.H :
+		return RS_BLOCK_TABLE[(typeNumber - 1) * 4 + 3];
+		default :
+		return undefined;
+	}
+    };
+
+    _this.getRSBlocks = function(typeNumber, errorCorrectLevel) {
+
+	var rsBlock = getRsBlockTable(typeNumber, errorCorrectLevel);
+
+	if (typeof rsBlock == 'undefined') {
+	    throw new Error('bad rs block @ typeNumber:' + typeNumber +
+			    '/errorCorrectLevel:' + errorCorrectLevel);
+	}
+
+	var length = rsBlock.length / 3;
+
+	var list = new Array();
+
+	for (var i = 0; i < length; i += 1) {
+
+	    var count = rsBlock[i * 3 + 0];
+	    var totalCount = rsBlock[i * 3 + 1];
+	    var dataCount = rsBlock[i * 3 + 2];
+
+	    for (var j = 0; j < count; j += 1) {
+		list.push(qrRSBlock(totalCount, dataCount) );
+	    }
+	}
+
+	return list;
+    };
+
+    return _this;
+}();
+
+//---------------------------------------------------------------------
+// qrBitBuffer
+//---------------------------------------------------------------------
+
+var qrBitBuffer = function() {
+
+    var _buffer = new Array();
+    var _length = 0;
+
+    var _this = {};
+
+    _this.getBuffer = function() {
+	return _buffer;
+    };
+
+    _this.getAt = function(index) {
+	var bufIndex = Math.floor(index / 8);
+	return ( (_buffer[bufIndex] >>> (7 - index % 8) ) & 1) == 1;
+    };
+
+    _this.put = function(num, length) {
+	for (var i = 0; i < length; i += 1) {
+	    _this.putBit( ( (num >>> (length - i - 1) ) & 1) == 1);
+	}
+    };
+
+    _this.getLengthInBits = function() {
+	return _length;
+    };
+
+    _this.putBit = function(bit) {
+
+	var bufIndex = Math.floor(_length / 8);
+	if (_buffer.length <= bufIndex) {
+	    _buffer.push(0);
+	}
+
+	if (bit) {
+	    _buffer[bufIndex] |= (0x80 >>> (_length % 8) );
+	}
+
+	_length += 1;
+    };
+
+    return _this;
+};
+
+//---------------------------------------------------------------------
+// qr8BitByte
+//---------------------------------------------------------------------
+
+var qr8BitByte = function(data) {
+
+    var _mode = QRMode.MODE_8BIT_BYTE;
+    var _data = data;
+    var _parsedData = [];
+
+    var _this = {};
+
+
+    // Added to support UTF-8 Characters
+    for (var i = 0, l = _data.length; i < l; i++) {
+	var byteArray = [];
+	var code = _data.charCodeAt(i);
+
+	if (code > 0x10000) {
+	    byteArray[0] = 0xF0 | ((code & 0x1C0000) >>> 18);
+	    byteArray[1] = 0x80 | ((code & 0x3F000) >>> 12);
+	    byteArray[2] = 0x80 | ((code & 0xFC0) >>> 6);
+	    byteArray[3] = 0x80 | (code & 0x3F);
+	} else if (code > 0x800) {
+	    byteArray[0] = 0xE0 | ((code & 0xF000) >>> 12);
+	    byteArray[1] = 0x80 | ((code & 0xFC0) >>> 6);
+	    byteArray[2] = 0x80 | (code & 0x3F);
+	} else if (code > 0x80) {
+	    byteArray[0] = 0xC0 | ((code & 0x7C0) >>> 6);
+	    byteArray[1] = 0x80 | (code & 0x3F);
+	} else {
+	    byteArray[0] = code;
+	}
+
+        // Fix Unicode corruption bug
+        _parsedData.push(byteArray);
+    }
+
+    _parsedData = Array.prototype.concat.apply([], _parsedData);
+
+    if (_parsedData.length != _data.length) {
+	_parsedData.unshift(191);
+	_parsedData.unshift(187);
+	_parsedData.unshift(239);
+    }
+
+    var _bytes = _parsedData;
+
+    _this.getMode = function() {
+	return _mode;
+    };
+
+    _this.getLength = function(buffer) {
+	return _bytes.length;
+    };
+
+    _this.write = function(buffer) {
+	for (var i = 0; i < _bytes.length; i += 1) {
+	    buffer.put(_bytes[i], 8);
+	}
+    };
+
+    return _this;
+};
+
+//=====================================================================
+// GIF Support etc.
+//
+
+//---------------------------------------------------------------------
+// byteArrayOutputStream
+//---------------------------------------------------------------------
+
+var byteArrayOutputStream = function() {
+
+    var _bytes = new Array();
+
+    var _this = {};
+
+    _this.writeByte = function(b) {
+	_bytes.push(b & 0xff);
+    };
+
+    _this.writeShort = function(i) {
+	_this.writeByte(i);
+	_this.writeByte(i >>> 8);
+    };
+
+    _this.writeBytes = function(b, off, len) {
+	off = off || 0;
+	len = len || b.length;
+	for (var i = 0; i < len; i += 1) {
+	    _this.writeByte(b[i + off]);
+	}
+    };
+
+    _this.writeString = function(s) {
+	for (var i = 0; i < s.length; i += 1) {
+	    _this.writeByte(s.charCodeAt(i) );
+	}
+    };
+
+    _this.toByteArray = function() {
+	return _bytes;
+    };
+
+    _this.toString = function() {
+	var s = '';
+	s += '[';
+	for (var i = 0; i < _bytes.length; i += 1) {
+	    if (i > 0) {
+		s += ',';
+	    }
+	    s += _bytes[i];
+	}
+	s += ']';
+	return s;
+    };
+
+    return _this;
+};
+
+//---------------------------------------------------------------------
+// base64EncodeOutputStream
+//---------------------------------------------------------------------
+
+var base64EncodeOutputStream = function() {
+
+    var _buffer = 0;
+    var _buflen = 0;
+    var _length = 0;
+    var _base64 = '';
+
+    var _this = {};
+
+    var writeEncoded = function(b) {
+	_base64 += String.fromCharCode(encode(b & 0x3f) );
+    };
+
+    var encode = function(n) {
+	if (n < 0) {
+	    // error.
+	} else if (n < 26) {
+	    return 0x41 + n;
+	} else if (n < 52) {
+	    return 0x61 + (n - 26);
+	} else if (n < 62) {
+	    return 0x30 + (n - 52);
+	} else if (n == 62) {
+	    return 0x2b;
+	} else if (n == 63) {
+	    return 0x2f;
+	}
+	throw new Error('n:' + n);
+    };
+
+    _this.writeByte = function(n) {
+
+	_buffer = (_buffer << 8) | (n & 0xff);
+	_buflen += 8;
+	_length += 1;
+
+	while (_buflen >= 6) {
+	    writeEncoded(_buffer >>> (_buflen - 6) );
+	    _buflen -= 6;
+	}
+    };
+
+    _this.flush = function() {
+
+	if (_buflen > 0) {
+	    writeEncoded(_buffer << (6 - _buflen) );
+	    _buffer = 0;
+	    _buflen = 0;
+	}
+
+	if (_length % 3 != 0) {
+	    // padding
+	    var padlen = 3 - _length % 3;
+	    for (var i = 0; i < padlen; i += 1) {
+		_base64 += '=';
+	    }
+	}
+    };
+
+    _this.toString = function() {
+	return _base64;
+    };
+
+    return _this;
+};
+
+//---------------------------------------------------------------------
+// base64DecodeInputStream
+//---------------------------------------------------------------------
+
+var base64DecodeInputStream = function(str) {
+
+    var _str = str;
+    var _pos = 0;
+    var _buffer = 0;
+    var _buflen = 0;
+
+    var _this = {};
+
+    _this.read = function() {
+
+	while (_buflen < 8) {
+
+	    if (_pos >= _str.length) {
+		if (_buflen == 0) {
+		    return -1;
+		}
+		throw new Error('unexpected end of file./' + _buflen);
+	    }
+
+	    var c = _str.charAt(_pos);
+	    _pos += 1;
+
+	    if (c == '=') {
+		_buflen = 0;
+		return -1;
+	    } else if (c.match(/^\s$/) ) {
+		// ignore if whitespace.
+		continue;
+	    }
+
+	    _buffer = (_buffer << 6) | decode(c.charCodeAt(0) );
+	    _buflen += 6;
+	}
+
+	var n = (_buffer >>> (_buflen - 8) ) & 0xff;
+	_buflen -= 8;
+	return n;
+    };
+
+    var decode = function(c) {
+	if (0x41 <= c && c <= 0x5a) {
+	    return c - 0x41;
+	} else if (0x61 <= c && c <= 0x7a) {
+	    return c - 0x61 + 26;
+	} else if (0x30 <= c && c <= 0x39) {
+	    return c - 0x30 + 52;
+	} else if (c == 0x2b) {
+	    return 62;
+	} else if (c == 0x2f) {
+	    return 63;
+	} else {
+	    throw new Error('c:' + c);
+	}
+    };
+
+    return _this;
+};
+
+//---------------------------------------------------------------------
+// gifImage (B/W)
+//---------------------------------------------------------------------
+
+var gifImage = function(width, height) {
+
+    var _width = width;
+    var _height = height;
+    var _data = new Array(width * height);
+
+    var _this = {};
+
+    _this.setPixel = function(x, y, pixel) {
+	_data[y * _width + x] = pixel;
+    };
+
+    _this.write = function(out) {
+
+	//---------------------------------
+	// GIF Signature
+
+	out.writeString('GIF87a');
+
+	//---------------------------------
+	// Screen Descriptor
+
+	out.writeShort(_width);
+	out.writeShort(_height);
+
+	out.writeByte(0x80); // 2bit
+	out.writeByte(0);
+	out.writeByte(0);
+
+	//---------------------------------
+	// Global Color Map
+
+	// black
+	out.writeByte(0x00);
+	out.writeByte(0x00);
+	out.writeByte(0x00);
+
+	// white
+	out.writeByte(0xff);
+	out.writeByte(0xff);
+	out.writeByte(0xff);
+
+	//---------------------------------
+	// Image Descriptor
+
+	out.writeString(',');
+	out.writeShort(0);
+	out.writeShort(0);
+	out.writeShort(_width);
+	out.writeShort(_height);
+	out.writeByte(0);
+
+	//---------------------------------
+	// Local Color Map
+
+	//---------------------------------
+	// Raster Data
+
+	var lzwMinCodeSize = 2;
+	var raster = getLZWRaster(lzwMinCodeSize);
+
+	out.writeByte(lzwMinCodeSize);
+
+	var offset = 0;
+
+	while (raster.length - offset > 255) {
+	    out.writeByte(255);
+	    out.writeBytes(raster, offset, 255);
+	    offset += 255;
+	}
+
+	out.writeByte(raster.length - offset);
+	out.writeBytes(raster, offset, raster.length - offset);
+	out.writeByte(0x00);
+
+	//---------------------------------
+	// GIF Terminator
+	out.writeString(';');
+    };
+
+    var bitOutputStream = function(out) {
+
+	var _out = out;
+	var _bitLength = 0;
+	var _bitBuffer = 0;
+
+	var _this = {};
+
+	_this.write = function(data, length) {
+
+	    if ( (data >>> length) != 0) {
+		throw new Error('length over');
+	    }
+
+	    while (_bitLength + length >= 8) {
+		_out.writeByte(0xff & ( (data << _bitLength) | _bitBuffer) );
+		length -= (8 - _bitLength);
+		data >>>= (8 - _bitLength);
+		_bitBuffer = 0;
+		_bitLength = 0;
+	    }
+
+	    _bitBuffer = (data << _bitLength) | _bitBuffer;
+	    _bitLength = _bitLength + length;
+	};
+
+	_this.flush = function() {
+	    if (_bitLength > 0) {
+		_out.writeByte(_bitBuffer);
+	    }
+	};
+
+	return _this;
+    };
+
+    var getLZWRaster = function(lzwMinCodeSize) {
+
+	var clearCode = 1 << lzwMinCodeSize;
+	var endCode = (1 << lzwMinCodeSize) + 1;
+	var bitLength = lzwMinCodeSize + 1;
+
+	// Setup LZWTable
+	var table = lzwTable();
+
+	for (var i = 0; i < clearCode; i += 1) {
+	    table.add(String.fromCharCode(i) );
+	}
+	table.add(String.fromCharCode(clearCode) );
+	table.add(String.fromCharCode(endCode) );
+
+	var byteOut = byteArrayOutputStream();
+	var bitOut = bitOutputStream(byteOut);
+
+	// clear code
+	bitOut.write(clearCode, bitLength);
+
+	var dataIndex = 0;
+
+	var s = String.fromCharCode(_data[dataIndex]);
+	dataIndex += 1;
+
+	while (dataIndex < _data.length) {
+
+	    var c = String.fromCharCode(_data[dataIndex]);
+	    dataIndex += 1;
+
+	    if (table.contains(s + c) ) {
+
+		s = s + c;
+
+	    } else {
+
+		bitOut.write(table.indexOf(s), bitLength);
+
+		if (table.size() < 0xfff) {
+
+		    if (table.size() == (1 << bitLength) ) {
+			bitLength += 1;
+		    }
+
+		    table.add(s + c);
+		}
+
+		s = c;
+	    }
+	}
+
+	bitOut.write(table.indexOf(s), bitLength);
+
+	// end code
+	bitOut.write(endCode, bitLength);
+
+	bitOut.flush();
+
+	return byteOut.toByteArray();
+    };
+
+    var lzwTable = function() {
+
+	var _map = {};
+	var _size = 0;
+
+	var _this = {};
+
+	_this.add = function(key) {
+	    if (_this.contains(key) ) {
+		throw new Error('dup key:' + key);
+	    }
+	    _map[key] = _size;
+	    _size += 1;
+	};
+
+	_this.size = function() {
+	    return _size;
+	};
+
+	_this.indexOf = function(key) {
+	    return _map[key];
+	};
+
+	_this.contains = function(key) {
+	    return typeof _map[key] != 'undefined';
+	};
+
+	return _this;
+    };
+
+    return _this;
+};
+
+var createImgTag = function(width, height, getPixel, alt) {
+
+    var gif = gifImage(width, height);
+    for (var y = 0; y < height; y += 1) {
+	for (var x = 0; x < width; x += 1) {
+	    gif.setPixel(x, y, getPixel(x, y) );
+	}
+    }
+
+    var b = byteArrayOutputStream();
+    gif.write(b);
+
+    var base64 = base64EncodeOutputStream();
+    var bytes = b.toByteArray();
+    for (var i = 0; i < bytes.length; i += 1) {
+	base64.writeByte(bytes[i]);
+    }
+    base64.flush();
+
+    var img = '';
+    img += 'data:image/gif;base64,';
+    img += base64;
+
+    return img;
+};
+
+//---------------------------------------------------------------------
+// returns qrcode function.
+
+module.exports = qrcode;
diff --git a/plugins/tiddlywiki/qrcode/files/tiddlywiki.files b/plugins/tiddlywiki/qrcode/files/tiddlywiki.files
new file mode 100644
index 000000000..91384cd47
--- /dev/null
+++ b/plugins/tiddlywiki/qrcode/files/tiddlywiki.files
@@ -0,0 +1,18 @@
+{
+	"tiddlers": [
+		{
+			"file": "qrcode.js",
+			"fields": {
+				"type": "application/javascript",
+				"title": "$:/plugins/tiddlywiki/qrcode/qrcode.js",
+				"module-type": "library"
+			}
+		},{
+			"file": "LICENSE",
+			"fields": {
+				"type": "text/plain",
+				"title": "$:/plugins/tiddlywiki/qrcode/license"
+			}
+		}
+	]
+}
diff --git a/plugins/tiddlywiki/qrcode/icon.tid b/plugins/tiddlywiki/qrcode/icon.tid
new file mode 100644
index 000000000..2ce14d4f5
--- /dev/null
+++ b/plugins/tiddlywiki/qrcode/icon.tid
@@ -0,0 +1,15 @@
+title: $:/plugins/tiddlywiki/qrcode/icon
+tags: $:/tags/Image
+
+<svg class="tc-image-qrcode tc-image-button" viewBox="0 0 128 128" width="22pt" height="22pt">
+    <g fill-rule="evenodd">
+        <path d="M0,15.9969199 C0,7.16206498 7.16987059,0 15.9969199,0 L64.0030801,0 C72.837935,0 80,7.16987059 80,15.9969199 L80,64.0030801 C80,72.837935 72.8301294,80 64.0030801,80 L15.9969199,80 C7.16206498,80 0,72.8301294 0,64.0030801 L0,15.9969199 Z M16,22.0063866 C16,18.6891509 18.6835413,16 22.0063866,16 L57.9936134,16 C61.3108491,16 64,18.6835413 64,22.0063866 L64,57.9936134 C64,61.3108491 61.3164587,64 57.9936134,64 L22.0063866,64 C18.6891509,64 16,61.3164587 16,57.9936134 L16,22.0063866 Z M28,31.990053 C28,29.7864076 29.7842933,28 31.990053,28 L48.009947,28 C50.2135924,28 52,29.7842933 52,31.990053 L52,48.009947 C52,50.2135924 50.2157067,52 48.009947,52 L31.990053,52 C29.7864076,52 28,50.2157067 28,48.009947 L28,31.990053 Z"></path>
+        <path d="M112,16 L112,8.49833453 L112,6.00333095 C112,2.68778282 114.67804,0 118.003331,0 L121.996669,0 C125.312217,0 128,2.67804027 128,6.00333095 L128,8.49833453 L128,23.0016655 L128,25.9966691 C128,29.3122172 125.32196,32 121.996669,32 L119.001665,32 L104.998335,32 L102.003331,32 C98.6877828,32 96,29.3219597 96,25.9966691 L96,22.0033309 C96,18.6877828 98.6780403,16 102.003331,16 L104.998335,16 L112,16 Z"></path>
+        <path d="M96,56.9983345 L96,54.0033309 C96,50.6877828 98.6780403,48 102.003331,48 L104.998335,48 L119.001665,48 L121.996669,48 C125.312217,48 128,50.6780403 128,54.0033309 L128,57.9966691 C128,61.3122172 125.32196,64 121.996669,64 L119.001665,64 L112,64 L112,71.0016655 L112,73.9966691 C112,77.3122172 109.32196,80 105.996669,80 L102.003331,80 C98.6877828,80 96,77.3219597 96,73.9966691 L96,71.0016655 L96,56.9983345 Z"></path>
+        <path d="M16,112 L23.0016655,112 L24.9983345,112 L32,112 L32,104.998335 L32,102.003331 C32,98.6877828 34.6780403,96 38.0033309,96 L40.9983345,96 L55.0016655,96 L57.9966691,96 C61.3122172,96 64,98.6780403 64,102.003331 L64,105.996669 C64,109.312217 61.3219597,112 57.9966691,112 L55.0016655,112 L48,112 L48,119.001665 L48,121.996669 C48,125.312217 45.3219597,128 41.9966691,128 L39.0016655,128 L24.9983345,128 L23.0016655,128 L8.99833453,128 L6.00333095,128 C2.68778282,128 0,125.32196 0,121.996669 L0,119.001665 L0,104.998335 L0,102.003331 C0,98.6877828 2.67804027,96 6.00333095,96 L9.99666905,96 C13.3122172,96 16,98.6780403 16,102.003331 L16,104.998335 L16,112 Z"></path>
+        <path d="M103.001665,96 L105.996669,96 C109.312217,96 112,98.6780403 112,102.003331 L112,105.996669 C112,109.312217 109.32196,112 105.996669,112 L103.001665,112 L88.9983345,112 L86.0033309,112 C82.6877828,112 80,109.32196 80,105.996669 L80,102.003331 C80,98.6877828 82.6780403,96 86.0033309,96 L88.9983345,96 L103.001665,96 Z"></path>
+        <path d="M72.9983345,112 L70.0033309,112 C66.6780403,112 64,114.687783 64,118.003331 L64,121.996669 C64,125.32196 66.6877828,128 70.0033309,128 L72.9983345,128 L87.0016655,128 L89.9966691,128 C93.3219597,128 96,125.312217 96,121.996669 L96,118.003331 C96,114.67804 93.3122172,112 89.9966691,112 L87.0016655,112 L72.9983345,112 Z"></path>
+        <rect x="112" y="80" width="16" height="16" rx="6"></rect>
+        <rect x="112" y="112" width="16" height="16" rx="6"></rect>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/plugins/tiddlywiki/qrcode/makeqr.js b/plugins/tiddlywiki/qrcode/makeqr.js
new file mode 100644
index 000000000..561dfb4a5
--- /dev/null
+++ b/plugins/tiddlywiki/qrcode/makeqr.js
@@ -0,0 +1,74 @@
+/*\
+title: $:/plugins/tiddlywiki/qrcode/makeqr.js
+type: application/javascript
+module-type: macro
+
+Macro to convert a string into a QR Code
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Information about this macro
+*/
+
+var qrcode = require("$:/plugins/tiddlywiki/qrcode/qrcode.js");
+
+var QRCODE_GENERATION_ERROR_PREFIX = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 300 300"><text x="0" y="30" fill="red" font-family="Helvetica, sans-serif" font-size="18">',
+	QRCODE_GENERATION_ERROR_SUFFIX = '</text></svg>';
+
+exports.name = "makeqr";
+
+exports.params = [
+	{name: "text"},
+	{name: "size"},
+	{name: "errorCorrectLevel"},
+	{name: "fallback"}
+];
+
+/*
+Run the macro
+*/
+exports.run = function(text,size,errorCorrectLevel,fallback) {
+	var result;
+	try {
+		result = generateQrCode(text,{size: size, errorCorrectLevel: errorCorrectLevel});
+	} catch (ex) {
+		console.log("makeqr error: " + ex);
+		result = fallback || ("data:image/svg+xml," + encodeURI(QRCODE_GENERATION_ERROR_PREFIX + ex + QRCODE_GENERATION_ERROR_SUFFIX));
+	}
+	return result || "";
+};
+
+function generateQrCode(text,options) {
+	options = options || {};
+	var typeNumber = options.typeNumber || 4,
+		errorCorrectLevel = options.errorCorrectLevel || "M",
+		size = options.size || 500,
+		qr;
+	try {
+		qr = qrcode(typeNumber,errorCorrectLevel);
+		qr.addData(text);
+		qr.make();
+	} catch (e) {
+		if(typeNumber >= 40) {
+			throw new Error("Text too long to encode");
+		} else {
+			return generateQrCode(text, {
+				size: size,
+				errorCorrectLevel: errorCorrectLevel,
+				typeNumber: typeNumber + 1
+			});
+		}
+	}
+	var cellsize = parseInt(size / qr.getModuleCount()),
+		margin = parseInt((size - qr.getModuleCount() * cellsize) / 2);
+	return qr.createImgTag(cellsize, margin, size);
+}
+
+
+})();
diff --git a/plugins/tiddlywiki/qrcode/plugin.info b/plugins/tiddlywiki/qrcode/plugin.info
new file mode 100644
index 000000000..1be38b1a3
--- /dev/null
+++ b/plugins/tiddlywiki/qrcode/plugin.info
@@ -0,0 +1,7 @@
+{
+	"title": "$:/plugins/tiddlywiki/qrcode",
+	"description": "QR Code generator",
+	"author": "Zeno Zeng, adapted by Jeremy Ruston",
+	"plugin-type": "plugin",
+	"list": "readme usage examples license"
+}
diff --git a/plugins/tiddlywiki/railroad/wrapper.js b/plugins/tiddlywiki/railroad/wrapper.js
index ca1c18e6b..aeaab3543 100644
--- a/plugins/tiddlywiki/railroad/wrapper.js
+++ b/plugins/tiddlywiki/railroad/wrapper.js
@@ -97,6 +97,7 @@ RailroadWidget.prototype.patchLinks = function(node) {
 					if(child.attributes["data-tw-external"]) {
 						// External links are straightforward
 						child.setAttribute("target","_blank");
+						child.setAttribute("rel","noopener noreferrer");
 					} else {
 						// Each internal link gets its own onclick handler, capturing its own copy of target
 						(function(myTarget) {
diff --git a/plugins/tiddlywiki/stacked-view/StackedControls.tid b/plugins/tiddlywiki/stacked-view/StackedControls.tid
index 6fc706fea..56c93d657 100644
--- a/plugins/tiddlywiki/stacked-view/StackedControls.tid
+++ b/plugins/tiddlywiki/stacked-view/StackedControls.tid
@@ -1,16 +1,19 @@
 title: $:/plugins/tiddlywiki/stacked-view/StackedControls
-tags: $:/tags/TopLeftBar
+caption: Stacked View
+tags: $:/tags/SideBar
 
-<$reveal type="match" state="$:/view" text="stacked">
-Stacked view fan height:
-<$button set="$:/config/StackedStoryViewFanHeight" setTo="-10">-10</$button>
-<$button set="$:/config/StackedStoryViewFanHeight" setTo="0">0</$button>
-<$button set="$:/config/StackedStoryViewFanHeight" setTo="10">10</$button>
-<$button set="$:/config/StackedStoryViewFanHeight" setTo="30">30</$button>
-<$button set="$:/config/StackedStoryViewFanHeight" setTo="50">50</$button>
-<$button set="$:/config/StackedStoryViewFanHeight" setTo="100">100</$button>
-<$button set="$:/config/StackedStoryViewFanHeight" setTo="300">300</$button>
-<$button set="$:/config/StackedStoryViewFanHeight" setTo="500">500</$button>
-<$button set="$:/config/StackedStoryViewFanHeight" setTo="700">700</$button>
-<$button set="$:/config/StackedStoryViewFanHeight" setTo="1500">1500</$button>
-</$reveal>
+Set the [[fan separation|$:/config/StackedStoryViewFanHeight]]:
+
+* <$button set="$:/config/StackedStoryViewFanHeight" setTo="-10">-10</$button>
+* <$button set="$:/config/StackedStoryViewFanHeight" setTo="0">0</$button>
+* <$button set="$:/config/StackedStoryViewFanHeight" setTo="10">10</$button>
+* <$button set="$:/config/StackedStoryViewFanHeight" setTo="30">30</$button>
+* <$button set="$:/config/StackedStoryViewFanHeight" setTo="50">50</$button>
+* <$button set="$:/config/StackedStoryViewFanHeight" setTo="100">100</$button>
+* <$button set="$:/config/StackedStoryViewFanHeight" setTo="150">150</$button>
+* <$button set="$:/config/StackedStoryViewFanHeight" setTo="200">200</$button>
+* <$button set="$:/config/StackedStoryViewFanHeight" setTo="250">250</$button>
+* <$button set="$:/config/StackedStoryViewFanHeight" setTo="300">300</$button>
+* <$button set="$:/config/StackedStoryViewFanHeight" setTo="500">500</$button>
+* <$button set="$:/config/StackedStoryViewFanHeight" setTo="700">700</$button>
+* <$button set="$:/config/StackedStoryViewFanHeight" setTo="1500">1500</$button>
diff --git a/plugins/tiddlywiki/text-slicer/docs.tid b/plugins/tiddlywiki/text-slicer/docs.tid
index f08e5c9d7..219443107 100644
--- a/plugins/tiddlywiki/text-slicer/docs.tid
+++ b/plugins/tiddlywiki/text-slicer/docs.tid
@@ -178,6 +178,15 @@ Tiddlers representing images have the following fields:
 * ''title'': an automatically generated unique title
 * ''type'': appropriate content type for the image (eg "image/jpeg")
 
+!!! Notes
+
+Notes are available during editing but hidden for static renderings. The slicing mechanism does not generate notes; they can only be subsequently added manually. Tiddlers representing notes have the following fields:
+
+* ''toc-type'': the text "note"
+* ''title'': an automatically generated unique title
+* ''text'': the text of the note
+* ''tags'': any CSS classes found in the HTML are converted into tags
+
 ! Document Metadata, Tags and Classes
 
 [TBD]
diff --git a/plugins/tiddlywiki/text-slicer/modules/commands/slice.js b/plugins/tiddlywiki/text-slicer/modules/commands/slice.js
index 29db5892a..81346fbbb 100644
--- a/plugins/tiddlywiki/text-slicer/modules/commands/slice.js
+++ b/plugins/tiddlywiki/text-slicer/modules/commands/slice.js
@@ -16,7 +16,7 @@ var widget = require("$:/core/modules/widgets/widget.js");
 
 exports.info = {
 	name: "slice",
-	synchronous: true
+	synchronous: false
 };
 
 var Command = function(params,commander,callback) {
@@ -31,11 +31,15 @@ Command.prototype.execute = function() {
 	}
 	var self = this,
 		wiki = this.commander.wiki,
-		tiddlerTitle = this.params[0],
-		slicer = new $tw.Slicer(wiki,tiddlerTitle);
-	slicer.sliceTiddler(tiddlerTitle)
+		sourceTitle = this.params[0],
+		destTitle = this.params[1],
+		slicer = new $tw.Slicer(wiki,sourceTitle,{
+			destTitle: destTitle
+		});
+	slicer.sliceTiddler()
 	slicer.outputTiddlers();
 	slicer.destroy();
+	$tw.utils.nextTick(this.callback);
 	return null;
 };
 
diff --git a/plugins/tiddlywiki/text-slicer/modules/filters/list-children.js b/plugins/tiddlywiki/text-slicer/modules/filters/list-children.js
new file mode 100644
index 000000000..443f80a0b
--- /dev/null
+++ b/plugins/tiddlywiki/text-slicer/modules/filters/list-children.js
@@ -0,0 +1,38 @@
+/*\
+title: $:/core/modules/filters/list-children.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operator returning all the descendents of a tiddler listed in the "list" field
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Export our filter function
+*/
+exports["list-children"] = function(source,operator,options) {
+	var children = {},
+		processTiddler = function(title) {
+			var tiddler = options.wiki.getTiddler(title);
+			if(tiddler && !$tw.utils.hop(children,title)) {
+				children[title] = true;
+				var list = options.wiki.getTiddlerList(title,operator.operand);
+				list.forEach(function(listItem) {
+					if(!$tw.utils.hop(children,listItem)) {
+						processTiddler(listItem);
+					}
+				});
+			}
+		};
+	source(function(tiddler,title) {
+		processTiddler(title);
+	});
+	return Object.keys(children);
+};
+
+})();
diff --git a/plugins/tiddlywiki/text-slicer/modules/slicer.js b/plugins/tiddlywiki/text-slicer/modules/slicer.js
index cc86089b0..2514b3d64 100644
--- a/plugins/tiddlywiki/text-slicer/modules/slicer.js
+++ b/plugins/tiddlywiki/text-slicer/modules/slicer.js
@@ -12,11 +12,16 @@ Main text-slicing logic
 /*global $tw: false */
 "use strict";
 
+var DOMParser = require("$:/plugins/tiddlywiki/xmldom/dom-parser").DOMParser;
+
 var SLICER_OUTPUT_TITLE = "$:/TextSlicer";
 
-function Slicer(wiki,sourceTitle) {
+function Slicer(wiki,sourceTitle,options) {
+	options = options || {};
 	this.wiki = wiki;
 	this.sourceTitle = sourceTitle;
+	this.sourceTiddler = wiki.getTiddler(this.sourceTitle);
+	this.destTitle = options.destTitle || this.sourceTiddler.fields["doc-split-to"] || ("Sliced up " + this.sourceTitle);
 	this.iframe = null; // Reference to iframe used for HTML parsing
 	this.stopWordList = "the and a of on i".split(" ");
 	this.tiddlers = {};
@@ -104,27 +109,33 @@ Slicer.prototype.isBlank = function(s) {
 };
 
 Slicer.prototype.getSourceHtmlDocument = function(tiddler) {
-	this.iframe = document.createElement("iframe");
-	document.body.appendChild(this.iframe);
-	this.iframe.contentWindow.document.open();
-	this.iframe.contentWindow.document.write(tiddler.fields.text);
-	this.iframe.contentWindow.document.close();
-	return this.iframe.contentWindow.document;
+	if($tw.browser) {
+		this.iframe = document.createElement("iframe");
+		document.body.appendChild(this.iframe);
+		this.iframe.contentWindow.document.open();
+		this.iframe.contentWindow.document.write(tiddler.fields.text);
+		this.iframe.contentWindow.document.close();
+		return this.iframe.contentWindow.document;
+	} else {
+		return new DOMParser().parseFromString(tiddler.fields.text);
+	}
 };
 
 Slicer.prototype.getSourceWikiDocument = function(tiddler) {
-	var widgetNode = this.wiki.makeTranscludeWidget(this.sourceTitle,{document: $tw.fakeDocument, parseAsInline: false}),
+	var widgetNode = this.wiki.makeTranscludeWidget(this.sourceTitle,{
+			document: $tw.fakeDocument,
+			parseAsInline: false,
+			importPageMacros: true}),
 		container = $tw.fakeDocument.createElement("div");
 	widgetNode.render(container,null);
 	return container;
 };
 
 Slicer.prototype.getSourceDocument = function() {
-	var tiddler = $tw.wiki.getTiddler(this.sourceTitle);
-	if(tiddler.fields.type === "text/html") {
-		return this.getSourceHtmlDocument(tiddler);
+	if(this.sourceTiddler.fields.type === "text/html") {
+		return this.getSourceHtmlDocument(this.sourceTiddler);
 	} else {
-		return this.getSourceWikiDocument(tiddler);
+		return this.getSourceWikiDocument(this.sourceTiddler);
 	}
 };
 
@@ -192,17 +203,21 @@ Slicer.prototype.processNode = function(domNode) {
 };
 
 // Slice a tiddler into individual tiddlers
-Slicer.prototype.sliceTiddler = function(title) {
-	this.sliceTitle = "Sliced up " + title;
+Slicer.prototype.sliceTiddler = function() {
+	var sliceTitle,sliceTiddler = {};
+	if(this.sourceTiddler) {
+		sliceTiddler = $tw.utils.extend({},this.sourceTiddler.fields);
+	}
+	sliceTiddler.title = this.destTitle;
+	sliceTiddler.text =  "Document sliced at " + (new Date());
+	sliceTiddler.type = "text/vnd.tiddlywiki";
+	sliceTiddler.tags = [];
+	sliceTiddler.list = [];
+	sliceTiddler["toc-type"] = "document";
 	var domNode = this.getSourceDocument();
-	this.parentStack.push({type: "h0", title: this.addTiddler({
-		title: this.sliceTitle,
-		text: "Document sliced at " + (new Date()),
-		list: [],
-		"toc-type": "document"
-	})});
-	this.currentTiddler = title;
-	this.containerStack.push(this.sliceTitle);
+	this.parentStack.push({type: "h0", title: this.addTiddler(sliceTiddler)});
+	this.currentTiddler = sliceTiddler.title;
+	this.containerStack.push(sliceTiddler.title);
 	this.processNodeList(domNode.childNodes);
 	this.containerStack.pop();
 };
diff --git a/plugins/tiddlywiki/text-slicer/modules/slicers/def-list.js b/plugins/tiddlywiki/text-slicer/modules/slicers/def-list.js
index bfcdce28e..2f471b78e 100644
--- a/plugins/tiddlywiki/text-slicer/modules/slicers/def-list.js
+++ b/plugins/tiddlywiki/text-slicer/modules/slicers/def-list.js
@@ -17,7 +17,7 @@ exports.processDefListNode = function(domNode,tagName) {
 		var title = this.makeUniqueTitle("def-list-" + tagName),
 			parentTitle = this.parentStack[this.parentStack.length - 1].title,
 			tags = [];
-		if(domNode.className.trim() !== "") {
+		if(domNode.className && domNode.className.trim() !== "") {
 			tags = tags.concat(domNode.className.split(" "));
 		}
 		this.addToList(parentTitle,title);
diff --git a/plugins/tiddlywiki/text-slicer/modules/slicers/definition.js b/plugins/tiddlywiki/text-slicer/modules/slicers/definition.js
index dc4d064c6..a5bcc695f 100644
--- a/plugins/tiddlywiki/text-slicer/modules/slicers/definition.js
+++ b/plugins/tiddlywiki/text-slicer/modules/slicers/definition.js
@@ -19,7 +19,7 @@ exports.processDefinitionNode = function(domNode,tagName) {
 			var title = this.makeUniqueTitle("definition",text),
 				parentTitle = this.parentStack[this.parentStack.length - 1].title,
 				tags = [];
-			if(domNode.className.trim() !== "") {
+			if(domNode.className && domNode.className.trim() !== "") {
 				tags = tags.concat(domNode.className.split(" "));
 			}
 			this.addToList(parentTitle,title);
diff --git a/plugins/tiddlywiki/text-slicer/modules/slicers/heading.js b/plugins/tiddlywiki/text-slicer/modules/slicers/heading.js
index cdc9ff1c5..c263c1074 100644
--- a/plugins/tiddlywiki/text-slicer/modules/slicers/heading.js
+++ b/plugins/tiddlywiki/text-slicer/modules/slicers/heading.js
@@ -18,7 +18,7 @@ exports.processHeadingNode = function(domNode,tagName) {
 		var title = this.makeUniqueTitle("heading",text),
 			parentTitle = this.popParentStackUntil(tagName),
 			tags = [];
-		if(domNode.className.trim() !== "") {
+		if(domNode.className && domNode.className.trim() !== "") {
 			tags = tags.concat(domNode.className.split(" "));
 		}
 		this.addToList(parentTitle,title);
diff --git a/plugins/tiddlywiki/text-slicer/modules/slicers/item.js b/plugins/tiddlywiki/text-slicer/modules/slicers/item.js
index e8c772310..b4a3dd201 100644
--- a/plugins/tiddlywiki/text-slicer/modules/slicers/item.js
+++ b/plugins/tiddlywiki/text-slicer/modules/slicers/item.js
@@ -19,7 +19,7 @@ exports.processListItemNode = function(domNode,tagName) {
 			var title = this.makeUniqueTitle("list-item",text),
 				parentTitle = this.parentStack[this.parentStack.length - 1].title,
 				tags = [];
-			if(domNode.className.trim() !== "") {
+			if(domNode.className && domNode.className.trim() !== "") {
 				tags = tags.concat(domNode.className.split(" "));
 			}
 			this.addToList(parentTitle,title);
diff --git a/plugins/tiddlywiki/text-slicer/modules/slicers/list.js b/plugins/tiddlywiki/text-slicer/modules/slicers/list.js
index 1e203b772..53b1c62f9 100644
--- a/plugins/tiddlywiki/text-slicer/modules/slicers/list.js
+++ b/plugins/tiddlywiki/text-slicer/modules/slicers/list.js
@@ -17,7 +17,7 @@ exports.processListNode = function(domNode,tagName) {
 		var title = this.makeUniqueTitle("list-" + tagName),
 			parentTitle = this.parentStack[this.parentStack.length - 1].title,
 			tags = [];
-		if(domNode.className.trim() !== "") {
+		if(domNode.className && domNode.className.trim() !== "") {
 			tags = tags.concat(domNode.className.split(" "));
 		}
 		this.addToList(parentTitle,title);
diff --git a/plugins/tiddlywiki/text-slicer/modules/slicers/paragraph.js b/plugins/tiddlywiki/text-slicer/modules/slicers/paragraph.js
index db28ad902..e5a2b088e 100644
--- a/plugins/tiddlywiki/text-slicer/modules/slicers/paragraph.js
+++ b/plugins/tiddlywiki/text-slicer/modules/slicers/paragraph.js
@@ -19,7 +19,7 @@ exports.processParagraphNode = function(domNode,tagName) {
 			var parentTitle = this.parentStack[this.parentStack.length - 1].title,
 				tags = [],
 				title = this.makeUniqueTitle("paragraph",text);
-			if(domNode.className.trim() !== "") {
+			if(domNode.className && domNode.className && domNode.className.trim() !== "") {
 				tags = tags.concat(domNode.className.split(" "));
 			}
 			this.addToList(parentTitle,this.addTiddler({
diff --git a/plugins/tiddlywiki/text-slicer/modules/slicers/term.js b/plugins/tiddlywiki/text-slicer/modules/slicers/term.js
index d72875e18..6ee16dde3 100644
--- a/plugins/tiddlywiki/text-slicer/modules/slicers/term.js
+++ b/plugins/tiddlywiki/text-slicer/modules/slicers/term.js
@@ -19,7 +19,7 @@ exports.processTermNode = function(domNode,tagName) {
 			var title = this.makeUniqueTitle("term",text),
 				parentTitle = this.parentStack[this.parentStack.length - 1].title,
 				tags = [];
-			if(domNode.className.trim() !== "") {
+			if(domNode.className && domNode.className.trim() !== "") {
 				tags = tags.concat(domNode.className.split(" "));
 			}
 			this.addToList(parentTitle,title);
diff --git a/plugins/tiddlywiki/text-slicer/modules/startup/slicer-message.js b/plugins/tiddlywiki/text-slicer/modules/startup/slicer-message.js
index 2a38d6a05..7cb457549 100644
--- a/plugins/tiddlywiki/text-slicer/modules/startup/slicer-message.js
+++ b/plugins/tiddlywiki/text-slicer/modules/startup/slicer-message.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/plugins/tiddlywiki/text-slicer/modules/startup/slicer.js
+title: $:/plugins/tiddlywiki/text-slicer/modules/startup/slicer-message.js
 type: application/javascript
 module-type: startup
 
@@ -21,7 +21,9 @@ exports.synchronous = true;
 // Install the root widget event handlers
 exports.startup = function() {
 	$tw.rootWidget.addEventListener("tm-slice-tiddler",function(event) {
-		var slicer = new $tw.Slicer($tw.wiki,event.param);
+		var slicer = new $tw.Slicer($tw.wiki,event.param,{
+			destTitle: event.paramObject && event.paramObject.destTitle
+		});
 		slicer.sliceTiddler(event.param)
 		slicer.outputTiddlers();
 		slicer.destroy();
diff --git a/plugins/tiddlywiki/text-slicer/styles.tid b/plugins/tiddlywiki/text-slicer/styles.tid
index cf74a4653..370b4d684 100644
--- a/plugins/tiddlywiki/text-slicer/styles.tid
+++ b/plugins/tiddlywiki/text-slicer/styles.tid
@@ -21,17 +21,82 @@ tags: $:/tags/Stylesheet
 	font-size: 1.7em;
 }
 
+.tc-slice-note {
+    color: #800;
+    padding: 4px 4px 4px 4px;
+    border: 1px solid #feed77;
+    background: #feed77;
+    background: -webkit-gradient(linear,left top,left bottom,color-stop(0%,#dede80),color-stop(7%,#feed77),color-stop(92%,#feed77),color-stop(100%,#dede80));
+    background: -webkit-linear-gradient(72deg,rgba(255, 255, 255, 0.5) 8%,rgba(255, 255, 255, 0.1) 80%), -webkit-linear-gradient(top,#dede80 0,#feed77 7%,#feed77 92%,#dede80 100%);
+    background: -moz-linear-gradient(72deg,rgba(255, 255, 255, 0.5) 8%,rgba(255, 255, 255, 0.1) 80%), -moz-linear-gradient(top,#dede80 0,#feed77 7%,#feed77 92%,#dede80 100%);
+    background: -o-linear-gradient(72deg,rgba(255, 255, 255, 0.5) 8%,rgba(255, 255, 255, 0.1) 80%), -o-linear-gradient(top,#dede80 0,#feed77 7%,#feed77 92%,#dede80 100%);
+    background: -ms-linear-gradient(72deg,rgba(255, 255, 255, 0.5) 8%,rgba(255, 255, 255, 0.1) 80%), -ms-linear-gradient(top,#dede80 0,#feed77 7%,#feed77 92%,#dede80 100%);
+    background: linear-gradient(72deg,rgba(255, 255, 255, 0.5) 8%,rgba(255, 255, 255, 0.1) 80%), linear-gradient(top,#dede80 0,#feed77 7%,#feed77 92%,#dede80 100%);
+	<<box-shadow "1px 1px 6px rgba(0,0,0,0.4)">>
+}
+
 .tc-document-preview-column .tc-sliced-document-header {
 	margin-left: 24px;
 }
 
 .tc-document-preview-column .tc-sliced-document {
 	margin-bottom: 3px;
-	border-bottom: 2px solid <<colour muted-foreground>>;
 }
 
-.tc-view-template-document-tiddler-heading {
-	border-top: 2px solid <<colour muted-foreground>>;
+.tc-view-template-document-tiddler-wrapper,
+.tc-edit-template-document-tiddler-wrapper {
+    border-top: 2px solid #D6A2A2;
+    margin-left: -42px;
+    margin-right: -42px;
+    margin-bottom: -42px;
+    padding-left: 42px;
+    padding-right: 42px;
+    background: #FFE3E3;
+    padding-bottom: 10px;
+}
+
+.tc-edit-template-document-tiddler-wrapper {
+	background: #A3A3D7;
+}
+
+div.tc-view-template-document-tiddler-heading a,
+div.tc-edit-template-document-tiddler-heading a {
+	border: 1px solid #D6A2A2;
+	background: #fff;
+	border-radius: 16px;
+    padding: 0px 4px 0px 4px;
+    margin: 2px 4px 2px 4px;
+    white-space: nowrap;
+    display: inline-block;
+}
+
+div.tc-view-template-document-tiddler-heading a:hover,
+div.tc-edit-template-document-tiddler-heading a:hover {
+	border: 1px solid <<colour background>>;
+	text-decoration: none;
+	color: <<colour background>>;
+	background: <<colour foreground>>;
+}
+
+.tc-view-template-document-tiddler-heading-icon,
+.tc-edit-template-document-tiddler-heading-icon {
+	width: 42px;
+	text-align: center;
+    margin-left: -42px;
+    margin-right: -42px;
+    position: absolute;
+}
+
+.tc-view-template-document-tiddler-subheading,
+.tc-edit-template-document-tiddler-subheading {
+	font-size: 0.7em;
+	font-weight: bold;
+	color: <<colour muted-foreground>>;
+}
+
+.tc-view-template-document-tiddler-heading-icon svg,
+.tc-edit-template-document-tiddler-heading-icon svg {
+	fill: <<colour background>>;	
 }
 
 .tc-view-template-document-tiddler {
diff --git a/plugins/tiddlywiki/text-slicer/templates/interactive/document.tid b/plugins/tiddlywiki/text-slicer/templates/interactive/document.tid
index 171c73c26..1a5366ce6 100644
--- a/plugins/tiddlywiki/text-slicer/templates/interactive/document.tid
+++ b/plugins/tiddlywiki/text-slicer/templates/interactive/document.tid
@@ -1,15 +1,19 @@
 title: $:/plugins/tiddlywiki/text-slicer/templates/interactive/document
 
 \define config-document-status()
-$:/config/plugins/tiddlywiki/text-slicer/show-preview-document/$(tv-heading-status-config-prefix)$/$(currentTiddler)$
+$:/state/plugins/tiddlywiki/text-slicer/show-preview-document/$(tv-heading-status-config-prefix)$/$(currentTiddler)$
 \end
 
 \define config-show-toolbar()
-$:/config/plugins/tiddlywiki/text-slicer/show-toolbar/$(currentTiddler)$
+$:/state/plugins/tiddlywiki/text-slicer/show-toolbar/$(currentTiddler)$
+\end
+
+\define config-show-metadata()
+$:/state/plugins/tiddlywiki/text-slicer/show-metadata/$(currentTiddler)$
 \end
 
 \define config-heading-status()
-$:/config/plugins/tiddlywiki/text-slicer/heading-status/$(currentTiddler)$
+$:/state/plugins/tiddlywiki/text-slicer/heading-status/$(currentTiddler)$
 \end
 
 \define body()
@@ -18,20 +22,20 @@ $:/config/plugins/tiddlywiki/text-slicer/heading-status/$(currentTiddler)$
 <div class="tc-sliced-document">
 <div class="tc-sliced-document-header">
 <div class="tc-document-tiddler-toolbar">
-<$reveal type="nomatch" state=<<config-document-status>> text="open" default="closed">
-<$button set=<<config-document-status>> setTo="open" class="tc-btn-invisible">
+<$reveal type="nomatch" state=<<config-document-status>> text="close" default="open">
+<$button set=<<config-document-status>> setTo="close" class="tc-btn-invisible">
 {{$:/core/images/down-arrow}}
 </$button>
 </$reveal>
-<$reveal type="match" state=<<config-document-status>> text="open" default="closed">
-<$button set=<<config-document-status>> setTo="close" class="tc-btn-invisible">
+<$reveal type="match" state=<<config-document-status>> text="close" default="open">
+<$button set=<<config-document-status>> setTo="open" class="tc-btn-invisible">
 {{$:/core/images/right-arrow}}
 </$button>
 </$reveal>
 </div>
 <h1 class="tc-sliced-document-title">''Document'': <$link><$view field="title"/></$link></h1>
 </div>
-<$reveal type="nomatch" state=<<config-document-status>> text="open" default="closed">
+<$reveal type="nomatch" state=<<config-document-status>> text="close" default="open">
 {{||$:/plugins/tiddlywiki/text-slicer/ui/document/header}}
 <div class='tc-sliced-document-body'>
 <$set name="tv-show-toolbar" value={{$(config-show-toolbar)$}}>
diff --git a/plugins/tiddlywiki/text-slicer/templates/interactive/heading.tid b/plugins/tiddlywiki/text-slicer/templates/interactive/heading.tid
index e9d47270c..9498c1a5c 100644
--- a/plugins/tiddlywiki/text-slicer/templates/interactive/heading.tid
+++ b/plugins/tiddlywiki/text-slicer/templates/interactive/heading.tid
@@ -8,13 +8,13 @@ $(tv-heading-status-config-title)$/$(tv-heading-status-config-prefix)$/$(current
 <$set name="tv-heading-status-config-title" value=<<config-heading-status>>>
 <div class="tc-document-tiddler">
 <div class="tc-document-tiddler-toolbar">
-<$reveal type="nomatch" state=<<tv-heading-status-config-title>> text="open" default=<<tv-default-heading-state>>>
-<$button set=<<tv-heading-status-config-title>> setTo="open" class="tc-btn-invisible">
+<$reveal type="nomatch" state=<<tv-heading-status-config-title>> text="close" default=<<tv-default-heading-state>>>
+<$button set=<<tv-heading-status-config-title>> setTo="close" class="tc-btn-invisible">
 {{$:/core/images/down-arrow}}
 </$button>
 </$reveal>
-<$reveal type="match" state=<<tv-heading-status-config-title>> text="open" default=<<tv-default-heading-state>>>
-<$button set=<<tv-heading-status-config-title>> setTo="close" class="tc-btn-invisible">
+<$reveal type="match" state=<<tv-heading-status-config-title>> text="close" default=<<tv-default-heading-state>>>
+<$button set=<<tv-heading-status-config-title>> setTo="open" class="tc-btn-invisible">
 {{$:/core/images/right-arrow}}
 </$button>
 </$reveal>
@@ -22,7 +22,7 @@ $(tv-heading-status-config-title)$/$(tv-heading-status-config-prefix)$/$(current
 <$link tag="$level$" class="tc-document-tiddler-link">
 <$transclude/>
 </$link>
-<$reveal type="nomatch" state=<<tv-heading-status-config-title>> text="open" default=<<tv-default-heading-state>>>
+<$reveal type="nomatch" state=<<tv-heading-status-config-title>> text="close" default=<<tv-default-heading-state>>>
 <$list filter="[list<currentTiddler>!has[draft.of]]" template="$:/plugins/tiddlywiki/text-slicer/templates/interactive/tiddler"/>
 </$reveal>
 </div>
diff --git a/plugins/tiddlywiki/text-slicer/templates/interactive/note.tid b/plugins/tiddlywiki/text-slicer/templates/interactive/note.tid
new file mode 100644
index 000000000..e2f3c4f3e
--- /dev/null
+++ b/plugins/tiddlywiki/text-slicer/templates/interactive/note.tid
@@ -0,0 +1,19 @@
+title: $:/plugins/tiddlywiki/text-slicer/templates/interactive/note
+
+\define body()
+<div class="tc-slice-note">
+
+<$link tag="div" class="tc-document-tiddler-link tc-document-tiddler">
+
+<$list filter="""[all[current]] $(tv-exclude-filter)$ +[limit[1]]""" variable="item">
+
+<$transclude/>
+
+</$list>
+
+</$link>
+
+</div>
+\end
+
+<<body>>
diff --git a/plugins/tiddlywiki/text-slicer/templates/interactive/tiddler.tid b/plugins/tiddlywiki/text-slicer/templates/interactive/tiddler.tid
index fd98e761a..2d53001b8 100644
--- a/plugins/tiddlywiki/text-slicer/templates/interactive/tiddler.tid
+++ b/plugins/tiddlywiki/text-slicer/templates/interactive/tiddler.tid
@@ -16,6 +16,10 @@ title: $:/plugins/tiddlywiki/text-slicer/templates/interactive/tiddler
 <$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/interactive/paragraph" mode="block"/>
 </$reveal>
 
+<$reveal type="match" state="!!toc-type" text="note">
+<$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/interactive/note" mode="block"/>
+</$reveal>
+
 <$reveal type="match" state="!!toc-type" text="list">
 <$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/interactive/list" mode="block"/>
 </$reveal>
diff --git a/plugins/tiddlywiki/text-slicer/templates/plain/note.tid b/plugins/tiddlywiki/text-slicer/templates/plain/note.tid
new file mode 100644
index 000000000..cddda37d6
--- /dev/null
+++ b/plugins/tiddlywiki/text-slicer/templates/plain/note.tid
@@ -0,0 +1,3 @@
+title: $:/plugins/tiddlywiki/text-slicer/templates/plain/note
+
+<!-- Don't display notes in plain mode -->
diff --git a/plugins/tiddlywiki/text-slicer/templates/plain/tiddler.tid b/plugins/tiddlywiki/text-slicer/templates/plain/tiddler.tid
index 390c2e308..f2b67200a 100644
--- a/plugins/tiddlywiki/text-slicer/templates/plain/tiddler.tid
+++ b/plugins/tiddlywiki/text-slicer/templates/plain/tiddler.tid
@@ -14,6 +14,10 @@ title: $:/plugins/tiddlywiki/text-slicer/templates/plain/tiddler
 <$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/plain/paragraph" mode="block"/>
 </$list>
 
+<$list filter="[<toc-type>prefix[note]]" variable="item">
+<$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/plain/note" mode="block"/>
+</$list>
+
 <$list filter="[<toc-type>prefix[list]]" variable="item">
 <$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/plain/list" mode="block"/>
 </$list>
diff --git a/plugins/tiddlywiki/text-slicer/templates/static/item.tid b/plugins/tiddlywiki/text-slicer/templates/static/item.tid
index 268320c13..1c7f5a703 100644
--- a/plugins/tiddlywiki/text-slicer/templates/static/item.tid
+++ b/plugins/tiddlywiki/text-slicer/templates/static/item.tid
@@ -4,6 +4,7 @@ title: $:/plugins/tiddlywiki/text-slicer/templates/static/item
 
 <$transclude/>
 
+<$list filter="[list<currentTiddler>!has[draft.of]]" template="$:/plugins/tiddlywiki/text-slicer/templates/static/tiddler"/>
+
 `</li>`
 
-<$list filter="[list<currentTiddler>!has[draft.of]]" template="$:/plugins/tiddlywiki/text-slicer/templates/static/tiddler"/>
diff --git a/plugins/tiddlywiki/text-slicer/templates/static/note.tid b/plugins/tiddlywiki/text-slicer/templates/static/note.tid
new file mode 100644
index 000000000..1530d9538
--- /dev/null
+++ b/plugins/tiddlywiki/text-slicer/templates/static/note.tid
@@ -0,0 +1,3 @@
+title: $:/plugins/tiddlywiki/text-slicer/templates/static/note
+
+<!-- Don't display notes in static mode -->
diff --git a/plugins/tiddlywiki/text-slicer/templates/static/tiddler.tid b/plugins/tiddlywiki/text-slicer/templates/static/tiddler.tid
index bd8e1e822..8f4c6fe59 100644
--- a/plugins/tiddlywiki/text-slicer/templates/static/tiddler.tid
+++ b/plugins/tiddlywiki/text-slicer/templates/static/tiddler.tid
@@ -20,6 +20,12 @@ title: $:/plugins/tiddlywiki/text-slicer/templates/static/tiddler
 
 </$list>
 
+<$list filter="[<toc-type>prefix[note]]" variable="item">
+
+<$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/static/note" mode="block"/>
+
+</$list>
+
 <$list filter="[<toc-type>prefix[list]]" variable="item">
 
 <$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/static/list" mode="block"/>
diff --git a/plugins/tiddlywiki/text-slicer/ui/document/header.tid b/plugins/tiddlywiki/text-slicer/ui/document/header.tid
index 3cd254183..1908dff41 100644
--- a/plugins/tiddlywiki/text-slicer/ui/document/header.tid
+++ b/plugins/tiddlywiki/text-slicer/ui/document/header.tid
@@ -20,13 +20,12 @@ title: $:/plugins/tiddlywiki/text-slicer/ui/document/header
 
 ''Exclude filter'': <$edit-text field="toc-exclude-filter"/>
 
-<$checkbox tiddler=<<config-show-toolbar>> field="text" checked="yes" unchecked="no" default="no"> Show toolbar</$checkbox>
-
-<$button>
+<$checkbox tiddler=<<config-show-toolbar>> field="text" checked="yes" unchecked="no" default="no"> Show toolbar </$checkbox> <$checkbox tiddler=<<config-show-metadata>> field="text" checked="yes" unchecked="no" default="no"> Show metadata</$checkbox> <$button>
 <$action-sendmessage $message="tm-open-window" $param=<<currentTiddler>> template="$:/plugins/tiddlywiki/text-slicer/templates/plain/document"/>
 View document
 </$button>
 
+<$reveal state=<<config-show-metadata>> default="no" type="match" text="yes">
 <table>
 <tbody>
 <$list filter="[all[system+tiddlers]tag[$:/tags/DocumentMetaData]]" variable="listItem">
@@ -34,5 +33,7 @@ View document
 </$list>
 </tbody>
 </table>
+</$reveal>
+
 
 </div>
diff --git a/plugins/tiddlywiki/text-slicer/ui/edit-template-segment.tid b/plugins/tiddlywiki/text-slicer/ui/edit-template-segment.tid
new file mode 100644
index 000000000..bd836a425
--- /dev/null
+++ b/plugins/tiddlywiki/text-slicer/ui/edit-template-segment.tid
@@ -0,0 +1,35 @@
+title: $:/plugins/tiddlywiki/text-slicer/ui/edit-template-segment
+tags: $:/tags/EditTemplate
+
+\define edit-field(name,tag:"input")
+$name$:
+
+<$edit-text field="""$name$""" tag="$tag$" class="tc-edit-texteditor"/>
+\end
+
+<$reveal type="nomatch" state="!!toc-type" text="">
+
+<div class="tc-edit-template-document-tiddler-wrapper">
+
+<div class="tc-edit-template-document-tiddler-heading">
+
+<div class="tc-edit-template-document-tiddler-heading-icon">
+
+{{$:/core/images/file}}
+
+</div>
+
+<div class="tc-edit-template-document-tiddler-subheading">
+
+<$view field="toc-type"/>
+
+</div>
+
+<<edit-field "list" tag:"textarea">>
+
+</div>
+
+</div>
+
+</$reveal>
+
diff --git a/plugins/tiddlywiki/text-slicer/ui/filters/Orphans.tid b/plugins/tiddlywiki/text-slicer/ui/filters/Orphans.tid
new file mode 100644
index 000000000..d4ab0b8d7
--- /dev/null
+++ b/plugins/tiddlywiki/text-slicer/ui/filters/Orphans.tid
@@ -0,0 +1,5 @@
+title: $:/plugins/tiddlywiki/text-slicer/filters/Orphans
+tags: $:/tags/Filter
+filter: [has[toc-type]] -[toc-type[document]list-children[]]
+description: [Text-slicer] Tiddlers that are not part of any document
+
diff --git a/plugins/tiddlywiki/text-slicer/ui/preview-column.tid b/plugins/tiddlywiki/text-slicer/ui/preview-column.tid
index 41eeac5fa..44532f6d3 100644
--- a/plugins/tiddlywiki/text-slicer/ui/preview-column.tid
+++ b/plugins/tiddlywiki/text-slicer/ui/preview-column.tid
@@ -3,10 +3,16 @@ tags: $:/tags/AboveStory
 
 <$scrollable fallthrough="no" class="tc-document-preview-column">
 
+<$vars
+	tv-default-heading-state="open"
+>
+
 <$list filter="[toc-type[document]!has[draft.of]sort[title]limit[1]]" emptyMessage={{$:/plugins/tiddlywiki/text-slicer/ui/preview-column/empty}}>
 
 <$list filter="[toc-type[document]!has[draft.of]sort[title]butfirst[1]limit[1]]" emptyMessage={{$:/plugins/tiddlywiki/text-slicer/ui/preview-column/single}} template="$:/plugins/tiddlywiki/text-slicer/ui/preview-column/multiple"/>
 
 </$list>
 
+</$vars>
+
 </$scrollable>
diff --git a/plugins/tiddlywiki/text-slicer/ui/tiddler/toolbar/title.tid b/plugins/tiddlywiki/text-slicer/ui/tiddler/toolbar/title.tid
index 52af7ef73..d1ed0b583 100644
--- a/plugins/tiddlywiki/text-slicer/ui/tiddler/toolbar/title.tid
+++ b/plugins/tiddlywiki/text-slicer/ui/tiddler/toolbar/title.tid
@@ -2,7 +2,7 @@ title: $:/plugins/tiddlywiki/text-slicer/ui/tiddler/toolbar/title
 tags: $:/tags/TextSlicerToolbar
 
 \define renameProxyTitle()
-$:/config/plugins/tiddlywiki/text-slicer/rename-$(currentTiddler)$
+$:/state/plugins/tiddlywiki/text-slicer/rename-$(currentTiddler)$
 \end
 
 \define body()
diff --git a/plugins/tiddlywiki/text-slicer/ui/view-template-segment.tid b/plugins/tiddlywiki/text-slicer/ui/view-template-segment.tid
index 8f14e4454..ebc346e8e 100644
--- a/plugins/tiddlywiki/text-slicer/ui/view-template-segment.tid
+++ b/plugins/tiddlywiki/text-slicer/ui/view-template-segment.tid
@@ -1,19 +1,43 @@
 title: $:/plugins/tiddlywiki/text-slicer/ui/view-template-segment
 tags: $:/tags/ViewTemplate
 
+\define config-heading-status()
+$:/state/plugins/tiddlywiki/text-slicer/heading-status/$(currentTiddler)$
+\end
+
 <$reveal type="nomatch" state=<<folded-state>> text="hide" retain="yes" animate="yes">
 
 <$reveal type="nomatch" state="!!toc-type" text="">
 
+<div class="tc-view-template-document-tiddler-wrapper">
+
 <div class="tc-view-template-document-tiddler-heading">
 
-//This tiddler is part of a document. The content as it appears in the document appears below.//
+<div class="tc-view-template-document-tiddler-heading-icon">
+
+{{$:/core/images/file}}
+
+</div>
+
+<div class="tc-view-template-document-tiddler-subheading">
+
+<$view field="toc-type"/>
+
+</div>
+
+Parents: <$list filter="[all[current]listed[]!is[system]]" emptyMessage="None">
+<$link><$view field="title"/></$link>
+</$list>
 
 </div>
 
 <div class="tc-view-template-document-tiddler">
 
-<$vars tv-default-heading-state="closed" tv-heading-status-config-prefix="view-template">
+<$vars
+	tv-default-heading-state="close"
+	tv-heading-status-config-prefix="view-template"
+	tv-heading-status-config-title=<<config-heading-status>>
+>
 
 <$transclude tiddler="$:/plugins/tiddlywiki/text-slicer/templates/interactive/tiddler"/>
 
@@ -21,6 +45,8 @@ tags: $:/tags/ViewTemplate
 
 </div>
 
+</div>
+
 </$reveal>
 
 </$reveal>
diff --git a/plugins/tiddlywiki/tiddlyweb/tiddlywebadaptor.js b/plugins/tiddlywiki/tiddlyweb/tiddlywebadaptor.js
index 3ff03f7a5..9666ed0f8 100644
--- a/plugins/tiddlywiki/tiddlyweb/tiddlywebadaptor.js
+++ b/plugins/tiddlywiki/tiddlyweb/tiddlywebadaptor.js
@@ -19,9 +19,14 @@ function TiddlyWebAdaptor(options) {
 	this.wiki = options.wiki;
 	this.host = this.getHost();
 	this.recipe = undefined;
+	this.hasStatus = false;
 	this.logger = new $tw.utils.Logger("TiddlyWebAdaptor");
 }
 
+TiddlyWebAdaptor.prototype.isReady = function() {
+	return this.hasStatus;
+};
+
 TiddlyWebAdaptor.prototype.getHost = function() {
 	var text = this.wiki.getTiddlerText(CONFIG_HOST_TIDDLER,DEFAULT_HOST_TIDDLER),
 		substitutions = [
@@ -30,7 +35,7 @@ TiddlyWebAdaptor.prototype.getHost = function() {
 		];
 	for(var t=0; t<substitutions.length; t++) {
 		var s = substitutions[t];
-		text = text.replace(new RegExp("\\$" + s.name + "\\$","mg"),s.value);
+		text = $tw.utils.replaceString(text,new RegExp("\\$" + s.name + "\\$","mg"),s.value);
 	}
 	return text;
 };
@@ -51,6 +56,7 @@ TiddlyWebAdaptor.prototype.getStatus = function(callback) {
 	$tw.utils.httpRequest({
 		url: this.host + "status",
 		callback: function(err,data) {
+			self.hasStatus = true;
 			if(err) {
 				return callback(err);
 			}
diff --git a/plugins/tiddlywiki/translators/output-file-templates/Exporters.multids.tid b/plugins/tiddlywiki/translators/output-file-templates/Exporters.multids.tid
new file mode 100644
index 000000000..88a6c86bd
--- /dev/null
+++ b/plugins/tiddlywiki/translators/output-file-templates/Exporters.multids.tid
@@ -0,0 +1,3 @@
+title: $:/plugins/tiddlywiki/translators/templates/Exporters.multids
+
+{{$:/language/Exporters/||$:/plugins/tiddlywiki/translators/templates/multids}}
\ No newline at end of file
diff --git a/plugins/tiddlywiki/translators/output-file-templates/Misc.multids.tid b/plugins/tiddlywiki/translators/output-file-templates/Misc.multids.tid
index ed19066d1..43ec9daf8 100644
--- a/plugins/tiddlywiki/translators/output-file-templates/Misc.multids.tid
+++ b/plugins/tiddlywiki/translators/output-file-templates/Misc.multids.tid
@@ -6,6 +6,7 @@ title: $:/plugins/tiddlywiki/translators/templates/Misc.multids
 -[all[tiddlers]prefix[$:/language/Date/]]
 -[all[tiddlers]prefix[$:/language/Docs/]]
 -[all[tiddlers]prefix[$:/language/EditTemplate/]]
+-[all[tiddlers]prefix[$:/language/Exporters/]]
 -[all[tiddlers]prefix[$:/language/Filters/]]
 -[all[tiddlers]prefix[$:/language/Help/]]
 -[all[tiddlers]prefix[$:/language/Import/]]
@@ -14,5 +15,7 @@ title: $:/plugins/tiddlywiki/translators/templates/Misc.multids
 -[all[tiddlers]prefix[$:/language/RelativeDate/]]
 -[all[tiddlers]prefix[$:/language/Search/]]
 -[all[tiddlers]prefix[$:/language/SideBar/]]
+-[all[tiddlers]prefix[$:/language/Snippets/]]
+-[all[tiddlers]prefix[$:/language/ThemeTweaks/]]
 -[all[tiddlers]prefix[$:/language/TiddlerInfo/]]
 +[sort[title]]||$:/plugins/tiddlywiki/translators/templates/filtered-multids}}
\ No newline at end of file
diff --git a/plugins/tiddlywiki/translators/output-file-templates/ThemeTweaks.multids.tid b/plugins/tiddlywiki/translators/output-file-templates/ThemeTweaks.multids.tid
new file mode 100644
index 000000000..a3f90606c
--- /dev/null
+++ b/plugins/tiddlywiki/translators/output-file-templates/ThemeTweaks.multids.tid
@@ -0,0 +1,3 @@
+title: $:/plugins/tiddlywiki/translators/templates/ThemeTweaks.multids
+
+{{$:/language/ThemeTweaks/||$:/plugins/tiddlywiki/translators/templates/multids}}
\ No newline at end of file
diff --git a/plugins/tiddlywiki/translators/templates/snippet-tid.tid b/plugins/tiddlywiki/translators/templates/snippet-tid.tid
new file mode 100644
index 000000000..d2bc48cfd
--- /dev/null
+++ b/plugins/tiddlywiki/translators/templates/snippet-tid.tid
@@ -0,0 +1,10 @@
+title: $:/plugins/tiddlywiki/translators/templates/snippet-tid
+
+\define generateTid(title)
+title: $:/language/Snippets/$title$
+tags: $:/tags/TextEditor/Snippet
+caption: <$text text={{$:/language/Snippets/$title$!!caption}}/>
+
+<$text text={{$:/language/Snippets/$title$}}/>
+\end
+<$macrocall $name="generateTid" title=<<currentTiddler>>/>
\ No newline at end of file
diff --git a/plugins/tiddlywiki/translators/templates/tid.tid b/plugins/tiddlywiki/translators/templates/tid.tid
index 7fde58ac4..55aee6602 100644
--- a/plugins/tiddlywiki/translators/templates/tid.tid
+++ b/plugins/tiddlywiki/translators/templates/tid.tid
@@ -3,6 +3,6 @@ title: $:/plugins/tiddlywiki/translators/templates/tid
 \define generateTid(title)
 title: $title$
 
-<$list filter="""[[$title$]is[tiddler]]"""><$transclude tiddler="""$title$"""/></$list>
+<$list filter="""[[$title$]is[tiddler]]"""><$text text={{$title$}}/></$list>
 \end
 <$macrocall $name="generateTid" title=<<currentTiddler>>/>
\ No newline at end of file
diff --git a/plugins/tiddlywiki/translators/ui/editorTag.tid b/plugins/tiddlywiki/translators/ui/editorTag.tid
index 81f163abc..02b3c8ce3 100644
--- a/plugins/tiddlywiki/translators/ui/editorTag.tid
+++ b/plugins/tiddlywiki/translators/ui/editorTag.tid
@@ -1,3 +1,3 @@
 title: $:/plugins/tiddlywiki/translators/editorTag
 
-input
\ No newline at end of file
+textarea
\ No newline at end of file
diff --git a/plugins/tiddlywiki/translators/ui/group/Miscellaneous.tid b/plugins/tiddlywiki/translators/ui/group/Miscellaneous.tid
index a43153193..19b640032 100644
--- a/plugins/tiddlywiki/translators/ui/group/Miscellaneous.tid
+++ b/plugins/tiddlywiki/translators/ui/group/Miscellaneous.tid
@@ -15,6 +15,8 @@ tags: $:/tags/TranslationGroup
 -[all[tiddlers+shadows]prefix[$:/language/RelativeDate/]]
 -[all[tiddlers+shadows]prefix[$:/language/Search/]]
 -[all[tiddlers+shadows]prefix[$:/language/SideBar/]]
+-[all[tiddlers+shadows]prefix[$:/language/Snippets/]]
+-[all[tiddlers+shadows]prefix[$:/language/ThemeTweaks/]]
 -[all[tiddlers+shadows]prefix[$:/language/TiddlerInfo/]]
 [all[tiddlers+shadows]prefix[$:/config/NewJournal/]]
 [[$:/SiteTitle]]
diff --git a/plugins/tiddlywiki/translators/ui/group/Snippets.tid b/plugins/tiddlywiki/translators/ui/group/Snippets.tid
new file mode 100644
index 000000000..6880c58a1
--- /dev/null
+++ b/plugins/tiddlywiki/translators/ui/group/Snippets.tid
@@ -0,0 +1,16 @@
+title: $:/plugins/tiddlywiki/translators/ui/group/Snippets
+caption: Snippets
+tags: $:/tags/TranslationGroup
+
+\define translatableTiddlerTitles()
+[all[tiddlers+shadows]prefix[$:/language/Snippets/]sort[title]]
+\end
+\define shortenTitle()
+[all[current]removeprefix[$:/language/Snippets/]]
+\end
+
+! Snippets
+
+Text snippets for use by the stamp text editor toolbar button.
+
+<<translatableStringEditor editorFields:"caption text">>
diff --git a/plugins/tiddlywiki/translators/ui/group/ThemeTweaks.tid b/plugins/tiddlywiki/translators/ui/group/ThemeTweaks.tid
new file mode 100644
index 000000000..0be2e3df0
--- /dev/null
+++ b/plugins/tiddlywiki/translators/ui/group/ThemeTweaks.tid
@@ -0,0 +1,16 @@
+title: $:/plugins/tiddlywiki/translators/ui/group/ThemeTweaks
+caption: Theme Tweaks
+tags: $:/tags/TranslationGroup
+
+\define translatableTiddlerTitles()
+[all[tiddlers+shadows]prefix[$:/language/ThemeTweaks/]sort[title]]
+\end
+\define shortenTitle()
+[all[current]removeprefix[$:/language/ThemeTweaks/]]
+\end
+
+! Theme Tweaks
+
+Strings used in the theme tweaks for Vanilla.
+
+<<translatableStringEditor>>
diff --git a/plugins/tiddlywiki/tw2parser/classictransclude.js b/plugins/tiddlywiki/tw2parser/classictransclude.js
index 104aef0eb..8afbed60c 100644
--- a/plugins/tiddlywiki/tw2parser/classictransclude.js
+++ b/plugins/tiddlywiki/tw2parser/classictransclude.js
@@ -79,7 +79,7 @@ TranscludeWidget.prototype.execute = function() {
 	// Check for recursion
 	var recursionMarker = this.makeRecursionMarker();
 	if(this.parentWidget && this.parentWidget.hasVariable("transclusion",recursionMarker)) {
-		this.makeChildWidgets([{type: "text", text: "Recursive transclusion error in transclude widget"}]);
+		this.makeChildWidgets([{type: "text", text: $tw.language.getString("Error/RecursiveTransclusion")}]);
 		return;
 	}
 	// Check for correct type
diff --git a/plugins/tiddlywiki/xmldom/files/LICENSE b/plugins/tiddlywiki/xmldom/files/LICENSE
new file mode 100644
index 000000000..68a9b5e1b
--- /dev/null
+++ b/plugins/tiddlywiki/xmldom/files/LICENSE
@@ -0,0 +1,8 @@
+You can choose any one of those:
+
+The MIT License (MIT):
+
+link:http://opensource.org/licenses/MIT
+
+LGPL:
+http://www.gnu.org/licenses/lgpl.html
diff --git a/plugins/tiddlywiki/xmldom/files/dom-parser.js b/plugins/tiddlywiki/xmldom/files/dom-parser.js
new file mode 100644
index 000000000..44657c507
--- /dev/null
+++ b/plugins/tiddlywiki/xmldom/files/dom-parser.js
@@ -0,0 +1,256 @@
+function DOMParser(options){
+	this.options = options ||{locator:{}};
+	
+}
+DOMParser.prototype.parseFromString = function(source,mimeType){	
+	var options = this.options;
+	var sax =  new XMLReader();
+	var domBuilder = options.domBuilder || new DOMHandler();//contentHandler and LexicalHandler
+	var errorHandler = options.errorHandler;
+	var locator = options.locator;
+	var defaultNSMap = options.xmlns||{};
+	var entityMap = {'lt':'<','gt':'>','amp':'&','quot':'"','apos':"'"}
+	if(locator){
+		domBuilder.setDocumentLocator(locator)
+	}
+	
+	sax.errorHandler = buildErrorHandler(errorHandler,domBuilder,locator);
+	sax.domBuilder = options.domBuilder || domBuilder;
+	if(/\/x?html?$/.test(mimeType)){
+		entityMap.nbsp = '\xa0';
+		entityMap.copy = '\xa9';
+		defaultNSMap['']= 'http://www.w3.org/1999/xhtml';
+	}
+	defaultNSMap.xml = defaultNSMap.xml || 'http://www.w3.org/XML/1998/namespace';
+	if(source){
+		sax.parse(source,defaultNSMap,entityMap);
+	}else{
+		sax.errorHandler.error("invalid document source");
+	}
+	return domBuilder.document;
+}
+function buildErrorHandler(errorImpl,domBuilder,locator){
+	if(!errorImpl){
+		if(domBuilder instanceof DOMHandler){
+			return domBuilder;
+		}
+		errorImpl = domBuilder ;
+	}
+	var errorHandler = {}
+	var isCallback = errorImpl instanceof Function;
+	locator = locator||{}
+	function build(key){
+		var fn = errorImpl[key];
+		if(!fn){
+			if(isCallback){
+				fn = errorImpl.length == 2?function(msg){errorImpl(key,msg)}:errorImpl;
+			}else{
+				var i=arguments.length;
+				while(--i){
+					if(fn = errorImpl[arguments[i]]){
+						break;
+					}
+				}
+			}
+		}
+		errorHandler[key] = fn && function(msg){
+			fn(msg+_locator(locator));
+		}||function(){};
+	}
+	build('warning','warn');
+	build('error','warn','warning');
+	build('fatalError','warn','warning','error');
+	return errorHandler;
+}
+/**
+ * +ContentHandler+ErrorHandler
+ * +LexicalHandler+EntityResolver2
+ * -DeclHandler-DTDHandler 
+ * 
+ * DefaultHandler:EntityResolver, DTDHandler, ContentHandler, ErrorHandler
+ * DefaultHandler2:DefaultHandler,LexicalHandler, DeclHandler, EntityResolver2
+ * @link http://www.saxproject.org/apidoc/org/xml/sax/helpers/DefaultHandler.html
+ */
+function DOMHandler() {
+    this.cdata = false;
+}
+function position(locator,node){
+	node.lineNumber = locator.lineNumber;
+	node.columnNumber = locator.columnNumber;
+}
+/**
+ * @see org.xml.sax.ContentHandler#startDocument
+ * @link http://www.saxproject.org/apidoc/org/xml/sax/ContentHandler.html
+ */ 
+DOMHandler.prototype = {
+	startDocument : function() {
+    	this.document = new DOMImplementation().createDocument(null, null, null);
+    	if (this.locator) {
+        	this.document.documentURI = this.locator.systemId;
+    	}
+	},
+	startElement:function(namespaceURI, localName, qName, attrs) {
+		var doc = this.document;
+	    var el = doc.createElementNS(namespaceURI, qName||localName);
+	    var len = attrs.length;
+	    appendElement(this, el);
+	    this.currentElement = el;
+	    
+		this.locator && position(this.locator,el)
+	    for (var i = 0 ; i < len; i++) {
+	        var namespaceURI = attrs.getURI(i);
+	        var value = attrs.getValue(i);
+	        var qName = attrs.getQName(i);
+			var attr = doc.createAttributeNS(namespaceURI, qName);
+			if( attr.getOffset){
+				position(attr.getOffset(1),attr)
+			}
+			attr.value = attr.nodeValue = value;
+			el.setAttributeNode(attr)
+	    }
+	},
+	endElement:function(namespaceURI, localName, qName) {
+		var current = this.currentElement
+	    var tagName = current.tagName;
+	    this.currentElement = current.parentNode;
+	},
+	startPrefixMapping:function(prefix, uri) {
+	},
+	endPrefixMapping:function(prefix) {
+	},
+	processingInstruction:function(target, data) {
+	    var ins = this.document.createProcessingInstruction(target, data);
+	    this.locator && position(this.locator,ins)
+	    appendElement(this, ins);
+	},
+	ignorableWhitespace:function(ch, start, length) {
+	},
+	characters:function(chars, start, length) {
+		chars = _toString.apply(this,arguments)
+		//console.log(chars)
+		if(this.currentElement && chars){
+			if (this.cdata) {
+				var charNode = this.document.createCDATASection(chars);
+				this.currentElement.appendChild(charNode);
+			} else {
+				var charNode = this.document.createTextNode(chars);
+				this.currentElement.appendChild(charNode);
+			}
+			this.locator && position(this.locator,charNode)
+		}
+	},
+	skippedEntity:function(name) {
+	},
+	endDocument:function() {
+		this.document.normalize();
+	},
+	setDocumentLocator:function (locator) {
+	    if(this.locator = locator){// && !('lineNumber' in locator)){
+	    	locator.lineNumber = 0;
+	    }
+	},
+	//LexicalHandler
+	comment:function(chars, start, length) {
+		chars = _toString.apply(this,arguments)
+	    var comm = this.document.createComment(chars);
+	    this.locator && position(this.locator,comm)
+	    appendElement(this, comm);
+	},
+	
+	startCDATA:function() {
+	    //used in characters() methods
+	    this.cdata = true;
+	},
+	endCDATA:function() {
+	    this.cdata = false;
+	},
+	
+	startDTD:function(name, publicId, systemId) {
+		var impl = this.document.implementation;
+	    if (impl && impl.createDocumentType) {
+	        var dt = impl.createDocumentType(name, publicId, systemId);
+	        this.locator && position(this.locator,dt)
+	        appendElement(this, dt);
+	    }
+	},
+	/**
+	 * @see org.xml.sax.ErrorHandler
+	 * @link http://www.saxproject.org/apidoc/org/xml/sax/ErrorHandler.html
+	 */
+	warning:function(error) {
+		console.warn(error,_locator(this.locator));
+	},
+	error:function(error) {
+		console.error(error,_locator(this.locator));
+	},
+	fatalError:function(error) {
+		console.error(error,_locator(this.locator));
+	    throw error;
+	}
+}
+function _locator(l){
+	if(l){
+		return '\n@'+(l.systemId ||'')+'#[line:'+l.lineNumber+',col:'+l.columnNumber+']'
+	}
+}
+function _toString(chars,start,length){
+	if(typeof chars == 'string'){
+		return chars.substr(start,length)
+	}else{//java sax connect width xmldom on rhino(what about: "? && !(chars instanceof String)")
+		if(chars.length >= start+length || start){
+			return new java.lang.String(chars,start,length)+'';
+		}
+		return chars;
+	}
+}
+
+/*
+ * @link http://www.saxproject.org/apidoc/org/xml/sax/ext/LexicalHandler.html
+ * used method of org.xml.sax.ext.LexicalHandler:
+ *  #comment(chars, start, length)
+ *  #startCDATA()
+ *  #endCDATA()
+ *  #startDTD(name, publicId, systemId)
+ *
+ *
+ * IGNORED method of org.xml.sax.ext.LexicalHandler:
+ *  #endDTD()
+ *  #startEntity(name)
+ *  #endEntity(name)
+ *
+ *
+ * @link http://www.saxproject.org/apidoc/org/xml/sax/ext/DeclHandler.html
+ * IGNORED method of org.xml.sax.ext.DeclHandler
+ * 	#attributeDecl(eName, aName, type, mode, value)
+ *  #elementDecl(name, model)
+ *  #externalEntityDecl(name, publicId, systemId)
+ *  #internalEntityDecl(name, value)
+ * @link http://www.saxproject.org/apidoc/org/xml/sax/ext/EntityResolver2.html
+ * IGNORED method of org.xml.sax.EntityResolver2
+ *  #resolveEntity(String name,String publicId,String baseURI,String systemId)
+ *  #resolveEntity(publicId, systemId)
+ *  #getExternalSubset(name, baseURI)
+ * @link http://www.saxproject.org/apidoc/org/xml/sax/DTDHandler.html
+ * IGNORED method of org.xml.sax.DTDHandler
+ *  #notationDecl(name, publicId, systemId) {};
+ *  #unparsedEntityDecl(name, publicId, systemId, notationName) {};
+ */
+"endDTD,startEntity,endEntity,attributeDecl,elementDecl,externalEntityDecl,internalEntityDecl,resolveEntity,getExternalSubset,notationDecl,unparsedEntityDecl".replace(/\w+/g,function(key){
+	DOMHandler.prototype[key] = function(){return null}
+})
+
+/* Private static helpers treated below as private instance methods, so don't need to add these to the public API; we might use a Relator to also get rid of non-standard public properties */
+function appendElement (hander,node) {
+    if (!hander.currentElement) {
+        hander.document.appendChild(node);
+    } else {
+        hander.currentElement.appendChild(node);
+    }
+}//appendChild and setAttributeNS are preformance key
+
+if(typeof require == 'function'){
+	var XMLReader = require('./sax').XMLReader;
+	var DOMImplementation = exports.DOMImplementation = require('./dom').DOMImplementation;
+	exports.XMLSerializer = require('./dom').XMLSerializer ;
+	exports.DOMParser = DOMParser;
+}
diff --git a/plugins/tiddlywiki/xmldom/files/dom.js b/plugins/tiddlywiki/xmldom/files/dom.js
new file mode 100644
index 000000000..0a3b8add4
--- /dev/null
+++ b/plugins/tiddlywiki/xmldom/files/dom.js
@@ -0,0 +1,1141 @@
+/*
+ * DOM Level 2
+ * Object DOMException
+ * @see http://www.w3.org/TR/REC-DOM-Level-1/ecma-script-language-binding.html
+ * @see http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/ecma-script-binding.html
+ */
+
+function copy(src,dest){
+	for(var p in src){
+		dest[p] = src[p];
+	}
+}
+/**
+^\w+\.prototype\.([_\w]+)\s*=\s*((?:.*\{\s*?[\r\n][\s\S]*?^})|\S.*?(?=[;\r\n]));?
+^\w+\.prototype\.([_\w]+)\s*=\s*(\S.*?(?=[;\r\n]));?
+ */
+function _extends(Class,Super){
+	var pt = Class.prototype;
+	if(Object.create){
+		var ppt = Object.create(Super.prototype)
+		pt.__proto__ = ppt;
+	}
+	if(!(pt instanceof Super)){
+		function t(){};
+		t.prototype = Super.prototype;
+		t = new t();
+		copy(pt,t);
+		Class.prototype = pt = t;
+	}
+	if(pt.constructor != Class){
+		if(typeof Class != 'function'){
+			console.error("unknow Class:"+Class)
+		}
+		pt.constructor = Class
+	}
+}
+var htmlns = 'http://www.w3.org/1999/xhtml' ;
+// Node Types
+var NodeType = {}
+var ELEMENT_NODE                = NodeType.ELEMENT_NODE                = 1;
+var ATTRIBUTE_NODE              = NodeType.ATTRIBUTE_NODE              = 2;
+var TEXT_NODE                   = NodeType.TEXT_NODE                   = 3;
+var CDATA_SECTION_NODE          = NodeType.CDATA_SECTION_NODE          = 4;
+var ENTITY_REFERENCE_NODE       = NodeType.ENTITY_REFERENCE_NODE       = 5;
+var ENTITY_NODE                 = NodeType.ENTITY_NODE                 = 6;
+var PROCESSING_INSTRUCTION_NODE = NodeType.PROCESSING_INSTRUCTION_NODE = 7;
+var COMMENT_NODE                = NodeType.COMMENT_NODE                = 8;
+var DOCUMENT_NODE               = NodeType.DOCUMENT_NODE               = 9;
+var DOCUMENT_TYPE_NODE          = NodeType.DOCUMENT_TYPE_NODE          = 10;
+var DOCUMENT_FRAGMENT_NODE      = NodeType.DOCUMENT_FRAGMENT_NODE      = 11;
+var NOTATION_NODE               = NodeType.NOTATION_NODE               = 12;
+
+// ExceptionCode
+var ExceptionCode = {}
+var ExceptionMessage = {};
+var INDEX_SIZE_ERR              = ExceptionCode.INDEX_SIZE_ERR              = ((ExceptionMessage[1]="Index size error"),1);
+var DOMSTRING_SIZE_ERR          = ExceptionCode.DOMSTRING_SIZE_ERR          = ((ExceptionMessage[2]="DOMString size error"),2);
+var HIERARCHY_REQUEST_ERR       = ExceptionCode.HIERARCHY_REQUEST_ERR       = ((ExceptionMessage[3]="Hierarchy request error"),3);
+var WRONG_DOCUMENT_ERR          = ExceptionCode.WRONG_DOCUMENT_ERR          = ((ExceptionMessage[4]="Wrong document"),4);
+var INVALID_CHARACTER_ERR       = ExceptionCode.INVALID_CHARACTER_ERR       = ((ExceptionMessage[5]="Invalid character"),5);
+var NO_DATA_ALLOWED_ERR         = ExceptionCode.NO_DATA_ALLOWED_ERR         = ((ExceptionMessage[6]="No data allowed"),6);
+var NO_MODIFICATION_ALLOWED_ERR = ExceptionCode.NO_MODIFICATION_ALLOWED_ERR = ((ExceptionMessage[7]="No modification allowed"),7);
+var NOT_FOUND_ERR               = ExceptionCode.NOT_FOUND_ERR               = ((ExceptionMessage[8]="Not found"),8);
+var NOT_SUPPORTED_ERR           = ExceptionCode.NOT_SUPPORTED_ERR           = ((ExceptionMessage[9]="Not supported"),9);
+var INUSE_ATTRIBUTE_ERR         = ExceptionCode.INUSE_ATTRIBUTE_ERR         = ((ExceptionMessage[10]="Attribute in use"),10);
+//level2
+var INVALID_STATE_ERR        	= ExceptionCode.INVALID_STATE_ERR        	= ((ExceptionMessage[11]="Invalid state"),11);
+var SYNTAX_ERR               	= ExceptionCode.SYNTAX_ERR               	= ((ExceptionMessage[12]="Syntax error"),12);
+var INVALID_MODIFICATION_ERR 	= ExceptionCode.INVALID_MODIFICATION_ERR 	= ((ExceptionMessage[13]="Invalid modification"),13);
+var NAMESPACE_ERR            	= ExceptionCode.NAMESPACE_ERR           	= ((ExceptionMessage[14]="Invalid namespace"),14);
+var INVALID_ACCESS_ERR       	= ExceptionCode.INVALID_ACCESS_ERR      	= ((ExceptionMessage[15]="Invalid access"),15);
+
+
+function DOMException(code, message) {
+	if(message instanceof Error){
+		var error = message;
+	}else{
+		error = this;
+		Error.call(this, ExceptionMessage[code]);
+		this.message = ExceptionMessage[code];
+		if(Error.captureStackTrace) Error.captureStackTrace(this, DOMException);
+	}
+	error.code = code;
+	if(message) this.message = this.message + ": " + message;
+	return error;
+};
+DOMException.prototype = Error.prototype;
+copy(ExceptionCode,DOMException)
+/**
+ * @see http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-536297177
+ * The NodeList interface provides the abstraction of an ordered collection of nodes, without defining or constraining how this collection is implemented. NodeList objects in the DOM are live.
+ * The items in the NodeList are accessible via an integral index, starting from 0.
+ */
+function NodeList() {
+};
+NodeList.prototype = {
+	/**
+	 * The number of nodes in the list. The range of valid child node indices is 0 to length-1 inclusive.
+	 * @standard level1
+	 */
+	length:0, 
+	/**
+	 * Returns the indexth item in the collection. If index is greater than or equal to the number of nodes in the list, this returns null.
+	 * @standard level1
+	 * @param index  unsigned long 
+	 *   Index into the collection.
+	 * @return Node
+	 * 	The node at the indexth position in the NodeList, or null if that is not a valid index. 
+	 */
+	item: function(index) {
+		return this[index] || null;
+	}
+};
+function LiveNodeList(node,refresh){
+	this._node = node;
+	this._refresh = refresh
+	_updateLiveList(this);
+}
+function _updateLiveList(list){
+	var inc = list._node._inc || list._node.ownerDocument._inc;
+	if(list._inc != inc){
+		var ls = list._refresh(list._node);
+		//console.log(ls.length)
+		__set__(list,'length',ls.length);
+		copy(ls,list);
+		list._inc = inc;
+	}
+}
+LiveNodeList.prototype.item = function(i){
+	_updateLiveList(this);
+	return this[i];
+}
+
+_extends(LiveNodeList,NodeList);
+/**
+ * 
+ * Objects implementing the NamedNodeMap interface are used to represent collections of nodes that can be accessed by name. Note that NamedNodeMap does not inherit from NodeList; NamedNodeMaps are not maintained in any particular order. Objects contained in an object implementing NamedNodeMap may also be accessed by an ordinal index, but this is simply to allow convenient enumeration of the contents of a NamedNodeMap, and does not imply that the DOM specifies an order to these Nodes.
+ * NamedNodeMap objects in the DOM are live.
+ * used for attributes or DocumentType entities 
+ */
+function NamedNodeMap() {
+};
+
+function _findNodeIndex(list,node){
+	var i = list.length;
+	while(i--){
+		if(list[i] === node){return i}
+	}
+}
+
+function _addNamedNode(el,list,newAttr,oldAttr){
+	if(oldAttr){
+		list[_findNodeIndex(list,oldAttr)] = newAttr;
+	}else{
+		list[list.length++] = newAttr;
+	}
+	if(el){
+		newAttr.ownerElement = el;
+		var doc = el.ownerDocument;
+		if(doc){
+			oldAttr && _onRemoveAttribute(doc,el,oldAttr);
+			_onAddAttribute(doc,el,newAttr);
+		}
+	}
+}
+function _removeNamedNode(el,list,attr){
+	var i = _findNodeIndex(list,attr);
+	if(i>=0){
+		var lastIndex = list.length-1
+		while(i<lastIndex){
+			list[i] = list[++i]
+		}
+		list.length = lastIndex;
+		if(el){
+			var doc = el.ownerDocument;
+			if(doc){
+				_onRemoveAttribute(doc,el,attr);
+				attr.ownerElement = null;
+			}
+		}
+	}else{
+		throw DOMException(NOT_FOUND_ERR,new Error())
+	}
+}
+NamedNodeMap.prototype = {
+	length:0,
+	item:NodeList.prototype.item,
+	getNamedItem: function(key) {
+//		if(key.indexOf(':')>0 || key == 'xmlns'){
+//			return null;
+//		}
+		var i = this.length;
+		while(i--){
+			var attr = this[i];
+			if(attr.nodeName == key){
+				return attr;
+			}
+		}
+	},
+	setNamedItem: function(attr) {
+		var el = attr.ownerElement;
+		if(el && el!=this._ownerElement){
+			throw new DOMException(INUSE_ATTRIBUTE_ERR);
+		}
+		var oldAttr = this.getNamedItem(attr.nodeName);
+		_addNamedNode(this._ownerElement,this,attr,oldAttr);
+		return oldAttr;
+	},
+	/* returns Node */
+	setNamedItemNS: function(attr) {// raises: WRONG_DOCUMENT_ERR,NO_MODIFICATION_ALLOWED_ERR,INUSE_ATTRIBUTE_ERR
+		var el = attr.ownerElement, oldAttr;
+		if(el && el!=this._ownerElement){
+			throw new DOMException(INUSE_ATTRIBUTE_ERR);
+		}
+		oldAttr = this.getNamedItemNS(attr.namespaceURI,attr.localName);
+		_addNamedNode(this._ownerElement,this,attr,oldAttr);
+		return oldAttr;
+	},
+
+	/* returns Node */
+	removeNamedItem: function(key) {
+		var attr = this.getNamedItem(key);
+		_removeNamedNode(this._ownerElement,this,attr);
+		return attr;
+		
+		
+	},// raises: NOT_FOUND_ERR,NO_MODIFICATION_ALLOWED_ERR
+	
+	//for level2
+	removeNamedItemNS:function(namespaceURI,localName){
+		var attr = this.getNamedItemNS(namespaceURI,localName);
+		_removeNamedNode(this._ownerElement,this,attr);
+		return attr;
+	},
+	getNamedItemNS: function(namespaceURI, localName) {
+		var i = this.length;
+		while(i--){
+			var node = this[i];
+			if(node.localName == localName && node.namespaceURI == namespaceURI){
+				return node;
+			}
+		}
+		return null;
+	}
+};
+/**
+ * @see http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html#ID-102161490
+ */
+function DOMImplementation(/* Object */ features) {
+	this._features = {};
+	if (features) {
+		for (var feature in features) {
+			 this._features = features[feature];
+		}
+	}
+};
+
+DOMImplementation.prototype = {
+	hasFeature: function(/* string */ feature, /* string */ version) {
+		var versions = this._features[feature.toLowerCase()];
+		if (versions && (!version || version in versions)) {
+			return true;
+		} else {
+			return false;
+		}
+	},
+	// Introduced in DOM Level 2:
+	createDocument:function(namespaceURI,  qualifiedName, doctype){// raises:INVALID_CHARACTER_ERR,NAMESPACE_ERR,WRONG_DOCUMENT_ERR
+		var doc = new Document();
+		doc.implementation = this;
+		doc.childNodes = new NodeList();
+		doc.doctype = doctype;
+		if(doctype){
+			doc.appendChild(doctype);
+		}
+		if(qualifiedName){
+			var root = doc.createElementNS(namespaceURI,qualifiedName);
+			doc.appendChild(root);
+		}
+		return doc;
+	},
+	// Introduced in DOM Level 2:
+	createDocumentType:function(qualifiedName, publicId, systemId){// raises:INVALID_CHARACTER_ERR,NAMESPACE_ERR
+		var node = new DocumentType();
+		node.name = qualifiedName;
+		node.nodeName = qualifiedName;
+		node.publicId = publicId;
+		node.systemId = systemId;
+		// Introduced in DOM Level 2:
+		//readonly attribute DOMString        internalSubset;
+		
+		//TODO:..
+		//  readonly attribute NamedNodeMap     entities;
+		//  readonly attribute NamedNodeMap     notations;
+		return node;
+	}
+};
+
+
+/**
+ * @see http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-1950641247
+ */
+
+function Node() {
+};
+
+Node.prototype = {
+	firstChild : null,
+	lastChild : null,
+	previousSibling : null,
+	nextSibling : null,
+	attributes : null,
+	parentNode : null,
+	childNodes : null,
+	ownerDocument : null,
+	nodeValue : null,
+	namespaceURI : null,
+	prefix : null,
+	localName : null,
+	// Modified in DOM Level 2:
+	insertBefore:function(newChild, refChild){//raises 
+		return _insertBefore(this,newChild,refChild);
+	},
+	replaceChild:function(newChild, oldChild){//raises 
+		this.insertBefore(newChild,oldChild);
+		if(oldChild){
+			this.removeChild(oldChild);
+		}
+	},
+	removeChild:function(oldChild){
+		return _removeChild(this,oldChild);
+	},
+	appendChild:function(newChild){
+		return this.insertBefore(newChild,null);
+	},
+	hasChildNodes:function(){
+		return this.firstChild != null;
+	},
+	cloneNode:function(deep){
+		return cloneNode(this.ownerDocument||this,this,deep);
+	},
+	// Modified in DOM Level 2:
+	normalize:function(){
+		var child = this.firstChild;
+		while(child){
+			var next = child.nextSibling;
+			if(next && next.nodeType == TEXT_NODE && child.nodeType == TEXT_NODE){
+				this.removeChild(next);
+				child.appendData(next.data);
+			}else{
+				child.normalize();
+				child = next;
+			}
+		}
+	},
+  	// Introduced in DOM Level 2:
+	isSupported:function(feature, version){
+		return this.ownerDocument.implementation.hasFeature(feature,version);
+	},
+    // Introduced in DOM Level 2:
+    hasAttributes:function(){
+    	return this.attributes.length>0;
+    },
+    lookupPrefix:function(namespaceURI){
+    	var el = this;
+    	while(el){
+    		var map = el._nsMap;
+    		//console.dir(map)
+    		if(map){
+    			for(var n in map){
+    				if(map[n] == namespaceURI){
+    					return n;
+    				}
+    			}
+    		}
+    		el = el.nodeType == 2?el.ownerDocument : el.parentNode;
+    	}
+    	return null;
+    },
+    // Introduced in DOM Level 3:
+    lookupNamespaceURI:function(prefix){
+    	var el = this;
+    	while(el){
+    		var map = el._nsMap;
+    		//console.dir(map)
+    		if(map){
+    			if(prefix in map){
+    				return map[prefix] ;
+    			}
+    		}
+    		el = el.nodeType == 2?el.ownerDocument : el.parentNode;
+    	}
+    	return null;
+    },
+    // Introduced in DOM Level 3:
+    isDefaultNamespace:function(namespaceURI){
+    	var prefix = this.lookupPrefix(namespaceURI);
+    	return prefix == null;
+    }
+};
+
+
+function _xmlEncoder(c){
+	return c == '<' && '&lt;' ||
+         c == '>' && '&gt;' ||
+         c == '&' && '&amp;' ||
+         c == '"' && '&quot;' ||
+         '&#'+c.charCodeAt()+';'
+}
+
+
+copy(NodeType,Node);
+copy(NodeType,Node.prototype);
+
+/**
+ * @param callback return true for continue,false for break
+ * @return boolean true: break visit;
+ */
+function _visitNode(node,callback){
+	if(callback(node)){
+		return true;
+	}
+	if(node = node.firstChild){
+		do{
+			if(_visitNode(node,callback)){return true}
+        }while(node=node.nextSibling)
+    }
+}
+
+
+
+function Document(){
+}
+function _onAddAttribute(doc,el,newAttr){
+	doc && doc._inc++;
+	var ns = newAttr.namespaceURI ;
+	if(ns == 'http://www.w3.org/2000/xmlns/'){
+		//update namespace
+		el._nsMap[newAttr.prefix?newAttr.localName:''] = newAttr.value
+	}
+}
+function _onRemoveAttribute(doc,el,newAttr,remove){
+	doc && doc._inc++;
+	var ns = newAttr.namespaceURI ;
+	if(ns == 'http://www.w3.org/2000/xmlns/'){
+		//update namespace
+		delete el._nsMap[newAttr.prefix?newAttr.localName:'']
+	}
+}
+function _onUpdateChild(doc,el,newChild){
+	if(doc && doc._inc){
+		doc._inc++;
+		//update childNodes
+		var cs = el.childNodes;
+		if(newChild){
+			cs[cs.length++] = newChild;
+		}else{
+			//console.log(1)
+			var child = el.firstChild;
+			var i = 0;
+			while(child){
+				cs[i++] = child;
+				child =child.nextSibling;
+			}
+			cs.length = i;
+		}
+	}
+}
+
+/**
+ * attributes;
+ * children;
+ * 
+ * writeable properties:
+ * nodeValue,Attr:value,CharacterData:data
+ * prefix
+ */
+function _removeChild(parentNode,child){
+	var previous = child.previousSibling;
+	var next = child.nextSibling;
+	if(previous){
+		previous.nextSibling = next;
+	}else{
+		parentNode.firstChild = next
+	}
+	if(next){
+		next.previousSibling = previous;
+	}else{
+		parentNode.lastChild = previous;
+	}
+	_onUpdateChild(parentNode.ownerDocument,parentNode);
+	return child;
+}
+/**
+ * preformance key(refChild == null)
+ */
+function _insertBefore(parentNode,newChild,nextChild){
+	var cp = newChild.parentNode;
+	if(cp){
+		cp.removeChild(newChild);//remove and update
+	}
+	if(newChild.nodeType === DOCUMENT_FRAGMENT_NODE){
+		var newFirst = newChild.firstChild;
+		if (newFirst == null) {
+			return newChild;
+		}
+		var newLast = newChild.lastChild;
+	}else{
+		newFirst = newLast = newChild;
+	}
+	var pre = nextChild ? nextChild.previousSibling : parentNode.lastChild;
+
+	newFirst.previousSibling = pre;
+	newLast.nextSibling = nextChild;
+	
+	
+	if(pre){
+		pre.nextSibling = newFirst;
+	}else{
+		parentNode.firstChild = newFirst;
+	}
+	if(nextChild == null){
+		parentNode.lastChild = newLast;
+	}else{
+		nextChild.previousSibling = newLast;
+	}
+	do{
+		newFirst.parentNode = parentNode;
+	}while(newFirst !== newLast && (newFirst= newFirst.nextSibling))
+	_onUpdateChild(parentNode.ownerDocument||parentNode,parentNode);
+	//console.log(parentNode.lastChild.nextSibling == null)
+	if (newChild.nodeType == DOCUMENT_FRAGMENT_NODE) {
+		newChild.firstChild = newChild.lastChild = null;
+	}
+	return newChild;
+}
+function _appendSingleChild(parentNode,newChild){
+	var cp = newChild.parentNode;
+	if(cp){
+		var pre = parentNode.lastChild;
+		cp.removeChild(newChild);//remove and update
+		var pre = parentNode.lastChild;
+	}
+	var pre = parentNode.lastChild;
+	newChild.parentNode = parentNode;
+	newChild.previousSibling = pre;
+	newChild.nextSibling = null;
+	if(pre){
+		pre.nextSibling = newChild;
+	}else{
+		parentNode.firstChild = newChild;
+	}
+	parentNode.lastChild = newChild;
+	_onUpdateChild(parentNode.ownerDocument,parentNode,newChild);
+	return newChild;
+	//console.log("__aa",parentNode.lastChild.nextSibling == null)
+}
+Document.prototype = {
+	//implementation : null,
+	nodeName :  '#document',
+	nodeType :  DOCUMENT_NODE,
+	doctype :  null,
+	documentElement :  null,
+	_inc : 1,
+	
+	insertBefore :  function(newChild, refChild){//raises 
+		if(newChild.nodeType == DOCUMENT_FRAGMENT_NODE){
+			var child = newChild.firstChild;
+			while(child){
+				var next = child.nextSibling;
+				this.insertBefore(child,refChild);
+				child = next;
+			}
+			return newChild;
+		}
+		if(this.documentElement == null && newChild.nodeType == 1){
+			this.documentElement = newChild;
+		}
+		
+		return _insertBefore(this,newChild,refChild),(newChild.ownerDocument = this),newChild;
+	},
+	removeChild :  function(oldChild){
+		if(this.documentElement == oldChild){
+			this.documentElement = null;
+		}
+		return _removeChild(this,oldChild);
+	},
+	// Introduced in DOM Level 2:
+	importNode : function(importedNode,deep){
+		return importNode(this,importedNode,deep);
+	},
+	// Introduced in DOM Level 2:
+	getElementById :	function(id){
+		var rtv = null;
+		_visitNode(this.documentElement,function(node){
+			if(node.nodeType == 1){
+				if(node.getAttribute('id') == id){
+					rtv = node;
+					return true;
+				}
+			}
+		})
+		return rtv;
+	},
+	
+	//document factory method:
+	createElement :	function(tagName){
+		var node = new Element();
+		node.ownerDocument = this;
+		node.nodeName = tagName;
+		node.tagName = tagName;
+		node.childNodes = new NodeList();
+		var attrs	= node.attributes = new NamedNodeMap();
+		attrs._ownerElement = node;
+		return node;
+	},
+	createDocumentFragment :	function(){
+		var node = new DocumentFragment();
+		node.ownerDocument = this;
+		node.childNodes = new NodeList();
+		return node;
+	},
+	createTextNode :	function(data){
+		var node = new Text();
+		node.ownerDocument = this;
+		node.appendData(data)
+		return node;
+	},
+	createComment :	function(data){
+		var node = new Comment();
+		node.ownerDocument = this;
+		node.appendData(data)
+		return node;
+	},
+	createCDATASection :	function(data){
+		var node = new CDATASection();
+		node.ownerDocument = this;
+		node.appendData(data)
+		return node;
+	},
+	createProcessingInstruction :	function(target,data){
+		var node = new ProcessingInstruction();
+		node.ownerDocument = this;
+		node.tagName = node.target = target;
+		node.nodeValue= node.data = data;
+		return node;
+	},
+	createAttribute :	function(name){
+		var node = new Attr();
+		node.ownerDocument	= this;
+		node.name = name;
+		node.nodeName	= name;
+		node.localName = name;
+		node.specified = true;
+		return node;
+	},
+	createEntityReference :	function(name){
+		var node = new EntityReference();
+		node.ownerDocument	= this;
+		node.nodeName	= name;
+		return node;
+	},
+	// Introduced in DOM Level 2:
+	createElementNS :	function(namespaceURI,qualifiedName){
+		var node = new Element();
+		var pl = qualifiedName.split(':');
+		var attrs	= node.attributes = new NamedNodeMap();
+		node.childNodes = new NodeList();
+		node.ownerDocument = this;
+		node.nodeName = qualifiedName;
+		node.tagName = qualifiedName;
+		node.namespaceURI = namespaceURI;
+		if(pl.length == 2){
+			node.prefix = pl[0];
+			node.localName = pl[1];
+		}else{
+			//el.prefix = null;
+			node.localName = qualifiedName;
+		}
+		attrs._ownerElement = node;
+		return node;
+	},
+	// Introduced in DOM Level 2:
+	createAttributeNS :	function(namespaceURI,qualifiedName){
+		var node = new Attr();
+		var pl = qualifiedName.split(':');
+		node.ownerDocument = this;
+		node.nodeName = qualifiedName;
+		node.name = qualifiedName;
+		node.namespaceURI = namespaceURI;
+		node.specified = true;
+		if(pl.length == 2){
+			node.prefix = pl[0];
+			node.localName = pl[1];
+		}else{
+			//el.prefix = null;
+			node.localName = qualifiedName;
+		}
+		return node;
+	}
+};
+_extends(Document,Node);
+
+
+function Element() {
+	this._nsMap = {};
+};
+Element.prototype = {
+	nodeType : ELEMENT_NODE,
+	hasAttribute : function(name){
+		return this.getAttributeNode(name)!=null;
+	},
+	getAttribute : function(name){
+		var attr = this.getAttributeNode(name);
+		return attr && attr.value || '';
+	},
+	getAttributeNode : function(name){
+		return this.attributes.getNamedItem(name);
+	},
+	setAttribute : function(name, value){
+		var attr = this.ownerDocument.createAttribute(name);
+		attr.value = attr.nodeValue = "" + value;
+		this.setAttributeNode(attr)
+	},
+	removeAttribute : function(name){
+		var attr = this.getAttributeNode(name)
+		attr && this.removeAttributeNode(attr);
+	},
+	
+	//four real opeartion method
+	appendChild:function(newChild){
+		if(newChild.nodeType === DOCUMENT_FRAGMENT_NODE){
+			return this.insertBefore(newChild,null);
+		}else{
+			return _appendSingleChild(this,newChild);
+		}
+	},
+	setAttributeNode : function(newAttr){
+		return this.attributes.setNamedItem(newAttr);
+	},
+	setAttributeNodeNS : function(newAttr){
+		return this.attributes.setNamedItemNS(newAttr);
+	},
+	removeAttributeNode : function(oldAttr){
+		return this.attributes.removeNamedItem(oldAttr.nodeName);
+	},
+	//get real attribute name,and remove it by removeAttributeNode
+	removeAttributeNS : function(namespaceURI, localName){
+		var old = this.getAttributeNodeNS(namespaceURI, localName);
+		old && this.removeAttributeNode(old);
+	},
+	
+	hasAttributeNS : function(namespaceURI, localName){
+		return this.getAttributeNodeNS(namespaceURI, localName)!=null;
+	},
+	getAttributeNS : function(namespaceURI, localName){
+		var attr = this.getAttributeNodeNS(namespaceURI, localName);
+		return attr && attr.value || '';
+	},
+	setAttributeNS : function(namespaceURI, qualifiedName, value){
+		var attr = this.ownerDocument.createAttributeNS(namespaceURI, qualifiedName);
+		attr.value = attr.nodeValue = "" + value;
+		this.setAttributeNode(attr)
+	},
+	getAttributeNodeNS : function(namespaceURI, localName){
+		return this.attributes.getNamedItemNS(namespaceURI, localName);
+	},
+	
+	getElementsByTagName : function(tagName){
+		return new LiveNodeList(this,function(base){
+			var ls = [];
+			_visitNode(base,function(node){
+				if(node !== base && node.nodeType == ELEMENT_NODE && (tagName === '*' || node.tagName == tagName)){
+					ls.push(node);
+				}
+			});
+			return ls;
+		});
+	},
+	getElementsByTagNameNS : function(namespaceURI, localName){
+		return new LiveNodeList(this,function(base){
+			var ls = [];
+			_visitNode(base,function(node){
+				if(node !== base && node.nodeType === ELEMENT_NODE && (namespaceURI === '*' || node.namespaceURI === namespaceURI) && (localName === '*' || node.localName == localName)){
+					ls.push(node);
+				}
+			});
+			return ls;
+		});
+	}
+};
+Document.prototype.getElementsByTagName = Element.prototype.getElementsByTagName;
+Document.prototype.getElementsByTagNameNS = Element.prototype.getElementsByTagNameNS;
+
+
+_extends(Element,Node);
+function Attr() {
+};
+Attr.prototype.nodeType = ATTRIBUTE_NODE;
+_extends(Attr,Node);
+
+
+function CharacterData() {
+};
+CharacterData.prototype = {
+	data : '',
+	substringData : function(offset, count) {
+		return this.data.substring(offset, offset+count);
+	},
+	appendData: function(text) {
+		text = this.data+text;
+		this.nodeValue = this.data = text;
+		this.length = text.length;
+	},
+	insertData: function(offset,text) {
+		this.replaceData(offset,0,text);
+	
+	},
+	appendChild:function(newChild){
+		//if(!(newChild instanceof CharacterData)){
+			throw new Error(ExceptionMessage[3])
+		//}
+		return Node.prototype.appendChild.apply(this,arguments)
+	},
+	deleteData: function(offset, count) {
+		this.replaceData(offset,count,"");
+	},
+	replaceData: function(offset, count, text) {
+		var start = this.data.substring(0,offset);
+		var end = this.data.substring(offset+count);
+		text = start + text + end;
+		this.nodeValue = this.data = text;
+		this.length = text.length;
+	}
+}
+_extends(CharacterData,Node);
+function Text() {
+};
+Text.prototype = {
+	nodeName : "#text",
+	nodeType : TEXT_NODE,
+	splitText : function(offset) {
+		var text = this.data;
+		var newText = text.substring(offset);
+		text = text.substring(0, offset);
+		this.data = this.nodeValue = text;
+		this.length = text.length;
+		var newNode = this.ownerDocument.createTextNode(newText);
+		if(this.parentNode){
+			this.parentNode.insertBefore(newNode, this.nextSibling);
+		}
+		return newNode;
+	}
+}
+_extends(Text,CharacterData);
+function Comment() {
+};
+Comment.prototype = {
+	nodeName : "#comment",
+	nodeType : COMMENT_NODE
+}
+_extends(Comment,CharacterData);
+
+function CDATASection() {
+};
+CDATASection.prototype = {
+	nodeName : "#cdata-section",
+	nodeType : CDATA_SECTION_NODE
+}
+_extends(CDATASection,CharacterData);
+
+
+function DocumentType() {
+};
+DocumentType.prototype.nodeType = DOCUMENT_TYPE_NODE;
+_extends(DocumentType,Node);
+
+function Notation() {
+};
+Notation.prototype.nodeType = NOTATION_NODE;
+_extends(Notation,Node);
+
+function Entity() {
+};
+Entity.prototype.nodeType = ENTITY_NODE;
+_extends(Entity,Node);
+
+function EntityReference() {
+};
+EntityReference.prototype.nodeType = ENTITY_REFERENCE_NODE;
+_extends(EntityReference,Node);
+
+function DocumentFragment() {
+};
+DocumentFragment.prototype.nodeName =	"#document-fragment";
+DocumentFragment.prototype.nodeType =	DOCUMENT_FRAGMENT_NODE;
+_extends(DocumentFragment,Node);
+
+
+function ProcessingInstruction() {
+}
+ProcessingInstruction.prototype.nodeType = PROCESSING_INSTRUCTION_NODE;
+_extends(ProcessingInstruction,Node);
+function XMLSerializer(){}
+XMLSerializer.prototype.serializeToString = function(node,attributeSorter){
+	return node.toString(attributeSorter);
+}
+Node.prototype.toString =function(attributeSorter){
+	var buf = [];
+	serializeToString(this,buf,attributeSorter);
+	return buf.join('');
+}
+function serializeToString(node,buf,attributeSorter,isHTML){
+	switch(node.nodeType){
+	case ELEMENT_NODE:
+		var attrs = node.attributes;
+		var len = attrs.length;
+		var child = node.firstChild;
+		var nodeName = node.tagName;
+		isHTML =  (htmlns === node.namespaceURI) ||isHTML 
+		buf.push('<',nodeName);
+		if(attributeSorter){
+			buf.sort.apply(attrs, attributeSorter);
+		}
+		for(var i=0;i<len;i++){
+			serializeToString(attrs.item(i),buf,attributeSorter,isHTML);
+		}
+		if(child || isHTML && !/^(?:meta|link|img|br|hr|input|button)$/i.test(nodeName)){
+			buf.push('>');
+			//if is cdata child node
+			if(isHTML && /^script$/i.test(nodeName)){
+				if(child){
+					buf.push(child.data);
+				}
+			}else{
+				while(child){
+					serializeToString(child,buf,attributeSorter,isHTML);
+					child = child.nextSibling;
+				}
+			}
+			buf.push('</',nodeName,'>');
+		}else{
+			buf.push('/>');
+		}
+		return;
+	case DOCUMENT_NODE:
+	case DOCUMENT_FRAGMENT_NODE:
+		var child = node.firstChild;
+		while(child){
+			serializeToString(child,buf,attributeSorter,isHTML);
+			child = child.nextSibling;
+		}
+		return;
+	case ATTRIBUTE_NODE:
+		return buf.push(' ',node.name,'="',node.value.replace(/[<&"]/g,_xmlEncoder),'"');
+	case TEXT_NODE:
+		return buf.push(node.data.replace(/[<&]/g,_xmlEncoder));
+	case CDATA_SECTION_NODE:
+		return buf.push( '<![CDATA[',node.data,']]>');
+	case COMMENT_NODE:
+		return buf.push( "<!--",node.data,"-->");
+	case DOCUMENT_TYPE_NODE:
+		var pubid = node.publicId;
+		var sysid = node.systemId;
+		buf.push('<!DOCTYPE ',node.name);
+		if(pubid){
+			buf.push(' PUBLIC "',pubid);
+			if (sysid && sysid!='.') {
+				buf.push( '" "',sysid);
+			}
+			buf.push('">');
+		}else if(sysid && sysid!='.'){
+			buf.push(' SYSTEM "',sysid,'">');
+		}else{
+			var sub = node.internalSubset;
+			if(sub){
+				buf.push(" [",sub,"]");
+			}
+			buf.push(">");
+		}
+		return;
+	case PROCESSING_INSTRUCTION_NODE:
+		return buf.push( "<?",node.target," ",node.data,"?>");
+	case ENTITY_REFERENCE_NODE:
+		return buf.push( '&',node.nodeName,';');
+	//case ENTITY_NODE:
+	//case NOTATION_NODE:
+	default:
+		buf.push('??',node.nodeName);
+	}
+}
+function importNode(doc,node,deep){
+	var node2;
+	switch (node.nodeType) {
+	case ELEMENT_NODE:
+		node2 = node.cloneNode(false);
+		node2.ownerDocument = doc;
+		//var attrs = node2.attributes;
+		//var len = attrs.length;
+		//for(var i=0;i<len;i++){
+			//node2.setAttributeNodeNS(importNode(doc,attrs.item(i),deep));
+		//}
+	case DOCUMENT_FRAGMENT_NODE:
+		break;
+	case ATTRIBUTE_NODE:
+		deep = true;
+		break;
+	//case ENTITY_REFERENCE_NODE:
+	//case PROCESSING_INSTRUCTION_NODE:
+	////case TEXT_NODE:
+	//case CDATA_SECTION_NODE:
+	//case COMMENT_NODE:
+	//	deep = false;
+	//	break;
+	//case DOCUMENT_NODE:
+	//case DOCUMENT_TYPE_NODE:
+	//cannot be imported.
+	//case ENTITY_NODE:
+	//case NOTATION_NODE：
+	//can not hit in level3
+	//default:throw e;
+	}
+	if(!node2){
+		node2 = node.cloneNode(false);//false
+	}
+	node2.ownerDocument = doc;
+	node2.parentNode = null;
+	if(deep){
+		var child = node.firstChild;
+		while(child){
+			node2.appendChild(importNode(doc,child,deep));
+			child = child.nextSibling;
+		}
+	}
+	return node2;
+}
+//
+//var _relationMap = {firstChild:1,lastChild:1,previousSibling:1,nextSibling:1,
+//					attributes:1,childNodes:1,parentNode:1,documentElement:1,doctype,};
+function cloneNode(doc,node,deep){
+	var node2 = new node.constructor();
+	for(var n in node){
+		var v = node[n];
+		if(typeof v != 'object' ){
+			if(v != node2[n]){
+				node2[n] = v;
+			}
+		}
+	}
+	if(node.childNodes){
+		node2.childNodes = new NodeList();
+	}
+	node2.ownerDocument = doc;
+	switch (node2.nodeType) {
+	case ELEMENT_NODE:
+		var attrs	= node.attributes;
+		var attrs2	= node2.attributes = new NamedNodeMap();
+		var len = attrs.length
+		attrs2._ownerElement = node2;
+		for(var i=0;i<len;i++){
+			node2.setAttributeNode(cloneNode(doc,attrs.item(i),true));
+		}
+		break;;
+	case ATTRIBUTE_NODE:
+		deep = true;
+	}
+	if(deep){
+		var child = node.firstChild;
+		while(child){
+			node2.appendChild(cloneNode(doc,child,deep));
+			child = child.nextSibling;
+		}
+	}
+	return node2;
+}
+
+function __set__(object,key,value){
+	object[key] = value
+}
+//do dynamic
+try{
+	if(Object.defineProperty){
+		Object.defineProperty(LiveNodeList.prototype,'length',{
+			get:function(){
+				_updateLiveList(this);
+				return this.$$length;
+			}
+		});
+		Object.defineProperty(Node.prototype,'textContent',{
+			get:function(){
+				return getTextContent(this);
+			},
+			set:function(data){
+				switch(this.nodeType){
+				case 1:
+				case 11:
+					while(this.firstChild){
+						this.removeChild(this.firstChild);
+					}
+					if(data || String(data)){
+						this.appendChild(this.ownerDocument.createTextNode(data));
+					}
+					break;
+				default:
+					//TODO:
+					this.data = data;
+					this.value = value;
+					this.nodeValue = data;
+				}
+			}
+		})
+		
+		function getTextContent(node){
+			switch(node.nodeType){
+			case 1:
+			case 11:
+				var buf = [];
+				node = node.firstChild;
+				while(node){
+					if(node.nodeType!==7 && node.nodeType !==8){
+						buf.push(getTextContent(node));
+					}
+					node = node.nextSibling;
+				}
+				return buf.join('');
+			default:
+				return node.nodeValue;
+			}
+		}
+		__set__ = function(object,key,value){
+			//console.log(value)
+			object['$$'+key] = value
+		}
+	}
+}catch(e){//ie8
+}
+
+if(typeof require == 'function'){
+	exports.DOMImplementation = DOMImplementation;
+	exports.XMLSerializer = XMLSerializer;
+}
diff --git a/plugins/tiddlywiki/xmldom/files/readme.md b/plugins/tiddlywiki/xmldom/files/readme.md
new file mode 100644
index 000000000..f832c4483
--- /dev/null
+++ b/plugins/tiddlywiki/xmldom/files/readme.md
@@ -0,0 +1,219 @@
+# XMLDOM [![Build Status](https://secure.travis-ci.org/bigeasy/xmldom.png?branch=master)](http://travis-ci.org/bigeasy/xmldom) [![Coverage Status](https://coveralls.io/repos/bigeasy/xmldom/badge.png?branch=master)](https://coveralls.io/r/bigeasy/xmldom) [![NPM version](https://badge.fury.io/js/xmldom.png)](http://badge.fury.io/js/xmldom)
+
+A JavaScript implementation of W3C DOM for Node.js, Rhino and the browser. Fully
+compatible with `W3C DOM level2`; and some compatible with `level3`. Supports
+`DOMParser` and `XMLSerializer` interface such as in browser.
+
+Install:
+-------
+>npm install xmldom
+
+Example:
+====
+```javascript
+var DOMParser = require('xmldom').DOMParser;
+var doc = new DOMParser().parseFromString(
+    '<xml xmlns="a" xmlns:c="./lite">\n'+
+        '\t<child>test</child>\n'+
+        '\t<child></child>\n'+
+        '\t<child/>\n'+
+    '</xml>'
+    ,'text/xml');
+doc.documentElement.setAttribute('x','y');
+doc.documentElement.setAttributeNS('./lite','c:x','y2');
+var nsAttr = doc.documentElement.getAttributeNS('./lite','x')
+console.info(nsAttr)
+console.info(doc)
+```
+API Reference
+=====
+
+ * [DOMParser](https://developer.mozilla.org/en/DOMParser):
+
+	```javascript
+	parseFromString(xmlsource,mimeType)
+	```
+	* **options extension** _by xmldom_(not BOM standard!!)
+
+	```javascript
+	//added the options argument
+	new DOMParser(options)
+	
+	//errorHandler is supported
+	new DOMParser({
+		/**
+		 * locator is always need for error position info
+		 */
+		locator:{},
+		/**
+		 * you can override the errorHandler for xml parser
+		 * @link http://www.saxproject.org/apidoc/org/xml/sax/ErrorHandler.html
+		 */
+		errorHandler:{warning:function(w){console.warn(w)},error:callback,fatalError:callback}
+		//only callback model
+		//errorHandler:function(level,msg){console.log(level,msg)}
+	})
+		
+	```
+
+ * [XMLSerializer](https://developer.mozilla.org/en/XMLSerializer)
+ 
+	```javascript
+	serializeToString(node)
+	```
+DOM level2 method and attribute:
+------
+
+ * [Node](http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-1950641247)
+	
+		attribute:
+			nodeValue|prefix
+		readonly attribute:
+			nodeName|nodeType|parentNode|childNodes|firstChild|lastChild|previousSibling|nextSibling|attributes|ownerDocument|namespaceURI|localName
+		method:	
+			insertBefore(newChild, refChild)
+			replaceChild(newChild, oldChild)
+			removeChild(oldChild)
+			appendChild(newChild)
+			hasChildNodes()
+			cloneNode(deep)
+			normalize()
+			isSupported(feature, version)
+			hasAttributes()
+
+ * [DOMImplementation](http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-102161490)
+		
+		method:
+			hasFeature(feature, version)
+			createDocumentType(qualifiedName, publicId, systemId)
+			createDocument(namespaceURI, qualifiedName, doctype)
+
+ * [Document](http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#i-Document) : Node
+		
+		readonly attribute:
+			doctype|implementation|documentElement
+		method:
+			createElement(tagName)
+			createDocumentFragment()
+			createTextNode(data)
+			createComment(data)
+			createCDATASection(data)
+			createProcessingInstruction(target, data)
+			createAttribute(name)
+			createEntityReference(name)
+			getElementsByTagName(tagname)
+			importNode(importedNode, deep)
+			createElementNS(namespaceURI, qualifiedName)
+			createAttributeNS(namespaceURI, qualifiedName)
+			getElementsByTagNameNS(namespaceURI, localName)
+			getElementById(elementId)
+
+ * [DocumentFragment](http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-B63ED1A3) : Node
+ * [Element](http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-745549614) : Node
+		
+		readonly attribute:
+			tagName
+		method:
+			getAttribute(name)
+			setAttribute(name, value)
+			removeAttribute(name)
+			getAttributeNode(name)
+			setAttributeNode(newAttr)
+			removeAttributeNode(oldAttr)
+			getElementsByTagName(name)
+			getAttributeNS(namespaceURI, localName)
+			setAttributeNS(namespaceURI, qualifiedName, value)
+			removeAttributeNS(namespaceURI, localName)
+			getAttributeNodeNS(namespaceURI, localName)
+			setAttributeNodeNS(newAttr)
+			getElementsByTagNameNS(namespaceURI, localName)
+			hasAttribute(name)
+			hasAttributeNS(namespaceURI, localName)
+
+ * [Attr](http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-637646024) : Node
+	
+		attribute:
+			value
+		readonly attribute:
+			name|specified|ownerElement
+
+ * [NodeList](http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-536297177)
+		
+		readonly attribute:
+			length
+		method:
+			item(index)
+	
+ * [NamedNodeMap](http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-1780488922)
+
+		readonly attribute:
+			length
+		method:
+			getNamedItem(name)
+			setNamedItem(arg)
+			removeNamedItem(name)
+			item(index)
+			getNamedItemNS(namespaceURI, localName)
+			setNamedItemNS(arg)
+			removeNamedItemNS(namespaceURI, localName)
+		
+ * [CharacterData](http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-FF21A306) : Node
+	
+		method:
+			substringData(offset, count)
+			appendData(arg)
+			insertData(offset, arg)
+			deleteData(offset, count)
+			replaceData(offset, count, arg)
+		
+ * [Text](http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-1312295772) : CharacterData
+	
+		method:
+			splitText(offset)
+			
+ * [CDATASection](http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-667469212)
+ * [Comment](http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-1728279322) : CharacterData
+	
+ * [DocumentType](http://www.w3.org/TR/2000/REC-DOM-Level-2-Core-20001113/core.html#ID-412266927)
+	
+		readonly attribute:
+			name|entities|notations|publicId|systemId|internalSubset
+			
+ * Notation : Node
+	
+		readonly attribute:
+			publicId|systemId
+			
+ * Entity : Node
+	
+		readonly attribute:
+			publicId|systemId|notationName
+			
+ * EntityReference : Node 
+ * ProcessingInstruction : Node 
+	
+		attribute:
+			data
+		readonly attribute:
+			target
+		
+DOM level 3 support:
+-----
+
+ * [Node](http://www.w3.org/TR/DOM-Level-3-Core/core.html#Node3-textContent)
+		
+		attribute:
+			textContent
+		method:
+			isDefaultNamespace(namespaceURI){
+			lookupNamespaceURI(prefix)
+
+DOM extension by xmldom
+---
+ * [Node] Source position extension; 
+		
+		attribute:
+			//Numbered starting from '1'
+			lineNumber
+			//Numbered starting from '1'
+			columnNumber
diff --git a/plugins/tiddlywiki/xmldom/files/sax.js b/plugins/tiddlywiki/xmldom/files/sax.js
new file mode 100644
index 000000000..127963f8a
--- /dev/null
+++ b/plugins/tiddlywiki/xmldom/files/sax.js
@@ -0,0 +1,586 @@
+//[4]   	NameStartChar	   ::=   	":" | [A-Z] | "_" | [a-z] | [#xC0-#xD6] | [#xD8-#xF6] | [#xF8-#x2FF] | [#x370-#x37D] | [#x37F-#x1FFF] | [#x200C-#x200D] | [#x2070-#x218F] | [#x2C00-#x2FEF] | [#x3001-#xD7FF] | [#xF900-#xFDCF] | [#xFDF0-#xFFFD] | [#x10000-#xEFFFF]
+//[4a]   	NameChar	   ::=   	NameStartChar | "-" | "." | [0-9] | #xB7 | [#x0300-#x036F] | [#x203F-#x2040]
+//[5]   	Name	   ::=   	NameStartChar (NameChar)*
+var nameStartChar = /[A-Z_a-z\xC0-\xD6\xD8-\xF6\u00F8-\u02FF\u0370-\u037D\u037F-\u1FFF\u200C-\u200D\u2070-\u218F\u2C00-\u2FEF\u3001-\uD7FF\uF900-\uFDCF\uFDF0-\uFFFD]///\u10000-\uEFFFF
+var nameChar = new RegExp("[\\-\\.0-9"+nameStartChar.source.slice(1,-1)+"\u00B7\u0300-\u036F\\u203F-\u2040]");
+var tagNamePattern = new RegExp('^'+nameStartChar.source+nameChar.source+'*(?:\:'+nameStartChar.source+nameChar.source+'*)?$');
+//var tagNamePattern = /^[a-zA-Z_][\w\-\.]*(?:\:[a-zA-Z_][\w\-\.]*)?$/
+//var handlers = 'resolveEntity,getExternalSubset,characters,endDocument,endElement,endPrefixMapping,ignorableWhitespace,processingInstruction,setDocumentLocator,skippedEntity,startDocument,startElement,startPrefixMapping,notationDecl,unparsedEntityDecl,error,fatalError,warning,attributeDecl,elementDecl,externalEntityDecl,internalEntityDecl,comment,endCDATA,endDTD,endEntity,startCDATA,startDTD,startEntity'.split(',')
+
+//S_TAG,	S_ATTR,	S_EQ,	S_V
+//S_ATTR_S,	S_E,	S_S,	S_C
+var S_TAG = 0;//tag name offerring
+var S_ATTR = 1;//attr name offerring 
+var S_ATTR_S=2;//attr name end and space offer
+var S_EQ = 3;//=space?
+var S_V = 4;//attr value(no quot value only)
+var S_E = 5;//attr value end and no space(quot end)
+var S_S = 6;//(attr value end || tag end ) && (space offer)
+var S_C = 7;//closed el<el />
+
+function XMLReader(){
+	
+}
+
+XMLReader.prototype = {
+	parse:function(source,defaultNSMap,entityMap){
+		var domBuilder = this.domBuilder;
+		domBuilder.startDocument();
+		_copy(defaultNSMap ,defaultNSMap = {})
+		parse(source,defaultNSMap,entityMap,
+				domBuilder,this.errorHandler);
+		domBuilder.endDocument();
+	}
+}
+function parse(source,defaultNSMapCopy,entityMap,domBuilder,errorHandler){
+  function fixedFromCharCode(code) {
+		// String.prototype.fromCharCode does not supports
+		// > 2 bytes unicode chars directly
+		if (code > 0xffff) {
+			code -= 0x10000;
+			var surrogate1 = 0xd800 + (code >> 10)
+				, surrogate2 = 0xdc00 + (code & 0x3ff);
+
+			return String.fromCharCode(surrogate1, surrogate2);
+		} else {
+			return String.fromCharCode(code);
+		}
+	}
+	function entityReplacer(a){
+		var k = a.slice(1,-1);
+		if(k in entityMap){
+			return entityMap[k]; 
+		}else if(k.charAt(0) === '#'){
+			return fixedFromCharCode(parseInt(k.substr(1).replace('x','0x')))
+		}else{
+			errorHandler.error('entity not found:'+a);
+			return a;
+		}
+	}
+	function appendText(end){//has some bugs
+		if(end>start){
+			var xt = source.substring(start,end).replace(/&#?\w+;/g,entityReplacer);
+			locator&&position(start);
+			domBuilder.characters(xt,0,end-start);
+			start = end
+		}
+	}
+	function position(p,m){
+		while(p>=lineEnd && (m = linePattern.exec(source))){
+			lineStart = m.index;
+			lineEnd = lineStart + m[0].length;
+			locator.lineNumber++;
+			//console.log('line++:',locator,startPos,endPos)
+		}
+		locator.columnNumber = p-lineStart+1;
+	}
+	var lineStart = 0;
+	var lineEnd = 0;
+	var linePattern = /.+(?:\r\n?|\n)|.*$/g
+	var locator = domBuilder.locator;
+	
+	var parseStack = [{currentNSMap:defaultNSMapCopy}]
+	var closeMap = {};
+	var start = 0;
+	while(true){
+		try{
+			var tagStart = source.indexOf('<',start);
+			if(tagStart<0){
+				if(!source.substr(start).match(/^\s*$/)){
+					var doc = domBuilder.document;
+	    			var text = doc.createTextNode(source.substr(start));
+	    			doc.appendChild(text);
+	    			domBuilder.currentElement = text;
+				}
+				return;
+			}
+			if(tagStart>start){
+				appendText(tagStart);
+			}
+			switch(source.charAt(tagStart+1)){
+			case '/':
+				var end = source.indexOf('>',tagStart+3);
+				var tagName = source.substring(tagStart+2,end);
+				var config = parseStack.pop();
+				var localNSMap = config.localNSMap;
+		        if(config.tagName != tagName){
+		            errorHandler.fatalError("end tag name: "+tagName+' is not match the current start tagName:'+config.tagName );
+		        }
+				domBuilder.endElement(config.uri,config.localName,tagName);
+				if(localNSMap){
+					for(var prefix in localNSMap){
+						domBuilder.endPrefixMapping(prefix) ;
+					}
+				}
+				end++;
+				break;
+				// end elment
+			case '?':// <?...?>
+				locator&&position(tagStart);
+				end = parseInstruction(source,tagStart,domBuilder);
+				break;
+			case '!':// <!doctype,<![CDATA,<!--
+				locator&&position(tagStart);
+				end = parseDCC(source,tagStart,domBuilder,errorHandler);
+				break;
+			default:
+			
+				locator&&position(tagStart);
+				
+				var el = new ElementAttributes();
+				
+				//elStartEnd
+				var end = parseElementStartPart(source,tagStart,el,entityReplacer,errorHandler);
+				var len = el.length;
+				
+				if(locator){
+					if(len){
+						//attribute position fixed
+						for(var i = 0;i<len;i++){
+							var a = el[i];
+							position(a.offset);
+							a.offset = copyLocator(locator,{});
+						}
+					}
+					position(end);
+				}
+				if(!el.closed && fixSelfClosed(source,end,el.tagName,closeMap)){
+					el.closed = true;
+					if(!entityMap.nbsp){
+						errorHandler.warning('unclosed xml attribute');
+					}
+				}
+				appendElement(el,domBuilder,parseStack);
+				
+				
+				if(el.uri === 'http://www.w3.org/1999/xhtml' && !el.closed){
+					end = parseHtmlSpecialContent(source,end,el.tagName,entityReplacer,domBuilder)
+				}else{
+					end++;
+				}
+			}
+		}catch(e){
+			errorHandler.error('element parse error: '+e);
+			end = -1;
+		}
+		if(end>start){
+			start = end;
+		}else{
+			//TODO: 这里有可能sax回退，有位置错误风险
+			appendText(Math.max(tagStart,start)+1);
+		}
+	}
+}
+function copyLocator(f,t){
+	t.lineNumber = f.lineNumber;
+	t.columnNumber = f.columnNumber;
+	return t;
+}
+
+/**
+ * @see #appendElement(source,elStartEnd,el,selfClosed,entityReplacer,domBuilder,parseStack);
+ * @return end of the elementStartPart(end of elementEndPart for selfClosed el)
+ */
+function parseElementStartPart(source,start,el,entityReplacer,errorHandler){
+	var attrName;
+	var value;
+	var p = ++start;
+	var s = S_TAG;//status
+	while(true){
+		var c = source.charAt(p);
+		switch(c){
+		case '=':
+			if(s === S_ATTR){//attrName
+				attrName = source.slice(start,p);
+				s = S_EQ;
+			}else if(s === S_ATTR_S){
+				s = S_EQ;
+			}else{
+				//fatalError: equal must after attrName or space after attrName
+				throw new Error('attribute equal must after attrName');
+			}
+			break;
+		case '\'':
+		case '"':
+			if(s === S_EQ){//equal
+				start = p+1;
+				p = source.indexOf(c,start)
+				if(p>0){
+					value = source.slice(start,p).replace(/&#?\w+;/g,entityReplacer);
+					el.add(attrName,value,start-1);
+					s = S_E;
+				}else{
+					//fatalError: no end quot match
+					throw new Error('attribute value no end \''+c+'\' match');
+				}
+			}else if(s == S_V){
+				value = source.slice(start,p).replace(/&#?\w+;/g,entityReplacer);
+				//console.log(attrName,value,start,p)
+				el.add(attrName,value,start);
+				//console.dir(el)
+				errorHandler.warning('attribute "'+attrName+'" missed start quot('+c+')!!');
+				start = p+1;
+				s = S_E
+			}else{
+				//fatalError: no equal before
+				throw new Error('attribute value must after "="');
+			}
+			break;
+		case '/':
+			switch(s){
+			case S_TAG:
+				el.setTagName(source.slice(start,p));
+			case S_E:
+			case S_S:
+			case S_C:
+				s = S_C;
+				el.closed = true;
+			case S_V:
+			case S_ATTR:
+			case S_ATTR_S:
+				break;
+			//case S_EQ:
+			default:
+				throw new Error("attribute invalid close char('/')")
+			}
+			break;
+		case ''://end document
+			//throw new Error('unexpected end of input')
+			errorHandler.error('unexpected end of input');
+		case '>':
+			switch(s){
+			case S_TAG:
+				el.setTagName(source.slice(start,p));
+			case S_E:
+			case S_S:
+			case S_C:
+				break;//normal
+			case S_V://Compatible state
+			case S_ATTR:
+				value = source.slice(start,p);
+				if(value.slice(-1) === '/'){
+					el.closed  = true;
+					value = value.slice(0,-1)
+				}
+			case S_ATTR_S:
+				if(s === S_ATTR_S){
+					value = attrName;
+				}
+				if(s == S_V){
+					errorHandler.warning('attribute "'+value+'" missed quot(")!!');
+					el.add(attrName,value.replace(/&#?\w+;/g,entityReplacer),start)
+				}else{
+					errorHandler.warning('attribute "'+value+'" missed value!! "'+value+'" instead!!')
+					el.add(value,value,start)
+				}
+				break;
+			case S_EQ:
+				throw new Error('attribute value missed!!');
+			}
+//			console.log(tagName,tagNamePattern,tagNamePattern.test(tagName))
+			return p;
+		/*xml space '\x20' | #x9 | #xD | #xA; */
+		case '\u0080':
+			c = ' ';
+		default:
+			if(c<= ' '){//space
+				switch(s){
+				case S_TAG:
+					el.setTagName(source.slice(start,p));//tagName
+					s = S_S;
+					break;
+				case S_ATTR:
+					attrName = source.slice(start,p)
+					s = S_ATTR_S;
+					break;
+				case S_V:
+					var value = source.slice(start,p).replace(/&#?\w+;/g,entityReplacer);
+					errorHandler.warning('attribute "'+value+'" missed quot(")!!');
+					el.add(attrName,value,start)
+				case S_E:
+					s = S_S;
+					break;
+				//case S_S:
+				//case S_EQ:
+				//case S_ATTR_S:
+				//	void();break;
+				//case S_C:
+					//ignore warning
+				}
+			}else{//not space
+//S_TAG,	S_ATTR,	S_EQ,	S_V
+//S_ATTR_S,	S_E,	S_S,	S_C
+				switch(s){
+				//case S_TAG:void();break;
+				//case S_ATTR:void();break;
+				//case S_V:void();break;
+				case S_ATTR_S:
+					errorHandler.warning('attribute "'+attrName+'" missed value!! "'+attrName+'" instead!!')
+					el.add(attrName,attrName,start);
+					start = p;
+					s = S_ATTR;
+					break;
+				case S_E:
+					errorHandler.warning('attribute space is required"'+attrName+'"!!')
+				case S_S:
+					s = S_ATTR;
+					start = p;
+					break;
+				case S_EQ:
+					s = S_V;
+					start = p;
+					break;
+				case S_C:
+					throw new Error("elements closed character '/' and '>' must be connected to");
+				}
+			}
+		}
+		p++;
+	}
+}
+/**
+ * @return end of the elementStartPart(end of elementEndPart for selfClosed el)
+ */
+function appendElement(el,domBuilder,parseStack){
+	var tagName = el.tagName;
+	var localNSMap = null;
+	var currentNSMap = parseStack[parseStack.length-1].currentNSMap;
+	var i = el.length;
+	while(i--){
+		var a = el[i];
+		var qName = a.qName;
+		var value = a.value;
+		var nsp = qName.indexOf(':');
+		if(nsp>0){
+			var prefix = a.prefix = qName.slice(0,nsp);
+			var localName = qName.slice(nsp+1);
+			var nsPrefix = prefix === 'xmlns' && localName
+		}else{
+			localName = qName;
+			prefix = null
+			nsPrefix = qName === 'xmlns' && ''
+		}
+		//can not set prefix,because prefix !== ''
+		a.localName = localName ;
+		//prefix == null for no ns prefix attribute 
+		if(nsPrefix !== false){//hack!!
+			if(localNSMap == null){
+				localNSMap = {}
+				//console.log(currentNSMap,0)
+				_copy(currentNSMap,currentNSMap={})
+				//console.log(currentNSMap,1)
+			}
+			currentNSMap[nsPrefix] = localNSMap[nsPrefix] = value;
+			a.uri = 'http://www.w3.org/2000/xmlns/'
+			domBuilder.startPrefixMapping(nsPrefix, value) 
+		}
+	}
+	var i = el.length;
+	while(i--){
+		a = el[i];
+		var prefix = a.prefix;
+		if(prefix){//no prefix attribute has no namespace
+			if(prefix === 'xml'){
+				a.uri = 'http://www.w3.org/XML/1998/namespace';
+			}if(prefix !== 'xmlns'){
+				a.uri = currentNSMap[prefix]
+				
+				//{console.log('###'+a.qName,domBuilder.locator.systemId+'',currentNSMap,a.uri)}
+			}
+		}
+	}
+	var nsp = tagName.indexOf(':');
+	if(nsp>0){
+		prefix = el.prefix = tagName.slice(0,nsp);
+		localName = el.localName = tagName.slice(nsp+1);
+	}else{
+		prefix = null;//important!!
+		localName = el.localName = tagName;
+	}
+	//no prefix element has default namespace
+	var ns = el.uri = currentNSMap[prefix || ''];
+	domBuilder.startElement(ns,localName,tagName,el);
+	//endPrefixMapping and startPrefixMapping have not any help for dom builder
+	//localNSMap = null
+	if(el.closed){
+		domBuilder.endElement(ns,localName,tagName);
+		if(localNSMap){
+			for(prefix in localNSMap){
+				domBuilder.endPrefixMapping(prefix) 
+			}
+		}
+	}else{
+		el.currentNSMap = currentNSMap;
+		el.localNSMap = localNSMap;
+		parseStack.push(el);
+	}
+}
+function parseHtmlSpecialContent(source,elStartEnd,tagName,entityReplacer,domBuilder){
+	if(/^(?:script|textarea)$/i.test(tagName)){
+		var elEndStart =  source.indexOf('</'+tagName+'>',elStartEnd);
+		var text = source.substring(elStartEnd+1,elEndStart);
+		if(/[&<]/.test(text)){
+			if(/^script$/i.test(tagName)){
+				//if(!/\]\]>/.test(text)){
+					//lexHandler.startCDATA();
+					domBuilder.characters(text,0,text.length);
+					//lexHandler.endCDATA();
+					return elEndStart;
+				//}
+			}//}else{//text area
+				text = text.replace(/&#?\w+;/g,entityReplacer);
+				domBuilder.characters(text,0,text.length);
+				return elEndStart;
+			//}
+			
+		}
+	}
+	return elStartEnd+1;
+}
+function fixSelfClosed(source,elStartEnd,tagName,closeMap){
+	//if(tagName in closeMap){
+	var pos = closeMap[tagName];
+	if(pos == null){
+		//console.log(tagName)
+		pos = closeMap[tagName] = source.lastIndexOf('</'+tagName+'>')
+	}
+	return pos<elStartEnd;
+	//} 
+}
+function _copy(source,target){
+	for(var n in source){target[n] = source[n]}
+}
+function parseDCC(source,start,domBuilder,errorHandler){//sure start with '<!'
+	var next= source.charAt(start+2)
+	switch(next){
+	case '-':
+		if(source.charAt(start + 3) === '-'){
+			var end = source.indexOf('-->',start+4);
+			//append comment source.substring(4,end)//<!--
+			if(end>start){
+				domBuilder.comment(source,start+4,end-start-4);
+				return end+3;
+			}else{
+				errorHandler.error("Unclosed comment");
+				return -1;
+			}
+		}else{
+			//error
+			return -1;
+		}
+	default:
+		if(source.substr(start+3,6) == 'CDATA['){
+			var end = source.indexOf(']]>',start+9);
+			domBuilder.startCDATA();
+			domBuilder.characters(source,start+9,end-start-9);
+			domBuilder.endCDATA() 
+			return end+3;
+		}
+		//<!DOCTYPE
+		//startDTD(java.lang.String name, java.lang.String publicId, java.lang.String systemId) 
+		var matchs = split(source,start);
+		var len = matchs.length;
+		if(len>1 && /!doctype/i.test(matchs[0][0])){
+			var name = matchs[1][0];
+			var pubid = len>3 && /^public$/i.test(matchs[2][0]) && matchs[3][0]
+			var sysid = len>4 && matchs[4][0];
+			var lastMatch = matchs[len-1]
+			domBuilder.startDTD(name,pubid && pubid.replace(/^(['"])(.*?)\1$/,'$2'),
+					sysid && sysid.replace(/^(['"])(.*?)\1$/,'$2'));
+			domBuilder.endDTD();
+			
+			return lastMatch.index+lastMatch[0].length
+		}
+	}
+	return -1;
+}
+
+
+
+function parseInstruction(source,start,domBuilder){
+	var end = source.indexOf('?>',start);
+	if(end){
+		var match = source.substring(start,end).match(/^<\?(\S*)\s*([\s\S]*?)\s*$/);
+		if(match){
+			var len = match[0].length;
+			domBuilder.processingInstruction(match[1], match[2]) ;
+			return end+2;
+		}else{//error
+			return -1;
+		}
+	}
+	return -1;
+}
+
+/**
+ * @param source
+ */
+function ElementAttributes(source){
+	
+}
+ElementAttributes.prototype = {
+	setTagName:function(tagName){
+		if(!tagNamePattern.test(tagName)){
+			throw new Error('invalid tagName:'+tagName)
+		}
+		this.tagName = tagName
+	},
+	add:function(qName,value,offset){
+		if(!tagNamePattern.test(qName)){
+			throw new Error('invalid attribute:'+qName)
+		}
+		this[this.length++] = {qName:qName,value:value,offset:offset}
+	},
+	length:0,
+	getLocalName:function(i){return this[i].localName},
+	getOffset:function(i){return this[i].offset},
+	getQName:function(i){return this[i].qName},
+	getURI:function(i){return this[i].uri},
+	getValue:function(i){return this[i].value}
+//	,getIndex:function(uri, localName)){
+//		if(localName){
+//			
+//		}else{
+//			var qName = uri
+//		}
+//	},
+//	getValue:function(){return this.getValue(this.getIndex.apply(this,arguments))},
+//	getType:function(uri,localName){}
+//	getType:function(i){},
+}
+
+
+
+
+function _set_proto_(thiz,parent){
+	thiz.__proto__ = parent;
+	return thiz;
+}
+if(!(_set_proto_({},_set_proto_.prototype) instanceof _set_proto_)){
+	_set_proto_ = function(thiz,parent){
+		function p(){};
+		p.prototype = parent;
+		p = new p();
+		for(parent in thiz){
+			p[parent] = thiz[parent];
+		}
+		return p;
+	}
+}
+
+function split(source,start){
+	var match;
+	var buf = [];
+	var reg = /'[^']+'|"[^"]+"|[^\s<>\/=]+=?|(\/?\s*>|<)/g;
+	reg.lastIndex = start;
+	reg.exec(source);//skip <
+	while(match = reg.exec(source)){
+		buf.push(match);
+		if(match[1])return buf;
+	}
+}
+
+if(typeof require == 'function'){
+	exports.XMLReader = XMLReader;
+}
+
diff --git a/plugins/tiddlywiki/xmldom/files/tiddlywiki.files b/plugins/tiddlywiki/xmldom/files/tiddlywiki.files
new file mode 100644
index 000000000..2e8d8a14e
--- /dev/null
+++ b/plugins/tiddlywiki/xmldom/files/tiddlywiki.files
@@ -0,0 +1,38 @@
+{
+	"tiddlers": [
+		{
+			"file": "dom.js",
+			"fields": {
+				"type": "application/javascript",
+				"title": "$:/plugins/tiddlywiki/xmldom/dom",
+				"module-type": "library"
+			},
+			"prefix": "",
+			"suffix": ""
+		},{
+			"file": "dom-parser.js",
+			"fields": {
+				"type": "application/javascript",
+				"title": "$:/plugins/tiddlywiki/xmldom/dom-parser",
+				"module-type": "library"
+			},
+			"prefix": "",
+			"suffix": ""
+		},{
+			"file": "sax.js",
+			"fields": {
+				"type": "application/javascript",
+				"title": "$:/plugins/tiddlywiki/xmldom/sax",
+				"module-type": "library"
+			},
+			"prefix": "",
+			"suffix": ""
+		},{
+			"file": "LICENSE",
+			"fields": {
+				"type": "text/plain",
+				"title": "$:/plugins/tiddlywiki/xmldom/license"
+			}
+		}
+	]
+}
diff --git a/plugins/tiddlywiki/xmldom/plugin.info b/plugins/tiddlywiki/xmldom/plugin.info
new file mode 100644
index 000000000..d28b438a7
--- /dev/null
+++ b/plugins/tiddlywiki/xmldom/plugin.info
@@ -0,0 +1,7 @@
+{
+	"title": "$:/plugins/tiddlywiki/xmldom",
+	"description": "Wrapper for xmldom",
+	"author": "JeremyRuston",
+	"core-version": ">=5.0.0",
+	"list": "readme license"
+}
diff --git a/plugins/tiddlywiki/xmldom/readme.tid b/plugins/tiddlywiki/xmldom/readme.tid
new file mode 100644
index 000000000..098edfd03
--- /dev/null
+++ b/plugins/tiddlywiki/xmldom/readme.tid
@@ -0,0 +1,3 @@
+title: $:/plugins/tiddlywiki/xmldom/readme
+
+This plugin packages [[xmldom|https://github.com/jindw/xmldom]] for use by other plugins. It does not provide any end-user visible features.
diff --git a/readme.md b/readme.md
index 60fbf3601..c2a68030b 100644
--- a/readme.md
+++ b/readme.md
@@ -1,4 +1,9 @@
-<p>Welcome to <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a>, a non-linear personal web notebook that anyone can use and keep forever, independently of any corporation.</p><p><a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> is a complete interactive wiki in <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/JavaScript.html">JavaScript</a>. It can be used as a single HTML file in the browser or as a powerful Node.js application. It is highly customisable: the entire user interface is itself implemented in hackable <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/WikiText.html">WikiText</a>.</p><p>Learn more and see it in action at <a class="tc-tiddlylink-external" href="http://tiddlywiki.com/" target="_blank">http://tiddlywiki.com/</a></p><p>Developer documentation is in progress at <a class="tc-tiddlylink-external" href="http://tiddlywiki.com/dev/" target="_blank">http://tiddlywiki.com/dev/</a></p><h1 class="">Installing <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> on Node.js</h1><ol><li>Install <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/Node.js.html">Node.js</a> from <a class="tc-tiddlylink-external" href="http://nodejs.org" target="_blank">http://nodejs.org</a></li><li>Open a command line terminal and type:<blockquote><p><code>npm install -g tiddlywiki</code></p><p>If it fails with an error you may need to re-run the command as an administrator:</p><p><code>sudo npm install -g tiddlywiki</code> (Mac/Linux)</p></blockquote></li><li>Check <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> is installed by typing:<blockquote><p><code>tiddlywiki --version</code></p></blockquote></li><li>In response, you should see <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> report its current version (eg &quot;5.1.9&quot;; you may also see other debugging information reported)</li><li>Try it out:<ol><li><code>tiddlywiki mynewwiki --init server</code> to create a folder for a new wiki that includes server-related components</li><li><code>tiddlywiki mynewwiki --server</code> to start <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a></li><li>Visit <a class="tc-tiddlylink-external" href="http://127.0.0.1:8080/" target="_blank">http://127.0.0.1:8080/</a> in your browser</li><li>Try editing and creating tiddlers</li></ol></li></ol><p>The <code>-g</code> flag causes <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> to be installed globally. Without it, <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> will only be available in the directory where you installed it.</p><p>If you are using Debian or Debian-based Linux and you are reciving a <code>node: command not found</code> error though node.js package is installed, you may need to create a symbolic link between <code>nodejs</code> and <code>node</code>. Consult your distro's manual and <code>whereis</code> to correctly create a link. See github <a class="tc-tiddlylink-external" href="http://github.com/Jermolene/TiddlyWiki5/issues/1434" target="_blank">issue 1434</a></p><p>Example Debian v8.0: <code>sudo ln -s /usr/bin/nodejs /usr/bin/node</code></p><h1 class="">Using <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> on Node.js</h1><p><a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki5.html">TiddlyWiki5</a> can be used on the command line to perform an extensive set of operations based on <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWikiFolders.html">TiddlyWikiFolders</a>, <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlerFiles.html">TiddlerFiles</a> and <a class="tc-tiddlylink tc-tiddlylink-missing" href="http://tiddlywiki.com/static/TiddlyWikiFiles.html">TiddlyWikiFiles</a>.</p><p>For example, the following command loads the tiddlers from a <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> HTML file and then saves one of them in static HTML:</p><pre><code>tiddlywiki --verbose --load mywiki.html --rendertiddler ReadMe ./readme.html</code></pre><p>Running <code>tiddlywiki</code> from the command line boots the <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> kernel, loads the core plugins and establishes an empty wiki store. It then sequentially processes the command line arguments from left to right. The arguments are separated with spaces.</p><p>The first argument is the optional path to the <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWikiFolders.html">TiddlyWikiFolder</a> to be loaded. If not present, then the current directory is used.</p><p>The commands and their individual arguments follow, each command being identified by the prefix <code>--</code>.</p><pre><code>tiddlywiki [&lt;wikipath&gt;] [--&lt;command&gt; [&lt;arg&gt;[,&lt;arg&gt;]]]</code></pre><p>The available commands are:</p><p><ul class="">
+<p>Welcome to <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a>, a non-linear personal web notebook that anyone can use and keep forever, independently of any corporation.</p><p><a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> is a complete interactive wiki in <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/JavaScript.html">JavaScript</a>. It can be used as a single HTML file in the browser or as a powerful Node.js application. It is highly customisable: the entire user interface is itself implemented in hackable <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/WikiText.html">WikiText</a>.</p><p>Learn more and see it in action at <a class="tc-tiddlylink-external" href="http://tiddlywiki.com/" rel="noopener noreferrer" target="_blank">http://tiddlywiki.com/</a></p><p>Developer documentation is in progress at <a class="tc-tiddlylink-external" href="http://tiddlywiki.com/dev/" rel="noopener noreferrer" target="_blank">http://tiddlywiki.com/dev/</a></p><h1 class="">Installing <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> on Node.js</h1><ol><li>Install <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/Node.js.html">Node.js</a><ul><li>either from your favourite package manager: typically <code>apt-get install nodejs</code> on Debian/Ubuntu Linux or Termux for Android, or <code>brew install node</code> on a Mac</li><li>or directly from <a class="tc-tiddlylink-external" href="http://nodejs.org" rel="noopener noreferrer" target="_blank">http://nodejs.org</a></li></ul></li><li>Open a command line terminal and type:<blockquote><p><code>npm install -g tiddlywiki</code></p><p>If it fails with an error you may need to re-run the command as an administrator:</p><p><code>sudo npm install -g tiddlywiki</code> (Mac/Linux)</p></blockquote></li><li>Check <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> is installed by typing:<blockquote><p><code>tiddlywiki --version</code></p></blockquote></li><li>In response, you should see <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> report its current version (eg &quot;5.1.13&quot;; you may also see other debugging information reported)</li><li>Try it out:<ol><li><code>tiddlywiki mynewwiki --init server</code> to create a folder for a new wiki that includes server-related components</li><li><code>tiddlywiki mynewwiki --server</code> to start <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a></li><li>Visit <a class="tc-tiddlylink-external" href="http://127.0.0.1:8080/" rel="noopener noreferrer" target="_blank">http://127.0.0.1:8080/</a> in your browser</li><li>Try editing and creating tiddlers</li></ol></li><li>Optionally, make an offline copy:<ul><li>click the <svg class="tc-image-save-button tc-image-button" height="22pt" viewBox="0 0 128 128" width="22pt">
+    <g fill-rule="evenodd">
+        <path d="M120.78304,34.329058 C125.424287,43.1924006 128.049406,53.2778608 128.049406,63.9764502 C128.049406,99.3226742 99.3956295,127.97645 64.0494055,127.97645 C28.7031816,127.97645 0.0494055385,99.3226742 0.0494055385,63.9764502 C0.0494055385,28.6302262 28.7031816,-0.0235498012 64.0494055,-0.0235498012 C82.8568763,-0.0235498012 99.769563,8.08898558 111.479045,21.0056358 L114.159581,18.3250998 C117.289194,15.1954866 122.356036,15.1939641 125.480231,18.3181584 C128.598068,21.4359957 128.601317,26.5107804 125.473289,29.6388083 L120.78304,34.329058 Z M108.72451,46.3875877 C110.870571,51.8341374 112.049406,57.767628 112.049406,63.9764502 C112.049406,90.4861182 90.5590735,111.97645 64.0494055,111.97645 C37.5397375,111.97645 16.0494055,90.4861182 16.0494055,63.9764502 C16.0494055,37.4667822 37.5397375,15.9764502 64.0494055,15.9764502 C78.438886,15.9764502 91.3495036,22.308215 100.147097,32.3375836 L58.9411255,73.5435552 L41.975581,56.5780107 C38.8486152,53.4510448 33.7746915,53.4551552 30.6568542,56.5729924 C27.5326599,59.6971868 27.5372202,64.7670668 30.6618725,67.8917192 L53.279253,90.5090997 C54.8435723,92.073419 56.8951519,92.8541315 58.9380216,92.8558261 C60.987971,92.8559239 63.0389578,92.0731398 64.6049211,90.5071765 L108.72451,46.3875877 Z"></path>
+    </g>
+</svg> <strong>save changes</strong> button in the sidebar, <strong>OR</strong></li><li><code>tiddlywiki --build index</code></li></ul></li></ol><p>The <code>-g</code> flag causes <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> to be installed globally. Without it, <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> will only be available in the directory where you installed it.</p><p>If you are using Debian or Debian-based Linux and you are receiving a <code>node: command not found</code> error though node.js package is installed, you may need to create a symbolic link between <code>nodejs</code> and <code>node</code>. Consult your distro's manual and <code>whereis</code> to correctly create a link. See github <a class="tc-tiddlylink-external" href="http://github.com/Jermolene/TiddlyWiki5/issues/1434" rel="noopener noreferrer" target="_blank">issue 1434</a></p><p>Example Debian v8.0: <code>sudo ln -s /usr/bin/nodejs /usr/bin/node</code>
+</p><h1 class="">Using <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> on Node.js</h1><p><a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki5.html">TiddlyWiki5</a> can be used on the command line to perform an extensive set of operations based on <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWikiFolders.html">TiddlyWikiFolders</a>, <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlerFiles.html">TiddlerFiles</a> and <a class="tc-tiddlylink tc-tiddlylink-missing" href="http://tiddlywiki.com/static/TiddlyWikiFiles.html">TiddlyWikiFiles</a>.</p><p>For example, the following command loads the tiddlers from a <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> HTML file and then saves one of them in static HTML:</p><pre><code>tiddlywiki --verbose --load mywiki.html --rendertiddler ReadMe ./readme.html</code></pre><p>Running <code>tiddlywiki</code> from the command line boots the <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWiki.html">TiddlyWiki</a> kernel, loads the core plugins and establishes an empty wiki store. It then sequentially processes the command line arguments from left to right. The arguments are separated with spaces.</p><p>The first argument is the optional path to the <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/TiddlyWikiFolders.html">TiddlyWikiFolder</a> to be loaded. If not present, then the current directory is used.</p><p>The commands and their individual arguments follow, each command being identified by the prefix <code>--</code>.</p><pre><code>tiddlywiki [&lt;wikipath&gt;] [--&lt;command&gt; [&lt;arg&gt;[,&lt;arg&gt;]]]</code></pre><p>The available commands are:</p><p><ul class="">
 
 <li>
 <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/BuildCommand.html">
@@ -182,6 +187,14 @@ Building TiddlyWikiClassic
 </a>
 </li>
 
+<li>
+<a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/Customising%2520Tiddler%2520File%2520Naming.html">
+
+Customising Tiddler File Naming
+
+</a>
+</li>
+
 <li>
 <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/Environment%2520Variables%2520on%2520Node.js.html">
 
@@ -198,6 +211,14 @@ Scripts for TiddlyWiki on Node.js
 </a>
 </li>
 
+<li>
+<a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/Serving%2520TW5%2520from%2520Android.html">
+
+Serving TW5 from Android
+
+</a>
+</li>
+
 <li>
 <a class="tc-tiddlylink tc-tiddlylink-resolves" href="http://tiddlywiki.com/static/Working%2520with%2520the%2520TiddlyWiki5%2520repository.html">
 
diff --git a/themes/tiddlywiki/snowwhite/base.tid b/themes/tiddlywiki/snowwhite/base.tid
index dff8c9bdc..78aae3b1f 100644
--- a/themes/tiddlywiki/snowwhite/base.tid
+++ b/themes/tiddlywiki/snowwhite/base.tid
@@ -88,11 +88,11 @@ canvas.tc-edit-bitmapeditor  {
 	<<background-linear-gradient "left, rgba(0,0,0,0.15) 0%, rgba(0,0,0,0.0) 100%">>
 }
 
-.tc-more-sidebar .tc-tab-buttons button {
+.tc-more-sidebar > .tc-tab-set > .tc-tab-buttons > button {
 	<<background-linear-gradient "left, rgba(0,0,0,0.01) 0%, rgba(0,0,0,0.1) 100%">>
 }
 
-.tc-more-sidebar .tc-tab-buttons button.tc-tab-selected {
+.tc-more-sidebar > .tc-tab-set > .tc-tab-buttons > button.tc-tab-selected {
 	<<background-linear-gradient "left, rgba(0,0,0,0.05) 0%, rgba(255,255,255,0.05) 100%">>
 }
 
diff --git a/themes/tiddlywiki/vanilla/ThemeTweaks.tid b/themes/tiddlywiki/vanilla/ThemeTweaks.tid
index bfc4075b0..486270851 100644
--- a/themes/tiddlywiki/vanilla/ThemeTweaks.tid
+++ b/themes/tiddlywiki/vanilla/ThemeTweaks.tid
@@ -1,23 +1,26 @@
 title: $:/themes/tiddlywiki/vanilla/themetweaks
 tags: $:/tags/ControlPanel/Appearance
-caption: Theme Tweaks
+caption: {{$:/language/ThemeTweaks/ThemeTweaks}}
+
+\define lingo-base() $:/language/ThemeTweaks/
+
+\define replacement-text()
+[img[$(imageTitle)$]]
+\end
 
 \define backgroundimage-dropdown()
 <div class="tc-drop-down-wrapper">
 <$button popup=<<qualify "$:/state/popup/themetweaks/backgroundimage">> class="tc-btn-invisible tc-btn-dropdown">{{$:/core/images/down-arrow}}</$button>
 <$reveal state=<<qualify "$:/state/popup/themetweaks/backgroundimage">> type="popup" position="belowleft" text="" default="">
 <div class="tc-drop-down">
-<$linkcatcher to="$:/themes/tiddlywiki/vanilla/settings/backgroundimage">
-<$link to="">
-(none)
-</$link>
-<hr>
-<$list filter="[all[shadows+tiddlers]is[image]] -[type[application/pdf]] +[sort[title]]">
-<$link to={{!!title}}>
-<$transclude/> <$view field="title"/>
-</$link>
-</$list>
-</$linkcatcher>
+<$macrocall $name="image-picker" actions="""
+
+<$action-setfield
+	$tiddler="$:/themes/tiddlywiki/vanilla/settings/backgroundimage"
+	$value=<<imageTitle>>
+/>
+
+"""/>
 </div>
 </$reveal>
 </div>
@@ -25,44 +28,45 @@ caption: Theme Tweaks
 
 \define backgroundimageattachment-dropdown()
 <$select tiddler="$:/themes/tiddlywiki/vanilla/settings/backgroundimageattachment" default="scroll">
-<option value="scroll">Scroll with tiddlers</option>
-<option value="fixed">Fixed to window</option>
+<option value="scroll"><<lingo Settings/BackgroundImageAttachment/Scroll>></option>
+<option value="fixed"><<lingo Settings/BackgroundImageAttachment/Fixed>></option>
 </$select>
 \end
 
 \define backgroundimagesize-dropdown()
 <$select tiddler="$:/themes/tiddlywiki/vanilla/settings/backgroundimagesize" default="scroll">
-<option value="auto">Auto</option>
-<option value="cover">Cover</option>
-<option value="contain">Contain</option>
+<option value="auto"><<lingo Settings/BackgroundImageSize/Auto>></option>
+<option value="cover"><<lingo Settings/BackgroundImageSize/Cover>></option>
+<option value="contain"><<lingo Settings/BackgroundImageSize/Contain>></option>
 </$select>
 \end
 
-You can tweak certain aspects of the ''Vanilla'' theme.
+<<lingo ThemeTweaks/Hint>>
 
-! Options
+! <<lingo Options>>
 
-|[[Sidebar layout|$:/themes/tiddlywiki/vanilla/options/sidebarlayout]] |<$select tiddler="$:/themes/tiddlywiki/vanilla/options/sidebarlayout"><option value="fixed-fluid">Fixed story, fluid sidebar</option><option value="fluid-fixed">Fluid story, fixed sidebar</option></$select> |
-|[[Sticky titles|$:/themes/tiddlywiki/vanilla/options/stickytitles]]<br>//Causes tiddler titles to "stick" to the top of the browser window. Caution: Does not work at all with Chrome, and causes some layout issues in Firefox// |<$select tiddler="$:/themes/tiddlywiki/vanilla/options/stickytitles"><option value="no">No</option><option value="yes">Yes</option></$select> |
+|<$link to="$:/themes/tiddlywiki/vanilla/options/sidebarlayout"><<lingo Options/SidebarLayout>></$link> |<$select tiddler="$:/themes/tiddlywiki/vanilla/options/sidebarlayout"><option value="fixed-fluid"><<lingo Options/SidebarLayout/Fixed-Fluid>></option><option value="fluid-fixed"><<lingo Options/SidebarLayout/Fluid-Fixed>></option></$select> |
+|<$link to="$:/themes/tiddlywiki/vanilla/options/stickytitles"><<lingo Options/StickyTitles>></$link><br>//<<lingo Options/StickyTitles/Hint>>// |<$select tiddler="$:/themes/tiddlywiki/vanilla/options/stickytitles"><option value="no">{{$:/language/No}}</option><option value="yes">{{$:/language/Yes}}</option></$select> |
+|<$link to="$:/themes/tiddlywiki/vanilla/options/codewrapping"><<lingo Options/CodeWrapping>></$link> |<$select tiddler="$:/themes/tiddlywiki/vanilla/options/codewrapping"><option value="pre">{{$:/language/No}}</option><option value="pre-wrap">{{$:/language/Yes}}</option></$select> |
 
-! Settings
+! <<lingo Settings>>
 
-|[[Font family|$:/themes/tiddlywiki/vanilla/settings/fontfamily]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/settings/fontfamily" default="" tag="input"/> | |
-|[[Code font family|$:/themes/tiddlywiki/vanilla/settings/codefontfamily]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/settings/codefontfamily" default="" tag="input"/> | |
-|[[Page background image|$:/themes/tiddlywiki/vanilla/settings/backgroundimage]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/settings/backgroundimage" default="" tag="input"/> |<<backgroundimage-dropdown>> |
-|[[Page background image attachment |$:/themes/tiddlywiki/vanilla/settings/backgroundimageattachment]] |<<backgroundimageattachment-dropdown>> | |
-|[[Page background image size |$:/themes/tiddlywiki/vanilla/settings/backgroundimagesize]] |<<backgroundimagesize-dropdown>> | |
+|<$link to="$:/themes/tiddlywiki/vanilla/settings/fontfamily"><<lingo Settings/FontFamily>></$link> |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/settings/fontfamily" default="" tag="input"/> | |
+|<$link to="$:/themes/tiddlywiki/vanilla/settings/codefontfamily"><<lingo Settings/CodeFontFamily>></$link> |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/settings/codefontfamily" default="" tag="input"/> | |
+|<$link to="$:/themes/tiddlywiki/vanilla/settings/backgroundimage"><<lingo Settings/BackgroundImage>></$link> |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/settings/backgroundimage" default="" tag="input"/> |<<backgroundimage-dropdown>> |
+|<$link to="$:/themes/tiddlywiki/vanilla/settings/backgroundimageattachment"><<lingo Settings/BackgroundImageAttachment>></$link> |<<backgroundimageattachment-dropdown>> | |
+|<$link to="$:/themes/tiddlywiki/vanilla/settings/backgroundimagesize"><<lingo Settings/BackgroundImageSize>></$link> |<<backgroundimagesize-dropdown>> | |
 
-! Sizes
+! <<lingo Metrics>>
 
-|[[Font size|$:/themes/tiddlywiki/vanilla/metrics/fontsize]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/fontsize" default="" tag="input"/> |
-|[[Line height|$:/themes/tiddlywiki/vanilla/metrics/lineheight]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/lineheight" default="" tag="input"/> |
-|[[Font size for tiddler body|$:/themes/tiddlywiki/vanilla/metrics/bodyfontsize]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/bodyfontsize" default="" tag="input"/> |
-|[[Line height for tiddler body|$:/themes/tiddlywiki/vanilla/metrics/bodylineheight]] |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/bodylineheight" default="" tag="input"/> |
-|[[Story left position|$:/themes/tiddlywiki/vanilla/metrics/storyleft]]<br>//how far the left margin of the story river<br>(tiddler area) is from the left of the page// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storyleft" default="" tag="input"/> |
-|[[Story top position|$:/themes/tiddlywiki/vanilla/metrics/storytop]]<br>//how far the top margin of the story river<br>is from the top of the page// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storytop" default="" tag="input"/> |
-|[[Story right|$:/themes/tiddlywiki/vanilla/metrics/storyright]]<br>//how far the left margin of the sidebar <br>is from the left of the page// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storyright" default="" tag="input"/> |
-|[[Story width|$:/themes/tiddlywiki/vanilla/metrics/storywidth]]<br>//the overall width of the story river// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storywidth" default="" tag="input"/> |
-|[[Tiddler width|$:/themes/tiddlywiki/vanilla/metrics/tiddlerwidth]]<br>//within the story river//<br> |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/tiddlerwidth" default="" tag="input"/> |
-|[[Sidebar breakpoint|$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint]]<br>//the minimum page width at which the story<br>river and sidebar will appear side by side// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint" default="" tag="input"/> |
-|[[Sidebar width|$:/themes/tiddlywiki/vanilla/metrics/sidebarwidth]]<br>//the width of the sidebar in fluid-fixed layout// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/sidebarwidth" default="" tag="input"/> |
+|<$link to="$:/themes/tiddlywiki/vanilla/metrics/fontsize"><<lingo Metrics/FontSize>></$link> |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/fontsize" default="" tag="input"/> |
+|<$link to="$:/themes/tiddlywiki/vanilla/metrics/lineheight"><<lingo Metrics/LineHeight>></$link> |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/lineheight" default="" tag="input"/> |
+|<$link to="$:/themes/tiddlywiki/vanilla/metrics/bodyfontsize"><<lingo Metrics/BodyFontSize>></$link> |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/bodyfontsize" default="" tag="input"/> |
+|<$link to="$:/themes/tiddlywiki/vanilla/metrics/bodylineheight"><<lingo Metrics/BodyLineHeight>></$link> |<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/bodylineheight" default="" tag="input"/> |
+|<$link to="$:/themes/tiddlywiki/vanilla/metrics/storyleft"><<lingo Metrics/StoryLeft>></$link><br>//<<lingo Metrics/StoryLeft/Hint>>// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storyleft" default="" tag="input"/> |
+|<$link to="$:/themes/tiddlywiki/vanilla/metrics/storytop"><<lingo Metrics/StoryTop>></$link><br>//<<lingo Metrics/StoryTop/Hint>>// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storytop" default="" tag="input"/> |
+|<$link to="$:/themes/tiddlywiki/vanilla/metrics/storyright"><<lingo Metrics/StoryRight>></$link><br>//<<lingo Metrics/StoryRight/Hint>>// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storyright" default="" tag="input"/> |
+|<$link to="$:/themes/tiddlywiki/vanilla/metrics/storywidth"><<lingo Metrics/StoryWidth>></$link><br>//<<lingo Metrics/StoryWidth/Hint>>// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/storywidth" default="" tag="input"/> |
+|<$link to="$:/themes/tiddlywiki/vanilla/metrics/tiddlerwidth"><<lingo Metrics/TiddlerWidth>></$link><br>//<<lingo Metrics/TiddlerWidth/Hint>>//<br> |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/tiddlerwidth" default="" tag="input"/> |
+|<$link to="$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint"><<lingo Metrics/SidebarBreakpoint>></$link><br>//<<lingo Metrics/SidebarBreakpoint/Hint>>// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint" default="" tag="input"/> |
+|<$link to="$:/themes/tiddlywiki/vanilla/metrics/sidebarwidth"><<lingo Metrics/SidebarWidth>></$link><br>//<<lingo Metrics/SidebarWidth/Hint>>// |^<$edit-text tiddler="$:/themes/tiddlywiki/vanilla/metrics/sidebarwidth" default="" tag="input"/> |
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index 35d969209..dc6bb431d 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -30,6 +30,15 @@ $hiddenSidebarText$
 </$reveal>
 \end
 
+\define if-editor-height-fixed(then,else)
+<$reveal state="$:/config/TextEditor/EditorHeight/Mode" type="match" text="fixed">
+$then$
+</$reveal>
+<$reveal state="$:/config/TextEditor/EditorHeight/Mode" type="match" text="auto">
+$else$
+</$reveal>
+\end
+
 \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline macrocallblock
 
 /*
@@ -69,11 +78,11 @@ html:-webkit-full-screen {
 body.tc-body {
 	font-size: {{$:/themes/tiddlywiki/vanilla/metrics/fontsize}};
 	line-height: {{$:/themes/tiddlywiki/vanilla/metrics/lineheight}};
+	word-wrap: break-word;
+	<<custom-background-datauri>>
 	color: <<colour foreground>>;
 	background-color: <<colour page-background>>;
 	fill: <<colour foreground>>;
-	word-wrap: break-word;
-	<<custom-background-datauri>>
 }
 
 h1, h2, h3, h4, h5, h6 {
@@ -88,8 +97,7 @@ pre {
 	margin-bottom: 1em;
 	word-break: normal;
 	word-wrap: break-word;
-	white-space: pre;
-	white-space: pre-wrap;
+	white-space: {{$:/themes/tiddlywiki/vanilla/options/codewrapping}};
 	background-color: <<colour pre-background>>;
 	border: 1px solid <<colour pre-border>>;
 	padding: 0 3px 2px;
@@ -101,7 +109,7 @@ code {
 	color: <<colour code-foreground>>;
 	background-color: <<colour code-background>>;
 	border: 1px solid <<colour code-border>>;
-    white-space: pre-wrap;
+	white-space: {{$:/themes/tiddlywiki/vanilla/options/codewrapping}};
 	padding: 0 3px 2px;
 	border-radius: 3px;
 	font-family: {{$:/themes/tiddlywiki/vanilla/settings/codefontfamily}};
@@ -321,7 +329,7 @@ a.tc-tiddlylink-external:hover {
 ** Buttons
 */
 
-button svg, button img {
+button svg, button img, label svg, label img {
 	vertical-align: middle;
 }
 
@@ -441,8 +449,8 @@ button svg.tc-image-button, button .tc-image-button img {
 	background: none;
 	border: none;
 	width: 100%;
-    width: calc(100% + 2px);
-    margin-left: -43px;
+	width: calc(100% + 2px);
+	margin-left: -43px;
 	text-align: center;
 	border-top: 2px solid <<colour tiddler-info-background>>;
 	margin-top: 4px;
@@ -471,8 +479,8 @@ button svg.tc-image-button, button .tc-image-button img {
 	width: 23px;
 	text-align: center;
 	margin-left: -35px;
-    top: 6px;
-    bottom: 6px;
+	top: 6px;
+	bottom: 6px;
 }
 
 .tc-fold-banner:hover {
@@ -480,16 +488,16 @@ button svg.tc-image-button, button .tc-image-button img {
 }
 
 @media (max-width: {{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}}) {
-	
+
 	.tc-unfold-banner {
 		position: static;
-	    width: calc(100% + 59px);
-    }
+		width: calc(100% + 59px);
+	}
 
 	.tc-fold-banner {
 		width: 16px;
 		margin-left: -16px;
-	    font-size: 0.75em;
+		font-size: 0.75em;
 	}
 
 }
@@ -691,6 +699,11 @@ button.tc-untagged-label {
 		padding: 71px 0 28px 42px;
 	}
 
+	html[dir="rtl"] .tc-sidebar-scrollable {
+		left: auto;
+		right: {{$:/themes/tiddlywiki/vanilla/metrics/storyright}};
+	}
+
 	.tc-story-river {
 		position: relative;
 		left: {{$:/themes/tiddlywiki/vanilla/metrics/storyleft}};
@@ -702,7 +715,7 @@ button.tc-untagged-label {
 <<if-no-sidebar "
 
 	.tc-story-river {
-		width: auto;
+		width: calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/storyleft}});
 	}
 
 ">>
@@ -727,7 +740,7 @@ button.tc-untagged-label {
 	.tc-story-river .tc-tiddler-frame {
 		margin: 0;
 		border: none;
-		padding: 28px;
+		padding: 0;
 	}
 }
 
@@ -865,10 +878,19 @@ button.tc-untagged-label {
 
 .tc-tiddler-controls button svg, .tc-tiddler-controls button img,
 .tc-search button svg, .tc-search a svg {
-	height: 0.75em;
 	fill: <<colour tiddler-controls-foreground>>;
 }
 
+.tc-tiddler-controls button svg, .tc-tiddler-controls button img {
+	height: 0.75em;
+}
+
+.tc-search button svg, .tc-search a svg {
+    height: 1.2em;
+    width: 1.2em;
+    margin: 0 0.25em;
+}
+
 .tc-tiddler-controls button.tc-selected svg,
 .tc-page-controls button.tc-selected svg  {
 	fill: <<colour tiddler-controls-foreground-selected>>;
@@ -894,13 +916,18 @@ button.tc-untagged-label {
 	color: <<colour very-muted-foreground>>;
 }
 
-.tc-tiddler-frame input.tc-edit-texteditor, .tc-tiddler-frame textarea.tc-edit-texteditor {
+.tc-tiddler-frame .tc-edit-texteditor {
 	width: 100%;
+	margin: 4px 0 4px 0;
+}
+
+.tc-tiddler-frame input.tc-edit-texteditor,
+.tc-tiddler-frame textarea.tc-edit-texteditor,
+.tc-tiddler-frame iframe.tc-edit-texteditor {
 	padding: 3px 3px 3px 3px;
 	border: 1px solid <<colour tiddler-editor-border>>;
 	line-height: 1.3em;
 	-webkit-appearance: none;
-	margin: 4px 0 4px 0;
 }
 
 .tc-tiddler-frame .tc-binary-warning {
@@ -960,6 +987,61 @@ html body.tc-body.tc-single-tiddler-window {
 	max-width: 100%;
 }
 
+/*
+** Editor
+*/
+
+.tc-editor-toolbar {
+	margin-top: 8px;
+}
+
+.tc-editor-toolbar button {
+	vertical-align: middle;
+	background-color: <<colour tiddler-controls-foreground>>;
+	fill: <<colour tiddler-controls-foreground-selected>>;
+	border-radius: 4px;
+	padding: 3px;
+	margin: 2px 0 2px 4px;
+}
+
+.tc-editor-toolbar button.tc-text-editor-toolbar-item-adjunct {
+	margin-left: 1px;
+	width: 1em;
+	border-radius: 8px;
+}
+
+.tc-editor-toolbar button.tc-text-editor-toolbar-item-start-group {
+	margin-left: 11px;
+}
+
+.tc-editor-toolbar button.tc-selected {
+	background-color: <<colour primary>>;
+}
+
+.tc-editor-toolbar button svg {
+	width: 1.6em;
+	height: 1.2em;
+}
+
+.tc-editor-toolbar button:hover {
+	background-color: <<colour tiddler-controls-foreground-selected>>;
+	fill: <<colour background>>;
+}
+
+.tc-editor-toolbar .tc-text-editor-toolbar-more {
+	white-space: normal;
+}
+
+.tc-editor-toolbar .tc-text-editor-toolbar-more button {
+	display: inline-block;
+	padding: 3px;
+	width: auto;
+}
+
+.tc-editor-toolbar .tc-search-results {
+	padding: 0;
+}
+
 /*
 ** Adjustments for fluid-fixed mode
 */
@@ -1093,14 +1175,27 @@ html body.tc-body.tc-single-tiddler-window {
 
 .tc-tiddler-preview-preview {
 	float: right;
-	width: 48%;
+	width: 49%;
 	border: 1px solid <<colour tiddler-editor-border>>;
-	margin: 4px 3px 3px 3px;
+	margin: 4px 0 3px 3px;
 	padding: 3px 3px 3px 3px;
 }
 
-.tc-tiddler-preview-edit {
-	width: 48%;
+<<if-editor-height-fixed then:"""
+
+.tc-tiddler-preview-preview {
+	overflow-y: scroll;
+	height: {{$:/config/TextEditor/EditorHeight/Height}};
+}
+
+""">>
+
+.tc-tiddler-frame .tc-tiddler-preview .tc-edit-texteditor {
+	width: 49%;
+}
+
+.tc-tiddler-frame .tc-tiddler-preview canvas.tc-edit-bitmapeditor {
+	max-width: 49%;
 }
 
 .tc-edit-fields {
@@ -1240,8 +1335,16 @@ html body.tc-body.tc-single-tiddler-window {
 	line-height: 1.4;
 }
 
+.tc-drop-down .tc-tab-set .tc-tab-buttons button {
+	display: inline-block;
+    width: auto;
+    margin-bottom: 0px;
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0;
+}
+
 .tc-drop-down .tc-prompt {
-	padding: 0 14px;	
+	padding: 0 14px;
 }
 
 .tc-drop-down .tc-chooser {
@@ -1315,6 +1418,11 @@ html body.tc-body.tc-single-tiddler-window {
 	padding: 0px 10px 0px 10px;
 }
 
+.tc-drop-down .tc-dropdown-item-plain,
+.tc-block-dropdown .tc-dropdown-item-plain {
+	padding: 4px 14px 4px 7px;
+}
+
 .tc-drop-down .tc-dropdown-item,
 .tc-block-dropdown .tc-dropdown-item {
 	padding: 4px 14px 4px 7px;
@@ -1328,7 +1436,56 @@ html body.tc-body.tc-single-tiddler-window {
 }
 
 .tc-search-results {
-    padding: 0 7px 0 7px;
+	padding: 0 7px 0 7px;
+}
+
+.tc-image-chooser, .tc-colour-chooser {
+	white-space: normal;
+}
+
+.tc-image-chooser a,
+.tc-colour-chooser a {
+	display: inline-block;
+	vertical-align: top;
+	text-align: center;
+	position: relative;
+}
+
+.tc-image-chooser a {
+	border: 1px solid <<colour muted-foreground>>;
+	padding: 2px;
+	margin: 2px;
+	width: 4em;
+	height: 4em;
+}
+
+.tc-colour-chooser a {
+	padding: 3px;
+	width: 2em;
+	height: 2em;
+	vertical-align: middle;
+}
+
+.tc-image-chooser a:hover,
+.tc-colour-chooser a:hover {
+	background: <<colour primary>>;
+	padding: 0px;
+	border: 3px solid <<colour primary>>;
+}
+
+.tc-image-chooser a svg,
+.tc-image-chooser a img {
+	display: inline-block;
+	width: auto;
+	height: auto;
+	max-width: 3.5em;
+	max-height: 3.5em;
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	margin: auto;
 }
 
 /*
@@ -1343,6 +1500,7 @@ html body.tc-body.tc-single-tiddler-window {
 	right: 0;
 	bottom: 0;
 	left: 0;
+	z-index: 900;
 }
 
 .tc-modal-backdrop {
@@ -1538,8 +1696,6 @@ html body.tc-body.tc-single-tiddler-window {
 }
 
 .tc-sidebar-lists .tc-tab-buttons button {
-	display: inline;
-	width: auto;
 	background-color: <<colour sidebar-tab-background>>;
 	color: <<colour sidebar-tab-foreground>>;
 	border-left: 1px solid <<colour sidebar-tab-border>>;
@@ -1551,7 +1707,7 @@ html body.tc-body.tc-single-tiddler-window {
 	border-top: 1px solid <<colour sidebar-tab-divider>>;
 }
 
-.tc-more-sidebar .tc-tab-buttons button {
+.tc-more-sidebar > .tc-tab-set > .tc-tab-buttons > button {
 	display: block;
 	width: 100%;
 	background-color: <<colour sidebar-tab-background>>;
@@ -1562,7 +1718,7 @@ html body.tc-body.tc-single-tiddler-window {
 	margin-bottom: inherit;
 }
 
-.tc-more-sidebar .tc-tab-buttons button.tc-tab-selected {
+.tc-more-sidebar > .tc-tab-set > .tc-tab-buttons > button.tc-tab-selected {
 	background-color: <<colour sidebar-tab-background-selected>>;
 	border: none;
 }
@@ -1969,7 +2125,7 @@ body.tc-dirty span.tc-dirty-indicator, body.tc-dirty span.tc-dirty-indicator svg
 }
 
 .tc-thumbnail-image {
-    text-align: center;
+	text-align: center;
 	overflow: hidden;
 	border-radius: 3px;
 }
@@ -1978,9 +2134,9 @@ body.tc-dirty span.tc-dirty-indicator, body.tc-dirty span.tc-dirty-indicator svg
 .tc-thumbnail-image img {
 	filter: alpha(opacity=1);
 	opacity: 1;
-    min-width: 100%;
-    min-height: 100%;
-    max-width: 100%;
+	min-width: 100%;
+	min-height: 100%;
+	max-width: 100%;
 }
 
 .tc-thumbnail-wrapper:hover .tc-thumbnail-image svg,
diff --git a/themes/tiddlywiki/vanilla/options.multids b/themes/tiddlywiki/vanilla/options.multids
index 036092379..c0b49d961 100644
--- a/themes/tiddlywiki/vanilla/options.multids
+++ b/themes/tiddlywiki/vanilla/options.multids
@@ -2,3 +2,4 @@ title: $:/themes/tiddlywiki/vanilla/options/
 
 stickytitles: no
 sidebarlayout: fixed-fluid
+codewrapping: pre-wrap