diff --git a/core/language/en-GB/SearchVariables.multids b/core/language/en-GB/SearchVariables.multids
new file mode 100644
index 000000000..014188fb6
--- /dev/null
+++ b/core/language/en-GB/SearchVariables.multids
@@ -0,0 +1,30 @@
+title: $:/language/Search/Variables/
+
+Caption: Variables
+Content: Variable content
+Clear/Exclude: Clear exlude
+Clear/Search: Clear search
+Exclude: Exclude:
+Exclude/Edit: Edit
+Function/Content: Function definition
+Function/Definition: Function definition
+Exclude/Hide: Hide exclude input
+Exclude/Hint: Exclude Filter eg: [prefix[.]]
+Exclude/Save: Create new exclude filter
+Exclude/Show: Show exclude input
+Exclude/Show/Config: Show saved exclude configurations
+Exclude/Description: EDIT ME - Description is shown in the dropdown
+ExpandAll: Expand all:
+FoldAll: Fold all:
+Filter: Search:
+Filter/Hint: Search Variable Name eg: .attr
+Hint: Filter global variables
+Info/Reset: Reset details search input
+Info/Toggle/Show: Show details search input
+Info/Toggle/Hide: Hide details search input
+Matches: //<small><<resultCount>> matches</small>//
+Search: Search Variables
+Search/Details: Search tiddler text, tags:
+Signature: Variable signature
+Option/Type: Type:
+Option/Sort: Sort:
\ No newline at end of file
diff --git a/core/language/en-GB/Snippets/variables-prefix-dot.tid b/core/language/en-GB/Snippets/variables-prefix-dot.tid
new file mode 100644
index 000000000..7681bf182
--- /dev/null
+++ b/core/language/en-GB/Snippets/variables-prefix-dot.tid
@@ -0,0 +1,5 @@
+description: [prefix[.]] Documentation variables prefixed with a dot
+tags: $:/tags/Variables/Exclude/Snippet
+title: $:/variables/exclude/prefix-dot
+
+[prefix[.]]
\ No newline at end of file
diff --git a/core/modules/filters/format/variable.js b/core/modules/filters/format/variable.js
new file mode 100644
index 000000000..ab23154a0
--- /dev/null
+++ b/core/modules/filters/format/variable.js
@@ -0,0 +1,33 @@
+/*\
+title: $:/core/modules/filters/format/variable.js
+type: application/javascript
+module-type: formatfilteroperator
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Export our filter function
+*/
+exports.variable = function(source,operand,options) {
+	var results = [],
+		widget = options.widget,
+		variable,
+		varInfo,
+		variableTemplate = (operand.length >=6  && operand) ? operand : "$type$ $name$($params$) $firstLine$";
+
+	source(function(tiddler,title) {
+		varInfo = widget.getVariableInfo(title, {});
+		varInfo.name = title;
+		if(title && title.length) {
+			variable = $tw.utils.formatVariableString(variableTemplate, varInfo);
+			results.push(variable);
+		}
+	});
+	return results;
+};
+
+})();
diff --git a/core/modules/filters/jsonvariables.js b/core/modules/filters/jsonvariables.js
new file mode 100644
index 000000000..cb5e1a575
--- /dev/null
+++ b/core/modules/filters/jsonvariables.js
@@ -0,0 +1,33 @@
+/*\
+title: $:/core/modules/filters/jsonvariable.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operator to get widget variable info and
+Display as JSON with basic formatting
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Export our filter function
+*/
+exports.jsonvariable = function(source,operator,options) {
+	var results = [],
+		widget = options.widget;
+	// "replacer" must be defined, otherwise JSON.stringify will throw a circular reference error RSOD
+	// "replacer" does not contain: isCacheable
+	var replacer= "params name value default resultList srcVariable text isFunctionDefinition isProcedureDefinition isWidgetDefinition isMacroDefinition".split(" ");
+	source(function(tiddler,title) {
+		var variable = widget.getVariableInfo(title, {}),
+		text = JSON.stringify(variable,replacer);
+		results.push(text || "");
+	});
+	return results;
+};
+
+})();
diff --git a/core/modules/filters/variables-wl.js b/core/modules/filters/variables-wl.js
new file mode 100644
index 000000000..3c3076e80
--- /dev/null
+++ b/core/modules/filters/variables-wl.js
@@ -0,0 +1,73 @@
+/*\
+title: $:/core/modules/filters/variables-wl.js
+type: application/javascript
+module-type: filteroperator
+
+Filter operator for returning the names of the active variables
+
+\*/
+(function(){
+
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+/*
+Export our filter function
+*/
+exports["variables-wl"] = function(source,operator,options) {
+	var operands = [];
+	$tw.utils.each(operator.operands,function(operand,index){
+		operands.push({
+			name: (index + 1).toString(),
+			value: operand
+		});
+	});
+	var names = [],
+		sort,
+		widget = options.widget,
+		included = (operands[0].value) ? operands[0].value : "var fn proc macro widget";
+		// all will overwrite 
+		included = ((included.indexOf("all") !== -1)) ? "var fn proc macro widget" : included;
+
+		// variableTemplate = (operands.length > 1 && operands[1]) ? operands[1].value : "$type$ $name$($params$) $firstLine$";
+
+	switch(operator.suffix) {
+		case "raw":
+			sort = false;
+			break;
+		case "alphabetical":  // the fallthrough is intentional. "alphabetical" is default
+		default:
+			sort = true;
+			break;
+	}
+	while(widget && !widget.hasOwnProperty("variables")) {
+		widget = widget.parentWidget;
+	}
+	if(widget && widget.variables) {
+		for(var variable in widget.variables) {
+			var varInfo = widget.getVariableInfo(variable, {});
+
+			// varInfo.name = variable;
+			// variable = $tw.utils.formatVariableString(variableTemplate, varInfo);
+
+			if( ((included.indexOf("fn") !== -1) && varInfo.srcVariable.isFunctionDefinition ) ||
+				((included.indexOf("proc") !== -1) && varInfo.srcVariable.isProcedureDefinition ) ||
+				((included.indexOf("macro") !== -1) && varInfo.srcVariable.isMacroDefinition ) ||
+				((included.indexOf("widget") !== -1) && varInfo.srcVariable.isWidgetDefinition ) )
+			{
+				names.push(variable);
+			} else if((included.indexOf("var") !== -1) && !varInfo.srcVariable.isFunctionDefinition && !varInfo.srcVariable.isProcedureDefinition && !varInfo.srcVariable.isMacroDefinition && !varInfo.srcVariable.isWidgetDefinition )
+			{
+				names.push(variable);
+			}
+		}
+	}
+	if(sort) {
+		return names.sort();
+	} else {
+		return names;
+	}
+};
+
+})();
diff --git a/core/modules/utils/utils-format.js b/core/modules/utils/utils-format.js
new file mode 100644
index 000000000..926ebc834
--- /dev/null
+++ b/core/modules/utils/utils-format.js
@@ -0,0 +1,71 @@
+/*\
+title: $:/core/modules/utils/utils-format.js
+type: application/javascript
+module-type: utils
+
+Various static utility functions.
+
+\*/
+/*jslint node: true, browser: true */
+/*global $tw: false */
+"use strict";
+
+exports.formatVariableString = function(template,options) {
+	var result = "",
+		firstLine = "",
+		name = options.name || "",
+		params = options.params || "",
+		os = options.srcVariable || options.name;
+	var	type = (os.isFunctionDefinition) ? "\\\\function" : (os.isMacroDefinition) ? "\\\\define" :
+			(os.isProcedureDefinition) ? "\\\\procedure" : (os.isWidgetDefinition) ? "\\\\widget" : "",
+		varType = (os.isFunctionDefinition) ? "fn" : (os.isMacroDefinition) ? "macro" :
+			(os.isProcedureDefinition) ? "proc" : (os.isWidgetDefinition) ? "widget" : "var";
+		var t = (!os.isFunctionDefinition && !os.isMacroDefinition && !os.isProcedureDefinition && !os.isWidgetDefinition) ? "$name$" : template;
+		var matches = [
+			[/^\$type\$/i, function() {
+				return (type) ? type : "";
+			}],
+			[/^\$name\$/i, function() {
+				return name;
+			}],
+			[/^\$params\$/i, function() {
+				var elements = [],
+					paramString = "";
+				if(params && params[0] && params[0].name) {
+					$tw.utils.each(params, function(p) {
+						elements.push(p.name + ((p.default) ? ':"' + p.default + '"' : ""));
+					});
+					paramString = elements.join(", ");
+				}
+				// return (type) ? "(" + paramString  + ")" : "";
+				return (type) ? paramString : "";
+			}],
+			[/^\$firstLine\$/i, function() {
+				var lines = os.value.split("\n"),
+					suffix = (lines.length > 1) ? "..." : "";
+				return (os.isFunctionDefinition) ? lines[0].replace("\\", "\\\\") + suffix: "";
+			}],
+			[/^\$varType\$/i, function() {
+				return varType;
+			}]
+		];
+		while(t.length){
+			var matchString = "";
+			$tw.utils.each(matches, function(m) {
+				var match = m[0].exec(t);
+				if(match) {
+					matchString = m[1].call(null,match);
+					t = t.substr(match[0].length);
+					return false;
+				}
+			});
+			if(matchString) {
+				result += matchString;
+			} else {
+				result += t.charAt(0);
+				t = t.substr(1);
+			}
+		}
+		result = result.replace(/\\(.)/g,"$1");
+		return result.trim();
+};
diff --git a/core/ui/AdvancedSearch/Variables.tid b/core/ui/AdvancedSearch/Variables.tid
new file mode 100644
index 000000000..55053c886
--- /dev/null
+++ b/core/ui/AdvancedSearch/Variables.tid
@@ -0,0 +1,27 @@
+caption: {{$:/language/Search/Variables/Caption}}
+created: 20240215233810357
+list-before: $:/core/ui/AdvancedSearch/Filter
+modified: 20240429173634149
+tags: $:/tags/AdvancedSearch
+title: $:/core/ui/AdvancedSearch/Variables
+type: text/vnd.tiddlywiki
+
+\define set-next-input-tab(beforeafter:"after")
+<!-- TODO move stateTitle to field  -->
+<$macrocall $name="change-input-tab"
+	stateTitle="$:/state/tab--1498284803"
+	tag="$:/tags/AdvancedSearch"
+	beforeafter="$beforeafter$"
+	defaultState="$:/core/ui/AdvancedSearch/System"
+	actions="<$action-setfield $tiddler='$:/state/advancedsearch/currentTab' text=<<nextTab>>/>"/>
+\end
+
+{{$:/language/Search/Variables/Hint}}
+
+<div class="tc-search tc-advanced-search">
+<$keyboard key="((input-tab-right))" actions=<<set-next-input-tab>>>
+	<$keyboard key="((input-tab-left))" actions=<<set-next-input-tab "before">>>
+		<<search-variables>>
+	</$keyboard>
+</$keyboard>
+</div>
\ No newline at end of file
diff --git a/core/ui/AdvancedSearch/Variables_ItemTemplate.tid b/core/ui/AdvancedSearch/Variables_ItemTemplate.tid
new file mode 100644
index 000000000..840d6ee22
--- /dev/null
+++ b/core/ui/AdvancedSearch/Variables_ItemTemplate.tid
@@ -0,0 +1,16 @@
+title: $:/core/ui/AdvancedSearch/Variables/ItemTemplate
+
+\whitespace trim
+
+\procedure editSnippet()
+<$action-sendmessage $message="tm-edit-tiddler" title=<<currentTiddler>> />
+\end
+
+<$link to={{!!text}} >
+	<$let tv-wikilinks="no">
+		<$transclude field="description"/>
+	</$let>
+</$link>
+<$button actions=<<editSnippet>> class="tc-btn-invisible tc-small-gap-left" tooltip={{$:/language/Search/Variables/Exclude/Edit}}>
+	{{$:/core/images/edit-button}}
+</$button>
diff --git a/core/wiki/macros/search-variables.tid b/core/wiki/macros/search-variables.tid
new file mode 100644
index 000000000..c1c10943c
--- /dev/null
+++ b/core/wiki/macros/search-variables.tid
@@ -0,0 +1,464 @@
+title: $:/core/macros/search-variables
+tags: $:/tags/Global
+
+\whitespace trim
+
+\procedure lingo-base() $:/language/Search/Variables/
+
+<!-- CONST string definitions -->
+\procedure DV-VAR-FILTER-OPTIONS() all fn var proc macro widget
+\procedure DV-FILTER-OPTIONS() $:/temp/varSearch/options
+\procedure DV-SORT-OPTIONS() $:/temp/varSearch/sort
+
+<!-- Filter strings selected by "Sort" dropdown -->
+\procedure DV-RAW-FILTER-STR() [variables:raw<_wlf.dv-type>]
+\procedure DV-FILTER-STR() [variables<_wlf.dv-type>]
+
+<!-- State or temp variable base-names -->
+\procedure DV-FOLDED() $:/temp/varFolded
+\procedure DV-SEARCH() $:/temp/varSearch
+\procedure DV-SEARCH-DETAILS() $:/temp/varSearch/details
+\procedure DV-SEARCH-STATE() $:/state/varSearch/name
+\procedure DV-EXCLUDE() $:/state/varExclude
+
+<!-- HiddenSettings typeSelector options: checkbox, radio (default) -->
+\procedure DV-TYPE-CONFIG() $:/config/DumpVariables/type-selector
+
+<!-- Construct filter strings -->
+\function wlf.dv-filterString() [<_wlf.dv-sort>match[raw]then<DV-RAW-FILTER-STR>else<DV-FILTER-STR>]
+\function wlf.dv-formattedVar() [<varname>format:variable<_wlf.dv-varFormatStr>]
+
+\function wlf.dv-foldedState() [<DV-FOLDED>] [<qualify>] +[join[/]]
+
+<!-- ============================ -->
+<!-- wl-dumpvariables main procedure -->
+<!-- ============================ -->
+\procedure wl-dumpvariables(type sort subfilter:"[[]]" format)
+	<!-- The following function is needed since the "format" string can contain closing brackets ")" -->
+	<!-- Be aware that the "format" filter operator uses $var-name$ for compatibility reasons -->
+	\function _wlf.dv-varFormatStr() [<format>!is[blank]then<format>else[$type$ $name$($params$)]]
+	\function _wlf.dv-type() [<type>]
+	\function _wlf.dv-sort() [<sort>]
+
+	<p>
+		<$text text=`${ [subfilter<wlf.dv-filterString>]
+			+[filter<subfilter>]
+			+[count[]] }$`
+		/>
+		<<lingo Matches>>
+		<% if [<subfilter>split[]count[]compare::gt[4]] %>
+			<span class="tc-small-gap-left"><$text text=`subfilter: $(subfilter)$`/></span>
+		<%endif%>
+	</p>
+
+	<ul>
+		<$list filter="[subfilter<wlf.dv-filterString>] +[filter<subfilter>]" variable="varname">
+			<li>
+				<code title={{$:/language/Search/Variables/Signature}}><$text text=<<wlf.dv-formattedVar>>/></code><br/>
+				<% if [<wlf.dv-formattedVar>prefix[\function]] %>
+					<pre title={{$:/language/Search/Variables/Function/Definition}}><code><$text text={{{ [<varname>jsonvariable[]jsonextract[srcVariable],[value]] }}}/></code></pre>
+				<% endif %>
+				<pre title={{$:/language/Search/Variables/Content}}><code><$text text={{{ [<varname>getvariable[]] }}}/></code></pre>
+			</li>
+		</$list>
+	</ul>
+\end
+
+<!-- search-variables helper functions -->
+\procedure dv-toggleState()
+<$action-setfield $tiddler=<<wlf.dv-varState>> text={{{ [<wlf.dv-varState>get[text]] +[toggle[yes],[no]] }}}/>
+<<dv-toggleInfoState>>
+\end
+
+\procedure dv-toggleInfoState()
+<$action-setfield $tiddler=<<wlf.dv-toggleInfoState>>
+	text={{{ [<wlf.dv-toggleInfoState>get[text]] +[toggle[yes],[no]] }}}
+/>
+<!-- Existing user modified "search text details" should be preserved. If empty use default formatted signature -->
+<!-- Be aware that the "format" filter operator uses $var-name$ for compatibility reasons -->
+<$action-setfield $tiddler=<<wlf.dv-detailsSearch>>
+	text={{{ [<wlf.dv-getDetailsSearchText>!is[blank]then<wlf.dv-getDetailsSearchText>] :else[<varname>format:variable[$type$ $name$]] }}}
+/>
+\end
+
+\procedure dv-setDetailsSearchText()
+<!-- Existing user modified "search text details" should be preserved. If empty use default formatted signature -->
+<!-- Be aware that the "format" filter operator uses $var-name$ for compatibility reasons -->
+<$action-setfield $tiddler=<<wlf.dv-detailsSearch>>
+	text={{{ [<varname>format:variable[$type$ $name$]] }}}
+/>
+\end
+
+\procedure dv-clearStatesButton()
+<span class="tc-small-gap"><<lingo FoldAll>></span>
+<$button class="tc-btn-invisible tc-tiny-gap-left" tooltip={{$:/language/Search/Variables/FoldAll}}>
+	<!-- "search text details" should be preserved -->
+	<$action-deletetiddler $filter="[prefix<DV-SEARCH-STATE>]"/>
+	{{$:/core/images/fold-all-button}}
+</$button>
+\end
+
+\procedure dv-clearSearchButton()
+<$button class="tc-btn-invisible btn-x" tooltip={{$:/language/Search/Variables/Clear/Search}}>
+	<$action-deletetiddler $tiddler=<<wlf.dv-searchText>>/>
+	<$action-sendmessage $message="tm-focus-selector" $param="input.x-inp"/>
+	{{$:/core/images/close-button}}
+</$button>
+\end
+
+\procedure dv-clearExcludeButton()
+<$button class="tc-btn-invisible btn-yy" tooltip={{$:/language/Search/Variables/Clear/Exclude}}>
+	<$action-deletetiddler $tiddler=<<wlf.dv-excludeText>>/>
+	<$action-sendmessage $message="tm-focus-selector" $param="input.y-inp"/>
+	{{$:/core/images/close-button}}
+</$button>
+\end
+
+\procedure dv-expandAllStatesButton()
+<span class="tc-tiny-gap"><<lingo ExpandAll>></span>
+<$button class="tc-btn-invisible" tooltip={{$:/language/Search/Variables/ExpandAll}}>
+	<$action-setfield $tiddler=<<DV-SEARCH-STATE>>
+		text={{{ [<wlf.dv-toggleInfoState>get[text]] +[toggle[yes],[no]] }}}
+	/>
+	<!-- only expand currently visible elements -->
+	<$list filter="[subfilter<wlf.dv-filterString>] +[search::some<wlf.dv-getSearchText>] +[filter<subfilter>]"
+		variable="varname"
+	>
+		<$action-setfield $tiddler=<<wlf.dv-varState>> text="yes"/>
+	</$list>
+	{{$:/core/images/unfold-all-button}}
+</$button>
+\end
+
+\procedure dv-info()
+<div class="multi-columns">
+	<$list filter="[all[tiddlers+shadows]] :filter[search:text,tags:words<wlf.dv-getDetailsSearchText>] 
+		-[[$:/config/OriginalTiddlerPaths]]
+		-[[$:/HistoryList]]
+		-[[$:/StoryList]]
+		-[[$:/core]]
+		:filter[!type[application/javascript]]
+		:filter[!prefix[$:/temp/]]
+		:filter[!prefix[$:/state/]]
+		:filter[!plugin-type[plugin]]"
+	>
+		<$link class="tc-small-gap-left"/><br>
+	</$list>
+</div>
+\end
+
+\function wlf.dv-tmpTypeOptions() [<DV-FILTER-OPTIONS>] [<qualify>] +[join[/]]
+\function wlf.dv-tmpSortOptions() [<DV-SORT-OPTIONS>] [<qualify>] +[join[/]]
+
+\function wlf.dv-searchText() [<DV-SEARCH>] [<qualify>] +[join[/]]
+\function wlf.dv-getSearchText() [<wlf.dv-searchText>get[text]]
+
+\function wlf.dv-excludeText() [<DV-EXCLUDE>] [<qualify>] +[join[/]]
+\function wlf.dv-getExcludeText() [<wlf.dv-excludeText>get[text]]
+
+\function wlf.dv-detailsSearch() [<DV-SEARCH-DETAILS>] [<varname>] [<qualify>] +[join[/]]
+\function wlf.dv-getDetailsSearchText() [<wlf.dv-detailsSearch>get[text]]
+
+\function wlf.dv-varState() [<DV-SEARCH-STATE>] [<varname>] [<qualify>] +[join[/]]
+\function wlf.dv-toggleInfoState() [<DV-SEARCH-STATE>] [<varname>] +[join[/]]
+
+<!-- =============================== -->
+<!-- search-variables main procedure -->
+<!-- =============================== -->
+\procedure search-variables(type sort subfilter:"[[]]" format)
+	<!-- The following function is needed since the "format" string can contain closing brackets ")" -->
+	<!-- Be aware that the "format" filter operator uses $var-name$ for compatibility reasons -->
+	\function _wlf.dv-varFormatStr() [<format>!is[blank]then<format>else[$type$ $name$($params$)]]
+	\function _wlf.dv-type() [<type>!is[blank]then<type>] :else[<wlf.dv-tmpTypeOptions>get[text]]
+	\function _wlf.dv-sort() [<sort>!is[blank]then<sort>] :else[<wlf.dv-tmpSortOptions>get[text]] :else[[alphabetical]]
+
+	<<dv-searchForm>>
+
+	<p tabindex="0">
+		<$text text=`${ [subfilter<wlf.dv-filterString>]
+			+[search::some<wlf.dv-getSearchText>]
+			+[filter<subfilter>]
+			+[!filter<wlf.dv-getExcludeText>]
+			+[count[]] }$`
+		/>
+			<<lingo Matches>>
+		<% if [<subfilter>split[]count[]compare::gt[4]] %>
+			<span class="tc-small-gap-left"><$text text=`subfilter: $(subfilter)$`/></span>
+		<%endif%>
+	</p>
+
+	<div class="tc-variables-results">
+	<$list filter="[subfilter<wlf.dv-filterString>]
+			+[search::some<wlf.dv-getSearchText>]
+			+[filter<subfilter>]
+			+[!filter<wlf.dv-getExcludeText>]"
+		variable="varname"
+	>
+		<div class="tc-var-item">
+			<$button actions=<<dv-toggleState>> class="tc-small-gap-left tc-btn-invisible">
+				<% if [<wlf.dv-varState>get[text]match[yes]] %>
+					{{$:/core/images/down-arrow}}
+				<% else %>
+					{{$:/core/images/right-arrow}}
+				<% endif %>
+				<code title={{$:/language/Search/Variables/Signature}} class="tc-small-gap-right"><$text text=<<wlf.dv-formattedVar>>/></code>
+			</$button>
+			<% if [<wlf.dv-formattedVar>prefix[\function]] %>
+				<!-- Be aware that the "format" filter operator uses $var-name$ for compatibility reasons -->
+				<span tabindex="0" class="tc-tiny-gap-right" title={{$:/language/Search/Variables/Function/Content}}>
+					<$text text={{{ [<varname>format:variable[$firstLine$]] }}}/>
+				</span>
+			<% endif %>
+
+			<% if [<wlf.dv-varState>get[text]match[yes]] %>
+				<$button actions=<<dv-toggleInfoState>>
+					class="tc-btn-details tc-btn-invisible tc-small-gap-left"
+				>
+					<% if [<wlf.dv-toggleInfoState>get[text]match[yes]] %>
+						<span title={{$:/language/Search/Variables/Info/Toggle/Hide}}>{{$:/core/images/up-arrow}}</span>
+					<% else %>
+						<span title={{$:/language/Search/Variables/Info/Toggle/Show}}>{{$:/core/images/advanced-search-button}}</span>
+					<% endif %>
+				</$button>
+				<blockquote class="tc-quote">
+					<% if [<wlf.dv-toggleInfoState>get[text]match[yes]] %>
+						<div class="wltc-labeled-input-wrapper">
+							<span tabindex="0" class="wltc-fixed-label wltc-align-right"><<lingo Search/Details>></span>
+							<$edit-text tiddler=<<wlf.dv-detailsSearch>> tag=input class="wltc-fluid-input tc-small-gap-left"/>
+							<$button actions=<<dv-setDetailsSearchText>>
+								class="tc-btn-invisible tc-tiny-gap-left"
+								tooltip={{$:/language/Search/Variables/Info/Reset}}
+							>
+								{{$:/core/images/refresh-button}}
+							</$button>
+						</div>
+						<<dv-info>>
+					<% endif %>
+					<% if [<varname>prefix[\function]] %>
+						<$codeblock code={{{ [<varname>jsonvariable[]jsonextract[srcVariable],[value]] }}}/>
+					<% endif %>
+					<pre tabindex="0" title={{$:/language/Search/Variables/Content}}><code><$text text={{{ [<varname>getvariable[]] }}}/></code></pre>
+				</blockquote>
+			<% endif %>
+		</div>
+	</$list>
+	</div>
+\end
+
+
+<!-- ================================== -->
+<!-- Grid Based Advanced Variables Form -->
+<!-- ================================== -->
+
+\procedure dv-search-input-box()
+<span class="x-txt"><$text text={{$:/language/Search/Variables/Filter}}/></span>
+<$edit-text tiddler=<<wlf.dv-searchText>>
+	tag=input
+	class="txt-input x-inp"
+	placeholder={{$:/language/Search/Variables/Filter/Hint}}
+	focus="yes"
+/>
+<<dv-clearSearchButton>>
+\end
+
+\procedure dv-exclude-input-box()
+<span class="y-txt"><$text text={{$:/language/Search/Variables/Exclude}}/></span>
+<$edit-text tiddler=<<wlf.dv-excludeText>>
+	tag=input
+	class="txt-input y-inp"
+	placeholder={{$:/language/Search/Variables/Exclude/Hint}}
+/>
+<<moreVariablesPopup>>
+<% if [<wlf.dv-getExcludeText>!is[blank]] %>
+	<<dv-clearExcludeButton>>
+<% endif %>
+\end
+
+\function wlf.dv-opt-class() "c" [<option>] +[join[-]] "tc-tiny-gap-right" "tc-dv-filterOptions" +[join[ ]]
+
+\procedure dv-filterOptions()
+<style>
+.tc-dv-filterOptions [data-gap="right"] {
+	width: auto;
+	margin-right: .25em;
+}
+</style>
+<span class="t-txt"><<lingo Option/Type>></span>
+<%if [<type>!is[blank]] %>
+	<span> <!-- span is needed to overwrite grid-area settings -->
+		<$list filter="[<_wlf.dv-type>split[ ]]" variable="option">
+			<code class=<<wlf.dv-opt-class>> ><<option>></code>
+		</$list>
+	</span>
+<% else %>
+	<$list filter="[enlist<DV-VAR-FILTER-OPTIONS>]" variable="option">
+		<%if [<DV-TYPE-CONFIG>get[text]match[checkbox]] %>
+			<$checkbox tiddler=<<wlf.dv-tmpTypeOptions>>
+				listField="text"
+				checked=<<option>>
+				default="all"
+				class=<<wlf.dv-opt-class>>
+				data-gap="right"
+			>
+				<<option>>
+			</$checkbox>
+		<% else %>
+			<$radio tiddler=<<wlf.dv-tmpTypeOptions>>
+				listField="text" value=<<option>>
+				default="all"
+				class=<<wlf.dv-opt-class>>
+				data-gap="right"
+			>
+				<<option>>
+			</$radio>
+		<% endif %>
+	</$list>
+<% endif %>
+\end
+
+\procedure dv-sortOptions()
+<span class="sel-txt">
+	<<lingo Option/Sort>>
+</span>
+<%if [<sort>!is[blank]] %>
+	<code class="sel-drop"><<_wlf.dv-sort>></code>
+<% else %>
+	<$select tiddler=<<wlf.dv-tmpSortOptions>>
+		default="alphabetical"
+		class="sel-drop"
+	>
+		<option value="alphabetical">alphabetical</option>
+		<option value="raw">raw</option>
+	</$select>
+<% endif %>
+\end
+
+\procedure dv-expandFoldOption()
+<span class="ex-btn">
+<% if [<DV-SEARCH-STATE>get[text]match[yes]] %>
+	<<dv-clearStatesButton>>
+<% else %>
+	<<dv-expandAllStatesButton>>
+<% endif %>
+</span>
+\end
+
+<!-- ========================================== -->
+<!-- Main -- Grid Based Advanced Variables Form -->
+<!-- ========================================== -->
+\procedure dv-searchForm()
+<div class="wltc-flexible-form">
+	<div class="tc-advanced-search-container">
+	<span class="tc-dv-type"><<dv-filterOptions>></span>
+	<span class="tc-dv-sort"><<dv-sortOptions>></span>
+	<span class="tc-dv-extra"><<dv-expandFoldOption>></span>
+	</div>
+	<div class="tc-flexible-input-container">
+		<$reveal stateTitle=<<wlf.dv-foldedState>>
+			tag="div"
+			class=`btn-fld ${[<wlf.dv-getExcludeText>!is[blank]then[btn-fld-has-exluded]]}$`
+			type="nomatch"
+			text="show"
+			default="hide"
+		>
+			<$button tooltip={{$:/language/Search/Variables/Exclude/Show}} class="tc-dv-btn tc-btn-invisible">
+				<$action-setfield $tiddler=<<wlf.dv-foldedState>> $field=text $value="show"/>
+				<% if [<wlf.dv-getExcludeText>!is[blank]]%>
+					{{$:/core/images/star-filled}}
+				<% else %>
+					{{$:/core/images/right-arrow}}
+				<% endif %>
+			</$button>
+		</$reveal>
+		<$reveal stateTitle=<<wlf.dv-foldedState>>
+			tag="div"
+			class=`btn-fld ${[<wlf.dv-getExcludeText>!is[blank]then[btn-fld-has-exluded]]}$`
+			type="nomatch"
+			text="hide"
+			default="hide"
+			style="align-self: center;"
+		>
+			<$button tooltip={{$:/language/Search/Variables/Exclude/Hide}}  class="tc-dv-btn tc-btn-invisible">
+				<$action-setfield $tiddler=<<wlf.dv-foldedState>> $field=text $value="hide"/>
+				<% if [<wlf.dv-getExcludeText>!is[blank]]%>
+					{{$:/core/images/star-filled}}
+				<% else %>
+					{{$:/core/images/up-arrow}}
+				<% endif %>
+			</$button>
+		</$reveal>
+		<<dv-search-input-box>>
+		<% if [<wlf.dv-foldedState>get[text]match[show]] %>
+			<<dv-exclude-input-box>>
+		<% endif %>
+	</div>
+</div>
+\end
+
+<!-- ==================== -->
+<!-- More Variables Popup -->
+
+\procedure dv-lc-actions()
+<$action-setfield $tiddler=<<wlf.dv-excludeText>> text=<<navigateTo>>/>
+<!-- <$action-sendmessage $message="tm-focus-selector" $param="input.y-inp"/> -->
+\end
+
+\procedure dv-addNewVariableFilter-actions()
+<$action-sendmessage
+	$message="tm-new-tiddler"
+	tags="$:/tags/Variables/Exclude/Snippet"
+	description=<<lingo Exclude/Description>>
+	text=<<wlf.dv-getExcludeText>>
+/>
+
+<$action-deletetiddler
+	$tiddler=<<dropdown-state>>
+/>
+\end
+
+\procedure dv-addNewVariableFilter()
+<$button tag="a"
+	actions=<<dv-addNewVariableFilter-actions>>
+	class="tc-tiddlylink"
+	aria-label={{$:/language/Search/Variables/Exclude/Save}}
+	tabindex="0"
+>
+	<em>
+		<$text text={{$:/language/Search/Variables/Exclude/Save}}/>
+	</em>
+</$button>
+\end
+
+\procedure moreVariablesPopup()
+<span class="tc-popup-keep btn-y">
+	<$button popup=<<qualify "$:/state/variableDropdown">> 
+		class="tc-btn-invisible"
+		tooltip={{$:/language/Search/Variables/Exclude/Show/Config}}
+	>
+		{{$:/core/images/down-arrow}}
+	</$button>
+</span>
+
+<$reveal state=<<qualify "$:/state/variableDropdown">> type="popup" position="belowleft">
+	<$let name="tv-show-missing-links" value="yes">
+		<$linkcatcher actions=<<dv-lc-actions>> >
+			<div class="tc-block-dropdown-wrapper">
+				<div class="tc-block-dropdown wltc-variables-dropdown">
+					<!-- <$macrocall $name="list-tagged-draggable"
+						tag="$:/tags/Variables/Exclude/Snippet"
+						subFilter="!is[draft]"
+						itemTemplate="$:/core/ui/AdvancedSearch/Variables/ItemTemplate"
+					/>  --> <!-- TODO make drag & drop sorting possible -->
+					<$list filter="[all[shadows+tiddlers]tag[$:/tags/Variables/Exclude/Snippet]!is[draft]]">
+						<div>
+							{{||$:/core/ui/AdvancedSearch/Variables/ItemTemplate}}
+						</div>
+					</$list>
+					<hr>
+					<<dv-addNewVariableFilter>>
+				</div>
+			</div>
+		</$linkcatcher>
+	</$let>
+</$reveal>
+\end
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/$__config_ViewToolbarButtons_Visibility_$__core_ui_Buttons_fold-bar.tid b/editions/tw5.com/tiddlers/$__config_ViewToolbarButtons_Visibility_$__core_ui_Buttons_fold-bar.tid
new file mode 100644
index 000000000..39627cc2e
--- /dev/null
+++ b/editions/tw5.com/tiddlers/$__config_ViewToolbarButtons_Visibility_$__core_ui_Buttons_fold-bar.tid
@@ -0,0 +1,6 @@
+created: 20240311170828385
+modified: 20240311170828385
+title: $:/config/ViewToolbarButtons/Visibility/$:/core/ui/Buttons/fold-bar
+type: text/vnd.tiddlywiki
+
+show
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/$__plugins_wikilabs_link-to-tabs.json b/editions/tw5.com/tiddlers/$__plugins_wikilabs_link-to-tabs.json
new file mode 100644
index 000000000..bf9d676a6
--- /dev/null
+++ b/editions/tw5.com/tiddlers/$__plugins_wikilabs_link-to-tabs.json
@@ -0,0 +1 @@
+{"tiddlers":{"$:/plugins/wikilabs/link-to-tabs/config":{"title":"$:/plugins/wikilabs/link-to-tabs/config","created":"20190712133008077","initial-opacity":"0.7","modified":"20190714104541701","show-all-links":"none","show-single-link":"inline-block","transition":"0.3","type":"text/vnd.tiddlywiki","text":"This tiddler is used to configure the \"Link-to-tabs\" plugin behaviour. \n\nThere are 4 fields, which are used by [[$:/plugins/wikilabs/link-to-tabs/styles]] enable and disable the internal links. \n\n* show-all-links: {{!!show-all-links}}\n* show-single-link: {{!!show-single-link}}\n* initial-opacity: {{!!initial-opacity}}\n* transition time in seconds: {{!!transition}}\n"},"$:/core/macros/tabs":{"title":"$:/core/macros/tabs","tags":"$:/tags/Macro","text":"\\define tabs-button()\n\\whitespace trim\n<$button\n\tset=<<tabsState>>\n\tsetTo=<<currentTab>>\n\tdefault=<<__default__>>\n\tselectedClass=\"tc-tab-selected\"\n\ttooltip={{!!tooltip}}\n\trole=\"switch\"\n\tdata-tab-title=<<currentTab>>\n>\n\t<$tiddler tiddler=<<save-currentTiddler>>>\n\t\t<$set name=\"tv-wikilinks\" value=\"no\">\n\t\t\t<$transclude tiddler=<<__buttonTemplate__>> mode=\"inline\">\n\t\t\t\t<$transclude tiddler=<<currentTab>> field=\"caption\">\n\t\t\t\t\t<$macrocall $name=\"currentTab\" $type=\"text/plain\" $output=\"text/plain\"/>\n\t\t\t\t</$transclude>\n\t\t\t</$transclude>\n\t\t</$set>\n\t</$tiddler>\n\t<<__actions__>>\n</$button>\n\\end\n\n\\define link-action(message:\"tm-navigate\" icon:\"$:/core/images/link\")\n\\whitespace trim\n<$linkcatcher message=<<__message__>> >\n\t<$link overrideClass=\"\" to=<<currentTiddler>> >\n\t\t<$transclude $tiddler=<<__icon__>>/>\n\t</$link>\n</$linkcatcher>\n\\end\n\n\\define tabs-tab-indicator()\n\\whitespace trim\n<$let pluginTab=`$(save-currentTiddler)$/$(currentTiddler)$`\n\tcurrentTiddler=`${[<plugin-info>!is[blank]then<pluginTab>else<currentTiddler>]}$`\n>\n\t<span class=\"wltc-link-to-tab\">\n\t\t<% if [all[current]!is[shadow]] :filter[[$:/plugins/wikilabs/link-to-tabs/config]get[link-action]match[tm-edit-tiddler]] %>\n\t\t\t<<link-action message:\"tm-edit-tiddler\" icon:\"$:/core/images/edit-button\">>\n\t\t<% elseif [all[current]is[tiddler]] :filter[[$:/plugins/wikilabs/link-to-tabs/config]get[shadow-action]match[tm-edit-tiddler]] %>\n\t\t\t<<link-action message:\"tm-edit-tiddler\" icon:\"$:/core/images/edit-button\">>\n\t\t<% else %>\n\t\t\t<<link-action>>\n\t\t<% endif %>\n\t</span>\n</$let>\n\\end\n\n\\define tabs-tab()\n\\whitespace trim\n<$set name=\"save-currentTiddler\" value=<<currentTiddler>>>\n\t<$tiddler tiddler=<<currentTab>>>\n\t\t<<tabs-button>>\n\t\t<<tabs-tab-indicator>>\n\t</$tiddler>\n</$set>\n\\end\n\n\\define tabs-tab-list()\n\\whitespace trim\n<$list filter=<<__tabsList__>> variable=\"currentTab\" storyview=\"pop\">\n\t<$set name=getCondition filter=\"[<currentTab>get[condition]]\">\n\t\t<$list\n\t\t\tfilter=\"[<currentTab>has[condition]subfilter<getCondition>limit[1]] ~[<currentTab>!has[condition]then[true]]\"\n\t\t\tvariable=\"ignore\"\n\t\t>\n\t\t\t<<tabs-tab>>\n\t\t</$list>\n\t</$set>\n</$list>\n\\end\n\n\\define tabs-tab-body()\n\\whitespace trim\n<$list filter=<<__tabsList__>> variable=\"currentTab\">\n\t<$set name=getCondition filter=\"[<currentTab>get[condition]]\">\n\t\t<$list\n\t\t\tfilter=\"[<currentTab>has[condition]subfilter<getCondition>limit[1]] ~[<currentTab>!has[condition]then[true]]\"\n\t\t\tvariable=\"ignore\"\n\t\t>\n\t\t\t<$reveal type=\"match\" state=<<tabsState>> text=<<currentTab>> default=<<__default__>> retain=<<__retain__>> tag=\"div\">\n\t\t\t\t<$transclude tiddler=<<__template__>> mode=\"block\">\n\t\t\t\t\t<$transclude tiddler=<<currentTab>> mode=\"block\"/>\n\t\t\t\t</$transclude>\n\t\t\t</$reveal>\n\t\t</$list>\n\t</$set>\n</$list>\n\\end\n\n\\define tabs(tabsList,default,state:\"$:/state/tab\",class,template,buttonTemplate,retain,actions,explicitState)\n\\whitespace trim\n<$qualify title=<<__state__>> name=\"qualifiedState\">\n\t<$let tabsState={{{ [<__explicitState__>minlength[1]] ~[<qualifiedState>] }}}>\n\t\t<div class={{{ [[tc-tab-set]addsuffix[ ]addsuffix<__class__>] }}}>\n\t\t\t<div class={{{ [[tc-tab-buttons]addsuffix[ ]addsuffix<__class__>] }}}>\n\t\t\t\t<<tabs-tab-list>>\n\t\t\t</div>\n\t\t<div class={{{ [[tc-tab-divider]addsuffix[ ]addsuffix<__class__>] }}}/>\n\t\t\t<div class={{{ [[tc-tab-content]addsuffix[ ]addsuffix<__class__>] }}}>\n\t\t\t\t<<tabs-tab-body>>\n\t\t\t</div>\n\t\t</div>\n\t</$let>\n</$qualify>\n\\end"},"$:/plugins/wikilabs/link-to-tabs/history":{"title":"$:/plugins/wikilabs/link-to-tabs/history","text":"\nV 3.0.0 - 2023-12-28\n\n* The ''edit-tabs'' plugin will be ''deprecated'' and be replaced by link-to-tabs\n* There are 2 new settings now\n** Clicking a tab-link opens ''non-system'' tiddlers in edit mode\n** Clicking a tab-link opens ''every existing'' tiddler in edit mode\n\n* New \"settings\" tab in the plugin\n* New \"settings\" tab in the ''$:/ControlPanel -> Settings -> WikiLabs'' tab\n\nV 2.4.0 - 2023-12-28\n\n* Update tabs-macro to TW v5.3.3\n\nV 2.3.0 - 2023-07-17\n\n* Updateto TW v5.3.0\n* Tabs in ControlPanel -> Plugins -> Plugin Info area work now.\n** Except the \"contents\" tab, since it's a \"virtual\" one.\n\nV 2.2.0 - 2022-03-27\n\n* update to TW v5.2.2\n* ''Important'': Changed license to Attribution-NonCommercial-ShareAlike -- [[CC-BY-NC-SA|$:/plugins/wikilabs/link-to-tabs/license]]\n\nV 2.1.0 - 2022-02-17\n\n* New $:/core/macros/tabs\n* much more hackable and added dynamic tabs\n** tabs can have a `condition` field now.\n\nV 2.0.1 - 2020-12-25\n\n* update license\n\nV 2.0.0 - 2020.12.05\n\n* Update $:/core/macros/tabs to V5.1.23\n\nV 1.1.1 - 2020.01.19\n\n* Update license link/text\n\nV 1.1.0 - 2019.07.14\n\n* Add new option: Initially hide link\n** Transition time from hidden to visible is adjustable\n* Added: \"Reset to Default\" button\n\nV 1.0.1 - 2019.02.18\n\n* link-to-tabs works in drop-down elements now.\n\nV 1.0.0 - 2019.02.14\n\n* Use core tabs-macro from TW 5.1.19\n\nV <1.0.0\n\n* Use core tabs-macro from TW 5.1.15\n"},"$:/plugins/wikilabs/link-to-tabs/icon":{"title":"$:/plugins/wikilabs/link-to-tabs/icon","text":"<svg width=\"22pt\" height=\"22pt\" version=\"1.1\" viewBox=\"0 0 128 128\">\n<path transform=\"scale(4.36)\" d=\"m18.6 0-14.5 7.33-3.93 14.7 10.5 7.33 14.5-7.33 3.93-14.7-10.5-7.33zm0.0371 4.98c1.26-7.68e-5 2.52 0.479 3.48 1.44 1.92 1.92 1.92 5.03 0 6.96l-3.48 3.48c-1.92 1.92-5.03 1.92-6.96 0a4.9 4.9 0 0 1-1.05-1.56l0.943-0.943a1.84 1.84 0 0 1 1.17-0.535 2.45 2.45 0 0 0 0.68 1.3c0.96 0.96 2.52 0.958 3.48-0.00195l3.47-3.47c0.962-0.962 0.962-2.52 0.00195-3.48-0.96-0.96-2.52-0.958-3.48 0.00195l-2.25 2.25a5.56 5.56 0 0 0-3.37-0.0508 4.97 4.97 0 0 1 0.41-0.465l3.48-3.48c0.96-0.96 2.22-1.44 3.48-1.44zm-5.76 5.76c1.26-5.8e-5 2.52 0.481 3.48 1.44a4.9 4.9 0 0 1 1.05 1.56l-0.941 0.943a1.84 1.84 0 0 1-1.17 0.533 2.45 2.45 0 0 0-0.68-1.29c-0.96-0.96-2.52-0.96-3.48 0l-3.48 3.48c-0.962 0.962-0.96 2.52 0 3.48 0.96 0.96 2.52 0.96 3.48 0l2.25-2.25a5.56 5.56 0 0 0 3.37 0.0527 4.97 4.97 0 0 1-0.41 0.463l-3.48 3.48c-1.92 1.92-5.03 1.92-6.96 0-1.92-1.92-1.92-5.03 0-6.95l3.48-3.48c0.96-0.96 2.22-1.44 3.48-1.44z\" style=\"stroke-width:.229\"/>\n</svg>\n"},"$:/plugins/wikilabs/link-to-tabs/license":{"title":"$:/plugins/wikilabs/link-to-tabs/license","license-text":"https://creativecommons.org/licenses/by-nc-sa/4.0/legalcode","text":"[[Link-to-Tabs-Macro|https://wikilabs.github.io/#link-to-tabs]] (c) Mario Pietsch - 2016-2024\n\n[[Creative Commons Attribution-NonCommercial-ShareAlike|https://creativecommons.org/licenses/by-nc-sa/4.0/]]\n"},"$:/plugins/wikilabs/link-to-tabs/readme":{"title":"$:/plugins/wikilabs/link-to-tabs/readme","text":"This plugin adds a little link icon to every tab.\n\n!! Settings\n\n* Have a closer look at the \"settings-tab\" here or\n* Open the ''$:/ControlPanel -> Settings -> WikiLabs'' tab\n\n''Important:'' This plugin modifies a core module and templates\n\n<ul><$list filter=\"[[$:/plugins/wikilabs/link-to-tabs]plugintiddlers[]prefix[$:/core/]] \"><li><$link to=<<currentTiddler>>><<currentTiddler>><br></$link></li></$list></ul>"},"$:/plugins/wikilabs/link-to-tabs/settings":{"title":"$:/plugins/wikilabs/link-to-tabs/settings","caption":"Link-to-Tabs","created":"20190712133607244","modified":"20190714104631250","tags":"$:/tags/ControlPanel/WikiLabs","type":"text/vnd.tiddlywiki","text":"The full documentation can be found at [[links-to-tabs plugin|https://wikilabs.github.io/editions/link-to-tabs/]] main page.\n\n<$checkbox tiddler=\"$:/plugins/wikilabs/link-to-tabs/config\" field=\"show-all-links\" checked=\"inline-block\" unchecked=\"none\" default=\"none\"> Show internal tab link for ''all tabs''</$checkbox>\n\n<$checkbox tiddler=\"$:/plugins/wikilabs/link-to-tabs/config\" field=\"show-single-link\" checked=\"inline-block\" unchecked=\"none\" default=\"inline-block\"> Show internal tab link for ''selected tabs''</$checkbox>\n\n<$checkbox tiddler=\"$:/plugins/wikilabs/link-to-tabs/config\" field=\"initial-opacity\" checked=\"0\" unchecked=\"0.7\" default=\"0.7\"> Tab links are initially hidden and need mouse hover to become visible.</$checkbox><br>The transition time in seconds is: <$edit-text tiddler=\"$:/plugins/wikilabs/link-to-tabs/config\" field=\"transition\" default=\"0.3\"/>\n\n<$checkbox tiddler=\"$:/plugins/wikilabs/link-to-tabs/config\" field=\"link-action\" checked=\"tm-edit-tiddler\" unchecked=\"tm-navigate\" default=\"tm-navigate\"> Clicking a tab-link opens ''non-shadow'' tiddlers in ''edit mode''</$checkbox>\n\n<$checkbox tiddler=\"$:/plugins/wikilabs/link-to-tabs/config\" field=\"shadow-action\" checked=\"tm-edit-tiddler\" unchecked=\"tm-navigate\" default=\"tm-navigate\"> Clicking a tab-link opens ''every existing'' tiddler in ''edit mode''</$checkbox>\n\n<$button message=\"tm-delete-tiddler\" param=\"$:/plugins/wikilabs/link-to-tabs/config\">\nReset to Default!\n</$button>"},"$:/ControlPanel/Settings/WikiLabs":{"title":"$:/ControlPanel/Settings/WikiLabs","caption":"WikiLabs","tags":"$:/tags/ControlPanel/SettingsTab","text":"Get an overview about all [[WikiLab Pugins|https://wikilabs.github.io]] \n\n<div class=\"tc-control-panel\">\n<$macrocall $name=\"tabs\" \n    tabsList=\"[all[shadows+tiddlers]tag[$:/tags/ControlPanel/WikiLabs]!has[draft.of]]\"\n    default=\"$:/plugins/wikilabs/link-to-tabs/settings\"\n    explicitState=\"$:/state/tab/settings/wikilabs\"\n/>\n</div>"},"$:/plugins/wikilabs/link-to-tabs/styles":{"title":"$:/plugins/wikilabs/link-to-tabs/styles","created":"20190712133348541","modified":"20190714104306483","tags":"$:/tags/Stylesheet","type":"text/vnd.tiddlywiki","text":"<pre>\n\n.wltc-link-to-tab {\n  display: {{$:/plugins/wikilabs/link-to-tabs/config!!show-all-links}};\n  position: relative;\n  top: -1em;\n  left: -1.3em;\n  font-size: 0.7em;\n  opacity: {{$:/plugins/wikilabs/link-to-tabs/config!!initial-opacity}};\n  margin-right: -1em;\n}\n\n.wltc-link-to-tab svg{\n  width: 1.4em;\n  height: 1.4em;\n}\n\n.wltc-link-to-tab:hover {\n  opacity: 1;\n  transition:opacity {{$:/plugins/wikilabs/link-to-tabs/config!!transition}}s;\n  transition-timing-function: cubic-bezier(1,-0.06,.39,.89);\n}\n\n.tc-tab-selected + .wltc-link-to-tab {\n  display: {{$:/plugins/wikilabs/link-to-tabs/config!!show-single-link}};\n}\n\n.tc-vertical > .wltc-link-to-tab {\n  top: -1.9em;\n  left: 0;\n  height: 0;\n  float: right;\n}\n\n.tc-search-results .wltc-link-to-tab a {\n  display: contents;\n  padding: 0;\n}\n\n</pre>"}}}
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/$__plugins_wikilabs_link-to-tabs.json.meta b/editions/tw5.com/tiddlers/$__plugins_wikilabs_link-to-tabs.json.meta
new file mode 100644
index 000000000..de078b3c3
--- /dev/null
+++ b/editions/tw5.com/tiddlers/$__plugins_wikilabs_link-to-tabs.json.meta
@@ -0,0 +1,11 @@
+author: Mario Pietsch
+core-version: >=5.3.3
+dependents: 
+description: Internal links are added to tabs if selected
+icon: $:/plugins/wikilabs/link-to-tabs/icon
+list: readme settings license history
+name: Link to Tabs
+plugin-type: plugin
+title: $:/plugins/wikilabs/link-to-tabs
+type: application/json
+version: 3.0.0
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/$__tab.json b/editions/tw5.com/tiddlers/$__tab.json
new file mode 100644
index 000000000..66d6ae4b2
--- /dev/null
+++ b/editions/tw5.com/tiddlers/$__tab.json
@@ -0,0 +1,32 @@
+{
+    "tiddlers": {
+        "$:/config/ShortcutInfo/tab": {
+            "text": "Insert Tab",
+            "title": "$:/config/ShortcutInfo/tab"
+        },
+        "$:/config/shortcuts-mac/tab": {
+            "text": "tab",
+            "title": "$:/config/shortcuts-mac/tab"
+        },
+        "$:/config/shortcuts-not-mac/tab": {
+            "text": "tab",
+            "title": "$:/config/shortcuts-not-mac/tab"
+        },
+        "$:/tab/icon": {
+            "text": "<svg class=\"tc-image-tab tc-image-button\" width=\"22pt\" height=\"22pt\" viewBox=\"0 0 128 128\" xmlns=\"http://www.w3.org/2000/svg\"><path d=\"M122 123h-11.5V65.3H122zm-19.3-28.8L73.9 123V99.9H6.6V88.4h67.3V65.3zM6.6 65.4V7.7h11.5v57.7zm19.3-28.8L54.7 7.8v23.1H122v11.5H54.7v23.1z\"/></svg>",
+            "tags": "$:/tags/Image",
+            "title": "$:/tab/icon"
+        },
+        "$:/insert/tab": {
+            "text": "<$action-sendmessage\n\t$message=\"tm-edit-text-operation\"\n\t$param=\"insert-text\"\n\ttext={{{ [charcode[9]] }}}\n/>",
+            "title": "$:/insert/tab",
+            "tags": "$:/tags/EditorToolbar",
+            "icon": "$:/tab/icon",
+            "caption": "Tab",
+            "description": "Insert Tab",
+            "condition": "[<targetTiddler>!has[type]] [<targetTiddler>type[text/vnd.tiddlywiki]]",
+            "shortcuts": "((tab))",
+            "condition-disabled": "[[$:/temp/bold/disabled]get[state-disabled]else[no]]"
+        }
+    }
+}
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/$__tab.json.meta b/editions/tw5.com/tiddlers/$__tab.json.meta
new file mode 100644
index 000000000..31166c4fd
--- /dev/null
+++ b/editions/tw5.com/tiddlers/$__tab.json.meta
@@ -0,0 +1,7 @@
+description: Toolbar button to get a tab space character
+modified: 20230806185015211
+name: Tab character
+plugin-type: plugin
+title: $:/tab
+type: application/json
+version: 0.0.2
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/$__themes_tiddlywiki_vanilla_settings_editorfontfamily.tid b/editions/tw5.com/tiddlers/$__themes_tiddlywiki_vanilla_settings_editorfontfamily.tid
new file mode 100644
index 000000000..5ec820b7f
--- /dev/null
+++ b/editions/tw5.com/tiddlers/$__themes_tiddlywiki_vanilla_settings_editorfontfamily.tid
@@ -0,0 +1,6 @@
+created: 20240312113200405
+modified: 20240312113200405
+title: $:/themes/tiddlywiki/vanilla/settings/editorfontfamily
+type: text/vnd.tiddlywiki
+
+"SFMono-Regular",Consolas,"Liberation Mono",Menlo,Courier,monospace
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/dump-type-fn-raw.tid b/editions/tw5.com/tiddlers/dump-type-fn-raw.tid
new file mode 100644
index 000000000..a78d4db74
--- /dev/null
+++ b/editions/tw5.com/tiddlers/dump-type-fn-raw.tid
@@ -0,0 +1,7 @@
+created: 20240427113318944
+modified: 20240517094948997
+tags: 
+title: dump-type-fn-raw
+type: text/vnd.tiddlywiki
+
+<<.example 1 """<<wl-dumpvariables  type:"fn" sort:"raw"  >>""">>
diff --git a/editions/tw5.com/tiddlers/dump-with-subfilter.tid b/editions/tw5.com/tiddlers/dump-with-subfilter.tid
new file mode 100644
index 000000000..59558a0da
--- /dev/null
+++ b/editions/tw5.com/tiddlers/dump-with-subfilter.tid
@@ -0,0 +1,9 @@
+created: 20240218195424844
+modified: 20240517094940707
+tags: 
+title: dump-with-subfilter
+type: text/vnd.tiddlywiki
+
+<<.example 1 """<<wl-dumpvariables  sort:raw subfilter:"[search::some[thisTiddler .attr ]]" >>""">>
+
+ 
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/features/VariableFormat.tid b/editions/tw5.com/tiddlers/features/VariableFormat.tid
new file mode 100644
index 000000000..539a48908
--- /dev/null
+++ b/editions/tw5.com/tiddlers/features/VariableFormat.tid
@@ -0,0 +1,22 @@
+created: 20240219185725834
+modified: 20240501103053921
+tags: Features
+title: VariableFormat
+type: text/vnd.tiddlywiki
+
+<<.from-version "5.3.4">>
+
+Finding "self explaining" variable names for functions, procedures, widgets and macros is difficult. So if variables are listed with <<.mlink dumpvariables>>, <<.mlink search-variables>> or from the "Variables" tab in the $:/AdvancedSearch, it's not obvious ''how'' they work and how they are defined. 
+
+The <<.olink variables>> operator returns all "visible" variables from the current context, depending on where the filter run is executed. The getvariable-operator allows us to return the "text" or the "value" of variables. But this information is not enough to get a good understanding of existing variables. 
+
+So using getvariable-operator in combination with the <<.olink format>> operator we are able to improve information in variable listings. 
+
+|Token |Substituted Value |h
+|`$type$` |variabe type eg: `\function`, `\procedure` and so on |
+|`$name$` |returns the name of the variable |
+|`$params$` |returns a list of parameters, which are defined with functions, procedures ... |
+|`$firstLine$` |returns the first line of the variable content-type as used by <<.olink getvariable>> |
+|`$varType$` |returns `var`, `fn`, ` proc`, ` macro` or ` widget` which can be used with the <<.olink variables>> operator |
+
+See: <<.mlink dumpvariables>>, <<.mlink search-variables>> or $:/AdvancedSearch
diff --git a/editions/tw5.com/tiddlers/filters/examples/format Operator (Examples).tid b/editions/tw5.com/tiddlers/filters/examples/format Operator (Examples).tid
index b6ad505a1..c9025b1aa 100644
--- a/editions/tw5.com/tiddlers/filters/examples/format Operator (Examples).tid	
+++ b/editions/tw5.com/tiddlers/filters/examples/format Operator (Examples).tid	
@@ -1,5 +1,5 @@
 created: 20201020102735123
