From 279441388ed8f66aef07bf99f76977d67e8e299a Mon Sep 17 00:00:00 2001
From: BurningTreeC <huber.simon@protonmail.com>
Date: Sat, 26 Oct 2024 06:52:23 +0200
Subject: [PATCH] make everything even more generic

---
 core/wiki/functions/themes.tid                | 19 +++++++
 core/wiki/macros/sidebar-resizer.tid          | 50 ++++++++-----------
 themes/tiddlywiki/centralised/functions.tid   |  5 +-
 themes/tiddlywiki/centralised/styles.tid      |  8 ---
 .../tiddlywiki/tight-heavier/metrics.multids  |  8 ---
 themes/tiddlywiki/tight/base.tid              | 16 +++---
 themes/tiddlywiki/tight/functions.tid         |  8 +++
 themes/tiddlywiki/vanilla/ThemeTweaks.tid     | 32 ++++++------
 themes/tiddlywiki/vanilla/base.tid            | 26 +++++-----
 themes/tiddlywiki/vanilla/functions.tid       |  5 +-
 .../tiddlywiki/vanilla/sidebar-resizer-ui.tid |  2 +-
 themes/tiddlywiki/vanilla/sidebar-resizer.tid | 43 ++++++++++------
 12 files changed, 120 insertions(+), 102 deletions(-)
 create mode 100644 core/wiki/functions/themes.tid
 delete mode 100644 themes/tiddlywiki/tight-heavier/metrics.multids
 create mode 100644 themes/tiddlywiki/tight/functions.tid

diff --git a/core/wiki/functions/themes.tid b/core/wiki/functions/themes.tid
new file mode 100644
index 000000000..a9a51d1ca
--- /dev/null
+++ b/core/wiki/functions/themes.tid
@@ -0,0 +1,19 @@
+title: $:/core/functions/themes
+tags: $:/tags/Global
+
+\function get.base.theme.metric.recursive(theme,metric) [<theme>get[dependents]enlist-input[]] :map[function[get.base.theme.metric],<currentTiddler>,<metric>]
+
+\function get.base.theme.metric(theme,metric) [<theme>addsuffix[/metrics/]addsuffix<metric>!is[missing]] :else[<theme>addsuffix[/metrics/]addsuffix<metric>is[shadow]] :else[function[get.base.theme.metric.recursive],<theme>,<metric>]
+
+\function get.base.theme(theme,metric) [function[get.base.theme.metric],<theme>,<metric>removesuffix<metric>removesuffix[/metrics/]]
+
+\function get.theme.metric(metric) [function[get.base.theme.metric],{$:/theme},<metric>first[]get[text]]
+
+\function get.theme(metric) [function[get.base.theme],{$:/theme},<metric>addsuffix[/metrics/]addsuffix<metric>!is[missing]] :else[function[get.base.theme],{$:/theme},<metric>addsuffix[/metrics/]addsuffix<metric>is[shadow]] :else[[$:/themes/tiddlywiki/vanilla/metrics/]addsuffix<metric>]
+
+\function set.theme.metric(metric) [function[get.base.theme.metric],{$:/theme},<metric>is[shadow]] :else[function[get.base.theme.metric],{$:/theme},<metric>!is[shadow]!is[missing]] :else[[$:/themes/tiddlywiki/vanilla/metrics/]addsuffix<metric>]
+
+\function get.base.functions.theme.recursive(theme) [<theme>get[dependents]enlist-input[]] :map[function[get.base.functions.theme],<currentTiddler>]
+
+\function get.base.functions.theme(theme) [<theme>addsufix[/functions]!is[missing]] :else[<theme>addsuffix[/functions]is[shadow]] :else[function[get.base.functions.theme.recursive],<theme>]
+
diff --git a/core/wiki/macros/sidebar-resizer.tid b/core/wiki/macros/sidebar-resizer.tid
index 5b9817f9f..4af1fe8df 100644
--- a/core/wiki/macros/sidebar-resizer.tid
+++ b/core/wiki/macros/sidebar-resizer.tid
@@ -32,12 +32,6 @@ title: $:/core/macros/sidebar-resizer
 
 \function convert.to.result(value,suffix) [<suffix>match[px]then<value>] [<suffix>match[%]then<convert.to.percentage.value>] [<suffix>match[cm]then<convert.to.cm.value>] [<suffix>match[mm]then<convert.to.mm.value>] [<suffix>match[Q]then<convert.to.Q.value>] [<suffix>match[in]then<convert.to.in.value>] [<suffix>match[pc]then<convert.to.pc.value>] [<suffix>match[pt]then<convert.to.pt.value>] [<suffix>match[em]then<convert.to.em.value>]
 
-\function get.theme(metric) [{$:/theme}addsuffix[/]addsuffix<metric>!is[missing]] :else[{$:/theme}addsuffix[/]addsuffix<metric>is[shadow]] :else[[$:/themes/tiddlywiki/vanilla/]addsuffix<metric>]
-
-\function get.theme.metric(metric) [{$:/theme}addsuffix[/]addsuffix<metric>get[text]] :else[[$:/themes/tiddlywiki/vanilla/]addsuffix<metric>get[text]]
-
-\function set.theme.metric(metric) [{$:/theme}addsuffix[/]addsuffix<metric>is[shadow]] :else[{$:/theme}addsuffix[/]addsuffix<metric>is[shadow]!is[missing]] :else[[$:/themes/tiddlywiki/vanilla/]addsuffix<metric>]
-
 \function get.value.metric(value) [<value>suffix[px]then[px]] :else[<value>suffix[%]then[%]] :else[<value>suffix[cm]then[cm]] :else[<value>suffix[mm]then[mm]] :else[<value>suffix[Q]then[Q]] :else[<value>suffix[in]then[in]] :else[<value>suffix[pc]then[pc]] :else[<value>suffix[pt]then[pt]] :else[<value>suffix[em]then[em]]
 
 \procedure set_theme_throttling(metric)
@@ -51,11 +45,11 @@ title: $:/core/macros/sidebar-resizer
 \procedure sidebar-resizer-pointerdown-actions()
 <%if [[$:/state/sidebar/resizing]is[missing]then<event-mousebutton>match[left]] %>
 	<$let
-		startStoryLeft={{{ [<storyLeftTiddler>!is[blank]get[text]] :else[get.theme.metric[metrics/storyleft]] }}}
-		startStoryRight={{{ [<storyRightTiddler>!is[blank]get[text]] :else[get.theme.metric[metrics/storyright]] }}}
-		startSidebarWidth={{{ [<sidebarWidthTiddler>!is[blank]get[text]] :else[get.theme.metric[metrics/sidebarwidth]] }}}
-		startTiddlerWidth={{{ [<tiddlerWidthTiddler>!is[blank]get[text]] :else[get.theme.metric[metrics/tiddlerwidth]] }}}
-		startStoryWidth={{{ [<storyWidthTiddler>!is[blank]get[text]] :else[get.theme.metric[metrics/storywidth]] }}}>
+		startStoryLeft={{{ [<storyLeftTiddler>!is[blank]get[text]] :else[get.theme.metric[storyleft]] }}}
+		startStoryRight={{{ [<storyRightTiddler>!is[blank]get[text]] :else[get.theme.metric[storyright]] }}}
+		startSidebarWidth={{{ [<sidebarWidthTiddler>!is[blank]get[text]] :else[get.theme.metric[sidebarwidth]] }}}
+		startTiddlerWidth={{{ [<tiddlerWidthTiddler>!is[blank]get[text]] :else[get.theme.metric[tiddlerwidth]] }}}
+		startStoryWidth={{{ [<storyWidthTiddler>!is[blank]get[text]] :else[get.theme.metric[storywidth]] }}}>
 		<$action-setfield $tiddler="$:/state/sidebar/resizing"
 			text="yes"
 			widget-node-width=<<tv-widgetnode-width>>
