diff --git a/core/ui/PageTemplate/alerts.tid b/core/ui/PageTemplate/alerts.tid
index 16b7f1238..e468fb65b 100644
--- a/core/ui/PageTemplate/alerts.tid
+++ b/core/ui/PageTemplate/alerts.tid
@@ -1,7 +1,7 @@
 title: $:/core/ui/PageTemplate/alerts
 tags: $:/tags/PageTemplate
 
-<$refresh-blocker refreshBlockerList="[[$:/state/sidebar/dimensions]] [[$:/state/sidebar/resizing]]" enabled="yes">
+<$refresh-blocker refreshBlockerList="[[$:/state/sidebar/dimensions]] [[$:/state/sidebar/resizing]]">
 
 <div class="tc-alerts">
 
diff --git a/core/ui/PageTemplate/drafts.tid b/core/ui/PageTemplate/drafts.tid
index adb6232ed..e595e6abc 100644
--- a/core/ui/PageTemplate/drafts.tid
+++ b/core/ui/PageTemplate/drafts.tid
@@ -2,7 +2,7 @@ title: $:/core/ui/PageTemplate/drafts
 tags: $:/tags/PageTemplate
 
 \whitespace trim
-<$refresh-blocker refreshBlockerList="[[$:/state/sidebar/dimensions]] [[$:/state/sidebar/resizing]]" enabled="yes">
+<$refresh-blocker refreshBlockerList="[[$:/state/sidebar/dimensions]] [[$:/state/sidebar/resizing]]">
 <$reveal state="$:/status/IsReadOnly" type="nomatch" text="yes" tag="div" class="tc-drafts-list">
 <$list filter="[has[draft.of]!sort[modified]] -[list[$:/StoryList]]">
 <$link>
diff --git a/core/ui/PageTemplate/pluginreloadwarning.tid b/core/ui/PageTemplate/pluginreloadwarning.tid
index 598bbddbb..4e99096ff 100644
--- a/core/ui/PageTemplate/pluginreloadwarning.tid
+++ b/core/ui/PageTemplate/pluginreloadwarning.tid
@@ -3,7 +3,7 @@ tags: $:/tags/PageTemplate
 
 \define lingo-base() $:/language/
 
-<$refresh-blocker refreshBlockerList="[[$:/state/sidebar/dimensions]] [[$:/state/sidebar/resizing]]" enabled="yes">
+<$refresh-blocker refreshBlockerList="[[$:/state/sidebar/dimensions]] [[$:/state/sidebar/resizing]]">
 
 <$list filter="[{$:/status/RequireReloadDueToPluginChange}match[yes]]">
 
diff --git a/core/ui/PageTemplate/sidebar.tid b/core/ui/PageTemplate/sidebar.tid
index 6a67d519c..619e260f3 100644
--- a/core/ui/PageTemplate/sidebar.tid
+++ b/core/ui/PageTemplate/sidebar.tid
@@ -8,7 +8,7 @@ $:/config/SideBarSegments/Visibility/$(listItem)$
 
 <$eventcatcher tag="div" class="tc-sidebar-resizer-pointerdown-eventcatcher" selector=".tc-sidebar-resizer" matchSelector=".tc-sidebar-resizer" $pointerdown=<<sidebar-resizer-pointerdown-actions>> $pointerup=<<sidebar-resizer-pointerup-actions>>>
 
-<$refresh-blocker refreshBlockerList="[all[tiddlers+shadows]] -$:/state/sidebar/resizing -$:/state/sidebar/dimensions -$:/state/sidebar" enabled="yes">
+<$refresh-blocker refreshBlockerList="[all[tiddlers+shadows]] -$:/state/sidebar/resizing -$:/state/sidebar/dimensions -$:/state/sidebar">
 
 <%if [{$:/state/sidebar}!match[no]] %>
 
@@ -24,7 +24,7 @@ $:/config/SideBarSegments/Visibility/$(listItem)$
 
 </$refresh-blocker>
 
