diff --git a/bld.sh b/bld.sh
index aaf3a20a1..17509352e 100755
--- a/bld.sh
+++ b/bld.sh
@@ -12,9 +12,8 @@ node ../../core/boot.js \
 	--verbose \
 	--password password \
 	--savetiddler ReadMe ../../readme.md text/html \
-	--savetiddler $:/core/templates/tiddlywiki5.template.html ../../../jermolene.github.com/index.html text/plain [!is[shadow]] \
-	--savetiddler $:/core/templates/tiddlywiki5.template.html ../../../jermolene.github.com/empty.html text/plain [!is[shadow]is[shadow]] \
-	--savetiddler $:/core/templates/tiddlywiki5.encrypted.template.html ../../../jermolene.github.com/encrypted.html text/plain [!is[shadow]] \
+	--savetiddler $:/core/templates/tiddlywiki5.template.html ../../../jermolene.github.com/index.html text/plain \
+	--savetiddler $:/core/templates/tiddlywiki5.encrypted.template.html ../../../jermolene.github.com/encrypted.html text/plain \
 	--savetiddler $:/core/templates/static.template.html ../../../jermolene.github.com/static.html text/plain \
 	|| exit 1
 
@@ -27,8 +26,8 @@ pushd editions/empty > /dev/null
 node ../../core/boot.js \
 	--verbose \
 	--password password \
-	--savetiddler $:/core/templates/tiddlywiki5.template.html ../../../jermolene.github.com/empty.html text/plain [!is[shadow]] \
-	--savetiddler $:/core/templates/tiddlywiki5.encrypted.template.html ../../../jermolene.github.com/empty_encrypted.html text/plain [!is[shadow]] \
+	--savetiddler $:/core/templates/tiddlywiki5.template.html ../../../jermolene.github.com/empty.html text/plain \
+	--savetiddler $:/core/templates/tiddlywiki5.encrypted.template.html ../../../jermolene.github.com/empty_encrypted.html text/plain \
 	|| exit 1
 
 popd > /dev/null
diff --git a/core/templates/tiddlywiki5.encrypted.template.html.tid b/core/templates/tiddlywiki5.encrypted.template.html.tid
index 899e4ad91..0d5c1e51e 100644
--- a/core/templates/tiddlywiki5.encrypted.template.html.tid
+++ b/core/templates/tiddlywiki5.encrypted.template.html.tid
@@ -34,7 +34,7 @@ type: text/x-tiddlywiki-html
 <!----------- Encrypted tiddlers ----------->
 <div id="encryptedArea" style="display:none;">
 <<serialize "[is[shadow]] -[type[text/css]] -[type[application/javascript]has[module-type]] -[type[application/javascript]library[yes]] -[[$:/core/boot.js]] -[[$:/core/bootprefix.js]]" application/x-tiddler-encrypted-div>>
-<<serialize "$1" application/x-tiddler-encrypted-div>>
+<<serialize "[!is[shadow]]" application/x-tiddler-encrypted-div>>
 </div>
 <!----------- Library modules ----------->
 <div id="libraryModules" style="display:none;">
diff --git a/core/templates/tiddlywiki5.template.html.tid b/core/templates/tiddlywiki5.template.html.tid
index d8049fae5..c60219b7c 100644
--- a/core/templates/tiddlywiki5.template.html.tid
+++ b/core/templates/tiddlywiki5.template.html.tid
@@ -37,7 +37,7 @@ type: text/x-tiddlywiki-html
 </div>
 <!----------- Ordinary tiddlers ----------->
 <div id="storeArea" style="display:none;">
-<<serialize "$1" application/x-tiddler-html-div>>
+<<serialize "[!is[shadow]]" application/x-tiddler-html-div>>
 </div>
 <!----------- Library modules ----------->
 <div id="libraryModules" style="display:none;">
diff --git a/dbld.sh b/dbld.sh
index 0b4a31ea0..a1ea5be6a 100755
--- a/dbld.sh
+++ b/dbld.sh
@@ -13,10 +13,10 @@ pushd editions/tw5dropbox/appwiki > /dev/null
 
 node ../../../core/boot.js \
 	--verbose \
-	--savetiddler $:/plugins/dropbox/tw5dropbox.template.js ../../../../../../Apps/Static\ Web\ Apps/TiddlyWiki5/public/tw5dropbox.js text/plain [!is[shadow]] \
-	--savetiddler $:/plugins/dropbox/index.template.html ../../../../../../Apps/TiddlyWiki5/My\ TiddlyWiki/index.html text/plain [!is[shadow]] \
-	--savetiddler $:/plugins/dropbox/index.template.html ../../../../../../Apps/Static\ Web\ Apps/TiddlyWiki5/public/apptemplate.html text/plain [!is[shadow]] \
-	--savetiddler $:/plugins/dropbox/styles.template.css ../../../../../../Apps/Static\ Web\ Apps/TiddlyWiki5/public/styles.css text/plain [!is[shadow]] \
+	--savetiddler $:/plugins/dropbox/tw5dropbox.template.js ../../../../../../Apps/Static\ Web\ Apps/TiddlyWiki5/public/tw5dropbox.js text/plain \
+	--savetiddler $:/plugins/dropbox/index.template.html ../../../../../../Apps/TiddlyWiki5/My\ TiddlyWiki/index.html text/plain \
+	--savetiddler $:/plugins/dropbox/index.template.html ../../../../../../Apps/Static\ Web\ Apps/TiddlyWiki5/public/apptemplate.html text/plain \
+	--savetiddler $:/plugins/dropbox/styles.template.css ../../../../../../Apps/Static\ Web\ Apps/TiddlyWiki5/public/styles.css text/plain \
 	|| exit 1
 
 popd > /dev/null
@@ -27,7 +27,7 @@ pushd editions/tw5dropbox/mainwiki > /dev/null
 
 node ../../../core/boot.js \
 	--verbose \
-	--savetiddler $:/plugins/dropbox/index.template.html ../../../../../../Apps/Static\ Web\ Apps/TiddlyWiki5/public/index.html text/plain [!is[shadow]] \
+	--savetiddler $:/plugins/dropbox/index.template.html ../../../../../../Apps/Static\ Web\ Apps/TiddlyWiki5/public/index.html text/plain \
 	|| exit 1
 
 popd > /dev/null
diff --git a/wbld.sh b/wbld.sh
index ed86e0f92..dcdc9477d 100755
--- a/wbld.sh
+++ b/wbld.sh
@@ -9,7 +9,7 @@ pushd editions/tw5tiddlyweb > /dev/null
 
 node ../../core/boot.js \
 	--verbose \
-	--savetiddler $:/core/templates/tiddlywiki5.template.html ../../../jermolene.github.com/tiddlyweb.html text/plain [!is[shadow]]\
+	--savetiddler $:/core/templates/tiddlywiki5.template.html ../../../jermolene.github.com/tiddlyweb.html text/plain \
 	|| exit 1
 
 popd > /dev/null