diff --git a/core/boot.js b/core/boot.js
index 998378669..8a52fc219 100644
--- a/core/boot.js
+++ b/core/boot.js
@@ -56,7 +56,7 @@ $tw.config = $tw.config || {};
$tw.config.root = $tw.config.root || "$:"; // Root for module titles (eg, "$:/kernel/boot.js")
$tw.config.bootModuleSubDir = $tw.config.bootModuleSubDir || "./modules";
$tw.config.wikiPluginsSubDir = $tw.config.wikiPluginsSubDir || "./plugins";
-$tw.config.wikiShadowsSubDir = $tw.config.wikiShadowsSubDir || "./shadows";
+$tw.config.wikiShadowsSubDir = $tw.config.wikiShadowsSubDir || "./wiki";
$tw.config.wikiTiddlersSubDir = $tw.config.wikiTiddlersSubDir || "./tiddlers";
// File extensions
diff --git a/core/templates/tiddlywiki5.template.html.tid b/core/templates/tiddlywiki5.template.html.tid
index 6551e42f8..dbb0257b6 100644
--- a/core/templates/tiddlywiki5.template.html.tid
+++ b/core/templates/tiddlywiki5.template.html.tid
@@ -14,13 +14,13 @@ type: text/x-tiddlywiki-html
>
" />
-<<include "$:/wiki/title" text/plain>>
+<<tiddler "$:/core/wiki/title">>
<>
-<>
+<>
diff --git a/core/wiki/title.tid b/core/wiki/title.tid
new file mode 100644
index 000000000..bee005e52
--- /dev/null
+++ b/core/wiki/title.tid
@@ -0,0 +1,4 @@
+title: $:/core/wiki/title
+type: text/x-tiddlywiki
+
+<> --- <>
\ No newline at end of file
diff --git a/tw2/shadows/tiddlywiki2.template.html.tid b/tw2/wiki/tiddlywiki2.template.html.tid
similarity index 100%
rename from tw2/shadows/tiddlywiki2.template.html.tid
rename to tw2/wiki/tiddlywiki2.template.html.tid
diff --git a/tw5.com/wiki/SiteSubtitle.tid b/tw5.com/wiki/SiteSubtitle.tid
new file mode 100644
index 000000000..a527346ee
--- /dev/null
+++ b/tw5.com/wiki/SiteSubtitle.tid
@@ -0,0 +1,4 @@
+title: SiteSubtitle
+type: text/x-tiddlywiki
+
+a reusable non-linear personal web notebook
\ No newline at end of file
diff --git a/tw5.com/wiki/SiteTitle.tid b/tw5.com/wiki/SiteTitle.tid
new file mode 100644
index 000000000..4b2e182ec
--- /dev/null
+++ b/tw5.com/wiki/SiteTitle.tid
@@ -0,0 +1,4 @@
+title: SiteTitle
+type: text/x-tiddlywiki
+
+TiddlyWiki5
\ No newline at end of file
diff --git a/tw5.com/shadows/StoryTiddlers.tid b/tw5.com/wiki/StoryTiddlers.tid
similarity index 100%
rename from tw5.com/shadows/StoryTiddlers.tid
rename to tw5.com/wiki/StoryTiddlers.tid
diff --git a/tw5.com/shadows/bootstrap.css.tid b/tw5.com/wiki/bootstrap.css.tid
similarity index 100%
rename from tw5.com/shadows/bootstrap.css.tid
rename to tw5.com/wiki/bootstrap.css.tid
diff --git a/tw5.com/shadows/styles.css.tid b/tw5.com/wiki/styles.css.tid
similarity index 100%
rename from tw5.com/shadows/styles.css.tid
rename to tw5.com/wiki/styles.css.tid