-<$refresh-blocker refreshBlockerList="[[$:/state/sidebar/dimensions]] [[$:/state/sidebar/resizing]]" enabled="yes">
+<$refresh-blocker refreshBlockerList="[[$:/state/sidebar/dimensions]] [[$:/state/sidebar/resizing]]">
 
 <$scrollable fallthrough="no" class="tc-sidebar-scrollable">
 
diff --git a/core/ui/PageTemplate/story.tid b/core/ui/PageTemplate/story.tid
index 0628b6f31..8a601e5f5 100644
--- a/core/ui/PageTemplate/story.tid
+++ b/core/ui/PageTemplate/story.tid
@@ -2,7 +2,7 @@ title: $:/core/ui/PageTemplate/story
 tags: $:/tags/PageTemplate
 
 \whitespace trim
-<$refresh-blocker refreshBlockerList="[[$:/state/sidebar/dimensions]] [[$:/state/sidebar/resizing]]" enabled="yes">
+<$refresh-blocker refreshBlockerList="[[$:/state/sidebar/dimensions]] [[$:/state/sidebar/resizing]]">
 
 <section class="tc-story-river" role="main">
 
diff --git a/core/ui/PageTemplate/topleftbar.tid b/core/ui/PageTemplate/topleftbar.tid
index a7eb6375e..f6e7b8ff7 100644
--- a/core/ui/PageTemplate/topleftbar.tid
+++ b/core/ui/PageTemplate/topleftbar.tid
@@ -1,7 +1,7 @@
 title: $:/core/ui/PageTemplate/topleftbar
 tags: $:/tags/PageTemplate
 
-<$refresh-blocker refreshBlockerList="[[$:/state/sidebar/dimensions]] [[$:/state/sidebar/resizing]]" enabled="yes">
+<$refresh-blocker refreshBlockerList="[[$:/state/sidebar/dimensions]] [[$:/state/sidebar/resizing]]">
 
 <span class="tc-topbar tc-topbar-left">
 
diff --git a/core/ui/PageTemplate/toprightbar.tid b/core/ui/PageTemplate/toprightbar.tid
index b0f7a01aa..028d7913a 100644
--- a/core/ui/PageTemplate/toprightbar.tid
+++ b/core/ui/PageTemplate/toprightbar.tid
@@ -1,7 +1,7 @@
 title: $:/core/ui/PageTemplate/toprightbar
 tags: $:/tags/PageTemplate
 
-<$refresh-blocker refreshBlockerList="[[$:/state/sidebar/dimensions]] [[$:/state/sidebar/resizing]]" enabled="yes">
+<$refresh-blocker refreshBlockerList="[[$:/state/sidebar/dimensions]] [[$:/state/sidebar/resizing]]">
 
 <span class="tc-topbar tc-topbar-right">
 
diff --git a/plugins/tiddlywiki/codemirror/styles.tid b/plugins/tiddlywiki/codemirror/styles.tid
index d0083805d..94bbc0d65 100755
--- a/plugins/tiddlywiki/codemirror/styles.tid
+++ b/plugins/tiddlywiki/codemirror/styles.tid
@@ -2,6 +2,7 @@ title: $:/plugins/tiddlywiki/codemirror/styles
 tags: [[$:/tags/Stylesheet]]
 module-type: codemirror-theme
 name: tiddlywiki
+refresh-blocker-list: [is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]]
 
 \define set-fat-cursor-background-css(colour,colourA,colourB)
 <$set name="backgroundColour" value=<<contrastcolour target:"""$colour$""" fallbackTarget:"""""" colourA:"""$colourA$""" colourB:"""$colourB$""">>>
diff --git a/plugins/tiddlywiki/comments/styles.tid b/plugins/tiddlywiki/comments/styles.tid
index ed3cf1ddf..5f65768f1 100644
--- a/plugins/tiddlywiki/comments/styles.tid
+++ b/plugins/tiddlywiki/comments/styles.tid
@@ -1,5 +1,6 @@
 title: $:/plugins/tiddlywiki/comments/styles
 tags: [[$:/tags/Stylesheet]]