@@ -83,15 +77,15 @@ title: $:/core/macros/sidebar-resizer
 <$let
 	storyRightStart={{{ [convert.to.pixels{$:/state/sidebar/resizing!!start-story-right}] }}}
 	storyWidthStart={{{ [convert.to.pixels{$:/state/sidebar/resizing!!start-story-width}] }}}
-	storyMinWidthValue={{{ [<storyMinWidthTiddler>!is[blank]get[text]] :else[<get.theme.metric metrics/storyminwidth>] }}}
+	storyMinWidthValue={{{ [<storyMinWidthTiddler>!is[blank]get[text]] :else[<get.theme.metric storyminwidth>] }}}
 	storyMinWidth={{{ [convert.to.pixels<storyMinWidthValue>] }}}
-	sidebarMinWidthValue={{{ [<sidebarMinWidthTiddler>!is[blank]get[text]] :else[<get.theme.metric metrics/sidebarminwidth>] }}}
+	sidebarMinWidthValue={{{ [<sidebarMinWidthTiddler>!is[blank]get[text]] :else[<get.theme.metric sidebarminwidth>] }}}
 	sidebarMinWidth={{{ [convert.to.pixels<sidebarMinWidthValue>] }}}
 	storyPaddingLeftValue={{{ [<storyPaddingLeftTiddler>!is[blank]get[text]] :else[get.theme.metric[metrics/storypaddingleft]] }}}
 	storyPaddingLeft={{{ [convert.to.pixels<storyPaddingLeftValue>] }}}
 	storyPaddingRightValue={{{ [<storyPaddingRightTiddler>!is[blank]get[text]] :else[get.theme.metric[metrics/storypaddingright]] }}}
 	storyPaddingRight={{{ [convert.to.pixels<storyPaddingRightValue>] }}}
-	storyLeftValue={{{ [<storyLeftTiddler>!is[blank]get[text]] :else[<get.theme.metric metrics/storyleft>] }}}
+	storyLeftValue={{{ [<storyLeftTiddler>!is[blank]get[text]] :else[<get.theme.metric storyleft>] }}}
 	storyLeft={{{ [convert.to.pixels<storyLeftValue>] }}}
 	clampedDiff={{{ [<storyWidthStart>add<storyLeft>add<sidebarMinWidth>subtract<widgetNodeWidth>compare:number:gt[0]] ~0 }}}
 	storyWidthStart={{{ [<storyWidthStart>subtract<clampedDiff>] }}}
@@ -120,12 +114,12 @@ title: $:/core/macros/sidebar-resizer
 		tiddlerWidthConverted={{{ [<tiddlerWidthMetric>match[%]then<tiddlerWidth>multiply[100]divide<innerStoryWidth>] :else[function[convert.to.result],<tiddlerWidth>,<tiddlerWidthMetric>] }}}
 		tiddlerMinWidthConverted={{{ [<tiddlerWidthMetric>match[%]then<tiddlerMinWidth>multiply[100]divide<innerStoryWidth>] :else[function[convert.to.result],<tiddlerMinWidth>,<tiddlerWidthMetric>] }}}
 		tiddlerMaxWidthConverted={{{ [<tiddlerWidthMetric>match[%]then<tiddlerMaxWidth>multiply[100]divide<innerStoryWidth>] :else[function[convert.to.result],<tiddlerMaxWidth>,<tiddlerWidthMetric>] }}}
-		storyWidthSetTiddler={{{ [<storyWidthTiddler>!is[blank]] :else[<set.theme.metric metrics/storywidth>] }}}
-		tiddlerWidthSetTiddler={{{ [<tiddlerWidthTiddler>!is[blank]] :else[<set.theme.metric metrics/tiddlerwidth>] }}}
+		storyWidthSetTiddler={{{ [<storyWidthTiddler>!is[blank]] :else[<set.theme.metric storywidth>] }}}
+		tiddlerWidthSetTiddler={{{ [<tiddlerWidthTiddler>!is[blank]] :else[<set.theme.metric tiddlerwidth>] }}}
 
 		storyWidthResult={{{ [<storyWidth>compare:number:lt<storyMinWidth>then<storyMinWidthConverted>addsuffix<storyWidthMetric>] :else[<storyWidth>compare:number:gteq<storyMaxWidth>then<storyMaxWidthConverted>addsuffix<storyWidthMetric>] :else[<storyWidthConverted>addsuffix<storyWidthMetric>] }}}
 
-		tiddlerWidthResult={{{  [<tiddlerWidthMetric>match[%]then<storyWidth>compare:number:lt<storyMinWidth>then<get.theme.metric metrics/tiddlerwidth>compare:number:gteq[0]then<get.theme.metric metrics/tiddlerwidth>] :else[<tiddlerWidthMetric>match[%]then<storyWidth>compare:number:gt<storyMaxWidth>then<get.theme.metric metrics/tiddlerwidth>] :else[<tiddlerWidthMetric>!match[%]then<tiddlerWidth>compare:number:lt<tiddlerMinWidth>then<tiddlerMinWidthConverted>addsuffix<tiddlerWidthMetric>] :else[<tiddlerWidthMetric>!match[%]then<tiddlerWidth>compare:number:gteq<tiddlerMaxWidth>then<tiddlerMaxWidthConverted>addsuffix<tiddlerWidthMetric>] :else[<tiddlerWidth>compare:number:lt[0]then[0]addsuffix<tiddlerWidthMetric>] :else[<tiddlerWidthConverted>addsuffix<tiddlerWidthMetric>] }}}>
+		tiddlerWidthResult={{{  [<tiddlerWidthMetric>match[%]then<storyWidth>compare:number:lt<storyMinWidth>then<get.theme.metric tiddlerwidth>compare:number:gteq[0]then<get.theme.metric tiddlerwidth>] :else[<tiddlerWidthMetric>match[%]then<storyWidth>compare:number:gt<storyMaxWidth>then<get.theme.metric tiddlerwidth>] :else[<tiddlerWidthMetric>!match[%]then<tiddlerWidth>compare:number:lt<tiddlerMinWidth>then<tiddlerMinWidthConverted>addsuffix<tiddlerWidthMetric>] :else[<tiddlerWidthMetric>!match[%]then<tiddlerWidth>compare:number:gteq<tiddlerMaxWidth>then<tiddlerMaxWidthConverted>addsuffix<tiddlerWidthMetric>] :else[<tiddlerWidth>compare:number:lt[0]then[0]addsuffix<tiddlerWidthMetric>] :else[<tiddlerWidthConverted>addsuffix<tiddlerWidthMetric>] }}}>
 
 		<$action-setfield $tiddler=<<tiddlerWidthSetTiddler>> text=<<tiddlerWidthResult>>/>
 		<$action-setfield $tiddler=<<storyWidthSetTiddler>> text=<<storyWidthResult>>/>
