diff --git a/js/App.js b/js/App.js
index 4bf2be69b..3090c3b7b 100644
--- a/js/App.js
+++ b/js/App.js
@@ -72,17 +72,14 @@ var App = function() {
 	// If in the browser, load the tiddlers built into the TiddlyWiki document
 	if(this.isBrowser) {
 		// First, the JavaScript system tiddlers
-		var moduleArea = document.getElementById("jsModules"),
-			tiddlers = this.store.deserializeTiddlers("(DOM)",moduleArea);
-		for(t=0; t<tiddlers.length; t++) {
-			this.store.addTiddler(new Tiddler(tiddlers[t]));
-		}
+		var moduleArea = document.getElementById("jsModules");
+		this.store.shadows.addTiddlers(this.store.deserializeTiddlers("(DOM)",moduleArea));
 		// Then, the ordinary tiddlers baked into the storeArea
 		var storeArea = document.getElementById("storeArea");
-		tiddlers = this.store.deserializeTiddlers("(DOM)",storeArea);
-		for(t=0; t<tiddlers.length; t++) {
-			this.store.addTiddler(new Tiddler(tiddlers[t]));
-		}
+		this.store.addTiddlers(this.store.deserializeTiddlers("(DOM)",storeArea));
+		// Finally, the shadow tiddlers
+		var shadowArea = document.getElementById("shadowArea");
+		this.store.shadows.addTiddlers(this.store.deserializeTiddlers("(DOM)",shadowArea));
 	}
 	// Bit of a hack to set up the macros
 	this.store.installMacro(require("./macros/chooser.js").macro);
diff --git a/tiddlywiki5/tiddlers/ShadowTiddlers.tid b/tiddlywiki5/tiddlers/ShadowTiddlers.tid
new file mode 100644
index 000000000..d8eb665f6
--- /dev/null
+++ b/tiddlywiki5/tiddlers/ShadowTiddlers.tid
@@ -0,0 +1,3 @@
+title: ShadowTiddlers
+
+<<list shadowed>>
diff --git a/tiddlywiki5/tiddlywiki5.recipe b/tiddlywiki5/tiddlywiki5.recipe
index 8edcc6830..b787b8444 100644
--- a/tiddlywiki5/tiddlywiki5.recipe
+++ b/tiddlywiki5/tiddlywiki5.recipe
@@ -6,7 +6,7 @@ tiddler: tiddlers/*.tid
 tiddler: tiddlers/*.jpg
 tiddler: tiddlers/*.png
 tiddler: tiddlers/*.svg
-tiddler: shadows/templates/*.tid
+shadow: shadows/templates/*.tid
 #tiddler: http://wikitext.tiddlyspace.com/fractalveg.jpg
 #	type: image/jpeg