diff --git a/boot/boot.js b/boot/boot.js
index 9e1ddabb9..89c88b8f2 100644
--- a/boot/boot.js
+++ b/boot/boot.js
@@ -1086,6 +1086,16 @@ $tw.loadWikiTiddlers = function(wikiPath,parentPaths) {
 			}
 		}
 	}
+	// Load any themes listed in the wiki info file
+	if(wikiInfo.themes) {
+		var themesBasePath = path.resolve($tw.boot.corePath,$tw.config.themesPath);
+		for(var t=0; t<wikiInfo.themes.length; t++) {
+			pluginFields = $tw.loadPluginFolder(path.resolve(themesBasePath,"./" + wikiInfo.themes[t]));
+			if(pluginFields) {
+				$tw.wiki.addTiddler(pluginFields);
+			}
+		}
+	}
 	// Load the wiki files, registering them as writable
 	var resolvedWikiPath = path.resolve(wikiPath,$tw.config.wikiTiddlersSubDir);
 	$tw.utils.each($tw.loadTiddlersFromPath(resolvedWikiPath),function(tiddlerFile) {
@@ -1139,6 +1149,7 @@ $tw.boot.startup = function() {
 		},
 		config: { // Configuration overridables
 			pluginsPath: "../plugins/",
+			themesPath: "../themes/",
 			wikiInfo: "./tiddlywiki.info",
 			wikiPluginsSubDir: "./plugins",
 			wikiTiddlersSubDir: "./tiddlers",
diff --git a/editions/clientserver/tiddlywiki.info b/editions/clientserver/tiddlywiki.info
index f224a8961..7a110be9a 100644
--- a/editions/clientserver/tiddlywiki.info
+++ b/editions/clientserver/tiddlywiki.info
@@ -3,6 +3,9 @@
 		"tiddlywiki/tiddlyweb",
 		"tiddlywiki/filesystem"
 	],
+	"themes": [
+		"tiddlywiki/snowwhite"
+	],
 	"doNotSave": [
 		"$:/StoryList",
 		"$:/HistoryList",
diff --git a/editions/empty/tiddlywiki.info b/editions/empty/tiddlywiki.info
index 40eb6562e..7fc99bd64 100644
--- a/editions/empty/tiddlywiki.info
+++ b/editions/empty/tiddlywiki.info
@@ -1,5 +1,8 @@
 {
 	"plugins": [
 		"tiddlywiki/fullscreen"
+	],
+	"themes": [
+		"tiddlywiki/snowwhite"
 	]
 }
\ No newline at end of file
diff --git a/editions/tahoelafs/tiddlywiki.info b/editions/tahoelafs/tiddlywiki.info
index 49bd181c2..e6b202388 100644
--- a/editions/tahoelafs/tiddlywiki.info
+++ b/editions/tahoelafs/tiddlywiki.info
@@ -1,5 +1,8 @@
 {
 	"plugins": [
 		"tiddlywiki/tahoelafs"
+	],
+	"themes": [
+		"tiddlywiki/snowwhite"
 	]
 }
\ No newline at end of file
diff --git a/editions/test/tiddlywiki.info b/editions/test/tiddlywiki.info
index e54562c82..56a046348 100644
--- a/editions/test/tiddlywiki.info
+++ b/editions/test/tiddlywiki.info
@@ -1,5 +1,8 @@
 {
 	"plugins": [
 		"tiddlywiki/jasmine"
+	],
+	"themes": [
+		"tiddlywiki/snowwhite"
 	]
 }
\ No newline at end of file
diff --git a/editions/tw5.com/tiddlywiki.info b/editions/tw5.com/tiddlywiki.info
index 40eb6562e..7fc99bd64 100644
--- a/editions/tw5.com/tiddlywiki.info
+++ b/editions/tw5.com/tiddlywiki.info
@@ -1,5 +1,8 @@
 {
 	"plugins": [
 		"tiddlywiki/fullscreen"
+	],
+	"themes": [
+		"tiddlywiki/snowwhite"
 	]
 }
\ No newline at end of file
diff --git a/editions/tw5tiddlyweb/tiddlywiki.info b/editions/tw5tiddlyweb/tiddlywiki.info
index aaea253fc..9f5fae314 100644
--- a/editions/tw5tiddlyweb/tiddlywiki.info
+++ b/editions/tw5tiddlyweb/tiddlywiki.info
@@ -2,5 +2,8 @@
 	"plugins": [
 		"tiddlywiki/fullscreen",
 		"tiddlywiki/tiddlyweb"
+	],
+	"themes": [
+		"tiddlywiki/snowwhite"
 	]
 }
\ No newline at end of file
diff --git a/core/styles/base.tid b/themes/tiddlywiki/snowwhite/base.tid
similarity index 100%
rename from core/styles/base.tid
rename to themes/tiddlywiki/snowwhite/base.tid
diff --git a/core/styles/colourmappings.tid b/themes/tiddlywiki/snowwhite/colourmappings.tid
similarity index 100%
rename from core/styles/colourmappings.tid
rename to themes/tiddlywiki/snowwhite/colourmappings.tid
diff --git a/core/styles/colours.tid b/themes/tiddlywiki/snowwhite/colours.tid
similarity index 100%
rename from core/styles/colours.tid
rename to themes/tiddlywiki/snowwhite/colours.tid
diff --git a/core/styles/metrics.tid b/themes/tiddlywiki/snowwhite/metrics.tid
similarity index 100%
rename from core/styles/metrics.tid
rename to themes/tiddlywiki/snowwhite/metrics.tid
diff --git a/themes/tiddlywiki/snowwhite/plugin.info b/themes/tiddlywiki/snowwhite/plugin.info
new file mode 100644
index 000000000..3a9bb82f6
--- /dev/null
+++ b/themes/tiddlywiki/snowwhite/plugin.info
@@ -0,0 +1,7 @@
+{
+	"title": "$:/themes/tiddlywiki/snowwhite",
+	"description": "A simple, plain layout",
+	"author": "JeremyRuston",
+	"version": "0.0.0",
+	"coreVersion": ">=5.0.0"
+}
diff --git a/core/styles/reset.tid b/themes/tiddlywiki/snowwhite/reset.tid
similarity index 100%
rename from core/styles/reset.tid
rename to themes/tiddlywiki/snowwhite/reset.tid