@@ -137,7 +131,7 @@ title: $:/core/macros/sidebar-resizer
 		storyRiverWidthConverted={{{ [function[convert.to.result],<storyRiverWidth>,<storyRightMetric>] }}}
 		storyRiverLimitConverted={{{ [function[convert.to.result],<storyRiverLimit>,<storyRightMetric>] }}}
 		storyMinWidthAddLeftConverted={{{ [function[convert.to.result],<storyMinWidthAddLeft>,<storyRightMetric>] }}}
-		storyRightSetTiddler={{{ [<storyRightTiddler>!is[blank]] :else[<set.theme.metric metrics/storyright>] }}}
+		storyRightSetTiddler={{{ [<storyRightTiddler>!is[blank]] :else[<set.theme.metric storyright>] }}}
 
 		result={{{ [<storyRiverWidth>compare:number:lt<storyMinWidthAddLeft>then<storyMinWidthAddLeftConverted>addsuffix<storyRightMetric>] :else[<storyRiverWidth>compare:number:gteq<storyRiverLimit>then<storyRiverLimitConverted>addsuffix<storyRightMetric>] :else[<storyRiverWidthConverted>addsuffix<storyRightMetric>] }}}>
 
@@ -150,12 +144,12 @@ title: $:/core/macros/sidebar-resizer
 
 \procedure set-sidebarwidth-actions()
 <$let
-	sidebarMinWidthValue={{{ [<sidebarMinWidthTiddler>!is[blank]get[text]] :else[<get.theme.metric metrics/sidebarminwidth>] }}}
+	sidebarMinWidthValue={{{ [<sidebarMinWidthTiddler>!is[blank]get[text]] :else[<get.theme.metric sidebarminwidth>] }}}
 	sidebarWidthMetric={{$:/state/sidebar/resizing!!sidebar-width-metric}}
 	sidebarMinWidth={{{ [convert.to.pixels<sidebarMinWidthValue>] }}}
-	storyLeftValue={{{ [<storyLeftTiddler>!is[blank]get[text]] :else[<get.theme.metric metrics/storyleft>] }}}
+	storyLeftValue={{{ [<storyLeftTiddler>!is[blank]get[text]] :else[<get.theme.metric storyleft>] }}}
 	storyLeft={{{ [convert.to.pixels<storyLeftValue>] }}}
-	storyMinWidthValue={{{ [<storyMinWidthTiddler>!is[blank]get[text]] :else[<get.theme.metric metrics/storyminwidth>] }}}
+	storyMinWidthValue={{{ [<storyMinWidthTiddler>!is[blank]get[text]] :else[<get.theme.metric storyminwidth>] }}}
 	storyMinWidth={{{ [convert.to.pixels<storyMinWidthValue>] }}}
 	sidebarMaxWidth={{{ [<widgetNodeWidth>subtract<storyLeft>subtract<storyMinWidth>] }}}
 	clampedDiff={{{ [<storyLeft>add<storyMinWidth>add<startSidebarWidth>subtract<widgetNodeWidth>compare:number:gt[0]] ~0 }}}
@@ -165,7 +159,7 @@ title: $:/core/macros/sidebar-resizer
 		sidebarWidthConverted={{{ [function[convert.to.result],<sidebarWidth>,<sidebarWidthMetric>] }}}
 		sidebarMaxWidthConverted={{{ [function[convert.to.result],<sidebarMaxWidth>,<sidebarWidthMetric>] }}}
 		sidebarMinWidthConverted={{{ [function[convert.to.result],<sidebarMinWidth>,<sidebarWidthMetric>] }}}
-		sidebarWidthSetTiddler={{{ [<sidebarWidthTiddler>!is[blank]] :else[<set.theme.metric metrics/sidebarwidth>] }}}>
+		sidebarWidthSetTiddler={{{ [<sidebarWidthTiddler>!is[blank]] :else[<set.theme.metric sidebarwidth>] }}}>
 		
 		<$action-setfield $tiddler=<<sidebarWidthSetTiddler>> text={{{ [<sidebarWidth>compare:number:gteq<sidebarMaxWidth>then<sidebarMaxWidthConverted>addsuffix<sidebarWidthMetric>] :else[<sidebarWidth>compare:number:lt<sidebarMinWidth>then<sidebarMinWidthConverted>addsuffix<sidebarWidthMetric>] :else[<sidebarWidthConverted>addsuffix<sidebarWidthMetric>] }}}/>
 	</$let>
@@ -190,7 +184,7 @@ title: $:/core/macros/sidebar-resizer
 		storyWidthConverted={{{ [function[convert.to.result],<storyWidth>,<storyWidthMetric>] }}}
 		storyMinWidthConverted={{{ [function[convert.to.result],<storyMinWidth>,<storyWidthMetric>] }}}
 		storyMaxWidthConverted={{{ [function[convert.to.result],<storyMaxWidth>,<storyWidthMetric>] }}}
-		storyWidthSetTiddler={{{ [<storyWidthTiddler>!is[blank]] :else[<set.theme.metric metrics/storywidth>] }}}>
+		storyWidthSetTiddler={{{ [<storyWidthTiddler>!is[blank]] :else[<set.theme.metric storywidth>] }}}>
 
 		<$action-setfield $tiddler=<<storyWidthSetTiddler>> text={{{ [<storyWidth>compare:number:lt<storyMinWidth>then<storyMinWidthConverted>addsuffix<storyWidthMetric>] :else[<storyWidth>compare:number:gteq<storyMaxWidth>then<storyMaxWidthConverted>addsuffix<storyWidthMetric>] :else[<storyWidthConverted>addsuffix<storyWidthMetric>] }}}/>
 
@@ -205,17 +199,17 @@ title: $:/core/macros/sidebar-resizer
 <%if [[$:/state/sidebar/resizing]!is[missing]] %>
 	<$let widgetNodeWidth={{$:/state/sidebar/resizing!!widget-node-width}} dragDiff=<<get.drag.diff>> startStoryRight={{{ [convert.to.pixels{$:/state/sidebar/resizing!!start-story-right}] }}} storyRiverWidth={{{ [<startStoryRight>add<dragDiff>] }}} startSidebarWidth={{{ [convert.to.pixels{$:/state/sidebar/resizing!!start-sidebar-width}] }}} sidebarWidth={{{ [<startSidebarWidth>subtract<dragDiff>] }}}>
 		<%if [<tv-set-storywidth-storyright>match[yes]] %>
-			<<set_theme_throttling metrics/storyright>>
-			<<set_theme_throttling metrics/tiddlerwidth>>
-			<<set_theme_throttling metrics/storywidth>>
+			<<set_theme_throttling storyright>>
+			<<set_theme_throttling tiddlerwidth>>
+			<<set_theme_throttling storywidth>>
 			<<set-storywidth-storyright-actions>>
 		<% endif %>
 		<%if [<tv-set-sidebarwidth>match[yes]] %>
-			<<set_theme_throttling metrics/sidebarwidth>>
+			<<set_theme_throttling sidebarwidth>>
 			<<set-sidebarwidth-actions>>
 		<% endif %>
 		<%if [<tv-set-centralised>match[yes]] %>
-			<<set_theme_throttling metrics/storywidth>>
+			<<set_theme_throttling storywidth>>
 			<<set-centralised-actions>>
 		<% endif %>
 	</$let>
