Merge branch 'master' into super-safe-mode

Add new safe mode layout
Add delete button to tiddler manager
2026-07-16 16:52:45 +00:00 · 2026-02-25 11:18:59 +00:00 · 2023-03-12 16:05:45 +00:00 · 2023-03-12 16:02:49 +00:00 · 2023-03-12 16:02:30 +00:00
521 changed files with 1578 additions and 13148 deletions
@@ -5,17 +5,17 @@ on:
      - master
      - tiddlywiki-com
 env:
-  NODE_VERSION: "22.22"
+  NODE_VERSION: "22"
 jobs:
  test:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-node@v6
+      - uses: actions/checkout@v5
+      - uses: actions/setup-node@v4
        with:
          node-version: "${{ env.NODE_VERSION }}"
      - run: "./bin/ci-test.sh"
-      - uses: actions/upload-artifact@v7
+      - uses: actions/upload-artifact@v4
        if: always()
        with:
          name: playwright-report
@@ -30,8 +30,8 @@ jobs:
      TW5_BUILD_MAIN_EDITION: "./editions/prerelease"
      TW5_BUILD_OUTPUT: "./output/prerelease"
    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-node@v6
+      - uses: actions/checkout@v5
+      - uses: actions/setup-node@v4
        with:
          node-version: "${{ env.NODE_VERSION }}"
      - run: "./bin/ci-pre-build.sh"
@@ -62,8 +62,8 @@ jobs:
      TW5_BUILD_OUTPUT: "./output"
      TW5_BUILD_ARCHIVE: "./output"
    steps:
-      - uses: actions/checkout@v6
-      - uses: actions/setup-node@v6
+      - uses: actions/checkout@v5
+      - uses: actions/setup-node@v4
        with:
          node-version: "${{ env.NODE_VERSION }}"
      - run: "./bin/ci-pre-build.sh"
@@ -20,7 +20,7 @@ jobs:
    steps:
    - name: build-size-check
      id: get_sizes
-      uses: TiddlyWiki/cerebrus@v8.1
+      uses: TiddlyWiki/cerebrus@v7
      with:
        pr_number: ${{ github.event.pull_request.number }}
        repo: ${{ github.repository }}
@@ -52,4 +52,4 @@ jobs:
              pr_size: '${{ needs.calculate-build-size.outputs.pr_size }}',
              base_size: '${{ needs.calculate-build-size.outputs.base_size }}'
            }
-          });
+          });
@@ -25,7 +25,7 @@ jobs:

    steps:
    - name: Build and check size
-      uses: TiddlyWiki/cerebrus@v8.1
+      uses: TiddlyWiki/cerebrus@v7
      with:
        pr_number: ${{ inputs.pr_number }}
        repo: ${{ github.repository }}
@@ -15,7 +15,7 @@ jobs:
    steps:
    # Step 1: Validate PR paths
    - name: Validate PR Paths
-      uses: TiddlyWiki/cerebrus@v8.1
+      uses: TiddlyWiki/cerebrus@v6
      with:
        pr_number: ${{ github.event.pull_request.number }}
        repo: ${{ github.repository }}
@@ -26,7 +26,7 @@ jobs:
    
    # Step 2: Validate change notes
    - name: Validate Change Notes
-      uses: TiddlyWiki/cerebrus@v8.1
+      uses: TiddlyWiki/cerebrus@v7
      with:
        pr_number: ${{ github.event.pull_request.number }}
        repo: ${{ github.repository }}
@@ -2,20 +2,10 @@
 .c9/
 .vs/
 .vscode/
-.claude/
-# TiddlyWiki
 tmp/
 output/
 node_modules/
-$__StoryList.tid
-# Playwright
 /test-results/
 /playwright-report/
-/blob-report/
 /playwright/.cache/
-/playwright/.auth/
-test-screenshots/
-test-output.txt
-.playwright-mcp
-# TiddlyWiki MPC
-.tw-mcp
+$__StoryList.tid
@@ -3,4 +3,3 @@
 tmp/
 output/
 node_modules/
-.claude/
@@ -5,7 +5,7 @@
 # Default to the current version number for building the plugin library

 if [  -z "$TW5_BUILD_VERSION" ]; then
-    TW5_BUILD_VERSION=v5.5.0.
+    TW5_BUILD_VERSION=v5.4.0
 fi

 echo "Using TW5_BUILD_VERSION as [$TW5_BUILD_VERSION]"
@@ -45,7 +45,7 @@ git clone --depth=1 --branch=main "https://github.com/TiddlyWiki/tiddlywiki.org-

 # Make the CNAME file that GitHub Pages requires

-# echo "tiddlywiki.org" > $TWORG_BUILD_OUTPUT/CNAME
+echo "tiddlywiki.org" > $TWORG_BUILD_OUTPUT/CNAME

 # Delete any existing static content