+refresh-blocker-list: [is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]]
 
 \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline
 
diff --git a/plugins/tiddlywiki/consent-banner/styles.tid b/plugins/tiddlywiki/consent-banner/styles.tid
index 70fb9205a..5c8b08387 100644
--- a/plugins/tiddlywiki/consent-banner/styles.tid
+++ b/plugins/tiddlywiki/consent-banner/styles.tid
@@ -1,5 +1,6 @@
 title: $:/plugins/tiddlywiki/consent-banner/styles
 tags: $:/tags/Stylesheet
+refresh-blocker-list: [is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]]
 
 .tc-consent-backdrop {
 	z-index: 1999;
diff --git a/plugins/tiddlywiki/dynannotate/styles.tid b/plugins/tiddlywiki/dynannotate/styles.tid
index a579117bd..cd0d036ee 100644
--- a/plugins/tiddlywiki/dynannotate/styles.tid
+++ b/plugins/tiddlywiki/dynannotate/styles.tid
@@ -1,6 +1,6 @@
 title: $:/plugins/tiddlywiki/dynannotate/styles
 tags: [[$:/tags/Stylesheet]]
-refresh-blocker-list: [all[tiddlers]is[draft]] [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]]
+refresh-blocker-list: [is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]]
 
 \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline
 
diff --git a/plugins/tiddlywiki/dynaview/styles.tid b/plugins/tiddlywiki/dynaview/styles.tid
index b6282a445..924ffd323 100644
--- a/plugins/tiddlywiki/dynaview/styles.tid
+++ b/plugins/tiddlywiki/dynaview/styles.tid
@@ -1,5 +1,6 @@
 title: $:/plugins/tiddlywiki/dynaview/styles
 tags: $:/tags/Stylesheet
+refresh-blocker-list: [is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]]
 
 \define if-tiddler-is(title,value,text)
 <$reveal stateTitle=<<__title__>> text=<<__value__>> type="match">
diff --git a/plugins/tiddlywiki/freelinks/styles.tid b/plugins/tiddlywiki/freelinks/styles.tid
index 61faa521b..0cecb2c1e 100644
--- a/plugins/tiddlywiki/freelinks/styles.tid
+++ b/plugins/tiddlywiki/freelinks/styles.tid
@@ -1,5 +1,6 @@
 title: $:/plugins/tiddlywiki/freelinks/styles
 tags: [[$:/tags/Stylesheet]]
+refresh-blocker-list: [is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]]
 
 \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline
 
diff --git a/plugins/tiddlywiki/geospatial/styles.tid b/plugins/tiddlywiki/geospatial/styles.tid
index b994c3d76..3bed758b4 100644
--- a/plugins/tiddlywiki/geospatial/styles.tid
+++ b/plugins/tiddlywiki/geospatial/styles.tid
@@ -1,5 +1,6 @@
 title: $:/plugins/tiddlywiki/geospatial/styles
 tags: [[$:/tags/Stylesheet]]
+refresh-blocker-list: [is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]]
 
 \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline
 
diff --git a/plugins/tiddlywiki/help/styles.tid b/plugins/tiddlywiki/help/styles.tid
index 7d70efc98..179398778 100644
--- a/plugins/tiddlywiki/help/styles.tid
+++ b/plugins/tiddlywiki/help/styles.tid
@@ -1,5 +1,6 @@
 title: $:/plugins/tiddlywiki/help/styles
 tags: [[$:/tags/Stylesheet]]
+refresh-blocker-list: [is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]]
 
 \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline
 