diff --git a/themes/tiddlywiki/centralised/functions.tid b/themes/tiddlywiki/centralised/functions.tid
index dae942c87..fb26e00de 100644
--- a/themes/tiddlywiki/centralised/functions.tid
+++ b/themes/tiddlywiki/centralised/functions.tid
@@ -2,4 +2,7 @@ title: $:/themes/tiddlywiki/centralised/functions
 
 \function set.centralised() yes
 \function set.storywidth.storyright() no
-\function set.sidebarwidth() no
\ No newline at end of file
+\function set.sidebarwidth() no
+
+\function sidebar.resizer.maxwidth() 21px
+\function sidebar.resizer.width() [[min(calc(]addsuffix<get.theme.metric storypaddingright>addsuffix[ / 2),]addsuffix<sidebar.resizer.maxwidth>addsuffix[)]]
diff --git a/themes/tiddlywiki/centralised/styles.tid b/themes/tiddlywiki/centralised/styles.tid
index 72a80e8c6..0271a512a 100644
--- a/themes/tiddlywiki/centralised/styles.tid
+++ b/themes/tiddlywiki/centralised/styles.tid
@@ -53,12 +53,4 @@ tags: [[$:/tags/Stylesheet]]
 		width: 100%;
 	}
 
-	html .tc-sidebar-resizer {
-		left: min(calc(50% + ({{$:/themes/tiddlywiki/centralised/metrics/storywidth}} / 2) - (2 * {{$:/themes/tiddlywiki/centralised/metrics/storypaddingright}} / 3)),calc(100% - {{$:/themes/tiddlywiki/centralised/metrics/sidebarminwidth}} - (2 * {{$:/themes/tiddlywiki/centralised/metrics/storypaddingright}} / 3)));
-	}
-
-	html body.tc-body .tc-sidebar-left .tc-sidebar-resizer {
-		left: auto;
-		right: min(calc(50% + ({{$:/themes/tiddlywiki/centralised/metrics/storywidth}} / 2) - (2 * {{$:/themes/tiddlywiki/centralised/metrics/storypaddingright}} / 3)),calc(100% - {{$:/themes/tiddlywiki/centralised/metrics/sidebarminwidth}} - (2 * {{$:/themes/tiddlywiki/centralised/metrics/storypaddingright}} / 3)));
-	}
 }
diff --git a/themes/tiddlywiki/tight-heavier/metrics.multids b/themes/tiddlywiki/tight-heavier/metrics.multids
deleted file mode 100644
index b4b9019d9..000000000
--- a/themes/tiddlywiki/tight-heavier/metrics.multids
+++ /dev/null
@@ -1,8 +0,0 @@
-title: $:/themes/tiddlywiki/tight-heavier/metrics/
-
-sidebarwidth: 350px
-storypaddingleft: 0px
-storypaddingright: 0px
-storyright: 770px
-storywidth: 770px
-tiddlerwidth: 770px
diff --git a/themes/tiddlywiki/tight/base.tid b/themes/tiddlywiki/tight/base.tid
index 1236597c5..5e8ff337a 100644
--- a/themes/tiddlywiki/tight/base.tid
+++ b/themes/tiddlywiki/tight/base.tid
@@ -1,8 +1,6 @@
 title: $:/themes/tiddlywiki/tight/base
 tags: [[$:/tags/Stylesheet]]
 
-\function get.theme.metric(metric) [{$:/theme}addsuffix[/]addsuffix<metric>get[text]] ~[[$:/themes/tiddlywiki/vanilla/]addsuffix<metric>get[text]]
-
 \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline conditional
 
 @media (max-width: {{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}}) {
@@ -29,7 +27,7 @@ tags: [[$:/tags/Stylesheet]]
 	}
 
 	html body.tc-body section.tc-story-river {
-		padding: 0px <<get.theme.metric metrics/storypaddingright>> 0px <<get.theme.metric metrics/storypaddingleft>>;
+		padding: 0px <<get.theme.metric storypaddingright>> 0px <<get.theme.metric storypaddingleft>>;
 	}
 
 	html body.tc-body div.tc-tiddler-frame {
@@ -51,12 +49,12 @@ tags: [[$:/tags/Stylesheet]]
 	<%if [{$:/themes/tiddlywiki/vanilla/options/sidebarlayout}match[fixed-fluid]] %>
 
 		html body.tc-body div.tc-sidebar-scrollable {
-			left: clamp(calc({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}} + 42px),calc(<<get.theme.metric metrics/storyright>> + 42px),calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}} + 42px));
+			left: clamp(calc({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}} + 42px),calc(<<get.theme.metric storyright>> + 42px),calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}} + 42px));
 		}
 
 		html body.tc-body .tc-sidebar-left div.tc-sidebar-scrollable {
 			left: 0;
-			right: clamp(calc({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}} + 42px),calc(<<get.theme.metric metrics/storyright>> + 42px),calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}} + 42px));
+			right: clamp(calc({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}} + 42px),calc(<<get.theme.metric storyright>> + 42px),calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}} + 42px));
 		}
 
 	<% endif %>
@@ -121,24 +119,24 @@ tags: [[$:/tags/Stylesheet]]
 	html body.tc-body .tc-sidebar-resizer {
 		width: 12px;
 		right: auto;
-		left: clamp(calc({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}}),clamp(calc(<<get.theme.metric metrics/storywidth>>),max(calc({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + <<get.theme.metric metrics/storywidth>>),calc(<<get.theme.metric metrics/storyright>>)),max(calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}} + ({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + <<get.theme.metric metrics/storywidth>> - <<get.theme.metric metrics/storyright>>)),calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}}))),calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}}));
+		left: clamp(calc({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}}),clamp(calc(<<get.theme.metric storywidth>>),max(calc({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + <<get.theme.metric storywidth>>),calc(<<get.theme.metric storyright>>)),max(calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}} + ({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + <<get.theme.metric storywidth>> - <<get.theme.metric storyright>>)),calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}}))),calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}}));
 	}
 
 	html body.tc-body .tc-sidebar-left .tc-sidebar-resizer {
 		left: auto;
-		right: clamp(calc({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}}),clamp(calc(<<get.theme.metric metrics/storywidth>>),max(calc({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + <<get.theme.metric metrics/storywidth>>),calc(<<get.theme.metric metrics/storyright>>)),max(calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}} + ({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + <<get.theme.metric metrics/storywidth>> - <<get.theme.metric metrics/storyright>>)),calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}}))),calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}}));
+		right: clamp(calc({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}}),clamp(calc(<<get.theme.metric storywidth>>),max(calc({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + <<get.theme.metric storywidth>>),calc(<<get.theme.metric storyright>>)),max(calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}} + ({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + <<get.theme.metric storywidth>> - <<get.theme.metric storyright>>)),calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}}))),calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}}));
 	}
 
 	<%if [{$:/themes/tiddlywiki/vanilla/options/sidebarlayout}match[fluid-fixed]] %>
 
 		html body.tc-body .tc-sidebar-resizer {
-			left: clamp(calc({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}}),calc(100% - <<get.theme.metric metrics/sidebarwidth>>),calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}}));
+			left: clamp(calc({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}}),calc(100% - <<get.theme.metric sidebarwidth>>),calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}}));
 			right: auto;
 		}
 
 		html body.tc-body .tc-sidebar-left .tc-sidebar-resizer {
 			left: auto;
-			right: clamp(calc({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}}),calc(100% - <<get.theme.metric metrics/sidebarwidth>>),calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}}));
+			right: clamp(calc({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}}),calc(100% - <<get.theme.metric sidebarwidth>>),calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}}));
 		}
 
 	<% endif %>