-modified: 20230226135641976
+modified: 20240501103205895
 tags: [[Operator Examples]] [[format Operator]]
 title: format Operator (Examples)
 type: text/vnd.tiddlywiki
@@ -29,9 +29,12 @@ A JSON string formatted as JSON – note how the JSON string is normalised to re
 
 <<.tip "To create a string to save a [[title list|Title List]] into a list field, use `format:titlelist[]` with the [[join operator|join Operator]]">>
 <<.operator-example 8 """[tag[TableOfContents]format:titlelist[]join[ ]]""">>
-For example, to save titles tagged `TableOfContents` to the titles field of the tiddler [[format titlelist test]]:
 
+A variable formatted as procedure definition. Also see: [[search-variables Macro]]
+<<.operator-example 9 """[[.attr]format:variable[$type$ $name$($params$) $firstLine$]]""">>
+
+For example, to save titles tagged `TableOfContents` to the titles field of the tiddler [[format titlelist test]]:
 <$macrocall $name='wikitext-example-without-html'
 src='<$button>Try it
-<$action-setfield $tiddler="format titlelist test" titles={{{ [tag[TableOfContents]format:titlelist[]join[ ]] }}}/>
+<$action-setfield $tiddler="format titlelist test" text={{{ [tag[TableOfContents]format:titlelist[]join[ ]] }}}/>
 </$button>'/>