diff --git a/plugins/tiddlywiki/highlight-legacy/styles.tid b/plugins/tiddlywiki/highlight-legacy/styles.tid
index 21368811e..3c2943f13 100644
--- a/plugins/tiddlywiki/highlight-legacy/styles.tid
+++ b/plugins/tiddlywiki/highlight-legacy/styles.tid
@@ -1,5 +1,6 @@
 title: $:/plugins/tiddlywiki/highlight-legacy/styles
 tags: [[$:/tags/Stylesheet]]
+refresh-blocker-list: [is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]]
 
 .hljs {
   display: block;
diff --git a/plugins/tiddlywiki/highlight/styles.tid b/plugins/tiddlywiki/highlight/styles.tid
index 24b024150..55ef74cd3 100644
--- a/plugins/tiddlywiki/highlight/styles.tid
+++ b/plugins/tiddlywiki/highlight/styles.tid
@@ -1,6 +1,6 @@
 title: $:/plugins/tiddlywiki/highlight/styles
 tags: [[$:/tags/Stylesheet]]
-refresh-blocker-list: [all[tiddlers]is[draft]] [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]]
+refresh-blocker-list: [is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]]
 
 pre.hljs {
   padding: 0;
diff --git a/plugins/tiddlywiki/innerwiki/styles.tid b/plugins/tiddlywiki/innerwiki/styles.tid
index 8ebccb995..768e16211 100644
--- a/plugins/tiddlywiki/innerwiki/styles.tid
+++ b/plugins/tiddlywiki/innerwiki/styles.tid
@@ -1,5 +1,6 @@
 title: $:/plugins/tiddlywiki/innerwiki/styles
 tags: [[$:/tags/Stylesheet]]
+refresh-blocker-list: [is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]]
 
 \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline
 
diff --git a/plugins/tiddlywiki/internals/styles.tid b/plugins/tiddlywiki/internals/styles.tid
index 73f3f068d..984040bac 100644
--- a/plugins/tiddlywiki/internals/styles.tid
+++ b/plugins/tiddlywiki/internals/styles.tid
@@ -1,4 +1,5 @@
 title: $:/plugins/tiddlywiki/internals/styles
 tags: $:/tags/Stylesheet
+refresh-blocker-list: [is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]]
 
 \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline macrocallblock
diff --git a/plugins/tiddlywiki/jasmine/files/tiddlywiki.files b/plugins/tiddlywiki/jasmine/files/tiddlywiki.files
index 23e03edd2..0fdee0ecf 100644
--- a/plugins/tiddlywiki/jasmine/files/tiddlywiki.files
+++ b/plugins/tiddlywiki/jasmine/files/tiddlywiki.files
@@ -51,7 +51,8 @@
 			"fields": {
 				"type": "text/css",
 				"title": {"source": "filename", "prefix": "$:/plugins/tiddlywiki/jasmine/jasmine-core/jasmine-core/"},
-				"tags": "[[$:/tags/Stylesheet]]"
+				"tags": "[[$:/tags/Stylesheet]]",
+				"refresh-blocker-list": "[is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]]"
 			}
 		}
 	]
diff --git a/plugins/tiddlywiki/katex/styles.tid b/plugins/tiddlywiki/katex/styles.tid
index afb328887..9f402e845 100644
--- a/plugins/tiddlywiki/katex/styles.tid
+++ b/plugins/tiddlywiki/katex/styles.tid
@@ -1,5 +1,6 @@
 title: $:/plugins/tiddlywiki/katex/styles
 tags: [[$:/tags/Stylesheet]]
+refresh-blocker-list: [is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]]
 
 \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline
 
diff --git a/plugins/tiddlywiki/markdown/styles.tid b/plugins/tiddlywiki/markdown/styles.tid
index 4185d4304..d67e78356 100644
--- a/plugins/tiddlywiki/markdown/styles.tid
+++ b/plugins/tiddlywiki/markdown/styles.tid
@@ -1,6 +1,7 @@
 title: $:/plugins/tiddlywiki/markdown/styles
 tags: [[$:/tags/Stylesheet]]
 code-body: yes