@@ -47,13 +47,6 @@ $tw.utils.hop = function(object,property) {
 /** @deprecated Use Array.isArray instead  */
 $tw.utils.isArray = (value) => Array.isArray(value);

-/*
-Determine if a value is a date, even across VM boundaries
-*/
-$tw.utils.isDate = function(value) {
-	return Object.prototype.toString.call(value) === "[object Date]";
-};
-
 /*
 Check if an array is equal by value and by reference.
 */
@@ -131,6 +124,9 @@ $tw.utils.pushTop = function(array,value) {
 	return array;
 };

+/** @deprecated Use instanceof Date instead */
+$tw.utils.isDate = (value) => value instanceof Date;
+
 /** @deprecated Use array iterative methods instead */
 $tw.utils.each = function(object,callback) {
 	if(object) {
@@ -1581,6 +1577,8 @@ $tw.Wiki.prototype.processSafeMode = function() {
 	this.addTiddler(new $tw.Tiddler({title: titleReportTiddler, text: report.join("\n\n")}));
 	// Set $:/DefaultTiddlers to point to our report
 	this.addTiddler(new $tw.Tiddler({title: "$:/DefaultTiddlers", text: "[[" + titleReportTiddler + "]]"}));
+	// Switch to the safe mode layout
+	this.addTiddler({title: "$:/layout", text: "$:/core/ui/SafeLayout"});
 };

 /*
@@ -1,7 +1,6 @@
 created: 20250909171928024
 modified: 20251110133437795
 tags: Community/Team
-leader: @kjharcombe 
 team: @MotovunJack
 title: Infrastructure Team

@@ -13,4 +12,4 @@ The infrastructure includes:
 * github.com/TiddlyWiki
 * tiddlywiki.com DNS
 * Netlify account for PR previews
-* edit.tiddlywiki.com
+* edit.tiddlywiki.com
@@ -1,8 +0,0 @@
-title: TiddlyWiki Team
-tags: Community/Team
-modified: 20260708095630754
-created: 20260708095630754
-leader: @BurningTreeC
-team: 
-
-The TiddlyDesktop development repository is at https://github.com/TiddlyWiki/TiddlyDesktop
@@ -9,14 +9,15 @@ Serve tiddlers over http

 "use strict";

-let fs, path, crypto, zlib, URL;
+let fs, url, path, querystring, crypto, zlib;

 if($tw.node) {
 	fs = require("fs"),
+	url = require("url"),
 	path = require("path"),
+	querystring = require("querystring"),
 	crypto = require("crypto"),
 	zlib = require("zlib");
-	URL = require("url").URL;
 }

 /*
@@ -259,8 +260,8 @@ Server.prototype.requestHandler = function(request,response,options) {
 	state.wiki = options.wiki || self.wiki;
 	state.boot = options.boot || self.boot;
 	state.server = self;
-	state.urlInfo = new URL(request.url, "http://localhost");
-	state.queryParameters = Object.fromEntries(state.urlInfo.searchParams);
+	state.urlInfo = url.parse(request.url);
+	state.queryParameters = querystring.parse(state.urlInfo.query);
 	state.pathPrefix = options.pathPrefix || this.get("path-prefix") || "";
 	// Enable CORS
 	if(this.corsEnable) {
@@ -58,11 +58,10 @@ LayoutSwitcher/Caption: Layout
 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
-Palette/CustomSettings/Prompt: Custom settings for current palette: <<palette-link>>
 Palette/Editor/Clone/Caption: clone
 Palette/Editor/Clone/Prompt: It is recommended that you clone this shadow palette before editing it
 Palette/Editor/Delete/Hint: delete this entry from the current palette
-Palette/Editor/Names/External/Show: Show inherited palette entries
+Palette/Editor/Names/External/Show: Show color names that are not part of the current palette
 Palette/Editor/Prompt/Modified: This shadow palette has been modified
 Palette/Editor/Prompt: Editing
 Palette/Editor/Reset/Caption: reset
@@ -30,7 +30,6 @@ Error/DeserializeOperator/MissingOperand: Filter Error: Missing operand for 'des
 Error/DeserializeOperator/UnknownDeserializer: Filter Error: Unknown deserializer provided as operand for the 'deserialize' operator
 Error/Filter: Filter error
 Error/FilterSyntax: Syntax error in filter expression
-Error/FilterPragma: Filter Error: Unknown filter pragma
 Error/FilterRunPrefix: Filter Error: Unknown prefix for filter run
 Error/IsFilterOperator: Filter Error: Unknown parameter for the 'is' filter operator
 Error/FormatFilterOperator: Filter Error: Unknown suffix for the 'format' filter operator
@@ -60,6 +59,7 @@ Manager/Controls/Show/Option/Tiddlers: tiddlers
 Manager/Controls/Show/Prompt: Show:
 Manager/Controls/Sort/Prompt: Sort by:
 Manager/Item/Colour: Colour
+Manager/Item/Editor: Editor
 Manager/Item/Fields: Fields
 Manager/Item/Icon/None: (none)
 Manager/Item/Icon: Icon
@@ -10,7 +10,7 @@ Advanced/ShadowInfo/Shadow/Hint: The tiddler <$link to=<<infoTiddler>>><$text te
 Advanced/ShadowInfo/Shadow/Source: It is defined in the plugin <$link to=<<pluginTiddler>>><$text text=<<pluginTiddler>>/></$link>
 Advanced/ShadowInfo/OverriddenShadow/Hint: It is overridden by an ordinary tiddler
 Advanced/CascadeInfo/Heading: Cascade Details
-Advanced/CascadeInfo/Hint: These are the view template segments that are resolved for each of the system view template cascades
+Advanced/CascadeInfo/Hint: These are the view template segments (tagged <<tag "$:/tags/ViewTemplate">>) using a cascade filter and their resulting template for the current tiddler.
 Advanced/CascadeInfo/Detail/View: View
 Advanced/CascadeInfo/Detail/ActiveCascadeFilter: Active cascade filter
 Advanced/CascadeInfo/Detail/Template: Template
@@ -31,7 +31,7 @@ function FramedEngine(options) {
 	this.parentNode.insertBefore(this.iframeNode,this.nextSibling);
 	this.iframeDoc = this.iframeNode.contentWindow.document;
 	// (Firefox requires us to put some empty content in the iframe)
-	var paletteTitle = this.widget.wiki.getTiddlerText("$:/palette/palette-colours");
+	var paletteTitle = this.widget.wiki.getTiddlerText("$:/palette");
 	var colorScheme = (this.widget.wiki.getTiddler(paletteTitle) || {fields: {}}).fields["color-scheme"] || "light";
 	this.iframeDoc.open();
 	this.iframeDoc.write("<!DOCTYPE html><html><head><meta name='color-scheme' content='" + colorScheme + "'></head><body></body></html>");
@@ -156,13 +156,14 @@ Fix the height of textarea to fit content
 FramedEngine.prototype.fixHeight = function() {
 	// Make sure styles are updated
 	this.copyStyles();
-	if(this.widget.editTag === "textarea") {
+	// If .editRows is initialised, it takes precedence
+	if(this.widget.editTag === "textarea" && !this.widget.editRows) {
 		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 + "px";
 			}
-		} else if(!this.widget.editRows) {
+		} else {
 			var fixedHeight = parseInt(this.widget.wiki.getTiddlerText(HEIGHT_VALUE_TITLE,"400px"),10);
 			fixedHeight = Math.max(fixedHeight,20);
 			this.domNode.style.height = fixedHeight + "px";
@@ -28,12 +28,7 @@ function SimpleEngine(options) {
 	if(this.widget.editTag === "textarea") {
 		this.domNode.appendChild(this.widget.document.createTextNode(this.value));
 	} else {
-		if(this.widget.editType === "color") {
-			// The <input type="color"> element requires a six digit hex value
-			this.domNode.value = $tw.utils.convertCSSColorToRGBString(this.value);
-		} else {
-			this.domNode.value = this.value;
-		}
+		this.domNode.value = this.value;
 	}
 	// Set the attributes
 	if(this.widget.editType && this.widget.editTag !== "textarea") {
@@ -88,9 +83,6 @@ Update the DomNode with the new text
 */
 SimpleEngine.prototype.updateDomNodeText = function(text) {
 	try {
-		if(this.widget.editType === "color") {
-			text = $tw.utils.convertCSSColorToRGBString(text);
-		}
 		this.domNode.value = text;
 	} catch(e) {
 		// Ignore
@@ -108,12 +100,13 @@ SimpleEngine.prototype.getText = function() {
 Fix the height of textarea to fit content
 */
 SimpleEngine.prototype.fixHeight = function() {
-	if(this.widget.editTag === "textarea") {
+	// If .editRows is initialised, it takes precedence
+	if((this.widget.editTag === "textarea") && !this.widget.editRows) {
 		if(this.widget.editAutoHeight) {
 			if(this.domNode && !this.domNode.isTiddlyWikiFakeDom) {
 				$tw.utils.resizeTextAreaToFit(this.domNode,this.widget.editMinHeight);
 			}
-		} else if(!this.widget.editRows) {
+		} else {
 			var fixedHeight = parseInt(this.widget.wiki.getTiddlerText(HEIGHT_VALUE_TITLE,"400px"),10);
 			fixedHeight = Math.max(fixedHeight,20);
 			this.domNode.style.height = fixedHeight + "px";
@@ -217,10 +217,10 @@ function editTextWidgetFactory(toolbarEngine,nonToolbarEngine) {
 	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["class"] || changedAttributes.placeholder || changedAttributes.size || changedAttributes.autoHeight || changedAttributes.minHeight || changedAttributes.focusPopup ||  changedAttributes.rows || changedAttributes.tabindex || changedAttributes.cancelPopups || changedAttributes.inputActions || changedAttributes.refreshTitle || changedAttributes.autocomplete || changedTiddlers[HEIGHT_MODE_TITLE] || changedTiddlers[ENABLE_TOOLBAR_TITLE] || changedTiddlers["$:/palette"] || changedAttributes.disabled || changedAttributes.fileDrop) {
+		if(changedAttributes.tiddler || changedAttributes.field || changedAttributes.index || changedAttributes["default"] || changedAttributes["class"] || changedAttributes.placeholder || changedAttributes.size || changedAttributes.autoHeight || changedAttributes.minHeight || changedAttributes.focusPopup ||  changedAttributes.rows || changedAttributes.tabindex || changedAttributes.cancelPopups || changedAttributes.inputActions || changedAttributes.refreshTitle || changedAttributes.autocomplete || changedTiddlers[HEIGHT_MODE_TITLE] || changedTiddlers[ENABLE_TOOLBAR_TITLE] || changedTiddlers["$:/palette"] || changedAttributes.disabled || changedAttributes.fileDrop) {
 			this.refreshSelf();
 			return true;
-		} else if(changedAttributes["default"] || changedTiddlers[this.editRefreshTitle]) {
+		} else if(changedTiddlers[this.editRefreshTitle]) {
 			this.engine.updateDomNodeText(this.getEditInfo().value);
 		} else if(changedTiddlers[this.editTitle]) {
 			var editInfo = this.getEditInfo();
@@ -146,16 +146,14 @@ exports.parseFilter = function(filterString) {
 		match;
 	var whitespaceRegExp = /(\s+)/mg,
 		// Groups:
-		// 1 - pragma
-		// 2 - pragma suffix
-		// 3 - entire filter run prefix
-		// 4 - filter run prefix name
-		// 5 - filter run prefix suffixes
-		// 6 - opening square bracket following filter run prefix
-		// 7 - double quoted string following filter run prefix
-		// 8 - single quoted string following filter run prefix
-		// 9 - anything except for whitespace and square brackets
-		operandRegExp = /(?:::(\w+)(?:\:(\w+))?(?=\s|$)|((?:\+|\-|~|(?:=>?)|:(\w+)(?:\:([\w\:, ]*))?)?)(?:(\[)|(?:"([^"]*)")|(?:'([^']*)')|([^\s\[\]]+)))/mg;
+		// 1 - entire filter run prefix
+		// 2 - filter run prefix itself
+		// 3 - filter run prefix suffixes
+		// 4 - opening square bracket following filter run prefix
+		// 5 - double quoted string following filter run prefix
+		// 6 - single quoted string following filter run prefix
+		// 7 - anything except for whitespace and square brackets
+		operandRegExp = /((?:\+|\-|~|(?:=>?)|\:(\w+)(?:\:([\w\:, ]*))?)?)(?:(\[)|(?:"([^"]*)")|(?:'([^']*)')|([^\s\[\]]+))/mg;
 	while(p < filterString.length) {
 		// Skip any whitespace
 		whitespaceRegExp.lastIndex = p;
@@ -172,23 +170,18 @@ exports.parseFilter = function(filterString) {
 			};
 			match = operandRegExp.exec(filterString);
 			if(match && match.index === p) {
+				// If there is a filter run prefix
 				if(match[1]) {
-					// If there is a filter pragma
-					operation.pragma = match[1];
-					operation.suffix = match[2];
-					p = match.index + match[0].length;
-				} else if(match[3]) {
-					// If there is a filter run prefix
-					operation.prefix = match[3];
+					operation.prefix = match[1];
 					p = p + operation.prefix.length;
 					// Name for named prefixes
-					if(match[4]) {
-						operation.namedPrefix = match[4];
+					if(match[2]) {
+						operation.namedPrefix = match[2];
 					}
 					// Suffixes for filter run prefix
-					if(match[5]) {
+					if(match[3]) {
 						operation.suffixes = [];
-						$tw.utils.each(match[5].split(":"),function(subsuffix) {
+						$tw.utils.each(match[3].split(":"),function(subsuffix) {
 							operation.suffixes.push([]);
 							$tw.utils.each(subsuffix.split(","),function(entry) {
 								entry = $tw.utils.trim(entry);
@@ -200,7 +193,7 @@ exports.parseFilter = function(filterString) {
 					}
 				}
 				// Opening square bracket
-				if(match[6]) {
+				if(match[4]) {
 					p = parseFilterOperation(operation.operators,filterString,p);
 				} else {
 					p = match.index + match[0].length;
@@ -210,9 +203,9 @@ exports.parseFilter = function(filterString) {
 				p = parseFilterOperation(operation.operators,filterString,p);
 			}
 			// Quoted strings and unquoted title
-			if(match[7] || match[8] || match[9]) { // Double quoted string, single quoted string or unquoted title
+			if(match[5] || match[6] || match[7]) { // Double quoted string, single quoted string or unquoted title
 				operation.operators.push(
-					{operator: "title", operands: [{text: match[7] || match[8] || match[9]}]}
+					{operator: "title", operands: [{text: match[5] || match[6] || match[7]}]}
 				);
 			}
 			results.push(operation);
@@ -237,25 +230,23 @@ exports.getFilterRunPrefixes = function() {
 	return this.filterRunPrefixes;
 };

-exports.filterTiddlers = function(filterString,widget,source,options) {
-	var fn = this.compileFilter(filterString,options);
+exports.filterTiddlers = function(filterString,widget,source) {
+	var fn = this.compileFilter(filterString);
 	return fn.call(this,source,widget);
 };

 /*
-Compile a filter into a function with the signature fn(source,widget,options) where:
+Compile a filter into a function with the signature fn(source,widget) where:
 source: an iterator function for the source tiddlers, called source(iterator), where iterator is called as iterator(tiddler,title)
 widget: an optional widget node for retrieving the current tiddler etc.
 */
-exports.compileFilter = function(filterString,options) {
-	var defaultFilterRunPrefix = (options || {}).defaultFilterRunPrefix || "or";
-	var cacheKey = filterString + "|" + defaultFilterRunPrefix;
+exports.compileFilter = function(filterString) {
 	if(!this.filterCache) {
 		this.filterCache = Object.create(null);
 		this.filterCacheCount = 0;
 	}
-	if(this.filterCache[cacheKey] !== undefined) {
-		return this.filterCache[cacheKey];
+	if(this.filterCache[filterString] !== undefined) {
+		return this.filterCache[filterString];
 	}
 	var filterParseTree;
 	try {
@@ -334,8 +325,7 @@ exports.compileFilter = function(filterString,options) {
 					regexp: operator.regexp
 				},{
 					wiki: self,
-					widget: widget,
-					defaultFilterRunPrefix: defaultFilterRunPrefix
+					widget: widget
 				});
 				if($tw.utils.isArray(results)) {
 					accumulator = self.makeTiddlerIterator(results);
@@ -356,45 +346,29 @@ exports.compileFilter = function(filterString,options) {
 		var filterRunPrefixes = self.getFilterRunPrefixes();
 		// Wrap the operator functions in a wrapper function that depends on the prefix
 		operationFunctions.push((function() {
-			if(operation.pragma) {
-				switch(operation.pragma) {
-					case "defaultprefix":
-						defaultFilterRunPrefix = operation.suffix || "or";
-						break;
-					default:
+			var options = {wiki: self, suffixes: operation.suffixes || []};
+			switch(operation.prefix || "") {
+				case "": // No prefix means that the operation is unioned into the result
+					return filterRunPrefixes["or"](operationSubFunction, options);
+				case "=": // The results of the operation are pushed into the result without deduplication
+					return filterRunPrefixes["all"](operationSubFunction, options);
+				case "-": // The results of this operation are removed from the main result
+					return filterRunPrefixes["except"](operationSubFunction, options);
+				case "+": // This operation is applied to the main results so far
+					return filterRunPrefixes["and"](operationSubFunction, options);
+				case "~": // This operation is unioned into the result only if the main result so far is empty
+					return filterRunPrefixes["else"](operationSubFunction, options);
+				case "=>": // This operation is applied to the main results so far, and the results are assigned to a variable
+					return filterRunPrefixes["let"](operationSubFunction, options);
+				default: 
+					if(operation.namedPrefix && filterRunPrefixes[operation.namedPrefix]) {
+						return filterRunPrefixes[operation.namedPrefix](operationSubFunction, options);
+					} else {
 						return function(results,source,widget) {
 							results.clear();
-							results.push($tw.language.getString("Error/FilterPragma"));
+							results.push($tw.language.getString("Error/FilterRunPrefix"));
 						};
-				}
-				return function(results,source,widget) {
-					// Dummy response
-				};
-			} else {
-				var options = {wiki: self, suffixes: operation.suffixes || []};
-				switch(operation.prefix || "") {
-					case "": // Use the default filter run prefix if none is specified
-						return filterRunPrefixes[defaultFilterRunPrefix](operationSubFunction, options);
-					case "=": // The results of the operation are pushed into the result without deduplication
-						return filterRunPrefixes["all"](operationSubFunction, options);
-					case "-": // The results of this operation are removed from the main result
-						return filterRunPrefixes["except"](operationSubFunction, options);
-					case "+": // This operation is applied to the main results so far
-						return filterRunPrefixes["and"](operationSubFunction, options);
-					case "~": // This operation is unioned into the result only if the main result so far is empty
-						return filterRunPrefixes["else"](operationSubFunction, options);
-					case "=>": // This operation is applied to the main results so far, and the results are assigned to a variable
-						return filterRunPrefixes["let"](operationSubFunction, options);
-					default: 
-						if(operation.namedPrefix && filterRunPrefixes[operation.namedPrefix]) {
-							return filterRunPrefixes[operation.namedPrefix](operationSubFunction, options);
-						} else {
-							return function(results,source,widget) {
-								results.clear();
-								results.push($tw.language.getString("Error/FilterRunPrefix"));
-							};
-						}
-				}
+					}
 			}
 		})());
 	});
@@ -433,7 +407,7 @@ exports.compileFilter = function(filterString,options) {
 		this.filterCache = Object.create(null);
 		this.filterCacheCount = 0;
 	}
-	this.filterCache[cacheKey] = fnMeasured;
+	this.filterCache[filterString] = fnMeasured;
 	this.filterCacheCount++;
 	return fnMeasured;
 };
@@ -1,21 +0,0 @@
-/*\
-title: $:/core/modules/filters/changecount.js
-type: application/javascript
-module-type: filteroperator
-
-Filter operator for retrieving the changecount for each title in the list.
-
-\*/
-
-"use strict";
-
-/*
-Export our filter function
-*/
-exports.changecount = function(source,operator,options) {
-	var results = [];
-	source(function(tiddler,title) {
-		results.push(options.wiki.getChangeCount(title) + "");
-	});
-	return results;
-};
@@ -1,140 +0,0 @@
-/*\
-title: $:/core/modules/filters/colour-ops.js
-type: application/javascript
-module-type: filteroperator
-
-Filter operators for colour operations
-
-\*/
-
-"use strict";
-
-var Color = require("$:/core/modules/utils/dom/color.js").Color,
-	colourSpacesList = Object.keys(Color.spaces),
-	hueAdjustersList = ["raw","increasing","decreasing","longer","shorter"];
-
-exports["colour-lighten"] = makeSerialColourOperator(function (colour, operator, options) {
-	return colour.lighten($tw.utils.parseNumber(operator.operand)).display().toString();
-});
-
-exports["colour-darken"] = makeSerialColourOperator(function (colour, operator, options) {
-	return colour.darken($tw.utils.parseNumber(operator.operand)).display().toString();
-});
-
-exports["colour-get-oklch"] = makeSerialColourOperator(function (colour, operator, options) {
-	var prop = ((operator.suffixes || [])[0] || ["l"])[0];
-	if(["l","c","h"].indexOf(prop) !== -1) {
-		colour = colour.oklch[prop];
-	}
-	return colour.toString();
-});
-
-exports["colour-set-oklch"] = makeSerialColourOperator(function (colour, operator, options) {
-	var prop = ((operator.suffixes || [])[0] || ["l"])[0];
-	if(["l","c","h"].indexOf(prop) !== -1) {
-		colour.oklch[prop] = $tw.utils.parseNumber(operator.operand);
-	}
-	return colour.display().toString();
-});
-
-exports["colour-set-alpha"] = makeSerialColourOperator(function (colour, operator, options) {
-	colour.alpha = $tw.utils.parseNumber(operator.operand);
-	return colour.display().toString();
-});
-
-exports["colour-contrast"] = makeParallelColourOperator(function (colours, operator, options) {
-	var colourContrasts = [];
-	$tw.utils.each(colours,function(colour,index) {
-		if(!colour) {
-			colour = $tw.utils.parseCSSColorObject("white");
-			colours[index] = colour;
-		}
-		if(index > 0) {
-			colourContrasts.push(colour.contrast(colours[index - 1],"DeltaPhi").toString());
-		}
-	});
-	return colourContrasts;
-});
-
-exports["colour-best-contrast"] = makeParallelColourOperator(function (colours, operator, options, originalColours) {
-	var bestContrast = 0,
-		bestColour = null;
-	if(colours.length < 2) {
-		return [];
-	}
-	var targetColour = colours[colours.length - 1];
-	for(var t=0; t<colours.length; t++) {
-		var colour = colours[t];
-		if(colour) {
-			var contrast = colour.contrast(targetColour,"DeltaPhi");
-			if(contrast > bestContrast) {
-				bestContrast = contrast;
-				bestColour = originalColours[t];
-			}
-		}
-	}
-	if(bestColour) {
-		return [bestColour];
-	} else {
-		return [];
-	}
-});
-
-exports["colour-interpolate"] = function(source,operator,options) {
-	// Get the colour space suffix
-	var space = ((((operator.suffixes || [])[0] || ["srgb"])[0]) || "").toLowerCase();
-	if(colourSpacesList.indexOf(space) === -1) {
-		space = "lch";
-	}
-	// Get the hue adjuster suffix
-	var hueAdjuster = ((((operator.suffixes || [])[1] || ["shorter"])[0]) || "").toLowerCase();
-	if(hueAdjustersList.indexOf(hueAdjuster) === -1) {
-		hueAdjuster = "shorter";
-	}
-	// Get the colours
-	if(operator.operands.length < 2) {
-		return [];
-	}
-	var colourA = $tw.utils.parseCSSColorObject(operator.operands[0]),
-		colourB = $tw.utils.parseCSSColorObject(operator.operands[1]);
-	if(!colourA || !colourB) {
-		return [];
-	}
-	var rangefn = colourA.range(colourB,{space: space, hue: hueAdjuster});
-	// Cycle through the weights
-	var results = [];
-	source(function(tiddler,title) {
-		var index = $tw.utils.parseNumber(title);
-		var colour = rangefn(index);
-		results.push(colour.display().toString());
-	});
-	return results;
-};
-
-function makeSerialColourOperator(fn) {
-	return function (source, operator, options) {
-		var results = [];
-		source(function (tiddler, title) {
-			var c = $tw.utils.parseCSSColorObject(title);
-			if(c) {
-				c = fn(c, operator, options);
-				results.push(c);
-			} else {
-				results.push("");
-			}
-		});
-		return results;
-	};
-}
-
-function makeParallelColourOperator(fn) {
-	return function (source, operator, options) {
-		var originalColours = [],
-			colours = [];
-		source(function (tiddler, title) {
-			originalColours.push(title);
-			colours.push($tw.utils.parseCSSColorObject(title));
-		});
-		return fn(colours, operator, options, originalColours);
-	};
-}
@@ -13,9 +13,7 @@ Filter operator returning those input titles that pass a subfilter
 Export our filter function
 */
 exports.filter = function(source,operator,options) {
-	var suffixes = operator.suffixes || [],
-		defaultFilterRunPrefix = (suffixes[0] || [options.defaultFilterRunPrefix] || [])[0] || "or",
-		filterFn = options.wiki.compileFilter(operator.operand,{defaultFilterRunPrefix}),
+	var filterFn = options.wiki.compileFilter(operator.operand),
 		results = [],
 		target = operator.prefix !== "!";
 	source(function(tiddler,title) {
@@ -14,31 +14,31 @@ Export our filter function
 */
 exports.sort = function(source,operator,options) {
 	var results = prepare_results(source);
-	options.wiki.sortTiddlers(results,operator.operand || "title",operator.prefix === "!",false,false);
+	options.wiki.sortTiddlers(results,operator.operands[0] || "title",operator.prefix === "!",false,false,undefined,operator.operands[1]);
 	return results;
 };

 exports.nsort = function(source,operator,options) {
 	var results = prepare_results(source);
-	options.wiki.sortTiddlers(results,operator.operand || "title",operator.prefix === "!",false,true);
+	options.wiki.sortTiddlers(results,operator.operands[0] || "title",operator.prefix === "!",false,true,undefined,operator.operands[1]);
 	return results;
 };

 exports.sortan = function(source, operator, options) {
 	var results = prepare_results(source);
-	options.wiki.sortTiddlers(results, operator.operand || "title", operator.prefix === "!",false,false,true);
+	options.wiki.sortTiddlers(results, operator.operands[0] || "title", operator.prefix === "!",false,false,true,operator.operands[1]);
 	return results;
 };

 exports.sortcs = function(source,operator,options) {
 	var results = prepare_results(source);
-	options.wiki.sortTiddlers(results,operator.operand || "title",operator.prefix === "!",true,false);
+	options.wiki.sortTiddlers(results,operator.operands[0] || "title",operator.prefix === "!",true,false,undefined,operator.operands[1]);
 	return results;
 };

 exports.nsortcs = function(source,operator,options) {
 	var results = prepare_results(source);
-	options.wiki.sortTiddlers(results,operator.operand || "title",operator.prefix === "!",true,true);
+	options.wiki.sortTiddlers(results,operator.operands[0] || "title",operator.prefix === "!",true,true,undefined,operator.operands[1]);
 	return results;
 };

@@ -13,9 +13,7 @@ Filter operator returning its operand evaluated as a filter
 Export our filter function
 */
 exports.subfilter = function(source,operator,options) {
-	var suffixes = operator.suffixes || [],
-		defaultFilterRunPrefix = (suffixes[0] || [options.defaultFilterRunPrefix] || [])[0] || "or";
-	var list = options.wiki.filterTiddlers(operator.operand,options.widget,source,{defaultFilterRunPrefix});
+	var list = options.wiki.filterTiddlers(operator.operand,options.widget,source);
 	if(operator.prefix === "!") {
 		var results = [];
 		source(function(tiddler,title) {
@@ -22,11 +22,12 @@ exports.tag = function(source,operator,options) {
 		});
 	} else {
 		// Old semantics:
+		var tiddlers;
 		if(operator.prefix === "!") {
 			// Returns a copy of the input if operator.operand is missing
-			const excludeTagSet = new Set(options.wiki.getTiddlersWithTag(operator.operand));
+			tiddlers = options.wiki.getTiddlersWithTag(operator.operand);
 			source(function(tiddler,title) {
-				if(!excludeTagSet.has(title)) {
+				if(tiddlers.indexOf(title) === -1) {
 					results.push(title);
 				}
 			});
@@ -38,9 +39,9 @@ exports.tag = function(source,operator,options) {
 					return indexedResults;
 				}
 			} else {
-				const includeTagSet = new Set(options.wiki.getTiddlersWithTag(operator.operand));
+				tiddlers = options.wiki.getTiddlersWithTag(operator.operand);
 				source(function(tiddler,title) {
-					if(includeTagSet.has(title)) {
+					if(tiddlers.indexOf(title) !== -1) {
 						results.push(title);
 					}
 				});
@@ -26,26 +26,25 @@ exports.params = [
 Run the macro
 */
 exports.run = function(target,fallbackTarget,colourA,colourB) {
-	var rgbTarget = $tw.utils.parseCSSColorObject(target) || $tw.utils.parseCSSColorObject(fallbackTarget);
+	var rgbTarget = $tw.utils.parseCSSColor(target) || $tw.utils.parseCSSColor(fallbackTarget);
 	if(!rgbTarget) {
 		return colourA;
 	}
-	var rgbColourA = $tw.utils.parseCSSColorObject(colourA),
-		rgbColourB = $tw.utils.parseCSSColorObject(colourB);
+	var rgbColourA = $tw.utils.parseCSSColor(colourA),
+		rgbColourB = $tw.utils.parseCSSColor(colourB);
 	if(rgbColourA && !rgbColourB) {
-		return colourA;
+		return rgbColourA;
 	}
 	if(rgbColourB && !rgbColourA) {
-		return colourB;
+		return rgbColourB;
 	}
 	if(!rgbColourA && !rgbColourB) {
 		// If neither colour is readable, return a crude inverse of the target
-		rgbTarget.srgb.r = 1 - rgbTarget.srgb.r;
-		rgbTarget.srgb.g = 1 - rgbTarget.srgb.g;
-		rgbTarget.srgb.b = 1 - rgbTarget.srgb.b;
-		return rgbTarget.display();
+		return [255 - rgbTarget[0],255 - rgbTarget[1],255 - rgbTarget[2],rgbTarget[3]];
 	}
-	var aContrast = rgbColourA.contrast(rgbTarget,"DeltaPhi"),
-		bContrast = rgbColourB.contrast(rgbTarget,"DeltaPhi");
-	return aContrast > bContrast ? colourA : colourB;
+	// Colour brightness formula derived from http://www.w3.org/WAI/ER/WD-AERT/#color-contrast
+	var brightnessTarget = rgbTarget[0] * 0.299 + rgbTarget[1] * 0.587 + rgbTarget[2] * 0.114,
+		brightnessA = rgbColourA[0] * 0.299 + rgbColourA[1] * 0.587 + rgbColourA[2] * 0.114,
+		brightnessB = rgbColourB[0] * 0.299 + rgbColourB[1] * 0.587 + rgbColourB[2] * 0.114;
+	return Math.abs(brightnessTarget - brightnessA) > Math.abs(brightnessTarget - brightnessB) ? colourA : colourB;
 };
@@ -107,7 +107,7 @@ exports.parseStringLiteral = function(source,pos) {
 		type: "string",
 		start: pos
 	};
-	var reString = /(?:"""([\s\S]*?)"""|"([^"]*)")|(?:'([^']*)')|\[\[((?:[^\]]|\](?!\]))*)\]\]/y;
+	var reString = /(?:"""([\s\S]*?)"""|"([^"]*)")|(?:'([^']*)')|\[\[((?:[^\]]|\](?!\]))*)\]\]/g;
 	reString.lastIndex = pos;
 	var match = reString.exec(source);
 	if(match && match.index === pos) {
@@ -221,7 +221,7 @@ exports.parseMacroInvocationAsTransclusion = function(source,pos) {
 		orderedAttributes: []
 	};
 	// Define our regexps
-	var reVarName = /([^\s>"'=:]+)/y;
+	var reVarName = /([^\s>"'=:]+)/g;
 	// Skip whitespace
 	pos = $tw.utils.skipWhiteSpace(source,pos);
 	// Look for a double opening angle bracket
@@ -237,11 +237,9 @@ exports.parseMacroInvocationAsTransclusion = function(source,pos) {
 	}
 	$tw.utils.addAttributeToParseTreeNode(node,"$variable",token.match[1]);
 	pos = token.end;
-	// Check that the tag is terminated by a space or >>, and that there is a closing >> somewhere ahead
-	if(!(source.charAt(pos) === ">" && source.charAt(pos + 1) === ">") ) {
-		if(source.indexOf(">>",pos) === -1) {
-			return null;
-		}
+	// Check that the tag is terminated by a space or >>
+	if(!$tw.utils.parseWhiteSpace(source,pos) && !(source.charAt(pos) === ">" && source.charAt(pos + 1) === ">") ) {
+		return null;
 	}
 	// Process attributes
 	pos = $tw.utils.parseMacroParametersAsAttributes(node,source,pos);
@@ -269,7 +267,7 @@ exports.parseMVVReferenceAsTransclusion = function(source,pos) {
 		orderedAttributes: []
 	};
 	// Define our regexps
-	var reVarName = /([^\s>"'=:)]+)/y;
+	var reVarName = /([^\s>"'=:)]+)/g;
 	// Skip whitespace
 	pos = $tw.utils.skipWhiteSpace(source,pos);
 	// Look for a double opening parenthesis
@@ -325,24 +323,18 @@ exports.parseMacroParameterAsAttribute = function(source,pos) {
 		start: pos
 	};
 	// Define our regexps
-	var reAttributeName = /([^\/\s>"'`=:]+)/y,
-		reStrictIdentifier = /^[A-Za-z0-9\-_]+$/,
-		reUnquotedAttribute = /(?!<<)((?:(?:>(?!>))|[^\s>"'])+)/y,
-		reFilteredValue = /\{\{\{([\S\s]+?)\}\}\}/y,
-		reIndirectValue = /\{\{([^\}]+)\}\}/y,
-		reSubstitutedValue = /(?:```([\s\S]*?)```|`([^`]|[\S\s]*?)`)/y;
+	var reAttributeName = /([^\/\s>"'`=:]+)/g,
+		reUnquotedAttribute = /((?:(?:>(?!>))|[^\s>"'])+)/g,
+		reFilteredValue = /\{\{\{([\S\s]+?)\}\}\}/g,
+		reIndirectValue = /\{\{([^\}]+)\}\}/g,
+		reSubstitutedValue = /(?:```([\s\S]*?)```|`([^`]|[\S\s]*?)`)/g;
 	// Skip whitespace
 	pos = $tw.utils.skipWhiteSpace(source,pos);
 	// Get the attribute name and the separator token
 	var nameToken = $tw.utils.parseTokenRegExp(source,pos,reAttributeName),
 		namePos = nameToken && $tw.utils.skipWhiteSpace(source,nameToken.end),
-		separatorToken = nameToken && $tw.utils.parseTokenRegExp(source,namePos,/=|:/y),
+		separatorToken = nameToken && $tw.utils.parseTokenRegExp(source,namePos,/=|:/g),
 		isNewStyleSeparator = false; // If there is no separator then we don't allow new style values
-	// Colon separator requires a strict identifier name to avoid mis-parsing values like $:/foo
-	if(nameToken && separatorToken && separatorToken.match[0] === ":" && !reStrictIdentifier.test(nameToken.match[1])) {
-		nameToken = null;
-		separatorToken = null;
-	}
 	// If we have a name and a separator then we have a named attribute
 	if(nameToken && separatorToken) {
 		node.name = nameToken.match[1];
@@ -353,78 +345,64 @@ exports.parseMacroParameterAsAttribute = function(source,pos) {
 	}
 	// Skip whitespace
 	pos = $tw.utils.skipWhiteSpace(source,pos);
-
-	do {
-		// Look for a string literal
-		var stringLiteral = $tw.utils.parseStringLiteral(source,pos);
-		if(stringLiteral) {
-			pos = stringLiteral.end;
-			node.type = "string";
-			node.value = stringLiteral.value;
-			// Mark the value as having been quoted in the source
-			node.quoted = true;
-			break;
-		}
-
-		if(isNewStyleSeparator) {
-			// 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];
-				break;
-			}
-
+	// Look for a string literal
+	var stringLiteral = $tw.utils.parseStringLiteral(source,pos);
+	if(stringLiteral) {
+		pos = stringLiteral.end;
+		node.type = "string";
+		node.value = stringLiteral.value;
+		// Mark the value as having been quoted in the source
+		node.quoted = true;
+	} else {
+		// Look for a filtered value
+		var filteredValue = $tw.utils.parseTokenRegExp(source,pos,reFilteredValue);
+		if(filteredValue && isNewStyleSeparator) {
+			pos = filteredValue.end;
+			node.type = "filtered";
+			node.filter = filteredValue.match[1];
+		} else {
 			// Look for an indirect value
 			var indirectValue = $tw.utils.parseTokenRegExp(source,pos,reIndirectValue);
-			if(indirectValue) {
+			if(indirectValue && isNewStyleSeparator) {
 				pos = indirectValue.end;
 				node.type = "indirect";
 				node.textReference = indirectValue.match[1];
-				break;
-			}
-
-			// Look for a macro invocation value
-			var macroInvocation = $tw.utils.parseMacroInvocationAsTransclusion(source,pos);
-			if(macroInvocation) {
-				pos = macroInvocation.end;
-				node.type = "macro";
-				node.value = macroInvocation;
-				break;
-			}
-
-			// Look for an MVV reference value
-			var mvvReference = $tw.utils.parseMVVReferenceAsTransclusion(source,pos);
-			if(mvvReference) {
-				pos = mvvReference.end;
-				node.type = "macro";
-				node.value = mvvReference;
-				node.isMVV = true;
-				break;
-			}
-
-			// Look for a substituted value
-			var substitutedValue = $tw.utils.parseTokenRegExp(source,pos,reSubstitutedValue);
-			if(substitutedValue) {
-				pos = substitutedValue.end;
-				node.type = "substituted";
-				node.rawValue = substitutedValue.match[1] || substitutedValue.match[2];
-				break;
+			} else {
+				// Look for a macro invocation value
+				var macroInvocation = $tw.utils.parseMacroInvocationAsTransclusion(source,pos);
+				if(macroInvocation && isNewStyleSeparator) {
+					pos = macroInvocation.end;
+					node.type = "macro";
+					node.value = macroInvocation;
+				} else {
+					// Look for an MVV reference value
+					var mvvReference = $tw.utils.parseMVVReferenceAsTransclusion(source,pos);
+					if(mvvReference && isNewStyleSeparator) {
+						pos = mvvReference.end;
+						node.type = "macro";
+						node.value = mvvReference;
+						node.isMVV = true;
+					} else {
+						var substitutedValue = $tw.utils.parseTokenRegExp(source,pos,reSubstitutedValue);
+						if(substitutedValue && isNewStyleSeparator) {
+							pos = substitutedValue.end;
+							node.type = "substituted";
+							node.rawValue = substitutedValue.match[1] || substitutedValue.match[2];
+						} 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];
+							} 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];
-			break; // redundant, but leaving for consistency
-		}
-
-	} while(false);
-
+	}
 	// Bail if we don't have a value
 	if(!node.type) {
 		return null;
@@ -528,79 +506,64 @@ exports.parseAttribute = function(source,pos) {
 		pos = token.end;
 		// Skip whitespace
 		pos = $tw.utils.skipWhiteSpace(source,pos);
-		do {
-			// Look for a string literal
-			var stringLiteral = $tw.utils.parseStringLiteral(source,pos);
-			if(stringLiteral) {
-				pos = stringLiteral.end;
-				node.type = "string";
-				node.value = stringLiteral.value;
-				break;
-			}
-
+		// Look for a string literal
+		var stringLiteral = $tw.utils.parseStringLiteral(source,pos);
+		if(stringLiteral) {
+			pos = stringLiteral.end;
+			node.type = "string";
+			node.value = stringLiteral.value;
+		} else {
 			// 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];
-				break;
+			} 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];
+				} else {
+					// Look for a macro invocation value
+					var macroInvocation = $tw.utils.parseMacroInvocationAsTransclusion(source,pos);
+					if(macroInvocation) {
+						pos = macroInvocation.end;
+						node.type = "macro";
+						node.value = macroInvocation;
+					} else {
+						// Look for an MVV reference value
+						var mvvReference = $tw.utils.parseMVVReferenceAsTransclusion(source,pos);
+						if(mvvReference) {
+							pos = mvvReference.end;
+							node.type = "macro";
+							node.value = mvvReference;
+							node.isMVV = true;
+						} else {
+							var substitutedValue = $tw.utils.parseTokenRegExp(source,pos,reSubstitutedValue);
+							if(substitutedValue) {
+								pos = substitutedValue.end;
+								node.type = "substituted";
+								node.rawValue = substitutedValue.match[1] || substitutedValue.match[2];
+							} 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];
+								} else {
+									node.type = "string";
+									node.value = "true";
+								}
+							}
+						}
+					}
+				}
 			}
-
-			// 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];
-				break;
-			}
-
-			// Look for a macro invocation value
-			var macroInvocation = $tw.utils.parseMacroInvocationAsTransclusion(source,pos);
-			if(macroInvocation) {
-				pos = macroInvocation.end;
-				node.type = "macro";
-				node.value = macroInvocation;
-				break;
-			}
-
-			// Look for an MVV reference value
-			var mvvReference = $tw.utils.parseMVVReferenceAsTransclusion(source,pos);
-			if(mvvReference) {
-				pos = mvvReference.end;
-				node.type = "macro";
-				node.value = mvvReference;
-				node.isMVV = true;
-				break;
-			}
-
-			// Look for a substituted value
-			var substitutedValue = $tw.utils.parseTokenRegExp(source,pos,reSubstitutedValue);
-			if(substitutedValue) {
-				pos = substitutedValue.end;
-				node.type = "substituted";
-				node.rawValue = substitutedValue.match[1] || substitutedValue.match[2];
-				break;
-			}
-
-			// 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];
-				break;
-			}
-
-			if(source.charAt(pos) === "<" && source.charAt(pos + 1) === "<" && source.indexOf(">>",pos) !== -1) {
-				// Value looks like a macro invocation (starts with << with a closing >> ahead) but does not parse as one. Return null so the enclosing tag fails to parse rather than silently binding the attribute to "true" and treating the remainder as further attributes (restores v5.3.8 behaviour)
-				return null;
-			}
-
-			node.type = "string";
-			node.value = "true";
-		} while(false);
+		}
 	} else {
 		// If there is no equals sign or colon, then this is an attribute with no value, defaulting to "true"
 		node.type = "string";
@@ -31,16 +31,13 @@ exports.parse = function() {
 	reEnd.lastIndex = this.parser.pos;
 	var match = reEnd.exec(this.parser.source),
 		text,
-		start = this.parser.pos,
-		textEnd;
+		start = this.parser.pos;
 	// Process the text
 	if(match) {
 		text = this.parser.source.substring(this.parser.pos,match.index);
-		textEnd = match.index;
 		this.parser.pos = match.index + match[0].length;
 	} else {
 		text = this.parser.source.substr(this.parser.pos);
-		textEnd = this.parser.sourceLength;
 		this.parser.pos = this.parser.sourceLength;
 	}
 	return [{
@@ -50,7 +47,7 @@ exports.parse = function() {
 			type: "text",
 			text: text,
 			start: start,
-			end: textEnd
+			end: this.parser.pos
 		}]
 	}];
 };
@@ -32,8 +32,7 @@ exports.parse = function() {
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// Create the link unless it is suppressed
 	if(this.match[0].substr(0,1) === "~") {
-		// Start after the suppressing "~" so the span matches the plain text
-		return [{type: "text", text: this.match[0].substr(1), start: start + 1, end: this.parser.pos}];
+		return [{type: "text", text: this.match[0].substr(1), start: start, end: this.parser.pos}];
 	} else {
 		return [{
 			type: "element",
@@ -34,7 +34,7 @@ exports.parse = function() {
 	// Parse the filter terminated by a line break
 	var reMatch = /(.*)(?:$|\r?\n)/mg;
 	reMatch.lastIndex = this.parser.pos;
-	var filterStart = this.parser.pos;
+	var filterStart = this.parser.source;
 	var match = reMatch.exec(this.parser.source);
 	this.parser.pos = reMatch.lastIndex;
 	// Parse tree nodes to return
@@ -27,11 +27,9 @@ Parse the most recent match
 */
 exports.parse = function() {
 	// Get the details of the match
-	var linkText = this.match[0],
-		// Start after the suppressing "~" so the span matches the plain text
-		start = this.parser.pos + 1;
+	var linkText = this.match[0];
 	// Move past the wikilink
 	this.parser.pos = this.matchRegExp.lastIndex;
 	// Return the link without unwikilink character as plain text
-	return [{type: "text", text: linkText.substr(1), start: start, end: this.parser.pos}];
+	return [{type: "text", text: linkText.substr(1)}];
 };
@@ -1,54 +0,0 @@
-/*\
-title: $:/core/modules/relinkers/tiddlers.js
-type: application/javascript
-module-type: relinker
-
-Relinks the tags and list fields of tiddlers.
-
-Calls a tw-relinking-tiddler hook for every altered tiddler.
-
-\*/
-
-exports.name = "tiddlers";
-
-exports.relink = function(wiki,fromTitle,toTitle,options) {
-	wiki.each(function(tiddler,title) {
-		var type = tiddler.fields.type || "";
-		// Don't touch plugins or JavaScript modules
-		if(!tiddler.fields["plugin-type"] && type !== "application/javascript") {
-			var tags = tiddler.fields.tags ? tiddler.fields.tags.slice(0) : undefined,
-				list = tiddler.fields.list ? tiddler.fields.list.slice(0) : undefined,
-				isModified = false,
-				processList = function(listField) {
-					if(listField && listField.indexOf(fromTitle) !== -1) {
-						// Remove any existing instances of the toTitle
-						var p = listField.indexOf(toTitle);
-						while(p !== -1) {
-							listField.splice(p,1);
-							p = listField.indexOf(toTitle);
-						}
-						// Replace the fromTitle with toTitle
-						$tw.utils.each(listField,function (title,index) {
-							if(title === fromTitle) {
-								listField[index] = toTitle;
-								isModified = true;
-							}
-						});
-					}
-				};
-			if(!options.dontRenameInTags) {
-				// Rename tags
-				processList(tags);
-			}
-			if(!options.dontRenameInLists) {
-				// Rename lists
-				processList(list);
-			}
-			if(isModified) {
-				var newTiddler = new $tw.Tiddler(tiddler,{tags: tags, list: list},wiki.getModificationFields());
-				newTiddler = $tw.hooks.invokeHook("th-relinking-tiddler",newTiddler,tiddler);
-				wiki.addTiddler(newTiddler);
-			}
-		}
-	});
-};
@@ -40,8 +40,6 @@ exports.startup = function() {
 	// The rest of the startup process here is not strictly to do with loading modules, but are needed before other startup
 	// modules are executed. It is easier to put them here than to introduce a new startup module
 	// --------------------------
-	// Set up the performance framework
-	$tw.perf = new $tw.Performance($tw.wiki.getTiddlerText(PERFORMANCE_INSTRUMENTATION_CONFIG_TITLE,"no") === "yes");
 	// Create a root widget for attaching event handlers. By using it as the parentWidget for another widget tree, one can reuse the event handlers
 	$tw.rootWidget = new widget.widget({
 		type: "widget",
@@ -221,7 +221,7 @@ function updateLocationHash(options) {
 		$tw.utils.copyToClipboard(url,{successNotification: options.successNotification, failureNotification: options.failureNotification});
 	}
 	// Only change the location hash if we must, thus avoiding unnecessary onhashchange events
-	if($tw.utils.getLocationHash() !== $tw.locationHash) {
+	if($tw.utils.getLocationHash() !== $tw.locationHash && !$tw.safeMode) {
 		if(options.updateHistory === "yes") {
 			// Assign the location hash so that history is updated
 			window.location.hash = $tw.locationHash;
@@ -3,43 +3,18 @@ title: $:/core/modules/utils/deprecated.js
 type: application/javascript
 module-type: utils

-Deprecated util functions. These preserve the pre-5.4.0 signatures and
-behaviour for backwards compatibility with plugins and external scripts.
-Prefer modern alternatives in new code (Array.prototype methods, classList,
-Math.sign, String.prototype.repeat, etc.).
+Deprecated util functions

 \*/

 exports.logTable = (data) => console.table(data);

-/*
-Repeats a string
-*/
-exports.repeat = function(str,count) {
-	var result = "";
-	for(var t=0;t<count;t++) {
-		result += str;
-	}
-	return result;
-};
+exports.repeat = (str,count) => str.repeat(count);

-/*
-Check if a string starts with another string
-*/
-exports.startsWith = function(str,search) {
-	return str.substring(0, search.length) === search;
-};
+exports.startsWith = (str,search) => str.startsWith(search);

-/*
-Check if a string ends with another string
-*/
-exports.endsWith = function(str,search) {
-	return str.substring(str.length - search.length) === search;
-};
+exports.endsWith = (str,search) => str.endsWith(search);

-/*
-Trim whitespace from the start and end of a string
-*/
 exports.trim = function(str) {
 	if(typeof str === "string") {
 		return str.trim();
@@ -54,54 +29,30 @@ exports.sign = Math.sign;

 exports.strEndsWith = (str,ending,position) => str.endsWith(ending,position);

-exports.stringifyNumber = function(num) {
-	return num + "";
-};
+exports.stringifyNumber = (num) => num.toString();

-// Returns the fully escaped CSS selector for a tag, e.g.
-// "$:/tags/Stylesheet" -> "tc-tagged-\%24\%3A\%2Ftags\%2FStylesheet" 
 exports.tagToCssSelector = function(tagName) {
 	return "tc-tagged-" + encodeURIComponent(tagName).replace(/[!"#$%&'()*+,\-./:;<=>?@[\\\]^`{\|}~,]/mg,function(c) {
 		return "\\" + c;
 	});
 };

-/*
-Determines whether element 'a' contains element 'b'.
-Returns false when a === b (matches the original John Resig semantics).
-*/
-exports.domContains = function(a,b) {
-	return a !== b && a.contains(b);
-};
+exports.domContains = (a,b) => a.compareDocumentPosition(b) & 16;

 exports.domMatchesSelector = (node,selector) => node.matches(selector);

-exports.hasClass = function(el,className) {
-	return !!(el && el.classList && el.classList.contains(className));
-};
-
-// addClass/removeClass/toggleClass split on whitespace to preserve the
-// original setAttribute("class", ...) acceptance of "foo bar" as two
-// classes. Regressed in #9251.
-function splitClasses(className) {
-	return (typeof className === "string" && className.match(/\S+/g)) || [];
-}
+exports.hasClass = (el,className) => el.classList && el.classList.contains(className);

 exports.addClass = function(el,className) {
-	if(!el.classList) return;
-	splitClasses(className).forEach(function(c) { el.classList.add(c); });
+	el.classList && className && el.classList.add(className);
 };

 exports.removeClass = function(el,className) {
-	if(!el.classList) return;
-	splitClasses(className).forEach(function(c) { el.classList.remove(c); });
+	el.classList && className && el.classList.remove(className);
 };

 exports.toggleClass = function(el,className,status) {
-	if(!el.classList) return;
-	splitClasses(className).forEach(function(c) { el.classList.toggle(c,status); });
+	el.classList && className && el.classList.toggle(className, status);
 };

-exports.getLocationPath = function() {
-	return window.location.toString().split("#")[0];
-};
+exports.getLocationPath = () => window.location.origin + window.location.pathname;
@@ -1,55 +0,0 @@
-/*\
-title: $:/core/modules/utils/color-utils.js
-type: application/javascript
-module-type: utils
-
-Color.js related utilities
-
-\*/
-
-"use strict";
-
-var Color = require("$:/core/modules/utils/dom/color.js").Color;
-
-/*
-For backwards compatibility
-*/
-exports.parseCSSColor = function(colourString) {
-	var c = exports.parseCSSColorObject(colourString);
-	if(c) {
-		var rgb = c.srgb;
-		return [rgb[0],rgb[1],rgb[2],c.alpha];
-	} else {
-		return null;
-	}
-};
-
-
-/*
-Preferred way to parse a Color.js colour
-*/
-exports.parseCSSColorObject = function(colourString) {
-	var c = null;
-	try {
-		c = new Color(colourString);
-	} catch(e) {
-		// Return null if there is an error
-	}
-	return c;
-};
-
-/*
-Convert a CSS colour to an RGB string suitable for use with the <input type="color"> element
-*/
-exports.convertCSSColorToRGBString = function(colourString) {
-	var c = exports.parseCSSColorObject(colourString);
-	if(c) {
-		var hex = c.toString({format: "hex"});
-		if(hex.length === 4) {
-			hex = "#" + hex[1] + hex[1] + hex[2] + hex[2] + hex[3] + hex[3];
-		}
-		return hex;
-	} else {
-		return null;
-	}
-};
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2021 Lea Verou, Chris Lilley
-
-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.
@@ -1,21 +0,0 @@
-{
-	"tiddlers": [
-		{
-			"file": "color.global.min.v0.6.1.js",
-			"fields": {
-				"type": "application/javascript",
-				"title": "$:/core/modules/utils/dom/color.js",
-				"module-type": "library"
-			},
-			"prefix": "",
-			"suffix": ";\nexports.Color = Color;"
-		},
-		{
-			"file": "LICENSE",
-			"fields": {
-				"type": "text/plain",
-				"title": "$:/core/modules/utils/dom/color.js/license"
-			}
-		}
-	]
-}
@@ -0,0 +1,200 @@
+// (c) Dean McNamee <dean@gmail.com>, 2012.
+//
+// https://github.com/deanm/css-color-parser-js
+//
+// 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.
+
+// http://www.w3.org/TR/css3-color/
+var kCSSColorTable = {
+  "transparent": [0,0,0,0], "aliceblue": [240,248,255,1],
+  "antiquewhite": [250,235,215,1], "aqua": [0,255,255,1],
+  "aquamarine": [127,255,212,1], "azure": [240,255,255,1],
+  "beige": [245,245,220,1], "bisque": [255,228,196,1],
+  "black": [0,0,0,1], "blanchedalmond": [255,235,205,1],
+  "blue": [0,0,255,1], "blueviolet": [138,43,226,1],
+  "brown": [165,42,42,1], "burlywood": [222,184,135,1],
+  "cadetblue": [95,158,160,1], "chartreuse": [127,255,0,1],
+  "chocolate": [210,105,30,1], "coral": [255,127,80,1],
+  "cornflowerblue": [100,149,237,1], "cornsilk": [255,248,220,1],
+  "crimson": [220,20,60,1], "cyan": [0,255,255,1],
+  "darkblue": [0,0,139,1], "darkcyan": [0,139,139,1],
+  "darkgoldenrod": [184,134,11,1], "darkgray": [169,169,169,1],
+  "darkgreen": [0,100,0,1], "darkgrey": [169,169,169,1],
+  "darkkhaki": [189,183,107,1], "darkmagenta": [139,0,139,1],
+  "darkolivegreen": [85,107,47,1], "darkorange": [255,140,0,1],
+  "darkorchid": [153,50,204,1], "darkred": [139,0,0,1],
+  "darksalmon": [233,150,122,1], "darkseagreen": [143,188,143,1],
+  "darkslateblue": [72,61,139,1], "darkslategray": [47,79,79,1],
+  "darkslategrey": [47,79,79,1], "darkturquoise": [0,206,209,1],
+  "darkviolet": [148,0,211,1], "deeppink": [255,20,147,1],
+  "deepskyblue": [0,191,255,1], "dimgray": [105,105,105,1],
+  "dimgrey": [105,105,105,1], "dodgerblue": [30,144,255,1],
+  "firebrick": [178,34,34,1], "floralwhite": [255,250,240,1],
+  "forestgreen": [34,139,34,1], "fuchsia": [255,0,255,1],
+  "gainsboro": [220,220,220,1], "ghostwhite": [248,248,255,1],
+  "gold": [255,215,0,1], "goldenrod": [218,165,32,1],
+  "gray": [128,128,128,1], "green": [0,128,0,1],
+  "greenyellow": [173,255,47,1], "grey": [128,128,128,1],
+  "honeydew": [240,255,240,1], "hotpink": [255,105,180,1],
+  "indianred": [205,92,92,1], "indigo": [75,0,130,1],
+  "ivory": [255,255,240,1], "khaki": [240,230,140,1],
+  "lavender": [230,230,250,1], "lavenderblush": [255,240,245,1],
+  "lawngreen": [124,252,0,1], "lemonchiffon": [255,250,205,1],
+  "lightblue": [173,216,230,1], "lightcoral": [240,128,128,1],
+  "lightcyan": [224,255,255,1], "lightgoldenrodyellow": [250,250,210,1],
+  "lightgray": [211,211,211,1], "lightgreen": [144,238,144,1],
+  "lightgrey": [211,211,211,1], "lightpink": [255,182,193,1],
+  "lightsalmon": [255,160,122,1], "lightseagreen": [32,178,170,1],
+  "lightskyblue": [135,206,250,1], "lightslategray": [119,136,153,1],
+  "lightslategrey": [119,136,153,1], "lightsteelblue": [176,196,222,1],
+  "lightyellow": [255,255,224,1], "lime": [0,255,0,1],
+  "limegreen": [50,205,50,1], "linen": [250,240,230,1],
+  "magenta": [255,0,255,1], "maroon": [128,0,0,1],
+  "mediumaquamarine": [102,205,170,1], "mediumblue": [0,0,205,1],
+  "mediumorchid": [186,85,211,1], "mediumpurple": [147,112,219,1],
+  "mediumseagreen": [60,179,113,1], "mediumslateblue": [123,104,238,1],
+  "mediumspringgreen": [0,250,154,1], "mediumturquoise": [72,209,204,1],
+  "mediumvioletred": [199,21,133,1], "midnightblue": [25,25,112,1],
+  "mintcream": [245,255,250,1], "mistyrose": [255,228,225,1],
+  "moccasin": [255,228,181,1], "navajowhite": [255,222,173,1],
+  "navy": [0,0,128,1], "oldlace": [253,245,230,1],
+  "olive": [128,128,0,1], "olivedrab": [107,142,35,1],
+  "orange": [255,165,0,1], "orangered": [255,69,0,1],
+  "orchid": [218,112,214,1], "palegoldenrod": [238,232,170,1],
+  "palegreen": [152,251,152,1], "paleturquoise": [175,238,238,1],
+  "palevioletred": [219,112,147,1], "papayawhip": [255,239,213,1],
+  "peachpuff": [255,218,185,1], "peru": [205,133,63,1],
+  "pink": [255,192,203,1], "plum": [221,160,221,1],
+  "powderblue": [176,224,230,1], "purple": [128,0,128,1],
+  "red": [255,0,0,1], "rosybrown": [188,143,143,1],
+  "royalblue": [65,105,225,1], "saddlebrown": [139,69,19,1],
+  "salmon": [250,128,114,1], "sandybrown": [244,164,96,1],
+  "seagreen": [46,139,87,1], "seashell": [255,245,238,1],
+  "sienna": [160,82,45,1], "silver": [192,192,192,1],
+  "skyblue": [135,206,235,1], "slateblue": [106,90,205,1],
+  "slategray": [112,128,144,1], "slategrey": [112,128,144,1],
+  "snow": [255,250,250,1], "springgreen": [0,255,127,1],
+  "steelblue": [70,130,180,1], "tan": [210,180,140,1],
+  "teal": [0,128,128,1], "thistle": [216,191,216,1],
+  "tomato": [255,99,71,1], "turquoise": [64,224,208,1],
+  "violet": [238,130,238,1], "wheat": [245,222,179,1],
+  "white": [255,255,255,1], "whitesmoke": [245,245,245,1],
+  "yellow": [255,255,0,1], "yellowgreen": [154,205,50,1]}
+
+function clamp_css_byte(i) {  // Clamp to integer 0 .. 255.
+  i = Math.round(i);  // Seems to be what Chrome does (vs truncation).
+  return i < 0 ? 0 : i > 255 ? 255 : i;
+}
+
+function clamp_css_float(f) {  // Clamp to float 0.0 .. 1.0.
+  return f < 0 ? 0 : f > 1 ? 1 : f;
+}
+
+function parse_css_int(str) {  // int or percentage.
+  if (str[str.length - 1] === '%')
+    return clamp_css_byte(parseFloat(str) / 100 * 255);
+  return clamp_css_byte(parseInt(str));
+}
+
+function parse_css_float(str) {  // float or percentage.
+  if (str[str.length - 1] === '%')
+    return clamp_css_float(parseFloat(str) / 100);
+  return clamp_css_float(parseFloat(str));
+}
+
+function css_hue_to_rgb(m1, m2, h) {
+  if (h < 0) h += 1;
+  else if (h > 1) h -= 1;
+
+  if (h * 6 < 1) return m1 + (m2 - m1) * h * 6;
+  if (h * 2 < 1) return m2;
+  if (h * 3 < 2) return m1 + (m2 - m1) * (2/3 - h) * 6;
+  return m1;
+}
+
+function parseCSSColor(css_str) {
+  // Remove all whitespace, not compliant, but should just be more accepting.
+  var str = css_str.replace(/ /g, '').toLowerCase();
+
+  // Color keywords (and transparent) lookup.
+  if (str in kCSSColorTable) return kCSSColorTable[str].slice();  // dup.
+
+  // #abc and #abc123 syntax.
+  if (str[0] === '#') {
+    if (str.length === 4) {
+      var iv = parseInt(str.substr(1), 16);  // TODO(deanm): Stricter parsing.
+      if (!(iv >= 0 && iv <= 0xfff)) return null;  // Covers NaN.
+      return [((iv & 0xf00) >> 4) | ((iv & 0xf00) >> 8),
+              (iv & 0xf0) | ((iv & 0xf0) >> 4),
+              (iv & 0xf) | ((iv & 0xf) << 4),
+              1];
+    } else if (str.length === 7) {
+      var iv = parseInt(str.substr(1), 16);  // TODO(deanm): Stricter parsing.
+      if (!(iv >= 0 && iv <= 0xffffff)) return null;  // Covers NaN.
+      return [(iv & 0xff0000) >> 16,
+              (iv & 0xff00) >> 8,
+              iv & 0xff,
+              1];
+    }
+
+    return null;
+  }
+
+  var op = str.indexOf('('), ep = str.indexOf(')');
+  if (op !== -1 && ep + 1 === str.length) {
+    var fname = str.substr(0, op);
+    var params = str.substr(op+1, ep-(op+1)).split(',');
+    var alpha = 1;  // To allow case fallthrough.
+    switch (fname) {
+      case 'rgba':
+        if (params.length !== 4) return null;
+        alpha = parse_css_float(params.pop());
+        // Fall through.
+      case 'rgb':
+        if (params.length !== 3) return null;
+        return [parse_css_int(params[0]),
+                parse_css_int(params[1]),
+                parse_css_int(params[2]),
+                alpha];
+      case 'hsla':
+        if (params.length !== 4) return null;
+        alpha = parse_css_float(params.pop());
+        // Fall through.
+      case 'hsl':
+        if (params.length !== 3) return null;
+        var h = (((parseFloat(params[0]) % 360) + 360) % 360) / 360;  // 0 .. 1
+        // NOTE(deanm): According to the CSS spec s/l should only be
+        // percentages, but we don't bother and let float or percentage.
+        var s = parse_css_float(params[1]);
+        var l = parse_css_float(params[2]);
+        var m2 = l <= 0.5 ? l * (s + 1) : l + s - l * s;
+        var m1 = l * 2 - m2;
+        return [clamp_css_byte(css_hue_to_rgb(m1, m2, h+1/3) * 255),
+                clamp_css_byte(css_hue_to_rgb(m1, m2, h) * 255),
+                clamp_css_byte(css_hue_to_rgb(m1, m2, h-1/3) * 255),
+                alpha];
+      default:
+        return null;
+    }
+  }
+
+  return null;
+}
+
+try { exports.parseCSSColor = parseCSSColor } catch(e) { }
@@ -0,0 +1,3 @@
+title: $:/core/modules/utils/dom/csscolorparser.js
+type: application/javascript
+module-type: utils
@@ -77,23 +77,10 @@ exports.resizeTextAreaToFit = function(domNode,minHeight) {
 	// Measure the specified minimum height
 	domNode.style.height = minHeight;
 	var measuredHeight = domNode.offsetHeight || parseInt(minHeight,10);
-	// Temporarily force rows=1 during auto-measurement so the intrinsic floor
-	// is one row rather than the HTML default of two; restore afterwards
-	var hadRowsAttr = domNode.hasAttribute("rows"),
-		savedRows = hadRowsAttr ? domNode.getAttribute("rows") : null;
-	if(!hadRowsAttr) {
-		domNode.setAttribute("rows","1");
-	}
 	// 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);
-	// Restore the original rows attribute state
-	if(!hadRowsAttr) {
-		domNode.removeAttribute("rows");
-	} else {
-		domNode.setAttribute("rows",savedRows);
-	}
 	// Only try to change the height if it has changed
 	if(newHeight !== domNode.offsetHeight) {
 		domNode.style.height = newHeight + "px";
@@ -82,11 +82,6 @@ var TW_Style = function(el) {
 	// Return a Proxy to handle direct access to individual style properties
 	return new Proxy(styleObject, {
 		get: function(target, property) {
-			// Real CSSStyleDeclaration returns undefined for non-string keys.
-			// Guards against crashes when consumers probe Symbol.toPrimitive etc.
-			if(typeof property !== "string") {
-				return undefined;
-			}
 			// If the property exists on styleObject, return it (get, set, setProperty methods)
 			if(property in target) {
 				return target[property];
@@ -95,10 +90,6 @@ var TW_Style = function(el) {
 			return el._style[$tw.utils.convertStyleNameToPropertyName(property)] || "";
 		},
 		set: function(target, property, value) {
-			// Mirror the get trap: ignore non-string keys instead of crashing.
-			if(typeof property !== "string") {
-				return true;
-			}
 			// Set the property in _style
 			el._style[$tw.utils.convertStyleNameToPropertyName(property)] = value;
 			return true;
@@ -243,28 +243,8 @@ exports.slowInSlowOut = function(t) {
 };

 exports.copyObjectPropertiesSafe = function(object) {
-	const seen = new Set();
-
-	function isDOMElement(value) {
-		if(!value || typeof value !== "object") {
-			return false;
-		}
-
-		// Cross-realm DOM nodes
-		if(typeof value.nodeType === "number" &&
-				typeof value.nodeName === "string") {
-			return true;
-		}
-
-		// Cross-realm Window objects
-		if(value.window === value &&
-				value.document &&
-				value.location) {
-			return true;
-		}
-
-		return false;
-	}
+	const seen = new Set(),
+		isDOMElement = (value) => value instanceof Node || value instanceof Window;

 	function safeCopy(obj) {
 		// skip circular references
@@ -275,6 +255,10 @@ exports.copyObjectPropertiesSafe = function(object) {
 		if(typeof obj !== "object" || obj === null) {
 			return obj;
 		}
+		// skip DOM elements
+		if(isDOMElement(obj)) {
+			return undefined;
+		}
 		// copy arrays, preserving positions
 		if(Array.isArray(obj)) {
 			return obj.map((item) => {
@@ -282,11 +266,7 @@ exports.copyObjectPropertiesSafe = function(object) {
 				return value === undefined ? null : value;
 			});
 		}
-		// skip DOM elements
-		if(isDOMElement(obj)) {
-			return undefined;
-		}
-		
+
 		seen.add(obj);
 		const copy = {};
 		let key,
@@ -61,7 +61,7 @@ LogWidget.prototype.log = function() {
 	$tw.utils.each(this.parseTreeNode.attributes,function(attribute,name) {
 		if(name.substring(0,2) !== "$$") {
 			var resultList = self.computeAttribute(attribute,{asList: true});
-			if(resultList && resultList.length <= 1) {
+			if(resultList.length <= 1) {
 				data[name] = resultList[0] || "";
 			} else {
 				data[name] = resultList;
@@ -75,7 +75,7 @@ LogWidget.prototype.log = function() {
 			allVars[v] = variable.value;
 		} else {
 			var variableInfo = this.getVariableInfo(v);
-			allVars[v] = variableInfo && variableInfo.resultList && variableInfo.resultList.length > 1 ? variableInfo.resultList : variableInfo.text;
+			allVars[v] = variableInfo.resultList.length > 1 ? variableInfo.resultList : variableInfo.text;
 		}
 	}
 	if(this.filter) {
@@ -62,8 +62,8 @@ SendMessageWidget.prototype.invokeAction = function(triggeringWidget,event) {
 	var paramObject = Object.create(null);
 	// Add names/values pairs if present
 	if(this.actionNames && this.actionValues) {
-		var names = this.wiki.filterTiddlers(this.actionNames,this,{defaultFilterRunPrefix: "all"}),
-			values = this.wiki.filterTiddlers(this.actionValues,this,{defaultFilterRunPrefix: "all"});
+		var names = this.wiki.filterTiddlers(this.actionNames,this),
+			values = this.wiki.filterTiddlers(this.actionValues,this);
 		$tw.utils.each(names,function(name,index) {
 			paramObject[name] = values[index] || "";
 		});
@@ -56,10 +56,10 @@ Invoke the action associated with this widget
 */
 SetMultipleFieldsWidget.prototype.invokeAction = function(triggeringWidget,event) {
 	var tiddler = this.wiki.getTiddler(this.actionTiddler),
-		names, values = this.wiki.filterTiddlers(this.actionValues,this,{defaultFilterRunPrefix: "all"});
+		names, values = this.wiki.filterTiddlers(this.actionValues,this);
 	if(this.actionFields) {
 		var additions = {};
-		names = this.wiki.filterTiddlers(this.actionFields,this,{defaultFilterRunPrefix: "all"});
+		names = this.wiki.filterTiddlers(this.actionFields,this);
 		$tw.utils.each(names,function(fieldname,index) {
 			additions[fieldname] = values[index] || "";
 		});
@@ -68,7 +68,7 @@ SetMultipleFieldsWidget.prototype.invokeAction = function(triggeringWidget,event
 		this.wiki.addTiddler(new $tw.Tiddler(creationFields,tiddler,{title: this.actionTiddler},modificationFields,additions));
 	} else if(this.actionIndexes) {
 		var data = this.wiki.getTiddlerData(this.actionTiddler,Object.create(null));
-		names = this.wiki.filterTiddlers(this.actionIndexes,this,{defaultFilterRunPrefix: "all"});
+		names = this.wiki.filterTiddlers(this.actionIndexes,this);
 		$tw.utils.each(names,function(name,index) {
 			data[name] = values[index] || "";
 		});
@@ -72,8 +72,8 @@ GenesisWidget.prototype.execute = function() {
 	this.attributeNames = [];
 	this.attributeValues = [];
 	if(this.genesisNames && this.genesisValues) {
-		this.attributeNames = this.wiki.filterTiddlers(self.genesisNames,this,{defaultFilterRunPrefix: "all"});
-		this.attributeValues = this.wiki.filterTiddlers(self.genesisValues,this,{defaultFilterRunPrefix: "all"});
+		this.attributeNames = this.wiki.filterTiddlers(self.genesisNames,this);
+		this.attributeValues = this.wiki.filterTiddlers(self.genesisValues,this);
 		$tw.utils.each(this.attributeNames,function(varname,index) {
 			$tw.utils.addAttributeToParseTreeNode(parseTreeNodes[0],varname,self.attributeValues[index] || "");
 		});
@@ -103,8 +103,8 @@ GenesisWidget.prototype.refresh = function(changedTiddlers) {
 	var changedAttributes = this.computeAttributes(),
 		filterNames = this.getAttribute("$names",""),
 		filterValues = this.getAttribute("$values",""),
-		attributeNames = this.wiki.filterTiddlers(filterNames,this,{defaultFilterRunPrefix: "all"}),
-		attributeValues = this.wiki.filterTiddlers(filterValues,this,{defaultFilterRunPrefix: "all"});
+		attributeNames = this.wiki.filterTiddlers(filterNames,this),
+		attributeValues = this.wiki.filterTiddlers(filterValues,this);
 	if($tw.utils.count(changedAttributes) > 0 || !$tw.utils.isArrayEqual(this.attributeNames,attributeNames) || !$tw.utils.isArrayEqual(this.attributeValues,attributeValues)) {
 		this.refreshSelf();
 		return true;
@@ -125,12 +125,13 @@ SelectWidget.prototype.setSelectValue = function() {
 			values = Array.isArray(value) ? value : $tw.utils.parseStringArray(value);
 		for(var i=0; i < select.children.length; i++){
 			child=select.children[i];
-			if(child.tagName && child.tagName.toUpperCase() === "OPTGROUP"){
+			if(child.children.length === 0){
+				child.selected = values.indexOf(child.value) !== -1;
+			} else {
+				// grouped options
 				for(var y=0; y < child.children.length; y++){
 					child.children[y].selected = values.indexOf(child.children[y].value) !== -1;
 				}
-			} else {
-				child.selected = values.indexOf(child.value) !== -1;
 			}
 		}
 	} else {
@@ -49,8 +49,8 @@ SetMultipleVariablesWidget.prototype.setVariables = function() {
 	this.variableNames = [];
 	this.variableValues = [];
 	if(filterNames && filterValues) {
-		this.variableNames = this.wiki.filterTiddlers(filterNames,this,{defaultFilterRunPrefix: "all"});
-		this.variableValues = this.wiki.filterTiddlers(filterValues,this,{defaultFilterRunPrefix: "all"});
+		this.variableNames = this.wiki.filterTiddlers(filterNames,this);
+		this.variableValues = this.wiki.filterTiddlers(filterValues,this);
 		$tw.utils.each(this.variableNames,function(varname,index) {
 			self.setVariable(varname,self.variableValues[index]);
 		});
@@ -63,8 +63,8 @@ Refresh the widget by ensuring our attributes are up to date
 SetMultipleVariablesWidget.prototype.refresh = function(changedTiddlers) {
 	var filterNames = this.getAttribute("$names",""),
 		filterValues = this.getAttribute("$values",""),
-		variableNames = this.wiki.filterTiddlers(filterNames,this,{defaultFilterRunPrefix: "all"}),
-		variableValues = this.wiki.filterTiddlers(filterValues,this,{defaultFilterRunPrefix: "all"});
+		variableNames = this.wiki.filterTiddlers(filterNames,this),
+		variableValues = this.wiki.filterTiddlers(filterValues,this);
 	if(!$tw.utils.isArrayEqual(this.variableNames,variableNames) || !$tw.utils.isArrayEqual(this.variableValues,variableValues)) {
 		this.refreshSelf();
 		return true;
@@ -189,7 +189,7 @@ Widget.prototype.getVariableInfo = function(name,options) {
 	}
 	return {
 		text: text,
-		resultList: text === undefined ? text : [text]
+		resultList: [text]
 	};
 };

@@ -338,7 +338,7 @@ Widget.prototype.makeFakeWidgetWithVariables = function(vars = {}) {
 				const value = vars[name];
 				return Array.isArray(value)
 					? { text: value[0], resultList: value }
-					: { text: value, resultList: value === undefined ? value : [value] };
+					: { text: value, resultList: [value] };
 			}
 			opts = opts || {};
 			opts.variables = Object.assign({}, vars, opts.variables || {});
@@ -9,7 +9,6 @@ Bulk tiddler operations such as rename.

 "use strict";

-var relinkers = $tw.modules.getModulesByTypeAsHashmap("relinker");
 /*
 Rename a tiddler, and relink any tags or lists that reference it.
 */
@@ -33,13 +32,50 @@ function renameTiddler(fromTitle,toTitle,options) {
 Relink any tags or lists that reference a given tiddler
 */
 function relinkTiddler(fromTitle,toTitle,options) {
+	var self = this;
 	fromTitle = (fromTitle || "").trim();
 	toTitle = (toTitle || "").trim();
 	options = options || {};
 	if(fromTitle && toTitle && fromTitle !== toTitle) {
-		for(var name in relinkers) {
-			relinkers[name].relink(this,fromTitle,toTitle,options);
-		}
+		this.each(function(tiddler,title) {
+			var type = tiddler.fields.type || "";
+			// Don't touch plugins or JavaScript modules
+			if(!tiddler.fields["plugin-type"] && type !== "application/javascript") {
+				var tags = tiddler.fields.tags ? tiddler.fields.tags.slice(0) : undefined,
+					list = tiddler.fields.list ? tiddler.fields.list.slice(0) : undefined,
+					isModified = false,
+					processList = function(listField) {
+						if(listField && listField.indexOf(fromTitle) !== -1) {
+							// Remove any existing instances of the toTitle
+							var p = listField.indexOf(toTitle);
+							while(p !== -1) {
+								listField.splice(p,1);
+								p = listField.indexOf(toTitle);
+							}
+							// Replace the fromTitle with toTitle
+							$tw.utils.each(listField,function (title,index) {
+								if(title === fromTitle) {
+									listField[index] = toTitle;
+									isModified = true;
+								}
+							});
+						}
+					};
+				if(!options.dontRenameInTags) {
+					// Rename tags
+					processList(tags);
+				}
+				if(!options.dontRenameInLists) {
+					// Rename lists
+					processList(list);
+				}
+				if(isModified) {
+					var newTiddler = new $tw.Tiddler(tiddler,{tags: tags, list: list},self.getModificationFields());
+					newTiddler = $tw.hooks.invokeHook("th-relinking-tiddler",newTiddler,tiddler);
+					self.addTiddler(newTiddler);
+				}
+			}
+		});
 	}
 };

@@ -369,31 +369,16 @@ Sort an array of tiddler titles by a specified field
 	isDescending: true if the sort should be descending
 	isCaseSensitive: true if the sort should consider upper and lower case letters to be different
 */
-exports.sortTiddlers = function(titles,sortField,isDescending,isCaseSensitive,isNumeric,isAlphaNumeric) {
+exports.sortTiddlers = function(titles,sortField,isDescending,isCaseSensitive,isNumeric,isAlphaNumeric,locale) {
 	var self = this;
 	if(sortField === "title") {
 		if(!isNumeric && !isAlphaNumeric) {
-			if(isCaseSensitive) {
-				if(isDescending) {
-					titles.sort(function(a,b) {
-						return b.localeCompare(a);
-					});
-				} else {
-					titles.sort(function(a,b) {
-						return a.localeCompare(b);
-					});
-				}	
+			const sorter = new Intl.Collator(locale, { sensitivity: isCaseSensitive ? "variant" : "accent" });
+			if(isDescending) {
+				titles.sort((a,b) => sorter.compare(b, a));
 			} else {
-				if(isDescending) {
-					titles.sort(function(a,b) {
-						return b.toLowerCase().localeCompare(a.toLowerCase());
-					});
-				} else {
-					titles.sort(function(a,b) {
-						return a.toLowerCase().localeCompare(b.toLowerCase());
-					});
-				}	
-			}
+				titles.sort((a,b) => sorter.compare(a, b));
+			}	
 		} else {
 			titles.sort(function(a,b) {
 				var x,y;
@@ -414,14 +399,8 @@ exports.sortTiddlers = function(titles,sortField,isDescending,isCaseSensitive,is
 						}
 					}
 				}
-				if(isAlphaNumeric) {
-					return isDescending ? b.localeCompare(a,undefined,{numeric: true,sensitivity: "base"}) : a.localeCompare(b,undefined,{numeric: true,sensitivity: "base"});
-				}
-				if(!isCaseSensitive) {
-					a = a.toLowerCase();
-					b = b.toLowerCase();
-				}
-				return isDescending ? b.localeCompare(a) : a.localeCompare(b);
+				const sorter = new Intl.Collator(locale, { numeric: isAlphaNumeric, sensitivity: isAlphaNumeric ? "base" : isCaseSensitive ? "variant" :  "accent" });
+				return isDescending ? sorter.compare(b, a) : sorter.compare(a, b);
 			});
 		}
 	} else {
@@ -463,14 +442,8 @@ exports.sortTiddlers = function(titles,sortField,isDescending,isCaseSensitive,is
 			}
 			a = String(a);
 			b = String(b);
-			if(isAlphaNumeric) {
-				return isDescending ? b.localeCompare(a,undefined,{numeric: true,sensitivity: "base"}) : a.localeCompare(b,undefined,{numeric: true,sensitivity: "base"});
-			}
-			if(!isCaseSensitive) {
-				a = a.toLowerCase();
-				b = b.toLowerCase();
-			}
-			return isDescending ? b.localeCompare(a) : a.localeCompare(b);
+			const sorter = new Intl.Collator(locale, { numeric: isAlphaNumeric, sensitivity: isAlphaNumeric ? "base" : isCaseSensitive ? "variant" :  "accent" });
+			return isDescending ? sorter.compare(b, a) : sorter.compare(a, b);
 		});
 	}
 };
@@ -1,10 +0,0 @@
-title: $:/palettes/AutoToggle
-name: AutoToggle
-description: Automatically switch between dark and light modes
-tags: $:/tags/Palette
-type: application/x-tiddler-dictionary
-color-scheme: [{$:/info/browser/darkmode}!match[yes]then[light]else[dark]]
-settings: $:/palettes/AutoToggle/Settings
-palette-import@light: $:/palettes/TwentyTwenties
-palette-import@dark: $:/palettes/TwentyTwentiesDark
-category: 2026
@@ -1,19 +0,0 @@
-title: $:/palettes/AutoToggle/Settings
-
-\procedure set-imported-palette(field)
-<$select field=<<field>>>
-	<$list filter="[all[shadows+tiddlers]tag[$:/tags/Palette]sort[name]] -[<currentTiddler>]">
-		<option value=<<currentTiddler>>><$view field="name"><$view field="title"/></$view></option>
-	</$list>
-</$select>
-\end set-imported-palette
-
-This palette can be used to automatically switch between two palettes based on the browser's dark mode setting.
-
-<$tiddler tiddler={{$:/palette}}>
-
-Light palette: <<set-imported-palette field:"palette-import@light">>
-
-Dark palette: <<set-imported-palette field:"palette-import@dark">>
-
-</$tiddler>
@@ -1,6 +1,5 @@
 title: $:/palettes/Blanca
 name: Blanca
-category: Legacy
 color-scheme: light
 description: A clean white palette to let you focus
 tags: $:/tags/Palette
@@ -1,6 +1,5 @@
 title: $:/palettes/Blue
 name: Blue
-category: Legacy
 color-scheme: light
 description: A blue theme
 tags: $:/tags/Palette
@@ -1,6 +1,5 @@
 title: $:/palettes/Muted
 name: Muted
-category: Legacy
 color-scheme: light
 description: Bright tiddlers on a muted background
 tags: $:/tags/Palette
@@ -1,6 +1,5 @@
 title: $:/palettes/ContrastDark
 name: Contrast (Dark)
-category: Legacy
 color-scheme: dark
 description: High contrast and unambiguous (dark version)
 tags: $:/tags/Palette
@@ -1,6 +1,5 @@
 title: $:/palettes/ContrastLight
 name: Contrast (Light)
-category: Legacy
 color-scheme: light
 description: High contrast and unambiguous (light version)
 tags: $:/tags/Palette
@@ -2,7 +2,6 @@ title: $:/palettes/CupertinoDark
 tags: $:/tags/Palette
 color-scheme: dark
 name: Cupertino Dark
-category: Legacy
 description: A macOS inspired dark palette
 type: application/x-tiddler-dictionary

@@ -2,7 +2,6 @@ created: 20150402111612188
 description: Good with dark photo backgrounds
 modified: 20150402112344080
 name: DarkPhotos
-category: Legacy
 tags: $:/tags/Palette
 title: $:/palettes/DarkPhotos
 type: application/x-tiddler-dictionary
@@ -2,7 +2,6 @@ title: $:/palettes/DesertSand
 tags: $:/tags/Palette
 color-scheme: light
 name: Desert Sand
-category: Legacy
 description: A desert sand palette
 type: application/x-tiddler-dictionary

@@ -1,7 +1,6 @@
 color-scheme: dark
 description: An inky color scheme for prose and code
 name: FlexokiDark
-category: Legacy
 tags: $:/tags/Palette
 title: $:/palettes/FlexokiDark
 type: application/x-tiddler-dictionary
@@ -1,6 +1,5 @@
 title: $:/palettes/FlexokiLight
 name: FlexokiLight
-category: Legacy
 description: An inky color scheme for prose and code
 tags: $:/tags/Palette
 type: application/x-tiddler-dictionary
@@ -1,6 +1,5 @@
 title: $:/palettes/GruvboxDark
 name: Gruvbox Dark
-category: Legacy
 color-scheme: dark
 description: Retro groove color scheme
 tags: $:/tags/Palette
@@ -1,6 +1,5 @@
 title: $:/palettes/Nord
 name: Nord
-category: Legacy
 color-scheme: dark
 description: An arctic, north-bluish color palette.
 tags: $:/tags/Palette
@@ -1,6 +1,5 @@
 title: $:/palettes/Rocker
 name: Rocker
-category: Legacy
 color-scheme: dark
 description: A dark theme
 tags: $:/tags/Palette
@@ -1,6 +1,5 @@
 title: $:/palettes/SolarFlare
 name: Solar Flare
-category: Legacy
 color-scheme: light
 description: Warm, relaxing earth colours
 tags: $:/tags/Palette
@@ -1,6 +1,5 @@
 title: $:/palettes/SolarizedDark
 tags: $:/tags/Palette
-category: Legacy
 type: application/x-tiddler-dictionary
 description: Precision dark colors for machines and people
 license: MIT, Ethan Schoonover, https://github.com/altercation/solarized/blob/master/LICENSE
@@ -4,7 +4,6 @@ type: application/x-tiddler-dictionary
 description: Precision colors for machines and people
 license: MIT, Ethan Schoonover, https://github.com/altercation/solarized/blob/master/LICENSE
 name: SolarizedLight
-category: Legacy
 color-scheme: light

 alert-background: #eee8d5
@@ -4,7 +4,6 @@ type: application/x-tiddler-dictionary
 description: Cold, spartan day colors
 name: Spartan Day
 color-scheme: light
-category: Legacy

 alert-background: <<colour background>>
 alert-border: <<colour very-muted-foreground>>
@@ -4,7 +4,6 @@ type: application/x-tiddler-dictionary
 description: Dark spartan colors
 name: Spartan Night
 color-scheme: dark
-category: Legacy

 alert-background: <<colour background>>
 alert-border: <<colour very-muted-foreground>>
@@ -1,226 +0,0 @@
-title: $:/palettes/TwentyTwenties
-name: TwentyTwenties
-description: Modern and flexible
-tags: $:/tags/Palette
-type: application/x-tiddler-dictionary
-color-scheme: light
-settings: $:/palettes/TwentyTwenties/Settings
-palette-import: $:/palettes/Vanilla
-category: 2026
-
-# Background and foreground colours, which are interpolated as required
-base-paper: #FFFCF0
-base-background: #edcec1
-base-ink: #333344
-?base-paper-ink: [tf.check-colour-contrast[base-paper],[base-ink],[45]]
-?base-background-ink: [tf.check-colour-contrast[base-background],[base-ink],[45]]
-
-# Primary colour, used for links and other accented elements
-base-primary: #5778d8
-?base-paper-primary: [tf.check-colour-contrast[base-paper],[base-primary],[45]]
-?base-background-primary: [tf.check-colour-contrast[base-background],[base-primary],[45]]
-
-# Secondary colour, used for alerts and other secondary elements
-base-secondary: #f0e48a
-?base-ink-secondary: [tf.check-colour-contrast[base-ink],[base-secondary],[45]]
-
-# Tertiary base colour, used for monospaced text and other tertiary elements
-base-tertiary: rgb(183, 95, 95)
-?base-paper-tertiary: [tf.check-colour-contrast[base-paper],[base-tertiary],[45]]
-
-# Basic spectrum colours
-base-black: #100F0F
-base-red: #D14D41
-base-orange: #DA702C
-base-yellow: #D0A215
-base-green: #879A39
-base-cyan: #3AA99F
-base-blue: #4385BE
-base-purple: #8B7EC8
-base-magenta: #CE5D97
-base-white: #FFFCF0
-# Darker variants
-# base-red: #AF3029
-# base-orange: #BC5215
-# base-yellow: #AD8301
-# base-green: #66800B
-# base-cyan: #24837B
-# base-blue: #205EA6
-# base-purple: #5E409D
-# base-magenta: #A02F6F
-
-# Palette definitions
-alert-background: [tf.colour[base-secondary]]
-alert-border: [tf.interpolate-colours[base-ink],[alert-background],[0.6]]
-alert-highlight: [tf.interpolate-colours[base-ink],[base-primary],[0.3]]
-alert-muted-foreground: [tf.interpolate-colours[base-ink],[alert-background],[0.4]]
-background: [tf.colour[base-paper]]
-blockquote-bar: [tf.colour[muted-foreground]]
-button-background: 
-button-border: 
-button-foreground: 
-code-background: [tf.interpolate-colours[base-paper],[base-tertiary],[0.1]]
-code-border: [tf.interpolate-colours[base-paper],[base-tertiary],[0.6]]
-code-foreground: [tf.colour[base-tertiary]]
-diff-delete-background: [tf.colour[base-red]]
-diff-delete-foreground: [tf.colour[foreground]]
-diff-equal-background: 
-diff-equal-foreground: [tf.colour[foreground]]
-diff-insert-background: [tf.colour[base-green]]
-diff-insert-foreground: [tf.colour[foreground]]
-diff-invisible-background: 
-diff-invisible-foreground: [tf.colour[muted-foreground]]
-dirty-indicator: [tf.colour[base-tertiary]]
-download-background: [tf.interpolate-colours[base-paper],[base-green],[0.6]]
-download-foreground: [tf.interpolate-colours[base-ink],[base-green],[0.1]]
-dragger-background: [tf.colour[foreground]]
-dragger-foreground: [tf.colour[background]]
-dropdown-background: [tf.colour[background]]
-dropdown-border: [tf.colour[muted-foreground]]
-dropdown-tab-background-selected: [tf.colour[background]]
-dropdown-tab-background: [tf.interpolate-colours[base-paper],[base-ink],[0.9]]
-dropzone-background: [tf.colour[base-secondary]colour-set-alpha[0.7]]
-external-link-background-hover: inherit
-external-link-background-visited: inherit
-external-link-background: inherit
-external-link-foreground-hover: inherit
-external-link-foreground-visited: [tf.colour[primary]]
-external-link-foreground: [tf.colour[primary]]
-footnote-target-background: [tf.interpolate-colours[base-paper],[base-ink],[0.2]]
-foreground: [tf.colour[base-ink]]
-highlight-background: [tf.interpolate-colours[base-paper],[base-yellow],[0.5]]
-highlight-foreground: [tf.interpolate-colours[base-yellow],[base-ink],[0.8]]
-menubar-background: #5778d8
-menubar-foreground: #fff
-message-background: [tf.interpolate-colours[base-paper],[base-blue],[0.2]]
-message-border: [tf.interpolate-colours[base-blue],[base-ink],[0.5]]
-message-foreground: [tf.interpolate-colours[base-blue],[base-ink],[0.8]]
-modal-backdrop: [tf.colour[foreground]]
-modal-background: [tf.colour[background]]
-modal-border: #999999
-modal-footer-background: #f5f5f5
-modal-footer-border: #dddddd
-modal-header-border: #eeeeee
-muted-foreground: [tf.interpolate-colours[base-paper],[base-ink],[0.3]]
-network-activity-foreground: #448844
-notification-background: [tf.colour[base-tertiary]colour-set-oklch:l[0.9]]
-notification-border: [tf.colour[base-tertiary]colour-set-oklch:l[0.2]]
-page-background: [tf.colour[base-background]]
-pre-background: [tf.interpolate-colours[base-paper],[base-tertiary],[0.1]]
-pre-border: [tf.interpolate-colours[base-paper],[base-tertiary],[0.6]]
-primary: [tf.colour[base-primary]]
-select-tag-background: 
-select-tag-foreground: 
-selection-background: 
-selection-foreground: 
-sidebar-button-foreground: [tf.colour[sidebar-controls-foreground]]
-sidebar-controls-foreground-hover: [tf.interpolate-colours[base-ink],[base-background],[0.2]]
-sidebar-controls-foreground: [tf.interpolate-colours[base-ink],[base-background],[0.8]]
-sidebar-foreground-shadow: inherit
-sidebar-foreground: =[tf.colour[base-ink]] =[tf.colour[base-paper]] =[tf.colour[base-background]] +[colour-best-contrast:DeltaPhi[]]
-sidebar-muted-foreground-hover: [tf.colour[sidebar-muted-foreground]colour-set-oklch:l[0.3]]
-sidebar-muted-foreground: [tf.interpolate-colours[foreground],[page-background],[0.6]]
-sidebar-tab-background-selected: [tf.colour[tab-background-selected]]
-sidebar-tab-background: [tf.colour[tab-background]]
-sidebar-tab-border-selected: [tf.colour[tab-border-selected]]
-sidebar-tab-border: [tf.colour[tab-border]]
-sidebar-tab-divider: [tf.colour[tab-divider]]
-sidebar-tab-foreground-selected: [tf.colour[tab-foreground-selected]]
-sidebar-tab-foreground: [tf.colour[tab-foreground]]
-sidebar-tiddler-link-foreground-hover: [tf.colour[sidebar-tiddler-link-foreground]colour-set-oklch:l[0.5]]
-sidebar-tiddler-link-foreground: =[tf.colour[base-primary]] =[tf.colour[base-secondary]] =[tf.colour[base-tertiary]] =[tf.colour[base-background]] +[colour-best-contrast:DeltaPhi[]]
-site-title-foreground: [tf.colour[tiddler-title-foreground]]
-stability-deprecated: #ff0000
-stability-experimental: #c07c00
-stability-legacy: #0000ff
-stability-stable: #008000
-static-alert-foreground: #aaaaaa
-tab-background-selected: [tf.colour[background]]
-tab-background: [tf.interpolate-colours[base-paper],[base-ink],[0.2]]
-tab-border-selected: [tf.colour[muted-foreground]]
-tab-border: [tf.colour[muted-foreground]]
-tab-divider: [tf.colour[muted-foreground]]
-tab-foreground-selected: [tf.colour[tab-foreground]]
-tab-foreground: [tf.colour[foreground]]
-table-border: [tf.colour[foreground]]
-table-footer-background: [tf.interpolate-colours[background],[foreground],[0.2]]
-table-header-background: [tf.interpolate-colours[background],[foreground],[0.1]]
-tag-background: [tf.interpolate-colours[base-paper],[base-yellow],[0.9]]
-tag-foreground: [tf.interpolate-colours[base-yellow],[base-ink],[0.8]]
-testcase-accent-level-1: #c1eaff
-testcase-accent-level-2: #E3B740
-testcase-accent-level-3: #5FD564
-tiddler-background: [tf.colour[background]]
-tiddler-border: [tf.interpolate-colours[base-paper],[base-background],[0.5]]
-tiddler-controls-foreground-hover: [tf.interpolate-colours[background],[foreground],[0.7]]
-tiddler-controls-foreground-selected: [tf.interpolate-colours[background],[foreground],[0.9]]
-tiddler-controls-foreground: [tf.interpolate-colours[background],[foreground],[0.5]]
-tiddler-editor-background: #f8f8f8
-tiddler-editor-border-image: #ffffff
-tiddler-editor-border: #cccccc
-tiddler-editor-fields-even: #e0e8e0
-tiddler-editor-fields-odd: #f0f4f0
-tiddler-info-background: #f8f8f8
-tiddler-info-border: #dddddd
-tiddler-info-tab-background: #f8f8f8
-tiddler-link-background: [tf.colour[background]]
-tiddler-link-foreground: [tf.colour[primary]]
-tiddler-subtitle-foreground: [tf.interpolate-colours[background],[foreground],[0.6]]
-tiddler-title-foreground: [tf.interpolate-colours[background],[foreground],[0.9]]
-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: 
-tour-chooser-button-foreground: <<colour very-muted-foreground>>
-tour-chooser-button-hover-background: <<colour muted-foreground>>
-tour-chooser-button-hover-foreground: : <<colour background>>
-tour-chooser-button-selected-background: <<colour primary>>
-tour-chooser-button-selected-foreground: <<colour background>>
-tour-chooser-dropdown-foreground: <<colour very-muted-foreground>>
-tour-chooser-item-background: <<colour background>>
-tour-chooser-item-border: <<colour muted-foreground>>
-tour-chooser-item-foreground: <<colour foreground>>
-tour-chooser-item-shadow: <<colour muted-foreground>>
-tour-chooser-item-start-background: <<colour download-background>>
-tour-chooser-item-start-foreground: <<colour background>>
-tour-chooser-item-start-hover-background: <<colour primary>>
-tour-chooser-item-start-hover-foreground: <<colour background>>
-tour-fullscreen-background: <<colour page-background>>
-tour-fullscreen-controls-foreground: <<colour muted-foreground>>
-tour-navigation-buttons-back-background: red
-tour-navigation-buttons-back-foreground: white
-tour-navigation-buttons-hint-background: purple
-tour-navigation-buttons-hint-foreground: white
-tour-navigation-buttons-hover-background: <<colour foreground>>
-tour-navigation-buttons-hover-foreground: <<colour background>>
-tour-navigation-buttons-next-background: purple
-tour-navigation-buttons-next-foreground: white
-tour-overlay-background: #cbfff8
-tour-overlay-border: #228877
-tour-step-heading-background: none
-tour-step-task-background: <<colour download-background>>
-tour-step-task-foreground: <<colour download-foreground>>
-untagged-background: #999999
-very-muted-foreground: #888888
-wikilist-background: #e5e5e5
-wikilist-button-background: #acacac
-wikilist-button-foreground: #000000
-wikilist-button-open-hover: green
-wikilist-button-open: #4fb82b
-wikilist-button-remove-hover: red
-wikilist-button-remove: #d85778
-wikilist-button-reveal-hover: blue
-wikilist-button-reveal: #5778d8
-wikilist-droplink-dragover: [tf.colour[base-secondary]colour-set-alpha[0.7]]
-wikilist-info: #000000
-wikilist-item: #ffffff
-wikilist-title-svg: [tf.colour[wikilist-title]]
-wikilist-title: #666666
-wikilist-toolbar-background: #d3d3d3
-wikilist-toolbar-foreground: #888888
-wikilist-url: #aaaaaa
@@ -1,12 +0,0 @@
-title: $:/palettes/TwentyTwenties/Dark
-name: TwentyTwenties Dark
-description: Modern and flexible, Darkish
-tags: $:/tags/Palette
-type: application/x-tiddler-dictionary
-color-scheme: dark
-palette-import: $:/palettes/TwentyTwenties
-category: 2026
-
-base-paper: #111122
-base-background: #f5f0f9
-base-ink: #8C8F80
@@ -1,12 +0,0 @@
-title: $:/palettes/TwentyTwenties/Green
-name: TwentyTwenties (Green)
-description: Modern and flexible, Greenish
-tags: $:/tags/Palette
-type: application/x-tiddler-dictionary
-color-scheme: light
-palette-import: $:/palettes/TwentyTwenties
-category: 2026
-
-base-paper: rgb(188, 255, 161)
-base-background: rgb(94, 192, 145)
-base-primary: #6e803c
@@ -1,13 +0,0 @@
-title: $:/palettes/TwentyTwenties/GreenP3
-name: TwentyTwenties (Green P3)
-description: Modern and flexible, Greenish and super bright
-tags: $:/tags/Palette
-type: application/x-tiddler-dictionary
-color-scheme: light
-palette-import: $:/palettes/TwentyTwenties
-category: 2026
-
-base-paper: color(display-p3 0.281 1 0.584 / 1)
-base-background: color(display-p3 1 1 0 / 1)
-base-primary: color(display-p3 1 0.563 1 / 1)
-
@@ -1,17 +0,0 @@
-title: $:/palettes/TwentyTwenties/Settings
-
-\procedure entry(name,description)
-<$text text=<<description>>/>: <$edit-text tiddler={{$:/palette}} index=<<name>> type="color" tag="input" default={{{ [function[colour],<name>] }}}/>
-\end entry
-
-<<entry name:"base-paper" description:"Paper">>
-
-<<entry name:"base-background" description:"Page background">>
-
-<<entry name:"base-ink" description:"Ink">>
-
-<<entry name:"base-primary" description:"Primary">>
-
-<<entry name:"base-secondary" description:"Secondary">>
-
-<<entry name:"base-tertiary" description:"Tertiary">>
@@ -5,7 +5,6 @@ type: application/x-tiddler-dictionary
 name: Twilight
 description: Delightful, soft darkness.
 color-scheme: dark
-category: Legacy

 alert-background: rgb(255, 255, 102)
 alert-border: rgb(232, 232, 125)
@@ -4,7 +4,6 @@ description: Pale and unobtrusive
 tags: $:/tags/Palette
 type: application/x-tiddler-dictionary
 color-scheme: light
-category: Legacy

 alert-background: #ffe476
 alert-border: #b99e2f
@@ -1,12 +0,0 @@
-title: $:/palettes/VanillaCherry
-name: Vanilla Cherry
-category: 2026
-description: Pale and unobtrusive with a cherry on top
-tags: $:/tags/Palette
-type: application/x-tiddler-dictionary
-color-scheme: light
-palette-import: $:/palettes/Vanilla
-
-primary:rgb(224, 32, 86);
-menubar-foreground: #fff
-menubar-background: <<colour primary>>
@@ -1,7 +0,0 @@
-title: $:/palettes/background/contrast-tests
-type: application/x-tiddler-dictionary
-tags: $:/tags/BackgroundPalette
-
-?background-foreground-contrast: [tf.check-colour-contrast[background],[foreground],[45]]
-?alert-contrast: [tf.check-colour-contrast[alert-background],[foreground],[45]]
-?code-contrast: [tf.check-colour-contrast[code-background],[code-foreground],[45]]
@@ -6,5 +6,5 @@ caption: {{$:/language/ControlPanel/Appearance/Caption}}
 {{$:/language/ControlPanel/Appearance/Hint}}

 <div class="tc-control-panel">
-<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Appearance]!has[draft.of]]" default="$:/core/ui/ControlPanel/Palette" explicitState="$:/state/tab--1963855381"/>
+<$macrocall $name="tabs" tabsList="[all[shadows+tiddlers]tag[$:/tags/ControlPanel/Appearance]!has[draft.of]]" default="$:/core/ui/ControlPanel/Theme" explicitState="$:/state/tab--1963855381"/>
 </div>
@@ -2,4 +2,20 @@ title: $:/core/ui/ControlPanel/Palette
 tags: $:/tags/ControlPanel/Appearance
 caption: {{$:/language/ControlPanel/Palette/Caption}}

-{{$:/PaletteManager}}
+\define lingo-base() $:/language/ControlPanel/Palette/
+
+{{$:/snippets/paletteswitcher}}
+
+<$reveal type="nomatch" state="$:/state/ShowPaletteEditor" text="yes">
+
+<$button set="$:/state/ShowPaletteEditor" setTo="yes"><<lingo ShowEditor/Caption>></$button>
+
+</$reveal>
+
+<$reveal type="match" state="$:/state/ShowPaletteEditor" text="yes">
+
+<$button set="$:/state/ShowPaletteEditor" setTo="no"><<lingo HideEditor/Caption>></$button>
+{{$:/PaletteManager}}
+
+</$reveal>
+
@@ -1,7 +1,5 @@
 title: $:/core/ui/EditTemplate/body/toolbar/button

-\whitespace trim
-
 \define toolbar-button-icon()
 <$list

@@ -17,13 +17,11 @@ tags: $:/tags/EditTemplate
 	<$let backgroundColor=<<colour>> >
 		<span class="tc-tag-label tc-tag-list-item tc-small-gap-right"
 			data-tag-title=<<currentTiddler>>
-			style=`color:$(foregroundColor)$; fill:$(foregroundColor)$; background-color:$(backgroundColor)$;`
+			style=`color:$(foregroundColor)$; background-color:$(backgroundColor)$; --tp-remove-tag-button-color:$(foregroundColor)$`
 		>
 			<$transclude tiddler=<<icon>>/>
 			<$view field="title" format="text"/>
-			<$button class="tc-btn-invisible tc-remove-tag-button"
-				style.fill=<<foregroundColor>>
-			>
+			<$button class="tc-btn-invisible tc-remove-tag-button">
 				<$action-listops $tiddler=<<saveTiddler>> $field=<<tagField>> $subfilter="-[{!!title}]"/>
 				{{$:/core/images/close-button}}
 			</$button>
@@ -48,6 +46,7 @@ tags: $:/tags/EditTemplate
 	<$list filter="[<currentTiddler>get<tagField>enlist-input[]sort[title]]" storyview="pop">
 		<$macrocall $name="tag-body"
 			colour={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}}
+			palette={{$:/palette}}
 			icon={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] }}}
 			tagField=<<tagField>>
 		/>
@@ -0,0 +1,5 @@
+title: $:/Manager/ItemMain/Editor
+tags: $:/tags/Manager/ItemMain
+caption: {{$:/language/Manager/Item/Editor}}
+
+<$edit-text tag="textarea" class="tc-edit-texteditor tc-edit-texteditor-body tc-max-width"/>
@@ -13,3 +13,8 @@ caption: {{$:/language/Manager/Item/Tools}}
 {{$:/core/images/edit-button}}&#32;edit
 </$button>
 </p>
+<p>
+<$button message="tm-delete-tiddler" param=<<currentTiddler>>>
+{{$:/core/images/delete-button}}&#32;delete
+</$button>
+</p>
@@ -1,94 +0,0 @@
-title: $:/PaletteEditor
-
-\define lingo-base() $:/language/ControlPanel/Palette/Editor/
-\define describePaletteColour(colour)
-<$transclude tiddler="$:/language/Docs/PaletteColours/$colour$"><$text text="$colour$"/></$transclude>
-\end
-\define edit-colour-placeholder()
- edit $(colourName)$
-\end
-\define colour-tooltip(showhide) $showhide$ editor for $(newColourName)$ 
-
-\define resolve-colour(macrocall)
-\import $:/core/macros/utils
-\whitespace trim
-<$wikify name="name" text="""$macrocall$""">
-<<name>>
-</$wikify>
-\end
-
-\define delete-colour-index-actions() <$action-setfield $index=<<colourName>>/>
-\define palette-manager-colour-row-segment()
-\whitespace trim
-<$edit-text index=<<colourName>> tag="input" placeholder=<<edit-colour-placeholder>> default=""/>
-<br>
-<$edit-text index=<<colourName>> type="color" tag="input" class="tc-palette-manager-colour-input"/>
-<$list filter="[<currentTiddler>getindex<colourName>removeprefix[<<]removesuffix[>>]] [<currentTiddler>getindex<colourName>removeprefix[<$]removesuffix[/>]]" variable="ignore">
-<$set name="state" value={{{ [[$:/state/palettemanager/]addsuffix<currentTiddler>addsuffix[/]addsuffix<colourName>] }}}>
-<$wikify name="newColourName" text="""<$macrocall $name="resolve-colour" macrocall={{{ [<currentTiddler>getindex<colourName>] }}}/>""">
-<$reveal state=<<state>> type="nomatch" text="show">
-<$button tooltip=<<colour-tooltip show>> aria-label=<<colour-tooltip show>> class="tc-btn-invisible" set=<<state>> setTo="show">{{$:/core/images/down-arrow}}<$text text=<<newColourName>> class="tc-small-gap-left"/></$button><br>
-</$reveal>
-<$reveal state=<<state>> type="match" text="show">
-<$button tooltip=<<colour-tooltip hide>> aria-label=<<colour-tooltip show>> class="tc-btn-invisible" actions="""<$action-deletetiddler $tiddler=<<state>>/>""">{{$:/core/images/up-arrow}}<$text text=<<newColourName>> class="tc-small-gap-left"/></$button><br>
-</$reveal>
-<$reveal state=<<state>> type="match" text="show">
-<$set name="colourName" value=<<newColourName>>>
-<br>
-<<palette-manager-colour-row-segment>>
-<br><br>
-</$set>
-</$reveal>
-</$wikify>
-</$set>
-</$list>
-\end
-
-\define palette-manager-colour-row()
-\whitespace trim
-<tr>
-<td>
-<span style="float:right;">
-<$button tooltip={{$:/language/ControlPanel/Palette/Editor/Delete/Hint}} aria-label={{$:/language/ControlPanel/Palette/Editor/Delete/Hint}} class="tc-btn-invisible" actions=<<delete-colour-index-actions>>>
-{{$:/core/images/delete-button}}</$button>
-</span>
-''<$macrocall $name="describePaletteColour" colour=<<colourName>>/>''<br/>
-<$macrocall $name="colourName" $output="text/plain"/>
-</td>
-<td>
-<<palette-manager-colour-row-segment>>
-</td>
-</tr>
-\end
-
-\define palette-manager-table()
-\whitespace trim
-<table>
-<tbody>
-<$set name="colorList" filter="[{$:/state/palettemanager/showexternal}match[yes]]"
-   value="[all[shadows+tiddlers]tag[$:/tags/Palette]indexes[]]" emptyValue="[<currentTiddler>indexes[]]">
-<$list filter=<<colorList>> variable="colourName"> <<palette-manager-colour-row>> </$list>
-</$set>
-</tbody>
-</table>
-\end
-\whitespace trim
-<$set name="currentTiddler" value={{$:/palette}}>
-
-<<lingo Prompt>>&#32;<$link to={{$:/palette}}><$macrocall $name="currentTiddler" $output="text/plain"/></$link>
-
-<$list filter="[all[current]is[shadow]is[tiddler]]" variable="listItem">
-<<lingo Prompt/Modified>>
-&#32;
-<$button message="tm-delete-tiddler" param={{$:/palette}}><<lingo Reset/Caption>></$button>
-</$list>
-
-<$list filter="[all[current]is[shadow]!is[tiddler]]" variable="listItem">
-<<lingo Clone/Prompt>>
-</$list>
-
-<$button message="tm-new-tiddler" param={{$:/palette}}><<lingo Clone/Caption>></$button>
-
-<$checkbox tiddler="$:/state/palettemanager/showexternal" field="text" checked="yes" unchecked="no"><span class="tc-small-gap-left"><<lingo Names/External/Show>></span></$checkbox>
-
-<<palette-manager-table>>
@@ -1,43 +1,94 @@
 title: $:/PaletteManager

-\define lingo-base() $:/language/ControlPanel/Palette/
+\define lingo-base() $:/language/ControlPanel/Palette/Editor/
+\define describePaletteColour(colour)
+<$transclude tiddler="$:/language/Docs/PaletteColours/$colour$"><$text text="$colour$"/></$transclude>
+\end
+\define edit-colour-placeholder()
+ edit $(colourName)$
+\end
+\define colour-tooltip(showhide) $showhide$ editor for $(newColourName)$ 

-<!-- Used by the language string CustomSettings/Prompt -->
-\procedure palette-link()
-<$tiddler tiddler={{$:/palette}}>
-	<$link to={{!!title}}>
-		<$view field="name" format="text">
-			<$view field="title" format="text"/>
-		</$view>
-	</$link>
-</$tiddler>
-\end palette-link
-
-<$transclude $tiddler="$:/snippets/paletteswitcher" thumbnails="yes"/>
-
-{{$:/snippets/palettetests}}
-
-<$let
-	paletteSettings={{{ [[$:/temp/palette-consolidated]get[settings]] }}}
->
-	<%if [<paletteSettings>!match[]] %>
-		<div>
-			<<lingo CustomSettings/Prompt>>
-			<$transclude $tiddler=<<paletteSettings>> $mode="block"/>
-		</div>
-	<%endif%>
-</$let>
-
-<$reveal type="nomatch" state="$:/state/ShowPaletteEditor" text="yes">
-
-<$button set="$:/state/ShowPaletteEditor" setTo="yes"><<lingo ShowEditor/Caption>></$button>
+\define resolve-colour(macrocall)
+\import $:/core/macros/utils
+\whitespace trim
+<$wikify name="name" text="""$macrocall$""">
+<<name>>
+</$wikify>
+\end

+\define delete-colour-index-actions() <$action-setfield $index=<<colourName>>/>
+\define palette-manager-colour-row-segment()
+\whitespace trim
+<$edit-text index=<<colourName>> tag="input" placeholder=<<edit-colour-placeholder>> default=""/>
+<br>
+<$edit-text index=<<colourName>> type="color" tag="input" class="tc-palette-manager-colour-input"/>
+<$list filter="[<currentTiddler>getindex<colourName>removeprefix[<<]removesuffix[>>]] [<currentTiddler>getindex<colourName>removeprefix[<$]removesuffix[/>]]" variable="ignore">
+<$set name="state" value={{{ [[$:/state/palettemanager/]addsuffix<currentTiddler>addsuffix[/]addsuffix<colourName>] }}}>
+<$wikify name="newColourName" text="""<$macrocall $name="resolve-colour" macrocall={{{ [<currentTiddler>getindex<colourName>] }}}/>""">
+<$reveal state=<<state>> type="nomatch" text="show">
+<$button tooltip=<<colour-tooltip show>> aria-label=<<colour-tooltip show>> class="tc-btn-invisible" set=<<state>> setTo="show">{{$:/core/images/down-arrow}}<$text text=<<newColourName>> class="tc-small-gap-left"/></$button><br>
 </$reveal>
-
-<$reveal type="match" state="$:/state/ShowPaletteEditor" text="yes">
-
-<$button set="$:/state/ShowPaletteEditor" setTo="no"><<lingo HideEditor/Caption>></$button>
-{{$:/PaletteEditor}}
-
+<$reveal state=<<state>> type="match" text="show">
+<$button tooltip=<<colour-tooltip hide>> aria-label=<<colour-tooltip show>> class="tc-btn-invisible" actions="""<$action-deletetiddler $tiddler=<<state>>/>""">{{$:/core/images/up-arrow}}<$text text=<<newColourName>> class="tc-small-gap-left"/></$button><br>
 </$reveal>
+<$reveal state=<<state>> type="match" text="show">
+<$set name="colourName" value=<<newColourName>>>
+<br>
+<<palette-manager-colour-row-segment>>
+<br><br>
+</$set>
+</$reveal>
+</$wikify>
+</$set>
+</$list>
+\end

+\define palette-manager-colour-row()
+\whitespace trim
+<tr>
+<td>
+<span style="float:right;">
+<$button tooltip={{$:/language/ControlPanel/Palette/Editor/Delete/Hint}} aria-label={{$:/language/ControlPanel/Palette/Editor/Delete/Hint}} class="tc-btn-invisible" actions=<<delete-colour-index-actions>>>
+{{$:/core/images/delete-button}}</$button>
+</span>
+''<$macrocall $name="describePaletteColour" colour=<<colourName>>/>''<br/>
+<$macrocall $name="colourName" $output="text/plain"/>
+</td>
+<td>
+<<palette-manager-colour-row-segment>>
+</td>
+</tr>
+\end
+
+\define palette-manager-table()
+\whitespace trim
+<table>
+<tbody>
+<$set name="colorList" filter="[{$:/state/palettemanager/showexternal}match[yes]]"
+   value="[all[shadows+tiddlers]tag[$:/tags/Palette]indexes[]]" emptyValue="[<currentTiddler>indexes[]]">
+<$list filter=<<colorList>> variable="colourName"> <<palette-manager-colour-row>> </$list>
+</$set>
+</tbody>
+</table>
+\end
+\whitespace trim
+<$set name="currentTiddler" value={{$:/palette}}>
+
+<<lingo Prompt>>&#32;<$link to={{$:/palette}}><$macrocall $name="currentTiddler" $output="text/plain"/></$link>
+
+<$list filter="[all[current]is[shadow]is[tiddler]]" variable="listItem">
+<<lingo Prompt/Modified>>
+&#32;
+<$button message="tm-delete-tiddler" param={{$:/palette}}><<lingo Reset/Caption>></$button>
+</$list>
+
+<$list filter="[all[current]is[shadow]!is[tiddler]]" variable="listItem">
+<<lingo Clone/Prompt>>
+</$list>
+
+<$button message="tm-new-tiddler" param={{$:/palette}}><<lingo Clone/Caption>></$button>
+
+<$checkbox tiddler="$:/state/palettemanager/showexternal" field="text" checked="yes" unchecked="no"><span class="tc-small-gap-left"><<lingo Names/External/Show>></span></$checkbox>
+
+<<palette-manager-table>>
@@ -1,19 +0,0 @@
-title: $:/core/ui/Palettes/Preview/Alert
-tags: $:/tags/Preview/Page
-
-\whitespace trim
-<div class="tc-palette-preview-thumbnail-alert" style.background-color=<<colour alert-background>>>
-	<div class="tc-palette-preview-thumbnail-alert-border" style.border-color=<<colour alert-border>>>
-		<div style.color=<<colour foreground>>>
-			<div class="tc-palette-preview-thumbnail-alert-subtitle" style.color=<<colour alert-muted-foreground>>>
-				Lorem Ipsum
-				<div class="tc-palette-preview-thumbnail-alert-highlight" style.color=<<colour alert-highlight>>>
-					(Count: 1)
-				</div>
-			</div>
-			<div class="tc-palette-preview-thumbnail-alert-body">
-				Lorem Ipsum Dolor Sit Amet Consectetur Adipiscing Elit Sed Do Eiusmod Tempor Incididunt.
-			</div>
-		</div>
-	</div>
-</div>
@@ -1,55 +0,0 @@
-title: $:/core/ui/Palettes/Preview/Helpers
-tags: $:/tags/Preview/Helpers
-
-\whitespace trim
-
-\procedure palette-preview-component-list(tag)
-<$list filter="[all[shadows+tiddlers]tag<tag>!has[draft.of]]" variable="componentTitle">
-	<$transclude $tiddler=<<componentTitle>> title=<<title>>/>
-</$list>
-\end palette-preview-component-list
-
-\procedure tab-set(tabTitles,colourPrefix:"")
-	<div class="tc-palette-preview-thumbnail-tab-set">
-		<div class="tc-palette-preview-thumbnail-tab-buttons">
-			<$list filter="[enlist<tabTitles>]" variable="tabTitle" counter="tabIndex">
-				<%if [<tabIndex>match[1]] %>
-					<span
-						class="tc-palette-preview-thumbnail-tab-button"
-						style.border-color={{{ [<colourPrefix>addsuffix[tab-border-selected]] :map[function[colour],<currentTiddler>] }}}
-						style.color={{{ [<colourPrefix>addsuffix[tab-foreground-selected]] :map[function[colour],<currentTiddler>] }}}
-						style.background-color={{{ [<colourPrefix>addsuffix[tab-background-selected]] :map[function[colour],<currentTiddler>] }}}
-					>
-						<$text text=<<tabTitle>>/>
-					</span>
-				<%else%>
-					<span
-						class="tc-palette-preview-thumbnail-tab-button"
-						style.border-color={{{ [<colourPrefix>addsuffix[tab-border]] :map[function[colour],<currentTiddler>] }}}
-						style.color={{{ [<colourPrefix>addsuffix[tab-foreground]] :map[function[colour],<currentTiddler>] }}}
-						style.background-color={{{ [<colourPrefix>addsuffix[tab-background]] :map[function[colour],<currentTiddler>] }}}
-					>
-						<$text text=<<tabTitle>>/>
-					</span>
-				<%endif%>
-			</$list>
-		</div>
-		<div
-			class="tc-palette-preview-thumbnail-tab-divider"
-			style.border-color={{{ [<colourPrefix>addsuffix[tab-divider]] :map[function[colour],<currentTiddler>] }}}
-		>
-		</div>
-	</div>
-\end tab-set
-
-\procedure link(text)
-<span class="tc-palette-preview-thumbnail-tiddler-link" style.color=<<colour primary>>>
-	<$text text=<<text>>/>
-</span>
-\end link
-
-\procedure sidebar-link(text)
-<span class="tc-palette-preview-thumbnail-tiddler-link" style.color=<<colour sidebar-tiddler-link-foreground>>>
-	<$text text=<<text>>/>
-</span>
-\end sidebar-link
@@ -1,11 +0,0 @@
-title: $:/core/ui/Palettes/Preview/Notification
-tags: $:/tags/Preview/PageOptional
-
-\whitespace trim
-<div class="tc-palette-preview-thumbnail-notification" style.background-color=<<colour notification-background>>>
-	<div class="tc-palette-preview-thumbnail-notification-border" style.border-color=<<colour notification-border>>>
-		<div class="tc-palette-preview-thumbnail-notification-body" style.color=<<colour foreground>>>
-			Lorem Ipsum Dolor Sit Amet Consectetur
-		</div>
-	</div>
-</div>
@@ -1,8 +0,0 @@
-title: $:/core/ui/Palettes/Preview/Sidebar/Search
-tags: $:/tags/Preview/SideBar
-
-\whitespace trim
-<div class="tc-palette-preview-thumbnail-sidebar-search" style.background-color=<<colour background>>>
-	<div class="tc-palette-preview-thumbnail-sidebar-search-box">
-	</div>
-</div>
@@ -1,7 +0,0 @@
-title: $:/core/ui/Palettes/Preview/Sidebar/Subtitle
-tags: $:/tags/Preview/SideBar
-
-\whitespace trim
-<div class="tc-palette-preview-thumbnail-sidebar-subtitle">
-	a non-linear personal web notebook
-</div>
@@ -1,18 +0,0 @@
-title: $:/core/ui/Palettes/Preview/Sidebar/Tabs
-tags: $:/tags/Preview/SideBar
-
-\whitespace trim
-
-\procedure recent-links()
-HelloThere Community Portal GettingStarted Development Download Filters Palettes Plugins Macros Templates Themes Stylesheets SystemTiddlers
-\end recent-links
-
-<<tab-set "Magna Placerat Ligula Imperdiet" "sidebar-">>
-
-<div class="tc-palette-preview-thumbnail-sidebar-list">
-	<$list filter="[enlist<recent-links>]">
-		<div>
-			<$transclude $variable="sidebar-link" text=<<currentTiddler>>/>
-		</div>
-	</$list>
-</div>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jeremy Ruston	c39e7b44e4	Merge branch 'master' into super-safe-mode	2026-02-25 11:18:59 +00:00
jeremy@jermolene.com	c3ca72ebe2	Add new safe mode layout	2023-03-12 16:05:45 +00:00
jeremy@jermolene.com	1ed3217239	Add delete button to tiddler manager	2023-03-12 16:02:49 +00:00
jeremy@jermolene.com	e59f97b9c5	Add editor panel to tiddler manager	2023-03-12 16:02:30 +00:00