feat: added tests

docs: added changenote
refactor: prefix operator
2026-07-27 05:58:53 +00:00 · 2026-07-26 15:38:11 +02:00 · 2026-07-26 14:57:26 +02:00 · 2026-07-24 18:50:54 +02:00 · 2026-07-24 18:36:46 +02:00 · 2026-07-24 18:29:18 +02:00
245 changed files with 675 additions and 5417 deletions
@@ -217,11 +217,6 @@ exports.generateTiddlerFileInfo = function(tiddler,options) {
 		fileInfo.isEditableFile = true;
 		fileInfo.originalpath = options.fileInfo.originalpath;
 	}
-	// Propagate the pinFilepath flag (so generateTiddlerFilepath can short-circuit
-	// FileSystemPaths and write back to the original location)
-	if(options.fileInfo && !!options.fileInfo.pinFilepath) {
-		fileInfo.pinFilepath = true;
-	}
 	// Check if the tiddler has any unsafe fields that can't be expressed in a .tid or .meta file: containing control characters, or leading/trailing whitespace
 	var hasUnsafeFields = false;
 	$tw.utils.each(tiddler.getFieldStrings(),function(value,fieldName) {
@@ -324,16 +319,9 @@ exports.generateTiddlerFilepath = function(title,options) {
 		extension = options.extension || "",
 		originalpath = (options.fileInfo && options.fileInfo.originalpath) ? options.fileInfo.originalpath : "",
 		overwrite = options.fileInfo && options.fileInfo.overwrite || false,
-		pinFilepath = !!(options.fileInfo && options.fileInfo.pinFilepath),
 		filepath;
-	// If the tiddler's filepath is pinned via tiddlywiki.files, the originalpath
-	// wins and the path filters are skipped entirely.
-	if(pinFilepath && originalpath) {
-		var pinnedExt = path.extname(originalpath);
-		filepath = originalpath.substring(0,originalpath.length - pinnedExt.length);
-	}
 	// Check if any of the pathFilters applies
-	if(!filepath && options.pathFilters && options.wiki) {
+	if(options.pathFilters && options.wiki) {
 		$tw.utils.each(options.pathFilters,function(filter) {
 			if(!filepath) {
 				var source = options.wiki.makeTiddlerIterator([title]),
@@ -364,10 +352,8 @@ exports.generateTiddlerFilepath = function(title,options) {
 	}
 	// Replace any Unicode control codes
 	filepath = filepath.replace(/[\x00-\x1f\x80-\x9f]/g,"_");
-	// Replace any characters that can't be used in cross-platform filenames.
-	if(!pinFilepath) {
-		filepath = $tw.utils.transliterate(filepath.replace(/<|>|~|\:|\"|\||\?|\*|\^|\\/g,"_"));
-	}
+	// Replace any characters that can't be used in cross-platform filenames
+	filepath = $tw.utils.transliterate(filepath.replace(/<|>|~|\:|\"|\||\?|\*|\^/g,"_"));
 	// Replace any dots or spaces at the end of the extension with the same number of underscores
 	extension = extension.replace(/[\. ]+$/, function (u) { return u.replace(/[\. ]/g, "_");});
 	// Truncate the extension if it is too long
@@ -58,14 +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/Customisations/Prompt: Customisations for the current palette: <<palette-link>>
-Palette/Customisations/Reset/Caption: reset customisations
-Palette/Editor/Customised/Prompt: This palette has customisations that override the entries marked below
-Palette/Editor/Customised/Entry: overridden by a customisation
 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,8 +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/FilterPragmaPosition: Filter Error: Filter pragmas are only allowed at the start of a filter
 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
@@ -78,6 +78,7 @@ class BackgroundActionTracker {
 			fnProcess: (changes) => {
 				if(this.hasChanged) {
 					this.hasChanged = false;
+					console.log("Processing background action", this.title);
 					const tiddler = this.wiki.getTiddler(this.title);
 					let doActions = true;
 					if(tiddler && tiddler.fields.platforms) {
@@ -88,7 +89,6 @@ class BackgroundActionTracker {
 						}
 					}
 					if(doActions) {
-						console.log("Processing background action", this.title);
 						this.wiki.invokeActionString(
 							this.actions,
 							null,
@@ -31,7 +31,8 @@ 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 colorScheme = (this.widget.wiki.getTiddler("$:/temp/palette-colours") || {fields: {}}).fields["color-scheme"] || "light";
+	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>");
 	this.iframeDoc.close();
@@ -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
@@ -217,11 +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]) {
-			this.editDefault = this.getAttribute("default");
+		} 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,26 +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",
-		seenNonPragmaOperation = false;
-	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 {
@@ -335,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);
@@ -357,60 +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) {
-				// Pragmas are only allowed at the start of a filter, before any runs
-				if(seenNonPragmaOperation) {
-					return function(results,source,widget) {
-						results.clear();
-						results.push($tw.language.getString("Error/FilterPragmaPosition"));
-					};
-				}
-				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 {
-				seenNonPragmaOperation = true;
-				var options = {wiki: self, suffixes: operation.suffixes || []};
-				switch(operation.prefix || "") {
-					case "": // Use the default filter run prefix if none is specified
-						if(filterRunPrefixes[defaultFilterRunPrefix]) {
-							return filterRunPrefixes[defaultFilterRunPrefix](operationSubFunction, options);
-						} else {
-							return function(results,source,widget) {
-								results.clear();
-								results.push($tw.language.getString("Error/FilterRunPrefix"));
-							};
-						}
-					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"));
-							};
-						}
-				}
+					}
 			}
 		})());
 	});
@@ -449,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,158 +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];
-		// Hue is null for achromatic colours
-		if(colour === null || colour === undefined || Number.isNaN(colour)) {
-			return "";
-		}
-	}
-	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-composite"] = makeSerialColourOperator(function (colour, operator, options) {
-	// Composite each translucent input colour over the backdrop given in the operand
-	var backdrop = $tw.utils.parseCSSColorObject(operator.operand);
-	if(backdrop && colour.alpha < 1) {
-		var alpha = colour.alpha;
-		colour.alpha = 1;
-		colour = backdrop.mix(colour,alpha,{space: "srgb"});
-	}
-	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];
-	if(!targetColour) {
-		return [];
-	}
-	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] && suffixes[0][0]) || options.defaultFilterRunPrefix || "or",
-		filterFn = options.wiki.compileFilter(operator.operand,{defaultFilterRunPrefix}),
+	var filterFn = options.wiki.compileFilter(operator.operand),
 		results = [],
 		target = operator.prefix !== "!";
 	source(function(tiddler,title) {
@@ -9,69 +9,56 @@ Filter operators for manipulating the current selection list

 "use strict";

+/*
+	Fetch titles from the current list
+*/
+const prepare_results = (source) => {
+	const results = [];
+	source((tiddler,title) => results.push(title));
+	return results;
+};
+
 /*
 Order a list
 */
 exports.order = function(source,operator,options) {
-	var results = [];
-	if(operator.operand.toLowerCase() === "reverse") {
-		source(function(tiddler,title) {
-			results.unshift(title);
-		});
-	} else {
-		source(function(tiddler,title) {
-			results.push(title);
-		});
-	}
-	return results;
+	const results = prepare_results(source);
+	return operator.operand.toLowerCase() === "reverse" ?
+		results.reverse() :
+		results;
 };

 /*
 Reverse list
 */
 exports.reverse = function(source,operator,options) {
-	var results = [];
-	source(function(tiddler,title) {
-		results.unshift(title);
-	});
-	return results;
+	return prepare_results(source).reverse();
 };

 /*
 First entry/entries in list
 */
 exports.first = function(source,operator,options) {
-	var count = $tw.utils.getInt(operator.operand,1),
-		results = [];
-	source(function(tiddler,title) {
-		results.push(title);
-	});
-	return results.slice(0,count);
+	const count = $tw.utils.getInt(operator.operand,1);
+	return prepare_results(source).slice(0,count);
 };

 /*
 Last entry/entries in list
 */
 exports.last = function(source,operator,options) {
-	var count = $tw.utils.getInt(operator.operand,1),
-		results = [];
-	if(count === 0) return results;
-	source(function(tiddler,title) {
-		results.push(title);
-	});
-	return results.slice(-count);
+	const count = $tw.utils.getInt(operator.operand,1);
+	return count === 0 ?
+		[] :
+		prepare_results(source).slice(-count);
 };

 /*
 All but the first entry/entries of the list
 */
 exports.rest = function(source,operator,options) {
-	var count = $tw.utils.getInt(operator.operand,1),
-		results = [];
-	source(function(tiddler,title) {
-		results.push(title);
-	});
-	return results.slice(count);
+	const count = $tw.utils.getInt(operator.operand,1);
+	return prepare_results(source).slice(count);
 };
 exports.butfirst = exports.rest;
 exports.bf = exports.rest;
@@ -80,12 +67,9 @@ exports.bf = exports.rest;
 All but the last entry/entries of the list
 */
 exports.butlast = function(source,operator,options) {
-	var count = $tw.utils.getInt(operator.operand,1),
-		results = [];
-	source(function(tiddler,title) {
-		results.push(title);
-	});
-	var index = count === 0 ? results.length : -count;
+	const count = $tw.utils.getInt(operator.operand,1),
+		results = prepare_results(source),
+		index = count === 0 ? results.length : -count;
 	return results.slice(0,index);
 };
 exports.bl = exports.butlast;
@@ -94,22 +78,14 @@ exports.bl = exports.butlast;
 The nth member of the list
 */
 exports.nth = function(source,operator,options) {
-	var count = $tw.utils.getInt(operator.operand,1),
-		results = [];
-	source(function(tiddler,title) {
-		results.push(title);
-	});
-	return results.slice(count - 1,count);
+	const count = $tw.utils.getInt(operator.operand,1);
+	return prepare_results(source).slice(count - 1,count);
 };

 /*
 The zero based nth member of the list
 */
 exports.zth = function(source,operator,options) {
-	var count = $tw.utils.getInt(operator.operand,0),
-		results = [];
-	source(function(tiddler,title) {
-		results.push(title);
-	});
-	return results.slice(count,count + 1);
-};
+	const count = $tw.utils.getInt(operator.operand,0);
+	return prepare_results(source).slice(count,count + 1);
+};
@@ -13,37 +13,23 @@ Filter operator for checking if a title starts with a prefix
 Export our filter function
 */
 exports.prefix = function(source,operator,options) {
-	var results = [],
-		suffixes = (operator.suffixes || [])[0] || [];
-	if(suffixes.indexOf("caseinsensitive") !== -1) {
-		var operand = operator.operand.toLowerCase();
-		if(operator.prefix === "!") {
-			source(function(tiddler,title) {
-				if(title.toLowerCase().substr(0,operand.length) !== operand) {
-					results.push(title);
-				}
-			});
-		} else {
-			source(function(tiddler,title) {
-				if(title.toLowerCase().substr(0,operand.length) === operand) {
-					results.push(title);
-				}
-			});
+	const results = [],
+		suffixes = (operator.suffixes || [])[0] || [],
+		caseInsensitive = suffixes.indexOf("caseinsensitive") !== -1,
+		negate = operator.prefix === "!";
+
+	const operand = caseInsensitive ?
+		operator.operand.toLowerCase() :
+		operator.operand;
+
+	source((tiddler,title) => {
+		const value = caseInsensitive ? title.toLowerCase() : title;
+		const matches = value.startsWith(operand);
+
+		if(negate ? !matches : matches) {
+			results.push(title);
 		}
-	} else {
-		if(operator.prefix === "!") {
-			source(function(tiddler,title) {
-				if(title.substr(0,operator.operand.length) !== operator.operand) {
-					results.push(title);
-				}
-			});
-		} else {
-			source(function(tiddler,title) {
-				if(title.substr(0,operator.operand.length) === operator.operand) {
-					results.push(title);
-				}
-			});
-		}
-	}
+	});
+
 	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] && suffixes[0][0]) || options.defaultFilterRunPrefix || "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) {
@@ -11,20 +11,18 @@ Extended filter operators to manipulate the current list.

 /*
 	Fetch titles from the current list
-	*/
-var prepare_results = function (source) {
-	var results = [];
-	source(function (tiddler, title) {
-		results.push(title);
-	});
+*/
+const prepare_results = (source) => {
+	const results = [];
+	source((tiddler,title) => results.push(title));
 	return results;
 };

 /*
 	Moves a number of items from the tail of the current list before the item named in the operand
-	*/
-exports.putbefore = function (source, operator) {
-	var results = prepare_results(source),
+*/
+exports.putbefore = function(source,operator) {
+	const results = prepare_results(source),
 		index = results.indexOf(operator.operand),
 		count = $tw.utils.getInt(operator.suffix,1);
 	return (index === -1) ?
@@ -34,9 +32,9 @@ exports.putbefore = function (source, operator) {

 /*
 	Moves a number of items from the tail of the current list after the item named in the operand
-	*/
-exports.putafter = function (source, operator) {
-	var results = prepare_results(source),
+*/
+exports.putafter = function(source,operator) {
+	const results = prepare_results(source),
 		index = results.indexOf(operator.operand),
 		count = $tw.utils.getInt(operator.suffix,1);
 	return (index === -1) ?
@@ -46,9 +44,9 @@ exports.putafter = function (source, operator) {

 /*
 	Replaces the item named in the operand with a number of items from the tail of the current list
-	*/
-exports.replace = function (source, operator) {
-	var results = prepare_results(source),
+*/
+exports.replace = function(source,operator) {
+	const results = prepare_results(source),
 		index = results.indexOf(operator.operand),
 		count = $tw.utils.getInt(operator.suffix,1);
 	return (index === -1) ?
@@ -58,39 +56,39 @@ exports.replace = function (source, operator) {

 /*
 	Moves a number of items from the tail of the current list to the head of the list
-	*/
-exports.putfirst = function (source, operator) {
-	var results = prepare_results(source),
+*/
+exports.putfirst = function(source,operator) {
+	const results = prepare_results(source),
 		count = $tw.utils.getInt(operator.suffix,1);
-	return results.slice(-count).concat(results.slice(0, -count));
+	return [...results.slice(-count), ...results.slice(0, -count)];
 };

 /*
 	Moves a number of items from the head of the current list to the tail of the list
-	*/
-exports.putlast = function (source, operator) {
-	var results = prepare_results(source),
+*/
+exports.putlast = function(source,operator) {
+	const results = prepare_results(source),
 		count = $tw.utils.getInt(operator.suffix,1);
-	return results.slice(count).concat(results.slice(0, count));
+	return [...results.slice(count), ...results.slice(0, count)];
 };

 /*
 	Moves the item named in the operand a number of places forward or backward in the list
-	*/
-exports.move = function (source, operator) {
-	var results = prepare_results(source),
+*/
+exports.move = function(source,operator) {
+	const results = prepare_results(source),
 		index = results.indexOf(operator.operand),
 		count = $tw.utils.getInt(operator.suffix,1),
 		marker = results.splice(index, 1),
-		offset =  (index + count) > 0 ? index + count : 0;
+		offset = (index + count) > 0 ? index + count : 0;
 	return results.slice(0, offset).concat(marker).concat(results.slice(offset));
 };

 /*
 	Returns the items from the current list that are after the item named in the operand
-	*/
-exports.allafter = function (source, operator) {
-	var results = prepare_results(source),
+*/
+exports.allafter = function(source,operator) {
+	const results = prepare_results(source),
 		index = results.indexOf(operator.operand);
 	return (index === -1) ? [] :
 		(operator.suffix) ? results.slice(index) :
@@ -99,9 +97,9 @@ exports.allafter = function (source, operator) {

 /*
 	Returns the items from the current list that are before the item named in the operand
-	*/
-exports.allbefore = function (source, operator) {
-	var results = prepare_results(source),
+*/
+exports.allbefore = function(source,operator) {
+	const results = prepare_results(source),
 		index = results.indexOf(operator.operand);
 	return (index === -1) ? [] :
 		(operator.suffix) ? results.slice(0, index + 1) :
@@ -110,9 +108,9 @@ exports.allbefore = function (source, operator) {

 /*
 	Appends the items listed in the operand array to the tail of the current list
-	*/
-exports.append = function (source, operator) {
-	var append = $tw.utils.parseStringArray(operator.operand, "true"),
+*/
+exports.append = function(source,operator) {
+	const append = $tw.utils.parseStringArray(operator.operand,"true"),
 		results = prepare_results(source),
 		count = parseInt(operator.suffix) || append.length;
 	return (append.length === 0) ? results :
@@ -122,9 +120,9 @@ exports.append = function (source, operator) {

 /*
 	Prepends the items listed in the operand array to the head of the current list
-	*/
-exports.prepend = function (source, operator) {
-	var prepend = $tw.utils.parseStringArray(operator.operand, "true"),
+*/
+exports.prepend = function(source,operator) {
+	const prepend = $tw.utils.parseStringArray(operator.operand,"true"),
 		results = prepare_results(source),
 		count = $tw.utils.getInt(operator.suffix,prepend.length);
 	return (prepend.length === 0) ? results :
@@ -134,21 +132,19 @@ exports.prepend = function (source, operator) {

 /*
 	Returns all items from the current list except the items listed in the operand array
-	*/
-exports.remove = function (source, operator) {
-	var array = $tw.utils.parseStringArray(operator.operand, "true"),
-		results = prepare_results(source),
-		count = parseInt(operator.suffix) || array.length,
-		p,
-		len,
-		index;
-	len = array.length - 1;
-	for(p = 0; p < count; ++p) {
-		if(operator.prefix) {
-			index = results.indexOf(array[len - p]);
-		} else {
-			index = results.indexOf(array[p]);
-		}
+*/
+exports.remove = function(source, operator) {
+	const array = $tw.utils.parseStringArray(operator.operand, "true"),
+		results = prepare_results(source);
+
+	if(array.length === 0) {
+		return results;
+	}
+	const count = parseInt(operator.suffix, 10) || array.length,
+		targetItems = operator.prefix ? array.slice(-count).reverse() : array.slice(0, count);
+
+	for(const item of targetItems) {
+		const index = results.indexOf(item);
 		if(index !== -1) {
 			results.splice(index, 1);
 		}
@@ -158,40 +154,32 @@ exports.remove = function (source, operator) {

 /*
 	Returns all items from the current list sorted in the order of the items in the operand array
-	*/
-exports.sortby = function (source, operator) {
-	var results = prepare_results(source);
+*/
+exports.sortby = function(source,operator) {
+	const results = prepare_results(source);
 	if(!results || results.length < 2) {
 		return results;
 	}
-	var lookup = $tw.utils.parseStringArray(operator.operand, "true");
-	results.sort(function (a, b) {
-		return lookup.indexOf(a) - lookup.indexOf(b);
-	});
-	return results;
+	const lookup = $tw.utils.parseStringArray(operator.operand,"true");
+	return results.sort((a,b) => lookup.indexOf(a) - lookup.indexOf(b));
 };

+
 /*
 	Removes all duplicate items from the current list
-	*/
-exports.unique = function (source, operator) {
-	var results = prepare_results(source);
-	var set = results.reduce(function (a, b) {
-		if(a.indexOf(b) < 0) {
-			a.push(b);
-		}
-		return a;
-	}, []);
-	return set;
+*/
+exports.unique = function(source, operator) {
+	return Array.from(new Set(prepare_results(source)));
 };

-var cycleValueInArray = function(results,operands,stepSize) {
-	var resultsIndex,
+const cycleValueInArray = function(results,operands,stepSize) {
+	let resultsIndex,
 		step = stepSize || 1,
 		i = 0,
-		opLength = operands.length,
 		nextOperandIndex;
-	for(i; i < opLength; i++) {
+	const opLength = operands.length;
+
+	for(; i < opLength; i++) {
 		resultsIndex = results.indexOf(operands[i]);
 		if(resultsIndex !== -1) {
 			break;
@@ -213,18 +201,19 @@ var cycleValueInArray = function(results,operands,stepSize) {

 /*
 	Toggles an item in the current list.
-	*/
+*/
 exports.toggle = function(source,operator) {
 	return cycleValueInArray(prepare_results(source),operator.operands);
 };

 exports.cycle = function(source,operator) {
-	var results = prepare_results(source),
-		operands = (operator.operand.length ? $tw.utils.parseStringArray(operator.operand, "true") : [""]),
-		step = $tw.utils.getInt(operator.operands[1]||"",1);
+	const results = prepare_results(source),
+		operands = operator.operand.length ? $tw.utils.parseStringArray(operator.operand,"true") : [""];
+	let step = $tw.utils.getInt(operator.operands[1] || "",1);
+
 	if(step < 0) {
 		operands.reverse();
 		step = Math.abs(step);
 	}
 	return cycleValueInArray(results,operands,step);
-};
+};
@@ -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;
 };
@@ -25,7 +25,7 @@ exports.init = function(parser) {
 };

 exports.parse = function() {
-	var reEnd = /(^|\r?\n)```$/mg;
+	var reEnd = /(\r?\n```$)/mg;
 	var languageStart = this.parser.pos + 3,
 		languageEnd = languageStart + this.match[1].length;
 	// Move past the match
@@ -15,8 +15,7 @@ var getCellInfo = function(text, start, length, SEPARATOR) {
 	var isCellQuoted = text.charAt(start) === QUOTE;
 	var cellStart = isCellQuoted ? start + 1 : start;
 	
-	// A quote licenses a separator inside the cell, so only an unquoted cell reads an immediate separator as empty
-	if(!isCellQuoted && text.charAt(cellStart) === SEPARATOR) {
+	if(text.charAt(i) === SEPARATOR) {
 		return [cellStart, cellStart, false];
 	}
 	
@@ -1,62 +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 components in the 0-255 range, matching the legacy csscolorparser.
-		// Clamp because Color.js can emit out-of-gamut sRGB components (e.g. from P3 inputs).
-		return [
-			Math.round(Math.max(0,Math.min(255,rgb[0] * 255))),
-			Math.round(Math.max(0,Math.min(255,rgb[1] * 255))),
-			Math.round(Math.max(0,Math.min(255,rgb[2] * 255))),
-			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) {
-	// The <input type="color"> element only accepts six digit hex values, so we
-	// discard any alpha channel and fall back to black for unparseable input
-	var rgb = exports.parseCSSColor(colourString);
-	if(rgb) {
-		return "#" + rgb.slice(0,3).map(function(component) {
-			return ("0" + component.toString(16)).slice(-2);
-		}).join("");
-	} else {
-		return "#000000";
-	}
-};
@@ -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
@@ -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,null,{defaultFilterRunPrefix: "all"}),
-			values = this.wiki.filterTiddlers(this.actionValues,this,null,{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,null,{defaultFilterRunPrefix: "all"});
+		names, values = this.wiki.filterTiddlers(this.actionValues,this);
 	if(this.actionFields) {
 		var additions = {};
-		names = this.wiki.filterTiddlers(this.actionFields,this,null,{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,null,{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,null,{defaultFilterRunPrefix: "all"});
-		this.attributeValues = this.wiki.filterTiddlers(self.genesisValues,this,null,{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,null,{defaultFilterRunPrefix: "all"}),
-		attributeValues = this.wiki.filterTiddlers(filterValues,this,null,{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;
@@ -49,8 +49,8 @@ SetMultipleVariablesWidget.prototype.setVariables = function() {
 	this.variableNames = [];
 	this.variableValues = [];
 	if(filterNames && filterValues) {
-		this.variableNames = this.wiki.filterTiddlers(filterNames,this,null,{defaultFilterRunPrefix: "all"});
-		this.variableValues = this.wiki.filterTiddlers(filterValues,this,null,{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,null,{defaultFilterRunPrefix: "all"}),
-		variableValues = this.wiki.filterTiddlers(filterValues,this,null,{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;
@@ -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]]
-customisations: $:/palettes/AutoToggle/Customisations
-palette-import@light: $:/palettes/TwentyTwenties
-palette-import@dark: $:/palettes/TwentyTwenties/Dark
-category: 2026
@@ -1,25 +0,0 @@
-title: $:/palettes/AutoToggle/Customisations
-
-\procedure layer-input-actions()
-<$action-setfield $tiddler=<<layerTitle>> palette-import={{$:/palette}}/>
-\end layer-input-actions
-
-\procedure set-imported-palette(field)
-<$select field=<<field>> default={{{ [[$:/temp/palette-consolidated]get<field>] }}} actions=<<layer-input-actions>>>
-	<$list filter="[all[shadows+tiddlers]tag[$:/tags/Palette]sort[name]] -[{$:/palette}]">
-		<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.
-
-<$let layerTitle={{{ [function[tf.palette-customisations-layer]] }}}>
-<$tiddler tiddler=<<layerTitle>>>
-
-Light palette: <<set-imported-palette field:"palette-import@light">>
-
-Dark palette: <<set-imported-palette field:"palette-import@dark">>
-
-</$tiddler>
-</$let>
@@ -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
-customisations: $:/palettes/TwentyTwenties/Customisations
-palette-import: $:/palettes/Vanilla
-category: 2026
-
-# Background and foreground colours, which are interpolated as required
-base-paper: #FFFCF0
-base-background: #f0d5c6
-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[]]
-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[]]
-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,25 +0,0 @@
-title: $:/palettes/TwentyTwenties/Customisations
-
-\procedure layer-input-actions()
-<$action-setfield $tiddler=<<layerTitle>> palette-import={{$:/palette}}/>
-\end layer-input-actions
-
-\procedure entry(name,description)
-<$text text=<<description>>/>: <$edit-text tiddler=<<layerTitle>> index=<<name>> type="color" tag="input" default={{{ [function[colour],<name>] }}} inputActions=<<layer-input-actions>>/>
-\end entry
-
-<$let layerTitle={{{ [function[tf.palette-customisations-layer]] }}}>
-
-<<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">>
-
-</$let>
@@ -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)
-
@@ -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]]
@@ -5,7 +5,7 @@ title: $:/core/stylesheets/custom-properties
 /* Tiddlywiki's CSS properties */

 :root {
-	<$list filter="[[$:/temp/palette-colours]indexes[]!prefix[?]]">
+	<$list filter="[[$:/palettes/Vanilla]indexes[]]">
 	--tpc-<<currentTiddler>>: <$transclude $variable="colour" $mode="inline" name=<<currentTiddler>>/>;
 	</$list>

@@ -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>
+
@@ -41,7 +41,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="$:/temp/palette-colours"
+			palette={{$:/palette}}
 			icon={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] }}}
 			tagField=<<tagField>>
 		/>
@@ -1,105 +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"/>
-<%if [<layerTitle>getindex<colourName>] %>
-<br/><em><<lingo Customised/Entry>></em>
-<%endif%>
-</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}}>
-<$let layerTitle={{{ [function[tf.palette-customisations-layer]] }}}>
-
-<<lingo Prompt>>&#32;<$link to={{$:/palette}}><$macrocall $name="currentTiddler" $output="text/plain"/></$link>
-
-<$list filter="[function[tf.palette-customisations-layer]is[tiddler]]" variable="listItem">
-<<lingo Customised/Prompt>>
-&#32;
-<$button actions="""<$action-deletetiddler $tiddler=<<layerTitle>>/>""">{{$:/language/ControlPanel/Palette/Customisations/Reset/Caption}}</$button>
-</$list>
-
-<$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>>
-</$let>
@@ -1,50 +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 Customisations/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
-	resolvedPalette={{{ [{$:/palette}is[tiddler]] [{$:/palette}is[shadow]] :else[[$:/palettes/Vanilla]] }}}
-	paletteCustomisations={{{ [<resolvedPalette>get[customisations]] :else[[$:/temp/palette-consolidated]get[customisations]] }}}
-	layerTitle={{{ [function[tf.palette-customisations-layer]] }}}
->
-	<%if [<paletteCustomisations>!match[]] %>
-		<div>
-			<<lingo Customisations/Prompt>>
-			<$transclude $tiddler=<<paletteCustomisations>> $mode="block"/>
-		</div>
-	<%endif%>
-	<%if [<layerTitle>is[tiddler]] %>
-		<div>
-			<$button actions="""<$action-deletetiddler $tiddler=<<layerTitle>>/>"""><<lingo Customisations/Reset/Caption>></$button>
-		</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>
@@ -1,7 +0,0 @@
-title: $:/core/ui/Palettes/Preview/Sidebar/Title
-tags: $:/tags/Preview/SideBar
-
-\whitespace trim
-<div class="tc-palette-preview-thumbnail-sidebar-title" style.color=<<colour site-title-foreground>>>
-	~TiddlyWiki
-</div>
@@ -1,7 +0,0 @@
-title: $:/core/ui/Palettes/Preview/SideBar
-tags: $:/tags/Preview/Page
-
-\whitespace trim
-<div class="tc-palette-preview-thumbnail-sidebar" style.color=<<colour sidebar-foreground>>>
-	<<palette-preview-component-list "$:/tags/Preview/SideBar">>
-</div>
@@ -1,9 +0,0 @@
-title: $:/core/ui/Palettes/Preview/Story
-tags: $:/tags/Preview/Page
-
-\whitespace trim
-<div class="tc-palette-preview-thumbnail-story">
-	<$list filter="HelloThere GettingStarted" variable="title">
-		<<palette-preview-component-list "$:/tags/Preview/Story">>
-	</$list>
-</div>
@@ -1,10 +0,0 @@
-title: $:/core/ui/Palettes/Preview/Tiddler
-tags: $:/tags/Preview/Story
-
-\parameters (title)
-\whitespace trim
-<div class="tc-palette-preview-thumbnail-tiddler-border" style.border-color=<<colour tiddler-border>>>
-	<div class="tc-palette-preview-thumbnail-tiddler" style.background-color=<<colour tiddler-background>>>
-		<<palette-preview-component-list "$:/tags/Preview/Tiddler">>
-	</div>
-</div>
@@ -1,15 +0,0 @@
-title: $:/core/ui/Palettes/Preview/Tiddler/Body
-tags: $:/tags/Preview/Tiddler
-
-\whitespace trim
-
-<div class="tc-palette-preview-thumbnail-tiddler-body" style.color=<<colour foreground>>>
-	<%if [<title>match[HelloThere]] %>
-		Lorem ipsum dolor sit amet, <<link "consectetur adipiscing elit">>. Cras non arcu ultricies, egestas odio tempus, vestibulum ipsum. Praesent diam lorem, elementum in venenatis eget, tincidunt quis lacus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Etiam efficitur velit tortor, sit amet tristique felis viverra sit amet. <<link "Nullam posuere facilisis purus sed">> consectetur. Integer vel elit euismod, posuere ligula et, dictum tellus. Donec in odio diam. Sed metus magna, placerat at ligula et, imperdiet sagittis ex.
-	<%else%>
-		Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-		<<tab-set "Sed Metus Magna Placerat Ligula Imperdiet">>
-		Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras non arcu ultricies, egestas odio tempus, vestibulum ipsum. Praesent diam lorem, elementum in venenatis eget, tincidunt quis lacus. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.
-	<%endif%>
-</div>
-
@@ -1,14 +0,0 @@
-title: $:/core/ui/Palettes/Preview/Tiddler/Header
-tags: $:/tags/Preview/Tiddler
-
-\whitespace trim
-<div class="tc-palette-preview-thumbnail-tiddler-header">
-	<div class="tc-palette-preview-thumbnail-tiddler-title" style.color=<<colour tiddler-title-foreground>>>
-		<$text text=<<title>>/>
-	</div>
-	<div class="tc-palette-preview-thumbnail-tiddler-toolbar" style.fill=<<colour tiddler-controls-foreground>>>
-		{{$:/core/images/down-arrow}}
-		{{$:/core/images/edit-button}}
-		{{$:/core/images/close-button}}
-	</div>
-</div>
@@ -1,7 +0,0 @@
-title: $:/core/ui/Palettes/Preview/Tiddler/Subtitle
-tags: $:/tags/Preview/Tiddler
-
-\whitespace trim
-<div class="tc-palette-preview-thumbnail-tiddler-subtitle" style.color=<<colour tiddler-subtitle-foreground>>>
-	Motovun Jack
-</div>
@@ -1,11 +0,0 @@
-title: $:/core/ui/Palettes/ViewTemplateBody
-
-<div style.width="220px">
-
-{{||$:/snippets/currpalettepreview}}
-
-</div>
-
-''<$view field="name" format="text"/>''
-<br>
-<$view field="description" format="text"/>
@@ -7,6 +7,7 @@ title: $:/core/ui/TagTemplate
 		tag=<<currentTiddler>>
 		icon={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] }}}
 		colour={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}}
+		palette={{$:/palette}}
 		element-tag="$button"
 		element-attributes="""popup=<<qualify "$:/state/popup/tag">> dragFilter="[subfilter{$:/core/config/TagPillDragFilter}]" tag='span'"""
 	/>
@@ -1,7 +0,0 @@
-title: $:/core/background-actions/AutoCompilePalette
-tags: $:/tags/BackgroundAction $:/tags/StartupAction
-platforms: browser
-track-filter: [{$:/palette}get[color-scheme]] :map[subfilter<currentTiddler>] [{$:/palette}changecount[]addprefix{$:/palette}] [[$:/palette]changecount[]] =[all[shadows+tiddlers]tag[$:/tags/Palette]changecount[]] =[all[shadows+tiddlers]tag[$:/tags/BackgroundPalette]changecount[]] =[all[tiddlers]prefix[$:/config/PaletteCustomisations/]changecount[]]
-
-\import [subfilter{$:/core/config/GlobalImportFilter}]
-<<actions-recompile-current-palette>>
@@ -10,5 +10,4 @@ code-body: [field:code-body[yes]then[$:/core/ui/ViewTemplate/body/code]]
 import: [field:plugin-type[import]then[$:/core/ui/ViewTemplate/body/import]]
 plugin: [has[plugin-type]then[$:/core/ui/ViewTemplate/body/plugin]]
 hide-body: [field:hide-body[yes]then[$:/core/ui/ViewTemplate/body/blank]]
-palette: [tag[$:/tags/Palette]then[$:/core/ui/Palettes/ViewTemplateBody]]
 default: [[$:/core/ui/ViewTemplate/body/default]]
@@ -1,12 +1,52 @@
 title: $:/snippets/currpalettepreview

+\define resolve-colour(macrocall)
+\import $:/core/macros/utils
 \whitespace trim
-
-\import [all[shadows+tiddlers]tag[$:/tags/Preview/Helpers]!is[draft]sort[title]]
-
-<!-- currentTiddler is the palette to use -->
-<$palette.preview paletteTitle=<<currentTiddler>>>
-	<div class="tc-palette-preview-thumbnail" style.background-color=<<colour page-background>>>
-		<<palette-preview-component-list tag:"$:/tags/Preview/Page">>
-	</div>
-</$palette.preview>
+<$wikify name="name" text="""$macrocall$""">
+<<name>>
+</$wikify>
+\end
+\define swatchStyle()
+background-color: $(swatchColour)$;
+\end
+\define swatch-inner()
+\whitespace trim
+<$set name="swatchColour" value={{##$(colourResolved)$}}>
+<$list filter="[<swatchColour>!prefix[<<colour ]!suffix[>>]]" variable="ignore">
+<div class="tc-swatch" style=<<swatchStyle>> title=<<swatchTitle>>/>
+&#32;
+</$list>
+<$list filter="[<swatchColour>prefix[<<colour ]suffix[>>]]" variable="ignore">
+<$wikify name="colourResolved" text="<$macrocall $name='resolve-colour' macrocall=<<swatchColour>>/>">
+<<swatch-inner>>
+</$wikify>
+</$list>
+</$set>
+\end
+\define swatch()
+\whitespace trim
+<$set name="swatchColour" value={{##$(colour)$}}>
+<$set name="swatchTitle" value=<<colour>>>
+<$list filter="[<swatchColour>!prefix[<<colour ]!suffix[>>]]" variable="ignore">
+<div class="tc-swatch" style=<<swatchStyle>> title=<<swatchTitle>>/>
+&#32;
+</$list>
+<$list filter="[<swatchColour>prefix[<<colour ]suffix[>>]]" variable="ignore">
+<$wikify name="colourResolved" text="<$macrocall $name='resolve-colour' macrocall=<<swatchColour>>/>">
+<<swatch-inner>>
+</$wikify>
+</$list>
+</$set>
+</$set>
+\end
+\whitespace trim
+<div class="tc-swatches-horiz"><$list filter="
+foreground
+background
+muted-foreground
+primary
+page-background
+tab-background
+tiddler-info-background
+" variable="colour"><<swatch>></$list></div>
@@ -1,174 +1,17 @@
 title: $:/core/macros/CSS
 tags: $:/tags/Macro

-\procedure actions-compile-palette-filtered(consolidatedPalette,outputPalette)
-<!-- The $:/config/DefaultColourMappings/ fallback used below is unused by the core and is retained for compatibility with third party plugins -->
-<!-- Note the join, needed to cope with palette entries containing spaces -->
-\function tf.colour(name) [<consolidatedPalette>getindex<name>] :else[[$:/config/DefaultColourMappings/]addsuffix<name>get[text]] :map[tf.colour-inner-transform-classic-palette-entry<currentTiddler>] :map[subfilter:all<currentTiddler>join[ ]]
-\function colour(name) [tf.colour<name>]
-\function color(name) [tf.colour<name>]
-<!-- Make the colour function use the input palette -->
-<$list filter="[<consolidatedPalette>indexes[]sort[]]" variable="colour-name">
-	<$let filter-text={{{ [<consolidatedPalette>getindex<colour-name>] :else[[$:/config/DefaultColourMappings/]addsuffix<colour-name>get[text]] :map[tf.colour-inner-transform-classic-palette-entry<currentTiddler>] }}}>
-		<!-- Note the join, needed to cope with palette entries containing spaces -->
-		<$action-setfield $tiddler=<<outputPalette>> $index=<<colour-name>> $value={{{ [subfilter:all<filter-text>join[ ]] +[join[ ]] }}}/>
-	</$let>
-</$list>
-\end actions-compile-palette-filtered
+<!-- Needs to stay that way for backwards compatibility. See GH issue: #8326 -->
+\define colour(name)
+\whitespace trim
+<$transclude tiddler={{$:/palette}} index="$name$">
+	<$transclude tiddler="$:/palettes/Vanilla" index="$name$">
+		<$transclude tiddler="$:/config/DefaultColourMappings/$name$"/>
+	</$transclude>
+</$transclude>
+\end

-\procedure actions-compile-palette-import(inputPalette,outputPalette,exclusions:"",scheme)
-<%if [enlist<exclusions>!match<inputPalette>count[]] :map[enlist<exclusions>count[]compare:number:eq<currentTiddler>] +[!match[]] %>
-		<$set name="exclusions" filter="[enlist<exclusions>] [<inputPalette>]">
-			<!-- Recursively import any imported palette -->
-			<$let
-				prefixed-palette-import={{{ [[palette-import@]addsuffix<scheme>] }}}
-				inputPalette={{{ [<inputPalette>get<prefixed-palette-import>has[title]] :else[<inputPalette>get[palette-import]] }}}
-			>
-				<%if [<inputPalette>has[title]] %>
-					<$transclude $variable="actions-compile-palette-import" inputPalette=<<inputPalette>> outputPalette=<<outputPalette>> exclusions=<<exclusions>> scheme=<<scheme>>/>
-				<%endif%>
-			</$let>
-			<!-- Copy the unsuffixed palette entries -->
-			<$action-setmultiplefields $tiddler=<<outputPalette>> $indexes="[<inputPalette>indexes[]!regexp[@]sort[]]" $values="[<inputPalette>indexes[]!regexp[@]sort[]] :map[<inputPalette>getindex<currentTiddler>]"/>
-			<!-- Copy the suffixed palette entries with the suffix stripped, overriding any unsuffixed entries of the same name -->
-			<%if [<scheme>!is[blank]] %>
-				<$let
-					prefixed-scheme={{{ [<scheme>addprefix[@]] }}}
-				>
-					<$action-setmultiplefields $tiddler=<<outputPalette>> $indexes="[<inputPalette>indexes[]suffix<prefixed-scheme>sort[]removesuffix<prefixed-scheme>]" $values="[<inputPalette>indexes[]suffix<prefixed-scheme>sort[]] :map[<inputPalette>getindex<currentTiddler>]"/>
-				</$let>
-			<%endif%>
-			<!-- Copy the fields from the palette -->
-			<$action-setmultiplefields $tiddler=<<outputPalette>> $fields="[<inputPalette>fields[]sort[]] -title -tags -text -type" $values="[<inputPalette>fields[]sort[]] -title -tags -text -type :map[<inputPalette>get<currentTiddler>]"/>
-		</$set>
-<%endif%>
-\end actions-compile-palette-import
-
-\procedure actions-compile-palette(inputPalette,outputPalette)
-\procedure tv-action-refresh-policy() always
-<$let
-	consolidatedPalette="$:/temp/palette-consolidated"
->
-	<!-- Compute the current scheme -->
-	<$let
-		color-scheme-filter={{{ [<inputPalette>get[color-scheme]] :else[<inputPalette>get[palette-import]get[color-scheme]] :else[[light]] }}}
-		scheme={{{ [subfilter:all<color-scheme-filter>] }}}
-	>
-		<!-- Clear the consolidated palette that stores the result of flattening the chain of imported input palettes -->
-		<$action-deletetiddler $tiddler=<<consolidatedPalette>>/>
-		<$action-setfield $tiddler=<<consolidatedPalette>> type="application/x-tiddler-dictionary"/>
-		<!-- Clear the output palette that stores the plain CSS values of palette entries -->
-		<$action-deletetiddler $tiddler=<<outputPalette>>/>
-		<$action-setfield $tiddler=<<outputPalette>> type="application/x-tiddler-dictionary"/>
-		<!-- Import the background palettes -->
-		<$list filter="[all[shadows+tiddlers]tag[$:/tags/BackgroundPalette]sort[]]" variable="palette-name">
-			<$transclude $variable="actions-compile-palette-import" inputPalette=<<palette-name>> outputPalette=<<consolidatedPalette>> scheme=<<scheme>>/>
-		</$list>
-		<!-- Consolidate the chain of palettes -->
-		<$transclude $variable="actions-compile-palette-import" inputPalette=<<inputPalette>> outputPalette=<<consolidatedPalette>> scheme=<<scheme>>/>
-		<!-- Save the current scheme in the output tiddler -->
-		<$action-setfield $tiddler=<<outputPalette>> $field="color-scheme" $value=<<scheme>>/>
-		<!-- Compile the temporary palette to the output palette -->
-		<$transclude $variable="actions-compile-palette-filtered" consolidatedPalette=<<consolidatedPalette>> outputPalette=<<outputPalette>>/>
-		<!-- Blank any entries with recursive definitions, reporting them via the readability test mechanism -->
-		<$list filter="[<outputPalette>indexes[]!prefix[?]] :filter[<outputPalette>getindex<currentTiddler>regexp[Excessive filter recursion]]" variable="entry-name">
-			<$action-setfield $tiddler=<<outputPalette>> $index=<<entry-name>> $value=""/>
-			<$action-setfield $tiddler=<<outputPalette>> $index={{{ [<entry-name>addprefix[?recursion-]] }}} $value={{{ [[the definition of ']addsuffix<entry-name>addsuffix[' is recursive]] }}}/>
-		</$list>
-	</$let>
-</$let>
-\end actions-compile-palette
-
-<!-- Customisations of the current palette are stored in a layer tiddler that imports the palette itself -->
-\function tf.palette-customisations-layer()
-[{$:/palette}is[tiddler]] [{$:/palette}is[shadow]] :else[[$:/palettes/Vanilla]] :map[addprefix[$:/config/PaletteCustomisations/]]
-\end tf.palette-customisations-layer
-
-\procedure actions-recompile-current-palette()
-\procedure tv-action-refresh-policy() always
-<$let
-	resolvedPalette={{{ [{$:/palette}is[tiddler]] [{$:/palette}is[shadow]] :else[[$:/palettes/Vanilla]] }}}
-	inputPalette={{{ [function[tf.palette-customisations-layer]has[palette-import]] :else[<resolvedPalette>] }}}
->
-	<$transclude $variable="actions-compile-palette" inputPalette=<<inputPalette>> outputPalette="$:/temp/palette-colours"/>
-</$let>
-\end actions-recompile-current-palette
-
-\procedure tv-palette-name() $:/temp/palette-colours
-
-\function tf.colour(name)
-[<tv-palette-name>getindex<name>] :else[[$:/config/DefaultColourMappings/]addsuffix<name>get[text]]
-\end tf.colour
-
-\function colour(name)
-[tf.colour<name>]
-\end colour
-
-\function color(name)
-[tf.colour<name>]
-\end color
-
-\procedure colour-function-prefix()
-[tf.colour[
-\end colour-function-prefix
-
-\procedure colour-function-suffix()
-]]
-\end colour-function-suffix
-
-\widget $palette.preview(paletteTitle)
-	\whitespace trim
-	<!-- The exclusions parameter guards against palettes that import each other in a loop -->
-	\function colour-inner-get-imported-palette(name,paletteTitle,exclusions)
-	[[palette-import@]addsuffix<scheme>] :map[<paletteTitle>get<currentTiddler>has[title]] +[!match[]] :else[<paletteTitle>get[palette-import]has[title]] +[!match[]] :filter[enlist<exclusions>match<currentTiddler>count[]compare:number:eq[0]] :map[function[colour-inner-descend-imported-palette],<name>,<currentTiddler>,<exclusions>,<paletteTitle>] +[!match[]] 
-	\end colour-inner-get-imported-palette
-
-	<!-- Helper to extend the exclusions list with the parent palette before descending -->
-	\function colour-inner-descend-imported-palette(name,paletteTitle,exclusions,parentTitle)
-	[enlist<exclusions>] [<parentTitle>] +[format:titlelist[]join[ ]] :map[function[colour-inner-get-palette-entry],<name>,<paletteTitle>,<currentTiddler>]
-	\end colour-inner-descend-imported-palette
-
-	\function colour-inner-get-palette-entry(name,paletteTitle,exclusions)
-	[<name>addsuffix[@]addsuffix<scheme>] :map[<paletteTitle>getindex<currentTiddler>] +[!match[]] :else[<paletteTitle>getindex<name>] :map[tf.colour-inner-transform-classic-palette-entry<currentTiddler>] :else[function[colour-inner-get-imported-palette],<name>,<paletteTitle>,<exclusions>]
-	\end colour-inner-get-palette-entry
-
-	<!-- Note the join, needed to cope with palette entries containing spaces -->
-	\function tf.colour(name)
-	[function[colour-inner-get-palette-entry],<name>,<paletteTitle>] :else[[$:/config/DefaultColourMappings/]addsuffix<name>get[text]] :map[subfilter:all<currentTiddler>join[ ]]
-	\end tf.colour
-
-	\function colour(name)
-	[tf.colour<name>]
-	\end colour
-
-	\function color(name)
-	[tf.colour<name>]
-	\end color
-
-	<$let
-		color-scheme-filter={{{ [<paletteTitle>get[color-scheme]] :else[<paletteTitle>get[palette-import]get[color-scheme]] :else[[light]] }}}
-		scheme={{{ [subfilter:all<color-scheme-filter>] }}}
-	>
-		<$slot $name="ts-raw"/>
-	</$let>
-\end $palette.preview
-
-\function tf.colour-inner-transform-classic-palette-entry(colour-result)
-[<colour-result>prefix[<<colour ]suffix[>>]removeprefix[<<colour ]removesuffix[>>]addprefix<colour-function-prefix>addsuffix<colour-function-suffix>] :else[<colour-result>]
-\end tf.colour-inner-transform-classic-palette-entry
-
-<!-- Translucent entries are composited over the background entry before their contrast is measured -->
-\function tf.check-colour-contrast-subfunction()
-[function[colour],[background]] =>backdrop [function[colour],<paletteEntryA>colour-composite<backdrop>] =>colourA [function[colour],<paletteEntryB>colour-composite<backdrop>] =>colourB [<colourA>] [<colourB>] +[colour-contrast[]fixed[3]]
-\end tf.check-colour-contrast-subfunction
-
-\function tf.check-colour-contrast(paletteEntryA,paletteEntryB,threshold)
-[function[tf.check-colour-contrast-subfunction]compare:number:gt<threshold>then[ok]] :else[function[tf.check-colour-contrast-subfunction]addsuffix[: ]addsuffix<paletteEntryA>addsuffix[/]addsuffix<paletteEntryB>addsuffix[ contrast is too low]]
-\end tf.check-colour-contrast
-
-\function tf.interpolate-colours(paletteEntryA,paletteEntryB,weight)
-[function[colour],<paletteEntryA>] =>colourA [function[colour],<paletteEntryB>] =>colourB [<weight>colour-interpolate:oklch<colourA>,<colourB>]
-\end tf.interpolate-colours
+\define color(name) <<colour $name$>>

 \procedure datauri(title)
 <$macrocall $name="makedatauri" type={{{ [<title>get[type]] }}} text={{{ [<title>get[text]] }}} _canonical_uri={{{ [<title>get[_canonical_uri]] }}}/>
@@ -6,5 +6,5 @@ $:/language/
 \end

 \define lingo(title)
-{{||$(lingo-base)$$title$}}
+{{$(lingo-base)$$title$}}
 \end
@@ -167,7 +167,7 @@ The second ESC tries to close the "draft tiddler"
 <!-- keep those variables because they may "bleed" into macros using old syntax -->
 <!-- "nonSystemTagsFilter", "systemTagsFilter" __need to be the same__ as fields: "first-search-filter", "second-search-filter" -->
 <$let
-	palette="$:/temp/palette-colours"
+	palette={{$:/palette}}
 	colourA={{{ [<palette>getindex[foreground]] }}}
 	colourB={{{ [<palette>getindex[background]] }}}
 	fallbackTarget={{{ [<palette>getindex[tag-background]] }}}
@@ -28,16 +28,15 @@ color:$(foregroundColor)$;
 </$let>
 \end

-<!-- Note that the 'palette' parameter is unused and is only retained for backwards compatibility -->
 \define tag-pill-body(tag,icon,colour,palette,element-tag,element-attributes,actions)
 \whitespace trim
 <$macrocall $name="tag-pill-inner"
 	tag=<<__tag__>>
 	icon=<<__icon__>>
 	colour=<<__colour__>>
-	fallbackTarget=<<colour tag-background>>
-	colourA=<<colour foreground>>
-	colourB=<<colour background>>
+	fallbackTarget={{$palette$##tag-background}}
+	colourA={{$palette$##foreground}}
+	colourB={{$palette$##background}}
 	element-tag=<<__element-tag__>>
 	element-attributes=<<__element-attributes__>>
 	actions=<<__actions__>>
@@ -52,6 +51,7 @@ color:$(foregroundColor)$;
 			tag=<<__tag__>>
 			icon={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerIconFilter]!is[draft]get[text]] }}}
 			colour={{{ [<currentTiddler>] :cascade[all[shadows+tiddlers]tag[$:/tags/TiddlerColourFilter]!is[draft]get[text]] }}}
+			palette={{$:/palette}}
 			element-tag=<<__element-tag__>>
 			element-attributes=<<__element-attributes__>>
 			actions=<<__actions__>>/>
@@ -1,3 +1,3 @@
 title: $:/palette

-$:/palettes/AutoToggle
+$:/palettes/Vanilla
@@ -1,30 +1,19 @@
 title: $:/snippets/paletteswitcher

-\parameters (thumbnails)
-
 \whitespace trim
-\procedure actions()
-<$action-setfield $tiddler="$:/palette" text=<<navigateTo>>/>
-\end actions
-
-<!-- Display palette in currentTiddler with selection logic -->
-\procedure palette-entry(thumbnails)
-<div class={{{ [<currentTiddler>match{$:/palette}then[tc-chosen]] tc-chooser-item +[join[ ]] }}}>
-	<$link to={{!!title}} aria-label=`${[[$:/language/ControlPanel/Palette/Caption]get[text]]}$ - ${[all[current]get[name]]}$. ${[all[current]get[description]]}$`>
-		<%if [<thumbnails>match[yes]] %>
-			{{||$:/snippets/currpalettepreview}}
-		<%endif%>
-		''<$view field="name" format="text"/>''
-		<br>
-		<$view field="description" format="text"/>
-	</$link>
+<$linkcatcher to="$:/palette">
+<div class="tc-chooser">
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/Palette]!is[draft]sort[name]]">
+<$set name="cls" filter="[all[current]prefix{$:/palette}]" value="tc-chooser-item tc-chosen" emptyValue="tc-chooser-item">
+<div class=<<cls>>>
+<$link to={{!!title}}>
+''<$view field="name" format="text"/>''
+&#32;-&#32;
+<$view field="description" format="text"/>
+{{||$:/snippets/currpalettepreview}}
+</$link>
+</div>
+</$set>
+</$list>
 </div>
-\end palette-entry
-
-<$linkcatcher actions=<<actions>>>
-	<div class={{{ tc-chooser [<thumbnails>match[yes]then[tc-chooser-cards]] +[join[ ]] }}}>
-		<$list filter="[all[shadows+tiddlers]tag[$:/tags/Palette]!is[draft]sort[name]]">
-			<$transclude $variable="palette-entry" thumbnails=<<thumbnails>>/>
-		</$list>
-	</div>
 </$linkcatcher>
@@ -1,19 +0,0 @@
-title: $:/snippets/palettetests
-
-<$let failureCount={{{ [[$:/temp/palette-colours]indexes[]prefix[?]] :filter[[$:/temp/palette-colours]getindex<currentTiddler>!match[ok]] +[count[]] }}}>
-
-<%if [<failureCount>compare:number:gt[0]] %>
-
-Palette test failures: <$text text=<<failureCount>>/>
-
-<$list filter="[[$:/temp/palette-colours]indexes[]prefix[?]sort[]]" variable="name">
-	<%if [[$:/temp/palette-colours]getindex<name>!match[ok]] %>
-		<div>
-			''<$text text={{{ [<name>removeprefix[?]] }}}/>'': <$text text={{{ [[$:/temp/palette-colours]getindex<name>] }}}/>
-		</div>
-	<%endif%>
-</$list>
-
-<%endif%>
-
-</$let>
@@ -1,2 +0,0 @@
-title: $:/tags/ControlPanel/Appearance
-text: $:/core/ui/ControlPanel/Palette $:/core/ui/ControlPanel/StoryView $:/core/ui/ControlPanel/Theme $:/core/ui/ControlPanel/Toolbars
@@ -1,2 +0,0 @@
-title: $:/tags/Preview/Page
-list: $:/core/ui/Palettes/Preview/Alert $:/core/ui/Palettes/Preview/Notification $:/core/ui/Palettes/Preview/Story $:/core/ui/Palettes/Preview/Sidebar
@@ -1,2 +0,0 @@
-title: $:/tags/Preview/SideBar
-list: $:/core/ui/Palettes/Preview/Sidebar/Title $:/core/ui/Palettes/Preview/Sidebar/Subtitle $:/core/ui/Palettes/Preview/Sidebar/Search $:/core/ui/Palettes/Preview/Sidebar/Tabs
@@ -1,2 +0,0 @@
-title: $:/tags/Preview/Tiddler
-list: $:/core/ui/Palettes/Preview/Tiddler/Header $:/core/ui/Palettes/Preview/Tiddler/Subtitle $:/core/ui/Palettes/Preview/Tiddler/Body
@@ -1,2 +1,2 @@
 title: $:/tags/ViewTemplateBodyFilter
-list: $:/config/ViewTemplateBodyFilters/testcase $:/config/ViewTemplateBodyFilters/hide-body $:/config/ViewTemplateBodyFilters/code-body $:/config/ViewTemplateBodyFilters/stylesheet $:/config/ViewTemplateBodyFilters/core-ui-advanced-search $:/config/ViewTemplateBodyFilters/core-ui-tags $:/config/ViewTemplateBodyFilters/import $:/config/ViewTemplateBodyFilters/plugin $:/config/ViewTemplateBodyFilters/html $:/config/ViewTemplateBodyFilters/system $:/config/ViewTemplateBodyFilters/palette $:/config/ViewTemplateBodyFilters/default
+list: $:/config/ViewTemplateBodyFilters/testcase $:/config/ViewTemplateBodyFilters/hide-body $:/config/ViewTemplateBodyFilters/code-body $:/config/ViewTemplateBodyFilters/stylesheet $:/config/ViewTemplateBodyFilters/core-ui-advanced-search $:/config/ViewTemplateBodyFilters/core-ui-tags $:/config/ViewTemplateBodyFilters/import $:/config/ViewTemplateBodyFilters/plugin $:/config/ViewTemplateBodyFilters/html $:/config/ViewTemplateBodyFilters/system $:/config/ViewTemplateBodyFilters/default
@@ -0,0 +1,6 @@
+title: $:/editions/dev/github-fork-ribbon
+tags: $:/tags/PageTemplate
+caption: ~GitHub ribbon
+description: ~GitHub ribbon for tw5.com/dev
+
+<div class="github-fork-ribbon-wrapper right" style><div class="github-fork-ribbon" style="background-color:#DF4848;"><a href="https://github.com/TiddlyWiki/TiddlyWiki5" target="_blank" rel="noopener noreferrer">Find me on ~GitHub</a></div></div>
@@ -0,0 +1,3 @@
+title: $:/palette
+
+$:/palettes/Vanilla
@@ -2,7 +2,6 @@ created: 20131127215321439
 modified: 20140912135951542
 title: $:/DefaultTiddlers

-[[$:/PaletteManager]]
 [[TiddlyWiki Pre-release]]
 HelloThere
 [[Quick Start]]
@@ -14,8 +14,6 @@
 		"tiddlywiki/jszip",
 		"tiddlywiki/confetti",
 		"tiddlywiki/tour",
-		"tiddlywiki/palettes-legacy",
-		"tiddlywiki/palettes-2026",
 		"tiddlywiki/dom-to-image"
 	],
 	"themes": [
@@ -6,8 +6,8 @@ const crossPlatformIndexPath = indexPath.replace(/^\/+/, "");


 test("get started link", async ({ page }) => {
-	// The tests can take a while to run, especially on CI runners
-	const timeout = 1000 * 180;
+	// The tests can take a while to run
+	const timeout = 1000 * 60;
 	test.setTimeout(timeout);

 	// Load the generated test TW html
@@ -1,27 +0,0 @@
-title: Filters/DefaultFilterRunPrefixPragma
-description: Test Default Filter Run Prefix Pragma
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-title: Output
-
-\whitespace trim
-
-\procedure mysubfilter() 1 1 +[join[Y]]
-
-(<$text text={{{ ::defaultprefix:all 1 1 [subfilter<mysubfilter>] +[join[X]] }}}/>)
-
-(<$text text={{{ 1 1 ::defaultprefix:all 1 1 }}}/>)
-
-(<$text text={{{ ::defaultprefix:and ::defaultprefix:all 1 1 +[join[X]] }}}/>)
-
-(<$text text={{{ ::defaultprefix:bogus [[x]] }}}/>)
-
-(<$text text={{{ ::defaultprefix 1 1 +[count[]] }}}/>)
-
-(<$text text={{{ ::nonexistent X }}}/>)
-
-+
-title: ExpectedResult
-
-<p>(1X1X1Y1)</p><p>(Filter Error: Filter pragmas are only allowed at the start of a filter)</p><p>(1X1)</p><p>(Filter Error: Unknown prefix for filter run)</p><p>(1)</p><p>(Filter Error: Unknown filter pragma)</p>
@@ -1,22 +0,0 @@
-title: Filters/Filter
-description: Test filter operator
-type: text/vnd.tiddlywiki-multiple
-tags: [[$:/tags/wiki-test-spec]]
-
-title: Output
-
-\whitespace trim
-
-\procedure test-filter() 1 1 +[join[X]] +[!match<currentTiddler>]
-
-(<$text text={{{ [filter<test-filter>] +[join[ ]] }}}/>)
-
-(<$text text={{{ [filter:all<test-filter>] +[join[ ]] }}}/>)
-
-+
-title: 1X1
-
-+
-title: ExpectedResult
-
-<p>($:/core 1X1 ExpectedResult Output)</p><p>($:/core ExpectedResult Output)</p>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
saqimtiaz	548c4211e5	feat: added tests	2026-07-26 15:38:11 +02:00
saqimtiaz	a5e228cd11	docs: added changenote	2026-07-26 14:57:26 +02:00
saqimtiaz	eb9d414204	refactor: prefix operator	2026-07-24 18:50:54 +02:00
saqimtiaz	44f585437c	refactor: optimize listops.js using ES2017	2026-07-24 18:36:46 +02:00
saqimtiaz	8d41b32ddc	chore: eslint	2026-07-24 18:29:18 +02:00
saqimtiaz	574d3e72bd	refactor: use ES2017 to optimize x-listops	2026-07-24 18:18:58 +02:00