diff --git a/core/templates/alltiddlers.template.html.tid b/core/templates/alltiddlers.template.html.tid
index 1e03a0fb3..f372afc7b 100644
--- a/core/templates/alltiddlers.template.html.tid
+++ b/core/templates/alltiddlers.template.html.tid
@@ -13,7 +13,7 @@ type: text/vnd.tiddlywiki-html
 <link id="faviconLink" rel="shortcut icon" href="favicon.ico">
 <title>{{$:/core/wiki/title}}</title>
 <div id="styleArea">
-{{{ [is[system]type[text/css]] ||$:/core/templates/css-tiddler}}}
+{{$:/boot/boot.css||$:/core/templates/css-tiddler}}
 </div>
 <style type="text/css">
 {{{ [tag[$:/tags/stylesheet]] [is[shadow]tag[$:/tags/stylesheet]] ||$:/core/templates/wikified-tiddler}}}
diff --git a/core/templates/save-all.tid b/core/templates/save-all.tid
index bd4e43fb5..9af53b3a0 100644
--- a/core/templates/save-all.tid
+++ b/core/templates/save-all.tid
@@ -1,6 +1,6 @@
 title: $:/core/save/all
 
 \define saveTiddlerFilter()
-[is[tiddler]] -[type[text/css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
+[is[tiddler]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
 \end
 {{$:/core/templates/tiddlywiki5.html}}
diff --git a/core/templates/save-empty.tid b/core/templates/save-empty.tid
index eb15e9fc3..bd224264e 100644
--- a/core/templates/save-empty.tid
+++ b/core/templates/save-empty.tid
@@ -1,6 +1,6 @@
 title: $:/core/save/empty
 
 \define saveTiddlerFilter()
-[is[system]] -[type[text/css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
+[is[system]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
 \end
 {{$:/core/templates/tiddlywiki5.html}}
diff --git a/core/templates/save-lazy-images.tid b/core/templates/save-lazy-images.tid
index dd9985b52..12f4c504d 100644
--- a/core/templates/save-lazy-images.tid
+++ b/core/templates/save-lazy-images.tid
@@ -1,6 +1,6 @@
 title: $:/core/save/lazy-images
 
 \define saveTiddlerFilter()
-[is[tiddler]] -[type[text/css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[!is[system]is[image]] +[sort[title]] 
+[is[tiddler]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[!is[system]is[image]] +[sort[title]] 
 \end
 {{$:/core/templates/tiddlywiki5.html}}
diff --git a/core/templates/static.template.css.tid b/core/templates/static.template.css.tid
index c754329ac..6ae269712 100644
--- a/core/templates/static.template.css.tid
+++ b/core/templates/static.template.css.tid
@@ -1,4 +1,4 @@
 title: $:/core/templates/static.template.css
 
-{{{ [is[system]type[text/css]] ||$:/core/templates/plain-text-tiddler}}}
+{{$:/boot/boot.css||$:/core/templates/plain-text-tiddler}}
 {{{ [tag[$:/tags/stylesheet]] [is[shadow]tag[$:/tags/stylesheet]] ||$:/core/templates/wikified-tiddler}}}
diff --git a/core/templates/static.template.html.tid b/core/templates/static.template.html.tid
index 29052063a..a0617d336 100644
--- a/core/templates/static.template.html.tid
+++ b/core/templates/static.template.html.tid
@@ -13,7 +13,7 @@ type: text/vnd.tiddlywiki-html
 <link id="faviconLink" rel="shortcut icon" href="favicon.ico">
 <title>{{$:/core/wiki/title}}</title>
 <div id="styleArea">
-{{{ [is[system]type[text/css]] ||$:/core/templates/css-tiddler}}}
+{{$:/boot/boot.css||$:/core/templates/css-tiddler}}
 </div>
 <style type="text/css">
 {{{ [tag[$:/tags/stylesheet]] [is[shadow]tag[$:/tags/stylesheet]] ||$:/core/templates/wikified-tiddler}}}
diff --git a/core/templates/tiddlywiki5.html.tid b/core/templates/tiddlywiki5.html.tid
index 489c2b984..ec32026b4 100644
--- a/core/templates/tiddlywiki5.html.tid
+++ b/core/templates/tiddlywiki5.html.tid
@@ -24,7 +24,7 @@ title: $:/core/templates/tiddlywiki5.html
 <body class="tw-body">
 <!--~~ Static styles ~~-->
 <div id="styleArea">
-{{{ [is[system]type[text/css]] ||$:/core/templates/css-tiddler}}}
+{{$:/boot/boot.css||$:/core/templates/css-tiddler}}
 </div>
 <!--~~ Static content for Google and browsers without JavaScript ~~-->
 <noscript>
diff --git a/editions/tw5.com/tiddlers/system/download-empty.tid b/editions/tw5.com/tiddlers/system/download-empty.tid
index 1a84e0331..280ac2a61 100644
--- a/editions/tw5.com/tiddlers/system/download-empty.tid
+++ b/editions/tw5.com/tiddlers/system/download-empty.tid
@@ -1,7 +1,7 @@
 title: $:/editions/tw5.com/download-empty
 
 \define saveTiddlerFilter()
-[[$:/core]] [[$:/isEncrypted]] [[$:/plugins/tiddlywiki/fullscreen]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] -[type[text/css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
+[[$:/core]] [[$:/isEncrypted]] [[$:/plugins/tiddlywiki/fullscreen]] [[$:/themes/tiddlywiki/snowwhite]] [[$:/themes/tiddlywiki/vanilla]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] +[sort[title]]
 \end
 \define savingEmpty()
 yes
diff --git a/plugins/tiddlywiki/tiddlyweb/download-offline.tid b/plugins/tiddlywiki/tiddlyweb/download-offline.tid
index db16077c8..5ff2e848e 100644
--- a/plugins/tiddlywiki/tiddlyweb/download-offline.tid
+++ b/plugins/tiddlywiki/tiddlyweb/download-offline.tid
@@ -1,6 +1,6 @@
 title: $:/editions/clientserver/download-offline
 
 \define saveTiddlerFilter()
-[is[tiddler]] -[type[text/css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/plugins/tiddlywiki/filesystem]] -[[$:/plugins/tiddlywiki/tiddlyweb]] +[sort[title]]
+[is[tiddler]] -[[$:/boot/boot.css]] -[type[application/javascript]library[yes]] -[[$:/boot/boot.js]] -[[$:/boot/bootprefix.js]] -[[$:/plugins/tiddlywiki/filesystem]] -[[$:/plugins/tiddlywiki/tiddlyweb]] +[sort[title]]
 \end
 {{$:/core/templates/tiddlywiki5.html}}