diff --git a/themes/tiddlywiki/tight/functions.tid b/themes/tiddlywiki/tight/functions.tid
new file mode 100644
index 000000000..d01adc7ec
--- /dev/null
+++ b/themes/tiddlywiki/tight/functions.tid
@@ -0,0 +1,8 @@
+title: $:/themes/tiddlywiki/tight/functions
+
+\function set.centralised() no
+\function set.storywidth.storyright() [{$:/themes/tiddlywiki/vanilla/options/sidebarlayout}match[fixed-fluid]then[yes]] :else[[no]]
+\function set.sidebarwidth() [{$:/themes/tiddlywiki/vanilla/options/sidebarlayout}match[fluid-fixed]then[yes]] :else[[no]]
+
+\function sidebar.resizer.maxwidth() 12px
+\function sidebar.resizer.width() <<sidebar.resizer.maxwidth>>
diff --git a/themes/tiddlywiki/vanilla/ThemeTweaks.tid b/themes/tiddlywiki/vanilla/ThemeTweaks.tid
index ccaff266c..6ea3c4a95 100644
--- a/themes/tiddlywiki/vanilla/ThemeTweaks.tid
+++ b/themes/tiddlywiki/vanilla/ThemeTweaks.tid
@@ -4,8 +4,6 @@ caption: {{$:/language/ThemeTweaks/ThemeTweaks}}
 
 \define lingo-base() $:/language/ThemeTweaks/
 
-\function get.theme(metric) [{$:/theme}addsuffix[/]addsuffix<metric>!is[missing]] ~[{$:/theme}addsuffix[/]addsuffix<metric>is[shadow]] ~[[$:/themes/tiddlywiki/vanilla/]addsuffix<metric>]
-
 \define replacement-text()
 [img[$(imageTitle)$]]
 \end
@@ -70,18 +68,18 @@ caption: {{$:/language/ThemeTweaks/ThemeTweaks}}
 
 <<lingo Metrics/SidebarResizer/Hint>>
 
-|<$link to=<<get.theme metrics/fontsize>>><<lingo Metrics/FontSize>></$link> |<$edit-text tiddler=<<get.theme metrics/fontsize>> default="" tag="input"/> |
-|<$link to=<<get.theme metrics/lineheight>>><<lingo Metrics/LineHeight>></$link> |<$edit-text tiddler=<<get.theme metrics/lineheight>> default="" tag="input"/> |
-|<$link to=<<get.theme metrics/bodyfontsize>>><<lingo Metrics/BodyFontSize>></$link> |<$edit-text tiddler=<<get.theme metrics/bodyfontsize>> default="" tag="input"/> |
-|<$link to=<<get.theme metrics/bodylineheight>>><<lingo Metrics/BodyLineHeight>></$link> |<$edit-text tiddler=<<get.theme metrics/bodylineheight>> default="" tag="input"/> |
-|<$link to=<<get.theme metrics/storyleft>>><<lingo Metrics/StoryLeft>></$link><br>//<<lingo Metrics/StoryLeft/Hint>>// |^<$edit-text tiddler=<<get.theme metrics/storyleft>> default="" tag="input"/> |
-|<$link to=<<get.theme metrics/storytop>>><<lingo Metrics/StoryTop>></$link><br>//<<lingo Metrics/StoryTop/Hint>>// |^<$edit-text tiddler=<<get.theme metrics/storytop>> default="" tag="input"/> |
-|<$link to=<<get.theme metrics/storyright>>><<lingo Metrics/StoryRight>></$link><br>//<<lingo Metrics/StoryRight/Hint>>// |^<$edit-text tiddler=<<get.theme metrics/storyright>> default="" tag="input"/> |
-|<$link to=<<get.theme metrics/storywidth>>><<lingo Metrics/StoryWidth>></$link><br>//<<lingo Metrics/StoryWidth/Hint>>// |^<$edit-text tiddler=<<get.theme metrics/storywidth>> default="" tag="input"/> |
-|<$link to=<<get.theme metrics/storyminwidth>>><<lingo Metrics/StoryMinWidth>></$link><br>//<<lingo Metrics/StoryMinWidth/Hint>>// |^<$edit-text tiddler=<<get.theme metrics/storyminwidth>> default="" tag="input"/> |
-|<$link to=<<get.theme metrics/storypaddingleft>>><<lingo Metrics/StoryPaddingLeft>></$link><br>//<<lingo Metrics/StoryPaddingLeft/Hint>>// |^<$edit-text tiddler=<<get.theme metrics/storypaddingleft>> default="" tag="input"/> |
-|<$link to=<<get.theme metrics/storypaddingright>>><<lingo Metrics/StoryPaddingRight>></$link><br>//<<lingo Metrics/StoryPaddingRight/Hint>>// |^<$edit-text tiddler=<<get.theme metrics/storypaddingright>> default="" tag="input"/> |
-|<$link to=<<get.theme metrics/tiddlerwidth>>><<lingo Metrics/TiddlerWidth>></$link><br>//<<lingo Metrics/TiddlerWidth/Hint>>//<br> |^<$edit-text tiddler=<<get.theme metrics/tiddlerwidth>> default="" tag="input"/> |
-|<$link to=<<get.theme metrics/sidebarbreakpoint>>><<lingo Metrics/SidebarBreakpoint>></$link><br>//<<lingo Metrics/SidebarBreakpoint/Hint>>// |^<$edit-text tiddler=<<get.theme metrics/sidebarbreakpoint>> default="" tag="input"/> |
-|<$link to=<<get.theme metrics/sidebarwidth>>><<lingo Metrics/SidebarWidth>></$link><br>//<<lingo Metrics/SidebarWidth/Hint>>// |^<$edit-text tiddler=<<get.theme metrics/sidebarwidth>> default="" tag="input"/> |
-|<$link to=<<get.theme metrics/sidebarminwidth>>><<lingo Metrics/SidebarMinWidth>></$link><br>//<<lingo Metrics/SidebarMinWidth/Hint>>// |^<$edit-text tiddler=<<get.theme metrics/sidebarminwidth>> default="" tag="input"/> |
+|<$link to=<<get.theme fontsize>>><<lingo Metrics/FontSize>></$link> |<$edit-text tiddler=<<get.theme fontsize>> default="" tag="input"/> |
+|<$link to=<<get.theme lineheight>>><<lingo Metrics/LineHeight>></$link> |<$edit-text tiddler=<<get.theme lineheight>> default="" tag="input"/> |
+|<$link to=<<get.theme bodyfontsize>>><<lingo Metrics/BodyFontSize>></$link> |<$edit-text tiddler=<<get.theme bodyfontsize>> default="" tag="input"/> |
+|<$link to=<<get.theme bodylineheight>>><<lingo Metrics/BodyLineHeight>></$link> |<$edit-text tiddler=<<get.theme bodylineheight>> default="" tag="input"/> |
+|<$link to=<<get.theme storyleft>>><<lingo Metrics/StoryLeft>></$link><br>//<<lingo Metrics/StoryLeft/Hint>>// |^<$edit-text tiddler=<<get.theme storyleft>> default="" tag="input"/> |
+|<$link to=<<get.theme storytop>>><<lingo Metrics/StoryTop>></$link><br>//<<lingo Metrics/StoryTop/Hint>>// |^<$edit-text tiddler=<<get.theme storytop>> default="" tag="input"/> |
+|<$link to=<<get.theme storyright>>><<lingo Metrics/StoryRight>></$link><br>//<<lingo Metrics/StoryRight/Hint>>// |^<$edit-text tiddler=<<get.theme storyright>> default="" tag="input"/> |
+|<$link to=<<get.theme storywidth>>><<lingo Metrics/StoryWidth>></$link><br>//<<lingo Metrics/StoryWidth/Hint>>// |^<$edit-text tiddler=<<get.theme storywidth>> default="" tag="input"/> |
+|<$link to=<<get.theme storyminwidth>>><<lingo Metrics/StoryMinWidth>></$link><br>//<<lingo Metrics/StoryMinWidth/Hint>>// |^<$edit-text tiddler=<<get.theme storyminwidth>> default="" tag="input"/> |
+|<$link to=<<get.theme storypaddingleft>>><<lingo Metrics/StoryPaddingLeft>></$link><br>//<<lingo Metrics/StoryPaddingLeft/Hint>>// |^<$edit-text tiddler=<<get.theme storypaddingleft>> default="" tag="input"/> |
+|<$link to=<<get.theme storypaddingright>>><<lingo Metrics/StoryPaddingRight>></$link><br>//<<lingo Metrics/StoryPaddingRight/Hint>>// |^<$edit-text tiddler=<<get.theme storypaddingright>> default="" tag="input"/> |
+|<$link to=<<get.theme tiddlerwidth>>><<lingo Metrics/TiddlerWidth>></$link><br>//<<lingo Metrics/TiddlerWidth/Hint>>//<br> |^<$edit-text tiddler=<<get.theme tiddlerwidth>> default="" tag="input"/> |
+|<$link to=<<get.theme sidebarbreakpoint>>><<lingo Metrics/SidebarBreakpoint>></$link><br>//<<lingo Metrics/SidebarBreakpoint/Hint>>// |^<$edit-text tiddler=<<get.theme sidebarbreakpoint>> default="" tag="input"/> |
+|<$link to=<<get.theme sidebarwidth>>><<lingo Metrics/SidebarWidth>></$link><br>//<<lingo Metrics/SidebarWidth/Hint>>// |^<$edit-text tiddler=<<get.theme sidebarwidth>> default="" tag="input"/> |
+|<$link to=<<get.theme sidebarminwidth>>><<lingo Metrics/SidebarMinWidth>></$link><br>//<<lingo Metrics/SidebarMinWidth/Hint>>// |^<$edit-text tiddler=<<get.theme sidebarminwidth>> default="" tag="input"/> |
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index 747d650a0..f6df2ffbd 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -3,8 +3,6 @@ tags: [[$:/tags/Stylesheet]]
 list-before:
 code-body: yes
 