diff --git a/editions/tw5.com/tiddlers/filters/examples/variables.tid b/editions/tw5.com/tiddlers/filters/examples/variables.tid
index f4db9207f..ffcbcd7c7 100644
--- a/editions/tw5.com/tiddlers/filters/examples/variables.tid
+++ b/editions/tw5.com/tiddlers/filters/examples/variables.tid
@@ -1,7 +1,13 @@
 created: 20190330100101453
-modified: 20190330100101453
+modified: 20240219184535837
 tags: [[variables Operator]] [[Operator Examples]]
 title: variables Operator (Examples)
 type: text/vnd.tiddlywiki
 
 <<.operator-example 1 "[variables[]prefix[colour]]" "returns the names of any variables whose names start with ''colour''">>
+
+<<.operator-example 2 "[variables[fn]]" "returns the names of any variables which are defined as `\function`s">>
+
+<<.operator-example 3 "[variables[proc]]" "returns the names of any variables which are defined as `\procedure`s">>
+
+<<.tip """Also see the filter operator <<.olink format>> to find out about variable "title" formatting""">>
diff --git a/editions/tw5.com/tiddlers/filters/format.tid b/editions/tw5.com/tiddlers/filters/format.tid
index 7d650ed0a..a2e0ca99e 100644
--- a/editions/tw5.com/tiddlers/filters/format.tid
+++ b/editions/tw5.com/tiddlers/filters/format.tid
@@ -22,6 +22,7 @@ The suffix <<.place B>> is one of the following supported string formats:
 |^`relativedate` |The input string is interpreted as a UTC date and displayed as the interval from the present instant. Any operator parameters <<.place C>> are ignored |
 |^`timestamp` |<<.from-version "5.3.0">> The input string is interpreted as number of milliseconds since the [[ECMAScript epoch|https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date#the_ecmascript_epoch_and_timestamps]], 1 January 1970, and displayed according to the DateFormat specified in the optional operator parameter. (Defaults to "[UTC]YYYY0MM0DD0hh0mm0ss0XXX") |
 |^`titlelist` |<<.from-version "5.2.0">> The input string wrapped in double square brackets if it contains a space. Appropriate for use in a [[title list|Title List]]. |
+|^`variable` |<<.from-version "5.3.4">> The input string is interpreted as a variable name, which can be formatted using the VariableFormat. Defaults to `$type$ $name$($params$) $firstLine$`|
 
 Invalid input strings are dropped by the <<.op format>> operator.
 
diff --git a/editions/tw5.com/tiddlers/filters/getvariable.tid b/editions/tw5.com/tiddlers/filters/getvariable.tid
index 13421988b..76f5af6b9 100644
--- a/editions/tw5.com/tiddlers/filters/getvariable.tid
+++ b/editions/tw5.com/tiddlers/filters/getvariable.tid
@@ -1,12 +1,13 @@
+caption: getvariable
 created: 20190330100101453
-modified: 20190330100101453
+modified: 20240219183835439
+op-input: a selection of variable names
+op-output: the values of each of the variables named in the input titles (or blank if the variable is not defined)
+op-parameter: <<.from-version "5.3.4">> defaults to: "text". optional: "value". Content type <<.param T>> of the varible content that should be returned
+op-purpose: select all values of variables named in the input titles
 tags: [[Filter Operators]] [[Special Operators]]
 title: getvariable Operator
-caption: getvariable
-op-purpose: select all values of variables named in the input titles
-op-input: a selection of variable names
-op-parameter: ignored
-op-output: the values of each of the variables named in the input titles (or blank if the variable is not defined)
+type: text/vnd.tiddlywiki
 
 <<.from-version "5.1.20">> The usual way to retrieve a variable value within a filter is with the angle brackets notation. For example, `[<currentTiddler>]` will retrieve the value of the variable called `currentTiddler`. 
 
@@ -14,4 +15,13 @@ The `getvariable` filter operator provides an alternative way to retrieve a vari
 
 The advantage of `getvariable` is that it makes it possible to work with variables whose name is computed, and not known in advance. For example, `[<myvariable>getvariable[]]` gets the value of the variable whose name is given in the variable `myvariable`.
 
+''Content Type:'' <<.from-version "5.3.4">>
+
+The Prameter <<.param T>> by default is "text". Variables, that are defined as eg: `\function`s have two useful content types: 
+
+* ''text'' ... contains the wikified text of the filter expression
+* ''value'' ... contains the definition string
+
+For any other variable type "text" and "value" are the same thing. 
+
 <<.operator-examples "getvariable">>
diff --git a/editions/tw5.com/tiddlers/filters/variables.tid b/editions/tw5.com/tiddlers/filters/variables.tid
index d1c6b08a8..e9addd272 100644
--- a/editions/tw5.com/tiddlers/filters/variables.tid
+++ b/editions/tw5.com/tiddlers/filters/variables.tid
@@ -1,16 +1,38 @@
+caption: variables
 created: 20190330100101453
-modified: 20190330100101453
+modified: 20240501101748198
+op-input: ignored
+op-output: the names of all the actively defined variables
+op-parameter: <<.from-version "5.3.4">> whitespace separated list of variable-types
+op-parameter-name: T
+op-purpose: select the names of all the actively defined variables
+op-suffix: <<.from-version "5.3.4">> deafults to: "sort", optional: "raw", see more details below
+op-suffix-name: S
 tags: [[Filter Operators]] [[Special Operators]] [[Selection Constructors]]
 title: variables Operator
 type: text/vnd.tiddlywiki
-caption: variables
-op-purpose: select the names of all the actively defined variables
-op-input: ignored
-op-parameter: none
-op-output: the names of all the actively defined variables
 
-<<.from-version "5.1.20">> The primary purpose of the `variables` operator is to implement the [[dumpvariables Macro]]:
+<<.from-version "5.1.20">> The primary purpose of the `variables` operator is to implement the <<.mlink dumpvariables>> or the <<.mlink serach-variables>> macros.
+
+`[variables:<sort>[<parameters>]]`
+
+''Possible Suffixes: <<.place S>>:'' <<.from-version "5.3.4">>
+
+* ''alphabetical'' (default): By default the returned list is alphabetically sorted
+* ''raw'': The variable list will be returned as created. The variables "near" the filter run will show up first. So if variables are defined in the tiddler, where the <<.mlink dumpvariables>> or <<.mlink search-variables>> macros are executed, they will be listed first. 
+
+''Parameters <<.place T>>:'' <<.from-version "5.3.4">>
+
+The parameters <<.place T>> allow a ''whitespace separated list'' of variable codes that should be listed
+
+* Default is `all` or `fn, var, proc, macro, widget`
+
+* ''all'' ... If set it takes precedence and will show all variables
+* ''fn'' ... Will only show variables defined as functions eg: `\function test-01()`
+* ''var'' ... Will only show standard variables defined with eg: `<$let test="test">...</$let>`
+* ''proc'' ... Will only show variables defined as procedures eg: `\procedure test-02()`
+* ''macro'' ... Will only show variables defined as macros eg: `\define test-macro()`
+* ''widgets'' ... Will only show variables defined as widgets eg: `\widget my-widget()`
 
-<$codeblock code={{$:/core/macros/dumpvariables}}/>
 
 <<.operator-examples "variables">>
diff --git a/editions/tw5.com/tiddlers/flexible-form-backup.tid b/editions/tw5.com/tiddlers/flexible-form-backup.tid
new file mode 100644
index 000000000..794984e64
--- /dev/null
+++ b/editions/tw5.com/tiddlers/flexible-form-backup.tid
@@ -0,0 +1,112 @@
+created: 20240424104446409
+modified: 20240424104446409
+title: /core/template/flexible-form
+type: text/vnd.tiddlywiki
+
+\parameters (sort, type)
+
+\whitespace trim
+
+\define FI-VAR-FILTER-OPTIONS() fn var proc macro widget
+
+\define FI-FOLDED() $:/temp/varFolded
+\define FI-SEARCH() $:/temp/varSearch
+\define FI-EXCLUDE() $:/temp/varExclude
+
+\function tf.fi-tmpTypeOptions() [<DV-TMP-FILTER-OPTIONS>] [<qualify>] +[join[/]]
+\function tf.fi-tmpSortOptions() [<DV-TMP-SORT-OPTIONS>] [<qualify>] +[join[/]]
+
+\function tf.fi-foldedState() [<FI-FOLDED>] [<qualify>] +[join[/]]
+
+\function tf.fi-searchText() [<FI-SEARCH>] [<qualify>] +[join[/]]
+\function tf.fi-getSearchText() [<tf.fi-searchText>get[text]]
+
+\function tf.fi-excludeText() [<FI-EXCLUDE>] [<qualify>] +[join[/]]
+\function tf.fi-getExcludeText() [<tf.fi-excludeText>get[text]]
+
+\procedure fi-clearSearchButton()
+<$button class="tc-btn-invisible btn-x" tooltip=`${ [{$:/language/Search/Variables/Clear}] [{$:/language/Search/Variables/Filter}] +[join[ ]] }$`>
+	<$action-deletetiddler $tiddler=<<tf.dv-searchText>>/>
+	{{$:/core/images/close-button}}
+</$button>
+\end
+
+\procedure fi-clearExcludeButton()
+<$button class="tc-btn-invisible btn-y" tooltip=`${ [{$:/language/Search/Variables/Clear}] [{$:/language/Search/Variables/Exclude}] +[join[ ]] }$`>
+	<$action-deletetiddler $tiddler=<<tf.dv-excludeText>>/>
+	{{$:/core/images/close-button}}
+</$button>
+\end
+
+\procedure fi-search-input-box()
+<%if [<sort>!is[blank]] %>
+	<code class="tc-small-gap">sort:<<_tf.fi-sort>></code>
+<%endif%>
+<%if [<type>!is[blank]] %>
+	<code class="tc-small-gap">type:<<_tf.fi-type>></code>
+<%endif%>
+<span class="x-txt"><$text text={{$:/language/Search/Variables/Filter}}/></span>
+<$edit-text tiddler=<<tf.fi-searchText>> tag=input class="x-inp" placeholder="filter variables by name"/> <<fi-clearSearchButton>>
+<% if [<DV-SEARCH-STATE>get[text]match[yes]] %>
+	<<fi-clearStatesButton>>
+<% else %>
+	<<fi-expandAllStatesButton>>
+<% endif %>
+\end
+
+\procedure fi-exclude-input-box()
+<span class="y-txt"><$text text={{$:/language/Search/Variables/Exclude}}/></span>
+<$edit-text tiddler=<<tf.fi-excludeText>> tag=input class="y-inp"/> <<fi-clearExcludeButton>>
+\end
+
+\function tf.fi-opt-class() "c" [<option>] +[join[-]] "tc-dv-filterOptions" +[join[ ]]
+
+\procedure fi-filterOptions()
+<style>
+.tc-dv-filterOptions [data-gap="right"] {
+	width: auto;
+	margin-right: .25em;
+}
+</style>
+<span class="t-txt">{{$:/language/Search/Variables/Option/Type}}</span>
+<$list filter="[enlist<FI-VAR-FILTER-OPTIONS>]" variable="option">
+	<$checkbox tiddler=<<tf.fi-tmpTypeOptions>> listField="text" checked=<<option>>
+		class=<<tf.fi-opt-class>> data-gap="right"
+	>
+		<<option>>
+	</$checkbox>
+</$list>
+\end
+
+\procedure fi-sortOptions()
+<span class="sel-txt">{{$:/language/Search/Variables/Option/Sort}}</span>
+<$select tiddler=<<tf.fi-tmpSortOptions>> default="alphabetical" class="sel-drop">
+	<option value="alphabetical">alphabetical</option>
+	<option value="raw">raw</option>
+</$select>
+\end
+
+<div class="wltc-flexible-form">
+	<div class="tc-advanced-search-container">
+	<<fi-filterOptions>> <<fi-sortOptions>>
+	</div>
+	<div class="tc-flexible-input-container">
+		<$reveal tag="div" type="nomatch" stateTitle=<<tf.fi-foldedState>> text="show" default="hide" class="btn-fld">
+			<$button tooltip={{$:/language/Search/Variables/Exclude/Show}}  class="tc-fi-btn tc-btn-invisible">
+				<$action-setfield $tiddler=<<tf.fi-foldedState>> $field=text $value="show"/>
+				{{$:/core/images/right-arrow}}
+			</$button>
+		</$reveal>
+		<$reveal tag="div" type="nomatch" stateTitle=<<tf.fi-foldedState>> text="hide" default="hide" class="btn-fld">
+			<$button tooltip={{$:/language/Search/Variables/Exclude/Hide}}  class="tc-fi-btn tc-btn-invisible">
+				<$action-setfield $tiddler=<<tf.fi-foldedState>> $field=text $value="hide"/>
+				{{$:/core/images/up-arrow}}
+			</$button>
+		</$reveal>
+		<<fi-search-input-box>>
+		<% if [<tf.fi-foldedState>get[text]match[show]] %>
+			<<fi-exclude-input-box>>
+		<% endif %>
+	</div>
+</div>
+
diff --git a/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting_ Variable Search Type Configuration.tid b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting_ Variable Search Type Configuration.tid
new file mode 100644
index 000000000..09d011f4f
--- /dev/null
+++ b/editions/tw5.com/tiddlers/hiddensettings/Hidden Setting_ Variable Search Type Configuration.tid	
@@ -0,0 +1,11 @@
+created: 20240501111046716
+modified: 20240501111407244
+tags: [[Hidden Settings]]
+title: Hidden Setting: Variable Search Type Configuration
+type: text/vnd.tiddlywiki
+
+$:/config/DumpVariables/type-selector defines if radio-buttons or checkboxes are used in $:/AdvancedSearch ''-> Variables'' tab.
+
+; Options
+: `radio` (default) if config tiddler is missing
+: `checkbox` -- to use checkboxes instead of radio-buttons
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/jsonvariable Operator (Examples).tid b/editions/tw5.com/tiddlers/jsonvariable Operator (Examples).tid
new file mode 100644
index 000000000..59090ac91
--- /dev/null
+++ b/editions/tw5.com/tiddlers/jsonvariable Operator (Examples).tid	
@@ -0,0 +1,41 @@
+created: 20240506132850677
+modified: 20240523052607425
+tags: [[Operator Examples]] [[jsonvariable Operator]]
+title: jsonvariable Operator (Examples)
+type: text/vnd.tiddlywiki
+
+The following example shows the "internal" structure of the `fn.test` function defined in <<.olink jsonvariable>> operator
+
+<<.example 1 """\procedure testProc() [[aa aa]] bb
+\function fn.test(splitChar:" " not-used) [enlist<testProc>format:titlelist[]]
+
+<pre><code><$text text={{{[[fn.test]jsonvariable[]]}}}/></code></pre>
+""">>
+
+The following example shows the same structure ''pretty printed'' using the <<.olink format>> filter operator
+
+<<.example 2 """\procedure testProc() [[aa aa]] bb
+\function fn.test(splitChar:" " not-used) [enlist<testProc>format:titlelist[]]
+
+\function tab() [charcode[9]]
+
+<pre><code><$text text={{{[[fn.test]jsonvariable[]format:json<tab>]}}}/></code></pre>
+""">>
+
+The following example extracts the ''function definition'' using the <<.olink jsonextract>> filter operator
+
+<<.example 3 """\procedure testProc() [[aa aa]] bb
+\function fn.test(splitChar:" " not-used) [enlist<testProc>format:titlelist[]]
+
+<pre><code><$text text={{{[[fn.test]jsonvariable[]jsonextract[srcVariable],[value]]}}}/></code></pre>
+""">>
+
+The following example extracts the `srcVariables.params` with pretty printing using <<.olink jsonextract>>
+
+<<.example 4 """\procedure testProc() [[aa aa]] bb
+\function fn.test(splitChar:" " not-used) [enlist<testProc>format:titlelist[]]
+
+\function tab() [charcode[9]]
+
+<pre><code><$text text={{{[[fn.test]jsonvariable[]jsonextract[srcVariable],[params]format:json<tab>]}}}/></code></pre>""">>
+
diff --git a/editions/tw5.com/tiddlers/jsonvariable Operator.tid b/editions/tw5.com/tiddlers/jsonvariable Operator.tid
new file mode 100644
index 000000000..ea1afdc71
--- /dev/null
+++ b/editions/tw5.com/tiddlers/jsonvariable Operator.tid	
@@ -0,0 +1,45 @@
+caption: jsonvariable
+created: 20240506131935424
+modified: 20240506151517068
+op-input: a selection variable names
+op-output: the JSON string values of each of the retrieved properties
+op-parameter: one or more indexes of the property to retrieve
+op-parameter-name: R
+op-purpose: retrieve the JSON string from a ~TiddlyWiki variable
+tags: [[Filter Operators]] [[JSON Operators]]
+title: jsonvariable Operator
+type: text/vnd.tiddlywiki
+
+\procedure testProc() [[aa aa]] bb
+\function fn.test(splitChar:" " not-used) [enlist<testProc>format:titlelist[]]
+\function tab() [charcode[9]]
+
+<<.from-version "5.3.4">>
+
+The <<.op jsonvariable>> operator is used to retrieve variables as JSON substrings. See also the following related operators:
+
+Properties within a JSON object are identified by a sequence of indexes. In the following example, we use a procedure: `testProc` and a function: `fn.test` to show the possibilities of <<.op jsonvariable>>. The `tab`-function is needed for the <<.olink format>> ooperator, which is used to "pretty-print" the output.
+
+```
+\procedure testProc() [[aa aa]] bb
+\function fn.test(splitChar:" " not-used) [enlist<testProc>format:titlelist[]]
+
+\function tab() [charcode[9]]
+
+<pre><code><$text text={{{[[fn.test]jsonvariable[]format:json<tab>]}}}/></code></pre>
+```
+
+Which results to:
+
+<pre><code><$text text={{{[[fn.test]jsonvariable[]format:json<tab>]}}}/></code></pre>
+
+Also see:
+
+* <<.olink jsonextract>> to retrieve a JSON value as a string of JSON
+* <<.olink jsonget>> to retrieve the values of a property in JSON data
+* <<.olink jsontype>> to retrieve the type of a JSON value
+* <<.olink jsonindexes>> to retrieve the names of the fields of a JSON object, or the indexes of a JSON array
+
+Every TW variable has this internal structure, which we can use to extract the info we need. 
+
+!! <<.operator-examples "jsonvariable">>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/macros/DumpVariablesMacro.tid b/editions/tw5.com/tiddlers/macros/dumpvariables Macro.tid
similarity index 100%
rename from editions/tw5.com/tiddlers/macros/DumpVariablesMacro.tid
rename to editions/tw5.com/tiddlers/macros/dumpvariables Macro.tid
diff --git a/editions/tw5.com/tiddlers/macros/examples/dumpvariables.tid b/editions/tw5.com/tiddlers/macros/examples/dumpvariables Macro (Examples).tid
similarity index 100%
rename from editions/tw5.com/tiddlers/macros/examples/dumpvariables.tid
rename to editions/tw5.com/tiddlers/macros/examples/dumpvariables Macro (Examples).tid
diff --git a/editions/tw5.com/tiddlers/macros/examples/search-variables Macro (Examples).tid b/editions/tw5.com/tiddlers/macros/examples/search-variables Macro (Examples).tid
new file mode 100644
index 000000000..3735d163d
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/examples/search-variables Macro (Examples).tid	
@@ -0,0 +1,35 @@
+created: 20240427121446051
+modified: 20240501121207308
+title: search-variables Macro (Examples)
+type: text/vnd.tiddlywiki
+
+The following example will list all variables that contain the word "example" in uppercase ''and'' also lowercase, due to the default setting of the <<.olink search>> operator.
+
+While ''the following list will be long'' it should be easy to refine it. It shows all variables known within this tiddler. Using the procedure in a ''different context''. Eg: the sidebar, variables will show ''different values''.
+
+<$macrocall $name=".example" n="1"
+eg="""<div><<search-variables >></div>"""/>
+
+<$macrocall $name=".example" n="2"
+eg="""<div><$let EXAMPLE="123" >
+<<search-variables subfilter:"[search::some[EXAMPLE dumpvariables]]">>
+</$let></div>"""/>
+
+Listing only specific varibles can be achieved using the <<.olink search>> operator as a subfilter.
+
+<<.tip """The ''transclusion'' variable is set to eg:"3" so if several "search interfaces" are open in the same tiddler, that type and sort parameters should have no side effects.""">>
+
+<$macrocall $name=".example" n="3"
+eg="""<div><$let EXAMPLE="123" transclusion="3">
+<<search-variables subfilter:"[search::casesensitive,some[EXAMPLE dumpvariables]]">>
+</$let></div>"""/>
+
+<$macrocall $name=".example" n="4"
+eg="""<div><<search-variables subfilter:"[prefix[.a]]">></div>"""/>
+
+<$macrocall $name=".example" n="5"
+eg="""<div><<search-variables type:"fn" sort:"raw">></div>"""/>
+
+<$macrocall $name=".example" n="6"
+eg="""<div><<search-variables type:"fn" sort:"raw" subfilter:"[prefix[.]]">></div>"""/>
+
diff --git a/editions/tw5.com/tiddlers/macros/search-variables Macro.tid b/editions/tw5.com/tiddlers/macros/search-variables Macro.tid
new file mode 100644
index 000000000..6c0106842
--- /dev/null
+++ b/editions/tw5.com/tiddlers/macros/search-variables Macro.tid	
@@ -0,0 +1,34 @@
+caption: search-variables
+created: 20240427120451313
+modified: 20240501101929800
+tags: Macros [[Core Macros]]
+title: search-variables Macro
+type: text/vnd.tiddlywiki
+
+This macro is <<.from-version "5.3.4">>
+
+The <<.def search-variables>> presents a form, which allows fast filtering of the resulting list. This procedure is also used in the $:/AdvancedSearch ''-> Variables'' tab.
+
+It returns a table showing the values of all [[variables|Variables]], [[procedures|Procedures]], [[functions|Functions]], [[widgets|Widgets]] and [[macros|Macros]] that exist at that position in the [[widget tree|Widgets]].
+
+It is useful for debugging and exploring ~TiddlyWiki's internals.
+
+!! Parameters
+
+; type
+: If type is empty all variable types are shown
+: optional: `fn, var, proc, macro, widget`. Using the type parameter will reduce the list.
+
+; sort
+: `raw`: Is used to allow the <<.olink variables>> to return a raw list.
+: `alphabetical`: If sort is missing, by ''default ''the list is alphabetically sorted.
+
+; subfilter
+: This parameter limits the number of variables that are listed eg:  `subfilter:"[search::some[sort .attr]]" `
+
+; format
+: Format the output string using the VariableFormat. Defaults to `$type$ $name$($params$) $firstLine$`.
+
+Also see: [[dumpvariables Macro]]
+
+!!! <<.macro-examples "search-variables">>
diff --git a/editions/tw5.com/tiddlers/search-variable-parameter-test.tid b/editions/tw5.com/tiddlers/search-variable-parameter-test.tid
new file mode 100644
index 000000000..35c80861b
--- /dev/null
+++ b/editions/tw5.com/tiddlers/search-variable-parameter-test.tid
@@ -0,0 +1,13 @@
+created: 20240218173858951
+modified: 20240223200921450
+tags: 
+title: search-variable-parameter-test
+type: text/vnd.tiddlywiki
+
+\procedure asdf()
+<$let EXAMPLE="123" >
+<<search-variables type:"" sort:"" subfilter:"[search::some[]]"  format:"$type$ $name$($params$)"  >>
+</$let>
+\end
+
+<<asdf>>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/test-dumpvariables-sort-raw.tid b/editions/tw5.com/tiddlers/test-dumpvariables-sort-raw.tid
new file mode 100644
index 000000000..0d4e2a890
--- /dev/null
+++ b/editions/tw5.com/tiddlers/test-dumpvariables-sort-raw.tid
@@ -0,0 +1,10 @@
+created: 20240218202032583
+modified: 20240517094448903
+tags: 
+title: test-dumpvariables-sort-raw
+type: text/vnd.tiddlywiki
+
+<<.example 1 """\procedure asdf(test:"hallo", x ) <<test>>
+
+<<wl-dumpvariables sort:"raw">> """>>
+
diff --git a/editions/tw5.com/tiddlers/test-jsonvariable-conat.tid b/editions/tw5.com/tiddlers/test-jsonvariable-conat.tid
new file mode 100644
index 000000000..274da207f
--- /dev/null
+++ b/editions/tw5.com/tiddlers/test-jsonvariable-conat.tid
@@ -0,0 +1,40 @@
+created: 20240506101435113
+modified: 20240506140610448
+tags: 
+title: test-jsonvariable-conat
+type: text/vnd.tiddlywiki
+
+''Nice to have''
+
+<<.example 1 """\function tab() [charcode[9]]
+
+<pre><$text text={{{[[.concat]jsonvariable[]]}}}/></pre>
+""">>
+
+''Human readable version''
+
+<<.example 2 """\function tab() [charcode[9]]
+
+<pre><$text text={{{[[.concat]jsonvariable[]format:json<tab>]}}}/></pre>
+""">>
+
+''Function definition''
+
+<<.example 3 """\function tab() [charcode[9]]
+
+<pre><$text text={{{[[.concat]jsonvariable[]jsonextract[srcVariable],[value]format:json<tab>]}}}/></pre>
+""">>
+
+''Get parameters''
+
+<<.example 4 """\function tab() [charcode[9]]
+
+<pre><$text text={{{[[.concat]jsonvariable[]jsonextract[srcVariable],[params]format:json<tab>]}}}/></pre>
+""">>
+
+''Expected''
+
+<<.example 5 """\function tab() [charcode[9]]
+
+<pre><$text text={{{[[.concat]format:variable[]]}}}/></pre>
+""">>
diff --git a/editions/tw5.com/tiddlers/test-search-variables.tid b/editions/tw5.com/tiddlers/test-search-variables.tid
new file mode 100644
index 000000000..c26365fc7
--- /dev/null
+++ b/editions/tw5.com/tiddlers/test-search-variables.tid
@@ -0,0 +1,8 @@
+created: 20240216004004135
+modified: 20240223200900425
+tags: 
+title: test-search-variables
+type: text/vnd.tiddlywiki
+
+
+<<search-variables type:"">>
diff --git a/editions/tw5.com/tiddlers/test-search-widget.tid b/editions/tw5.com/tiddlers/test-search-widget.tid
new file mode 100644
index 000000000..182d09ce3
--- /dev/null
+++ b/editions/tw5.com/tiddlers/test-search-widget.tid
@@ -0,0 +1,9 @@
+created: 20240430134820097
+modified: 20240430135154411
+tags: $:/tags/Global
+title: test-search-widget
+type: text/vnd.tiddlywiki
+
+\widget $w.test-world()
+Hello World
+\end
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/test-snippet.tid b/editions/tw5.com/tiddlers/test-snippet.tid
new file mode 100644
index 000000000..2e9bdcab4
--- /dev/null
+++ b/editions/tw5.com/tiddlers/test-snippet.tid
@@ -0,0 +1,8 @@
+created: 20240430135650615
+description: prefixed dot and prefixed DV-
+modified: 20240430135725412
+tags: $:/tags/Variables/Exclude/Snippet
+title: test-snippet
+type: text/vnd.tiddlywiki
+
+[prefix[.]] [prefix[DV-]] 
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/test-sort-raw.tid b/editions/tw5.com/tiddlers/test-sort-raw.tid
new file mode 100644
index 000000000..7dd9829ae
--- /dev/null
+++ b/editions/tw5.com/tiddlers/test-sort-raw.tid
@@ -0,0 +1,7 @@
+created: 20240430092721150
+modified: 20240430111853759
+tags: 
+title: test-sort-raw
+type: text/vnd.tiddlywiki
+
+<div><<search-variables type:"macro proc fn" sort:raw >></div>
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlers/test-widget.tid b/editions/tw5.com/tiddlers/test-widget.tid
new file mode 100644
index 000000000..af745f9ee
--- /dev/null
+++ b/editions/tw5.com/tiddlers/test-widget.tid
@@ -0,0 +1,21 @@
+created: 20240222140353499
+modified: 20240517094709340
+tags: 
+title: test-widget
+type: text/vnd.tiddlywiki
+
+\widget $my.widget(one:'Jaguar')
+<$text text=<<one>>/>
+<$slot $name="ts-raw">
+	Whale
+</$slot>
+\end
+
+<$my.widget one="Dingo">
+	Crocodile
+</$my.widget>
+
+<$my.widget/>
+
+<<wl-dumpvariables subfilter:"[search::casesensitive,some[my. transc]]">>
+
diff --git a/editions/tw5.com/tiddlers/wl-dumpvariables Macro (Examples).tid b/editions/tw5.com/tiddlers/wl-dumpvariables Macro (Examples).tid
new file mode 100644
index 000000000..371f5c75f
--- /dev/null
+++ b/editions/tw5.com/tiddlers/wl-dumpvariables Macro (Examples).tid	
@@ -0,0 +1,29 @@
+created: 20150221151358000
+modified: 20240517094857590
+tags: [[dumpvariables Macro]] [[Macro Examples]]
+title: wl-dumpvariables Macro (Examples)
+type: text/vnd.tiddlywiki
+
+The following example will list all variables that contain the word "example" in uppercase ''and'' also lowercase, due to the default setting of the <<.olink search>> operator.
+
+<$macrocall $name=".example" n="1"
+eg="""<$let EXAMPLE="123" >
+<<wl-dumpvariables subfilter:"[search::some[EXAMPLE wl-dumpvariables]]">>
+</$let>"""/>
+
+Listing only specific varibles can be achieved using the <<.olink search>> operator as a subfilter
+
+<$macrocall $name=".example" n="2"
+eg="""<$let EXAMPLE="123" >
+<<wl-dumpvariables subfilter:"[search::casesensitive,some[EXAMPLE wl-dumpvariables]]">>
+</$let>"""/>
+
+<$macrocall $name=".example" n="3"
+eg="""<<wl-dumpvariables subfilter:"[prefix[.a]]">>"""/>
+
+''The following list will be very long.'' It shows all variables known within this tiddler. Using the macro in a ''different context''. Eg: the sidebar, variables will show ''different values''.
+
+<$macrocall $name=".example" n="4"
+eg="""<<wl-dumpvariables>>"""/>
+
+
diff --git a/editions/tw5.com/tiddlers/wl-dumpvariables Macro.tid b/editions/tw5.com/tiddlers/wl-dumpvariables Macro.tid
new file mode 100644
index 000000000..bc1ced96a
--- /dev/null
+++ b/editions/tw5.com/tiddlers/wl-dumpvariables Macro.tid	
@@ -0,0 +1,33 @@
+caption: wl-dumpvariables
+created: 20140908104107181
+modified: 20240517094925367
+tags: Macros [[Core Macros]]
+title: wl-dumpvariables Macro
+type: text/vnd.tiddlywiki
+
+The <<.def wl-dumpvariables>> [[macro|Macros]] returns a table showing the values of all [[variables|Variables]], [[procedures|Procedures]], [[functions|Functions]], [[widgets|Widgets]] and [[macros|Macros]] that exist at that position in the [[widget tree|Widgets]].
+
+It is useful for debugging and exploring ~TiddlyWiki's internals.
+
+Placeholders are replaced with values in the normal way, but using the default values for all macro parameters.
+
+!! Parameters
+
+The following parameters are <<.from-version "5.3.4">>
+
+; type
+: If type is empty all variable types are shown: `fn, var, proc, macro, widget`. Using the type parameter will reduce the list.
+
+; sort
+: `raw`: Is used to allow the <<.olink variables>> to return a raw list.
+: `alphabetical`: If sort is missing, by ''default ''the list is alphabetically sorted.
+
+; subfilter
+: This parameter limits the number of variables that are listed eg:  `subfilter:"[search::some[sort .attr]]" `
+
+; format
+: Format the output string using the VariableFormat. Defaults to `$type$ $name$($params$) $firstLine$`.
+
+Also see: [[search-variables Macro]]
+
+!!! <<.macro-examples "wl-dumpvariables">>
diff --git a/themes/tiddlywiki/vanilla/flexible-form-styles.tid b/themes/tiddlywiki/vanilla/flexible-form-styles.tid
new file mode 100644
index 000000000..71579a327
--- /dev/null
+++ b/themes/tiddlywiki/vanilla/flexible-form-styles.tid
@@ -0,0 +1,215 @@
+title: /core/template/flexible-form/styles
+tags: $:/tags/Stylesheet
+
+<!-- imported from vanilla base -->
+
+/* Labeled text input, where input is max width */
+.wltc-labeled-input-wrapper {
+	display: flex;
+	padding: 6px 0;
+}
+
+.wltc-align-right {
+	text-align: right;
+}
+
+.wltc-fixed-label {
+	flex: auto;
+}
+
+.wltc-fluid-input {
+	flex: 20;
+}
+
+.tc-advanced-search input {
+	width: 90%;
+}
+
+.tc-advanced-search .wltc-flexible-form .txt-input {
+	width: 100%;
+}
+
+.tc-block-dropdown-wrapper .tc-edit-type-dropdown,
+.tc-block-dropdown-wrapper .wltc-variables-dropdown {
+	position: relative;
+}
+
+.tc-block-dropdown-wrapper .wltc-variables-dropdown a {
+	display: inline-block;
+	width: 90%;
+}
+
+.tc-block-dropdown-wrapper .wltc-variables-dropdown svg {
+	height: .9rem;
+	width: .9rem;
+}
+
+.wltc-variables-dropdown a.tc-tiddlylink-missing {
+	font-style: normal;
+}
+
+<!-- flex form -->
+.wltc-flexible-form {
+	<!-- outline: 1px solid blue; -->
+	overflow: auto;
+	margin-bottom: 1em;
+}
+
+.tc-advanced-search-container {
+	padding: 4px 3px 3px 3px;
+	border-bottom: 1px dotted black;
+	display: grid;
+	grid-column-gap: 1em;
+	grid-row-gap: 0.2em;
+	grid-template-columns: minmax(max-content, auto) minmax(max-content, auto) 1fr;
+	grid-template-areas:
+		"tc-dv-type tc-dv-sort tc-dv-extra";
+}
+
+.tc-dv-type {
+	grid-area: tc-dv-type;
+	display: grid;
+	grid-column-gap: 0.3em;
+	grid-row-gap: 0.2em;
+	grid-template-columns: 5.3em;
+	grid-template-areas:
+		"t-txt c-all c-fn c-var c-proc c-macro c-widget";
+}
+
+.tc-dv-filterOptions {
+	<!-- border: 1px solid <<colour code-border>>; -->
+	padding: 0 .3em;
+}
+
+.tc-dv-sort {
+	grid-area: tc-dv-sort;
+	display: grid;
+	grid-column-gap: 0.3em;
+	grid-row-gap: 0.2em;
+	grid-template-columns: 6em 9em;
+	grid-template-areas:
+		"sel-txt sel-drop";
+}
+
+.tc-dv-extra {
+	grid-area: tc-dv-extra;
+	display: grid;
+	grid-column-gap: 0.3em;
+	grid-row-gap: 0.2em;
+	grid-template-columns: 1fr;
+	grid-template-areas:
+		"ex-btn";
+}
+
+<!-- TODO Try this without a media query!!! -->
+@media (max-width:
+	<$text text={{{ [{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}removesuffix[px]]
+		[{$:/themes/tiddlywiki/vanilla/metrics/sidebarwidth}removesuffix[px]]
+		:reduce[<currentTiddler>add<accumulator>addsuffix[px]] }}}
+	/>) {
+	.tc-dv-sort {
+		grid-template-columns: 5.3em 9em;
+	}
+
+	.tc-advanced-search-container {
+		grid-column-gap: 0.1em;
+		grid-template-areas:
+			"tc-dv-type tc-dv-type tc-dv-type"
+			"tc-dv-sort tc-dv-sort tc-dv-extra";
+	}
+}
+
+.tc-flexible-input-container {
+	padding: 4px 3px 3px 3px;
+	display: grid;
+	grid-row-gap: 0.2em;
+	grid-column-gap: 0.3em;
+	grid-template-columns: 1em 4em 1fr 1.5em 1.5em;
+	grid-template-areas:
+		"btn-fld x-txt x-inp btn-x btn-xx"
+		"btn-fld y-txt y-inp btn-y btn-yy";
+}
+
+.btn-fld-has-exluded button:hover svg,
+.btn-fld-has-exluded button svg {
+	<!-- fill: <<colour dirty-indicator>>; -->
+}
+
+.tc-variables-results button.tc-btn-details svg {
+	width: .9em;
+	height: .9em;
+}
+
+.btn-fld {
+	padding: 0 2px;
+	grid-area: btn-fld;
+}
+
+.x-inp {
+	grid-area: x-inp;
+}
+.y-inp {
+	grid-area: y-inp;
+}
+
+.t-txt,
+.x-txt,
+.y-txt {
+	text-align: right;
+}
+.t-txt {
+	grid-area: t-txt;
+}
+.x-txt {
+	grid-area: x-txt;
+}
+.y-txt {
+	grid-area: y-txt;
+}
+
+.btn-t {
+	grid-area: btn-t;
+}
+.btn-x {
+	grid-area: btn-x;
+}
+.btn-y {
+	grid-area: btn-y;
+}
+
+.btn-xx {
+	grid-area: btn-xx;
+}
+.btn-yy {
+	grid-area: btn-yy;
+}
+
+.c-all {
+	grid-area: c-all;
+}
+.c-fn {
+	grid-area: c-fn;
+}
+.c-var {
+	grid-area: c-var;
+}
+.c-proc {
+	grid-area: c-proc;
+}
+.c-macro {
+	grid-area: c-macro;
+}
+.c-widget {
+	grid-area: c-widget;
+}
+.sel-txt {
+	text-align: right;
+	grid-area: sel-txt;
+}
+.sel-drop {
+	grid-area: sel-drop;
+	border: 1px solid <<colour code-border>>;
+}
+.ex-btn {
+	grid-area: ex-btn;
+}
\ No newline at end of file