+refresh-blocker-list: [is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]]
 
 .markdown {
 	display: block;
diff --git a/plugins/tiddlywiki/menubar/styles.tid b/plugins/tiddlywiki/menubar/styles.tid
index ff0539934..1b1b170ce 100644
--- a/plugins/tiddlywiki/menubar/styles.tid
+++ b/plugins/tiddlywiki/menubar/styles.tid
@@ -1,6 +1,6 @@
 title: $:/plugins/tiddlywiki/menubar/styles
 tags: [[$:/tags/Stylesheet]]
-refresh-blocker-list: [all[tiddlers]is[draft]] [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]] -$:/state/popup/menubar/hamburger
+refresh-blocker-list: [is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]] -$:/state/popup/menubar/hamburger
 
 \define breakpoint-plus-one()
 <$text text={{{ [{$:/config/plugins/menubar/breakpoint}removesuffix[px]add[1]addsuffix[px]] ~[{$:/config/plugins/menubar/breakpoint}] }}} />
diff --git a/plugins/tiddlywiki/powered-by-tiddlywiki/styles.tid b/plugins/tiddlywiki/powered-by-tiddlywiki/styles.tid
index b89cefb07..702e9220c 100644
--- a/plugins/tiddlywiki/powered-by-tiddlywiki/styles.tid
+++ b/plugins/tiddlywiki/powered-by-tiddlywiki/styles.tid
@@ -1,5 +1,6 @@
 title: $:/plugins/tiddlywiki/powered-by-tiddlywiki/styles
 tags: $:/tags/Stylesheet
+refresh-blocker-list: [is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]]
 
 .tc-powered-by-tiddlywiki-banner {
 	position: fixed;
diff --git a/plugins/tiddlywiki/railroad/files/tiddlywiki.files b/plugins/tiddlywiki/railroad/files/tiddlywiki.files
index 266250366..7bc544c82 100644
--- a/plugins/tiddlywiki/railroad/files/tiddlywiki.files
+++ b/plugins/tiddlywiki/railroad/files/tiddlywiki.files
@@ -6,7 +6,7 @@
 				"type": "text/vnd.tiddlywiki",
 				"title": "$:/plugins/tiddlywiki/railroad/railroad-diagrams.css",
 				"tags": "$:/tags/Stylesheet",
-				"refresh-blocker-list": "[all[tiddlers]is[draft]] [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]]"
+				"refresh-blocker-list": "[is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]]"
 			}
 		},{
 			"file": "railroad-diagrams.js",
diff --git a/plugins/tiddlywiki/share/styles.tid b/plugins/tiddlywiki/share/styles.tid
index a96da5d6d..f463fae41 100644
--- a/plugins/tiddlywiki/share/styles.tid
+++ b/plugins/tiddlywiki/share/styles.tid
@@ -1,5 +1,6 @@
 title: $:/plugins/tiddlywiki/share/styles
 tags: [[$:/tags/Stylesheet]]
+refresh-blocker-list: [is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]]
 
 \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline
 
diff --git a/plugins/tiddlywiki/text-slicer/styles.tid b/plugins/tiddlywiki/text-slicer/styles.tid
index 370b4d684..deb4e4ce9 100644
--- a/plugins/tiddlywiki/text-slicer/styles.tid
+++ b/plugins/tiddlywiki/text-slicer/styles.tid
@@ -1,5 +1,6 @@
 title: $:/plugins/tiddlywiki/text-slicer/styles
 tags: $:/tags/Stylesheet
+refresh-blocker-list: [is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]]
 
 \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline macrocallblock
 
diff --git a/plugins/tiddlywiki/tiddlyweb/styles.tid b/plugins/tiddlywiki/tiddlyweb/styles.tid
index 20796e6c1..b23a1122e 100644
--- a/plugins/tiddlywiki/tiddlyweb/styles.tid
+++ b/plugins/tiddlywiki/tiddlyweb/styles.tid
@@ -1,5 +1,6 @@
 title: $:/plugins/tiddlywiki/tiddlyweb/styles
 tags: [[$:/tags/Stylesheet]]