-\function get.theme.metric(metric) [{$:/theme}addsuffix[/]addsuffix<metric>get[text]] ~[[$:/themes/tiddlywiki/vanilla/]addsuffix<metric>get[text]]
-
 \define custom-background-datauri()
 <$set name="background" value={{$:/themes/tiddlywiki/vanilla/settings/backgroundimage}}>
 <$list filter="[<background>is[image]]">
@@ -1029,7 +1027,7 @@ button.tc-btn-invisible.tc-remove-tag-button {
 	.tc-sidebar-scrollable {
 		position: fixed;
 		top: {{$:/themes/tiddlywiki/vanilla/metrics/storytop}};
-		left: clamp(calc({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}}),<<get.theme.metric metrics/storyright>>,calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}}));
+		left: clamp(calc({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}}),<<get.theme.metric storyright>>,calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}}));
 		bottom: 0;
 		right: 0;
 		overflow-y: auto;
@@ -1041,7 +1039,7 @@ button.tc-btn-invisible.tc-remove-tag-button {
 
 	.tc-sidebar-left .tc-sidebar-scrollable {
 		left: 0;
-		right: clamp(calc({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}}),<<get.theme.metric metrics/storyright>>,calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}}));
+		right: clamp(calc({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}}),<<get.theme.metric storyright>>,calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}}));
 		margin: 0 0 0 0;
 	}
 
@@ -1056,14 +1054,14 @@ button.tc-btn-invisible.tc-remove-tag-button {
 
 	.tc-story-river {
 		left: max(0px,{{$:/themes/tiddlywiki/vanilla/metrics/storyleft}});
-		right: clamp(calc({{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}} - {{$:/themes/tiddlywiki/vanilla/metrics/storyleft}}),calc(100% - <<get.theme.metric metrics/storywidth>> - {{$:/themes/tiddlywiki/vanilla/metrics/storyleft}}),calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}}));
+		right: clamp(calc({{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}} - {{$:/themes/tiddlywiki/vanilla/metrics/storyleft}}),calc(100% - <<get.theme.metric storywidth>> - {{$:/themes/tiddlywiki/vanilla/metrics/storyleft}}),calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}}));
 		top: {{$:/themes/tiddlywiki/vanilla/metrics/storytop}};
-		width: clamp({{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}},<<get.theme.metric metrics/storywidth>>,calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}}));
+		width: clamp({{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}},<<get.theme.metric storywidth>>,calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}}));
 		padding: 42px {{$:/themes/tiddlywiki/vanilla/metrics/storypaddingright}} 42px {{$:/themes/tiddlywiki/vanilla/metrics/storypaddingleft}};
 	}
 
 	.tc-sidebar-left .tc-story-river {
-		left: clamp({{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}},calc(100% - <<get.theme.metric metrics/storywidth>> - {{$:/themes/tiddlywiki/vanilla/metrics/storyleft}}),calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}}));
+		left: clamp({{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}},calc(100% - <<get.theme.metric storywidth>> - {{$:/themes/tiddlywiki/vanilla/metrics/storyleft}}),calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}}));
 		right: max(0px,{{$:/themes/tiddlywiki/vanilla/metrics/storyleft}});
 	}
 
@@ -1188,7 +1186,7 @@ button.tc-btn-invisible.tc-remove-tag-button {
 @media (min-width: <<sidebarbreakpoint>>) {
 	.tc-tiddler-frame {
 		padding: 28px 42px 42px 42px;
-		width: clamp(0px,<<get.theme.metric metrics/tiddlerwidth>>,100%);
+		width: clamp(0px,<<get.theme.metric tiddlerwidth>>,100%);
 		border-radius: 2px;
 	}
 
@@ -1519,15 +1517,15 @@ html body.tc-body.tc-single-tiddler-window {
 		width: auto;
 		left: 0;
 		margin-left: max(0px,{{$:/themes/tiddlywiki/vanilla/metrics/storyleft}});
-		margin-right: clamp({{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}},<<get.theme.metric metrics/sidebarwidth>>,calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} - {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}}));
+		margin-right: clamp({{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}},<<get.theme.metric sidebarwidth>>,calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} - {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}}));
 	}
 
 	.tc-sidebar-left .tc-story-river {
 		margin-right: max(0px,{{$:/themes/tiddlywiki/vanilla/metrics/storyleft}});
-		margin-left: clamp({{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}},<<get.theme.metric metrics/sidebarwidth>>,calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} - {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}}));
+		margin-left: clamp({{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}},<<get.theme.metric sidebarwidth>>,calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} - {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}}));
 		left: auto;
 		right: 0;
-		padding-right: <<get.theme.metric metrics/storypaddingright>>;
+		padding-right: <<get.theme.metric storypaddingright>>;
 		padding-left: 0;
 	}
 
@@ -1544,7 +1542,7 @@ html body.tc-body.tc-single-tiddler-window {
 		left: auto;
 		bottom: 0;
 		right: 0;
-		width: clamp({{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}},<<get.theme.metric metrics/sidebarwidth>>,(100% - {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}} - {{$:/themes/tiddlywiki/vanilla/metrics/storyleft}}));
+		width: clamp({{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}},<<get.theme.metric sidebarwidth>>,(100% - {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}} - {{$:/themes/tiddlywiki/vanilla/metrics/storyleft}}));
 	}
 
 	.tc-sidebar-left .tc-sidebar-scrollable {
@@ -1574,13 +1572,13 @@ html body.tc-body.tc-single-tiddler-window {
 	}
 
 	.tc-sidebar-left .tc-story-river {
-		margin-left: max(<<get.theme.metric metrics/storypaddingleft>>,calc(<<get.theme.metric metrics/storypaddingleft>> + {{$:/themes/tiddlywiki/vanilla/metrics/storyleft}}));
+		margin-left: max(<<get.theme.metric storypaddingleft>>,calc(<<get.theme.metric storypaddingleft>> + {{$:/themes/tiddlywiki/vanilla/metrics/storyleft}}));
 		margin-right: 0;
 	}
 
 	html[dir="rtl"] .tc-sidebar-left .tc-story-river {
 		margin-left: 0;
-		margin-right: max(<<get.theme.metric metrics/storypaddingleft>>,calc(<<get.theme.metric metrics/storypaddingleft>> + {{$:/themes/tiddlywiki/vanilla/metrics/storyleft}}));
+		margin-right: max(<<get.theme.metric storypaddingleft>>,calc(<<get.theme.metric storypaddingleft>> + {{$:/themes/tiddlywiki/vanilla/metrics/storyleft}}));
 	}
 
 	body.tc-body .tc-page-container.tc-page-view-zoomin .tc-tiddler-frame {
diff --git a/themes/tiddlywiki/vanilla/functions.tid b/themes/tiddlywiki/vanilla/functions.tid
index 2896975a8..de016d109 100644
--- a/themes/tiddlywiki/vanilla/functions.tid
+++ b/themes/tiddlywiki/vanilla/functions.tid
@@ -2,4 +2,7 @@ title: $:/themes/tiddlywiki/vanilla/functions
 
 \function set.centralised() no
 \function set.storywidth.storyright() [{$:/themes/tiddlywiki/vanilla/options/sidebarlayout}match[fixed-fluid]then[yes]] :else[[no]]
-\function set.sidebarwidth() [{$:/themes/tiddlywiki/vanilla/options/sidebarlayout}match[fluid-fixed]then[yes]] :else[[no]]
\ No newline at end of file
+\function set.sidebarwidth() [{$:/themes/tiddlywiki/vanilla/options/sidebarlayout}match[fluid-fixed]then[yes]] :else[[no]]
+
+\function sidebar.resizer.maxwidth() 21px
+\function sidebar.resizer.width() [[min(calc(]addsuffix<get.theme.metric storypaddingright>addsuffix[ / 2),]addsuffix<sidebar.resizer.maxwidth>addsuffix[)]]
diff --git a/themes/tiddlywiki/vanilla/sidebar-resizer-ui.tid b/themes/tiddlywiki/vanilla/sidebar-resizer-ui.tid
index 6b8ecf0ef..adf1d0256 100644
--- a/themes/tiddlywiki/vanilla/sidebar-resizer-ui.tid
+++ b/themes/tiddlywiki/vanilla/sidebar-resizer-ui.tid
@@ -2,7 +2,7 @@ title: $:/themes/tiddlywiki/vanilla/ui/sidebar-resizer
 tags: $:/tags/PageTemplate
 list-after: $:/core/ui/PageTemplate/story
 
-\import [{$:/theme}addsuffix[/functions]!is[missing]else{$:/theme}addsuffix[/functions]is[shadow]else[$:/themes/tiddlywiki/vanilla/functions]] [[$:/core/macros/sidebar-resizer]]
+\import [function[get.base.functions.theme],{$:/theme}!is[missing]] :else[function[get.base.functions.theme],{$:/theme}is[shadow]] :else[[$:/themes/tiddlywiki/vanilla/functions]] [[$:/core/macros/sidebar-resizer]]
 \whitespace trim
 
 <%if [{$:/themes/tiddlywiki/vanilla/options/sidebarresizer}match[show]] %>
diff --git a/themes/tiddlywiki/vanilla/sidebar-resizer.tid b/themes/tiddlywiki/vanilla/sidebar-resizer.tid
index 6f40cd83b..e9e2db853 100644
--- a/themes/tiddlywiki/vanilla/sidebar-resizer.tid
+++ b/themes/tiddlywiki/vanilla/sidebar-resizer.tid
@@ -2,12 +2,12 @@ title: $:/themes/tiddlywiki/vanilla/sidebar-resizer
 tags: [[$:/tags/Stylesheet]]
 code-body: yes
 
+\import [function[get.base.functions.theme],{$:/theme}!is[missing]] :else[function[get.base.functions.theme],{$:/theme}is[shadow]] :else[[$:/themes/tiddlywiki/vanilla/functions]]
+
 \function sidebarbreakpoint() [{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}]
 
 \function sidebarbreakpoint-minus-one() [{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}removesuffix[px]subtract[1]addsuffix[px]] ~[{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}]
 
-\function get.theme.metric(metric) [{$:/theme}addsuffix[/]addsuffix<metric>get[text]] ~[[$:/themes/tiddlywiki/vanilla/]addsuffix<metric>get[text]]
-
 \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline macrocallblock conditional
 
 @media (min-width: <<sidebarbreakpoint>>) {
@@ -16,7 +16,7 @@ code-body: yes
 		position: fixed;
 		top: 0;
 		height: 100%;
-		width: min(calc(<<get.theme.metric metrics/storypaddingright>> / 2),21px);
+		width: <<sidebar.resizer.width>>;
 		transition: opacity 100ms;
 		opacity: 0.1;
 		cursor: ew-resize;
@@ -82,29 +82,42 @@ code-body: yes
 
 	<% endif %>
 
-	<%if [{$:/theme}!match[$:/themes/tiddlywiki/centralised]] %>
+	<%if [<set.storywidth.storyright>match[yes]] %>
 
 		.tc-sidebar-resizer {
-			left: clamp(calc({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}} - (2 * {{$:/themes/tiddlywiki/vanilla/metrics/storypaddingright}} / 3)),clamp(calc({{$:/themes/tiddlywiki/vanilla/metrics/storywidth}} - (2 * {{$:/themes/tiddlywiki/vanilla/metrics/storypaddingright}} / 3)),max(calc({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + {{$:/themes/tiddlywiki/vanilla/metrics/storywidth}} - (2 * {{$:/themes/tiddlywiki/vanilla/metrics/storypaddingright}} / 3)),calc({{$:/themes/tiddlywiki/vanilla/metrics/storyright}} - (2 * {{$:/themes/tiddlywiki/vanilla/metrics/storypaddingright}} / 3))),max(calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}} - (2 * {{$:/themes/tiddlywiki/vanilla/metrics/storypaddingright}} / 3) + ({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + {{$:/themes/tiddlywiki/vanilla/metrics/storywidth}} - {{$:/themes/tiddlywiki/vanilla/metrics/storyright}})),calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}} - (2 * {{$:/themes/tiddlywiki/vanilla/metrics/storypaddingright}} / 3)))),calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}} - (2 * {{$:/themes/tiddlywiki/vanilla/metrics/storypaddingright}} / 3)));
+			left: clamp(calc(<<get.theme.metric storyleft>> + <<get.theme.metric storyminwidth>> - (2 * <<get.theme.metric storypaddingright>> / 3)),clamp(calc(<<get.theme.metric storywidth>> - (2 * <<get.theme.metric storypaddingright>> / 3)),max(calc(<<get.theme.metric storyleft>> + <<get.theme.metric storywidth>> - (2 * <<get.theme.metric storypaddingright>> / 3)),calc(<<get.theme.metric storyright>> - (2 * <<get.theme.metric storypaddingright>> / 3))),max(calc(100% - <<get.theme.metric sidebarminwidth>> - (2 * <<get.theme.metric storypaddingright>> / 3) + (<<get.theme.metric storyleft>> + <<get.theme.metric storywidth>> - <<get.theme.metric storyright>>)),calc(100% - <<get.theme.metric sidebarminwidth>> - (2 * <<get.theme.metric storypaddingright>> / 3)))),calc(100% - <<get.theme.metric sidebarminwidth>> - (2 * <<get.theme.metric storypaddingright>> / 3)));
 		}
 
 		.tc-sidebar-left .tc-sidebar-resizer {
 			left: auto;
-			right: clamp(calc({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}} - (2 * {{$:/themes/tiddlywiki/vanilla/metrics/storypaddingright}} / 3)),clamp(calc({{$:/themes/tiddlywiki/vanilla/metrics/storywidth}} - (2 * {{$:/themes/tiddlywiki/vanilla/metrics/storypaddingright}} / 3)),max(calc({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + {{$:/themes/tiddlywiki/vanilla/metrics/storywidth}} - (2 * {{$:/themes/tiddlywiki/vanilla/metrics/storypaddingright}} / 3)),calc({{$:/themes/tiddlywiki/vanilla/metrics/storyright}} - (2 * {{$:/themes/tiddlywiki/vanilla/metrics/storypaddingright}} / 3))),max(calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}} - (2 * {{$:/themes/tiddlywiki/vanilla/metrics/storypaddingright}} / 3) + ({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + {{$:/themes/tiddlywiki/vanilla/metrics/storywidth}} - {{$:/themes/tiddlywiki/vanilla/metrics/storyright}})),calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}} - (2 * {{$:/themes/tiddlywiki/vanilla/metrics/storypaddingright}} / 3)))),calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}} - (2 * {{$:/themes/tiddlywiki/vanilla/metrics/storypaddingright}} / 3)));
+			right: clamp(calc(<<get.theme.metric storyleft>> + <<get.theme.metric storyminwidth>> - (2 * <<get.theme.metric storypaddingright>> / 3)),clamp(calc(<<get.theme.metric storywidth>> - (2 * <<get.theme.metric storypaddingright>> / 3)),max(calc(<<get.theme.metric storyleft>> + <<get.theme.metric storywidth>> - (2 * <<get.theme.metric storypaddingright>> / 3)),calc(<<get.theme.metric storyright>> - (2 * <<get.theme.metric storypaddingright>> / 3))),max(calc(100% - <<get.theme.metric sidebarminwidth>> - (2 * <<get.theme.metric storypaddingright>> / 3) + (<<get.theme.metric storyleft>> + <<get.theme.metric storywidth>> - <<get.theme.metric storyright>>)),calc(100% - <<get.theme.metric sidebarminwidth>> - (2 * <<get.theme.metric storypaddingright>> / 3)))),calc(100% - <<get.theme.metric sidebarminwidth>> - (2 * <<get.theme.metric storypaddingright>> / 3)));
 		}
 