+refresh-blocker-list: [is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]]
 
 \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline macrocallblock
 
diff --git a/plugins/tiddlywiki/tour/styles.tid b/plugins/tiddlywiki/tour/styles.tid
index 703e5bd74..b09eefd62 100644
--- a/plugins/tiddlywiki/tour/styles.tid
+++ b/plugins/tiddlywiki/tour/styles.tid
@@ -1,6 +1,6 @@
 title: $:/plugins/tiddlywiki/tour/styles
 tags: $:/tags/Stylesheet
-refresh-blocker-list: [all[tiddlers]is[draft]] [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]]
+refresh-blocker-list: [is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]]
 
 \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline macrocallblock
 
diff --git a/plugins/tiddlywiki/twitter-archivist/styles.tid b/plugins/tiddlywiki/twitter-archivist/styles.tid
index 7ed95a0c1..a89fa089f 100644
--- a/plugins/tiddlywiki/twitter-archivist/styles.tid
+++ b/plugins/tiddlywiki/twitter-archivist/styles.tid
@@ -1,6 +1,7 @@
 title: $:/plugins/tiddlywiki/twitter-archivist/styles
 tags: [[$:/tags/Stylesheet]]
 code-body: yes
+refresh-blocker-list: [is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]]
 
 \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline macrocallblock
 
diff --git a/plugins/tiddlywiki/upgrade/styles.tid b/plugins/tiddlywiki/upgrade/styles.tid
index 944c6a918..432df9da2 100644
--- a/plugins/tiddlywiki/upgrade/styles.tid
+++ b/plugins/tiddlywiki/upgrade/styles.tid
@@ -1,5 +1,6 @@
 title: $:/plugins/tiddlywiki/upgrade/styles
 tags: $:/tags/Stylesheet
+refresh-blocker-list: [is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]]
 
 .tc-upgrade-wizard-wrapper {
 	width: 100%;
diff --git a/plugins/tiddlywiki/xlsx-utils/styles.tid b/plugins/tiddlywiki/xlsx-utils/styles.tid
index 680d2b773..5b42bb2cb 100644
--- a/plugins/tiddlywiki/xlsx-utils/styles.tid
+++ b/plugins/tiddlywiki/xlsx-utils/styles.tid
@@ -1,5 +1,6 @@
 title: $:/plugins/tiddlywiki/xlsx-utils/styles
 tags: [[$:/tags/Stylesheet]]
+refresh-blocker-list: [is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]]
 
 \define quick-colour-selector-background() #bac0f1
 \define quick-colour-selector-border() #9196c1
diff --git a/themes/tiddlywiki/centralised/styles.tid b/themes/tiddlywiki/centralised/styles.tid
index 00402c992..f426bfa33 100644
--- a/themes/tiddlywiki/centralised/styles.tid
+++ b/themes/tiddlywiki/centralised/styles.tid
@@ -1,6 +1,6 @@
 title: $:/themes/tiddlywiki/centralised/styles.tid
 tags: [[$:/tags/Stylesheet]]
-refresh-blocker-list: [all[tiddlers]is[draft]] [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]]
+refresh-blocker-list: [is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]]
 
 \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline
 
diff --git a/themes/tiddlywiki/heavier/base.tid b/themes/tiddlywiki/heavier/base.tid
index 518e392e0..31a823cad 100644
--- a/themes/tiddlywiki/heavier/base.tid
+++ b/themes/tiddlywiki/heavier/base.tid
@@ -1,6 +1,6 @@
 title: $:/themes/tiddlywiki/heavier/base
 tags: [[$:/tags/Stylesheet]]
-refresh-blocker-list: [all[tiddlers]is[draft]] [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]]
+refresh-blocker-list: [is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]]
 
 \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline
 