-		<%if [{$:/themes/tiddlywiki/vanilla/options/sidebarlayout}match[fluid-fixed]] %>
+	<% endif %>
 
-			.tc-sidebar-resizer {
-				left: clamp(calc({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}} + ({{$:/themes/tiddlywiki/vanilla/metrics/storypaddingright}} / 3)),calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarwidth}} + ({{$:/themes/tiddlywiki/vanilla/metrics/storypaddingright}} / 3)),calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}} + ({{$:/themes/tiddlywiki/vanilla/metrics/storypaddingright}} / 3)));
-			}
+	<%if [<set.sidebarwidth>match[yes]] %>
 
-			.tc-sidebar-left .tc-sidebar-resizer {
-				left: auto;
-				right: clamp(calc({{$:/themes/tiddlywiki/vanilla/metrics/storyleft}} + {{$:/themes/tiddlywiki/vanilla/metrics/storyminwidth}} + ({{$:/themes/tiddlywiki/vanilla/metrics/storypaddingright}} / 3)),calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarwidth}} + ({{$:/themes/tiddlywiki/vanilla/metrics/storypaddingright}} / 3)),calc(100% - {{$:/themes/tiddlywiki/vanilla/metrics/sidebarminwidth}} + ({{$:/themes/tiddlywiki/vanilla/metrics/storypaddingright}} / 3)));
-			}
+		.tc-sidebar-resizer {
+			left: clamp(calc(<<get.theme.metric storyleft>> + <<get.theme.metric storyminwidth>> + (<<get.theme.metric storypaddingright>> / 3)),calc(100% - <<get.theme.metric sidebarwidth>> + (<<get.theme.metric storypaddingright>> / 3)),calc(100% - <<get.theme.metric sidebarminwidth>> + (<<get.theme.metric storypaddingright>> / 3)));
+		}
 
-		<% endif %>
+		.tc-sidebar-left .tc-sidebar-resizer {
+			left: auto;
+			right: clamp(calc(<<get.theme.metric storyleft>> + <<get.theme.metric storyminwidth>> + (<<get.theme.metric storypaddingright>> / 3)),calc(100% - <<get.theme.metric sidebarwidth>> + (<<get.theme.metric storypaddingright>> / 3)),calc(100% - <<get.theme.metric sidebarminwidth>> + (<<get.theme.metric storypaddingright>> / 3)));
+		}
+
+	<% endif %>
+
+	<%if [<set.centralised>match[yes]] %>
+
+		.tc-sidebar-resizer {
+			left: min(calc(50% + (<<get.theme.metric storywidth>> / 2) - (2 * <<get.theme.metric storypaddingright>> / 3)),calc(100% - <<get.theme.metric sidebarminwidth>> - (2 * <<get.theme.metric storypaddingright>> / 3)));
+		}
+
+		.tc-sidebar-left .tc-sidebar-resizer {
+			left: auto;
+			right: min(calc(50% + (<<get.theme.metric storywidth>> / 2) - (2 * <<get.theme.metric storypaddingright>> / 3)),calc(100% - <<get.theme.metric sidebarminwidth>> - (2 * <<get.theme.metric storypaddingright>> / 3)));
+		}
 
 	<% endif %>