diff --git a/themes/tiddlywiki/readonly/styles.tid b/themes/tiddlywiki/readonly/styles.tid
index e22a84e77..0c92877d9 100644
--- a/themes/tiddlywiki/readonly/styles.tid
+++ b/themes/tiddlywiki/readonly/styles.tid
@@ -1,6 +1,6 @@
 title: $:/themes/tiddlywiki/readonly/styles.tid
 tags: [[$:/tags/Stylesheet]]
-refresh-blocker-list: [all[tiddlers]is[draft]] [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]]
+refresh-blocker-list: [is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]]
 
 \define button-selector(title)
 button.$title$, .tc-drop-down button.$title$, div.$title$
diff --git a/themes/tiddlywiki/seamless/base.tid b/themes/tiddlywiki/seamless/base.tid
index 864897c9c..6a4d838d1 100644
--- a/themes/tiddlywiki/seamless/base.tid
+++ b/themes/tiddlywiki/seamless/base.tid
@@ -1,7 +1,7 @@
 title: $:/themes/tiddlywiki/seamless/base
 tags: [[$:/tags/Stylesheet]]
 list-after: $:/themes/tiddlywiki/vanilla/base
-refresh-blocker-list: [all[tiddlers]is[draft]] [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]]
+refresh-blocker-list: [is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]]
 
 \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline
 
diff --git a/themes/tiddlywiki/snowwhite/base.tid b/themes/tiddlywiki/snowwhite/base.tid
index cf33b9d59..b8029595d 100644
--- a/themes/tiddlywiki/snowwhite/base.tid
+++ b/themes/tiddlywiki/snowwhite/base.tid
@@ -1,6 +1,6 @@
 title: $:/themes/tiddlywiki/snowwhite/base
 tags: [[$:/tags/Stylesheet]]
-refresh-blocker-list: [all[tiddlers]is[draft]] [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]]
+refresh-blocker-list: [is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]]
 
 \define sidebarbreakpoint-minus-one()
 <$text text={{{ [{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}removesuffix[px]subtract[1]addsuffix[px]] ~[{$:/themes/tiddlywiki/vanilla/metrics/sidebarbreakpoint}] }}}/>
diff --git a/themes/tiddlywiki/starlight/styles.tid b/themes/tiddlywiki/starlight/styles.tid
index cd7d170f5..463cc2066 100644
--- a/themes/tiddlywiki/starlight/styles.tid
+++ b/themes/tiddlywiki/starlight/styles.tid
@@ -1,6 +1,6 @@
 title: $:/themes/tiddlywiki/starlight/styles.tid
 tags: [[$:/tags/Stylesheet]]
-refresh-blocker-list: [all[tiddlers]is[draft]] [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]]
+refresh-blocker-list: [is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]]
 
 \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline
 
diff --git a/themes/tiddlywiki/tight/base.tid b/themes/tiddlywiki/tight/base.tid
index 55ab02ce9..1c38bd486 100644
--- a/themes/tiddlywiki/tight/base.tid
+++ b/themes/tiddlywiki/tight/base.tid
@@ -1,6 +1,6 @@
 title: $:/themes/tiddlywiki/tight/base
 tags: [[$:/tags/Stylesheet]]
-refresh-blocker-list: [all[tiddlers]is[draft]] [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]]
+refresh-blocker-list: [is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]]
 
 \rules only filteredtranscludeinline transcludeinline macrodef macrocallinline
 
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index 399ed8bd5..0a3526828 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -1,7 +1,7 @@
 title: $:/themes/tiddlywiki/vanilla/base
 tags: [[$:/tags/Stylesheet]]
 list-before: $:/themes/tiddlywiki/vanilla/fluid-fixed
-refresh-blocker-list: [all[tiddlers]is[draft]] [all[tiddlers]prefix[$:/state/]] [all[tiddlers]prefix[$:/temp/]]
+refresh-blocker-list: [is[draft]] [prefix[$:/state/]] [prefix[$:/temp/]]
 code-body: yes
 
 \define custom-background-datauri()